From 62fa7d2aaeaabdc478ae3b0fab2929a0fcc89e40 Mon Sep 17 00:00:00 2001
From: Alexander Gryaznov <hi@agryaznov.com>
Date: Tue, 29 Mar 2022 17:14:49 +0200
Subject: [PATCH] contracts: add  `seal_code_hash` and `seal_own_code_hash` to
 API (#10933)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* `seal_origin` + tests added

* `seal_origin` benchmark added

* `seal_code_hash` + tests added

* `seal_code_hash` benchmark added

* `seal_own_code_hash` + tests added

* `seal_own_code_hash` benchmark added

* fmt lil fix

* akward accident bug fix

* Apply suggestions from code review

Co-authored-by: Alexander Theißen <alex.theissen@me.com>

* Apply suggestions from code review

Co-authored-by: Alexander Theißen <alex.theissen@me.com>

* benchmark fix

* `WasmModule::getter()` to take `module_name` arg

* test enhanced

* fixes based on review feedback

* Apply suggestions from code review

Co-authored-by: Alexander Theißen <alex.theissen@me.com>

* Hash left as const to return a ref to it from mock

* HASH test val to local const in mock

* Apply suggestions from code review

Co-authored-by: Alexander Theißen <alex.theissen@me.com>

* fixes to benchmarks according to review feedback

* cargo run --quiet --profile=production  --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_contracts --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/contracts/src/weights.rs --template=./.maintain/frame-weight-template.hbs

* removed `seal_origin` from API

Co-authored-by: Alexander Theißen <alex.theissen@me.com>
Co-authored-by: Parity Bot <admin@parity.io>
---
 frame/contracts/src/benchmarking/code.rs |    4 +-
 frame/contracts/src/benchmarking/mod.rs  |   71 +-
 frame/contracts/src/exec.rs              |   72 ++
 frame/contracts/src/schedule.rs          |    8 +
 frame/contracts/src/wasm/mod.rs          |  120 ++-
 frame/contracts/src/wasm/runtime.rs      |   48 +
 frame/contracts/src/weights.rs           | 1242 +++++++++++-----------
 7 files changed, 951 insertions(+), 614 deletions(-)

diff --git a/frame/contracts/src/benchmarking/code.rs b/frame/contracts/src/benchmarking/code.rs
index f9d71fde65885..2544fd6b7f922 100644
--- a/frame/contracts/src/benchmarking/code.rs
+++ b/frame/contracts/src/benchmarking/code.rs
@@ -339,12 +339,12 @@ where
 	/// Creates a wasm module that calls the imported function named `getter_name` `repeat`
 	/// times. The imported function is expected to have the "getter signature" of
 	/// (out_ptr: u32, len_ptr: u32) -> ().
-	pub fn getter(getter_name: &'static str, repeat: u32) -> Self {
+	pub fn getter(module_name: &'static str, getter_name: &'static str, repeat: u32) -> Self {
 		let pages = max_pages::<T>();
 		ModuleDefinition {
 			memory: Some(ImportedMemory::max::<T>()),
 			imported_functions: vec![ImportedFunction {
-				module: "seal0",
+				module: module_name,
 				name: getter_name,
 				params: vec![ValueType::I32, ValueType::I32],
 				return_type: None,
diff --git a/frame/contracts/src/benchmarking/mod.rs b/frame/contracts/src/benchmarking/mod.rs
index 8539978bd6b39..de83f51a01528 100644
--- a/frame/contracts/src/benchmarking/mod.rs
+++ b/frame/contracts/src/benchmarking/mod.rs
@@ -394,7 +394,7 @@ benchmarks! {
 	seal_caller {
 		let r in 0 .. API_BENCHMARK_BATCHES;
 		let instance = Contract::<T>::new(WasmModule::getter(
-			"seal_caller", r * API_BENCHMARK_BATCH_SIZE
+			"seal0", "seal_caller", r * API_BENCHMARK_BATCH_SIZE
 		), vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::MAX, None, vec![])
@@ -436,6 +436,59 @@ benchmarks! {
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::MAX, None, vec![])
 
+	seal_code_hash {
+		let r in 0 .. API_BENCHMARK_BATCHES;
+		let accounts = (0 .. r * API_BENCHMARK_BATCH_SIZE)
+			.map(|n| account::<T::AccountId>("account", n, 0))
+			.collect::<Vec<_>>();
+		let account_len = accounts.get(0).map(|i| i.encode().len()).unwrap_or(0);
+		let accounts_bytes = accounts.iter().map(|a| a.encode()).flatten().collect::<Vec<_>>();
+		let accounts_len = accounts_bytes.len();
+		let pages = code::max_pages::<T>();
+		let code = WasmModule::<T>::from(ModuleDefinition {
+			memory: Some(ImportedMemory::max::<T>()),
+			imported_functions: vec![ImportedFunction {
+				module: "__unstable__",
+				name: "seal_code_hash",
+				params: vec![ValueType::I32, ValueType::I32, ValueType::I32],
+				return_type: Some(ValueType::I32),
+			}],
+			data_segments: vec![
+				DataSegment {
+					offset: 0,
+					value: 32u32.to_le_bytes().to_vec(), // output length
+				},
+				DataSegment {
+					offset: 36,
+					value: accounts_bytes,
+				},
+			],
+			call_body: Some(body::repeated_dyn(r * API_BENCHMARK_BATCH_SIZE, vec![
+				Counter(36, account_len as u32), // address_ptr
+				Regular(Instruction::I32Const(4)), // ptr to output data
+				Regular(Instruction::I32Const(0)), // ptr to output length
+				Regular(Instruction::Call(0)),
+				Regular(Instruction::Drop),
+			])),
+			.. Default::default()
+		});
+		let instance = Contract::<T>::new(code, vec![])?;
+		let info = instance.info()?;
+		// every account would be a contract (worst case)
+		for acc in accounts.iter() {
+			<ContractInfoOf<T>>::insert(acc, info.clone());
+		}
+		let origin = RawOrigin::Signed(instance.caller.clone());
+	}: call(origin, instance.addr, 0u32.into(), Weight::MAX, None, vec![])
+
+	seal_own_code_hash {
+		let r in 0 .. API_BENCHMARK_BATCHES;
+		let instance = Contract::<T>::new(WasmModule::getter(
+			"__unstable__", "seal_own_code_hash", r * API_BENCHMARK_BATCH_SIZE
+		), vec![])?;
+		let origin = RawOrigin::Signed(instance.caller.clone());
+	}: call(origin, instance.addr, 0u32.into(), Weight::MAX, None, vec![])
+
 	seal_caller_is_origin {
 		let r in 0 .. API_BENCHMARK_BATCHES;
 		let code = WasmModule::<T>::from(ModuleDefinition {
@@ -459,7 +512,7 @@ benchmarks! {
 	seal_address {
 		let r in 0 .. API_BENCHMARK_BATCHES;
 		let instance = Contract::<T>::new(WasmModule::getter(
-			"seal_address", r * API_BENCHMARK_BATCH_SIZE
+			"seal0", "seal_address", r * API_BENCHMARK_BATCH_SIZE
 		), vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::MAX, None, vec![])
@@ -467,7 +520,7 @@ benchmarks! {
 	seal_gas_left {
 		let r in 0 .. API_BENCHMARK_BATCHES;
 		let instance = Contract::<T>::new(WasmModule::getter(
-			"seal_gas_left", r * API_BENCHMARK_BATCH_SIZE
+			"seal0", "seal_gas_left", r * API_BENCHMARK_BATCH_SIZE
 		), vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::MAX, None, vec![])
@@ -475,7 +528,7 @@ benchmarks! {
 	seal_balance {
 		let r in 0 .. API_BENCHMARK_BATCHES;
 		let instance = Contract::<T>::new(WasmModule::getter(
-			"seal_balance", r * API_BENCHMARK_BATCH_SIZE
+			"seal0", "seal_balance", r * API_BENCHMARK_BATCH_SIZE
 		), vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::MAX, None, vec![])
@@ -483,7 +536,7 @@ benchmarks! {
 	seal_value_transferred {
 		let r in 0 .. API_BENCHMARK_BATCHES;
 		let instance = Contract::<T>::new(WasmModule::getter(
-			"seal_value_transferred", r * API_BENCHMARK_BATCH_SIZE
+			"seal0", "seal_value_transferred", r * API_BENCHMARK_BATCH_SIZE
 		), vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::MAX, None, vec![])
@@ -491,7 +544,7 @@ benchmarks! {
 	seal_minimum_balance {
 		let r in 0 .. API_BENCHMARK_BATCHES;
 		let instance = Contract::<T>::new(WasmModule::getter(
-			"seal_minimum_balance", r * API_BENCHMARK_BATCH_SIZE
+			"seal0", "seal_minimum_balance", r * API_BENCHMARK_BATCH_SIZE
 		), vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::MAX, None, vec![])
@@ -499,7 +552,7 @@ benchmarks! {
 	seal_block_number {
 		let r in 0 .. API_BENCHMARK_BATCHES;
 		let instance = Contract::<T>::new(WasmModule::getter(
-			"seal_block_number", r * API_BENCHMARK_BATCH_SIZE
+			"seal0", "seal_block_number", r * API_BENCHMARK_BATCH_SIZE
 		), vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::MAX, None, vec![])
@@ -507,7 +560,7 @@ benchmarks! {
 	seal_now {
 		let r in 0 .. API_BENCHMARK_BATCHES;
 		let instance = Contract::<T>::new(WasmModule::getter(
-			"seal_now", r * API_BENCHMARK_BATCH_SIZE
+			"seal0", "seal_now", r * API_BENCHMARK_BATCH_SIZE
 		), vec![])?;
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::MAX, None, vec![])
@@ -2341,7 +2394,7 @@ benchmarks! {
 	}
 
 	// w_memory_grow = w_bench - 2 * w_param
-	// We can only allow allocate as much memory as it is allowed in a a contract.
+	// We can only allow allocate as much memory as it is allowed in a contract.
 	// Therefore the repeat count is limited by the maximum memory any contract can have.
 	// Using a contract with more memory will skew the benchmark because the runtime of grow
 	// depends on how much memory is already allocated.
diff --git a/frame/contracts/src/exec.rs b/frame/contracts/src/exec.rs
index 455665687d973..e73b29e54378b 100644
--- a/frame/contracts/src/exec.rs
+++ b/frame/contracts/src/exec.rs
@@ -162,6 +162,14 @@ pub trait Ext: sealing::Sealed {
 	/// Check if a contract lives at the specified `address`.
 	fn is_contract(&self, address: &AccountIdOf<Self::T>) -> bool;
 
+	/// Returns the code hash of the contract for the given `address`.
+	///
+	/// Returns `None` if the `address` does not belong to a contract.
+	fn code_hash(&self, address: &AccountIdOf<Self::T>) -> Option<CodeHash<Self::T>>;
+
+	/// Returns the code hash of the contract being executed.
+	fn own_code_hash(&mut self) -> &CodeHash<Self::T>;
+
 	/// Check if the caller of the current contract is the origin of the whole call stack.
 	///
 	/// This can be checked with `is_contract(self.caller())` as well.
@@ -1103,6 +1111,14 @@ where
 		ContractInfoOf::<T>::contains_key(&address)
 	}
 
+	fn code_hash(&self, address: &T::AccountId) -> Option<CodeHash<Self::T>> {
+		<ContractInfoOf<T>>::get(&address).map(|contract| contract.code_hash)
+	}
+
+	fn own_code_hash(&mut self) -> &CodeHash<Self::T> {
+		&self.top_frame_mut().contract_info().code_hash
+	}
+
 	fn caller_is_origin(&self) -> bool {
 		self.caller() == &self.origin
 	}
@@ -1753,6 +1769,62 @@ mod tests {
 		});
 	}
 
+	#[test]
+	fn code_hash_returns_proper_values() {
+		let code_bob = MockLoader::insert(Call, |ctx, _| {
+			// ALICE is not a contract and hence she does not have a code_hash
+			assert!(ctx.ext.code_hash(&ALICE).is_none());
+			// BOB is a contract and hence he has a code_hash
+			assert!(ctx.ext.code_hash(&BOB).is_some());
+			exec_success()
+		});
+
+		ExtBuilder::default().build().execute_with(|| {
+			let schedule = <Test as Config>::Schedule::get();
+			place_contract(&BOB, code_bob);
+			let mut storage_meter = storage::meter::Meter::new(&ALICE, Some(0), 0).unwrap();
+			// ALICE (not contract) -> BOB (contract)
+			let result = MockStack::run_call(
+				ALICE,
+				BOB,
+				&mut GasMeter::<Test>::new(GAS_LIMIT),
+				&mut storage_meter,
+				&schedule,
+				0,
+				vec![0],
+				None,
+			);
+			assert_matches!(result, Ok(_));
+		});
+	}
+
+	#[test]
+	fn own_code_hash_returns_proper_values() {
+		let bob_ch = MockLoader::insert(Call, |ctx, _| {
+			let code_hash = ctx.ext.code_hash(&BOB).unwrap();
+			assert_eq!(*ctx.ext.own_code_hash(), code_hash);
+			exec_success()
+		});
+
+		ExtBuilder::default().build().execute_with(|| {
+			let schedule = <Test as Config>::Schedule::get();
+			place_contract(&BOB, bob_ch);
+			let mut storage_meter = storage::meter::Meter::new(&ALICE, Some(0), 0).unwrap();
+			// ALICE (not contract) -> BOB (contract)
+			let result = MockStack::run_call(
+				ALICE,
+				BOB,
+				&mut GasMeter::<Test>::new(GAS_LIMIT),
+				&mut storage_meter,
+				&schedule,
+				0,
+				vec![0],
+				None,
+			);
+			assert_matches!(result, Ok(_));
+		});
+	}
+
 	#[test]
 	fn caller_is_origin_returns_proper_values() {
 		let code_charlie = MockLoader::insert(Call, |ctx, _| {
diff --git a/frame/contracts/src/schedule.rs b/frame/contracts/src/schedule.rs
index 8535166a6ac5c..b0c58d721d578 100644
--- a/frame/contracts/src/schedule.rs
+++ b/frame/contracts/src/schedule.rs
@@ -265,6 +265,12 @@ pub struct HostFnWeights<T: Config> {
 	/// Weight of calling `seal_is_contract`.
 	pub is_contract: Weight,
 
+	/// Weight of calling `seal_code_hash`.
+	pub code_hash: Weight,
+
+	/// Weight of calling `seal_own_code_hash`.
+	pub own_code_hash: Weight,
+
 	/// Weight of calling `seal_caller_is_origin`.
 	pub caller_is_origin: Weight,
 
@@ -584,6 +590,8 @@ impl<T: Config> Default for HostFnWeights<T> {
 		Self {
 			caller: cost_batched!(seal_caller),
 			is_contract: cost_batched!(seal_is_contract),
+			code_hash: cost_batched!(seal_code_hash),
+			own_code_hash: cost_batched!(seal_own_code_hash),
 			caller_is_origin: cost_batched!(seal_caller_is_origin),
 			address: cost_batched!(seal_address),
 			gas_left: cost_batched!(seal_gas_left),
diff --git a/frame/contracts/src/wasm/mod.rs b/frame/contracts/src/wasm/mod.rs
index 3912a936684c2..c38613cb68102 100644
--- a/frame/contracts/src/wasm/mod.rs
+++ b/frame/contracts/src/wasm/mod.rs
@@ -438,6 +438,13 @@ mod tests {
 		fn is_contract(&self, _address: &AccountIdOf<Self::T>) -> bool {
 			true
 		}
+		fn code_hash(&self, _address: &AccountIdOf<Self::T>) -> Option<CodeHash<Self::T>> {
+			Some(H256::from_slice(&[0x11; 32]))
+		}
+		fn own_code_hash(&mut self) -> &CodeHash<Self::T> {
+			const HASH: H256 = H256::repeat_byte(0x10);
+			&HASH
+		}
 		fn caller_is_origin(&self) -> bool {
 			false
 		}
@@ -1155,7 +1162,7 @@ mod tests {
 		);
 	}
 
-	/// calls `seal_caller` and compares the result with the constant 42.
+	/// calls `seal_caller` and compares the result with the constant (ALICE's address part).
 	const CODE_CALLER: &str = r#"
 (module
 	(import "seal0" "seal_caller" (func $seal_caller (param i32 i32)))
@@ -1185,7 +1192,7 @@ mod tests {
 			)
 		)
 
-		;; assert that the first 64 byte are the beginning of "ALICE"
+		;; assert that the first 8 bytes are the beginning of "ALICE"
 		(call $assert
 			(i64.eq
 				(i64.load (i32.const 0))
@@ -1203,7 +1210,7 @@ mod tests {
 		assert_ok!(execute(CODE_CALLER, vec![], MockExt::default()));
 	}
 
-	/// calls `seal_address` and compares the result with the constant 69.
+	/// calls `seal_address` and compares the result with the constant (BOB's address part).
 	const CODE_ADDRESS: &str = r#"
 (module
 	(import "seal0" "seal_address" (func $seal_address (param i32 i32)))
@@ -1233,7 +1240,7 @@ mod tests {
 			)
 		)
 
-		;; assert that the first 64 byte are the beginning of "BOB"
+		;; assert that the first 8 bytes are the beginning of "BOB"
 		(call $assert
 			(i64.eq
 				(i64.load (i32.const 0))
@@ -2361,6 +2368,111 @@ mod tests {
 	}
 
 	#[test]
+	#[cfg(feature = "unstable-interface")]
+	fn code_hash_works() {
+		/// calls `seal_code_hash` and compares the result with the constant.
+		const CODE_CODE_HASH: &str = r#"
+(module
+	(import "__unstable__" "seal_code_hash" (func $seal_code_hash (param i32 i32 i32) (result i32)))
+	(import "env" "memory" (memory 1 1))
+
+	;; size of our buffer is 32 bytes
+	(data (i32.const 32) "\20")
+
+	(func $assert (param i32)
+		(block $ok
+			(br_if $ok
+				(get_local 0)
+			)
+			(unreachable)
+		)
+	)
+
+	(func (export "call")
+		;; fill the buffer with the code hash.
+		(call $seal_code_hash
+			(i32.const 0) ;; input: address_ptr (before call)
+			(i32.const 0) ;; output: code_hash_ptr (after call)
+			(i32.const 32) ;; same 32 bytes length for input and output
+		)
+
+		;; assert size == 32
+		(call $assert
+			(i32.eq
+				(i32.load (i32.const 32))
+				(i32.const 32)
+			)
+		)
+
+		;; assert that the first 8 bytes are "1111111111111111"
+		(call $assert
+			(i64.eq
+				(i64.load (i32.const 0))
+				(i64.const 0x1111111111111111)
+			)
+		)
+		drop
+	)
+
+	(func (export "deploy"))
+)
+"#;
+		assert_ok!(execute(CODE_CODE_HASH, vec![], MockExt::default()));
+	}
+
+	#[test]
+	#[cfg(feature = "unstable-interface")]
+	fn own_code_hash_works() {
+		/// calls `seal_own_code_hash` and compares the result with the constant.
+		const CODE_OWN_CODE_HASH: &str = r#"
+(module
+	(import "__unstable__" "seal_own_code_hash" (func $seal_own_code_hash (param i32 i32)))
+	(import "env" "memory" (memory 1 1))
+
+	;; size of our buffer is 32 bytes
+	(data (i32.const 32) "\20")
+
+	(func $assert (param i32)
+		(block $ok
+			(br_if $ok
+				(get_local 0)
+			)
+			(unreachable)
+		)
+	)
+
+	(func (export "call")
+		;; fill the buffer with the code hash
+		(call $seal_own_code_hash
+			(i32.const 0)  ;; output: code_hash_ptr
+			(i32.const 32) ;; 32 bytes length of code_hash output
+		)
+
+		;; assert size == 32
+		(call $assert
+			(i32.eq
+				(i32.load (i32.const 32))
+				(i32.const 32)
+			)
+		)
+
+		;; assert that the first 8 bytes are "1010101010101010"
+		(call $assert
+			(i64.eq
+				(i64.load (i32.const 0))
+				(i64.const 0x1010101010101010)
+			)
+		)
+	)
+
+	(func (export "deploy"))
+)
+"#;
+		assert_ok!(execute(CODE_OWN_CODE_HASH, vec![], MockExt::default()));
+	}
+
+	#[test]
+	#[cfg(feature = "unstable-interface")]
 	fn caller_is_origin_works() {
 		const CODE_CALLER_IS_ORIGIN: &str = r#"
 ;; This runs `caller_is_origin` check on zero account address
diff --git a/frame/contracts/src/wasm/runtime.rs b/frame/contracts/src/wasm/runtime.rs
index 043b45e6a76ed..975cfcdd12db8 100644
--- a/frame/contracts/src/wasm/runtime.rs
+++ b/frame/contracts/src/wasm/runtime.rs
@@ -144,6 +144,12 @@ pub enum RuntimeCosts {
 	Caller,
 	/// Weight of calling `seal_is_contract`.
 	IsContract,
+	/// Weight of calling `seal_code_hash`.
+	#[cfg(feature = "unstable-interface")]
+	CodeHash,
+	/// Weight of calling `seal_own_code_hash`.
+	#[cfg(feature = "unstable-interface")]
+	OwnCodeHash,
 	/// Weight of calling `seal_caller_is_origin`.
 	CallerIsOrigin,
 	/// Weight of calling `seal_address`.
@@ -234,6 +240,10 @@ impl RuntimeCosts {
 			CopyToContract(len) => s.input_per_byte.saturating_mul(len.into()),
 			Caller => s.caller,
 			IsContract => s.is_contract,
+			#[cfg(feature = "unstable-interface")]
+			CodeHash => s.code_hash,
+			#[cfg(feature = "unstable-interface")]
+			OwnCodeHash => s.own_code_hash,
 			CallerIsOrigin => s.caller_is_origin,
 			Address => s.address,
 			GasLeft => s.gas_left,
@@ -1371,6 +1381,44 @@ define_env!(Env, <E: Ext>,
 		Ok(ctx.ext.is_contract(&address) as u32)
 	},
 
+	// Retrieve the code hash for a specified contract address.
+	//
+	// # Parameters
+	//
+	// - `account_ptr`: a pointer to the address in question.
+	//   Should be decodable as an `T::AccountId`. Traps otherwise.
+	// - `out_ptr`: pointer to the linear memory where the returning value is written to.
+	// - `out_len_ptr`: in-out pointer into linear memory where the buffer length
+	//   is read from and the value length is written to.
+	//
+	// # Errors
+	//
+	// `ReturnCode::KeyNotFound`
+	[__unstable__] seal_code_hash(ctx, account_ptr: u32, out_ptr: u32, out_len_ptr: u32) -> ReturnCode => {
+		ctx.charge_gas(RuntimeCosts::CodeHash)?;
+		let address: <<E as Ext>::T as frame_system::Config>::AccountId =
+			ctx.read_sandbox_memory_as(account_ptr)?;
+		if let Some(value) = ctx.ext.code_hash(&address) {
+			ctx.write_sandbox_output(out_ptr, out_len_ptr, &value.encode(), false, already_charged)?;
+			Ok(ReturnCode::Success)
+		} else {
+			Ok(ReturnCode::KeyNotFound)
+		}
+	},
+
+	// Retrieve the code hash of the currently executing contract.
+	//
+	// # Parameters
+	//
+	// - `out_ptr`: pointer to the linear memory where the returning value is written to.
+	// - `out_len_ptr`: in-out pointer into linear memory where the buffer length
+	//   is read from and the value length is written to.
+	[__unstable__] seal_own_code_hash(ctx, out_ptr: u32, out_len_ptr: u32) => {
+		ctx.charge_gas(RuntimeCosts::OwnCodeHash)?;
+		let code_hash_encoded = &ctx.ext.own_code_hash().encode();
+		Ok(ctx.write_sandbox_output(out_ptr, out_len_ptr, code_hash_encoded, false, already_charged)?)
+	},
+
 	// Checks whether the caller of the current contract is the origin of the whole call stack.
 	//
 	// Prefer this over `seal_is_contract` when checking whether your contract is being called by a contract
diff --git a/frame/contracts/src/weights.rs b/frame/contracts/src/weights.rs
index b438ad51cbfca..43f00196ab3b2 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-18, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-03-21, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -56,6 +56,8 @@ pub trait WeightInfo {
 	fn remove_code() -> Weight;
 	fn seal_caller(r: u32, ) -> Weight;
 	fn seal_is_contract(r: u32, ) -> Weight;
+	fn seal_code_hash(r: u32, ) -> Weight;
+	fn seal_own_code_hash(r: u32, ) -> Weight;
 	fn seal_caller_is_origin(r: u32, ) -> Weight;
 	fn seal_address(r: u32, ) -> Weight;
 	fn seal_gas_left(r: u32, ) -> Weight;
@@ -160,14 +162,14 @@ 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_512_000 as Weight)
+		(1_569_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 {
-		(8_089_000 as Weight)
+		(9_620_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((741_000 as Weight).saturating_mul(k as Weight))
+			.saturating_add((748_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)))
@@ -175,17 +177,17 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts DeletionQueue (r:1 w:0)
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((2_287_000 as Weight).saturating_mul(q as Weight))
+			// Standard Error: 4_000
+			.saturating_add((1_795_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 {
-		(15_212_000 as Weight)
+		(12_256_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((51_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((49_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))
 	}
@@ -194,9 +196,9 @@ 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_with_code_per_byte(c: u32, ) -> Weight {
-		(218_406_000 as Weight)
+		(213_494_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((55_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((53_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,9 +210,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 instantiate_with_code(c: u32, s: u32, ) -> Weight {
-		(265_773_000 as Weight)
+		(231_180_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((127_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((125_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))
@@ -223,7 +225,7 @@ 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 {
-		(173_852_000 as Weight)
+		(172_238_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))
@@ -234,7 +236,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 {
-		(140_088_000 as Weight)
+		(140_912_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
@@ -242,9 +244,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 {
-		(44_290_000 as Weight)
+		(42_493_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((51_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((49_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 +254,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_364_000 as Weight)
+		(24_533_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
@@ -261,9 +263,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 {
-		(219_617_000 as Weight)
-			// Standard Error: 119_000
-			.saturating_add((50_409_000 as Weight).saturating_mul(r as Weight))
+		(220_009_000 as Weight)
+			// Standard Error: 80_000
+			.saturating_add((47_887_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 +274,21 @@ 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 {
-		(102_073_000 as Weight)
-			// Standard Error: 843_000
-			.saturating_add((369_025_000 as Weight).saturating_mul(r as Weight))
+		(71_779_000 as Weight)
+			// Standard Error: 900_000
+			.saturating_add((371_278_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: System Account (r:1 w:0)
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
+	fn seal_code_hash(r: u32, ) -> Weight {
+		(0 as Weight)
+			// Standard Error: 2_329_000
+			.saturating_add((451_731_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))
@@ -283,10 +297,21 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
+	fn seal_own_code_hash(r: u32, ) -> Weight {
+		(227_824_000 as Weight)
+			// Standard Error: 128_000
+			.saturating_add((52_843_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: System Account (r:1 w:0)
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_caller_is_origin(r: u32, ) -> Weight {
-		(213_550_000 as Weight)
-			// Standard Error: 63_000
-			.saturating_add((21_519_000 as Weight).saturating_mul(r as Weight))
+		(213_057_000 as Weight)
+			// Standard Error: 43_000
+			.saturating_add((21_023_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 +320,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 {
-		(220_649_000 as Weight)
-			// Standard Error: 95_000
-			.saturating_add((50_197_000 as Weight).saturating_mul(r as Weight))
+		(219_066_000 as Weight)
+			// Standard Error: 117_000
+			.saturating_add((48_056_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 +331,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 {
-		(218_190_000 as Weight)
-			// Standard Error: 99_000
-			.saturating_add((49_817_000 as Weight).saturating_mul(r as Weight))
+		(218_844_000 as Weight)
+			// Standard Error: 101_000
+			.saturating_add((47_325_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 +342,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 {
-		(223_133_000 as Weight)
-			// Standard Error: 188_000
-			.saturating_add((142_288_000 as Weight).saturating_mul(r as Weight))
+		(219_234_000 as Weight)
+			// Standard Error: 171_000
+			.saturating_add((142_534_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 +353,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 {
-		(216_612_000 as Weight)
-			// Standard Error: 103_000
-			.saturating_add((49_956_000 as Weight).saturating_mul(r as Weight))
+		(215_128_000 as Weight)
+			// Standard Error: 119_000
+			.saturating_add((48_392_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 +364,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 {
-		(218_349_000 as Weight)
-			// Standard Error: 93_000
-			.saturating_add((49_656_000 as Weight).saturating_mul(r as Weight))
+		(214_603_000 as Weight)
+			// Standard Error: 115_000
+			.saturating_add((48_041_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 +375,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 {
-		(213_151_000 as Weight)
-			// Standard Error: 110_000
-			.saturating_add((50_099_000 as Weight).saturating_mul(r as Weight))
+		(214_091_000 as Weight)
+			// Standard Error: 126_000
+			.saturating_add((48_067_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 +386,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 {
-		(216_816_000 as Weight)
-			// Standard Error: 95_000
-			.saturating_add((49_724_000 as Weight).saturating_mul(r as Weight))
+		(214_418_000 as Weight)
+			// Standard Error: 100_000
+			.saturating_add((47_791_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 +398,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 {
-		(223_053_000 as Weight)
-			// Standard Error: 148_000
-			.saturating_add((124_240_000 as Weight).saturating_mul(r as Weight))
+		(229_261_000 as Weight)
+			// Standard Error: 150_000
+			.saturating_add((121_988_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 +409,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 {
-		(127_253_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((25_608_000 as Weight).saturating_mul(r as Weight))
+		(127_983_000 as Weight)
+			// Standard Error: 56_000
+			.saturating_add((24_016_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 +420,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 {
-		(218_057_000 as Weight)
-			// Standard Error: 98_000
-			.saturating_add((49_061_000 as Weight).saturating_mul(r as Weight))
+		(216_634_000 as Weight)
+			// Standard Error: 114_000
+			.saturating_add((46_864_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 +431,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 {
-		(293_563_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((11_877_000 as Weight).saturating_mul(n as Weight))
+		(285_180_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((11_899_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))
 	}
@@ -416,10 +441,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
-	fn seal_return(r: u32, ) -> Weight {
-		(211_511_000 as Weight)
-			// Standard Error: 70_000
-			.saturating_add((2_085_000 as Weight).saturating_mul(r as Weight))
+	fn seal_return(_r: u32, ) -> Weight {
+		(215_379_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -428,9 +451,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 {
-		(213_876_000 as Weight)
+		(213_957_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((193_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((201_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 +464,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 {
-		(214_736_000 as Weight)
-			// Standard Error: 206_000
-			.saturating_add((53_637_000 as Weight).saturating_mul(r as Weight))
+		(215_782_000 as Weight)
+			// Standard Error: 149_000
+			.saturating_add((52_421_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 +478,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 {
-		(222_037_000 as Weight)
-			// Standard Error: 191_000
-			.saturating_add((160_114_000 as Weight).saturating_mul(r as Weight))
+		(217_910_000 as Weight)
+			// Standard Error: 149_000
+			.saturating_add((157_525_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 +489,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 {
-		(219_211_000 as Weight)
-			// Standard Error: 239_000
-			.saturating_add((296_722_000 as Weight).saturating_mul(r as Weight))
+		(230_787_000 as Weight)
+			// Standard Error: 210_000
+			.saturating_add((296_973_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 +501,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 {
-		(519_643_000 as Weight)
-			// Standard Error: 1_842_000
-			.saturating_add((300_853_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 363_000
-			.saturating_add((82_577_000 as Weight).saturating_mul(n as Weight))
+		(539_238_000 as Weight)
+			// Standard Error: 1_701_000
+			.saturating_add((294_348_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 335_000
+			.saturating_add((82_116_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 +516,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 {
-		(132_710_000 as Weight)
-			// Standard Error: 77_000
-			.saturating_add((41_623_000 as Weight).saturating_mul(r as Weight))
+		(135_081_000 as Weight)
+			// Standard Error: 94_000
+			.saturating_add((39_247_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 {
-		(40_644_000 as Weight)
-			// Standard Error: 1_072_000
-			.saturating_add((412_308_000 as Weight).saturating_mul(r as Weight))
+		(41_752_000 as Weight)
+			// Standard Error: 1_107_000
+			.saturating_add((403_473_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 +534,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 {
-		(609_052_000 as Weight)
-			// Standard Error: 258_000
-			.saturating_add((28_633_000 as Weight).saturating_mul(n as Weight))
+		(602_028_000 as Weight)
+			// Standard Error: 255_000
+			.saturating_add((28_303_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 {
-		(629_665_000 as Weight)
-			// Standard Error: 300_000
-			.saturating_add((10_947_000 as Weight).saturating_mul(n as Weight))
+		(620_964_000 as Weight)
+			// Standard Error: 308_000
+			.saturating_add((11_338_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 {
-		(91_519_000 as Weight)
-			// Standard Error: 889_000
-			.saturating_add((386_498_000 as Weight).saturating_mul(r as Weight))
+		(88_113_000 as Weight)
+			// Standard Error: 851_000
+			.saturating_add((381_671_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 +560,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 {
-		(612_224_000 as Weight)
-			// Standard Error: 269_000
-			.saturating_add((10_709_000 as Weight).saturating_mul(n as Weight))
+		(603_193_000 as Weight)
+			// Standard Error: 262_000
+			.saturating_add((10_286_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 {
-		(112_236_000 as Weight)
-			// Standard Error: 624_000
-			.saturating_add((327_655_000 as Weight).saturating_mul(r as Weight))
+		(112_477_000 as Weight)
+			// Standard Error: 666_000
+			.saturating_add((324_824_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 {
-		(567_711_000 as Weight)
-			// Standard Error: 387_000
-			.saturating_add((63_984_000 as Weight).saturating_mul(n as Weight))
+		(564_781_000 as Weight)
+			// Standard Error: 403_000
+			.saturating_add((63_824_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 {
-		(109_996_000 as Weight)
-			// Standard Error: 681_000
-			.saturating_add((298_317_000 as Weight).saturating_mul(r as Weight))
+		(115_207_000 as Weight)
+			// Standard Error: 672_000
+			.saturating_add((290_919_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 {
-		(518_342_000 as Weight)
-			// Standard Error: 251_000
-			.saturating_add((9_666_000 as Weight).saturating_mul(n as Weight))
+		(511_026_000 as Weight)
+			// Standard Error: 224_000
+			.saturating_add((10_138_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 {
-		(75_974_000 as Weight)
-			// Standard Error: 1_000_000
-			.saturating_add((417_954_000 as Weight).saturating_mul(r as Weight))
+		(79_113_000 as Weight)
+			// Standard Error: 904_000
+			.saturating_add((417_022_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 +612,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 {
-		(653_188_000 as Weight)
-			// Standard Error: 333_000
-			.saturating_add((64_810_000 as Weight).saturating_mul(n as Weight))
+		(651_769_000 as Weight)
+			// Standard Error: 338_000
+			.saturating_add((65_576_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 +623,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 {
-		(127_056_000 as Weight)
-			// Standard Error: 1_106_000
-			.saturating_add((1_784_183_000 as Weight).saturating_mul(r as Weight))
+		(93_588_000 as Weight)
+			// Standard Error: 1_444_000
+			.saturating_add((1_803_217_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 +637,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: 2_621_000
-			.saturating_add((19_757_765_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 3_050_000
+			.saturating_add((19_925_209_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 +650,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: 6_286_000
-			.saturating_add((19_798_229_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 7_377_000
+			.saturating_add((19_978_301_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 +660,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 {
-		(10_922_130_000 as Weight)
-			// Standard Error: 15_556_000
-			.saturating_add((1_672_276_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 6_000
-			.saturating_add((11_984_000 as Weight).saturating_mul(c as Weight))
+		(11_124_804_000 as Weight)
+			// Standard Error: 21_475_000
+			.saturating_add((1_635_442_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 9_000
+			.saturating_add((11_981_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 +678,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: 46_147_000
-			.saturating_add((27_589_519_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 47_682_000
+			.saturating_add((27_883_754_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 +692,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Contracts Nonce (r:1 w:1)
 	// Storage: Contracts OwnerInfoOf (r:1 w:1)
 	fn seal_instantiate_per_transfer_salt_kb(t: u32, s: u32, ) -> Weight {
-		(14_790_752_000 as Weight)
-			// Standard Error: 37_838_000
-			.saturating_add((714_016_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 17_000
-			.saturating_add((155_605_000 as Weight).saturating_mul(s as Weight))
+		(14_824_308_000 as Weight)
+			// Standard Error: 39_823_000
+			.saturating_add((880_630_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 18_000
+			.saturating_add((156_232_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 +707,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 {
-		(216_547_000 as Weight)
-			// Standard Error: 126_000
-			.saturating_add((81_132_000 as Weight).saturating_mul(r as Weight))
+		(218_378_000 as Weight)
+			// Standard Error: 131_000
+			.saturating_add((78_260_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 +718,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 {
-		(459_912_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((464_750_000 as Weight).saturating_mul(n as Weight))
+		(202_849_000 as Weight)
+			// Standard Error: 61_000
+			.saturating_add((466_532_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 +729,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 {
-		(212_653_000 as Weight)
+		(220_258_000 as Weight)
 			// Standard Error: 147_000
-			.saturating_add((93_380_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((90_363_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 +740,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 {
-		(324_536_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((306_160_000 as Weight).saturating_mul(n as Weight))
+		(232_371_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((307_036_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 +751,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 {
-		(218_574_000 as Weight)
-			// Standard Error: 123_000
-			.saturating_add((65_035_000 as Weight).saturating_mul(r as Weight))
+		(217_991_000 as Weight)
+			// Standard Error: 124_000
+			.saturating_add((62_273_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 +762,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 {
-		(345_804_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((118_896_000 as Weight).saturating_mul(n as Weight))
+		(396_282_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((119_575_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 +773,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 {
-		(215_898_000 as Weight)
-			// Standard Error: 108_000
-			.saturating_add((64_332_000 as Weight).saturating_mul(r as Weight))
+		(217_578_000 as Weight)
+			// Standard Error: 104_000
+			.saturating_add((62_189_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 +784,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 {
-		(351_569_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((118_896_000 as Weight).saturating_mul(n as Weight))
+		(358_167_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((119_692_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 +795,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 {
-		(272_893_000 as Weight)
-			// Standard Error: 1_438_000
-			.saturating_add((15_412_877_000 as Weight).saturating_mul(r as Weight))
+		(292_884_000 as Weight)
+			// Standard Error: 683_000
+			.saturating_add((3_824_902_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 +808,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_132_000
-			.saturating_add((937_623_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 2_302_000
+			.saturating_add((922_467_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 {
-		(74_268_000 as Weight)
+		(74_516_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((595_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((592_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(74_515_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((1_300_000 as Weight).saturating_mul(r as Weight))
+		(74_430_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((1_320_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(74_217_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((1_411_000 as Weight).saturating_mul(r as Weight))
+		(74_440_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((1_428_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(73_689_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((1_792_000 as Weight).saturating_mul(r as Weight))
+		(74_151_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((1_782_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(73_755_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((1_899_000 as Weight).saturating_mul(r as Weight))
+		(74_225_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((1_887_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(73_735_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((903_000 as Weight).saturating_mul(r as Weight))
+		(73_987_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((898_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(73_595_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_448_000 as Weight).saturating_mul(r as Weight))
+		(73_305_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((1_465_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(73_524_000 as Weight)
+		(73_037_000 as Weight)
 			// Standard Error: 3_000
-			.saturating_add((1_572_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((1_605_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(76_361_000 as Weight)
+		(76_434_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((4_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(76_131_000 as Weight)
-			// Standard Error: 7_000
-			.saturating_add((7_271_000 as Weight).saturating_mul(r as Weight))
+		(75_461_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((7_446_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(87_948_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((9_429_000 as Weight).saturating_mul(r as Weight))
+		(87_222_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((9_406_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(98_091_000 as Weight)
+		(97_204_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((481_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((472_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(74_311_000 as Weight)
+		(75_299_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((627_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((601_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(74_701_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((677_000 as Weight).saturating_mul(r as Weight))
+		(74_827_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((686_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(74_645_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((890_000 as Weight).saturating_mul(r as Weight))
+		(74_624_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((895_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(77_130_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_156_000 as Weight).saturating_mul(r as Weight))
+		(77_435_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((1_201_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(77_199_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_366_000 as Weight).saturating_mul(r as Weight))
+		(76_693_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((1_410_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(74_024_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((675_000 as Weight).saturating_mul(r as Weight))
+		(74_244_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((660_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(75_226_000 as Weight)
-			// Standard Error: 170_000
-			.saturating_add((186_225_000 as Weight).saturating_mul(r as Weight))
+		(73_527_000 as Weight)
+			// Standard Error: 931_000
+			.saturating_add((184_946_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(74_307_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((896_000 as Weight).saturating_mul(r as Weight))
+		(74_181_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((906_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(74_408_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((895_000 as Weight).saturating_mul(r as Weight))
+		(74_339_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((896_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(74_418_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((885_000 as Weight).saturating_mul(r as Weight))
+		(74_444_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((889_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(74_130_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((920_000 as Weight).saturating_mul(r as Weight))
+		(74_572_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((908_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(74_318_000 as Weight)
+		(74_349_000 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((876_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((881_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(74_496_000 as Weight)
+		(74_426_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((871_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((875_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(73_938_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((897_000 as Weight).saturating_mul(r as Weight))
+		(74_172_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((906_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(73_943_000 as Weight)
+		(74_169_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((1_367_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((1_362_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(74_305_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_353_000 as Weight).saturating_mul(r as Weight))
+		(74_205_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((1_360_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(73_948_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((1_361_000 as Weight).saturating_mul(r as Weight))
+		(74_237_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((1_356_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(74_188_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((1_354_000 as Weight).saturating_mul(r as Weight))
+		(74_181_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_357_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(74_156_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((1_353_000 as Weight).saturating_mul(r as Weight))
+		(74_038_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((1_360_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(73_972_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((1_365_000 as Weight).saturating_mul(r as Weight))
+		(73_881_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((1_372_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(74_082_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((1_360_000 as Weight).saturating_mul(r as Weight))
+		(73_969_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((1_361_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(74_190_000 as Weight)
-			// Standard Error: 1_000
+		(74_497_000 as Weight)
+			// Standard Error: 3_000
 			.saturating_add((1_359_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(73_803_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_370_000 as Weight).saturating_mul(r as Weight))
+		(74_275_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_354_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(74_063_000 as Weight)
-			// Standard Error: 1_000
+		(74_349_000 as Weight)
+			// Standard Error: 3_000
 			.saturating_add((1_357_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(73_750_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_345_000 as Weight).saturating_mul(r as Weight))
+		(74_192_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_333_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(73_979_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((1_341_000 as Weight).saturating_mul(r as Weight))
+		(74_271_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((1_340_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(74_197_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((1_332_000 as Weight).saturating_mul(r as Weight))
+		(73_971_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_340_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(73_624_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((2_020_000 as Weight).saturating_mul(r as Weight))
+		(74_546_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((1_995_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(74_074_000 as Weight)
+		(74_194_000 as Weight)
 			// Standard Error: 2_000
 			.saturating_add((2_050_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(73_766_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((2_016_000 as Weight).saturating_mul(r as Weight))
+		(74_106_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_997_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(73_978_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((2_064_000 as Weight).saturating_mul(r as Weight))
+		(74_219_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((2_061_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(73_996_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((1_336_000 as Weight).saturating_mul(r as Weight))
+		(74_157_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((1_338_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(74_058_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_335_000 as Weight).saturating_mul(r as Weight))
+		(74_135_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_336_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(73_983_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((1_337_000 as Weight).saturating_mul(r as Weight))
+		(74_038_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((1_345_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(74_061_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((1_351_000 as Weight).saturating_mul(r as Weight))
+		(74_011_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((1_362_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(73_940_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((1_360_000 as Weight).saturating_mul(r as Weight))
+		(74_054_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((1_356_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(73_954_000 as Weight)
+		(73_900_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((1_359_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((1_358_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(74_026_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((1_354_000 as Weight).saturating_mul(r as Weight))
+		(73_948_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((1_357_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(74_149_000 as Weight)
+		(73_972_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((1_352_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((1_358_000 as Weight).saturating_mul(r as Weight))
 	}
 }
 
@@ -1051,14 +1074,14 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 impl WeightInfo for () {
 	// Storage: Contracts DeletionQueue (r:1 w:0)
 	fn on_initialize() -> Weight {
-		(1_512_000 as Weight)
+		(1_569_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 {
-		(8_089_000 as Weight)
+		(9_620_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((741_000 as Weight).saturating_mul(k as Weight))
+			.saturating_add((748_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)))
@@ -1066,17 +1089,17 @@ impl WeightInfo for () {
 	// Storage: Contracts DeletionQueue (r:1 w:0)
 	fn on_initialize_per_queue_item(q: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((2_287_000 as Weight).saturating_mul(q as Weight))
+			// Standard Error: 4_000
+			.saturating_add((1_795_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 {
-		(15_212_000 as Weight)
+		(12_256_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((51_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((49_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1085,9 +1108,9 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System Account (r:1 w:1)
 	fn call_with_code_per_byte(c: u32, ) -> Weight {
-		(218_406_000 as Weight)
+		(213_494_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((55_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((53_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,9 +1122,9 @@ 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 {
-		(265_773_000 as Weight)
+		(231_180_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((127_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((125_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))
@@ -1114,7 +1137,7 @@ impl WeightInfo for () {
 	// Storage: System Account (r:1 w:1)
 	// Storage: Contracts OwnerInfoOf (r:1 w:1)
 	fn instantiate(s: u32, ) -> Weight {
-		(173_852_000 as Weight)
+		(172_238_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))
@@ -1125,7 +1148,7 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: System Account (r:1 w:1)
 	fn call() -> Weight {
-		(140_088_000 as Weight)
+		(140_912_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
@@ -1133,9 +1156,9 @@ impl WeightInfo for () {
 	// Storage: Contracts PristineCode (r:0 w:1)
 	// Storage: Contracts OwnerInfoOf (r:0 w:1)
 	fn upload_code(c: u32, ) -> Weight {
-		(44_290_000 as Weight)
+		(42_493_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((51_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((49_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 +1166,7 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:0 w:1)
 	// Storage: Contracts PristineCode (r:0 w:1)
 	fn remove_code() -> Weight {
-		(24_364_000 as Weight)
+		(24_533_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
@@ -1152,9 +1175,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_caller(r: u32, ) -> Weight {
-		(219_617_000 as Weight)
-			// Standard Error: 119_000
-			.saturating_add((50_409_000 as Weight).saturating_mul(r as Weight))
+		(220_009_000 as Weight)
+			// Standard Error: 80_000
+			.saturating_add((47_887_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 +1186,21 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_is_contract(r: u32, ) -> Weight {
-		(102_073_000 as Weight)
-			// Standard Error: 843_000
-			.saturating_add((369_025_000 as Weight).saturating_mul(r as Weight))
+		(71_779_000 as Weight)
+			// Standard Error: 900_000
+			.saturating_add((371_278_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: System Account (r:1 w:0)
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
+	fn seal_code_hash(r: u32, ) -> Weight {
+		(0 as Weight)
+			// Standard Error: 2_329_000
+			.saturating_add((451_731_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))
@@ -1174,10 +1209,21 @@ impl WeightInfo for () {
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
+	fn seal_own_code_hash(r: u32, ) -> Weight {
+		(227_824_000 as Weight)
+			// Standard Error: 128_000
+			.saturating_add((52_843_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: System Account (r:1 w:0)
+	// Storage: Contracts ContractInfoOf (r:1 w:1)
+	// Storage: Contracts CodeStorage (r:1 w:0)
+	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_caller_is_origin(r: u32, ) -> Weight {
-		(213_550_000 as Weight)
-			// Standard Error: 63_000
-			.saturating_add((21_519_000 as Weight).saturating_mul(r as Weight))
+		(213_057_000 as Weight)
+			// Standard Error: 43_000
+			.saturating_add((21_023_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 +1232,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_address(r: u32, ) -> Weight {
-		(220_649_000 as Weight)
-			// Standard Error: 95_000
-			.saturating_add((50_197_000 as Weight).saturating_mul(r as Weight))
+		(219_066_000 as Weight)
+			// Standard Error: 117_000
+			.saturating_add((48_056_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 +1243,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 {
-		(218_190_000 as Weight)
-			// Standard Error: 99_000
-			.saturating_add((49_817_000 as Weight).saturating_mul(r as Weight))
+		(218_844_000 as Weight)
+			// Standard Error: 101_000
+			.saturating_add((47_325_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 +1254,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_balance(r: u32, ) -> Weight {
-		(223_133_000 as Weight)
-			// Standard Error: 188_000
-			.saturating_add((142_288_000 as Weight).saturating_mul(r as Weight))
+		(219_234_000 as Weight)
+			// Standard Error: 171_000
+			.saturating_add((142_534_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 +1265,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 {
-		(216_612_000 as Weight)
-			// Standard Error: 103_000
-			.saturating_add((49_956_000 as Weight).saturating_mul(r as Weight))
+		(215_128_000 as Weight)
+			// Standard Error: 119_000
+			.saturating_add((48_392_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 +1276,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 {
-		(218_349_000 as Weight)
-			// Standard Error: 93_000
-			.saturating_add((49_656_000 as Weight).saturating_mul(r as Weight))
+		(214_603_000 as Weight)
+			// Standard Error: 115_000
+			.saturating_add((48_041_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 +1287,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 {
-		(213_151_000 as Weight)
-			// Standard Error: 110_000
-			.saturating_add((50_099_000 as Weight).saturating_mul(r as Weight))
+		(214_091_000 as Weight)
+			// Standard Error: 126_000
+			.saturating_add((48_067_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 +1298,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_now(r: u32, ) -> Weight {
-		(216_816_000 as Weight)
-			// Standard Error: 95_000
-			.saturating_add((49_724_000 as Weight).saturating_mul(r as Weight))
+		(214_418_000 as Weight)
+			// Standard Error: 100_000
+			.saturating_add((47_791_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 +1310,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 {
-		(223_053_000 as Weight)
-			// Standard Error: 148_000
-			.saturating_add((124_240_000 as Weight).saturating_mul(r as Weight))
+		(229_261_000 as Weight)
+			// Standard Error: 150_000
+			.saturating_add((121_988_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 +1321,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_gas(r: u32, ) -> Weight {
-		(127_253_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((25_608_000 as Weight).saturating_mul(r as Weight))
+		(127_983_000 as Weight)
+			// Standard Error: 56_000
+			.saturating_add((24_016_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 +1332,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_input(r: u32, ) -> Weight {
-		(218_057_000 as Weight)
-			// Standard Error: 98_000
-			.saturating_add((49_061_000 as Weight).saturating_mul(r as Weight))
+		(216_634_000 as Weight)
+			// Standard Error: 114_000
+			.saturating_add((46_864_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 +1343,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 {
-		(293_563_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((11_877_000 as Weight).saturating_mul(n as Weight))
+		(285_180_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((11_899_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1307,10 +1353,8 @@ impl WeightInfo for () {
 	// Storage: Contracts ContractInfoOf (r:1 w:1)
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
-	fn seal_return(r: u32, ) -> Weight {
-		(211_511_000 as Weight)
-			// Standard Error: 70_000
-			.saturating_add((2_085_000 as Weight).saturating_mul(r as Weight))
+	fn seal_return(_r: u32, ) -> Weight {
+		(215_379_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -1319,9 +1363,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 {
-		(213_876_000 as Weight)
+		(213_957_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((193_000 as Weight).saturating_mul(n as Weight))
+			.saturating_add((201_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 +1376,9 @@ impl WeightInfo for () {
 	// Storage: Contracts DeletionQueue (r:1 w:1)
 	// Storage: Contracts OwnerInfoOf (r:1 w:1)
 	fn seal_terminate(r: u32, ) -> Weight {
-		(214_736_000 as Weight)
-			// Standard Error: 206_000
-			.saturating_add((53_637_000 as Weight).saturating_mul(r as Weight))
+		(215_782_000 as Weight)
+			// Standard Error: 149_000
+			.saturating_add((52_421_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 +1390,9 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	// Storage: RandomnessCollectiveFlip RandomMaterial (r:1 w:0)
 	fn seal_random(r: u32, ) -> Weight {
-		(222_037_000 as Weight)
-			// Standard Error: 191_000
-			.saturating_add((160_114_000 as Weight).saturating_mul(r as Weight))
+		(217_910_000 as Weight)
+			// Standard Error: 149_000
+			.saturating_add((157_525_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 +1401,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 {
-		(219_211_000 as Weight)
-			// Standard Error: 239_000
-			.saturating_add((296_722_000 as Weight).saturating_mul(r as Weight))
+		(230_787_000 as Weight)
+			// Standard Error: 210_000
+			.saturating_add((296_973_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 +1413,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 {
-		(519_643_000 as Weight)
-			// Standard Error: 1_842_000
-			.saturating_add((300_853_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 363_000
-			.saturating_add((82_577_000 as Weight).saturating_mul(n as Weight))
+		(539_238_000 as Weight)
+			// Standard Error: 1_701_000
+			.saturating_add((294_348_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 335_000
+			.saturating_add((82_116_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 +1428,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 {
-		(132_710_000 as Weight)
-			// Standard Error: 77_000
-			.saturating_add((41_623_000 as Weight).saturating_mul(r as Weight))
+		(135_081_000 as Weight)
+			// Standard Error: 94_000
+			.saturating_add((39_247_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 {
-		(40_644_000 as Weight)
-			// Standard Error: 1_072_000
-			.saturating_add((412_308_000 as Weight).saturating_mul(r as Weight))
+		(41_752_000 as Weight)
+			// Standard Error: 1_107_000
+			.saturating_add((403_473_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 +1446,25 @@ impl WeightInfo for () {
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_set_storage_per_new_kb(n: u32, ) -> Weight {
-		(609_052_000 as Weight)
-			// Standard Error: 258_000
-			.saturating_add((28_633_000 as Weight).saturating_mul(n as Weight))
+		(602_028_000 as Weight)
+			// Standard Error: 255_000
+			.saturating_add((28_303_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 {
-		(629_665_000 as Weight)
-			// Standard Error: 300_000
-			.saturating_add((10_947_000 as Weight).saturating_mul(n as Weight))
+		(620_964_000 as Weight)
+			// Standard Error: 308_000
+			.saturating_add((11_338_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 {
-		(91_519_000 as Weight)
-			// Standard Error: 889_000
-			.saturating_add((386_498_000 as Weight).saturating_mul(r as Weight))
+		(88_113_000 as Weight)
+			// Standard Error: 851_000
+			.saturating_add((381_671_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 +1472,51 @@ impl WeightInfo for () {
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_clear_storage_per_kb(n: u32, ) -> Weight {
-		(612_224_000 as Weight)
-			// Standard Error: 269_000
-			.saturating_add((10_709_000 as Weight).saturating_mul(n as Weight))
+		(603_193_000 as Weight)
+			// Standard Error: 262_000
+			.saturating_add((10_286_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 {
-		(112_236_000 as Weight)
-			// Standard Error: 624_000
-			.saturating_add((327_655_000 as Weight).saturating_mul(r as Weight))
+		(112_477_000 as Weight)
+			// Standard Error: 666_000
+			.saturating_add((324_824_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 {
-		(567_711_000 as Weight)
-			// Standard Error: 387_000
-			.saturating_add((63_984_000 as Weight).saturating_mul(n as Weight))
+		(564_781_000 as Weight)
+			// Standard Error: 403_000
+			.saturating_add((63_824_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 {
-		(109_996_000 as Weight)
-			// Standard Error: 681_000
-			.saturating_add((298_317_000 as Weight).saturating_mul(r as Weight))
+		(115_207_000 as Weight)
+			// Standard Error: 672_000
+			.saturating_add((290_919_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 {
-		(518_342_000 as Weight)
-			// Standard Error: 251_000
-			.saturating_add((9_666_000 as Weight).saturating_mul(n as Weight))
+		(511_026_000 as Weight)
+			// Standard Error: 224_000
+			.saturating_add((10_138_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 {
-		(75_974_000 as Weight)
-			// Standard Error: 1_000_000
-			.saturating_add((417_954_000 as Weight).saturating_mul(r as Weight))
+		(79_113_000 as Weight)
+			// Standard Error: 904_000
+			.saturating_add((417_022_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 +1524,9 @@ impl WeightInfo for () {
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn seal_take_storage_per_kb(n: u32, ) -> Weight {
-		(653_188_000 as Weight)
-			// Standard Error: 333_000
-			.saturating_add((64_810_000 as Weight).saturating_mul(n as Weight))
+		(651_769_000 as Weight)
+			// Standard Error: 338_000
+			.saturating_add((65_576_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 +1535,9 @@ impl WeightInfo for () {
 	// Storage: Contracts CodeStorage (r:1 w:0)
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_transfer(r: u32, ) -> Weight {
-		(127_056_000 as Weight)
-			// Standard Error: 1_106_000
-			.saturating_add((1_784_183_000 as Weight).saturating_mul(r as Weight))
+		(93_588_000 as Weight)
+			// Standard Error: 1_444_000
+			.saturating_add((1_803_217_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 +1549,8 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 2_621_000
-			.saturating_add((19_757_765_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 3_050_000
+			.saturating_add((19_925_209_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 +1562,8 @@ impl WeightInfo for () {
 	// Storage: Timestamp Now (r:1 w:0)
 	fn seal_delegate_call(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 6_286_000
-			.saturating_add((19_798_229_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 7_377_000
+			.saturating_add((19_978_301_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 +1572,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 {
-		(10_922_130_000 as Weight)
-			// Standard Error: 15_556_000
-			.saturating_add((1_672_276_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 6_000
-			.saturating_add((11_984_000 as Weight).saturating_mul(c as Weight))
+		(11_124_804_000 as Weight)
+			// Standard Error: 21_475_000
+			.saturating_add((1_635_442_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 9_000
+			.saturating_add((11_981_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 +1590,8 @@ impl WeightInfo for () {
 	// Storage: Contracts OwnerInfoOf (r:100 w:100)
 	fn seal_instantiate(r: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 46_147_000
-			.saturating_add((27_589_519_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 47_682_000
+			.saturating_add((27_883_754_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 +1604,11 @@ impl WeightInfo for () {
 	// Storage: Contracts Nonce (r:1 w:1)
 	// Storage: Contracts OwnerInfoOf (r:1 w:1)
 	fn seal_instantiate_per_transfer_salt_kb(t: u32, s: u32, ) -> Weight {
-		(14_790_752_000 as Weight)
-			// Standard Error: 37_838_000
-			.saturating_add((714_016_000 as Weight).saturating_mul(t as Weight))
-			// Standard Error: 17_000
-			.saturating_add((155_605_000 as Weight).saturating_mul(s as Weight))
+		(14_824_308_000 as Weight)
+			// Standard Error: 39_823_000
+			.saturating_add((880_630_000 as Weight).saturating_mul(t as Weight))
+			// Standard Error: 18_000
+			.saturating_add((156_232_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 +1619,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 {
-		(216_547_000 as Weight)
-			// Standard Error: 126_000
-			.saturating_add((81_132_000 as Weight).saturating_mul(r as Weight))
+		(218_378_000 as Weight)
+			// Standard Error: 131_000
+			.saturating_add((78_260_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 +1630,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 {
-		(459_912_000 as Weight)
-			// Standard Error: 27_000
-			.saturating_add((464_750_000 as Weight).saturating_mul(n as Weight))
+		(202_849_000 as Weight)
+			// Standard Error: 61_000
+			.saturating_add((466_532_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 +1641,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 {
-		(212_653_000 as Weight)
+		(220_258_000 as Weight)
 			// Standard Error: 147_000
-			.saturating_add((93_380_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((90_363_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 +1652,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 {
-		(324_536_000 as Weight)
-			// Standard Error: 20_000
-			.saturating_add((306_160_000 as Weight).saturating_mul(n as Weight))
+		(232_371_000 as Weight)
+			// Standard Error: 23_000
+			.saturating_add((307_036_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 +1663,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 {
-		(218_574_000 as Weight)
-			// Standard Error: 123_000
-			.saturating_add((65_035_000 as Weight).saturating_mul(r as Weight))
+		(217_991_000 as Weight)
+			// Standard Error: 124_000
+			.saturating_add((62_273_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 +1674,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 {
-		(345_804_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((118_896_000 as Weight).saturating_mul(n as Weight))
+		(396_282_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((119_575_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 +1685,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 {
-		(215_898_000 as Weight)
-			// Standard Error: 108_000
-			.saturating_add((64_332_000 as Weight).saturating_mul(r as Weight))
+		(217_578_000 as Weight)
+			// Standard Error: 104_000
+			.saturating_add((62_189_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 +1696,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 {
-		(351_569_000 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((118_896_000 as Weight).saturating_mul(n as Weight))
+		(358_167_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((119_692_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 +1707,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 {
-		(272_893_000 as Weight)
-			// Standard Error: 1_438_000
-			.saturating_add((15_412_877_000 as Weight).saturating_mul(r as Weight))
+		(292_884_000 as Weight)
+			// Standard Error: 683_000
+			.saturating_add((3_824_902_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 +1720,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_132_000
-			.saturating_add((937_623_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 2_302_000
+			.saturating_add((922_467_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 {
-		(74_268_000 as Weight)
+		(74_516_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((595_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((592_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64load(r: u32, ) -> Weight {
-		(74_515_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((1_300_000 as Weight).saturating_mul(r as Weight))
+		(74_430_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((1_320_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64store(r: u32, ) -> Weight {
-		(74_217_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((1_411_000 as Weight).saturating_mul(r as Weight))
+		(74_440_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((1_428_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_select(r: u32, ) -> Weight {
-		(73_689_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((1_792_000 as Weight).saturating_mul(r as Weight))
+		(74_151_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((1_782_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_if(r: u32, ) -> Weight {
-		(73_755_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((1_899_000 as Weight).saturating_mul(r as Weight))
+		(74_225_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((1_887_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br(r: u32, ) -> Weight {
-		(73_735_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((903_000 as Weight).saturating_mul(r as Weight))
+		(73_987_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((898_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_if(r: u32, ) -> Weight {
-		(73_595_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_448_000 as Weight).saturating_mul(r as Weight))
+		(73_305_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((1_465_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table(r: u32, ) -> Weight {
-		(73_524_000 as Weight)
+		(73_037_000 as Weight)
 			// Standard Error: 3_000
-			.saturating_add((1_572_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((1_605_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_br_table_per_entry(e: u32, ) -> Weight {
-		(76_361_000 as Weight)
+		(76_434_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((4_000 as Weight).saturating_mul(e as Weight))
 	}
 	fn instr_call(r: u32, ) -> Weight {
-		(76_131_000 as Weight)
-			// Standard Error: 7_000
-			.saturating_add((7_271_000 as Weight).saturating_mul(r as Weight))
+		(75_461_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((7_446_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect(r: u32, ) -> Weight {
-		(87_948_000 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((9_429_000 as Weight).saturating_mul(r as Weight))
+		(87_222_000 as Weight)
+			// Standard Error: 15_000
+			.saturating_add((9_406_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_call_indirect_per_param(p: u32, ) -> Weight {
-		(98_091_000 as Weight)
+		(97_204_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((481_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((472_000 as Weight).saturating_mul(p as Weight))
 	}
 	fn instr_local_get(r: u32, ) -> Weight {
-		(74_311_000 as Weight)
+		(75_299_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((627_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((601_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_set(r: u32, ) -> Weight {
-		(74_701_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((677_000 as Weight).saturating_mul(r as Weight))
+		(74_827_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((686_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_local_tee(r: u32, ) -> Weight {
-		(74_645_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((890_000 as Weight).saturating_mul(r as Weight))
+		(74_624_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((895_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_get(r: u32, ) -> Weight {
-		(77_130_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_156_000 as Weight).saturating_mul(r as Weight))
+		(77_435_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((1_201_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_global_set(r: u32, ) -> Weight {
-		(77_199_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_366_000 as Weight).saturating_mul(r as Weight))
+		(76_693_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((1_410_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_current(r: u32, ) -> Weight {
-		(74_024_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((675_000 as Weight).saturating_mul(r as Weight))
+		(74_244_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((660_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_memory_grow(r: u32, ) -> Weight {
-		(75_226_000 as Weight)
-			// Standard Error: 170_000
-			.saturating_add((186_225_000 as Weight).saturating_mul(r as Weight))
+		(73_527_000 as Weight)
+			// Standard Error: 931_000
+			.saturating_add((184_946_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64clz(r: u32, ) -> Weight {
-		(74_307_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((896_000 as Weight).saturating_mul(r as Weight))
+		(74_181_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((906_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ctz(r: u32, ) -> Weight {
-		(74_408_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((895_000 as Weight).saturating_mul(r as Weight))
+		(74_339_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((896_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64popcnt(r: u32, ) -> Weight {
-		(74_418_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((885_000 as Weight).saturating_mul(r as Weight))
+		(74_444_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((889_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eqz(r: u32, ) -> Weight {
-		(74_130_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((920_000 as Weight).saturating_mul(r as Weight))
+		(74_572_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((908_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendsi32(r: u32, ) -> Weight {
-		(74_318_000 as Weight)
+		(74_349_000 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((876_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((881_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64extendui32(r: u32, ) -> Weight {
-		(74_496_000 as Weight)
+		(74_426_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((871_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((875_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i32wrapi64(r: u32, ) -> Weight {
-		(73_938_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((897_000 as Weight).saturating_mul(r as Weight))
+		(74_172_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((906_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64eq(r: u32, ) -> Weight {
-		(73_943_000 as Weight)
+		(74_169_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((1_367_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((1_362_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ne(r: u32, ) -> Weight {
-		(74_305_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_353_000 as Weight).saturating_mul(r as Weight))
+		(74_205_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((1_360_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64lts(r: u32, ) -> Weight {
-		(73_948_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((1_361_000 as Weight).saturating_mul(r as Weight))
+		(74_237_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((1_356_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ltu(r: u32, ) -> Weight {
-		(74_188_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((1_354_000 as Weight).saturating_mul(r as Weight))
+		(74_181_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_357_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gts(r: u32, ) -> Weight {
-		(74_156_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((1_353_000 as Weight).saturating_mul(r as Weight))
+		(74_038_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((1_360_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64gtu(r: u32, ) -> Weight {
-		(73_972_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((1_365_000 as Weight).saturating_mul(r as Weight))
+		(73_881_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((1_372_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64les(r: u32, ) -> Weight {
-		(74_082_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((1_360_000 as Weight).saturating_mul(r as Weight))
+		(73_969_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((1_361_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64leu(r: u32, ) -> Weight {
-		(74_190_000 as Weight)
-			// Standard Error: 1_000
+		(74_497_000 as Weight)
+			// Standard Error: 3_000
 			.saturating_add((1_359_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64ges(r: u32, ) -> Weight {
-		(73_803_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_370_000 as Weight).saturating_mul(r as Weight))
+		(74_275_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_354_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64geu(r: u32, ) -> Weight {
-		(74_063_000 as Weight)
-			// Standard Error: 1_000
+		(74_349_000 as Weight)
+			// Standard Error: 3_000
 			.saturating_add((1_357_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64add(r: u32, ) -> Weight {
-		(73_750_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_345_000 as Weight).saturating_mul(r as Weight))
+		(74_192_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_333_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64sub(r: u32, ) -> Weight {
-		(73_979_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((1_341_000 as Weight).saturating_mul(r as Weight))
+		(74_271_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((1_340_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64mul(r: u32, ) -> Weight {
-		(74_197_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((1_332_000 as Weight).saturating_mul(r as Weight))
+		(73_971_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_340_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divs(r: u32, ) -> Weight {
-		(73_624_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((2_020_000 as Weight).saturating_mul(r as Weight))
+		(74_546_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((1_995_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64divu(r: u32, ) -> Weight {
-		(74_074_000 as Weight)
+		(74_194_000 as Weight)
 			// Standard Error: 2_000
 			.saturating_add((2_050_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rems(r: u32, ) -> Weight {
-		(73_766_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((2_016_000 as Weight).saturating_mul(r as Weight))
+		(74_106_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_997_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64remu(r: u32, ) -> Weight {
-		(73_978_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((2_064_000 as Weight).saturating_mul(r as Weight))
+		(74_219_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((2_061_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64and(r: u32, ) -> Weight {
-		(73_996_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((1_336_000 as Weight).saturating_mul(r as Weight))
+		(74_157_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((1_338_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64or(r: u32, ) -> Weight {
-		(74_058_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_335_000 as Weight).saturating_mul(r as Weight))
+		(74_135_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_336_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64xor(r: u32, ) -> Weight {
-		(73_983_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((1_337_000 as Weight).saturating_mul(r as Weight))
+		(74_038_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((1_345_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shl(r: u32, ) -> Weight {
-		(74_061_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((1_351_000 as Weight).saturating_mul(r as Weight))
+		(74_011_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((1_362_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shrs(r: u32, ) -> Weight {
-		(73_940_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((1_360_000 as Weight).saturating_mul(r as Weight))
+		(74_054_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((1_356_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64shru(r: u32, ) -> Weight {
-		(73_954_000 as Weight)
+		(73_900_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((1_359_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((1_358_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotl(r: u32, ) -> Weight {
-		(74_026_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((1_354_000 as Weight).saturating_mul(r as Weight))
+		(73_948_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((1_357_000 as Weight).saturating_mul(r as Weight))
 	}
 	fn instr_i64rotr(r: u32, ) -> Weight {
-		(74_149_000 as Weight)
+		(73_972_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((1_352_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((1_358_000 as Weight).saturating_mul(r as Weight))
 	}
 }