From b2b36b17c46775296a348c8781d676aa777dbb43 Mon Sep 17 00:00:00 2001 From: Luke Parker Date: Sat, 20 Sep 2025 00:06:19 -0400 Subject: [PATCH] Restore `GenesisConfig` to the validator sets pallet --- Cargo.lock | 200 +++++++++--------- substrate/abi/Cargo.toml | 6 +- substrate/client/Cargo.toml | 6 +- substrate/coins/Cargo.toml | 8 +- substrate/core/Cargo.toml | 6 +- substrate/dex/Cargo.toml | 16 +- substrate/economic-security/Cargo.toml | 18 +- substrate/emissions/Cargo.toml | 8 +- substrate/genesis-liquidity/Cargo.toml | 10 +- substrate/in-instructions/Cargo.toml | 20 +- substrate/node/Cargo.toml | 48 ++--- substrate/primitives/Cargo.toml | 2 +- substrate/runtime/Cargo.toml | 16 +- substrate/signals/Cargo.toml | 6 +- substrate/validator-sets/Cargo.toml | 34 +-- substrate/validator-sets/src/allocations.rs | 2 +- .../src/embedded_elliptic_curve_keys.rs | 6 +- substrate/validator-sets/src/lib.rs | 98 ++++----- substrate/validator-sets/src/mock.rs | 4 +- substrate/validator-sets/src/sessions.rs | 6 +- substrate/validator-sets/src/tests.rs | 2 +- 21 files changed, 241 insertions(+), 281 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9bcf3fec..6ba2d01a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3190,7 +3190,7 @@ checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" [[package]] name = "fork-tree" version = "13.0.1" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "parity-scale-codec", ] @@ -3223,7 +3223,7 @@ checksum = "28dd6caf6059519a65843af8fe2a3ae298b14b80179855aeb4adc2c1934ee619" [[package]] name = "frame-benchmarking" version = "41.0.1" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "frame-support", "frame-support-procedural", @@ -3246,7 +3246,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "41.0.1" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "frame-support", "frame-system", @@ -3262,7 +3262,7 @@ dependencies = [ [[package]] name = "frame-support" version = "41.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "array-bytes", "bitflags 1.3.2", @@ -3280,7 +3280,6 @@ dependencies = [ "sp-core", "sp-crypto-hashing-proc-macro", "sp-debug-derive", - "sp-genesis-builder", "sp-inherents", "sp-io", "sp-runtime", @@ -3296,7 +3295,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "34.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "Inflector", "cfg-expr", @@ -3315,7 +3314,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "13.0.1" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 3.3.0", @@ -3327,7 +3326,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "12.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "proc-macro2", "quote", @@ -3337,7 +3336,7 @@ dependencies = [ [[package]] name = "frame-system" version = "41.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "cfg-if", "frame-support", @@ -3354,7 +3353,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.47.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "frame-support", "parity-scale-codec", @@ -6119,7 +6118,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "41.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "frame-support", "frame-system", @@ -6131,7 +6130,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "41.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "frame-benchmarking", "frame-support", @@ -6152,7 +6151,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "41.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "frame-benchmarking", "frame-support", @@ -6172,7 +6171,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "41.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "frame-support", "frame-system", @@ -6192,7 +6191,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "40.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "frame-benchmarking", "frame-support", @@ -7657,7 +7656,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "32.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "log", "sp-core", @@ -7668,7 +7667,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.51.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "async-trait", "futures", @@ -7699,7 +7698,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.50.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "futures", "log", @@ -7720,7 +7719,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.45.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "parity-scale-codec", "sp-api", @@ -7735,7 +7734,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "44.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "array-bytes", "parity-scale-codec", @@ -7759,7 +7758,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "12.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "proc-macro-crate 3.3.0", "proc-macro2", @@ -7770,7 +7769,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.53.1" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "array-bytes", "chrono", @@ -7811,7 +7810,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "40.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "fnv", "futures", @@ -7837,7 +7836,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.47.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "hash-db", "kvdb", @@ -7864,7 +7863,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.50.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "async-trait", "futures", @@ -7887,7 +7886,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.51.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "async-trait", "fork-tree", @@ -7923,7 +7922,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.50.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "fork-tree", "parity-scale-codec", @@ -7936,7 +7935,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa" version = "0.36.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "ahash", "array-bytes", @@ -7980,7 +7979,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.50.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "async-trait", "futures", @@ -8003,7 +8002,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.43.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "parity-scale-codec", "parking_lot", @@ -8025,7 +8024,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.39.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", @@ -8037,7 +8036,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.39.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "anyhow", "log", @@ -8053,7 +8052,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.50.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "console", "futures", @@ -8069,7 +8068,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "36.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "array-bytes", "parking_lot", @@ -8083,7 +8082,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.51.1" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "array-bytes", "async-channel", @@ -8129,7 +8128,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.49.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "bitflags 1.3.2", "parity-scale-codec", @@ -8139,7 +8138,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.51.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "ahash", "futures", @@ -8158,7 +8157,7 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.50.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "array-bytes", "async-channel", @@ -8179,7 +8178,7 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.50.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "array-bytes", "async-channel", @@ -8214,7 +8213,7 @@ dependencies = [ [[package]] name = "sc-network-transactions" version = "0.50.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "array-bytes", "futures", @@ -8233,7 +8232,7 @@ dependencies = [ [[package]] name = "sc-network-types" version = "0.17.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "bs58", "bytes", @@ -8254,7 +8253,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.20.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -8263,7 +8262,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "46.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "futures", "jsonrpsee", @@ -8293,7 +8292,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.50.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -8311,7 +8310,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "23.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "dyn-clone", "forwarded-header-value", @@ -8335,7 +8334,7 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.51.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "array-bytes", "futures", @@ -8368,7 +8367,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.52.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "async-trait", "directories", @@ -8430,7 +8429,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.39.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "log", "parity-scale-codec", @@ -8441,7 +8440,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "43.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "derive_more 1.0.0", "futures", @@ -8461,7 +8460,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "29.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "chrono", "futures", @@ -8480,7 +8479,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "40.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "chrono", "console", @@ -8507,7 +8506,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "11.1.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "proc-macro-crate 3.3.0", "proc-macro2", @@ -8518,7 +8517,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "40.1.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "async-trait", "futures", @@ -8548,7 +8547,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "40.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "async-trait", "futures", @@ -8565,7 +8564,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "19.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "async-channel", "futures", @@ -9743,12 +9742,11 @@ dependencies = [ "frame-system", "parity-scale-codec", "rand_core 0.6.4", + "serai-abi", "serai-coins-pallet", - "serai-primitives", "sp-api", "sp-core", "sp-io", - "sp-runtime", "zeroize", ] @@ -10121,7 +10119,7 @@ dependencies = [ [[package]] name = "sp-api" version = "37.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "hash-db", "log", @@ -10140,7 +10138,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "23.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "Inflector", "blake2 0.10.6", @@ -10154,7 +10152,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "41.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "parity-scale-codec", "serde", @@ -10165,7 +10163,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "27.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "integer-sqrt", "num-traits", @@ -10177,7 +10175,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "37.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "parity-scale-codec", "sp-api", @@ -10187,7 +10185,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "37.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "sp-api", "sp-inherents", @@ -10197,7 +10195,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "40.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "futures", "parity-scale-codec", @@ -10216,7 +10214,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.43.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "async-trait", "futures", @@ -10230,7 +10228,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.43.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "async-trait", "parity-scale-codec", @@ -10247,7 +10245,7 @@ dependencies = [ [[package]] name = "sp-consensus-grandpa" version = "24.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "finality-grandpa", "log", @@ -10263,7 +10261,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.43.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "parity-scale-codec", "serde", @@ -10273,7 +10271,7 @@ dependencies = [ [[package]] name = "sp-core" version = "37.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "array-bytes", "bitflags 1.3.2", @@ -10311,7 +10309,7 @@ dependencies = [ [[package]] name = "sp-crypto-hashing" version = "0.1.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "blake2b_simd", "byteorder", @@ -10324,7 +10322,7 @@ dependencies = [ [[package]] name = "sp-crypto-hashing-proc-macro" version = "0.1.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "quote", "sp-crypto-hashing", @@ -10334,7 +10332,7 @@ dependencies = [ [[package]] name = "sp-database" version = "10.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "kvdb", "parking_lot", @@ -10343,7 +10341,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "14.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "proc-macro2", "quote", @@ -10353,7 +10351,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.30.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "environmental", "parity-scale-codec", @@ -10363,7 +10361,7 @@ dependencies = [ [[package]] name = "sp-genesis-builder" version = "0.18.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "parity-scale-codec", "sp-api", @@ -10372,7 +10370,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "37.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -10384,7 +10382,7 @@ dependencies = [ [[package]] name = "sp-io" version = "41.0.1" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "bytes", "log", @@ -10405,7 +10403,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "42.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "sp-core", "sp-runtime", @@ -10415,7 +10413,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.43.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "parity-scale-codec", "parking_lot", @@ -10426,7 +10424,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "11.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "thiserror 2.0.16", "zstd", @@ -10435,7 +10433,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "37.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "sp-api", "sp-core", @@ -10445,7 +10443,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "13.0.2" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "backtrace", "regex", @@ -10454,7 +10452,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "35.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "rustc-hash", "serde", @@ -10464,7 +10462,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "42.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "either", "hash256-std-hasher", @@ -10488,7 +10486,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "30.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "bytes", "parity-scale-codec", @@ -10502,7 +10500,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "19.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "Inflector", "expander", @@ -10515,7 +10513,7 @@ dependencies = [ [[package]] name = "sp-session" version = "39.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "parity-scale-codec", "sp-api", @@ -10528,7 +10526,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "39.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -10540,7 +10538,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.46.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "hash-db", "log", @@ -10560,12 +10558,12 @@ dependencies = [ [[package]] name = "sp-std" version = "14.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" [[package]] name = "sp-storage" version = "22.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10577,7 +10575,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "37.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "async-trait", "parity-scale-codec", @@ -10589,7 +10587,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "17.1.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "parity-scale-codec", "tracing", @@ -10600,7 +10598,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "37.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "sp-api", "sp-runtime", @@ -10609,7 +10607,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "40.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "ahash", "foldhash 0.1.5", @@ -10633,7 +10631,7 @@ dependencies = [ [[package]] name = "sp-version" version = "40.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10649,7 +10647,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "15.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "parity-scale-codec", "proc-macro-warning", @@ -10661,7 +10659,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "22.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "anyhow", "impl-trait-for-tuples", @@ -10673,7 +10671,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "32.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "bounded-collections", "parity-scale-codec", @@ -10822,7 +10820,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.17.6" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "http-body-util", "hyper", @@ -10836,7 +10834,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "27.0.0" -source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=d4624c561765c13b38eb566e435131a8c329a543#d4624c561765c13b38eb566e435131a8c329a543" +source = "git+https://github.com/serai-dex/patch-polkadot-sdk?rev=16336c737dbe833e9d138a256af99698aba637c7#16336c737dbe833e9d138a256af99698aba637c7" dependencies = [ "cargo_metadata", "console", diff --git a/substrate/abi/Cargo.toml b/substrate/abi/Cargo.toml index 233e7fd7..d822faee 100644 --- a/substrate/abi/Cargo.toml +++ b/substrate/abi/Cargo.toml @@ -22,12 +22,12 @@ workspace = true borsh = { version = "1", default-features = false, features = ["derive", "de_strict_order"] } bitvec = { version = "1", default-features = false, features = ["alloc"] } -sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } +sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } serde = { version = "1", default-features = false, features = ["derive"], optional = true } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"], optional = true } -sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false, features = ["serde"], optional = true } -frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false, optional = true } +sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false, features = ["serde"], optional = true } +frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false, optional = true } serai-primitives = { path = "../primitives", version = "0.1", default-features = false } diff --git a/substrate/client/Cargo.toml b/substrate/client/Cargo.toml index ac5b1ef9..1b8a5afd 100644 --- a/substrate/client/Cargo.toml +++ b/substrate/client/Cargo.toml @@ -31,9 +31,9 @@ serde_json = { version = "1", optional = true } serai-abi = { path = "../abi", version = "0.1" } multiaddr = { version = "0.18", optional = true } -sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", optional = true } -sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", optional = true } -frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", optional = true } +sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", optional = true } +sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", optional = true } +frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", optional = true } async-lock = "3" diff --git a/substrate/coins/Cargo.toml b/substrate/coins/Cargo.toml index f617c292..344f7c76 100644 --- a/substrate/coins/Cargo.toml +++ b/substrate/coins/Cargo.toml @@ -18,10 +18,10 @@ workspace = true [dependencies] scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } +sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } -frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } +frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } serai-abi = { path = "../abi", default-features = false, features = ["substrate"] } serai-core-pallet = { path = "../core", default-features = false } @@ -29,7 +29,7 @@ serai-core-pallet = { path = "../core", default-features = false } [dev-dependencies] borsh = { version = "1", default-features = false, features = ["std", "derive", "de_strict_order"] } -sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false, features = ["std"] } +sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false, features = ["std"] } [features] std = [ diff --git a/substrate/core/Cargo.toml b/substrate/core/Cargo.toml index 2512d7ad..9fbf3949 100644 --- a/substrate/core/Cargo.toml +++ b/substrate/core/Cargo.toml @@ -20,10 +20,10 @@ borsh = { version = "1", default-features = false, features = ["derive", "de_str scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } +sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } -frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } +frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } serai-abi = { path = "../abi", default-features = false, features = ["substrate"] } diff --git a/substrate/dex/Cargo.toml b/substrate/dex/Cargo.toml index f000d74e..a5dce0b5 100644 --- a/substrate/dex/Cargo.toml +++ b/substrate/dex/Cargo.toml @@ -21,15 +21,15 @@ workspace = true [dependencies] scale = { package = "parity-scale-codec", version = "3.6.1", default-features = false } -sp-std = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -sp-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } +sp-std = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +sp-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } -frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -frame-benchmarking = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false, optional = true } +frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +frame-benchmarking = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false, optional = true } coins-pallet = { package = "serai-coins-pallet", path = "../coins", default-features = false } diff --git a/substrate/economic-security/Cargo.toml b/substrate/economic-security/Cargo.toml index 9321c3c3..c7c7bc7c 100644 --- a/substrate/economic-security/Cargo.toml +++ b/substrate/economic-security/Cargo.toml @@ -21,8 +21,8 @@ workspace = true [dependencies] scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } +frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } dex-pallet = { package = "serai-dex-pallet", path = "../dex", default-features = false } coins-pallet = { package = "serai-coins-pallet", path = "../coins", default-features = false } @@ -30,16 +30,16 @@ coins-pallet = { package = "serai-coins-pallet", path = "../coins", default-feat serai-primitives = { path = "../primitives", default-features = false } [dev-dependencies] -pallet-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -pallet-grandpa = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -pallet-timestamp = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } +pallet-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +pallet-grandpa = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +pallet-timestamp = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } validator-sets-pallet = { package = "serai-validator-sets-pallet", path = "../validator-sets", default-features = false } -sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -sp-consensus-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } +sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +sp-consensus-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } [features] std = [ diff --git a/substrate/emissions/Cargo.toml b/substrate/emissions/Cargo.toml index 983199fa..c13abec1 100644 --- a/substrate/emissions/Cargo.toml +++ b/substrate/emissions/Cargo.toml @@ -21,11 +21,11 @@ workspace = true [dependencies] scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } +frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } -sp-std = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } +sp-std = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } coins-pallet = { package = "serai-coins-pallet", path = "../coins", default-features = false } validator-sets-pallet = { package = "serai-validator-sets-pallet", path = "../validator-sets", default-features = false } diff --git a/substrate/genesis-liquidity/Cargo.toml b/substrate/genesis-liquidity/Cargo.toml index cd592802..277c4884 100644 --- a/substrate/genesis-liquidity/Cargo.toml +++ b/substrate/genesis-liquidity/Cargo.toml @@ -21,12 +21,12 @@ workspace = true [dependencies] scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } +frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } -sp-std = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -sp-application-crypto = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } +sp-std = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +sp-application-crypto = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } dex-pallet = { package = "serai-dex-pallet", path = "../dex", default-features = false } coins-pallet = { package = "serai-coins-pallet", path = "../coins", default-features = false } diff --git a/substrate/in-instructions/Cargo.toml b/substrate/in-instructions/Cargo.toml index 5d35689b..90636df1 100644 --- a/substrate/in-instructions/Cargo.toml +++ b/substrate/in-instructions/Cargo.toml @@ -24,14 +24,14 @@ bitvec = { version = "1", default-features = false, features = ["alloc"] } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "max-encoded-len"] } -sp-std = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -sp-application-crypto = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } +sp-std = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +sp-application-crypto = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } -frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } +frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } serai-primitives = { path = "../primitives", default-features = false } @@ -42,9 +42,9 @@ genesis-liquidity-pallet = { package = "serai-genesis-liquidity-pallet", path = emissions-pallet = { package = "serai-emissions-pallet", path = "../emissions", default-features = false } [dev-dependencies] -pallet-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -pallet-grandpa = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -pallet-timestamp = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } +pallet-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +pallet-grandpa = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +pallet-timestamp = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } economic-security-pallet = { package = "serai-economic-security-pallet", path = "../economic-security", default-features = false } diff --git a/substrate/node/Cargo.toml b/substrate/node/Cargo.toml index fd4cc341..c9f91b63 100644 --- a/substrate/node/Cargo.toml +++ b/substrate/node/Cargo.toml @@ -34,16 +34,16 @@ secq256k1 = { path = "../../crypto/secq256k1" } libp2p = "0.56" -sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543" } -sp-keystore = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543" } -sp-timestamp = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543" } -sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543" } -sp-blockchain = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543" } -sp-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543" } -sp-block-builder = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543" } -sp-consensus-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543" } +sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7" } +sp-keystore = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7" } +sp-timestamp = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7" } +sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7" } +sp-blockchain = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7" } +sp-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7" } +sp-block-builder = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7" } +sp-consensus-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7" } -frame-benchmarking = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543" } +frame-benchmarking = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7" } serai-runtime = { path = "../runtime", features = ["std"] } @@ -55,24 +55,24 @@ jsonrpsee = { version = "0.24", features = ["server"] } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -sc-transaction-pool = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543" } -sc-transaction-pool-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543" } -sc-basic-authorship = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543" } -sc-executor = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543" } -sc-service = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543" } -sc-client-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543" } -sc-network-common = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543" } -sc-network = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } +sc-transaction-pool = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7" } +sc-transaction-pool-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7" } +sc-basic-authorship = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7" } +sc-executor = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7" } +sc-service = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7" } +sc-client-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7" } +sc-network-common = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7" } +sc-network = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } -sc-consensus = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543" } -sc-consensus-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543" } -sc-consensus-grandpa = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543" } -sc-authority-discovery = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543" } +sc-consensus = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7" } +sc-consensus-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7" } +sc-consensus-grandpa = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7" } +sc-authority-discovery = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7" } -sc-telemetry = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543" } -sc-cli = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false, features = ["rocksdb"] } +sc-telemetry = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7" } +sc-cli = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false, features = ["rocksdb"] } -sc-rpc-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543" } +sc-rpc-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7" } serai-env = { path = "../../common/env" } diff --git a/substrate/primitives/Cargo.toml b/substrate/primitives/Cargo.toml index a3b98e07..4120997a 100644 --- a/substrate/primitives/Cargo.toml +++ b/substrate/primitives/Cargo.toml @@ -21,7 +21,7 @@ borsh = { version = "1", default-features = false, features = ["derive", "de_str bitvec = { version = "1", default-features = false, features = ["alloc"] } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"], optional = true } -sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } +sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } ciphersuite = { path = "../../crypto/ciphersuite", default-features = false, features = ["alloc"] } schnorr-signatures = { path = "../../crypto/schnorr", default-features = false } diff --git a/substrate/runtime/Cargo.toml b/substrate/runtime/Cargo.toml index 05ca6e03..f40de0af 100644 --- a/substrate/runtime/Cargo.toml +++ b/substrate/runtime/Cargo.toml @@ -20,16 +20,16 @@ workspace = true [dependencies] scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -sp-version = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -sp-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } +sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +sp-version = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +sp-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } serai-abi = { path = "../abi", default-features = false, features = ["substrate"] } -frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -frame-executive = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } +frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +frame-executive = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } serai-core-pallet = { path = "../core", default-features = false } serai-coins-pallet = { path = "../coins", default-features = false } @@ -37,7 +37,7 @@ serai-validator-sets-pallet = { path = "../validator-sets", default-features = f serai-signals-pallet = { path = "../signals", default-features = false } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543" } +substrate-wasm-builder = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7" } [features] std = [ diff --git a/substrate/signals/Cargo.toml b/substrate/signals/Cargo.toml index b714499e..3f2a53c5 100644 --- a/substrate/signals/Cargo.toml +++ b/substrate/signals/Cargo.toml @@ -21,10 +21,10 @@ workspace = true [dependencies] scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } +sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } -frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } +frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } serai-abi = { path = "../abi", default-features = false, features = ["substrate"] } diff --git a/substrate/validator-sets/Cargo.toml b/substrate/validator-sets/Cargo.toml index a5f1600d..02bfd936 100644 --- a/substrate/validator-sets/Cargo.toml +++ b/substrate/validator-sets/Cargo.toml @@ -20,29 +20,18 @@ bitvec = { version = "1", default-features = false, features = ["alloc", "serde" scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "bit-vec"] } -sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -sp-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } +sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +sp-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } -frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } -frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } +frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } +frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "16336c737dbe833e9d138a256af99698aba637c7", default-features = false } -serai-primitives = { path = "../primitives", default-features = false, features = ["non_canonical_scale_derivations"] } +serai-abi = { path = "../abi", default-features = false, features = ["substrate"] } -coins-pallet = { package = "serai-coins-pallet", path = "../coins", default-features = false } +serai-coins-pallet = { path = "../coins", default-features = false } [dev-dependencies] -#pallet-timestamp = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } - -#sp-consensus-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "d4624c561765c13b38eb566e435131a8c329a543", default-features = false } - -#ciphersuite = { path = "../../../crypto/ciphersuite", default-features = false, features = ["std"] } -#dalek-ff-group = { path = "../../../crypto/dalek-ff-group", default-features = false, features = ["std"] } -#dkg-musig = { path = "../../../crypto/dkg/musig", default-features = false, features = ["std"] } -#frost = { package = "modular-frost", path = "../../../crypto/frost", features = ["tests"] } -#schnorrkel = { path = "../../../crypto/schnorrkel", package = "frost-schnorrkel" } - zeroize = "^1.5" rand_core = "0.6" @@ -56,22 +45,21 @@ std = [ "sp-core/std", "sp-io/std", - "sp-runtime/std", "sp-api/std", "frame-system/std", "frame-support/std", - "serai-primitives/std", + "serai-abi/std", - "coins-pallet/std", + "serai-coins-pallet/std", ] try-runtime = [ + "serai-abi/try-runtime", + "frame-system/try-runtime", "frame-support/try-runtime", - - "sp-runtime/try-runtime", ] runtime-benchmarks = [ diff --git a/substrate/validator-sets/src/allocations.rs b/substrate/validator-sets/src/allocations.rs index 6eff07fd..08332f62 100644 --- a/substrate/validator-sets/src/allocations.rs +++ b/substrate/validator-sets/src/allocations.rs @@ -1,6 +1,6 @@ use sp_core::{Encode, sr25519::Public}; -use serai_primitives::{network_id::NetworkId, balance::Amount, validator_sets::KeyShares}; +use serai_abi::primitives::{network_id::NetworkId, balance::Amount, validator_sets::KeyShares}; use frame_support::storage::{StorageMap, StoragePrefixedMap}; diff --git a/substrate/validator-sets/src/embedded_elliptic_curve_keys.rs b/substrate/validator-sets/src/embedded_elliptic_curve_keys.rs index febd03e0..e9ea748a 100644 --- a/substrate/validator-sets/src/embedded_elliptic_curve_keys.rs +++ b/substrate/validator-sets/src/embedded_elliptic_curve_keys.rs @@ -1,6 +1,6 @@ use sp_core::sr25519::Public; -use serai_primitives::{crypto::SignedEmbeddedEllipticCurveKeys, network_id::*}; +use serai_abi::primitives::{crypto::SignedEmbeddedEllipticCurveKeys, network_id::*}; use frame_support::storage::StorageDoubleMap; @@ -9,8 +9,8 @@ pub(crate) trait EmbeddedEllipticCurveKeysStorage { type EmbeddedEllipticCurveKeys: StorageDoubleMap< ExternalNetworkId, Public, - serai_primitives::crypto::EmbeddedEllipticCurveKeys, - Query = Option, + serai_abi::primitives::crypto::EmbeddedEllipticCurveKeys, + Query = Option, >; } diff --git a/substrate/validator-sets/src/lib.rs b/substrate/validator-sets/src/lib.rs index ae66b034..44fe1cb6 100644 --- a/substrate/validator-sets/src/lib.rs +++ b/substrate/validator-sets/src/lib.rs @@ -34,11 +34,11 @@ use frame_support::{ BoundedVec, WeakBoundedVec, StoragePrefixedMap, }; -use serai_primitives::*; +use serai_abi::primitives::*; pub use validator_sets_primitives as primitives; use primitives::*; -use coins_pallet::{Pallet as Coins, AllowMint}; +use serai_coins_pallet::{Pallet as Coins, AllowMint}; use dex_pallet::Pallet as Dex; use pallet_babe::{ @@ -81,51 +81,51 @@ mod pallet { use frame_system::pallet_prelude::*; use frame_support::pallet_prelude::*; - use serai_primitives::{ - crypto::KeyPair, + use serai_abi::primitives::{ + crypto::SignedEmbeddedEllipticCurveKeys, network_id::*, coin::*, balance::*, - validator_sets::{Session, ExternalValidatorSet, ValidatorSet, KeyShares as KeySharesStruct}, + validator_sets::{Session, ValidatorSet, KeyShares as KeySharesStruct}, address::SeraiAddress, }; - use coins_pallet::Pallet as Coins; + use serai_coins_pallet::Pallet as Coins; use super::*; #[pallet::config] pub trait Config: - frame_system::Config + coins_pallet::Config + frame_system::Config + serai_coins_pallet::Config { // type ShouldEndSession: ShouldEndSession>; } - /* TODO - #[derive(Clone, PartialEq, Eq, Debug, Encode, Decode, serde::Serialize, serde::Deserialize)] - pub struct AllEmbeddedEllipticCurveKeysAtGenesis { - pub embedwards25519: BoundedVec>, - pub secq256k1: BoundedVec>, - } - #[pallet::genesis_config] - #[derive(Clone, PartialEq, Eq, Debug, Encode, Decode)] + #[derive(Clone, PartialEq, Eq, Debug)] pub struct GenesisConfig { - /// Networks to spawn Serai with, and the stake requirement per key share. - /// - /// Every participant at genesis will automatically be assumed to have this much stake. - /// This stake cannot be withdrawn however as there's no actual stake behind it. - pub networks: Vec<(NetworkId, Amount)>, /// List of participants to place in the initial validator sets. - pub participants: Vec<(T::AccountId, AllEmbeddedEllipticCurveKeysAtGenesis)>, + pub participants: Vec<(T::AccountId, Vec)>, } - impl Default for GenesisConfig { - fn default() -> Self { - GenesisConfig { networks: Default::default(), participants: Default::default() } + #[pallet::genesis_build] + impl BuildGenesisConfig for GenesisConfig { + fn build(&self) { + for (participant, keys) in &self.participants { + for (network, keys) in ExternalNetworkId::all().zip(keys.iter().cloned()) { + assert_eq!(network, keys.network()); + as crate::EmbeddedEllipticCurveKeys>::set_embedded_elliptic_curve_keys( + *participant, + keys, + ) + .expect("genesis embedded elliptic curve keys weren't valid"); + } + } + for network in NetworkId::all() { + Abstractions::::attempt_new_session(network, true); + } } } - */ #[pallet::pallet] pub struct Pallet(PhantomData); @@ -171,7 +171,7 @@ mod pallet { ExternalNetworkId, Blake2_128Concat, Public, - serai_primitives::crypto::EmbeddedEllipticCurveKeys, + serai_abi::primitives::crypto::EmbeddedEllipticCurveKeys, OptionQuery, >; @@ -320,31 +320,6 @@ mod pallet { } } } - - #[pallet::genesis_build] - impl BuildGenesisConfig for GenesisConfig { - fn build(&self) { - for (id, stake) in self.networks.clone() { - AllocationPerKeyShare::::set(id, Some(stake)); - for participant in &self.participants { - if Abstractions::::set_allocation(id, participant.0, stake) { - panic!("participants contained duplicates"); - } - EmbeddedEllipticCurveKeys::::set( - participant.0, - EmbeddedEllipticCurve::Embedwards25519, - Some(participant.1.embedwards25519.clone()), - ); - EmbeddedEllipticCurveKeys::::set( - participant.0, - EmbeddedEllipticCurve::Secq256k1, - Some(participant.1.secq256k1.clone()), - ); - } - Pallet::::new_set(id); - } - } - } */ impl Pallet { @@ -536,7 +511,7 @@ mod pallet { } fn new_session() { - for network in serai_primitives::NETWORKS { + for network in serai_abi::primitives::NETWORKS { // If this network hasn't started sessions yet, don't start one now let Some(current_session) = Self::session(network) else { continue }; // Only spawn a new set if: @@ -834,7 +809,7 @@ mod pallet { #[pallet::weight((0, DispatchClass::Normal))] // TODO pub fn set_embedded_elliptic_curve_keys( origin: OriginFor, - keys: serai_primitives::crypto::SignedEmbeddedEllipticCurveKeys, + keys: SignedEmbeddedEllipticCurveKeys, ) -> DispatchResult { let signer = ensure_signed(origin)?; as crate::EmbeddedEllipticCurveKeys>::set_embedded_elliptic_curve_keys( @@ -848,7 +823,7 @@ 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( + Coins::::transfer_fn( validator, Self::account(), Balance { coin: Coin::Serai, amount }, @@ -866,7 +841,7 @@ mod pallet { let deallocation_timeline = Abstractions::::decrease_allocation(network, account, amount) .map_err(Error::::DeallocationError)?; if matches!(deallocation_timeline, DeallocationTimeline::Immediate) { - Coins::::transfer_fn( + Coins::::transfer_fn( Self::account(), account, Balance { coin: Coin::Serai, amount }, @@ -886,7 +861,7 @@ mod pallet { let account = ensure_signed(origin)?; let amount = Abstractions::::claim_delayed_deallocation(account, network, session) .map_err(Error::::DeallocationError)?; - Coins::::transfer_fn( + Coins::::transfer_fn( Self::account(), account, Balance { coin: Coin::Serai, amount }, @@ -1118,20 +1093,19 @@ mod pallet { } */ } +pub use pallet::*; sp_api::decl_runtime_apis! { #[api_version(1)] pub trait ValidatorSetsApi { /// Returns the validator set for a given network. fn validators( - network_id: serai_primitives::network_id::NetworkId, - ) -> Vec; + network_id: serai_abi::primitives::network_id::NetworkId, + ) -> Vec; /// Returns the external network key for a given external network. fn external_network_key( - network: serai_primitives::network_id::ExternalNetworkId, - ) -> Option; + network: serai_abi::primitives::network_id::ExternalNetworkId, + ) -> Option; } } - -pub use pallet::*; diff --git a/substrate/validator-sets/src/mock.rs b/substrate/validator-sets/src/mock.rs index a557055e..25b97620 100644 --- a/substrate/validator-sets/src/mock.rs +++ b/substrate/validator-sets/src/mock.rs @@ -18,11 +18,11 @@ use sp_runtime::{ BuildStorage, }; -use serai_primitives::*; +use serai_abi::primitives::*; use validator_sets::{primitives::MAX_KEY_SHARES_PER_SET_U32, MembershipProof}; pub use crate as validator_sets; -pub use coins_pallet as coins; +pub use serai_coins_pallet as coins; pub use dex_pallet as dex; pub use pallet_babe as babe; pub use pallet_grandpa as grandpa; diff --git a/substrate/validator-sets/src/sessions.rs b/substrate/validator-sets/src/sessions.rs index 68f3ca86..827ed7c6 100644 --- a/substrate/validator-sets/src/sessions.rs +++ b/substrate/validator-sets/src/sessions.rs @@ -1,7 +1,7 @@ use alloc::vec::Vec; use sp_core::{Encode, Decode, ConstU32, sr25519::Public, bounded::BoundedVec}; -use serai_primitives::{ +use serai_abi::primitives::{ network_id::NetworkId, balance::Amount, validator_sets::{KeyShares as KeySharesStruct, Session, ValidatorSet}, @@ -231,9 +231,9 @@ impl Sessions for Storage { return; } } - (Some(current), None) => unreachable!("current session but never decided a session"), + (Some(_current), None) => unreachable!("current session but never decided a session"), // If we decided our first session, but didn't start it, don't decide another session - (None, Some(latest)) => return, + (None, Some(_latest)) => return, (None, None) => { // If we've never started a session, we can decide the first session } diff --git a/substrate/validator-sets/src/tests.rs b/substrate/validator-sets/src/tests.rs index d97a4bb6..e627b2f5 100644 --- a/substrate/validator-sets/src/tests.rs +++ b/substrate/validator-sets/src/tests.rs @@ -22,7 +22,7 @@ use sp_core::{ }; use sp_runtime::traits::ValidateUnsigned; -use serai_primitives::*; +use serai_abi::primitives::*; fn active_network_validators(network: NetworkId) -> Vec<(Public, u64)> { if network == NetworkId::Serai {