From 10c126ad924c438bd8ce04b6099053c6e24d4a89 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 | 113 +++++++++--------- Cargo.toml | 4 +- crypto/dkg/evrf/Cargo.toml | 10 +- crypto/embedwards25519/Cargo.toml | 2 +- crypto/secq256k1/Cargo.toml | 2 +- crypto/short-weierstrass/Cargo.toml | 2 +- deny.toml | 102 ++++++++-------- .../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/client/Cargo.toml | 2 +- substrate/node/Cargo.toml | 2 +- 24 files changed, 234 insertions(+), 329 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 e2a4d6d1..fa6d95c2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -341,7 +341,7 @@ dependencies = [ "cfg-if", "const-hex", "derive_more 2.0.1", - "foldhash", + "foldhash 0.1.5", "hashbrown 0.15.5", "indexmap 2.11.0", "itoa", @@ -1938,7 +1938,7 @@ name = "ciphersuite" version = "0.4.99" dependencies = [ "ciphersuite 0.4.2", - "dalek-ff-group 0.5.0", + "dalek-ff-group", "std-shims", "zeroize", ] @@ -2402,7 +2402,7 @@ dependencies = [ "cxxbridge-cmd", "cxxbridge-flags", "cxxbridge-macro", - "foldhash", + "foldhash 0.1.5", "link-cplusplus", ] @@ -2470,16 +2470,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" @@ -2806,7 +2796,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", @@ -2831,7 +2821,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", @@ -2922,9 +2912,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", @@ -3350,6 +3340,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" +[[package]] +name = "foldhash" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" + [[package]] name = "fork-tree" version = "3.0.0" @@ -3771,7 +3767,7 @@ dependencies = [ [[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", @@ -3786,7 +3782,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", @@ -3797,7 +3793,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", @@ -4008,10 +4004,19 @@ checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" dependencies = [ "allocator-api2", "equivalent", - "foldhash", + "foldhash 0.1.5", "serde", ] +[[package]] +name = "hashbrown" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" +dependencies = [ + "foldhash 0.2.0", +] + [[package]] name = "heck" version = "0.4.1" @@ -6084,7 +6089,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", @@ -6107,7 +6112,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", @@ -6119,7 +6124,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", @@ -6128,7 +6133,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", @@ -6141,7 +6146,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", @@ -6156,10 +6161,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", @@ -6177,11 +6182,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", @@ -6192,7 +6197,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", @@ -6202,7 +6207,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", @@ -6216,7 +6221,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", @@ -6234,7 +6239,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", @@ -6247,7 +6252,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", @@ -6263,7 +6268,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", @@ -6276,10 +6281,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", @@ -6330,7 +6334,7 @@ dependencies = [ name = "multiexp" version = "0.4.2" dependencies = [ - "dalek-ff-group 0.5.0", + "dalek-ff-group", "ff", "group", "k256", @@ -9466,7 +9470,7 @@ name = "schnorr-signatures" version = "0.5.2" dependencies = [ "ciphersuite 0.4.2", - "dalek-ff-group 0.5.0", + "dalek-ff-group", "digest 0.11.0-rc.1", "flexible-transcript", "hex", @@ -9752,7 +9756,7 @@ dependencies = [ "borsh", "ciphersuite 0.4.2", "ciphersuite-kp256", - "dalek-ff-group 0.5.0", + "dalek-ff-group", "dkg-musig", "dockertest", "frame-system", @@ -9813,7 +9817,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", @@ -9902,7 +9906,7 @@ dependencies = [ "blake2 0.11.0-rc.2", "borsh", "ciphersuite 0.4.2", - "dalek-ff-group 0.5.0", + "dalek-ff-group", "dkg", "log", "parity-scale-codec", @@ -10166,7 +10170,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", @@ -10187,7 +10191,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", @@ -10204,7 +10208,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", @@ -10234,7 +10238,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", @@ -10262,7 +10266,7 @@ dependencies = [ "ciphersuite-kp256", "clap", "curve25519-dalek", - "dalek-ff-group 0.5.0", + "dalek-ff-group", "embedwards25519", "frame-benchmarking", "futures-util", @@ -10313,7 +10317,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", @@ -10730,7 +10734,7 @@ version = "0.1.0" dependencies = [ "bitvec", "ciphersuite 0.4.2", - "dalek-ff-group 0.5.0", + "dalek-ff-group", "dkg-musig", "frame-support", "frame-system", @@ -10765,7 +10769,7 @@ version = "0.1.0" dependencies = [ "borsh", "ciphersuite 0.4.2", - "dalek-ff-group 0.5.0", + "dalek-ff-group", "dkg-musig", "parity-scale-codec", "scale-info", @@ -11050,9 +11054,10 @@ dependencies = [ [[package]] name = "simple-request" -version = "0.1.0" +version = "0.1.1" dependencies = [ "base64ct", + "futures-util", "http-body-util", "hyper 1.4.1", "hyper-rustls", @@ -11868,7 +11873,7 @@ dependencies = [ name = "std-shims" version = "0.1.5" dependencies = [ - "hashbrown 0.15.5", + "hashbrown 0.16.0", "rustversion", "spin 0.10.0", ] @@ -12618,7 +12623,7 @@ version = "0.1.0" dependencies = [ "blake2 0.11.0-rc.2", "ciphersuite 0.4.2", - "dalek-ff-group 0.5.0", + "dalek-ff-group", "flexible-transcript", "futures-channel", "futures-util", diff --git a/Cargo.toml b/Cargo.toml index a5443344..3234fac9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,8 +18,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", @@ -198,7 +196,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/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 25cd1b2f..48b45cf2 100644 --- a/deny.toml +++ b/deny.toml @@ -36,77 +36,77 @@ allow = [ "MPL-2.0", "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" }, - { 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" }, + { 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 b1e7b1cb..00615d82 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 8ceef0f9..d4949dd9 100644 --- a/processor/monero/Cargo.toml +++ b/processor/monero/Cargo.toml @@ -29,8 +29,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/client/Cargo.toml b/substrate/client/Cargo.toml index 0df6540b..dbf3a56a 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 25cb6d57..758ba34e 100644 --- a/substrate/node/Cargo.toml +++ b/substrate/node/Cargo.toml @@ -82,7 +82,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"] } [build-dependencies] substrate-build-script-utils = { git = "https://github.com/serai-dex/substrate" }