Companion for #11649: Bound uses of Call (#5729)

* Fixes

* Clear out old weights

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Resolve merges

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Fix weight traits

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* polkadot runtime: Clippy

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* rococo runtime: update pallet configs

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Add preimage migration

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Add all migrations

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Democracy is not on Westend

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* [Migration] Refund stored multisig calls (#6075)

* Add Preimages to referenda config

Needed since Gov V2 just merged.

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Update weights

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Add multisig migration to Westend+Rococo

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Fix Executive syntax

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Bump Substrate

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Co-authored-by: parity-processbot <>
Co-authored-by: Roman Useinov <roman.useinov@gmail.com>
This commit is contained in:
Gavin Wood
2022-10-05 22:17:59 +01:00
committed by GitHub
parent 4aea71a95f
commit 9a3cf4cd1f
19 changed files with 786 additions and 1249 deletions
@@ -16,8 +16,8 @@
//! 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`
//! 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_democracy.rs
// --output=./runtime/rococo/src/weights
#![cfg_attr(rustfmt, rustfmt_skip)]
#![allow(unused_parens)]
@@ -49,134 +49,103 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
// 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)
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)
/// 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))
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)
/// 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))
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)
/// 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))
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(17_752_000 as u64)
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)
// 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))
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)
/// 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))
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(3_700_000 as u64)
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(3_713_000 as u64)
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(17_441_000 as u64)
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)
/// 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))
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)
/// 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))
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(11_892_000 as u64)
Weight::from_ref_time(13_235_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]`.
// 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(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))
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))
@@ -186,36 +155,36 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
// 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]`.
// 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(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))
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: Democracy ReferendumInfoOf (r:1 w:1)
// Storage: Balances Locks (r:1 w:1)
/// The range of component `r` is `[1, 99]`.
// Storage: Democracy ReferendumInfoOf (r:2 w:2)
/// The range of component `r` is `[0, 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))
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:1 w:1)
/// The range of component `r` is `[1, 99]`.
// Storage: Democracy ReferendumInfoOf (r:2 w:2)
/// The range of component `r` is `[0, 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))
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))
@@ -223,76 +192,48 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
}
// 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))
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 `[1, 99]`.
/// The range of component `r` is `[0, 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))
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 `[1, 99]`.
/// The range of component `r` is `[0, 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))
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, 99]`.
/// The range of component `r` is `[1, 100]`.
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))
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, 99]`.
/// The range of component `r` is `[1, 100]`.
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))
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))
}