From bec806230a1e376d2d642c4f78b6ef3ddb3cc8bf Mon Sep 17 00:00:00 2001 From: Luke Parker Date: Thu, 18 Sep 2025 16:05:30 -0400 Subject: [PATCH] Misc updates --- .github/actions/build-dependencies/action.yml | 2 +- .github/workflows/daily-deny.yml | 2 +- .github/workflows/lint.yml | 12 +- Cargo.lock | 225 +++++++++--------- Cargo.toml | 4 +- coordinator/cosign/Cargo.toml | 1 - coordinator/cosign/src/lib.rs | 3 - crypto/dkg/evrf/Cargo.toml | 10 +- crypto/embedwards25519/Cargo.toml | 2 +- crypto/secq256k1/Cargo.toml | 2 +- crypto/short-weierstrass/Cargo.toml | 2 +- deny.toml | 104 ++++---- .../dev/networks/monero/hashes-v0.18.3.4.txt | 50 ---- .../dev/networks/monero/hashes-v0.18.4.2.txt | 50 ++++ orchestration/src/main.rs | 2 +- orchestration/src/networks/monero.rs | 2 +- .../networks/monero/hashes-v0.18.3.4.txt | 50 ---- .../networks/monero/hashes-v0.18.4.2.txt | 50 ++++ patches/dalek-ff-group/Cargo.toml | 29 --- patches/dalek-ff-group/LICENSE | 21 -- patches/dalek-ff-group/README.md | 4 - patches/dalek-ff-group/src/lib.rs | 44 ---- processor/monero/Cargo.toml | 4 +- rust-toolchain.toml | 2 +- substrate/abi/src/transaction.rs | 4 +- substrate/client/Cargo.toml | 2 +- substrate/node/Cargo.toml | 2 +- substrate/signals/src/lib.rs | 24 +- substrate/validator-sets/src/lib.rs | 22 +- 29 files changed, 316 insertions(+), 415 deletions(-) delete mode 100644 orchestration/dev/networks/monero/hashes-v0.18.3.4.txt create mode 100644 orchestration/dev/networks/monero/hashes-v0.18.4.2.txt delete mode 100644 orchestration/testnet/networks/monero/hashes-v0.18.3.4.txt create mode 100644 orchestration/testnet/networks/monero/hashes-v0.18.4.2.txt delete mode 100644 patches/dalek-ff-group/Cargo.toml delete mode 100644 patches/dalek-ff-group/LICENSE delete mode 100644 patches/dalek-ff-group/README.md delete mode 100644 patches/dalek-ff-group/src/lib.rs diff --git a/.github/actions/build-dependencies/action.yml b/.github/actions/build-dependencies/action.yml index bfc02a4c..4629329b 100644 --- a/.github/actions/build-dependencies/action.yml +++ b/.github/actions/build-dependencies/action.yml @@ -43,7 +43,7 @@ runs: - name: Install solc shell: bash run: | - cargo +1.89 install svm-rs --version =0.5.18 + cargo +1.90 install svm-rs --version =0.5.19 svm install 0.8.26 svm use 0.8.26 diff --git a/.github/workflows/daily-deny.yml b/.github/workflows/daily-deny.yml index b11cdaf9..5cd7427e 100644 --- a/.github/workflows/daily-deny.yml +++ b/.github/workflows/daily-deny.yml @@ -18,7 +18,7 @@ jobs: key: rust-advisory-db - name: Install cargo deny - run: cargo +1.89 install cargo-deny --version =0.18.3 + run: cargo +1.90 install cargo-deny --version =0.18.4 - name: Run cargo deny run: cargo deny -L error --all-features check --hide-inclusion-graph diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 9b604577..f78005b7 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -52,7 +52,7 @@ jobs: key: rust-advisory-db - name: Install cargo deny - run: cargo +1.89 install cargo-deny --version =0.18.3 + run: cargo +1.90 install cargo-deny --version =0.18.4 - name: Run cargo deny run: cargo deny -L error --all-features check --hide-inclusion-graph @@ -88,8 +88,8 @@ jobs: - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac - name: Verify all dependencies are in use run: | - cargo +1.89 install cargo-machete --version =0.8.0 - cargo +1.89 machete + cargo +1.90 install cargo-machete --version =0.9.1 + cargo +1.90 machete msrv: runs-on: ubuntu-latest @@ -98,7 +98,7 @@ jobs: - name: Verify claimed `rust-version` shell: bash run: | - cargo +1.89 install cargo-msrv --version =0.18.4 + cargo +1.90 install cargo-msrv --version =0.18.4 function check_msrv { # We `cd` into the directory passed as the first argument, but will return to the @@ -146,12 +146,12 @@ jobs: cargo_toml_lines=$(cat ./Cargo.toml | wc -l) # Keep all lines after the start of the array, then keep all lines before the next "]" members=$(cat Cargo.toml | grep "members\ \=\ \[" -m1 -A$cargo_toml_lines | grep "]" -m1 -B$cargo_toml_lines) - # Prune `members = [` to `[` by replacing the first line with just `[` - members=$(echo "$members" | sed "1s/.*/\[/") # Parse out any comments, whitespace, including comments post-fixed on the same line as an entry # We accomplish the latter by pruning all characters after the entry's "," members=$(echo "$members" | grep -Ev "^[[:space:]]*(#|$)" | awk -F',' '{print $1","}') + # Replace the first line, which was "members = [" and is now "members = [,", with "[" + members=$(echo "$members" | sed "1s/.*/\[/") # Correct the last line, which was malleated to "]," members=$(echo "$members" | sed "$(echo "$members" | wc -l)s/\]\,/\]/") diff --git a/Cargo.lock b/Cargo.lock index 15165f9e..43ee365b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -343,7 +343,7 @@ dependencies = [ "derive_more 2.0.1", "foldhash 0.1.5", "hashbrown 0.15.5", - "indexmap 2.11.3", + "indexmap 2.11.4", "itoa", "k256", "keccak-asm", @@ -571,7 +571,7 @@ dependencies = [ "alloy-sol-macro-input", "const-hex", "heck 0.5.0", - "indexmap 2.11.3", + "indexmap 2.11.4", "proc-macro-error2", "proc-macro2", "quote", @@ -1457,7 +1457,7 @@ version = "0.11.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1edac47499deef695d9431bf241c75ea29f4cf3dcb78d39e19b31515e4ad3b08" dependencies = [ - "digest 0.11.0-rc.1", + "digest 0.11.0-rc.2", ] [[package]] @@ -1718,9 +1718,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.20.2" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8d458d63f0f0f482c8da9b7c8b76c21bd885a02056cc94c6404d861ca2b8206" +checksum = "1a2c5f3bf25ec225351aa1c8e230d04d880d3bd89dea133537dafad4ae291e5c" dependencies = [ "smallvec", ] @@ -1790,7 +1790,7 @@ dependencies = [ name = "ciphersuite" version = "0.4.2" dependencies = [ - "digest 0.11.0-rc.1", + "digest 0.11.0-rc.2", "ff", "ff-group-tests", "group", @@ -1805,7 +1805,7 @@ name = "ciphersuite" version = "0.4.99" dependencies = [ "ciphersuite 0.4.2", - "dalek-ff-group 0.5.0", + "dalek-ff-group", "std-shims", "zeroize", ] @@ -2325,9 +2325,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.184" +version = "1.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4a0beb369d20d0de6aa7084ee523e4c9a31d7d8c61ba357b119bb574d7f368" +checksum = "2f81de88da10862f22b5b3a60f18f6f42bbe7cb8faa24845dd7b1e4e22190e77" dependencies = [ "cc", "cxx-build", @@ -2340,13 +2340,13 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.184" +version = "1.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27d955b93e56a8e45cbc34df0ae920d8b5ad01541a4571222c78527c00e1a40a" +checksum = "5edd58bf75c3fdfc80d79806403af626570662f7b6cc782a7fabe156166bd6d6" dependencies = [ "cc", "codespan-reporting", - "indexmap 2.11.3", + "indexmap 2.11.4", "proc-macro2", "quote", "scratch", @@ -2355,13 +2355,13 @@ dependencies = [ [[package]] name = "cxxbridge-cmd" -version = "1.0.184" +version = "1.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052f6c468d9dabdc2b8b228bcb2d7843b2bea0f3fb9c4e2c6ba5852574ec0150" +checksum = "fd46bf2b541a4e0c2d5abba76607379ee05d68e714868e3cb406dc8d591ce2d2" dependencies = [ "clap", "codespan-reporting", - "indexmap 2.11.3", + "indexmap 2.11.4", "proc-macro2", "quote", "syn 2.0.106", @@ -2369,17 +2369,17 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.184" +version = "1.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fd145fa180986cb8002c63217d03b2c782fdcd5fa323adcd1f62d2d6ece6144" +checksum = "2c79b68f6a3a8f809d39b38ae8af61305a6113819b19b262643b9c21353b92d9" [[package]] name = "cxxbridge-macro" -version = "1.0.184" +version = "1.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02ac4a3bc4484a2daa0a8421c9588bd26522be9682a2fe02c7087bc4e8bc3c60" +checksum = "862b7fdb048ff9ef0779a0d0a03affd09746c4c875543746b640756be9cff2af" dependencies = [ - "indexmap 2.11.3", + "indexmap 2.11.4", "proc-macro2", "quote", "rustversion", @@ -2402,16 +2402,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "dalek-ff-group" -version = "0.5.99" -dependencies = [ - "crypto-bigint 0.5.5", - "crypto-bigint 0.6.1", - "dalek-ff-group 0.5.0", - "prime-field", -] - [[package]] name = "darling" version = "0.20.11" @@ -2484,7 +2474,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d162beedaa69905488a8da94f5ac3edb4dd4788b732fadb7bd120b2625c1976" dependencies = [ "data-encoding", - "syn 1.0.109", + "syn 2.0.106", ] [[package]] @@ -2618,9 +2608,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.11.0-rc.1" +version = "0.11.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a4aae35a0fcbe22ff1be50fe96df72002d5a4a6fb4aae9193cf2da0daa36da2" +checksum = "6749b668519cd7149ee3d11286a442a8a8bdc3a9d529605f579777bfccc5a4bc" dependencies = [ "block-buffer 0.11.0-rc.5", "crypto-common 0.2.0-rc.4", @@ -2709,7 +2699,7 @@ dependencies = [ "blake2 0.11.0-rc.2", "ciphersuite 0.4.2", "ciphersuite-kp256", - "dalek-ff-group 0.5.0", + "dalek-ff-group", "dkg", "dkg-recovery", "ec-divisors", @@ -2734,7 +2724,7 @@ name = "dkg-musig" version = "0.6.0" dependencies = [ "ciphersuite 0.4.2", - "dalek-ff-group 0.5.0", + "dalek-ff-group", "dkg", "dkg-recovery", "multiexp", @@ -2804,9 +2794,9 @@ checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" [[package]] name = "ec-divisors" version = "0.1.0" -source = "git+https://github.com/monero-oxide/monero-oxide?rev=7216a2e84c7671c167c3d81eafe0d2b1f418f102#7216a2e84c7671c167c3d81eafe0d2b1f418f102" +source = "git+https://github.com/monero-oxide/monero-oxide?rev=dc1b3dbe436aae61ec363505052d4715d38ce1df#dc1b3dbe436aae61ec363505052d4715d38ce1df" dependencies = [ - "dalek-ff-group 0.5.99", + "dalek-ff-group", "ff", "group", "rand_core 0.6.4", @@ -2995,7 +2985,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.61.0", ] [[package]] @@ -3173,7 +3163,7 @@ name = "flexible-transcript" version = "0.3.4" dependencies = [ "blake2 0.11.0-rc.2", - "digest 0.11.0-rc.1", + "digest 0.11.0-rc.2", "merlin", "sha2 0.11.0-rc.2", "zeroize", @@ -3549,7 +3539,7 @@ checksum = "42012b0f064e01aa58b545fe3727f90f7dd4020f4a3ea735b50344965f5a57e9" [[package]] name = "generalized-bulletproofs" version = "0.1.0" -source = "git+https://github.com/monero-oxide/monero-oxide?rev=7216a2e84c7671c167c3d81eafe0d2b1f418f102#7216a2e84c7671c167c3d81eafe0d2b1f418f102" +source = "git+https://github.com/monero-oxide/monero-oxide?rev=dc1b3dbe436aae61ec363505052d4715d38ce1df#dc1b3dbe436aae61ec363505052d4715d38ce1df" dependencies = [ "blake2 0.10.6", "ciphersuite 0.4.99", @@ -3564,7 +3554,7 @@ dependencies = [ [[package]] name = "generalized-bulletproofs-circuit-abstraction" version = "0.1.0" -source = "git+https://github.com/monero-oxide/monero-oxide?rev=7216a2e84c7671c167c3d81eafe0d2b1f418f102#7216a2e84c7671c167c3d81eafe0d2b1f418f102" +source = "git+https://github.com/monero-oxide/monero-oxide?rev=dc1b3dbe436aae61ec363505052d4715d38ce1df#dc1b3dbe436aae61ec363505052d4715d38ce1df" dependencies = [ "ciphersuite 0.4.99", "generalized-bulletproofs", @@ -3575,7 +3565,7 @@ dependencies = [ [[package]] name = "generalized-bulletproofs-ec-gadgets" version = "0.1.0" -source = "git+https://github.com/monero-oxide/monero-oxide?rev=7216a2e84c7671c167c3d81eafe0d2b1f418f102#7216a2e84c7671c167c3d81eafe0d2b1f418f102" +source = "git+https://github.com/monero-oxide/monero-oxide?rev=dc1b3dbe436aae61ec363505052d4715d38ce1df#dc1b3dbe436aae61ec363505052d4715d38ce1df" dependencies = [ "ciphersuite 0.4.99", "generalized-bulletproofs-circuit-abstraction", @@ -3677,7 +3667,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7" dependencies = [ "fallible-iterator", - "indexmap 2.11.3", + "indexmap 2.11.4", "stable_deref_trait", ] @@ -3743,7 +3733,7 @@ dependencies = [ "futures-core", "futures-sink", "http", - "indexmap 2.11.3", + "indexmap 2.11.4", "slab", "tokio", "tokio-util", @@ -4078,7 +4068,7 @@ dependencies = [ "hyper", "libc", "pin-project-lite", - "socket2 0.5.10", + "socket2 0.6.0", "tokio", "tower-service", "tracing", @@ -4276,9 +4266,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.11.3" +version = "2.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92119844f513ffa41556430369ab02c295a3578af21cf945caa3e9e0c2481ac3" +checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5" dependencies = [ "equivalent", "hashbrown 0.15.5", @@ -4388,9 +4378,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.77" +version = "0.3.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" +checksum = "852f13bec5eba4ba9afbeb93fd7c13fe56147f055939ae21c43a29a0ecb2702e" dependencies = [ "once_cell", "wasm-bindgen", @@ -5427,7 +5417,7 @@ version = "0.11.0" dependencies = [ "ciphersuite 0.4.2", "ciphersuite-kp256", - "dalek-ff-group 0.5.0", + "dalek-ff-group", "dkg", "dkg-dealer", "dkg-recovery", @@ -5469,7 +5459,7 @@ dependencies = [ [[package]] name = "monero-address" version = "0.1.0" -source = "git+https://github.com/monero-oxide/monero-oxide?rev=7f37cc8f770858aa1739e0f56dbe447db86f4ba6#7f37cc8f770858aa1739e0f56dbe447db86f4ba6" +source = "git+https://github.com/monero-oxide/monero-oxide?rev=2c847f71079a105456376f9957cee86c4b6a9eb8#2c847f71079a105456376f9957cee86c4b6a9eb8" dependencies = [ "curve25519-dalek", "monero-base58", @@ -5481,7 +5471,7 @@ dependencies = [ [[package]] name = "monero-base58" version = "0.1.0" -source = "git+https://github.com/monero-oxide/monero-oxide?rev=7f37cc8f770858aa1739e0f56dbe447db86f4ba6#7f37cc8f770858aa1739e0f56dbe447db86f4ba6" +source = "git+https://github.com/monero-oxide/monero-oxide?rev=2c847f71079a105456376f9957cee86c4b6a9eb8#2c847f71079a105456376f9957cee86c4b6a9eb8" dependencies = [ "monero-primitives", "std-shims", @@ -5490,7 +5480,7 @@ dependencies = [ [[package]] name = "monero-borromean" version = "0.1.0" -source = "git+https://github.com/monero-oxide/monero-oxide?rev=7f37cc8f770858aa1739e0f56dbe447db86f4ba6#7f37cc8f770858aa1739e0f56dbe447db86f4ba6" +source = "git+https://github.com/monero-oxide/monero-oxide?rev=2c847f71079a105456376f9957cee86c4b6a9eb8#2c847f71079a105456376f9957cee86c4b6a9eb8" dependencies = [ "curve25519-dalek", "monero-generators", @@ -5503,7 +5493,7 @@ dependencies = [ [[package]] name = "monero-bulletproofs" version = "0.1.0" -source = "git+https://github.com/monero-oxide/monero-oxide?rev=7f37cc8f770858aa1739e0f56dbe447db86f4ba6#7f37cc8f770858aa1739e0f56dbe447db86f4ba6" +source = "git+https://github.com/monero-oxide/monero-oxide?rev=2c847f71079a105456376f9957cee86c4b6a9eb8#2c847f71079a105456376f9957cee86c4b6a9eb8" dependencies = [ "curve25519-dalek", "monero-generators", @@ -5518,10 +5508,10 @@ dependencies = [ [[package]] name = "monero-clsag" version = "0.1.0" -source = "git+https://github.com/monero-oxide/monero-oxide?rev=7f37cc8f770858aa1739e0f56dbe447db86f4ba6#7f37cc8f770858aa1739e0f56dbe447db86f4ba6" +source = "git+https://github.com/monero-oxide/monero-oxide?rev=2c847f71079a105456376f9957cee86c4b6a9eb8#2c847f71079a105456376f9957cee86c4b6a9eb8" dependencies = [ "curve25519-dalek", - "dalek-ff-group 0.5.99", + "dalek-ff-group", "flexible-transcript", "group", "modular-frost", @@ -5539,11 +5529,11 @@ dependencies = [ [[package]] name = "monero-generators" version = "0.4.0" -source = "git+https://github.com/monero-oxide/monero-oxide?rev=7f37cc8f770858aa1739e0f56dbe447db86f4ba6#7f37cc8f770858aa1739e0f56dbe447db86f4ba6" +source = "git+https://github.com/monero-oxide/monero-oxide?rev=2c847f71079a105456376f9957cee86c4b6a9eb8#2c847f71079a105456376f9957cee86c4b6a9eb8" dependencies = [ "crypto-bigint 0.5.5", "curve25519-dalek", - "dalek-ff-group 0.5.99", + "dalek-ff-group", "group", "monero-io", "sha3 0.10.8", @@ -5554,7 +5544,7 @@ dependencies = [ [[package]] name = "monero-io" version = "0.1.0" -source = "git+https://github.com/monero-oxide/monero-oxide?rev=7f37cc8f770858aa1739e0f56dbe447db86f4ba6#7f37cc8f770858aa1739e0f56dbe447db86f4ba6" +source = "git+https://github.com/monero-oxide/monero-oxide?rev=2c847f71079a105456376f9957cee86c4b6a9eb8#2c847f71079a105456376f9957cee86c4b6a9eb8" dependencies = [ "curve25519-dalek", "std-shims", @@ -5564,7 +5554,7 @@ dependencies = [ [[package]] name = "monero-mlsag" version = "0.1.0" -source = "git+https://github.com/monero-oxide/monero-oxide?rev=7f37cc8f770858aa1739e0f56dbe447db86f4ba6#7f37cc8f770858aa1739e0f56dbe447db86f4ba6" +source = "git+https://github.com/monero-oxide/monero-oxide?rev=2c847f71079a105456376f9957cee86c4b6a9eb8#2c847f71079a105456376f9957cee86c4b6a9eb8" dependencies = [ "curve25519-dalek", "monero-generators", @@ -5578,7 +5568,7 @@ dependencies = [ [[package]] name = "monero-oxide" version = "0.1.4-alpha" -source = "git+https://github.com/monero-oxide/monero-oxide?rev=7f37cc8f770858aa1739e0f56dbe447db86f4ba6#7f37cc8f770858aa1739e0f56dbe447db86f4ba6" +source = "git+https://github.com/monero-oxide/monero-oxide?rev=2c847f71079a105456376f9957cee86c4b6a9eb8#2c847f71079a105456376f9957cee86c4b6a9eb8" dependencies = [ "curve25519-dalek", "hex-literal", @@ -5596,7 +5586,7 @@ dependencies = [ [[package]] name = "monero-primitives" version = "0.1.0" -source = "git+https://github.com/monero-oxide/monero-oxide?rev=7f37cc8f770858aa1739e0f56dbe447db86f4ba6#7f37cc8f770858aa1739e0f56dbe447db86f4ba6" +source = "git+https://github.com/monero-oxide/monero-oxide?rev=2c847f71079a105456376f9957cee86c4b6a9eb8#2c847f71079a105456376f9957cee86c4b6a9eb8" dependencies = [ "curve25519-dalek", "monero-generators", @@ -5609,7 +5599,7 @@ dependencies = [ [[package]] name = "monero-rpc" version = "0.1.0" -source = "git+https://github.com/monero-oxide/monero-oxide?rev=7f37cc8f770858aa1739e0f56dbe447db86f4ba6#7f37cc8f770858aa1739e0f56dbe447db86f4ba6" +source = "git+https://github.com/monero-oxide/monero-oxide?rev=2c847f71079a105456376f9957cee86c4b6a9eb8#2c847f71079a105456376f9957cee86c4b6a9eb8" dependencies = [ "curve25519-dalek", "hex", @@ -5625,7 +5615,7 @@ dependencies = [ [[package]] name = "monero-simple-request-rpc" version = "0.1.0" -source = "git+https://github.com/monero-oxide/monero-oxide?rev=7f37cc8f770858aa1739e0f56dbe447db86f4ba6#7f37cc8f770858aa1739e0f56dbe447db86f4ba6" +source = "git+https://github.com/monero-oxide/monero-oxide?rev=2c847f71079a105456376f9957cee86c4b6a9eb8#2c847f71079a105456376f9957cee86c4b6a9eb8" dependencies = [ "digest_auth", "hex", @@ -5638,10 +5628,9 @@ dependencies = [ [[package]] name = "monero-wallet" version = "0.1.0" -source = "git+https://github.com/monero-oxide/monero-oxide?rev=7f37cc8f770858aa1739e0f56dbe447db86f4ba6#7f37cc8f770858aa1739e0f56dbe447db86f4ba6" +source = "git+https://github.com/monero-oxide/monero-oxide?rev=2c847f71079a105456376f9957cee86c4b6a9eb8#2c847f71079a105456376f9957cee86c4b6a9eb8" dependencies = [ "curve25519-dalek", - "dalek-ff-group 0.5.99", "flexible-transcript", "hex", "modular-frost", @@ -5710,7 +5699,7 @@ dependencies = [ name = "multiexp" version = "0.4.2" dependencies = [ - "dalek-ff-group 0.5.0", + "dalek-ff-group", "ff", "group", "k256", @@ -6035,9 +6024,9 @@ dependencies = [ [[package]] name = "nybbles" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0418987d1aaed324d95b4beffc93635e19be965ed5d63ec07a35980fe3b71a4" +checksum = "bfa11e84403164a9f12982ab728f3c67c6fd4ab5b5f0254ffc217bdbd3b28ab0" dependencies = [ "alloy-rlp", "cfg-if", @@ -6064,7 +6053,7 @@ checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe" dependencies = [ "crc32fast", "hashbrown 0.15.5", - "indexmap 2.11.3", + "indexmap 2.11.4", "memchr", ] @@ -6353,7 +6342,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772" dependencies = [ "fixedbitset", - "indexmap 2.11.3", + "indexmap 2.11.4", ] [[package]] @@ -6756,8 +6745,8 @@ version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac6c3320f9abac597dcbc668774ef006702672474aad53c6d596b62e487b40b1" dependencies = [ - "heck 0.4.1", - "itertools 0.13.0", + "heck 0.5.0", + "itertools 0.14.0", "log", "multimap", "once_cell", @@ -6777,7 +6766,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9120690fafc389a67ba3803df527d0ec9cbbc9cc45e4cc20b332996dfb672425" dependencies = [ "anyhow", - "itertools 0.13.0", + "itertools 0.14.0", "proc-macro2", "quote", "syn 2.0.106", @@ -6872,7 +6861,7 @@ dependencies = [ "quinn-udp", "rustc-hash", "rustls", - "socket2 0.5.10", + "socket2 0.6.0", "thiserror 2.0.16", "tokio", "tracing", @@ -6909,9 +6898,9 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.5.10", + "socket2 0.6.0", "tracing", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] @@ -7549,7 +7538,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.59.0", + "windows-sys 0.61.0", ] [[package]] @@ -8521,7 +8510,7 @@ dependencies = [ "async-trait", "futures", "futures-timer", - "indexmap 2.11.3", + "indexmap 2.11.4", "itertools 0.14.0", "linked-hash-map", "parity-scale-codec", @@ -8550,7 +8539,7 @@ source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c1 dependencies = [ "async-trait", "futures", - "indexmap 2.11.3", + "indexmap 2.11.4", "log", "parity-scale-codec", "serde", @@ -8624,8 +8613,8 @@ name = "schnorr-signatures" version = "0.5.2" dependencies = [ "ciphersuite 0.4.2", - "dalek-ff-group 0.5.0", - "digest 0.11.0-rc.1", + "dalek-ff-group", + "digest 0.11.0-rc.2", "flexible-transcript", "hex", "multiexp", @@ -8870,7 +8859,7 @@ dependencies = [ "borsh", "ciphersuite 0.4.2", "ciphersuite-kp256", - "dalek-ff-group 0.5.0", + "dalek-ff-group", "dkg-musig", "dockertest", "frame-system", @@ -8915,7 +8904,7 @@ dependencies = [ "blake2 0.11.0-rc.2", "borsh", "ciphersuite 0.4.2", - "dalek-ff-group 0.5.0", + "dalek-ff-group", "dkg-musig", "env_logger", "frost-schnorrkel", @@ -9002,7 +8991,7 @@ dependencies = [ "blake2 0.11.0-rc.2", "borsh", "ciphersuite 0.4.2", - "dalek-ff-group 0.5.0", + "dalek-ff-group", "dkg", "log", "rand_core 0.6.4", @@ -9024,7 +9013,6 @@ dependencies = [ "blake2 0.11.0-rc.2", "borsh", "log", - "schnorrkel", "serai-client", "serai-cosign-types", "serai-db", @@ -9226,7 +9214,7 @@ version = "0.1.0" dependencies = [ "borsh", "ciphersuite 0.4.2", - "dalek-ff-group 0.5.0", + "dalek-ff-group", "env_logger", "flexible-transcript", "hex", @@ -9247,7 +9235,7 @@ name = "serai-message-queue-tests" version = "0.1.0" dependencies = [ "ciphersuite 0.4.2", - "dalek-ff-group 0.5.0", + "dalek-ff-group", "dockertest", "hex", "rand_core 0.6.4", @@ -9264,7 +9252,7 @@ version = "0.1.0" dependencies = [ "borsh", "ciphersuite 0.4.2", - "dalek-ff-group 0.5.0", + "dalek-ff-group", "dkg-evrf", "log", "modular-frost", @@ -9293,7 +9281,7 @@ version = "0.1.0" dependencies = [ "bitcoin-serai", "ciphersuite 0.4.2", - "dalek-ff-group 0.5.0", + "dalek-ff-group", "dkg", "dkg-dealer", "dkg-evrf", @@ -9321,7 +9309,7 @@ dependencies = [ "ciphersuite-kp256", "clap", "curve25519-dalek", - "dalek-ff-group 0.5.0", + "dalek-ff-group", "embedwards25519", "frame-benchmarking", "futures-util", @@ -9368,7 +9356,7 @@ name = "serai-orchestrator" version = "0.0.1" dependencies = [ "ciphersuite 0.4.2", - "dalek-ff-group 0.5.0", + "dalek-ff-group", "embedwards25519", "flexible-transcript", "hex", @@ -9388,7 +9376,7 @@ dependencies = [ "bitvec", "borsh", "ciphersuite 0.4.2", - "dalek-ff-group 0.5.0", + "dalek-ff-group", "dkg-musig", "embedwards25519", "parity-scale-codec", @@ -9785,7 +9773,7 @@ version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ - "indexmap 2.11.3", + "indexmap 2.11.4", "itoa", "memchr", "ryu", @@ -9835,7 +9823,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.11.3", + "indexmap 2.11.4", "serde", "serde_derive", "serde_json", @@ -9918,7 +9906,7 @@ checksum = "d1e3878ab0f98e35b2df35fe53201d088299b41a6bb63e3e34dada2ac4abd924" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.11.0-rc.1", + "digest 0.11.0-rc.2", ] [[package]] @@ -9937,7 +9925,7 @@ version = "0.11.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2103ca0e6f4e9505eae906de5e5883e06fc3b2232fb5d6914890c7bbcb62f478" dependencies = [ - "digest 0.11.0-rc.1", + "digest 0.11.0-rc.2", "keccak 0.2.0-rc.0", ] @@ -10949,7 +10937,7 @@ dependencies = [ "getrandom 0.3.3", "once_cell", "rustix", - "windows-sys 0.59.0", + "windows-sys 0.61.0", ] [[package]] @@ -11147,9 +11135,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b" +checksum = "05f63835928ca123f1bef57abbcd23bb2ba0ac9ae1235f1e65bda0d06e7786bd" dependencies = [ "rustls", "tokio", @@ -11217,7 +11205,7 @@ version = "0.22.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" dependencies = [ - "indexmap 2.11.3", + "indexmap 2.11.4", "serde", "serde_spanned", "toml_datetime", @@ -11378,7 +11366,7 @@ dependencies = [ "blake2 0.11.0-rc.2", "borsh", "ciphersuite 0.4.2", - "dalek-ff-group 0.5.0", + "dalek-ff-group", "flexible-transcript", "futures-channel", "futures-util", @@ -11662,21 +11650,22 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.100" +version = "0.2.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +checksum = "ab10a69fbd0a177f5f649ad4d8d3305499c42bab9aef2f7ff592d0ec8f833819" dependencies = [ "cfg-if", "once_cell", "rustversion", "wasm-bindgen-macro", + "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.100" +version = "0.2.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" +checksum = "0bb702423545a6007bbc368fde243ba47ca275e549c8a28617f56f6ba53b1d1c" dependencies = [ "bumpalo", "log", @@ -11688,9 +11677,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.100" +version = "0.2.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +checksum = "fc65f4f411d91494355917b605e1480033152658d71f722a90647f56a70c88a0" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -11698,9 +11687,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.100" +version = "0.2.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +checksum = "ffc003a991398a8ee604a401e194b6b3a39677b3173d6e74495eb51b82e99a32" dependencies = [ "proc-macro2", "quote", @@ -11711,9 +11700,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.100" +version = "0.2.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +checksum = "293c37f4efa430ca14db3721dfbe48d8c33308096bd44d80ebaa775ab71ba1cf" dependencies = [ "unicode-ident", ] @@ -11785,7 +11774,7 @@ checksum = "a9b1e81f3eb254cf7404a82cee6926a4a3ccc5aad80cc3d43608a070c67aa1d7" dependencies = [ "bitflags 2.9.4", "hashbrown 0.15.5", - "indexmap 2.11.3", + "indexmap 2.11.4", "semver 1.0.27", "serde", ] @@ -11814,7 +11803,7 @@ dependencies = [ "cc", "cfg-if", "hashbrown 0.15.5", - "indexmap 2.11.3", + "indexmap 2.11.4", "libc", "log", "mach2", @@ -11854,7 +11843,7 @@ dependencies = [ "cranelift-bitset", "cranelift-entity", "gimli 0.32.3", - "indexmap 2.11.3", + "indexmap 2.11.4", "log", "object 0.37.3", "postcard", @@ -12016,9 +12005,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.77" +version = "0.3.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" +checksum = "fbe734895e869dc429d78c4b433f8d17d95f8d05317440b4fad5ab2d33e596dc" dependencies = [ "js-sys", "wasm-bindgen", @@ -12090,7 +12079,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.61.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index a7560365..9b3565b1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,8 +9,6 @@ members = [ # This re-exports the in-tree `ciphersuite` _without_ changes breaking to monero-oxide # Not included in workspace to prevent having two crates with the same name (an error) # "patches/ciphersuite", - # Same for `dalek-ff-group` - # "patches/dalek-ff-group", "common/std-shims", "common/zalloc", @@ -176,7 +174,7 @@ simple-request = { path = "common/request" } multiexp = { path = "crypto/multiexp" } flexible-transcript = { path = "crypto/transcript" } ciphersuite = { path = "patches/ciphersuite" } -dalek-ff-group = { path = "patches/dalek-ff-group" } +dalek-ff-group = { path = "crypto/dalek-ff-group" } minimal-ed448 = { path = "crypto/ed448" } modular-frost = { path = "crypto/frost" } diff --git a/coordinator/cosign/Cargo.toml b/coordinator/cosign/Cargo.toml index ab5041ba..72449b4b 100644 --- a/coordinator/cosign/Cargo.toml +++ b/coordinator/cosign/Cargo.toml @@ -19,7 +19,6 @@ workspace = true [dependencies] blake2 = { version = "0.11.0-rc.0", default-features = false, features = ["alloc"] } -schnorrkel = { version = "0.11", default-features = false, features = ["std"] } borsh = { version = "1", default-features = false, features = ["std", "derive", "de_strict_order"] } serai-client = { path = "../../substrate/client", default-features = false, features = ["serai"] } diff --git a/coordinator/cosign/src/lib.rs b/coordinator/cosign/src/lib.rs index 16e2091e..524f486a 100644 --- a/coordinator/cosign/src/lib.rs +++ b/coordinator/cosign/src/lib.rs @@ -29,9 +29,6 @@ mod delay; pub use delay::BROADCAST_FREQUENCY; use delay::LatestCosignedBlockNumber; -/// The schnorrkel context to used when signing a cosign. -pub const COSIGN_CONTEXT: &[u8] = b"/serai/coordinator/cosign"; - /// A 'global session', defined as all validator sets used for cosigning at a given moment. /// /// We evaluate cosign faults within a global session. This ensures even if cosigners cosign diff --git a/crypto/dkg/evrf/Cargo.toml b/crypto/dkg/evrf/Cargo.toml index 1bf7d831..e7c768c0 100644 --- a/crypto/dkg/evrf/Cargo.toml +++ b/crypto/dkg/evrf/Cargo.toml @@ -34,10 +34,10 @@ generic-array = { version = "1", default-features = false, features = ["alloc"] blake2 = { version = "0.11.0-rc.2", default-features = false } rand_chacha = { version = "0.3", default-features = false } -generalized-bulletproofs = { git = "https://github.com/monero-oxide/monero-oxide", rev = "7216a2e84c7671c167c3d81eafe0d2b1f418f102", default-features = false } -ec-divisors = { git = "https://github.com/monero-oxide/monero-oxide", rev = "7216a2e84c7671c167c3d81eafe0d2b1f418f102", default-features = false } -generalized-bulletproofs-circuit-abstraction = { git = "https://github.com/monero-oxide/monero-oxide", rev = "7216a2e84c7671c167c3d81eafe0d2b1f418f102", default-features = false } -generalized-bulletproofs-ec-gadgets = { git = "https://github.com/monero-oxide/monero-oxide", rev = "7216a2e84c7671c167c3d81eafe0d2b1f418f102", default-features = false } +generalized-bulletproofs = { git = "https://github.com/monero-oxide/monero-oxide", rev = "dc1b3dbe436aae61ec363505052d4715d38ce1df", default-features = false } +ec-divisors = { git = "https://github.com/monero-oxide/monero-oxide", rev = "dc1b3dbe436aae61ec363505052d4715d38ce1df", default-features = false } +generalized-bulletproofs-circuit-abstraction = { git = "https://github.com/monero-oxide/monero-oxide", rev = "dc1b3dbe436aae61ec363505052d4715d38ce1df", default-features = false } +generalized-bulletproofs-ec-gadgets = { git = "https://github.com/monero-oxide/monero-oxide", rev = "dc1b3dbe436aae61ec363505052d4715d38ce1df", default-features = false } dkg = { path = "..", default-features = false } @@ -52,7 +52,7 @@ rand = { version = "0.8", default-features = false, features = ["std"] } ciphersuite = { path = "../../ciphersuite", default-features = false, features = ["std"] } embedwards25519 = { path = "../../embedwards25519", default-features = false, features = ["std"] } dalek-ff-group = { path = "../../dalek-ff-group", default-features = false, features = ["std"] } -generalized-bulletproofs = { git = "https://github.com/monero-oxide/monero-oxide", rev = "7216a2e84c7671c167c3d81eafe0d2b1f418f102", features = ["tests"] } +generalized-bulletproofs = { git = "https://github.com/monero-oxide/monero-oxide", rev = "dc1b3dbe436aae61ec363505052d4715d38ce1df", features = ["tests"] } dkg-recovery = { path = "../recovery" } [features] diff --git a/crypto/embedwards25519/Cargo.toml b/crypto/embedwards25519/Cargo.toml index 70696472..c3af1a71 100644 --- a/crypto/embedwards25519/Cargo.toml +++ b/crypto/embedwards25519/Cargo.toml @@ -29,7 +29,7 @@ curve25519-dalek = { version = "4", default-features = false, features = ["legac blake2 = { version = "0.11.0-rc.2", default-features = false } ciphersuite = { path = "../ciphersuite", version = "0.4", default-features = false } -generalized-bulletproofs-ec-gadgets = { git = "https://github.com/monero-oxide/monero-oxide", rev = "7216a2e84c7671c167c3d81eafe0d2b1f418f102", default-features = false, optional = true } +generalized-bulletproofs-ec-gadgets = { git = "https://github.com/monero-oxide/monero-oxide", rev = "dc1b3dbe436aae61ec363505052d4715d38ce1df", default-features = false, optional = true } [dev-dependencies] hex = "0.4" diff --git a/crypto/secq256k1/Cargo.toml b/crypto/secq256k1/Cargo.toml index 6d752545..e73d37e8 100644 --- a/crypto/secq256k1/Cargo.toml +++ b/crypto/secq256k1/Cargo.toml @@ -24,7 +24,7 @@ prime-field = { path = "../prime-field", default-features = false } short-weierstrass = { path = "../short-weierstrass", default-features = false } ciphersuite = { path = "../ciphersuite", version = "0.4", default-features = false } -generalized-bulletproofs-ec-gadgets = { git = "https://github.com/monero-oxide/monero-oxide", rev = "7216a2e84c7671c167c3d81eafe0d2b1f418f102", default-features = false, optional = true } +generalized-bulletproofs-ec-gadgets = { git = "https://github.com/monero-oxide/monero-oxide", rev = "dc1b3dbe436aae61ec363505052d4715d38ce1df", default-features = false, optional = true } [dev-dependencies] hex = "0.4" diff --git a/crypto/short-weierstrass/Cargo.toml b/crypto/short-weierstrass/Cargo.toml index 3ad36bf6..b58fbf6e 100644 --- a/crypto/short-weierstrass/Cargo.toml +++ b/crypto/short-weierstrass/Cargo.toml @@ -21,7 +21,7 @@ rand_core = { version = "0.6", default-features = false } ff = { version = "0.13", default-features = false, features = ["bits"] } group = { version = "0.13", default-features = false } -ec-divisors = { git = "https://github.com/monero-oxide/monero-oxide", rev = "7216a2e84c7671c167c3d81eafe0d2b1f418f102", default-features = false, optional = true } +ec-divisors = { git = "https://github.com/monero-oxide/monero-oxide", rev = "dc1b3dbe436aae61ec363505052d4715d38ce1df", default-features = false, optional = true } [features] alloc = ["zeroize/alloc", "rand_core/alloc", "ff/alloc", "group/alloc", "ec-divisors"] diff --git a/deny.toml b/deny.toml index bc0e5cb0..20e40002 100644 --- a/deny.toml +++ b/deny.toml @@ -34,78 +34,78 @@ allow = [ # "MPL-2.0", # Commented as it's not currently in-use within the Serai tree "Apache-2.0", "Apache-2.0 WITH LLVM-exception", - "GPL-3.0 WITH Classpath-exception-2.0", + "GPL-3.0-or-later WITH Classpath-exception-2.0", ] exceptions = [ - { allow = ["AGPL-3.0"], name = "serai-env" }, - { allow = ["AGPL-3.0"], name = "serai-task" }, + { allow = ["AGPL-3.0-only"], name = "serai-env" }, + { allow = ["AGPL-3.0-only"], name = "serai-task" }, - { allow = ["AGPL-3.0"], name = "ethereum-schnorr-contract" }, - { allow = ["AGPL-3.0"], name = "serai-ethereum-relayer" }, + { allow = ["AGPL-3.0-only"], name = "ethereum-schnorr-contract" }, + { allow = ["AGPL-3.0-only"], name = "serai-ethereum-relayer" }, - { allow = ["AGPL-3.0"], name = "serai-message-queue" }, + { allow = ["AGPL-3.0-only"], name = "serai-message-queue" }, - { allow = ["AGPL-3.0"], name = "serai-processor-messages" }, - { allow = ["AGPL-3.0"], name = "serai-processor-primitives" }, + { allow = ["AGPL-3.0-only"], name = "serai-processor-messages" }, + { allow = ["AGPL-3.0-only"], name = "serai-processor-primitives" }, - { allow = ["AGPL-3.0"], name = "serai-processor-key-gen" }, - { allow = ["AGPL-3.0"], name = "serai-processor-frost-attempt-manager" }, + { allow = ["AGPL-3.0-only"], name = "serai-processor-key-gen" }, + { allow = ["AGPL-3.0-only"], name = "serai-processor-frost-attempt-manager" }, - { allow = ["AGPL-3.0"], name = "serai-processor-scanner" }, - { allow = ["AGPL-3.0"], name = "serai-processor-scheduler-primitives" }, - { allow = ["AGPL-3.0"], name = "serai-processor-utxo-scheduler-primitives" }, - { allow = ["AGPL-3.0"], name = "serai-processor-utxo-scheduler" }, - { allow = ["AGPL-3.0"], name = "serai-processor-transaction-chaining-scheduler" }, - { allow = ["AGPL-3.0"], name = "serai-processor-smart-contract-scheduler" }, - { allow = ["AGPL-3.0"], name = "serai-processor-signers" }, + { allow = ["AGPL-3.0-only"], name = "serai-processor-scanner" }, + { allow = ["AGPL-3.0-only"], name = "serai-processor-scheduler-primitives" }, + { allow = ["AGPL-3.0-only"], name = "serai-processor-utxo-scheduler-primitives" }, + { allow = ["AGPL-3.0-only"], name = "serai-processor-utxo-scheduler" }, + { allow = ["AGPL-3.0-only"], name = "serai-processor-transaction-chaining-scheduler" }, + { allow = ["AGPL-3.0-only"], name = "serai-processor-smart-contract-scheduler" }, + { allow = ["AGPL-3.0-only"], name = "serai-processor-signers" }, - { allow = ["AGPL-3.0"], name = "serai-bitcoin-processor" }, - { allow = ["AGPL-3.0"], name = "serai-processor-bin" }, - { allow = ["AGPL-3.0"], name = "serai-processor-ethereum-primitives" }, - { allow = ["AGPL-3.0"], name = "serai-ethereum-test-primitives" }, - { allow = ["AGPL-3.0"], name = "serai-processor-ethereum-deployer" }, - { allow = ["AGPL-3.0"], name = "serai-processor-ethereum-router" }, - { allow = ["AGPL-3.0"], name = "serai-processor-ethereum-erc20" }, - { allow = ["AGPL-3.0"], name = "serai-ethereum-processor" }, - { allow = ["AGPL-3.0"], name = "serai-monero-processor" }, + { allow = ["AGPL-3.0-only"], name = "serai-bitcoin-processor" }, + { allow = ["AGPL-3.0-only"], name = "serai-processor-bin" }, + { allow = ["AGPL-3.0-only"], name = "serai-processor-ethereum-primitives" }, + { allow = ["AGPL-3.0-only"], name = "serai-ethereum-test-primitives" }, + { allow = ["AGPL-3.0-only"], name = "serai-processor-ethereum-deployer" }, + { allow = ["AGPL-3.0-only"], name = "serai-processor-ethereum-router" }, + { allow = ["AGPL-3.0-only"], name = "serai-processor-ethereum-erc20" }, + { allow = ["AGPL-3.0-only"], name = "serai-ethereum-processor" }, + { allow = ["AGPL-3.0-only"], name = "serai-monero-processor" }, - { allow = ["AGPL-3.0"], name = "tributary-sdk" }, - { allow = ["AGPL-3.0"], name = "serai-cosign-types" }, - { allow = ["AGPL-3.0"], name = "serai-cosign" }, - { allow = ["AGPL-3.0"], name = "serai-coordinator-substrate" }, - { allow = ["AGPL-3.0"], name = "serai-coordinator-tributary" }, - { allow = ["AGPL-3.0"], name = "serai-coordinator-p2p" }, - { allow = ["AGPL-3.0"], name = "serai-coordinator-libp2p-p2p" }, - { allow = ["AGPL-3.0"], name = "serai-coordinator" }, + { allow = ["AGPL-3.0-only"], name = "tributary-sdk" }, + { allow = ["AGPL-3.0-only"], name = "serai-cosign-types" }, + { allow = ["AGPL-3.0-only"], name = "serai-cosign" }, + { allow = ["AGPL-3.0-only"], name = "serai-coordinator-substrate" }, + { allow = ["AGPL-3.0-only"], name = "serai-coordinator-tributary" }, + { allow = ["AGPL-3.0-only"], name = "serai-coordinator-p2p" }, + { allow = ["AGPL-3.0-only"], name = "serai-coordinator-libp2p-p2p" }, + { allow = ["AGPL-3.0-only"], name = "serai-coordinator" }, - { allow = ["AGPL-3.0"], name = "serai-coins-pallet" }, - { allow = ["AGPL-3.0"], name = "serai-dex-pallet" }, + { allow = ["AGPL-3.0-only"], name = "serai-coins-pallet" }, + { allow = ["AGPL-3.0-only"], name = "serai-dex-pallet" }, - { allow = ["AGPL-3.0"], name = "serai-genesis-liquidity-pallet" }, - { allow = ["AGPL-3.0"], name = "serai-emissions-pallet" }, + { allow = ["AGPL-3.0-only"], name = "serai-genesis-liquidity-pallet" }, + { allow = ["AGPL-3.0-only"], name = "serai-emissions-pallet" }, - { allow = ["AGPL-3.0"], name = "serai-economic-security-pallet" }, + { allow = ["AGPL-3.0-only"], name = "serai-economic-security-pallet" }, - { allow = ["AGPL-3.0"], name = "serai-in-instructions-pallet" }, + { allow = ["AGPL-3.0-only"], name = "serai-in-instructions-pallet" }, - { allow = ["AGPL-3.0"], name = "serai-validator-sets-pallet" }, + { allow = ["AGPL-3.0-only"], name = "serai-validator-sets-pallet" }, - { allow = ["AGPL-3.0"], name = "serai-signals-pallet" }, + { allow = ["AGPL-3.0-only"], name = "serai-signals-pallet" }, - { allow = ["AGPL-3.0"], name = "serai-runtime" }, - { allow = ["AGPL-3.0"], name = "serai-node" }, + { allow = ["AGPL-3.0-only"], name = "serai-runtime" }, + { allow = ["AGPL-3.0-only"], name = "serai-node" }, - { allow = ["AGPL-3.0"], name = "serai-orchestrator" }, + { allow = ["AGPL-3.0-only"], name = "serai-orchestrator" }, - { allow = ["AGPL-3.0"], name = "mini-serai" }, + { allow = ["AGPL-3.0-only"], name = "mini-serai" }, - { allow = ["AGPL-3.0"], name = "serai-docker-tests" }, - { allow = ["AGPL-3.0"], name = "serai-message-queue-tests" }, - { allow = ["AGPL-3.0"], name = "serai-processor-tests" }, - { allow = ["AGPL-3.0"], name = "serai-coordinator-tests" }, - { allow = ["AGPL-3.0"], name = "serai-full-stack-tests" }, - { allow = ["AGPL-3.0"], name = "serai-reproducible-runtime-tests" }, + { allow = ["AGPL-3.0-only"], name = "serai-docker-tests" }, + { allow = ["AGPL-3.0-only"], name = "serai-message-queue-tests" }, + { allow = ["AGPL-3.0-only"], name = "serai-processor-tests" }, + { allow = ["AGPL-3.0-only"], name = "serai-coordinator-tests" }, + { allow = ["AGPL-3.0-only"], name = "serai-full-stack-tests" }, + { allow = ["AGPL-3.0-only"], name = "serai-reproducible-runtime-tests" }, ] [[licenses.clarify]] diff --git a/orchestration/dev/networks/monero/hashes-v0.18.3.4.txt b/orchestration/dev/networks/monero/hashes-v0.18.3.4.txt deleted file mode 100644 index d3dca617..00000000 --- a/orchestration/dev/networks/monero/hashes-v0.18.3.4.txt +++ /dev/null @@ -1,50 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -# This GPG-signed message exists to confirm the SHA256 sums of Monero binaries. -# -# Please verify the signature against the key for binaryFate in the -# source code repository (/utils/gpg_keys). -# -# -## CLI -15e4d7dfc2f9261a0a452b0f8fd157c33cdbc8a896e23d883ddd13e2480a3800 monero-android-armv7-v0.18.3.4.tar.bz2 -d9c9249d1408822ce36b346c6b9fb6b896cda16714d62117fb1c588a5201763c monero-android-armv8-v0.18.3.4.tar.bz2 -360a551388922c8991a9ba4abaa88676b0fc7ec1fa4d0f4b5c0500847e0b946c monero-freebsd-x64-v0.18.3.4.tar.bz2 -354603c56446fb0551cdd6933bce5a13590b7881e05979b7ec25d89e7e59a0e2 monero-linux-armv7-v0.18.3.4.tar.bz2 -33ca2f0055529d225b61314c56370e35606b40edad61c91c859f873ed67a1ea7 monero-linux-armv8-v0.18.3.4.tar.bz2 -88739a1521b9fda3154540268e416c7af016ed7857041c76ab8ed7d7674c71ca monero-linux-riscv64-v0.18.3.4.tar.bz2 -51ba03928d189c1c11b5379cab17dd9ae8d2230056dc05c872d0f8dba4a87f1d monero-linux-x64-v0.18.3.4.tar.bz2 -d7ca0878abff2919a0104d7ed29d9c35df9ca0ea1b6fb4ebf6c8f7607ffb9e41 monero-linux-x86-v0.18.3.4.tar.bz2 -44520cb3a05c2518ca9aeae1b2e3080fe2bba1e3596d014ceff1090dfcba8ab4 monero-mac-armv8-v0.18.3.4.tar.bz2 -32c449f562216d3d83154e708471236d07db7477d6b67f1936a0a85a5005f2b8 monero-mac-x64-v0.18.3.4.tar.bz2 -54a66db6c892b2a0999754841f4ca68511741b88ea3ab20c7cd504a027f465f5 monero-win-x64-v0.18.3.4.zip -1a9824742aa1587023c3bddea788c115940cfd49371c78a8dd62c40113132d01 monero-win-x86-v0.18.3.4.zip -7d4845ec0a3b52404d41785da348ec33509f0a5981e8a27c5fa55b18d696e139 monero-source-v0.18.3.4.tar.bz2 -# -## GUI -63349d5a7637cd0c5d1693a1a2e910a92cbb123903d57667077a36454845d7bf monero-gui-install-win-x64-v0.18.3.4.exe -2866f3a2be30e4c4113e6274cad1d6698f81c37ceebc6e8f084c57230a0f70a6 monero-gui-linux-x64-v0.18.3.4.tar.bz2 -eedbf827513607a3ef579077dacd573e65892b199102effef97dff9d73138ca6 monero-gui-mac-armv8-v0.18.3.4.dmg -54eb151d7511a9f26130864e2c02f258344803b2b68311c8be29850d7faef359 monero-gui-mac-x64-v0.18.3.4.dmg -b5d42dddd722e728e480337f89038c8ea606c6507bf0c88ddf2af25050c9b751 monero-gui-win-x64-v0.18.3.4.zip -2f1d643bb2cc08e5eb334a6bfd649b0aa95ceb6178ff2f90448d5ef8d2a752a6 monero-gui-source-v0.18.3.4.tar.bz2 -# -# -# ~binaryFate ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEgaxZH+nEtlxYBq/D8K9NRioL35IFAmbF8bAACgkQ8K9NRioL -35KQAQ/7BP9j0Tx+zlFs3zbVIFXzfoPbGo2/uerM4xUWX/NUoI7XDTGWV2lpcR1x -o6eqstbuHciY0Aj2MsICsdqD+1PYW0EBZlfNLMrk161c3nQMJcjCE65uIhbLkOSs -6SUakmpxkueQOE/Ug5Afaa/JBATVTxLTmqSCI7Ai9NplF+6KNauXQXNrlwO/gHcd -whYDmsqp2JyOtMpMlpOckzLgg7Oroj7B0LBf78Z13p1naUyPooBaIEXSdKm5g2HI -vPd+z1bOVIluqPBnYWUwL7EmXy08/broejHGliQ+2iY9IsmDDx6rnSe/oprNEDic -l+/w3KvPcTkBh8hJLVDyYieYdVYHqOktIPlR1dKV512CnuP1ljr/CXjJmkAkXHlg -bObMUCIM9UYqp1I+KDaArjYNbzkHK02Lu6sak49GXgEuq66m9t4isF2GdcHrbERs -cLGsnhkTO2LtnGcziOC2l9XSzL41swxe0GrkK0rdeiyDCGAlb7hllevFy7zlT90l -Jw670TyFVBs8fUFHk/tOtT0ivSDJJg8m9waBzi/46ksOvuid6p3P3a0agqu3uclj -rscSpk0JS3E/3+A/N0IaiTmUO5zSjbsCrSnxQjcfrRRtERL+6JVHFVlW+nJzYWWH -u0O7bNZSqEruR4aTEtsddLgs57I10thDR5SUONuAqbEq8EYN8OE= -=aLFR ------END PGP SIGNATURE----- diff --git a/orchestration/dev/networks/monero/hashes-v0.18.4.2.txt b/orchestration/dev/networks/monero/hashes-v0.18.4.2.txt new file mode 100644 index 00000000..3188ceca --- /dev/null +++ b/orchestration/dev/networks/monero/hashes-v0.18.4.2.txt @@ -0,0 +1,50 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +# This GPG-signed message exists to confirm the SHA256 sums of Monero binaries. +# +# Please verify the signature against the key for binaryFate in the +# source code repository (/utils/gpg_keys). +# +# +## CLI +6122f0bcaca12d5badd92002338847d16032f6d52d86155c203bcb67d4fe1518 monero-android-armv7-v0.18.4.2.tar.bz2 +3b248c3201f028205915403b4b2f173df0dd8bf47eeb268fd67a4661251469d3 monero-android-armv8-v0.18.4.2.tar.bz2 +b4e2b7de80107a1b4613b878d8e2114244b3fb16397821d69baa72d9b0f8c8d5 monero-freebsd-x64-v0.18.4.2.tar.bz2 +ecb2577499a3b0901d731e11d462d3fadcd70095f3ab0def0c27ee64dc56b061 monero-linux-armv7-v0.18.4.2.tar.bz2 +a39530054dac348b219f1048a24ca629da26990f72cf9c1f6b6853e3d8c39a79 monero-linux-armv8-v0.18.4.2.tar.bz2 +18492ace80bf8ef2f44aa9a99b4f20adf00fd59c675a6a496211a720088d5d1a monero-linux-riscv64-v0.18.4.2.tar.bz2 +41d023f2357244ea43ee0a74796f5705ce75ce7373a5865d4959fefa13ecab06 monero-linux-x64-v0.18.4.2.tar.bz2 +03e77a4836861a47430664fa703dd149a355b3b214bc400b04ed38eb064a3ef0 monero-linux-x86-v0.18.4.2.tar.bz2 +9b98da6911b4769abef229c20e21f29d919b11db156965d6f139d2e1ad6625c2 monero-mac-armv8-v0.18.4.2.tar.bz2 +b1b1b580320118d3b6eaa5575fdbd73cf4db90fcc025b7abf875c5e5b4e335c1 monero-mac-x64-v0.18.4.2.tar.bz2 +14dd5aa11308f106183dd7834aa200e74ce6f3497103973696b556e893a4fef2 monero-win-x64-v0.18.4.2.zip +934d9dbeb06ff5610d2c96ebe34fa480e74f78eaeb3fa3e47d89b7961c9bc5e0 monero-win-x86-v0.18.4.2.zip +e9ec2062b3547db58f00102e6905621116ab7f56a331e0bc9b9e892607b87d24 monero-source-v0.18.4.2.tar.bz2 +# +## GUI +9d6e87add7e3ac006ee34c13c4f629252595395f54421db768f72dc233e94ea8 monero-gui-install-win-x64-v0.18.4.2.exe +e4fcdea3f0ff27c3616a8a75545f42a4e4866ea374fa2eeaa9c87027573358ea monero-gui-linux-x64-v0.18.4.2.tar.bz2 +3dfee5c5d8e000c72eb3755bf0eb03ca7c5928b69c3a241e147ad22d144e00a7 monero-gui-mac-armv8-v0.18.4.2.dmg +16abadcbd608d4f7ba20d17a297f2aa2c9066d33f6f22bf3fcdca679ab603990 monero-gui-mac-x64-v0.18.4.2.dmg +4daff8850280173d46464ba9a9de7f712228ad1ef76a1c4954531e4fd2b86d86 monero-gui-win-x64-v0.18.4.2.zip +691085e61ece6c56738431f3cfd395536ca0675214e5991e0dbfab85025e82d7 monero-gui-source-v0.18.4.2.tar.bz2 +# +# +# ~binaryFate +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEgaxZH+nEtlxYBq/D8K9NRioL35IFAmitx+kACgkQ8K9NRioL +35J6cQ/7ByvGstg/a5lIYbB+Lz5bNiPozCILD9/offvC7GgOvna9rkHuofuLS+pX +qhYEMrjFjmp03XMY+i68M83qkBEZ+yU5iNDbwRuHUNMMWaaGlhnhm3nyUVtDpjjr +4xwVsee+dzi0JZhVQG7HJFURiP2Ub5Ua6bSaATDoT/aUYdhmrOnQiH2+VxogiCv3 +JStDqXq6LpFjzw7UkAfxxu1PW+AQFNBzi3L0qWfzb5WWL7xuK63wXGmEkYBlvult +qt3LUhDUzMrfZ5GiiOYDEw44Y2atD4ibOYtBnllCX9CKNb0o2KKU6Qkj+CYqqtnE +uGNOt1oT09VPOtE7OUkBLVkALjef7ZXRibE7tN4wSnsrG39DP795/52L6CGJbl4n +UDnHzLCUbuvhnoAu5U+rUP5nUEDYS9ANNyj610ogNCo7YjfzLH641WSQ/UnuXKkA +RmK8xIiKoOnUeOanX99zqeXqV7gQdQMlfwLUr3pQzCI2YjdvxdRoedSEi5nX5KvO +Snf3BcCYMBemGYqVMdo95tc0Gmsw12/O8WwrBbTea+PeAXJuLaBxrLNn+RNZLfF/ +UJYq2VcEwxG6vXb3cJ5lDKmRDDRI8Fxu6Amdab+6ponhM8Zy3eAynVIO952pLA7N +dtl72RsimM+sgHXP4ERYL4c6WARSHE5sAiog43dr56l3PPmM8pE= +=SoHG +-----END PGP SIGNATURE----- diff --git a/orchestration/src/main.rs b/orchestration/src/main.rs index 811407f6..f888c379 100644 --- a/orchestration/src/main.rs +++ b/orchestration/src/main.rs @@ -149,7 +149,7 @@ fn build_serai_service(prelude: &str, release: bool, features: &str, package: &s format!( r#" -FROM rust:1.89-slim-bookworm AS builder +FROM rust:1.90-slim-bookworm AS builder COPY --from=mimalloc-debian libmimalloc.so /usr/lib RUN echo "/usr/lib/libmimalloc.so" >> /etc/ld.so.preload diff --git a/orchestration/src/networks/monero.rs b/orchestration/src/networks/monero.rs index 8103ff24..d30cdc69 100644 --- a/orchestration/src/networks/monero.rs +++ b/orchestration/src/networks/monero.rs @@ -10,7 +10,7 @@ fn monero_internal( monero_binary: &str, ports: &str, ) { - const MONERO_VERSION: &str = "0.18.3.4"; + const MONERO_VERSION: &str = "0.18.4.2"; let arch = match std::env::consts::ARCH { // We probably would run this without issues yet it's not worth needing to provide support for diff --git a/orchestration/testnet/networks/monero/hashes-v0.18.3.4.txt b/orchestration/testnet/networks/monero/hashes-v0.18.3.4.txt deleted file mode 100644 index d3dca617..00000000 --- a/orchestration/testnet/networks/monero/hashes-v0.18.3.4.txt +++ /dev/null @@ -1,50 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -# This GPG-signed message exists to confirm the SHA256 sums of Monero binaries. -# -# Please verify the signature against the key for binaryFate in the -# source code repository (/utils/gpg_keys). -# -# -## CLI -15e4d7dfc2f9261a0a452b0f8fd157c33cdbc8a896e23d883ddd13e2480a3800 monero-android-armv7-v0.18.3.4.tar.bz2 -d9c9249d1408822ce36b346c6b9fb6b896cda16714d62117fb1c588a5201763c monero-android-armv8-v0.18.3.4.tar.bz2 -360a551388922c8991a9ba4abaa88676b0fc7ec1fa4d0f4b5c0500847e0b946c monero-freebsd-x64-v0.18.3.4.tar.bz2 -354603c56446fb0551cdd6933bce5a13590b7881e05979b7ec25d89e7e59a0e2 monero-linux-armv7-v0.18.3.4.tar.bz2 -33ca2f0055529d225b61314c56370e35606b40edad61c91c859f873ed67a1ea7 monero-linux-armv8-v0.18.3.4.tar.bz2 -88739a1521b9fda3154540268e416c7af016ed7857041c76ab8ed7d7674c71ca monero-linux-riscv64-v0.18.3.4.tar.bz2 -51ba03928d189c1c11b5379cab17dd9ae8d2230056dc05c872d0f8dba4a87f1d monero-linux-x64-v0.18.3.4.tar.bz2 -d7ca0878abff2919a0104d7ed29d9c35df9ca0ea1b6fb4ebf6c8f7607ffb9e41 monero-linux-x86-v0.18.3.4.tar.bz2 -44520cb3a05c2518ca9aeae1b2e3080fe2bba1e3596d014ceff1090dfcba8ab4 monero-mac-armv8-v0.18.3.4.tar.bz2 -32c449f562216d3d83154e708471236d07db7477d6b67f1936a0a85a5005f2b8 monero-mac-x64-v0.18.3.4.tar.bz2 -54a66db6c892b2a0999754841f4ca68511741b88ea3ab20c7cd504a027f465f5 monero-win-x64-v0.18.3.4.zip -1a9824742aa1587023c3bddea788c115940cfd49371c78a8dd62c40113132d01 monero-win-x86-v0.18.3.4.zip -7d4845ec0a3b52404d41785da348ec33509f0a5981e8a27c5fa55b18d696e139 monero-source-v0.18.3.4.tar.bz2 -# -## GUI -63349d5a7637cd0c5d1693a1a2e910a92cbb123903d57667077a36454845d7bf monero-gui-install-win-x64-v0.18.3.4.exe -2866f3a2be30e4c4113e6274cad1d6698f81c37ceebc6e8f084c57230a0f70a6 monero-gui-linux-x64-v0.18.3.4.tar.bz2 -eedbf827513607a3ef579077dacd573e65892b199102effef97dff9d73138ca6 monero-gui-mac-armv8-v0.18.3.4.dmg -54eb151d7511a9f26130864e2c02f258344803b2b68311c8be29850d7faef359 monero-gui-mac-x64-v0.18.3.4.dmg -b5d42dddd722e728e480337f89038c8ea606c6507bf0c88ddf2af25050c9b751 monero-gui-win-x64-v0.18.3.4.zip -2f1d643bb2cc08e5eb334a6bfd649b0aa95ceb6178ff2f90448d5ef8d2a752a6 monero-gui-source-v0.18.3.4.tar.bz2 -# -# -# ~binaryFate ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEgaxZH+nEtlxYBq/D8K9NRioL35IFAmbF8bAACgkQ8K9NRioL -35KQAQ/7BP9j0Tx+zlFs3zbVIFXzfoPbGo2/uerM4xUWX/NUoI7XDTGWV2lpcR1x -o6eqstbuHciY0Aj2MsICsdqD+1PYW0EBZlfNLMrk161c3nQMJcjCE65uIhbLkOSs -6SUakmpxkueQOE/Ug5Afaa/JBATVTxLTmqSCI7Ai9NplF+6KNauXQXNrlwO/gHcd -whYDmsqp2JyOtMpMlpOckzLgg7Oroj7B0LBf78Z13p1naUyPooBaIEXSdKm5g2HI -vPd+z1bOVIluqPBnYWUwL7EmXy08/broejHGliQ+2iY9IsmDDx6rnSe/oprNEDic -l+/w3KvPcTkBh8hJLVDyYieYdVYHqOktIPlR1dKV512CnuP1ljr/CXjJmkAkXHlg -bObMUCIM9UYqp1I+KDaArjYNbzkHK02Lu6sak49GXgEuq66m9t4isF2GdcHrbERs -cLGsnhkTO2LtnGcziOC2l9XSzL41swxe0GrkK0rdeiyDCGAlb7hllevFy7zlT90l -Jw670TyFVBs8fUFHk/tOtT0ivSDJJg8m9waBzi/46ksOvuid6p3P3a0agqu3uclj -rscSpk0JS3E/3+A/N0IaiTmUO5zSjbsCrSnxQjcfrRRtERL+6JVHFVlW+nJzYWWH -u0O7bNZSqEruR4aTEtsddLgs57I10thDR5SUONuAqbEq8EYN8OE= -=aLFR ------END PGP SIGNATURE----- diff --git a/orchestration/testnet/networks/monero/hashes-v0.18.4.2.txt b/orchestration/testnet/networks/monero/hashes-v0.18.4.2.txt new file mode 100644 index 00000000..3188ceca --- /dev/null +++ b/orchestration/testnet/networks/monero/hashes-v0.18.4.2.txt @@ -0,0 +1,50 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +# This GPG-signed message exists to confirm the SHA256 sums of Monero binaries. +# +# Please verify the signature against the key for binaryFate in the +# source code repository (/utils/gpg_keys). +# +# +## CLI +6122f0bcaca12d5badd92002338847d16032f6d52d86155c203bcb67d4fe1518 monero-android-armv7-v0.18.4.2.tar.bz2 +3b248c3201f028205915403b4b2f173df0dd8bf47eeb268fd67a4661251469d3 monero-android-armv8-v0.18.4.2.tar.bz2 +b4e2b7de80107a1b4613b878d8e2114244b3fb16397821d69baa72d9b0f8c8d5 monero-freebsd-x64-v0.18.4.2.tar.bz2 +ecb2577499a3b0901d731e11d462d3fadcd70095f3ab0def0c27ee64dc56b061 monero-linux-armv7-v0.18.4.2.tar.bz2 +a39530054dac348b219f1048a24ca629da26990f72cf9c1f6b6853e3d8c39a79 monero-linux-armv8-v0.18.4.2.tar.bz2 +18492ace80bf8ef2f44aa9a99b4f20adf00fd59c675a6a496211a720088d5d1a monero-linux-riscv64-v0.18.4.2.tar.bz2 +41d023f2357244ea43ee0a74796f5705ce75ce7373a5865d4959fefa13ecab06 monero-linux-x64-v0.18.4.2.tar.bz2 +03e77a4836861a47430664fa703dd149a355b3b214bc400b04ed38eb064a3ef0 monero-linux-x86-v0.18.4.2.tar.bz2 +9b98da6911b4769abef229c20e21f29d919b11db156965d6f139d2e1ad6625c2 monero-mac-armv8-v0.18.4.2.tar.bz2 +b1b1b580320118d3b6eaa5575fdbd73cf4db90fcc025b7abf875c5e5b4e335c1 monero-mac-x64-v0.18.4.2.tar.bz2 +14dd5aa11308f106183dd7834aa200e74ce6f3497103973696b556e893a4fef2 monero-win-x64-v0.18.4.2.zip +934d9dbeb06ff5610d2c96ebe34fa480e74f78eaeb3fa3e47d89b7961c9bc5e0 monero-win-x86-v0.18.4.2.zip +e9ec2062b3547db58f00102e6905621116ab7f56a331e0bc9b9e892607b87d24 monero-source-v0.18.4.2.tar.bz2 +# +## GUI +9d6e87add7e3ac006ee34c13c4f629252595395f54421db768f72dc233e94ea8 monero-gui-install-win-x64-v0.18.4.2.exe +e4fcdea3f0ff27c3616a8a75545f42a4e4866ea374fa2eeaa9c87027573358ea monero-gui-linux-x64-v0.18.4.2.tar.bz2 +3dfee5c5d8e000c72eb3755bf0eb03ca7c5928b69c3a241e147ad22d144e00a7 monero-gui-mac-armv8-v0.18.4.2.dmg +16abadcbd608d4f7ba20d17a297f2aa2c9066d33f6f22bf3fcdca679ab603990 monero-gui-mac-x64-v0.18.4.2.dmg +4daff8850280173d46464ba9a9de7f712228ad1ef76a1c4954531e4fd2b86d86 monero-gui-win-x64-v0.18.4.2.zip +691085e61ece6c56738431f3cfd395536ca0675214e5991e0dbfab85025e82d7 monero-gui-source-v0.18.4.2.tar.bz2 +# +# +# ~binaryFate +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEgaxZH+nEtlxYBq/D8K9NRioL35IFAmitx+kACgkQ8K9NRioL +35J6cQ/7ByvGstg/a5lIYbB+Lz5bNiPozCILD9/offvC7GgOvna9rkHuofuLS+pX +qhYEMrjFjmp03XMY+i68M83qkBEZ+yU5iNDbwRuHUNMMWaaGlhnhm3nyUVtDpjjr +4xwVsee+dzi0JZhVQG7HJFURiP2Ub5Ua6bSaATDoT/aUYdhmrOnQiH2+VxogiCv3 +JStDqXq6LpFjzw7UkAfxxu1PW+AQFNBzi3L0qWfzb5WWL7xuK63wXGmEkYBlvult +qt3LUhDUzMrfZ5GiiOYDEw44Y2atD4ibOYtBnllCX9CKNb0o2KKU6Qkj+CYqqtnE +uGNOt1oT09VPOtE7OUkBLVkALjef7ZXRibE7tN4wSnsrG39DP795/52L6CGJbl4n +UDnHzLCUbuvhnoAu5U+rUP5nUEDYS9ANNyj610ogNCo7YjfzLH641WSQ/UnuXKkA +RmK8xIiKoOnUeOanX99zqeXqV7gQdQMlfwLUr3pQzCI2YjdvxdRoedSEi5nX5KvO +Snf3BcCYMBemGYqVMdo95tc0Gmsw12/O8WwrBbTea+PeAXJuLaBxrLNn+RNZLfF/ +UJYq2VcEwxG6vXb3cJ5lDKmRDDRI8Fxu6Amdab+6ponhM8Zy3eAynVIO952pLA7N +dtl72RsimM+sgHXP4ERYL4c6WARSHE5sAiog43dr56l3PPmM8pE= +=SoHG +-----END PGP SIGNATURE----- diff --git a/patches/dalek-ff-group/Cargo.toml b/patches/dalek-ff-group/Cargo.toml deleted file mode 100644 index 0cac3c94..00000000 --- a/patches/dalek-ff-group/Cargo.toml +++ /dev/null @@ -1,29 +0,0 @@ -[package] -name = "dalek-ff-group" -version = "0.5.99" -description = "ff/group bindings around curve25519-dalek" -license = "MIT" -repository = "https://github.com/serai-dex/serai/tree/develop/crypto/dalek-ff-group" -authors = ["Luke Parker "] -keywords = ["curve25519", "ed25519", "ristretto", "dalek", "group"] -edition = "2021" -rust-version = "1.85" - -[package.metadata.docs.rs] -all-features = true -rustdoc-args = ["--cfg", "docsrs"] - -[lints] -workspace = true - -[dependencies] -dalek-ff-group = { path = "../../crypto/dalek-ff-group", default-features = false } - -crypto-bigint-05 = { package = "crypto-bigint", version = "0.5", default-features = false, features = ["zeroize"] } -crypto-bigint = { version = "0.6", default-features = false, features = ["zeroize"] } -prime-field = { path = "../../crypto/prime-field", default-features = false } - -[features] -alloc = ["dalek-ff-group/alloc", "crypto-bigint-05/alloc", "crypto-bigint/alloc", "prime-field/alloc"] -std = ["alloc", "dalek-ff-group/std", "prime-field/std"] -default = ["std"] diff --git a/patches/dalek-ff-group/LICENSE b/patches/dalek-ff-group/LICENSE deleted file mode 100644 index 32ff304a..00000000 --- a/patches/dalek-ff-group/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2022-2025 Luke Parker - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/patches/dalek-ff-group/README.md b/patches/dalek-ff-group/README.md deleted file mode 100644 index 5a25d05b..00000000 --- a/patches/dalek-ff-group/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# Dalek FF/Group - -Patch for the `crates.io` `dalek-ff-group` to use the in-tree `dalek-ff-group`, -resolving relevant breaking changes made since. diff --git a/patches/dalek-ff-group/src/lib.rs b/patches/dalek-ff-group/src/lib.rs deleted file mode 100644 index 848f2a8f..00000000 --- a/patches/dalek-ff-group/src/lib.rs +++ /dev/null @@ -1,44 +0,0 @@ -#![allow(deprecated)] -#![cfg_attr(docsrs, feature(doc_auto_cfg))] -#![no_std] // Prevents writing new code, in what should be a simple wrapper, which requires std -#![doc = include_str!("../README.md")] -#![allow(clippy::redundant_closure_call)] - -pub use dalek_ff_group::{Scalar, EdwardsPoint, RistrettoPoint, Ed25519, Ristretto}; - -type ThirtyTwoArray = [u8; 32]; -prime_field::odd_prime_field_with_specific_repr!( - FieldElement, - "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffed", - "02", - false, - crate::ThirtyTwoArray -); - -impl FieldElement { - /// Create a FieldElement from a `crypto_bigint::U256`. - /// - /// This will reduce the `U256` by the modulus, into a member of the field. - #[deprecated] - pub const fn from_u256(u256: &crypto_bigint_05::U256) -> Self { - const MODULUS: crypto_bigint::U256 = crypto_bigint::U256::from_be_hex( - "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffed", - ); - let mut u256 = crypto_bigint::U256::from_words(*u256.as_words()); - loop { - let result = FieldElement::from_bytes(&u256.to_le_bytes()); - if let Some(result) = result { - return result; - } - u256 = u256.wrapping_sub(&MODULUS); - } - } - - /// Create a `FieldElement` from the reduction of a 512-bit number. - /// - /// The bytes are interpreted in little-endian format. - #[deprecated] - pub fn wide_reduce(value: [u8; 64]) -> Self { - >::from_uniform_bytes(&value) - } -} diff --git a/processor/monero/Cargo.toml b/processor/monero/Cargo.toml index 5119c579..b3a0dcf8 100644 --- a/processor/monero/Cargo.toml +++ b/processor/monero/Cargo.toml @@ -28,8 +28,8 @@ dalek-ff-group = { path = "../../crypto/dalek-ff-group", default-features = fals dkg = { package = "dkg-evrf", path = "../../crypto/dkg/evrf", default-features = false, features = ["std", "ed25519"] } frost = { package = "modular-frost", path = "../../crypto/frost", default-features = false } -monero-wallet = { git = "https://github.com/monero-oxide/monero-oxide", rev = "7f37cc8f770858aa1739e0f56dbe447db86f4ba6", default-features = false, features = ["std", "multisig"] } -monero-simple-request-rpc = { git = "https://github.com/monero-oxide/monero-oxide", rev = "7f37cc8f770858aa1739e0f56dbe447db86f4ba6", default-features = false } +monero-wallet = { git = "https://github.com/monero-oxide/monero-oxide", rev = "2c847f71079a105456376f9957cee86c4b6a9eb8", default-features = false, features = ["std", "multisig"] } +monero-simple-request-rpc = { git = "https://github.com/monero-oxide/monero-oxide", rev = "2c847f71079a105456376f9957cee86c4b6a9eb8", default-features = false } serai-client = { path = "../../substrate/client", default-features = false, features = ["monero"] } diff --git a/rust-toolchain.toml b/rust-toolchain.toml index cdd2b730..41d13f48 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "1.89" +channel = "1.90" targets = ["wasm32v1-none"] profile = "minimal" components = ["rust-src", "rustfmt", "clippy"] diff --git a/substrate/abi/src/transaction.rs b/substrate/abi/src/transaction.rs index d5fc1f08..53490924 100644 --- a/substrate/abi/src/transaction.rs +++ b/substrate/abi/src/transaction.rs @@ -237,7 +237,9 @@ mod substrate { use scale::{Encode, Decode}; use sp_runtime::{ transaction_validity::*, - traits::{Verify, ExtrinsicLike, ExtrinsicCall, Dispatchable, ValidateUnsigned, Checkable, Applyable}, + traits::{ + Verify, ExtrinsicLike, ExtrinsicCall, Dispatchable, ValidateUnsigned, Checkable, Applyable, + }, Weight, }; #[rustfmt::skip] diff --git a/substrate/client/Cargo.toml b/substrate/client/Cargo.toml index 5d9ba9f3..f8d37697 100644 --- a/substrate/client/Cargo.toml +++ b/substrate/client/Cargo.toml @@ -43,7 +43,7 @@ bitcoin = { version = "0.32", optional = true } ciphersuite = { path = "../../crypto/ciphersuite", optional = true } dalek-ff-group = { path = "../../crypto/dalek-ff-group", optional = true } -monero-address = { git = "https://github.com/monero-oxide/monero-oxide", rev = "7f37cc8f770858aa1739e0f56dbe447db86f4ba6", version = "0.1.0", default-features = false, features = ["std"], optional = true } +monero-address = { git = "https://github.com/monero-oxide/monero-oxide", rev = "2c847f71079a105456376f9957cee86c4b6a9eb8", version = "0.1.0", default-features = false, features = ["std"], optional = true } [dev-dependencies] rand_core = "0.6" diff --git a/substrate/node/Cargo.toml b/substrate/node/Cargo.toml index 851b9129..f5f71235 100644 --- a/substrate/node/Cargo.toml +++ b/substrate/node/Cargo.toml @@ -78,7 +78,7 @@ serai-env = { path = "../../common/env" } curve25519-dalek = { version = "4", default-features = false, features = ["alloc", "zeroize"] } bitcoin-serai = { path = "../../networks/bitcoin", default-features = false, features = ["std", "hazmat"] } -monero-address = { git = "https://github.com/monero-oxide/monero-oxide", rev = "7f37cc8f770858aa1739e0f56dbe447db86f4ba6", default-features = false, features = ["std"] } +monero-address = { git = "https://github.com/monero-oxide/monero-oxide", rev = "2c847f71079a105456376f9957cee86c4b6a9eb8", default-features = false, features = ["std"] } [features] default = [] diff --git a/substrate/signals/src/lib.rs b/substrate/signals/src/lib.rs index c57e337a..4a08b9b8 100644 --- a/substrate/signals/src/lib.rs +++ b/substrate/signals/src/lib.rs @@ -10,7 +10,10 @@ extern crate alloc; pub mod pallet { use sp_core::sr25519::Public; - use serai_abi::{primitives::{prelude::*, signals::*}, SubstrateBlock}; + use serai_abi::{ + primitives::{prelude::*, signals::*}, + SubstrateBlock, + }; use frame_system::pallet_prelude::*; use frame_support::pallet_prelude::*; @@ -18,7 +21,9 @@ pub mod pallet { use validator_sets_pallet::{Config as VsConfig, Pallet as VsPallet}; #[pallet::config] - pub trait Config: frame_system::Config + VsConfig { + pub trait Config: + frame_system::Config + VsConfig + { /// How long a candidate retirement signal is valid for. /// /// This MUST be equal to the rate at which new sets are attempted. @@ -297,8 +302,7 @@ pub mod pallet { retirement_signal: [u8; 32], ) -> DispatchResult { let validator = ensure_signed(origin)?; - let Some(registered_signal) = RegisteredRetirementSignals::::get(retirement_signal) - else { + let Some(registered_signal) = RegisteredRetirementSignals::::get(retirement_signal) else { return Err::<(), _>(Error::::NonExistentRetirementSignal.into()); }; if SeraiAddress::from(validator) != registered_signal.registrant { @@ -325,11 +329,7 @@ pub mod pallet { /// Favor a signal. #[pallet::call_index(2)] #[pallet::weight((0, DispatchClass::Normal))] // TODO - pub fn favor( - origin: OriginFor, - signal: Signal, - for_network: NetworkId, - ) -> DispatchResult { + pub fn favor(origin: OriginFor, signal: Signal, for_network: NetworkId) -> DispatchResult { let validator = ensure_signed(origin)?; // Perform the relevant checks for this class of signal @@ -347,7 +347,7 @@ pub mod pallet { process. */ let Some(registered_signal) = RegisteredRetirementSignals::::get(signal_id) else { - return Err::<(), _>(Error::::NonExistentRetirementSignal.into()) + return Err::<(), _>(Error::::NonExistentRetirementSignal.into()); }; // Check the signal isn't out of date, and its tallies with it. @@ -356,7 +356,7 @@ pub mod pallet { { Err::<(), _>(Error::::ExpiredRetirementSignal)?; } - }, + } Signal::Halt { .. } => {} } @@ -378,7 +378,7 @@ pub mod pallet { Signal::Retire { signal_id } => { LockedInRetirement::::set(Some(( signal_id, - frame_system::Pallet::::block_number() + T::RetirementLockInDuration::get() + frame_system::Pallet::::block_number() + T::RetirementLockInDuration::get(), ))); // TODO: Event } diff --git a/substrate/validator-sets/src/lib.rs b/substrate/validator-sets/src/lib.rs index 54123349..ae66b034 100644 --- a/substrate/validator-sets/src/lib.rs +++ b/substrate/validator-sets/src/lib.rs @@ -95,7 +95,9 @@ mod pallet { use super::*; #[pallet::config] - pub trait Config: frame_system::Config + coins_pallet::Config { + pub trait Config: + frame_system::Config + coins_pallet::Config + { // type ShouldEndSession: ShouldEndSession>; } @@ -846,7 +848,11 @@ mod pallet { #[pallet::weight((0, DispatchClass::Normal))] // TODO pub fn allocate(origin: OriginFor, network: NetworkId, amount: Amount) -> DispatchResult { let validator = ensure_signed(origin)?; - Coins::::transfer_fn(validator, Self::account(), Balance { coin: Coin::Serai, amount })?; + Coins::::transfer_fn( + validator, + Self::account(), + Balance { coin: Coin::Serai, amount }, + )?; Abstractions::::increase_allocation(network, validator, amount, false) .map_err(Error::::AllocationError)?; Ok(()) @@ -860,7 +866,11 @@ mod pallet { let deallocation_timeline = Abstractions::::decrease_allocation(network, account, amount) .map_err(Error::::DeallocationError)?; if matches!(deallocation_timeline, DeallocationTimeline::Immediate) { - Coins::::transfer_fn(Self::account(), account, Balance { coin: Coin::Serai, amount })?; + Coins::::transfer_fn( + Self::account(), + account, + Balance { coin: Coin::Serai, amount }, + )?; } Ok(()) @@ -876,7 +886,11 @@ mod pallet { let account = ensure_signed(origin)?; let amount = Abstractions::::claim_delayed_deallocation(account, network, session) .map_err(Error::::DeallocationError)?; - Coins::::transfer_fn(Self::account(), account, Balance { coin: Coin::Serai, amount })?; + Coins::::transfer_fn( + Self::account(), + account, + Balance { coin: Coin::Serai, amount }, + )?; Ok(()) } }