From 88d4e39c294ca9e690aa003cee38ceb3e375b463 Mon Sep 17 00:00:00 2001 From: kianenigma Date: Fri, 16 Oct 2020 17:24:07 +0200 Subject: [PATCH 1/3] Make it build --- runtime/common/src/lib.rs | 6 +++--- runtime/common/src/paras_registrar.rs | 1 - runtime/kusama/src/lib.rs | 1 - runtime/polkadot/src/lib.rs | 1 - runtime/rococo-v1/src/lib.rs | 1 - runtime/test-runtime/src/lib.rs | 1 - runtime/westend/src/lib.rs | 1 - 7 files changed, 3 insertions(+), 9 deletions(-) diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index 132ef5da6408..b20d81ab4120 100644 --- a/runtime/common/src/lib.rs +++ b/runtime/common/src/lib.rs @@ -49,9 +49,9 @@ pub use impls::ToAuthor; pub type NegativeImbalance = as Currency<::AccountId>>::NegativeImbalance; -/// We assume that an on-initialize consumes 10% of the weight on average, hence a single extrinsic -/// will not be allowed to consume more than `AvailableBlockRatio - 10%`. -pub const AVERAGE_ON_INITIALIZE_WEIGHT: Perbill = Perbill::from_percent(10); +/// We assume that an on-initialize consumes 3% of the weight on average, hence a single extrinsic +/// will not be allowed to consume more than `AvailableBlockRatio - 3%`. +pub const AVERAGE_ON_INITIALIZE_WEIGHT: Perbill = Perbill::from_percent(3); // Common constants used in all runtimes. parameter_types! { diff --git a/runtime/common/src/paras_registrar.rs b/runtime/common/src/paras_registrar.rs index 7c9ed36a9751..63c3b61f5806 100644 --- a/runtime/common/src/paras_registrar.rs +++ b/runtime/common/src/paras_registrar.rs @@ -410,7 +410,6 @@ mod tests { type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator; type NextNewSession = Session; type ElectionLookahead = ElectionLookahead; - type Call = Call; type UnsignedPriority = StakingUnsignedPriority; type MaxIterations = (); type MinSolutionScoreBump = (); diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 57f42168363a..cebbf1c44715 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -361,7 +361,6 @@ impl pallet_staking::Trait for Runtime { type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator; type NextNewSession = Session; type ElectionLookahead = ElectionLookahead; - type Call = Call; type UnsignedPriority = StakingUnsignedPriority; type MaxIterations = MaxIterations; type MinSolutionScoreBump = MinSolutionScoreBump; diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index d905a8c201d9..6bddb829a505 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -368,7 +368,6 @@ impl pallet_staking::Trait for Runtime { type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator; type NextNewSession = Session; type ElectionLookahead = ElectionLookahead; - type Call = Call; type UnsignedPriority = StakingUnsignedPriority; type MaxIterations = MaxIterations; type MinSolutionScoreBump = MinSolutionScoreBump; diff --git a/runtime/rococo-v1/src/lib.rs b/runtime/rococo-v1/src/lib.rs index c0b2e3bfb2ff..76d69802fdb1 100644 --- a/runtime/rococo-v1/src/lib.rs +++ b/runtime/rococo-v1/src/lib.rs @@ -574,7 +574,6 @@ impl pallet_staking::Trait for Runtime { type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator; type NextNewSession = Session; type ElectionLookahead = ElectionLookahead; - type Call = Call; type UnsignedPriority = StakingUnsignedPriority; type MaxIterations = MaxIterations; type OffchainSolutionWeightLimit = MaximumBlockWeight; diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs index 342841b2732c..e0a782bb294d 100644 --- a/runtime/test-runtime/src/lib.rs +++ b/runtime/test-runtime/src/lib.rs @@ -313,7 +313,6 @@ impl pallet_staking::Trait for Runtime { type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator; type NextNewSession = Session; type ElectionLookahead = ElectionLookahead; - type Call = Call; type UnsignedPriority = StakingUnsignedPriority; type MaxIterations = MaxIterations; type OffchainSolutionWeightLimit = MaximumBlockWeight; diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs index 2efd3644574f..d62b28da60e0 100644 --- a/runtime/westend/src/lib.rs +++ b/runtime/westend/src/lib.rs @@ -333,7 +333,6 @@ impl pallet_staking::Trait for Runtime { type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator; type NextNewSession = Session; type ElectionLookahead = ElectionLookahead; - type Call = Call; type UnsignedPriority = StakingUnsignedPriority; type MaxIterations = MaxIterations; type MinSolutionScoreBump = MinSolutionScoreBump; From fe9e172ab7574e020885495f5d64c33adb615ead Mon Sep 17 00:00:00 2001 From: kianenigma Date: Fri, 16 Oct 2020 18:52:42 +0200 Subject: [PATCH 2/3] 2.5 --- runtime/common/src/lib.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index b20d81ab4120..9569412b7cb7 100644 --- a/runtime/common/src/lib.rs +++ b/runtime/common/src/lib.rs @@ -49,9 +49,9 @@ pub use impls::ToAuthor; pub type NegativeImbalance = as Currency<::AccountId>>::NegativeImbalance; -/// We assume that an on-initialize consumes 3% of the weight on average, hence a single extrinsic -/// will not be allowed to consume more than `AvailableBlockRatio - 3%`. -pub const AVERAGE_ON_INITIALIZE_WEIGHT: Perbill = Perbill::from_percent(3); +/// We assume that an on-initialize consumes 2.5% of the weight on average, hence a single extrinsic +/// will not be allowed to consume more than `AvailableBlockRatio - 2.5%`. +pub const AVERAGE_ON_INITIALIZE_WEIGHT: Perbill = Perbill::from_perthousand(25); // Common constants used in all runtimes. parameter_types! { From 4120776b0f5994009cba7f456437a0510e71f3f7 Mon Sep 17 00:00:00 2001 From: kianenigma Date: Fri, 16 Oct 2020 19:40:43 +0200 Subject: [PATCH 3/3] Update weights --- runtime/kusama/src/weights/pallet_staking.rs | 72 +++++++++---------- .../polkadot/src/weights/pallet_staking.rs | 72 +++++++++---------- runtime/westend/src/weights/pallet_staking.rs | 72 +++++++++---------- 3 files changed, 108 insertions(+), 108 deletions(-) diff --git a/runtime/kusama/src/weights/pallet_staking.rs b/runtime/kusama/src/weights/pallet_staking.rs index 35e2ebe2a861..551d188e9c3d 100644 --- a/runtime/kusama/src/weights/pallet_staking.rs +++ b/runtime/kusama/src/weights/pallet_staking.rs @@ -26,133 +26,133 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl pallet_staking::WeightInfo for WeightInfo { fn bond() -> Weight { - (95_041_000 as Weight) + (93_696_000 as Weight) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } fn bond_extra() -> Weight { - (73_981_000 as Weight) + (74_181_000 as Weight) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } fn unbond() -> Weight { - (67_107_000 as Weight) + (67_062_000 as Weight) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn withdraw_unbonded_update(s: u32, ) -> Weight { - (67_795_000 as Weight) + (67_349_000 as Weight) .saturating_add((32_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn withdraw_unbonded_kill(s: u32, ) -> Weight { - (110_537_000 as Weight) - .saturating_add((3_879_000 as Weight).saturating_mul(s as Weight)) + (109_652_000 as Weight) + .saturating_add((3_830_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(7 as Weight)) .saturating_add(T::DbWeight::get().writes(8 as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight))) } fn validate() -> Weight { - (22_802_000 as Weight) + (23_014_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } fn nominate(n: u32, ) -> Weight { - (29_784_000 as Weight) - .saturating_add((401_000 as Weight).saturating_mul(n as Weight)) + (29_636_000 as Weight) + .saturating_add((380_000 as Weight).saturating_mul(n as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } fn chill() -> Weight { - (22_719_000 as Weight) + (22_547_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } fn set_payee() -> Weight { - (15_354_000 as Weight) + (15_427_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn set_controller() -> Weight { - (33_783_000 as Weight) + (33_721_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn set_validator_count() -> Weight { - (3_126_000 as Weight) + (3_235_000 as Weight) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn force_no_eras() -> Weight { - (3_548_000 as Weight) + (3_641_000 as Weight) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn force_new_era() -> Weight { - (3_474_000 as Weight) + (3_644_000 as Weight) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn force_new_era_always() -> Weight { - (3_518_000 as Weight) + (3_692_000 as Weight) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn set_invulnerables(v: u32, ) -> Weight { - (3_639_000 as Weight) + (3_762_000 as Weight) .saturating_add((9_000 as Weight).saturating_mul(v as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn force_unstake(s: u32, ) -> Weight { - (75_900_000 as Weight) - .saturating_add((3_891_000 as Weight).saturating_mul(s as Weight)) + (75_106_000 as Weight) + .saturating_add((3_818_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(8 as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight))) } fn cancel_deferred_slash(s: u32, ) -> Weight { - (5_844_744_000 as Weight) - .saturating_add((34_644_000 as Weight).saturating_mul(s as Weight)) + (5_858_945_000 as Weight) + .saturating_add((34_650_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 payout_stakers_dead_controller(n: u32, ) -> Weight { - (145_214_000 as Weight) - .saturating_add((57_875_000 as Weight).saturating_mul(n as Weight)) + (134_161_000 as Weight) + .saturating_add((57_888_000 as Weight).saturating_mul(n as Weight)) .saturating_add(T::DbWeight::get().reads(11 as Weight)) .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight))) .saturating_add(T::DbWeight::get().writes(2 as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(n as Weight))) } fn payout_stakers_alive_staked(n: u32, ) -> Weight { - (173_115_000 as Weight) - .saturating_add((76_912_000 as Weight).saturating_mul(n as Weight)) + (165_075_000 as Weight) + .saturating_add((76_146_000 as Weight).saturating_mul(n as Weight)) .saturating_add(T::DbWeight::get().reads(12 as Weight)) .saturating_add(T::DbWeight::get().reads((5 as Weight).saturating_mul(n as Weight))) .saturating_add(T::DbWeight::get().writes(3 as Weight)) .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(n as Weight))) } fn rebond(l: u32, ) -> Weight { - (46_569_000 as Weight) - .saturating_add((104_000 as Weight).saturating_mul(l as Weight)) + (46_514_000 as Weight) + .saturating_add((102_000 as Weight).saturating_mul(l as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn set_history_depth(e: u32, ) -> Weight { (0 as Weight) - .saturating_add((36_641_000 as Weight).saturating_mul(e as Weight)) + .saturating_add((36_060_000 as Weight).saturating_mul(e as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) .saturating_add(T::DbWeight::get().writes((7 as Weight).saturating_mul(e as Weight))) } fn reap_stash(s: u32, ) -> Weight { - (95_718_000 as Weight) - .saturating_add((3_875_000 as Weight).saturating_mul(s as Weight)) + (94_628_000 as Weight) + .saturating_add((3_837_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(8 as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight))) } fn new_era(v: u32, n: u32, ) -> Weight { (0 as Weight) - .saturating_add((1_262_144_000 as Weight).saturating_mul(v as Weight)) - .saturating_add((143_471_000 as Weight).saturating_mul(n as Weight)) + .saturating_add((1_005_893_000 as Weight).saturating_mul(v as Weight)) + .saturating_add((117_364_000 as Weight).saturating_mul(n as Weight)) .saturating_add(T::DbWeight::get().reads(10 as Weight)) .saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(v as Weight))) .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight))) @@ -161,10 +161,10 @@ impl pallet_staking::WeightInfo for WeightInfo { } fn submit_solution_better(v: u32, n: u32, a: u32, w: u32, ) -> Weight { (0 as Weight) - .saturating_add((879_000 as Weight).saturating_mul(v as Weight)) - .saturating_add((488_000 as Weight).saturating_mul(n as Weight)) - .saturating_add((133_102_000 as Weight).saturating_mul(a as Weight)) - .saturating_add((8_073_000 as Weight).saturating_mul(w as Weight)) + .saturating_add((1_135_000 as Weight).saturating_mul(v as Weight)) + .saturating_add((545_000 as Weight).saturating_mul(n as Weight)) + .saturating_add((96_915_000 as Weight).saturating_mul(a as Weight)) + .saturating_add((7_461_000 as Weight).saturating_mul(w as Weight)) .saturating_add(T::DbWeight::get().reads(6 as Weight)) .saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(a as Weight))) .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(w as Weight))) diff --git a/runtime/polkadot/src/weights/pallet_staking.rs b/runtime/polkadot/src/weights/pallet_staking.rs index 35e2ebe2a861..551d188e9c3d 100644 --- a/runtime/polkadot/src/weights/pallet_staking.rs +++ b/runtime/polkadot/src/weights/pallet_staking.rs @@ -26,133 +26,133 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl pallet_staking::WeightInfo for WeightInfo { fn bond() -> Weight { - (95_041_000 as Weight) + (93_696_000 as Weight) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } fn bond_extra() -> Weight { - (73_981_000 as Weight) + (74_181_000 as Weight) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } fn unbond() -> Weight { - (67_107_000 as Weight) + (67_062_000 as Weight) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn withdraw_unbonded_update(s: u32, ) -> Weight { - (67_795_000 as Weight) + (67_349_000 as Weight) .saturating_add((32_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn withdraw_unbonded_kill(s: u32, ) -> Weight { - (110_537_000 as Weight) - .saturating_add((3_879_000 as Weight).saturating_mul(s as Weight)) + (109_652_000 as Weight) + .saturating_add((3_830_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(7 as Weight)) .saturating_add(T::DbWeight::get().writes(8 as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight))) } fn validate() -> Weight { - (22_802_000 as Weight) + (23_014_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } fn nominate(n: u32, ) -> Weight { - (29_784_000 as Weight) - .saturating_add((401_000 as Weight).saturating_mul(n as Weight)) + (29_636_000 as Weight) + .saturating_add((380_000 as Weight).saturating_mul(n as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } fn chill() -> Weight { - (22_719_000 as Weight) + (22_547_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } fn set_payee() -> Weight { - (15_354_000 as Weight) + (15_427_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn set_controller() -> Weight { - (33_783_000 as Weight) + (33_721_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn set_validator_count() -> Weight { - (3_126_000 as Weight) + (3_235_000 as Weight) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn force_no_eras() -> Weight { - (3_548_000 as Weight) + (3_641_000 as Weight) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn force_new_era() -> Weight { - (3_474_000 as Weight) + (3_644_000 as Weight) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn force_new_era_always() -> Weight { - (3_518_000 as Weight) + (3_692_000 as Weight) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn set_invulnerables(v: u32, ) -> Weight { - (3_639_000 as Weight) + (3_762_000 as Weight) .saturating_add((9_000 as Weight).saturating_mul(v as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn force_unstake(s: u32, ) -> Weight { - (75_900_000 as Weight) - .saturating_add((3_891_000 as Weight).saturating_mul(s as Weight)) + (75_106_000 as Weight) + .saturating_add((3_818_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(8 as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight))) } fn cancel_deferred_slash(s: u32, ) -> Weight { - (5_844_744_000 as Weight) - .saturating_add((34_644_000 as Weight).saturating_mul(s as Weight)) + (5_858_945_000 as Weight) + .saturating_add((34_650_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 payout_stakers_dead_controller(n: u32, ) -> Weight { - (145_214_000 as Weight) - .saturating_add((57_875_000 as Weight).saturating_mul(n as Weight)) + (134_161_000 as Weight) + .saturating_add((57_888_000 as Weight).saturating_mul(n as Weight)) .saturating_add(T::DbWeight::get().reads(11 as Weight)) .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight))) .saturating_add(T::DbWeight::get().writes(2 as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(n as Weight))) } fn payout_stakers_alive_staked(n: u32, ) -> Weight { - (173_115_000 as Weight) - .saturating_add((76_912_000 as Weight).saturating_mul(n as Weight)) + (165_075_000 as Weight) + .saturating_add((76_146_000 as Weight).saturating_mul(n as Weight)) .saturating_add(T::DbWeight::get().reads(12 as Weight)) .saturating_add(T::DbWeight::get().reads((5 as Weight).saturating_mul(n as Weight))) .saturating_add(T::DbWeight::get().writes(3 as Weight)) .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(n as Weight))) } fn rebond(l: u32, ) -> Weight { - (46_569_000 as Weight) - .saturating_add((104_000 as Weight).saturating_mul(l as Weight)) + (46_514_000 as Weight) + .saturating_add((102_000 as Weight).saturating_mul(l as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn set_history_depth(e: u32, ) -> Weight { (0 as Weight) - .saturating_add((36_641_000 as Weight).saturating_mul(e as Weight)) + .saturating_add((36_060_000 as Weight).saturating_mul(e as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) .saturating_add(T::DbWeight::get().writes((7 as Weight).saturating_mul(e as Weight))) } fn reap_stash(s: u32, ) -> Weight { - (95_718_000 as Weight) - .saturating_add((3_875_000 as Weight).saturating_mul(s as Weight)) + (94_628_000 as Weight) + .saturating_add((3_837_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(8 as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight))) } fn new_era(v: u32, n: u32, ) -> Weight { (0 as Weight) - .saturating_add((1_262_144_000 as Weight).saturating_mul(v as Weight)) - .saturating_add((143_471_000 as Weight).saturating_mul(n as Weight)) + .saturating_add((1_005_893_000 as Weight).saturating_mul(v as Weight)) + .saturating_add((117_364_000 as Weight).saturating_mul(n as Weight)) .saturating_add(T::DbWeight::get().reads(10 as Weight)) .saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(v as Weight))) .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight))) @@ -161,10 +161,10 @@ impl pallet_staking::WeightInfo for WeightInfo { } fn submit_solution_better(v: u32, n: u32, a: u32, w: u32, ) -> Weight { (0 as Weight) - .saturating_add((879_000 as Weight).saturating_mul(v as Weight)) - .saturating_add((488_000 as Weight).saturating_mul(n as Weight)) - .saturating_add((133_102_000 as Weight).saturating_mul(a as Weight)) - .saturating_add((8_073_000 as Weight).saturating_mul(w as Weight)) + .saturating_add((1_135_000 as Weight).saturating_mul(v as Weight)) + .saturating_add((545_000 as Weight).saturating_mul(n as Weight)) + .saturating_add((96_915_000 as Weight).saturating_mul(a as Weight)) + .saturating_add((7_461_000 as Weight).saturating_mul(w as Weight)) .saturating_add(T::DbWeight::get().reads(6 as Weight)) .saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(a as Weight))) .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(w as Weight))) diff --git a/runtime/westend/src/weights/pallet_staking.rs b/runtime/westend/src/weights/pallet_staking.rs index 35e2ebe2a861..551d188e9c3d 100644 --- a/runtime/westend/src/weights/pallet_staking.rs +++ b/runtime/westend/src/weights/pallet_staking.rs @@ -26,133 +26,133 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl pallet_staking::WeightInfo for WeightInfo { fn bond() -> Weight { - (95_041_000 as Weight) + (93_696_000 as Weight) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } fn bond_extra() -> Weight { - (73_981_000 as Weight) + (74_181_000 as Weight) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } fn unbond() -> Weight { - (67_107_000 as Weight) + (67_062_000 as Weight) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn withdraw_unbonded_update(s: u32, ) -> Weight { - (67_795_000 as Weight) + (67_349_000 as Weight) .saturating_add((32_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn withdraw_unbonded_kill(s: u32, ) -> Weight { - (110_537_000 as Weight) - .saturating_add((3_879_000 as Weight).saturating_mul(s as Weight)) + (109_652_000 as Weight) + .saturating_add((3_830_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(7 as Weight)) .saturating_add(T::DbWeight::get().writes(8 as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight))) } fn validate() -> Weight { - (22_802_000 as Weight) + (23_014_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } fn nominate(n: u32, ) -> Weight { - (29_784_000 as Weight) - .saturating_add((401_000 as Weight).saturating_mul(n as Weight)) + (29_636_000 as Weight) + .saturating_add((380_000 as Weight).saturating_mul(n as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } fn chill() -> Weight { - (22_719_000 as Weight) + (22_547_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } fn set_payee() -> Weight { - (15_354_000 as Weight) + (15_427_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn set_controller() -> Weight { - (33_783_000 as Weight) + (33_721_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn set_validator_count() -> Weight { - (3_126_000 as Weight) + (3_235_000 as Weight) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn force_no_eras() -> Weight { - (3_548_000 as Weight) + (3_641_000 as Weight) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn force_new_era() -> Weight { - (3_474_000 as Weight) + (3_644_000 as Weight) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn force_new_era_always() -> Weight { - (3_518_000 as Weight) + (3_692_000 as Weight) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn set_invulnerables(v: u32, ) -> Weight { - (3_639_000 as Weight) + (3_762_000 as Weight) .saturating_add((9_000 as Weight).saturating_mul(v as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn force_unstake(s: u32, ) -> Weight { - (75_900_000 as Weight) - .saturating_add((3_891_000 as Weight).saturating_mul(s as Weight)) + (75_106_000 as Weight) + .saturating_add((3_818_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(8 as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight))) } fn cancel_deferred_slash(s: u32, ) -> Weight { - (5_844_744_000 as Weight) - .saturating_add((34_644_000 as Weight).saturating_mul(s as Weight)) + (5_858_945_000 as Weight) + .saturating_add((34_650_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 payout_stakers_dead_controller(n: u32, ) -> Weight { - (145_214_000 as Weight) - .saturating_add((57_875_000 as Weight).saturating_mul(n as Weight)) + (134_161_000 as Weight) + .saturating_add((57_888_000 as Weight).saturating_mul(n as Weight)) .saturating_add(T::DbWeight::get().reads(11 as Weight)) .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight))) .saturating_add(T::DbWeight::get().writes(2 as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(n as Weight))) } fn payout_stakers_alive_staked(n: u32, ) -> Weight { - (173_115_000 as Weight) - .saturating_add((76_912_000 as Weight).saturating_mul(n as Weight)) + (165_075_000 as Weight) + .saturating_add((76_146_000 as Weight).saturating_mul(n as Weight)) .saturating_add(T::DbWeight::get().reads(12 as Weight)) .saturating_add(T::DbWeight::get().reads((5 as Weight).saturating_mul(n as Weight))) .saturating_add(T::DbWeight::get().writes(3 as Weight)) .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(n as Weight))) } fn rebond(l: u32, ) -> Weight { - (46_569_000 as Weight) - .saturating_add((104_000 as Weight).saturating_mul(l as Weight)) + (46_514_000 as Weight) + .saturating_add((102_000 as Weight).saturating_mul(l as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn set_history_depth(e: u32, ) -> Weight { (0 as Weight) - .saturating_add((36_641_000 as Weight).saturating_mul(e as Weight)) + .saturating_add((36_060_000 as Weight).saturating_mul(e as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) .saturating_add(T::DbWeight::get().writes((7 as Weight).saturating_mul(e as Weight))) } fn reap_stash(s: u32, ) -> Weight { - (95_718_000 as Weight) - .saturating_add((3_875_000 as Weight).saturating_mul(s as Weight)) + (94_628_000 as Weight) + .saturating_add((3_837_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(8 as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight))) } fn new_era(v: u32, n: u32, ) -> Weight { (0 as Weight) - .saturating_add((1_262_144_000 as Weight).saturating_mul(v as Weight)) - .saturating_add((143_471_000 as Weight).saturating_mul(n as Weight)) + .saturating_add((1_005_893_000 as Weight).saturating_mul(v as Weight)) + .saturating_add((117_364_000 as Weight).saturating_mul(n as Weight)) .saturating_add(T::DbWeight::get().reads(10 as Weight)) .saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(v as Weight))) .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight))) @@ -161,10 +161,10 @@ impl pallet_staking::WeightInfo for WeightInfo { } fn submit_solution_better(v: u32, n: u32, a: u32, w: u32, ) -> Weight { (0 as Weight) - .saturating_add((879_000 as Weight).saturating_mul(v as Weight)) - .saturating_add((488_000 as Weight).saturating_mul(n as Weight)) - .saturating_add((133_102_000 as Weight).saturating_mul(a as Weight)) - .saturating_add((8_073_000 as Weight).saturating_mul(w as Weight)) + .saturating_add((1_135_000 as Weight).saturating_mul(v as Weight)) + .saturating_add((545_000 as Weight).saturating_mul(n as Weight)) + .saturating_add((96_915_000 as Weight).saturating_mul(a as Weight)) + .saturating_add((7_461_000 as Weight).saturating_mul(w as Weight)) .saturating_add(T::DbWeight::get().reads(6 as Weight)) .saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(a as Weight))) .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(w as Weight)))