diff --git a/Cargo.lock b/Cargo.lock index 1f6d1ad7..73365307 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1308,6 +1308,7 @@ dependencies = [ "modular-frost", "processor-messages", "rand_core 0.6.4", + "serai-client", "tokio", "tributary-chain", ] @@ -2864,7 +2865,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "parity-scale-codec", ] @@ -2887,7 +2888,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "frame-support", "frame-support-procedural", @@ -2912,7 +2913,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "Inflector", "array-bytes", @@ -2959,7 +2960,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "frame-support", "frame-system", @@ -2987,7 +2988,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "bitflags", "environmental", @@ -3020,7 +3021,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "Inflector", "cfg-expr", @@ -3035,7 +3036,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -3047,7 +3048,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "proc-macro2", "quote", @@ -3057,7 +3058,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "frame-support", "log", @@ -3075,7 +3076,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "parity-scale-codec", "sp-api", @@ -5835,7 +5836,7 @@ dependencies = [ [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "frame-benchmarking", "frame-support", @@ -5850,7 +5851,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "frame-support", "frame-system", @@ -5866,7 +5867,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "frame-support", "frame-system", @@ -5880,7 +5881,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "frame-benchmarking", "frame-support", @@ -5904,7 +5905,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "frame-benchmarking", "frame-support", @@ -5919,7 +5920,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "frame-benchmarking", "frame-support", @@ -5942,7 +5943,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "frame-support", "frame-system", @@ -5963,7 +5964,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "frame-benchmarking", "frame-support", @@ -5981,7 +5982,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "frame-support", "frame-system", @@ -5997,7 +5998,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -6013,7 +6014,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -7433,7 +7434,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "log", "sp-core", @@ -7444,7 +7445,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "async-trait", "futures", @@ -7472,7 +7473,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "futures", "futures-timer", @@ -7495,7 +7496,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -7510,7 +7511,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "memmap2", "sc-chain-spec-derive", @@ -7529,7 +7530,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -7540,7 +7541,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "array-bytes", "chrono", @@ -7580,7 +7581,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "fnv", "futures", @@ -7606,7 +7607,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "hash-db", "kvdb", @@ -7632,7 +7633,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "async-trait", "futures", @@ -7657,7 +7658,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "async-trait", "fork-tree", @@ -7696,7 +7697,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "fork-tree", "parity-scale-codec", @@ -7709,7 +7710,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "ahash 0.8.3", "array-bytes", @@ -7749,7 +7750,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "async-trait", "futures", @@ -7772,7 +7773,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "lru 0.9.0", "parity-scale-codec", @@ -7796,7 +7797,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", @@ -7809,7 +7810,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "log", "sc-allocator", @@ -7822,7 +7823,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "anyhow", "cfg-if", @@ -7840,7 +7841,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "ansi_term", "futures", @@ -7856,7 +7857,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "array-bytes", "async-trait", @@ -7871,7 +7872,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "array-bytes", "async-channel", @@ -7915,7 +7916,7 @@ dependencies = [ [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "cid", "futures", @@ -7935,7 +7936,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "array-bytes", "async-trait", @@ -7963,7 +7964,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "ahash 0.8.3", "futures", @@ -7982,7 +7983,7 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "array-bytes", "futures", @@ -8004,7 +8005,7 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "array-bytes", "async-trait", @@ -8038,7 +8039,7 @@ dependencies = [ [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "array-bytes", "futures", @@ -8058,7 +8059,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "array-bytes", "bytes", @@ -8089,7 +8090,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "futures", "libp2p", @@ -8102,7 +8103,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -8111,7 +8112,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "futures", "jsonrpsee", @@ -8141,7 +8142,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -8160,7 +8161,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "http", "jsonrpsee", @@ -8175,7 +8176,7 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "array-bytes", "futures", @@ -8201,7 +8202,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "async-trait", "directories", @@ -8267,7 +8268,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "log", "parity-scale-codec", @@ -8278,7 +8279,7 @@ dependencies = [ [[package]] name = "sc-storage-monitor" version = "0.1.0" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "clap 4.2.2", "fs4", @@ -8294,7 +8295,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "futures", "libc", @@ -8313,7 +8314,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "chrono", "futures", @@ -8332,7 +8333,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "ansi_term", "atty", @@ -8363,7 +8364,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -8374,7 +8375,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "async-trait", "futures", @@ -8401,7 +8402,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "async-trait", "futures", @@ -8415,7 +8416,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "async-channel", "futures", @@ -9123,7 +9124,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "hash-db", "log", @@ -9141,7 +9142,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "Inflector", "blake2", @@ -9155,7 +9156,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "7.0.0" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "parity-scale-codec", "scale-info", @@ -9168,7 +9169,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "6.0.0" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "integer-sqrt", "num-traits", @@ -9182,7 +9183,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "parity-scale-codec", "scale-info", @@ -9195,7 +9196,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "parity-scale-codec", "sp-api", @@ -9207,7 +9208,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "futures", "log", @@ -9225,7 +9226,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "async-trait", "futures", @@ -9240,7 +9241,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "async-trait", "merlin", @@ -9263,7 +9264,7 @@ dependencies = [ [[package]] name = "sp-consensus-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "finality-grandpa", "log", @@ -9281,7 +9282,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "parity-scale-codec", "scale-info", @@ -9293,7 +9294,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "parity-scale-codec", "scale-info", @@ -9306,7 +9307,7 @@ dependencies = [ [[package]] name = "sp-core" version = "7.0.0" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "array-bytes", "bitflags", @@ -9349,7 +9350,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "5.0.0" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "blake2b_simd", "byteorder", @@ -9378,7 +9379,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "proc-macro2", "quote", @@ -9389,7 +9390,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -9398,7 +9399,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "5.0.0" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "proc-macro2", "quote", @@ -9408,7 +9409,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.13.0" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "environmental", "parity-scale-codec", @@ -9419,7 +9420,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -9434,7 +9435,7 @@ dependencies = [ [[package]] name = "sp-io" version = "7.0.0" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "bytes", "ed25519", @@ -9460,7 +9461,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "7.0.0" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "lazy_static", "sp-core", @@ -9471,7 +9472,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.13.0" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "futures", "merlin", @@ -9487,7 +9488,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "thiserror", "zstd 0.12.3+zstd.1.5.2", @@ -9496,7 +9497,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "sp-api", "sp-core", @@ -9506,7 +9507,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "5.0.0" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "backtrace", "lazy_static", @@ -9516,7 +9517,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "rustc-hash", "serde", @@ -9526,7 +9527,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "7.0.0" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "either", "hash256-std-hasher", @@ -9548,7 +9549,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "7.0.0" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -9566,7 +9567,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "6.0.0" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "Inflector", "proc-macro-crate", @@ -9578,7 +9579,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "parity-scale-codec", "scale-info", @@ -9592,7 +9593,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "parity-scale-codec", "scale-info", @@ -9604,7 +9605,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.13.0" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "hash-db", "log", @@ -9624,7 +9625,7 @@ dependencies = [ [[package]] name = "sp-std" version = "5.0.0" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" [[package]] name = "sp-std" @@ -9635,7 +9636,7 @@ checksum = "af0ee286f98455272f64ac5bb1384ff21ac029fbb669afbaf48477faff12760e" [[package]] name = "sp-storage" version = "7.0.0" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "impl-serde", "parity-scale-codec", @@ -9648,7 +9649,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "async-trait", "futures-timer", @@ -9663,7 +9664,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "6.0.0" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "parity-scale-codec", "sp-std 5.0.0", @@ -9675,7 +9676,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "sp-api", "sp-runtime", @@ -9684,7 +9685,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "async-trait", "log", @@ -9700,7 +9701,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "7.0.0" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "ahash 0.8.3", "hash-db", @@ -9723,7 +9724,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "impl-serde", "parity-scale-codec", @@ -9740,7 +9741,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -9751,7 +9752,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "7.0.0" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "anyhow", "impl-trait-for-tuples", @@ -9765,7 +9766,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "parity-scale-codec", "scale-info", @@ -9933,7 +9934,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "platforms", ] @@ -9941,7 +9942,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -9960,7 +9961,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "hyper", "log", @@ -9972,7 +9973,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#a22112aa10bf719cd37ae036d0b3580567e567e1" +source = "git+https://github.com/serai-dex/substrate#10ccaca0eb498a2316bbf627d419b29b1a75933a" dependencies = [ "ansi_term", "build-helper", diff --git a/substrate/client/metadata.json b/substrate/client/metadata.json deleted file mode 100644 index e69de29b..00000000 diff --git a/substrate/client/src/serai/validator_sets.rs b/substrate/client/src/serai/validator_sets.rs index dcba4faf..e62aabfe 100644 --- a/substrate/client/src/serai/validator_sets.rs +++ b/substrate/client/src/serai/validator_sets.rs @@ -11,6 +11,15 @@ const PALLET: &str = "ValidatorSets"; pub type ValidatorSetsEvent = validator_sets::Event<Runtime>; impl Serai { + pub async fn get_new_set_events( + &self, + block: [u8; 32], + ) -> Result<Vec<ValidatorSetsEvent>, SeraiError> { + self + .events::<ValidatorSets, _>(block, |event| matches!(event, ValidatorSetsEvent::NewSet { .. })) + .await + } + pub async fn get_vote_events( &self, block: [u8; 32], diff --git a/substrate/client/tests/validator_sets.rs b/substrate/client/tests/validator_sets.rs index 25619c87..19a162e3 100644 --- a/substrate/client/tests/validator_sets.rs +++ b/substrate/client/tests/validator_sets.rs @@ -3,11 +3,14 @@ use rand_core::{RngCore, OsRng}; use sp_core::{sr25519::Public, Pair}; use serai_client::{ - primitives::{BITCOIN_NET_ID, BITCOIN_NET, insecure_pair_from_name}, + primitives::{ + BITCOIN_NET_ID, ETHEREUM_NET_ID, MONERO_NET_ID, BITCOIN_NET, insecure_pair_from_name, + }, validator_sets::{ primitives::{Session, ValidatorSet}, ValidatorSetsEvent, }, + subxt::config::Header, Serai, }; @@ -33,6 +36,22 @@ serai_test!( let serai = serai().await; // Make sure the genesis is as expected + assert_eq!( + serai + .get_new_set_events( + serai.get_block_by_number(0).await.unwrap().unwrap().header.hash().into() + ) + .await + .unwrap(), + [BITCOIN_NET_ID, ETHEREUM_NET_ID, MONERO_NET_ID] + .iter() + .copied() + .map(|network| ValidatorSetsEvent::NewSet { + set: ValidatorSet { session: Session(0), network } + }) + .collect::<Vec<_>>(), + ); + let set_data = serai.get_validator_set(set).await.unwrap().unwrap(); assert_eq!(set_data.network, *BITCOIN_NET); let participants_ref: &[_] = set_data.participants.as_ref(); diff --git a/substrate/validator-sets/pallet/src/lib.rs b/substrate/validator-sets/pallet/src/lib.rs index f7350d12..582d8519 100644 --- a/substrate/validator-sets/pallet/src/lib.rs +++ b/substrate/validator-sets/pallet/src/lib.rs @@ -64,27 +64,12 @@ pub mod pallet { pub type VoteCount<T: Config> = StorageMap<_, Blake2_128Concat, (ValidatorSet, KeyPair), u16, ValueQuery>; - #[pallet::genesis_build] - impl<T: Config> GenesisBuild<T> for GenesisConfig<T> { - fn build(&self) { - let mut participants = Vec::new(); - for participant in self.participants.clone() { - participants.push((participant, self.bond)); - } - let participants = BoundedVec::try_from(participants).unwrap(); - - for (id, network) in self.networks.clone() { - ValidatorSets::<T>::set( - ValidatorSet { session: Session(0), network: id }, - Some(ValidatorSetData { bond: self.bond, network, participants: participants.clone() }), - ); - } - } - } - #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] pub enum Event<T: Config> { + NewSet { + set: ValidatorSet, + }, Vote { voter: T::AccountId, set: ValidatorSet, @@ -98,6 +83,26 @@ pub mod pallet { }, } + #[pallet::genesis_build] + impl<T: Config> GenesisBuild<T> for GenesisConfig<T> { + fn build(&self) { + let mut participants = Vec::new(); + for participant in self.participants.clone() { + participants.push((participant, self.bond)); + } + let participants = BoundedVec::try_from(participants).unwrap(); + + for (id, network) in self.networks.clone() { + let set = ValidatorSet { session: Session(0), network: id }; + ValidatorSets::<T>::set( + set, + Some(ValidatorSetData { bond: self.bond, network, participants: participants.clone() }), + ); + Pallet::<T>::deposit_event(Event::NewSet { set }) + } + } + } + #[pallet::error] pub enum Error<T> { /// Validator Set doesn't exist.