diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock index 7170b70f6f..d5c34e3e8e 100644 --- a/polkadot/Cargo.lock +++ b/polkadot/Cargo.lock @@ -1920,7 +1920,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "parity-scale-codec", ] @@ -1938,7 +1938,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-support", "frame-system", @@ -1957,7 +1957,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "Inflector", "chrono", @@ -1983,7 +1983,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-support", "frame-system", @@ -1996,7 +1996,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-support", "frame-system", @@ -2011,7 +2011,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "14.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "parity-scale-codec", "serde", @@ -2022,7 +2022,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "bitflags", "frame-metadata", @@ -2048,7 +2048,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2060,7 +2060,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.0.0", @@ -2072,7 +2072,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "proc-macro2", "quote", @@ -2082,7 +2082,7 @@ dependencies = [ [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-metadata", "frame-support", @@ -2103,7 +2103,7 @@ dependencies = [ [[package]] name = "frame-support-test-pallet" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-support", "frame-system", @@ -2113,7 +2113,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-support", "log", @@ -2129,7 +2129,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-benchmarking", "frame-support", @@ -2143,7 +2143,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "parity-scale-codec", "sp-api", @@ -2152,7 +2152,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-support", "sp-api", @@ -4530,7 +4530,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b" [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-support", "frame-system", @@ -4545,7 +4545,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-support", "frame-system", @@ -4559,7 +4559,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-benchmarking", "frame-support", @@ -4582,7 +4582,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-benchmarking", "frame-support", @@ -4637,7 +4637,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-benchmarking", "frame-support", @@ -4715,7 +4715,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-benchmarking", "frame-support", @@ -4731,7 +4731,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-benchmarking", "frame-support", @@ -4746,7 +4746,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4769,7 +4769,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-benchmarking", "frame-support", @@ -4786,7 +4786,7 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-benchmarking", "frame-support", @@ -4800,7 +4800,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-benchmarking", "frame-support", @@ -4822,7 +4822,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4837,7 +4837,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-benchmarking", "frame-support", @@ -4856,7 +4856,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-benchmarking", "frame-support", @@ -4872,7 +4872,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-benchmarking", "frame-support", @@ -4888,7 +4888,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -4905,7 +4905,7 @@ dependencies = [ [[package]] name = "pallet-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-support", "frame-system", @@ -4921,7 +4921,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4938,7 +4938,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-benchmarking", "frame-support", @@ -4952,7 +4952,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-support", "frame-system", @@ -4965,7 +4965,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-support", "frame-system", @@ -4981,7 +4981,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5003,7 +5003,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-benchmarking", "frame-support", @@ -5017,7 +5017,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-support", "frame-system", @@ -5030,7 +5030,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-benchmarking", "frame-support", @@ -5045,7 +5045,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-support", "frame-system", @@ -5065,7 +5065,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-benchmarking", "frame-support", @@ -5081,7 +5081,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-support", "frame-system", @@ -5094,7 +5094,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5116,7 +5116,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -5127,7 +5127,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "log", "sp-arithmetic", @@ -5136,7 +5136,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-support", "frame-system", @@ -5149,7 +5149,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-benchmarking", "frame-support", @@ -5166,7 +5166,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-benchmarking", "frame-support", @@ -5181,7 +5181,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-support", "frame-system", @@ -5197,7 +5197,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5214,7 +5214,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5225,7 +5225,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-benchmarking", "frame-support", @@ -5241,7 +5241,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-benchmarking", "frame-support", @@ -5256,7 +5256,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-benchmarking", "frame-support", @@ -6609,6 +6609,7 @@ version = "0.9.9" dependencies = [ "bitvec 0.20.1", "frame-benchmarking", + "frame-election-provider-support", "frame-support", "frame-support-test", "frame-system", @@ -7647,7 +7648,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "env_logger 0.9.0", "jsonrpsee-proc-macros", @@ -7906,7 +7907,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "log", "sp-core", @@ -7917,7 +7918,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "async-trait", "derive_more", @@ -7944,7 +7945,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "futures 0.3.17", "futures-timer 3.0.2", @@ -7967,7 +7968,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -7983,7 +7984,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7999,7 +8000,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -8010,7 +8011,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "chrono", "fdlimit", @@ -8048,7 +8049,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "fnv", "futures 0.3.17", @@ -8076,7 +8077,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "hash-db", "kvdb", @@ -8101,7 +8102,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "async-trait", "futures 0.3.17", @@ -8125,7 +8126,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "async-trait", "derive_more", @@ -8168,7 +8169,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "derive_more", "futures 0.3.17", @@ -8192,7 +8193,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "fork-tree", "parity-scale-codec", @@ -8205,7 +8206,7 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "assert_matches", "async-trait", @@ -8239,7 +8240,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "async-trait", "futures 0.3.17", @@ -8265,7 +8266,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "sc-client-api", "sp-authorship", @@ -8276,7 +8277,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "lazy_static", "libsecp256k1 0.6.0", @@ -8302,7 +8303,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "derive_more", "environmental", @@ -8320,7 +8321,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "log", "parity-scale-codec", @@ -8336,7 +8337,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "cfg-if 1.0.0", "libc", @@ -8355,7 +8356,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "async-trait", "derive_more", @@ -8392,7 +8393,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "derive_more", "finality-grandpa", @@ -8416,7 +8417,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "ansi_term 0.12.1", "futures 0.3.17", @@ -8433,7 +8434,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "async-trait", "derive_more", @@ -8448,7 +8449,7 @@ dependencies = [ [[package]] name = "sc-light" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "hash-db", "parity-scale-codec", @@ -8466,7 +8467,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "async-std", "async-trait", @@ -8517,7 +8518,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "futures 0.3.17", "futures-timer 3.0.2", @@ -8533,7 +8534,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "bytes 1.0.1", "fnv", @@ -8560,7 +8561,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "futures 0.3.17", "libp2p", @@ -8573,7 +8574,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -8582,7 +8583,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "futures 0.3.17", "hash-db", @@ -8613,7 +8614,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "futures 0.3.17", "jsonrpc-core", @@ -8638,7 +8639,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "futures 0.3.17", "jsonrpc-core", @@ -8655,7 +8656,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "async-trait", "directories", @@ -8720,7 +8721,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "log", "parity-scale-codec", @@ -8734,7 +8735,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -8756,7 +8757,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "chrono", "futures 0.3.17", @@ -8774,7 +8775,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "ansi_term 0.12.1", "atty", @@ -8803,7 +8804,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -8814,7 +8815,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "futures 0.3.17", "intervalier", @@ -8841,7 +8842,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "derive_more", "futures 0.3.17", @@ -8855,7 +8856,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "futures 0.3.17", "futures-timer 3.0.2", @@ -9286,7 +9287,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "hash-db", "log", @@ -9303,7 +9304,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "blake2-rfc", "proc-macro-crate 1.0.0", @@ -9315,7 +9316,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "parity-scale-codec", "serde", @@ -9327,7 +9328,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "integer-sqrt", "num-traits", @@ -9341,7 +9342,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "parity-scale-codec", "sp-api", @@ -9353,7 +9354,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "async-trait", "parity-scale-codec", @@ -9365,7 +9366,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "parity-scale-codec", "sp-api", @@ -9377,7 +9378,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "futures 0.3.17", "log", @@ -9395,7 +9396,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "async-trait", "futures 0.3.17", @@ -9414,7 +9415,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "async-trait", "merlin", @@ -9436,7 +9437,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "parity-scale-codec", "sp-arithmetic", @@ -9446,7 +9447,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -9458,7 +9459,7 @@ dependencies = [ [[package]] name = "sp-core" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "base58", "blake2-rfc", @@ -9502,7 +9503,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "kvdb", "parking_lot 0.11.1", @@ -9511,7 +9512,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "proc-macro2", "quote", @@ -9521,7 +9522,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "environmental", "parity-scale-codec", @@ -9532,7 +9533,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "finality-grandpa", "log", @@ -9549,7 +9550,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -9563,7 +9564,7 @@ dependencies = [ [[package]] name = "sp-io" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "futures 0.3.17", "hash-db", @@ -9588,7 +9589,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "lazy_static", "sp-core", @@ -9599,7 +9600,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "async-trait", "derive_more", @@ -9616,7 +9617,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "zstd", ] @@ -9624,7 +9625,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "parity-scale-codec", "serde", @@ -9638,7 +9639,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -9649,7 +9650,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "sp-api", "sp-core", @@ -9659,7 +9660,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "backtrace", ] @@ -9667,7 +9668,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "rustc-hash", "serde", @@ -9677,7 +9678,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "either", "hash256-std-hasher", @@ -9698,7 +9699,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -9715,7 +9716,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "Inflector", "proc-macro-crate 1.0.0", @@ -9727,7 +9728,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "serde", "serde_json", @@ -9736,7 +9737,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "parity-scale-codec", "sp-api", @@ -9749,7 +9750,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -9759,7 +9760,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "hash-db", "log", @@ -9782,12 +9783,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" [[package]] name = "sp-storage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "impl-serde", "parity-scale-codec", @@ -9800,7 +9801,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "log", "sp-core", @@ -9813,7 +9814,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "async-trait", "futures-timer 3.0.2", @@ -9829,7 +9830,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "erased-serde", "log", @@ -9847,7 +9848,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "sp-api", "sp-runtime", @@ -9856,7 +9857,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "async-trait", "log", @@ -9871,7 +9872,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "hash-db", "memory-db", @@ -9885,7 +9886,7 @@ dependencies = [ [[package]] name = "sp-version" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "impl-serde", "parity-scale-codec", @@ -9900,7 +9901,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -9911,7 +9912,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -10107,7 +10108,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "platforms", ] @@ -10115,7 +10116,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.17", @@ -10137,7 +10138,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "async-std", "derive_more", @@ -10151,7 +10152,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "async-trait", "futures 0.3.17", @@ -10178,7 +10179,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "futures 0.3.17", "substrate-test-utils-derive", @@ -10188,7 +10189,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -10199,7 +10200,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "ansi_term 0.12.1", "build-helper", @@ -10352,7 +10353,7 @@ dependencies = [ [[package]] name = "test-runner" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "frame-system", "futures 0.3.17", @@ -10759,7 +10760,7 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#b674bd2338b645c41a7f2c21e696891c7e34500d" +source = "git+https://github.com/paritytech/substrate?branch=master#2ec7f55c8ab8e8d5241515076aba4770562d87cd" dependencies = [ "log", "parity-scale-codec", diff --git a/polkadot/runtime/common/Cargo.toml b/polkadot/runtime/common/Cargo.toml index 9d3cf52efd..9e3255969e 100644 --- a/polkadot/runtime/common/Cargo.toml +++ b/polkadot/runtime/common/Cargo.toml @@ -36,6 +36,7 @@ pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-election-provider-multi-phase = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-beefy-mmr = { git = "https://github.com/paritytech/grandpa-bridge-gadget", branch = "master", default-features = false } +frame-election-provider-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } diff --git a/polkadot/runtime/common/src/elections.rs b/polkadot/runtime/common/src/elections.rs index d42fe0d4dc..4e2b080bfc 100644 --- a/polkadot/runtime/common/src/elections.rs +++ b/polkadot/runtime/common/src/elections.rs @@ -56,6 +56,12 @@ impl pallet_election_provider_multi_phase::BenchmarkingConfig for BenchmarkConfi const MAXIMUM_TARGETS: u32 = 2000; } +/// The accuracy type used for genesis election provider; +pub type OnOnChainAccuracy = sp_runtime::Perbill; + +/// The election provider of the genesis +pub type GenesisElectionOf = frame_election_provider_support::onchain::OnChainSequentialPhragmen; + /// Maximum number of iterations for balancing that will be executed in the embedded miner of /// pallet-election-provider-multi-phase. pub const MINER_MAX_ITERATIONS: u32 = 10; diff --git a/polkadot/runtime/kusama/src/lib.rs b/polkadot/runtime/kusama/src/lib.rs index e04b6f0503..41686e0558 100644 --- a/polkadot/runtime/kusama/src/lib.rs +++ b/polkadot/runtime/kusama/src/lib.rs @@ -350,9 +350,6 @@ parameter_types! { pub const SignedDepositByte: Balance = deposit(0, 10) / 1024; // Each good submission will get 1/10 KSM as reward pub SignedRewardBase: Balance = UNITS / 10; - // fallback: emergency phase. - pub const Fallback: pallet_election_provider_multi_phase::FallbackStrategy = - pallet_election_provider_multi_phase::FallbackStrategy::Nothing; pub SolutionImprovementThreshold: Perbill = Perbill::from_rational(5u32, 10_000); // miner configs @@ -389,11 +386,10 @@ impl pallet_election_provider_multi_phase::Config for Runtime { type MinerTxPriority = NposSolutionPriority; type DataProvider = Staking; type Solution = NposCompactSolution24; - type OnChainAccuracy = Perbill; - type Fallback = Fallback; + type Fallback = pallet_election_provider_multi_phase::NoFallback; type Solver = frame_election_provider_support::SequentialPhragmen< AccountId, - pallet_election_provider_multi_phase::SolutionAccuracyOf, + pallet_election_provider_multi_phase::SolutionAccuracyOf, runtime_common::elections::OffchainRandomBalancing, >; type BenchmarkingConfig = runtime_common::elections::BenchmarkConfig; @@ -402,7 +398,7 @@ impl pallet_election_provider_multi_phase::Config for Runtime { EnsureRoot, pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, CouncilCollective>, >; - type WeightInfo = weights::pallet_election_provider_multi_phase::WeightInfo; + type WeightInfo = weights::pallet_election_provider_multi_phase::WeightInfo; } fn era_payout( @@ -483,6 +479,11 @@ type SlashCancelOrigin = EnsureOneOf< pallet_collective::EnsureProportionAtLeast<_1, _2, AccountId, CouncilCollective>, >; +impl frame_election_provider_support::onchain::Config for Runtime { + type Accuracy = runtime_common::elections::OnOnChainAccuracy; + type DataProvider = Staking; +} + impl pallet_staking::Config for Runtime { const MAX_NOMINATIONS: u32 = ::LIMIT as u32; @@ -490,10 +491,7 @@ impl pallet_staking::Config for Runtime { type UnixTime = Timestamp; type CurrencyToVote = CurrencyToVote; type ElectionProvider = ElectionProviderMultiPhase; - type GenesisElectionProvider = - frame_election_provider_support::onchain::OnChainSequentialPhragmen< - pallet_election_provider_multi_phase::OnChainConfig, - >; + type GenesisElectionProvider = runtime_common::elections::GenesisElectionOf; type RewardRemainder = Treasury; type Event = Event; type Slash = Treasury; diff --git a/polkadot/runtime/polkadot/src/lib.rs b/polkadot/runtime/polkadot/src/lib.rs index 15f394355b..9210d74fc6 100644 --- a/polkadot/runtime/polkadot/src/lib.rs +++ b/polkadot/runtime/polkadot/src/lib.rs @@ -356,9 +356,6 @@ parameter_types! { pub const SignedDepositByte: Balance = deposit(0, 10) / 1024; // Each good submission will get 1 DOT as reward pub SignedRewardBase: Balance = 1 * UNITS; - // fallback: emergency phase. - pub const Fallback: pallet_election_provider_multi_phase::FallbackStrategy = - pallet_election_provider_multi_phase::FallbackStrategy::Nothing; pub SolutionImprovementThreshold: Perbill = Perbill::from_rational(5u32, 10_000); // miner configs @@ -394,12 +391,11 @@ impl pallet_election_provider_multi_phase::Config for Runtime { type OffchainRepeat = OffchainRepeat; type MinerTxPriority = NposSolutionPriority; type DataProvider = Staking; - type OnChainAccuracy = Perbill; type Solution = NposCompactSolution16; - type Fallback = Fallback; + type Fallback = pallet_election_provider_multi_phase::NoFallback; type Solver = frame_election_provider_support::SequentialPhragmen< AccountId, - pallet_election_provider_multi_phase::SolutionAccuracyOf, + pallet_election_provider_multi_phase::SolutionAccuracyOf, runtime_common::elections::OffchainRandomBalancing, >; type BenchmarkingConfig = runtime_common::elections::BenchmarkConfig; @@ -408,7 +404,7 @@ impl pallet_election_provider_multi_phase::Config for Runtime { EnsureRoot, pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, CouncilCollective>, >; - type WeightInfo = weights::pallet_election_provider_multi_phase::WeightInfo; + type WeightInfo = weights::pallet_election_provider_multi_phase::WeightInfo; } // TODO #6469: This shouldn't be static, but a lazily cached value, not built unless needed, and @@ -443,6 +439,11 @@ type SlashCancelOrigin = EnsureOneOf< pallet_collective::EnsureProportionAtLeast<_3, _4, AccountId, CouncilCollective>, >; +impl frame_election_provider_support::onchain::Config for Runtime { + type Accuracy = runtime_common::elections::OnOnChainAccuracy; + type DataProvider = Staking; +} + impl pallet_staking::Config for Runtime { const MAX_NOMINATIONS: u32 = ::LIMIT as u32; @@ -463,10 +464,7 @@ impl pallet_staking::Config for Runtime { type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator; type NextNewSession = Session; type ElectionProvider = ElectionProviderMultiPhase; - type GenesisElectionProvider = - frame_election_provider_support::onchain::OnChainSequentialPhragmen< - pallet_election_provider_multi_phase::OnChainConfig, - >; + type GenesisElectionProvider = runtime_common::elections::GenesisElectionOf; type WeightInfo = weights::pallet_staking::WeightInfo; } diff --git a/polkadot/runtime/test-runtime/src/lib.rs b/polkadot/runtime/test-runtime/src/lib.rs index a82836deef..723ee44958 100644 --- a/polkadot/runtime/test-runtime/src/lib.rs +++ b/polkadot/runtime/test-runtime/src/lib.rs @@ -314,9 +314,7 @@ parameter_types! { } impl frame_election_provider_support::onchain::Config for Runtime { - type AccountId = ::AccountId; - type BlockNumber = ::BlockNumber; - type Accuracy = sp_runtime::Perbill; + type Accuracy = runtime_common::elections::OnOnChainAccuracy; type DataProvider = Staking; } diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs index c99c811cb0..24e522ef40 100644 --- a/polkadot/runtime/westend/src/lib.rs +++ b/polkadot/runtime/westend/src/lib.rs @@ -335,10 +335,6 @@ parameter_types! { pub const SignedDepositByte: Balance = deposit(0, 10) / 1024; // Each good submission will get 1 WND as reward pub SignedRewardBase: Balance = 1 * UNITS; - // fallback: emergency phase. - pub const Fallback: pallet_election_provider_multi_phase::FallbackStrategy = - pallet_election_provider_multi_phase::FallbackStrategy::Nothing; - pub SolutionImprovementThreshold: Perbill = Perbill::from_rational(5u32, 10_000); // miner configs @@ -374,17 +370,16 @@ impl pallet_election_provider_multi_phase::Config for Runtime { type OffchainRepeat = OffchainRepeat; type MinerTxPriority = NposSolutionPriority; type DataProvider = Staking; - type OnChainAccuracy = Perbill; type Solution = NposCompactSolution16; - type Fallback = Fallback; + type Fallback = pallet_election_provider_multi_phase::NoFallback; type Solver = frame_election_provider_support::SequentialPhragmen< AccountId, - pallet_election_provider_multi_phase::SolutionAccuracyOf, + pallet_election_provider_multi_phase::SolutionAccuracyOf, runtime_common::elections::OffchainRandomBalancing, >; type BenchmarkingConfig = runtime_common::elections::BenchmarkConfig; type ForceOrigin = EnsureRoot; - type WeightInfo = weights::pallet_election_provider_multi_phase::WeightInfo; + type WeightInfo = weights::pallet_election_provider_multi_phase::WeightInfo; } pallet_staking_reward_curve::build! { @@ -409,6 +404,11 @@ parameter_types! { pub const MaxNominatorRewardedPerValidator: u32 = 64; } +impl frame_election_provider_support::onchain::Config for Runtime { + type Accuracy = runtime_common::elections::OnOnChainAccuracy; + type DataProvider = Staking; +} + impl pallet_staking::Config for Runtime { const MAX_NOMINATIONS: u32 = ::LIMIT as u32; @@ -429,10 +429,7 @@ impl pallet_staking::Config for Runtime { type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator; type NextNewSession = Session; type ElectionProvider = ElectionProviderMultiPhase; - type GenesisElectionProvider = - frame_election_provider_support::onchain::OnChainSequentialPhragmen< - pallet_election_provider_multi_phase::OnChainConfig, - >; + type GenesisElectionProvider = runtime_common::elections::GenesisElectionOf; type WeightInfo = weights::pallet_staking::WeightInfo; }