diff --git a/Cargo.lock b/Cargo.lock
index 119a8b3afed2..e89b62af01b8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1765,9 +1765,9 @@ dependencies = [
 
 [[package]]
 name = "blake3"
-version = "1.5.0"
+version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87"
+checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7"
 dependencies = [
  "arrayref",
  "arrayvec 0.7.4",
@@ -2708,12 +2708,13 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6"
 
 [[package]]
 name = "cc"
-version = "1.0.94"
+version = "1.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7"
+checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938"
 dependencies = [
  "jobserver",
  "libc",
+ "shlex",
 ]
 
 [[package]]
@@ -7918,9 +7919,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
 [[package]]
 name = "jobserver"
-version = "0.1.26"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2"
+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
 dependencies = [
  "libc",
 ]
@@ -12309,7 +12310,8 @@ dependencies = [
  "pallet-utility",
  "parity-scale-codec",
  "paste",
- "polkavm 0.11.0",
+ "polkavm 0.12.0",
+ "polkavm-common 0.12.0",
  "pretty_assertions",
  "rlp",
  "scale-info",
@@ -12334,7 +12336,7 @@ dependencies = [
  "frame-system",
  "log",
  "parity-wasm",
- "polkavm-linker 0.11.0",
+ "polkavm-linker 0.12.0",
  "sp-core 28.0.0",
  "sp-io 30.0.0",
  "sp-runtime 31.0.1",
@@ -12394,7 +12396,7 @@ dependencies = [
  "bitflags 1.3.2",
  "parity-scale-codec",
  "paste",
- "polkavm-derive 0.11.0",
+ "polkavm-derive 0.12.0",
  "scale-info",
 ]
 
@@ -16141,15 +16143,15 @@ dependencies = [
 
 [[package]]
 name = "polkavm"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1195fbc12f11645143a4f3974bf909d25c7f7efddcc6f4e57688d9a518c90bae"
+checksum = "f27910c5061e4cea6be6c66684b49d0f42b6a05900c9b0da9e7f3dd2d587a8d4"
 dependencies = [
  "libc",
  "log",
- "polkavm-assembler 0.11.0",
- "polkavm-common 0.11.0",
- "polkavm-linux-raw 0.11.0",
+ "polkavm-assembler 0.12.0",
+ "polkavm-common 0.12.0",
+ "polkavm-linux-raw 0.12.0",
 ]
 
 [[package]]
@@ -16163,9 +16165,9 @@ dependencies = [
 
 [[package]]
 name = "polkavm-assembler"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0b0399659fe7a5370c3e3464188888d29069cfa46d99631d19834a379c15826"
+checksum = "82f0e374fa043f31459b30d629d7e866247ac4b6c7662ac72e4e5bf50d052b92"
 dependencies = [
  "log",
 ]
@@ -16187,12 +16189,13 @@ dependencies = [
 
 [[package]]
 name = "polkavm-common"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "254b19b64ff9b57c06b32c0affed961cb9a32429b8d3e5cf2633cad7fbb3e270"
+checksum = "f4e42e082c3d89da2346555baf4d951fe07dcb9208e42a02c272e6d5d0326f9a"
 dependencies = [
+ "blake3",
  "log",
- "polkavm-assembler 0.11.0",
+ "polkavm-assembler 0.12.0",
 ]
 
 [[package]]
@@ -16215,11 +16218,11 @@ dependencies = [
 
 [[package]]
 name = "polkavm-derive"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f565f0106fbb3598d64b8528d5cb966b6a87a8dd93fbcfe09fb6388ff2865711"
+checksum = "540b798393e68a890202d5dc9f86a985b7ea83611e3406d90dc1043e7997b4d1"
 dependencies = [
- "polkavm-derive-impl-macro 0.11.0",
+ "polkavm-derive-impl-macro 0.12.0",
 ]
 
 [[package]]
@@ -16248,11 +16251,11 @@ dependencies = [
 
 [[package]]
 name = "polkavm-derive-impl"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "314445fb5688b4769354087d92be2ac94c487e63ffe74a6fb7bb312e57f20827"
+checksum = "d179eddaaef62ce5960faaa2ec9e8f131c81661c8b9365c4d55b275011688534"
 dependencies = [
- "polkavm-common 0.11.0",
+ "polkavm-common 0.12.0",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "syn 2.0.79",
@@ -16280,11 +16283,11 @@ dependencies = [
 
 [[package]]
 name = "polkavm-derive-impl-macro"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bf952e05bc5ce7d81293bae18cb44c271c78615b201d75e983cdcc40d5c6ef1"
+checksum = "bd35472599d35d90e24afe9eb39ae6ee6cb1b924f0c03b277ef8b5f174a63853"
 dependencies = [
- "polkavm-derive-impl 0.11.0",
+ "polkavm-derive-impl 0.12.0",
  "syn 2.0.79",
 ]
 
@@ -16305,15 +16308,15 @@ dependencies = [
 
 [[package]]
 name = "polkavm-linker"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "535a2095a186ccde2cd2fa721d6370c495586d47714817565b2f6621d31164b3"
+checksum = "6f917b16db9ab13819a738a321b48a2d0d20d9e32dedcff75054148676afbec4"
 dependencies = [
  "gimli 0.28.0",
  "hashbrown 0.14.5",
  "log",
  "object 0.36.1",
- "polkavm-common 0.11.0",
+ "polkavm-common 0.12.0",
  "regalloc2 0.9.3",
  "rustc-demangle",
 ]
@@ -16326,9 +16329,9 @@ checksum = "26e85d3456948e650dff0cfc85603915847faf893ed1e66b020bb82ef4557120"
 
 [[package]]
 name = "polkavm-linux-raw"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3011697430dfcfe800d1d7c540ef69e3bdd66e9037cc38f01fee1c2e0908011e"
+checksum = "d280301d5b5a321c732173c969058f4b5726f3a0046f6802f396df2599f3753d"
 
 [[package]]
 name = "polling"
@@ -16758,7 +16761,7 @@ checksum = "80b776a1b2dc779f5ee0641f8ade0125bc1298dd41a9a0c16d8bd57b42d222b1"
 dependencies = [
  "bytes",
  "heck 0.5.0",
- "itertools 0.11.0",
+ "itertools 0.12.1",
  "log",
  "multimap",
  "once_cell",
@@ -16779,7 +16782,7 @@ checksum = "f8650aabb6c35b860610e9cff5dc1af886c9e25073b7b1712a68972af4281302"
 dependencies = [
  "bytes",
  "heck 0.5.0",
- "itertools 0.11.0",
+ "itertools 0.12.1",
  "log",
  "multimap",
  "once_cell",
@@ -16812,7 +16815,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"
 dependencies = [
  "anyhow",
- "itertools 0.11.0",
+ "itertools 0.12.1",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "syn 2.0.79",
@@ -16825,7 +16828,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "acf0c195eebb4af52c752bec4f52f645da98b6e92077a04110c7f349477ae5ac"
 dependencies = [
  "anyhow",
- "itertools 0.11.0",
+ "itertools 0.12.1",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "syn 2.0.79",
diff --git a/prdoc/pr_5939.prdoc b/prdoc/pr_5939.prdoc
new file mode 100644
index 000000000000..babb26281ecd
--- /dev/null
+++ b/prdoc/pr_5939.prdoc
@@ -0,0 +1,14 @@
+title: "[pallet-revive] Bump PolkaVM and add static code validation"
+
+doc:
+  - audience: Runtime Dev
+    description: |
+     Statically validate basic block sizes and instructions.
+
+crates:
+  - name: pallet-revive
+    bump: major
+  - name: pallet-revive-fixtures
+    bump: minor
+  - name: pallet-revive-uapi
+    bump: patch
diff --git a/substrate/frame/revive/Cargo.toml b/substrate/frame/revive/Cargo.toml
index 177b3c3e9eec..e896d9e8fa26 100644
--- a/substrate/frame/revive/Cargo.toml
+++ b/substrate/frame/revive/Cargo.toml
@@ -19,7 +19,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 environmental = { workspace = true }
 paste = { workspace = true }
-polkavm = { version = "0.11.0", default-features = false }
+polkavm = { version = "0.12.0", default-features = false }
+polkavm-common = { version = "0.12.0", default-features = false }
 bitflags = { workspace = true }
 codec = { features = [
 	"derive",
@@ -83,6 +84,7 @@ std = [
 	"pallet-revive-fixtures/std",
 	"pallet-timestamp/std",
 	"pallet-utility/std",
+	"polkavm-common/std",
 	"polkavm/std",
 	"rlp/std",
 	"scale-info/std",
diff --git a/substrate/frame/revive/fixtures/Cargo.toml b/substrate/frame/revive/fixtures/Cargo.toml
index 53db08a3911a..75b23fdd44d1 100644
--- a/substrate/frame/revive/fixtures/Cargo.toml
+++ b/substrate/frame/revive/fixtures/Cargo.toml
@@ -1,6 +1,5 @@
 [package]
 name = "pallet-revive-fixtures"
-publish = true
 version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
@@ -22,7 +21,7 @@ log = { workspace = true }
 parity-wasm = { workspace = true }
 tempfile = { workspace = true }
 toml = { workspace = true }
-polkavm-linker = { version = "0.11.0" }
+polkavm-linker = { version = "0.12.0" }
 anyhow = { workspace = true, default-features = true }
 
 [features]
diff --git a/substrate/frame/revive/fixtures/build.rs b/substrate/frame/revive/fixtures/build.rs
index 944ae246c1b8..3178baf6bbe4 100644
--- a/substrate/frame/revive/fixtures/build.rs
+++ b/substrate/frame/revive/fixtures/build.rs
@@ -115,6 +115,7 @@ mod build {
 
 	fn invoke_build(current_dir: &Path) -> Result<()> {
 		let encoded_rustflags = [
+			"-Dwarnings",
 			"-Crelocation-model=pie",
 			"-Clink-arg=--emit-relocs",
 			"-Clink-arg=--export-dynamic-symbol=__polkavm_symbol_export_hack__*",
@@ -158,8 +159,8 @@ mod build {
 	/// Post-process the compiled code.
 	fn post_process(input_path: &Path, output_path: &Path) -> Result<()> {
 		let mut config = polkavm_linker::Config::default();
-		config.set_strip(true);
-		config.set_optimize(false);
+		config.set_strip(false);
+		config.set_optimize(true);
 		let orig =
 			fs::read(input_path).with_context(|| format!("Failed to read {:?}", input_path))?;
 		let linked = polkavm_linker::program_from_elf(config, orig.as_ref())
diff --git a/substrate/frame/revive/fixtures/build/Cargo.toml b/substrate/frame/revive/fixtures/build/Cargo.toml
index 5b3a21b5122e..948d7438cf98 100644
--- a/substrate/frame/revive/fixtures/build/Cargo.toml
+++ b/substrate/frame/revive/fixtures/build/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2021"
 [dependencies]
 uapi = { package = 'pallet-revive-uapi', path = "", default-features = false }
 common = { package = 'pallet-revive-fixtures-common', path = "" }
-polkavm-derive = { version = "0.11.0" }
+polkavm-derive = { version = "0.12.0" }
 
 [profile.release]
 opt-level = 3
diff --git a/substrate/frame/revive/fixtures/contracts/basic_block.rs b/substrate/frame/revive/fixtures/contracts/basic_block.rs
new file mode 100644
index 000000000000..0cde7a264632
--- /dev/null
+++ b/substrate/frame/revive/fixtures/contracts/basic_block.rs
@@ -0,0 +1,47 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Create a basic block that is larger than we allow.
+
+#![no_std]
+#![no_main]
+
+extern crate common;
+
+use core::arch::asm;
+
+// Export that is never called. We can put code here that should be in the binary
+// but is never supposed to be run.
+#[no_mangle]
+#[polkavm_derive::polkavm_export]
+pub extern "C" fn call_never() {
+	// Stores cannot be optimized away because the optimizer cannot
+	// know whether they have side effects.
+	let value: u32 = 42;
+	unsafe {
+		// Repeat 1001 times to intentionally exceed the allowed basic block limit (1000)
+		asm!(".rept 1001", "sw {x}, 0(sp)", ".endr", x = in(reg) value);
+	}
+}
+
+#[no_mangle]
+#[polkavm_derive::polkavm_export]
+pub extern "C" fn deploy() {}
+
+#[no_mangle]
+#[polkavm_derive::polkavm_export]
+pub extern "C" fn call() {}
diff --git a/substrate/frame/revive/fixtures/contracts/call_diverging_out_len.rs b/substrate/frame/revive/fixtures/contracts/call_diverging_out_len.rs
index e13162f8fb43..129adde2cec9 100644
--- a/substrate/frame/revive/fixtures/contracts/call_diverging_out_len.rs
+++ b/substrate/frame/revive/fixtures/contracts/call_diverging_out_len.rs
@@ -26,7 +26,8 @@
 #![no_std]
 #![no_main]
 
-use common::input;
+extern crate common;
+
 use uapi::{HostFn, HostFnImpl as api};
 
 const BUF_SIZE: usize = 8;
@@ -36,7 +37,7 @@ static DATA: [u8; BUF_SIZE] = [1, 2, 3, 4, 5, 6, 7, 8];
 /// and expect the call output to match `expected_output`.
 fn assert_call<const N: usize>(callee_address: &[u8; 20], expected_output: [u8; BUF_SIZE]) {
 	let mut output_buf = [0u8; BUF_SIZE];
-	let mut output_buf_capped = &mut &mut output_buf[..N];
+	let output_buf_capped = &mut &mut output_buf[..N];
 
 	api::call(
 		uapi::CallFlags::ALLOW_REENTRY,
@@ -62,7 +63,7 @@ fn assert_instantiate<const N: usize>(expected_output: [u8; BUF_SIZE]) {
 	api::own_code_hash(&mut code_hash);
 
 	let mut output_buf = [0u8; BUF_SIZE];
-	let mut output_buf_capped = &mut &mut output_buf[..N];
+	let output_buf_capped = &mut &mut output_buf[..N];
 
 	api::instantiate(
 		&code_hash,
diff --git a/substrate/frame/revive/fixtures/contracts/call_return_code.rs b/substrate/frame/revive/fixtures/contracts/call_return_code.rs
index d0d7c1bee2a5..2d13b9f70956 100644
--- a/substrate/frame/revive/fixtures/contracts/call_return_code.rs
+++ b/substrate/frame/revive/fixtures/contracts/call_return_code.rs
@@ -21,7 +21,7 @@
 #![no_std]
 #![no_main]
 
-use common::{input, u256_bytes};
+use common::input;
 use uapi::{HostFn, HostFnImpl as api};
 
 #[no_mangle]
diff --git a/substrate/frame/revive/fixtures/contracts/sbrk.rs b/substrate/frame/revive/fixtures/contracts/sbrk.rs
new file mode 100644
index 000000000000..5b0bba99df81
--- /dev/null
+++ b/substrate/frame/revive/fixtures/contracts/sbrk.rs
@@ -0,0 +1,39 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Uses the sbrk instruction in order to test that it is rejected.
+
+#![no_std]
+#![no_main]
+
+extern crate common;
+
+// Export that is never called. We can put code here that should be in the binary
+// but is never supposed to be run.
+#[no_mangle]
+#[polkavm_derive::polkavm_export]
+pub extern "C" fn call_never() {
+	polkavm_derive::sbrk(4);
+}
+
+#[no_mangle]
+#[polkavm_derive::polkavm_export]
+pub extern "C" fn deploy() {}
+
+#[no_mangle]
+#[polkavm_derive::polkavm_export]
+pub extern "C" fn call() {}
diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index 6d87fd904c3f..9986da472c96 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -533,6 +533,10 @@ pub mod pallet {
 		/// The static memory consumption of the blob will be larger than
 		/// [`limits::code::STATIC_MEMORY_BYTES`].
 		StaticMemoryTooLarge,
+		/// The program contains a basic block that is larger than allowed.
+		BasicBlockTooLarge,
+		/// The program contains an invalid instruction.
+		InvalidInstruction,
 		/// The contract has reached its maximum number of delegate dependencies.
 		MaxDelegateDependenciesReached,
 		/// The dependency was not found in the contract's delegate dependencies.
diff --git a/substrate/frame/revive/src/limits.rs b/substrate/frame/revive/src/limits.rs
index 50cdba6d0c91..c6d5ef8d8b1b 100644
--- a/substrate/frame/revive/src/limits.rs
+++ b/substrate/frame/revive/src/limits.rs
@@ -82,7 +82,6 @@ pub mod code {
 	use super::PAGE_SIZE;
 	use crate::{CodeVec, Config, Error, LOG_TARGET};
 	use alloc::vec::Vec;
-	use frame_support::ensure;
 	use sp_runtime::DispatchError;
 
 	/// The maximum length of a code blob in bytes.
@@ -109,6 +108,13 @@ pub mod code {
 	/// The code is stored multiple times as part of the compiled program.
 	const EXTRA_OVERHEAD_PER_CODE_BYTE: u32 = 4;
 
+	/// The maximum size of a basic block in number of instructions.
+	///
+	/// We need to limit the size of basic blocks because the interpreters lazy compilation
+	/// compiles one basic block at a time. A malicious program could trigger the compilation
+	/// of the whole program by creating one giant basic block otherwise.
+	const BASIC_BLOCK_SIZE: u32 = 1000;
+
 	/// Make sure that the various program parts are within the defined limits.
 	pub fn enforce<T: Config>(blob: Vec<u8>) -> Result<CodeVec, DispatchError> {
 		fn round_page(n: u32) -> u64 {
@@ -123,8 +129,30 @@ pub mod code {
 			Error::<T>::CodeRejected
 		})?;
 
-		// this is O(n) but it allows us to be more precise
-		let num_instructions = program.instructions().count() as u64;
+		// This scans the whole program but we only do it once on code deployment.
+		// It is safe to do unchecked math in u32 because the size of the program
+		// was already checked above.
+		use polkavm_common::program::ISA32_V1_NoSbrk as ISA;
+		let mut num_instructions: u32 = 0;
+		let mut max_basic_block_size: u32 = 0;
+		let mut basic_block_size: u32 = 0;
+		for inst in program.instructions(ISA) {
+			num_instructions += 1;
+			basic_block_size += 1;
+			if inst.kind.opcode().starts_new_basic_block() {
+				max_basic_block_size = max_basic_block_size.max(basic_block_size);
+				basic_block_size = 0;
+			}
+			if matches!(inst.kind, polkavm::program::Instruction::invalid) {
+				log::debug!(target: LOG_TARGET, "invalid instruction at offset {}", inst.offset);
+				return Err(<Error<T>>::InvalidInstruction.into())
+			}
+		}
+
+		if max_basic_block_size > BASIC_BLOCK_SIZE {
+			log::debug!(target: LOG_TARGET, "basic block too large: {max_basic_block_size} limit: {BASIC_BLOCK_SIZE}");
+			return Err(Error::<T>::BasicBlockTooLarge.into())
+		}
 
 		// The memory consumptions is the byte size of the whole blob,
 		// minus the RO data payload in the blob,
@@ -139,12 +167,17 @@ pub mod code {
 			.saturating_add(round_page(program.rw_data_size()))
 			.saturating_sub(program.rw_data().len() as u64)
 			.saturating_add(round_page(program.stack_size()))
-			.saturating_add((num_instructions).saturating_mul(BYTES_PER_INSTRUCTION.into()))
+			.saturating_add(
+				u64::from(num_instructions).saturating_mul(BYTES_PER_INSTRUCTION.into()),
+			)
 			.saturating_add(
 				(program.code().len() as u64).saturating_mul(EXTRA_OVERHEAD_PER_CODE_BYTE.into()),
 			);
 
-		ensure!(memory_size <= STATIC_MEMORY_BYTES as u64, <Error<T>>::StaticMemoryTooLarge);
+		if memory_size > STATIC_MEMORY_BYTES.into() {
+			log::debug!(target: LOG_TARGET, "static memory too large: {memory_size} limit: {STATIC_MEMORY_BYTES}");
+			return Err(Error::<T>::StaticMemoryTooLarge.into())
+		}
 
 		Ok(blob)
 	}
diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index c7d1a8b2cf0d..4816e65f8f5c 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -4396,4 +4396,50 @@ mod run_tests {
 			assert_ok!(builder::call(addr).data(data.to_vec()).build());
 		});
 	}
+
+	#[test]
+	fn sbrk_cannot_be_deployed() {
+		let (code, _) = compile_module("sbrk").unwrap();
+
+		ExtBuilder::default().build().execute_with(|| {
+			let _ = Balances::set_balance(&ALICE, 1_000_000);
+
+			assert_err!(
+				Contracts::upload_code(
+					RuntimeOrigin::signed(ALICE),
+					code.clone(),
+					deposit_limit::<Test>(),
+				),
+				<Error<Test>>::InvalidInstruction
+			);
+
+			assert_err!(
+				builder::bare_instantiate(Code::Upload(code)).build().result,
+				<Error<Test>>::InvalidInstruction
+			);
+		});
+	}
+
+	#[test]
+	fn overweight_basic_block_cannot_be_deployed() {
+		let (code, _) = compile_module("basic_block").unwrap();
+
+		ExtBuilder::default().build().execute_with(|| {
+			let _ = Balances::set_balance(&ALICE, 1_000_000);
+
+			assert_err!(
+				Contracts::upload_code(
+					RuntimeOrigin::signed(ALICE),
+					code.clone(),
+					deposit_limit::<Test>(),
+				),
+				<Error<Test>>::BasicBlockTooLarge
+			);
+
+			assert_err!(
+				builder::bare_instantiate(Code::Upload(code)).build().result,
+				<Error<Test>>::BasicBlockTooLarge
+			);
+		});
+	}
 }
diff --git a/substrate/frame/revive/src/wasm/mod.rs b/substrate/frame/revive/src/wasm/mod.rs
index cd274873975d..e2256d7dcea7 100644
--- a/substrate/frame/revive/src/wasm/mod.rs
+++ b/substrate/frame/revive/src/wasm/mod.rs
@@ -291,6 +291,7 @@ impl<T: Config> WasmBlob<T> {
 		let mut module_config = polkavm::ModuleConfig::new();
 		module_config.set_page_size(limits::PAGE_SIZE);
 		module_config.set_gas_metering(Some(polkavm::GasMeteringKind::Sync));
+		module_config.set_allow_sbrk(false);
 		let module = polkavm::Module::new(&engine, &module_config, self.code.into_inner().into())
 			.map_err(|err| {
 			log::debug!(target: LOG_TARGET, "failed to create polkavm module: {err:?}");
diff --git a/substrate/frame/revive/src/weights.rs b/substrate/frame/revive/src/weights.rs
index 5e549de3a9fb..9a1b2310b4eb 100644
--- a/substrate/frame/revive/src/weights.rs
+++ b/substrate/frame/revive/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for `pallet_revive`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
-//! DATE: 2024-10-04, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-10-06, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `runner-jniz7bxx-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
@@ -126,7 +126,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `109`
 		//  Estimated: `1594`
-		// Minimum execution time: 2_700_000 picoseconds.
+		// Minimum execution time: 2_712_000 picoseconds.
 		Weight::from_parts(2_882_000, 1594)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
@@ -137,10 +137,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `392 + k * (69 ±0)`
 		//  Estimated: `382 + k * (70 ±0)`
-		// Minimum execution time: 13_819_000 picoseconds.
-		Weight::from_parts(14_021_000, 382)
-			// Standard Error: 843
-			.saturating_add(Weight::from_parts(1_222_715, 0).saturating_mul(k.into()))
+		// Minimum execution time: 13_394_000 picoseconds.
+		Weight::from_parts(13_668_000, 382)
+			// Standard Error: 2_208
+			.saturating_add(Weight::from_parts(1_340_842, 0).saturating_mul(k.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(k.into())))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
@@ -158,12 +158,14 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
 	/// The range of component `c` is `[0, 262144]`.
-	fn call_with_code_per_byte(_c: u32, ) -> Weight {
+	fn call_with_code_per_byte(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `838`
-		//  Estimated: `4303`
-		// Minimum execution time: 79_748_000 picoseconds.
-		Weight::from_parts(82_727_773, 4303)
+		//  Measured:  `1466`
+		//  Estimated: `4931`
+		// Minimum execution time: 80_390_000 picoseconds.
+		Weight::from_parts(83_627_295, 4931)
+			// Standard Error: 0
+			.saturating_add(Weight::from_parts(1, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(5_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -181,16 +183,14 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(262180), added: 264655, mode: `Measured`)
 	/// The range of component `c` is `[0, 262144]`.
 	/// The range of component `i` is `[0, 262144]`.
-	fn instantiate_with_code(c: u32, i: u32, ) -> Weight {
+	fn instantiate_with_code(_c: u32, i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `303`
 		//  Estimated: `6232`
-		// Minimum execution time: 179_270_000 picoseconds.
-		Weight::from_parts(149_933_578, 6232)
-			// Standard Error: 11
-			.saturating_add(Weight::from_parts(16, 0).saturating_mul(c.into()))
+		// Minimum execution time: 184_708_000 picoseconds.
+		Weight::from_parts(177_995_416, 6232)
 			// Standard Error: 11
-			.saturating_add(Weight::from_parts(4_675, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(4_609, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(6_u64))
 			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
@@ -209,12 +209,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `i` is `[0, 262144]`.
 	fn instantiate(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `657`
-		//  Estimated: `4111`
-		// Minimum execution time: 156_112_000 picoseconds.
-		Weight::from_parts(132_715_336, 4111)
+		//  Measured:  `1261`
+		//  Estimated: `4706`
+		// Minimum execution time: 150_137_000 picoseconds.
+		Weight::from_parts(136_548_469, 4706)
 			// Standard Error: 16
-			.saturating_add(Weight::from_parts(4_599, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(4_531, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(6_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -230,10 +230,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
 	fn call() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `838`
-		//  Estimated: `4303`
-		// Minimum execution time: 82_111_000 picoseconds.
-		Weight::from_parts(83_659_000, 4303)
+		//  Measured:  `1466`
+		//  Estimated: `4931`
+		// Minimum execution time: 83_178_000 picoseconds.
+		Weight::from_parts(84_633_000, 4931)
 			.saturating_add(T::DbWeight::get().reads(5_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -248,8 +248,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `109`
 		//  Estimated: `3574`
-		// Minimum execution time: 49_154_000 picoseconds.
-		Weight::from_parts(50_856_127, 3574)
+		// Minimum execution time: 51_526_000 picoseconds.
+		Weight::from_parts(54_565_973, 3574)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -263,8 +263,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `285`
 		//  Estimated: `3750`
-		// Minimum execution time: 41_347_000 picoseconds.
-		Weight::from_parts(42_272_000, 3750)
+		// Minimum execution time: 41_885_000 picoseconds.
+		Weight::from_parts(42_467_000, 3750)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -274,10 +274,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	fn set_code() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `495`
-		//  Estimated: `6435`
-		// Minimum execution time: 25_234_000 picoseconds.
-		Weight::from_parts(26_339_000, 6435)
+		//  Measured:  `492`
+		//  Estimated: `6432`
+		// Minimum execution time: 24_905_000 picoseconds.
+		Weight::from_parts(25_483_000, 6432)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -286,17 +286,17 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 7_509_000 picoseconds.
-		Weight::from_parts(9_047_452, 0)
-			// Standard Error: 165
-			.saturating_add(Weight::from_parts(197_103, 0).saturating_mul(r.into()))
+		// Minimum execution time: 6_979_000 picoseconds.
+		Weight::from_parts(8_272_348, 0)
+			// Standard Error: 137
+			.saturating_add(Weight::from_parts(172_489, 0).saturating_mul(r.into()))
 	}
 	fn seal_caller() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 257_000 picoseconds.
-		Weight::from_parts(300_000, 0)
+		// Minimum execution time: 251_000 picoseconds.
+		Weight::from_parts(318_000, 0)
 	}
 	/// Storage: `Revive::ContractInfoOf` (r:1 w:0)
 	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(1779), added: 4254, mode: `Measured`)
@@ -304,8 +304,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `272`
 		//  Estimated: `3737`
-		// Minimum execution time: 6_537_000 picoseconds.
-		Weight::from_parts(7_024_000, 3737)
+		// Minimum execution time: 6_966_000 picoseconds.
+		Weight::from_parts(7_240_000, 3737)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Revive::ContractInfoOf` (r:1 w:0)
@@ -314,51 +314,51 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `369`
 		//  Estimated: `3834`
-		// Minimum execution time: 7_571_000 picoseconds.
-		Weight::from_parts(8_060_000, 3834)
+		// Minimum execution time: 7_589_000 picoseconds.
+		Weight::from_parts(7_958_000, 3834)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	fn seal_own_code_hash() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 254_000 picoseconds.
-		Weight::from_parts(281_000, 0)
+		// Minimum execution time: 235_000 picoseconds.
+		Weight::from_parts(285_000, 0)
 	}
 	fn seal_caller_is_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 279_000 picoseconds.
-		Weight::from_parts(338_000, 0)
+		// Minimum execution time: 283_000 picoseconds.
+		Weight::from_parts(326_000, 0)
 	}
 	fn seal_caller_is_root() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 240_000 picoseconds.
-		Weight::from_parts(286_000, 0)
+		// Minimum execution time: 266_000 picoseconds.
+		Weight::from_parts(298_000, 0)
 	}
 	fn seal_address() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 198_000 picoseconds.
-		Weight::from_parts(262_000, 0)
+		// Minimum execution time: 240_000 picoseconds.
+		Weight::from_parts(290_000, 0)
 	}
 	fn seal_weight_left() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 593_000 picoseconds.
-		Weight::from_parts(665_000, 0)
+		// Minimum execution time: 651_000 picoseconds.
+		Weight::from_parts(714_000, 0)
 	}
 	fn seal_balance() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `140`
+		//  Measured:  `103`
 		//  Estimated: `0`
-		// Minimum execution time: 5_393_000 picoseconds.
-		Weight::from_parts(5_688_000, 0)
+		// Minimum execution time: 4_476_000 picoseconds.
+		Weight::from_parts(4_671_000, 0)
 	}
 	/// Storage: `System::Account` (r:1 w:0)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
@@ -366,8 +366,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `52`
 		//  Estimated: `3517`
-		// Minimum execution time: 3_907_000 picoseconds.
-		Weight::from_parts(4_154_000, 3517)
+		// Minimum execution time: 3_800_000 picoseconds.
+		Weight::from_parts(3_968_000, 3517)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Revive::ImmutableDataOf` (r:1 w:0)
@@ -377,10 +377,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `205 + n * (1 ±0)`
 		//  Estimated: `3670 + n * (1 ±0)`
-		// Minimum execution time: 5_700_000 picoseconds.
-		Weight::from_parts(6_362_270, 3670)
+		// Minimum execution time: 5_845_000 picoseconds.
+		Weight::from_parts(6_473_478, 3670)
 			// Standard Error: 4
-			.saturating_add(Weight::from_parts(749, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(651, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -391,39 +391,39 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_041_000 picoseconds.
-		Weight::from_parts(2_216_694, 0)
-			// Standard Error: 1
-			.saturating_add(Weight::from_parts(620, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_980_000 picoseconds.
+		Weight::from_parts(2_324_567, 0)
+			// Standard Error: 3
+			.saturating_add(Weight::from_parts(512, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	fn seal_value_transferred() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 229_000 picoseconds.
-		Weight::from_parts(261_000, 0)
+		// Minimum execution time: 259_000 picoseconds.
+		Weight::from_parts(285_000, 0)
 	}
 	fn seal_minimum_balance() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 226_000 picoseconds.
-		Weight::from_parts(270_000, 0)
+		// Minimum execution time: 244_000 picoseconds.
+		Weight::from_parts(291_000, 0)
 	}
 	fn seal_block_number() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 215_000 picoseconds.
-		Weight::from_parts(273_000, 0)
+		// Minimum execution time: 252_000 picoseconds.
+		Weight::from_parts(291_000, 0)
 	}
 	fn seal_now() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 242_000 picoseconds.
-		Weight::from_parts(271_000, 0)
+		// Minimum execution time: 245_000 picoseconds.
+		Weight::from_parts(277_000, 0)
 	}
 	/// Storage: `TransactionPayment::NextFeeMultiplier` (r:1 w:0)
 	/// Proof: `TransactionPayment::NextFeeMultiplier` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `Measured`)
@@ -431,8 +431,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `67`
 		//  Estimated: `1552`
-		// Minimum execution time: 5_438_000 picoseconds.
-		Weight::from_parts(5_695_000, 1552)
+		// Minimum execution time: 5_650_000 picoseconds.
+		Weight::from_parts(5_783_000, 1552)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// The range of component `n` is `[0, 262140]`.
@@ -440,20 +440,20 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 405_000 picoseconds.
-		Weight::from_parts(539_737, 0)
+		// Minimum execution time: 427_000 picoseconds.
+		Weight::from_parts(351_577, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(148, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(114, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 262140]`.
 	fn seal_return(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 222_000 picoseconds.
-		Weight::from_parts(539_301, 0)
+		// Minimum execution time: 265_000 picoseconds.
+		Weight::from_parts(746_316, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(294, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(202, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Revive::DeletionQueueCounter` (r:1 w:1)
 	/// Proof: `Revive::DeletionQueueCounter` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
@@ -467,11 +467,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn seal_terminate(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `272 + n * (88 ±0)`
-		//  Estimated: `3738 + n * (2563 ±0)`
-		// Minimum execution time: 15_971_000 picoseconds.
-		Weight::from_parts(18_759_349, 3738)
-			// Standard Error: 10_298
-			.saturating_add(Weight::from_parts(4_194_635, 0).saturating_mul(n.into()))
+		//  Estimated: `3737 + n * (2563 ±0)`
+		// Minimum execution time: 15_988_000 picoseconds.
+		Weight::from_parts(18_796_705, 3737)
+			// Standard Error: 10_437
+			.saturating_add(Weight::from_parts(4_338_085, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
@@ -484,22 +484,22 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_341_000 picoseconds.
-		Weight::from_parts(4_292_048, 0)
-			// Standard Error: 2_476
-			.saturating_add(Weight::from_parts(193_480, 0).saturating_mul(t.into()))
-			// Standard Error: 22
-			.saturating_add(Weight::from_parts(959, 0).saturating_mul(n.into()))
+		// Minimum execution time: 4_237_000 picoseconds.
+		Weight::from_parts(4_128_112, 0)
+			// Standard Error: 2_947
+			.saturating_add(Weight::from_parts(198_825, 0).saturating_mul(t.into()))
+			// Standard Error: 26
+			.saturating_add(Weight::from_parts(1_007, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `i` is `[0, 262144]`.
 	fn seal_debug_message(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 287_000 picoseconds.
-		Weight::from_parts(758_020, 0)
+		// Minimum execution time: 292_000 picoseconds.
+		Weight::from_parts(1_297_376, 0)
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(814, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(724, 0).saturating_mul(i.into()))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
 	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -507,8 +507,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `744`
 		//  Estimated: `744`
-		// Minimum execution time: 7_944_000 picoseconds.
-		Weight::from_parts(8_358_000, 744)
+		// Minimum execution time: 7_812_000 picoseconds.
+		Weight::from_parts(8_171_000, 744)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -517,8 +517,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `10754`
 		//  Estimated: `10754`
-		// Minimum execution time: 44_950_000 picoseconds.
-		Weight::from_parts(45_575_000, 10754)
+		// Minimum execution time: 44_179_000 picoseconds.
+		Weight::from_parts(45_068_000, 10754)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -527,8 +527,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `744`
 		//  Estimated: `744`
-		// Minimum execution time: 9_095_000 picoseconds.
-		Weight::from_parts(9_484_000, 744)
+		// Minimum execution time: 8_964_000 picoseconds.
+		Weight::from_parts(9_336_000, 744)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -538,8 +538,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `10754`
 		//  Estimated: `10754`
-		// Minimum execution time: 46_814_000 picoseconds.
-		Weight::from_parts(47_710_000, 10754)
+		// Minimum execution time: 45_606_000 picoseconds.
+		Weight::from_parts(47_190_000, 10754)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -551,12 +551,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + o * (1 ±0)`
 		//  Estimated: `247 + o * (1 ±0)`
-		// Minimum execution time: 9_496_000 picoseconds.
-		Weight::from_parts(9_875_533, 247)
-			// Standard Error: 34
-			.saturating_add(Weight::from_parts(712, 0).saturating_mul(n.into()))
-			// Standard Error: 34
-			.saturating_add(Weight::from_parts(777, 0).saturating_mul(o.into()))
+		// Minimum execution time: 9_077_000 picoseconds.
+		Weight::from_parts(9_823_489, 247)
+			// Standard Error: 54
+			.saturating_add(Weight::from_parts(392, 0).saturating_mul(n.into()))
+			// Standard Error: 54
+			.saturating_add(Weight::from_parts(408, 0).saturating_mul(o.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(o.into()))
@@ -568,10 +568,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 9_185_000 picoseconds.
-		Weight::from_parts(9_912_715, 247)
-			// Standard Error: 59
-			.saturating_add(Weight::from_parts(567, 0).saturating_mul(n.into()))
+		// Minimum execution time: 8_812_000 picoseconds.
+		Weight::from_parts(9_626_925, 247)
+			// Standard Error: 77
+			.saturating_add(Weight::from_parts(269, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
@@ -583,10 +583,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 8_586_000 picoseconds.
-		Weight::from_parts(9_536_041, 247)
-			// Standard Error: 54
-			.saturating_add(Weight::from_parts(1_456, 0).saturating_mul(n.into()))
+		// Minimum execution time: 8_143_000 picoseconds.
+		Weight::from_parts(9_229_363, 247)
+			// Standard Error: 77
+			.saturating_add(Weight::from_parts(1_198, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -597,10 +597,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 8_162_000 picoseconds.
-		Weight::from_parts(8_813_128, 247)
-			// Standard Error: 43
-			.saturating_add(Weight::from_parts(880, 0).saturating_mul(n.into()))
+		// Minimum execution time: 7_899_000 picoseconds.
+		Weight::from_parts(8_591_860, 247)
+			// Standard Error: 56
+			.saturating_add(Weight::from_parts(461, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -611,10 +611,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 9_717_000 picoseconds.
-		Weight::from_parts(10_635_621, 247)
-			// Standard Error: 58
-			.saturating_add(Weight::from_parts(1_430, 0).saturating_mul(n.into()))
+		// Minimum execution time: 9_215_000 picoseconds.
+		Weight::from_parts(10_198_528, 247)
+			// Standard Error: 75
+			.saturating_add(Weight::from_parts(1_521, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
@@ -623,36 +623,36 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_503_000 picoseconds.
-		Weight::from_parts(1_592_000, 0)
+		// Minimum execution time: 1_406_000 picoseconds.
+		Weight::from_parts(1_515_000, 0)
 	}
 	fn set_transient_storage_full() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_903_000 picoseconds.
-		Weight::from_parts(1_996_000, 0)
+		// Minimum execution time: 1_782_000 picoseconds.
+		Weight::from_parts(1_890_000, 0)
 	}
 	fn get_transient_storage_empty() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_432_000 picoseconds.
-		Weight::from_parts(1_534_000, 0)
+		// Minimum execution time: 1_380_000 picoseconds.
+		Weight::from_parts(1_422_000, 0)
 	}
 	fn get_transient_storage_full() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_606_000 picoseconds.
-		Weight::from_parts(1_669_000, 0)
+		// Minimum execution time: 1_504_000 picoseconds.
+		Weight::from_parts(1_583_000, 0)
 	}
 	fn rollback_transient_storage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 960_000 picoseconds.
-		Weight::from_parts(1_089_000, 0)
+		// Minimum execution time: 1_045_000 picoseconds.
+		Weight::from_parts(1_138_000, 0)
 	}
 	/// The range of component `n` is `[0, 512]`.
 	/// The range of component `o` is `[0, 512]`.
@@ -660,59 +660,59 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_317_000 picoseconds.
-		Weight::from_parts(2_449_933, 0)
-			// Standard Error: 11
-			.saturating_add(Weight::from_parts(315, 0).saturating_mul(n.into()))
-			// Standard Error: 11
-			.saturating_add(Weight::from_parts(387, 0).saturating_mul(o.into()))
+		// Minimum execution time: 2_039_000 picoseconds.
+		Weight::from_parts(2_317_406, 0)
+			// Standard Error: 13
+			.saturating_add(Weight::from_parts(283, 0).saturating_mul(n.into()))
+			// Standard Error: 13
+			.saturating_add(Weight::from_parts(347, 0).saturating_mul(o.into()))
 	}
 	/// The range of component `n` is `[0, 512]`.
 	fn seal_clear_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_980_000 picoseconds.
-		Weight::from_parts(2_352_243, 0)
+		// Minimum execution time: 1_880_000 picoseconds.
+		Weight::from_parts(2_251_392, 0)
 			// Standard Error: 17
-			.saturating_add(Weight::from_parts(372, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(313, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 512]`.
 	fn seal_get_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_857_000 picoseconds.
-		Weight::from_parts(2_082_050, 0)
+		// Minimum execution time: 1_763_000 picoseconds.
+		Weight::from_parts(1_951_912, 0)
 			// Standard Error: 13
-			.saturating_add(Weight::from_parts(373, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(268, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 512]`.
 	fn seal_contains_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_693_000 picoseconds.
-		Weight::from_parts(1_892_600, 0)
-			// Standard Error: 13
-			.saturating_add(Weight::from_parts(193, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_536_000 picoseconds.
+		Weight::from_parts(1_779_085, 0)
+			// Standard Error: 14
+			.saturating_add(Weight::from_parts(148, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 512]`.
 	fn seal_take_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_620_000 picoseconds.
-		Weight::from_parts(2_818_388, 0)
-			// Standard Error: 15
-			.saturating_add(Weight::from_parts(39, 0).saturating_mul(n.into()))
+		// Minimum execution time: 2_343_000 picoseconds.
+		Weight::from_parts(2_587_750, 0)
+			// Standard Error: 22
+			.saturating_add(Weight::from_parts(30, 0).saturating_mul(n.into()))
 	}
 	fn seal_transfer() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `140`
+		//  Measured:  `103`
 		//  Estimated: `0`
-		// Minimum execution time: 10_207_000 picoseconds.
-		Weight::from_parts(10_627_000, 0)
+		// Minimum execution time: 9_250_000 picoseconds.
+		Weight::from_parts(9_637_000, 0)
 	}
 	/// Storage: `Revive::ContractInfoOf` (r:1 w:0)
 	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(1779), added: 4254, mode: `Measured`)
@@ -724,17 +724,17 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `i` is `[0, 262144]`.
 	fn seal_call(t: u32, i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `630 + t * (140 ±0)`
-		//  Estimated: `4095 + t * (140 ±0)`
-		// Minimum execution time: 34_452_000 picoseconds.
-		Weight::from_parts(34_837_900, 4095)
-			// Standard Error: 30_385
-			.saturating_add(Weight::from_parts(1_981_565, 0).saturating_mul(t.into()))
+		//  Measured:  `1221 + t * (103 ±0)`
+		//  Estimated: `4686 + t * (103 ±0)`
+		// Minimum execution time: 33_333_000 picoseconds.
+		Weight::from_parts(34_378_774, 4686)
+			// Standard Error: 41_131
+			.saturating_add(Weight::from_parts(1_756_626, 0).saturating_mul(t.into()))
 			// Standard Error: 0
 			.saturating_add(Weight::from_parts(3, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
-			.saturating_add(Weight::from_parts(0, 140).saturating_mul(t.into()))
+			.saturating_add(Weight::from_parts(0, 103).saturating_mul(t.into()))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
@@ -742,10 +742,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(262180), added: 264655, mode: `Measured`)
 	fn seal_delegate_call() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `457`
-		//  Estimated: `3922`
-		// Minimum execution time: 27_287_000 picoseconds.
-		Weight::from_parts(28_450_000, 3922)
+		//  Measured:  `1048`
+		//  Estimated: `4513`
+		// Minimum execution time: 27_096_000 picoseconds.
+		Weight::from_parts(27_934_000, 4513)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
@@ -759,12 +759,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `i` is `[0, 262144]`.
 	fn seal_instantiate(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `703`
-		//  Estimated: `4160`
-		// Minimum execution time: 118_660_000 picoseconds.
-		Weight::from_parts(104_638_796, 4160)
-			// Standard Error: 11
-			.saturating_add(Weight::from_parts(4_296, 0).saturating_mul(i.into()))
+		//  Measured:  `1257`
+		//  Estimated: `4715`
+		// Minimum execution time: 118_412_000 picoseconds.
+		Weight::from_parts(106_130_041, 4715)
+			// Standard Error: 12
+			.saturating_add(Weight::from_parts(4_235, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -773,64 +773,64 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 683_000 picoseconds.
-		Weight::from_parts(3_836_563, 0)
-			// Standard Error: 2
-			.saturating_add(Weight::from_parts(1_456, 0).saturating_mul(n.into()))
+		// Minimum execution time: 614_000 picoseconds.
+		Weight::from_parts(4_320_897, 0)
+			// Standard Error: 3
+			.saturating_add(Weight::from_parts(1_371, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn seal_hash_keccak_256(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_082_000 picoseconds.
-		Weight::from_parts(5_027_764, 0)
+		// Minimum execution time: 1_062_000 picoseconds.
+		Weight::from_parts(4_571_371, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(3_644, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(3_572, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn seal_hash_blake2_256(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 660_000 picoseconds.
-		Weight::from_parts(3_585_640, 0)
-			// Standard Error: 2
-			.saturating_add(Weight::from_parts(1_586, 0).saturating_mul(n.into()))
+		// Minimum execution time: 609_000 picoseconds.
+		Weight::from_parts(4_008_056, 0)
+			// Standard Error: 3
+			.saturating_add(Weight::from_parts(1_497, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn seal_hash_blake2_128(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 638_000 picoseconds.
-		Weight::from_parts(3_763_242, 0)
+		// Minimum execution time: 608_000 picoseconds.
+		Weight::from_parts(3_839_383, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_582, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(1_504, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 261889]`.
 	fn seal_sr25519_verify(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 42_962_000 picoseconds.
-		Weight::from_parts(27_938_396, 0)
-			// Standard Error: 13
-			.saturating_add(Weight::from_parts(5_269, 0).saturating_mul(n.into()))
+		// Minimum execution time: 43_110_000 picoseconds.
+		Weight::from_parts(31_941_593, 0)
+			// Standard Error: 12
+			.saturating_add(Weight::from_parts(5_233, 0).saturating_mul(n.into()))
 	}
 	fn seal_ecdsa_recover() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 47_133_000 picoseconds.
-		Weight::from_parts(48_458_000, 0)
+		// Minimum execution time: 47_798_000 picoseconds.
+		Weight::from_parts(49_225_000, 0)
 	}
 	fn seal_ecdsa_to_eth_address() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 13_249_000 picoseconds.
-		Weight::from_parts(13_518_000, 0)
+		// Minimum execution time: 12_576_000 picoseconds.
+		Weight::from_parts(12_731_000, 0)
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
@@ -838,8 +838,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `266`
 		//  Estimated: `3731`
-		// Minimum execution time: 14_696_000 picoseconds.
-		Weight::from_parts(15_106_000, 3731)
+		// Minimum execution time: 14_306_000 picoseconds.
+		Weight::from_parts(15_011_000, 3731)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -847,10 +847,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	fn lock_delegate_dependency() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `304`
-		//  Estimated: `3769`
-		// Minimum execution time: 10_292_000 picoseconds.
-		Weight::from_parts(10_670_000, 3769)
+		//  Measured:  `303`
+		//  Estimated: `3768`
+		// Minimum execution time: 10_208_000 picoseconds.
+		Weight::from_parts(10_514_000, 3768)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -858,10 +858,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `MaxEncodedLen`)
 	fn unlock_delegate_dependency() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `304`
+		//  Measured:  `303`
 		//  Estimated: `3561`
-		// Minimum execution time: 9_056_000 picoseconds.
-		Weight::from_parts(9_350_000, 3561)
+		// Minimum execution time: 9_062_000 picoseconds.
+		Weight::from_parts(9_414_000, 3561)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -870,10 +870,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_145_000 picoseconds.
-		Weight::from_parts(10_744_073, 0)
-			// Standard Error: 72
-			.saturating_add(Weight::from_parts(84_813, 0).saturating_mul(r.into()))
+		// Minimum execution time: 8_074_000 picoseconds.
+		Weight::from_parts(9_646_158, 0)
+			// Standard Error: 58
+			.saturating_add(Weight::from_parts(84_694, 0).saturating_mul(r.into()))
 	}
 }
 
@@ -885,7 +885,7 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `109`
 		//  Estimated: `1594`
-		// Minimum execution time: 2_700_000 picoseconds.
+		// Minimum execution time: 2_712_000 picoseconds.
 		Weight::from_parts(2_882_000, 1594)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
@@ -896,10 +896,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `392 + k * (69 ±0)`
 		//  Estimated: `382 + k * (70 ±0)`
-		// Minimum execution time: 13_819_000 picoseconds.
-		Weight::from_parts(14_021_000, 382)
-			// Standard Error: 843
-			.saturating_add(Weight::from_parts(1_222_715, 0).saturating_mul(k.into()))
+		// Minimum execution time: 13_394_000 picoseconds.
+		Weight::from_parts(13_668_000, 382)
+			// Standard Error: 2_208
+			.saturating_add(Weight::from_parts(1_340_842, 0).saturating_mul(k.into()))
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(k.into())))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
@@ -917,12 +917,14 @@ impl WeightInfo for () {
 	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
 	/// The range of component `c` is `[0, 262144]`.
-	fn call_with_code_per_byte(_c: u32, ) -> Weight {
+	fn call_with_code_per_byte(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `838`
-		//  Estimated: `4303`
-		// Minimum execution time: 79_748_000 picoseconds.
-		Weight::from_parts(82_727_773, 4303)
+		//  Measured:  `1466`
+		//  Estimated: `4931`
+		// Minimum execution time: 80_390_000 picoseconds.
+		Weight::from_parts(83_627_295, 4931)
+			// Standard Error: 0
+			.saturating_add(Weight::from_parts(1, 0).saturating_mul(c.into()))
 			.saturating_add(RocksDbWeight::get().reads(5_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -940,16 +942,14 @@ impl WeightInfo for () {
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(262180), added: 264655, mode: `Measured`)
 	/// The range of component `c` is `[0, 262144]`.
 	/// The range of component `i` is `[0, 262144]`.
-	fn instantiate_with_code(c: u32, i: u32, ) -> Weight {
+	fn instantiate_with_code(_c: u32, i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `303`
 		//  Estimated: `6232`
-		// Minimum execution time: 179_270_000 picoseconds.
-		Weight::from_parts(149_933_578, 6232)
-			// Standard Error: 11
-			.saturating_add(Weight::from_parts(16, 0).saturating_mul(c.into()))
+		// Minimum execution time: 184_708_000 picoseconds.
+		Weight::from_parts(177_995_416, 6232)
 			// Standard Error: 11
-			.saturating_add(Weight::from_parts(4_675, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(4_609, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(6_u64))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
@@ -968,12 +968,12 @@ impl WeightInfo for () {
 	/// The range of component `i` is `[0, 262144]`.
 	fn instantiate(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `657`
-		//  Estimated: `4111`
-		// Minimum execution time: 156_112_000 picoseconds.
-		Weight::from_parts(132_715_336, 4111)
+		//  Measured:  `1261`
+		//  Estimated: `4706`
+		// Minimum execution time: 150_137_000 picoseconds.
+		Weight::from_parts(136_548_469, 4706)
 			// Standard Error: 16
-			.saturating_add(Weight::from_parts(4_599, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(4_531, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(6_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -989,10 +989,10 @@ impl WeightInfo for () {
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
 	fn call() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `838`
-		//  Estimated: `4303`
-		// Minimum execution time: 82_111_000 picoseconds.
-		Weight::from_parts(83_659_000, 4303)
+		//  Measured:  `1466`
+		//  Estimated: `4931`
+		// Minimum execution time: 83_178_000 picoseconds.
+		Weight::from_parts(84_633_000, 4931)
 			.saturating_add(RocksDbWeight::get().reads(5_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -1007,8 +1007,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `109`
 		//  Estimated: `3574`
-		// Minimum execution time: 49_154_000 picoseconds.
-		Weight::from_parts(50_856_127, 3574)
+		// Minimum execution time: 51_526_000 picoseconds.
+		Weight::from_parts(54_565_973, 3574)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -1022,8 +1022,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `285`
 		//  Estimated: `3750`
-		// Minimum execution time: 41_347_000 picoseconds.
-		Weight::from_parts(42_272_000, 3750)
+		// Minimum execution time: 41_885_000 picoseconds.
+		Weight::from_parts(42_467_000, 3750)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -1033,10 +1033,10 @@ impl WeightInfo for () {
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	fn set_code() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `495`
-		//  Estimated: `6435`
-		// Minimum execution time: 25_234_000 picoseconds.
-		Weight::from_parts(26_339_000, 6435)
+		//  Measured:  `492`
+		//  Estimated: `6432`
+		// Minimum execution time: 24_905_000 picoseconds.
+		Weight::from_parts(25_483_000, 6432)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -1045,17 +1045,17 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 7_509_000 picoseconds.
-		Weight::from_parts(9_047_452, 0)
-			// Standard Error: 165
-			.saturating_add(Weight::from_parts(197_103, 0).saturating_mul(r.into()))
+		// Minimum execution time: 6_979_000 picoseconds.
+		Weight::from_parts(8_272_348, 0)
+			// Standard Error: 137
+			.saturating_add(Weight::from_parts(172_489, 0).saturating_mul(r.into()))
 	}
 	fn seal_caller() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 257_000 picoseconds.
-		Weight::from_parts(300_000, 0)
+		// Minimum execution time: 251_000 picoseconds.
+		Weight::from_parts(318_000, 0)
 	}
 	/// Storage: `Revive::ContractInfoOf` (r:1 w:0)
 	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(1779), added: 4254, mode: `Measured`)
@@ -1063,8 +1063,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `272`
 		//  Estimated: `3737`
-		// Minimum execution time: 6_537_000 picoseconds.
-		Weight::from_parts(7_024_000, 3737)
+		// Minimum execution time: 6_966_000 picoseconds.
+		Weight::from_parts(7_240_000, 3737)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Revive::ContractInfoOf` (r:1 w:0)
@@ -1073,51 +1073,51 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `369`
 		//  Estimated: `3834`
-		// Minimum execution time: 7_571_000 picoseconds.
-		Weight::from_parts(8_060_000, 3834)
+		// Minimum execution time: 7_589_000 picoseconds.
+		Weight::from_parts(7_958_000, 3834)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	fn seal_own_code_hash() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 254_000 picoseconds.
-		Weight::from_parts(281_000, 0)
+		// Minimum execution time: 235_000 picoseconds.
+		Weight::from_parts(285_000, 0)
 	}
 	fn seal_caller_is_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 279_000 picoseconds.
-		Weight::from_parts(338_000, 0)
+		// Minimum execution time: 283_000 picoseconds.
+		Weight::from_parts(326_000, 0)
 	}
 	fn seal_caller_is_root() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 240_000 picoseconds.
-		Weight::from_parts(286_000, 0)
+		// Minimum execution time: 266_000 picoseconds.
+		Weight::from_parts(298_000, 0)
 	}
 	fn seal_address() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 198_000 picoseconds.
-		Weight::from_parts(262_000, 0)
+		// Minimum execution time: 240_000 picoseconds.
+		Weight::from_parts(290_000, 0)
 	}
 	fn seal_weight_left() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 593_000 picoseconds.
-		Weight::from_parts(665_000, 0)
+		// Minimum execution time: 651_000 picoseconds.
+		Weight::from_parts(714_000, 0)
 	}
 	fn seal_balance() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `140`
+		//  Measured:  `103`
 		//  Estimated: `0`
-		// Minimum execution time: 5_393_000 picoseconds.
-		Weight::from_parts(5_688_000, 0)
+		// Minimum execution time: 4_476_000 picoseconds.
+		Weight::from_parts(4_671_000, 0)
 	}
 	/// Storage: `System::Account` (r:1 w:0)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
@@ -1125,8 +1125,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `52`
 		//  Estimated: `3517`
-		// Minimum execution time: 3_907_000 picoseconds.
-		Weight::from_parts(4_154_000, 3517)
+		// Minimum execution time: 3_800_000 picoseconds.
+		Weight::from_parts(3_968_000, 3517)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Revive::ImmutableDataOf` (r:1 w:0)
@@ -1136,10 +1136,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `205 + n * (1 ±0)`
 		//  Estimated: `3670 + n * (1 ±0)`
-		// Minimum execution time: 5_700_000 picoseconds.
-		Weight::from_parts(6_362_270, 3670)
+		// Minimum execution time: 5_845_000 picoseconds.
+		Weight::from_parts(6_473_478, 3670)
 			// Standard Error: 4
-			.saturating_add(Weight::from_parts(749, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(651, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -1150,39 +1150,39 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_041_000 picoseconds.
-		Weight::from_parts(2_216_694, 0)
-			// Standard Error: 1
-			.saturating_add(Weight::from_parts(620, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_980_000 picoseconds.
+		Weight::from_parts(2_324_567, 0)
+			// Standard Error: 3
+			.saturating_add(Weight::from_parts(512, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	fn seal_value_transferred() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 229_000 picoseconds.
-		Weight::from_parts(261_000, 0)
+		// Minimum execution time: 259_000 picoseconds.
+		Weight::from_parts(285_000, 0)
 	}
 	fn seal_minimum_balance() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 226_000 picoseconds.
-		Weight::from_parts(270_000, 0)
+		// Minimum execution time: 244_000 picoseconds.
+		Weight::from_parts(291_000, 0)
 	}
 	fn seal_block_number() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 215_000 picoseconds.
-		Weight::from_parts(273_000, 0)
+		// Minimum execution time: 252_000 picoseconds.
+		Weight::from_parts(291_000, 0)
 	}
 	fn seal_now() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 242_000 picoseconds.
-		Weight::from_parts(271_000, 0)
+		// Minimum execution time: 245_000 picoseconds.
+		Weight::from_parts(277_000, 0)
 	}
 	/// Storage: `TransactionPayment::NextFeeMultiplier` (r:1 w:0)
 	/// Proof: `TransactionPayment::NextFeeMultiplier` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `Measured`)
@@ -1190,8 +1190,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `67`
 		//  Estimated: `1552`
-		// Minimum execution time: 5_438_000 picoseconds.
-		Weight::from_parts(5_695_000, 1552)
+		// Minimum execution time: 5_650_000 picoseconds.
+		Weight::from_parts(5_783_000, 1552)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// The range of component `n` is `[0, 262140]`.
@@ -1199,20 +1199,20 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 405_000 picoseconds.
-		Weight::from_parts(539_737, 0)
+		// Minimum execution time: 427_000 picoseconds.
+		Weight::from_parts(351_577, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(148, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(114, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 262140]`.
 	fn seal_return(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 222_000 picoseconds.
-		Weight::from_parts(539_301, 0)
+		// Minimum execution time: 265_000 picoseconds.
+		Weight::from_parts(746_316, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(294, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(202, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Revive::DeletionQueueCounter` (r:1 w:1)
 	/// Proof: `Revive::DeletionQueueCounter` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
@@ -1226,11 +1226,11 @@ impl WeightInfo for () {
 	fn seal_terminate(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `272 + n * (88 ±0)`
-		//  Estimated: `3738 + n * (2563 ±0)`
-		// Minimum execution time: 15_971_000 picoseconds.
-		Weight::from_parts(18_759_349, 3738)
-			// Standard Error: 10_298
-			.saturating_add(Weight::from_parts(4_194_635, 0).saturating_mul(n.into()))
+		//  Estimated: `3737 + n * (2563 ±0)`
+		// Minimum execution time: 15_988_000 picoseconds.
+		Weight::from_parts(18_796_705, 3737)
+			// Standard Error: 10_437
+			.saturating_add(Weight::from_parts(4_338_085, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(n.into())))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
@@ -1243,22 +1243,22 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_341_000 picoseconds.
-		Weight::from_parts(4_292_048, 0)
-			// Standard Error: 2_476
-			.saturating_add(Weight::from_parts(193_480, 0).saturating_mul(t.into()))
-			// Standard Error: 22
-			.saturating_add(Weight::from_parts(959, 0).saturating_mul(n.into()))
+		// Minimum execution time: 4_237_000 picoseconds.
+		Weight::from_parts(4_128_112, 0)
+			// Standard Error: 2_947
+			.saturating_add(Weight::from_parts(198_825, 0).saturating_mul(t.into()))
+			// Standard Error: 26
+			.saturating_add(Weight::from_parts(1_007, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `i` is `[0, 262144]`.
 	fn seal_debug_message(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 287_000 picoseconds.
-		Weight::from_parts(758_020, 0)
+		// Minimum execution time: 292_000 picoseconds.
+		Weight::from_parts(1_297_376, 0)
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(814, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(724, 0).saturating_mul(i.into()))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
 	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -1266,8 +1266,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `744`
 		//  Estimated: `744`
-		// Minimum execution time: 7_944_000 picoseconds.
-		Weight::from_parts(8_358_000, 744)
+		// Minimum execution time: 7_812_000 picoseconds.
+		Weight::from_parts(8_171_000, 744)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -1276,8 +1276,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `10754`
 		//  Estimated: `10754`
-		// Minimum execution time: 44_950_000 picoseconds.
-		Weight::from_parts(45_575_000, 10754)
+		// Minimum execution time: 44_179_000 picoseconds.
+		Weight::from_parts(45_068_000, 10754)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -1286,8 +1286,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `744`
 		//  Estimated: `744`
-		// Minimum execution time: 9_095_000 picoseconds.
-		Weight::from_parts(9_484_000, 744)
+		// Minimum execution time: 8_964_000 picoseconds.
+		Weight::from_parts(9_336_000, 744)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -1297,8 +1297,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `10754`
 		//  Estimated: `10754`
-		// Minimum execution time: 46_814_000 picoseconds.
-		Weight::from_parts(47_710_000, 10754)
+		// Minimum execution time: 45_606_000 picoseconds.
+		Weight::from_parts(47_190_000, 10754)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -1310,12 +1310,12 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + o * (1 ±0)`
 		//  Estimated: `247 + o * (1 ±0)`
-		// Minimum execution time: 9_496_000 picoseconds.
-		Weight::from_parts(9_875_533, 247)
-			// Standard Error: 34
-			.saturating_add(Weight::from_parts(712, 0).saturating_mul(n.into()))
-			// Standard Error: 34
-			.saturating_add(Weight::from_parts(777, 0).saturating_mul(o.into()))
+		// Minimum execution time: 9_077_000 picoseconds.
+		Weight::from_parts(9_823_489, 247)
+			// Standard Error: 54
+			.saturating_add(Weight::from_parts(392, 0).saturating_mul(n.into()))
+			// Standard Error: 54
+			.saturating_add(Weight::from_parts(408, 0).saturating_mul(o.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(o.into()))
@@ -1327,10 +1327,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 9_185_000 picoseconds.
-		Weight::from_parts(9_912_715, 247)
-			// Standard Error: 59
-			.saturating_add(Weight::from_parts(567, 0).saturating_mul(n.into()))
+		// Minimum execution time: 8_812_000 picoseconds.
+		Weight::from_parts(9_626_925, 247)
+			// Standard Error: 77
+			.saturating_add(Weight::from_parts(269, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
@@ -1342,10 +1342,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 8_586_000 picoseconds.
-		Weight::from_parts(9_536_041, 247)
-			// Standard Error: 54
-			.saturating_add(Weight::from_parts(1_456, 0).saturating_mul(n.into()))
+		// Minimum execution time: 8_143_000 picoseconds.
+		Weight::from_parts(9_229_363, 247)
+			// Standard Error: 77
+			.saturating_add(Weight::from_parts(1_198, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -1356,10 +1356,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 8_162_000 picoseconds.
-		Weight::from_parts(8_813_128, 247)
-			// Standard Error: 43
-			.saturating_add(Weight::from_parts(880, 0).saturating_mul(n.into()))
+		// Minimum execution time: 7_899_000 picoseconds.
+		Weight::from_parts(8_591_860, 247)
+			// Standard Error: 56
+			.saturating_add(Weight::from_parts(461, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -1370,10 +1370,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 9_717_000 picoseconds.
-		Weight::from_parts(10_635_621, 247)
-			// Standard Error: 58
-			.saturating_add(Weight::from_parts(1_430, 0).saturating_mul(n.into()))
+		// Minimum execution time: 9_215_000 picoseconds.
+		Weight::from_parts(10_198_528, 247)
+			// Standard Error: 75
+			.saturating_add(Weight::from_parts(1_521, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
@@ -1382,36 +1382,36 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_503_000 picoseconds.
-		Weight::from_parts(1_592_000, 0)
+		// Minimum execution time: 1_406_000 picoseconds.
+		Weight::from_parts(1_515_000, 0)
 	}
 	fn set_transient_storage_full() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_903_000 picoseconds.
-		Weight::from_parts(1_996_000, 0)
+		// Minimum execution time: 1_782_000 picoseconds.
+		Weight::from_parts(1_890_000, 0)
 	}
 	fn get_transient_storage_empty() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_432_000 picoseconds.
-		Weight::from_parts(1_534_000, 0)
+		// Minimum execution time: 1_380_000 picoseconds.
+		Weight::from_parts(1_422_000, 0)
 	}
 	fn get_transient_storage_full() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_606_000 picoseconds.
-		Weight::from_parts(1_669_000, 0)
+		// Minimum execution time: 1_504_000 picoseconds.
+		Weight::from_parts(1_583_000, 0)
 	}
 	fn rollback_transient_storage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 960_000 picoseconds.
-		Weight::from_parts(1_089_000, 0)
+		// Minimum execution time: 1_045_000 picoseconds.
+		Weight::from_parts(1_138_000, 0)
 	}
 	/// The range of component `n` is `[0, 512]`.
 	/// The range of component `o` is `[0, 512]`.
@@ -1419,59 +1419,59 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_317_000 picoseconds.
-		Weight::from_parts(2_449_933, 0)
-			// Standard Error: 11
-			.saturating_add(Weight::from_parts(315, 0).saturating_mul(n.into()))
-			// Standard Error: 11
-			.saturating_add(Weight::from_parts(387, 0).saturating_mul(o.into()))
+		// Minimum execution time: 2_039_000 picoseconds.
+		Weight::from_parts(2_317_406, 0)
+			// Standard Error: 13
+			.saturating_add(Weight::from_parts(283, 0).saturating_mul(n.into()))
+			// Standard Error: 13
+			.saturating_add(Weight::from_parts(347, 0).saturating_mul(o.into()))
 	}
 	/// The range of component `n` is `[0, 512]`.
 	fn seal_clear_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_980_000 picoseconds.
-		Weight::from_parts(2_352_243, 0)
+		// Minimum execution time: 1_880_000 picoseconds.
+		Weight::from_parts(2_251_392, 0)
 			// Standard Error: 17
-			.saturating_add(Weight::from_parts(372, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(313, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 512]`.
 	fn seal_get_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_857_000 picoseconds.
-		Weight::from_parts(2_082_050, 0)
+		// Minimum execution time: 1_763_000 picoseconds.
+		Weight::from_parts(1_951_912, 0)
 			// Standard Error: 13
-			.saturating_add(Weight::from_parts(373, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(268, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 512]`.
 	fn seal_contains_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_693_000 picoseconds.
-		Weight::from_parts(1_892_600, 0)
-			// Standard Error: 13
-			.saturating_add(Weight::from_parts(193, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_536_000 picoseconds.
+		Weight::from_parts(1_779_085, 0)
+			// Standard Error: 14
+			.saturating_add(Weight::from_parts(148, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 512]`.
 	fn seal_take_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_620_000 picoseconds.
-		Weight::from_parts(2_818_388, 0)
-			// Standard Error: 15
-			.saturating_add(Weight::from_parts(39, 0).saturating_mul(n.into()))
+		// Minimum execution time: 2_343_000 picoseconds.
+		Weight::from_parts(2_587_750, 0)
+			// Standard Error: 22
+			.saturating_add(Weight::from_parts(30, 0).saturating_mul(n.into()))
 	}
 	fn seal_transfer() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `140`
+		//  Measured:  `103`
 		//  Estimated: `0`
-		// Minimum execution time: 10_207_000 picoseconds.
-		Weight::from_parts(10_627_000, 0)
+		// Minimum execution time: 9_250_000 picoseconds.
+		Weight::from_parts(9_637_000, 0)
 	}
 	/// Storage: `Revive::ContractInfoOf` (r:1 w:0)
 	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(1779), added: 4254, mode: `Measured`)
@@ -1483,17 +1483,17 @@ impl WeightInfo for () {
 	/// The range of component `i` is `[0, 262144]`.
 	fn seal_call(t: u32, i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `630 + t * (140 ±0)`
-		//  Estimated: `4095 + t * (140 ±0)`
-		// Minimum execution time: 34_452_000 picoseconds.
-		Weight::from_parts(34_837_900, 4095)
-			// Standard Error: 30_385
-			.saturating_add(Weight::from_parts(1_981_565, 0).saturating_mul(t.into()))
+		//  Measured:  `1221 + t * (103 ±0)`
+		//  Estimated: `4686 + t * (103 ±0)`
+		// Minimum execution time: 33_333_000 picoseconds.
+		Weight::from_parts(34_378_774, 4686)
+			// Standard Error: 41_131
+			.saturating_add(Weight::from_parts(1_756_626, 0).saturating_mul(t.into()))
 			// Standard Error: 0
 			.saturating_add(Weight::from_parts(3, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
-			.saturating_add(Weight::from_parts(0, 140).saturating_mul(t.into()))
+			.saturating_add(Weight::from_parts(0, 103).saturating_mul(t.into()))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
@@ -1501,10 +1501,10 @@ impl WeightInfo for () {
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(262180), added: 264655, mode: `Measured`)
 	fn seal_delegate_call() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `457`
-		//  Estimated: `3922`
-		// Minimum execution time: 27_287_000 picoseconds.
-		Weight::from_parts(28_450_000, 3922)
+		//  Measured:  `1048`
+		//  Estimated: `4513`
+		// Minimum execution time: 27_096_000 picoseconds.
+		Weight::from_parts(27_934_000, 4513)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
@@ -1518,12 +1518,12 @@ impl WeightInfo for () {
 	/// The range of component `i` is `[0, 262144]`.
 	fn seal_instantiate(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `703`
-		//  Estimated: `4160`
-		// Minimum execution time: 118_660_000 picoseconds.
-		Weight::from_parts(104_638_796, 4160)
-			// Standard Error: 11
-			.saturating_add(Weight::from_parts(4_296, 0).saturating_mul(i.into()))
+		//  Measured:  `1257`
+		//  Estimated: `4715`
+		// Minimum execution time: 118_412_000 picoseconds.
+		Weight::from_parts(106_130_041, 4715)
+			// Standard Error: 12
+			.saturating_add(Weight::from_parts(4_235, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -1532,64 +1532,64 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 683_000 picoseconds.
-		Weight::from_parts(3_836_563, 0)
-			// Standard Error: 2
-			.saturating_add(Weight::from_parts(1_456, 0).saturating_mul(n.into()))
+		// Minimum execution time: 614_000 picoseconds.
+		Weight::from_parts(4_320_897, 0)
+			// Standard Error: 3
+			.saturating_add(Weight::from_parts(1_371, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn seal_hash_keccak_256(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_082_000 picoseconds.
-		Weight::from_parts(5_027_764, 0)
+		// Minimum execution time: 1_062_000 picoseconds.
+		Weight::from_parts(4_571_371, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(3_644, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(3_572, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn seal_hash_blake2_256(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 660_000 picoseconds.
-		Weight::from_parts(3_585_640, 0)
-			// Standard Error: 2
-			.saturating_add(Weight::from_parts(1_586, 0).saturating_mul(n.into()))
+		// Minimum execution time: 609_000 picoseconds.
+		Weight::from_parts(4_008_056, 0)
+			// Standard Error: 3
+			.saturating_add(Weight::from_parts(1_497, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn seal_hash_blake2_128(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 638_000 picoseconds.
-		Weight::from_parts(3_763_242, 0)
+		// Minimum execution time: 608_000 picoseconds.
+		Weight::from_parts(3_839_383, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_582, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(1_504, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 261889]`.
 	fn seal_sr25519_verify(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 42_962_000 picoseconds.
-		Weight::from_parts(27_938_396, 0)
-			// Standard Error: 13
-			.saturating_add(Weight::from_parts(5_269, 0).saturating_mul(n.into()))
+		// Minimum execution time: 43_110_000 picoseconds.
+		Weight::from_parts(31_941_593, 0)
+			// Standard Error: 12
+			.saturating_add(Weight::from_parts(5_233, 0).saturating_mul(n.into()))
 	}
 	fn seal_ecdsa_recover() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 47_133_000 picoseconds.
-		Weight::from_parts(48_458_000, 0)
+		// Minimum execution time: 47_798_000 picoseconds.
+		Weight::from_parts(49_225_000, 0)
 	}
 	fn seal_ecdsa_to_eth_address() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 13_249_000 picoseconds.
-		Weight::from_parts(13_518_000, 0)
+		// Minimum execution time: 12_576_000 picoseconds.
+		Weight::from_parts(12_731_000, 0)
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
@@ -1597,8 +1597,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `266`
 		//  Estimated: `3731`
-		// Minimum execution time: 14_696_000 picoseconds.
-		Weight::from_parts(15_106_000, 3731)
+		// Minimum execution time: 14_306_000 picoseconds.
+		Weight::from_parts(15_011_000, 3731)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -1606,10 +1606,10 @@ impl WeightInfo for () {
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	fn lock_delegate_dependency() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `304`
-		//  Estimated: `3769`
-		// Minimum execution time: 10_292_000 picoseconds.
-		Weight::from_parts(10_670_000, 3769)
+		//  Measured:  `303`
+		//  Estimated: `3768`
+		// Minimum execution time: 10_208_000 picoseconds.
+		Weight::from_parts(10_514_000, 3768)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -1617,10 +1617,10 @@ impl WeightInfo for () {
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `MaxEncodedLen`)
 	fn unlock_delegate_dependency() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `304`
+		//  Measured:  `303`
 		//  Estimated: `3561`
-		// Minimum execution time: 9_056_000 picoseconds.
-		Weight::from_parts(9_350_000, 3561)
+		// Minimum execution time: 9_062_000 picoseconds.
+		Weight::from_parts(9_414_000, 3561)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -1629,9 +1629,9 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_145_000 picoseconds.
-		Weight::from_parts(10_744_073, 0)
-			// Standard Error: 72
-			.saturating_add(Weight::from_parts(84_813, 0).saturating_mul(r.into()))
+		// Minimum execution time: 8_074_000 picoseconds.
+		Weight::from_parts(9_646_158, 0)
+			// Standard Error: 58
+			.saturating_add(Weight::from_parts(84_694, 0).saturating_mul(r.into()))
 	}
 }
diff --git a/substrate/frame/revive/uapi/Cargo.toml b/substrate/frame/revive/uapi/Cargo.toml
index 52de77a10944..8705781db002 100644
--- a/substrate/frame/revive/uapi/Cargo.toml
+++ b/substrate/frame/revive/uapi/Cargo.toml
@@ -21,7 +21,7 @@ codec = { features = [
 ], optional = true, workspace = true }
 
 [target.'cfg(target_arch = "riscv32")'.dependencies]
-polkavm-derive = { version = "0.11.0" }
+polkavm-derive = { version = "0.12.0" }
 
 [package.metadata.docs.rs]
 default-target = ["wasm32-unknown-unknown"]