From d4bfb55c0f086ba059a73df574e0e9e73de9afed Mon Sep 17 00:00:00 2001 From: Gavin Wood Date: Thu, 24 Sep 2020 23:52:20 +0200 Subject: [PATCH] Companion for #7111 (Introduce `cancel_proposal` and `blacklist`) (#1728) * Fixes * update weights * Fixes * Fixes * Fixes * update weights * "Update Substrate" Co-authored-by: Shawn Tabrizi Co-authored-by: parity-processbot <> --- polkadot/Cargo.lock | 269 +++++++++--------- polkadot/runtime/kusama/src/lib.rs | 18 +- .../kusama/src/weights/pallet_democracy.rs | 223 ++++++++------- polkadot/runtime/polkadot/src/lib.rs | 15 +- .../polkadot/src/weights/pallet_democracy.rs | 223 ++++++++------- 5 files changed, 403 insertions(+), 345 deletions(-) diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock index fe521ba3de..75905d83ce 100644 --- a/polkadot/Cargo.lock +++ b/polkadot/Cargo.lock @@ -1429,7 +1429,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "parity-scale-codec", ] @@ -1437,7 +1437,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-support", "frame-system", @@ -1455,8 +1455,9 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ + "chrono", "frame-benchmarking", "parity-scale-codec", "sc-cli", @@ -1473,7 +1474,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-support", "frame-system", @@ -1489,7 +1490,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "12.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "parity-scale-codec", "serde", @@ -1500,7 +1501,7 @@ dependencies = [ [[package]] name = "frame-support" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "bitmask", "frame-metadata", @@ -1525,7 +1526,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-support-procedural-tools", "proc-macro2 1.0.18", @@ -1536,7 +1537,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1548,7 +1549,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "proc-macro2 1.0.18", "quote 1.0.7", @@ -1558,7 +1559,7 @@ dependencies = [ [[package]] name = "frame-system" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1574,7 +1575,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-benchmarking", "frame-support", @@ -1588,7 +1589,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "parity-scale-codec", "sp-api", @@ -3756,7 +3757,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-support", "frame-system", @@ -3772,7 +3773,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-support", "frame-system", @@ -3787,7 +3788,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-benchmarking", "frame-support", @@ -3812,7 +3813,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-benchmarking", "frame-support", @@ -3826,7 +3827,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-benchmarking", "frame-support", @@ -3842,7 +3843,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-benchmarking", "frame-support", @@ -3857,7 +3858,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-benchmarking", "frame-support", @@ -3872,7 +3873,7 @@ dependencies = [ [[package]] name = "pallet-finality-tracker" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-support", "frame-system", @@ -3888,7 +3889,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-benchmarking", "frame-support", @@ -3910,7 +3911,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "enumflags2", "frame-benchmarking", @@ -3926,7 +3927,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-benchmarking", "frame-support", @@ -3946,7 +3947,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-support", "frame-system", @@ -3962,7 +3963,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-support", "frame-system", @@ -3976,7 +3977,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-support", "frame-system", @@ -3991,7 +3992,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-support", "frame-system", @@ -4005,7 +4006,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-support", "frame-system", @@ -4020,7 +4021,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-benchmarking", "frame-support", @@ -4041,7 +4042,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-support", "frame-system", @@ -4056,7 +4057,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-support", "frame-system", @@ -4069,7 +4070,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "enumflags2", "frame-support", @@ -4084,7 +4085,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-benchmarking", "frame-support", @@ -4099,7 +4100,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-support", "frame-system", @@ -4119,7 +4120,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-benchmarking", "frame-support", @@ -4135,7 +4136,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-support", "frame-system", @@ -4149,7 +4150,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-benchmarking", "frame-support", @@ -4171,7 +4172,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -4182,7 +4183,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-support", "frame-system", @@ -4196,7 +4197,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-benchmarking", "frame-support", @@ -4214,7 +4215,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-support", "frame-system", @@ -4231,7 +4232,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4249,7 +4250,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-support", "parity-scale-codec", @@ -4262,7 +4263,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-benchmarking", "frame-support", @@ -4277,7 +4278,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-benchmarking", "frame-support", @@ -4293,7 +4294,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "enumflags2", "frame-benchmarking", @@ -6480,7 +6481,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "bytes 0.5.6", "derive_more 0.99.9", @@ -6508,7 +6509,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6532,7 +6533,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -6549,7 +6550,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -6566,7 +6567,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -6577,7 +6578,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "ansi_term 0.12.1", "atty", @@ -6626,7 +6627,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "derive_more 0.99.9", "fnv", @@ -6662,7 +6663,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "blake2-rfc", "hash-db", @@ -6692,7 +6693,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "sc-client-api", "sp-blockchain", @@ -6703,7 +6704,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "derive_more 0.99.9", "fork-tree", @@ -6747,7 +6748,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "derive_more 0.99.9", "futures 0.3.5", @@ -6771,7 +6772,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "fork-tree", "parity-scale-codec", @@ -6784,7 +6785,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6807,7 +6808,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "log 0.4.11", "sc-client-api", @@ -6821,7 +6822,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "derive_more 0.99.9", "lazy_static", @@ -6849,7 +6850,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "derive_more 0.99.9", "log 0.4.11", @@ -6866,7 +6867,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "log 0.4.11", "parity-scale-codec", @@ -6881,7 +6882,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "log 0.4.11", "parity-scale-codec", @@ -6899,7 +6900,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "derive_more 0.99.9", "finality-grandpa", @@ -6936,7 +6937,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "derive_more 0.99.9", "finality-grandpa", @@ -6960,7 +6961,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "ansi_term 0.12.1", "futures 0.3.5", @@ -6978,7 +6979,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "derive_more 0.99.9", "hex", @@ -6994,7 +6995,7 @@ dependencies = [ [[package]] name = "sc-light" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "hash-db", "lazy_static", @@ -7013,7 +7014,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "async-std", "async-trait", @@ -7067,7 +7068,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -7082,7 +7083,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "bytes 0.5.6", "fnv", @@ -7109,7 +7110,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "futures 0.3.5", "libp2p", @@ -7122,7 +7123,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "log 0.4.11", "substrate-prometheus-endpoint", @@ -7131,7 +7132,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "futures 0.3.5", "hash-db", @@ -7163,7 +7164,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "derive_more 0.99.9", "futures 0.3.5", @@ -7187,7 +7188,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "futures 0.1.29", "jsonrpc-core", @@ -7205,7 +7206,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "derive_more 0.99.9", "directories", @@ -7267,7 +7268,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "log 0.4.11", "parity-scale-codec", @@ -7281,7 +7282,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -7302,7 +7303,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "erased-serde", "log 0.4.11", @@ -7321,7 +7322,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "derive_more 0.99.9", "futures 0.3.5", @@ -7342,7 +7343,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "derive_more 0.99.9", "futures 0.3.5", @@ -7809,7 +7810,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "derive_more 0.99.9", "log 0.4.11", @@ -7821,7 +7822,7 @@ dependencies = [ [[package]] name = "sp-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "hash-db", "parity-scale-codec", @@ -7836,7 +7837,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -7848,7 +7849,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "parity-scale-codec", "serde", @@ -7860,7 +7861,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "integer-sqrt", "num-traits 0.2.12", @@ -7873,7 +7874,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "parity-scale-codec", "sp-api", @@ -7885,7 +7886,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7896,7 +7897,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "parity-scale-codec", "sp-api", @@ -7908,7 +7909,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "derive_more 0.99.9", "log 0.4.11", @@ -7925,7 +7926,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "serde", "serde_json", @@ -7934,7 +7935,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "derive_more 0.99.9", "futures 0.3.5", @@ -7960,7 +7961,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "merlin", "parity-scale-codec", @@ -7979,7 +7980,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -7988,7 +7989,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -8000,7 +8001,7 @@ dependencies = [ [[package]] name = "sp-core" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "base58", "blake2-rfc", @@ -8044,7 +8045,7 @@ dependencies = [ [[package]] name = "sp-database" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -8053,7 +8054,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "proc-macro2 1.0.18", "quote 1.0.7", @@ -8063,7 +8064,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "environmental", "parity-scale-codec", @@ -8074,7 +8075,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "finality-grandpa", "log 0.4.11", @@ -8090,7 +8091,7 @@ dependencies = [ [[package]] name = "sp-finality-tracker" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -8100,7 +8101,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "derive_more 0.99.9", "parity-scale-codec", @@ -8112,7 +8113,7 @@ dependencies = [ [[package]] name = "sp-io" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "futures 0.3.5", "hash-db", @@ -8135,7 +8136,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "lazy_static", "sp-core", @@ -8146,7 +8147,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "parity-scale-codec", "serde", @@ -8158,7 +8159,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -8169,7 +8170,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "sp-api", "sp-core", @@ -8179,7 +8180,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "backtrace", "log 0.4.11", @@ -8188,7 +8189,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "serde", "sp-core", @@ -8197,7 +8198,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "either", "hash256-std-hasher", @@ -8219,7 +8220,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "parity-scale-codec", "primitive-types", @@ -8235,7 +8236,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "Inflector", "proc-macro-crate", @@ -8247,7 +8248,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "serde", "serde_json", @@ -8256,7 +8257,7 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "parity-scale-codec", "sp-api", @@ -8269,7 +8270,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -8279,7 +8280,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "hash-db", "log 0.4.11", @@ -8300,12 +8301,12 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" [[package]] name = "sp-storage" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8318,7 +8319,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8332,7 +8333,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "log 0.4.11", "parity-scale-codec", @@ -8345,7 +8346,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "derive_more 0.99.9", "futures 0.3.5", @@ -8360,7 +8361,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "hash-db", "memory-db", @@ -8374,7 +8375,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "futures 0.3.5", "futures-core", @@ -8386,7 +8387,7 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8398,7 +8399,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8539,7 +8540,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "chrono", "console_error_panic_hook", @@ -8565,7 +8566,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "platforms", ] @@ -8573,7 +8574,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.5", @@ -8596,7 +8597,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "async-std", "derive_more 0.99.9", @@ -8610,7 +8611,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "futures 0.1.29", "futures 0.3.5", @@ -8636,7 +8637,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "futures 0.3.5", "substrate-test-utils-derive", @@ -8646,7 +8647,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#a200cdb93c6af5763b9c7bf313fa708764ac88ca" +source = "git+https://github.com/paritytech/substrate#5ea23999bef9440d11572a87bd9a24da08b378a2" dependencies = [ "proc-macro-crate", "quote 1.0.7", diff --git a/polkadot/runtime/kusama/src/lib.rs b/polkadot/runtime/kusama/src/lib.rs index 70a091c9f3..89c115ae61 100644 --- a/polkadot/runtime/kusama/src/lib.rs +++ b/polkadot/runtime/kusama/src/lib.rs @@ -376,6 +376,7 @@ parameter_types! { pub const PreimageByteDeposit: Balance = 10 * MILLICENTS; pub const InstantAllowed: bool = true; pub const MaxVotes: u32 = 100; + pub const MaxProposals: u32 = 100; } impl pallet_democracy::Trait for Runtime { @@ -400,7 +401,19 @@ impl pallet_democracy::Trait for Runtime { type InstantAllowed = InstantAllowed; type FastTrackVotingPeriod = FastTrackVotingPeriod; // To cancel a proposal which has been passed, 2/3 of the council must agree to it. - type CancellationOrigin = pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, CouncilCollective>; + type CancellationOrigin = EnsureOneOf< + AccountId, + EnsureRoot, + pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, CouncilCollective>, + >; + // To cancel a proposal before it has been passed, the technical committee must be unanimous or + // Root must agree. + type CancelProposalOrigin = EnsureOneOf< + AccountId, + EnsureRoot, + pallet_collective::EnsureProportionAtLeast<_1, _1, AccountId, TechnicalCollective>, + >; + type BlacklistOrigin = EnsureRoot; // Any single technical committee member may veto a coming council proposal, however they can // only do it once and it lasts only for the cooloff period. type VetoOrigin = pallet_collective::EnsureMember; @@ -411,7 +424,8 @@ impl pallet_democracy::Trait for Runtime { type PalletsOrigin = OriginCaller; type MaxVotes = MaxVotes; type OperationalPreimageOrigin = pallet_collective::EnsureMember; - type WeightInfo = weights::pallet_democracy::WeightInfo; + type WeightInfo = weights::pallet_democracy::WeightInfo; + type MaxProposals = MaxProposals; } parameter_types! { diff --git a/polkadot/runtime/kusama/src/weights/pallet_democracy.rs b/polkadot/runtime/kusama/src/weights/pallet_democracy.rs index 676281309c..51eca2855a 100644 --- a/polkadot/runtime/kusama/src/weights/pallet_democracy.rs +++ b/polkadot/runtime/kusama/src/weights/pallet_democracy.rs @@ -1,156 +1,173 @@ -// Copyright 2019-2020 Parity Technologies (UK) Ltd. -// This file is part of Polkadot. +// This file is part of Substrate. -// Polkadot is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. +// Copyright (C) 2020 Parity Technologies (UK) Ltd. +// SPDX-License-Identifier: Apache-2.0 -// Polkadot is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. -// You should have received a copy of the GNU General Public License -// along with Polkadot. If not, see . +//! Weights for pallet_democracy +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0 +//! DATE: 2020-09-24, STEPS: [50], REPEAT: 20, LOW RANGE: [], HIGH RANGE: [] -//! Weights for the Democracy Pallet -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc5 +#![allow(unused_parens)] +#![allow(unused_imports)] -use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight}; +use frame_support::{traits::Get, weights::Weight}; +use sp_std::marker::PhantomData; -pub struct WeightInfo; -impl pallet_democracy::WeightInfo for WeightInfo { +pub struct WeightInfo(PhantomData); +impl pallet_democracy::WeightInfo for WeightInfo { fn propose() -> Weight { - (49113000 as Weight) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(3 as Weight)) + (96_316_000 as Weight) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn second(s: u32, ) -> Weight { - (42067000 as Weight) - .saturating_add((220000 as Weight).saturating_mul(s as Weight)) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) + (58_386_000 as Weight) + .saturating_add((259_000 as Weight).saturating_mul(s as Weight)) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn vote_new(r: u32, ) -> Weight { - (54159000 as Weight) - .saturating_add((252000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(3 as Weight)) - .saturating_add(DbWeight::get().writes(3 as Weight)) + (70_374_000 as Weight) + .saturating_add((291_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn vote_existing(r: u32, ) -> Weight { - (54145000 as Weight) - .saturating_add((262000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(3 as Weight)) - .saturating_add(DbWeight::get().writes(3 as Weight)) + (70_097_000 as Weight) + .saturating_add((296_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn emergency_cancel() -> Weight { - (31071000 as Weight) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) + (41_731_000 as Weight) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) + } + fn blacklist(p: u32, ) -> Weight { + (117_847_000 as Weight) + .saturating_add((871_000 as Weight).saturating_mul(p as Weight)) + .saturating_add(T::DbWeight::get().reads(5 as Weight)) + .saturating_add(T::DbWeight::get().writes(6 as Weight)) } fn external_propose(v: u32, ) -> Weight { - (14282000 as Weight) - .saturating_add((109000 as Weight).saturating_mul(v as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) + (20_972_000 as Weight) + .saturating_add((114_000 as Weight).saturating_mul(v as Weight)) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn external_propose_majority() -> Weight { - (3478000 as Weight) - .saturating_add(DbWeight::get().writes(1 as Weight)) + (5_030_000 as Weight) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn external_propose_default() -> Weight { - (3442000 as Weight) - .saturating_add(DbWeight::get().writes(1 as Weight)) + (4_981_000 as Weight) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn fast_track() -> Weight { - (30820000 as Weight) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(3 as Weight)) + (42_801_000 as Weight) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn veto_external(v: u32, ) -> Weight { - (30971000 as Weight) - .saturating_add((184000 as Weight).saturating_mul(v as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) + (44_115_000 as Weight) + .saturating_add((194_000 as Weight).saturating_mul(v as Weight)) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) + } + fn cancel_proposal(p: u32, ) -> Weight { + (73_937_000 as Weight) + .saturating_add((962_000 as Weight).saturating_mul(p as Weight)) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn cancel_referendum() -> Weight { - (20431000 as Weight) - .saturating_add(DbWeight::get().writes(1 as Weight)) + (25_233_000 as Weight) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn cancel_queued(r: u32, ) -> Weight { - (42438000 as Weight) - .saturating_add((3284000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) + (48_251_000 as Weight) + .saturating_add((3_590_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) } fn on_initialize_base(r: u32, ) -> Weight { - (70826000 as Weight) - .saturating_add((10716000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(6 as Weight)) - .saturating_add(DbWeight::get().reads((2 as Weight).saturating_mul(r as Weight))) - .saturating_add(DbWeight::get().writes(5 as Weight)) + (17_597_000 as Weight) + .saturating_add((7_248_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(T::DbWeight::get().reads(5 as Weight)) + .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) } fn delegate(r: u32, ) -> Weight { - (72046000 as Weight) - .saturating_add((7837000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(4 as Weight)) - .saturating_add(DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) - .saturating_add(DbWeight::get().writes(4 as Weight)) - .saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) + (93_916_000 as Weight) + .saturating_add((10_794_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(T::DbWeight::get().reads(4 as Weight)) + .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) + .saturating_add(T::DbWeight::get().writes(4 as Weight)) + .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) } fn undelegate(r: u32, ) -> Weight { - (41028000 as Weight) - .saturating_add((7810000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) - .saturating_add(DbWeight::get().writes(2 as Weight)) - .saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) + (47_855_000 as Weight) + .saturating_add((10_805_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) } fn clear_public_proposals() -> Weight { - (3643000 as Weight) - .saturating_add(DbWeight::get().writes(1 as Weight)) + (4_864_000 as Weight) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn note_preimage(b: u32, ) -> Weight { - (46629000 as Weight) - .saturating_add((4000 as Weight).saturating_mul(b as Weight)) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) + (66_754_000 as Weight) + .saturating_add((4_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn note_imminent_preimage(b: u32, ) -> Weight { - (31147000 as Weight) - .saturating_add((3000 as Weight).saturating_mul(b as Weight)) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) + (44_664_000 as Weight) + .saturating_add((3_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn reap_preimage(b: u32, ) -> Weight { - (42848000 as Weight) - .saturating_add((3000 as Weight).saturating_mul(b as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) + (59_968_000 as Weight) + .saturating_add((3_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn unlock_remove(r: u32, ) -> Weight { - (45333000 as Weight) - .saturating_add((171000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(3 as Weight)) - .saturating_add(DbWeight::get().writes(3 as Weight)) + (58_573_000 as Weight) + .saturating_add((131_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn unlock_set(r: u32, ) -> Weight { - (44424000 as Weight) - .saturating_add((291000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(3 as Weight)) - .saturating_add(DbWeight::get().writes(3 as Weight)) + (53_831_000 as Weight) + .saturating_add((324_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn remove_vote(r: u32, ) -> Weight { - (28250000 as Weight) - .saturating_add((283000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) + (31_846_000 as Weight) + .saturating_add((327_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) } fn remove_other_vote(r: u32, ) -> Weight { - (28250000 as Weight) - .saturating_add((283000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) + (31_880_000 as Weight) + .saturating_add((222_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) } } diff --git a/polkadot/runtime/polkadot/src/lib.rs b/polkadot/runtime/polkadot/src/lib.rs index f629cef9f1..e8edf95bb4 100644 --- a/polkadot/runtime/polkadot/src/lib.rs +++ b/polkadot/runtime/polkadot/src/lib.rs @@ -408,6 +408,7 @@ parameter_types! { pub const PreimageByteDeposit: Balance = 1 * CENTS; pub const InstantAllowed: bool = true; pub const MaxVotes: u32 = 100; + pub const MaxProposals: u32 = 100; } impl pallet_democracy::Trait for Runtime { @@ -447,10 +448,17 @@ impl pallet_democracy::Trait for Runtime { type InstantAllowed = InstantAllowed; type FastTrackVotingPeriod = FastTrackVotingPeriod; // To cancel a proposal which has been passed, 2/3 of the council must agree to it. - type CancellationOrigin = frame_system::EnsureOneOf, - frame_system::EnsureRoot, + EnsureRoot, >; + // To cancel a proposal before it has been passed, the technical committee must be unanimous or + // Root must agree. + type CancelProposalOrigin = EnsureOneOf, + EnsureRoot, + >; + type BlacklistOrigin = EnsureRoot; // Any single technical committee member may veto a coming council proposal, however they can // only do it once and it lasts only for the cooloff period. type VetoOrigin = pallet_collective::EnsureMember; @@ -461,7 +469,8 @@ impl pallet_democracy::Trait for Runtime { type Scheduler = Scheduler; type PalletsOrigin = OriginCaller; type MaxVotes = MaxVotes; - type WeightInfo = weights::pallet_democracy::WeightInfo; + type WeightInfo = weights::pallet_democracy::WeightInfo; + type MaxProposals = MaxProposals; } parameter_types! { diff --git a/polkadot/runtime/polkadot/src/weights/pallet_democracy.rs b/polkadot/runtime/polkadot/src/weights/pallet_democracy.rs index 676281309c..51eca2855a 100644 --- a/polkadot/runtime/polkadot/src/weights/pallet_democracy.rs +++ b/polkadot/runtime/polkadot/src/weights/pallet_democracy.rs @@ -1,156 +1,173 @@ -// Copyright 2019-2020 Parity Technologies (UK) Ltd. -// This file is part of Polkadot. +// This file is part of Substrate. -// Polkadot is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. +// Copyright (C) 2020 Parity Technologies (UK) Ltd. +// SPDX-License-Identifier: Apache-2.0 -// Polkadot is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. -// You should have received a copy of the GNU General Public License -// along with Polkadot. If not, see . +//! Weights for pallet_democracy +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0 +//! DATE: 2020-09-24, STEPS: [50], REPEAT: 20, LOW RANGE: [], HIGH RANGE: [] -//! Weights for the Democracy Pallet -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc5 +#![allow(unused_parens)] +#![allow(unused_imports)] -use frame_support::weights::{Weight, constants::RocksDbWeight as DbWeight}; +use frame_support::{traits::Get, weights::Weight}; +use sp_std::marker::PhantomData; -pub struct WeightInfo; -impl pallet_democracy::WeightInfo for WeightInfo { +pub struct WeightInfo(PhantomData); +impl pallet_democracy::WeightInfo for WeightInfo { fn propose() -> Weight { - (49113000 as Weight) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(3 as Weight)) + (96_316_000 as Weight) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn second(s: u32, ) -> Weight { - (42067000 as Weight) - .saturating_add((220000 as Weight).saturating_mul(s as Weight)) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) + (58_386_000 as Weight) + .saturating_add((259_000 as Weight).saturating_mul(s as Weight)) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn vote_new(r: u32, ) -> Weight { - (54159000 as Weight) - .saturating_add((252000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(3 as Weight)) - .saturating_add(DbWeight::get().writes(3 as Weight)) + (70_374_000 as Weight) + .saturating_add((291_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn vote_existing(r: u32, ) -> Weight { - (54145000 as Weight) - .saturating_add((262000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(3 as Weight)) - .saturating_add(DbWeight::get().writes(3 as Weight)) + (70_097_000 as Weight) + .saturating_add((296_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn emergency_cancel() -> Weight { - (31071000 as Weight) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) + (41_731_000 as Weight) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) + } + fn blacklist(p: u32, ) -> Weight { + (117_847_000 as Weight) + .saturating_add((871_000 as Weight).saturating_mul(p as Weight)) + .saturating_add(T::DbWeight::get().reads(5 as Weight)) + .saturating_add(T::DbWeight::get().writes(6 as Weight)) } fn external_propose(v: u32, ) -> Weight { - (14282000 as Weight) - .saturating_add((109000 as Weight).saturating_mul(v as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) + (20_972_000 as Weight) + .saturating_add((114_000 as Weight).saturating_mul(v as Weight)) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn external_propose_majority() -> Weight { - (3478000 as Weight) - .saturating_add(DbWeight::get().writes(1 as Weight)) + (5_030_000 as Weight) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn external_propose_default() -> Weight { - (3442000 as Weight) - .saturating_add(DbWeight::get().writes(1 as Weight)) + (4_981_000 as Weight) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn fast_track() -> Weight { - (30820000 as Weight) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(3 as Weight)) + (42_801_000 as Weight) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn veto_external(v: u32, ) -> Weight { - (30971000 as Weight) - .saturating_add((184000 as Weight).saturating_mul(v as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) + (44_115_000 as Weight) + .saturating_add((194_000 as Weight).saturating_mul(v as Weight)) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) + } + fn cancel_proposal(p: u32, ) -> Weight { + (73_937_000 as Weight) + .saturating_add((962_000 as Weight).saturating_mul(p as Weight)) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn cancel_referendum() -> Weight { - (20431000 as Weight) - .saturating_add(DbWeight::get().writes(1 as Weight)) + (25_233_000 as Weight) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn cancel_queued(r: u32, ) -> Weight { - (42438000 as Weight) - .saturating_add((3284000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) + (48_251_000 as Weight) + .saturating_add((3_590_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) } fn on_initialize_base(r: u32, ) -> Weight { - (70826000 as Weight) - .saturating_add((10716000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(6 as Weight)) - .saturating_add(DbWeight::get().reads((2 as Weight).saturating_mul(r as Weight))) - .saturating_add(DbWeight::get().writes(5 as Weight)) + (17_597_000 as Weight) + .saturating_add((7_248_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(T::DbWeight::get().reads(5 as Weight)) + .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) } fn delegate(r: u32, ) -> Weight { - (72046000 as Weight) - .saturating_add((7837000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(4 as Weight)) - .saturating_add(DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) - .saturating_add(DbWeight::get().writes(4 as Weight)) - .saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) + (93_916_000 as Weight) + .saturating_add((10_794_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(T::DbWeight::get().reads(4 as Weight)) + .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) + .saturating_add(T::DbWeight::get().writes(4 as Weight)) + .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) } fn undelegate(r: u32, ) -> Weight { - (41028000 as Weight) - .saturating_add((7810000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) - .saturating_add(DbWeight::get().writes(2 as Weight)) - .saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) + (47_855_000 as Weight) + .saturating_add((10_805_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) } fn clear_public_proposals() -> Weight { - (3643000 as Weight) - .saturating_add(DbWeight::get().writes(1 as Weight)) + (4_864_000 as Weight) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn note_preimage(b: u32, ) -> Weight { - (46629000 as Weight) - .saturating_add((4000 as Weight).saturating_mul(b as Weight)) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) + (66_754_000 as Weight) + .saturating_add((4_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn note_imminent_preimage(b: u32, ) -> Weight { - (31147000 as Weight) - .saturating_add((3000 as Weight).saturating_mul(b as Weight)) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) + (44_664_000 as Weight) + .saturating_add((3_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn reap_preimage(b: u32, ) -> Weight { - (42848000 as Weight) - .saturating_add((3000 as Weight).saturating_mul(b as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) + (59_968_000 as Weight) + .saturating_add((3_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn unlock_remove(r: u32, ) -> Weight { - (45333000 as Weight) - .saturating_add((171000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(3 as Weight)) - .saturating_add(DbWeight::get().writes(3 as Weight)) + (58_573_000 as Weight) + .saturating_add((131_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn unlock_set(r: u32, ) -> Weight { - (44424000 as Weight) - .saturating_add((291000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(3 as Weight)) - .saturating_add(DbWeight::get().writes(3 as Weight)) + (53_831_000 as Weight) + .saturating_add((324_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn remove_vote(r: u32, ) -> Weight { - (28250000 as Weight) - .saturating_add((283000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) + (31_846_000 as Weight) + .saturating_add((327_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) } fn remove_other_vote(r: u32, ) -> Weight { - (28250000 as Weight) - .saturating_add((283000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) + (31_880_000 as Weight) + .saturating_add((222_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) } }