From 670daeccc9f8fdacb519d6f39c24a2963c59d8fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Wed, 16 Feb 2022 08:18:00 +0100
Subject: [PATCH] Measure per byte and not kb for certain benchmarks

---
 frame/contracts/src/benchmarking/mod.rs |   28 +-
 frame/contracts/src/lib.rs              |   13 +-
 frame/contracts/src/tests.rs            |    2 +-
 frame/contracts/src/wasm/code_cache.rs  |    6 +-
 frame/contracts/src/weights.rs          | 1244 +++++++++++------------
 5 files changed, 645 insertions(+), 648 deletions(-)

diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index 3a749095b955e..827c729e16150 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -231,8 +231,8 @@ benchmarks! {
 	// first time after a new schedule was deployed: For every new schedule a contract needs
 	// to re-run the instrumentation once.
 	reinstrument {
-		let c in 0 .. T::Schedule::get().limits.code_len / 1024;
-		let WasmModule { code, hash, .. } = WasmModule::<T>::sized(c * 1024, Location::Call);
+		let c in 0 .. T::Schedule::get().limits.code_len;
+		let WasmModule { code, hash, .. } = WasmModule::<T>::sized(c, Location::Call);
 		Contracts::<T>::store_code_raw(code, whitelisted_caller())?;
 		let schedule = T::Schedule::get();
 		let mut gas_meter = GasMeter::new(Weight::MAX);
@@ -241,15 +241,15 @@ benchmarks! {
 		Contracts::<T>::reinstrument_module(&mut module, &schedule)?;
 	}
 
-	// This benchmarks the overhead of loading a code of size `c` kb from storage and into
+	// This benchmarks the overhead of loading a code of size `c` byte from storage and into
 	// the sandbox. This does **not** include the actual execution for which the gas meter
 	// is responsible. This is achieved by generating all code to the `deploy` function
 	// which is in the wasm module but not executed on `call`.
 	// The results are supposed to be used as `call_with_code_kb(c) - call_with_code_kb(0)`.
-	call_with_code_kb {
-		let c in 0 .. T::Schedule::get().limits.code_len / 1024;
+	call_with_code_per_byte {
+		let c in 0 .. T::Schedule::get().limits.code_len;
 		let instance = Contract::<T>::with_caller(
-			whitelisted_caller(), WasmModule::sized(c * 1024, Location::Deploy), vec![],
+			whitelisted_caller(), WasmModule::sized(c, Location::Deploy), vec![],
 		)?;
 		let value = T::Currency::minimum_balance();
 		let origin = RawOrigin::Signed(instance.caller.clone());
@@ -271,13 +271,13 @@ benchmarks! {
 	// We cannot let `c` grow to the maximum code size because the code is not allowed
 	// to be larger than the maximum size **after instrumentation**.
 	instantiate_with_code {
-		let c in 0 .. Perbill::from_percent(49).mul_ceil(T::Schedule::get().limits.code_len) / 1024;
-		let s in 0 .. code::max_pages::<T>() * 64;
-		let salt = vec![42u8; (s * 1024) as usize];
+		let c in 0 .. Perbill::from_percent(49).mul_ceil(T::Schedule::get().limits.code_len);
+		let s in 0 .. code::max_pages::<T>() * 64 * 1024;
+		let salt = vec![42u8; s as usize];
 		let value = T::Currency::minimum_balance();
 		let caller = whitelisted_caller();
 		T::Currency::make_free_balance_be(&caller, caller_funding::<T>());
-		let WasmModule { code, hash, .. } = WasmModule::<T>::sized(c * 1024, Location::Call);
+		let WasmModule { code, hash, .. } = WasmModule::<T>::sized(c, Location::Call);
 		let origin = RawOrigin::Signed(caller.clone());
 		let addr = Contracts::<T>::contract_address(&caller, &hash, &salt);
 	}: _(origin, value, Weight::MAX, None, code, vec![], salt)
@@ -299,8 +299,8 @@ benchmarks! {
 	// Instantiate uses a dummy contract constructor to measure the overhead of the instantiate.
 	// `s`: Size of the salt in kilobytes.
 	instantiate {
-		let s in 0 .. code::max_pages::<T>() * 64;
-		let salt = vec![42u8; (s * 1024) as usize];
+		let s in 0 .. code::max_pages::<T>() * 64 * 1024;
+		let salt = vec![42u8; s as usize];
 		let value = T::Currency::minimum_balance();
 		let caller = whitelisted_caller();
 		T::Currency::make_free_balance_be(&caller, caller_funding::<T>());
@@ -360,10 +360,10 @@ benchmarks! {
 	// We cannot let `c` grow to the maximum code size because the code is not allowed
 	// to be larger than the maximum size **after instrumentation**.
 	upload_code {
-		let c in 0 .. Perbill::from_percent(50).mul_ceil(T::Schedule::get().limits.code_len / 1024);
+		let c in 0 .. Perbill::from_percent(50).mul_ceil(T::Schedule::get().limits.code_len);
 		let caller = whitelisted_caller();
 		T::Currency::make_free_balance_be(&caller, caller_funding::<T>());
-		let WasmModule { code, hash, .. } = WasmModule::<T>::sized(c * 1024, Location::Call);
+		let WasmModule { code, hash, .. } = WasmModule::<T>::sized(c, Location::Call);
 		let origin = RawOrigin::Signed(caller.clone());
 	}: _(origin, code, None)
 	verify {
diff --git a/frame/contracts/src/lib.rs b/frame/contracts/src/lib.rs
index 9e7b61301e7de..037e3f1d33ae3 100644
--- a/frame/contracts/src/lib.rs
+++ b/frame/contracts/src/lib.rs
@@ -410,10 +410,7 @@ pub mod pallet {
 		/// - The `value` is transferred to the new account.
 		/// - The `deploy` function is executed in the context of the newly-created account.
 		#[pallet::weight(
-			T::WeightInfo::instantiate_with_code(
-				code.len() as u32 / 1024,
-				salt.len() as u32 / 1024,
-			)
+			T::WeightInfo::instantiate_with_code(code.len() as u32, salt.len() as u32)
 			.saturating_add(*gas_limit)
 		)]
 		pub fn instantiate_with_code(
@@ -445,7 +442,7 @@ pub mod pallet {
 			}
 			output.gas_meter.into_dispatch_result(
 				output.result.map(|(_address, result)| result),
-				T::WeightInfo::instantiate_with_code(code_len / 1024, salt_len / 1024),
+				T::WeightInfo::instantiate_with_code(code_len, salt_len),
 			)
 		}
 
@@ -455,7 +452,7 @@ pub mod pallet {
 		/// code deployment step. Instead, the `code_hash` of an on-chain deployed wasm binary
 		/// must be supplied.
 		#[pallet::weight(
-			T::WeightInfo::instantiate(salt.len() as u32 / 1024).saturating_add(*gas_limit)
+			T::WeightInfo::instantiate(salt.len() as u32).saturating_add(*gas_limit)
 		)]
 		pub fn instantiate(
 			origin: OriginFor<T>,
@@ -485,7 +482,7 @@ pub mod pallet {
 			}
 			output.gas_meter.into_dispatch_result(
 				output.result.map(|(_address, output)| output),
-				T::WeightInfo::instantiate(salt_len / 1024),
+				T::WeightInfo::instantiate(salt_len),
 			)
 		}
 
@@ -505,7 +502,7 @@ pub mod pallet {
 		/// To avoid this situation a constructor could employ access control so that it can
 		/// only be instantiated by permissioned entities. The same is true when uploading
 		/// through [`Self::instantiate_with_code`].
-		#[pallet::weight(T::WeightInfo::upload_code(code.len() as u32 / 1024))]
+		#[pallet::weight(T::WeightInfo::upload_code(code.len() as u32))]
 		pub fn upload_code(
 			origin: OriginFor<T>,
 			code: Vec<u8>,
diff --git a/frame/contracts/src/tests.rs b/frame/contracts/src/tests.rs
index 486e84da75471..9ea23e974b21d 100644
--- a/frame/contracts/src/tests.rs
+++ b/frame/contracts/src/tests.rs
@@ -1998,7 +1998,7 @@ fn reinstrument_does_charge() {
 		assert!(result2.gas_consumed > result1.gas_consumed);
 		assert_eq!(
 			result2.gas_consumed,
-			result1.gas_consumed + <Test as Config>::WeightInfo::reinstrument(code_len / 1024),
+			result1.gas_consumed + <Test as Config>::WeightInfo::reinstrument(code_len),
 		);
 	});
 }
diff --git a/frame/contracts/src/wasm/code_cache.rs b/frame/contracts/src/wasm/code_cache.rs
index 9fc49ac9a502d..ee5cdd5307214 100644
--- a/frame/contracts/src/wasm/code_cache.rs
+++ b/frame/contracts/src/wasm/code_cache.rs
@@ -216,9 +216,9 @@ impl<T: Config> Token<T> for CodeToken {
 		// point because when charging the general weight for calling the contract we not know the
 		// size of the contract.
 		match *self {
-			Reinstrument(len) => T::WeightInfo::reinstrument(len / 1024),
-			Load(len) => T::WeightInfo::call_with_code_kb(len / 1024)
-				.saturating_sub(T::WeightInfo::call_with_code_kb(0)),
+			Reinstrument(len) => T::WeightInfo::reinstrument(len),
+			Load(len) => T::WeightInfo::call_with_code_per_byte(len)
+				.saturating_sub(T::WeightInfo::call_with_code_per_byte(0)),
 		}
 	}
 }
diff --git a/frame/contracts/src/weights.rs b/frame/contracts/src/weights.rs
index c43e98bb8ac4b..fd32c247ba729 100644
--- a/frame/contracts/src/weights.rs
+++ b/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 4.0.0-dev
-//! DATE: 2022-02-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-02-16, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -48,7 +48,7 @@ pub trait WeightInfo {
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight;
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight;
 	fn reinstrument(c: u32, ) -> Weight;
-	fn call_with_code_kb(c: u32, ) -> Weight;
+	fn call_with_code_per_byte(c: u32, ) -> Weight;
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight;
 	fn instantiate(s: u32, ) -> Weight;
 	fn call() -> Weight;
@@ -160,32 +160,32 @@ pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts DeletionQueue (r:1 w:0)
 	fn on_initialize() -> Weight {
-		(1_560_000 as Weight)
+		(1_588_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
-		(7_843_000 as Weight)
+		(6_994_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((749_000 as Weight).saturating_mul(k as Weight))
+			.saturating_add((743_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)))
 	}
 	// Storage: Contracts DeletionQueue (r:1 w:0)
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
-		(3_228_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((2_257_000 as Weight).saturating_mul(q as Weight))
+		(2_831_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((2_232_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))
 	}
 	// Storage: Contracts PristineCode (r:1 w:0)
 	// Storage: Contracts CodeStorage (r:0 w:1)
 	fn reinstrument(c: u32, ) -> Weight {
-		(20_531_000 as Weight)
-			// Standard Error: 34_000
-			.saturating_add((66_014_000 as Weight).saturating_mul(c as Weight))
+		(17_839_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((64_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))
 	}
@@ -193,10 +193,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System Account (r:1 w:1)
-	fn call_with_code_kb(c: u32, ) -> Weight {
-		(295_703_000 as Weight)
-			// Standard Error: 53_000
-			.saturating_add((57_661_000 as Weight).saturating_mul(c as Weight))
+	fn call_with_code_per_byte(c: u32, ) -> Weight {
+		(222_400_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((56_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))
 	}
@@ -208,11 +208,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts PristineCode (r:0 w:1)
 	// Storage: Contracts OwnerInfoOf (r:0 w:1)
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight {
-		(332_572_000 as Weight)
-			// Standard Error: 125_000
-			.saturating_add((149_095_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 7_000
-			.saturating_add((1_779_000 as Weight).saturating_mul(s as Weight))
+		(283_144_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((140_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 0
+			.saturating_add((2_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(6 as Weight))
 	}
@@ -223,9 +223,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:1 w:1)
 	// Storage: Contracts OwnerInfoOf (r:1 w:1)
 	fn instantiate(s: u32, ) -> Weight {
-		(222_992_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((1_759_000 as Weight).saturating_mul(s as Weight))
+		(171_794_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(5 as Weight))
 	}
@@ -234,7 +234,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System Account (r:1 w:1)
 	fn call() -> Weight {
-		(189_003_000 as Weight)
+		(140_234_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
@@ -242,9 +242,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts PristineCode (r:0 w:1)
 	// Storage: Contracts OwnerInfoOf (r:0 w:1)
 	fn upload_code(c: u32, ) -> Weight {
-		(52_521_000 as Weight)
-			// Standard Error: 36_000
-			.saturating_add((66_486_000 as Weight).saturating_mul(c as Weight))
+		(49_467_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((66_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
@@ -252,7 +252,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:0 w:1)
 	// Storage: Contracts PristineCode (r:0 w:1)
 	fn remove_code() -> Weight {
-		(24_705_000 as Weight)
+		(24_915_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
@@ -261,9 +261,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_caller(r: u32, ) -> Weight {
-		(300_165_000 as Weight)
-			// Standard Error: 125_000
-			.saturating_add((49_828_000 as Weight).saturating_mul(r as Weight))
+		(218_957_000 as Weight)
+			// Standard Error: 114_000
+			.saturating_add((49_881_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))
 	}
@@ -272,9 +272,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_is_contract(r: u32, ) -> Weight {
-		(179_488_000 as Weight)
-			// Standard Error: 718_000
-			.saturating_add((375_855_000 as Weight).saturating_mul(r as Weight))
+		(76_490_000 as Weight)
+			// Standard Error: 856_000
+			.saturating_add((375_305_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))
@@ -284,9 +284,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_caller_is_origin(r: u32, ) -> Weight {
-		(295_198_000 as Weight)
-			// Standard Error: 79_000
-			.saturating_add((21_948_000 as Weight).saturating_mul(r as Weight))
+		(213_485_000 as Weight)
+			// Standard Error: 76_000
+			.saturating_add((22_020_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))
 	}
@@ -295,9 +295,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_address(r: u32, ) -> Weight {
-		(300_366_000 as Weight)
-			// Standard Error: 111_000
-			.saturating_add((49_435_000 as Weight).saturating_mul(r as Weight))
+		(218_468_000 as Weight)
+			// Standard Error: 108_000
+			.saturating_add((49_457_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))
 	}
@@ -306,9 +306,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(299_800_000 as Weight)
-			// Standard Error: 87_000
-			.saturating_add((49_002_000 as Weight).saturating_mul(r as Weight))
+		(218_950_000 as Weight)
+			// Standard Error: 99_000
+			.saturating_add((48_859_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))
 	}
@@ -317,9 +317,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_balance(r: u32, ) -> Weight {
-		(303_057_000 as Weight)
-			// Standard Error: 175_000
-			.saturating_add((139_293_000 as Weight).saturating_mul(r as Weight))
+		(226_714_000 as Weight)
+			// Standard Error: 111_000
+			.saturating_add((141_924_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))
 	}
@@ -328,9 +328,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(299_754_000 as Weight)
-			// Standard Error: 93_000
-			.saturating_add((48_945_000 as Weight).saturating_mul(r as Weight))
+		(216_673_000 as Weight)
+			// Standard Error: 90_000
+			.saturating_add((49_367_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))
 	}
@@ -339,9 +339,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(302_229_000 as Weight)
-			// Standard Error: 128_000
-			.saturating_add((49_007_000 as Weight).saturating_mul(r as Weight))
+		(215_859_000 as Weight)
+			// Standard Error: 104_000
+			.saturating_add((49_334_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))
 	}
@@ -350,9 +350,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_block_number(r: u32, ) -> Weight {
-		(300_772_000 as Weight)
-			// Standard Error: 114_000
-			.saturating_add((48_794_000 as Weight).saturating_mul(r as Weight))
+		(216_419_000 as Weight)
+			// Standard Error: 109_000
+			.saturating_add((49_417_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))
 	}
@@ -361,9 +361,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_now(r: u32, ) -> Weight {
-		(301_936_000 as Weight)
-			// Standard Error: 119_000
-			.saturating_add((48_839_000 as Weight).saturating_mul(r as Weight))
+		(218_799_000 as Weight)
+			// Standard Error: 108_000
+			.saturating_add((48_631_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))
 	}
@@ -373,9 +373,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: TransactionPayment NextFeeMultiplier (r:1 w:0)
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(304_935_000 as Weight)
-			// Standard Error: 146_000
-			.saturating_add((121_871_000 as Weight).saturating_mul(r as Weight))
+		(215_968_000 as Weight)
+			// Standard Error: 147_000
+			.saturating_add((122_978_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))
 	}
@@ -384,9 +384,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_gas(r: u32, ) -> Weight {
-		(178_176_000 as Weight)
-			// Standard Error: 52_000
-			.saturating_add((24_960_000 as Weight).saturating_mul(r as Weight))
+		(127_183_000 as Weight)
+			// Standard Error: 35_000
+			.saturating_add((24_523_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))
 	}
@@ -395,9 +395,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_input(r: u32, ) -> Weight {
-		(297_394_000 as Weight)
-			// Standard Error: 140_000
-			.saturating_add((49_199_000 as Weight).saturating_mul(r as Weight))
+		(217_535_000 as Weight)
+			// Standard Error: 91_000
+			.saturating_add((48_400_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))
 	}
@@ -406,9 +406,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(374_409_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((11_924_000 as Weight).saturating_mul(n as Weight))
+		(297_539_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((11_870_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))
 	}
@@ -417,9 +417,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_return(r: u32, ) -> Weight {
-		(292_278_000 as Weight)
-			// Standard Error: 114_000
-			.saturating_add((1_474_000 as Weight).saturating_mul(r as Weight))
+		(211_807_000 as Weight)
+			// Standard Error: 160_000
+			.saturating_add((1_717_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))
 	}
@@ -428,9 +428,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(294_714_000 as Weight)
+		(213_139_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((230_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((197_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))
 	}
@@ -441,9 +441,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts DeletionQueue (r:1 w:1)
 	// Storage: Contracts OwnerInfoOf (r:1 w:1)
 	fn seal_terminate(r: u32, ) -> Weight {
-		(297_589_000 as Weight)
-			// Standard Error: 2_835_000
-			.saturating_add((53_498_000 as Weight).saturating_mul(r as Weight))
+		(215_292_000 as Weight)
+			// Standard Error: 390_000
+			.saturating_add((52_831_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))
@@ -455,9 +455,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: RandomnessCollectiveFlip RandomMaterial (r:1 w:0)
 	fn seal_random(r: u32, ) -> Weight {
-		(296_371_000 as Weight)
-			// Standard Error: 220_000
-			.saturating_add((160_881_000 as Weight).saturating_mul(r as Weight))
+		(215_802_000 as Weight)
+			// Standard Error: 132_000
+			.saturating_add((159_065_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))
 	}
@@ -466,9 +466,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(308_401_000 as Weight)
-			// Standard Error: 202_000
-			.saturating_add((277_771_000 as Weight).saturating_mul(r as Weight))
+		(225_069_000 as Weight)
+			// Standard Error: 201_000
+			.saturating_add((292_145_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))
 	}
@@ -478,11 +478,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System EventTopics (r:100 w:100)
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(625_100_000 as Weight)
-			// Standard Error: 2_053_000
-			.saturating_add((284_765_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 404_000
-			.saturating_add((85_893_000 as Weight).saturating_mul(n as Weight))
+		(519_617_000 as Weight)
+			// Standard Error: 1_751_000
+			.saturating_add((290_832_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 345_000
+			.saturating_add((82_584_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))
@@ -493,17 +493,17 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_debug_message(r: u32, ) -> Weight {
-		(182_141_000 as Weight)
-			// Standard Error: 134_000
-			.saturating_add((41_928_000 as Weight).saturating_mul(r as Weight))
+		(132_245_000 as Weight)
+			// Standard Error: 75_000
+			.saturating_add((41_274_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))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(139_030_000 as Weight)
-			// Standard Error: 1_038_000
-			.saturating_add((405_168_000 as Weight).saturating_mul(r as Weight))
+		(48_288_000 as Weight)
+			// Standard Error: 1_024_000
+			.saturating_add((408_264_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))
@@ -511,25 +511,25 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_set_storage_per_new_kb(n: u32, ) -> Weight {
-		(689_591_000 as Weight)
-			// Standard Error: 275_000
-			.saturating_add((31_438_000 as Weight).saturating_mul(n as Weight))
+		(607_246_000 as Weight)
+			// Standard Error: 252_000
+			.saturating_add((28_722_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(105 as Weight))
 			.saturating_add(T::DbWeight::get().writes(103 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_set_storage_per_old_kb(n: u32, ) -> Weight {
-		(709_965_000 as Weight)
-			// Standard Error: 340_000
-			.saturating_add((11_182_000 as Weight).saturating_mul(n as Weight))
+		(623_983_000 as Weight)
+			// Standard Error: 305_000
+			.saturating_add((11_374_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(105 as Weight))
 			.saturating_add(T::DbWeight::get().writes(103 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_clear_storage(r: u32, ) -> Weight {
-		(169_937_000 as Weight)
-			// Standard Error: 883_000
-			.saturating_add((389_090_000 as Weight).saturating_mul(r as Weight))
+		(91_727_000 as Weight)
+			// Standard Error: 837_000
+			.saturating_add((383_577_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
@@ -537,51 +537,51 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_clear_storage_per_kb(n: u32, ) -> Weight {
-		(695_589_000 as Weight)
-			// Standard Error: 268_000
-			.saturating_add((10_530_000 as Weight).saturating_mul(n as Weight))
+		(604_749_000 as Weight)
+			// Standard Error: 251_000
+			.saturating_add((11_086_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(105 as Weight))
 			.saturating_add(T::DbWeight::get().writes(103 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_get_storage(r: u32, ) -> Weight {
-		(195_080_000 as Weight)
-			// Standard Error: 607_000
-			.saturating_add((328_903_000 as Weight).saturating_mul(r as Weight))
+		(107_805_000 as Weight)
+			// Standard Error: 722_000
+			.saturating_add((326_494_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))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(647_422_000 as Weight)
-			// Standard Error: 361_000
-			.saturating_add((68_849_000 as Weight).saturating_mul(n as Weight))
+		(564_604_000 as Weight)
+			// Standard Error: 360_000
+			.saturating_add((65_184_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(104 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_contains_storage(r: u32, ) -> Weight {
-		(198_907_000 as Weight)
-			// Standard Error: 658_000
-			.saturating_add((295_368_000 as Weight).saturating_mul(r as Weight))
+		(122_105_000 as Weight)
+			// Standard Error: 560_000
+			.saturating_add((291_458_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))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_contains_storage_per_kb(n: u32, ) -> Weight {
-		(599_284_000 as Weight)
-			// Standard Error: 243_000
-			.saturating_add((9_923_000 as Weight).saturating_mul(n as Weight))
+		(512_580_000 as Weight)
+			// Standard Error: 245_000
+			.saturating_add((10_171_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(104 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_take_storage(r: u32, ) -> Weight {
-		(170_700_000 as Weight)
-			// Standard Error: 887_000
-			.saturating_add((422_448_000 as Weight).saturating_mul(r as Weight))
+		(81_220_000 as Weight)
+			// Standard Error: 933_000
+			.saturating_add((418_532_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
@@ -589,9 +589,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_take_storage_per_kb(n: u32, ) -> Weight {
-		(743_584_000 as Weight)
-			// Standard Error: 403_000
-			.saturating_add((69_763_000 as Weight).saturating_mul(n as Weight))
+		(652_330_000 as Weight)
+			// Standard Error: 357_000
+			.saturating_add((65_711_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(105 as Weight))
 			.saturating_add(T::DbWeight::get().writes(103 as Weight))
 	}
@@ -600,9 +600,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_transfer(r: u32, ) -> Weight {
-		(208_815_000 as Weight)
-			// Standard Error: 1_078_000
-			.saturating_add((1_719_660_000 as Weight).saturating_mul(r as Weight))
+		(126_544_000 as Weight)
+			// Standard Error: 1_198_000
+			.saturating_add((1_796_593_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 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))
@@ -614,8 +614,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 3_471_000
-			.saturating_add((27_917_429_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 3_033_000
+			.saturating_add((19_788_005_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 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))
@@ -627,8 +627,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_delegate_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 13_012_000
-			.saturating_add((28_044_371_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 6_663_000
+			.saturating_add((19_835_985_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads((99 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -637,11 +637,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:2 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_call_per_transfer_clone_kb(t: u32, c: u32, ) -> Weight {
-		(15_964_304_000 as Weight)
-			// Standard Error: 19_327_000
-			.saturating_add((1_629_626_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 8_000
-			.saturating_add((11_992_000 as Weight).saturating_mul(c as Weight))
+		(10_957_494_000 as Weight)
+			// Standard Error: 13_908_000
+			.saturating_add((1_622_630_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 6_000
+			.saturating_add((11_960_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(105 as Weight))
 			.saturating_add(T::DbWeight::get().reads((101 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(T::DbWeight::get().writes(101 as Weight))
@@ -655,8 +655,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts OwnerInfoOf (r:100 w:100)
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 50_849_000
-			.saturating_add((35_608_311_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 48_191_000
+			.saturating_add((27_587_375_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().reads((400 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
@@ -669,11 +669,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts AccountCounter (r:1 w:1)
 	// Storage: Contracts OwnerInfoOf (r:1 w:1)
 	fn seal_instantiate_per_transfer_salt_kb(t: u32, s: u32, ) -> Weight {
-		(19_455_191_000 as Weight)
-			// Standard Error: 57_478_000
-			.saturating_add((786_148_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 27_000
-			.saturating_add((160_385_000 as Weight).saturating_mul(s as Weight))
+		(14_504_226_000 as Weight)
+			// Standard Error: 66_350_000
+			.saturating_add((912_874_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 31_000
+			.saturating_add((157_415_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(207 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(T::DbWeight::get().writes(205 as Weight))
@@ -684,9 +684,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(294_686_000 as Weight)
-			// Standard Error: 123_000
-			.saturating_add((81_172_000 as Weight).saturating_mul(r as Weight))
+		(216_771_000 as Weight)
+			// Standard Error: 127_000
+			.saturating_add((79_994_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))
 	}
@@ -695,9 +695,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(276_895_000 as Weight)
-			// Standard Error: 35_000
-			.saturating_add((469_007_000 as Weight).saturating_mul(n as Weight))
+		(376_960_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((465_507_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))
 	}
@@ -706,9 +706,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(295_476_000 as Weight)
-			// Standard Error: 127_000
-			.saturating_add((91_822_000 as Weight).saturating_mul(r as Weight))
+		(212_554_000 as Weight)
+			// Standard Error: 129_000
+			.saturating_add((92_073_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))
 	}
@@ -717,9 +717,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(402_456_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((311_103_000 as Weight).saturating_mul(n as Weight))
+		(298_638_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((307_231_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))
 	}
@@ -728,9 +728,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(296_702_000 as Weight)
-			// Standard Error: 142_000
-			.saturating_add((64_431_000 as Weight).saturating_mul(r as Weight))
+		(216_274_000 as Weight)
+			// Standard Error: 100_000
+			.saturating_add((64_205_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))
 	}
@@ -739,9 +739,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(375_322_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((124_338_000 as Weight).saturating_mul(n as Weight))
+		(294_478_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((120_405_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))
 	}
@@ -750,9 +750,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(294_158_000 as Weight)
-			// Standard Error: 148_000
-			.saturating_add((64_474_000 as Weight).saturating_mul(r as Weight))
+		(215_874_000 as Weight)
+			// Standard Error: 115_000
+			.saturating_add((63_402_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))
 	}
@@ -761,9 +761,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(390_049_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((124_330_000 as Weight).saturating_mul(n as Weight))
+		(288_361_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((120_795_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))
 	}
@@ -772,9 +772,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_ecdsa_recover(r: u32, ) -> Weight {
-		(233_346_000 as Weight)
-			// Standard Error: 1_355_000
-			.saturating_add((15_405_070_000 as Weight).saturating_mul(r as Weight))
+		(142_940_000 as Weight)
+			// Standard Error: 1_317_000
+			.saturating_add((15_385_437_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))
 	}
@@ -785,265 +785,265 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts OwnerInfoOf (r:36 w:36)
 	fn seal_set_code_hash(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_158_000
-			.saturating_add((932_937_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 1_981_000
+			.saturating_add((943_500_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads((99 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes((99 as Weight).saturating_mul(r as Weight)))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(119_148_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((585_000 as Weight).saturating_mul(r as Weight))
+		(74_672_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((595_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(118_413_000 as Weight)
-			// Standard Error: 3_000
+		(74_346_000 as Weight)
+			// Standard Error: 1_000
 			.saturating_add((1_324_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(118_700_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_415_000 as Weight).saturating_mul(r as Weight))
+		(74_149_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_438_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(118_736_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_777_000 as Weight).saturating_mul(r as Weight))
+		(74_186_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((1_789_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(118_277_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((1_909_000 as Weight).saturating_mul(r as Weight))
+		(74_040_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_898_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(118_360_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((895_000 as Weight).saturating_mul(r as Weight))
+		(73_909_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((910_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(118_142_000 as Weight)
+		(73_873_000 as Weight)
 			// Standard Error: 3_000
-			.saturating_add((1_439_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((1_446_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(118_239_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((1_553_000 as Weight).saturating_mul(r as Weight))
+		(73_438_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((1_582_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(120_801_000 as Weight)
+		(75_993_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((4_000 as Weight).saturating_mul(e as Weight))
+			.saturating_add((8_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(118_536_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((17_082_000 as Weight).saturating_mul(r as Weight))
+		(73_218_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((17_167_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(130_467_000 as Weight)
+		(85_517_000 as Weight)
 			// Standard Error: 30_000
-			.saturating_add((28_199_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((28_885_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(164_624_000 as Weight)
+		(119_915_000 as Weight)
 			// Standard Error: 3_000
-			.saturating_add((901_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((918_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(119_422_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((617_000 as Weight).saturating_mul(r as Weight))
+		(74_718_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((618_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(119_747_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((668_000 as Weight).saturating_mul(r as Weight))
+		(74_800_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((684_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(119_410_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((898_000 as Weight).saturating_mul(r as Weight))
+		(74_590_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((911_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(121_657_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_160_000 as Weight).saturating_mul(r as Weight))
+		(76_776_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_159_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(121_531_000 as Weight)
-			// Standard Error: 1_000
+		(77_283_000 as Weight)
+			// Standard Error: 2_000
 			.saturating_add((1_367_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(118_340_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((674_000 as Weight).saturating_mul(r as Weight))
+		(74_555_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((655_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(118_114_000 as Weight)
-			// Standard Error: 194_000
-			.saturating_add((229_474_000 as Weight).saturating_mul(r as Weight))
+		(73_693_000 as Weight)
+			// Standard Error: 131_000
+			.saturating_add((181_095_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(119_160_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((890_000 as Weight).saturating_mul(r as Weight))
+		(74_457_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((903_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(119_199_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((893_000 as Weight).saturating_mul(r as Weight))
+		(74_287_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((907_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(119_103_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((885_000 as Weight).saturating_mul(r as Weight))
+		(74_603_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((892_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(119_033_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((917_000 as Weight).saturating_mul(r as Weight))
+		(74_383_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((920_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(118_950_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((879_000 as Weight).saturating_mul(r as Weight))
+		(74_020_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((896_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(118_534_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((888_000 as Weight).saturating_mul(r as Weight))
+		(74_108_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((889_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(119_108_000 as Weight)
+		(74_197_000 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((881_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((901_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(118_677_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((1_360_000 as Weight).saturating_mul(r as Weight))
+		(73_941_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_377_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(118_769_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((1_355_000 as Weight).saturating_mul(r as Weight))
+		(73_891_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((1_383_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(118_690_000 as Weight)
+		(74_253_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((1_356_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((1_369_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(118_899_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_350_000 as Weight).saturating_mul(r as Weight))
+		(74_125_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_371_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(118_519_000 as Weight)
-			// Standard Error: 6_000
-			.saturating_add((1_376_000 as Weight).saturating_mul(r as Weight))
+		(74_144_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_369_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(119_315_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((1_347_000 as Weight).saturating_mul(r as Weight))
+		(74_170_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((1_375_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(118_171_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((1_377_000 as Weight).saturating_mul(r as Weight))
+		(74_164_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((1_370_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(118_581_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_367_000 as Weight).saturating_mul(r as Weight))
+		(74_166_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_376_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(118_673_000 as Weight)
+		(73_920_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((1_355_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((1_381_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(118_618_000 as Weight)
+		(74_691_000 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((1_357_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((1_356_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(118_569_000 as Weight)
+		(74_198_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((1_335_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((1_347_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(118_261_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((1_363_000 as Weight).saturating_mul(r as Weight))
+		(74_064_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_358_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(118_542_000 as Weight)
-			// Standard Error: 2_000
+		(75_744_000 as Weight)
+			// Standard Error: 8_000
 			.saturating_add((1_338_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(118_648_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((1_993_000 as Weight).saturating_mul(r as Weight))
+		(74_300_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((2_003_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(118_378_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((2_057_000 as Weight).saturating_mul(r as Weight))
+		(74_001_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((2_051_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(118_813_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((1_995_000 as Weight).saturating_mul(r as Weight))
+		(74_132_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_994_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(118_697_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((2_025_000 as Weight).saturating_mul(r as Weight))
+		(74_241_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((2_070_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(118_838_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_332_000 as Weight).saturating_mul(r as Weight))
+		(74_069_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_351_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(118_641_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((1_347_000 as Weight).saturating_mul(r as Weight))
+		(73_978_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((1_355_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(118_551_000 as Weight)
+		(74_053_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((1_338_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((1_351_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(118_603_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((1_352_000 as Weight).saturating_mul(r as Weight))
+		(73_891_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((1_371_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(118_885_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_345_000 as Weight).saturating_mul(r as Weight))
+		(74_062_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_366_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(118_602_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((1_354_000 as Weight).saturating_mul(r as Weight))
+		(74_347_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_360_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(118_733_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((1_349_000 as Weight).saturating_mul(r as Weight))
+		(74_116_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_366_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(118_920_000 as Weight)
+		(73_837_000 as Weight)
 			// Standard Error: 3_000
-			.saturating_add((1_348_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((1_377_000 as Weight).saturating_mul(r as Weight))
 	}
 }
 
@@ -1051,32 +1051,32 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 impl WeightInfo for () {
 	// Storage: Contracts DeletionQueue (r:1 w:0)
 	fn on_initialize() -> Weight {
-		(1_560_000 as Weight)
+		(1_588_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
-		(7_843_000 as Weight)
+		(6_994_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((749_000 as Weight).saturating_mul(k as Weight))
+			.saturating_add((743_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)))
 	}
 	// Storage: Contracts DeletionQueue (r:1 w:0)
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
-		(3_228_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((2_257_000 as Weight).saturating_mul(q as Weight))
+		(2_831_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((2_232_000 as Weight).saturating_mul(q as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Contracts PristineCode (r:1 w:0)
 	// Storage: Contracts CodeStorage (r:0 w:1)
 	fn reinstrument(c: u32, ) -> Weight {
-		(20_531_000 as Weight)
-			// Standard Error: 34_000
-			.saturating_add((66_014_000 as Weight).saturating_mul(c as Weight))
+		(17_839_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((64_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1084,10 +1084,10 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System Account (r:1 w:1)
-	fn call_with_code_kb(c: u32, ) -> Weight {
-		(295_703_000 as Weight)
-			// Standard Error: 53_000
-			.saturating_add((57_661_000 as Weight).saturating_mul(c as Weight))
+	fn call_with_code_per_byte(c: u32, ) -> Weight {
+		(222_400_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((56_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
@@ -1099,11 +1099,11 @@ impl WeightInfo for () {
 	// Storage: Contracts PristineCode (r:0 w:1)
 	// Storage: Contracts OwnerInfoOf (r:0 w:1)
 	fn instantiate_with_code(c: u32, s: u32, ) -> Weight {
-		(332_572_000 as Weight)
-			// Standard Error: 125_000
-			.saturating_add((149_095_000 as Weight).saturating_mul(c as Weight))
-			// Standard Error: 7_000
-			.saturating_add((1_779_000 as Weight).saturating_mul(s as Weight))
+		(283_144_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((140_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 0
+			.saturating_add((2_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(6 as Weight))
 	}
@@ -1114,9 +1114,9 @@ impl WeightInfo for () {
 	// Storage: System Account (r:1 w:1)
 	// Storage: Contracts OwnerInfoOf (r:1 w:1)
 	fn instantiate(s: u32, ) -> Weight {
-		(222_992_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((1_759_000 as Weight).saturating_mul(s as Weight))
+		(171_794_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((2_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(5 as Weight))
 	}
@@ -1125,7 +1125,7 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System Account (r:1 w:1)
 	fn call() -> Weight {
-		(189_003_000 as Weight)
+		(140_234_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
@@ -1133,9 +1133,9 @@ impl WeightInfo for () {
 	// Storage: Contracts PristineCode (r:0 w:1)
 	// Storage: Contracts OwnerInfoOf (r:0 w:1)
 	fn upload_code(c: u32, ) -> Weight {
-		(52_521_000 as Weight)
-			// Standard Error: 36_000
-			.saturating_add((66_486_000 as Weight).saturating_mul(c as Weight))
+		(49_467_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((66_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
@@ -1143,7 +1143,7 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:0 w:1)
 	// Storage: Contracts PristineCode (r:0 w:1)
 	fn remove_code() -> Weight {
-		(24_705_000 as Weight)
+		(24_915_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
@@ -1152,9 +1152,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_caller(r: u32, ) -> Weight {
-		(300_165_000 as Weight)
-			// Standard Error: 125_000
-			.saturating_add((49_828_000 as Weight).saturating_mul(r as Weight))
+		(218_957_000 as Weight)
+			// Standard Error: 114_000
+			.saturating_add((49_881_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1163,9 +1163,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_is_contract(r: u32, ) -> Weight {
-		(179_488_000 as Weight)
-			// Standard Error: 718_000
-			.saturating_add((375_855_000 as Weight).saturating_mul(r as Weight))
+		(76_490_000 as Weight)
+			// Standard Error: 856_000
+			.saturating_add((375_305_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))
@@ -1175,9 +1175,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_caller_is_origin(r: u32, ) -> Weight {
-		(295_198_000 as Weight)
-			// Standard Error: 79_000
-			.saturating_add((21_948_000 as Weight).saturating_mul(r as Weight))
+		(213_485_000 as Weight)
+			// Standard Error: 76_000
+			.saturating_add((22_020_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1186,9 +1186,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_address(r: u32, ) -> Weight {
-		(300_366_000 as Weight)
-			// Standard Error: 111_000
-			.saturating_add((49_435_000 as Weight).saturating_mul(r as Weight))
+		(218_468_000 as Weight)
+			// Standard Error: 108_000
+			.saturating_add((49_457_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1197,9 +1197,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_gas_left(r: u32, ) -> Weight {
-		(299_800_000 as Weight)
-			// Standard Error: 87_000
-			.saturating_add((49_002_000 as Weight).saturating_mul(r as Weight))
+		(218_950_000 as Weight)
+			// Standard Error: 99_000
+			.saturating_add((48_859_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1208,9 +1208,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_balance(r: u32, ) -> Weight {
-		(303_057_000 as Weight)
-			// Standard Error: 175_000
-			.saturating_add((139_293_000 as Weight).saturating_mul(r as Weight))
+		(226_714_000 as Weight)
+			// Standard Error: 111_000
+			.saturating_add((141_924_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1219,9 +1219,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_value_transferred(r: u32, ) -> Weight {
-		(299_754_000 as Weight)
-			// Standard Error: 93_000
-			.saturating_add((48_945_000 as Weight).saturating_mul(r as Weight))
+		(216_673_000 as Weight)
+			// Standard Error: 90_000
+			.saturating_add((49_367_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1230,9 +1230,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_minimum_balance(r: u32, ) -> Weight {
-		(302_229_000 as Weight)
-			// Standard Error: 128_000
-			.saturating_add((49_007_000 as Weight).saturating_mul(r as Weight))
+		(215_859_000 as Weight)
+			// Standard Error: 104_000
+			.saturating_add((49_334_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1241,9 +1241,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_block_number(r: u32, ) -> Weight {
-		(300_772_000 as Weight)
-			// Standard Error: 114_000
-			.saturating_add((48_794_000 as Weight).saturating_mul(r as Weight))
+		(216_419_000 as Weight)
+			// Standard Error: 109_000
+			.saturating_add((49_417_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1252,9 +1252,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_now(r: u32, ) -> Weight {
-		(301_936_000 as Weight)
-			// Standard Error: 119_000
-			.saturating_add((48_839_000 as Weight).saturating_mul(r as Weight))
+		(218_799_000 as Weight)
+			// Standard Error: 108_000
+			.saturating_add((48_631_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1264,9 +1264,9 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: TransactionPayment NextFeeMultiplier (r:1 w:0)
 	fn seal_weight_to_fee(r: u32, ) -> Weight {
-		(304_935_000 as Weight)
-			// Standard Error: 146_000
-			.saturating_add((121_871_000 as Weight).saturating_mul(r as Weight))
+		(215_968_000 as Weight)
+			// Standard Error: 147_000
+			.saturating_add((122_978_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1275,9 +1275,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_gas(r: u32, ) -> Weight {
-		(178_176_000 as Weight)
-			// Standard Error: 52_000
-			.saturating_add((24_960_000 as Weight).saturating_mul(r as Weight))
+		(127_183_000 as Weight)
+			// Standard Error: 35_000
+			.saturating_add((24_523_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1286,9 +1286,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_input(r: u32, ) -> Weight {
-		(297_394_000 as Weight)
-			// Standard Error: 140_000
-			.saturating_add((49_199_000 as Weight).saturating_mul(r as Weight))
+		(217_535_000 as Weight)
+			// Standard Error: 91_000
+			.saturating_add((48_400_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1297,9 +1297,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_input_per_kb(n: u32, ) -> Weight {
-		(374_409_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((11_924_000 as Weight).saturating_mul(n as Weight))
+		(297_539_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((11_870_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1308,9 +1308,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_return(r: u32, ) -> Weight {
-		(292_278_000 as Weight)
-			// Standard Error: 114_000
-			.saturating_add((1_474_000 as Weight).saturating_mul(r as Weight))
+		(211_807_000 as Weight)
+			// Standard Error: 160_000
+			.saturating_add((1_717_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1319,9 +1319,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_return_per_kb(n: u32, ) -> Weight {
-		(294_714_000 as Weight)
+		(213_139_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((230_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((197_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1332,9 +1332,9 @@ impl WeightInfo for () {
 	// Storage: Contracts DeletionQueue (r:1 w:1)
 	// Storage: Contracts OwnerInfoOf (r:1 w:1)
 	fn seal_terminate(r: u32, ) -> Weight {
-		(297_589_000 as Weight)
-			// Standard Error: 2_835_000
-			.saturating_add((53_498_000 as Weight).saturating_mul(r as Weight))
+		(215_292_000 as Weight)
+			// Standard Error: 390_000
+			.saturating_add((52_831_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))
@@ -1346,9 +1346,9 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: RandomnessCollectiveFlip RandomMaterial (r:1 w:0)
 	fn seal_random(r: u32, ) -> Weight {
-		(296_371_000 as Weight)
-			// Standard Error: 220_000
-			.saturating_add((160_881_000 as Weight).saturating_mul(r as Weight))
+		(215_802_000 as Weight)
+			// Standard Error: 132_000
+			.saturating_add((159_065_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1357,9 +1357,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_deposit_event(r: u32, ) -> Weight {
-		(308_401_000 as Weight)
-			// Standard Error: 202_000
-			.saturating_add((277_771_000 as Weight).saturating_mul(r as Weight))
+		(225_069_000 as Weight)
+			// Standard Error: 201_000
+			.saturating_add((292_145_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1369,11 +1369,11 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System EventTopics (r:100 w:100)
 	fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight {
-		(625_100_000 as Weight)
-			// Standard Error: 2_053_000
-			.saturating_add((284_765_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 404_000
-			.saturating_add((85_893_000 as Weight).saturating_mul(n as Weight))
+		(519_617_000 as Weight)
+			// Standard Error: 1_751_000
+			.saturating_add((290_832_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 345_000
+			.saturating_add((82_584_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))
@@ -1384,17 +1384,17 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_debug_message(r: u32, ) -> Weight {
-		(182_141_000 as Weight)
-			// Standard Error: 134_000
-			.saturating_add((41_928_000 as Weight).saturating_mul(r as Weight))
+		(132_245_000 as Weight)
+			// Standard Error: 75_000
+			.saturating_add((41_274_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_set_storage(r: u32, ) -> Weight {
-		(139_030_000 as Weight)
-			// Standard Error: 1_038_000
-			.saturating_add((405_168_000 as Weight).saturating_mul(r as Weight))
+		(48_288_000 as Weight)
+			// Standard Error: 1_024_000
+			.saturating_add((408_264_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))
@@ -1402,25 +1402,25 @@ impl WeightInfo for () {
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_set_storage_per_new_kb(n: u32, ) -> Weight {
-		(689_591_000 as Weight)
-			// Standard Error: 275_000
-			.saturating_add((31_438_000 as Weight).saturating_mul(n as Weight))
+		(607_246_000 as Weight)
+			// Standard Error: 252_000
+			.saturating_add((28_722_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(105 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(103 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_set_storage_per_old_kb(n: u32, ) -> Weight {
-		(709_965_000 as Weight)
-			// Standard Error: 340_000
-			.saturating_add((11_182_000 as Weight).saturating_mul(n as Weight))
+		(623_983_000 as Weight)
+			// Standard Error: 305_000
+			.saturating_add((11_374_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(105 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(103 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_clear_storage(r: u32, ) -> Weight {
-		(169_937_000 as Weight)
-			// Standard Error: 883_000
-			.saturating_add((389_090_000 as Weight).saturating_mul(r as Weight))
+		(91_727_000 as Weight)
+			// Standard Error: 837_000
+			.saturating_add((383_577_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
@@ -1428,51 +1428,51 @@ impl WeightInfo for () {
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_clear_storage_per_kb(n: u32, ) -> Weight {
-		(695_589_000 as Weight)
-			// Standard Error: 268_000
-			.saturating_add((10_530_000 as Weight).saturating_mul(n as Weight))
+		(604_749_000 as Weight)
+			// Standard Error: 251_000
+			.saturating_add((11_086_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(105 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(103 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_get_storage(r: u32, ) -> Weight {
-		(195_080_000 as Weight)
-			// Standard Error: 607_000
-			.saturating_add((328_903_000 as Weight).saturating_mul(r as Weight))
+		(107_805_000 as Weight)
+			// Standard Error: 722_000
+			.saturating_add((326_494_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))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_get_storage_per_kb(n: u32, ) -> Weight {
-		(647_422_000 as Weight)
-			// Standard Error: 361_000
-			.saturating_add((68_849_000 as Weight).saturating_mul(n as Weight))
+		(564_604_000 as Weight)
+			// Standard Error: 360_000
+			.saturating_add((65_184_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(104 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_contains_storage(r: u32, ) -> Weight {
-		(198_907_000 as Weight)
-			// Standard Error: 658_000
-			.saturating_add((295_368_000 as Weight).saturating_mul(r as Weight))
+		(122_105_000 as Weight)
+			// Standard Error: 560_000
+			.saturating_add((291_458_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))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_contains_storage_per_kb(n: u32, ) -> Weight {
-		(599_284_000 as Weight)
-			// Standard Error: 243_000
-			.saturating_add((9_923_000 as Weight).saturating_mul(n as Weight))
+		(512_580_000 as Weight)
+			// Standard Error: 245_000
+			.saturating_add((10_171_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(104 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_take_storage(r: u32, ) -> Weight {
-		(170_700_000 as Weight)
-			// Standard Error: 887_000
-			.saturating_add((422_448_000 as Weight).saturating_mul(r as Weight))
+		(81_220_000 as Weight)
+			// Standard Error: 933_000
+			.saturating_add((418_532_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
@@ -1480,9 +1480,9 @@ impl WeightInfo for () {
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_take_storage_per_kb(n: u32, ) -> Weight {
-		(743_584_000 as Weight)
-			// Standard Error: 403_000
-			.saturating_add((69_763_000 as Weight).saturating_mul(n as Weight))
+		(652_330_000 as Weight)
+			// Standard Error: 357_000
+			.saturating_add((65_711_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(105 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(103 as Weight))
 	}
@@ -1491,9 +1491,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_transfer(r: u32, ) -> Weight {
-		(208_815_000 as Weight)
-			// Standard Error: 1_078_000
-			.saturating_add((1_719_660_000 as Weight).saturating_mul(r as Weight))
+		(126_544_000 as Weight)
+			// Standard Error: 1_198_000
+			.saturating_add((1_796_593_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
@@ -1505,8 +1505,8 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 3_471_000
-			.saturating_add((27_917_429_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 3_033_000
+			.saturating_add((19_788_005_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
@@ -1518,8 +1518,8 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_delegate_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 13_012_000
-			.saturating_add((28_044_371_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 6_663_000
+			.saturating_add((19_835_985_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads((99 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1528,11 +1528,11 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:2 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_call_per_transfer_clone_kb(t: u32, c: u32, ) -> Weight {
-		(15_964_304_000 as Weight)
-			// Standard Error: 19_327_000
-			.saturating_add((1_629_626_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 8_000
-			.saturating_add((11_992_000 as Weight).saturating_mul(c as Weight))
+		(10_957_494_000 as Weight)
+			// Standard Error: 13_908_000
+			.saturating_add((1_622_630_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 6_000
+			.saturating_add((11_960_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(105 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((101 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(101 as Weight))
@@ -1546,8 +1546,8 @@ impl WeightInfo for () {
 	// Storage: Contracts OwnerInfoOf (r:100 w:100)
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 50_849_000
-			.saturating_add((35_608_311_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 48_191_000
+			.saturating_add((27_587_375_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(6 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((400 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
@@ -1560,11 +1560,11 @@ impl WeightInfo for () {
 	// Storage: Contracts AccountCounter (r:1 w:1)
 	// Storage: Contracts OwnerInfoOf (r:1 w:1)
 	fn seal_instantiate_per_transfer_salt_kb(t: u32, s: u32, ) -> Weight {
-		(19_455_191_000 as Weight)
-			// Standard Error: 57_478_000
-			.saturating_add((786_148_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 27_000
-			.saturating_add((160_385_000 as Weight).saturating_mul(s as Weight))
+		(14_504_226_000 as Weight)
+			// Standard Error: 66_350_000
+			.saturating_add((912_874_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 31_000
+			.saturating_add((157_415_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(207 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(t as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(205 as Weight))
@@ -1575,9 +1575,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_sha2_256(r: u32, ) -> Weight {
-		(294_686_000 as Weight)
-			// Standard Error: 123_000
-			.saturating_add((81_172_000 as Weight).saturating_mul(r as Weight))
+		(216_771_000 as Weight)
+			// Standard Error: 127_000
+			.saturating_add((79_994_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1586,9 +1586,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight {
-		(276_895_000 as Weight)
-			// Standard Error: 35_000
-			.saturating_add((469_007_000 as Weight).saturating_mul(n as Weight))
+		(376_960_000 as Weight)
+			// Standard Error: 24_000
+			.saturating_add((465_507_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1597,9 +1597,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_keccak_256(r: u32, ) -> Weight {
-		(295_476_000 as Weight)
-			// Standard Error: 127_000
-			.saturating_add((91_822_000 as Weight).saturating_mul(r as Weight))
+		(212_554_000 as Weight)
+			// Standard Error: 129_000
+			.saturating_add((92_073_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1608,9 +1608,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight {
-		(402_456_000 as Weight)
-			// Standard Error: 19_000
-			.saturating_add((311_103_000 as Weight).saturating_mul(n as Weight))
+		(298_638_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((307_231_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1619,9 +1619,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_256(r: u32, ) -> Weight {
-		(296_702_000 as Weight)
-			// Standard Error: 142_000
-			.saturating_add((64_431_000 as Weight).saturating_mul(r as Weight))
+		(216_274_000 as Weight)
+			// Standard Error: 100_000
+			.saturating_add((64_205_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1630,9 +1630,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight {
-		(375_322_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((124_338_000 as Weight).saturating_mul(n as Weight))
+		(294_478_000 as Weight)
+			// Standard Error: 18_000
+			.saturating_add((120_405_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1641,9 +1641,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_128(r: u32, ) -> Weight {
-		(294_158_000 as Weight)
-			// Standard Error: 148_000
-			.saturating_add((64_474_000 as Weight).saturating_mul(r as Weight))
+		(215_874_000 as Weight)
+			// Standard Error: 115_000
+			.saturating_add((63_402_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1652,9 +1652,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight {
-		(390_049_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((124_330_000 as Weight).saturating_mul(n as Weight))
+		(288_361_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((120_795_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1663,9 +1663,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_ecdsa_recover(r: u32, ) -> Weight {
-		(233_346_000 as Weight)
-			// Standard Error: 1_355_000
-			.saturating_add((15_405_070_000 as Weight).saturating_mul(r as Weight))
+		(142_940_000 as Weight)
+			// Standard Error: 1_317_000
+			.saturating_add((15_385_437_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1676,264 +1676,264 @@ impl WeightInfo for () {
 	// Storage: Contracts OwnerInfoOf (r:36 w:36)
 	fn seal_set_code_hash(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_158_000
-			.saturating_add((932_937_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 1_981_000
+			.saturating_add((943_500_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads((99 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes((99 as Weight).saturating_mul(r as Weight)))
 	}
 	fn instr_i64const(r: u32, ) -> Weight {
-		(119_148_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((585_000 as Weight).saturating_mul(r as Weight))
+		(74_672_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((595_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(118_413_000 as Weight)
-			// Standard Error: 3_000
+		(74_346_000 as Weight)
+			// Standard Error: 1_000
 			.saturating_add((1_324_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(118_700_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_415_000 as Weight).saturating_mul(r as Weight))
+		(74_149_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_438_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(118_736_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_777_000 as Weight).saturating_mul(r as Weight))
+		(74_186_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((1_789_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(118_277_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((1_909_000 as Weight).saturating_mul(r as Weight))
+		(74_040_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_898_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(118_360_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((895_000 as Weight).saturating_mul(r as Weight))
+		(73_909_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((910_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(118_142_000 as Weight)
+		(73_873_000 as Weight)
 			// Standard Error: 3_000
-			.saturating_add((1_439_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((1_446_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(118_239_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((1_553_000 as Weight).saturating_mul(r as Weight))
+		(73_438_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((1_582_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(120_801_000 as Weight)
+		(75_993_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((4_000 as Weight).saturating_mul(e as Weight))
+			.saturating_add((8_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(118_536_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((17_082_000 as Weight).saturating_mul(r as Weight))
+		(73_218_000 as Weight)
+			// Standard Error: 17_000
+			.saturating_add((17_167_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(130_467_000 as Weight)
+		(85_517_000 as Weight)
 			// Standard Error: 30_000
-			.saturating_add((28_199_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((28_885_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(164_624_000 as Weight)
+		(119_915_000 as Weight)
 			// Standard Error: 3_000
-			.saturating_add((901_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((918_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(119_422_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((617_000 as Weight).saturating_mul(r as Weight))
+		(74_718_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((618_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(119_747_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((668_000 as Weight).saturating_mul(r as Weight))
+		(74_800_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((684_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(119_410_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((898_000 as Weight).saturating_mul(r as Weight))
+		(74_590_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((911_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(121_657_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_160_000 as Weight).saturating_mul(r as Weight))
+		(76_776_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_159_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(121_531_000 as Weight)
-			// Standard Error: 1_000
+		(77_283_000 as Weight)
+			// Standard Error: 2_000
 			.saturating_add((1_367_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(118_340_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((674_000 as Weight).saturating_mul(r as Weight))
+		(74_555_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((655_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(118_114_000 as Weight)
-			// Standard Error: 194_000
-			.saturating_add((229_474_000 as Weight).saturating_mul(r as Weight))
+		(73_693_000 as Weight)
+			// Standard Error: 131_000
+			.saturating_add((181_095_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(119_160_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((890_000 as Weight).saturating_mul(r as Weight))
+		(74_457_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((903_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(119_199_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((893_000 as Weight).saturating_mul(r as Weight))
+		(74_287_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((907_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(119_103_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((885_000 as Weight).saturating_mul(r as Weight))
+		(74_603_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((892_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(119_033_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((917_000 as Weight).saturating_mul(r as Weight))
+		(74_383_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((920_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(118_950_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((879_000 as Weight).saturating_mul(r as Weight))
+		(74_020_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((896_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(118_534_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((888_000 as Weight).saturating_mul(r as Weight))
+		(74_108_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((889_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(119_108_000 as Weight)
+		(74_197_000 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((881_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((901_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(118_677_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((1_360_000 as Weight).saturating_mul(r as Weight))
+		(73_941_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_377_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(118_769_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((1_355_000 as Weight).saturating_mul(r as Weight))
+		(73_891_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((1_383_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(118_690_000 as Weight)
+		(74_253_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((1_356_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((1_369_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(118_899_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_350_000 as Weight).saturating_mul(r as Weight))
+		(74_125_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_371_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(118_519_000 as Weight)
-			// Standard Error: 6_000
-			.saturating_add((1_376_000 as Weight).saturating_mul(r as Weight))
+		(74_144_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_369_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(119_315_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((1_347_000 as Weight).saturating_mul(r as Weight))
+		(74_170_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((1_375_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(118_171_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((1_377_000 as Weight).saturating_mul(r as Weight))
+		(74_164_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((1_370_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(118_581_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_367_000 as Weight).saturating_mul(r as Weight))
+		(74_166_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_376_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(118_673_000 as Weight)
+		(73_920_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((1_355_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((1_381_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(118_618_000 as Weight)
+		(74_691_000 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((1_357_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((1_356_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(118_569_000 as Weight)
+		(74_198_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((1_335_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((1_347_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(118_261_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((1_363_000 as Weight).saturating_mul(r as Weight))
+		(74_064_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_358_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(118_542_000 as Weight)
-			// Standard Error: 2_000
+		(75_744_000 as Weight)
+			// Standard Error: 8_000
 			.saturating_add((1_338_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(118_648_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((1_993_000 as Weight).saturating_mul(r as Weight))
+		(74_300_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((2_003_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(118_378_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((2_057_000 as Weight).saturating_mul(r as Weight))
+		(74_001_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((2_051_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(118_813_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((1_995_000 as Weight).saturating_mul(r as Weight))
+		(74_132_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_994_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(118_697_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((2_025_000 as Weight).saturating_mul(r as Weight))
+		(74_241_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((2_070_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(118_838_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_332_000 as Weight).saturating_mul(r as Weight))
+		(74_069_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_351_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(118_641_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((1_347_000 as Weight).saturating_mul(r as Weight))
+		(73_978_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((1_355_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(118_551_000 as Weight)
+		(74_053_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((1_338_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((1_351_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(118_603_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((1_352_000 as Weight).saturating_mul(r as Weight))
+		(73_891_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((1_371_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(118_885_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_345_000 as Weight).saturating_mul(r as Weight))
+		(74_062_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_366_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(118_602_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((1_354_000 as Weight).saturating_mul(r as Weight))
+		(74_347_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_360_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(118_733_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((1_349_000 as Weight).saturating_mul(r as Weight))
+		(74_116_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_366_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(118_920_000 as Weight)
+		(73_837_000 as Weight)
 			// Standard Error: 3_000
-			.saturating_add((1_348_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((1_377_000 as Weight).saturating_mul(r as Weight))
 	}
 }