diff --git a/Cargo.lock b/Cargo.lock index 18ce2f40d034..889949e168e5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -450,17 +450,19 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "beefy-primitives", "fnv", "futures 0.3.21", + "futures-timer", "hex", "log", "parity-scale-codec", "parking_lot 0.12.0", "sc-chain-spec", "sc-client-api", + "sc-finality-grandpa", "sc-keystore", "sc-network", "sc-network-gossip", @@ -469,6 +471,7 @@ dependencies = [ "sp-application-crypto", "sp-arithmetic", "sp-blockchain", + "sp-consensus", "sp-core", "sp-keystore", "sp-runtime", @@ -480,7 +483,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -503,12 +506,12 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "parity-scale-codec", "scale-info", @@ -2103,7 +2106,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "parity-scale-codec", ] @@ -2121,7 +2124,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-support", "frame-system", @@ -2143,7 +2146,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "Inflector", "chrono", @@ -2188,7 +2191,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -2199,7 +2202,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -2215,7 +2218,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-support", "frame-system", @@ -2243,7 +2246,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "bitflags", "frame-metadata", @@ -2272,7 +2275,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2284,7 +2287,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.1.3", @@ -2296,7 +2299,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "proc-macro2", "quote", @@ -2306,7 +2309,7 @@ dependencies = [ [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-support", "frame-support-test-pallet", @@ -2329,7 +2332,7 @@ dependencies = [ [[package]] name = "frame-support-test-pallet" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-support", "frame-system", @@ -2340,7 +2343,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-support", "log", @@ -2357,7 +2360,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-benchmarking", "frame-support", @@ -2372,7 +2375,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "parity-scale-codec", "sp-api", @@ -2381,7 +2384,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-support", "sp-api", @@ -2577,7 +2580,7 @@ dependencies = [ [[package]] name = "generate-bags" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "chrono", "frame-election-provider-support", @@ -5043,7 +5046,7 @@ checksum = "20448fd678ec04e6ea15bbe0476874af65e98a01515d667aa49f1434dc44ebf4" [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-benchmarking", "frame-support", @@ -5057,7 +5060,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-support", "frame-system", @@ -5073,7 +5076,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-support", "frame-system", @@ -5088,7 +5091,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-benchmarking", "frame-support", @@ -5112,7 +5115,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5132,7 +5135,7 @@ dependencies = [ [[package]] name = "pallet-bags-list-remote-tests" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-election-provider-support", "frame-support", @@ -5152,7 +5155,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-benchmarking", "frame-support", @@ -5167,7 +5170,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "beefy-primitives", "frame-support", @@ -5183,7 +5186,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -5208,7 +5211,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-benchmarking", "frame-support", @@ -5290,7 +5293,7 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-benchmarking", "frame-support", @@ -5309,7 +5312,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-benchmarking", "frame-support", @@ -5326,7 +5329,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-benchmarking", "frame-support", @@ -5342,7 +5345,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5365,7 +5368,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-benchmarking", "frame-support", @@ -5383,7 +5386,7 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-benchmarking", "frame-support", @@ -5398,7 +5401,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-benchmarking", "frame-support", @@ -5421,7 +5424,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5437,7 +5440,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-benchmarking", "frame-support", @@ -5457,7 +5460,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-benchmarking", "frame-support", @@ -5474,7 +5477,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-benchmarking", "frame-support", @@ -5491,7 +5494,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -5509,7 +5512,7 @@ dependencies = [ [[package]] name = "pallet-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-support", "frame-system", @@ -5525,7 +5528,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5542,7 +5545,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-benchmarking", "frame-support", @@ -5557,7 +5560,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-support", "frame-system", @@ -5571,7 +5574,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-support", "frame-system", @@ -5588,7 +5591,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5611,7 +5614,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-benchmarking", "frame-support", @@ -5627,7 +5630,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-benchmarking", "frame-support", @@ -5642,7 +5645,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-support", "frame-system", @@ -5656,7 +5659,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-benchmarking", "frame-support", @@ -5672,7 +5675,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-support", "frame-system", @@ -5693,7 +5696,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-benchmarking", "frame-support", @@ -5709,7 +5712,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-support", "frame-system", @@ -5723,7 +5726,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5746,7 +5749,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -5757,7 +5760,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "log", "sp-arithmetic", @@ -5766,7 +5769,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-support", "frame-system", @@ -5780,7 +5783,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-benchmarking", "frame-support", @@ -5798,7 +5801,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-benchmarking", "frame-support", @@ -5817,7 +5820,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-support", "frame-system", @@ -5834,7 +5837,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5851,7 +5854,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5862,7 +5865,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-benchmarking", "frame-support", @@ -5879,7 +5882,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-benchmarking", "frame-support", @@ -5895,7 +5898,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-benchmarking", "frame-support", @@ -8360,7 +8363,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "env_logger 0.9.0", "jsonrpsee 0.8.0", @@ -8708,7 +8711,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "log", "sp-core", @@ -8719,7 +8722,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "async-trait", "futures 0.3.21", @@ -8746,7 +8749,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "futures 0.3.21", "futures-timer", @@ -8769,7 +8772,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -8785,7 +8788,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.0", @@ -8802,7 +8805,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -8813,7 +8816,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "chrono", "clap", @@ -8851,7 +8854,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "fnv", "futures 0.3.21", @@ -8879,7 +8882,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "hash-db", "kvdb", @@ -8904,7 +8907,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "async-trait", "futures 0.3.21", @@ -8928,7 +8931,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "async-trait", "fork-tree", @@ -8971,7 +8974,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "futures 0.3.21", "jsonrpc-core", @@ -8995,7 +8998,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "fork-tree", "parity-scale-codec", @@ -9008,7 +9011,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "async-trait", "futures 0.3.21", @@ -9033,7 +9036,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "sc-client-api", "sp-authorship", @@ -9044,7 +9047,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "lazy_static", "lru 0.6.6", @@ -9071,7 +9074,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "environmental", "parity-scale-codec", @@ -9088,7 +9091,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "log", "parity-scale-codec", @@ -9104,7 +9107,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "cfg-if 1.0.0", "libc", @@ -9122,7 +9125,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "ahash", "async-trait", @@ -9162,7 +9165,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "finality-grandpa", "futures 0.3.21", @@ -9186,7 +9189,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "ansi_term", "futures 0.3.21", @@ -9203,7 +9206,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "async-trait", "hex", @@ -9218,7 +9221,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "async-trait", "asynchronous-codec 0.5.0", @@ -9267,7 +9270,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "ahash", "futures 0.3.21", @@ -9284,7 +9287,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "bytes 1.1.0", "fnv", @@ -9312,7 +9315,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "futures 0.3.21", "libp2p", @@ -9325,7 +9328,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -9334,7 +9337,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "futures 0.3.21", "hash-db", @@ -9365,7 +9368,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "futures 0.3.21", "jsonrpc-core", @@ -9391,7 +9394,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "futures 0.3.21", "jsonrpc-core", @@ -9408,7 +9411,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "async-trait", "directories", @@ -9472,7 +9475,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "log", "parity-scale-codec", @@ -9486,7 +9489,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -9507,7 +9510,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "chrono", "futures 0.3.21", @@ -9525,7 +9528,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "ansi_term", "atty", @@ -9556,7 +9559,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -9567,7 +9570,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "futures 0.3.21", "futures-timer", @@ -9594,7 +9597,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "futures 0.3.21", "log", @@ -9607,7 +9610,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "futures 0.3.21", "futures-timer", @@ -10111,7 +10114,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "hash-db", "log", @@ -10128,7 +10131,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "blake2 0.10.2", "proc-macro-crate 1.1.3", @@ -10140,7 +10143,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "parity-scale-codec", "scale-info", @@ -10153,7 +10156,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "integer-sqrt", "num-traits", @@ -10168,7 +10171,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "parity-scale-codec", "scale-info", @@ -10181,7 +10184,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "async-trait", "parity-scale-codec", @@ -10193,7 +10196,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "parity-scale-codec", "sp-api", @@ -10205,7 +10208,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "futures 0.3.21", "log", @@ -10223,7 +10226,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "async-trait", "futures 0.3.21", @@ -10242,7 +10245,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "async-trait", "merlin", @@ -10265,7 +10268,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "parity-scale-codec", "scale-info", @@ -10279,7 +10282,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -10291,7 +10294,7 @@ dependencies = [ [[package]] name = "sp-core" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "base58", "bitflags", @@ -10337,7 +10340,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "blake2 0.10.2", "byteorder", @@ -10351,7 +10354,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "proc-macro2", "quote", @@ -10362,7 +10365,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "kvdb", "parking_lot 0.12.0", @@ -10371,7 +10374,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "proc-macro2", "quote", @@ -10381,7 +10384,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "environmental", "parity-scale-codec", @@ -10392,7 +10395,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "finality-grandpa", "log", @@ -10410,7 +10413,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -10424,7 +10427,7 @@ dependencies = [ [[package]] name = "sp-io" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "futures 0.3.21", "hash-db", @@ -10449,7 +10452,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "lazy_static", "sp-core", @@ -10460,7 +10463,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "async-trait", "futures 0.3.21", @@ -10477,7 +10480,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "thiserror", "zstd", @@ -10486,7 +10489,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "parity-scale-codec", "scale-info", @@ -10500,7 +10503,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "sp-api", "sp-core", @@ -10510,7 +10513,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "backtrace", "lazy_static", @@ -10520,7 +10523,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "rustc-hash", "serde", @@ -10530,7 +10533,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "either", "hash256-std-hasher", @@ -10552,7 +10555,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -10569,7 +10572,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "Inflector", "proc-macro-crate 1.1.3", @@ -10581,7 +10584,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "serde", "serde_json", @@ -10590,7 +10593,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "parity-scale-codec", "scale-info", @@ -10604,7 +10607,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "parity-scale-codec", "scale-info", @@ -10615,7 +10618,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "hash-db", "log", @@ -10637,12 +10640,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" [[package]] name = "sp-storage" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10655,7 +10658,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "log", "sp-core", @@ -10668,7 +10671,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "async-trait", "futures-timer", @@ -10684,7 +10687,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "parity-scale-codec", "sp-std", @@ -10696,7 +10699,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "sp-api", "sp-runtime", @@ -10705,7 +10708,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "async-trait", "log", @@ -10721,7 +10724,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "hash-db", "memory-db", @@ -10737,7 +10740,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10754,7 +10757,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -10765,7 +10768,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "impl-trait-for-tuples", "log", @@ -10966,7 +10969,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "platforms", ] @@ -10974,7 +10977,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.21", @@ -10996,7 +10999,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "futures-util", "hyper", @@ -11009,7 +11012,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "async-trait", "futures 0.3.21", @@ -11035,7 +11038,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "futures 0.3.21", "substrate-test-utils-derive", @@ -11045,7 +11048,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -11056,7 +11059,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "ansi_term", "build-helper", @@ -11737,7 +11740,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#26ea75756b44de8b83f927c63c6ed46a0f040386" +source = "git+https://github.com/paritytech/substrate?branch=master#69079b58579ea36812c4a375a118f27aac0fb281" dependencies = [ "clap", "jsonrpsee 0.4.1", diff --git a/runtime/common/src/elections.rs b/runtime/common/src/elections.rs index 3a3ce5f85718..be0ebbd6b2d0 100644 --- a/runtime/common/src/elections.rs +++ b/runtime/common/src/elections.rs @@ -16,7 +16,10 @@ //! Code for elections. -use frame_election_provider_support::SortedListProvider; +use frame_election_provider_support::{ + onchain::{ExecutionConfig, UnboundedExecution}, + ElectionDataProvider, SequentialPhragmen, SortedListProvider, +}; use sp_std::{boxed::Box, marker::PhantomData}; /// Implements the weight types for the elections module and a specific @@ -64,9 +67,20 @@ impl pallet_election_provider_multi_phase::BenchmarkingConfig for BenchmarkConfi /// The accuracy type used for genesis election provider; pub type OnOnChainAccuracy = sp_runtime::Perbill; +/// Election Configuration parameters +pub struct OnChainSeqPhragmen(PhantomData<(T, S)>); +impl< + T: frame_system::Config, + S: ElectionDataProvider, + > ExecutionConfig for OnChainSeqPhragmen +{ + type System = T; + type Solver = SequentialPhragmen; + type DataProvider = S; +} + /// The election provider of the genesis -pub type GenesisElectionOf = - frame_election_provider_support::onchain::OnChainSequentialPhragmen; +pub type GenesisElectionOf = UnboundedExecution>; /// Implementation of `frame_election_provider_support::SortedListProvider` that updates the /// bags-list but uses [`pallet_staking::Nominators`] for `iter`. This is meant to be a transitionary diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 777f141436ce..1a7f57442dc8 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -29,8 +29,9 @@ use primitives::v2::{ SessionInfo, Signature, ValidationCode, ValidationCodeHash, ValidatorId, ValidatorIndex, }; use runtime_common::{ - auctions, claims, crowdloan, impl_runtime_weights, impls::DealWithFees, paras_registrar, - prod_or_fast, slots, BlockHashCount, BlockLength, CurrencyToVote, SlowAdjustingFeeUpdate, + auctions, claims, crowdloan, elections::OnChainSeqPhragmen, impl_runtime_weights, + impls::DealWithFees, paras_registrar, prod_or_fast, slots, BlockHashCount, BlockLength, + CurrencyToVote, SlowAdjustingFeeUpdate, }; use sp_std::{cmp::Ordering, collections::btree_map::BTreeMap, prelude::*}; @@ -45,6 +46,9 @@ use runtime_parachains::{ use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId; use beefy_primitives::crypto::AuthorityId as BeefyId; +use frame_election_provider_support::{ + generate_solution_type, onchain::UnboundedExecution, NposSolution, SequentialPhragmen, +}; use frame_support::{ construct_runtime, parameter_types, traits::{ @@ -413,7 +417,7 @@ parameter_types! { pub const MaxElectableTargets: u16 = u16::MAX; } -frame_election_provider_support::generate_solution_type!( +generate_solution_type!( #[compact] pub struct NposCompactSolution24::< VoterIndex = u32, @@ -445,9 +449,8 @@ impl pallet_election_provider_multi_phase::Config for Runtime { type DataProvider = Staking; type Solution = NposCompactSolution24; type Fallback = pallet_election_provider_multi_phase::NoFallback; - type GovernanceFallback = - frame_election_provider_support::onchain::OnChainSequentialPhragmen; - type Solver = frame_election_provider_support::SequentialPhragmen< + type GovernanceFallback = UnboundedExecution>; + type Solver = SequentialPhragmen< AccountId, pallet_election_provider_multi_phase::SolutionAccuracyOf, (), @@ -546,7 +549,7 @@ parameter_types! { pub const MaxNominatorRewardedPerValidator: u32 = 256; pub const OffendingValidatorsThreshold: Perbill = Perbill::from_percent(17); // 24 - pub const MaxNominations: u32 = ::LIMIT as u32; + pub const MaxNominations: u32 = ::LIMIT as u32; } type SlashCancelOrigin = EnsureOneOf< @@ -554,18 +557,13 @@ type SlashCancelOrigin = EnsureOneOf< pallet_collective::EnsureProportionAtLeast, >; -impl frame_election_provider_support::onchain::Config for Runtime { - type Accuracy = runtime_common::elections::OnOnChainAccuracy; - type DataProvider = Staking; -} - impl pallet_staking::Config for Runtime { type MaxNominations = MaxNominations; type Currency = Balances; type UnixTime = Timestamp; type CurrencyToVote = CurrencyToVote; type ElectionProvider = ElectionProviderMultiPhase; - type GenesisElectionProvider = runtime_common::elections::GenesisElectionOf; + type GenesisElectionProvider = runtime_common::elections::GenesisElectionOf; type RewardRemainder = Treasury; type Event = Event; type Slash = Treasury; diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index cddccbd92647..e89b098eefdc 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -22,8 +22,9 @@ use pallet_transaction_payment::CurrencyAdapter; use runtime_common::{ - auctions, claims, crowdloan, impl_runtime_weights, impls::DealWithFees, paras_registrar, - prod_or_fast, slots, BlockHashCount, BlockLength, CurrencyToVote, SlowAdjustingFeeUpdate, + auctions, claims, crowdloan, elections::OnChainSeqPhragmen, impl_runtime_weights, + impls::DealWithFees, paras_registrar, prod_or_fast, slots, BlockHashCount, BlockLength, + CurrencyToVote, SlowAdjustingFeeUpdate, }; use runtime_parachains::{ @@ -37,6 +38,9 @@ use runtime_parachains::{ use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId; use beefy_primitives::crypto::AuthorityId as BeefyId; +use frame_election_provider_support::{ + generate_solution_type, onchain::UnboundedExecution, SequentialPhragmen, +}; use frame_support::{ construct_runtime, parameter_types, traits::{ @@ -456,7 +460,7 @@ parameter_types! { pub const MaxElectableTargets: u16 = u16::MAX; } -frame_election_provider_support::generate_solution_type!( +generate_solution_type!( #[compact] pub struct NposCompactSolution16::< VoterIndex = u32, @@ -488,9 +492,8 @@ impl pallet_election_provider_multi_phase::Config for Runtime { type DataProvider = Staking; type Solution = NposCompactSolution16; type Fallback = pallet_election_provider_multi_phase::NoFallback; - type GovernanceFallback = - frame_election_provider_support::onchain::OnChainSequentialPhragmen; - type Solver = frame_election_provider_support::SequentialPhragmen< + type GovernanceFallback = UnboundedExecution>; + type Solver = SequentialPhragmen< AccountId, pallet_election_provider_multi_phase::SolutionAccuracyOf, (), @@ -551,11 +554,6 @@ type SlashCancelOrigin = EnsureOneOf< pallet_collective::EnsureProportionAtLeast, >; -impl frame_election_provider_support::onchain::Config for Runtime { - type Accuracy = runtime_common::elections::OnOnChainAccuracy; - type DataProvider = Staking; -} - impl pallet_staking::Config for Runtime { type MaxNominations = MaxNominations; type Currency = Balances; @@ -576,7 +574,7 @@ impl pallet_staking::Config for Runtime { type OffendingValidatorsThreshold = OffendingValidatorsThreshold; type NextNewSession = Session; type ElectionProvider = ElectionProviderMultiPhase; - type GenesisElectionProvider = runtime_common::elections::GenesisElectionOf; + type GenesisElectionProvider = runtime_common::elections::GenesisElectionOf; type VoterList = BagsList; type MaxUnlockingChunks = frame_support::traits::ConstU32<32>; type BenchmarkingConfig = runtime_common::StakingBenchmarkingConfig; diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs index 543cf75d868c..8adf4a54ea09 100644 --- a/runtime/test-runtime/src/lib.rs +++ b/runtime/test-runtime/src/lib.rs @@ -318,11 +318,6 @@ parameter_types! { pub const MaxAuthorities: u32 = 100_000; } -impl frame_election_provider_support::onchain::Config for Runtime { - type Accuracy = runtime_common::elections::OnOnChainAccuracy; - type DataProvider = Staking; -} - impl pallet_staking::Config for Runtime { type MaxNominations = frame_support::pallet_prelude::ConstU32<16>; type Currency = Balances; @@ -342,10 +337,14 @@ impl pallet_staking::Config for Runtime { type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator; type OffendingValidatorsThreshold = OffendingValidatorsThreshold; type NextNewSession = Session; - type ElectionProvider = - frame_election_provider_support::onchain::OnChainSequentialPhragmen; - type GenesisElectionProvider = - frame_election_provider_support::onchain::OnChainSequentialPhragmen; + type ElectionProvider = frame_election_provider_support::onchain::UnboundedExecution< + runtime_common::elections::OnChainSeqPhragmen, + >; + type GenesisElectionProvider = frame_election_provider_support::onchain::UnboundedExecution< + runtime_common::elections::OnChainSeqPhragmen, + >; + // Use the nominator map to iter voter AND no-ops for all SortedListProvider hooks. The migration + // to bags-list is a no-op, but the storage version will be updated. type VoterList = pallet_staking::UseNominatorsAndValidatorsMap; type MaxUnlockingChunks = frame_support::traits::ConstU32<32>; type BenchmarkingConfig = runtime_common::StakingBenchmarkingConfig; diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs index 436b12826846..01e766023bfb 100644 --- a/runtime/westend/src/lib.rs +++ b/runtime/westend/src/lib.rs @@ -22,6 +22,7 @@ use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId; use beefy_primitives::crypto::AuthorityId as BeefyId; +use frame_election_provider_support::{onchain::UnboundedExecution, SequentialPhragmen}; use frame_support::{ construct_runtime, parameter_types, traits::{Contains, InstanceFilter, KeyOwnerProofSystem, OnRuntimeUpgrade}, @@ -42,8 +43,9 @@ use primitives::v2::{ ValidatorIndex, ValidatorSignature, }; use runtime_common::{ - assigned_slots, auctions, crowdloan, impl_runtime_weights, impls::ToAuthor, paras_registrar, - paras_sudo_wrapper, slots, BlockHashCount, BlockLength, CurrencyToVote, SlowAdjustingFeeUpdate, + assigned_slots, auctions, crowdloan, elections::OnChainSeqPhragmen, impl_runtime_weights, + impls::ToAuthor, paras_registrar, paras_sudo_wrapper, slots, BlockHashCount, BlockLength, + CurrencyToVote, SlowAdjustingFeeUpdate, }; use runtime_parachains::{ configuration as parachains_configuration, disputes as parachains_disputes, @@ -390,9 +392,8 @@ impl pallet_election_provider_multi_phase::Config for Runtime { type DataProvider = Staking; type Solution = NposCompactSolution16; type Fallback = pallet_election_provider_multi_phase::NoFallback; - type GovernanceFallback = - frame_election_provider_support::onchain::OnChainSequentialPhragmen; - type Solver = frame_election_provider_support::SequentialPhragmen< + type GovernanceFallback = UnboundedExecution>; + type Solver = SequentialPhragmen< AccountId, pallet_election_provider_multi_phase::SolutionAccuracyOf, (), @@ -440,11 +441,6 @@ parameter_types! { pub const MaxNominations: u32 = ::LIMIT as u32; } -impl frame_election_provider_support::onchain::Config for Runtime { - type Accuracy = runtime_common::elections::OnOnChainAccuracy; - type DataProvider = Staking; -} - impl pallet_staking::Config for Runtime { type MaxNominations = MaxNominations; type Currency = Balances; @@ -465,7 +461,7 @@ impl pallet_staking::Config for Runtime { type OffendingValidatorsThreshold = OffendingValidatorsThreshold; type NextNewSession = Session; type ElectionProvider = ElectionProviderMultiPhase; - type GenesisElectionProvider = runtime_common::elections::GenesisElectionOf; + type GenesisElectionProvider = runtime_common::elections::GenesisElectionOf; type VoterList = BagsList; type MaxUnlockingChunks = frame_support::traits::ConstU32<32>; type BenchmarkingConfig = runtime_common::StakingBenchmarkingConfig;