From e5831c3db373ec28e85e2971d485d8b74fd2d2ca Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Mon, 21 Jun 2021 10:57:43 +0100
Subject: [PATCH] New Weights for All Pallets (#9148)

* Create run_benchmarks.sh

* Update run_benchmarks.sh

* new weights

* Delete run_benchmarks.sh

* wrong folder

* remove grandpa weight

* Update weights.rs
---
 substrate/frame/assets/src/weights.rs         |  118 +-
 substrate/frame/balances/src/weights.rs       |   26 +-
 substrate/frame/bounties/src/weights.rs       |   60 +-
 substrate/frame/collective/src/weights.rs     |  218 +--
 substrate/frame/contracts/src/weights.rs      | 1272 ++++++++---------
 substrate/frame/democracy/src/weights.rs      |  217 +--
 .../src/weights.rs                            |  102 +-
 .../frame/elections-phragmen/src/weights.rs   |  124 +-
 substrate/frame/gilt/src/weights.rs           |   54 +-
 substrate/frame/identity/src/weights.rs       |  272 ++--
 substrate/frame/im-online/src/weights.rs      |   25 +-
 substrate/frame/indices/src/weights.rs        |   42 +-
 substrate/frame/lottery/src/weights.rs        |   36 +-
 substrate/frame/membership/src/weights.rs     |   58 +-
 substrate/frame/multisig/src/weights.rs       |  154 +-
 substrate/frame/proxy/src/weights.rs          |  156 +-
 substrate/frame/scheduler/src/weights.rs      |   60 +-
 substrate/frame/session/src/weights.rs        |   24 +-
 substrate/frame/staking/src/weights.rs        |  238 +--
 substrate/frame/system/src/weights.rs         |   43 +-
 substrate/frame/timestamp/src/weights.rs      |   28 +-
 substrate/frame/tips/src/weights.rs           |   54 +-
 .../frame/transaction-storage/src/weights.rs  |   22 +-
 substrate/frame/treasury/src/weights.rs       |   34 +-
 substrate/frame/uniques/src/weights.rs        |  114 +-
 substrate/frame/utility/src/weights.rs        |   26 +-
 substrate/frame/vesting/src/weights.rs        |   84 +-
 27 files changed, 1851 insertions(+), 1810 deletions(-)

diff --git a/substrate/frame/assets/src/weights.rs b/substrate/frame/assets/src/weights.rs
index 77db7fa4f05..ae5462288a3 100644
--- a/substrate/frame/assets/src/weights.rs
+++ b/substrate/frame/assets/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_assets
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-10, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -73,23 +73,23 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn create() -> Weight {
-		(52_735_000 as Weight)
+		(43_277_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_create() -> Weight {
-		(26_570_000 as Weight)
+		(21_829_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn destroy(c: u32, s: u32, a: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 93_000
-			.saturating_add((31_110_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 93_000
-			.saturating_add((38_908_000 as Weight).saturating_mul(s as Weight))
-			// Standard Error: 935_000
-			.saturating_add((42_765_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 34_000
+			.saturating_add((22_206_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 34_000
+			.saturating_add((28_086_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 346_000
+			.saturating_add((32_168_000 as Weight).saturating_mul(a as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(c as Weight)))
 			.saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(s as Weight)))
@@ -100,106 +100,106 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(a as Weight)))
 	}
 	fn mint() -> Weight {
-		(58_399_000 as Weight)
+		(45_983_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn burn() -> Weight {
-		(65_917_000 as Weight)
+		(52_925_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn transfer() -> Weight {
-		(100_407_000 as Weight)
+		(80_375_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn transfer_keep_alive() -> Weight {
-		(84_243_000 as Weight)
+		(67_688_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn force_transfer() -> Weight {
-		(100_407_000 as Weight)
+		(80_267_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn freeze() -> Weight {
-		(37_831_000 as Weight)
+		(30_541_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn thaw() -> Weight {
-		(37_660_000 as Weight)
+		(30_494_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn freeze_asset() -> Weight {
-		(27_175_000 as Weight)
+		(22_025_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn thaw_asset() -> Weight {
-		(26_884_000 as Weight)
+		(21_889_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn transfer_ownership() -> Weight {
-		(31_877_000 as Weight)
+		(24_939_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_team() -> Weight {
-		(27_947_000 as Weight)
+		(21_959_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_metadata(_n: u32, s: u32, ) -> Weight {
-		(57_993_000 as Weight)
+		(47_510_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((12_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((6_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn clear_metadata() -> Weight {
-		(57_820_000 as Weight)
+		(46_085_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_set_metadata(_n: u32, s: u32, ) -> Weight {
-		(30_830_000 as Weight)
+		(24_297_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((7_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_clear_metadata() -> Weight {
-		(57_292_000 as Weight)
+		(45_787_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_asset_status() -> Weight {
-		(26_750_000 as Weight)
+		(20_574_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn approve_transfer() -> Weight {
-		(65_598_000 as Weight)
+		(53_893_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn transfer_approved() -> Weight {
-		(131_312_000 as Weight)
+		(106_171_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
 	fn cancel_approval() -> Weight {
-		(66_904_000 as Weight)
+		(55_213_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn force_cancel_approval() -> Weight {
-		(67_525_000 as Weight)
+		(55_946_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
@@ -208,23 +208,23 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn create() -> Weight {
-		(52_735_000 as Weight)
+		(43_277_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_create() -> Weight {
-		(26_570_000 as Weight)
+		(21_829_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn destroy(c: u32, s: u32, a: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 93_000
-			.saturating_add((31_110_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 93_000
-			.saturating_add((38_908_000 as Weight).saturating_mul(s as Weight))
-			// Standard Error: 935_000
-			.saturating_add((42_765_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 34_000
+			.saturating_add((22_206_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 34_000
+			.saturating_add((28_086_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 346_000
+			.saturating_add((32_168_000 as Weight).saturating_mul(a as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(c as Weight)))
 			.saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(s as Weight)))
@@ -235,106 +235,106 @@ impl WeightInfo for () {
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(a as Weight)))
 	}
 	fn mint() -> Weight {
-		(58_399_000 as Weight)
+		(45_983_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn burn() -> Weight {
-		(65_917_000 as Weight)
+		(52_925_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn transfer() -> Weight {
-		(100_407_000 as Weight)
+		(80_375_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn transfer_keep_alive() -> Weight {
-		(84_243_000 as Weight)
+		(67_688_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn force_transfer() -> Weight {
-		(100_407_000 as Weight)
+		(80_267_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn freeze() -> Weight {
-		(37_831_000 as Weight)
+		(30_541_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn thaw() -> Weight {
-		(37_660_000 as Weight)
+		(30_494_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn freeze_asset() -> Weight {
-		(27_175_000 as Weight)
+		(22_025_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn thaw_asset() -> Weight {
-		(26_884_000 as Weight)
+		(21_889_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn transfer_ownership() -> Weight {
-		(31_877_000 as Weight)
+		(24_939_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_team() -> Weight {
-		(27_947_000 as Weight)
+		(21_959_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_metadata(_n: u32, s: u32, ) -> Weight {
-		(57_993_000 as Weight)
+		(47_510_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((12_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((6_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn clear_metadata() -> Weight {
-		(57_820_000 as Weight)
+		(46_085_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_set_metadata(_n: u32, s: u32, ) -> Weight {
-		(30_830_000 as Weight)
+		(24_297_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((7_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_clear_metadata() -> Weight {
-		(57_292_000 as Weight)
+		(45_787_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_asset_status() -> Weight {
-		(26_750_000 as Weight)
+		(20_574_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn approve_transfer() -> Weight {
-		(65_598_000 as Weight)
+		(53_893_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn transfer_approved() -> Weight {
-		(131_312_000 as Weight)
+		(106_171_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 	}
 	fn cancel_approval() -> Weight {
-		(66_904_000 as Weight)
+		(55_213_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn force_cancel_approval() -> Weight {
-		(67_525_000 as Weight)
+		(55_946_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
diff --git a/substrate/frame/balances/src/weights.rs b/substrate/frame/balances/src/weights.rs
index cf1d7dff828..79e6445dd6b 100644
--- a/substrate/frame/balances/src/weights.rs
+++ b/substrate/frame/balances/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_balances
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-04, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -56,32 +56,32 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn transfer() -> Weight {
-		(91_896_000 as Weight)
+		(73_268_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn transfer_keep_alive() -> Weight {
-		(67_779_000 as Weight)
+		(54_881_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_balance_creating() -> Weight {
-		(36_912_000 as Weight)
+		(29_853_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_balance_killing() -> Weight {
-		(44_416_000 as Weight)
+		(36_007_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_transfer() -> Weight {
-		(90_811_000 as Weight)
+		(72_541_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn transfer_all() -> Weight {
-		(84_170_000 as Weight)
+		(67_360_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -90,32 +90,32 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn transfer() -> Weight {
-		(91_896_000 as Weight)
+		(73_268_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn transfer_keep_alive() -> Weight {
-		(67_779_000 as Weight)
+		(54_881_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_balance_creating() -> Weight {
-		(36_912_000 as Weight)
+		(29_853_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_balance_killing() -> Weight {
-		(44_416_000 as Weight)
+		(36_007_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_transfer() -> Weight {
-		(90_811_000 as Weight)
+		(72_541_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn transfer_all() -> Weight {
-		(84_170_000 as Weight)
+		(67_360_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
diff --git a/substrate/frame/bounties/src/weights.rs b/substrate/frame/bounties/src/weights.rs
index 50d76739a93..9b50d438923 100644
--- a/substrate/frame/bounties/src/weights.rs
+++ b/substrate/frame/bounties/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,12 +17,12 @@
 
 //! Autogenerated weights for pallet_bounties
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-12-16, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
-// ./target/release/substrate
+// target/release/substrate
 // benchmark
 // --chain=dev
 // --steps=50
@@ -61,61 +61,61 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn propose_bounty(d: u32, ) -> Weight {
-		(64_778_000 as Weight)
+		(44_351_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((1_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn approve_bounty() -> Weight {
-		(18_293_000 as Weight)
+		(12_417_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn propose_curator() -> Weight {
-		(14_248_000 as Weight)
+		(9_692_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn unassign_curator() -> Weight {
-		(52_100_000 as Weight)
+		(41_211_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn accept_curator() -> Weight {
-		(52_564_000 as Weight)
+		(37_376_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn award_bounty() -> Weight {
-		(37_426_000 as Weight)
+		(25_525_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn claim_bounty() -> Weight {
-		(176_077_000 as Weight)
+		(125_495_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
 	fn close_bounty_proposed() -> Weight {
-		(51_162_000 as Weight)
+		(40_464_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn close_bounty_active() -> Weight {
-		(116_907_000 as Weight)
+		(84_042_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn extend_bounty_expiry() -> Weight {
-		(36_419_000 as Weight)
+		(25_114_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn spend_funds(b: u32, ) -> Weight {
-		(7_562_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((77_328_000 as Weight).saturating_mul(b as Weight))
+		(351_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((58_724_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(b as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -126,61 +126,61 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn propose_bounty(d: u32, ) -> Weight {
-		(64_778_000 as Weight)
+		(44_351_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((1_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn approve_bounty() -> Weight {
-		(18_293_000 as Weight)
+		(12_417_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn propose_curator() -> Weight {
-		(14_248_000 as Weight)
+		(9_692_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn unassign_curator() -> Weight {
-		(52_100_000 as Weight)
+		(41_211_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn accept_curator() -> Weight {
-		(52_564_000 as Weight)
+		(37_376_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn award_bounty() -> Weight {
-		(37_426_000 as Weight)
+		(25_525_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn claim_bounty() -> Weight {
-		(176_077_000 as Weight)
+		(125_495_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 	}
 	fn close_bounty_proposed() -> Weight {
-		(51_162_000 as Weight)
+		(40_464_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn close_bounty_active() -> Weight {
-		(116_907_000 as Weight)
+		(84_042_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn extend_bounty_expiry() -> Weight {
-		(36_419_000 as Weight)
+		(25_114_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn spend_funds(b: u32, ) -> Weight {
-		(7_562_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((77_328_000 as Weight).saturating_mul(b as Weight))
+		(351_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((58_724_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(b as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
diff --git a/substrate/frame/collective/src/weights.rs b/substrate/frame/collective/src/weights.rs
index 7bdce04d264..46bd999344a 100644
--- a/substrate/frame/collective/src/weights.rs
+++ b/substrate/frame/collective/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Weights for pallet_collective
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! Autogenerated weights for pallet_collective
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -43,17 +44,16 @@ use sp_std::marker::PhantomData;
 
 /// Weight functions needed for pallet_collective.
 pub trait WeightInfo {
-	fn set_members(_m: u32, _n: u32, _p: u32, ) -> Weight;
-	fn execute(_b: u32, _m: u32, ) -> Weight;
-	fn propose_execute(_b: u32, _m: u32, ) -> Weight;
-	fn propose_proposed(_b: u32, _m: u32, _p: u32, ) -> Weight;
-	fn vote(_m: u32, ) -> Weight;
-	fn close_early_disapproved(_m: u32, _p: u32, ) -> Weight;
-	fn close_early_approved(_b: u32, _m: u32, _p: u32, ) -> Weight;
-	fn close_disapproved(_m: u32, _p: u32, ) -> Weight;
-	fn close_approved(_b: u32, _m: u32, _p: u32, ) -> Weight;
-	fn disapprove_proposal(_p: u32, ) -> Weight;
-
+	fn set_members(m: u32, n: u32, p: u32, ) -> Weight;
+	fn execute(b: u32, m: u32, ) -> Weight;
+	fn propose_execute(b: u32, m: u32, ) -> Weight;
+	fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight;
+	fn vote(m: u32, ) -> Weight;
+	fn close_early_disapproved(m: u32, p: u32, ) -> Weight;
+	fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight;
+	fn close_disapproved(m: u32, p: u32, ) -> Weight;
+	fn close_approved(b: u32, m: u32, p: u32, ) -> Weight;
+	fn disapprove_proposal(p: u32, ) -> Weight;
 }
 
 /// Weights for pallet_collective using the Substrate node and recommended hardware.
@@ -61,170 +61,194 @@ pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn set_members(m: u32, n: u32, p: u32, ) -> Weight {
 		(0 as Weight)
-			.saturating_add((20_933_000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((254_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add((28_233_000 as Weight).saturating_mul(p as Weight))
+			// Standard Error: 5_000
+			.saturating_add((15_266_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 5_000
+			.saturating_add((39_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 5_000
+			.saturating_add((20_899_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(p as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
 	}
 	fn execute(b: u32, m: u32, ) -> Weight {
-		(31_147_000 as Weight)
-			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
-			.saturating_add((115_000 as Weight).saturating_mul(m as Weight))
+		(21_945_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
+			// Standard Error: 0
+			.saturating_add((93_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-
 	}
 	fn propose_execute(b: u32, m: u32, ) -> Weight {
-		(38_774_000 as Weight)
-			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
-			.saturating_add((226_000 as Weight).saturating_mul(m as Weight))
+		(26_316_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
+			// Standard Error: 0
+			.saturating_add((184_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
-
 	}
 	fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight {
-		(64_230_000 as Weight)
-			.saturating_add((5_000 as Weight).saturating_mul(b as Weight))
-			.saturating_add((138_000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((637_000 as Weight).saturating_mul(p as Weight))
+		(42_664_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
+			// Standard Error: 2_000
+			.saturating_add((166_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 2_000
+			.saturating_add((435_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
-
 	}
 	fn vote(m: u32, ) -> Weight {
-		(57_051_000 as Weight)
-			.saturating_add((220_000 as Weight).saturating_mul(m as Weight))
+		(43_750_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((198_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-
 	}
 	fn close_early_disapproved(m: u32, p: u32, ) -> Weight {
-		(61_406_000 as Weight)
-			.saturating_add((225_000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((630_000 as Weight).saturating_mul(p as Weight))
+		(44_153_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((185_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 0
+			.saturating_add((454_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-
 	}
 	fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		(92_864_000 as Weight)
-			.saturating_add((1_000 as Weight).saturating_mul(b as Weight))
-			.saturating_add((233_000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((597_000 as Weight).saturating_mul(p as Weight))
+		(65_478_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
+			// Standard Error: 2_000
+			.saturating_add((167_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 2_000
+			.saturating_add((434_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-
 	}
 	fn close_disapproved(m: u32, p: u32, ) -> Weight {
-		(67_942_000 as Weight)
-			.saturating_add((232_000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((636_000 as Weight).saturating_mul(p as Weight))
+		(49_001_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((189_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 0
+			.saturating_add((464_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-
 	}
 	fn close_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		(99_742_000 as Weight)
-			.saturating_add((1_000 as Weight).saturating_mul(b as Weight))
-			.saturating_add((233_000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((598_000 as Weight).saturating_mul(p as Weight))
+		(65_049_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
+			// Standard Error: 1_000
+			.saturating_add((192_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 1_000
+			.saturating_add((469_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-
 	}
 	fn disapprove_proposal(p: u32, ) -> Weight {
-		(36_628_000 as Weight)
-			.saturating_add((640_000 as Weight).saturating_mul(p as Weight))
+		(27_288_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((477_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-
 	}
-
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn set_members(m: u32, n: u32, p: u32, ) -> Weight {
 		(0 as Weight)
-			.saturating_add((20_933_000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((254_000 as Weight).saturating_mul(n as Weight))
-			.saturating_add((28_233_000 as Weight).saturating_mul(p as Weight))
+			// Standard Error: 5_000
+			.saturating_add((15_266_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 5_000
+			.saturating_add((39_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 5_000
+			.saturating_add((20_899_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(p as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
 	}
 	fn execute(b: u32, m: u32, ) -> Weight {
-		(31_147_000 as Weight)
-			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
-			.saturating_add((115_000 as Weight).saturating_mul(m as Weight))
+		(21_945_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
+			// Standard Error: 0
+			.saturating_add((93_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
-
 	}
 	fn propose_execute(b: u32, m: u32, ) -> Weight {
-		(38_774_000 as Weight)
-			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
-			.saturating_add((226_000 as Weight).saturating_mul(m as Weight))
+		(26_316_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
+			// Standard Error: 0
+			.saturating_add((184_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
-
 	}
 	fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight {
-		(64_230_000 as Weight)
-			.saturating_add((5_000 as Weight).saturating_mul(b as Weight))
-			.saturating_add((138_000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((637_000 as Weight).saturating_mul(p as Weight))
+		(42_664_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
+			// Standard Error: 2_000
+			.saturating_add((166_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 2_000
+			.saturating_add((435_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
-
 	}
 	fn vote(m: u32, ) -> Weight {
-		(57_051_000 as Weight)
-			.saturating_add((220_000 as Weight).saturating_mul(m as Weight))
+		(43_750_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((198_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-
 	}
 	fn close_early_disapproved(m: u32, p: u32, ) -> Weight {
-		(61_406_000 as Weight)
-			.saturating_add((225_000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((630_000 as Weight).saturating_mul(p as Weight))
+		(44_153_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((185_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 0
+			.saturating_add((454_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
-
 	}
 	fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		(92_864_000 as Weight)
-			.saturating_add((1_000 as Weight).saturating_mul(b as Weight))
-			.saturating_add((233_000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((597_000 as Weight).saturating_mul(p as Weight))
+		(65_478_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
+			// Standard Error: 2_000
+			.saturating_add((167_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 2_000
+			.saturating_add((434_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
-
 	}
 	fn close_disapproved(m: u32, p: u32, ) -> Weight {
-		(67_942_000 as Weight)
-			.saturating_add((232_000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((636_000 as Weight).saturating_mul(p as Weight))
+		(49_001_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((189_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 0
+			.saturating_add((464_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
-
 	}
 	fn close_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		(99_742_000 as Weight)
-			.saturating_add((1_000 as Weight).saturating_mul(b as Weight))
-			.saturating_add((233_000 as Weight).saturating_mul(m as Weight))
-			.saturating_add((598_000 as Weight).saturating_mul(p as Weight))
+		(65_049_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
+			// Standard Error: 1_000
+			.saturating_add((192_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 1_000
+			.saturating_add((469_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
-
 	}
 	fn disapprove_proposal(p: u32, ) -> Weight {
-		(36_628_000 as Weight)
-			.saturating_add((640_000 as Weight).saturating_mul(p as Weight))
+		(27_288_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((477_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
-
 	}
-
 }
diff --git a/substrate/frame/contracts/src/weights.rs b/substrate/frame/contracts/src/weights.rs
index b96a3cad5b7..5edb4170e4e 100644
--- a/substrate/frame/contracts/src/weights.rs
+++ b/substrate/frame/contracts/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_contracts
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-05-11, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -62,8 +62,6 @@ pub trait WeightInfo {
 	fn seal_rent_allowance(r: u32, ) -> Weight;
 	fn seal_block_number(r: u32, ) -> Weight;
 	fn seal_now(r: u32, ) -> Weight;
-	fn seal_rent_params(r: u32, ) -> Weight;
-	fn seal_rent_status(r: u32, ) -> Weight;
 	fn seal_weight_to_fee(r: u32, ) -> Weight;
 	fn seal_gas(r: u32, ) -> Weight;
 	fn seal_input(r: u32, ) -> Weight;
@@ -154,286 +152,272 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn on_initialize() -> Weight {
-		(3_656_000 as Weight)
+		(3_603_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 	}
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((2_241_000 as Weight).saturating_mul(k as Weight))
+			// Standard Error: 2_000
+			.saturating_add((2_217_000 as Weight).saturating_mul(k 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(k as Weight)))
 	}
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
-		(36_820_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((34_550_000 as Weight).saturating_mul(q as Weight))
+		(0 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((36_769_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn instrument(c: u32, ) -> Weight {
-		(42_348_000 as Weight)
-			// Standard Error: 185_000
-			.saturating_add((95_664_000 as Weight).saturating_mul(c as Weight))
+		(54_463_000 as Weight)
+			// Standard Error: 105_000
+			.saturating_add((77_542_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight {
-		(210_852_000 as Weight)
-			// Standard Error: 138_000
-			.saturating_add((135_241_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 9_000
-			.saturating_add((1_846_000 as Weight).saturating_mul(s as Weight))
+		(184_114_000 as Weight)
+			// Standard Error: 82_000
+			.saturating_add((117_247_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 5_000
+			.saturating_add((1_542_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn instantiate(c: u32, s: u32, ) -> Weight {
-		(217_380_000 as Weight)
-			// Standard Error: 6_000
-			.saturating_add((8_483_000 as Weight).saturating_mul(c as Weight))
+		(183_501_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((5_645_000 as Weight).saturating_mul(c as Weight))
 			// Standard Error: 0
-			.saturating_add((1_752_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((1_473_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 call(c: u32, ) -> Weight {
-		(181_443_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((3_955_000 as Weight).saturating_mul(c as Weight))
+		(173_411_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((2_639_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn claim_surcharge(c: u32, ) -> Weight {
-		(132_551_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((4_740_000 as Weight).saturating_mul(c as Weight))
+		(125_839_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((3_123_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn seal_caller(r: u32, ) -> Weight {
-		(137_742_000 as Weight)
-			// Standard Error: 74_000
-			.saturating_add((242_261_000 as Weight).saturating_mul(r as Weight))
+		(131_793_000 as Weight)
+			// Standard Error: 84_000
+			.saturating_add((231_138_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_address(r: u32, ) -> Weight {
-		(137_739_000 as Weight)
-			// Standard Error: 91_000
-			.saturating_add((241_803_000 as Weight).saturating_mul(r as Weight))
+		(129_995_000 as Weight)
+			// Standard Error: 78_000
+			.saturating_add((231_839_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(139_631_000 as Weight)
-			// Standard Error: 83_000
-			.saturating_add((236_790_000 as Weight).saturating_mul(r as Weight))
+		(129_710_000 as Weight)
+			// Standard Error: 85_000
+			.saturating_add((227_268_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_balance(r: u32, ) -> Weight {
-		(142_506_000 as Weight)
-			// Standard Error: 176_000
-			.saturating_add((525_752_000 as Weight).saturating_mul(r as Weight))
+		(133_445_000 as Weight)
+			// Standard Error: 144_000
+			.saturating_add((487_125_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(138_569_000 as Weight)
-			// Standard Error: 76_000
-			.saturating_add((237_016_000 as Weight).saturating_mul(r as Weight))
+		(129_299_000 as Weight)
+			// Standard Error: 82_000
+			.saturating_add((227_118_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(134_713_000 as Weight)
-			// Standard Error: 81_000
-			.saturating_add((237_962_000 as Weight).saturating_mul(r as Weight))
+		(126_120_000 as Weight)
+			// Standard Error: 114_000
+			.saturating_add((227_326_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(131_523_000 as Weight)
-			// Standard Error: 90_000
-			.saturating_add((237_435_000 as Weight).saturating_mul(r as Weight))
+		(130_934_000 as Weight)
+			// Standard Error: 89_000
+			.saturating_add((226_638_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_rent_allowance(r: u32, ) -> Weight {
-		(141_574_000 as Weight)
-			// Standard Error: 86_000
-			.saturating_add((238_102_000 as Weight).saturating_mul(r as Weight))
+		(128_738_000 as Weight)
+			// Standard Error: 77_000
+			.saturating_add((227_062_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_block_number(r: u32, ) -> Weight {
-		(140_240_000 as Weight)
-			// Standard Error: 101_000
-			.saturating_add((236_568_000 as Weight).saturating_mul(r as Weight))
+		(132_375_000 as Weight)
+			// Standard Error: 88_000
+			.saturating_add((226_861_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_now(r: u32, ) -> Weight {
-		(138_265_000 as Weight)
-			// Standard Error: 91_000
-			.saturating_add((237_187_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn seal_rent_params(r: u32, ) -> Weight {
-		(149_701_000 as Weight)
-			// Standard Error: 297_000
-			.saturating_add((357_149_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(4 as Weight))
-			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-	}
-	fn seal_rent_status(r: u32, ) -> Weight {
-		(146_863_000 as Weight)
-			// Standard Error: 191_000
-			.saturating_add((638_683_000 as Weight).saturating_mul(r as Weight))
+		(127_888_000 as Weight)
+			// Standard Error: 86_000
+			.saturating_add((227_851_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(144_278_000 as Weight)
+		(131_825_000 as Weight)
 			// Standard Error: 149_000
-			.saturating_add((470_264_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((420_149_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_gas(r: u32, ) -> Weight {
-		(111_361_000 as Weight)
-			// Standard Error: 157_000
-			.saturating_add((118_441_000 as Weight).saturating_mul(r as Weight))
+		(113_641_000 as Weight)
+			// Standard Error: 114_000
+			.saturating_add((113_068_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_input(r: u32, ) -> Weight {
-		(129_970_000 as Weight)
-			// Standard Error: 316_000
-			.saturating_add((7_160_000 as Weight).saturating_mul(r as Weight))
+		(122_982_000 as Weight)
+			// Standard Error: 74_000
+			.saturating_add((6_828_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(139_275_000 as Weight)
+		(131_913_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((250_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((275_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_return(r: u32, ) -> Weight {
-		(119_240_000 as Weight)
-			// Standard Error: 57_000
-			.saturating_add((4_347_000 as Weight).saturating_mul(r as Weight))
+		(114_164_000 as Weight)
+			// Standard Error: 72_000
+			.saturating_add((4_318_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(128_896_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((757_000 as Weight).saturating_mul(n as Weight))
+		(123_940_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((664_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_terminate(r: u32, ) -> Weight {
-		(130_119_000 as Weight)
-			// Standard Error: 108_000
-			.saturating_add((95_078_000 as Weight).saturating_mul(r as Weight))
+		(123_340_000 as Weight)
+			// Standard Error: 99_000
+			.saturating_add((89_126_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((4 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_terminate_per_code_kb(c: u32, ) -> Weight {
-		(230_167_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((8_495_000 as Weight).saturating_mul(c as Weight))
+		(217_499_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((5_608_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
 	fn seal_restore_to(r: u32, ) -> Weight {
-		(159_200_000 as Weight)
-			// Standard Error: 261_000
-			.saturating_add((103_048_000 as Weight).saturating_mul(r as Weight))
+		(149_019_000 as Weight)
+			// Standard Error: 903_000
+			.saturating_add((87_433_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((5 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_restore_to_per_code_kb_delta(c: u32, t: u32, d: u32, ) -> Weight {
-		(58_389_000 as Weight)
-			// Standard Error: 131_000
-			.saturating_add((7_910_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 131_000
-			.saturating_add((4_036_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 1_156_000
-			.saturating_add((3_714_110_000 as Weight).saturating_mul(d as Weight))
+		(18_255_000 as Weight)
+			// Standard Error: 141_000
+			.saturating_add((5_142_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 141_000
+			.saturating_add((2_478_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 1_242_000
+			.saturating_add((2_935_421_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
 			.saturating_add(T::DbWeight::get().writes(7 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(d as Weight)))
 	}
 	fn seal_random(r: u32, ) -> Weight {
-		(138_794_000 as Weight)
-			// Standard Error: 216_000
-			.saturating_add((599_742_000 as Weight).saturating_mul(r as Weight))
+		(140_411_000 as Weight)
+			// Standard Error: 146_000
+			.saturating_add((566_687_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(139_890_000 as Weight)
-			// Standard Error: 263_000
-			.saturating_add((885_805_000 as Weight).saturating_mul(r as Weight))
+		(132_048_000 as Weight)
+			// Standard Error: 308_000
+			.saturating_add((818_622_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_117_962_000 as Weight)
-			// Standard Error: 4_029_000
-			.saturating_add((566_825_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 794_000
-			.saturating_add((251_096_000 as Weight).saturating_mul(n as Weight))
+		(1_080_578_000 as Weight)
+			// Standard Error: 2_337_000
+			.saturating_add((534_525_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 460_000
+			.saturating_add((167_990_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_set_rent_allowance(r: u32, ) -> Weight {
-		(132_720_000 as Weight)
-			// Standard Error: 87_000
-			.saturating_add((164_134_000 as Weight).saturating_mul(r as Weight))
+		(123_998_000 as Weight)
+			// Standard Error: 53_000
+			.saturating_add((155_113_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_debug_message(r: u32, ) -> Weight {
-		(125_834_000 as Weight)
-			// Standard Error: 142_000
-			.saturating_add((127_200_000 as Weight).saturating_mul(r as Weight))
+		(120_514_000 as Weight)
+			// Standard Error: 93_000
+			.saturating_add((124_243_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(478_734_000 as Weight)
-			// Standard Error: 2_559_000
-			.saturating_add((3_766_445_000 as Weight).saturating_mul(r as Weight))
+		(47_131_000 as Weight)
+			// Standard Error: 931_000
+			.saturating_add((4_033_062_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(600_306_000 as Weight)
-			// Standard Error: 234_000
-			.saturating_add((70_989_000 as Weight).saturating_mul(n as Weight))
+		(549_577_000 as Weight)
+			// Standard Error: 192_000
+			.saturating_add((57_815_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn seal_clear_storage(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_380_000
-			.saturating_add((1_242_131_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 2_635_000
+			.saturating_add((1_214_454_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -441,23 +425,23 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	}
 	fn seal_get_storage(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 1_060_000
-			.saturating_add((910_861_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 1_044_000
+			.saturating_add((883_653_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(605_545_000 as Weight)
-			// Standard Error: 252_000
-			.saturating_add((153_519_000 as Weight).saturating_mul(n as Weight))
+		(568_190_000 as Weight)
+			// Standard Error: 181_000
+			.saturating_add((106_420_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_transfer(r: u32, ) -> Weight {
-		(36_854_000 as Weight)
-			// Standard Error: 2_076_000
-			.saturating_add((5_183_774_000 as Weight).saturating_mul(r as Weight))
+		(0 as Weight)
+			// Standard Error: 1_553_000
+			.saturating_add((4_810_405_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
@@ -465,645 +449,631 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	}
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 6_583_000
-			.saturating_add((11_599_057_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 8_671_000
+			.saturating_add((10_965_308_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((200 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_call_per_code_transfer_input_output_kb(c: u32, t: u32, i: u32, o: u32, ) -> Weight {
-		(10_431_738_000 as Weight)
-			// Standard Error: 301_000
-			.saturating_add((392_174_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 125_400_000
-			.saturating_add((3_698_896_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 39_000
-			.saturating_add((60_692_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 42_000
-			.saturating_add((78_872_000 as Weight).saturating_mul(o as Weight))
+		(10_138_403_000 as Weight)
+			// Standard Error: 162_000
+			.saturating_add((264_871_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 67_846_000
+			.saturating_add((3_793_372_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 21_000
+			.saturating_add((49_168_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 22_000
+			.saturating_add((71_664_000 as Weight).saturating_mul(o as Weight))
 			.saturating_add(T::DbWeight::get().reads(205 as Weight))
 			.saturating_add(T::DbWeight::get().writes(101 as Weight))
 			.saturating_add(T::DbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 32_118_000
-			.saturating_add((21_117_947_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 34_546_000
+			.saturating_add((19_938_393_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes((300 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_instantiate_per_code_input_output_salt_kb(c: u32, i: u32, o: u32, s: u32, ) -> Weight {
-		(8_542_521_000 as Weight)
-			// Standard Error: 644_000
-			.saturating_add((878_020_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 91_000
-			.saturating_add((63_004_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 91_000
-			.saturating_add((83_203_000 as Weight).saturating_mul(o as Weight))
-			// Standard Error: 91_000
-			.saturating_add((240_170_000 as Weight).saturating_mul(s as Weight))
+		(8_861_543_000 as Weight)
+			// Standard Error: 566_000
+			.saturating_add((585_057_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 80_000
+			.saturating_add((52_025_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 80_000
+			.saturating_add((75_956_000 as Weight).saturating_mul(o as Weight))
+			// Standard Error: 80_000
+			.saturating_add((198_033_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(206 as Weight))
 			.saturating_add(T::DbWeight::get().writes(204 as Weight))
 	}
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(130_991_000 as Weight)
-			// Standard Error: 106_000
-			.saturating_add((230_186_000 as Weight).saturating_mul(r as Weight))
+		(129_022_000 as Weight)
+			// Standard Error: 76_000
+			.saturating_add((216_764_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(508_089_000 as Weight)
-			// Standard Error: 38_000
-			.saturating_add((491_916_000 as Weight).saturating_mul(n as Weight))
+		(414_489_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((481_873_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(135_384_000 as Weight)
-			// Standard Error: 111_000
-			.saturating_add((233_638_000 as Weight).saturating_mul(r as Weight))
+		(127_636_000 as Weight)
+			// Standard Error: 104_000
+			.saturating_add((225_094_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(445_961_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((340_992_000 as Weight).saturating_mul(n as Weight))
+		(216_668_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((331_423_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(133_593_000 as Weight)
-			// Standard Error: 112_000
-			.saturating_add((208_000_000 as Weight).saturating_mul(r as Weight))
+		(129_582_000 as Weight)
+			// Standard Error: 97_000
+			.saturating_add((198_429_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(444_562_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((159_521_000 as Weight).saturating_mul(n as Weight))
+		(288_991_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((148_497_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(131_381_000 as Weight)
-			// Standard Error: 82_000
-			.saturating_add((207_479_000 as Weight).saturating_mul(r as Weight))
+		(128_711_000 as Weight)
+			// Standard Error: 94_000
+			.saturating_add((197_050_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(576_129_000 as Weight)
-			// Standard Error: 49_000
-			.saturating_add((156_900_000 as Weight).saturating_mul(n as Weight))
+		(275_444_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((148_469_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(20_276_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((3_355_000 as Weight).saturating_mul(r as Weight))
+		(20_089_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((3_376_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(22_345_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((133_628_000 as Weight).saturating_mul(r as Weight))
+		(22_187_000 as Weight)
+			// Standard Error: 31_000
+			.saturating_add((162_969_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(22_294_000 as Weight)
-			// Standard Error: 95_000
-			.saturating_add((204_007_000 as Weight).saturating_mul(r as Weight))
+		(22_292_000 as Weight)
+			// Standard Error: 39_000
+			.saturating_add((233_277_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(20_266_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((12_605_000 as Weight).saturating_mul(r as Weight))
+		(20_083_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((12_378_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(20_208_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((12_589_000 as Weight).saturating_mul(r as Weight))
+		(20_091_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((12_195_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(20_227_000 as Weight)
+		(20_082_000 as Weight)
 			// Standard Error: 18_000
-			.saturating_add((6_429_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((6_151_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(20_279_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((14_560_000 as Weight).saturating_mul(r as Weight))
+		(20_031_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((13_978_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(20_210_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((15_613_000 as Weight).saturating_mul(r as Weight))
+		(20_063_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((15_524_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(34_276_000 as Weight)
+		(34_332_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((130_000 as Weight).saturating_mul(e as Weight))
+			.saturating_add((117_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(20_426_000 as Weight)
-			// Standard Error: 69_000
-			.saturating_add((91_850_000 as Weight).saturating_mul(r as Weight))
+		(20_446_000 as Weight)
+			// Standard Error: 121_000
+			.saturating_add((90_977_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(27_099_000 as Weight)
-			// Standard Error: 111_000
-			.saturating_add((169_212_000 as Weight).saturating_mul(r as Weight))
+		(28_119_000 as Weight)
+			// Standard Error: 390_000
+			.saturating_add((192_865_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(206_492_000 as Weight)
+		(228_352_000 as Weight)
 			// Standard Error: 4_000
-			.saturating_add((4_685_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((3_891_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(37_892_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((3_510_000 as Weight).saturating_mul(r as Weight))
+		(37_745_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((3_135_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(37_773_000 as Weight)
+		(37_639_000 as Weight)
 			// Standard Error: 15_000
-			.saturating_add((3_814_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((3_541_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(37_785_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((4_949_000 as Weight).saturating_mul(r as Weight))
+		(37_639_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((4_813_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(23_467_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((7_493_000 as Weight).saturating_mul(r as Weight))
+		(23_379_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((7_757_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(23_492_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((8_499_000 as Weight).saturating_mul(r as Weight))
+		(23_378_000 as Weight)
+			// Standard Error: 68_000
+			.saturating_add((8_437_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(22_347_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((3_565_000 as Weight).saturating_mul(r as Weight))
+		(22_245_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((3_446_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(20_849_000 as Weight)
-			// Standard Error: 2_751_000
-			.saturating_add((2_072_517_000 as Weight).saturating_mul(r as Weight))
+		(20_714_000 as Weight)
+			// Standard Error: 478_000
+			.saturating_add((2_314_540_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(20_216_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((5_067_000 as Weight).saturating_mul(r as Weight))
+		(20_126_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((5_316_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(20_218_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((5_015_000 as Weight).saturating_mul(r as Weight))
+		(20_107_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((5_344_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(20_215_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((5_888_000 as Weight).saturating_mul(r as Weight))
+		(20_135_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((5_909_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(20_232_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((5_366_000 as Weight).saturating_mul(r as Weight))
+		(20_107_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((5_515_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(20_205_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((4_847_000 as Weight).saturating_mul(r as Weight))
+		(20_229_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((5_113_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(20_181_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((4_849_000 as Weight).saturating_mul(r as Weight))
+		(20_070_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((5_226_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(20_175_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((4_981_000 as Weight).saturating_mul(r as Weight))
+		(20_090_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((5_296_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(20_273_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((7_402_000 as Weight).saturating_mul(r as Weight))
+		(20_095_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((7_323_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(20_260_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((7_392_000 as Weight).saturating_mul(r as Weight))
+		(20_043_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((7_280_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(20_248_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((7_363_000 as Weight).saturating_mul(r as Weight))
+		(20_061_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((7_226_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(20_229_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((7_412_000 as Weight).saturating_mul(r as Weight))
+		(20_072_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((7_315_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(20_232_000 as Weight)
-			// Standard Error: 9_000
-			.saturating_add((7_364_000 as Weight).saturating_mul(r as Weight))
+		(20_054_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((7_228_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(20_252_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((7_383_000 as Weight).saturating_mul(r as Weight))
+		(20_169_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_262_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(20_258_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((7_359_000 as Weight).saturating_mul(r as Weight))
+		(20_115_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((7_212_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(20_245_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((7_400_000 as Weight).saturating_mul(r as Weight))
+		(20_122_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((7_166_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(20_245_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((7_391_000 as Weight).saturating_mul(r as Weight))
+		(20_140_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((7_242_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(20_230_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((7_439_000 as Weight).saturating_mul(r as Weight))
+		(20_107_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_365_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(20_254_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((7_204_000 as Weight).saturating_mul(r as Weight))
+		(20_179_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((7_144_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(20_182_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((7_327_000 as Weight).saturating_mul(r as Weight))
+		(20_143_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((7_222_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(20_203_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((7_221_000 as Weight).saturating_mul(r as Weight))
+		(20_129_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((7_247_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(20_187_000 as Weight)
+		(20_107_000 as Weight)
 			// Standard Error: 16_000
-			.saturating_add((13_738_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((12_953_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(20_153_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((12_766_000 as Weight).saturating_mul(r as Weight))
+		(20_093_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((12_040_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(20_219_000 as Weight)
+		(20_102_000 as Weight)
 			// Standard Error: 13_000
-			.saturating_add((13_732_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((12_945_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(20_246_000 as Weight)
+		(20_132_000 as Weight)
 			// Standard Error: 16_000
-			.saturating_add((12_686_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((12_199_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(20_228_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((7_245_000 as Weight).saturating_mul(r as Weight))
+		(20_155_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((7_103_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(20_238_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((7_250_000 as Weight).saturating_mul(r as Weight))
+		(20_088_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((7_213_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(20_213_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((7_292_000 as Weight).saturating_mul(r as Weight))
+		(20_060_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_275_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(20_224_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((7_554_000 as Weight).saturating_mul(r as Weight))
+		(20_104_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((7_282_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(20_261_000 as Weight)
+		(20_111_000 as Weight)
 			// Standard Error: 20_000
-			.saturating_add((7_551_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((7_264_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(20_212_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((7_616_000 as Weight).saturating_mul(r as Weight))
+		(20_096_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((7_347_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(20_176_000 as Weight)
-			// Standard Error: 9_000
-			.saturating_add((7_877_000 as Weight).saturating_mul(r as Weight))
+		(20_091_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((7_370_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(20_230_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((7_347_000 as Weight).saturating_mul(r as Weight))
+		(20_102_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((7_266_000 as Weight).saturating_mul(r as Weight))
 	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn on_initialize() -> Weight {
-		(3_656_000 as Weight)
+		(3_603_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 	}
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((2_241_000 as Weight).saturating_mul(k as Weight))
+			// Standard Error: 2_000
+			.saturating_add((2_217_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
-		(36_820_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((34_550_000 as Weight).saturating_mul(q as Weight))
+		(0 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((36_769_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn instrument(c: u32, ) -> Weight {
-		(42_348_000 as Weight)
-			// Standard Error: 185_000
-			.saturating_add((95_664_000 as Weight).saturating_mul(c as Weight))
+		(54_463_000 as Weight)
+			// Standard Error: 105_000
+			.saturating_add((77_542_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight {
-		(210_852_000 as Weight)
-			// Standard Error: 138_000
-			.saturating_add((135_241_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 9_000
-			.saturating_add((1_846_000 as Weight).saturating_mul(s as Weight))
+		(184_114_000 as Weight)
+			// Standard Error: 82_000
+			.saturating_add((117_247_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 5_000
+			.saturating_add((1_542_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn instantiate(c: u32, s: u32, ) -> Weight {
-		(217_380_000 as Weight)
-			// Standard Error: 6_000
-			.saturating_add((8_483_000 as Weight).saturating_mul(c as Weight))
+		(183_501_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((5_645_000 as Weight).saturating_mul(c as Weight))
 			// Standard Error: 0
-			.saturating_add((1_752_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((1_473_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn call(c: u32, ) -> Weight {
-		(181_443_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((3_955_000 as Weight).saturating_mul(c as Weight))
+		(173_411_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((2_639_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn claim_surcharge(c: u32, ) -> Weight {
-		(132_551_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((4_740_000 as Weight).saturating_mul(c as Weight))
+		(125_839_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((3_123_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn seal_caller(r: u32, ) -> Weight {
-		(137_742_000 as Weight)
-			// Standard Error: 74_000
-			.saturating_add((242_261_000 as Weight).saturating_mul(r as Weight))
+		(131_793_000 as Weight)
+			// Standard Error: 84_000
+			.saturating_add((231_138_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_address(r: u32, ) -> Weight {
-		(137_739_000 as Weight)
-			// Standard Error: 91_000
-			.saturating_add((241_803_000 as Weight).saturating_mul(r as Weight))
+		(129_995_000 as Weight)
+			// Standard Error: 78_000
+			.saturating_add((231_839_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(139_631_000 as Weight)
-			// Standard Error: 83_000
-			.saturating_add((236_790_000 as Weight).saturating_mul(r as Weight))
+		(129_710_000 as Weight)
+			// Standard Error: 85_000
+			.saturating_add((227_268_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_balance(r: u32, ) -> Weight {
-		(142_506_000 as Weight)
-			// Standard Error: 176_000
-			.saturating_add((525_752_000 as Weight).saturating_mul(r as Weight))
+		(133_445_000 as Weight)
+			// Standard Error: 144_000
+			.saturating_add((487_125_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(138_569_000 as Weight)
-			// Standard Error: 76_000
-			.saturating_add((237_016_000 as Weight).saturating_mul(r as Weight))
+		(129_299_000 as Weight)
+			// Standard Error: 82_000
+			.saturating_add((227_118_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(134_713_000 as Weight)
-			// Standard Error: 81_000
-			.saturating_add((237_962_000 as Weight).saturating_mul(r as Weight))
+		(126_120_000 as Weight)
+			// Standard Error: 114_000
+			.saturating_add((227_326_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_tombstone_deposit(r: u32, ) -> Weight {
-		(131_523_000 as Weight)
-			// Standard Error: 90_000
-			.saturating_add((237_435_000 as Weight).saturating_mul(r as Weight))
+		(130_934_000 as Weight)
+			// Standard Error: 89_000
+			.saturating_add((226_638_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_rent_allowance(r: u32, ) -> Weight {
-		(141_574_000 as Weight)
-			// Standard Error: 86_000
-			.saturating_add((238_102_000 as Weight).saturating_mul(r as Weight))
+		(128_738_000 as Weight)
+			// Standard Error: 77_000
+			.saturating_add((227_062_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_block_number(r: u32, ) -> Weight {
-		(140_240_000 as Weight)
-			// Standard Error: 101_000
-			.saturating_add((236_568_000 as Weight).saturating_mul(r as Weight))
+		(132_375_000 as Weight)
+			// Standard Error: 88_000
+			.saturating_add((226_861_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_now(r: u32, ) -> Weight {
-		(138_265_000 as Weight)
-			// Standard Error: 91_000
-			.saturating_add((237_187_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-	}
-	fn seal_rent_params(r: u32, ) -> Weight {
-		(149_701_000 as Weight)
-			// Standard Error: 297_000
-			.saturating_add((357_149_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-	}
-	fn seal_rent_status(r: u32, ) -> Weight {
-		(146_863_000 as Weight)
-			// Standard Error: 191_000
-			.saturating_add((638_683_000 as Weight).saturating_mul(r as Weight))
+		(127_888_000 as Weight)
+			// Standard Error: 86_000
+			.saturating_add((227_851_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(144_278_000 as Weight)
+		(131_825_000 as Weight)
 			// Standard Error: 149_000
-			.saturating_add((470_264_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((420_149_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_gas(r: u32, ) -> Weight {
-		(111_361_000 as Weight)
-			// Standard Error: 157_000
-			.saturating_add((118_441_000 as Weight).saturating_mul(r as Weight))
+		(113_641_000 as Weight)
+			// Standard Error: 114_000
+			.saturating_add((113_068_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_input(r: u32, ) -> Weight {
-		(129_970_000 as Weight)
-			// Standard Error: 316_000
-			.saturating_add((7_160_000 as Weight).saturating_mul(r as Weight))
+		(122_982_000 as Weight)
+			// Standard Error: 74_000
+			.saturating_add((6_828_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(139_275_000 as Weight)
+		(131_913_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((250_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((275_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_return(r: u32, ) -> Weight {
-		(119_240_000 as Weight)
-			// Standard Error: 57_000
-			.saturating_add((4_347_000 as Weight).saturating_mul(r as Weight))
+		(114_164_000 as Weight)
+			// Standard Error: 72_000
+			.saturating_add((4_318_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(128_896_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((757_000 as Weight).saturating_mul(n as Weight))
+		(123_940_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((664_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_terminate(r: u32, ) -> Weight {
-		(130_119_000 as Weight)
-			// Standard Error: 108_000
-			.saturating_add((95_078_000 as Weight).saturating_mul(r as Weight))
+		(123_340_000 as Weight)
+			// Standard Error: 99_000
+			.saturating_add((89_126_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((4 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_terminate_per_code_kb(c: u32, ) -> Weight {
-		(230_167_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((8_495_000 as Weight).saturating_mul(c as Weight))
+		(217_499_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((5_608_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 	}
 	fn seal_restore_to(r: u32, ) -> Weight {
-		(159_200_000 as Weight)
-			// Standard Error: 261_000
-			.saturating_add((103_048_000 as Weight).saturating_mul(r as Weight))
+		(149_019_000 as Weight)
+			// Standard Error: 903_000
+			.saturating_add((87_433_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((4 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((5 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_restore_to_per_code_kb_delta(c: u32, t: u32, d: u32, ) -> Weight {
-		(58_389_000 as Weight)
-			// Standard Error: 131_000
-			.saturating_add((7_910_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 131_000
-			.saturating_add((4_036_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 1_156_000
-			.saturating_add((3_714_110_000 as Weight).saturating_mul(d as Weight))
+		(18_255_000 as Weight)
+			// Standard Error: 141_000
+			.saturating_add((5_142_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 141_000
+			.saturating_add((2_478_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 1_242_000
+			.saturating_add((2_935_421_000 as Weight).saturating_mul(d as Weight))
 			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(d as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(7 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(d as Weight)))
 	}
 	fn seal_random(r: u32, ) -> Weight {
-		(138_794_000 as Weight)
-			// Standard Error: 216_000
-			.saturating_add((599_742_000 as Weight).saturating_mul(r as Weight))
+		(140_411_000 as Weight)
+			// Standard Error: 146_000
+			.saturating_add((566_687_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(139_890_000 as Weight)
-			// Standard Error: 263_000
-			.saturating_add((885_805_000 as Weight).saturating_mul(r as Weight))
+		(132_048_000 as Weight)
+			// Standard Error: 308_000
+			.saturating_add((818_622_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(1_117_962_000 as Weight)
-			// Standard Error: 4_029_000
-			.saturating_add((566_825_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 794_000
-			.saturating_add((251_096_000 as Weight).saturating_mul(n as Weight))
+		(1_080_578_000 as Weight)
+			// Standard Error: 2_337_000
+			.saturating_add((534_525_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 460_000
+			.saturating_add((167_990_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_set_rent_allowance(r: u32, ) -> Weight {
-		(132_720_000 as Weight)
-			// Standard Error: 87_000
-			.saturating_add((164_134_000 as Weight).saturating_mul(r as Weight))
+		(123_998_000 as Weight)
+			// Standard Error: 53_000
+			.saturating_add((155_113_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_debug_message(r: u32, ) -> Weight {
-		(125_834_000 as Weight)
-			// Standard Error: 142_000
-			.saturating_add((127_200_000 as Weight).saturating_mul(r as Weight))
+		(120_514_000 as Weight)
+			// Standard Error: 93_000
+			.saturating_add((124_243_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(478_734_000 as Weight)
-			// Standard Error: 2_559_000
-			.saturating_add((3_766_445_000 as Weight).saturating_mul(r as Weight))
+		(47_131_000 as Weight)
+			// Standard Error: 931_000
+			.saturating_add((4_033_062_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_set_storage_per_kb(n: u32, ) -> Weight {
-		(600_306_000 as Weight)
-			// Standard Error: 234_000
-			.saturating_add((70_989_000 as Weight).saturating_mul(n as Weight))
+		(549_577_000 as Weight)
+			// Standard Error: 192_000
+			.saturating_add((57_815_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn seal_clear_storage(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_380_000
-			.saturating_add((1_242_131_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 2_635_000
+			.saturating_add((1_214_454_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
@@ -1111,23 +1081,23 @@ impl WeightInfo for () {
 	}
 	fn seal_get_storage(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 1_060_000
-			.saturating_add((910_861_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 1_044_000
+			.saturating_add((883_653_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(605_545_000 as Weight)
-			// Standard Error: 252_000
-			.saturating_add((153_519_000 as Weight).saturating_mul(n as Weight))
+		(568_190_000 as Weight)
+			// Standard Error: 181_000
+			.saturating_add((106_420_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_transfer(r: u32, ) -> Weight {
-		(36_854_000 as Weight)
-			// Standard Error: 2_076_000
-			.saturating_add((5_183_774_000 as Weight).saturating_mul(r as Weight))
+		(0 as Weight)
+			// Standard Error: 1_553_000
+			.saturating_add((4_810_405_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
@@ -1135,358 +1105,358 @@ impl WeightInfo for () {
 	}
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 6_583_000
-			.saturating_add((11_599_057_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 8_671_000
+			.saturating_add((10_965_308_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((200 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((100 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_call_per_code_transfer_input_output_kb(c: u32, t: u32, i: u32, o: u32, ) -> Weight {
-		(10_431_738_000 as Weight)
-			// Standard Error: 301_000
-			.saturating_add((392_174_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 125_400_000
-			.saturating_add((3_698_896_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 39_000
-			.saturating_add((60_692_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 42_000
-			.saturating_add((78_872_000 as Weight).saturating_mul(o as Weight))
+		(10_138_403_000 as Weight)
+			// Standard Error: 162_000
+			.saturating_add((264_871_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 67_846_000
+			.saturating_add((3_793_372_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 21_000
+			.saturating_add((49_168_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 22_000
+			.saturating_add((71_664_000 as Weight).saturating_mul(o as Weight))
 			.saturating_add(RocksDbWeight::get().reads(205 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(101 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((101 as Weight).saturating_mul(t as Weight)))
 	}
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 32_118_000
-			.saturating_add((21_117_947_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 34_546_000
+			.saturating_add((19_938_393_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((300 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((300 as Weight).saturating_mul(r as Weight)))
 	}
 	fn seal_instantiate_per_code_input_output_salt_kb(c: u32, i: u32, o: u32, s: u32, ) -> Weight {
-		(8_542_521_000 as Weight)
-			// Standard Error: 644_000
-			.saturating_add((878_020_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 91_000
-			.saturating_add((63_004_000 as Weight).saturating_mul(i as Weight))
-			// Standard Error: 91_000
-			.saturating_add((83_203_000 as Weight).saturating_mul(o as Weight))
-			// Standard Error: 91_000
-			.saturating_add((240_170_000 as Weight).saturating_mul(s as Weight))
+		(8_861_543_000 as Weight)
+			// Standard Error: 566_000
+			.saturating_add((585_057_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 80_000
+			.saturating_add((52_025_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 80_000
+			.saturating_add((75_956_000 as Weight).saturating_mul(o as Weight))
+			// Standard Error: 80_000
+			.saturating_add((198_033_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(206 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(204 as Weight))
 	}
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(130_991_000 as Weight)
-			// Standard Error: 106_000
-			.saturating_add((230_186_000 as Weight).saturating_mul(r as Weight))
+		(129_022_000 as Weight)
+			// Standard Error: 76_000
+			.saturating_add((216_764_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(508_089_000 as Weight)
-			// Standard Error: 38_000
-			.saturating_add((491_916_000 as Weight).saturating_mul(n as Weight))
+		(414_489_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((481_873_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(135_384_000 as Weight)
-			// Standard Error: 111_000
-			.saturating_add((233_638_000 as Weight).saturating_mul(r as Weight))
+		(127_636_000 as Weight)
+			// Standard Error: 104_000
+			.saturating_add((225_094_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(445_961_000 as Weight)
-			// Standard Error: 29_000
-			.saturating_add((340_992_000 as Weight).saturating_mul(n as Weight))
+		(216_668_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((331_423_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(133_593_000 as Weight)
-			// Standard Error: 112_000
-			.saturating_add((208_000_000 as Weight).saturating_mul(r as Weight))
+		(129_582_000 as Weight)
+			// Standard Error: 97_000
+			.saturating_add((198_429_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(444_562_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((159_521_000 as Weight).saturating_mul(n as Weight))
+		(288_991_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((148_497_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(131_381_000 as Weight)
-			// Standard Error: 82_000
-			.saturating_add((207_479_000 as Weight).saturating_mul(r as Weight))
+		(128_711_000 as Weight)
+			// Standard Error: 94_000
+			.saturating_add((197_050_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(576_129_000 as Weight)
-			// Standard Error: 49_000
-			.saturating_add((156_900_000 as Weight).saturating_mul(n as Weight))
+		(275_444_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((148_469_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(20_276_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((3_355_000 as Weight).saturating_mul(r as Weight))
+		(20_089_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((3_376_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(22_345_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((133_628_000 as Weight).saturating_mul(r as Weight))
+		(22_187_000 as Weight)
+			// Standard Error: 31_000
+			.saturating_add((162_969_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(22_294_000 as Weight)
-			// Standard Error: 95_000
-			.saturating_add((204_007_000 as Weight).saturating_mul(r as Weight))
+		(22_292_000 as Weight)
+			// Standard Error: 39_000
+			.saturating_add((233_277_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(20_266_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((12_605_000 as Weight).saturating_mul(r as Weight))
+		(20_083_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((12_378_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(20_208_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((12_589_000 as Weight).saturating_mul(r as Weight))
+		(20_091_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((12_195_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(20_227_000 as Weight)
+		(20_082_000 as Weight)
 			// Standard Error: 18_000
-			.saturating_add((6_429_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((6_151_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(20_279_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((14_560_000 as Weight).saturating_mul(r as Weight))
+		(20_031_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((13_978_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(20_210_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((15_613_000 as Weight).saturating_mul(r as Weight))
+		(20_063_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((15_524_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(34_276_000 as Weight)
+		(34_332_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((130_000 as Weight).saturating_mul(e as Weight))
+			.saturating_add((117_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(20_426_000 as Weight)
-			// Standard Error: 69_000
-			.saturating_add((91_850_000 as Weight).saturating_mul(r as Weight))
+		(20_446_000 as Weight)
+			// Standard Error: 121_000
+			.saturating_add((90_977_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(27_099_000 as Weight)
-			// Standard Error: 111_000
-			.saturating_add((169_212_000 as Weight).saturating_mul(r as Weight))
+		(28_119_000 as Weight)
+			// Standard Error: 390_000
+			.saturating_add((192_865_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(206_492_000 as Weight)
+		(228_352_000 as Weight)
 			// Standard Error: 4_000
-			.saturating_add((4_685_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((3_891_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(37_892_000 as Weight)
-			// Standard Error: 24_000
-			.saturating_add((3_510_000 as Weight).saturating_mul(r as Weight))
+		(37_745_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((3_135_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(37_773_000 as Weight)
+		(37_639_000 as Weight)
 			// Standard Error: 15_000
-			.saturating_add((3_814_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((3_541_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(37_785_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((4_949_000 as Weight).saturating_mul(r as Weight))
+		(37_639_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((4_813_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(23_467_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((7_493_000 as Weight).saturating_mul(r as Weight))
+		(23_379_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((7_757_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(23_492_000 as Weight)
-			// Standard Error: 28_000
-			.saturating_add((8_499_000 as Weight).saturating_mul(r as Weight))
+		(23_378_000 as Weight)
+			// Standard Error: 68_000
+			.saturating_add((8_437_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(22_347_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((3_565_000 as Weight).saturating_mul(r as Weight))
+		(22_245_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((3_446_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(20_849_000 as Weight)
-			// Standard Error: 2_751_000
-			.saturating_add((2_072_517_000 as Weight).saturating_mul(r as Weight))
+		(20_714_000 as Weight)
+			// Standard Error: 478_000
+			.saturating_add((2_314_540_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(20_216_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((5_067_000 as Weight).saturating_mul(r as Weight))
+		(20_126_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((5_316_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(20_218_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((5_015_000 as Weight).saturating_mul(r as Weight))
+		(20_107_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((5_344_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(20_215_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((5_888_000 as Weight).saturating_mul(r as Weight))
+		(20_135_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((5_909_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(20_232_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((5_366_000 as Weight).saturating_mul(r as Weight))
+		(20_107_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((5_515_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(20_205_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((4_847_000 as Weight).saturating_mul(r as Weight))
+		(20_229_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((5_113_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(20_181_000 as Weight)
-			// Standard Error: 12_000
-			.saturating_add((4_849_000 as Weight).saturating_mul(r as Weight))
+		(20_070_000 as Weight)
+			// Standard Error: 11_000
+			.saturating_add((5_226_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(20_175_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((4_981_000 as Weight).saturating_mul(r as Weight))
+		(20_090_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((5_296_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(20_273_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((7_402_000 as Weight).saturating_mul(r as Weight))
+		(20_095_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((7_323_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(20_260_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((7_392_000 as Weight).saturating_mul(r as Weight))
+		(20_043_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((7_280_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(20_248_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((7_363_000 as Weight).saturating_mul(r as Weight))
+		(20_061_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((7_226_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(20_229_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((7_412_000 as Weight).saturating_mul(r as Weight))
+		(20_072_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((7_315_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(20_232_000 as Weight)
-			// Standard Error: 9_000
-			.saturating_add((7_364_000 as Weight).saturating_mul(r as Weight))
+		(20_054_000 as Weight)
+			// Standard Error: 27_000
+			.saturating_add((7_228_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(20_252_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((7_383_000 as Weight).saturating_mul(r as Weight))
+		(20_169_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_262_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(20_258_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((7_359_000 as Weight).saturating_mul(r as Weight))
+		(20_115_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((7_212_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(20_245_000 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((7_400_000 as Weight).saturating_mul(r as Weight))
+		(20_122_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((7_166_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(20_245_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((7_391_000 as Weight).saturating_mul(r as Weight))
+		(20_140_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((7_242_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(20_230_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((7_439_000 as Weight).saturating_mul(r as Weight))
+		(20_107_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_365_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(20_254_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((7_204_000 as Weight).saturating_mul(r as Weight))
+		(20_179_000 as Weight)
+			// Standard Error: 14_000
+			.saturating_add((7_144_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(20_182_000 as Weight)
-			// Standard Error: 22_000
-			.saturating_add((7_327_000 as Weight).saturating_mul(r as Weight))
+		(20_143_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((7_222_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(20_203_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((7_221_000 as Weight).saturating_mul(r as Weight))
+		(20_129_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((7_247_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(20_187_000 as Weight)
+		(20_107_000 as Weight)
 			// Standard Error: 16_000
-			.saturating_add((13_738_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((12_953_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(20_153_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((12_766_000 as Weight).saturating_mul(r as Weight))
+		(20_093_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((12_040_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(20_219_000 as Weight)
+		(20_102_000 as Weight)
 			// Standard Error: 13_000
-			.saturating_add((13_732_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((12_945_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(20_246_000 as Weight)
+		(20_132_000 as Weight)
 			// Standard Error: 16_000
-			.saturating_add((12_686_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((12_199_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(20_228_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((7_245_000 as Weight).saturating_mul(r as Weight))
+		(20_155_000 as Weight)
+			// Standard Error: 26_000
+			.saturating_add((7_103_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(20_238_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((7_250_000 as Weight).saturating_mul(r as Weight))
+		(20_088_000 as Weight)
+			// Standard Error: 22_000
+			.saturating_add((7_213_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(20_213_000 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((7_292_000 as Weight).saturating_mul(r as Weight))
+		(20_060_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((7_275_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(20_224_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((7_554_000 as Weight).saturating_mul(r as Weight))
+		(20_104_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((7_282_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(20_261_000 as Weight)
+		(20_111_000 as Weight)
 			// Standard Error: 20_000
-			.saturating_add((7_551_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((7_264_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(20_212_000 as Weight)
-			// Standard Error: 15_000
-			.saturating_add((7_616_000 as Weight).saturating_mul(r as Weight))
+		(20_096_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((7_347_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(20_176_000 as Weight)
-			// Standard Error: 9_000
-			.saturating_add((7_877_000 as Weight).saturating_mul(r as Weight))
+		(20_091_000 as Weight)
+			// Standard Error: 16_000
+			.saturating_add((7_370_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(20_230_000 as Weight)
-			// Standard Error: 17_000
-			.saturating_add((7_347_000 as Weight).saturating_mul(r as Weight))
+		(20_102_000 as Weight)
+			// Standard Error: 28_000
+			.saturating_add((7_266_000 as Weight).saturating_mul(r as Weight))
 	}
 }
diff --git a/substrate/frame/democracy/src/weights.rs b/substrate/frame/democracy/src/weights.rs
index e2e1bd0c8be..1462e65c409 100644
--- a/substrate/frame/democracy/src/weights.rs
+++ b/substrate/frame/democracy/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Weights for pallet_democracy
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-28, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! Autogenerated weights for pallet_democracy
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -74,145 +75,163 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn propose() -> Weight {
-		(87_883_000 as Weight)
+		(71_782_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn second(s: u32, ) -> Weight {
-		(52_998_000 as Weight)
-			.saturating_add((251_000 as Weight).saturating_mul(s as Weight))
+		(41_071_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((211_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn vote_new(r: u32, ) -> Weight {
-		(63_300_000 as Weight)
-			.saturating_add((284_000 as Weight).saturating_mul(r as Weight))
+		(46_179_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((283_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn vote_existing(r: u32, ) -> Weight {
-		(63_127_000 as Weight)
-			.saturating_add((289_000 as Weight).saturating_mul(r as Weight))
+		(46_169_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((284_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn emergency_cancel() -> Weight {
-		(38_877_000 as Weight)
+		(28_615_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn blacklist(p: u32, ) -> Weight {
-		(108_060_000 as Weight)
-			.saturating_add((795_000 as Weight).saturating_mul(p as Weight))
+		(80_711_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((590_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(6 as Weight))
 	}
 	fn external_propose(v: u32, ) -> Weight {
-		(19_052_000 as Weight)
-			.saturating_add((111_000 as Weight).saturating_mul(v as Weight))
+		(13_197_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((90_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn external_propose_majority() -> Weight {
-		(4_544_000 as Weight)
+		(2_712_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn external_propose_default() -> Weight {
-		(4_608_000 as Weight)
+		(2_680_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn fast_track() -> Weight {
-		(38_876_000 as Weight)
+		(28_340_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn veto_external(v: u32, ) -> Weight {
-		(40_283_000 as Weight)
-			.saturating_add((187_000 as Weight).saturating_mul(v as Weight))
+		(28_894_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((133_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn cancel_proposal(p: u32, ) -> Weight {
-		(68_449_000 as Weight)
-			.saturating_add((876_000 as Weight).saturating_mul(p as Weight))
+		(54_339_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((561_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn cancel_referendum() -> Weight {
-		(23_670_000 as Weight)
+		(17_183_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn cancel_queued(r: u32, ) -> Weight {
-		(43_247_000 as Weight)
-			.saturating_add((4_578_000 as Weight).saturating_mul(r as Weight))
+		(30_500_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_730_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn on_initialize_base(r: u32, ) -> Weight {
-		(15_278_000 as Weight)
-			.saturating_add((6_696_000 as Weight).saturating_mul(r as Weight))
+		(7_788_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((5_422_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
 	}
 	fn delegate(r: u32, ) -> Weight {
-		(83_002_000 as Weight)
-			.saturating_add((9_889_000 as Weight).saturating_mul(r as Weight))
+		(55_676_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((7_553_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight)))
 	}
 	fn undelegate(r: u32, ) -> Weight {
-		(43_552_000 as Weight)
-			.saturating_add((9_887_000 as Weight).saturating_mul(r as Weight))
+		(23_908_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((7_551_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight)))
 	}
 	fn clear_public_proposals() -> Weight {
-		(4_404_000 as Weight)
+		(3_023_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn note_preimage(b: u32, ) -> Weight {
-		(60_073_000 as Weight)
-			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
+		(44_069_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))
 	}
 	fn note_imminent_preimage(b: u32, ) -> Weight {
-		(38_896_000 as Weight)
-			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
+		(28_457_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))
 	}
 	fn reap_preimage(b: u32, ) -> Weight {
-		(54_861_000 as Weight)
-			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
+		(39_646_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn unlock_remove(r: u32, ) -> Weight {
-		(52_956_000 as Weight)
-			.saturating_add((126_000 as Weight).saturating_mul(r as Weight))
+		(39_499_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((148_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn unlock_set(r: u32, ) -> Weight {
-		(49_789_000 as Weight)
-			.saturating_add((274_000 as Weight).saturating_mul(r as Weight))
+		(37_340_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((266_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn remove_vote(r: u32, ) -> Weight {
-		(29_790_000 as Weight)
-			.saturating_add((283_000 as Weight).saturating_mul(r as Weight))
+		(20_397_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((259_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn remove_other_vote(r: u32, ) -> Weight {
-		(28_497_000 as Weight)
-			.saturating_add((217_000 as Weight).saturating_mul(r as Weight))
+		(20_425_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((156_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
@@ -221,145 +240,163 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn propose() -> Weight {
-		(87_883_000 as Weight)
+		(71_782_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn second(s: u32, ) -> Weight {
-		(52_998_000 as Weight)
-			.saturating_add((251_000 as Weight).saturating_mul(s as Weight))
+		(41_071_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((211_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn vote_new(r: u32, ) -> Weight {
-		(63_300_000 as Weight)
-			.saturating_add((284_000 as Weight).saturating_mul(r as Weight))
+		(46_179_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((283_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn vote_existing(r: u32, ) -> Weight {
-		(63_127_000 as Weight)
-			.saturating_add((289_000 as Weight).saturating_mul(r as Weight))
+		(46_169_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((284_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn emergency_cancel() -> Weight {
-		(38_877_000 as Weight)
+		(28_615_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn blacklist(p: u32, ) -> Weight {
-		(108_060_000 as Weight)
-			.saturating_add((795_000 as Weight).saturating_mul(p as Weight))
+		(80_711_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((590_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(6 as Weight))
 	}
 	fn external_propose(v: u32, ) -> Weight {
-		(19_052_000 as Weight)
-			.saturating_add((111_000 as Weight).saturating_mul(v as Weight))
+		(13_197_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((90_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn external_propose_majority() -> Weight {
-		(4_544_000 as Weight)
+		(2_712_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn external_propose_default() -> Weight {
-		(4_608_000 as Weight)
+		(2_680_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn fast_track() -> Weight {
-		(38_876_000 as Weight)
+		(28_340_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn veto_external(v: u32, ) -> Weight {
-		(40_283_000 as Weight)
-			.saturating_add((187_000 as Weight).saturating_mul(v as Weight))
+		(28_894_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((133_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn cancel_proposal(p: u32, ) -> Weight {
-		(68_449_000 as Weight)
-			.saturating_add((876_000 as Weight).saturating_mul(p as Weight))
+		(54_339_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((561_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn cancel_referendum() -> Weight {
-		(23_670_000 as Weight)
+		(17_183_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn cancel_queued(r: u32, ) -> Weight {
-		(43_247_000 as Weight)
-			.saturating_add((4_578_000 as Weight).saturating_mul(r as Weight))
+		(30_500_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_730_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn on_initialize_base(r: u32, ) -> Weight {
-		(15_278_000 as Weight)
-			.saturating_add((6_696_000 as Weight).saturating_mul(r as Weight))
+		(7_788_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((5_422_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
 	}
 	fn delegate(r: u32, ) -> Weight {
-		(83_002_000 as Weight)
-			.saturating_add((9_889_000 as Weight).saturating_mul(r as Weight))
+		(55_676_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((7_553_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(r as Weight)))
 	}
 	fn undelegate(r: u32, ) -> Weight {
-		(43_552_000 as Weight)
-			.saturating_add((9_887_000 as Weight).saturating_mul(r as Weight))
+		(23_908_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((7_551_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(r as Weight)))
 	}
 	fn clear_public_proposals() -> Weight {
-		(4_404_000 as Weight)
+		(3_023_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn note_preimage(b: u32, ) -> Weight {
-		(60_073_000 as Weight)
-			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
+		(44_069_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn note_imminent_preimage(b: u32, ) -> Weight {
-		(38_896_000 as Weight)
-			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
+		(28_457_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn reap_preimage(b: u32, ) -> Weight {
-		(54_861_000 as Weight)
-			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
+		(39_646_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn unlock_remove(r: u32, ) -> Weight {
-		(52_956_000 as Weight)
-			.saturating_add((126_000 as Weight).saturating_mul(r as Weight))
+		(39_499_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((148_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn unlock_set(r: u32, ) -> Weight {
-		(49_789_000 as Weight)
-			.saturating_add((274_000 as Weight).saturating_mul(r as Weight))
+		(37_340_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((266_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn remove_vote(r: u32, ) -> Weight {
-		(29_790_000 as Weight)
-			.saturating_add((283_000 as Weight).saturating_mul(r as Weight))
+		(20_397_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((259_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn remove_other_vote(r: u32, ) -> Weight {
-		(28_497_000 as Weight)
-			.saturating_add((217_000 as Weight).saturating_mul(r as Weight))
+		(20_425_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((156_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
diff --git a/substrate/frame/election-provider-multi-phase/src/weights.rs b/substrate/frame/election-provider-multi-phase/src/weights.rs
index 3d3a5cede32..51b99bc962d 100644
--- a/substrate/frame/election-provider-multi-phase/src/weights.rs
+++ b/substrate/frame/election-provider-multi-phase/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_election_provider_multi_phase
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-03-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -57,101 +57,105 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn on_initialize_nothing() -> Weight {
-		(22_730_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(7 as Weight))
+		(24_579_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(8 as Weight))
 	}
 	fn on_initialize_open_signed() -> Weight {
-		(112_051_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(8 as Weight))
+		(87_463_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(10 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn on_initialize_open_unsigned_with_snapshot() -> Weight {
-		(112_165_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(8 as Weight))
+		(87_381_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(10 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn on_initialize_open_unsigned_without_snapshot() -> Weight {
-		(21_039_000 as Weight)
+		(18_489_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn elect_queued() -> Weight {
-		(7_362_949_000 as Weight)
+		(6_038_989_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(6 as Weight))
 	}
-	fn submit_unsigned(v: u32, _t: u32, a: u32, d: u32, ) -> Weight {
+	fn submit_unsigned(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((3_933_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 21_000
-			.saturating_add((13_520_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 107_000
-			.saturating_add((2_880_000 as Weight).saturating_mul(d as Weight))
-			.saturating_add(T::DbWeight::get().reads(6 as Weight))
+			// Standard Error: 12_000
+			.saturating_add((3_480_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 42_000
+			.saturating_add((194_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 12_000
+			.saturating_add((10_498_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 63_000
+			.saturating_add((3_074_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn feasibility_check(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((4_069_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 7_000
+			.saturating_add((3_481_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 24_000
+			.saturating_add((385_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 7_000
+			.saturating_add((8_538_000 as Weight).saturating_mul(a as Weight))
 			// Standard Error: 36_000
-			.saturating_add((503_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 10_000
-			.saturating_add((10_000_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 54_000
-			.saturating_add((3_734_000 as Weight).saturating_mul(d as Weight))
-			.saturating_add(T::DbWeight::get().reads(3 as Weight))
+			.saturating_add((3_322_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn on_initialize_nothing() -> Weight {
-		(22_730_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
+		(24_579_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(8 as Weight))
 	}
 	fn on_initialize_open_signed() -> Weight {
-		(112_051_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(8 as Weight))
+		(87_463_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(10 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn on_initialize_open_unsigned_with_snapshot() -> Weight {
-		(112_165_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(8 as Weight))
+		(87_381_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(10 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn on_initialize_open_unsigned_without_snapshot() -> Weight {
-		(21_039_000 as Weight)
+		(18_489_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn elect_queued() -> Weight {
-		(7_362_949_000 as Weight)
+		(6_038_989_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(6 as Weight))
 	}
-	fn submit_unsigned(v: u32, _t: u32, a: u32, d: u32, ) -> Weight {
+	fn submit_unsigned(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 21_000
-			.saturating_add((3_933_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 21_000
-			.saturating_add((13_520_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 107_000
-			.saturating_add((2_880_000 as Weight).saturating_mul(d as Weight))
-			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
+			// Standard Error: 12_000
+			.saturating_add((3_480_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 42_000
+			.saturating_add((194_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 12_000
+			.saturating_add((10_498_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 63_000
+			.saturating_add((3_074_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn feasibility_check(v: u32, t: u32, a: u32, d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 10_000
-			.saturating_add((4_069_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 7_000
+			.saturating_add((3_481_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 24_000
+			.saturating_add((385_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 7_000
+			.saturating_add((8_538_000 as Weight).saturating_mul(a as Weight))
 			// Standard Error: 36_000
-			.saturating_add((503_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 10_000
-			.saturating_add((10_000_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 54_000
-			.saturating_add((3_734_000 as Weight).saturating_mul(d as Weight))
-			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
+			.saturating_add((3_322_000 as Weight).saturating_mul(d as Weight))
+			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 	}
 }
diff --git a/substrate/frame/elections-phragmen/src/weights.rs b/substrate/frame/elections-phragmen/src/weights.rs
index c3d9365c885..12a3a433401 100644
--- a/substrate/frame/elections-phragmen/src/weights.rs
+++ b/substrate/frame/elections-phragmen/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_elections_phragmen
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.1
-//! DATE: 2021-01-20, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -62,82 +62,80 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn vote_equal(v: u32, ) -> Weight {
-		(45_157_000 as Weight)
-			// Standard Error: 6_000
-			.saturating_add((399_000 as Weight).saturating_mul(v as Weight))
+		(43_911_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((324_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn vote_more(v: u32, ) -> Weight {
-		(69_738_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((450_000 as Weight).saturating_mul(v as Weight))
+		(68_236_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((359_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn vote_less(v: u32, ) -> Weight {
-		(73_955_000 as Weight)
-			// Standard Error: 38_000
-			.saturating_add((227_000 as Weight).saturating_mul(v as Weight))
+		(68_162_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((350_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn remove_voter() -> Weight {
-		(68_398_000 as Weight)
+		(63_005_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn submit_candidacy(c: u32, ) -> Weight {
-		(59_291_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((412_000 as Weight).saturating_mul(c as Weight))
+		(58_498_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((305_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn renounce_candidacy_candidate(c: u32, ) -> Weight {
-		(55_026_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((207_000 as Weight).saturating_mul(c as Weight))
+		(52_062_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((173_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn renounce_candidacy_members() -> Weight {
-		(77_840_000 as Weight)
+		(73_234_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn renounce_candidacy_runners_up() -> Weight {
-		(54_559_000 as Weight)
+		(51_689_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn remove_member_with_replacement() -> Weight {
-		(84_311_000 as Weight)
+		(79_906_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
 	fn remove_member_wrong_refund() -> Weight {
-		(7_677_000 as Weight)
+		(6_877_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 	}
-	fn clean_defunct_voters(v: u32, d: u32, ) -> Weight {
+	fn clean_defunct_voters(v: u32, _d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 55_000
-			.saturating_add((114_815_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 53_000
-			.saturating_add((49_000 as Weight).saturating_mul(d as Weight))
+			// Standard Error: 39_000
+			.saturating_add((112_381_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(v as Weight)))
 	}
 	fn election_phragmen(c: u32, v: u32, e: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 1_940_000
-			.saturating_add((43_557_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 807_000
-			.saturating_add((65_849_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 55_000
-			.saturating_add((4_206_000 as Weight).saturating_mul(e as Weight))
+			// Standard Error: 1_789_000
+			.saturating_add((42_600_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 744_000
+			.saturating_add((60_743_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 50_000
+			.saturating_add((3_837_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(c as Weight)))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(c as Weight)))
@@ -147,82 +145,80 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn vote_equal(v: u32, ) -> Weight {
-		(45_157_000 as Weight)
-			// Standard Error: 6_000
-			.saturating_add((399_000 as Weight).saturating_mul(v as Weight))
+		(43_911_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((324_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn vote_more(v: u32, ) -> Weight {
-		(69_738_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((450_000 as Weight).saturating_mul(v as Weight))
+		(68_236_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((359_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn vote_less(v: u32, ) -> Weight {
-		(73_955_000 as Weight)
-			// Standard Error: 38_000
-			.saturating_add((227_000 as Weight).saturating_mul(v as Weight))
+		(68_162_000 as Weight)
+			// Standard Error: 9_000
+			.saturating_add((350_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn remove_voter() -> Weight {
-		(68_398_000 as Weight)
+		(63_005_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn submit_candidacy(c: u32, ) -> Weight {
-		(59_291_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((412_000 as Weight).saturating_mul(c as Weight))
+		(58_498_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((305_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn renounce_candidacy_candidate(c: u32, ) -> Weight {
-		(55_026_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((207_000 as Weight).saturating_mul(c as Weight))
+		(52_062_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((173_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn renounce_candidacy_members() -> Weight {
-		(77_840_000 as Weight)
+		(73_234_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn renounce_candidacy_runners_up() -> Weight {
-		(54_559_000 as Weight)
+		(51_689_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn remove_member_with_replacement() -> Weight {
-		(84_311_000 as Weight)
+		(79_906_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 	}
 	fn remove_member_wrong_refund() -> Weight {
-		(7_677_000 as Weight)
+		(6_877_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 	}
-	fn clean_defunct_voters(v: u32, d: u32, ) -> Weight {
+	fn clean_defunct_voters(v: u32, _d: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 55_000
-			.saturating_add((114_815_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 53_000
-			.saturating_add((49_000 as Weight).saturating_mul(d as Weight))
+			// Standard Error: 39_000
+			.saturating_add((112_381_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(v as Weight)))
 	}
 	fn election_phragmen(c: u32, v: u32, e: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 1_940_000
-			.saturating_add((43_557_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 807_000
-			.saturating_add((65_849_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 55_000
-			.saturating_add((4_206_000 as Weight).saturating_mul(e as Weight))
+			// Standard Error: 1_789_000
+			.saturating_add((42_600_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 744_000
+			.saturating_add((60_743_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 50_000
+			.saturating_add((3_837_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(c as Weight)))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(c as Weight)))
diff --git a/substrate/frame/gilt/src/weights.rs b/substrate/frame/gilt/src/weights.rs
index 1e0e5fa9b4d..c9e16c04187 100644
--- a/substrate/frame/gilt/src/weights.rs
+++ b/substrate/frame/gilt/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_gilt
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-02-23, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -58,50 +58,50 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn place_bid(l: u32, ) -> Weight {
-		(79_274_000 as Weight)
+		(60_401_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((289_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add((146_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn place_bid_max() -> Weight {
-		(297_825_000 as Weight)
+		(178_653_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn retract_bid(l: u32, ) -> Weight {
-		(79_731_000 as Weight)
+		(61_026_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((231_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add((119_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn set_target() -> Weight {
-		(6_113_000 as Weight)
+		(5_756_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn thaw() -> Weight {
-		(74_792_000 as Weight)
+		(72_668_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn pursue_target_noop() -> Weight {
-		(3_468_000 as Weight)
+		(3_449_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 	}
 	fn pursue_target_per_item(b: u32, ) -> Weight {
-		(65_792_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((11_402_000 as Weight).saturating_mul(b as Weight))
+		(58_182_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((10_005_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(b as Weight)))
 	}
 	fn pursue_target_per_queue(q: u32, ) -> Weight {
-		(32_391_000 as Weight)
+		(21_740_000 as Weight)
 			// Standard Error: 7_000
-			.saturating_add((18_500_000 as Weight).saturating_mul(q as Weight))
+			.saturating_add((16_849_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(q as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
@@ -112,50 +112,50 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn place_bid(l: u32, ) -> Weight {
-		(79_274_000 as Weight)
+		(60_401_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((289_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add((146_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn place_bid_max() -> Weight {
-		(297_825_000 as Weight)
+		(178_653_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn retract_bid(l: u32, ) -> Weight {
-		(79_731_000 as Weight)
+		(61_026_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((231_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add((119_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn set_target() -> Weight {
-		(6_113_000 as Weight)
+		(5_756_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn thaw() -> Weight {
-		(74_792_000 as Weight)
+		(72_668_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn pursue_target_noop() -> Weight {
-		(3_468_000 as Weight)
+		(3_449_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 	}
 	fn pursue_target_per_item(b: u32, ) -> Weight {
-		(65_792_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((11_402_000 as Weight).saturating_mul(b as Weight))
+		(58_182_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((10_005_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(b as Weight)))
 	}
 	fn pursue_target_per_queue(q: u32, ) -> Weight {
-		(32_391_000 as Weight)
+		(21_740_000 as Weight)
 			// Standard Error: 7_000
-			.saturating_add((18_500_000 as Weight).saturating_mul(q as Weight))
+			.saturating_add((16_849_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(q as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
diff --git a/substrate/frame/identity/src/weights.rs b/substrate/frame/identity/src/weights.rs
index 1635a8d7054..f283b2869bd 100644
--- a/substrate/frame/identity/src/weights.rs
+++ b/substrate/frame/identity/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Weights for pallet_identity
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! Autogenerated weights for pallet_identity
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -43,270 +44,295 @@ use sp_std::marker::PhantomData;
 
 /// Weight functions needed for pallet_identity.
 pub trait WeightInfo {
-	fn add_registrar(_r: u32, ) -> Weight;
-	fn set_identity(_r: u32, _x: u32, ) -> Weight;
-	fn set_subs_new(_s: u32, ) -> Weight;
-	fn set_subs_old(_p: u32, ) -> Weight;
-	fn clear_identity(_r: u32, _s: u32, _x: u32, ) -> Weight;
-	fn request_judgement(_r: u32, _x: u32, ) -> Weight;
-	fn cancel_request(_r: u32, _x: u32, ) -> Weight;
-	fn set_fee(_r: u32, ) -> Weight;
-	fn set_account_id(_r: u32, ) -> Weight;
-	fn set_fields(_r: u32, ) -> Weight;
-	fn provide_judgement(_r: u32, _x: u32, ) -> Weight;
-	fn kill_identity(_r: u32, _s: u32, _x: u32, ) -> Weight;
-	fn add_sub(_s: u32, ) -> Weight;
-	fn rename_sub(_s: u32, ) -> Weight;
-	fn remove_sub(_s: u32, ) -> Weight;
-	fn quit_sub(_s: u32, ) -> Weight;
-	
+	fn add_registrar(r: u32, ) -> Weight;
+	fn set_identity(r: u32, x: u32, ) -> Weight;
+	fn set_subs_new(s: u32, ) -> Weight;
+	fn set_subs_old(p: u32, ) -> Weight;
+	fn clear_identity(r: u32, s: u32, x: u32, ) -> Weight;
+	fn request_judgement(r: u32, x: u32, ) -> Weight;
+	fn cancel_request(r: u32, x: u32, ) -> Weight;
+	fn set_fee(r: u32, ) -> Weight;
+	fn set_account_id(r: u32, ) -> Weight;
+	fn set_fields(r: u32, ) -> Weight;
+	fn provide_judgement(r: u32, x: u32, ) -> Weight;
+	fn kill_identity(r: u32, s: u32, x: u32, ) -> Weight;
+	fn add_sub(s: u32, ) -> Weight;
+	fn rename_sub(s: u32, ) -> Weight;
+	fn remove_sub(s: u32, ) -> Weight;
+	fn quit_sub(s: u32, ) -> Weight;
 }
 
 /// Weights for pallet_identity using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn add_registrar(r: u32, ) -> Weight {
-		(28_965_000 as Weight)
-			.saturating_add((421_000 as Weight).saturating_mul(r as Weight))
+		(21_825_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((288_000 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))
-			
 	}
 	fn set_identity(r: u32, x: u32, ) -> Weight {
-		(71_923_000 as Weight)
-			.saturating_add((529_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((1_763_000 as Weight).saturating_mul(x as Weight))
+		(53_354_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((274_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 2_000
+			.saturating_add((939_000 as Weight).saturating_mul(x as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn set_subs_new(s: u32, ) -> Weight {
-		(55_550_000 as Weight)
-			.saturating_add((9_760_000 as Weight).saturating_mul(s as Weight))
+		(42_017_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((6_457_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(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn set_subs_old(p: u32, ) -> Weight {
-		(51_789_000 as Weight)
-			.saturating_add((3_484_000 as Weight).saturating_mul(p as Weight))
+		(41_605_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_157_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
 	}
 	fn clear_identity(r: u32, s: u32, x: u32, ) -> Weight {
-		(65_458_000 as Weight)
-			.saturating_add((230_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((3_437_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add((1_023_000 as Weight).saturating_mul(x as Weight))
+		(51_811_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((202_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 0
+			.saturating_add((2_157_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 0
+			.saturating_add((618_000 as Weight).saturating_mul(x as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 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)))
 	}
 	fn request_judgement(r: u32, x: u32, ) -> Weight {
-		(75_299_000 as Weight)
-			.saturating_add((493_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((2_014_000 as Weight).saturating_mul(x as Weight))
+		(54_657_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((381_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 0
+			.saturating_add((1_153_000 as Weight).saturating_mul(x as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn cancel_request(r: u32, x: u32, ) -> Weight {
-		(67_492_000 as Weight)
-			.saturating_add((225_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((2_003_000 as Weight).saturating_mul(x as Weight))
+		(50_895_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((267_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 0
+			.saturating_add((1_141_000 as Weight).saturating_mul(x as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn set_fee(r: u32, ) -> Weight {
-		(11_375_000 as Weight)
-			.saturating_add((382_000 as Weight).saturating_mul(r as Weight))
+		(8_036_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((281_000 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))
-			
 	}
 	fn set_account_id(r: u32, ) -> Weight {
-		(12_898_000 as Weight)
-			.saturating_add((384_000 as Weight).saturating_mul(r as Weight))
+		(9_001_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((288_000 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))
-			
 	}
 	fn set_fields(r: u32, ) -> Weight {
-		(11_419_000 as Weight)
-			.saturating_add((381_000 as Weight).saturating_mul(r as Weight))
+		(8_039_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((286_000 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))
-			
 	}
 	fn provide_judgement(r: u32, x: u32, ) -> Weight {
-		(51_115_000 as Weight)
-			.saturating_add((427_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((2_001_000 as Weight).saturating_mul(x as Weight))
+		(35_746_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((346_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 0
+			.saturating_add((1_164_000 as Weight).saturating_mul(x as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
-	fn kill_identity(_r: u32, s: u32, _x: u32, ) -> Weight {
-		(90_911_000 as Weight)
-			.saturating_add((3_450_000 as Weight).saturating_mul(s as Weight))
+	fn kill_identity(r: u32, s: u32, x: u32, ) -> Weight {
+		(65_304_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((149_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 0
+			.saturating_add((2_118_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 0
+			.saturating_add((6_000 as Weight).saturating_mul(x as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn add_sub(s: u32, ) -> Weight {
-		(76_957_000 as Weight)
-			.saturating_add((261_000 as Weight).saturating_mul(s as Weight))
+		(55_491_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((220_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
 	fn rename_sub(s: u32, ) -> Weight {
-		(26_219_000 as Weight)
+		(17_564_000 as Weight)
+			// Standard Error: 0
 			.saturating_add((84_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn remove_sub(s: u32, ) -> Weight {
-		(73_130_000 as Weight)
-			.saturating_add((239_000 as Weight).saturating_mul(s as Weight))
+		(56_535_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((209_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
 	fn quit_sub(s: u32, ) -> Weight {
-		(48_088_000 as Weight)
-			.saturating_add((237_000 as Weight).saturating_mul(s as Weight))
+		(35_369_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((200_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))
-			
 	}
-	
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn add_registrar(r: u32, ) -> Weight {
-		(28_965_000 as Weight)
-			.saturating_add((421_000 as Weight).saturating_mul(r as Weight))
+		(21_825_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((288_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn set_identity(r: u32, x: u32, ) -> Weight {
-		(71_923_000 as Weight)
-			.saturating_add((529_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((1_763_000 as Weight).saturating_mul(x as Weight))
+		(53_354_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((274_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 2_000
+			.saturating_add((939_000 as Weight).saturating_mul(x as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn set_subs_new(s: u32, ) -> Weight {
-		(55_550_000 as Weight)
-			.saturating_add((9_760_000 as Weight).saturating_mul(s as Weight))
+		(42_017_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((6_457_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(s as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn set_subs_old(p: u32, ) -> Weight {
-		(51_789_000 as Weight)
-			.saturating_add((3_484_000 as Weight).saturating_mul(p as Weight))
+		(41_605_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_157_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
 	}
 	fn clear_identity(r: u32, s: u32, x: u32, ) -> Weight {
-		(65_458_000 as Weight)
-			.saturating_add((230_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((3_437_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add((1_023_000 as Weight).saturating_mul(x as Weight))
+		(51_811_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((202_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 0
+			.saturating_add((2_157_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 0
+			.saturating_add((618_000 as Weight).saturating_mul(x as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn request_judgement(r: u32, x: u32, ) -> Weight {
-		(75_299_000 as Weight)
-			.saturating_add((493_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((2_014_000 as Weight).saturating_mul(x as Weight))
+		(54_657_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((381_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 0
+			.saturating_add((1_153_000 as Weight).saturating_mul(x as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn cancel_request(r: u32, x: u32, ) -> Weight {
-		(67_492_000 as Weight)
-			.saturating_add((225_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((2_003_000 as Weight).saturating_mul(x as Weight))
+		(50_895_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((267_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 0
+			.saturating_add((1_141_000 as Weight).saturating_mul(x as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn set_fee(r: u32, ) -> Weight {
-		(11_375_000 as Weight)
-			.saturating_add((382_000 as Weight).saturating_mul(r as Weight))
+		(8_036_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((281_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn set_account_id(r: u32, ) -> Weight {
-		(12_898_000 as Weight)
-			.saturating_add((384_000 as Weight).saturating_mul(r as Weight))
+		(9_001_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((288_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn set_fields(r: u32, ) -> Weight {
-		(11_419_000 as Weight)
-			.saturating_add((381_000 as Weight).saturating_mul(r as Weight))
+		(8_039_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((286_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn provide_judgement(r: u32, x: u32, ) -> Weight {
-		(51_115_000 as Weight)
-			.saturating_add((427_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add((2_001_000 as Weight).saturating_mul(x as Weight))
+		(35_746_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((346_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 0
+			.saturating_add((1_164_000 as Weight).saturating_mul(x as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
-	fn kill_identity(_r: u32, s: u32, _x: u32, ) -> Weight {
-		(90_911_000 as Weight)
-			.saturating_add((3_450_000 as Weight).saturating_mul(s as Weight))
+	fn kill_identity(r: u32, s: u32, x: u32, ) -> Weight {
+		(65_304_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((149_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 0
+			.saturating_add((2_118_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 0
+			.saturating_add((6_000 as Weight).saturating_mul(x as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn add_sub(s: u32, ) -> Weight {
-		(76_957_000 as Weight)
-			.saturating_add((261_000 as Weight).saturating_mul(s as Weight))
+		(55_491_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((220_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
 	fn rename_sub(s: u32, ) -> Weight {
-		(26_219_000 as Weight)
+		(17_564_000 as Weight)
+			// Standard Error: 0
 			.saturating_add((84_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn remove_sub(s: u32, ) -> Weight {
-		(73_130_000 as Weight)
-			.saturating_add((239_000 as Weight).saturating_mul(s as Weight))
+		(56_535_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((209_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
 	fn quit_sub(s: u32, ) -> Weight {
-		(48_088_000 as Weight)
-			.saturating_add((237_000 as Weight).saturating_mul(s as Weight))
+		(35_369_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((200_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
-	
 }
diff --git a/substrate/frame/im-online/src/weights.rs b/substrate/frame/im-online/src/weights.rs
index 83ec294e8ed..6a1f575b856 100644
--- a/substrate/frame/im-online/src/weights.rs
+++ b/substrate/frame/im-online/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Weights for pallet_im_online
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! Autogenerated weights for pallet_im_online
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -50,9 +51,11 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn validate_unsigned_and_then_heartbeat(k: u32, e: u32, ) -> Weight {
-		(114_379_000 as Weight)
-			.saturating_add((219_000 as Weight).saturating_mul(k as Weight))
-			.saturating_add((481_000 as Weight).saturating_mul(e as Weight))
+		(97_166_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((153_000 as Weight).saturating_mul(k as Weight))
+			// Standard Error: 1_000
+			.saturating_add((328_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -61,9 +64,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn validate_unsigned_and_then_heartbeat(k: u32, e: u32, ) -> Weight {
-		(114_379_000 as Weight)
-			.saturating_add((219_000 as Weight).saturating_mul(k as Weight))
-			.saturating_add((481_000 as Weight).saturating_mul(e as Weight))
+		(97_166_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((153_000 as Weight).saturating_mul(k as Weight))
+			// Standard Error: 1_000
+			.saturating_add((328_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
diff --git a/substrate/frame/indices/src/weights.rs b/substrate/frame/indices/src/weights.rs
index e303b943b7e..559392d3d2b 100644
--- a/substrate/frame/indices/src/weights.rs
+++ b/substrate/frame/indices/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Weights for pallet_indices
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! Autogenerated weights for pallet_indices
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -48,76 +49,63 @@ pub trait WeightInfo {
 	fn free() -> Weight;
 	fn force_transfer() -> Weight;
 	fn freeze() -> Weight;
-	
 }
 
 /// Weights for pallet_indices using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn claim() -> Weight {
-		(53_799_000 as Weight)
+		(40_622_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn transfer() -> Weight {
-		(60_294_000 as Weight)
+		(49_166_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
 	fn free() -> Weight {
-		(48_625_000 as Weight)
+		(40_802_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn force_transfer() -> Weight {
-		(49_762_000 as Weight)
+		(41_423_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
 	fn freeze() -> Weight {
-		(44_869_000 as Weight)
+		(38_476_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
-	
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn claim() -> Weight {
-		(53_799_000 as Weight)
+		(40_622_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn transfer() -> Weight {
-		(60_294_000 as Weight)
+		(49_166_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
 	fn free() -> Weight {
-		(48_625_000 as Weight)
+		(40_802_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn force_transfer() -> Weight {
-		(49_762_000 as Weight)
+		(41_423_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
 	fn freeze() -> Weight {
-		(44_869_000 as Weight)
+		(38_476_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
-	
 }
diff --git a/substrate/frame/lottery/src/weights.rs b/substrate/frame/lottery/src/weights.rs
index 464bb94bbbb..a73d0b667e3 100644
--- a/substrate/frame/lottery/src/weights.rs
+++ b/substrate/frame/lottery/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_lottery
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2021-01-05, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -56,33 +56,33 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn buy_ticket() -> Weight {
-		(97_799_000 as Weight)
+		(71_604_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn set_calls(n: u32, ) -> Weight {
-		(20_932_000 as Weight)
-			// Standard Error: 9_000
-			.saturating_add((513_000 as Weight).saturating_mul(n as Weight))
+		(15_015_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((301_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn start_lottery() -> Weight {
-		(77_600_000 as Weight)
+		(58_855_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn stop_repeat() -> Weight {
-		(10_707_000 as Weight)
+		(7_524_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn on_initialize_end() -> Weight {
-		(162_126_000 as Weight)
+		(114_766_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn on_initialize_repeat() -> Weight {
-		(169_310_000 as Weight)
+		(119_402_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
@@ -91,33 +91,33 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn buy_ticket() -> Weight {
-		(97_799_000 as Weight)
+		(71_604_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn set_calls(n: u32, ) -> Weight {
-		(20_932_000 as Weight)
-			// Standard Error: 9_000
-			.saturating_add((513_000 as Weight).saturating_mul(n as Weight))
+		(15_015_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((301_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn start_lottery() -> Weight {
-		(77_600_000 as Weight)
+		(58_855_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn stop_repeat() -> Weight {
-		(10_707_000 as Weight)
+		(7_524_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn on_initialize_end() -> Weight {
-		(162_126_000 as Weight)
+		(114_766_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn on_initialize_repeat() -> Weight {
-		(169_310_000 as Weight)
+		(119_402_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 	}
diff --git a/substrate/frame/membership/src/weights.rs b/substrate/frame/membership/src/weights.rs
index fbdb44caec8..8e2d8bb2661 100644
--- a/substrate/frame/membership/src/weights.rs
+++ b/substrate/frame/membership/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_membership
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-04-17, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -57,49 +57,49 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn add_member(m: u32, ) -> Weight {
-		(25_448_000 as Weight)
+		(24_309_000 as Weight)
 			// Standard Error: 3_000
-			.saturating_add((257_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((147_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn remove_member(m: u32, ) -> Weight {
-		(31_317_000 as Weight)
+		(29_722_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((215_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((119_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn swap_member(m: u32, ) -> Weight {
-		(31_208_000 as Weight)
+		(30_239_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((229_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((132_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn reset_member(m: u32, ) -> Weight {
-		(31_673_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((455_000 as Weight).saturating_mul(m as Weight))
+		(31_302_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((289_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn change_key(m: u32, ) -> Weight {
-		(33_499_000 as Weight)
+		(31_967_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((226_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((130_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn set_prime(m: u32, ) -> Weight {
-		(8_865_000 as Weight)
+		(8_083_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((124_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((91_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn clear_prime(m: u32, ) -> Weight {
-		(3_397_000 as Weight)
+		(3_360_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((1_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
@@ -109,49 +109,49 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn add_member(m: u32, ) -> Weight {
-		(25_448_000 as Weight)
+		(24_309_000 as Weight)
 			// Standard Error: 3_000
-			.saturating_add((257_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((147_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn remove_member(m: u32, ) -> Weight {
-		(31_317_000 as Weight)
+		(29_722_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((215_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((119_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn swap_member(m: u32, ) -> Weight {
-		(31_208_000 as Weight)
+		(30_239_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((229_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((132_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn reset_member(m: u32, ) -> Weight {
-		(31_673_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((455_000 as Weight).saturating_mul(m as Weight))
+		(31_302_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((289_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn change_key(m: u32, ) -> Weight {
-		(33_499_000 as Weight)
+		(31_967_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((226_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((130_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn set_prime(m: u32, ) -> Weight {
-		(8_865_000 as Weight)
+		(8_083_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((124_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((91_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn clear_prime(m: u32, ) -> Weight {
-		(3_397_000 as Weight)
+		(3_360_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((1_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
diff --git a/substrate/frame/multisig/src/weights.rs b/substrate/frame/multisig/src/weights.rs
index 1c8736616c1..50f77403001 100644
--- a/substrate/frame/multisig/src/weights.rs
+++ b/substrate/frame/multisig/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Weights for pallet_multisig
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! Autogenerated weights for pallet_multisig
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -53,162 +54,165 @@ pub trait WeightInfo {
 	fn approve_as_multi_approve(s: u32, ) -> Weight;
 	fn approve_as_multi_complete(s: u32, ) -> Weight;
 	fn cancel_as_multi(s: u32, ) -> Weight;
-	
 }
 
 /// Weights for pallet_multisig using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
-	fn as_multi_threshold_1(z: u32, ) -> Weight {
-		(14_183_000 as Weight)
-			.saturating_add((1_000 as Weight).saturating_mul(z as Weight))
-			
+	fn as_multi_threshold_1(_z: u32, ) -> Weight {
+		(14_411_000 as Weight)
 	}
 	fn as_multi_create(s: u32, z: u32, ) -> Weight {
-		(72_350_000 as Weight)
-			.saturating_add((64_000 as Weight).saturating_mul(s as Weight))
+		(54_200_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((127_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 0
 			.saturating_add((1_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn as_multi_create_store(s: u32, z: u32, ) -> Weight {
-		(83_175_000 as Weight)
-			.saturating_add((72_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add((3_000 as Weight).saturating_mul(z as Weight))
+		(60_502_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((128_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 0
+			.saturating_add((2_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
 	fn as_multi_approve(s: u32, z: u32, ) -> Weight {
-		(43_035_000 as Weight)
-			.saturating_add((140_000 as Weight).saturating_mul(s as Weight))
+		(32_075_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((132_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 0
 			.saturating_add((1_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn as_multi_approve_store(s: u32, z: u32, ) -> Weight {
-		(75_190_000 as Weight)
-			.saturating_add((127_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add((3_000 as Weight).saturating_mul(z as Weight))
+		(57_742_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((141_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 0
+			.saturating_add((2_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
 	fn as_multi_complete(s: u32, z: u32, ) -> Weight {
-		(92_751_000 as Weight)
-			.saturating_add((282_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add((5_000 as Weight).saturating_mul(z as Weight))
+		(73_503_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((246_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 0
+			.saturating_add((4_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-			
 	}
 	fn approve_as_multi_create(s: u32, ) -> Weight {
-		(71_937_000 as Weight)
-			.saturating_add((87_000 as Weight).saturating_mul(s as Weight))
+		(53_659_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((133_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn approve_as_multi_approve(s: u32, ) -> Weight {
-		(44_294_000 as Weight)
-			.saturating_add((89_000 as Weight).saturating_mul(s as Weight))
+		(31_353_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((136_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 approve_as_multi_complete(s: u32, ) -> Weight {
-		(163_098_000 as Weight)
-			.saturating_add((276_000 as Weight).saturating_mul(s as Weight))
+		(125_011_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((247_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-			
 	}
 	fn cancel_as_multi(s: u32, ) -> Weight {
-		(115_731_000 as Weight)
-			.saturating_add((104_000 as Weight).saturating_mul(s as Weight))
+		(92_318_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((128_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))
-			
 	}
-	
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
-	fn as_multi_threshold_1(z: u32, ) -> Weight {
-		(14_183_000 as Weight)
-			.saturating_add((1_000 as Weight).saturating_mul(z as Weight))
-			
+	fn as_multi_threshold_1(_z: u32, ) -> Weight {
+		(14_411_000 as Weight)
 	}
 	fn as_multi_create(s: u32, z: u32, ) -> Weight {
-		(72_350_000 as Weight)
-			.saturating_add((64_000 as Weight).saturating_mul(s as Weight))
+		(54_200_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((127_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 0
 			.saturating_add((1_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn as_multi_create_store(s: u32, z: u32, ) -> Weight {
-		(83_175_000 as Weight)
-			.saturating_add((72_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add((3_000 as Weight).saturating_mul(z as Weight))
+		(60_502_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((128_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 0
+			.saturating_add((2_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
 	fn as_multi_approve(s: u32, z: u32, ) -> Weight {
-		(43_035_000 as Weight)
-			.saturating_add((140_000 as Weight).saturating_mul(s as Weight))
+		(32_075_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((132_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 0
 			.saturating_add((1_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn as_multi_approve_store(s: u32, z: u32, ) -> Weight {
-		(75_190_000 as Weight)
-			.saturating_add((127_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add((3_000 as Weight).saturating_mul(z as Weight))
+		(57_742_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((141_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 0
+			.saturating_add((2_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
 	fn as_multi_complete(s: u32, z: u32, ) -> Weight {
-		(92_751_000 as Weight)
-			.saturating_add((282_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add((5_000 as Weight).saturating_mul(z as Weight))
+		(73_503_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((246_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 0
+			.saturating_add((4_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
-			
 	}
 	fn approve_as_multi_create(s: u32, ) -> Weight {
-		(71_937_000 as Weight)
-			.saturating_add((87_000 as Weight).saturating_mul(s as Weight))
+		(53_659_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((133_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn approve_as_multi_approve(s: u32, ) -> Weight {
-		(44_294_000 as Weight)
-			.saturating_add((89_000 as Weight).saturating_mul(s as Weight))
+		(31_353_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((136_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn approve_as_multi_complete(s: u32, ) -> Weight {
-		(163_098_000 as Weight)
-			.saturating_add((276_000 as Weight).saturating_mul(s as Weight))
+		(125_011_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((247_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
-			
 	}
 	fn cancel_as_multi(s: u32, ) -> Weight {
-		(115_731_000 as Weight)
-			.saturating_add((104_000 as Weight).saturating_mul(s as Weight))
+		(92_318_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((128_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
-	
 }
diff --git a/substrate/frame/proxy/src/weights.rs b/substrate/frame/proxy/src/weights.rs
index b720a22be12..f250186ad81 100644
--- a/substrate/frame/proxy/src/weights.rs
+++ b/substrate/frame/proxy/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Weights for pallet_proxy
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! Autogenerated weights for pallet_proxy
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -53,162 +54,167 @@ pub trait WeightInfo {
 	fn remove_proxies(p: u32, ) -> Weight;
 	fn anonymous(p: u32, ) -> Weight;
 	fn kill_anonymous(p: u32, ) -> Weight;
-	
 }
 
 /// Weights for pallet_proxy using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn proxy(p: u32, ) -> Weight {
-		(32_194_000 as Weight)
-			.saturating_add((215_000 as Weight).saturating_mul(p as Weight))
+		(22_645_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((162_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
-			
 	}
 	fn proxy_announced(a: u32, p: u32, ) -> Weight {
-		(67_490_000 as Weight)
-			.saturating_add((859_000 as Weight).saturating_mul(a as Weight))
-			.saturating_add((215_000 as Weight).saturating_mul(p as Weight))
+		(53_259_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((543_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 2_000
+			.saturating_add((153_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
 	fn remove_announcement(a: u32, p: u32, ) -> Weight {
-		(40_768_000 as Weight)
-			.saturating_add((882_000 as Weight).saturating_mul(a as Weight))
-			.saturating_add((122_000 as Weight).saturating_mul(p as Weight))
+		(37_983_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((545_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 2_000
+			.saturating_add((4_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
 	fn reject_announcement(a: u32, p: u32, ) -> Weight {
-		(42_742_000 as Weight)
-			.saturating_add((852_000 as Weight).saturating_mul(a as Weight))
-			.saturating_add((22_000 as Weight).saturating_mul(p as Weight))
+		(37_922_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((541_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 2_000
+			.saturating_add((6_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
 	fn announce(a: u32, p: u32, ) -> Weight {
-		(67_967_000 as Weight)
-			.saturating_add((737_000 as Weight).saturating_mul(a as Weight))
-			.saturating_add((213_000 as Weight).saturating_mul(p as Weight))
+		(51_355_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((534_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 2_000
+			.saturating_add((148_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-			
 	}
 	fn add_proxy(p: u32, ) -> Weight {
-		(45_245_000 as Weight)
-			.saturating_add((240_000 as Weight).saturating_mul(p as Weight))
+		(35_798_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((228_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn remove_proxy(p: u32, ) -> Weight {
-		(40_742_000 as Weight)
-			.saturating_add((272_000 as Weight).saturating_mul(p as Weight))
+		(35_554_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((250_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn remove_proxies(p: u32, ) -> Weight {
-		(39_070_000 as Weight)
-			.saturating_add((214_000 as Weight).saturating_mul(p as Weight))
+		(33_911_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((165_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn anonymous(p: u32, ) -> Weight {
-		(64_851_000 as Weight)
-			.saturating_add((37_000 as Weight).saturating_mul(p as Weight))
+		(48_695_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((53_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn kill_anonymous(p: u32, ) -> Weight {
-		(41_831_000 as Weight)
-			.saturating_add((207_000 as Weight).saturating_mul(p as Weight))
+		(35_904_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((159_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
-	
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn proxy(p: u32, ) -> Weight {
-		(32_194_000 as Weight)
-			.saturating_add((215_000 as Weight).saturating_mul(p as Weight))
+		(22_645_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((162_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
-			
 	}
 	fn proxy_announced(a: u32, p: u32, ) -> Weight {
-		(67_490_000 as Weight)
-			.saturating_add((859_000 as Weight).saturating_mul(a as Weight))
-			.saturating_add((215_000 as Weight).saturating_mul(p as Weight))
+		(53_259_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((543_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 2_000
+			.saturating_add((153_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
 	fn remove_announcement(a: u32, p: u32, ) -> Weight {
-		(40_768_000 as Weight)
-			.saturating_add((882_000 as Weight).saturating_mul(a as Weight))
-			.saturating_add((122_000 as Weight).saturating_mul(p as Weight))
+		(37_983_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((545_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 2_000
+			.saturating_add((4_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
 	fn reject_announcement(a: u32, p: u32, ) -> Weight {
-		(42_742_000 as Weight)
-			.saturating_add((852_000 as Weight).saturating_mul(a as Weight))
-			.saturating_add((22_000 as Weight).saturating_mul(p as Weight))
+		(37_922_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((541_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 2_000
+			.saturating_add((6_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
 	fn announce(a: u32, p: u32, ) -> Weight {
-		(67_967_000 as Weight)
-			.saturating_add((737_000 as Weight).saturating_mul(a as Weight))
-			.saturating_add((213_000 as Weight).saturating_mul(p as Weight))
+		(51_355_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((534_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 2_000
+			.saturating_add((148_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
 	fn add_proxy(p: u32, ) -> Weight {
-		(45_245_000 as Weight)
-			.saturating_add((240_000 as Weight).saturating_mul(p as Weight))
+		(35_798_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((228_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn remove_proxy(p: u32, ) -> Weight {
-		(40_742_000 as Weight)
-			.saturating_add((272_000 as Weight).saturating_mul(p as Weight))
+		(35_554_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((250_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn remove_proxies(p: u32, ) -> Weight {
-		(39_070_000 as Weight)
-			.saturating_add((214_000 as Weight).saturating_mul(p as Weight))
+		(33_911_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((165_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn anonymous(p: u32, ) -> Weight {
-		(64_851_000 as Weight)
-			.saturating_add((37_000 as Weight).saturating_mul(p as Weight))
+		(48_695_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((53_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn kill_anonymous(p: u32, ) -> Weight {
-		(41_831_000 as Weight)
-			.saturating_add((207_000 as Weight).saturating_mul(p as Weight))
+		(35_904_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((159_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
-	
 }
diff --git a/substrate/frame/scheduler/src/weights.rs b/substrate/frame/scheduler/src/weights.rs
index 1d7273353f3..648652428cb 100644
--- a/substrate/frame/scheduler/src/weights.rs
+++ b/substrate/frame/scheduler/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Weights for pallet_scheduler
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! Autogenerated weights for pallet_scheduler
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -47,72 +48,69 @@ pub trait WeightInfo {
 	fn cancel(s: u32, ) -> Weight;
 	fn schedule_named(s: u32, ) -> Weight;
 	fn cancel_named(s: u32, ) -> Weight;
-	
 }
 
 /// Weights for pallet_scheduler using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn schedule(s: u32, ) -> Weight {
-		(35_029_000 as Weight)
-			.saturating_add((77_000 as Weight).saturating_mul(s as Weight))
+		(24_811_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((116_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 cancel(s: u32, ) -> Weight {
-		(31_419_000 as Weight)
-			.saturating_add((4_015_000 as Weight).saturating_mul(s as Weight))
+		(23_851_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((1_439_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))
-			
 	}
 	fn schedule_named(s: u32, ) -> Weight {
-		(44_752_000 as Weight)
-			.saturating_add((123_000 as Weight).saturating_mul(s as Weight))
+		(31_096_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((141_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))
-			
 	}
 	fn cancel_named(s: u32, ) -> Weight {
-		(35_712_000 as Weight)
-			.saturating_add((4_008_000 as Weight).saturating_mul(s as Weight))
+		(26_715_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((1_455_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))
-			
 	}
-	
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn schedule(s: u32, ) -> Weight {
-		(35_029_000 as Weight)
-			.saturating_add((77_000 as Weight).saturating_mul(s as Weight))
+		(24_811_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((116_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn cancel(s: u32, ) -> Weight {
-		(31_419_000 as Weight)
-			.saturating_add((4_015_000 as Weight).saturating_mul(s as Weight))
+		(23_851_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((1_439_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
 	fn schedule_named(s: u32, ) -> Weight {
-		(44_752_000 as Weight)
-			.saturating_add((123_000 as Weight).saturating_mul(s as Weight))
+		(31_096_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((141_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
 	fn cancel_named(s: u32, ) -> Weight {
-		(35_712_000 as Weight)
-			.saturating_add((4_008_000 as Weight).saturating_mul(s as Weight))
+		(26_715_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((1_455_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-			
 	}
-	
 }
diff --git a/substrate/frame/session/src/weights.rs b/substrate/frame/session/src/weights.rs
index 88ed9e6d8ec..ec911d8c01c 100644
--- a/substrate/frame/session/src/weights.rs
+++ b/substrate/frame/session/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Weights for pallet_session
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! Autogenerated weights for pallet_session
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -45,40 +46,33 @@ use sp_std::marker::PhantomData;
 pub trait WeightInfo {
 	fn set_keys() -> Weight;
 	fn purge_keys() -> Weight;
-	
 }
 
 /// Weights for pallet_session using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn set_keys() -> Weight {
-		(86_033_000 as Weight)
+		(70_351_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
-			
 	}
 	fn purge_keys() -> Weight {
-		(54_334_000 as Weight)
+		(45_866_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
-			
 	}
-	
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn set_keys() -> Weight {
-		(86_033_000 as Weight)
+		(70_351_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
-			
 	}
 	fn purge_keys() -> Weight {
-		(54_334_000 as Weight)
+		(45_866_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
-			
 	}
-	
 }
diff --git a/substrate/frame/staking/src/weights.rs b/substrate/frame/staking/src/weights.rs
index 980b0855fbd..dbf5f3fc82b 100644
--- a/substrate/frame/staking/src/weights.rs
+++ b/substrate/frame/staking/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_staking
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-15, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -78,154 +78,154 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn bond() -> Weight {
-		(91_278_000 as Weight)
+		(72_617_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 {
-		(69_833_000 as Weight)
+		(55_590_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn unbond() -> Weight {
-		(75_020_000 as Weight)
+		(59_730_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn withdraw_unbonded_update(s: u32, ) -> Weight {
-		(63_898_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((50_000 as Weight).saturating_mul(s as Weight))
+		(52_279_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((68_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
-		(103_717_000 as Weight)
+		(86_629_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((2_942_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((2_379_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(8 as Weight))
 			.saturating_add(T::DbWeight::get().writes(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn validate() -> Weight {
-		(40_702_000 as Weight)
+		(32_393_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn kick(k: u32, ) -> Weight {
-		(33_572_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((20_771_000 as Weight).saturating_mul(k as Weight))
+		(36_986_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((16_574_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(k as Weight)))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn nominate(n: u32, ) -> Weight {
-		(53_561_000 as Weight)
-			// Standard Error: 34_000
-			.saturating_add((6_652_000 as Weight).saturating_mul(n as Weight))
+		(43_228_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((5_119_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn chill() -> Weight {
-		(21_489_000 as Weight)
+		(17_800_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 	}
 	fn set_payee() -> Weight {
-		(14_514_000 as Weight)
+		(12_612_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 {
-		(32_598_000 as Weight)
+		(27_503_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 {
-		(2_477_000 as Weight)
+		(2_119_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_no_eras() -> Weight {
-		(2_743_000 as Weight)
+		(2_320_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_new_era() -> Weight {
-		(2_784_000 as Weight)
+		(2_269_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_new_era_always() -> Weight {
-		(2_749_000 as Weight)
+		(2_334_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_invulnerables(v: u32, ) -> Weight {
-		(2_798_000 as Weight)
+		(2_354_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((5_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_unstake(s: u32, ) -> Weight {
-		(70_372_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((3_029_000 as Weight).saturating_mul(s as Weight))
+		(61_556_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((2_377_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn cancel_deferred_slash(s: u32, ) -> Weight {
-		(3_436_822_000 as Weight)
-			// Standard Error: 221_000
-			.saturating_add((19_799_000 as Weight).saturating_mul(s as Weight))
+		(3_367_105_000 as Weight)
+			// Standard Error: 222_000
+			.saturating_add((19_817_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 {
-		(132_018_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((61_340_000 as Weight).saturating_mul(n as Weight))
+		(47_229_000 as Weight)
+			// Standard Error: 53_000
+			.saturating_add((48_365_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(10 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 {
-		(158_346_000 as Weight)
-			// Standard Error: 61_000
-			.saturating_add((77_147_000 as Weight).saturating_mul(n as Weight))
+		(156_788_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((61_280_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(11 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 {
-		(57_756_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((79_000 as Weight).saturating_mul(l as Weight))
+		(47_815_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((65_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn set_history_depth(e: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 100_000
-			.saturating_add((44_873_000 as Weight).saturating_mul(e as Weight))
+			// Standard Error: 74_000
+			.saturating_add((34_945_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 {
-		(75_073_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((2_988_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(T::DbWeight::get().reads(6 as Weight))
-			.saturating_add(T::DbWeight::get().writes(6 as Weight))
+		(73_483_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_384_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 new_era(v: u32, n: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 1_146_000
-			.saturating_add((362_986_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 57_000
-			.saturating_add((60_216_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 846_000
+			.saturating_add((305_234_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 42_000
+			.saturating_add((48_280_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(10 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
@@ -234,12 +234,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	}
 	fn get_npos_voters(v: u32, n: u32, s: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 230_000
-			.saturating_add((35_891_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 230_000
-			.saturating_add((37_854_000 as Weight).saturating_mul(n as Weight))
-			// Standard Error: 7_842_000
-			.saturating_add((32_492_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 99_000
+			.saturating_add((25_735_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 99_000
+			.saturating_add((28_122_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 3_388_000
+			.saturating_add((21_500_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
@@ -247,17 +247,17 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	}
 	fn get_npos_targets(v: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 74_000
-			.saturating_add((16_370_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 30_000
+			.saturating_add((11_065_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(v as Weight)))
 	}
 	fn update_staking_limits() -> Weight {
-		(6_398_000 as Weight)
+		(5_028_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	fn chill_other() -> Weight {
-		(44_694_000 as Weight)
+		(35_758_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
@@ -266,154 +266,154 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn bond() -> Weight {
-		(91_278_000 as Weight)
+		(72_617_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn bond_extra() -> Weight {
-		(69_833_000 as Weight)
+		(55_590_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn unbond() -> Weight {
-		(75_020_000 as Weight)
+		(59_730_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn withdraw_unbonded_update(s: u32, ) -> Weight {
-		(63_898_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((50_000 as Weight).saturating_mul(s as Weight))
+		(52_279_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((68_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn withdraw_unbonded_kill(s: u32, ) -> Weight {
-		(103_717_000 as Weight)
+		(86_629_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((2_942_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((2_379_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(8 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn validate() -> Weight {
-		(40_702_000 as Weight)
+		(32_393_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn kick(k: u32, ) -> Weight {
-		(33_572_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((20_771_000 as Weight).saturating_mul(k as Weight))
+		(36_986_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((16_574_000 as Weight).saturating_mul(k as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(k as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(k as Weight)))
 	}
 	fn nominate(n: u32, ) -> Weight {
-		(53_561_000 as Weight)
-			// Standard Error: 34_000
-			.saturating_add((6_652_000 as Weight).saturating_mul(n as Weight))
+		(43_228_000 as Weight)
+			// Standard Error: 21_000
+			.saturating_add((5_119_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn chill() -> Weight {
-		(21_489_000 as Weight)
+		(17_800_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 	}
 	fn set_payee() -> Weight {
-		(14_514_000 as Weight)
+		(12_612_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_controller() -> Weight {
-		(32_598_000 as Weight)
+		(27_503_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn set_validator_count() -> Weight {
-		(2_477_000 as Weight)
+		(2_119_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_no_eras() -> Weight {
-		(2_743_000 as Weight)
+		(2_320_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_new_era() -> Weight {
-		(2_784_000 as Weight)
+		(2_269_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_new_era_always() -> Weight {
-		(2_749_000 as Weight)
+		(2_334_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_invulnerables(v: u32, ) -> Weight {
-		(2_798_000 as Weight)
+		(2_354_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((5_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_unstake(s: u32, ) -> Weight {
-		(70_372_000 as Weight)
-			// Standard Error: 13_000
-			.saturating_add((3_029_000 as Weight).saturating_mul(s as Weight))
+		(61_556_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((2_377_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn cancel_deferred_slash(s: u32, ) -> Weight {
-		(3_436_822_000 as Weight)
-			// Standard Error: 221_000
-			.saturating_add((19_799_000 as Weight).saturating_mul(s as Weight))
+		(3_367_105_000 as Weight)
+			// Standard Error: 222_000
+			.saturating_add((19_817_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn payout_stakers_dead_controller(n: u32, ) -> Weight {
-		(132_018_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((61_340_000 as Weight).saturating_mul(n as Weight))
+		(47_229_000 as Weight)
+			// Standard Error: 53_000
+			.saturating_add((48_365_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(10 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(n as Weight)))
 	}
 	fn payout_stakers_alive_staked(n: u32, ) -> Weight {
-		(158_346_000 as Weight)
-			// Standard Error: 61_000
-			.saturating_add((77_147_000 as Weight).saturating_mul(n as Weight))
+		(156_788_000 as Weight)
+			// Standard Error: 20_000
+			.saturating_add((61_280_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(11 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((5 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((3 as Weight).saturating_mul(n as Weight)))
 	}
 	fn rebond(l: u32, ) -> Weight {
-		(57_756_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((79_000 as Weight).saturating_mul(l as Weight))
+		(47_815_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((65_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn set_history_depth(e: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 100_000
-			.saturating_add((44_873_000 as Weight).saturating_mul(e as Weight))
+			// Standard Error: 74_000
+			.saturating_add((34_945_000 as Weight).saturating_mul(e as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((7 as Weight).saturating_mul(e as Weight)))
 	}
 	fn reap_stash(s: u32, ) -> Weight {
-		(75_073_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((2_988_000 as Weight).saturating_mul(s as Weight))
-			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
-			.saturating_add(RocksDbWeight::get().writes(6 as Weight))
+		(73_483_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_384_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add(RocksDbWeight::get().reads(7 as Weight))
+			.saturating_add(RocksDbWeight::get().writes(8 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(s as Weight)))
 	}
 	fn new_era(v: u32, n: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 1_146_000
-			.saturating_add((362_986_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 57_000
-			.saturating_add((60_216_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 846_000
+			.saturating_add((305_234_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 42_000
+			.saturating_add((48_280_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(10 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
@@ -422,12 +422,12 @@ impl WeightInfo for () {
 	}
 	fn get_npos_voters(v: u32, n: u32, s: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 230_000
-			.saturating_add((35_891_000 as Weight).saturating_mul(v as Weight))
-			// Standard Error: 230_000
-			.saturating_add((37_854_000 as Weight).saturating_mul(n as Weight))
-			// Standard Error: 7_842_000
-			.saturating_add((32_492_000 as Weight).saturating_mul(s as Weight))
+			// Standard Error: 99_000
+			.saturating_add((25_735_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 99_000
+			.saturating_add((28_122_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 3_388_000
+			.saturating_add((21_500_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(v as Weight)))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(n as Weight)))
@@ -435,17 +435,17 @@ impl WeightInfo for () {
 	}
 	fn get_npos_targets(v: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 74_000
-			.saturating_add((16_370_000 as Weight).saturating_mul(v as Weight))
+			// Standard Error: 30_000
+			.saturating_add((11_065_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(v as Weight)))
 	}
 	fn update_staking_limits() -> Weight {
-		(6_398_000 as Weight)
+		(5_028_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
 	}
 	fn chill_other() -> Weight {
-		(44_694_000 as Weight)
+		(35_758_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
diff --git a/substrate/frame/system/src/weights.rs b/substrate/frame/system/src/weights.rs
index 04e95de4ba3..c6284ba17d6 100644
--- a/substrate/frame/system/src/weights.rs
+++ b/substrate/frame/system/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for frame_system
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-02-28, STEPS: \[50, \], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -34,7 +34,6 @@
 // --heap-pages=4096
 // --output=./frame/system/src/weights.rs
 // --template=./.maintain/frame-weight-template.hbs
-// --output-analysis=max
 
 
 #![allow(unused_parens)]
@@ -58,38 +57,38 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: crate::Config> WeightInfo for SubstrateWeight<T> {
 	fn remark(_b: u32, ) -> Weight {
-		(1_345_000 as Weight)
+		(1_038_000 as Weight)
 	}
 	fn remark_with_event(b: u32, ) -> Weight {
-		(9_697_000 as Weight)
+		(5_246_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((1_000 as Weight).saturating_mul(b as Weight))
 	}
 	fn set_heap_pages() -> Weight {
-		(2_070_000 as Weight)
+		(1_586_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_changes_trie_config() -> Weight {
-		(10_111_000 as Weight)
+		(7_181_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn set_storage(i: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 0
-			.saturating_add((619_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((568_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
 	fn kill_storage(i: u32, ) -> Weight {
-		(1_647_000 as Weight)
+		(2_278_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((460_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((423_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
 	fn kill_prefix(p: u32, ) -> Weight {
-		(10_678_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((862_000 as Weight).saturating_mul(p as Weight))
+		(8_243_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((795_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
 	}
 }
@@ -97,38 +96,38 @@ impl<T: crate::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn remark(_b: u32, ) -> Weight {
-		(1_345_000 as Weight)
+		(1_038_000 as Weight)
 	}
 	fn remark_with_event(b: u32, ) -> Weight {
-		(9_697_000 as Weight)
+		(5_246_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((1_000 as Weight).saturating_mul(b as Weight))
 	}
 	fn set_heap_pages() -> Weight {
-		(2_070_000 as Weight)
+		(1_586_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_changes_trie_config() -> Weight {
-		(10_111_000 as Weight)
+		(7_181_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn set_storage(i: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 0
-			.saturating_add((619_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((568_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
 	fn kill_storage(i: u32, ) -> Weight {
-		(1_647_000 as Weight)
+		(2_278_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((460_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((423_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
 	fn kill_prefix(p: u32, ) -> Weight {
-		(10_678_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((862_000 as Weight).saturating_mul(p as Weight))
+		(8_243_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((795_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
 	}
 }
diff --git a/substrate/frame/timestamp/src/weights.rs b/substrate/frame/timestamp/src/weights.rs
index 875d78c31d2..cf4fa6ea3d6 100644
--- a/substrate/frame/timestamp/src/weights.rs
+++ b/substrate/frame/timestamp/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Weights for pallet_timestamp
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! Autogenerated weights for pallet_timestamp
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -45,36 +46,29 @@ use sp_std::marker::PhantomData;
 pub trait WeightInfo {
 	fn set() -> Weight;
 	fn on_finalize() -> Weight;
-	
 }
 
 /// Weights for pallet_timestamp using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn set() -> Weight {
-		(11_650_000 as Weight)
-			.saturating_add(T::DbWeight::get().reads(2 as Weight))
+		(10_277_000 as Weight)
+			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-			
 	}
 	fn on_finalize() -> Weight {
-		(6_681_000 as Weight)
-			
+		(4_859_000 as Weight)
 	}
-	
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn set() -> Weight {
-		(11_650_000 as Weight)
-			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
+		(10_277_000 as Weight)
+			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-			
 	}
 	fn on_finalize() -> Weight {
-		(6_681_000 as Weight)
-			
+		(4_859_000 as Weight)
 	}
-	
 }
diff --git a/substrate/frame/tips/src/weights.rs b/substrate/frame/tips/src/weights.rs
index f5cd4bc23c8..ceee79bd6f0 100644
--- a/substrate/frame/tips/src/weights.rs
+++ b/substrate/frame/tips/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for pallet_tips
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-12-20, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -56,44 +56,44 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn report_awesome(r: u32, ) -> Weight {
-		(73_795_000 as Weight)
+		(49_844_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((2_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn retract_tip() -> Weight {
-		(61_753_000 as Weight)
+		(45_934_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn tip_new(r: u32, t: u32, ) -> Weight {
-		(47_731_000 as Weight)
+		(31_777_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((2_000 as Weight).saturating_mul(r as Weight))
 			// Standard Error: 0
-			.saturating_add((154_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((127_000 as Weight).saturating_mul(t as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn tip(t: u32, ) -> Weight {
-		(35_215_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((712_000 as Weight).saturating_mul(t as Weight))
+		(22_361_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((584_000 as Weight).saturating_mul(t as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn close_tip(t: u32, ) -> Weight {
-		(117_027_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((375_000 as Weight).saturating_mul(t as Weight))
+		(84_470_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((326_000 as Weight).saturating_mul(t as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn slash_tip(t: u32, ) -> Weight {
-		(37_184_000 as Weight)
+		(25_214_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((11_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((8_000 as Weight).saturating_mul(t as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
@@ -102,44 +102,44 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn report_awesome(r: u32, ) -> Weight {
-		(73_795_000 as Weight)
+		(49_844_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((2_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn retract_tip() -> Weight {
-		(61_753_000 as Weight)
+		(45_934_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn tip_new(r: u32, t: u32, ) -> Weight {
-		(47_731_000 as Weight)
+		(31_777_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((2_000 as Weight).saturating_mul(r as Weight))
 			// Standard Error: 0
-			.saturating_add((154_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((127_000 as Weight).saturating_mul(t as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn tip(t: u32, ) -> Weight {
-		(35_215_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((712_000 as Weight).saturating_mul(t as Weight))
+		(22_361_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((584_000 as Weight).saturating_mul(t as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn close_tip(t: u32, ) -> Weight {
-		(117_027_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((375_000 as Weight).saturating_mul(t as Weight))
+		(84_470_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((326_000 as Weight).saturating_mul(t as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn slash_tip(t: u32, ) -> Weight {
-		(37_184_000 as Weight)
+		(25_214_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((11_000 as Weight).saturating_mul(t as Weight))
+			.saturating_add((8_000 as Weight).saturating_mul(t as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
diff --git a/substrate/frame/transaction-storage/src/weights.rs b/substrate/frame/transaction-storage/src/weights.rs
index 7951db8828d..46fc664d977 100644
--- a/substrate/frame/transaction-storage/src/weights.rs
+++ b/substrate/frame/transaction-storage/src/weights.rs
@@ -18,16 +18,14 @@
 //! Autogenerated weights for pallet_transaction_storage
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-03, STEPS: `[20, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
-// ./target/release/substrate
+// target/release/substrate
 // benchmark
-// --chain
-// dev
-// --steps
-// 20
+// --chain=dev
+// --steps=50
 // --repeat=20
 // --pallet=pallet_transaction_storage
 // --extrinsic=*
@@ -57,17 +55,17 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn store(l: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 0
-			.saturating_add((10_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add((8_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn renew() -> Weight {
-		(97_000_000 as Weight)
+		(65_933_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn check_proof_max() -> Weight {
-		(99_000_000 as Weight)
+		(163_549_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -78,17 +76,17 @@ impl WeightInfo for () {
 	fn store(l: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 0
-			.saturating_add((10_000 as Weight).saturating_mul(l as Weight))
+			.saturating_add((8_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn renew() -> Weight {
-		(97_000_000 as Weight)
+		(65_933_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn check_proof_max() -> Weight {
-		(99_000_000 as Weight)
+		(163_549_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
diff --git a/substrate/frame/treasury/src/weights.rs b/substrate/frame/treasury/src/weights.rs
index 9d627f1c287..b22380e3c47 100644
--- a/substrate/frame/treasury/src/weights.rs
+++ b/substrate/frame/treasury/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_treasury
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-04-26, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -54,26 +54,26 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn propose_spend() -> Weight {
-		(45_393_000 as Weight)
+		(41_763_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn reject_proposal() -> Weight {
-		(42_796_000 as Weight)
+		(39_049_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn approve_proposal(p: u32, ) -> Weight {
-		(14_153_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((94_000 as Weight).saturating_mul(p as Weight))
+		(13_547_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((124_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn on_initialize_proposals(p: u32, ) -> Weight {
-		(51_633_000 as Weight)
-			// Standard Error: 42_000
-			.saturating_add((65_705_000 as Weight).saturating_mul(p as Weight))
+		(48_990_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((59_621_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(p as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
@@ -84,26 +84,26 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn propose_spend() -> Weight {
-		(45_393_000 as Weight)
+		(41_763_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn reject_proposal() -> Weight {
-		(42_796_000 as Weight)
+		(39_049_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn approve_proposal(p: u32, ) -> Weight {
-		(14_153_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((94_000 as Weight).saturating_mul(p as Weight))
+		(13_547_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((124_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn on_initialize_proposals(p: u32, ) -> Weight {
-		(51_633_000 as Weight)
-			// Standard Error: 42_000
-			.saturating_add((65_705_000 as Weight).saturating_mul(p as Weight))
+		(48_990_000 as Weight)
+			// Standard Error: 19_000
+			.saturating_add((59_621_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(p as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
diff --git a/substrate/frame/uniques/src/weights.rs b/substrate/frame/uniques/src/weights.rs
index 9272ae6026a..a2263d6cd34 100644
--- a/substrate/frame/uniques/src/weights.rs
+++ b/substrate/frame/uniques/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_uniques
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-05-24, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -72,23 +72,23 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn create() -> Weight {
-		(55_264_000 as Weight)
+		(43_219_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_create() -> Weight {
-		(28_173_000 as Weight)
+		(21_919_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn destroy(n: u32, m: u32, a: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 32_000
-			.saturating_add((23_077_000 as Weight).saturating_mul(n as Weight))
-			// Standard Error: 32_000
-			.saturating_add((1_723_000 as Weight).saturating_mul(m as Weight))
-			// Standard Error: 32_000
-			.saturating_add((1_534_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 13_000
+			.saturating_add((16_619_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 13_000
+			.saturating_add((967_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 13_000
+			.saturating_add((834_000 as Weight).saturating_mul(a as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
@@ -97,101 +97,101 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(a as Weight)))
 	}
 	fn mint() -> Weight {
-		(73_250_000 as Weight)
+		(57_627_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn burn() -> Weight {
-		(74_443_000 as Weight)
+		(58_615_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn transfer() -> Weight {
-		(54_690_000 as Weight)
+		(43_335_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	fn redeposit(i: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((34_624_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 13_000
+			.saturating_add((26_322_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(i as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
 	fn freeze() -> Weight {
-		(39_505_000 as Weight)
+		(31_020_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn thaw() -> Weight {
-		(38_844_000 as Weight)
+		(31_012_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn freeze_class() -> Weight {
-		(28_739_000 as Weight)
+		(22_761_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn thaw_class() -> Weight {
-		(28_963_000 as Weight)
+		(22_789_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn transfer_ownership() -> Weight {
-		(65_160_000 as Weight)
+		(50_779_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn set_team() -> Weight {
-		(30_000_000 as Weight)
+		(24_045_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn force_asset_status() -> Weight {
-		(29_145_000 as Weight)
+		(22_925_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn set_attribute() -> Weight {
-		(88_923_000 as Weight)
+		(70_416_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn clear_attribute() -> Weight {
-		(79_878_000 as Weight)
+		(64_640_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn set_metadata() -> Weight {
-		(67_110_000 as Weight)
+		(53_229_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn clear_metadata() -> Weight {
-		(66_191_000 as Weight)
+		(52_145_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn set_class_metadata() -> Weight {
-		(65_558_000 as Weight)
+		(51_556_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	fn clear_class_metadata() -> Weight {
-		(60_135_000 as Weight)
+		(47_314_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn approve_transfer() -> Weight {
-		(40_337_000 as Weight)
+		(32_946_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn cancel_approval() -> Weight {
-		(40_770_000 as Weight)
+		(32_328_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -200,23 +200,23 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn create() -> Weight {
-		(55_264_000 as Weight)
+		(43_219_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_create() -> Weight {
-		(28_173_000 as Weight)
+		(21_919_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn destroy(n: u32, m: u32, a: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 32_000
-			.saturating_add((23_077_000 as Weight).saturating_mul(n as Weight))
-			// Standard Error: 32_000
-			.saturating_add((1_723_000 as Weight).saturating_mul(m as Weight))
-			// Standard Error: 32_000
-			.saturating_add((1_534_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 13_000
+			.saturating_add((16_619_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 13_000
+			.saturating_add((967_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 13_000
+			.saturating_add((834_000 as Weight).saturating_mul(a as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(n as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
@@ -225,101 +225,101 @@ impl WeightInfo for () {
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(a as Weight)))
 	}
 	fn mint() -> Weight {
-		(73_250_000 as Weight)
+		(57_627_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn burn() -> Weight {
-		(74_443_000 as Weight)
+		(58_615_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn transfer() -> Weight {
-		(54_690_000 as Weight)
+		(43_335_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	fn redeposit(i: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((34_624_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 13_000
+			.saturating_add((26_322_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(i as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
 	fn freeze() -> Weight {
-		(39_505_000 as Weight)
+		(31_020_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn thaw() -> Weight {
-		(38_844_000 as Weight)
+		(31_012_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn freeze_class() -> Weight {
-		(28_739_000 as Weight)
+		(22_761_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn thaw_class() -> Weight {
-		(28_963_000 as Weight)
+		(22_789_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn transfer_ownership() -> Weight {
-		(65_160_000 as Weight)
+		(50_779_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn set_team() -> Weight {
-		(30_000_000 as Weight)
+		(24_045_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn force_asset_status() -> Weight {
-		(29_145_000 as Weight)
+		(22_925_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn set_attribute() -> Weight {
-		(88_923_000 as Weight)
+		(70_416_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn clear_attribute() -> Weight {
-		(79_878_000 as Weight)
+		(64_640_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn set_metadata() -> Weight {
-		(67_110_000 as Weight)
+		(53_229_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn clear_metadata() -> Weight {
-		(66_191_000 as Weight)
+		(52_145_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn set_class_metadata() -> Weight {
-		(65_558_000 as Weight)
+		(51_556_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
 	fn clear_class_metadata() -> Weight {
-		(60_135_000 as Weight)
+		(47_314_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn approve_transfer() -> Weight {
-		(40_337_000 as Weight)
+		(32_946_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	fn cancel_approval() -> Weight {
-		(40_770_000 as Weight)
+		(32_328_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
diff --git a/substrate/frame/utility/src/weights.rs b/substrate/frame/utility/src/weights.rs
index dd4981cf32d..0bab9720100 100644
--- a/substrate/frame/utility/src/weights.rs
+++ b/substrate/frame/utility/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_utility
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-06-03, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -53,33 +53,33 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn batch(c: u32, ) -> Weight {
-		(19_099_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((640_000 as Weight).saturating_mul(c as Weight))
+		(14_618_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((610_000 as Weight).saturating_mul(c as Weight))
 	}
 	fn as_derivative() -> Weight {
-		(3_701_000 as Weight)
+		(3_175_000 as Weight)
 	}
 	fn batch_all(c: u32, ) -> Weight {
-		(19_199_000 as Weight)
+		(14_561_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((1_061_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((1_013_000 as Weight).saturating_mul(c as Weight))
 	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn batch(c: u32, ) -> Weight {
-		(19_099_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((640_000 as Weight).saturating_mul(c as Weight))
+		(14_618_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((610_000 as Weight).saturating_mul(c as Weight))
 	}
 	fn as_derivative() -> Weight {
-		(3_701_000 as Weight)
+		(3_175_000 as Weight)
 	}
 	fn batch_all(c: u32, ) -> Weight {
-		(19_199_000 as Weight)
+		(14_561_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((1_061_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((1_013_000 as Weight).saturating_mul(c as Weight))
 	}
 }
diff --git a/substrate/frame/vesting/src/weights.rs b/substrate/frame/vesting/src/weights.rs
index 1e44474fbc9..053453d757f 100644
--- a/substrate/frame/vesting/src/weights.rs
+++ b/substrate/frame/vesting/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Weights for pallet_vesting
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0
-//! DATE: 2020-10-27, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! Autogenerated weights for pallet_vesting
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
+//! DATE: 2021-06-19, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -49,100 +50,97 @@ pub trait WeightInfo {
 	fn vest_other_unlocked(l: u32, ) -> Weight;
 	fn vested_transfer(l: u32, ) -> Weight;
 	fn force_vested_transfer(l: u32, ) -> Weight;
-
 }
 
 /// Weights for pallet_vesting using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn vest_locked(l: u32, ) -> Weight {
-		(57_472_000 as Weight)
-			.saturating_add((155_000 as Weight).saturating_mul(l as Weight))
+		(42_905_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((232_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
-
 	}
 	fn vest_unlocked(l: u32, ) -> Weight {
-		(61_681_000 as Weight)
-			.saturating_add((138_000 as Weight).saturating_mul(l as Weight))
+		(45_650_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((215_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-
 	}
 	fn vest_other_locked(l: u32, ) -> Weight {
-		(56_910_000 as Weight)
-			.saturating_add((160_000 as Weight).saturating_mul(l as Weight))
+		(42_273_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((246_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
-
 	}
 	fn vest_other_unlocked(l: u32, ) -> Weight {
-		(61_319_000 as Weight)
-			.saturating_add((144_000 as Weight).saturating_mul(l as Weight))
+		(45_324_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((214_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-
 	}
 	fn vested_transfer(l: u32, ) -> Weight {
-		(124_996_000 as Weight)
-			.saturating_add((209_000 as Weight).saturating_mul(l as Weight))
+		(96_661_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((211_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
-
 	}
 	fn force_vested_transfer(l: u32, ) -> Weight {
-		(123_911_000 as Weight)
-			.saturating_add((213_000 as Weight).saturating_mul(l as Weight))
+		(98_812_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((139_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
-
 	}
-
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	fn vest_locked(l: u32, ) -> Weight {
-		(57_472_000 as Weight)
-			.saturating_add((155_000 as Weight).saturating_mul(l as Weight))
+		(42_905_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((232_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
-
 	}
 	fn vest_unlocked(l: u32, ) -> Weight {
-		(61_681_000 as Weight)
-			.saturating_add((138_000 as Weight).saturating_mul(l as Weight))
+		(45_650_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((215_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-
 	}
 	fn vest_other_locked(l: u32, ) -> Weight {
-		(56_910_000 as Weight)
-			.saturating_add((160_000 as Weight).saturating_mul(l as Weight))
+		(42_273_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((246_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
-
 	}
 	fn vest_other_unlocked(l: u32, ) -> Weight {
-		(61_319_000 as Weight)
-			.saturating_add((144_000 as Weight).saturating_mul(l as Weight))
+		(45_324_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((214_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
-
 	}
 	fn vested_transfer(l: u32, ) -> Weight {
-		(124_996_000 as Weight)
-			.saturating_add((209_000 as Weight).saturating_mul(l as Weight))
+		(96_661_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((211_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
-
 	}
 	fn force_vested_transfer(l: u32, ) -> Weight {
-		(123_911_000 as Weight)
-			.saturating_add((213_000 as Weight).saturating_mul(l as Weight))
+		(98_812_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((139_000 as Weight).saturating_mul(l as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
-
 	}
-
 }
-- 
GitLab