From 1ff70d005c8c592ad2c3a580e2a82c597157aca6 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Fri, 24 Jun 2022 11:55:16 -0400 Subject: [PATCH 01/15] Fixes --- Cargo.lock | 433 +++++++++++------- runtime/kusama/src/lib.rs | 11 +- .../kusama/src/weights/pallet_democracy.rs | 192 +++----- .../kusama/src/weights/pallet_scheduler.rs | 154 +------ runtime/polkadot/src/lib.rs | 12 +- .../polkadot/src/weights/pallet_democracy.rs | 196 +++----- .../polkadot/src/weights/pallet_scheduler.rs | 162 +------ runtime/westend/src/lib.rs | 4 +- .../westend/src/weights/pallet_scheduler.rs | 162 +------ 9 files changed, 487 insertions(+), 839 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 15341b99c3ae..929ec332f461 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -424,7 +424,6 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "beefy-primitives", "fnv", @@ -458,7 +457,6 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -478,7 +476,6 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "beefy-primitives", "sp-api", @@ -487,7 +484,6 @@ dependencies = [ [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "parity-scale-codec", "scale-info", @@ -2109,7 +2105,6 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "parity-scale-codec", ] @@ -2127,7 +2122,6 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-support", "frame-system", @@ -2149,7 +2143,6 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "Inflector", "chrono", @@ -2200,7 +2193,6 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2211,7 +2203,6 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -2227,7 +2218,6 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-support", "frame-system", @@ -2255,7 +2245,6 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "bitflags", "frame-metadata", @@ -2285,7 +2274,6 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2297,7 +2285,6 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -2309,7 +2296,6 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "proc-macro2", "quote", @@ -2319,7 +2305,6 @@ dependencies = [ [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-support", "frame-support-test-pallet", @@ -2342,7 +2327,6 @@ dependencies = [ [[package]] name = "frame-support-test-pallet" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-support", "frame-system", @@ -2353,7 +2337,6 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-support", "log", @@ -2370,7 +2353,6 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-benchmarking", "frame-support", @@ -2385,7 +2367,6 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "parity-scale-codec", "sp-api", @@ -2394,7 +2375,6 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-support", "sp-api", @@ -2576,7 +2556,6 @@ dependencies = [ [[package]] name = "generate-bags" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "chrono", "frame-election-provider-support", @@ -4970,7 +4949,6 @@ checksum = "20448fd678ec04e6ea15bbe0476874af65e98a01515d667aa49f1434dc44ebf4" [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-benchmarking", "frame-support", @@ -4984,7 +4962,6 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-support", "frame-system", @@ -5000,7 +4977,6 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-support", "frame-system", @@ -5015,7 +4991,6 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5039,7 +5014,6 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5059,7 +5033,6 @@ dependencies = [ [[package]] name = "pallet-bags-list-remote-tests" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-election-provider-support", "frame-support", @@ -5078,7 +5051,6 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5093,7 +5065,6 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "beefy-primitives", "frame-support", @@ -5109,7 +5080,6 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -5132,7 +5102,6 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5214,7 +5183,6 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5233,7 +5201,6 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5250,7 +5217,6 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5258,6 +5224,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", + "sp-core", "sp-io", "sp-runtime", "sp-std", @@ -5266,7 +5233,6 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5289,7 +5255,6 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5302,7 +5267,6 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5320,7 +5284,6 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5335,7 +5298,6 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5358,7 +5320,6 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5374,7 +5335,6 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5394,7 +5354,6 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5411,7 +5370,6 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5428,7 +5386,6 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -5446,7 +5403,6 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -5461,7 +5417,6 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5476,7 +5431,6 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-support", "frame-system", @@ -5493,7 +5447,6 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5512,7 +5465,6 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-support", "frame-system", @@ -5529,7 +5481,6 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5552,11 +5503,11 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "scale-info", "sp-core", @@ -5568,7 +5519,6 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5583,7 +5533,6 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5598,7 +5547,6 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5614,7 +5562,6 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-support", "frame-system", @@ -5635,7 +5582,6 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5651,7 +5597,6 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-support", "frame-system", @@ -5665,7 +5610,6 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5688,7 +5632,6 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -5699,7 +5642,6 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "log", "sp-arithmetic", @@ -5708,7 +5650,6 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-support", "frame-system", @@ -5722,7 +5663,6 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5740,7 +5680,6 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5759,7 +5698,6 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-support", "frame-system", @@ -5775,7 +5713,6 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -5790,7 +5727,6 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5801,7 +5737,6 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5818,7 +5753,6 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5834,7 +5768,6 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8362,7 +8295,6 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "env_logger 0.9.0", "jsonrpsee", @@ -8714,7 +8646,6 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "log", "sp-core", @@ -8725,7 +8656,6 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "async-trait", "futures", @@ -8752,7 +8682,6 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "futures", "futures-timer", @@ -8775,7 +8704,6 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -8791,7 +8719,6 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.0", @@ -8808,7 +8735,6 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -8819,7 +8745,6 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "chrono", "clap", @@ -8858,7 +8783,6 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "fnv", "futures", @@ -8886,7 +8810,6 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "hash-db", "kvdb", @@ -8911,7 +8834,6 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "async-trait", "futures", @@ -8935,7 +8857,6 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "async-trait", "fork-tree", @@ -8978,7 +8899,6 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "futures", "jsonrpsee", @@ -9000,7 +8920,6 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "fork-tree", "parity-scale-codec", @@ -9013,7 +8932,6 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "async-trait", "futures", @@ -9038,7 +8956,6 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "sc-client-api", "sp-authorship", @@ -9049,7 +8966,6 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "lazy_static", "lru 0.7.7", @@ -9076,7 +8992,6 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "environmental", "parity-scale-codec", @@ -9093,7 +9008,6 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "log", "parity-scale-codec", @@ -9108,7 +9022,6 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "cfg-if 1.0.0", "libc", @@ -9126,7 +9039,6 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "ahash", "async-trait", @@ -9166,7 +9078,6 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "finality-grandpa", "futures", @@ -9187,7 +9098,6 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "ansi_term", "futures", @@ -9204,7 +9114,6 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "async-trait", "hex", @@ -9219,7 +9128,6 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "async-trait", "asynchronous-codec", @@ -9271,7 +9179,6 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "futures", "libp2p", @@ -9284,7 +9191,6 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "ahash", "futures", @@ -9301,7 +9207,6 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "futures", "libp2p", @@ -9321,7 +9226,6 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "bitflags", "either", @@ -9350,7 +9254,6 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "bytes", "fnv", @@ -9378,7 +9281,6 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "futures", "libp2p", @@ -9391,7 +9293,6 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -9400,7 +9301,6 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "futures", "hash-db", @@ -9430,7 +9330,6 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "futures", "jsonrpsee", @@ -9453,7 +9352,6 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "futures", "jsonrpsee", @@ -9466,7 +9364,6 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "async-trait", "directories", @@ -9531,7 +9428,6 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "log", "parity-scale-codec", @@ -9545,7 +9441,6 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -9564,7 +9459,6 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "futures", "libc", @@ -9583,7 +9477,6 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "chrono", "futures", @@ -9601,7 +9494,6 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "ansi_term", "atty", @@ -9632,7 +9524,6 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -9643,7 +9534,6 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "futures", "futures-timer", @@ -9670,7 +9560,6 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "futures", "log", @@ -9683,7 +9572,6 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "futures", "futures-timer", @@ -10156,7 +10044,6 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "hash-db", "log", @@ -10173,7 +10060,6 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "blake2", "proc-macro-crate", @@ -10185,7 +10071,6 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "parity-scale-codec", "scale-info", @@ -10198,7 +10083,6 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "integer-sqrt", "num-traits", @@ -10213,7 +10097,6 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "parity-scale-codec", "scale-info", @@ -10226,7 +10109,6 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "async-trait", "parity-scale-codec", @@ -10238,7 +10120,6 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "parity-scale-codec", "sp-api", @@ -10250,7 +10131,6 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "futures", "log", @@ -10268,7 +10148,6 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "async-trait", "futures", @@ -10287,7 +10166,6 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "async-trait", "merlin", @@ -10310,7 +10188,6 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "parity-scale-codec", "scale-info", @@ -10324,7 +10201,6 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "parity-scale-codec", "scale-info", @@ -10337,7 +10213,6 @@ dependencies = [ [[package]] name = "sp-core" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "base58", "bitflags", @@ -10383,7 +10258,6 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "blake2", "byteorder", @@ -10397,7 +10271,6 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "proc-macro2", "quote", @@ -10408,7 +10281,6 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "kvdb", "parking_lot 0.12.0", @@ -10417,7 +10289,6 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "proc-macro2", "quote", @@ -10427,7 +10298,6 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "environmental", "parity-scale-codec", @@ -10438,7 +10308,6 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "finality-grandpa", "log", @@ -10456,7 +10325,6 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -10470,7 +10338,6 @@ dependencies = [ [[package]] name = "sp-io" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "futures", "hash-db", @@ -10495,7 +10362,6 @@ dependencies = [ [[package]] name = "sp-keyring" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "lazy_static", "sp-core", @@ -10506,7 +10372,6 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "async-trait", "futures", @@ -10523,7 +10388,6 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "thiserror", "zstd", @@ -10532,7 +10396,6 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "log", "parity-scale-codec", @@ -10547,7 +10410,6 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "parity-scale-codec", "scale-info", @@ -10561,7 +10423,6 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "sp-api", "sp-core", @@ -10571,7 +10432,6 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "backtrace", "lazy_static", @@ -10581,7 +10441,6 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "rustc-hash", "serde", @@ -10591,7 +10450,6 @@ dependencies = [ [[package]] name = "sp-runtime" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "either", "hash256-std-hasher", @@ -10613,7 +10471,6 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -10630,7 +10487,6 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "Inflector", "proc-macro-crate", @@ -10642,7 +10498,6 @@ dependencies = [ [[package]] name = "sp-sandbox" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "log", "parity-scale-codec", @@ -10656,7 +10511,6 @@ dependencies = [ [[package]] name = "sp-serializer" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "serde", "serde_json", @@ -10665,7 +10519,6 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "parity-scale-codec", "scale-info", @@ -10679,7 +10532,6 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "parity-scale-codec", "scale-info", @@ -10690,7 +10542,6 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "hash-db", "log", @@ -10712,12 +10563,10 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" [[package]] name = "sp-storage" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10730,7 +10579,6 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "log", "sp-core", @@ -10743,7 +10591,6 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "async-trait", "futures-timer", @@ -10759,7 +10606,6 @@ dependencies = [ [[package]] name = "sp-tracing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "parity-scale-codec", "sp-std", @@ -10771,7 +10617,6 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "sp-api", "sp-runtime", @@ -10780,7 +10625,6 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "async-trait", "log", @@ -10796,7 +10640,6 @@ dependencies = [ [[package]] name = "sp-trie" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "hash-db", "memory-db", @@ -10812,7 +10655,6 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10829,7 +10671,6 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -10840,7 +10681,6 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "impl-trait-for-tuples", "log", @@ -11032,7 +10872,6 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "platforms", ] @@ -11040,7 +10879,6 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -11061,7 +10899,6 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "futures-util", "hyper", @@ -11074,7 +10911,6 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "jsonrpsee", "log", @@ -11095,7 +10931,6 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "async-trait", "futures", @@ -11121,7 +10956,6 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "futures", "substrate-test-utils-derive", @@ -11131,7 +10965,6 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -11142,7 +10975,6 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "ansi_term", "build-helper", @@ -11858,7 +11690,6 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60b945caca440fdf6a7be96b7dc0db54923f039d" dependencies = [ "clap", "jsonrpsee", @@ -12992,3 +12823,263 @@ dependencies = [ "cc", "libc", ] + +[[patch.unused]] +name = "chain-spec-builder" +version = "2.0.0" + +[[patch.unused]] +name = "frame-election-solution-type-fuzzer" +version = "2.0.0-alpha.5" + +[[patch.unused]] +name = "frame-support-test-compile-pass" +version = "4.0.0-dev" + +[[patch.unused]] +name = "node-bench" +version = "0.9.0-dev" + +[[patch.unused]] +name = "node-cli" +version = "3.0.0-dev" + +[[patch.unused]] +name = "node-executor" +version = "3.0.0-dev" + +[[patch.unused]] +name = "node-inspect" +version = "0.9.0-dev" + +[[patch.unused]] +name = "node-primitives" +version = "2.0.0" + +[[patch.unused]] +name = "node-rpc" +version = "3.0.0-dev" + +[[patch.unused]] +name = "node-runtime" +version = "3.0.0-dev" + +[[patch.unused]] +name = "node-runtime-generate-bags" +version = "3.0.0" + +[[patch.unused]] +name = "node-template" +version = "4.0.0-dev" + +[[patch.unused]] +name = "node-template-runtime" +version = "4.0.0-dev" + +[[patch.unused]] +name = "node-testing" +version = "3.0.0-dev" + +[[patch.unused]] +name = "pallet-alliance" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-asset-tx-payment" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-atomic-swap" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-aura" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-bags-list-fuzzer" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-contracts" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-contracts-primitives" +version = "6.0.0" + +[[patch.unused]] +name = "pallet-contracts-proc-macro" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-contracts-rpc" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-contracts-rpc-runtime-api" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-conviction-voting" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-example-basic" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-example-offchain-worker" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-example-parallel" +version = "3.0.0-dev" + +[[patch.unused]] +name = "pallet-lottery" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-nicks" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-node-authorization" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-nomination-pools-test-staking" +version = "1.0.0" + +[[patch.unused]] +name = "pallet-randomness-collective-flip" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-ranked-collective" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-referenda" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-remark" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-scored-pool" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-state-trie-migration" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-template" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-transaction-storage" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-uniques" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-whitelist" +version = "4.0.0-dev" + +[[patch.unused]] +name = "sc-consensus-aura" +version = "0.10.0-dev" + +[[patch.unused]] +name = "sc-consensus-manual-seal" +version = "0.10.0-dev" + +[[patch.unused]] +name = "sc-consensus-pow" +version = "0.10.0-dev" + +[[patch.unused]] +name = "sc-network-test" +version = "0.8.0" + +[[patch.unused]] +name = "sc-runtime-test" +version = "2.0.0" + +[[patch.unused]] +name = "sc-service-test" +version = "2.0.0" + +[[patch.unused]] +name = "sp-api-test" +version = "2.0.1" + +[[patch.unused]] +name = "sp-application-crypto-test" +version = "2.0.0" + +[[patch.unused]] +name = "sp-arithmetic-fuzzer" +version = "2.0.0" + +[[patch.unused]] +name = "sp-consensus-aura" +version = "0.10.0-dev" + +[[patch.unused]] +name = "sp-consensus-pow" +version = "0.10.0-dev" + +[[patch.unused]] +name = "sp-npos-elections-fuzzer" +version = "2.0.0-alpha.5" + +[[patch.unused]] +name = "sp-runtime-interface-test" +version = "2.0.0" + +[[patch.unused]] +name = "sp-runtime-interface-test-wasm" +version = "2.0.0" + +[[patch.unused]] +name = "sp-runtime-interface-test-wasm-deprecated" +version = "2.0.0" + +[[patch.unused]] +name = "sp-test-primitives" +version = "2.0.0" + +[[patch.unused]] +name = "subkey" +version = "2.0.2" + +[[patch.unused]] +name = "substrate-frame-cli" +version = "4.0.0-dev" + +[[patch.unused]] +name = "substrate-frame-rpc-support" +version = "3.0.0" + +[[patch.unused]] +name = "substrate-test-runtime" +version = "2.0.0" + +[[patch.unused]] +name = "substrate-test-runtime-client" +version = "2.0.0" + +[[patch.unused]] +name = "substrate-test-runtime-transaction-pool" +version = "2.0.0" + +[[patch.unused]] +name = "substrate-test-utils-test-crate" +version = "0.1.0" diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 93a6e6f836f0..1d3677302758 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -229,12 +229,10 @@ impl pallet_scheduler::Config for Runtime { type MaxScheduledPerBlock = MaxScheduledPerBlock; type WeightInfo = weights::pallet_scheduler::WeightInfo; type OriginPrivilegeCmp = OriginPrivilegeCmp; - type PreimageProvider = Preimage; - type NoPreimagePostponement = NoPreimagePostponement; + type Preimages = Preimage; } parameter_types! { - pub const PreimageMaxSize: u32 = 4096 * 1024; pub const PreimageBaseDeposit: Balance = deposit(2, 64); pub const PreimageByteDeposit: Balance = deposit(0, 1); } @@ -244,7 +242,6 @@ impl pallet_preimage::Config for Runtime { type Event = Event; type Currency = Balances; type ManagerOrigin = EnsureRoot; - type MaxSize = PreimageMaxSize; type BaseDeposit = PreimageBaseDeposit; type ByteDeposit = PreimageByteDeposit; } @@ -635,7 +632,6 @@ parameter_types! { } impl pallet_democracy::Config for Runtime { - type Proposal = Call; type Event = Event; type Currency = Balances; type EnactmentPeriod = EnactmentPeriod; @@ -677,14 +673,15 @@ impl pallet_democracy::Config for Runtime { // only do it once and it lasts only for the cooloff period. type VetoOrigin = pallet_collective::EnsureMember; type CooloffPeriod = CooloffPeriod; - type PreimageByteDeposit = PreimageByteDeposit; - type OperationalPreimageOrigin = pallet_collective::EnsureMember; type Slash = Treasury; type Scheduler = Scheduler; type PalletsOrigin = OriginCaller; type MaxVotes = MaxVotes; type WeightInfo = weights::pallet_democracy::WeightInfo; type MaxProposals = MaxProposals; + type Preimages = Preimage; + type MaxDeposits = ConstU32<100>; + type MaxBlacklisted = ConstU32<100>; } parameter_types! { diff --git a/runtime/kusama/src/weights/pallet_democracy.rs b/runtime/kusama/src/weights/pallet_democracy.rs index 8e9158da11c6..31de6f68fc53 100644 --- a/runtime/kusama/src/weights/pallet_democracy.rs +++ b/runtime/kusama/src/weights/pallet_democracy.rs @@ -49,45 +49,42 @@ impl pallet_democracy::WeightInfo for WeightInfo { // Storage: Democracy Blacklist (r:1 w:0) // Storage: Democracy DepositOf (r:0 w:1) fn propose() -> Weight { - (37_599_000 as Weight) + (48_328_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } // Storage: Democracy DepositOf (r:1 w:1) - /// The range of component `s` is `[0, 100]`. - fn second(s: u32, ) -> Weight { - (28_626_000 as Weight) + fn second() -> Weight { + (30_923_000 as Weight) // Standard Error: 1_000 - .saturating_add((88_000 as Weight).saturating_mul(s as Weight)) + .saturating_add((142_000 as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy VotingOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) - /// The range of component `r` is `[1, 99]`. - fn vote_new(r: u32, ) -> Weight { - (36_143_000 as Weight) - // Standard Error: 0 - .saturating_add((129_000 as Weight).saturating_mul(r as Weight)) + fn vote_new() -> Weight { + (40_345_000 as Weight) + // Standard Error: 1_000 + .saturating_add((140_000 as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy VotingOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) - /// The range of component `r` is `[1, 99]`. - fn vote_existing(r: u32, ) -> Weight { - (35_740_000 as Weight) - // Standard Error: 0 - .saturating_add((134_000 as Weight).saturating_mul(r as Weight)) + fn vote_existing() -> Weight { + (39_853_000 as Weight) + // Standard Error: 1_000 + .saturating_add((150_000 as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy Cancellations (r:1 w:1) fn emergency_cancel() -> Weight { - (17_934_000 as Weight) + (19_364_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } @@ -97,88 +94,82 @@ impl pallet_democracy::WeightInfo for WeightInfo { // Storage: Democracy Blacklist (r:0 w:1) // Storage: Democracy DepositOf (r:1 w:1) // Storage: System Account (r:1 w:1) - /// The range of component `p` is `[1, 100]`. - fn blacklist(p: u32, ) -> Weight { - (54_019_000 as Weight) - // Standard Error: 3_000 - .saturating_add((208_000 as Weight).saturating_mul(p as Weight)) + fn blacklist() -> Weight { + (57_708_000 as Weight) + // Standard Error: 4_000 + .saturating_add((192_000 as Weight)) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(6 as Weight)) } // Storage: Democracy NextExternal (r:1 w:1) // Storage: Democracy Blacklist (r:1 w:0) - /// The range of component `v` is `[1, 100]`. - fn external_propose(v: u32, ) -> Weight { - (10_637_000 as Weight) - // Standard Error: 1_000 - .saturating_add((26_000 as Weight).saturating_mul(v as Weight)) + fn external_propose() -> Weight { + (10_714_000 as Weight) + // Standard Error: 0 + .saturating_add((33_000 as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Democracy NextExternal (r:0 w:1) fn external_propose_majority() -> Weight { - (4_256_000 as Weight) + (3_697_000 as Weight) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Democracy NextExternal (r:0 w:1) fn external_propose_default() -> Weight { - (3_910_000 as Weight) + (3_831_000 as Weight) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Democracy NextExternal (r:1 w:1) // Storage: Democracy ReferendumCount (r:1 w:1) // Storage: Democracy ReferendumInfoOf (r:0 w:1) fn fast_track() -> Weight { - (18_324_000 as Weight) + (20_271_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } // Storage: Democracy NextExternal (r:1 w:1) // Storage: Democracy Blacklist (r:1 w:1) - /// The range of component `v` is `[0, 100]`. - fn veto_external(v: u32, ) -> Weight { - (19_330_000 as Weight) + fn veto_external() -> Weight { + (21_319_000 as Weight) // Standard Error: 0 - .saturating_add((60_000 as Weight).saturating_mul(v as Weight)) + .saturating_add((52_000 as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Democracy PublicProps (r:1 w:1) // Storage: Democracy DepositOf (r:1 w:1) // Storage: System Account (r:1 w:1) - /// The range of component `p` is `[1, 100]`. - fn cancel_proposal(p: u32, ) -> Weight { - (43_275_000 as Weight) - // Standard Error: 1_000 - .saturating_add((194_000 as Weight).saturating_mul(p as Weight)) + fn cancel_proposal() -> Weight { + (43_960_000 as Weight) + // Standard Error: 2_000 + .saturating_add((184_000 as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } // Storage: Democracy ReferendumInfoOf (r:0 w:1) fn cancel_referendum() -> Weight { - (12_879_000 as Weight) + (13_475_000 as Weight) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Scheduler Lookup (r:1 w:1) // Storage: Scheduler Agenda (r:1 w:1) - /// The range of component `r` is `[1, 99]`. - fn cancel_queued(r: u32, ) -> Weight { - (23_811_000 as Weight) - // Standard Error: 3_000 - .saturating_add((1_935_000 as Weight).saturating_mul(r as Weight)) + fn cancel_queued() -> Weight { + (24_320_000 as Weight) + // Standard Error: 1_000 + .saturating_add((560_000 as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Democracy LowestUnbaked (r:1 w:1) // Storage: Democracy ReferendumCount (r:1 w:0) // Storage: Democracy ReferendumInfoOf (r:1 w:0) - /// The range of component `r` is `[1, 99]`. - fn on_initialize_base(r: u32, ) -> Weight { - (1_518_000 as Weight) - // Standard Error: 3_000 - .saturating_add((3_035_000 as Weight).saturating_mul(r as Weight)) + fn on_initialize_base(_r: u32,) -> Weight { + (3_428_000 as Weight) + // Standard Error: 2_000 + .saturating_add((3_171_000 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().reads((1 as Weight))) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Democracy LowestUnbaked (r:1 w:1) @@ -187,112 +178,77 @@ impl pallet_democracy::WeightInfo for WeightInfo { // Storage: Democracy NextExternal (r:1 w:0) // Storage: Democracy PublicProps (r:1 w:0) // Storage: Democracy ReferendumInfoOf (r:1 w:0) - /// The range of component `r` is `[1, 99]`. - fn on_initialize_base_with_launch_period(r: u32, ) -> Weight { - (6_466_000 as Weight) + fn on_initialize_base_with_launch_period(_r: u32,) -> Weight { + (7_867_000 as Weight) // Standard Error: 2_000 - .saturating_add((3_030_000 as Weight).saturating_mul(r as Weight)) + .saturating_add((3_177_000 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))) + .saturating_add(T::DbWeight::get().reads((1 as Weight))) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Democracy VotingOf (r:3 w:3) // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) - /// The range of component `r` is `[1, 99]`. - fn delegate(r: u32, ) -> Weight { - (37_036_000 as Weight) - // Standard Error: 3_000 - .saturating_add((3_961_000 as Weight).saturating_mul(r as Weight)) + fn delegate(_v: u32,) -> Weight { + (37_902_000 as Weight) + // Standard Error: 4_000 + .saturating_add((4_335_000 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().reads((1 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))) + .saturating_add(T::DbWeight::get().writes((1 as Weight))) } // Storage: Democracy VotingOf (r:2 w:2) // Storage: Democracy ReferendumInfoOf (r:1 w:1) - /// The range of component `r` is `[1, 99]`. - fn undelegate(r: u32, ) -> Weight { - (20_072_000 as Weight) - // Standard Error: 2_000 - .saturating_add((3_920_000 as Weight).saturating_mul(r as Weight)) + fn undelegate(_v: u32,) -> Weight { + (21_272_000 as Weight) + // Standard Error: 3_000 + .saturating_add((4_351_000 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().reads((1 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))) + .saturating_add(T::DbWeight::get().writes((1 as Weight))) } // Storage: Democracy PublicProps (r:0 w:1) fn clear_public_proposals() -> Weight { - (4_230_000 as Weight) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } - // Storage: Democracy Preimages (r:1 w:1) - /// The range of component `b` is `[0, 16384]`. - fn note_preimage(b: u32, ) -> Weight { - (25_123_000 as Weight) - // Standard Error: 0 - .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)) - } - // Storage: Democracy Preimages (r:1 w:1) - /// The range of component `b` is `[0, 16384]`. - fn note_imminent_preimage(b: u32, ) -> Weight { - (18_007_000 as Weight) - // Standard Error: 0 - .saturating_add((2_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)) - } - // Storage: Democracy Preimages (r:1 w:1) - // Storage: System Account (r:1 w:0) - /// The range of component `b` is `[0, 16384]`. - fn reap_preimage(b: u32, ) -> Weight { - (25_534_000 as Weight) - // Standard Error: 0 - .saturating_add((1_000 as Weight).saturating_mul(b as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) + (4_913_000 as Weight) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Democracy VotingOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) // Storage: System Account (r:1 w:1) - /// The range of component `r` is `[1, 99]`. - fn unlock_remove(r: u32, ) -> Weight { - (23_337_000 as Weight) - // Standard Error: 0 - .saturating_add((35_000 as Weight).saturating_mul(r as Weight)) + fn unlock_remove() -> Weight { + (26_619_000 as Weight) + // Standard Error: 1_000 + .saturating_add((56_000 as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } // Storage: Democracy VotingOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) // Storage: System Account (r:1 w:1) - /// The range of component `r` is `[1, 99]`. - fn unlock_set(r: u32, ) -> Weight { - (22_595_000 as Weight) - // Standard Error: 0 - .saturating_add((118_000 as Weight).saturating_mul(r as Weight)) + fn unlock_set() -> Weight { + (25_373_000 as Weight) + // Standard Error: 1_000 + .saturating_add((142_000 as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy VotingOf (r:1 w:1) - /// The range of component `r` is `[1, 99]`. - fn remove_vote(r: u32, ) -> Weight { - (14_176_000 as Weight) - // Standard Error: 0 - .saturating_add((113_000 as Weight).saturating_mul(r as Weight)) + fn remove_vote() -> Weight { + (15_961_000 as Weight) + // Standard Error: 1_000 + .saturating_add((115_000 as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy VotingOf (r:1 w:1) - /// The range of component `r` is `[1, 99]`. - fn remove_other_vote(r: u32, ) -> Weight { - (14_328_000 as Weight) - // Standard Error: 0 - .saturating_add((115_000 as Weight).saturating_mul(r as Weight)) + fn remove_other_vote() -> Weight { + (15_992_000 as Weight) + // Standard Error: 1_000 + .saturating_add((113_000 as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } diff --git a/runtime/kusama/src/weights/pallet_scheduler.rs b/runtime/kusama/src/weights/pallet_scheduler.rs index 0233f6cd603e..f0ffe45ca283 100644 --- a/runtime/kusama/src/weights/pallet_scheduler.rs +++ b/runtime/kusama/src/weights/pallet_scheduler.rs @@ -44,163 +44,47 @@ use sp_std::marker::PhantomData; /// Weight functions for `pallet_scheduler`. pub struct WeightInfo(PhantomData); impl pallet_scheduler::WeightInfo for WeightInfo { - // Storage: Scheduler Agenda (r:2 w:2) - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:1) - // Storage: Scheduler Lookup (r:0 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_periodic_named_resolved(s: u32, ) -> Weight { - (2_368_000 as Weight) - // Standard Error: 40_000 - .saturating_add((26_438_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((4 as Weight).saturating_mul(s as Weight))) - } - // Storage: Scheduler Agenda (r:1 w:1) - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:1) - // Storage: Scheduler Lookup (r:0 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_named_resolved(s: u32, ) -> Weight { - (1_219_000 as Weight) - // Standard Error: 31_000 - .saturating_add((21_529_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(s as Weight))) - } - // Storage: Scheduler Agenda (r:2 w:2) - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_periodic_resolved(s: u32, ) -> Weight { - (0 as Weight) - // Standard Error: 36_000 - .saturating_add((24_281_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(s as Weight))) - } - // Storage: Scheduler Agenda (r:1 w:1) - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_resolved(s: u32, ) -> Weight { - (4_273_000 as Weight) - // Standard Error: 29_000 - .saturating_add((20_365_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(s as Weight))) - } - // Storage: Scheduler Agenda (r:2 w:2) - // Storage: Preimage PreimageFor (r:1 w:0) - // Storage: Scheduler Lookup (r:0 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_named_aborted(s: u32, ) -> Weight { - (5_169_000 as Weight) - // Standard Error: 15_000 - .saturating_add((9_048_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight))) - } - // Storage: Scheduler Agenda (r:2 w:2) - // Storage: Preimage PreimageFor (r:1 w:0) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_aborted(s: u32, ) -> Weight { - (5_315_000 as Weight) - // Standard Error: 13_000 - .saturating_add((6_973_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } - // Storage: Scheduler Agenda (r:2 w:2) - // Storage: Scheduler Lookup (r:0 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_periodic_named(s: u32, ) -> Weight { - (12_039_000 as Weight) - // Standard Error: 25_000 - .saturating_add((16_231_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(s as Weight))) - } - // Storage: Scheduler Agenda (r:2 w:2) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_periodic(s: u32, ) -> Weight { - (10_723_000 as Weight) - // Standard Error: 19_000 - .saturating_add((13_961_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight))) - } - // Storage: Scheduler Agenda (r:1 w:1) - // Storage: Scheduler Lookup (r:0 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_named(s: u32, ) -> Weight { - (11_270_000 as Weight) - // Standard Error: 24_000 - .saturating_add((11_633_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)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight))) - } - // Storage: Scheduler Agenda (r:1 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize(s: u32, ) -> Weight { - (12_051_000 as Weight) - // Standard Error: 15_000 - .saturating_add((10_607_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 service_agendas() -> Weight { 0 } + fn service_agenda(_i: u32, ) -> Weight { 0 } + fn service_task_base() -> Weight { 0 } + fn service_task_periodic() -> Weight { 0 } + fn service_task_named() -> Weight { 0 } + fn service_task_fetched(_s: u32, ) -> Weight { 0 } + fn execute_dispatch_signed() -> Weight { 0 } + fn execute_dispatch_unsigned() -> Weight { 0 } + // Storage: Scheduler Agenda (r:1 w:1) - /// The range of component `s` is `[0, 50]`. fn schedule(s: u32, ) -> Weight { - (19_419_000 as Weight) + (18_013_000 as Weight) // Standard Error: 1_000 - .saturating_add((39_000 as Weight).saturating_mul(s as Weight)) + .saturating_add((87_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)) } // Storage: Scheduler Agenda (r:1 w:1) // Storage: Scheduler Lookup (r:0 w:1) - /// The range of component `s` is `[1, 50]`. fn cancel(s: u32, ) -> Weight { - (18_945_000 as Weight) - // Standard Error: 6_000 - .saturating_add((2_018_000 as Weight).saturating_mul(s as Weight)) + (18_131_000 as Weight) + // Standard Error: 1_000 + .saturating_add((595_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Scheduler Lookup (r:1 w:1) // Storage: Scheduler Agenda (r:1 w:1) - /// The range of component `s` is `[0, 50]`. fn schedule_named(s: u32, ) -> Weight { - (22_501_000 as Weight) + (21_230_000 as Weight) // Standard Error: 1_000 - .saturating_add((55_000 as Weight).saturating_mul(s as Weight)) + .saturating_add((98_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Scheduler Lookup (r:1 w:1) // Storage: Scheduler Agenda (r:1 w:1) - /// The range of component `s` is `[1, 50]`. fn cancel_named(s: u32, ) -> Weight { - (20_359_000 as Weight) - // Standard Error: 6_000 - .saturating_add((2_021_000 as Weight).saturating_mul(s as Weight)) + (20_139_000 as Weight) + // Standard Error: 1_000 + .saturating_add((595_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index 5cb94013c2fc..c8a6dfe73e2d 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -42,7 +42,7 @@ use frame_support::{ construct_runtime, parameter_types, traits::{ Contains, EitherOfDiverse, InstanceFilter, KeyOwnerProofSystem, LockIdentifier, - PrivilegeCmp, + PrivilegeCmp, ConstU32, }, weights::ConstantMultiplier, PalletId, RuntimeDebug, @@ -272,8 +272,7 @@ impl pallet_scheduler::Config for Runtime { type MaxScheduledPerBlock = MaxScheduledPerBlock; type WeightInfo = weights::pallet_scheduler::WeightInfo; type OriginPrivilegeCmp = OriginPrivilegeCmp; - type PreimageProvider = Preimage; - type NoPreimagePostponement = NoPreimagePostponement; + type Preimages = Preimage; } parameter_types! { @@ -287,7 +286,6 @@ impl pallet_preimage::Config for Runtime { type Event = Event; type Currency = Balances; type ManagerOrigin = EnsureRoot; - type MaxSize = PreimageMaxSize; type BaseDeposit = PreimageBaseDeposit; type ByteDeposit = PreimageByteDeposit; } @@ -655,7 +653,6 @@ parameter_types! { } impl pallet_democracy::Config for Runtime { - type Proposal = Call; type Event = Event; type Currency = Balances; type EnactmentPeriod = EnactmentPeriod; @@ -707,14 +704,15 @@ impl pallet_democracy::Config for Runtime { // only do it once and it lasts only for the cooloff period. type VetoOrigin = pallet_collective::EnsureMember; type CooloffPeriod = CooloffPeriod; - type PreimageByteDeposit = PreimageByteDeposit; - type OperationalPreimageOrigin = pallet_collective::EnsureMember; type Slash = Treasury; type Scheduler = Scheduler; type PalletsOrigin = OriginCaller; type MaxVotes = MaxVotes; type WeightInfo = weights::pallet_democracy::WeightInfo; type MaxProposals = MaxProposals; + type Preimages = Preimage; + type MaxDeposits = ConstU32<100>; + type MaxBlacklisted = ConstU32<100>; } parameter_types! { diff --git a/runtime/polkadot/src/weights/pallet_democracy.rs b/runtime/polkadot/src/weights/pallet_democracy.rs index 1dd2d2de1b3b..31de6f68fc53 100644 --- a/runtime/polkadot/src/weights/pallet_democracy.rs +++ b/runtime/polkadot/src/weights/pallet_democracy.rs @@ -17,14 +17,14 @@ //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev //! DATE: 2022-06-20, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! HOSTNAME: `bm4`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024 +//! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024 // Executed Command: // ./target/production/polkadot // benchmark // pallet -// --chain=polkadot-dev +// --chain=kusama-dev // --steps=50 // --repeat=20 // --pallet=pallet_democracy @@ -32,7 +32,7 @@ // --execution=wasm // --wasm-execution=compiled // --header=./file_header.txt -// --output=./runtime/polkadot/src/weights/pallet_democracy.rs +// --output=./runtime/kusama/src/weights/pallet_democracy.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] @@ -49,45 +49,42 @@ impl pallet_democracy::WeightInfo for WeightInfo { // Storage: Democracy Blacklist (r:1 w:0) // Storage: Democracy DepositOf (r:0 w:1) fn propose() -> Weight { - (38_760_000 as Weight) + (48_328_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } // Storage: Democracy DepositOf (r:1 w:1) - /// The range of component `s` is `[0, 100]`. - fn second(s: u32, ) -> Weight { - (28_399_000 as Weight) - // Standard Error: 0 - .saturating_add((92_000 as Weight).saturating_mul(s as Weight)) + fn second() -> Weight { + (30_923_000 as Weight) + // Standard Error: 1_000 + .saturating_add((142_000 as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy VotingOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) - /// The range of component `r` is `[1, 99]`. - fn vote_new(r: u32, ) -> Weight { - (36_370_000 as Weight) - // Standard Error: 0 - .saturating_add((132_000 as Weight).saturating_mul(r as Weight)) + fn vote_new() -> Weight { + (40_345_000 as Weight) + // Standard Error: 1_000 + .saturating_add((140_000 as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy VotingOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) - /// The range of component `r` is `[1, 99]`. - fn vote_existing(r: u32, ) -> Weight { - (35_984_000 as Weight) - // Standard Error: 0 - .saturating_add((139_000 as Weight).saturating_mul(r as Weight)) + fn vote_existing() -> Weight { + (39_853_000 as Weight) + // Standard Error: 1_000 + .saturating_add((150_000 as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy Cancellations (r:1 w:1) fn emergency_cancel() -> Weight { - (18_382_000 as Weight) + (19_364_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } @@ -97,88 +94,82 @@ impl pallet_democracy::WeightInfo for WeightInfo { // Storage: Democracy Blacklist (r:0 w:1) // Storage: Democracy DepositOf (r:1 w:1) // Storage: System Account (r:1 w:1) - /// The range of component `p` is `[1, 100]`. - fn blacklist(p: u32, ) -> Weight { - (54_335_000 as Weight) - // Standard Error: 3_000 - .saturating_add((206_000 as Weight).saturating_mul(p as Weight)) + fn blacklist() -> Weight { + (57_708_000 as Weight) + // Standard Error: 4_000 + .saturating_add((192_000 as Weight)) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(6 as Weight)) } // Storage: Democracy NextExternal (r:1 w:1) // Storage: Democracy Blacklist (r:1 w:0) - /// The range of component `v` is `[1, 100]`. - fn external_propose(v: u32, ) -> Weight { - (10_113_000 as Weight) + fn external_propose() -> Weight { + (10_714_000 as Weight) // Standard Error: 0 - .saturating_add((31_000 as Weight).saturating_mul(v as Weight)) + .saturating_add((33_000 as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Democracy NextExternal (r:0 w:1) fn external_propose_majority() -> Weight { - (4_161_000 as Weight) + (3_697_000 as Weight) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Democracy NextExternal (r:0 w:1) fn external_propose_default() -> Weight { - (3_982_000 as Weight) + (3_831_000 as Weight) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Democracy NextExternal (r:1 w:1) // Storage: Democracy ReferendumCount (r:1 w:1) // Storage: Democracy ReferendumInfoOf (r:0 w:1) fn fast_track() -> Weight { - (18_469_000 as Weight) + (20_271_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } // Storage: Democracy NextExternal (r:1 w:1) // Storage: Democracy Blacklist (r:1 w:1) - /// The range of component `v` is `[0, 100]`. - fn veto_external(v: u32, ) -> Weight { - (19_497_000 as Weight) + fn veto_external() -> Weight { + (21_319_000 as Weight) // Standard Error: 0 - .saturating_add((59_000 as Weight).saturating_mul(v as Weight)) + .saturating_add((52_000 as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Democracy PublicProps (r:1 w:1) // Storage: Democracy DepositOf (r:1 w:1) // Storage: System Account (r:1 w:1) - /// The range of component `p` is `[1, 100]`. - fn cancel_proposal(p: u32, ) -> Weight { - (44_021_000 as Weight) - // Standard Error: 1_000 - .saturating_add((192_000 as Weight).saturating_mul(p as Weight)) + fn cancel_proposal() -> Weight { + (43_960_000 as Weight) + // Standard Error: 2_000 + .saturating_add((184_000 as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } // Storage: Democracy ReferendumInfoOf (r:0 w:1) fn cancel_referendum() -> Weight { - (12_749_000 as Weight) + (13_475_000 as Weight) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Scheduler Lookup (r:1 w:1) // Storage: Scheduler Agenda (r:1 w:1) - /// The range of component `r` is `[1, 99]`. - fn cancel_queued(r: u32, ) -> Weight { - (24_315_000 as Weight) - // Standard Error: 2_000 - .saturating_add((1_934_000 as Weight).saturating_mul(r as Weight)) + fn cancel_queued() -> Weight { + (24_320_000 as Weight) + // Standard Error: 1_000 + .saturating_add((560_000 as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Democracy LowestUnbaked (r:1 w:1) // Storage: Democracy ReferendumCount (r:1 w:0) // Storage: Democracy ReferendumInfoOf (r:1 w:0) - /// The range of component `r` is `[1, 99]`. - fn on_initialize_base(r: u32, ) -> Weight { - (1_409_000 as Weight) + fn on_initialize_base(_r: u32,) -> Weight { + (3_428_000 as Weight) // Standard Error: 2_000 - .saturating_add((3_021_000 as Weight).saturating_mul(r as Weight)) + .saturating_add((3_171_000 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().reads((1 as Weight))) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Democracy LowestUnbaked (r:1 w:1) @@ -187,112 +178,77 @@ impl pallet_democracy::WeightInfo for WeightInfo { // Storage: Democracy NextExternal (r:1 w:0) // Storage: Democracy PublicProps (r:1 w:0) // Storage: Democracy ReferendumInfoOf (r:1 w:0) - /// The range of component `r` is `[1, 99]`. - fn on_initialize_base_with_launch_period(r: u32, ) -> Weight { - (6_374_000 as Weight) + fn on_initialize_base_with_launch_period(_r: u32,) -> Weight { + (7_867_000 as Weight) // Standard Error: 2_000 - .saturating_add((3_024_000 as Weight).saturating_mul(r as Weight)) + .saturating_add((3_177_000 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))) + .saturating_add(T::DbWeight::get().reads((1 as Weight))) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Democracy VotingOf (r:3 w:3) // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) - /// The range of component `r` is `[1, 99]`. - fn delegate(r: u32, ) -> Weight { - (38_282_000 as Weight) - // Standard Error: 8_000 - .saturating_add((4_001_000 as Weight).saturating_mul(r as Weight)) + fn delegate(_v: u32,) -> Weight { + (37_902_000 as Weight) + // Standard Error: 4_000 + .saturating_add((4_335_000 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().reads((1 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))) + .saturating_add(T::DbWeight::get().writes((1 as Weight))) } // Storage: Democracy VotingOf (r:2 w:2) // Storage: Democracy ReferendumInfoOf (r:1 w:1) - /// The range of component `r` is `[1, 99]`. - fn undelegate(r: u32, ) -> Weight { - (20_343_000 as Weight) + fn undelegate(_v: u32,) -> Weight { + (21_272_000 as Weight) // Standard Error: 3_000 - .saturating_add((3_921_000 as Weight).saturating_mul(r as Weight)) + .saturating_add((4_351_000 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().reads((1 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))) + .saturating_add(T::DbWeight::get().writes((1 as Weight))) } // Storage: Democracy PublicProps (r:0 w:1) fn clear_public_proposals() -> Weight { - (4_326_000 as Weight) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } - // Storage: Democracy Preimages (r:1 w:1) - /// The range of component `b` is `[0, 16384]`. - fn note_preimage(b: u32, ) -> Weight { - (25_988_000 as Weight) - // Standard Error: 0 - .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)) - } - // Storage: Democracy Preimages (r:1 w:1) - /// The range of component `b` is `[0, 16384]`. - fn note_imminent_preimage(b: u32, ) -> Weight { - (18_549_000 as Weight) - // Standard Error: 0 - .saturating_add((2_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)) - } - // Storage: Democracy Preimages (r:1 w:1) - // Storage: System Account (r:1 w:0) - /// The range of component `b` is `[0, 16384]`. - fn reap_preimage(b: u32, ) -> Weight { - (26_198_000 as Weight) - // Standard Error: 0 - .saturating_add((1_000 as Weight).saturating_mul(b as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) + (4_913_000 as Weight) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Democracy VotingOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) // Storage: System Account (r:1 w:1) - /// The range of component `r` is `[1, 99]`. - fn unlock_remove(r: u32, ) -> Weight { - (23_408_000 as Weight) - // Standard Error: 0 - .saturating_add((34_000 as Weight).saturating_mul(r as Weight)) + fn unlock_remove() -> Weight { + (26_619_000 as Weight) + // Standard Error: 1_000 + .saturating_add((56_000 as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } // Storage: Democracy VotingOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) // Storage: System Account (r:1 w:1) - /// The range of component `r` is `[1, 99]`. - fn unlock_set(r: u32, ) -> Weight { - (22_694_000 as Weight) - // Standard Error: 0 - .saturating_add((123_000 as Weight).saturating_mul(r as Weight)) + fn unlock_set() -> Weight { + (25_373_000 as Weight) + // Standard Error: 1_000 + .saturating_add((142_000 as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy VotingOf (r:1 w:1) - /// The range of component `r` is `[1, 99]`. - fn remove_vote(r: u32, ) -> Weight { - (13_839_000 as Weight) - // Standard Error: 0 - .saturating_add((118_000 as Weight).saturating_mul(r as Weight)) + fn remove_vote() -> Weight { + (15_961_000 as Weight) + // Standard Error: 1_000 + .saturating_add((115_000 as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy VotingOf (r:1 w:1) - /// The range of component `r` is `[1, 99]`. - fn remove_other_vote(r: u32, ) -> Weight { - (14_110_000 as Weight) - // Standard Error: 0 - .saturating_add((117_000 as Weight).saturating_mul(r as Weight)) + fn remove_other_vote() -> Weight { + (15_992_000 as Weight) + // Standard Error: 1_000 + .saturating_add((113_000 as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } diff --git a/runtime/polkadot/src/weights/pallet_scheduler.rs b/runtime/polkadot/src/weights/pallet_scheduler.rs index ee156d2bf34b..f0ffe45ca283 100644 --- a/runtime/polkadot/src/weights/pallet_scheduler.rs +++ b/runtime/polkadot/src/weights/pallet_scheduler.rs @@ -17,14 +17,14 @@ //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev //! DATE: 2022-06-20, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! HOSTNAME: `bm4`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024 +//! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024 // Executed Command: // ./target/production/polkadot // benchmark // pallet -// --chain=polkadot-dev +// --chain=kusama-dev // --steps=50 // --repeat=20 // --pallet=pallet_scheduler @@ -32,7 +32,7 @@ // --execution=wasm // --wasm-execution=compiled // --header=./file_header.txt -// --output=./runtime/polkadot/src/weights/pallet_scheduler.rs +// --output=./runtime/kusama/src/weights/pallet_scheduler.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] @@ -44,163 +44,47 @@ use sp_std::marker::PhantomData; /// Weight functions for `pallet_scheduler`. pub struct WeightInfo(PhantomData); impl pallet_scheduler::WeightInfo for WeightInfo { - // Storage: Scheduler Agenda (r:2 w:2) - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:1) - // Storage: Scheduler Lookup (r:0 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_periodic_named_resolved(s: u32, ) -> Weight { - (2_739_000 as Weight) - // Standard Error: 32_000 - .saturating_add((26_230_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((4 as Weight).saturating_mul(s as Weight))) - } - // Storage: Scheduler Agenda (r:1 w:1) - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:1) - // Storage: Scheduler Lookup (r:0 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_named_resolved(s: u32, ) -> Weight { - (1_517_000 as Weight) - // Standard Error: 29_000 - .saturating_add((21_305_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(s as Weight))) - } - // Storage: Scheduler Agenda (r:2 w:2) - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_periodic_resolved(s: u32, ) -> Weight { - (1_851_000 as Weight) - // Standard Error: 29_000 - .saturating_add((23_826_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(s as Weight))) - } - // Storage: Scheduler Agenda (r:1 w:1) - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_resolved(s: u32, ) -> Weight { - (4_340_000 as Weight) - // Standard Error: 33_000 - .saturating_add((20_124_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(s as Weight))) - } - // Storage: Scheduler Agenda (r:2 w:2) - // Storage: Preimage PreimageFor (r:1 w:0) - // Storage: Scheduler Lookup (r:0 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_named_aborted(s: u32, ) -> Weight { - (5_748_000 as Weight) - // Standard Error: 13_000 - .saturating_add((8_979_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight))) - } - // Storage: Scheduler Agenda (r:2 w:2) - // Storage: Preimage PreimageFor (r:1 w:0) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_aborted(s: u32, ) -> Weight { - (5_823_000 as Weight) - // Standard Error: 10_000 - .saturating_add((6_938_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } - // Storage: Scheduler Agenda (r:2 w:2) - // Storage: Scheduler Lookup (r:0 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_periodic_named(s: u32, ) -> Weight { - (8_570_000 as Weight) - // Standard Error: 23_000 - .saturating_add((16_278_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(s as Weight))) - } - // Storage: Scheduler Agenda (r:2 w:2) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_periodic(s: u32, ) -> Weight { - (12_054_000 as Weight) - // Standard Error: 18_000 - .saturating_add((13_823_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight))) - } - // Storage: Scheduler Agenda (r:1 w:1) - // Storage: Scheduler Lookup (r:0 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_named(s: u32, ) -> Weight { - (11_777_000 as Weight) - // Standard Error: 13_000 - .saturating_add((11_441_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)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight))) - } - // Storage: Scheduler Agenda (r:1 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize(s: u32, ) -> Weight { - (15_020_000 as Weight) - // Standard Error: 69_000 - .saturating_add((10_582_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 service_agendas() -> Weight { 0 } + fn service_agenda(_i: u32, ) -> Weight { 0 } + fn service_task_base() -> Weight { 0 } + fn service_task_periodic() -> Weight { 0 } + fn service_task_named() -> Weight { 0 } + fn service_task_fetched(_s: u32, ) -> Weight { 0 } + fn execute_dispatch_signed() -> Weight { 0 } + fn execute_dispatch_unsigned() -> Weight { 0 } + // Storage: Scheduler Agenda (r:1 w:1) - /// The range of component `s` is `[0, 50]`. fn schedule(s: u32, ) -> Weight { - (19_644_000 as Weight) + (18_013_000 as Weight) // Standard Error: 1_000 - .saturating_add((43_000 as Weight).saturating_mul(s as Weight)) + .saturating_add((87_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)) } // Storage: Scheduler Agenda (r:1 w:1) // Storage: Scheduler Lookup (r:0 w:1) - /// The range of component `s` is `[1, 50]`. fn cancel(s: u32, ) -> Weight { - (18_988_000 as Weight) - // Standard Error: 6_000 - .saturating_add((2_019_000 as Weight).saturating_mul(s as Weight)) + (18_131_000 as Weight) + // Standard Error: 1_000 + .saturating_add((595_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Scheduler Lookup (r:1 w:1) // Storage: Scheduler Agenda (r:1 w:1) - /// The range of component `s` is `[0, 50]`. fn schedule_named(s: u32, ) -> Weight { - (22_760_000 as Weight) + (21_230_000 as Weight) // Standard Error: 1_000 - .saturating_add((55_000 as Weight).saturating_mul(s as Weight)) + .saturating_add((98_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Scheduler Lookup (r:1 w:1) // Storage: Scheduler Agenda (r:1 w:1) - /// The range of component `s` is `[1, 50]`. fn cancel_named(s: u32, ) -> Weight { - (20_361_000 as Weight) - // Standard Error: 6_000 - .saturating_add((2_030_000 as Weight).saturating_mul(s as Weight)) + (20_139_000 as Weight) + // Standard Error: 1_000 + .saturating_add((595_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs index b8139f77dc1d..132c1e9a4081 100644 --- a/runtime/westend/src/lib.rs +++ b/runtime/westend/src/lib.rs @@ -185,8 +185,7 @@ impl pallet_scheduler::Config for Runtime { type MaxScheduledPerBlock = MaxScheduledPerBlock; type WeightInfo = weights::pallet_scheduler::WeightInfo; type OriginPrivilegeCmp = frame_support::traits::EqualPrivilegeOnly; - type PreimageProvider = Preimage; - type NoPreimagePostponement = NoPreimagePostponement; + type Preimages = Preimage; } parameter_types! { @@ -200,7 +199,6 @@ impl pallet_preimage::Config for Runtime { type Event = Event; type Currency = Balances; type ManagerOrigin = EnsureRoot; - type MaxSize = PreimageMaxSize; type BaseDeposit = PreimageBaseDeposit; type ByteDeposit = PreimageByteDeposit; } diff --git a/runtime/westend/src/weights/pallet_scheduler.rs b/runtime/westend/src/weights/pallet_scheduler.rs index 730953580938..f0ffe45ca283 100644 --- a/runtime/westend/src/weights/pallet_scheduler.rs +++ b/runtime/westend/src/weights/pallet_scheduler.rs @@ -17,14 +17,14 @@ //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev //! DATE: 2022-06-20, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! HOSTNAME: `bm5`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westend-dev"), DB CACHE: 1024 +//! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024 // Executed Command: // ./target/production/polkadot // benchmark // pallet -// --chain=westend-dev +// --chain=kusama-dev // --steps=50 // --repeat=20 // --pallet=pallet_scheduler @@ -32,7 +32,7 @@ // --execution=wasm // --wasm-execution=compiled // --header=./file_header.txt -// --output=./runtime/westend/src/weights/pallet_scheduler.rs +// --output=./runtime/kusama/src/weights/pallet_scheduler.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] @@ -44,163 +44,47 @@ use sp_std::marker::PhantomData; /// Weight functions for `pallet_scheduler`. pub struct WeightInfo(PhantomData); impl pallet_scheduler::WeightInfo for WeightInfo { - // Storage: Scheduler Agenda (r:2 w:2) - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:1) - // Storage: Scheduler Lookup (r:0 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_periodic_named_resolved(s: u32, ) -> Weight { - (5_079_000 as Weight) - // Standard Error: 33_000 - .saturating_add((26_738_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((4 as Weight).saturating_mul(s as Weight))) - } - // Storage: Scheduler Agenda (r:1 w:1) - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:1) - // Storage: Scheduler Lookup (r:0 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_named_resolved(s: u32, ) -> Weight { - (5_021_000 as Weight) - // Standard Error: 24_000 - .saturating_add((21_541_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(s as Weight))) - } - // Storage: Scheduler Agenda (r:2 w:2) - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_periodic_resolved(s: u32, ) -> Weight { - (392_000 as Weight) - // Standard Error: 33_000 - .saturating_add((24_462_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(s as Weight))) - } - // Storage: Scheduler Agenda (r:1 w:1) - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_resolved(s: u32, ) -> Weight { - (1_755_000 as Weight) - // Standard Error: 76_000 - .saturating_add((20_919_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(s as Weight))) - } - // Storage: Scheduler Agenda (r:2 w:2) - // Storage: Preimage PreimageFor (r:1 w:0) - // Storage: Scheduler Lookup (r:0 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_named_aborted(s: u32, ) -> Weight { - (5_824_000 as Weight) - // Standard Error: 14_000 - .saturating_add((9_198_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight))) - } - // Storage: Scheduler Agenda (r:2 w:2) - // Storage: Preimage PreimageFor (r:1 w:0) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_aborted(s: u32, ) -> Weight { - (6_226_000 as Weight) - // Standard Error: 13_000 - .saturating_add((7_188_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } - // Storage: Scheduler Agenda (r:2 w:2) - // Storage: Scheduler Lookup (r:0 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_periodic_named(s: u32, ) -> Weight { - (10_112_000 as Weight) - // Standard Error: 24_000 - .saturating_add((16_279_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(s as Weight))) - } - // Storage: Scheduler Agenda (r:2 w:2) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_periodic(s: u32, ) -> Weight { - (10_797_000 as Weight) - // Standard Error: 20_000 - .saturating_add((14_070_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight))) - } - // Storage: Scheduler Agenda (r:1 w:1) - // Storage: Scheduler Lookup (r:0 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_named(s: u32, ) -> Weight { - (12_340_000 as Weight) - // Standard Error: 15_000 - .saturating_add((11_422_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)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight))) - } - // Storage: Scheduler Agenda (r:1 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize(s: u32, ) -> Weight { - (11_674_000 as Weight) - // Standard Error: 21_000 - .saturating_add((10_610_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 service_agendas() -> Weight { 0 } + fn service_agenda(_i: u32, ) -> Weight { 0 } + fn service_task_base() -> Weight { 0 } + fn service_task_periodic() -> Weight { 0 } + fn service_task_named() -> Weight { 0 } + fn service_task_fetched(_s: u32, ) -> Weight { 0 } + fn execute_dispatch_signed() -> Weight { 0 } + fn execute_dispatch_unsigned() -> Weight { 0 } + // Storage: Scheduler Agenda (r:1 w:1) - /// The range of component `s` is `[0, 50]`. fn schedule(s: u32, ) -> Weight { - (19_589_000 as Weight) + (18_013_000 as Weight) // Standard Error: 1_000 - .saturating_add((44_000 as Weight).saturating_mul(s as Weight)) + .saturating_add((87_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)) } // Storage: Scheduler Agenda (r:1 w:1) // Storage: Scheduler Lookup (r:0 w:1) - /// The range of component `s` is `[1, 50]`. fn cancel(s: u32, ) -> Weight { - (19_165_000 as Weight) - // Standard Error: 6_000 - .saturating_add((2_009_000 as Weight).saturating_mul(s as Weight)) + (18_131_000 as Weight) + // Standard Error: 1_000 + .saturating_add((595_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Scheduler Lookup (r:1 w:1) // Storage: Scheduler Agenda (r:1 w:1) - /// The range of component `s` is `[0, 50]`. fn schedule_named(s: u32, ) -> Weight { - (22_693_000 as Weight) + (21_230_000 as Weight) // Standard Error: 1_000 - .saturating_add((59_000 as Weight).saturating_mul(s as Weight)) + .saturating_add((98_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Scheduler Lookup (r:1 w:1) // Storage: Scheduler Agenda (r:1 w:1) - /// The range of component `s` is `[1, 50]`. fn cancel_named(s: u32, ) -> Weight { - (20_523_000 as Weight) - // Standard Error: 5_000 - .saturating_add((2_019_000 as Weight).saturating_mul(s as Weight)) + (20_139_000 as Weight) + // Standard Error: 1_000 + .saturating_add((595_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } From a09b0b93cf0c8f57d07fc3b637dede863b7136b5 Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Tue, 6 Sep 2022 12:21:07 +0200 Subject: [PATCH 02/15] Clear out old weights Signed-off-by: Oliver Tale-Yazdi --- .../kusama/src/weights/pallet_democracy.rs | 57 +------------------ .../kusama/src/weights/pallet_scheduler.rs | 35 +----------- .../polkadot/src/weights/pallet_democracy.rs | 57 +------------------ .../polkadot/src/weights/pallet_scheduler.rs | 35 +----------- .../westend/src/weights/pallet_scheduler.rs | 35 +----------- 5 files changed, 10 insertions(+), 209 deletions(-) diff --git a/runtime/kusama/src/weights/pallet_democracy.rs b/runtime/kusama/src/weights/pallet_democracy.rs index f6bc2b25b78e..4f552bf7e6ca 100644 --- a/runtime/kusama/src/weights/pallet_democracy.rs +++ b/runtime/kusama/src/weights/pallet_democracy.rs @@ -42,61 +42,8 @@ use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; use sp_std::marker::PhantomData; -/// Weight functions needed for pallet_democracy. -pub trait WeightInfo { - fn propose() -> Weight; - fn second() -> Weight; - fn vote_new() -> Weight; - fn vote_existing() -> Weight; - fn emergency_cancel() -> Weight; - fn blacklist() -> Weight; - fn external_propose() -> Weight; - fn external_propose_majority() -> Weight; - fn external_propose_default() -> Weight; - fn fast_track() -> Weight; - fn veto_external() -> Weight; - fn cancel_proposal() -> Weight; - fn cancel_referendum() -> Weight; - fn cancel_queued() -> Weight; - fn on_initialize_base(_r: u32,) -> Weight; - fn on_initialize_base_with_launch_period(_r: u32,) -> Weight; - fn delegate(_v: u32) -> Weight; - fn undelegate(_v: u32) -> Weight; - fn clear_public_proposals() -> Weight; - fn unlock_remove() -> Weight; - fn unlock_set() -> Weight; - fn remove_vote() -> Weight; - fn remove_other_vote() -> Weight; -} - -pub struct SubstrateWeight(PhantomData); -impl WeightInfo for SubstrateWeight { - fn propose() -> Weight { Weight::zero() } - fn second() -> Weight { Weight::zero() } - fn vote_new() -> Weight { Weight::zero() } - fn vote_existing() -> Weight { Weight::zero() } - fn emergency_cancel() -> Weight { Weight::zero() } - fn blacklist() -> Weight { Weight::zero() } - fn external_propose() -> Weight { Weight::zero() } - fn external_propose_majority() -> Weight { Weight::zero() } - fn external_propose_default() -> Weight { Weight::zero() } - fn fast_track() -> Weight { Weight::zero() } - fn veto_external() -> Weight { Weight::zero() } - fn cancel_proposal() -> Weight { Weight::zero() } - fn cancel_referendum() -> Weight { Weight::zero() } - fn cancel_queued() -> Weight { Weight::zero() } - fn on_initialize_base(_r: u32,) -> Weight { Weight::zero() } - fn on_initialize_base_with_launch_period(_r: u32,) -> Weight { Weight::zero() } - fn delegate(_v: u32) -> Weight { Weight::zero() } - fn undelegate(_v: u32) -> Weight { Weight::zero() } - fn clear_public_proposals() -> Weight { Weight::zero() } - fn unlock_remove() -> Weight { Weight::zero() } - fn unlock_set() -> Weight { Weight::zero() } - fn remove_vote() -> Weight { Weight::zero() } - fn remove_other_vote() -> Weight { Weight::zero() } -} - -impl WeightInfo for () { +pub struct WeightInfo(PhantomData); +impl pallet_democracy::WeightInfo for WeightInfo { fn propose() -> Weight { Weight::zero() } fn second() -> Weight { Weight::zero() } fn vote_new() -> Weight { Weight::zero() } diff --git a/runtime/kusama/src/weights/pallet_scheduler.rs b/runtime/kusama/src/weights/pallet_scheduler.rs index c6245483cd7d..2159151270d7 100644 --- a/runtime/kusama/src/weights/pallet_scheduler.rs +++ b/runtime/kusama/src/weights/pallet_scheduler.rs @@ -42,39 +42,8 @@ use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; use sp_std::marker::PhantomData; -/// Weight functions needed for pallet_scheduler. -pub trait WeightInfo { - fn service_agendas() -> Weight; - fn service_agenda(_i: u32, ) -> Weight; - fn service_task_base() -> Weight; - fn service_task_periodic() -> Weight; - fn service_task_named() -> Weight; - fn service_task_fetched(_s: u32, ) -> Weight; - fn execute_dispatch_signed() -> Weight; - fn execute_dispatch_unsigned() -> Weight; - fn schedule(_s: u32, ) -> Weight; - fn cancel(_s: u32, ) -> Weight; - fn schedule_named(_s: u32, ) -> Weight; - fn cancel_named(_s: u32, ) -> Weight; -} - -pub struct SubstrateWeight(PhantomData); -impl WeightInfo for SubstrateWeight { - fn service_agendas() -> Weight { Weight::zero() } - fn service_agenda(_i: u32, ) -> Weight { Weight::zero() } - fn service_task_base() -> Weight { Weight::zero() } - fn service_task_periodic() -> Weight { Weight::zero() } - fn service_task_named() -> Weight { Weight::zero() } - fn service_task_fetched(_s: u32, ) -> Weight { Weight::zero() } - fn execute_dispatch_signed() -> Weight { Weight::zero() } - fn execute_dispatch_unsigned() -> Weight { Weight::zero() } - fn schedule(_s: u32, ) -> Weight { Weight::zero() } - fn cancel(_s: u32, ) -> Weight { Weight::zero() } - fn schedule_named(_s: u32, ) -> Weight { Weight::zero() } - fn cancel_named(_s: u32, ) -> Weight { Weight::zero() } -} - -impl WeightInfo for () { +pub struct WeightInfo(PhantomData); +impl pallet_scheduler::WeightInfo for WeightInfo { fn service_agendas() -> Weight { Weight::zero() } fn service_agenda(_i: u32, ) -> Weight { Weight::zero() } fn service_task_base() -> Weight { Weight::zero() } diff --git a/runtime/polkadot/src/weights/pallet_democracy.rs b/runtime/polkadot/src/weights/pallet_democracy.rs index f6bc2b25b78e..4f552bf7e6ca 100644 --- a/runtime/polkadot/src/weights/pallet_democracy.rs +++ b/runtime/polkadot/src/weights/pallet_democracy.rs @@ -42,61 +42,8 @@ use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; use sp_std::marker::PhantomData; -/// Weight functions needed for pallet_democracy. -pub trait WeightInfo { - fn propose() -> Weight; - fn second() -> Weight; - fn vote_new() -> Weight; - fn vote_existing() -> Weight; - fn emergency_cancel() -> Weight; - fn blacklist() -> Weight; - fn external_propose() -> Weight; - fn external_propose_majority() -> Weight; - fn external_propose_default() -> Weight; - fn fast_track() -> Weight; - fn veto_external() -> Weight; - fn cancel_proposal() -> Weight; - fn cancel_referendum() -> Weight; - fn cancel_queued() -> Weight; - fn on_initialize_base(_r: u32,) -> Weight; - fn on_initialize_base_with_launch_period(_r: u32,) -> Weight; - fn delegate(_v: u32) -> Weight; - fn undelegate(_v: u32) -> Weight; - fn clear_public_proposals() -> Weight; - fn unlock_remove() -> Weight; - fn unlock_set() -> Weight; - fn remove_vote() -> Weight; - fn remove_other_vote() -> Weight; -} - -pub struct SubstrateWeight(PhantomData); -impl WeightInfo for SubstrateWeight { - fn propose() -> Weight { Weight::zero() } - fn second() -> Weight { Weight::zero() } - fn vote_new() -> Weight { Weight::zero() } - fn vote_existing() -> Weight { Weight::zero() } - fn emergency_cancel() -> Weight { Weight::zero() } - fn blacklist() -> Weight { Weight::zero() } - fn external_propose() -> Weight { Weight::zero() } - fn external_propose_majority() -> Weight { Weight::zero() } - fn external_propose_default() -> Weight { Weight::zero() } - fn fast_track() -> Weight { Weight::zero() } - fn veto_external() -> Weight { Weight::zero() } - fn cancel_proposal() -> Weight { Weight::zero() } - fn cancel_referendum() -> Weight { Weight::zero() } - fn cancel_queued() -> Weight { Weight::zero() } - fn on_initialize_base(_r: u32,) -> Weight { Weight::zero() } - fn on_initialize_base_with_launch_period(_r: u32,) -> Weight { Weight::zero() } - fn delegate(_v: u32) -> Weight { Weight::zero() } - fn undelegate(_v: u32) -> Weight { Weight::zero() } - fn clear_public_proposals() -> Weight { Weight::zero() } - fn unlock_remove() -> Weight { Weight::zero() } - fn unlock_set() -> Weight { Weight::zero() } - fn remove_vote() -> Weight { Weight::zero() } - fn remove_other_vote() -> Weight { Weight::zero() } -} - -impl WeightInfo for () { +pub struct WeightInfo(PhantomData); +impl pallet_democracy::WeightInfo for WeightInfo { fn propose() -> Weight { Weight::zero() } fn second() -> Weight { Weight::zero() } fn vote_new() -> Weight { Weight::zero() } diff --git a/runtime/polkadot/src/weights/pallet_scheduler.rs b/runtime/polkadot/src/weights/pallet_scheduler.rs index c6245483cd7d..2159151270d7 100644 --- a/runtime/polkadot/src/weights/pallet_scheduler.rs +++ b/runtime/polkadot/src/weights/pallet_scheduler.rs @@ -42,39 +42,8 @@ use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; use sp_std::marker::PhantomData; -/// Weight functions needed for pallet_scheduler. -pub trait WeightInfo { - fn service_agendas() -> Weight; - fn service_agenda(_i: u32, ) -> Weight; - fn service_task_base() -> Weight; - fn service_task_periodic() -> Weight; - fn service_task_named() -> Weight; - fn service_task_fetched(_s: u32, ) -> Weight; - fn execute_dispatch_signed() -> Weight; - fn execute_dispatch_unsigned() -> Weight; - fn schedule(_s: u32, ) -> Weight; - fn cancel(_s: u32, ) -> Weight; - fn schedule_named(_s: u32, ) -> Weight; - fn cancel_named(_s: u32, ) -> Weight; -} - -pub struct SubstrateWeight(PhantomData); -impl WeightInfo for SubstrateWeight { - fn service_agendas() -> Weight { Weight::zero() } - fn service_agenda(_i: u32, ) -> Weight { Weight::zero() } - fn service_task_base() -> Weight { Weight::zero() } - fn service_task_periodic() -> Weight { Weight::zero() } - fn service_task_named() -> Weight { Weight::zero() } - fn service_task_fetched(_s: u32, ) -> Weight { Weight::zero() } - fn execute_dispatch_signed() -> Weight { Weight::zero() } - fn execute_dispatch_unsigned() -> Weight { Weight::zero() } - fn schedule(_s: u32, ) -> Weight { Weight::zero() } - fn cancel(_s: u32, ) -> Weight { Weight::zero() } - fn schedule_named(_s: u32, ) -> Weight { Weight::zero() } - fn cancel_named(_s: u32, ) -> Weight { Weight::zero() } -} - -impl WeightInfo for () { +pub struct WeightInfo(PhantomData); +impl pallet_scheduler::WeightInfo for WeightInfo { fn service_agendas() -> Weight { Weight::zero() } fn service_agenda(_i: u32, ) -> Weight { Weight::zero() } fn service_task_base() -> Weight { Weight::zero() } diff --git a/runtime/westend/src/weights/pallet_scheduler.rs b/runtime/westend/src/weights/pallet_scheduler.rs index c6245483cd7d..2159151270d7 100644 --- a/runtime/westend/src/weights/pallet_scheduler.rs +++ b/runtime/westend/src/weights/pallet_scheduler.rs @@ -42,39 +42,8 @@ use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; use sp_std::marker::PhantomData; -/// Weight functions needed for pallet_scheduler. -pub trait WeightInfo { - fn service_agendas() -> Weight; - fn service_agenda(_i: u32, ) -> Weight; - fn service_task_base() -> Weight; - fn service_task_periodic() -> Weight; - fn service_task_named() -> Weight; - fn service_task_fetched(_s: u32, ) -> Weight; - fn execute_dispatch_signed() -> Weight; - fn execute_dispatch_unsigned() -> Weight; - fn schedule(_s: u32, ) -> Weight; - fn cancel(_s: u32, ) -> Weight; - fn schedule_named(_s: u32, ) -> Weight; - fn cancel_named(_s: u32, ) -> Weight; -} - -pub struct SubstrateWeight(PhantomData); -impl WeightInfo for SubstrateWeight { - fn service_agendas() -> Weight { Weight::zero() } - fn service_agenda(_i: u32, ) -> Weight { Weight::zero() } - fn service_task_base() -> Weight { Weight::zero() } - fn service_task_periodic() -> Weight { Weight::zero() } - fn service_task_named() -> Weight { Weight::zero() } - fn service_task_fetched(_s: u32, ) -> Weight { Weight::zero() } - fn execute_dispatch_signed() -> Weight { Weight::zero() } - fn execute_dispatch_unsigned() -> Weight { Weight::zero() } - fn schedule(_s: u32, ) -> Weight { Weight::zero() } - fn cancel(_s: u32, ) -> Weight { Weight::zero() } - fn schedule_named(_s: u32, ) -> Weight { Weight::zero() } - fn cancel_named(_s: u32, ) -> Weight { Weight::zero() } -} - -impl WeightInfo for () { +pub struct WeightInfo(PhantomData); +impl pallet_scheduler::WeightInfo for WeightInfo { fn service_agendas() -> Weight { Weight::zero() } fn service_agenda(_i: u32, ) -> Weight { Weight::zero() } fn service_task_base() -> Weight { Weight::zero() } From 5b158f5a14ac624ceee7426f74e19bc8ed6bea07 Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Tue, 6 Sep 2022 12:42:07 +0200 Subject: [PATCH 03/15] Resolve merges Signed-off-by: Oliver Tale-Yazdi --- runtime/kusama/src/governance/old.rs | 6 +- runtime/kusama/src/lib.rs | 151 --------------------------- runtime/polkadot/src/lib.rs | 10 +- 3 files changed, 8 insertions(+), 159 deletions(-) diff --git a/runtime/kusama/src/governance/old.rs b/runtime/kusama/src/governance/old.rs index a87ddf6ec1fc..12c810a0553e 100644 --- a/runtime/kusama/src/governance/old.rs +++ b/runtime/kusama/src/governance/old.rs @@ -32,7 +32,6 @@ parameter_types! { } impl pallet_democracy::Config for Runtime { - type Proposal = Call; type Event = Event; type Currency = Balances; type EnactmentPeriod = EnactmentPeriod; @@ -74,14 +73,15 @@ impl pallet_democracy::Config for Runtime { // only do it once and it lasts only for the cooloff period. type VetoOrigin = pallet_collective::EnsureMember; type CooloffPeriod = CooloffPeriod; - type PreimageByteDeposit = PreimageByteDeposit; - type OperationalPreimageOrigin = pallet_collective::EnsureMember; type Slash = Treasury; type Scheduler = Scheduler; type PalletsOrigin = OriginCaller; type MaxVotes = MaxVotes; type WeightInfo = weights::pallet_democracy::WeightInfo; type MaxProposals = MaxProposals; + type Preimages = Preimage; + type MaxDeposits = ConstU32<100>; + type MaxBlacklisted = ConstU32<100>; } parameter_types! { diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 7e2d1146c542..36597a5ebf28 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -628,157 +628,6 @@ impl pallet_staking::Config for Runtime { } parameter_types! { -<<<<<<< HEAD - pub LaunchPeriod: BlockNumber = prod_or_fast!(7 * DAYS, 1, "KSM_LAUNCH_PERIOD"); - pub VotingPeriod: BlockNumber = prod_or_fast!(7 * DAYS, 1 * MINUTES, "KSM_VOTING_PERIOD"); - pub FastTrackVotingPeriod: BlockNumber = prod_or_fast!(3 * HOURS, 1 * MINUTES, "KSM_FAST_TRACK_VOTING_PERIOD"); - pub const MinimumDeposit: Balance = 100 * CENTS; - pub EnactmentPeriod: BlockNumber = prod_or_fast!(8 * DAYS, 1, "KSM_ENACTMENT_PERIOD"); - pub CooloffPeriod: BlockNumber = prod_or_fast!(7 * DAYS, 1 * MINUTES, "KSM_COOLOFF_PERIOD"); - pub const InstantAllowed: bool = true; - pub const MaxVotes: u32 = 100; - pub const MaxProposals: u32 = 100; -} - -impl pallet_democracy::Config for Runtime { - type Event = Event; - type Currency = Balances; - type EnactmentPeriod = EnactmentPeriod; - type VoteLockingPeriod = EnactmentPeriod; - type LaunchPeriod = LaunchPeriod; - type VotingPeriod = VotingPeriod; - type MinimumDeposit = MinimumDeposit; - /// A straight majority of the council can decide what their next motion is. - type ExternalOrigin = - pallet_collective::EnsureProportionAtLeast; - /// A majority can have the next scheduled referendum be a straight majority-carries vote. - type ExternalMajorityOrigin = - pallet_collective::EnsureProportionAtLeast; - /// A unanimous council can have the next scheduled referendum be a straight default-carries - /// (NTB) vote. - type ExternalDefaultOrigin = - pallet_collective::EnsureProportionAtLeast; - /// Two thirds of the technical committee can have an `ExternalMajority/ExternalDefault` vote - /// be tabled immediately and with a shorter voting/enactment period. - type FastTrackOrigin = - pallet_collective::EnsureProportionAtLeast; - type InstantOrigin = - pallet_collective::EnsureProportionAtLeast; - 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 = EitherOfDiverse< - EnsureRoot, - pallet_collective::EnsureProportionAtLeast, - >; - type BlacklistOrigin = EnsureRoot; - // To cancel a proposal before it has been passed, the technical committee must be unanimous or - // Root must agree. - type CancelProposalOrigin = EitherOfDiverse< - EnsureRoot, - pallet_collective::EnsureProportionAtLeast, - >; - // 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; - type CooloffPeriod = CooloffPeriod; - type Slash = Treasury; - type Scheduler = Scheduler; - type PalletsOrigin = OriginCaller; - type MaxVotes = MaxVotes; - type WeightInfo = weights::pallet_democracy::WeightInfo; - type MaxProposals = MaxProposals; - type Preimages = Preimage; - type MaxDeposits = ConstU32<100>; - type MaxBlacklisted = ConstU32<100>; -} - -parameter_types! { - pub CouncilMotionDuration: BlockNumber = prod_or_fast!(3 * DAYS, 2 * MINUTES, "KSM_MOTION_DURATION"); - pub const CouncilMaxProposals: u32 = 100; - pub const CouncilMaxMembers: u32 = 100; -} - -type CouncilCollective = pallet_collective::Instance1; -impl pallet_collective::Config for Runtime { - type Origin = Origin; - type Proposal = Call; - type Event = Event; - type MotionDuration = CouncilMotionDuration; - type MaxProposals = CouncilMaxProposals; - type MaxMembers = CouncilMaxMembers; - type DefaultVote = pallet_collective::PrimeDefaultVote; - type WeightInfo = weights::pallet_collective_council::WeightInfo; -} - -parameter_types! { - pub const CandidacyBond: Balance = 100 * CENTS; - // 1 storage item created, key size is 32 bytes, value size is 16+16. - pub const VotingBondBase: Balance = deposit(1, 64); - // additional data per vote is 32 bytes (account id). - pub const VotingBondFactor: Balance = deposit(0, 32); - /// Daily council elections - pub TermDuration: BlockNumber = prod_or_fast!(24 * HOURS, 2 * MINUTES, "KSM_TERM_DURATION"); - pub const DesiredMembers: u32 = 19; - pub const DesiredRunnersUp: u32 = 19; - pub const PhragmenElectionPalletId: LockIdentifier = *b"phrelect"; -} - -// Make sure that there are no more than MaxMembers members elected via phragmen. -const_assert!(DesiredMembers::get() <= CouncilMaxMembers::get()); - -impl pallet_elections_phragmen::Config for Runtime { - type Event = Event; - type Currency = Balances; - type ChangeMembers = Council; - type InitializeMembers = Council; - type CurrencyToVote = frame_support::traits::U128CurrencyToVote; - type CandidacyBond = CandidacyBond; - type VotingBondBase = VotingBondBase; - type VotingBondFactor = VotingBondFactor; - type LoserCandidate = Treasury; - type KickedMember = Treasury; - type DesiredMembers = DesiredMembers; - type DesiredRunnersUp = DesiredRunnersUp; - type TermDuration = TermDuration; - type PalletId = PhragmenElectionPalletId; - type WeightInfo = weights::pallet_elections_phragmen::WeightInfo; -} - -parameter_types! { - pub TechnicalMotionDuration: BlockNumber = prod_or_fast!(3 * DAYS, 2 * MINUTES, "KSM_MOTION_DURATION"); - pub const TechnicalMaxProposals: u32 = 100; - pub const TechnicalMaxMembers: u32 = 100; -} - -type TechnicalCollective = pallet_collective::Instance2; -impl pallet_collective::Config for Runtime { - type Origin = Origin; - type Proposal = Call; - type Event = Event; - type MotionDuration = TechnicalMotionDuration; - type MaxProposals = TechnicalMaxProposals; - type MaxMembers = TechnicalMaxMembers; - type DefaultVote = pallet_collective::PrimeDefaultVote; - type WeightInfo = weights::pallet_collective_technical_committee::WeightInfo; -} - -impl pallet_membership::Config for Runtime { - type Event = Event; - type AddOrigin = MoreThanHalfCouncil; - type RemoveOrigin = MoreThanHalfCouncil; - type SwapOrigin = MoreThanHalfCouncil; - type ResetOrigin = MoreThanHalfCouncil; - type PrimeOrigin = MoreThanHalfCouncil; - type MembershipInitialized = TechnicalCommittee; - type MembershipChanged = TechnicalCommittee; - type MaxMembers = TechnicalMaxMembers; - type WeightInfo = weights::pallet_membership::WeightInfo; -} - -parameter_types! { -======= ->>>>>>> origin/master pub const ProposalBond: Permill = Permill::from_percent(5); pub const ProposalBondMinimum: Balance = 2000 * CENTS; pub const ProposalBondMaximum: Balance = 1 * GRAND; diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index 2b420e575298..8771c5b841a7 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -41,8 +41,8 @@ use frame_election_provider_support::{generate_solution_type, onchain, Sequentia use frame_support::{ construct_runtime, parameter_types, traits::{ - Contains, EitherOfDiverse, InstanceFilter, KeyOwnerProofSystem, LockIdentifier, - PrivilegeCmp, ConstU32, + ConstU32, Contains, EitherOfDiverse, InstanceFilter, KeyOwnerProofSystem, LockIdentifier, + PrivilegeCmp, }, weights::ConstantMultiplier, PalletId, RuntimeDebug, @@ -714,9 +714,9 @@ impl pallet_democracy::Config for Runtime { type MaxVotes = MaxVotes; type WeightInfo = weights::pallet_democracy::WeightInfo; type MaxProposals = MaxProposals; - type Preimages = Preimage; - type MaxDeposits = ConstU32<100>; - type MaxBlacklisted = ConstU32<100>; + type Preimages = Preimage; + type MaxDeposits = ConstU32<100>; + type MaxBlacklisted = ConstU32<100>; } parameter_types! { From 1246fed039b3a7cac65c5e58bd6b4d872e9008c7 Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Mon, 12 Sep 2022 15:43:59 +0200 Subject: [PATCH 04/15] Fix weight traits Signed-off-by: Oliver Tale-Yazdi --- .../kusama/src/weights/pallet_democracy.rs | 17 +- .../kusama/src/weights/pallet_scheduler.rs | 26 +- .../polkadot/src/weights/pallet_democracy.rs | 17 +- .../polkadot/src/weights/pallet_scheduler.rs | 26 +- .../rococo/src/weights/pallet_democracy.rs | 324 ++---------------- .../rococo/src/weights/pallet_scheduler.rs | 222 ++---------- .../westend/src/weights/pallet_scheduler.rs | 26 +- 7 files changed, 116 insertions(+), 542 deletions(-) diff --git a/runtime/kusama/src/weights/pallet_democracy.rs b/runtime/kusama/src/weights/pallet_democracy.rs index b163cbb412ca..c9bccf32c208 100644 --- a/runtime/kusama/src/weights/pallet_democracy.rs +++ b/runtime/kusama/src/weights/pallet_democracy.rs @@ -37,14 +37,13 @@ impl pallet_democracy::WeightInfo for WeightInfo { fn veto_external() -> Weight { Weight::zero() } fn cancel_proposal() -> Weight { Weight::zero() } fn cancel_referendum() -> Weight { Weight::zero() } - fn cancel_queued() -> Weight { Weight::zero() } - fn on_initialize_base(_r: u32,) -> Weight { Weight::zero() } - fn on_initialize_base_with_launch_period(_r: u32,) -> Weight { Weight::zero() } - fn delegate(_v: u32) -> Weight { Weight::zero() } - fn undelegate(_v: u32) -> Weight { Weight::zero() } + fn on_initialize_base(_r: u32, ) -> Weight { Weight::zero() } + fn on_initialize_base_with_launch_period(_r: u32, ) -> Weight { Weight::zero() } + fn delegate(_r: u32, ) -> Weight { Weight::zero() } + fn undelegate(_r: u32, ) -> Weight { Weight::zero() } fn clear_public_proposals() -> Weight { Weight::zero() } - fn unlock_remove() -> Weight { Weight::zero() } - fn unlock_set() -> Weight { Weight::zero() } - fn remove_vote() -> Weight { Weight::zero() } - fn remove_other_vote() -> Weight { Weight::zero() } + fn unlock_remove(_r: u32, ) -> Weight { Weight::zero() } + fn unlock_set(_r: u32, ) -> Weight { Weight::zero() } + fn remove_vote(_r: u32, ) -> Weight { Weight::zero() } + fn remove_other_vote(_r: u32, ) -> Weight { Weight::zero() } } diff --git a/runtime/kusama/src/weights/pallet_scheduler.rs b/runtime/kusama/src/weights/pallet_scheduler.rs index 6ab229a02d01..369318ae2e10 100644 --- a/runtime/kusama/src/weights/pallet_scheduler.rs +++ b/runtime/kusama/src/weights/pallet_scheduler.rs @@ -24,18 +24,16 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl pallet_scheduler::WeightInfo for WeightInfo { - fn on_initialize_periodic_named_resolved(s: u32, ) -> Weight; - fn on_initialize_named_resolved(s: u32, ) -> Weight; - fn on_initialize_periodic_resolved(s: u32, ) -> Weight; - fn on_initialize_resolved(s: u32, ) -> Weight; - fn on_initialize_named_aborted(s: u32, ) -> Weight; - fn on_initialize_aborted(s: u32, ) -> Weight; - fn on_initialize_periodic_named(s: u32, ) -> Weight; - fn on_initialize_periodic(s: u32, ) -> Weight; - fn on_initialize_named(s: u32, ) -> Weight; - fn on_initialize(s: u32, ) -> Weight; - fn schedule(s: u32, ) -> Weight; - fn cancel(s: u32, ) -> Weight; - fn schedule_named(s: u32, ) -> Weight; - fn cancel_named(s: u32, ) -> Weight; + fn service_agendas_base() -> Weight { Weight::zero() } + fn service_agenda_base(_s: u32, ) -> Weight { Weight::zero() } + fn service_task_base() -> Weight { Weight::zero() } + fn service_task_fetched(_s: u32, ) -> Weight { Weight::zero() } + fn service_task_named() -> Weight { Weight::zero() } + fn service_task_periodic() -> Weight { Weight::zero() } + fn execute_dispatch_signed() -> Weight { Weight::zero() } + fn execute_dispatch_unsigned() -> Weight { Weight::zero() } + fn schedule(_s: u32, ) -> Weight { Weight::zero() } + fn cancel(_s: u32, ) -> Weight { Weight::zero() } + fn schedule_named(_s: u32, ) -> Weight { Weight::zero() } + fn cancel_named(_s: u32, ) -> Weight { Weight::zero() } } diff --git a/runtime/polkadot/src/weights/pallet_democracy.rs b/runtime/polkadot/src/weights/pallet_democracy.rs index b163cbb412ca..c9bccf32c208 100644 --- a/runtime/polkadot/src/weights/pallet_democracy.rs +++ b/runtime/polkadot/src/weights/pallet_democracy.rs @@ -37,14 +37,13 @@ impl pallet_democracy::WeightInfo for WeightInfo { fn veto_external() -> Weight { Weight::zero() } fn cancel_proposal() -> Weight { Weight::zero() } fn cancel_referendum() -> Weight { Weight::zero() } - fn cancel_queued() -> Weight { Weight::zero() } - fn on_initialize_base(_r: u32,) -> Weight { Weight::zero() } - fn on_initialize_base_with_launch_period(_r: u32,) -> Weight { Weight::zero() } - fn delegate(_v: u32) -> Weight { Weight::zero() } - fn undelegate(_v: u32) -> Weight { Weight::zero() } + fn on_initialize_base(_r: u32, ) -> Weight { Weight::zero() } + fn on_initialize_base_with_launch_period(_r: u32, ) -> Weight { Weight::zero() } + fn delegate(_r: u32, ) -> Weight { Weight::zero() } + fn undelegate(_r: u32, ) -> Weight { Weight::zero() } fn clear_public_proposals() -> Weight { Weight::zero() } - fn unlock_remove() -> Weight { Weight::zero() } - fn unlock_set() -> Weight { Weight::zero() } - fn remove_vote() -> Weight { Weight::zero() } - fn remove_other_vote() -> Weight { Weight::zero() } + fn unlock_remove(_r: u32, ) -> Weight { Weight::zero() } + fn unlock_set(_r: u32, ) -> Weight { Weight::zero() } + fn remove_vote(_r: u32, ) -> Weight { Weight::zero() } + fn remove_other_vote(_r: u32, ) -> Weight { Weight::zero() } } diff --git a/runtime/polkadot/src/weights/pallet_scheduler.rs b/runtime/polkadot/src/weights/pallet_scheduler.rs index 6ab229a02d01..369318ae2e10 100644 --- a/runtime/polkadot/src/weights/pallet_scheduler.rs +++ b/runtime/polkadot/src/weights/pallet_scheduler.rs @@ -24,18 +24,16 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl pallet_scheduler::WeightInfo for WeightInfo { - fn on_initialize_periodic_named_resolved(s: u32, ) -> Weight; - fn on_initialize_named_resolved(s: u32, ) -> Weight; - fn on_initialize_periodic_resolved(s: u32, ) -> Weight; - fn on_initialize_resolved(s: u32, ) -> Weight; - fn on_initialize_named_aborted(s: u32, ) -> Weight; - fn on_initialize_aborted(s: u32, ) -> Weight; - fn on_initialize_periodic_named(s: u32, ) -> Weight; - fn on_initialize_periodic(s: u32, ) -> Weight; - fn on_initialize_named(s: u32, ) -> Weight; - fn on_initialize(s: u32, ) -> Weight; - fn schedule(s: u32, ) -> Weight; - fn cancel(s: u32, ) -> Weight; - fn schedule_named(s: u32, ) -> Weight; - fn cancel_named(s: u32, ) -> Weight; + fn service_agendas_base() -> Weight { Weight::zero() } + fn service_agenda_base(_s: u32, ) -> Weight { Weight::zero() } + fn service_task_base() -> Weight { Weight::zero() } + fn service_task_fetched(_s: u32, ) -> Weight { Weight::zero() } + fn service_task_named() -> Weight { Weight::zero() } + fn service_task_periodic() -> Weight { Weight::zero() } + fn execute_dispatch_signed() -> Weight { Weight::zero() } + fn execute_dispatch_unsigned() -> Weight { Weight::zero() } + fn schedule(_s: u32, ) -> Weight { Weight::zero() } + fn cancel(_s: u32, ) -> Weight { Weight::zero() } + fn schedule_named(_s: u32, ) -> Weight { Weight::zero() } + fn cancel_named(_s: u32, ) -> Weight { Weight::zero() } } diff --git a/runtime/rococo/src/weights/pallet_democracy.rs b/runtime/rococo/src/weights/pallet_democracy.rs index 317b0d4bb0a1..c9bccf32c208 100644 --- a/runtime/rococo/src/weights/pallet_democracy.rs +++ b/runtime/rococo/src/weights/pallet_democracy.rs @@ -1,299 +1,49 @@ -// Copyright 2017-2022 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) 2022 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. - -// You should have received a copy of the GNU General Public License -// along with Polkadot. If not, see . -//! Autogenerated weights for `pallet_democracy` -//! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-08-19, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! HOSTNAME: `bm4`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("rococo-dev"), DB CACHE: 1024 - -// Executed Command: -// ./target/production/polkadot -// benchmark -// pallet -// --chain=rococo-dev -// --steps=50 -// --repeat=20 -// --pallet=pallet_democracy -// --extrinsic=* -// --execution=wasm -// --wasm-execution=compiled -// --header=./file_header.txt -// --output=./runtime/rococo/src/weights/pallet_democracy.rs +// 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. #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -use frame_support::{traits::Get, weights::Weight}; +use frame_support::{traits::Get, weights::{Weight}}; use sp_std::marker::PhantomData; -/// Weight functions for `pallet_democracy`. pub struct WeightInfo(PhantomData); impl pallet_democracy::WeightInfo for WeightInfo { - // Storage: Democracy PublicPropCount (r:1 w:1) - // Storage: Democracy PublicProps (r:1 w:1) - // Storage: Democracy Blacklist (r:1 w:0) - // Storage: Democracy DepositOf (r:0 w:1) - fn propose() -> Weight { - Weight::from_ref_time(37_453_000 as u64) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) - } - // Storage: Democracy DepositOf (r:1 w:1) - /// The range of component `s` is `[0, 100]`. - fn second(s: u32, ) -> Weight { - Weight::from_ref_time(27_807_000 as u64) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(69_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - } - // Storage: Democracy ReferendumInfoOf (r:1 w:1) - // Storage: Democracy VotingOf (r:1 w:1) - // Storage: Balances Locks (r:1 w:1) - /// The range of component `r` is `[1, 99]`. - fn vote_new(r: u32, ) -> Weight { - Weight::from_ref_time(35_336_000 as u64) - // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(120_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) - } - // Storage: Democracy ReferendumInfoOf (r:1 w:1) - // Storage: Democracy VotingOf (r:1 w:1) - // Storage: Balances Locks (r:1 w:1) - /// The range of component `r` is `[1, 99]`. - fn vote_existing(r: u32, ) -> Weight { - Weight::from_ref_time(35_107_000 as u64) - // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(123_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) - } - // Storage: Democracy ReferendumInfoOf (r:1 w:1) - // Storage: Democracy Cancellations (r:1 w:1) - fn emergency_cancel() -> Weight { - Weight::from_ref_time(17_752_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - } - // Storage: Democracy PublicProps (r:1 w:1) - // Storage: Democracy NextExternal (r:1 w:1) - // Storage: Democracy ReferendumInfoOf (r:1 w:1) - // Storage: Democracy Blacklist (r:0 w:1) - // Storage: Democracy DepositOf (r:1 w:1) - // Storage: System Account (r:1 w:1) - /// The range of component `p` is `[1, 100]`. - fn blacklist(p: u32, ) -> Weight { - Weight::from_ref_time(52_116_000 as u64) - // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(194_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().writes(6 as u64)) - } - // Storage: Democracy NextExternal (r:1 w:1) - // Storage: Democracy Blacklist (r:1 w:0) - /// The range of component `v` is `[1, 100]`. - fn external_propose(v: u32, ) -> Weight { - Weight::from_ref_time(10_194_000 as u64) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(10_000 as u64).saturating_mul(v as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - } - // Storage: Democracy NextExternal (r:0 w:1) - fn external_propose_majority() -> Weight { - Weight::from_ref_time(3_700_000 as u64) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - } - // Storage: Democracy NextExternal (r:0 w:1) - fn external_propose_default() -> Weight { - Weight::from_ref_time(3_713_000 as u64) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - } - // Storage: Democracy NextExternal (r:1 w:1) - // Storage: Democracy ReferendumCount (r:1 w:1) - // Storage: Democracy ReferendumInfoOf (r:0 w:1) - fn fast_track() -> Weight { - Weight::from_ref_time(17_441_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) - } - // Storage: Democracy NextExternal (r:1 w:1) - // Storage: Democracy Blacklist (r:1 w:1) - /// The range of component `v` is `[0, 100]`. - fn veto_external(v: u32, ) -> Weight { - Weight::from_ref_time(18_536_000 as u64) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(42_000 as u64).saturating_mul(v as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - } - // Storage: Democracy PublicProps (r:1 w:1) - // Storage: Democracy DepositOf (r:1 w:1) - // Storage: System Account (r:1 w:1) - /// The range of component `p` is `[1, 100]`. - fn cancel_proposal(p: u32, ) -> Weight { - Weight::from_ref_time(42_174_000 as u64) - // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(164_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) - } - // Storage: Democracy ReferendumInfoOf (r:0 w:1) - fn cancel_referendum() -> Weight { - Weight::from_ref_time(11_892_000 as u64) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - } - // Storage: Scheduler Lookup (r:1 w:1) - // Storage: Scheduler Agenda (r:1 w:1) - /// The range of component `r` is `[1, 99]`. - fn cancel_queued(r: u32, ) -> Weight { - Weight::from_ref_time(23_252_000 as u64) - // Standard Error: 5_000 - .saturating_add(Weight::from_ref_time(2_242_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - } - // Storage: Democracy LowestUnbaked (r:1 w:1) - // Storage: Democracy ReferendumCount (r:1 w:0) - // Storage: Democracy ReferendumInfoOf (r:1 w:0) - /// The range of component `r` is `[1, 99]`. - fn on_initialize_base(r: u32, ) -> Weight { - Weight::from_ref_time(1_457_000 as u64) - // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(2_956_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - } - // Storage: Democracy LowestUnbaked (r:1 w:1) - // Storage: Democracy ReferendumCount (r:1 w:0) - // Storage: Democracy LastTabledWasExternal (r:1 w:0) - // Storage: Democracy NextExternal (r:1 w:0) - // Storage: Democracy PublicProps (r:1 w:0) - // Storage: Democracy ReferendumInfoOf (r:1 w:0) - /// The range of component `r` is `[1, 99]`. - fn on_initialize_base_with_launch_period(r: u32, ) -> Weight { - Weight::from_ref_time(6_240_000 as u64) - // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(2_963_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - } - // Storage: Democracy VotingOf (r:3 w:3) - // Storage: Democracy ReferendumInfoOf (r:1 w:1) - // Storage: Balances Locks (r:1 w:1) - /// The range of component `r` is `[1, 99]`. - fn delegate(r: u32, ) -> Weight { - Weight::from_ref_time(34_480_000 as u64) - // Standard Error: 5_000 - .saturating_add(Weight::from_ref_time(3_908_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) - .saturating_add(T::DbWeight::get().writes(4 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(r as u64))) - } - // Storage: Democracy VotingOf (r:2 w:2) - // Storage: Democracy ReferendumInfoOf (r:1 w:1) - /// The range of component `r` is `[1, 99]`. - fn undelegate(r: u32, ) -> Weight { - Weight::from_ref_time(17_446_000 as u64) - // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(3_917_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(r as u64))) - } - // Storage: Democracy PublicProps (r:0 w:1) - fn clear_public_proposals() -> Weight { - Weight::from_ref_time(3_727_000 as u64) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - } - // Storage: Democracy Preimages (r:1 w:1) - /// The range of component `b` is `[0, 16384]`. - fn note_preimage(b: u32, ) -> Weight { - Weight::from_ref_time(25_720_000 as u64) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(3_000 as u64).saturating_mul(b as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - } - // Storage: Democracy Preimages (r:1 w:1) - /// The range of component `b` is `[0, 16384]`. - fn note_imminent_preimage(b: u32, ) -> Weight { - Weight::from_ref_time(17_884_000 as u64) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(3_000 as u64).saturating_mul(b as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - } - // Storage: Democracy Preimages (r:1 w:1) - // Storage: System Account (r:1 w:0) - /// The range of component `b` is `[0, 16384]`. - fn reap_preimage(b: u32, ) -> Weight { - Weight::from_ref_time(24_695_000 as u64) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(1_000 as u64).saturating_mul(b as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - } - // Storage: Democracy VotingOf (r:1 w:1) - // Storage: Balances Locks (r:1 w:1) - // Storage: System Account (r:1 w:1) - /// The range of component `r` is `[1, 99]`. - fn unlock_remove(r: u32, ) -> Weight { - Weight::from_ref_time(22_207_000 as u64) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(36_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) - } - // Storage: Democracy VotingOf (r:1 w:1) - // Storage: Balances Locks (r:1 w:1) - // Storage: System Account (r:1 w:1) - /// The range of component `r` is `[1, 99]`. - fn unlock_set(r: u32, ) -> Weight { - Weight::from_ref_time(21_561_000 as u64) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(110_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) - } - // Storage: Democracy ReferendumInfoOf (r:1 w:1) - // Storage: Democracy VotingOf (r:1 w:1) - /// The range of component `r` is `[1, 99]`. - fn remove_vote(r: u32, ) -> Weight { - Weight::from_ref_time(13_204_000 as u64) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(105_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - } - // Storage: Democracy ReferendumInfoOf (r:1 w:1) - // Storage: Democracy VotingOf (r:1 w:1) - /// The range of component `r` is `[1, 99]`. - fn remove_other_vote(r: u32, ) -> Weight { - Weight::from_ref_time(12_994_000 as u64) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(106_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - } + fn propose() -> Weight { Weight::zero() } + fn second() -> Weight { Weight::zero() } + fn vote_new() -> Weight { Weight::zero() } + fn vote_existing() -> Weight { Weight::zero() } + fn emergency_cancel() -> Weight { Weight::zero() } + fn blacklist() -> Weight { Weight::zero() } + fn external_propose() -> Weight { Weight::zero() } + fn external_propose_majority() -> Weight { Weight::zero() } + fn external_propose_default() -> Weight { Weight::zero() } + fn fast_track() -> Weight { Weight::zero() } + fn veto_external() -> Weight { Weight::zero() } + fn cancel_proposal() -> Weight { Weight::zero() } + fn cancel_referendum() -> Weight { Weight::zero() } + fn on_initialize_base(_r: u32, ) -> Weight { Weight::zero() } + fn on_initialize_base_with_launch_period(_r: u32, ) -> Weight { Weight::zero() } + fn delegate(_r: u32, ) -> Weight { Weight::zero() } + fn undelegate(_r: u32, ) -> Weight { Weight::zero() } + fn clear_public_proposals() -> Weight { Weight::zero() } + fn unlock_remove(_r: u32, ) -> Weight { Weight::zero() } + fn unlock_set(_r: u32, ) -> Weight { Weight::zero() } + fn remove_vote(_r: u32, ) -> Weight { Weight::zero() } + fn remove_other_vote(_r: u32, ) -> Weight { Weight::zero() } } diff --git a/runtime/rococo/src/weights/pallet_scheduler.rs b/runtime/rococo/src/weights/pallet_scheduler.rs index 06a77fcee9cb..369318ae2e10 100644 --- a/runtime/rococo/src/weights/pallet_scheduler.rs +++ b/runtime/rococo/src/weights/pallet_scheduler.rs @@ -1,207 +1,39 @@ -// Copyright 2017-2022 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) 2022 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. - -// You should have received a copy of the GNU General Public License -// along with Polkadot. If not, see . -//! Autogenerated weights for `pallet_scheduler` -//! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-08-19, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! HOSTNAME: `bm4`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("rococo-dev"), DB CACHE: 1024 - -// Executed Command: -// ./target/production/polkadot -// benchmark -// pallet -// --chain=rococo-dev -// --steps=50 -// --repeat=20 -// --pallet=pallet_scheduler -// --extrinsic=* -// --execution=wasm -// --wasm-execution=compiled -// --header=./file_header.txt -// --output=./runtime/rococo/src/weights/pallet_scheduler.rs +// 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. #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -use frame_support::{traits::Get, weights::Weight}; +use frame_support::{traits::Get, weights::{Weight}}; use sp_std::marker::PhantomData; -/// Weight functions for `pallet_scheduler`. pub struct WeightInfo(PhantomData); impl pallet_scheduler::WeightInfo for WeightInfo { - // Storage: Scheduler Agenda (r:2 w:2) - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:1) - // Storage: Scheduler Lookup (r:0 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_periodic_named_resolved(s: u32, ) -> Weight { - Weight::from_ref_time(1_256_000 as u64) - // Standard Error: 42_000 - .saturating_add(Weight::from_ref_time(26_925_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().reads((3 as u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((4 as u64).saturating_mul(s as u64))) - } - // Storage: Scheduler Agenda (r:1 w:1) - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:1) - // Storage: Scheduler Lookup (r:0 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_named_resolved(s: u32, ) -> Weight { - Weight::from_ref_time(921_000 as u64) - // Standard Error: 35_000 - .saturating_add(Weight::from_ref_time(21_922_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((3 as u64).saturating_mul(s as u64))) - } - // Storage: Scheduler Agenda (r:2 w:2) - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_periodic_resolved(s: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) - // Standard Error: 62_000 - .saturating_add(Weight::from_ref_time(24_926_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().reads((3 as u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((3 as u64).saturating_mul(s as u64))) - } - // Storage: Scheduler Agenda (r:1 w:1) - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_resolved(s: u32, ) -> Weight { - Weight::from_ref_time(10_674_000 as u64) - // Standard Error: 31_000 - .saturating_add(Weight::from_ref_time(20_631_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(s as u64))) - } - // Storage: Scheduler Agenda (r:2 w:2) - // Storage: Preimage PreimageFor (r:1 w:0) - // Storage: Scheduler Lookup (r:0 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_named_aborted(s: u32, ) -> Weight { - Weight::from_ref_time(2_607_000 as u64) - // Standard Error: 20_000 - .saturating_add(Weight::from_ref_time(10_009_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(s as u64))) - } - // Storage: Scheduler Agenda (r:2 w:2) - // Storage: Preimage PreimageFor (r:1 w:0) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_aborted(s: u32, ) -> Weight { - Weight::from_ref_time(3_381_000 as u64) - // Standard Error: 17_000 - .saturating_add(Weight::from_ref_time(7_945_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - } - // Storage: Scheduler Agenda (r:2 w:2) - // Storage: Scheduler Lookup (r:0 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_periodic_named(s: u32, ) -> Weight { - Weight::from_ref_time(6_676_000 as u64) - // Standard Error: 25_000 - .saturating_add(Weight::from_ref_time(16_966_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(s as u64))) - } - // Storage: Scheduler Agenda (r:2 w:2) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_periodic(s: u32, ) -> Weight { - Weight::from_ref_time(8_899_000 as u64) - // Standard Error: 24_000 - .saturating_add(Weight::from_ref_time(14_630_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(s as u64))) - } - // Storage: Scheduler Agenda (r:1 w:1) - // Storage: Scheduler Lookup (r:0 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_named(s: u32, ) -> Weight { - Weight::from_ref_time(8_583_000 as u64) - // Standard Error: 19_000 - .saturating_add(Weight::from_ref_time(12_228_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(s as u64))) - } - // Storage: Scheduler Agenda (r:1 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize(s: u32, ) -> Weight { - Weight::from_ref_time(8_544_000 as u64) - // Standard Error: 19_000 - .saturating_add(Weight::from_ref_time(11_364_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - } - // Storage: Scheduler Agenda (r:1 w:1) - /// The range of component `s` is `[0, 50]`. - fn schedule(s: u32, ) -> Weight { - Weight::from_ref_time(19_060_000 as u64) - // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(46_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - } - // Storage: Scheduler Agenda (r:1 w:1) - // Storage: Scheduler Lookup (r:0 w:1) - /// The range of component `s` is `[1, 50]`. - fn cancel(s: u32, ) -> Weight { - Weight::from_ref_time(17_694_000 as u64) - // Standard Error: 7_000 - .saturating_add(Weight::from_ref_time(2_368_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - } - // Storage: Scheduler Lookup (r:1 w:1) - // Storage: Scheduler Agenda (r:1 w:1) - /// The range of component `s` is `[0, 50]`. - fn schedule_named(s: u32, ) -> Weight { - Weight::from_ref_time(22_258_000 as u64) - // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(60_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - } - // Storage: Scheduler Lookup (r:1 w:1) - // Storage: Scheduler Agenda (r:1 w:1) - /// The range of component `s` is `[1, 50]`. - fn cancel_named(s: u32, ) -> Weight { - Weight::from_ref_time(18_882_000 as u64) - // Standard Error: 7_000 - .saturating_add(Weight::from_ref_time(2_379_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - } + fn service_agendas_base() -> Weight { Weight::zero() } + fn service_agenda_base(_s: u32, ) -> Weight { Weight::zero() } + fn service_task_base() -> Weight { Weight::zero() } + fn service_task_fetched(_s: u32, ) -> Weight { Weight::zero() } + fn service_task_named() -> Weight { Weight::zero() } + fn service_task_periodic() -> Weight { Weight::zero() } + fn execute_dispatch_signed() -> Weight { Weight::zero() } + fn execute_dispatch_unsigned() -> Weight { Weight::zero() } + fn schedule(_s: u32, ) -> Weight { Weight::zero() } + fn cancel(_s: u32, ) -> Weight { Weight::zero() } + fn schedule_named(_s: u32, ) -> Weight { Weight::zero() } + fn cancel_named(_s: u32, ) -> Weight { Weight::zero() } } diff --git a/runtime/westend/src/weights/pallet_scheduler.rs b/runtime/westend/src/weights/pallet_scheduler.rs index 6ab229a02d01..369318ae2e10 100644 --- a/runtime/westend/src/weights/pallet_scheduler.rs +++ b/runtime/westend/src/weights/pallet_scheduler.rs @@ -24,18 +24,16 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl pallet_scheduler::WeightInfo for WeightInfo { - fn on_initialize_periodic_named_resolved(s: u32, ) -> Weight; - fn on_initialize_named_resolved(s: u32, ) -> Weight; - fn on_initialize_periodic_resolved(s: u32, ) -> Weight; - fn on_initialize_resolved(s: u32, ) -> Weight; - fn on_initialize_named_aborted(s: u32, ) -> Weight; - fn on_initialize_aborted(s: u32, ) -> Weight; - fn on_initialize_periodic_named(s: u32, ) -> Weight; - fn on_initialize_periodic(s: u32, ) -> Weight; - fn on_initialize_named(s: u32, ) -> Weight; - fn on_initialize(s: u32, ) -> Weight; - fn schedule(s: u32, ) -> Weight; - fn cancel(s: u32, ) -> Weight; - fn schedule_named(s: u32, ) -> Weight; - fn cancel_named(s: u32, ) -> Weight; + fn service_agendas_base() -> Weight { Weight::zero() } + fn service_agenda_base(_s: u32, ) -> Weight { Weight::zero() } + fn service_task_base() -> Weight { Weight::zero() } + fn service_task_fetched(_s: u32, ) -> Weight { Weight::zero() } + fn service_task_named() -> Weight { Weight::zero() } + fn service_task_periodic() -> Weight { Weight::zero() } + fn execute_dispatch_signed() -> Weight { Weight::zero() } + fn execute_dispatch_unsigned() -> Weight { Weight::zero() } + fn schedule(_s: u32, ) -> Weight { Weight::zero() } + fn cancel(_s: u32, ) -> Weight { Weight::zero() } + fn schedule_named(_s: u32, ) -> Weight { Weight::zero() } + fn cancel_named(_s: u32, ) -> Weight { Weight::zero() } } From bfa473b9b443fbf7282d308aca985ee8e0cf096c Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Mon, 12 Sep 2022 15:44:23 +0200 Subject: [PATCH 05/15] polkadot runtime: Clippy Signed-off-by: Oliver Tale-Yazdi --- runtime/polkadot/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index b721c7e41c54..c9069c30e8b0 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -41,7 +41,7 @@ use frame_election_provider_support::{generate_solution_type, onchain, Sequentia use frame_support::{ construct_runtime, parameter_types, traits::{ - ConstU32, Contains, EitherOfDiverse, InstanceFilter, KeyOwnerProofSystem, LockIdentifier, + ConstU32, EitherOfDiverse, InstanceFilter, KeyOwnerProofSystem, LockIdentifier, PrivilegeCmp, }, weights::ConstantMultiplier, From 9254b89595d4a407d3d7b5f2775f60e83bd40078 Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Mon, 12 Sep 2022 15:44:37 +0200 Subject: [PATCH 06/15] rococo runtime: update pallet configs Signed-off-by: Oliver Tale-Yazdi --- runtime/rococo/src/lib.rs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs index a2d6190bfb76..23cc25c5d060 100644 --- a/runtime/rococo/src/lib.rs +++ b/runtime/rococo/src/lib.rs @@ -69,8 +69,8 @@ use sp_mmr_primitives as mmr; use sp_runtime::{ create_runtime_str, generic, impl_opaque_keys, traits::{ - AccountIdLookup, BlakeTwo256, Block as BlockT, ConvertInto, Extrinsic as ExtrinsicT, - Keccak256, OpaqueKeys, SaturatedConversion, Verify, + AccountIdLookup, BlakeTwo256, Block as BlockT, ConstU32, ConvertInto, + Extrinsic as ExtrinsicT, Keccak256, OpaqueKeys, SaturatedConversion, Verify, }, transaction_validity::{TransactionPriority, TransactionSource, TransactionValidity}, ApplyExtrinsicResult, KeyTypeId, Perbill, Percent, Permill, @@ -215,12 +215,10 @@ impl pallet_scheduler::Config for Runtime { type MaxScheduledPerBlock = MaxScheduledPerBlock; type WeightInfo = weights::pallet_scheduler::WeightInfo; type OriginPrivilegeCmp = OriginPrivilegeCmp; - type PreimageProvider = Preimage; - type NoPreimagePostponement = NoPreimagePostponement; + type Preimages = Preimage; } parameter_types! { - pub const PreimageMaxSize: u32 = 4096 * 1024; pub const PreimageBaseDeposit: Balance = deposit(2, 64); pub const PreimageByteDeposit: Balance = deposit(0, 1); } @@ -230,7 +228,6 @@ impl pallet_preimage::Config for Runtime { type Event = Event; type Currency = Balances; type ManagerOrigin = EnsureRoot; - type MaxSize = PreimageMaxSize; type BaseDeposit = PreimageBaseDeposit; type ByteDeposit = PreimageByteDeposit; } @@ -398,7 +395,6 @@ parameter_types! { } impl pallet_democracy::Config for Runtime { - type Proposal = Call; type Event = Event; type Currency = Balances; type EnactmentPeriod = EnactmentPeriod; @@ -440,14 +436,15 @@ impl pallet_democracy::Config for Runtime { // only do it once and it lasts only for the cooloff period. type VetoOrigin = pallet_collective::EnsureMember; type CooloffPeriod = CooloffPeriod; - type PreimageByteDeposit = PreimageByteDeposit; - type OperationalPreimageOrigin = pallet_collective::EnsureMember; type Slash = Treasury; type Scheduler = Scheduler; type PalletsOrigin = OriginCaller; type MaxVotes = MaxVotes; type WeightInfo = weights::pallet_democracy::WeightInfo; type MaxProposals = MaxProposals; + type Preimages = Preimage; + type MaxDeposits = ConstU32<100>; + type MaxBlacklisted = ConstU32<100>; } parameter_types! { From 6e5aa9977c2d4916d0f6c51de3906c23ac022359 Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Tue, 13 Sep 2022 20:27:01 +0200 Subject: [PATCH 07/15] Add preimage migration Signed-off-by: Oliver Tale-Yazdi --- runtime/kusama/src/lib.rs | 5 ++++- runtime/polkadot/src/lib.rs | 6 +++++- runtime/rococo/src/lib.rs | 1 + runtime/westend/src/lib.rs | 5 ++++- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index b5058485d842..7a892218ad34 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -1439,7 +1439,10 @@ pub type Executive = frame_executive::Executive< frame_system::ChainContext, Runtime, AllPalletsWithSystem, - pallet_nomination_pools::migration::v3::MigrateToV3, + ( + pallet_nomination_pools::migration::v3::MigrateToV3, + pallet_preimage::migration::v1::Migration, + ), >; /// The payload being signed in the transactions. pub type SignedPayload = generic::SignedPayload; diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index ccc9660b1eab..82da6740084d 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -1525,7 +1525,11 @@ pub type Executive = frame_executive::Executive< frame_system::ChainContext, Runtime, AllPalletsWithSystem, - (InitiateNominationPools, pallet_nomination_pools::migration::v3::MigrateToV3), + ( + InitiateNominationPools, + pallet_nomination_pools::migration::v3::MigrateToV3, + pallet_preimage::migration::v1::Migration, + ), >; /// The payload being signed in transactions. pub type SignedPayload = generic::SignedPayload; diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs index c144063829b6..9e960137cdf2 100644 --- a/runtime/rococo/src/lib.rs +++ b/runtime/rococo/src/lib.rs @@ -1431,6 +1431,7 @@ pub type Executive = frame_executive::Executive< frame_system::ChainContext, Runtime, AllPalletsWithSystem, + pallet_preimage::migration::v1::Migration, >; /// The payload being signed in transactions. pub type SignedPayload = generic::SignedPayload; diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs index 2ec991164624..916072f1d50c 100644 --- a/runtime/westend/src/lib.rs +++ b/runtime/westend/src/lib.rs @@ -1160,7 +1160,10 @@ pub type Executive = frame_executive::Executive< frame_system::ChainContext, Runtime, AllPalletsWithSystem, - pallet_nomination_pools::migration::v3::MigrateToV3, + ( + pallet_nomination_pools::migration::v3::MigrateToV3, + pallet_preimage::migration::v1::Migration, + ), >; /// The payload being signed in transactions. pub type SignedPayload = generic::SignedPayload; From a8de0ec872e0cd8f5abc78a7ff5a4fc4cfd0424a Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Wed, 14 Sep 2022 15:31:23 +0200 Subject: [PATCH 08/15] Add all migrations Signed-off-by: Oliver Tale-Yazdi --- runtime/kusama/src/lib.rs | 3 +++ runtime/polkadot/src/lib.rs | 3 +++ runtime/rococo/src/lib.rs | 7 ++++++- runtime/westend/src/lib.rs | 3 +++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 7a892218ad34..bdfa2f96a80a 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -1441,7 +1441,10 @@ pub type Executive = frame_executive::Executive< AllPalletsWithSystem, ( pallet_nomination_pools::migration::v3::MigrateToV3, + // "Bound uses of call" pallet_preimage::migration::v1::Migration, + pallet_scheduler::migration::v3::MigrateToV4, + pallet_democracy::migrations::v1::Migration, ), >; /// The payload being signed in the transactions. diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index 82da6740084d..f884c9ae108d 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -1528,7 +1528,10 @@ pub type Executive = frame_executive::Executive< ( InitiateNominationPools, pallet_nomination_pools::migration::v3::MigrateToV3, + // "Bound uses of call" pallet_preimage::migration::v1::Migration, + pallet_scheduler::migration::v3::MigrateToV4, + pallet_democracy::migrations::v1::Migration, ), >; /// The payload being signed in transactions. diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs index 9e960137cdf2..1ae96619854d 100644 --- a/runtime/rococo/src/lib.rs +++ b/runtime/rococo/src/lib.rs @@ -1431,7 +1431,12 @@ pub type Executive = frame_executive::Executive< frame_system::ChainContext, Runtime, AllPalletsWithSystem, - pallet_preimage::migration::v1::Migration, + ( + // "Bound uses of call" + pallet_preimage::migration::v1::Migration, + pallet_scheduler::migration::v3::MigrateToV4, + pallet_democracy::migrations::v1::Migration, + ), >; /// The payload being signed in transactions. pub type SignedPayload = generic::SignedPayload; diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs index 916072f1d50c..668b1ee549d6 100644 --- a/runtime/westend/src/lib.rs +++ b/runtime/westend/src/lib.rs @@ -1162,7 +1162,10 @@ pub type Executive = frame_executive::Executive< AllPalletsWithSystem, ( pallet_nomination_pools::migration::v3::MigrateToV3, + // "Bound uses of call" pallet_preimage::migration::v1::Migration, + pallet_scheduler::migration::v3::MigrateToV4, + pallet_democracy::migrations::v1::Migration, ), >; /// The payload being signed in transactions. From 8f615bdb7fe8d34a4940eb8aecbbc34f8224d330 Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Wed, 14 Sep 2022 16:15:05 +0200 Subject: [PATCH 09/15] Democracy is not on Westend Signed-off-by: Oliver Tale-Yazdi --- runtime/westend/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs index 668b1ee549d6..4c5196ed02a2 100644 --- a/runtime/westend/src/lib.rs +++ b/runtime/westend/src/lib.rs @@ -1165,7 +1165,6 @@ pub type Executive = frame_executive::Executive< // "Bound uses of call" pallet_preimage::migration::v1::Migration, pallet_scheduler::migration::v3::MigrateToV4, - pallet_democracy::migrations::v1::Migration, ), >; /// The payload being signed in transactions. From 3a9097e5c932c8ef62309892edf2f24a579a7d5f Mon Sep 17 00:00:00 2001 From: Roman Useinov Date: Fri, 30 Sep 2022 12:43:12 +0200 Subject: [PATCH 10/15] [Migration] Refund stored multisig calls (#6075) --- runtime/kusama/src/lib.rs | 1 + runtime/polkadot/src/lib.rs | 1 + 2 files changed, 2 insertions(+) diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 048f9b5a0e3b..de732a0dcde7 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -1479,6 +1479,7 @@ pub type Executive = frame_executive::Executive< pallet_preimage::migration::v1::Migration, pallet_scheduler::migration::v3::MigrateToV4, pallet_democracy::migrations::v1::Migration, + pallet_multisig::migrations::v1::MigrateToV1, ), >; /// The payload being signed in the transactions. diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index 57aa23a2d8e0..e86e2086a8b0 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -1565,6 +1565,7 @@ pub type Executive = frame_executive::Executive< pallet_preimage::migration::v1::Migration, pallet_scheduler::migration::v3::MigrateToV4, pallet_democracy::migrations::v1::Migration, + pallet_multisig::migrations::v1::MigrateToV1, ), >; From 4a555a70eb57eec79b9836ce521d7c2f1505e7af Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Mon, 3 Oct 2022 19:37:27 +0200 Subject: [PATCH 11/15] Add Preimages to referenda config Needed since Gov V2 just merged. Signed-off-by: Oliver Tale-Yazdi --- runtime/kusama/src/governance/fellowship.rs | 1 + runtime/kusama/src/governance/mod.rs | 1 + 2 files changed, 2 insertions(+) diff --git a/runtime/kusama/src/governance/fellowship.rs b/runtime/kusama/src/governance/fellowship.rs index 66e2f6ee6d58..52ab8d0bebc8 100644 --- a/runtime/kusama/src/governance/fellowship.rs +++ b/runtime/kusama/src/governance/fellowship.rs @@ -314,6 +314,7 @@ impl pallet_referenda::Config for Runtime { type UndecidingTimeout = UndecidingTimeout; type AlarmInterval = AlarmInterval; type Tracks = TracksInfo; + type Preimages = Preimage; } pub type FellowshipCollectiveInstance = pallet_ranked_collective::Instance1; diff --git a/runtime/kusama/src/governance/mod.rs b/runtime/kusama/src/governance/mod.rs index 4dbf375f67f0..87cbfd7eea2f 100644 --- a/runtime/kusama/src/governance/mod.rs +++ b/runtime/kusama/src/governance/mod.rs @@ -91,4 +91,5 @@ impl pallet_referenda::Config for Runtime { type UndecidingTimeout = UndecidingTimeout; type AlarmInterval = AlarmInterval; type Tracks = TracksInfo; + type Preimages = Preimage; } From ba262dd58fdb9ab911bef1ad114b0da2c2dbe1d4 Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Mon, 3 Oct 2022 21:14:22 +0200 Subject: [PATCH 12/15] Update weights Signed-off-by: Oliver Tale-Yazdi --- .../kusama/src/weights/pallet_democracy.rs | 265 +++++++++++++++--- runtime/kusama/src/weights/pallet_preimage.rs | 67 +++-- .../kusama/src/weights/pallet_scheduler.rs | 143 ++++++++-- .../polkadot/src/weights/pallet_democracy.rs | 265 +++++++++++++++--- .../polkadot/src/weights/pallet_preimage.rs | 63 ++--- .../polkadot/src/weights/pallet_scheduler.rs | 146 ++++++++-- .../rococo/src/weights/pallet_democracy.rs | 265 +++++++++++++++--- runtime/rococo/src/weights/pallet_preimage.rs | 63 ++--- .../rococo/src/weights/pallet_scheduler.rs | 146 ++++++++-- .../westend/src/weights/pallet_preimage.rs | 63 ++--- .../westend/src/weights/pallet_scheduler.rs | 146 ++++++++-- 11 files changed, 1283 insertions(+), 349 deletions(-) diff --git a/runtime/kusama/src/weights/pallet_democracy.rs b/runtime/kusama/src/weights/pallet_democracy.rs index c9bccf32c208..b9b4127c597e 100644 --- a/runtime/kusama/src/weights/pallet_democracy.rs +++ b/runtime/kusama/src/weights/pallet_democracy.rs @@ -1,49 +1,240 @@ -// This file is part of Substrate. +// Copyright 2017-2022 Parity Technologies (UK) Ltd. +// This file is part of Polkadot. -// Copyright (C) 2022 Parity Technologies (UK) Ltd. -// SPDX-License-Identifier: Apache-2.0 +// 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. -// 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. +// 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. + +// You should have received a copy of the GNU General Public License +// along with Polkadot. If not, see . +//! Autogenerated weights for `pallet_democracy` +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-10-03, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! HOSTNAME: `bm2`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024 + +// Executed Command: +// ./target/production/polkadot +// benchmark +// pallet +// --chain=kusama-dev +// --steps=50 +// --repeat=20 +// --pallet=pallet_democracy +// --extrinsic=* +// --execution=wasm +// --wasm-execution=compiled +// --header=./file_header.txt +// --output=./runtime/kusama/src/weights #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -use frame_support::{traits::Get, weights::{Weight}}; +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; +/// Weight functions for `pallet_democracy`. pub struct WeightInfo(PhantomData); impl pallet_democracy::WeightInfo for WeightInfo { - fn propose() -> Weight { Weight::zero() } - fn second() -> Weight { Weight::zero() } - fn vote_new() -> Weight { Weight::zero() } - fn vote_existing() -> Weight { Weight::zero() } - fn emergency_cancel() -> Weight { Weight::zero() } - fn blacklist() -> Weight { Weight::zero() } - fn external_propose() -> Weight { Weight::zero() } - fn external_propose_majority() -> Weight { Weight::zero() } - fn external_propose_default() -> Weight { Weight::zero() } - fn fast_track() -> Weight { Weight::zero() } - fn veto_external() -> Weight { Weight::zero() } - fn cancel_proposal() -> Weight { Weight::zero() } - fn cancel_referendum() -> Weight { Weight::zero() } - fn on_initialize_base(_r: u32, ) -> Weight { Weight::zero() } - fn on_initialize_base_with_launch_period(_r: u32, ) -> Weight { Weight::zero() } - fn delegate(_r: u32, ) -> Weight { Weight::zero() } - fn undelegate(_r: u32, ) -> Weight { Weight::zero() } - fn clear_public_proposals() -> Weight { Weight::zero() } - fn unlock_remove(_r: u32, ) -> Weight { Weight::zero() } - fn unlock_set(_r: u32, ) -> Weight { Weight::zero() } - fn remove_vote(_r: u32, ) -> Weight { Weight::zero() } - fn remove_other_vote(_r: u32, ) -> Weight { Weight::zero() } + // Storage: Democracy PublicPropCount (r:1 w:1) + // Storage: Democracy PublicProps (r:1 w:1) + // Storage: Democracy Blacklist (r:1 w:0) + // Storage: Democracy DepositOf (r:0 w:1) + fn propose() -> Weight { + Weight::from_ref_time(42_340_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) + } + // Storage: Democracy DepositOf (r:1 w:1) + fn second() -> Weight { + Weight::from_ref_time(38_557_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy VotingOf (r:1 w:1) + // Storage: Balances Locks (r:1 w:1) + fn vote_new() -> Weight { + Weight::from_ref_time(48_480_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) + } + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy VotingOf (r:1 w:1) + // Storage: Balances Locks (r:1 w:1) + fn vote_existing() -> Weight { + Weight::from_ref_time(48_553_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) + } + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy Cancellations (r:1 w:1) + fn emergency_cancel() -> Weight { + Weight::from_ref_time(20_602_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + } + // Storage: Democracy PublicProps (r:1 w:1) + // Storage: Democracy DepositOf (r:1 w:1) + // Storage: System Account (r:1 w:1) + // Storage: Democracy NextExternal (r:1 w:1) + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy Blacklist (r:0 w:1) + fn blacklist() -> Weight { + Weight::from_ref_time(75_265_000 as u64) + .saturating_add(T::DbWeight::get().reads(5 as u64)) + .saturating_add(T::DbWeight::get().writes(6 as u64)) + } + // Storage: Democracy NextExternal (r:1 w:1) + // Storage: Democracy Blacklist (r:1 w:0) + fn external_propose() -> Weight { + Weight::from_ref_time(15_498_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Democracy NextExternal (r:0 w:1) + fn external_propose_majority() -> Weight { + Weight::from_ref_time(4_503_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Democracy NextExternal (r:0 w:1) + fn external_propose_default() -> Weight { + Weight::from_ref_time(4_486_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Democracy NextExternal (r:1 w:1) + // Storage: Democracy ReferendumCount (r:1 w:1) + // Storage: Democracy ReferendumInfoOf (r:0 w:1) + fn fast_track() -> Weight { + Weight::from_ref_time(19_676_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) + } + // Storage: Democracy NextExternal (r:1 w:1) + // Storage: Democracy Blacklist (r:1 w:1) + fn veto_external() -> Weight { + Weight::from_ref_time(25_443_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + } + // Storage: Democracy PublicProps (r:1 w:1) + // Storage: Democracy DepositOf (r:1 w:1) + // Storage: System Account (r:1 w:1) + fn cancel_proposal() -> Weight { + Weight::from_ref_time(63_468_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) + } + // Storage: Democracy ReferendumInfoOf (r:0 w:1) + fn cancel_referendum() -> Weight { + Weight::from_ref_time(13_030_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Democracy LowestUnbaked (r:1 w:1) + // Storage: Democracy ReferendumCount (r:1 w:0) + // Storage: Democracy ReferendumInfoOf (r:2 w:0) + /// The range of component `r` is `[0, 99]`. + fn on_initialize_base(r: u32, ) -> Weight { + Weight::from_ref_time(5_941_000 as u64) + // Standard Error: 2_263 + .saturating_add(Weight::from_ref_time(2_136_731 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Democracy LowestUnbaked (r:1 w:1) + // Storage: Democracy ReferendumCount (r:1 w:0) + // Storage: Democracy LastTabledWasExternal (r:1 w:0) + // Storage: Democracy NextExternal (r:1 w:0) + // Storage: Democracy PublicProps (r:1 w:0) + // Storage: Democracy ReferendumInfoOf (r:2 w:0) + /// The range of component `r` is `[0, 99]`. + fn on_initialize_base_with_launch_period(r: u32, ) -> Weight { + Weight::from_ref_time(8_085_000 as u64) + // Standard Error: 2_202 + .saturating_add(Weight::from_ref_time(2_143_624 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(5 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Democracy VotingOf (r:3 w:3) + // Storage: Balances Locks (r:1 w:1) + // Storage: Democracy ReferendumInfoOf (r:2 w:2) + /// The range of component `r` is `[0, 99]`. + fn delegate(r: u32, ) -> Weight { + Weight::from_ref_time(40_416_000 as u64) + // Standard Error: 4_125 + .saturating_add(Weight::from_ref_time(3_038_258 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(4 as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(r as u64))) + } + // Storage: Democracy VotingOf (r:2 w:2) + // Storage: Democracy ReferendumInfoOf (r:2 w:2) + /// The range of component `r` is `[0, 99]`. + fn undelegate(r: u32, ) -> Weight { + Weight::from_ref_time(24_459_000 as u64) + // Standard Error: 2_860 + .saturating_add(Weight::from_ref_time(2_984_453 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(r as u64))) + } + // Storage: Democracy PublicProps (r:0 w:1) + fn clear_public_proposals() -> Weight { + Weight::from_ref_time(5_200_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Democracy VotingOf (r:1 w:1) + // Storage: Balances Locks (r:1 w:1) + // Storage: System Account (r:1 w:1) + /// The range of component `r` is `[0, 99]`. + fn unlock_remove(r: u32, ) -> Weight { + Weight::from_ref_time(24_289_000 as u64) + // Standard Error: 2_579 + .saturating_add(Weight::from_ref_time(125_300 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) + } + // Storage: Democracy VotingOf (r:1 w:1) + // Storage: Balances Locks (r:1 w:1) + // Storage: System Account (r:1 w:1) + /// The range of component `r` is `[0, 99]`. + fn unlock_set(r: u32, ) -> Weight { + Weight::from_ref_time(28_331_000 as u64) + // Standard Error: 755 + .saturating_add(Weight::from_ref_time(90_997 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) + } + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy VotingOf (r:1 w:1) + /// The range of component `r` is `[1, 100]`. + fn remove_vote(r: u32, ) -> Weight { + Weight::from_ref_time(15_350_000 as u64) + // Standard Error: 1_015 + .saturating_add(Weight::from_ref_time(104_402 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + } + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy VotingOf (r:1 w:1) + /// The range of component `r` is `[1, 100]`. + fn remove_other_vote(r: u32, ) -> Weight { + Weight::from_ref_time(15_433_000 as u64) + // Standard Error: 980 + .saturating_add(Weight::from_ref_time(104_660 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + } } diff --git a/runtime/kusama/src/weights/pallet_preimage.rs b/runtime/kusama/src/weights/pallet_preimage.rs index 782deda50e27..2fc3687f4581 100644 --- a/runtime/kusama/src/weights/pallet_preimage.rs +++ b/runtime/kusama/src/weights/pallet_preimage.rs @@ -16,8 +16,8 @@ //! Autogenerated weights for `pallet_preimage` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-09-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! HOSTNAME: `bm4`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` +//! DATE: 2022-10-03, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! HOSTNAME: `bm2`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024 // Executed Command: @@ -32,103 +32,102 @@ // --execution=wasm // --wasm-execution=compiled // --header=./file_header.txt -// --output=./runtime/kusama/src/weights/ +// --output=./runtime/kusama/src/weights #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -use frame_support::{traits::Get, weights::{Weight}}; +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; /// Weight functions for `pallet_preimage`. pub struct WeightInfo(PhantomData); impl pallet_preimage::WeightInfo for WeightInfo { - // Storage: Preimage PreimageFor (r:1 w:1) // Storage: Preimage StatusFor (r:1 w:1) + // Storage: Preimage PreimageFor (r:0 w:1) /// The range of component `s` is `[0, 4194304]`. fn note_preimage(s: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) + Weight::from_ref_time(27_993_000 as u64) + // Standard Error: 5 + .saturating_add(Weight::from_ref_time(2_208 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(2 as u64)) } - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:0) + // Storage: Preimage StatusFor (r:1 w:1) + // Storage: Preimage PreimageFor (r:0 w:1) /// The range of component `s` is `[0, 4194304]`. fn note_requested_preimage(s: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(19_503_000 as u64) + // Standard Error: 5 + .saturating_add(Weight::from_ref_time(2_264 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:0) + // Storage: Preimage StatusFor (r:1 w:1) + // Storage: Preimage PreimageFor (r:0 w:1) /// The range of component `s` is `[0, 4194304]`. fn note_no_deposit_preimage(s: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(17_878_000 as u64) + // Standard Error: 2 + .saturating_add(Weight::from_ref_time(2_130 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) // Storage: Preimage PreimageFor (r:0 w:1) fn unnote_preimage() -> Weight { - Weight::from_ref_time(37_471_000 as u64) + Weight::from_ref_time(40_091_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) // Storage: Preimage PreimageFor (r:0 w:1) fn unnote_no_deposit_preimage() -> Weight { - Weight::from_ref_time(26_305_000 as u64) + Weight::from_ref_time(27_459_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) fn request_preimage() -> Weight { - Weight::from_ref_time(35_418_000 as u64) + Weight::from_ref_time(27_176_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) fn request_no_deposit_preimage() -> Weight { - Weight::from_ref_time(23_113_000 as u64) + Weight::from_ref_time(14_096_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) fn request_unnoted_preimage() -> Weight { - Weight::from_ref_time(17_429_000 as u64) + Weight::from_ref_time(17_365_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) fn request_requested_preimage() -> Weight { - Weight::from_ref_time(8_153_000 as u64) + Weight::from_ref_time(8_013_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) // Storage: Preimage PreimageFor (r:0 w:1) fn unrequest_preimage() -> Weight { - Weight::from_ref_time(25_132_000 as u64) + Weight::from_ref_time(27_185_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) - // Storage: Preimage PreimageFor (r:0 w:1) fn unrequest_unnoted_preimage() -> Weight { - Weight::from_ref_time(17_918_000 as u64) + Weight::from_ref_time(7_955_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) fn unrequest_multi_referenced_preimage() -> Weight { - Weight::from_ref_time(8_173_000 as u64) + Weight::from_ref_time(7_819_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(1 as u64)) } diff --git a/runtime/kusama/src/weights/pallet_scheduler.rs b/runtime/kusama/src/weights/pallet_scheduler.rs index 369318ae2e10..c6df2801dd69 100644 --- a/runtime/kusama/src/weights/pallet_scheduler.rs +++ b/runtime/kusama/src/weights/pallet_scheduler.rs @@ -1,39 +1,128 @@ -// This file is part of Substrate. +// Copyright 2017-2022 Parity Technologies (UK) Ltd. +// This file is part of Polkadot. -// Copyright (C) 2022 Parity Technologies (UK) Ltd. -// SPDX-License-Identifier: Apache-2.0 +// 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. -// 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. +// 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. + +// You should have received a copy of the GNU General Public License +// along with Polkadot. If not, see . +//! Autogenerated weights for `pallet_scheduler` +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-10-03, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! HOSTNAME: `bm2`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024 + +// Executed Command: +// ./target/production/polkadot +// benchmark +// pallet +// --chain=kusama-dev +// --steps=50 +// --repeat=20 +// --pallet=pallet_scheduler +// --extrinsic=* +// --execution=wasm +// --wasm-execution=compiled +// --header=./file_header.txt +// --output=./runtime/kusama/src/weights #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -use frame_support::{traits::Get, weights::{Weight}}; +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; +/// Weight functions for `pallet_scheduler`. pub struct WeightInfo(PhantomData); impl pallet_scheduler::WeightInfo for WeightInfo { - fn service_agendas_base() -> Weight { Weight::zero() } - fn service_agenda_base(_s: u32, ) -> Weight { Weight::zero() } - fn service_task_base() -> Weight { Weight::zero() } - fn service_task_fetched(_s: u32, ) -> Weight { Weight::zero() } - fn service_task_named() -> Weight { Weight::zero() } - fn service_task_periodic() -> Weight { Weight::zero() } - fn execute_dispatch_signed() -> Weight { Weight::zero() } - fn execute_dispatch_unsigned() -> Weight { Weight::zero() } - fn schedule(_s: u32, ) -> Weight { Weight::zero() } - fn cancel(_s: u32, ) -> Weight { Weight::zero() } - fn schedule_named(_s: u32, ) -> Weight { Weight::zero() } - fn cancel_named(_s: u32, ) -> Weight { Weight::zero() } + // Storage: Scheduler IncompleteSince (r:1 w:1) + fn service_agendas_base() -> Weight { + Weight::from_ref_time(4_558_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Scheduler Agenda (r:1 w:1) + /// The range of component `s` is `[0, 50]`. + fn service_agenda_base(s: u32, ) -> Weight { + Weight::from_ref_time(3_715_000 as u64) + // Standard Error: 2_737 + .saturating_add(Weight::from_ref_time(624_353 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + fn service_task_base() -> Weight { + Weight::from_ref_time(9_345_000 as u64) + } + // Storage: Preimage PreimageFor (r:1 w:1) + // Storage: Preimage StatusFor (r:1 w:1) + /// The range of component `s` is `[128, 4194304]`. + fn service_task_fetched(s: u32, ) -> Weight { + Weight::from_ref_time(20_078_000 as u64) + // Standard Error: 5 + .saturating_add(Weight::from_ref_time(1_153 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + } + // Storage: Scheduler Lookup (r:0 w:1) + fn service_task_named() -> Weight { + Weight::from_ref_time(10_744_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + fn service_task_periodic() -> Weight { + Weight::from_ref_time(9_556_000 as u64) + } + fn execute_dispatch_signed() -> Weight { + Weight::from_ref_time(4_130_000 as u64) + } + fn execute_dispatch_unsigned() -> Weight { + Weight::from_ref_time(4_058_000 as u64) + } + // Storage: Scheduler Agenda (r:1 w:1) + /// The range of component `s` is `[0, 49]`. + fn schedule(s: u32, ) -> Weight { + Weight::from_ref_time(16_721_000 as u64) + // Standard Error: 3_319 + .saturating_add(Weight::from_ref_time(657_802 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Scheduler Agenda (r:1 w:1) + // Storage: Scheduler Lookup (r:0 w:1) + /// The range of component `s` is `[1, 50]`. + fn cancel(s: u32, ) -> Weight { + Weight::from_ref_time(19_496_000 as u64) + // Standard Error: 1_368 + .saturating_add(Weight::from_ref_time(572_226 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + } + // Storage: Scheduler Lookup (r:1 w:1) + // Storage: Scheduler Agenda (r:1 w:1) + /// The range of component `s` is `[0, 49]`. + fn schedule_named(s: u32, ) -> Weight { + Weight::from_ref_time(19_831_000 as u64) + // Standard Error: 3_559 + .saturating_add(Weight::from_ref_time(689_493 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + } + // Storage: Scheduler Lookup (r:1 w:1) + // Storage: Scheduler Agenda (r:1 w:1) + /// The range of component `s` is `[1, 50]`. + fn cancel_named(s: u32, ) -> Weight { + Weight::from_ref_time(20_788_000 as u64) + // Standard Error: 1_758 + .saturating_add(Weight::from_ref_time(605_808 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + } } diff --git a/runtime/polkadot/src/weights/pallet_democracy.rs b/runtime/polkadot/src/weights/pallet_democracy.rs index c9bccf32c208..136797abcf03 100644 --- a/runtime/polkadot/src/weights/pallet_democracy.rs +++ b/runtime/polkadot/src/weights/pallet_democracy.rs @@ -1,49 +1,240 @@ -// This file is part of Substrate. +// Copyright 2017-2022 Parity Technologies (UK) Ltd. +// This file is part of Polkadot. -// Copyright (C) 2022 Parity Technologies (UK) Ltd. -// SPDX-License-Identifier: Apache-2.0 +// 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. -// 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. +// 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. + +// You should have received a copy of the GNU General Public License +// along with Polkadot. If not, see . +//! Autogenerated weights for `pallet_democracy` +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-10-03, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! HOSTNAME: `bm2`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024 + +// Executed Command: +// ./target/production/polkadot +// benchmark +// pallet +// --chain=polkadot-dev +// --steps=50 +// --repeat=20 +// --pallet=pallet_democracy +// --extrinsic=* +// --execution=wasm +// --wasm-execution=compiled +// --header=./file_header.txt +// --output=./runtime/polkadot/src/weights #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -use frame_support::{traits::Get, weights::{Weight}}; +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; +/// Weight functions for `pallet_democracy`. pub struct WeightInfo(PhantomData); impl pallet_democracy::WeightInfo for WeightInfo { - fn propose() -> Weight { Weight::zero() } - fn second() -> Weight { Weight::zero() } - fn vote_new() -> Weight { Weight::zero() } - fn vote_existing() -> Weight { Weight::zero() } - fn emergency_cancel() -> Weight { Weight::zero() } - fn blacklist() -> Weight { Weight::zero() } - fn external_propose() -> Weight { Weight::zero() } - fn external_propose_majority() -> Weight { Weight::zero() } - fn external_propose_default() -> Weight { Weight::zero() } - fn fast_track() -> Weight { Weight::zero() } - fn veto_external() -> Weight { Weight::zero() } - fn cancel_proposal() -> Weight { Weight::zero() } - fn cancel_referendum() -> Weight { Weight::zero() } - fn on_initialize_base(_r: u32, ) -> Weight { Weight::zero() } - fn on_initialize_base_with_launch_period(_r: u32, ) -> Weight { Weight::zero() } - fn delegate(_r: u32, ) -> Weight { Weight::zero() } - fn undelegate(_r: u32, ) -> Weight { Weight::zero() } - fn clear_public_proposals() -> Weight { Weight::zero() } - fn unlock_remove(_r: u32, ) -> Weight { Weight::zero() } - fn unlock_set(_r: u32, ) -> Weight { Weight::zero() } - fn remove_vote(_r: u32, ) -> Weight { Weight::zero() } - fn remove_other_vote(_r: u32, ) -> Weight { Weight::zero() } + // Storage: Democracy PublicPropCount (r:1 w:1) + // Storage: Democracy PublicProps (r:1 w:1) + // Storage: Democracy Blacklist (r:1 w:0) + // Storage: Democracy DepositOf (r:0 w:1) + fn propose() -> Weight { + Weight::from_ref_time(42_048_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) + } + // Storage: Democracy DepositOf (r:1 w:1) + fn second() -> Weight { + Weight::from_ref_time(38_631_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy VotingOf (r:1 w:1) + // Storage: Balances Locks (r:1 w:1) + fn vote_new() -> Weight { + Weight::from_ref_time(48_571_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) + } + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy VotingOf (r:1 w:1) + // Storage: Balances Locks (r:1 w:1) + fn vote_existing() -> Weight { + Weight::from_ref_time(48_556_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) + } + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy Cancellations (r:1 w:1) + fn emergency_cancel() -> Weight { + Weight::from_ref_time(20_104_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + } + // Storage: Democracy PublicProps (r:1 w:1) + // Storage: Democracy DepositOf (r:1 w:1) + // Storage: System Account (r:1 w:1) + // Storage: Democracy NextExternal (r:1 w:1) + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy Blacklist (r:0 w:1) + fn blacklist() -> Weight { + Weight::from_ref_time(75_289_000 as u64) + .saturating_add(T::DbWeight::get().reads(5 as u64)) + .saturating_add(T::DbWeight::get().writes(6 as u64)) + } + // Storage: Democracy NextExternal (r:1 w:1) + // Storage: Democracy Blacklist (r:1 w:0) + fn external_propose() -> Weight { + Weight::from_ref_time(15_734_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Democracy NextExternal (r:0 w:1) + fn external_propose_majority() -> Weight { + Weight::from_ref_time(4_507_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Democracy NextExternal (r:0 w:1) + fn external_propose_default() -> Weight { + Weight::from_ref_time(4_603_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Democracy NextExternal (r:1 w:1) + // Storage: Democracy ReferendumCount (r:1 w:1) + // Storage: Democracy ReferendumInfoOf (r:0 w:1) + fn fast_track() -> Weight { + Weight::from_ref_time(19_816_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) + } + // Storage: Democracy NextExternal (r:1 w:1) + // Storage: Democracy Blacklist (r:1 w:1) + fn veto_external() -> Weight { + Weight::from_ref_time(25_722_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + } + // Storage: Democracy PublicProps (r:1 w:1) + // Storage: Democracy DepositOf (r:1 w:1) + // Storage: System Account (r:1 w:1) + fn cancel_proposal() -> Weight { + Weight::from_ref_time(63_768_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) + } + // Storage: Democracy ReferendumInfoOf (r:0 w:1) + fn cancel_referendum() -> Weight { + Weight::from_ref_time(13_183_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Democracy LowestUnbaked (r:1 w:1) + // Storage: Democracy ReferendumCount (r:1 w:0) + // Storage: Democracy ReferendumInfoOf (r:2 w:0) + /// The range of component `r` is `[0, 99]`. + fn on_initialize_base(r: u32, ) -> Weight { + Weight::from_ref_time(5_999_000 as u64) + // Standard Error: 2_072 + .saturating_add(Weight::from_ref_time(2_080_681 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Democracy LowestUnbaked (r:1 w:1) + // Storage: Democracy ReferendumCount (r:1 w:0) + // Storage: Democracy LastTabledWasExternal (r:1 w:0) + // Storage: Democracy NextExternal (r:1 w:0) + // Storage: Democracy PublicProps (r:1 w:0) + // Storage: Democracy ReferendumInfoOf (r:2 w:0) + /// The range of component `r` is `[0, 99]`. + fn on_initialize_base_with_launch_period(r: u32, ) -> Weight { + Weight::from_ref_time(8_114_000 as u64) + // Standard Error: 2_286 + .saturating_add(Weight::from_ref_time(2_087_574 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(5 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Democracy VotingOf (r:3 w:3) + // Storage: Balances Locks (r:1 w:1) + // Storage: Democracy ReferendumInfoOf (r:2 w:2) + /// The range of component `r` is `[0, 99]`. + fn delegate(r: u32, ) -> Weight { + Weight::from_ref_time(40_509_000 as u64) + // Standard Error: 3_676 + .saturating_add(Weight::from_ref_time(2_999_395 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(4 as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(r as u64))) + } + // Storage: Democracy VotingOf (r:2 w:2) + // Storage: Democracy ReferendumInfoOf (r:2 w:2) + /// The range of component `r` is `[0, 99]`. + fn undelegate(r: u32, ) -> Weight { + Weight::from_ref_time(24_592_000 as u64) + // Standard Error: 2_506 + .saturating_add(Weight::from_ref_time(2_932_469 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(r as u64))) + } + // Storage: Democracy PublicProps (r:0 w:1) + fn clear_public_proposals() -> Weight { + Weight::from_ref_time(5_070_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Democracy VotingOf (r:1 w:1) + // Storage: Balances Locks (r:1 w:1) + // Storage: System Account (r:1 w:1) + /// The range of component `r` is `[0, 99]`. + fn unlock_remove(r: u32, ) -> Weight { + Weight::from_ref_time(23_860_000 as u64) + // Standard Error: 2_624 + .saturating_add(Weight::from_ref_time(129_209 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) + } + // Storage: Democracy VotingOf (r:1 w:1) + // Storage: Balances Locks (r:1 w:1) + // Storage: System Account (r:1 w:1) + /// The range of component `r` is `[0, 99]`. + fn unlock_set(r: u32, ) -> Weight { + Weight::from_ref_time(28_512_000 as u64) + // Standard Error: 619 + .saturating_add(Weight::from_ref_time(84_477 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) + } + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy VotingOf (r:1 w:1) + /// The range of component `r` is `[1, 100]`. + fn remove_vote(r: u32, ) -> Weight { + Weight::from_ref_time(15_612_000 as u64) + // Standard Error: 841 + .saturating_add(Weight::from_ref_time(98_567 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + } + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy VotingOf (r:1 w:1) + /// The range of component `r` is `[1, 100]`. + fn remove_other_vote(r: u32, ) -> Weight { + Weight::from_ref_time(15_282_000 as u64) + // Standard Error: 1_040 + .saturating_add(Weight::from_ref_time(104_928 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + } } diff --git a/runtime/polkadot/src/weights/pallet_preimage.rs b/runtime/polkadot/src/weights/pallet_preimage.rs index 15606f560519..bd316e310277 100644 --- a/runtime/polkadot/src/weights/pallet_preimage.rs +++ b/runtime/polkadot/src/weights/pallet_preimage.rs @@ -16,8 +16,8 @@ //! Autogenerated weights for `pallet_preimage` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-09-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` +//! DATE: 2022-10-03, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! HOSTNAME: `bm2`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024 // Executed Command: @@ -32,103 +32,102 @@ // --execution=wasm // --wasm-execution=compiled // --header=./file_header.txt -// --output=./runtime/polkadot/src/weights/ +// --output=./runtime/polkadot/src/weights #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -use frame_support::{traits::Get, weights::{Weight}}; +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; /// Weight functions for `pallet_preimage`. pub struct WeightInfo(PhantomData); impl pallet_preimage::WeightInfo for WeightInfo { - // Storage: Preimage PreimageFor (r:1 w:1) // Storage: Preimage StatusFor (r:1 w:1) + // Storage: Preimage PreimageFor (r:0 w:1) /// The range of component `s` is `[0, 4194304]`. fn note_preimage(s: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_ref_time(28_326_000 as u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(Weight::from_ref_time(2_116 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(2 as u64)) } - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:0) + // Storage: Preimage StatusFor (r:1 w:1) + // Storage: Preimage PreimageFor (r:0 w:1) /// The range of component `s` is `[0, 4194304]`. fn note_requested_preimage(s: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_ref_time(20_011_000 as u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(2_114 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:0) + // Storage: Preimage StatusFor (r:1 w:1) + // Storage: Preimage PreimageFor (r:0 w:1) /// The range of component `s` is `[0, 4194304]`. fn note_no_deposit_preimage(s: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(18_805_000 as u64) + // Standard Error: 1 + .saturating_add(Weight::from_ref_time(2_116 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) // Storage: Preimage PreimageFor (r:0 w:1) fn unnote_preimage() -> Weight { - Weight::from_ref_time(40_028_000 as u64) + Weight::from_ref_time(39_007_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) // Storage: Preimage PreimageFor (r:0 w:1) fn unnote_no_deposit_preimage() -> Weight { - Weight::from_ref_time(27_637_000 as u64) + Weight::from_ref_time(27_523_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) fn request_preimage() -> Weight { - Weight::from_ref_time(37_505_000 as u64) + Weight::from_ref_time(26_477_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) fn request_no_deposit_preimage() -> Weight { - Weight::from_ref_time(26_628_000 as u64) + Weight::from_ref_time(13_236_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) fn request_unnoted_preimage() -> Weight { - Weight::from_ref_time(17_156_000 as u64) + Weight::from_ref_time(17_975_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) fn request_requested_preimage() -> Weight { - Weight::from_ref_time(8_109_000 as u64) + Weight::from_ref_time(8_295_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) // Storage: Preimage PreimageFor (r:0 w:1) fn unrequest_preimage() -> Weight { - Weight::from_ref_time(27_209_000 as u64) + Weight::from_ref_time(26_186_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) - // Storage: Preimage PreimageFor (r:0 w:1) fn unrequest_unnoted_preimage() -> Weight { - Weight::from_ref_time(17_931_000 as u64) + Weight::from_ref_time(8_176_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) fn unrequest_multi_referenced_preimage() -> Weight { - Weight::from_ref_time(7_951_000 as u64) + Weight::from_ref_time(8_005_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(1 as u64)) } diff --git a/runtime/polkadot/src/weights/pallet_scheduler.rs b/runtime/polkadot/src/weights/pallet_scheduler.rs index 369318ae2e10..9446fdc5efec 100644 --- a/runtime/polkadot/src/weights/pallet_scheduler.rs +++ b/runtime/polkadot/src/weights/pallet_scheduler.rs @@ -1,39 +1,131 @@ -// This file is part of Substrate. +// Copyright 2017-2022 Parity Technologies (UK) Ltd. +// This file is part of Polkadot. -// Copyright (C) 2022 Parity Technologies (UK) Ltd. -// SPDX-License-Identifier: Apache-2.0 +// 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. -// 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. +// 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. + +// You should have received a copy of the GNU General Public License +// along with Polkadot. If not, see . +//! Autogenerated weights for `pallet_scheduler` +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-10-03, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! HOSTNAME: `bm2`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024 + +// Executed Command: +// ./target/production/polkadot +// benchmark +// pallet +// --chain=polkadot-dev +// --steps=50 +// --repeat=20 +// --pallet=pallet_scheduler +// --extrinsic=* +// --execution=wasm +// --wasm-execution=compiled +// --header=./file_header.txt +// --output=./runtime/polkadot/src/weights #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -use frame_support::{traits::Get, weights::{Weight}}; +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; +/// Weight functions for `pallet_scheduler`. pub struct WeightInfo(PhantomData); impl pallet_scheduler::WeightInfo for WeightInfo { - fn service_agendas_base() -> Weight { Weight::zero() } - fn service_agenda_base(_s: u32, ) -> Weight { Weight::zero() } - fn service_task_base() -> Weight { Weight::zero() } - fn service_task_fetched(_s: u32, ) -> Weight { Weight::zero() } - fn service_task_named() -> Weight { Weight::zero() } - fn service_task_periodic() -> Weight { Weight::zero() } - fn execute_dispatch_signed() -> Weight { Weight::zero() } - fn execute_dispatch_unsigned() -> Weight { Weight::zero() } - fn schedule(_s: u32, ) -> Weight { Weight::zero() } - fn cancel(_s: u32, ) -> Weight { Weight::zero() } - fn schedule_named(_s: u32, ) -> Weight { Weight::zero() } - fn cancel_named(_s: u32, ) -> Weight { Weight::zero() } + // Storage: Scheduler IncompleteSince (r:1 w:1) + fn service_agendas_base() -> Weight { + Weight::from_ref_time(4_522_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Scheduler Agenda (r:1 w:1) + /// The range of component `s` is `[0, 50]`. + fn service_agenda_base(s: u32, ) -> Weight { + Weight::from_ref_time(3_859_000 as u64) + // Standard Error: 2_692 + .saturating_add(Weight::from_ref_time(618_992 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + fn service_task_base() -> Weight { + Weight::from_ref_time(12_288_000 as u64) + } + // Storage: Preimage PreimageFor (r:1 w:1) + // Storage: Preimage StatusFor (r:1 w:1) + /// The range of component `s` is `[128, 4194304]`. + fn service_task_fetched(s: u32, ) -> Weight { + Weight::from_ref_time(23_105_000 as u64) + // Standard Error: 0 + .saturating_add(Weight::from_ref_time(1_126 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + } + // Storage: Scheduler Lookup (r:0 w:1) + fn service_task_named() -> Weight { + Weight::from_ref_time(13_382_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Scheduler Agenda (r:1 w:1) + fn service_task_periodic() -> Weight { + Weight::from_ref_time(19_246_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + fn execute_dispatch_signed() -> Weight { + Weight::from_ref_time(3_714_000 as u64) + } + fn execute_dispatch_unsigned() -> Weight { + Weight::from_ref_time(3_667_000 as u64) + } + // Storage: Scheduler Agenda (r:1 w:1) + /// The range of component `s` is `[0, 49]`. + fn schedule(s: u32, ) -> Weight { + Weight::from_ref_time(16_556_000 as u64) + // Standard Error: 3_431 + .saturating_add(Weight::from_ref_time(659_506 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Scheduler Agenda (r:1 w:1) + // Storage: Scheduler Lookup (r:0 w:1) + /// The range of component `s` is `[1, 50]`. + fn cancel(s: u32, ) -> Weight { + Weight::from_ref_time(18_922_000 as u64) + // Standard Error: 1_665 + .saturating_add(Weight::from_ref_time(586_420 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + } + // Storage: Scheduler Lookup (r:1 w:1) + // Storage: Scheduler Agenda (r:1 w:1) + /// The range of component `s` is `[0, 49]`. + fn schedule_named(s: u32, ) -> Weight { + Weight::from_ref_time(19_633_000 as u64) + // Standard Error: 3_740 + .saturating_add(Weight::from_ref_time(692_772 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + } + // Storage: Scheduler Lookup (r:1 w:1) + // Storage: Scheduler Agenda (r:1 w:1) + /// The range of component `s` is `[1, 50]`. + fn cancel_named(s: u32, ) -> Weight { + Weight::from_ref_time(20_220_000 as u64) + // Standard Error: 2_111 + .saturating_add(Weight::from_ref_time(622_452 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + } } diff --git a/runtime/rococo/src/weights/pallet_democracy.rs b/runtime/rococo/src/weights/pallet_democracy.rs index c9bccf32c208..453385b594e7 100644 --- a/runtime/rococo/src/weights/pallet_democracy.rs +++ b/runtime/rococo/src/weights/pallet_democracy.rs @@ -1,49 +1,240 @@ -// This file is part of Substrate. +// Copyright 2017-2022 Parity Technologies (UK) Ltd. +// This file is part of Polkadot. -// Copyright (C) 2022 Parity Technologies (UK) Ltd. -// SPDX-License-Identifier: Apache-2.0 +// 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. -// 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. +// 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. + +// You should have received a copy of the GNU General Public License +// along with Polkadot. If not, see . +//! Autogenerated weights for `pallet_democracy` +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-10-03, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! HOSTNAME: `bm2`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("rococo-dev"), DB CACHE: 1024 + +// Executed Command: +// ./target/production/polkadot +// benchmark +// pallet +// --chain=rococo-dev +// --steps=50 +// --repeat=20 +// --pallet=pallet_democracy +// --extrinsic=* +// --execution=wasm +// --wasm-execution=compiled +// --header=./file_header.txt +// --output=./runtime/rococo/src/weights #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -use frame_support::{traits::Get, weights::{Weight}}; +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; +/// Weight functions for `pallet_democracy`. pub struct WeightInfo(PhantomData); impl pallet_democracy::WeightInfo for WeightInfo { - fn propose() -> Weight { Weight::zero() } - fn second() -> Weight { Weight::zero() } - fn vote_new() -> Weight { Weight::zero() } - fn vote_existing() -> Weight { Weight::zero() } - fn emergency_cancel() -> Weight { Weight::zero() } - fn blacklist() -> Weight { Weight::zero() } - fn external_propose() -> Weight { Weight::zero() } - fn external_propose_majority() -> Weight { Weight::zero() } - fn external_propose_default() -> Weight { Weight::zero() } - fn fast_track() -> Weight { Weight::zero() } - fn veto_external() -> Weight { Weight::zero() } - fn cancel_proposal() -> Weight { Weight::zero() } - fn cancel_referendum() -> Weight { Weight::zero() } - fn on_initialize_base(_r: u32, ) -> Weight { Weight::zero() } - fn on_initialize_base_with_launch_period(_r: u32, ) -> Weight { Weight::zero() } - fn delegate(_r: u32, ) -> Weight { Weight::zero() } - fn undelegate(_r: u32, ) -> Weight { Weight::zero() } - fn clear_public_proposals() -> Weight { Weight::zero() } - fn unlock_remove(_r: u32, ) -> Weight { Weight::zero() } - fn unlock_set(_r: u32, ) -> Weight { Weight::zero() } - fn remove_vote(_r: u32, ) -> Weight { Weight::zero() } - fn remove_other_vote(_r: u32, ) -> Weight { Weight::zero() } + // Storage: Democracy PublicPropCount (r:1 w:1) + // Storage: Democracy PublicProps (r:1 w:1) + // Storage: Democracy Blacklist (r:1 w:0) + // Storage: Democracy DepositOf (r:0 w:1) + fn propose() -> Weight { + Weight::from_ref_time(41_783_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) + } + // Storage: Democracy DepositOf (r:1 w:1) + fn second() -> Weight { + Weight::from_ref_time(38_362_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy VotingOf (r:1 w:1) + // Storage: Balances Locks (r:1 w:1) + fn vote_new() -> Weight { + Weight::from_ref_time(48_307_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) + } + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy VotingOf (r:1 w:1) + // Storage: Balances Locks (r:1 w:1) + fn vote_existing() -> Weight { + Weight::from_ref_time(48_500_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) + } + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy Cancellations (r:1 w:1) + fn emergency_cancel() -> Weight { + Weight::from_ref_time(20_294_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + } + // Storage: Democracy PublicProps (r:1 w:1) + // Storage: Democracy DepositOf (r:1 w:1) + // Storage: System Account (r:1 w:1) + // Storage: Democracy NextExternal (r:1 w:1) + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy Blacklist (r:0 w:1) + fn blacklist() -> Weight { + Weight::from_ref_time(75_191_000 as u64) + .saturating_add(T::DbWeight::get().reads(5 as u64)) + .saturating_add(T::DbWeight::get().writes(6 as u64)) + } + // Storage: Democracy NextExternal (r:1 w:1) + // Storage: Democracy Blacklist (r:1 w:0) + fn external_propose() -> Weight { + Weight::from_ref_time(16_369_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Democracy NextExternal (r:0 w:1) + fn external_propose_majority() -> Weight { + Weight::from_ref_time(4_767_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Democracy NextExternal (r:0 w:1) + fn external_propose_default() -> Weight { + Weight::from_ref_time(4_866_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Democracy NextExternal (r:1 w:1) + // Storage: Democracy ReferendumCount (r:1 w:1) + // Storage: Democracy ReferendumInfoOf (r:0 w:1) + fn fast_track() -> Weight { + Weight::from_ref_time(19_986_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) + } + // Storage: Democracy NextExternal (r:1 w:1) + // Storage: Democracy Blacklist (r:1 w:1) + fn veto_external() -> Weight { + Weight::from_ref_time(25_291_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + } + // Storage: Democracy PublicProps (r:1 w:1) + // Storage: Democracy DepositOf (r:1 w:1) + // Storage: System Account (r:1 w:1) + fn cancel_proposal() -> Weight { + Weight::from_ref_time(63_703_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) + } + // Storage: Democracy ReferendumInfoOf (r:0 w:1) + fn cancel_referendum() -> Weight { + Weight::from_ref_time(13_235_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Democracy LowestUnbaked (r:1 w:1) + // Storage: Democracy ReferendumCount (r:1 w:0) + // Storage: Democracy ReferendumInfoOf (r:2 w:0) + /// The range of component `r` is `[0, 99]`. + fn on_initialize_base(r: u32, ) -> Weight { + Weight::from_ref_time(5_980_000 as u64) + // Standard Error: 2_131 + .saturating_add(Weight::from_ref_time(2_104_197 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Democracy LowestUnbaked (r:1 w:1) + // Storage: Democracy ReferendumCount (r:1 w:0) + // Storage: Democracy LastTabledWasExternal (r:1 w:0) + // Storage: Democracy NextExternal (r:1 w:0) + // Storage: Democracy PublicProps (r:1 w:0) + // Storage: Democracy ReferendumInfoOf (r:2 w:0) + /// The range of component `r` is `[0, 99]`. + fn on_initialize_base_with_launch_period(r: u32, ) -> Weight { + Weight::from_ref_time(8_351_000 as u64) + // Standard Error: 2_308 + .saturating_add(Weight::from_ref_time(2_117_411 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(5 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Democracy VotingOf (r:3 w:3) + // Storage: Balances Locks (r:1 w:1) + // Storage: Democracy ReferendumInfoOf (r:2 w:2) + /// The range of component `r` is `[0, 99]`. + fn delegate(r: u32, ) -> Weight { + Weight::from_ref_time(40_303_000 as u64) + // Standard Error: 3_789 + .saturating_add(Weight::from_ref_time(3_031_594 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(4 as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(r as u64))) + } + // Storage: Democracy VotingOf (r:2 w:2) + // Storage: Democracy ReferendumInfoOf (r:2 w:2) + /// The range of component `r` is `[0, 99]`. + fn undelegate(r: u32, ) -> Weight { + Weight::from_ref_time(24_342_000 as u64) + // Standard Error: 2_624 + .saturating_add(Weight::from_ref_time(2_962_125 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(r as u64))) + } + // Storage: Democracy PublicProps (r:0 w:1) + fn clear_public_proposals() -> Weight { + Weight::from_ref_time(5_811_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Democracy VotingOf (r:1 w:1) + // Storage: Balances Locks (r:1 w:1) + // Storage: System Account (r:1 w:1) + /// The range of component `r` is `[0, 99]`. + fn unlock_remove(r: u32, ) -> Weight { + Weight::from_ref_time(22_894_000 as u64) + // Standard Error: 2_967 + .saturating_add(Weight::from_ref_time(142_001 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) + } + // Storage: Democracy VotingOf (r:1 w:1) + // Storage: Balances Locks (r:1 w:1) + // Storage: System Account (r:1 w:1) + /// The range of component `r` is `[0, 99]`. + fn unlock_set(r: u32, ) -> Weight { + Weight::from_ref_time(28_227_000 as u64) + // Standard Error: 673 + .saturating_add(Weight::from_ref_time(87_748 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) + } + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy VotingOf (r:1 w:1) + /// The range of component `r` is `[1, 100]`. + fn remove_vote(r: u32, ) -> Weight { + Weight::from_ref_time(15_578_000 as u64) + // Standard Error: 1_035 + .saturating_add(Weight::from_ref_time(105_378 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + } + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy VotingOf (r:1 w:1) + /// The range of component `r` is `[1, 100]`. + fn remove_other_vote(r: u32, ) -> Weight { + Weight::from_ref_time(15_542_000 as u64) + // Standard Error: 1_104 + .saturating_add(Weight::from_ref_time(109_552 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + } } diff --git a/runtime/rococo/src/weights/pallet_preimage.rs b/runtime/rococo/src/weights/pallet_preimage.rs index 5268e8054a13..1755de2b34e6 100644 --- a/runtime/rococo/src/weights/pallet_preimage.rs +++ b/runtime/rococo/src/weights/pallet_preimage.rs @@ -16,8 +16,8 @@ //! Autogenerated weights for `pallet_preimage` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-08-19, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! HOSTNAME: `bm4`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` +//! DATE: 2022-10-03, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! HOSTNAME: `bm2`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("rococo-dev"), DB CACHE: 1024 // Executed Command: @@ -32,7 +32,7 @@ // --execution=wasm // --wasm-execution=compiled // --header=./file_header.txt -// --output=./runtime/rococo/src/weights/pallet_preimage.rs +// --output=./runtime/rococo/src/weights #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] @@ -44,91 +44,90 @@ use sp_std::marker::PhantomData; /// Weight functions for `pallet_preimage`. pub struct WeightInfo(PhantomData); impl pallet_preimage::WeightInfo for WeightInfo { - // Storage: Preimage PreimageFor (r:1 w:1) // Storage: Preimage StatusFor (r:1 w:1) + // Storage: Preimage PreimageFor (r:0 w:1) /// The range of component `s` is `[0, 4194304]`. fn note_preimage(s: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_ref_time(29_017_000 as u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(3_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(Weight::from_ref_time(2_113 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(2 as u64)) } - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:0) + // Storage: Preimage StatusFor (r:1 w:1) + // Storage: Preimage PreimageFor (r:0 w:1) /// The range of component `s` is `[0, 4194304]`. fn note_requested_preimage(s: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(3_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(19_793_000 as u64) + // Standard Error: 1 + .saturating_add(Weight::from_ref_time(2_115 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:0) + // Storage: Preimage StatusFor (r:1 w:1) + // Storage: Preimage PreimageFor (r:0 w:1) /// The range of component `s` is `[0, 4194304]`. fn note_no_deposit_preimage(s: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(3_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(18_854_000 as u64) + // Standard Error: 1 + .saturating_add(Weight::from_ref_time(2_115 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) // Storage: Preimage PreimageFor (r:0 w:1) fn unnote_preimage() -> Weight { - Weight::from_ref_time(35_236_000 as u64) + Weight::from_ref_time(38_886_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) // Storage: Preimage PreimageFor (r:0 w:1) fn unnote_no_deposit_preimage() -> Weight { - Weight::from_ref_time(23_396_000 as u64) + Weight::from_ref_time(27_017_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) fn request_preimage() -> Weight { - Weight::from_ref_time(33_944_000 as u64) + Weight::from_ref_time(25_041_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) fn request_no_deposit_preimage() -> Weight { - Weight::from_ref_time(22_151_000 as u64) + Weight::from_ref_time(13_933_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) fn request_unnoted_preimage() -> Weight { - Weight::from_ref_time(16_617_000 as u64) + Weight::from_ref_time(17_760_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) fn request_requested_preimage() -> Weight { - Weight::from_ref_time(6_552_000 as u64) + Weight::from_ref_time(8_816_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) // Storage: Preimage PreimageFor (r:0 w:1) fn unrequest_preimage() -> Weight { - Weight::from_ref_time(23_787_000 as u64) + Weight::from_ref_time(25_068_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) - // Storage: Preimage PreimageFor (r:0 w:1) fn unrequest_unnoted_preimage() -> Weight { - Weight::from_ref_time(16_327_000 as u64) + Weight::from_ref_time(8_917_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) fn unrequest_multi_referenced_preimage() -> Weight { - Weight::from_ref_time(6_289_000 as u64) + Weight::from_ref_time(8_915_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(1 as u64)) } diff --git a/runtime/rococo/src/weights/pallet_scheduler.rs b/runtime/rococo/src/weights/pallet_scheduler.rs index 369318ae2e10..ae9dc6426622 100644 --- a/runtime/rococo/src/weights/pallet_scheduler.rs +++ b/runtime/rococo/src/weights/pallet_scheduler.rs @@ -1,39 +1,131 @@ -// This file is part of Substrate. +// Copyright 2017-2022 Parity Technologies (UK) Ltd. +// This file is part of Polkadot. -// Copyright (C) 2022 Parity Technologies (UK) Ltd. -// SPDX-License-Identifier: Apache-2.0 +// 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. -// 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. +// 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. + +// You should have received a copy of the GNU General Public License +// along with Polkadot. If not, see . +//! Autogenerated weights for `pallet_scheduler` +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-10-03, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! HOSTNAME: `bm2`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("rococo-dev"), DB CACHE: 1024 + +// Executed Command: +// ./target/production/polkadot +// benchmark +// pallet +// --chain=rococo-dev +// --steps=50 +// --repeat=20 +// --pallet=pallet_scheduler +// --extrinsic=* +// --execution=wasm +// --wasm-execution=compiled +// --header=./file_header.txt +// --output=./runtime/rococo/src/weights #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -use frame_support::{traits::Get, weights::{Weight}}; +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; +/// Weight functions for `pallet_scheduler`. pub struct WeightInfo(PhantomData); impl pallet_scheduler::WeightInfo for WeightInfo { - fn service_agendas_base() -> Weight { Weight::zero() } - fn service_agenda_base(_s: u32, ) -> Weight { Weight::zero() } - fn service_task_base() -> Weight { Weight::zero() } - fn service_task_fetched(_s: u32, ) -> Weight { Weight::zero() } - fn service_task_named() -> Weight { Weight::zero() } - fn service_task_periodic() -> Weight { Weight::zero() } - fn execute_dispatch_signed() -> Weight { Weight::zero() } - fn execute_dispatch_unsigned() -> Weight { Weight::zero() } - fn schedule(_s: u32, ) -> Weight { Weight::zero() } - fn cancel(_s: u32, ) -> Weight { Weight::zero() } - fn schedule_named(_s: u32, ) -> Weight { Weight::zero() } - fn cancel_named(_s: u32, ) -> Weight { Weight::zero() } + // Storage: Scheduler IncompleteSince (r:1 w:1) + fn service_agendas_base() -> Weight { + Weight::from_ref_time(4_700_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Scheduler Agenda (r:1 w:1) + /// The range of component `s` is `[0, 50]`. + fn service_agenda_base(s: u32, ) -> Weight { + Weight::from_ref_time(3_868_000 as u64) + // Standard Error: 2_747 + .saturating_add(Weight::from_ref_time(629_992 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + fn service_task_base() -> Weight { + Weight::from_ref_time(12_316_000 as u64) + } + // Storage: Preimage PreimageFor (r:1 w:1) + // Storage: Preimage StatusFor (r:1 w:1) + /// The range of component `s` is `[128, 4194304]`. + fn service_task_fetched(s: u32, ) -> Weight { + Weight::from_ref_time(24_103_000 as u64) + // Standard Error: 5 + .saturating_add(Weight::from_ref_time(1_154 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + } + // Storage: Scheduler Lookup (r:0 w:1) + fn service_task_named() -> Weight { + Weight::from_ref_time(13_408_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Scheduler Agenda (r:1 w:1) + fn service_task_periodic() -> Weight { + Weight::from_ref_time(19_302_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + fn execute_dispatch_signed() -> Weight { + Weight::from_ref_time(3_885_000 as u64) + } + fn execute_dispatch_unsigned() -> Weight { + Weight::from_ref_time(4_037_000 as u64) + } + // Storage: Scheduler Agenda (r:1 w:1) + /// The range of component `s` is `[0, 49]`. + fn schedule(s: u32, ) -> Weight { + Weight::from_ref_time(16_768_000 as u64) + // Standard Error: 3_650 + .saturating_add(Weight::from_ref_time(667_428 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Scheduler Agenda (r:1 w:1) + // Storage: Scheduler Lookup (r:0 w:1) + /// The range of component `s` is `[1, 50]`. + fn cancel(s: u32, ) -> Weight { + Weight::from_ref_time(19_239_000 as u64) + // Standard Error: 1_456 + .saturating_add(Weight::from_ref_time(578_125 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + } + // Storage: Scheduler Lookup (r:1 w:1) + // Storage: Scheduler Agenda (r:1 w:1) + /// The range of component `s` is `[0, 49]`. + fn schedule_named(s: u32, ) -> Weight { + Weight::from_ref_time(19_065_000 as u64) + // Standard Error: 4_027 + .saturating_add(Weight::from_ref_time(719_766 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + } + // Storage: Scheduler Lookup (r:1 w:1) + // Storage: Scheduler Agenda (r:1 w:1) + /// The range of component `s` is `[1, 50]`. + fn cancel_named(s: u32, ) -> Weight { + Weight::from_ref_time(20_039_000 as u64) + // Standard Error: 2_179 + .saturating_add(Weight::from_ref_time(627_335 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + } } diff --git a/runtime/westend/src/weights/pallet_preimage.rs b/runtime/westend/src/weights/pallet_preimage.rs index afd51148cdde..97f066d7d40b 100644 --- a/runtime/westend/src/weights/pallet_preimage.rs +++ b/runtime/westend/src/weights/pallet_preimage.rs @@ -16,8 +16,8 @@ //! Autogenerated weights for `pallet_preimage` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-09-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! HOSTNAME: `bm5`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` +//! DATE: 2022-10-03, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! HOSTNAME: `bm2`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westend-dev"), DB CACHE: 1024 // Executed Command: @@ -32,103 +32,102 @@ // --execution=wasm // --wasm-execution=compiled // --header=./file_header.txt -// --output=./runtime/westend/src/weights/ +// --output=./runtime/westend/src/weights #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -use frame_support::{traits::Get, weights::{Weight}}; +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; /// Weight functions for `pallet_preimage`. pub struct WeightInfo(PhantomData); impl pallet_preimage::WeightInfo for WeightInfo { - // Storage: Preimage PreimageFor (r:1 w:1) // Storage: Preimage StatusFor (r:1 w:1) + // Storage: Preimage PreimageFor (r:0 w:1) /// The range of component `s` is `[0, 4194304]`. fn note_preimage(s: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_ref_time(28_888_000 as u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(Weight::from_ref_time(2_116 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(2 as u64)) } - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:0) + // Storage: Preimage StatusFor (r:1 w:1) + // Storage: Preimage PreimageFor (r:0 w:1) /// The range of component `s` is `[0, 4194304]`. fn note_requested_preimage(s: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_ref_time(20_640_000 as u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(2_115 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:0) + // Storage: Preimage StatusFor (r:1 w:1) + // Storage: Preimage PreimageFor (r:0 w:1) /// The range of component `s` is `[0, 4194304]`. fn note_no_deposit_preimage(s: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(19_203_000 as u64) + // Standard Error: 1 + .saturating_add(Weight::from_ref_time(2_115 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) // Storage: Preimage PreimageFor (r:0 w:1) fn unnote_preimage() -> Weight { - Weight::from_ref_time(40_836_000 as u64) + Weight::from_ref_time(41_563_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) // Storage: Preimage PreimageFor (r:0 w:1) fn unnote_no_deposit_preimage() -> Weight { - Weight::from_ref_time(28_774_000 as u64) + Weight::from_ref_time(28_606_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) fn request_preimage() -> Weight { - Weight::from_ref_time(37_963_000 as u64) + Weight::from_ref_time(27_447_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) fn request_no_deposit_preimage() -> Weight { - Weight::from_ref_time(25_754_000 as u64) + Weight::from_ref_time(14_862_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) fn request_unnoted_preimage() -> Weight { - Weight::from_ref_time(17_769_000 as u64) + Weight::from_ref_time(18_337_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) fn request_requested_preimage() -> Weight { - Weight::from_ref_time(9_214_000 as u64) + Weight::from_ref_time(9_074_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) // Storage: Preimage PreimageFor (r:0 w:1) fn unrequest_preimage() -> Weight { - Weight::from_ref_time(26_179_000 as u64) + Weight::from_ref_time(28_192_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) - // Storage: Preimage PreimageFor (r:0 w:1) fn unrequest_unnoted_preimage() -> Weight { - Weight::from_ref_time(18_809_000 as u64) + Weight::from_ref_time(9_012_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Preimage StatusFor (r:1 w:1) fn unrequest_multi_referenced_preimage() -> Weight { - Weight::from_ref_time(8_759_000 as u64) + Weight::from_ref_time(8_961_000 as u64) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(1 as u64)) } diff --git a/runtime/westend/src/weights/pallet_scheduler.rs b/runtime/westend/src/weights/pallet_scheduler.rs index 369318ae2e10..f325f2311093 100644 --- a/runtime/westend/src/weights/pallet_scheduler.rs +++ b/runtime/westend/src/weights/pallet_scheduler.rs @@ -1,39 +1,131 @@ -// This file is part of Substrate. +// Copyright 2017-2022 Parity Technologies (UK) Ltd. +// This file is part of Polkadot. -// Copyright (C) 2022 Parity Technologies (UK) Ltd. -// SPDX-License-Identifier: Apache-2.0 +// 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. -// 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. +// 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. + +// You should have received a copy of the GNU General Public License +// along with Polkadot. If not, see . +//! Autogenerated weights for `pallet_scheduler` +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-10-03, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! HOSTNAME: `bm2`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westend-dev"), DB CACHE: 1024 + +// Executed Command: +// ./target/production/polkadot +// benchmark +// pallet +// --chain=westend-dev +// --steps=50 +// --repeat=20 +// --pallet=pallet_scheduler +// --extrinsic=* +// --execution=wasm +// --wasm-execution=compiled +// --header=./file_header.txt +// --output=./runtime/westend/src/weights #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -use frame_support::{traits::Get, weights::{Weight}}; +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; +/// Weight functions for `pallet_scheduler`. pub struct WeightInfo(PhantomData); impl pallet_scheduler::WeightInfo for WeightInfo { - fn service_agendas_base() -> Weight { Weight::zero() } - fn service_agenda_base(_s: u32, ) -> Weight { Weight::zero() } - fn service_task_base() -> Weight { Weight::zero() } - fn service_task_fetched(_s: u32, ) -> Weight { Weight::zero() } - fn service_task_named() -> Weight { Weight::zero() } - fn service_task_periodic() -> Weight { Weight::zero() } - fn execute_dispatch_signed() -> Weight { Weight::zero() } - fn execute_dispatch_unsigned() -> Weight { Weight::zero() } - fn schedule(_s: u32, ) -> Weight { Weight::zero() } - fn cancel(_s: u32, ) -> Weight { Weight::zero() } - fn schedule_named(_s: u32, ) -> Weight { Weight::zero() } - fn cancel_named(_s: u32, ) -> Weight { Weight::zero() } + // Storage: Scheduler IncompleteSince (r:1 w:1) + fn service_agendas_base() -> Weight { + Weight::from_ref_time(4_399_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Scheduler Agenda (r:1 w:1) + /// The range of component `s` is `[0, 50]`. + fn service_agenda_base(s: u32, ) -> Weight { + Weight::from_ref_time(3_771_000 as u64) + // Standard Error: 2_641 + .saturating_add(Weight::from_ref_time(610_848 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + fn service_task_base() -> Weight { + Weight::from_ref_time(12_651_000 as u64) + } + // Storage: Preimage PreimageFor (r:1 w:1) + // Storage: Preimage StatusFor (r:1 w:1) + /// The range of component `s` is `[128, 4194304]`. + fn service_task_fetched(s: u32, ) -> Weight { + Weight::from_ref_time(24_280_000 as u64) + // Standard Error: 0 + .saturating_add(Weight::from_ref_time(1_126 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + } + // Storage: Scheduler Lookup (r:0 w:1) + fn service_task_named() -> Weight { + Weight::from_ref_time(13_929_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Scheduler Agenda (r:1 w:1) + fn service_task_periodic() -> Weight { + Weight::from_ref_time(19_285_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + fn execute_dispatch_signed() -> Weight { + Weight::from_ref_time(4_026_000 as u64) + } + fn execute_dispatch_unsigned() -> Weight { + Weight::from_ref_time(4_078_000 as u64) + } + // Storage: Scheduler Agenda (r:1 w:1) + /// The range of component `s` is `[0, 49]`. + fn schedule(s: u32, ) -> Weight { + Weight::from_ref_time(17_176_000 as u64) + // Standard Error: 3_203 + .saturating_add(Weight::from_ref_time(645_757 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + } + // Storage: Scheduler Agenda (r:1 w:1) + // Storage: Scheduler Lookup (r:0 w:1) + /// The range of component `s` is `[1, 50]`. + fn cancel(s: u32, ) -> Weight { + Weight::from_ref_time(19_408_000 as u64) + // Standard Error: 1_645 + .saturating_add(Weight::from_ref_time(575_558 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + } + // Storage: Scheduler Lookup (r:1 w:1) + // Storage: Scheduler Agenda (r:1 w:1) + /// The range of component `s` is `[0, 49]`. + fn schedule_named(s: u32, ) -> Weight { + Weight::from_ref_time(20_173_000 as u64) + // Standard Error: 3_998 + .saturating_add(Weight::from_ref_time(684_714 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + } + // Storage: Scheduler Lookup (r:1 w:1) + // Storage: Scheduler Agenda (r:1 w:1) + /// The range of component `s` is `[1, 50]`. + fn cancel_named(s: u32, ) -> Weight { + Weight::from_ref_time(20_330_000 as u64) + // Standard Error: 2_310 + .saturating_add(Weight::from_ref_time(621_196 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + } } From f2367eb830886e2331217b83e7d711d4c16c8729 Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Tue, 4 Oct 2022 11:47:43 +0200 Subject: [PATCH 13/15] Add multisig migration to Westend+Rococo Signed-off-by: Oliver Tale-Yazdi --- runtime/rococo/src/lib.rs | 1 + runtime/westend/src/lib.rs | 1 + 2 files changed, 2 insertions(+) diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs index 48b992447339..3e1300cc432d 100644 --- a/runtime/rococo/src/lib.rs +++ b/runtime/rococo/src/lib.rs @@ -1455,6 +1455,7 @@ pub type Executive = frame_executive::Executive< pallet_preimage::migration::v1::Migration, pallet_scheduler::migration::v3::MigrateToV4, pallet_democracy::migrations::v1::Migration, + pallet_multisig::migrations::v1::MigrateToV1, ), >; /// The payload being signed in transactions. diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs index 4f56c97d4e43..e6ed5ed65dcc 100644 --- a/runtime/westend/src/lib.rs +++ b/runtime/westend/src/lib.rs @@ -1216,6 +1216,7 @@ pub type Executive = frame_executive::Executive< // "Bound uses of call" pallet_preimage::migration::v1::Migration, pallet_scheduler::migration::v3::MigrateToV4, + pallet_multisig::migrations::v1::MigrateToV1, ), >; /// The payload being signed in transactions. From 7b7ca0e0c908f7132e01f2bdd6959304b2600b29 Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Wed, 5 Oct 2022 13:24:53 +0200 Subject: [PATCH 14/15] Fix Executive syntax Signed-off-by: Oliver Tale-Yazdi --- runtime/kusama/src/lib.rs | 2 +- runtime/polkadot/src/lib.rs | 2 +- runtime/rococo/src/lib.rs | 3 ++- runtime/westend/src/lib.rs | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index a752fba7e3ac..a4a3a05e1173 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -1473,7 +1473,7 @@ pub type Executive = frame_executive::Executive< pallet_scheduler::migration::v3::MigrateToV4, pallet_democracy::migrations::v1::Migration, pallet_multisig::migrations::v1::MigrateToV1, - // "Properly migrate weights to v2" + // "Properly migrate weights to v2" parachains_configuration::migration::v3::MigrateToV3, ), >; diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index 427c3f4d6994..054fb421babd 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -1566,7 +1566,7 @@ pub type Executive = frame_executive::Executive< pallet_scheduler::migration::v3::MigrateToV4, pallet_democracy::migrations::v1::Migration, pallet_multisig::migrations::v1::MigrateToV1, - // "Properly migrate weights to v2" + // "Properly migrate weights to v2" parachains_configuration::migration::v3::MigrateToV3, ), >; diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs index 6bf1fc9c5d67..a13bc5932db2 100644 --- a/runtime/rococo/src/lib.rs +++ b/runtime/rococo/src/lib.rs @@ -1456,8 +1456,9 @@ pub type Executive = frame_executive::Executive< pallet_scheduler::migration::v3::MigrateToV4, pallet_democracy::migrations::v1::Migration, pallet_multisig::migrations::v1::MigrateToV1, + // "Properly migrate weights to v2" + parachains_configuration::migration::v3::MigrateToV3, ), - parachains_configuration::migration::v3::MigrateToV3, >; /// The payload being signed in transactions. pub type SignedPayload = generic::SignedPayload; diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs index 661dc198eeee..61a909b4806d 100644 --- a/runtime/westend/src/lib.rs +++ b/runtime/westend/src/lib.rs @@ -1217,7 +1217,7 @@ pub type Executive = frame_executive::Executive< pallet_preimage::migration::v1::Migration, pallet_scheduler::migration::v3::MigrateToV4, pallet_multisig::migrations::v1::MigrateToV1, - // "Properly migrate weights to v2" + // "Properly migrate weights to v2" parachains_configuration::migration::v3::MigrateToV3, ), >; From 954d16c80d9dbda71f563785d475f77e143a59a5 Mon Sep 17 00:00:00 2001 From: Gav Date: Wed, 5 Oct 2022 19:22:47 +0100 Subject: [PATCH 15/15] Bump Substrate --- Cargo.lock | 379 +++++++++++++++++++++++++++-------------------------- 1 file changed, 192 insertions(+), 187 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 015056f42a39..c23829c0751c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -435,7 +435,7 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "array-bytes", "async-trait", @@ -472,7 +472,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -492,7 +492,7 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "beefy-primitives", "sp-api", @@ -502,7 +502,7 @@ dependencies = [ [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "parity-scale-codec", "scale-info", @@ -1999,7 +1999,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "parity-scale-codec", ] @@ -2017,7 +2017,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-support", "frame-system", @@ -2040,7 +2040,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "Inflector", "array-bytes", @@ -2091,7 +2091,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2102,7 +2102,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -2118,7 +2118,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-support", "frame-system", @@ -2147,7 +2147,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "bitflags", "frame-metadata", @@ -2179,7 +2179,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "Inflector", "cfg-expr", @@ -2193,7 +2193,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -2205,7 +2205,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "proc-macro2", "quote", @@ -2215,7 +2215,7 @@ dependencies = [ [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-support", "frame-support-test-pallet", @@ -2238,7 +2238,7 @@ dependencies = [ [[package]] name = "frame-support-test-pallet" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-support", "frame-system", @@ -2249,7 +2249,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-support", "log", @@ -2267,7 +2267,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-benchmarking", "frame-support", @@ -2282,7 +2282,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "parity-scale-codec", "sp-api", @@ -2291,7 +2291,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-support", "parity-scale-codec", @@ -2474,7 +2474,7 @@ dependencies = [ [[package]] name = "generate-bags" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "chrono", "frame-election-provider-support", @@ -4835,7 +4835,7 @@ checksum = "20448fd678ec04e6ea15bbe0476874af65e98a01515d667aa49f1434dc44ebf4" [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4849,7 +4849,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-support", "frame-system", @@ -4865,7 +4865,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-support", "frame-system", @@ -4880,7 +4880,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4904,7 +4904,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4924,7 +4924,7 @@ dependencies = [ [[package]] name = "pallet-bags-list-remote-tests" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-election-provider-support", "frame-support", @@ -4943,7 +4943,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4958,7 +4958,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "beefy-primitives", "frame-support", @@ -4974,7 +4974,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "array-bytes", "beefy-merkle-tree", @@ -4997,7 +4997,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-benchmarking", "frame-support", @@ -5015,7 +5015,7 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-benchmarking", "frame-support", @@ -5034,7 +5034,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-benchmarking", "frame-support", @@ -5051,7 +5051,7 @@ dependencies = [ [[package]] name = "pallet-conviction-voting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "assert_matches", "frame-benchmarking", @@ -5068,14 +5068,16 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "scale-info", "serde", + "sp-core", "sp-io", "sp-runtime", "sp-std", @@ -5084,7 +5086,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5108,7 +5110,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5121,7 +5123,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-benchmarking", "frame-support", @@ -5139,7 +5141,7 @@ dependencies = [ [[package]] name = "pallet-fast-unstake" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5160,7 +5162,7 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-benchmarking", "frame-support", @@ -5175,7 +5177,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-benchmarking", "frame-support", @@ -5198,7 +5200,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5214,7 +5216,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-benchmarking", "frame-support", @@ -5234,7 +5236,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-benchmarking", "frame-support", @@ -5251,7 +5253,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-benchmarking", "frame-support", @@ -5268,7 +5270,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -5286,7 +5288,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -5301,11 +5303,12 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "scale-info", "sp-io", @@ -5316,7 +5319,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-support", "frame-system", @@ -5333,7 +5336,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5353,7 +5356,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-runtime-api" version = "1.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "parity-scale-codec", "sp-api", @@ -5363,7 +5366,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-support", "frame-system", @@ -5380,7 +5383,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5403,11 +5406,12 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "scale-info", "sp-core", @@ -5419,7 +5423,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-benchmarking", "frame-support", @@ -5434,7 +5438,7 @@ dependencies = [ [[package]] name = "pallet-ranked-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-benchmarking", "frame-support", @@ -5452,7 +5456,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-benchmarking", "frame-support", @@ -5467,7 +5471,7 @@ dependencies = [ [[package]] name = "pallet-referenda" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "assert_matches", "frame-benchmarking", @@ -5485,7 +5489,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-benchmarking", "frame-support", @@ -5501,7 +5505,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-support", "frame-system", @@ -5522,7 +5526,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-benchmarking", "frame-support", @@ -5538,7 +5542,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-support", "frame-system", @@ -5552,7 +5556,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5575,7 +5579,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -5586,7 +5590,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "log", "sp-arithmetic", @@ -5595,7 +5599,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-support", "frame-system", @@ -5609,7 +5613,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-benchmarking", "frame-support", @@ -5627,7 +5631,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-benchmarking", "frame-support", @@ -5646,7 +5650,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-support", "frame-system", @@ -5662,7 +5666,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -5677,7 +5681,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5688,7 +5692,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-benchmarking", "frame-support", @@ -5705,7 +5709,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-benchmarking", "frame-support", @@ -5721,7 +5725,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-benchmarking", "frame-support", @@ -5736,7 +5740,7 @@ dependencies = [ [[package]] name = "pallet-whitelist" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-benchmarking", "frame-support", @@ -8269,7 +8273,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "env_logger 0.9.0", "jsonrpsee", @@ -8617,7 +8621,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "log", "sp-core", @@ -8628,7 +8632,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "async-trait", "futures", @@ -8637,8 +8641,8 @@ dependencies = [ "libp2p", "log", "parity-scale-codec", - "prost 0.10.3", - "prost-build 0.10.4", + "prost 0.11.0", + "prost-build 0.11.1", "rand 0.7.3", "sc-client-api", "sc-network-common", @@ -8655,7 +8659,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "futures", "futures-timer", @@ -8678,7 +8682,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -8694,7 +8698,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.0", @@ -8711,7 +8715,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -8722,7 +8726,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "array-bytes", "chrono", @@ -8762,7 +8766,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "fnv", "futures", @@ -8790,7 +8794,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "hash-db", "kvdb", @@ -8815,7 +8819,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "async-trait", "futures", @@ -8839,7 +8843,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "async-trait", "fork-tree", @@ -8881,7 +8885,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "futures", "jsonrpsee", @@ -8903,7 +8907,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "fork-tree", "parity-scale-codec", @@ -8916,7 +8920,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "async-trait", "futures", @@ -8940,7 +8944,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "lazy_static", "lru 0.7.8", @@ -8967,7 +8971,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "environmental", "parity-scale-codec", @@ -8983,7 +8987,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "log", "parity-scale-codec", @@ -8998,7 +9002,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "cfg-if 1.0.0", "libc", @@ -9018,7 +9022,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "ahash", "array-bytes", @@ -9059,7 +9063,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "finality-grandpa", "futures", @@ -9080,7 +9084,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "ansi_term", "futures", @@ -9097,7 +9101,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "array-bytes", "async-trait", @@ -9112,7 +9116,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "array-bytes", "async-trait", @@ -9134,7 +9138,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "pin-project", - "prost 0.10.3", + "prost 0.11.0", "rand 0.7.3", "sc-block-builder", "sc-client-api", @@ -9159,7 +9163,7 @@ dependencies = [ [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "cid", "futures", @@ -9179,7 +9183,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "async-trait", "bitflags", @@ -9189,7 +9193,7 @@ dependencies = [ "libp2p", "linked_hash_set", "parity-scale-codec", - "prost-build 0.10.4", + "prost-build 0.11.1", "sc-consensus", "sc-peerset", "serde", @@ -9205,7 +9209,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "ahash", "futures", @@ -9223,15 +9227,15 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "array-bytes", "futures", "libp2p", "log", "parity-scale-codec", - "prost 0.10.3", - "prost-build 0.10.4", + "prost 0.11.0", + "prost-build 0.11.1", "sc-client-api", "sc-network-common", "sc-peerset", @@ -9244,7 +9248,7 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "array-bytes", "fork-tree", @@ -9253,8 +9257,8 @@ dependencies = [ "log", "lru 0.7.8", "parity-scale-codec", - "prost 0.10.3", - "prost-build 0.10.4", + "prost 0.11.0", + "prost-build 0.11.1", "sc-client-api", "sc-consensus", "sc-network-common", @@ -9272,7 +9276,7 @@ dependencies = [ [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "array-bytes", "futures", @@ -9291,7 +9295,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "array-bytes", "bytes", @@ -9321,7 +9325,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "futures", "libp2p", @@ -9334,7 +9338,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -9343,7 +9347,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "futures", "hash-db", @@ -9373,7 +9377,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "futures", "jsonrpsee", @@ -9396,7 +9400,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "futures", "jsonrpsee", @@ -9409,7 +9413,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "async-trait", "directories", @@ -9479,7 +9483,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "log", "parity-scale-codec", @@ -9493,7 +9497,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -9512,7 +9516,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "futures", "libc", @@ -9531,7 +9535,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "chrono", "futures", @@ -9549,7 +9553,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "ansi_term", "atty", @@ -9580,7 +9584,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -9591,7 +9595,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "futures", "futures-timer", @@ -9617,7 +9621,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "futures", "log", @@ -9630,7 +9634,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "futures", "futures-timer", @@ -10116,7 +10120,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "hash-db", "log", @@ -10134,7 +10138,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "blake2", "proc-macro-crate", @@ -10146,7 +10150,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "parity-scale-codec", "scale-info", @@ -10159,7 +10163,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "integer-sqrt", "num-traits", @@ -10174,7 +10178,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "parity-scale-codec", "scale-info", @@ -10187,7 +10191,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "async-trait", "parity-scale-codec", @@ -10199,7 +10203,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "parity-scale-codec", "sp-api", @@ -10211,7 +10215,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "futures", "log", @@ -10229,7 +10233,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "async-trait", "futures", @@ -10248,7 +10252,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "async-trait", "merlin", @@ -10271,7 +10275,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "parity-scale-codec", "scale-info", @@ -10285,7 +10289,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "parity-scale-codec", "scale-info", @@ -10298,7 +10302,7 @@ dependencies = [ [[package]] name = "sp-core" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "array-bytes", "base58", @@ -10344,7 +10348,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "blake2", "byteorder", @@ -10358,7 +10362,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "proc-macro2", "quote", @@ -10369,7 +10373,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -10378,7 +10382,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "proc-macro2", "quote", @@ -10388,7 +10392,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "environmental", "parity-scale-codec", @@ -10399,7 +10403,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "finality-grandpa", "log", @@ -10417,7 +10421,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -10431,7 +10435,7 @@ dependencies = [ [[package]] name = "sp-io" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "bytes", "futures", @@ -10457,7 +10461,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "lazy_static", "sp-core", @@ -10468,7 +10472,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "async-trait", "futures", @@ -10485,7 +10489,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "thiserror", "zstd", @@ -10494,10 +10498,11 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "log", "parity-scale-codec", + "scale-info", "serde", "sp-api", "sp-core", @@ -10509,7 +10514,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "parity-scale-codec", "scale-info", @@ -10523,7 +10528,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "sp-api", "sp-core", @@ -10533,7 +10538,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "backtrace", "lazy_static", @@ -10543,7 +10548,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "rustc-hash", "serde", @@ -10553,7 +10558,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "either", "hash256-std-hasher", @@ -10576,7 +10581,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -10594,7 +10599,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "Inflector", "proc-macro-crate", @@ -10606,7 +10611,7 @@ dependencies = [ [[package]] name = "sp-sandbox" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "log", "parity-scale-codec", @@ -10620,7 +10625,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "parity-scale-codec", "scale-info", @@ -10634,7 +10639,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "parity-scale-codec", "scale-info", @@ -10645,7 +10650,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "hash-db", "log", @@ -10667,12 +10672,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" [[package]] name = "sp-storage" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10685,7 +10690,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "log", "sp-core", @@ -10698,7 +10703,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "async-trait", "futures-timer", @@ -10714,7 +10719,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "parity-scale-codec", "sp-std", @@ -10726,7 +10731,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "sp-api", "sp-runtime", @@ -10735,7 +10740,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "async-trait", "log", @@ -10751,7 +10756,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "ahash", "hash-db", @@ -10774,7 +10779,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10791,7 +10796,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -10802,7 +10807,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "impl-trait-for-tuples", "log", @@ -10815,7 +10820,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -11030,7 +11035,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "platforms", ] @@ -11038,7 +11043,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -11059,7 +11064,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "futures-util", "hyper", @@ -11072,7 +11077,7 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "jsonrpsee", "log", @@ -11093,7 +11098,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "array-bytes", "async-trait", @@ -11119,7 +11124,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "futures", "substrate-test-utils-derive", @@ -11129,7 +11134,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -11140,7 +11145,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "ansi_term", "build-helper", @@ -11853,7 +11858,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e77cbe39c4d1bfd978bb03c686fc9f60d86a3d06" +source = "git+https://github.com/paritytech/substrate?branch=master#eefba93cf62ff80e1011dbe1cd3a543b711f7bb9" dependencies = [ "clap", "frame-try-runtime", @@ -11923,7 +11928,7 @@ version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "digest 0.10.3", "rand 0.8.5", "static_assertions",