From e4302116d5f2dbb59a9be15f8b00f94ee276b535 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Wed, 2 Jul 2025 09:55:24 +0200
Subject: [PATCH 001/186] wip

---
 substrate/frame/revive/src/call_builder.rs    |  21 ++--
 substrate/frame/revive/src/evm/runtime.rs     |  21 ++--
 substrate/frame/revive/src/exec.rs            |  24 ++--
 substrate/frame/revive/src/impl_fungibles.rs  |  17 ++-
 substrate/frame/revive/src/lib.rs             | 118 ++++++++++++------
 substrate/frame/revive/src/primitives.rs      |  40 ++++--
 substrate/frame/revive/src/storage.rs         |  50 +++++++-
 .../frame/revive/src/test_utils/builder.rs    |  13 +-
 substrate/frame/revive/src/tests.rs           |  21 ++--
 9 files changed, 224 insertions(+), 101 deletions(-)

diff --git a/substrate/frame/revive/src/call_builder.rs b/substrate/frame/revive/src/call_builder.rs
index ca287fe6a795..5929084b3abe 100644
--- a/substrate/frame/revive/src/call_builder.rs
+++ b/substrate/frame/revive/src/call_builder.rs
@@ -32,8 +32,9 @@ use crate::{
 	storage::meter::Meter,
 	transient_storage::MeterEntry,
 	vm::{PreparedCall, Runtime},
-	BalanceOf, BumpNonce, Code, CodeInfoOf, Config, ContractBlob, ContractInfo, ContractInfoOf,
-	DepositLimit, Error, GasMeter, MomentOf, Origin, Pallet as Contracts, PristineCode, Weight,
+	AccountInfo, AccountInfoOf, BalanceOf, BumpNonce, Code, CodeInfoOf, Config, ContractBlob,
+	ContractInfo, ContractInfoOf, DepositLimit, Error, GasMeter, MomentOf, Origin,
+	Pallet as Contracts, PristineCode, Weight,
 };
 use alloc::{vec, vec::Vec};
 use frame_support::{storage::child, traits::fungible::Mutate};
@@ -94,7 +95,7 @@ where
 			// Whitelist the contract's contractInfo as it is already accounted for in the call
 			// benchmark
 			frame_benchmarking::benchmarking::add_to_whitelist(
-				crate::ContractInfoOf::<T>::hashed_key_for(&T::AddressMapper::to_address(
+				AccountInfoOf::<T>::hashed_key_for(&T::AddressMapper::to_address(
 					&contract.account_id,
 				))
 				.into(),
@@ -264,7 +265,7 @@ where
 
 		let outcome = Contracts::<T>::bare_instantiate(
 			origin,
-			0u32.into(),
+			Default::default(),
 			Weight::MAX,
 			DepositLimit::Balance(default_deposit_limit::<T>()),
 			Code::Upload(module.code),
@@ -277,7 +278,10 @@ where
 		let account_id = T::AddressMapper::to_fallback_account_id(&address);
 		let result = Contract { caller, address, account_id };
 
-		ContractInfoOf::<T>::insert(&address, result.info()?);
+		AccountInfoOf::<T>::insert(
+			&address,
+			AccountInfo { account_type: result.info()?.into(), dust: 0 },
+		);
 
 		Ok(result)
 	}
@@ -309,7 +313,10 @@ where
 			info.write(&Key::Fix(item.0), Some(item.1.clone()), None, false)
 				.map_err(|_| "Failed to write storage to restoration dest")?;
 		}
-		<ContractInfoOf<T>>::insert(&self.address, info);
+		<AccountInfoOf<T>>::insert(
+			&self.address,
+			AccountInfo { account_type: info.into(), dust: 0 },
+		);
 		Ok(())
 	}
 
@@ -351,7 +358,7 @@ where
 
 	/// Get the `ContractInfo` of the `addr` or an error if it no longer exists.
 	pub fn address_info(addr: &T::AccountId) -> Result<ContractInfo<T>, &'static str> {
-		ContractInfoOf::<T>::get(T::AddressMapper::to_address(addr))
+		<AccountInfo<T>>::load_contract(&T::AddressMapper::to_address(addr))
 			.ok_or("Expected contract to exist at this point.")
 	}
 
diff --git a/substrate/frame/revive/src/evm/runtime.rs b/substrate/frame/revive/src/evm/runtime.rs
index 342b29f5158f..be299ac82a17 100644
--- a/substrate/frame/revive/src/evm/runtime.rs
+++ b/substrate/frame/revive/src/evm/runtime.rs
@@ -20,8 +20,8 @@ use crate::{
 		api::{GenericTransaction, TransactionSigned},
 		GasEncoder,
 	},
-	AccountIdOf, AddressMapper, BalanceOf, Config, ConversionPrecision, MomentOf,
-	OnChargeTransactionBalanceOf, Pallet, LOG_TARGET, RUNTIME_PALLETS_ADDR,
+	AccountIdOf, AddressMapper, BalanceOf, Config, MomentOf, OnChargeTransactionBalanceOf, Pallet,
+	LOG_TARGET, RUNTIME_PALLETS_ADDR,
 };
 use alloc::vec::Vec;
 use codec::{Decode, DecodeLimit, DecodeWithMemTracking, Encode};
@@ -313,14 +313,11 @@ pub trait EthExtra {
 			return Err(InvalidTransaction::Call);
 		}
 
-		let value = crate::Pallet::<Self::Config>::convert_evm_to_native(
-			value.unwrap_or_default(),
-			ConversionPrecision::Exact,
-		)
-		.map_err(|err| {
-			log::debug!(target: LOG_TARGET, "Failed to convert value to native: {err:?}");
-			InvalidTransaction::Call
-		})?;
+		let value = crate::Pallet::<Self::Config>::convert_evm_to_native(value.unwrap_or_default())
+			.map_err(|err| {
+				log::debug!(target: LOG_TARGET, "Failed to convert value to native: {err:?}");
+				InvalidTransaction::Call
+			})?;
 
 		let data = input.to_vec();
 
@@ -341,14 +338,14 @@ pub trait EthExtra {
 					InvalidTransaction::Call
 				})?;
 
-				if value != 0u32.into() {
+				if !value.is_zero() {
 					log::debug!(target: LOG_TARGET, "Runtime pallets address cannot be called with value");
 					return Err(InvalidTransaction::Call)
 				}
 
 				call
 			} else {
-				crate::Call::call::<Self::Config> {
+				crate::Call::eth_call::<Self::Config> {
 					dest,
 					value,
 					gas_limit,
diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index 8e0657f00b12..2fee982e97e0 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -25,8 +25,8 @@ use crate::{
 	storage::{self, meter::Diff, WriteOutcome},
 	tracing::if_tracing,
 	transient_storage::TransientStorage,
-	BalanceOf, CodeInfo, CodeInfoOf, Config, ContractInfo, ContractInfoOf, ConversionPrecision,
-	Error, Event, ImmutableData, ImmutableDataOf, Pallet as Contracts, RuntimeCosts,
+	BalanceOf, BalanceWithDust, CodeInfo, CodeInfoOf, Config, ContractInfo, ContractInfoOf, Error,
+	Event, ImmutableData, ImmutableDataOf, Pallet as Contracts, RuntimeCosts,
 };
 use alloc::vec::Vec;
 use core::{fmt::Debug, marker::PhantomData, mem};
@@ -1381,11 +1381,14 @@ where
 		value: U256,
 		storage_meter: &mut storage::meter::GenericMeter<T, S>,
 	) -> ExecResult {
-		let value = crate::Pallet::<T>::convert_evm_to_native(value, ConversionPrecision::Exact)?;
+		let value = crate::Pallet::<T>::convert_evm_to_native(value)?;
 		if value.is_zero() {
 			return Ok(Default::default());
 		}
 
+		// TODO handle dust
+		let BalanceWithDust { value, dust } = value;
+
 		if <System<T>>::account_exists(to) {
 			return T::Currency::transfer(from, to, value, Preservation::Preserve)
 				.map(|_| Default::default())
@@ -1395,7 +1398,7 @@ where
 		let origin = origin.account_id()?;
 		let ed = <T as Config>::Currency::minimum_balance();
 		with_transaction(|| -> TransactionOutcome<ExecResult> {
-			match T::Currency::transfer(origin, to, ed, Preservation::Preserve)
+			let res = match T::Currency::transfer(origin, to, ed, Preservation::Preserve)
 				.map_err(|_| Error::<T>::StorageDepositNotEnoughFunds.into())
 				.and_then(|_| {
 					T::Currency::transfer(from, to, value, Preservation::Preserve)
@@ -1408,7 +1411,14 @@ where
 					TransactionOutcome::Commit(Ok(Default::default()))
 				},
 				Err(err) => TransactionOutcome::Rollback(Err(err)),
+			};
+
+			if !dust.is_zero() {
+				// let addr =
+				// ContractInfoOf
 			}
+
+			res
 		})
 	}
 
@@ -1465,10 +1475,8 @@ where
 
 	/// Returns the *free* balance of the supplied AccountId.
 	fn account_balance(&self, who: &T::AccountId) -> U256 {
-		crate::Pallet::<T>::convert_native_to_evm(T::Currency::reducible_balance(
-			who,
-			Preservation::Preserve,
-			Fortitude::Polite,
+		crate::Pallet::<T>::convert_native_to_evm(BalanceWithDust::from_value(
+			T::Currency::reducible_balance(who, Preservation::Preserve, Fortitude::Polite),
 		))
 	}
 
diff --git a/substrate/frame/revive/src/impl_fungibles.rs b/substrate/frame/revive/src/impl_fungibles.rs
index 75c3ae59e98d..0fb9434e580b 100644
--- a/substrate/frame/revive/src/impl_fungibles.rs
+++ b/substrate/frame/revive/src/impl_fungibles.rs
@@ -39,14 +39,11 @@ use frame_support::{
 	PalletId,
 };
 use sp_core::{H160, H256, U256};
-use sp_runtime::{
-	traits::{AccountIdConversion, Zero},
-	DispatchError,
-};
+use sp_runtime::{traits::AccountIdConversion, DispatchError};
 
 use super::{
-	address::AddressMapper, pallet, BalanceOf, Bounded, Config, ContractResult, DepositLimit,
-	MomentOf, Pallet, Weight,
+	address::AddressMapper, pallet, BalanceOf, BalanceWithDust, Bounded, Config, ContractResult,
+	DepositLimit, MomentOf, Pallet, Weight,
 };
 use ethereum_standards::IERC20;
 
@@ -78,7 +75,7 @@ where
 		let ContractResult { result, .. } = Self::bare_call(
 			T::RuntimeOrigin::signed(Self::checking_account()),
 			asset_id,
-			BalanceOf::<T>::zero(),
+			BalanceWithDust::default(),
 			GAS_LIMIT,
 			DepositLimit::Balance(
 				<<T as pallet::Config>::Currency as fungible::Inspect<_>>::total_issuance(),
@@ -114,7 +111,7 @@ where
 		let ContractResult { result, .. } = Self::bare_call(
 			T::RuntimeOrigin::signed(account_id.clone()),
 			asset_id,
-			BalanceOf::<T>::zero(),
+			BalanceWithDust::default(),
 			GAS_LIMIT,
 			DepositLimit::Balance(
 				<<T as pallet::Config>::Currency as fungible::Inspect<_>>::total_issuance(),
@@ -189,7 +186,7 @@ where
 		let ContractResult { result, gas_consumed, .. } = Self::bare_call(
 			T::RuntimeOrigin::signed(who.clone()),
 			asset_id,
-			BalanceOf::<T>::zero(),
+			BalanceWithDust::default(),
 			GAS_LIMIT,
 			DepositLimit::Balance(
 				<<T as pallet::Config>::Currency as fungible::Inspect<_>>::total_issuance(),
@@ -226,7 +223,7 @@ where
 		let ContractResult { result, .. } = Self::bare_call(
 			T::RuntimeOrigin::signed(Self::checking_account()),
 			asset_id,
-			BalanceOf::<T>::zero(),
+			BalanceWithDust::default(),
 			GAS_LIMIT,
 			DepositLimit::Balance(
 				<<T as pallet::Config>::Currency as fungible::Inspect<_>>::total_issuance(),
diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index c51d87113b98..3045a52f211f 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -49,7 +49,9 @@ use crate::{
 	},
 	exec::{AccountIdOf, ExecError, Executable, Key, Stack as ExecStack},
 	gas::GasMeter,
-	storage::{meter::Meter as StorageMeter, ContractInfo, DeletionQueueManager},
+	storage::{
+		meter::Meter as StorageMeter, AccountInfo, AccountType, ContractInfo, DeletionQueueManager,
+	},
 	tracing::if_tracing,
 	vm::{CodeInfo, ContractBlob, RuntimeCosts},
 };
@@ -79,7 +81,7 @@ use frame_system::{
 use pallet_transaction_payment::OnChargeTransaction;
 use scale_info::TypeInfo;
 use sp_runtime::{
-	traits::{BadOrigin, Bounded, Convert, Dispatchable, Saturating, Zero},
+	traits::{BadOrigin, Bounded, Convert, Dispatchable, Saturating},
 	AccountId32, DispatchError,
 };
 
@@ -457,8 +459,6 @@ pub mod pallet {
 		ExecutionFailed = 0x27,
 		/// Failed to convert a U256 to a Balance.
 		BalanceConversionFailed = 0x28,
-		/// Failed to convert an EVM balance to a native balance.
-		DecimalPrecisionLoss = 0x29,
 		/// Immutable data can only be set during deploys and only be read during calls.
 		/// Additionally, it is only valid to set the data once and it must not be empty.
 		InvalidImmutableAccess = 0x2A,
@@ -495,6 +495,10 @@ pub mod pallet {
 	#[pallet::storage]
 	pub(crate) type CodeInfoOf<T: Config> = StorageMap<_, Identity, H256, CodeInfo<T>>;
 
+	/// The data associated to a contract or externally owned account.
+	#[pallet::storage]
+	pub(crate) type AccountInfoOf<T: Config> = StorageMap<_, Identity, H160, AccountInfo<T>>;
+
 	/// The code associated with a given account.
 	#[pallet::storage]
 	pub(crate) type ContractInfoOf<T: Config> = StorageMap<_, Identity, H160, ContractInfo<T>>;
@@ -730,7 +734,7 @@ pub mod pallet {
 			let mut output = Self::bare_call(
 				origin,
 				dest,
-				value,
+				BalanceWithDust::from_value(value),
 				gas_limit,
 				DepositLimit::Balance(storage_deposit_limit),
 				data,
@@ -765,7 +769,7 @@ pub mod pallet {
 			let data_len = data.len() as u32;
 			let mut output = Self::bare_instantiate(
 				origin,
-				value,
+				BalanceWithDust::from_value(value),
 				gas_limit,
 				DepositLimit::Balance(storage_deposit_limit),
 				Code::Existing(code_hash),
@@ -830,7 +834,7 @@ pub mod pallet {
 			let data_len = data.len() as u32;
 			let mut output = Self::bare_instantiate(
 				origin,
-				value,
+				BalanceWithDust::from_value(value),
 				gas_limit,
 				DepositLimit::Balance(storage_deposit_limit),
 				Code::Upload(code),
@@ -864,7 +868,7 @@ pub mod pallet {
 		)]
 		pub fn eth_instantiate_with_code(
 			origin: OriginFor<T>,
-			#[pallet::compact] value: BalanceOf<T>,
+			value: BalanceWithDust<BalanceOf<T>>,
 			gas_limit: Weight,
 			#[pallet::compact] storage_deposit_limit: BalanceOf<T>,
 			code: Vec<u8>,
@@ -895,6 +899,35 @@ pub mod pallet {
 			)
 		}
 
+		/// Same as [`Self::call`], but intended to be dispatched **only**
+		/// by an EVM transaction through the EVM compatibility layer.
+		#[pallet::call_index(11)]
+		#[pallet::weight(T::WeightInfo::call().saturating_add(*gas_limit))]
+		pub fn eth_call(
+			origin: OriginFor<T>,
+			dest: H160,
+			value: BalanceWithDust<BalanceOf<T>>,
+			gas_limit: Weight,
+			#[pallet::compact] storage_deposit_limit: BalanceOf<T>,
+			data: Vec<u8>,
+		) -> DispatchResultWithPostInfo {
+			let mut output = Self::bare_call(
+				origin,
+				dest,
+				value,
+				gas_limit,
+				DepositLimit::Balance(storage_deposit_limit),
+				data,
+			);
+
+			if let Ok(return_value) = &output.result {
+				if return_value.did_revert() {
+					output.result = Err(<Error<T>>::ContractReverted.into());
+				}
+			}
+			dispatch_result(output.result, output.gas_consumed, T::WeightInfo::call())
+		}
+
 		/// Upload new `code` without instantiating a contract from it.
 		///
 		/// If the code does not already exist a deposit is reserved from the caller
@@ -951,12 +984,15 @@ pub mod pallet {
 			code_hash: sp_core::H256,
 		) -> DispatchResult {
 			ensure_root(origin)?;
-			<ContractInfoOf<T>>::try_mutate(&dest, |contract| {
-				let contract = if let Some(contract) = contract {
-					contract
-				} else {
+			<AccountInfoOf<T>>::try_mutate(&dest, |account| {
+				let Some(account) = account else {
+					return Err(<Error<T>>::ContractNotFound.into());
+				};
+
+				let AccountType::Contract(ref mut contract) = account.account_type else {
 					return Err(<Error<T>>::ContractNotFound.into());
 				};
+
 				<CodeInfo<T>>::increment_refcount(code_hash)?;
 				<CodeInfo<T>>::decrement_refcount(contract.code_hash)?;
 				contract.code_hash = code_hash;
@@ -1043,7 +1079,7 @@ where
 	pub fn bare_call(
 		origin: OriginFor<T>,
 		dest: H160,
-		value: BalanceOf<T>,
+		value: BalanceWithDust<BalanceOf<T>>,
 		gas_limit: Weight,
 		storage_deposit_limit: DepositLimit<BalanceOf<T>>,
 		data: Vec<u8>,
@@ -1101,7 +1137,7 @@ where
 	/// more information to the caller useful to estimate the cost of the operation.
 	pub fn bare_instantiate(
 		origin: OriginFor<T>,
-		value: BalanceOf<T>,
+		value: BalanceWithDust<BalanceOf<T>>,
 		gas_limit: Weight,
 		storage_deposit_limit: DepositLimit<BalanceOf<T>>,
 		code: Code,
@@ -1229,8 +1265,7 @@ where
 
 		// Convert the value to the native balance type.
 		let evm_value = tx.value.unwrap_or_default();
-		let native_value = match Self::convert_evm_to_native(evm_value, ConversionPrecision::Exact)
-		{
+		let native_value = match Self::convert_evm_to_native(evm_value) {
 			Ok(v) => v,
 			Err(_) => return Err(EthTransactError::Message("Failed to convert value".into())),
 		};
@@ -1315,7 +1350,7 @@ where
 						result.gas_required,
 						result.storage_deposit,
 					);
-					let dispatch_call: <T as Config>::RuntimeCall = crate::Call::<T>::call {
+					let dispatch_call: <T as Config>::RuntimeCall = crate::Call::<T>::eth_call {
 						dest,
 						value: native_value,
 						gas_limit,
@@ -1410,7 +1445,10 @@ where
 	/// Get the balance with EVM decimals of the given `address`.
 	pub fn evm_balance(address: &H160) -> U256 {
 		let account = T::AddressMapper::to_account_id(&address);
-		Self::convert_native_to_evm(T::Currency::reducible_balance(&account, Preserve, Polite))
+		// TODO add dust
+		Self::convert_native_to_evm(BalanceWithDust::from_value(T::Currency::reducible_balance(
+			&account, Preserve, Polite,
+		)))
 	}
 
 	/// Get the nonce for the given `address`.
@@ -1425,7 +1463,7 @@ where
 	/// Convert a substrate fee into a gas value, using the fixed `GAS_PRICE`.
 	/// The gas is calculated as `fee / GAS_PRICE`, rounded up to the nearest integer.
 	pub fn evm_fee_to_gas(fee: BalanceOf<T>) -> U256 {
-		let fee = Self::convert_native_to_evm(fee);
+		let fee = Self::convert_native_to_evm(BalanceWithDust::from_value(fee));
 		let gas_price = GAS_PRICE.into();
 		let (quotient, remainder) = fee.div_mod(gas_price);
 		if remainder.is_zero() {
@@ -1438,7 +1476,8 @@ where
 	/// Convert a gas value into a substrate fee
 	fn evm_gas_to_fee(gas: U256, gas_price: U256) -> Result<BalanceOf<T>, Error<T>> {
 		let fee = gas.saturating_mul(gas_price);
-		Self::convert_evm_to_native(fee, ConversionPrecision::RoundUp)
+		let value = Self::convert_evm_to_native(fee)?;
+		Ok(value.into_rounded_balance())
 	}
 
 	/// Convert a weight to a gas value.
@@ -1504,8 +1543,10 @@ where
 
 	/// Query storage of a specified contract under a specified key.
 	pub fn get_storage(address: H160, key: [u8; 32]) -> GetStorageResult {
-		let contract_info =
-			ContractInfoOf::<T>::get(&address).ok_or(ContractAccessError::DoesntExist)?;
+		let account = AccountInfoOf::<T>::get(&address).ok_or(ContractAccessError::DoesntExist)?;
+		let AccountType::Contract(contract_info) = account.account_type else {
+			return Err(ContractAccessError::DoesntExist)
+		};
 
 		let maybe_value = contract_info.read(&Key::from_fixed(key));
 		Ok(maybe_value)
@@ -1513,8 +1554,10 @@ where
 
 	/// Query storage of a specified contract under a specified variable-sized key.
 	pub fn get_storage_var_key(address: H160, key: Vec<u8>) -> GetStorageResult {
-		let contract_info =
-			ContractInfoOf::<T>::get(&address).ok_or(ContractAccessError::DoesntExist)?;
+		let account = AccountInfoOf::<T>::get(&address).ok_or(ContractAccessError::DoesntExist)?;
+		let AccountType::Contract(contract_info) = account.account_type else {
+			return Err(ContractAccessError::DoesntExist)
+		};
 
 		let maybe_value = contract_info.read(
 			&Key::try_from_var(key)
@@ -1557,28 +1600,25 @@ where
 	}
 
 	/// Convert a native balance to EVM balance.
-	fn convert_native_to_evm(value: BalanceOf<T>) -> U256 {
-		value.into().saturating_mul(T::NativeToEthRatio::get().into())
+	fn convert_native_to_evm(value: BalanceWithDust<BalanceOf<T>>) -> U256 {
+		let BalanceWithDust { value, dust } = value;
+		value
+			.into()
+			.saturating_mul(T::NativeToEthRatio::get().into())
+			.saturating_add(dust.into())
 	}
 
 	/// Convert an EVM balance to a native balance.
-	fn convert_evm_to_native(
-		value: U256,
-		precision: ConversionPrecision,
-	) -> Result<BalanceOf<T>, Error<T>> {
+	fn convert_evm_to_native(value: U256) -> Result<BalanceWithDust<BalanceOf<T>>, Error<T>> {
 		if value.is_zero() {
-			return Ok(Zero::zero());
+			return Ok(Default::default())
 		}
 
 		let (quotient, remainder) = value.div_mod(T::NativeToEthRatio::get().into());
-		match (precision, remainder.is_zero()) {
-			(ConversionPrecision::Exact, false) => Err(Error::<T>::DecimalPrecisionLoss),
-			(_, true) => quotient.try_into().map_err(|_| Error::<T>::BalanceConversionFailed),
-			(_, false) => quotient
-				.saturating_add(U256::one())
-				.try_into()
-				.map_err(|_| Error::<T>::BalanceConversionFailed),
-		}
+		let value = quotient.try_into().map_err(|_| Error::<T>::BalanceConversionFailed)?;
+		let dust = remainder.try_into().map_err(|_| Error::<T>::BalanceConversionFailed)?;
+
+		Ok(BalanceWithDust::new(value, dust))
 	}
 }
 
diff --git a/substrate/frame/revive/src/primitives.rs b/substrate/frame/revive/src/primitives.rs
index 32e333d1689d..70d25afba6c5 100644
--- a/substrate/frame/revive/src/primitives.rs
+++ b/substrate/frame/revive/src/primitives.rs
@@ -24,7 +24,7 @@ use frame_support::weights::Weight;
 use pallet_revive_uapi::ReturnFlags;
 use scale_info::TypeInfo;
 use sp_runtime::{
-	traits::{Saturating, Zero},
+	traits::{One, Saturating, Zero},
 	DispatchError, RuntimeDebug,
 };
 
@@ -108,12 +108,38 @@ pub enum EthTransactError {
 	Message(String),
 }
 
-/// Precision used for converting between Native and EVM balances.
-pub enum ConversionPrecision {
-	/// Exact conversion without any rounding.
-	Exact,
-	/// Conversion that rounds up to the nearest whole number.
-	RoundUp,
+/// A Balance amount along with some "dust" to represent the lowest decimals that can't be expressed
+/// in the native currency
+#[derive(Default, Clone, Copy, Eq, Encode, Decode, TypeInfo, PartialEq, Debug)]
+pub struct BalanceWithDust<Balance> {
+	/// The value expressed in the native currency
+	pub value: Balance,
+	/// The dust, representing up to 1 unit of the native currency.
+	/// The dust will be bounded between 0 and `crate::Config::NativeToEthRatio`
+	pub dust: u32,
+}
+
+impl<Balance: Zero + One + Saturating> BalanceWithDust<Balance> {
+	/// Creates a new `BalanceWithDust` with the given value and dust.
+	pub fn new(value: Balance, dust: u32) -> Self {
+		Self { value, dust }
+	}
+
+	pub fn from_value(value: Balance) -> Self {
+		Self { value, dust: 0 }
+	}
+
+	pub fn is_zero(&self) -> bool {
+		self.value.is_zero() && self.dust == 0
+	}
+
+	pub fn into_rounded_balance(self) -> Balance {
+		if self.dust == 0 {
+			self.value
+		} else {
+			self.value.saturating_add(Balance::one())
+		}
+	}
 }
 
 /// Result type of a `bare_code_upload` call.
diff --git a/substrate/frame/revive/src/storage.rs b/substrate/frame/revive/src/storage.rs
index 7084647971a0..7bed4c5143ff 100644
--- a/substrate/frame/revive/src/storage.rs
+++ b/substrate/frame/revive/src/storage.rs
@@ -25,8 +25,7 @@ use crate::{
 	storage::meter::Diff,
 	tracing::if_tracing,
 	weights::WeightInfo,
-	BalanceOf, Config, ContractInfoOf, DeletionQueue, DeletionQueueCounter, Error, TrieId,
-	SENTINEL,
+	AccountInfoOf, BalanceOf, Config, DeletionQueue, DeletionQueueCounter, Error, TrieId, SENTINEL,
 };
 use alloc::vec::Vec;
 use codec::{Decode, Encode, MaxEncodedLen};
@@ -44,6 +43,29 @@ use sp_runtime::{
 	DispatchError, RuntimeDebug,
 };
 
+/// Represents the account information for a contract or an externally owned account (EOA).
+#[derive(Encode, Decode, CloneNoBound, PartialEq, Eq, RuntimeDebug, TypeInfo, MaxEncodedLen)]
+#[scale_info(skip_type_params(T))]
+pub struct AccountInfo<T: Config> {
+	/// The type of the account.
+	pub account_type: AccountType<T>,
+
+	// The  amount that was transferred to this account that is less than the
+	// NativeToEthRatio, and can be represented in the native currency
+	pub dust: u32,
+}
+
+/// The account type is used to distinguish between contracts and externally owned accounts.
+#[derive(Encode, Decode, CloneNoBound, PartialEq, Eq, RuntimeDebug, TypeInfo, MaxEncodedLen)]
+#[scale_info(skip_type_params(T))]
+pub enum AccountType<T: Config> {
+	/// An account that is a contract.
+	Contract(ContractInfo<T>),
+
+	/// An account that is an externally owned account (EOA).
+	EOA,
+}
+
 /// Information for managing an account and its sub trie abstraction.
 /// This is the required info to cache for an account.
 #[derive(Encode, Decode, CloneNoBound, PartialEq, Eq, RuntimeDebug, TypeInfo, MaxEncodedLen)]
@@ -70,6 +92,26 @@ pub struct ContractInfo<T: Config> {
 	immutable_data_len: u32,
 }
 
+impl<T: Config> From<ContractInfo<T>> for AccountType<T> {
+	fn from(contract_info: ContractInfo<T>) -> Self {
+		AccountType::Contract(contract_info)
+	}
+}
+
+impl<T: Config> AccountInfo<T> {
+	fn has_contract(address: &H160) -> bool {
+		let Some(info) = <AccountInfoOf<T>>::get(address) else { return false };
+		matches!(info.account_type, AccountType::Contract(_))
+	}
+
+	/// Loads the contract information for a given address.
+	pub fn load_contract(address: &H160) -> Option<ContractInfo<T>> {
+		let Some(info) = <AccountInfoOf<T>>::get(address) else { return None };
+		let AccountType::Contract(contract_info) = info.account_type else { return None };
+		Some(contract_info)
+	}
+}
+
 impl<T: Config> ContractInfo<T> {
 	/// Constructs a new contract info **without** writing it to storage.
 	///
@@ -80,7 +122,7 @@ impl<T: Config> ContractInfo<T> {
 		nonce: T::Nonce,
 		code_hash: sp_core::H256,
 	) -> Result<Self, DispatchError> {
-		if <ContractInfoOf<T>>::contains_key(address) {
+		if <AccountInfo<T>>::has_contract(address) {
 			return Err(Error::<T>::DuplicateContract.into());
 		}
 
@@ -321,7 +363,7 @@ impl<T: Config> ContractInfo<T> {
 
 	/// Returns the code hash of the contract specified by `account` ID.
 	pub fn load_code_hash(account: &AccountIdOf<T>) -> Option<sp_core::H256> {
-		<ContractInfoOf<T>>::get(&T::AddressMapper::to_address(account)).map(|i| i.code_hash)
+		<AccountInfo<T>>::load_contract(&T::AddressMapper::to_address(account)).map(|i| i.code_hash)
 	}
 
 	/// Returns the amount of immutable bytes of this contract.
diff --git a/substrate/frame/revive/src/test_utils/builder.rs b/substrate/frame/revive/src/test_utils/builder.rs
index 6764607da015..afa194c92434 100644
--- a/substrate/frame/revive/src/test_utils/builder.rs
+++ b/substrate/frame/revive/src/test_utils/builder.rs
@@ -17,8 +17,9 @@
 
 use super::{deposit_limit, GAS_LIMIT};
 use crate::{
-	address::AddressMapper, AccountIdOf, BalanceOf, BumpNonce, Code, Config, ContractResult,
-	DepositLimit, ExecReturnValue, InstantiateReturnValue, OriginFor, Pallet, Weight,
+	address::AddressMapper, AccountIdOf, BalanceOf, BalanceWithDust, BumpNonce, Code, Config,
+	ContractResult, DepositLimit, ExecReturnValue, InstantiateReturnValue, OriginFor, Pallet,
+	Weight,
 };
 use alloc::{vec, vec::Vec};
 use frame_support::pallet_prelude::DispatchResultWithPostInfo;
@@ -132,7 +133,7 @@ builder!(
 builder!(
 	bare_instantiate(
 		origin: OriginFor<T>,
-		value: BalanceOf<T>,
+		value: BalanceWithDust<BalanceOf<T>>,
 		gas_limit: Weight,
 		storage_deposit_limit: DepositLimit<BalanceOf<T>>,
 		code: Code,
@@ -160,7 +161,7 @@ builder!(
 	pub fn bare_instantiate(origin: OriginFor<T>, code: Code) -> Self {
 		Self {
 			origin,
-			value: 0u32.into(),
+			value: Default::default(),
 			gas_limit: GAS_LIMIT,
 			storage_deposit_limit: DepositLimit::Balance(deposit_limit::<T>()),
 			code,
@@ -198,7 +199,7 @@ builder!(
 	bare_call(
 		origin: OriginFor<T>,
 		dest: H160,
-		value: BalanceOf<T>,
+		value: BalanceWithDust<BalanceOf<T>>,
 		gas_limit: Weight,
 		storage_deposit_limit: DepositLimit<BalanceOf<T>>,
 		data: Vec<u8>,
@@ -214,7 +215,7 @@ builder!(
 		Self {
 			origin,
 			dest,
-			value: 0u32.into(),
+			value: Default::default(),
 			gas_limit: GAS_LIMIT,
 			storage_deposit_limit: DepositLimit::Balance(deposit_limit::<T>()),
 			data: vec![],
diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index b99b587f7d59..718d353c8cac 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -30,9 +30,9 @@ use crate::{
 	tests::test_utils::{get_contract, get_contract_checked},
 	tracing::trace,
 	weights::WeightInfo,
-	AccountId32Mapper, BalanceOf, BumpNonce, Code, CodeInfoOf, Config, ContractInfo,
-	ContractInfoOf, DeletionQueueCounter, DepositLimit, Error, EthTransactError, HoldReason,
-	Origin, Pallet, PristineCode, H160,
+	AccountId32Mapper, AccountInfoOf, BalanceOf, BalanceWithDust, BumpNonce, Code, CodeInfoOf,
+	Config, ContractInfo, ContractInfoOf, DeletionQueueCounter, DepositLimit, Error,
+	EthTransactError, HoldReason, Origin, Pallet, PristineCode, H160,
 };
 
 use crate::test_utils::builder::Contract;
@@ -96,8 +96,8 @@ macro_rules! assert_refcount {
 pub mod test_utils {
 	use super::{CodeHashLockupDepositPercent, Contracts, DepositPerByte, DepositPerItem, Test};
 	use crate::{
-		address::AddressMapper, exec::AccountIdOf, BalanceOf, CodeInfo, CodeInfoOf, Config,
-		ContractInfo, ContractInfoOf, PristineCode,
+		address::AddressMapper, exec::AccountIdOf, AccountInfo, AccountInfoOf, BalanceOf, CodeInfo,
+		CodeInfoOf, Config, ContractInfo, ContractInfoOf, PristineCode,
 	};
 	use codec::{Encode, MaxEncodedLen};
 	use frame_support::traits::fungible::{InspectHold, Mutate};
@@ -109,7 +109,10 @@ pub mod test_utils {
 		let address =
 			<<Test as Config>::AddressMapper as AddressMapper<Test>>::to_address(&address);
 		let contract = <ContractInfo<Test>>::new(&address, 0, code_hash).unwrap();
-		<ContractInfoOf<Test>>::insert(address, contract);
+		<AccountInfoOf<Test>>::insert(
+			address,
+			AccountInfo { account_type: contract.into(), dust: 0 },
+		);
 	}
 	pub fn set_balance(who: &AccountIdOf<Test>, amount: u64) {
 		let _ = <Test as Config>::Currency::set_balance(who, amount);
@@ -439,7 +442,9 @@ fn calling_plain_account_is_balance_transfer() {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000);
 		assert!(!<ContractInfoOf<Test>>::contains_key(BOB_ADDR));
 		assert_eq!(test_utils::get_balance(&BOB_FALLBACK), 0);
-		let result = builder::bare_call(BOB_ADDR).value(42).build_and_unwrap_result();
+		let result = builder::bare_call(BOB_ADDR)
+			.value(BalanceWithDust::from_value(42))
+			.build_and_unwrap_result();
 		assert_eq!(
 			test_utils::get_balance(&BOB_FALLBACK),
 			42 + <Test as Config>::Currency::minimum_balance()
@@ -470,7 +475,7 @@ fn instantiate_and_call_and_deposit_event() {
 
 		// Check at the end to get hash on error easily
 		let Contract { addr, account_id } = builder::bare_instantiate(Code::Existing(code_hash))
-			.value(value)
+			.value(BalanceWithDust::from_value(value))
 			.build_and_unwrap_contract();
 		assert!(ContractInfoOf::<Test>::contains_key(&addr));
 

From b8edd12c5f5febc61a5dde90577631ad4385e7fe Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Wed, 2 Jul 2025 15:30:00 +0200
Subject: [PATCH 002/186] fix build & test not handling dust yet

---
 substrate/frame/revive/src/call_builder.rs    |   4 +-
 substrate/frame/revive/src/evm/runtime.rs     |   6 +-
 .../src/evm/tracing/prestate_tracing.rs       |   4 +-
 substrate/frame/revive/src/exec.rs            |  44 ++---
 substrate/frame/revive/src/impl_fungibles.rs  |   4 +-
 substrate/frame/revive/src/lib.rs             |  19 +--
 substrate/frame/revive/src/primitives.rs      |  23 ++-
 substrate/frame/revive/src/tests.rs           | 151 +++++++++---------
 8 files changed, 137 insertions(+), 118 deletions(-)

diff --git a/substrate/frame/revive/src/call_builder.rs b/substrate/frame/revive/src/call_builder.rs
index 5929084b3abe..bc5ba7f960c4 100644
--- a/substrate/frame/revive/src/call_builder.rs
+++ b/substrate/frame/revive/src/call_builder.rs
@@ -33,8 +33,8 @@ use crate::{
 	transient_storage::MeterEntry,
 	vm::{PreparedCall, Runtime},
 	AccountInfo, AccountInfoOf, BalanceOf, BumpNonce, Code, CodeInfoOf, Config, ContractBlob,
-	ContractInfo, ContractInfoOf, DepositLimit, Error, GasMeter, MomentOf, Origin,
-	Pallet as Contracts, PristineCode, Weight,
+	ContractInfo, DepositLimit, Error, GasMeter, MomentOf, Origin, Pallet as Contracts,
+	PristineCode, Weight,
 };
 use alloc::{vec, vec::Vec};
 use frame_support::{storage::child, traits::fungible::Mutate};
diff --git a/substrate/frame/revive/src/evm/runtime.rs b/substrate/frame/revive/src/evm/runtime.rs
index be299ac82a17..14d15a4f994b 100644
--- a/substrate/frame/revive/src/evm/runtime.rs
+++ b/substrate/frame/revive/src/evm/runtime.rs
@@ -601,9 +601,9 @@ mod test {
 
 		assert_eq!(
 			call,
-			crate::Call::call::<Test> {
+			crate::Call::eth_call::<Test> {
 				dest: tx.to.unwrap(),
-				value: tx.value.unwrap_or_default().as_u64(),
+				value: tx.value.unwrap_or_default().as_u64().into(),
 				data: tx.input.to_vec(),
 				gas_limit,
 				storage_deposit_limit
@@ -624,7 +624,7 @@ mod test {
 		assert_eq!(
 			call,
 			crate::Call::eth_instantiate_with_code::<Test> {
-				value: tx.value.unwrap_or_default().as_u64(),
+				value: tx.value.unwrap_or_default().as_u64().into(),
 				code,
 				data,
 				gas_limit,
diff --git a/substrate/frame/revive/src/evm/tracing/prestate_tracing.rs b/substrate/frame/revive/src/evm/tracing/prestate_tracing.rs
index ded073a5aa3b..6afbf3dd56fc 100644
--- a/substrate/frame/revive/src/evm/tracing/prestate_tracing.rs
+++ b/substrate/frame/revive/src/evm/tracing/prestate_tracing.rs
@@ -17,7 +17,7 @@
 use crate::{
 	evm::{Bytes, PrestateTrace, PrestateTraceInfo, PrestateTracerConfig},
 	tracing::Tracing,
-	BalanceOf, Bounded, Code, Config, ContractInfoOf, ExecReturnValue, Key, MomentOf, Pallet,
+	AccountInfo, BalanceOf, Bounded, Code, Config, ExecReturnValue, Key, MomentOf, Pallet,
 	PristineCode, Weight,
 };
 use alloc::{collections::BTreeMap, vec::Vec};
@@ -140,7 +140,7 @@ where
 {
 	/// Get the code of the contract.
 	fn bytecode(address: &H160) -> Option<Bytes> {
-		let code_hash = ContractInfoOf::<T>::get(address)?.code_hash;
+		let code_hash = AccountInfo::<T>::load_contract(address)?.code_hash;
 		let code: Vec<u8> = PristineCode::<T>::get(&code_hash)?.into();
 		return Some(code.into())
 	}
diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index 2fee982e97e0..4901468af1ce 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -25,8 +25,8 @@ use crate::{
 	storage::{self, meter::Diff, WriteOutcome},
 	tracing::if_tracing,
 	transient_storage::TransientStorage,
-	BalanceOf, BalanceWithDust, CodeInfo, CodeInfoOf, Config, ContractInfo, ContractInfoOf, Error,
-	Event, ImmutableData, ImmutableDataOf, Pallet as Contracts, RuntimeCosts,
+	AccountInfo, AccountInfoOf, BalanceOf, BalanceWithDust, CodeInfo, CodeInfoOf, Config,
+	ContractInfo, Error, Event, ImmutableData, ImmutableDataOf, Pallet as Contracts, RuntimeCosts,
 };
 use alloc::vec::Vec;
 use core::{fmt::Debug, marker::PhantomData, mem};
@@ -714,8 +714,9 @@ impl<T: Config> CachedContract<T> {
 	/// Load the `contract_info` from storage if necessary.
 	fn load(&mut self, account_id: &T::AccountId) {
 		if let CachedContract::Invalidated = self {
-			let contract = <ContractInfoOf<T>>::get(T::AddressMapper::to_address(account_id));
-			if let Some(contract) = contract {
+			if let Some(contract) =
+				AccountInfo::<T>::load_contract(&T::AddressMapper::to_address(account_id))
+			{
 				*self = CachedContract::Cached(contract);
 			}
 		}
@@ -934,13 +935,13 @@ where
 				let mut contract = match (cached_info, &precompile) {
 					(Some(info), _) => CachedContract::Cached(info),
 					(None, None) =>
-						if let Some(info) = <ContractInfoOf<T>>::get(&address) {
+						if let Some(info) = AccountInfo::<T>::load_contract(&address) {
 							CachedContract::Cached(info)
 						} else {
 							return Ok(None);
 						},
 					(None, Some(precompile)) if precompile.has_contract_info() => {
-						if let Some(info) = <ContractInfoOf<T>>::get(&address) {
+						if let Some(info) = AccountInfo::<T>::load_contract(&address) {
 							CachedContract::Cached(info)
 						} else {
 							let info = ContractInfo::new(&address, 0u32.into(), H256::zero())?;
@@ -960,7 +961,8 @@ where
 							_phantom: Default::default(),
 						}
 					} else {
-						let Some(info) = ContractInfoOf::<T>::get(&delegated_call.callee) else {
+						let Some(info) = AccountInfo::<T>::load_contract(&delegated_call.callee)
+						else {
 							return Ok(None);
 						};
 						let executable = E::from_storage(info.code_hash, gas_meter)?;
@@ -1056,9 +1058,10 @@ where
 		if let (CachedContract::Cached(contract), ExportedFunction::Call) =
 			(&frame.contract_info, frame.entry_point)
 		{
-			<ContractInfoOf<T>>::insert(
+			// TODO add dust
+			AccountInfoOf::<T>::insert(
 				T::AddressMapper::to_address(&frame.account_id),
-				contract.clone(),
+				AccountInfo { account_type: contract.clone().into(), dust: 0 },
 			);
 		}
 
@@ -1337,7 +1340,10 @@ where
 				// because that case is already handled by the optimization above. Only the first
 				// cache needs to be invalidated because that one will invalidate the next cache
 				// when it is popped from the stack.
-				<ContractInfoOf<T>>::insert(T::AddressMapper::to_address(account_id), contract);
+				<AccountInfoOf<T>>::insert(
+					T::AddressMapper::to_address(account_id),
+					AccountInfo { account_type: contract.into(), dust: 0 }, // TODO handle dust
+				);
 				if let Some(f) = self.frames_mut().skip(1).find(|f| f.account_id == *account_id) {
 					f.contract_info.invalidate();
 				}
@@ -1354,9 +1360,9 @@ where
 				contract.as_deref_mut(),
 			);
 			if let Some(contract) = contract {
-				<ContractInfoOf<T>>::insert(
+				<AccountInfoOf<T>>::insert(
 					T::AddressMapper::to_address(&self.first_frame.account_id),
-					contract,
+					AccountInfo { account_type: contract.clone().into(), dust: 0 }, /* TODO handle dust */
 				);
 			}
 		}
@@ -1475,9 +1481,9 @@ where
 
 	/// Returns the *free* balance of the supplied AccountId.
 	fn account_balance(&self, who: &T::AccountId) -> U256 {
-		crate::Pallet::<T>::convert_native_to_evm(BalanceWithDust::from_value(
-			T::Currency::reducible_balance(who, Preservation::Preserve, Fortitude::Polite),
-		))
+		let value = T::Currency::reducible_balance(who, Preservation::Preserve, Fortitude::Polite);
+		let dust = 0; // TODO handle dust
+		crate::Pallet::<T>::convert_native_to_evm(BalanceWithDust { value, dust })
 	}
 
 	/// Certain APIs, e.g. `{set,get}_immutable_data` behave differently depending
@@ -1564,7 +1570,7 @@ where
 
 		info.queue_trie_for_deletion();
 		let account_address = T::AddressMapper::to_address(&frame.account_id);
-		ContractInfoOf::<T>::remove(&account_address);
+		AccountInfoOf::<T>::remove(&account_address); // TODO handle dust
 		ImmutableDataOf::<T>::remove(&account_address);
 		<CodeInfo<T>>::decrement_refcount(info.code_hash)?;
 
@@ -1863,7 +1869,7 @@ where
 	}
 
 	fn is_contract(&self, address: &H160) -> bool {
-		ContractInfoOf::<T>::contains_key(&address)
+		AccountInfo::<T>::load_contract(&address).map(|_| true).unwrap_or_default()
 	}
 
 	fn to_account_id(&self, address: &H160) -> T::AccountId {
@@ -1871,7 +1877,7 @@ where
 	}
 
 	fn code_hash(&self, address: &H160) -> H256 {
-		<ContractInfoOf<T>>::get(&address)
+		<AccountInfo<T>>::load_contract(&address)
 			.map(|contract| contract.code_hash)
 			.unwrap_or_else(|| {
 				if System::<T>::account_exists(&T::AddressMapper::to_account_id(address)) {
@@ -1882,7 +1888,7 @@ where
 	}
 
 	fn code_size(&self, address: &H160) -> u64 {
-		<ContractInfoOf<T>>::get(&address)
+		<AccountInfo<T>>::load_contract(&address)
 			.and_then(|contract| CodeInfoOf::<T>::get(contract.code_hash))
 			.map(|info| info.code_len())
 			.unwrap_or_default()
diff --git a/substrate/frame/revive/src/impl_fungibles.rs b/substrate/frame/revive/src/impl_fungibles.rs
index 0fb9434e580b..2d5b7ba8fcd9 100644
--- a/substrate/frame/revive/src/impl_fungibles.rs
+++ b/substrate/frame/revive/src/impl_fungibles.rs
@@ -299,7 +299,7 @@ mod tests {
 	use crate::{
 		test_utils::{builder::*, ALICE},
 		tests::{Contracts, ExtBuilder, RuntimeOrigin, Test},
-		Code, ContractInfoOf,
+		AccountInfoOf, Code,
 	};
 	use frame_support::assert_ok;
 
@@ -324,7 +324,7 @@ mod tests {
 				EU256::abi_decode_validate(&result.data).expect("Failed to decode ABI response");
 			assert_eq!(balance, EU256::from(amount));
 			// Contract is uploaded.
-			assert_eq!(ContractInfoOf::<Test>::contains_key(&addr), true);
+			assert_eq!(AccountInfoOf::<Test>::contains_key(&addr), true);
 		});
 	}
 
diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index 3045a52f211f..f291ab5e9978 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -499,10 +499,6 @@ pub mod pallet {
 	#[pallet::storage]
 	pub(crate) type AccountInfoOf<T: Config> = StorageMap<_, Identity, H160, AccountInfo<T>>;
 
-	/// The code associated with a given account.
-	#[pallet::storage]
-	pub(crate) type ContractInfoOf<T: Config> = StorageMap<_, Identity, H160, ContractInfo<T>>;
-
 	/// The immutable data associated with a given account.
 	#[pallet::storage]
 	pub(crate) type ImmutableDataOf<T: Config> = StorageMap<_, Identity, H160, ImmutableData>;
@@ -734,7 +730,7 @@ pub mod pallet {
 			let mut output = Self::bare_call(
 				origin,
 				dest,
-				BalanceWithDust::from_value(value),
+				Into::<BalanceWithDust<_>>::into(value),
 				gas_limit,
 				DepositLimit::Balance(storage_deposit_limit),
 				data,
@@ -769,7 +765,7 @@ pub mod pallet {
 			let data_len = data.len() as u32;
 			let mut output = Self::bare_instantiate(
 				origin,
-				BalanceWithDust::from_value(value),
+				Into::<BalanceWithDust<_>>::into(value),
 				gas_limit,
 				DepositLimit::Balance(storage_deposit_limit),
 				Code::Existing(code_hash),
@@ -834,7 +830,7 @@ pub mod pallet {
 			let data_len = data.len() as u32;
 			let mut output = Self::bare_instantiate(
 				origin,
-				BalanceWithDust::from_value(value),
+				Into::<BalanceWithDust<_>>::into(value),
 				gas_limit,
 				DepositLimit::Balance(storage_deposit_limit),
 				Code::Upload(code),
@@ -1445,10 +1441,9 @@ where
 	/// Get the balance with EVM decimals of the given `address`.
 	pub fn evm_balance(address: &H160) -> U256 {
 		let account = T::AddressMapper::to_account_id(&address);
-		// TODO add dust
-		Self::convert_native_to_evm(BalanceWithDust::from_value(T::Currency::reducible_balance(
-			&account, Preserve, Polite,
-		)))
+		let value = T::Currency::reducible_balance(&account, Preserve, Polite);
+		let dust = 0; // TODO
+		Self::convert_native_to_evm(BalanceWithDust { value, dust })
 	}
 
 	/// Get the nonce for the given `address`.
@@ -1463,7 +1458,7 @@ where
 	/// Convert a substrate fee into a gas value, using the fixed `GAS_PRICE`.
 	/// The gas is calculated as `fee / GAS_PRICE`, rounded up to the nearest integer.
 	pub fn evm_fee_to_gas(fee: BalanceOf<T>) -> U256 {
-		let fee = Self::convert_native_to_evm(BalanceWithDust::from_value(fee));
+		let fee = Self::convert_native_to_evm(Into::<BalanceWithDust<_>>::into(fee));
 		let gas_price = GAS_PRICE.into();
 		let (quotient, remainder) = fee.div_mod(gas_price);
 		if remainder.is_zero() {
diff --git a/substrate/frame/revive/src/primitives.rs b/substrate/frame/revive/src/primitives.rs
index 70d25afba6c5..52832fdde2bf 100644
--- a/substrate/frame/revive/src/primitives.rs
+++ b/substrate/frame/revive/src/primitives.rs
@@ -110,7 +110,18 @@ pub enum EthTransactError {
 
 /// A Balance amount along with some "dust" to represent the lowest decimals that can't be expressed
 /// in the native currency
-#[derive(Default, Clone, Copy, Eq, Encode, Decode, TypeInfo, PartialEq, Debug)]
+#[derive(
+	Default,
+	codec::DecodeWithMemTracking,
+	Clone,
+	Copy,
+	Eq,
+	Encode,
+	Decode,
+	TypeInfo,
+	PartialEq,
+	Debug,
+)]
 pub struct BalanceWithDust<Balance> {
 	/// The value expressed in the native currency
 	pub value: Balance,
@@ -119,16 +130,18 @@ pub struct BalanceWithDust<Balance> {
 	pub dust: u32,
 }
 
+impl<Balance> From<Balance> for BalanceWithDust<Balance> {
+	fn from(value: Balance) -> Self {
+		Self { value, dust: 0 }
+	}
+}
+
 impl<Balance: Zero + One + Saturating> BalanceWithDust<Balance> {
 	/// Creates a new `BalanceWithDust` with the given value and dust.
 	pub fn new(value: Balance, dust: u32) -> Self {
 		Self { value, dust }
 	}
 
-	pub fn from_value(value: Balance) -> Self {
-		Self { value, dust: 0 }
-	}
-
 	pub fn is_zero(&self) -> bool {
 		self.value.is_zero() && self.dust == 0
 	}
diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index 718d353c8cac..89ad5d1b97bb 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -30,9 +30,9 @@ use crate::{
 	tests::test_utils::{get_contract, get_contract_checked},
 	tracing::trace,
 	weights::WeightInfo,
-	AccountId32Mapper, AccountInfoOf, BalanceOf, BalanceWithDust, BumpNonce, Code, CodeInfoOf,
-	Config, ContractInfo, ContractInfoOf, DeletionQueueCounter, DepositLimit, Error,
-	EthTransactError, HoldReason, Origin, Pallet, PristineCode, H160,
+	AccountId32Mapper, AccountInfo, AccountInfoOf, BalanceOf, BumpNonce, Code, CodeInfoOf, Config,
+	ContractInfo, DeletionQueueCounter, DepositLimit, Error, EthTransactError, HoldReason, Origin,
+	Pallet, PristineCode, H160,
 };
 
 use crate::test_utils::builder::Contract;
@@ -97,7 +97,7 @@ pub mod test_utils {
 	use super::{CodeHashLockupDepositPercent, Contracts, DepositPerByte, DepositPerItem, Test};
 	use crate::{
 		address::AddressMapper, exec::AccountIdOf, AccountInfo, AccountInfoOf, BalanceOf, CodeInfo,
-		CodeInfoOf, Config, ContractInfo, ContractInfoOf, PristineCode,
+		CodeInfoOf, Config, ContractInfo, PristineCode,
 	};
 	use codec::{Encode, MaxEncodedLen};
 	use frame_support::traits::fungible::{InspectHold, Mutate};
@@ -130,7 +130,7 @@ pub mod test_utils {
 		get_contract_checked(addr).unwrap()
 	}
 	pub fn get_contract_checked(addr: &H160) -> Option<ContractInfo<Test>> {
-		ContractInfoOf::<Test>::get(addr)
+		AccountInfo::<Test>::load_contract(addr)
 	}
 	pub fn get_code_deposit(code_hash: &sp_core::H256) -> BalanceOf<Test> {
 		crate::CodeInfoOf::<Test>::get(code_hash).unwrap().deposit()
@@ -440,11 +440,9 @@ impl Default for Origin<Test> {
 fn calling_plain_account_is_balance_transfer() {
 	ExtBuilder::default().build().execute_with(|| {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000);
-		assert!(!<ContractInfoOf<Test>>::contains_key(BOB_ADDR));
+		assert!(!<AccountInfoOf<Test>>::contains_key(BOB_ADDR));
 		assert_eq!(test_utils::get_balance(&BOB_FALLBACK), 0);
-		let result = builder::bare_call(BOB_ADDR)
-			.value(BalanceWithDust::from_value(42))
-			.build_and_unwrap_result();
+		let result = builder::bare_call(BOB_ADDR).value(42.into()).build_and_unwrap_result();
 		assert_eq!(
 			test_utils::get_balance(&BOB_FALLBACK),
 			42 + <Test as Config>::Currency::minimum_balance()
@@ -475,9 +473,9 @@ fn instantiate_and_call_and_deposit_event() {
 
 		// Check at the end to get hash on error easily
 		let Contract { addr, account_id } = builder::bare_instantiate(Code::Existing(code_hash))
-			.value(BalanceWithDust::from_value(value))
+			.value(value.into())
 			.build_and_unwrap_contract();
-		assert!(ContractInfoOf::<Test>::contains_key(&addr));
+		assert!(AccountInfoOf::<Test>::contains_key(&addr));
 
 		assert_eq!(
 			System::events(),
@@ -557,7 +555,7 @@ fn create1_address_from_extrinsic() {
 			let Contract { addr, .. } = builder::bare_instantiate(Code::Existing(code_hash))
 				.salt(None)
 				.build_and_unwrap_contract();
-			assert!(ContractInfoOf::<Test>::contains_key(&addr));
+			assert!(AccountInfoOf::<Test>::contains_key(&addr));
 			assert_eq!(
 				addr,
 				create1(&<Test as Config>::AddressMapper::to_address(&ALICE), nonce - 1)
@@ -569,7 +567,7 @@ fn create1_address_from_extrinsic() {
 			let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary.clone()))
 				.salt(None)
 				.build_and_unwrap_contract();
-			assert!(ContractInfoOf::<Test>::contains_key(&addr));
+			assert!(AccountInfoOf::<Test>::contains_key(&addr));
 			assert_eq!(
 				addr,
 				create1(&<Test as Config>::AddressMapper::to_address(&ALICE), nonce - 1)
@@ -587,7 +585,7 @@ fn deposit_event_max_value_limit() {
 		// Create
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.value(30_000)
+			.value(30_000.into())
 			.build_and_unwrap_contract();
 
 		// Call contract with allowed storage value.
@@ -613,7 +611,7 @@ fn run_out_of_fuel_engine() {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
 
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.value(100 * min_balance)
+			.value((100 * min_balance).into())
 			.build_and_unwrap_contract();
 
 		// Call the contract with a fixed gas limit. It must run out of gas because it just
@@ -714,7 +712,7 @@ fn storage_work() {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
 		let min_balance = Contracts::min_balance();
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-			.value(min_balance * 100)
+			.value((min_balance * 100).into())
 			.build_and_unwrap_contract();
 
 		builder::bare_call(addr).build_and_unwrap_result();
@@ -729,7 +727,7 @@ fn storage_max_value_limit() {
 		// Create
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.value(30_000)
+			.value(30_000.into())
 			.build_and_unwrap_contract();
 		get_contract(&addr);
 
@@ -755,7 +753,7 @@ fn clear_storage_on_zero_value() {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
 		let min_balance = Contracts::min_balance();
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-			.value(min_balance * 100)
+			.value((min_balance * 100).into())
 			.build_and_unwrap_contract();
 
 		builder::bare_call(addr).build_and_unwrap_result();
@@ -770,7 +768,7 @@ fn transient_storage_work() {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
 		let min_balance = Contracts::min_balance();
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-			.value(min_balance * 100)
+			.value((min_balance * 100).into())
 			.build_and_unwrap_contract();
 
 		builder::bare_call(addr).build_and_unwrap_result();
@@ -830,7 +828,7 @@ fn deploy_and_call_other_contract() {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
 		let Contract { addr: caller_addr, account_id: caller_account } =
 			builder::bare_instantiate(Code::Upload(caller_binary))
-				.value(100_000)
+				.value(100_000.into())
 				.build_and_unwrap_contract();
 
 		let callee_addr = create2(
@@ -921,13 +919,13 @@ fn delegate_call() {
 		// Instantiate the 'caller'
 		let Contract { addr: caller_addr, .. } =
 			builder::bare_instantiate(Code::Upload(caller_binary))
-				.value(300_000)
+				.value(300_000.into())
 				.build_and_unwrap_contract();
 
 		// Instantiate the 'callee'
 		let Contract { addr: callee_addr, .. } =
 			builder::bare_instantiate(Code::Upload(callee_binary))
-				.value(100_000)
+				.value(100_000.into())
 				.build_and_unwrap_contract();
 
 		assert_ok!(builder::call(caller_addr)
@@ -947,7 +945,7 @@ fn delegate_call_non_existant_is_noop() {
 		// Instantiate the 'caller'
 		let Contract { addr: caller_addr, .. } =
 			builder::bare_instantiate(Code::Upload(caller_binary))
-				.value(300_000)
+				.value(300_000.into())
 				.build_and_unwrap_contract();
 
 		assert_ok!(builder::call(caller_addr)
@@ -970,19 +968,19 @@ fn delegate_call_with_weight_limit() {
 		// Instantiate the 'caller'
 		let Contract { addr: caller_addr, .. } =
 			builder::bare_instantiate(Code::Upload(caller_binary))
-				.value(300_000)
+				.value(300_000.into())
 				.build_and_unwrap_contract();
 
 		// Instantiate the 'callee'
 		let Contract { addr: callee_addr, .. } =
 			builder::bare_instantiate(Code::Upload(callee_binary))
-				.value(100_000)
+				.value(100_000.into())
 				.build_and_unwrap_contract();
 
 		// fails, not enough weight
 		assert_err!(
 			builder::bare_call(caller_addr)
-				.value(1337)
+				.value(1337.into())
 				.data((callee_addr, 100u64, 100u64).encode())
 				.build()
 				.result,
@@ -1007,20 +1005,20 @@ fn delegate_call_with_deposit_limit() {
 		// Instantiate the 'caller'
 		let Contract { addr: caller_addr, .. } =
 			builder::bare_instantiate(Code::Upload(caller_binary))
-				.value(300_000)
+				.value(300_000.into())
 				.build_and_unwrap_contract();
 
 		// Instantiate the 'callee'
 		let Contract { addr: callee_addr, .. } =
 			builder::bare_instantiate(Code::Upload(callee_binary))
-				.value(100_000)
+				.value(100_000.into())
 				.build_and_unwrap_contract();
 
 		// Delegate call will write 1 storage and deposit of 2 (1 item) + 32 (bytes) is required.
 		// + 32 + 16 for blake2_128concat
 		// Fails, not enough deposit
 		let ret = builder::bare_call(caller_addr)
-			.value(1337)
+			.value(1337.into())
 			.data((callee_addr, 81u64).encode())
 			.build_and_unwrap_result();
 		assert_return_code!(ret, RuntimeReturnCode::OutOfResources);
@@ -1040,7 +1038,7 @@ fn transfer_expendable_cannot_kill_account() {
 
 		// Instantiate the BOB contract.
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.value(1_000)
+			.value(1_000.into())
 			.build_and_unwrap_contract();
 
 		// Check that the BOB contract has been instantiated.
@@ -1079,7 +1077,7 @@ fn cannot_self_destruct_through_draining() {
 
 		// Instantiate the BOB contract.
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.value(value)
+			.value(value.into())
 			.build_and_unwrap_contract();
 		let account = <Test as Config>::AddressMapper::to_account_id(&addr);
 
@@ -1147,7 +1145,7 @@ fn cannot_self_destruct_while_live() {
 
 		// Instantiate the BOB contract.
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.value(100_000)
+			.value(100_000.into())
 			.build_and_unwrap_contract();
 
 		// Check that the BOB contract has been instantiated.
@@ -1175,7 +1173,7 @@ fn self_destruct_works() {
 
 		// Instantiate the BOB contract.
 		let contract = builder::bare_instantiate(Code::Upload(binary))
-			.value(100_000)
+			.value(100_000.into())
 			.build_and_unwrap_contract();
 
 		// Check that the BOB contract has been instantiated.
@@ -1252,7 +1250,7 @@ fn destroy_contract_and_transfer_funds() {
 		// construction.
 		let Contract { addr: addr_bob, .. } =
 			builder::bare_instantiate(Code::Upload(caller_binary))
-				.value(200_000)
+				.value(200_000.into())
 				.data(callee_code_hash.as_ref().to_vec())
 				.build_and_unwrap_contract();
 
@@ -1292,7 +1290,7 @@ fn crypto_hashes() {
 
 		// Instantiate the CRYPTO_HASHES contract.
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.value(100_000)
+			.value(100_000.into())
 			.build_and_unwrap_contract();
 		// Perform the call.
 		let input = b"_DEAD_BEEF";
@@ -1329,7 +1327,7 @@ fn transfer_return_code() {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
 
 		let contract = builder::bare_instantiate(Code::Upload(binary))
-			.value(min_balance * 100)
+			.value((min_balance * 100).into())
 			.build_and_unwrap_contract();
 
 		// Contract has only the minimal balance so any transfer will fail.
@@ -1351,7 +1349,7 @@ fn call_return_code() {
 		let _ = <Test as Config>::Currency::set_balance(&CHARLIE, 1000 * min_balance);
 
 		let bob = builder::bare_instantiate(Code::Upload(caller_code))
-			.value(min_balance * 100)
+			.value((min_balance * 100).into())
 			.build_and_unwrap_contract();
 
 		// BOB cannot pay the ed which is needed to pull DJANGO into existence
@@ -1397,7 +1395,7 @@ fn call_return_code() {
 
 		let django = builder::bare_instantiate(Code::Upload(callee_code))
 			.origin(RuntimeOrigin::signed(CHARLIE))
-			.value(min_balance * 100)
+			.value((min_balance * 100).into())
 			.build_and_unwrap_contract();
 
 		// Sending more than the contract has will make the transfer fail.
@@ -1455,7 +1453,7 @@ fn instantiate_return_code() {
 		assert_ok!(builder::instantiate_with_code(callee_code).value(min_balance * 100).build());
 
 		let contract = builder::bare_instantiate(Code::Upload(caller_code))
-			.value(min_balance * 100)
+			.value((min_balance * 100).into())
 			.build_and_unwrap_contract();
 
 		// bob cannot pay the ED to create the contract as he has no money
@@ -1512,7 +1510,7 @@ fn lazy_removal_works() {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
 
 		let contract = builder::bare_instantiate(Code::Upload(code))
-			.value(min_balance * 100)
+			.value((min_balance * 100).into())
 			.build_and_unwrap_contract();
 
 		let info = get_contract(&contract.addr);
@@ -1525,7 +1523,7 @@ fn lazy_removal_works() {
 		assert_ok!(builder::call(contract.addr).build());
 
 		// Contract info should be gone
-		assert!(!<ContractInfoOf::<Test>>::contains_key(&contract.addr));
+		assert!(!<AccountInfoOf::<Test>>::contains_key(&contract.addr));
 
 		// But value should be still there as the lazy removal did not run, yet.
 		assert_matches!(child::get(trie, &[99]), Some(42));
@@ -1548,7 +1546,7 @@ fn lazy_batch_removal_works() {
 
 		for i in 0..3u8 {
 			let contract = builder::bare_instantiate(Code::Upload(code.clone()))
-				.value(min_balance * 100)
+				.value((min_balance * 100).into())
 				.salt(Some([i; 32]))
 				.build_and_unwrap_contract();
 
@@ -1562,7 +1560,7 @@ fn lazy_batch_removal_works() {
 			// there as the lazy removal did not run, yet.
 			assert_ok!(builder::call(contract.addr).build());
 
-			assert!(!<ContractInfoOf::<Test>>::contains_key(&contract.addr));
+			assert!(!<AccountInfoOf::<Test>>::contains_key(&contract.addr));
 			assert_matches!(child::get(trie, &[99]), Some(42));
 
 			tries.push(trie.clone())
@@ -1618,7 +1616,7 @@ fn lazy_removal_partial_remove_works() {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
 
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-			.value(min_balance * 100)
+			.value((min_balance * 100).into())
 			.build_and_unwrap_contract();
 
 		let info = get_contract(&addr);
@@ -1627,13 +1625,16 @@ fn lazy_removal_partial_remove_works() {
 		for val in &vals {
 			info.write(&Key::Fix(val.0), Some(val.2.clone()), None, false).unwrap();
 		}
-		<ContractInfoOf<Test>>::insert(&addr, info.clone());
+		<AccountInfoOf<Test>>::insert(
+			&addr,
+			AccountInfo { account_type: info.clone().into(), dust: 0 },
+		);
 
 		// Terminate the contract
 		assert_ok!(builder::call(addr).build());
 
 		// Contract info should be gone
-		assert!(!<ContractInfoOf::<Test>>::contains_key(&addr));
+		assert!(!<AccountInfoOf::<Test>>::contains_key(&addr));
 
 		let trie = info.child_trie_info();
 
@@ -1682,7 +1683,7 @@ fn lazy_removal_does_no_run_on_low_remaining_weight() {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
 
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-			.value(min_balance * 100)
+			.value((min_balance * 100).into())
 			.build_and_unwrap_contract();
 
 		let info = get_contract(&addr);
@@ -1695,7 +1696,7 @@ fn lazy_removal_does_no_run_on_low_remaining_weight() {
 		assert_ok!(builder::call(addr).build());
 
 		// Contract info should be gone
-		assert!(!<ContractInfoOf::<Test>>::contains_key(&addr));
+		assert!(!<AccountInfoOf::<Test>>::contains_key(&addr));
 
 		// But value should be still there as the lazy removal did not run, yet.
 		assert_matches!(child::get(trie, &[99]), Some(42));
@@ -1736,7 +1737,7 @@ fn lazy_removal_does_not_use_all_weight() {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
 
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-			.value(min_balance * 100)
+			.value((min_balance * 100).into())
 			.build_and_unwrap_contract();
 
 		let info = get_contract(&addr);
@@ -1752,13 +1753,16 @@ fn lazy_removal_does_not_use_all_weight() {
 		for val in &vals {
 			info.write(&Key::Fix(val.0), Some(val.2.clone()), None, false).unwrap();
 		}
-		<ContractInfoOf<Test>>::insert(&addr, info.clone());
+		<AccountInfoOf<Test>>::insert(
+			&addr,
+			AccountInfo { account_type: info.clone().into(), dust: 0 },
+		);
 
 		// Terminate the contract
 		assert_ok!(builder::call(addr).build());
 
 		// Contract info should be gone
-		assert!(!<ContractInfoOf::<Test>>::contains_key(&addr));
+		assert!(!<AccountInfoOf::<Test>>::contains_key(&addr));
 
 		let trie = info.child_trie_info();
 
@@ -1810,7 +1814,7 @@ fn deletion_queue_ring_buffer_overflow() {
 		// add 3 contracts to the deletion queue
 		for i in 0..3u8 {
 			let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code.clone()))
-				.value(min_balance * 100)
+				.value((min_balance * 100).into())
 				.salt(Some([i; 32]))
 				.build_and_unwrap_contract();
 
@@ -1824,7 +1828,7 @@ fn deletion_queue_ring_buffer_overflow() {
 			// there as the lazy removal did not run, yet.
 			assert_ok!(builder::call(addr).build());
 
-			assert!(!<ContractInfoOf::<Test>>::contains_key(&addr));
+			assert!(!<AccountInfoOf::<Test>>::contains_key(&addr));
 			assert_matches!(child::get(trie, &[99]), Some(42));
 
 			tries.push(trie.clone())
@@ -1851,18 +1855,18 @@ fn refcounter() {
 
 		// Create two contracts with the same code and check that they do in fact share it.
 		let Contract { addr: addr0, .. } = builder::bare_instantiate(Code::Upload(binary.clone()))
-			.value(min_balance * 100)
+			.value((min_balance * 100).into())
 			.salt(Some([0; 32]))
 			.build_and_unwrap_contract();
 		let Contract { addr: addr1, .. } = builder::bare_instantiate(Code::Upload(binary.clone()))
-			.value(min_balance * 100)
+			.value((min_balance * 100).into())
 			.salt(Some([1; 32]))
 			.build_and_unwrap_contract();
 		assert_refcount!(code_hash, 2);
 
 		// Sharing should also work with the usual instantiate call
 		let Contract { addr: addr2, .. } = builder::bare_instantiate(Code::Existing(code_hash))
-			.value(min_balance * 100)
+			.value((min_balance * 100).into())
 			.salt(Some([2; 32]))
 			.build_and_unwrap_contract();
 		assert_refcount!(code_hash, 3);
@@ -1897,11 +1901,11 @@ fn gas_estimation_for_subcalls() {
 
 		let Contract { addr: addr_caller, .. } =
 			builder::bare_instantiate(Code::Upload(caller_code))
-				.value(min_balance * 100)
+				.value((min_balance * 100).into())
 				.build_and_unwrap_contract();
 
 		let Contract { addr: addr_dummy, .. } = builder::bare_instantiate(Code::Upload(dummy_code))
-			.value(min_balance * 100)
+			.value((min_balance * 100).into())
 			.build_and_unwrap_contract();
 
 		// Run the test for all of those weight limits for the subcall
@@ -1973,7 +1977,7 @@ fn call_runtime_reentrancy_guarded() {
 
 		let Contract { addr: addr_callee, .. } =
 			builder::bare_instantiate(Code::Upload(callee_code))
-				.value(min_balance * 100)
+				.value((min_balance * 100).into())
 				.salt(Some([1; 32]))
 				.build_and_unwrap_contract();
 
@@ -2009,7 +2013,7 @@ fn sr25519_verify() {
 
 		// Instantiate the sr25519_verify contract.
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.value(100_000)
+			.value(100_000.into())
 			.build_and_unwrap_contract();
 
 		let call_with = |message: &[u8; 11]| {
@@ -2259,7 +2263,7 @@ fn instantiate_with_below_existential_deposit_works() {
 
 		// Instantiate the BOB contract.
 		let Contract { addr, account_id } = builder::bare_instantiate(Code::Upload(binary))
-			.value(value)
+			.value(value.into())
 			.build_and_unwrap_contract();
 
 		// Ensure the contract was stored and get expected deposit amount to be reserved.
@@ -2470,7 +2474,7 @@ fn slash_cannot_kill_account() {
 		let min_balance = Contracts::min_balance();
 
 		let Contract { addr, account_id } = builder::bare_instantiate(Code::Upload(binary))
-			.value(value)
+			.value(value.into())
 			.build_and_unwrap_contract();
 
 		// Drop previous events
@@ -2541,7 +2545,7 @@ fn contract_reverted() {
 			.build_and_unwrap_result();
 		assert_eq!(result.result.flags, flags);
 		assert_eq!(result.result.data, buffer);
-		assert!(!<ContractInfoOf<Test>>::contains_key(result.addr));
+		assert!(!<AccountInfoOf<Test>>::contains_key(result.addr));
 
 		// Pass empty flags and therefore successfully instantiate the contract for later use.
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Existing(code_hash))
@@ -2571,7 +2575,7 @@ fn set_code_hash() {
 
 		// Instantiate the 'caller'
 		let Contract { addr: contract_addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.value(300_000)
+			.value(300_000.into())
 			.build_and_unwrap_contract();
 		// upload new code
 		assert_ok!(Contracts::upload_code(
@@ -2752,7 +2756,7 @@ fn deposit_limit_in_nested_instantiate() {
 		// Create caller contract
 		let Contract { addr: addr_caller, account_id: caller_id } =
 			builder::bare_instantiate(Code::Upload(binary_caller))
-				.value(10_000u64) // this balance is later passed to the deployed contract
+				.value(10_000u64.into()) // this balance is later passed to the deployed contract
 				.build_and_unwrap_contract();
 		// Deploy a contract to get its occupied storage size
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary_callee))
@@ -2767,7 +2771,8 @@ fn deposit_limit_in_nested_instantiate() {
 		// - 2 for the storage item of 0 bytes being created in the callee constructor
 		// - 48 for the key
 		let callee_min_deposit = {
-			let callee_info_len = ContractInfoOf::<Test>::get(&addr).unwrap().encoded_size() as u64;
+			let callee_info_len =
+				AccountInfo::<Test>::load_contract(&addr).unwrap().encoded_size() as u64;
 			let code_deposit = test_utils::lockup_deposit(&code_hash_callee);
 			callee_info_len + code_deposit + 2 + ED + 2 + 48
 		};
@@ -4075,7 +4080,7 @@ fn tracing_works_for_transfers() {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000);
 		let mut tracer = CallTracer::new(Default::default(), |_| U256::zero());
 		trace(&mut tracer, || {
-			builder::bare_call(BOB_ADDR).value(10_000_000).build_and_unwrap_result();
+			builder::bare_call(BOB_ADDR).value(10_000_000.into()).build_and_unwrap_result();
 		});
 
 		let trace = tracer.collect_trace();
@@ -4105,7 +4110,7 @@ fn call_tracing_works() {
 			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
 
 		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).value(10_000_000).build_and_unwrap_contract();
+			builder::bare_instantiate(Code::Upload(code)).value(10_000_000.into()).build_and_unwrap_contract();
 
 
 		let tracer_configs = vec![
@@ -4260,7 +4265,7 @@ fn create_call_tracing_works() {
 
 		let Contract { addr, .. } = trace(&mut tracer, || {
 			builder::bare_instantiate(Code::Upload(code.clone()))
-				.value(100)
+				.value(100.into())
 				.salt(None)
 				.build_and_unwrap_contract()
 		});
@@ -4325,7 +4330,7 @@ fn prestate_tracing_works() {
 				.build_and_unwrap_contract();
 
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code.clone()))
-			.value(10_000_000)
+			.value(10_000_000.into())
 			.build_and_unwrap_contract();
 
 		// redact balance so that tests are resilient to weight changes
@@ -4588,7 +4593,7 @@ fn pure_precompile_works() {
 			let id = <Test as Config>::AddressMapper::to_account_id(&precompile_addr);
 			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
 			let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-				.value(1000)
+				.value(1000.into())
 				.build_and_unwrap_contract();
 
 			let result = builder::bare_call(addr)
@@ -4657,7 +4662,7 @@ fn precompiles_work() {
 			let id = <Test as Config>::AddressMapper::to_account_id(&precompile_addr);
 			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
 			let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-				.value(1000)
+				.value(1000.into())
 				.build_and_unwrap_contract();
 
 			let result = builder::bare_call(addr)
@@ -4702,7 +4707,7 @@ fn precompiles_with_info_creates_contract() {
 			let id = <Test as Config>::AddressMapper::to_account_id(&precompile_addr);
 			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
 			let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-				.value(1000)
+				.value(1000.into())
 				.build_and_unwrap_contract();
 
 			let result = builder::bare_call(addr)

From a7adc715d8c380c2fa528d7b57deb4dbbf7983a3 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Thu, 3 Jul 2025 00:01:24 +0200
Subject: [PATCH 003/186] add transfer_with dust

---
 substrate/frame/revive/src/exec.rs    | 98 ++++++++++++++++++++-------
 substrate/frame/revive/src/lib.rs     | 27 ++++++--
 substrate/frame/revive/src/storage.rs | 75 ++++++++++++++++++--
 substrate/frame/revive/src/tests.rs   |  6 +-
 4 files changed, 168 insertions(+), 38 deletions(-)

diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index 4901468af1ce..5fd9dce8036a 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -22,11 +22,12 @@ use crate::{
 	precompiles::{All as AllPrecompiles, Instance as PrecompileInstance, Precompiles},
 	primitives::{BumpNonce, ExecReturnValue, StorageDeposit},
 	runtime_decl_for_revive_api::{Decode, Encode, RuntimeDebugNoBound, TypeInfo},
-	storage::{self, meter::Diff, WriteOutcome},
+	storage::{self, meter::Diff, AccountIdOrAddress, WriteOutcome},
 	tracing::if_tracing,
 	transient_storage::TransientStorage,
 	AccountInfo, AccountInfoOf, BalanceOf, BalanceWithDust, CodeInfo, CodeInfoOf, Config,
-	ContractInfo, Error, Event, ImmutableData, ImmutableDataOf, Pallet as Contracts, RuntimeCosts,
+	ContractInfo, Error, Event, ImmutableData, ImmutableDataOf, Pallet, Pallet as Contracts,
+	RuntimeCosts,
 };
 use alloc::vec::Vec;
 use core::{fmt::Debug, marker::PhantomData, mem};
@@ -36,7 +37,7 @@ use frame_support::{
 	storage::{with_transaction, TransactionOutcome},
 	traits::{
 		fungible::{Inspect, Mutate},
-		tokens::{Fortitude, Preservation},
+		tokens::Preservation,
 		Time,
 	},
 	weights::Weight,
@@ -49,7 +50,7 @@ use frame_system::{
 use sp_core::{
 	ecdsa::Public as ECDSAPublic,
 	sr25519::{Public as SR25519Public, Signature as SR25519Signature},
-	ConstU32, H160, H256, U256,
+	ConstU32, Get, H160, H256, U256,
 };
 use sp_io::{crypto::secp256k1_ecdsa_recover_compressed, hashing::blake2_256};
 use sp_runtime::{
@@ -1058,7 +1059,6 @@ where
 		if let (CachedContract::Cached(contract), ExportedFunction::Call) =
 			(&frame.contract_info, frame.entry_point)
 		{
-			// TODO add dust
 			AccountInfoOf::<T>::insert(
 				T::AddressMapper::to_address(&frame.account_id),
 				AccountInfo { account_type: contract.clone().into(), dust: 0 },
@@ -1342,7 +1342,7 @@ where
 				// when it is popped from the stack.
 				<AccountInfoOf<T>>::insert(
 					T::AddressMapper::to_address(account_id),
-					AccountInfo { account_type: contract.into(), dust: 0 }, // TODO handle dust
+					AccountInfo { account_type: contract.into(), dust: 0 },
 				);
 				if let Some(f) = self.frames_mut().skip(1).find(|f| f.account_id == *account_id) {
 					f.contract_info.invalidate();
@@ -1362,7 +1362,7 @@ where
 			if let Some(contract) = contract {
 				<AccountInfoOf<T>>::insert(
 					T::AddressMapper::to_address(&self.first_frame.account_id),
-					AccountInfo { account_type: contract.clone().into(), dust: 0 }, /* TODO handle dust */
+					AccountInfo { account_type: contract.clone().into(), dust: 0 },
 				);
 			}
 		}
@@ -1392,13 +1392,8 @@ where
 			return Ok(Default::default());
 		}
 
-		// TODO handle dust
-		let BalanceWithDust { value, dust } = value;
-
 		if <System<T>>::account_exists(to) {
-			return T::Currency::transfer(from, to, value, Preservation::Preserve)
-				.map(|_| Default::default())
-				.map_err(|_| Error::<T>::TransferFailed.into());
+			return Self::transfer_with_dust(from, to, value).map(|_| Default::default())
 		}
 
 		let origin = origin.account_id()?;
@@ -1406,10 +1401,8 @@ where
 		with_transaction(|| -> TransactionOutcome<ExecResult> {
 			let res = match T::Currency::transfer(origin, to, ed, Preservation::Preserve)
 				.map_err(|_| Error::<T>::StorageDepositNotEnoughFunds.into())
-				.and_then(|_| {
-					T::Currency::transfer(from, to, value, Preservation::Preserve)
-						.map_err(|_| Error::<T>::TransferFailed.into())
-				}) {
+				.and_then(|_| Self::transfer_with_dust(from, to, value))
+			{
 				Ok(_) => {
 					// ed is taken from the transaction signer so it should be
 					// limited by the storage deposit
@@ -1419,15 +1412,71 @@ where
 				Err(err) => TransactionOutcome::Rollback(Err(err)),
 			};
 
-			if !dust.is_zero() {
-				// let addr =
-				// ContractInfoOf
-			}
-
 			res
 		})
 	}
 
+	fn transfer_with_dust(
+		from: &AccountIdOf<T>,
+		to: &AccountIdOf<T>,
+		value: BalanceWithDust<BalanceOf<T>>,
+	) -> Result<(), ExecError> {
+		let BalanceWithDust { value, dust } = value;
+
+		let transfer = |from, to, value| {
+			T::Currency::transfer(from, to, value, Preservation::Preserve)
+				.map_err(|_| ExecError::from(Error::<T>::TransferFailed))?;
+			return Ok(())
+		};
+
+		let transfer_dust = |from: &mut AccountInfo<T>, to: &mut AccountInfo<T>, dust| {
+			from.dust
+				.checked_sub(dust)
+				.ok_or_else(|| ExecError::from(Error::<T>::TransferFailed))?;
+			to.dust
+				.checked_add(dust)
+				.ok_or_else(|| ExecError::from(Error::<T>::TransferFailed))?;
+			Ok::<(), ExecError>(())
+		};
+
+		if dust.is_zero() {
+			return transfer(from, to, value)
+		}
+
+		let from_addr = <T::AddressMapper as AddressMapper<T>>::to_address(from);
+		let mut from_info = AccountInfoOf::<T>::get(&from_addr).unwrap_or_default();
+
+		let to_addr = <T::AddressMapper as AddressMapper<T>>::to_address(to);
+		let mut to_info = AccountInfoOf::<T>::get(&to_addr).unwrap_or_default();
+
+		let dust_account_id = Pallet::<T>::dust_account_id();
+		let plank = T::NativeToEthRatio::get();
+
+		if from_info.dust < dust {
+			transfer(from, &dust_account_id, 1u32.into())?;
+			from_info
+				.dust
+				.checked_add(plank)
+				.ok_or_else(|| ExecError::from(Error::<T>::TransferFailed))?;
+		}
+
+		transfer(from, to, value)?;
+		transfer_dust(&mut from_info, &mut to_info, dust)?;
+
+		if to_info.dust.saturating_add(dust) >= plank {
+			transfer(&dust_account_id, to, 1u32.into())?;
+			to_info
+				.dust
+				.checked_sub(plank)
+				.ok_or_else(|| ExecError::from(Error::<T>::TransferFailed))?;
+		}
+
+		AccountInfoOf::<T>::set(&from_addr, Some(from_info));
+		AccountInfoOf::<T>::set(&to_addr, Some(to_info));
+
+		Ok(())
+	}
+
 	/// Same as `transfer` but `from` is an `Origin`.
 	fn transfer_from_origin<S: storage::meter::State + Default + Debug>(
 		origin: &Origin<T>,
@@ -1481,9 +1530,8 @@ where
 
 	/// Returns the *free* balance of the supplied AccountId.
 	fn account_balance(&self, who: &T::AccountId) -> U256 {
-		let value = T::Currency::reducible_balance(who, Preservation::Preserve, Fortitude::Polite);
-		let dust = 0; // TODO handle dust
-		crate::Pallet::<T>::convert_native_to_evm(BalanceWithDust { value, dust })
+		let balance = AccountInfo::<T>::balance(AccountIdOrAddress::AccountId(who.clone()));
+		crate::Pallet::<T>::convert_native_to_evm(balance)
 	}
 
 	/// Certain APIs, e.g. `{set,get}_immutable_data` behave differently depending
diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index f291ab5e9978..41d152b041af 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -67,7 +67,6 @@ use frame_support::{
 	pallet_prelude::DispatchClass,
 	traits::{
 		fungible::{Inspect, Mutate, MutateHold},
-		tokens::{Fortitude::Polite, Preservation::Preserve},
 		ConstU32, ConstU64, EnsureOrigin, Get, IsType, OriginTrait, Time,
 	},
 	weights::WeightMeter,
@@ -129,7 +128,7 @@ const LOG_TARGET: &str = "runtime::revive";
 #[frame_support::pallet]
 pub mod pallet {
 	use super::*;
-	use frame_support::{pallet_prelude::*, traits::FindAuthor};
+	use frame_support::{pallet_prelude::*, traits::FindAuthor, PalletId};
 	use frame_system::pallet_prelude::*;
 	use sp_core::U256;
 	use sp_runtime::Perbill;
@@ -344,7 +343,7 @@ pub mod pallet {
 			type RuntimeMemory = ConstU32<{ 128 * 1024 * 1024 }>;
 			type PVFMemory = ConstU32<{ 512 * 1024 * 1024 }>;
 			type ChainId = ConstU64<42>;
-			type NativeToEthRatio = ConstU32<1>;
+			type NativeToEthRatio = ConstU32<10_000_000>;
 			type EthGasEncoder = ();
 			type FindAuthor = ();
 		}
@@ -535,6 +534,15 @@ pub mod pallet {
 	#[pallet::genesis_build]
 	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 		fn build(&self) {
+			use frame_support::traits::fungible::Mutate;
+
+			// Create Dust account
+			let account_id = Pallet::<T>::dust_account_id();
+			let min = T::Currency::minimum_balance();
+			if <T as Config>::Currency::balance(&account_id) < min {
+				let _ = <T as Config>::Currency::set_balance(&account_id, min);
+			}
+
 			for id in &self.mapped_accounts {
 				if let Err(err) = T::AddressMapper::map(id) {
 					log::error!(target: LOG_TARGET, "Failed to map account {id:?}: {err:?}");
@@ -672,6 +680,13 @@ pub mod pallet {
 		}
 	}
 
+	impl<T: Config> Pallet<T> {
+		pub fn dust_account_id() -> <T as frame_system::Config>::AccountId {
+			use sp_runtime::traits::AccountIdConversion;
+			PalletId(*b"py/revdt").into_account_truncating()
+		}
+	}
+
 	#[pallet::call]
 	impl<T: Config> Pallet<T>
 	where
@@ -1440,10 +1455,8 @@ where
 
 	/// Get the balance with EVM decimals of the given `address`.
 	pub fn evm_balance(address: &H160) -> U256 {
-		let account = T::AddressMapper::to_account_id(&address);
-		let value = T::Currency::reducible_balance(&account, Preserve, Polite);
-		let dust = 0; // TODO
-		Self::convert_native_to_evm(BalanceWithDust { value, dust })
+		let balance = AccountInfo::<T>::balance(address.clone().into());
+		Self::convert_native_to_evm(balance)
 	}
 
 	/// Get the nonce for the given `address`.
diff --git a/substrate/frame/revive/src/storage.rs b/substrate/frame/revive/src/storage.rs
index 7bed4c5143ff..2cd8d7e08bcc 100644
--- a/substrate/frame/revive/src/storage.rs
+++ b/substrate/frame/revive/src/storage.rs
@@ -25,7 +25,8 @@ use crate::{
 	storage::meter::Diff,
 	tracing::if_tracing,
 	weights::WeightInfo,
-	AccountInfoOf, BalanceOf, Config, DeletionQueue, DeletionQueueCounter, Error, TrieId, SENTINEL,
+	AccountInfoOf, BalanceOf, BalanceWithDust, Config, DeletionQueue, DeletionQueueCounter, Error,
+	TrieId, SENTINEL,
 };
 use alloc::vec::Vec;
 use codec::{Decode, Encode, MaxEncodedLen};
@@ -43,8 +44,25 @@ use sp_runtime::{
 	DispatchError, RuntimeDebug,
 };
 
+pub enum AccountIdOrAddress<T: Config> {
+	/// An account that is a contract.
+	AccountId(AccountIdOf<T>),
+	/// An externally owned account (EOA).
+	Address(H160),
+}
+
 /// Represents the account information for a contract or an externally owned account (EOA).
-#[derive(Encode, Decode, CloneNoBound, PartialEq, Eq, RuntimeDebug, TypeInfo, MaxEncodedLen)]
+#[derive(
+	DefaultNoBound,
+	Encode,
+	Decode,
+	CloneNoBound,
+	PartialEq,
+	Eq,
+	RuntimeDebug,
+	TypeInfo,
+	MaxEncodedLen,
+)]
 #[scale_info(skip_type_params(T))]
 pub struct AccountInfo<T: Config> {
 	/// The type of the account.
@@ -56,13 +74,24 @@ pub struct AccountInfo<T: Config> {
 }
 
 /// The account type is used to distinguish between contracts and externally owned accounts.
-#[derive(Encode, Decode, CloneNoBound, PartialEq, Eq, RuntimeDebug, TypeInfo, MaxEncodedLen)]
+#[derive(
+	DefaultNoBound,
+	Encode,
+	Decode,
+	CloneNoBound,
+	PartialEq,
+	Eq,
+	RuntimeDebug,
+	TypeInfo,
+	MaxEncodedLen,
+)]
 #[scale_info(skip_type_params(T))]
 pub enum AccountType<T: Config> {
 	/// An account that is a contract.
 	Contract(ContractInfo<T>),
 
 	/// An account that is an externally owned account (EOA).
+	#[default]
 	EOA,
 }
 
@@ -92,6 +121,29 @@ pub struct ContractInfo<T: Config> {
 	immutable_data_len: u32,
 }
 
+impl<T: Config> From<H160> for AccountIdOrAddress<T> {
+	fn from(address: H160) -> Self {
+		AccountIdOrAddress::Address(address)
+	}
+}
+
+impl<T: Config> AccountIdOrAddress<T> {
+	pub fn address(&self) -> H160 {
+		match self {
+			AccountIdOrAddress::AccountId(id) =>
+				<T::AddressMapper as AddressMapper<T>>::to_address(id),
+			AccountIdOrAddress::Address(address) => *address,
+		}
+	}
+
+	pub fn account_id(&self) -> AccountIdOf<T> {
+		match self {
+			AccountIdOrAddress::AccountId(id) => id.clone(),
+			AccountIdOrAddress::Address(address) => T::AddressMapper::to_account_id(address),
+		}
+	}
+}
+
 impl<T: Config> From<ContractInfo<T>> for AccountType<T> {
 	fn from(contract_info: ContractInfo<T>) -> Self {
 		AccountType::Contract(contract_info)
@@ -99,11 +151,24 @@ impl<T: Config> From<ContractInfo<T>> for AccountType<T> {
 }
 
 impl<T: Config> AccountInfo<T> {
-	fn has_contract(address: &H160) -> bool {
+	/// Returns true if the account is a contract.
+	fn is_contract(address: &H160) -> bool {
 		let Some(info) = <AccountInfoOf<T>>::get(address) else { return false };
 		matches!(info.account_type, AccountType::Contract(_))
 	}
 
+	/// Returns the balance of the account at the given address.
+	pub fn balance(account: AccountIdOrAddress<T>) -> BalanceWithDust<BalanceOf<T>> {
+		use frame_support::traits::{
+			fungible::Inspect,
+			tokens::{Fortitude::Polite, Preservation::Preserve},
+		};
+
+		let value = T::Currency::reducible_balance(&account.account_id(), Preserve, Polite);
+		let dust = <AccountInfoOf<T>>::get(account.address()).map(|a| a.dust).unwrap_or_default();
+		BalanceWithDust { value, dust }
+	}
+
 	/// Loads the contract information for a given address.
 	pub fn load_contract(address: &H160) -> Option<ContractInfo<T>> {
 		let Some(info) = <AccountInfoOf<T>>::get(address) else { return None };
@@ -122,7 +187,7 @@ impl<T: Config> ContractInfo<T> {
 		nonce: T::Nonce,
 		code_hash: sp_core::H256,
 	) -> Result<Self, DispatchError> {
-		if <AccountInfo<T>>::has_contract(address) {
+		if <AccountInfo<T>>::is_contract(address) {
 			return Err(Error::<T>::DuplicateContract.into());
 		}
 
diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index 89ad5d1b97bb..1339f28f99ed 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -442,7 +442,11 @@ fn calling_plain_account_is_balance_transfer() {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000);
 		assert!(!<AccountInfoOf<Test>>::contains_key(BOB_ADDR));
 		assert_eq!(test_utils::get_balance(&BOB_FALLBACK), 0);
-		let result = builder::bare_call(BOB_ADDR).value(42.into()).build_and_unwrap_result();
+
+		let result = builder::bare_call(BOB_ADDR)
+			.value(crate::BalanceWithDust { value: 42, dust: 0 })
+			.build_and_unwrap_result();
+
 		assert_eq!(
 			test_utils::get_balance(&BOB_FALLBACK),
 			42 + <Test as Config>::Currency::minimum_balance()

From 578a11a6dcdbfa2af4a79c874e30d8b49561852a Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Thu, 3 Jul 2025 00:19:12 +0200
Subject: [PATCH 004/186] fix transfer_with_dust

---
 substrate/frame/revive/src/exec.rs | 10 ++++++----
 substrate/frame/revive/src/lib.rs  |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index 5fd9dce8036a..a320f2e6c64a 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -1430,10 +1430,12 @@ where
 		};
 
 		let transfer_dust = |from: &mut AccountInfo<T>, to: &mut AccountInfo<T>, dust| {
-			from.dust
+			from.dust = from
+				.dust
 				.checked_sub(dust)
 				.ok_or_else(|| ExecError::from(Error::<T>::TransferFailed))?;
-			to.dust
+			to.dust = to
+				.dust
 				.checked_add(dust)
 				.ok_or_else(|| ExecError::from(Error::<T>::TransferFailed))?;
 			Ok::<(), ExecError>(())
@@ -1454,7 +1456,7 @@ where
 
 		if from_info.dust < dust {
 			transfer(from, &dust_account_id, 1u32.into())?;
-			from_info
+			from_info.dust = from_info
 				.dust
 				.checked_add(plank)
 				.ok_or_else(|| ExecError::from(Error::<T>::TransferFailed))?;
@@ -1465,7 +1467,7 @@ where
 
 		if to_info.dust.saturating_add(dust) >= plank {
 			transfer(&dust_account_id, to, 1u32.into())?;
-			to_info
+			to_info.dust = to_info
 				.dust
 				.checked_sub(plank)
 				.ok_or_else(|| ExecError::from(Error::<T>::TransferFailed))?;
diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index 41d152b041af..6237d502b728 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -540,7 +540,7 @@ pub mod pallet {
 			let account_id = Pallet::<T>::dust_account_id();
 			let min = T::Currency::minimum_balance();
 			if <T as Config>::Currency::balance(&account_id) < min {
-				let _ = <T as Config>::Currency::set_balance(&account_id, min);
+				<T as Config>::Currency::set_balance(&account_id, min);
 			}
 
 			for id in &self.mapped_accounts {

From 56eabf0460da3f418f5716c10283809b6d56ee30 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Thu, 3 Jul 2025 14:00:38 +0200
Subject: [PATCH 005/186] fix tests

---
 .../fixtures/contracts/caller_contract.rs     |  2 +-
 .../create_storage_and_instantiate.rs         |  2 +-
 .../fixtures/contracts/delegate_call_lib.rs   |  2 +-
 .../contracts/destroy_and_transfer.rs         |  2 +-
 .../contracts/instantiate_return_code.rs      |  2 +-
 .../fixtures/contracts/return_data_api.rs     |  2 +-
 .../revive/fixtures/contracts/tracing.rs      |  4 +-
 substrate/frame/revive/src/exec.rs            |  5 +-
 substrate/frame/revive/src/exec/tests.rs      | 70 +++++++++++++------
 substrate/frame/revive/src/lib.rs             |  2 +-
 substrate/frame/revive/src/tests.rs           | 59 +++++++++-------
 11 files changed, 94 insertions(+), 58 deletions(-)

diff --git a/substrate/frame/revive/fixtures/contracts/caller_contract.rs b/substrate/frame/revive/fixtures/contracts/caller_contract.rs
index 8e1ab82b63ba..79e2a4ee9a5c 100644
--- a/substrate/frame/revive/fixtures/contracts/caller_contract.rs
+++ b/substrate/frame/revive/fixtures/contracts/caller_contract.rs
@@ -35,7 +35,7 @@ pub extern "C" fn call() {
 
 	// The value to transfer on instantiation and calls. Chosen to be greater than existential
 	// deposit.
-	let value = u256_bytes(32768u64);
+	let value = u256_bytes(32_768_000_000u64);
 	let salt = [0u8; 32];
 
 	// Callee will use the first 4 bytes of the input to return an exit status.
diff --git a/substrate/frame/revive/fixtures/contracts/create_storage_and_instantiate.rs b/substrate/frame/revive/fixtures/contracts/create_storage_and_instantiate.rs
index fa679886c5d5..a7345adba154 100644
--- a/substrate/frame/revive/fixtures/contracts/create_storage_and_instantiate.rs
+++ b/substrate/frame/revive/fixtures/contracts/create_storage_and_instantiate.rs
@@ -43,7 +43,7 @@ pub extern "C" fn call() {
 	key[0] = 1;
 	api::set_storage(StorageFlags::empty(), &key, data);
 
-	let value = u256_bytes(10_000u64);
+	let value = u256_bytes(10_000_000_000u64);
 	let salt = [0u8; 32];
 	let mut address = [0u8; 20];
 	let mut deploy_input = [0; 32 + 4];
diff --git a/substrate/frame/revive/fixtures/contracts/delegate_call_lib.rs b/substrate/frame/revive/fixtures/contracts/delegate_call_lib.rs
index 2a3364f46c4a..97f883b8456e 100644
--- a/substrate/frame/revive/fixtures/contracts/delegate_call_lib.rs
+++ b/substrate/frame/revive/fixtures/contracts/delegate_call_lib.rs
@@ -40,7 +40,7 @@ pub extern "C" fn call() {
 	// Assert that `value_transferred` is equal to the value
 	// passed to the `caller` contract: 1337.
 	let value = u64_output!(api::value_transferred,);
-	assert_eq!(value, 1337);
+	assert_eq!(value, 1337_000_000);
 
 	// Assert that ALICE is the caller of the contract.
 	let mut caller = [0u8; 20];
diff --git a/substrate/frame/revive/fixtures/contracts/destroy_and_transfer.rs b/substrate/frame/revive/fixtures/contracts/destroy_and_transfer.rs
index 919dded0f060..4ca300fdb0dc 100644
--- a/substrate/frame/revive/fixtures/contracts/destroy_and_transfer.rs
+++ b/substrate/frame/revive/fixtures/contracts/destroy_and_transfer.rs
@@ -22,7 +22,7 @@ include!("../panic_handler.rs");
 use uapi::{input, u256_bytes, HostFn, HostFnImpl as api, StorageFlags};
 
 const ADDRESS_KEY: [u8; 32] = [0u8; 32];
-const VALUE: [u8; 32] = u256_bytes(65536);
+const VALUE: [u8; 32] = u256_bytes(65_536_000_000);
 
 #[no_mangle]
 #[polkavm_derive::polkavm_export]
diff --git a/substrate/frame/revive/fixtures/contracts/instantiate_return_code.rs b/substrate/frame/revive/fixtures/contracts/instantiate_return_code.rs
index a1904415e88f..3475accb5bdd 100644
--- a/substrate/frame/revive/fixtures/contracts/instantiate_return_code.rs
+++ b/substrate/frame/revive/fixtures/contracts/instantiate_return_code.rs
@@ -35,7 +35,7 @@ pub extern "C" fn call() {
 		                 * all. */
 		u64::MAX, // How much proof_size weight to devote for the execution. u64::MAX = use all.
 		&[u8::MAX; 32], // No deposit limit.
-		&u256_bytes(10_000u64), // Value to transfer.
+		&u256_bytes(10_000_000_000u64), // Value to transfer.
 		buffer,
 		None,
 		None,
diff --git a/substrate/frame/revive/fixtures/contracts/return_data_api.rs b/substrate/frame/revive/fixtures/contracts/return_data_api.rs
index 4066531b602a..d2225b16cd02 100644
--- a/substrate/frame/revive/fixtures/contracts/return_data_api.rs
+++ b/substrate/frame/revive/fixtures/contracts/return_data_api.rs
@@ -86,7 +86,7 @@ fn assert_balance_transfer_does_reset() {
 		u64::MAX,
 		u64::MAX,
 		&[u8::MAX; 32],
-		&u256_bytes(128),
+		&u256_bytes(128_000_000),
 		&[],
 		None,
 	)
diff --git a/substrate/frame/revive/fixtures/contracts/tracing.rs b/substrate/frame/revive/fixtures/contracts/tracing.rs
index 8e79665b2344..5995a189803b 100644
--- a/substrate/frame/revive/fixtures/contracts/tracing.rs
+++ b/substrate/frame/revive/fixtures/contracts/tracing.rs
@@ -39,8 +39,8 @@ pub extern "C" fn call() {
 			u64::MAX, // How much ref_time to devote for the execution. u64::MAX = use all.
 			u64::MAX, /* How much proof_size to devote for the execution. u64::MAX = use
 			           * all. */
-			&[u8::MAX; 32],   // No deposit limit.
-			&u256_bytes(100), // Value transferred
+			&[u8::MAX; 32],             // No deposit limit.
+			&u256_bytes(1_000_000_000), // Value transferred
 			&[],
 			None,
 		);
diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index a320f2e6c64a..730d51f59378 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -1425,7 +1425,10 @@ where
 
 		let transfer = |from, to, value| {
 			T::Currency::transfer(from, to, value, Preservation::Preserve)
-				.map_err(|_| ExecError::from(Error::<T>::TransferFailed))?;
+				.map_err(|err| {
+					log::debug!(target: crate::LOG_TARGET, "Transfer failed: from {from:?} to {to:?} (value: ${value:?}). Err: {err:?}");
+					ExecError::from(Error::<T>::TransferFailed)
+				})?;
 			return Ok(())
 		};
 
diff --git a/substrate/frame/revive/src/exec/tests.rs b/substrate/frame/revive/src/exec/tests.rs
index 9fe6caf24796..4b6a32bd43de 100644
--- a/substrate/frame/revive/src/exec/tests.rs
+++ b/substrate/frame/revive/src/exec/tests.rs
@@ -238,7 +238,15 @@ fn transfer_works() {
 		let value = 55;
 		let origin = Origin::from_account_id(ALICE);
 		let mut storage_meter = storage::meter::Meter::new(u64::MAX);
-		MockStack::transfer(&origin, &ALICE, &BOB, value.into(), &mut storage_meter).unwrap();
+
+		MockStack::transfer(
+			&origin,
+			&ALICE,
+			&BOB,
+			Pallet::<Test>::convert_native_to_evm(value.into()),
+			&mut storage_meter,
+		)
+		.unwrap();
 
 		let min_balance = <Test as Config>::Currency::minimum_balance();
 		assert!(min_balance > 0);
@@ -254,14 +262,14 @@ fn transfer_works() {
 #[test]
 fn transfer_to_nonexistent_account_works() {
 	// This test verifies that a contract is able to transfer
-	// some funds to a nonexistant account and that those transfers
+	// some funds to a nonexistent account and that those transfers
 	// are not able to reap accounts.
 	ExtBuilder::default().build().execute_with(|| {
 		let ed = <Test as Config>::Currency::minimum_balance();
 		let value = 1024;
 		let mut storage_meter = storage::meter::Meter::new(u64::MAX);
 
-		// Transfers to nonexistant accounts should work
+		// Transfers to nonexistent accounts should work
 		set_balance(&ALICE, ed * 2);
 		set_balance(&BOB, ed + value);
 
@@ -269,7 +277,7 @@ fn transfer_to_nonexistent_account_works() {
 			&Origin::from_account_id(ALICE),
 			&BOB,
 			&CHARLIE,
-			value.into(),
+			Pallet::<Test>::convert_native_to_evm(value.into()),
 			&mut storage_meter,
 		));
 		assert_eq!(get_balance(&ALICE), ed);
@@ -284,7 +292,7 @@ fn transfer_to_nonexistent_account_works() {
 				&Origin::from_account_id(ALICE),
 				&BOB,
 				&DJANGO,
-				value.into(),
+				Pallet::<Test>::convert_native_to_evm(value.into()),
 				&mut storage_meter
 			),
 			<Error<Test>>::StorageDepositNotEnoughFunds,
@@ -298,7 +306,7 @@ fn transfer_to_nonexistent_account_works() {
 				&Origin::from_account_id(ALICE),
 				&BOB,
 				&EVE,
-				value.into(),
+				Pallet::<Test>::convert_native_to_evm(value.into()),
 				&mut storage_meter
 			),
 			<Error<Test>>::TransferFailed
@@ -311,9 +319,10 @@ fn transfer_to_nonexistent_account_works() {
 #[test]
 fn correct_transfer_on_call() {
 	let value = 55;
+	let evm_value = Pallet::<Test>::convert_native_to_evm(value.into());
 
 	let success_ch = MockLoader::insert(Call, move |ctx, _| {
-		assert_eq!(ctx.ext.value_transferred(), U256::from(value));
+		assert_eq!(ctx.ext.value_transferred(), evm_value);
 		Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: Vec::new() })
 	});
 
@@ -329,7 +338,7 @@ fn correct_transfer_on_call() {
 			BOB_ADDR,
 			&mut GasMeter::<Test>::new(GAS_LIMIT),
 			&mut storage_meter,
-			value.into(),
+			evm_value.as_u64().into(),
 			vec![],
 			false,
 		)
@@ -343,14 +352,15 @@ fn correct_transfer_on_call() {
 #[test]
 fn correct_transfer_on_delegate_call() {
 	let value = 35;
+	let evm_value = Pallet::<Test>::convert_native_to_evm(value.into());
 
 	let success_ch = MockLoader::insert(Call, move |ctx, _| {
-		assert_eq!(ctx.ext.value_transferred(), U256::from(value));
+		assert_eq!(ctx.ext.value_transferred(), evm_value);
 		Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: Vec::new() })
 	});
 
 	let delegate_ch = MockLoader::insert(Call, move |ctx, _| {
-		assert_eq!(ctx.ext.value_transferred(), U256::from(value));
+		assert_eq!(ctx.ext.value_transferred(), evm_value);
 		ctx.ext.delegate_call(Weight::zero(), U256::zero(), CHARLIE_ADDR, Vec::new())?;
 		Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: Vec::new() })
 	});
@@ -368,7 +378,7 @@ fn correct_transfer_on_delegate_call() {
 			BOB_ADDR,
 			&mut GasMeter::<Test>::new(GAS_LIMIT),
 			&mut storage_meter,
-			value.into(),
+			evm_value.as_u64().into(),
 			vec![],
 			false,
 		));
@@ -471,7 +481,7 @@ fn balance_too_low() {
 			&Origin::from_account_id(ALICE),
 			&from,
 			&dest,
-			100u64.into(),
+			Pallet::<Test>::convert_native_to_evm(100u64.into()).as_u64().into(),
 			&mut storage_meter,
 		);
 
@@ -1126,7 +1136,7 @@ fn instantiation_work_with_success_output() {
 					executable,
 					&mut gas_meter,
 					&mut storage_meter,
-					min_balance.into(),
+					Pallet::<Test>::convert_native_to_evm(min_balance.into()),
 					vec![],
 					Some(&[0 ;32]),
 					false,
@@ -1178,7 +1188,7 @@ fn instantiation_fails_with_failing_output() {
 					executable,
 					&mut gas_meter,
 					&mut storage_meter,
-					min_balance.into(),
+					Pallet::<Test>::convert_native_to_evm(min_balance.into()),
 					vec![],
 					Some(&[0; 32]),
 					false,
@@ -1206,13 +1216,14 @@ fn instantiation_from_contract() {
 		let instantiated_contract_address = Rc::clone(&instantiated_contract_address);
 		move |ctx, _| {
 			// Instantiate a contract and save it's address in `instantiated_contract_address`.
+			let min_balance = <Test as Config>::Currency::minimum_balance();
 			let (address, output) = ctx
 				.ext
 				.instantiate(
 					Weight::MAX,
 					U256::MAX,
 					dummy_ch,
-					<Test as Config>::Currency::minimum_balance().into(),
+					Pallet::<Test>::convert_native_to_evm(min_balance.into()),
 					vec![],
 					Some(&[48; 32]),
 				)
@@ -1241,7 +1252,7 @@ fn instantiation_from_contract() {
 					BOB_ADDR,
 					&mut GasMeter::<Test>::new(GAS_LIMIT),
 					&mut storage_meter,
-					(min_balance * 10).into(),
+					Pallet::<Test>::convert_native_to_evm((min_balance * 10).into()),
 					vec![],
 					false,
 				),
@@ -1271,12 +1282,15 @@ fn instantiation_traps() {
 	let instantiator_ch = MockLoader::insert(Call, {
 		move |ctx, _| {
 			// Instantiate a contract and save it's address in `instantiated_contract_address`.
+			let min_balance = <Test as Config>::Currency::minimum_balance();
+			let value = Pallet::<Test>::convert_native_to_evm(min_balance.into());
+
 			assert_matches!(
 				ctx.ext.instantiate(
 					Weight::zero(),
 					U256::zero(),
 					dummy_ch,
-					<Test as Config>::Currency::minimum_balance().into(),
+					value,
 					vec![],
 					Some(&[0; 32]),
 				),
@@ -1339,7 +1353,7 @@ fn termination_from_instantiate_fails() {
 					executable,
 					&mut gas_meter,
 					&mut storage_meter,
-					100u64.into(),
+					Pallet::<Test>::convert_native_to_evm(100u64.into()),
 					vec![],
 					Some(&[0; 32]),
 					false,
@@ -2368,7 +2382,8 @@ fn last_frame_output_works_on_instantiate() {
 	let trap_ch = MockLoader::insert(Constructor, |_, _| Err("It's a trap!".into()));
 	let instantiator_ch = MockLoader::insert(Call, {
 		move |ctx, _| {
-			let value = <Test as Config>::Currency::minimum_balance().into();
+			let min_balance = <Test as Config>::Currency::minimum_balance();
+			let value = Pallet::<Test>::convert_native_to_evm(min_balance.into());
 
 			// Successful instantiation should set the output
 			let address =
@@ -2380,7 +2395,15 @@ fn last_frame_output_works_on_instantiate() {
 
 			// Balance transfers should reset the output
 			ctx.ext
-				.call(Weight::MAX, U256::MAX, &address, U256::from(1), vec![], true, false)
+				.call(
+					Weight::MAX,
+					U256::MAX,
+					&address,
+					Pallet::<Test>::convert_native_to_evm(1.into()),
+					vec![],
+					true,
+					false,
+				)
 				.unwrap();
 			assert_eq!(ctx.ext.last_frame_output(), &Default::default());
 
@@ -2575,7 +2598,8 @@ fn immutable_data_access_checks_work() {
 	});
 	let instantiator_ch = MockLoader::insert(Call, {
 		move |ctx, _| {
-			let value = <Test as Config>::Currency::minimum_balance().into();
+			let min_balance = <Test as Config>::Currency::minimum_balance();
+			let value = Pallet::<Test>::convert_native_to_evm(min_balance.into());
 
 			assert_eq!(
 				ctx.ext.set_immutable_data(vec![0, 1, 2, 3].try_into().unwrap()),
@@ -2747,7 +2771,9 @@ fn immutable_data_set_errors_with_empty_data() {
 	});
 	let instantiator_ch = MockLoader::insert(Call, {
 		move |ctx, _| {
-			let value = <Test as Config>::Currency::minimum_balance().into();
+			let min_balance = <Test as Config>::Currency::minimum_balance();
+			let value = Pallet::<Test>::convert_native_to_evm(min_balance.into());
+
 			ctx.ext
 				.instantiate(Weight::MAX, U256::MAX, dummy_ch, value, vec![], None)
 				.unwrap();
diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index 6237d502b728..f273442b1b4e 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -343,7 +343,7 @@ pub mod pallet {
 			type RuntimeMemory = ConstU32<{ 128 * 1024 * 1024 }>;
 			type PVFMemory = ConstU32<{ 512 * 1024 * 1024 }>;
 			type ChainId = ConstU64<42>;
-			type NativeToEthRatio = ConstU32<10_000_000>;
+			type NativeToEthRatio = ConstU32<1_000_000>;
 			type EthGasEncoder = ();
 			type FindAuthor = ();
 		}
diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index 1339f28f99ed..1a94beab123b 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -1384,11 +1384,13 @@ fn call_return_code() {
 		// The ED is charged from the call origin.
 		let alice_before = test_utils::get_balance(&ALICE_FALLBACK);
 		assert_eq!(test_utils::get_balance(&DJANGO_FALLBACK), 0);
+
+		let value = Pallet::<Test>::convert_native_to_evm(1u64.into());
 		let result = builder::bare_call(bob.addr)
 			.data(
 				AsRef::<[u8]>::as_ref(&DJANGO_ADDR)
 					.iter()
-					.chain(&u256_bytes(1))
+					.chain(&value.to_little_endian())
 					.cloned()
 					.collect(),
 			)
@@ -1403,11 +1405,12 @@ fn call_return_code() {
 			.build_and_unwrap_contract();
 
 		// Sending more than the contract has will make the transfer fail.
+		let value = Pallet::<Test>::convert_native_to_evm((min_balance * 300).into());
 		let result = builder::bare_call(bob.addr)
 			.data(
 				AsRef::<[u8]>::as_ref(&django.addr)
 					.iter()
-					.chain(&u256_bytes(min_balance * 300))
+					.chain(&value.to_little_endian())
 					.chain(&0u32.to_le_bytes())
 					.cloned()
 					.collect(),
@@ -1417,11 +1420,12 @@ fn call_return_code() {
 
 		// Contract has enough balance but callee reverts because "1" is passed.
 		<Test as Config>::Currency::set_balance(&bob.account_id, min_balance + 1000);
+		let value = Pallet::<Test>::convert_native_to_evm(5u64.into());
 		let result = builder::bare_call(bob.addr)
 			.data(
 				AsRef::<[u8]>::as_ref(&django.addr)
 					.iter()
-					.chain(&u256_bytes(5))
+					.chain(&value.to_little_endian())
 					.chain(&1u32.to_le_bytes())
 					.cloned()
 					.collect(),
@@ -1434,7 +1438,7 @@ fn call_return_code() {
 			.data(
 				AsRef::<[u8]>::as_ref(&django.addr)
 					.iter()
-					.chain(&u256_bytes(5))
+					.chain(&value.to_little_endian())
 					.chain(&2u32.to_le_bytes())
 					.cloned()
 					.collect(),
@@ -4084,7 +4088,7 @@ fn tracing_works_for_transfers() {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000);
 		let mut tracer = CallTracer::new(Default::default(), |_| U256::zero());
 		trace(&mut tracer, || {
-			builder::bare_call(BOB_ADDR).value(10_000_000.into()).build_and_unwrap_result();
+			builder::bare_call(BOB_ADDR).value(10.into()).build_and_unwrap_result();
 		});
 
 		let trace = tracer.collect_trace();
@@ -4217,7 +4221,7 @@ fn call_tracing_works() {
 												CallTrace {
 													from: addr,
 													to: BOB_ADDR,
-													value: Some(U256::from(100)),
+													value: Some(U256::from(1_000_000_000)),
 													call_type: CallType::Call,
 													..Default::default()
 												}
@@ -4280,7 +4284,7 @@ fn create_call_tracing_works() {
 			CallTrace {
 				from: ALICE_ADDR,
 				to: addr,
-				value: Some(100.into()),
+				value: Some(Pallet::<Test>::convert_native_to_evm(100.into())),
 				input: Bytes(code.clone()),
 				call_type: CallType::Create,
 				..Default::default()
@@ -4377,7 +4381,7 @@ fn prestate_tracing_works() {
 					(
 						addr,
 						PrestateTraceInfo {
-							balance: Some(U256::from(10_000_000u64)),
+							balance: Some(U256::from(10_000_000_000_000u128)),
 							code: Some(Bytes(code.clone())),
 							nonce: Some(1),
 							..Default::default()
@@ -4401,14 +4405,14 @@ fn prestate_tracing_works() {
 						(
 							BOB_ADDR,
 							PrestateTraceInfo {
-								balance: Some(U256::from(100u64)),
+								balance: Some(U256::from(1_000_000_000u64)),
 								..Default::default()
 							},
 						),
 						(
 							addr,
 							PrestateTraceInfo {
-								balance: Some(U256::from(9_999_900u64)),
+								balance: Some(U256::from(9_999_000_000_000u128)),
 								code: Some(Bytes(code.clone())),
 								nonce: Some(1),
 								..Default::default()
@@ -4419,14 +4423,14 @@ fn prestate_tracing_works() {
 						(
 							BOB_ADDR,
 							PrestateTraceInfo {
-								balance: Some(U256::from(200u64)),
+								balance: Some(U256::from(2_000_000_000u64)),
 								..Default::default()
 							},
 						),
 						(
 							addr,
 							PrestateTraceInfo {
-								balance: Some(U256::from(9_999_800u64)),
+								balance: Some(U256::from(99_98_000_000_000u64)),
 								..Default::default()
 							},
 						),
@@ -4536,68 +4540,67 @@ fn pure_precompile_works() {
 
 	let cases = vec![
 		(
-			// ECRecover
+			"ECRecover",
 			H160::from_low_u64_be(1),
 			hex!("18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c000000000000000000000000000000000000000000000000000000000000001c73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549").to_vec(),
 			hex!("000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b").to_vec(),
 		),
 		(
-			// Sha256
+			"Sha256",
 			H160::from_low_u64_be(2),
 			hex!("ec07171c4f0f0e2b").to_vec(),
 			hex!("d0591ea667763c69a5f5a3bae657368ea63318b2c9c8349cccaf507e3cbd7c7a").to_vec(),
 		),
 		(
-			// Ripemd160
+			"Ripemd160",
 			H160::from_low_u64_be(3),
 			hex!("ec07171c4f0f0e2b").to_vec(),
 			hex!("000000000000000000000000a9c5ebaf7589fd8acfd542c3a008956de84fbeb7").to_vec(),
 		),
 		(
-			// Identity
+			"Identity",
 			H160::from_low_u64_be(4),
 			[42u8; 128].to_vec(),
 			[42u8; 128].to_vec(),
 		),
 		(
-			// Modexp
+			"Modexp",
 			H160::from_low_u64_be(5),
 			hex!("00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f").to_vec(),
 			hex!("0000000000000000000000000000000000000000000000000000000000000001").to_vec(),
 		),
 		(
-			// Bn128Add
+			"Bn128Add",
 			H160::from_low_u64_be(6),
 			hex!("18b18acfb4c2c30276db5411368e7185b311dd124691610c5d3b74034e093dc9063c909c4720840cb5134cb9f59fa749755796819658d32efc0d288198f3726607c2b7f58a84bd6145f00c9c2bc0bb1a187f20ff2c92963a88019e7c6a014eed06614e20c147e940f2d70da3f74c9a17df361706a4485c742bd6788478fa17d7").to_vec(),
 			hex!("2243525c5efd4b9c3d3c45ac0ca3fe4dd85e830a4ce6b65fa1eeaee202839703301d1d33be6da8e509df21cc35964723180eed7532537db9ae5e7d48f195c915").to_vec(),
 		),
 		(
-			// Bn128Mul
+			"Bn128Mul",
 			H160::from_low_u64_be(7),
 			hex!("2bd3e6d0f3b142924f5ca7b49ce5b9d54c4703d7ae5648e61d02268b1a0a9fb721611ce0a6af85915e2f1d70300909ce2e49dfad4a4619c8390cae66cefdb20400000000000000000000000000000000000000000000000011138ce750fa15c2").to_vec(),
 			hex!("070a8d6a982153cae4be29d434e8faef8a47b274a053f5a4ee2a6c9c13c31e5c031b8ce914eba3a9ffb989f9cdd5b0f01943074bf4f0f315690ec3cec6981afc").to_vec(),
 		),
 		(
-			// Bn128Pairing
+			"Bn128Pairing",
 			H160::from_low_u64_be(8),
 			hex!("1c76476f4def4bb94541d57ebba1193381ffa7aa76ada664dd31c16024c43f593034dd2920f673e204fee2811c678745fc819b55d3e9d294e45c9b03a76aef41209dd15ebff5d46c4bd888e51a93cf99a7329636c63514396b4a452003a35bf704bf11ca01483bfa8b34b43561848d28905960114c8ac04049af4b6315a416782bb8324af6cfc93537a2ad1a445cfd0ca2a71acd7ac41fadbf933c2a51be344d120a2a4cf30c1bf9845f20c6fe39e07ea2cce61f0c9bb048165fe5e4de877550111e129f1cf1097710d41c4ac70fcdfa5ba2023c6ff1cbeac322de49d1b6df7c2032c61a830e3c17286de9462bf242fca2883585b93870a73853face6a6bf411198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa").to_vec(),
 			hex!("0000000000000000000000000000000000000000000000000000000000000001").to_vec(),
 		),
 		(
-			// Blake2F
+			"Blake2F",
 			H160::from_low_u64_be(9),
 			hex!("0000000048c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b61626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000001").to_vec(),
 			hex!("08c9bcf367e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d282e6ad7f520e511f6c3e2b8c68059b9442be0454267ce079217e1319cde05b").to_vec(),
 		),
 	];
 
-	for (precompile_addr, input, output) in cases {
+	for (description, precompile_addr, input, output) in cases {
 		let (code, _code_hash) = compile_module("call_and_return").unwrap();
 		ExtBuilder::default().build().execute_with(|| {
-			let id = <Test as Config>::AddressMapper::to_account_id(&precompile_addr);
 			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
 			let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-				.value(1000.into())
+				.value(1_000.into())
 				.build_and_unwrap_contract();
 
 			let result = builder::bare_call(addr)
@@ -4610,11 +4613,15 @@ fn pure_precompile_works() {
 				)
 				.build_and_unwrap_result();
 
-			assert_eq!(test_utils::get_balance(&id), 101u64);
+			assert_eq!(
+				Pallet::<Test>::evm_balance(&precompile_addr),
+				U256::from(100),
+				"{description}: unexpected balance"
+			);
 			assert_eq!(
 				alloy_core::hex::encode(result.data),
 				alloy_core::hex::encode(output),
-				"Unexpected output for precompile: {precompile_addr:?}",
+				"{description} Unexpected output for precompile: {precompile_addr:?}",
 			);
 			assert_eq!(result.flags, ReturnFlags::empty());
 		});

From 9b6f39f21c3b4b13f2a1339eef8d80c0e5dafa86 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Thu, 3 Jul 2025 14:06:08 +0200
Subject: [PATCH 006/186] use evm_balance where possible

---
 substrate/frame/revive/src/tests.rs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index 1a94beab123b..aebef3ce1b46 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -2388,12 +2388,11 @@ fn storage_deposit_callee_works() {
 	let (binary_callee, _code_hash_callee) = compile_module("store_call").unwrap();
 	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let min_balance = Contracts::min_balance();
 
 		// Create both contracts: Constructors do nothing.
 		let Contract { addr: addr_caller, .. } =
 			builder::bare_instantiate(Code::Upload(binary_caller)).build_and_unwrap_contract();
-		let Contract { addr: addr_callee, account_id } =
+		let Contract { addr: addr_callee, .. } =
 			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
 
 		assert_ok!(builder::call(addr_caller).data((100u32, &addr_callee).encode()).build());
@@ -2401,7 +2400,7 @@ fn storage_deposit_callee_works() {
 		let callee = get_contract(&addr_callee);
 		let deposit = DepositPerByte::get() * 100 + DepositPerItem::get() * 1 + 48;
 
-		assert_eq!(test_utils::get_balance(&account_id), min_balance);
+		assert_eq!(Pallet::<Test>::evm_balance(&addr_caller), U256::zero());
 		assert_eq!(
 			callee.total_deposit(),
 			deposit + test_utils::contract_base_deposit(&addr_callee)
@@ -4685,7 +4684,7 @@ fn precompiles_work() {
 			// no account or contract info should be created for a NoInfo pre-compile
 			assert!(test_utils::get_contract_checked(&precompile_addr).is_none());
 			assert!(!System::account_exists(&id));
-			assert_eq!(test_utils::get_balance(&id), 0u64);
+			assert_eq!(Pallet::<Test>::evm_balance(&precompile_addr), U256::zero());
 
 			assert_eq!(result.flags, ReturnFlags::empty());
 			assert_eq!(u32::from_le_bytes(result.data[..4].try_into().unwrap()), error_code as u32);
@@ -4730,7 +4729,7 @@ fn precompiles_with_info_creates_contract() {
 			// a pre-compile with contract info should create an account on first call
 			assert!(test_utils::get_contract_checked(&precompile_addr).is_some());
 			assert!(System::account_exists(&id));
-			assert_eq!(test_utils::get_balance(&id), 1u64);
+			assert_eq!(Pallet::<Test>::evm_balance(&precompile_addr), U256::from(0));
 
 			assert_eq!(result.flags, ReturnFlags::empty());
 			assert_eq!(u32::from_le_bytes(result.data[..4].try_into().unwrap()), error_code as u32);

From b34ebcf786fe610fc53eb2c3ea76be9ded1e001e Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Thu, 3 Jul 2025 16:18:02 +0200
Subject: [PATCH 007/186] port test from design

---
 substrate/frame/revive/src/tests.rs | 151 ++++++++++++++++++++++++++--
 1 file changed, 142 insertions(+), 9 deletions(-)

diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index aebef3ce1b46..6d888bee881a 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -26,16 +26,14 @@ use crate::{
 	exec::Key,
 	limits,
 	storage::DeletionQueueManager,
-	test_utils::*,
+	test_utils::{builder::Contract, *},
 	tests::test_utils::{get_contract, get_contract_checked},
 	tracing::trace,
 	weights::WeightInfo,
-	AccountId32Mapper, AccountInfo, AccountInfoOf, BalanceOf, BumpNonce, Code, CodeInfoOf, Config,
-	ContractInfo, DeletionQueueCounter, DepositLimit, Error, EthTransactError, HoldReason, Origin,
-	Pallet, PristineCode, H160,
+	AccountId32Mapper, AccountInfo, AccountInfoOf, BalanceOf, BalanceWithDust, BumpNonce, Code,
+	CodeInfoOf, Config, ContractInfo, DeletionQueueCounter, DepositLimit, Error, EthTransactError,
+	HoldReason, Origin, Pallet, PristineCode, H160,
 };
-
-use crate::test_utils::builder::Contract;
 use assert_matches::assert_matches;
 use codec::Encode;
 use frame_support::{
@@ -45,7 +43,7 @@ use frame_support::{
 	storage::child,
 	traits::{
 		fungible::{BalancedHold, Inspect, Mutate, MutateHold},
-		tokens::Preservation,
+		tokens::{Fortitude::Polite, Preservation, Preservation::Preserve},
 		ConstU32, ConstU64, FindAuthor, OnIdle, OnInitialize, StorageVersion,
 	},
 	weights::{constants::WEIGHT_REF_TIME_PER_SECOND, FixedFee, IdentityFee, Weight, WeightMeter},
@@ -55,7 +53,7 @@ use pallet_revive_fixtures::compile_module;
 use pallet_revive_uapi::{ReturnErrorCode as RuntimeReturnCode, ReturnFlags};
 use pallet_transaction_payment::{ConstFeeMultiplier, Multiplier};
 use pretty_assertions::{assert_eq, assert_ne};
-use sp_core::U256;
+use sp_core::{Get, U256};
 use sp_io::hashing::blake2_256;
 use sp_keystore::{testing::MemoryKeystore, KeystoreExt};
 use sp_runtime::{
@@ -94,7 +92,10 @@ macro_rules! assert_refcount {
 }
 
 pub mod test_utils {
-	use super::{CodeHashLockupDepositPercent, Contracts, DepositPerByte, DepositPerItem, Test};
+	use super::{
+		BalanceWithDust, CodeHashLockupDepositPercent, Contracts, DepositPerByte, DepositPerItem,
+		Test,
+	};
 	use crate::{
 		address::AddressMapper, exec::AccountIdOf, AccountInfo, AccountInfoOf, BalanceOf, CodeInfo,
 		CodeInfoOf, Config, ContractInfo, PristineCode,
@@ -177,6 +178,23 @@ pub mod test_utils {
 		buffer[..8].copy_from_slice(&bytes);
 		buffer
 	}
+
+	pub fn set_balance_with_dust(address: &H160, value: BalanceWithDust<BalanceOf<Test>>) {
+		use frame_support::traits::Currency;
+		let ed = <Test as Config>::Currency::minimum_balance();
+		let BalanceWithDust { value, dust } = value;
+		let account_id = <Test as Config>::AddressMapper::to_account_id(&address);
+		<Test as Config>::Currency::set_balance(&account_id, ed + value);
+		if dust > 0 {
+			AccountInfoOf::<Test>::mutate(&address, |account| {
+				if let Some(account) = account {
+					account.dust = dust;
+				} else {
+					*account = Some(AccountInfo { dust, ..Default::default() });
+				}
+			});
+		}
+	}
 }
 
 mod builder {
@@ -402,6 +420,8 @@ impl ExtBuilder {
 		}
 		.assimilate_storage(&mut t)
 		.unwrap();
+
+		crate::GenesisConfig::<Test>::default().assimilate_storage(&mut t).unwrap();
 		let mut ext = sp_io::TestExternalities::new(t);
 		ext.register_extension(KeystoreExt::new(MemoryKeystore::new()));
 		ext.execute_with(|| {
@@ -455,6 +475,119 @@ fn calling_plain_account_is_balance_transfer() {
 	});
 }
 
+#[test]
+fn transfer_with_dust_works() {
+	struct TestCase {
+		description: &'static str,
+		from_balance: BalanceWithDust<u64>,
+		to_balance: BalanceWithDust<u64>,
+		dust_account_balance: u64,
+		amount: BalanceWithDust<u64>,
+		expected_from_balance: BalanceWithDust<u64>,
+		expected_to_balance: BalanceWithDust<u64>,
+		expected_dust_account_balance: u64,
+	}
+
+	let plank: u32 = <Test as Config>::NativeToEthRatio::get();
+
+	let test_cases = vec![
+		TestCase {
+			description: "without dust",
+			from_balance: BalanceWithDust { value: 100, dust: 0 },
+			to_balance: BalanceWithDust { value: 0, dust: 0 },
+			dust_account_balance: 0,
+			amount: BalanceWithDust { value: 1, dust: 0 },
+			expected_from_balance: BalanceWithDust { value: 99, dust: 0 },
+			expected_to_balance: BalanceWithDust { value: 1, dust: 0 },
+			expected_dust_account_balance: 0,
+		},
+		TestCase {
+			description: "with dust",
+			from_balance: BalanceWithDust { value: 100, dust: 0 },
+			to_balance: BalanceWithDust { value: 0, dust: 0 },
+			dust_account_balance: 0,
+			amount: BalanceWithDust { value: 1, dust: 10 },
+			expected_from_balance: BalanceWithDust { value: 98, dust: plank - 10 },
+			expected_to_balance: BalanceWithDust { value: 1, dust: 10 },
+			expected_dust_account_balance: 1,
+		},
+		TestCase {
+			description: "with existing dust",
+			from_balance: BalanceWithDust { value: 100, dust: 5 },
+			to_balance: BalanceWithDust { value: 0, dust: plank - 5 },
+			dust_account_balance: 1,
+			amount: BalanceWithDust { value: 1, dust: 10 },
+			expected_from_balance: BalanceWithDust { value: 98, dust: plank - 5 },
+			expected_to_balance: BalanceWithDust { value: 2, dust: 5 },
+			expected_dust_account_balance: 1,
+		},
+		TestCase {
+			description: "with enough existing dust",
+			from_balance: BalanceWithDust { value: 100, dust: 10 },
+			to_balance: BalanceWithDust { value: 0, dust: plank - 10 },
+			dust_account_balance: 1,
+			amount: BalanceWithDust { value: 1, dust: 10 },
+			expected_from_balance: BalanceWithDust { value: 99, dust: 0 },
+			expected_to_balance: BalanceWithDust { value: 2, dust: 0 },
+			expected_dust_account_balance: 0,
+		},
+	];
+
+	for TestCase {
+		description,
+		from_balance,
+		to_balance,
+		dust_account_balance,
+		amount,
+		expected_from_balance,
+		expected_to_balance,
+		expected_dust_account_balance,
+	} in test_cases.into_iter()
+	{
+		let dust_account_id = Pallet::<Test>::dust_account_id();
+		ExtBuilder::default().build().execute_with(|| {
+			test_utils::set_balance_with_dust(&ALICE_ADDR, from_balance);
+			test_utils::set_balance_with_dust(&BOB_ADDR, to_balance);
+			<Test as Config>::Currency::mint_into(&dust_account_id, dust_account_balance).unwrap();
+
+			let total_issuance = <Test as Config>::Currency::total_issuance();
+
+			let result = builder::bare_call(BOB_ADDR).value(amount).build_and_unwrap_result();
+			assert_eq!(result, Default::default(), "{description} tx failed");
+
+			assert_eq!(
+				Pallet::<Test>::evm_balance(&ALICE_ADDR),
+				Pallet::<Test>::convert_native_to_evm(expected_from_balance),
+				"{description}: invalid from balance"
+			);
+
+			assert_eq!(
+				Pallet::<Test>::evm_balance(&BOB_ADDR),
+				Pallet::<Test>::convert_native_to_evm(expected_to_balance),
+				"{description}: invalid to balance"
+			);
+
+			assert_eq!(
+				<Test as Config>::Currency::reducible_balance(&dust_account_id, Preserve, Polite),
+				expected_dust_account_balance,
+				"{description}: invalid dust balance"
+			);
+
+			assert_eq!(
+				total_issuance,
+				<Test as Config>::Currency::total_issuance(),
+				"{description}: total issuance has not changed"
+			);
+
+			assert_eq!(
+				(expected_from_balance.dust + expected_to_balance.dust) / plank,
+				expected_dust_account_balance as u32,
+				"{description}: Total dust should match the balance held by the dust_account",
+			);
+		});
+	}
+}
+
 #[test]
 fn instantiate_and_call_and_deposit_event() {
 	let (binary, code_hash) = compile_module("event_and_return_on_deploy").unwrap();

From c35e90993ac6f9da633dbdba9ed242779a244812 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Thu, 3 Jul 2025 21:15:26 +0200
Subject: [PATCH 008/186] fix runtime-api macro

---
 substrate/frame/revive/src/lib.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index f273442b1b4e..da595d42b9fe 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -1875,7 +1875,7 @@ macro_rules! impl_runtime_apis_plus_revive {
 					$crate::Pallet::<Self>::bare_call(
 						<Self as $crate::frame_system::Config>::RuntimeOrigin::signed(origin),
 						dest,
-						value,
+						Into::<$crate::BalanceWithDust<_>>::into(value),
 						gas_limit.unwrap_or(blockweights.max_block),
 						$crate::DepositLimit::Balance(storage_deposit_limit.unwrap_or(u128::MAX)),
 						input_data,
@@ -1898,7 +1898,7 @@ macro_rules! impl_runtime_apis_plus_revive {
 					$crate::Pallet::<Self>::prepare_dry_run(&origin);
 					$crate::Pallet::<Self>::bare_instantiate(
 						<Self as $crate::frame_system::Config>::RuntimeOrigin::signed(origin),
-						value,
+						Into::<$crate::BalanceWithDust<_>>::into(value),
 						gas_limit.unwrap_or(blockweights.max_block),
 						$crate::DepositLimit::Balance(storage_deposit_limit.unwrap_or(u128::MAX)),
 						code,

From d168cd4fc6226f27460684db5a08255211c382cc Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Thu, 3 Jul 2025 21:24:56 +0200
Subject: [PATCH 009/186] fix missing test

---
 substrate/frame/revive/src/tests.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index 6d888bee881a..3daa0071e6ff 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -1502,11 +1502,12 @@ fn call_return_code() {
 		// Contract calls into Django which is no valid contract
 		// This will be a balance transfer into a new account
 		// with more than the contract has which will make the transfer fail
+		let value = Pallet::<Test>::convert_native_to_evm((min_balance * 200).into());
 		let result = builder::bare_call(bob.addr)
 			.data(
 				AsRef::<[u8]>::as_ref(&DJANGO_ADDR)
 					.iter()
-					.chain(&u256_bytes(min_balance * 200))
+					.chain(&value.to_little_endian())
 					.cloned()
 					.collect(),
 			)

From e357c7412de36f39d8dd44cf6880ec3661b51685 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Thu, 3 Jul 2025 21:33:10 +0200
Subject: [PATCH 010/186] fix benchmark tests

---
 substrate/frame/revive/src/benchmarking.rs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/substrate/frame/revive/src/benchmarking.rs b/substrate/frame/revive/src/benchmarking.rs
index 93e698a0082c..cf1768f2b75f 100644
--- a/substrate/frame/revive/src/benchmarking.rs
+++ b/substrate/frame/revive/src/benchmarking.rs
@@ -26,7 +26,7 @@ use crate::{
 	limits,
 	precompiles::{self, run::builtin as run_builtin_precompile},
 	storage::WriteOutcome,
-	ConversionPrecision, Pallet as Contracts, *,
+	Pallet as Contracts, *,
 };
 use alloc::{vec, vec::Vec};
 use codec::{Encode, MaxEncodedLen};
@@ -45,7 +45,10 @@ use sp_consensus_babe::{
 	BABE_ENGINE_ID,
 };
 use sp_consensus_slots::Slot;
-use sp_runtime::generic::{Digest, DigestItem};
+use sp_runtime::{
+	generic::{Digest, DigestItem},
+	traits::Zero,
+};
 
 /// How many runs we do per API benchmark.
 ///
@@ -1741,7 +1744,7 @@ mod benchmarks {
 			}
 		};
 
-		assert!(ContractInfoOf::<T>::get(&addr).is_none());
+		assert!(AccountInfoOf::<T>::get(&addr).is_none());
 
 		let result;
 		#[block]
@@ -1758,12 +1761,11 @@ mod benchmarks {
 		}
 
 		assert_ok!(result);
-		assert!(ContractInfoOf::<T>::get(&addr).is_some());
+		assert!(AccountInfo::<T>::load_contract(&addr).is_some());
 		assert_eq!(
 			T::Currency::balance(&account_id),
 			Pallet::<T>::min_balance() +
-				Pallet::<T>::convert_evm_to_native(value.into(), ConversionPrecision::Exact)
-					.unwrap()
+				Pallet::<T>::convert_evm_to_native(value.into()).unwrap().value
 		);
 		Ok(())
 	}

From d1d981c9fe3ab429da2e9c73cf86be75ebb951f6 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 4 Jul 2025 14:53:06 +0200
Subject: [PATCH 011/186] Use U256 in bare_*

---
 .../revive/fixtures/contracts/tracing.rs      |   4 +-
 substrate/frame/revive/src/benchmarking.rs    |  53 ++++++---
 substrate/frame/revive/src/call_builder.rs    |   6 +-
 substrate/frame/revive/src/evm/runtime.rs     |   7 +-
 substrate/frame/revive/src/exec.rs            |  18 +--
 substrate/frame/revive/src/exec/tests.rs      |  34 +++---
 substrate/frame/revive/src/impl_fungibles.rs  |  12 +-
 substrate/frame/revive/src/lib.rs             |  54 ++++-----
 substrate/frame/revive/src/storage.rs         |  11 ++
 .../frame/revive/src/test_utils/builder.rs    |   9 +-
 substrate/frame/revive/src/tests.rs           | 107 ++++++++----------
 substrate/frame/revive/src/vm/runtime.rs      |  39 +++++--
 substrate/frame/revive/src/weights.rs         |  12 +-
 13 files changed, 192 insertions(+), 174 deletions(-)

diff --git a/substrate/frame/revive/fixtures/contracts/tracing.rs b/substrate/frame/revive/fixtures/contracts/tracing.rs
index 5995a189803b..8e79665b2344 100644
--- a/substrate/frame/revive/fixtures/contracts/tracing.rs
+++ b/substrate/frame/revive/fixtures/contracts/tracing.rs
@@ -39,8 +39,8 @@ pub extern "C" fn call() {
 			u64::MAX, // How much ref_time to devote for the execution. u64::MAX = use all.
 			u64::MAX, /* How much proof_size to devote for the execution. u64::MAX = use
 			           * all. */
-			&[u8::MAX; 32],             // No deposit limit.
-			&u256_bytes(1_000_000_000), // Value transferred
+			&[u8::MAX; 32],   // No deposit limit.
+			&u256_bytes(100), // Value transferred
 			&[],
 			None,
 		);
diff --git a/substrate/frame/revive/src/benchmarking.rs b/substrate/frame/revive/src/benchmarking.rs
index cf1768f2b75f..c4d6c9515eb6 100644
--- a/substrate/frame/revive/src/benchmarking.rs
+++ b/substrate/frame/revive/src/benchmarking.rs
@@ -1562,16 +1562,20 @@ mod benchmarks {
 	}
 
 	// t: with or without some value to transfer
+	// d: with or without dust value to transfer
 	// i: size of the input data
 	#[benchmark(pov_mode = Measured)]
-	fn seal_call(t: Linear<0, 1>, i: Linear<0, { limits::code::BLOB_BYTES }>) {
-		let Contract { account_id: callee, .. } =
+	fn seal_call(t: Linear<0, 1>, d: Linear<0, 1>, i: Linear<0, { limits::code::BLOB_BYTES }>) {
+		let Contract { account_id: callee, address: callee_addr, .. } =
 			Contract::<T>::with_index(1, VmBinaryModule::dummy(), vec![]).unwrap();
+
 		let callee_bytes = callee.encode();
 		let callee_len = callee_bytes.len() as u32;
 
-		let value: BalanceOf<T> = (1_000_000 * t).into();
-		let value_bytes = Into::<U256>::into(value).encode();
+		let value: BalanceOf<T> = (1_000_000u32 * t).into();
+		let dust = 100u32 * d;
+		let evm_value = Pallet::<T>::convert_native_to_evm(BalanceWithDust { value, dust });
+		let value_bytes = evm_value.encode();
 
 		let deposit: BalanceOf<T> = (u32::MAX - 100).into();
 		let deposit_bytes = Into::<U256>::into(deposit).encode();
@@ -1583,6 +1587,7 @@ mod benchmarks {
 		// This is why we set the input here instead of passig it as pointer to the `bench_call`.
 		setup.set_data(vec![42; i as usize]);
 		setup.set_origin(Origin::from_account_id(setup.contract().account_id.clone()));
+		setup.set_balance(value + 1u32.into() + Pallet::<T>::min_balance());
 
 		let (mut ext, _) = setup.ext();
 		let mut runtime = crate::vm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
@@ -1602,7 +1607,12 @@ mod benchmarks {
 			);
 		}
 
-		assert_ok!(result);
+		assert_eq!(result.unwrap(), ReturnErrorCode::Success);
+		assert_eq!(
+			Pallet::<T>::evm_balance(&callee_addr),
+			evm_value,
+			"{callee_addr:?} balance should hold {evm_value:?}"
+		);
 	}
 
 	// d: 1 if the associated pre-compile has a contract info that needs to be loaded
@@ -1700,20 +1710,27 @@ mod benchmarks {
 			);
 		}
 
-		assert_ok!(result);
+		assert_eq!(result.unwrap(), ReturnErrorCode::Success);
 		Ok(())
 	}
 
-	// t: value to transfer
-	// i: size of input in bytes
+	// t: with or without some value to transfer
+	// d: with or without dust value to transfer
+	// i: size of the input data
 	#[benchmark(pov_mode = Measured)]
-	fn seal_instantiate(i: Linear<0, { limits::code::BLOB_BYTES }>) -> Result<(), BenchmarkError> {
+	fn seal_instantiate(
+		t: Linear<0, 1>,
+		d: Linear<0, 1>,
+		i: Linear<0, { limits::code::BLOB_BYTES }>,
+	) -> Result<(), BenchmarkError> {
 		let code = VmBinaryModule::dummy();
 		let hash = Contract::<T>::with_index(1, VmBinaryModule::dummy(), vec![])?.info()?.code_hash;
 		let hash_bytes = hash.encode();
 
-		let value: BalanceOf<T> = 1_000_000u32.into();
-		let value_bytes = Into::<U256>::into(value).encode();
+		let value: BalanceOf<T> = (1_000_000u32 * t).into();
+		let dust = 100u32 * d;
+		let evm_value = Pallet::<T>::convert_native_to_evm(BalanceWithDust { value, dust });
+		let value_bytes = evm_value.encode();
 		let value_len = value_bytes.len() as u32;
 
 		let deposit: BalanceOf<T> = BalanceOf::<T>::max_value();
@@ -1722,7 +1739,7 @@ mod benchmarks {
 
 		let mut setup = CallSetup::<T>::default();
 		setup.set_origin(Origin::from_account_id(setup.contract().account_id.clone()));
-		setup.set_balance(value + (Pallet::<T>::min_balance() * 2u32.into()));
+		setup.set_balance(value + 1u32.into() + (Pallet::<T>::min_balance() * 2u32.into()));
 
 		let account_id = &setup.contract().account_id.clone();
 		let (mut ext, _) = setup.ext();
@@ -1733,7 +1750,6 @@ mod benchmarks {
 		let salt = [42u8; 32];
 		let deployer = T::AddressMapper::to_address(&account_id);
 		let addr = crate::address::create2(&deployer, &code.code, &input, &salt);
-		let account_id = T::AddressMapper::to_fallback_account_id(&addr);
 		let mut memory = memory!(hash_bytes, input, deposit_bytes, value_bytes, salt,);
 
 		let mut offset = {
@@ -1753,19 +1769,20 @@ mod benchmarks {
 				memory.as_mut_slice(),
 				u64::MAX,                                           // ref_time_limit
 				u64::MAX,                                           // proof_size_limit
-				pack_hi_lo(offset(input_len), offset(deposit_len)), // deopsit_ptr + value_ptr
+				pack_hi_lo(offset(input_len), offset(deposit_len)), // deposit_ptr + value_ptr
 				pack_hi_lo(input_len, 0),                           // input_data_len + input_data
 				pack_hi_lo(0, SENTINEL),                            // output_len_ptr + output_ptr
 				pack_hi_lo(SENTINEL, offset(value_len)),            // address_ptr + salt_ptr
 			);
 		}
 
-		assert_ok!(result);
+		assert_eq!(result.unwrap(), ReturnErrorCode::Success);
 		assert!(AccountInfo::<T>::load_contract(&addr).is_some());
+
 		assert_eq!(
-			T::Currency::balance(&account_id),
-			Pallet::<T>::min_balance() +
-				Pallet::<T>::convert_evm_to_native(value.into()).unwrap().value
+			Pallet::<T>::evm_balance(&addr),
+			evm_value,
+			"{addr:?} balance should hold {evm_value:?}"
 		);
 		Ok(())
 	}
diff --git a/substrate/frame/revive/src/call_builder.rs b/substrate/frame/revive/src/call_builder.rs
index bc5ba7f960c4..aad90f2980c6 100644
--- a/substrate/frame/revive/src/call_builder.rs
+++ b/substrate/frame/revive/src/call_builder.rs
@@ -278,11 +278,7 @@ where
 		let account_id = T::AddressMapper::to_fallback_account_id(&address);
 		let result = Contract { caller, address, account_id };
 
-		AccountInfoOf::<T>::insert(
-			&address,
-			AccountInfo { account_type: result.info()?.into(), dust: 0 },
-		);
-
+		AccountInfo::<T>::insert_contract(&address, result.info()?);
 		Ok(result)
 	}
 
diff --git a/substrate/frame/revive/src/evm/runtime.rs b/substrate/frame/revive/src/evm/runtime.rs
index 14d15a4f994b..48380f83899b 100644
--- a/substrate/frame/revive/src/evm/runtime.rs
+++ b/substrate/frame/revive/src/evm/runtime.rs
@@ -313,12 +313,7 @@ pub trait EthExtra {
 			return Err(InvalidTransaction::Call);
 		}
 
-		let value = crate::Pallet::<Self::Config>::convert_evm_to_native(value.unwrap_or_default())
-			.map_err(|err| {
-				log::debug!(target: LOG_TARGET, "Failed to convert value to native: {err:?}");
-				InvalidTransaction::Call
-			})?;
-
+		let value = value.unwrap_or_default();
 		let data = input.to_vec();
 
 		let (gas_limit, storage_deposit_limit) =
diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index 730d51f59378..baed85083635 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -1059,9 +1059,9 @@ where
 		if let (CachedContract::Cached(contract), ExportedFunction::Call) =
 			(&frame.contract_info, frame.entry_point)
 		{
-			AccountInfoOf::<T>::insert(
-				T::AddressMapper::to_address(&frame.account_id),
-				AccountInfo { account_type: contract.clone().into(), dust: 0 },
+			AccountInfo::<T>::insert_contract(
+				&T::AddressMapper::to_address(&frame.account_id),
+				contract.clone(),
 			);
 		}
 
@@ -1340,9 +1340,9 @@ where
 				// because that case is already handled by the optimization above. Only the first
 				// cache needs to be invalidated because that one will invalidate the next cache
 				// when it is popped from the stack.
-				<AccountInfoOf<T>>::insert(
-					T::AddressMapper::to_address(account_id),
-					AccountInfo { account_type: contract.into(), dust: 0 },
+				AccountInfo::<T>::insert_contract(
+					&T::AddressMapper::to_address(account_id),
+					contract,
 				);
 				if let Some(f) = self.frames_mut().skip(1).find(|f| f.account_id == *account_id) {
 					f.contract_info.invalidate();
@@ -1360,9 +1360,9 @@ where
 				contract.as_deref_mut(),
 			);
 			if let Some(contract) = contract {
-				<AccountInfoOf<T>>::insert(
-					T::AddressMapper::to_address(&self.first_frame.account_id),
-					AccountInfo { account_type: contract.clone().into(), dust: 0 },
+				AccountInfo::<T>::insert_contract(
+					&T::AddressMapper::to_address(&self.first_frame.account_id),
+					contract.clone(),
 				);
 			}
 		}
diff --git a/substrate/frame/revive/src/exec/tests.rs b/substrate/frame/revive/src/exec/tests.rs
index 4b6a32bd43de..85d41716a062 100644
--- a/substrate/frame/revive/src/exec/tests.rs
+++ b/substrate/frame/revive/src/exec/tests.rs
@@ -243,7 +243,7 @@ fn transfer_works() {
 			&origin,
 			&ALICE,
 			&BOB,
-			Pallet::<Test>::convert_native_to_evm(value.into()),
+			Pallet::<Test>::convert_native_to_evm(value),
 			&mut storage_meter,
 		)
 		.unwrap();
@@ -277,7 +277,7 @@ fn transfer_to_nonexistent_account_works() {
 			&Origin::from_account_id(ALICE),
 			&BOB,
 			&CHARLIE,
-			Pallet::<Test>::convert_native_to_evm(value.into()),
+			Pallet::<Test>::convert_native_to_evm(value),
 			&mut storage_meter,
 		));
 		assert_eq!(get_balance(&ALICE), ed);
@@ -292,7 +292,7 @@ fn transfer_to_nonexistent_account_works() {
 				&Origin::from_account_id(ALICE),
 				&BOB,
 				&DJANGO,
-				Pallet::<Test>::convert_native_to_evm(value.into()),
+				Pallet::<Test>::convert_native_to_evm(value),
 				&mut storage_meter
 			),
 			<Error<Test>>::StorageDepositNotEnoughFunds,
@@ -306,7 +306,7 @@ fn transfer_to_nonexistent_account_works() {
 				&Origin::from_account_id(ALICE),
 				&BOB,
 				&EVE,
-				Pallet::<Test>::convert_native_to_evm(value.into()),
+				Pallet::<Test>::convert_native_to_evm(value),
 				&mut storage_meter
 			),
 			<Error<Test>>::TransferFailed
@@ -319,7 +319,7 @@ fn transfer_to_nonexistent_account_works() {
 #[test]
 fn correct_transfer_on_call() {
 	let value = 55;
-	let evm_value = Pallet::<Test>::convert_native_to_evm(value.into());
+	let evm_value = Pallet::<Test>::convert_native_to_evm(value);
 
 	let success_ch = MockLoader::insert(Call, move |ctx, _| {
 		assert_eq!(ctx.ext.value_transferred(), evm_value);
@@ -352,7 +352,7 @@ fn correct_transfer_on_call() {
 #[test]
 fn correct_transfer_on_delegate_call() {
 	let value = 35;
-	let evm_value = Pallet::<Test>::convert_native_to_evm(value.into());
+	let evm_value = Pallet::<Test>::convert_native_to_evm(value);
 
 	let success_ch = MockLoader::insert(Call, move |ctx, _| {
 		assert_eq!(ctx.ext.value_transferred(), evm_value);
@@ -481,7 +481,7 @@ fn balance_too_low() {
 			&Origin::from_account_id(ALICE),
 			&from,
 			&dest,
-			Pallet::<Test>::convert_native_to_evm(100u64.into()).as_u64().into(),
+			Pallet::<Test>::convert_native_to_evm(100u64).as_u64().into(),
 			&mut storage_meter,
 		);
 
@@ -1136,7 +1136,7 @@ fn instantiation_work_with_success_output() {
 					executable,
 					&mut gas_meter,
 					&mut storage_meter,
-					Pallet::<Test>::convert_native_to_evm(min_balance.into()),
+					Pallet::<Test>::convert_native_to_evm(min_balance),
 					vec![],
 					Some(&[0 ;32]),
 					false,
@@ -1188,7 +1188,7 @@ fn instantiation_fails_with_failing_output() {
 					executable,
 					&mut gas_meter,
 					&mut storage_meter,
-					Pallet::<Test>::convert_native_to_evm(min_balance.into()),
+					Pallet::<Test>::convert_native_to_evm(min_balance),
 					vec![],
 					Some(&[0; 32]),
 					false,
@@ -1223,7 +1223,7 @@ fn instantiation_from_contract() {
 					Weight::MAX,
 					U256::MAX,
 					dummy_ch,
-					Pallet::<Test>::convert_native_to_evm(min_balance.into()),
+					Pallet::<Test>::convert_native_to_evm(min_balance),
 					vec![],
 					Some(&[48; 32]),
 				)
@@ -1252,7 +1252,7 @@ fn instantiation_from_contract() {
 					BOB_ADDR,
 					&mut GasMeter::<Test>::new(GAS_LIMIT),
 					&mut storage_meter,
-					Pallet::<Test>::convert_native_to_evm((min_balance * 10).into()),
+					Pallet::<Test>::convert_native_to_evm(min_balance * 10),
 					vec![],
 					false,
 				),
@@ -1283,7 +1283,7 @@ fn instantiation_traps() {
 		move |ctx, _| {
 			// Instantiate a contract and save it's address in `instantiated_contract_address`.
 			let min_balance = <Test as Config>::Currency::minimum_balance();
-			let value = Pallet::<Test>::convert_native_to_evm(min_balance.into());
+			let value = Pallet::<Test>::convert_native_to_evm(min_balance);
 
 			assert_matches!(
 				ctx.ext.instantiate(
@@ -1353,7 +1353,7 @@ fn termination_from_instantiate_fails() {
 					executable,
 					&mut gas_meter,
 					&mut storage_meter,
-					Pallet::<Test>::convert_native_to_evm(100u64.into()),
+					Pallet::<Test>::convert_native_to_evm(100u64),
 					vec![],
 					Some(&[0; 32]),
 					false,
@@ -2383,7 +2383,7 @@ fn last_frame_output_works_on_instantiate() {
 	let instantiator_ch = MockLoader::insert(Call, {
 		move |ctx, _| {
 			let min_balance = <Test as Config>::Currency::minimum_balance();
-			let value = Pallet::<Test>::convert_native_to_evm(min_balance.into());
+			let value = Pallet::<Test>::convert_native_to_evm(min_balance);
 
 			// Successful instantiation should set the output
 			let address =
@@ -2399,7 +2399,7 @@ fn last_frame_output_works_on_instantiate() {
 					Weight::MAX,
 					U256::MAX,
 					&address,
-					Pallet::<Test>::convert_native_to_evm(1.into()),
+					Pallet::<Test>::convert_native_to_evm(1),
 					vec![],
 					true,
 					false,
@@ -2599,7 +2599,7 @@ fn immutable_data_access_checks_work() {
 	let instantiator_ch = MockLoader::insert(Call, {
 		move |ctx, _| {
 			let min_balance = <Test as Config>::Currency::minimum_balance();
-			let value = Pallet::<Test>::convert_native_to_evm(min_balance.into());
+			let value = Pallet::<Test>::convert_native_to_evm(min_balance);
 
 			assert_eq!(
 				ctx.ext.set_immutable_data(vec![0, 1, 2, 3].try_into().unwrap()),
@@ -2772,7 +2772,7 @@ fn immutable_data_set_errors_with_empty_data() {
 	let instantiator_ch = MockLoader::insert(Call, {
 		move |ctx, _| {
 			let min_balance = <Test as Config>::Currency::minimum_balance();
-			let value = Pallet::<Test>::convert_native_to_evm(min_balance.into());
+			let value = Pallet::<Test>::convert_native_to_evm(min_balance);
 
 			ctx.ext
 				.instantiate(Weight::MAX, U256::MAX, dummy_ch, value, vec![], None)
diff --git a/substrate/frame/revive/src/impl_fungibles.rs b/substrate/frame/revive/src/impl_fungibles.rs
index 2d5b7ba8fcd9..bad9af69218a 100644
--- a/substrate/frame/revive/src/impl_fungibles.rs
+++ b/substrate/frame/revive/src/impl_fungibles.rs
@@ -42,8 +42,8 @@ use sp_core::{H160, H256, U256};
 use sp_runtime::{traits::AccountIdConversion, DispatchError};
 
 use super::{
-	address::AddressMapper, pallet, BalanceOf, BalanceWithDust, Bounded, Config, ContractResult,
-	DepositLimit, MomentOf, Pallet, Weight,
+	address::AddressMapper, pallet, BalanceOf, Bounded, Config, ContractResult, DepositLimit,
+	MomentOf, Pallet, Weight,
 };
 use ethereum_standards::IERC20;
 
@@ -75,7 +75,7 @@ where
 		let ContractResult { result, .. } = Self::bare_call(
 			T::RuntimeOrigin::signed(Self::checking_account()),
 			asset_id,
-			BalanceWithDust::default(),
+			Default::default(),
 			GAS_LIMIT,
 			DepositLimit::Balance(
 				<<T as pallet::Config>::Currency as fungible::Inspect<_>>::total_issuance(),
@@ -111,7 +111,7 @@ where
 		let ContractResult { result, .. } = Self::bare_call(
 			T::RuntimeOrigin::signed(account_id.clone()),
 			asset_id,
-			BalanceWithDust::default(),
+			Default::default(),
 			GAS_LIMIT,
 			DepositLimit::Balance(
 				<<T as pallet::Config>::Currency as fungible::Inspect<_>>::total_issuance(),
@@ -186,7 +186,7 @@ where
 		let ContractResult { result, gas_consumed, .. } = Self::bare_call(
 			T::RuntimeOrigin::signed(who.clone()),
 			asset_id,
-			BalanceWithDust::default(),
+			Default::default(),
 			GAS_LIMIT,
 			DepositLimit::Balance(
 				<<T as pallet::Config>::Currency as fungible::Inspect<_>>::total_issuance(),
@@ -223,7 +223,7 @@ where
 		let ContractResult { result, .. } = Self::bare_call(
 			T::RuntimeOrigin::signed(Self::checking_account()),
 			asset_id,
-			BalanceWithDust::default(),
+			Default::default(),
 			GAS_LIMIT,
 			DepositLimit::Balance(
 				<<T as pallet::Config>::Currency as fungible::Inspect<_>>::total_issuance(),
diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index da595d42b9fe..afdf04890345 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -534,15 +534,6 @@ pub mod pallet {
 	#[pallet::genesis_build]
 	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 		fn build(&self) {
-			use frame_support::traits::fungible::Mutate;
-
-			// Create Dust account
-			let account_id = Pallet::<T>::dust_account_id();
-			let min = T::Currency::minimum_balance();
-			if <T as Config>::Currency::balance(&account_id) < min {
-				<T as Config>::Currency::set_balance(&account_id, min);
-			}
-
 			for id in &self.mapped_accounts {
 				if let Err(err) = T::AddressMapper::map(id) {
 					log::error!(target: LOG_TARGET, "Failed to map account {id:?}: {err:?}");
@@ -681,10 +672,16 @@ pub mod pallet {
 	}
 
 	impl<T: Config> Pallet<T> {
+		/// The dust account ID used for exchange Plank for dust.
 		pub fn dust_account_id() -> <T as frame_system::Config>::AccountId {
 			use sp_runtime::traits::AccountIdConversion;
 			PalletId(*b"py/revdt").into_account_truncating()
 		}
+
+		/// Returns true if the evm value carries dust.
+		pub fn has_dust(value: U256) -> bool {
+			value % U256::from(<T>::NativeToEthRatio::get()) != U256::zero()
+		}
 	}
 
 	#[pallet::call]
@@ -745,7 +742,7 @@ pub mod pallet {
 			let mut output = Self::bare_call(
 				origin,
 				dest,
-				Into::<BalanceWithDust<_>>::into(value),
+				Pallet::<T>::convert_native_to_evm(value),
 				gas_limit,
 				DepositLimit::Balance(storage_deposit_limit),
 				data,
@@ -780,7 +777,7 @@ pub mod pallet {
 			let data_len = data.len() as u32;
 			let mut output = Self::bare_instantiate(
 				origin,
-				Into::<BalanceWithDust<_>>::into(value),
+				Pallet::<T>::convert_native_to_evm(value),
 				gas_limit,
 				DepositLimit::Balance(storage_deposit_limit),
 				Code::Existing(code_hash),
@@ -845,7 +842,7 @@ pub mod pallet {
 			let data_len = data.len() as u32;
 			let mut output = Self::bare_instantiate(
 				origin,
-				Into::<BalanceWithDust<_>>::into(value),
+				Pallet::<T>::convert_native_to_evm(value),
 				gas_limit,
 				DepositLimit::Balance(storage_deposit_limit),
 				Code::Upload(code),
@@ -879,7 +876,7 @@ pub mod pallet {
 		)]
 		pub fn eth_instantiate_with_code(
 			origin: OriginFor<T>,
-			value: BalanceWithDust<BalanceOf<T>>,
+			value: U256,
 			gas_limit: Weight,
 			#[pallet::compact] storage_deposit_limit: BalanceOf<T>,
 			code: Vec<u8>,
@@ -917,7 +914,7 @@ pub mod pallet {
 		pub fn eth_call(
 			origin: OriginFor<T>,
 			dest: H160,
-			value: BalanceWithDust<BalanceOf<T>>,
+			value: U256,
 			gas_limit: Weight,
 			#[pallet::compact] storage_deposit_limit: BalanceOf<T>,
 			data: Vec<u8>,
@@ -1090,7 +1087,7 @@ where
 	pub fn bare_call(
 		origin: OriginFor<T>,
 		dest: H160,
-		value: BalanceWithDust<BalanceOf<T>>,
+		value: U256,
 		gas_limit: Weight,
 		storage_deposit_limit: DepositLimit<BalanceOf<T>>,
 		data: Vec<u8>,
@@ -1110,7 +1107,7 @@ where
 				dest,
 				&mut gas_meter,
 				&mut storage_meter,
-				Self::convert_native_to_evm(value),
+				value,
 				data,
 				storage_deposit_limit.is_unchecked(),
 			)?;
@@ -1148,7 +1145,7 @@ where
 	/// more information to the caller useful to estimate the cost of the operation.
 	pub fn bare_instantiate(
 		origin: OriginFor<T>,
-		value: BalanceWithDust<BalanceOf<T>>,
+		value: U256,
 		gas_limit: Weight,
 		storage_deposit_limit: DepositLimit<BalanceOf<T>>,
 		code: Code,
@@ -1195,7 +1192,7 @@ where
 				executable,
 				&mut gas_meter,
 				&mut storage_meter,
-				Self::convert_native_to_evm(value),
+				value,
 				data,
 				salt.as_ref(),
 				unchecked_deposit_limit,
@@ -1275,12 +1272,7 @@ where
 		}
 
 		// Convert the value to the native balance type.
-		let evm_value = tx.value.unwrap_or_default();
-		let native_value = match Self::convert_evm_to_native(evm_value) {
-			Ok(v) => v,
-			Err(_) => return Err(EthTransactError::Message("Failed to convert value".into())),
-		};
-
+		let value = tx.value.unwrap_or_default();
 		let input = tx.input.clone().to_vec();
 
 		let extract_error = |err| {
@@ -1331,7 +1323,7 @@ where
 					let result = crate::Pallet::<T>::bare_call(
 						T::RuntimeOrigin::signed(origin),
 						dest,
-						native_value,
+						value,
 						gas_limit,
 						storage_deposit_limit,
 						input.clone(),
@@ -1363,7 +1355,7 @@ where
 					);
 					let dispatch_call: <T as Config>::RuntimeCall = crate::Call::<T>::eth_call {
 						dest,
-						value: native_value,
+						value,
 						gas_limit,
 						storage_deposit_limit,
 						data: input.clone(),
@@ -1390,7 +1382,7 @@ where
 				// Dry run the call.
 				let result = crate::Pallet::<T>::bare_instantiate(
 					T::RuntimeOrigin::signed(origin),
-					native_value,
+					value,
 					gas_limit,
 					storage_deposit_limit,
 					Code::Upload(code.to_vec()),
@@ -1426,7 +1418,7 @@ where
 				);
 				let dispatch_call: <T as Config>::RuntimeCall =
 					crate::Call::<T>::eth_instantiate_with_code {
-						value: native_value,
+						value,
 						gas_limit,
 						storage_deposit_limit,
 						code: code.to_vec(),
@@ -1471,7 +1463,7 @@ where
 	/// Convert a substrate fee into a gas value, using the fixed `GAS_PRICE`.
 	/// The gas is calculated as `fee / GAS_PRICE`, rounded up to the nearest integer.
 	pub fn evm_fee_to_gas(fee: BalanceOf<T>) -> U256 {
-		let fee = Self::convert_native_to_evm(Into::<BalanceWithDust<_>>::into(fee));
+		let fee = Self::convert_native_to_evm(fee);
 		let gas_price = GAS_PRICE.into();
 		let (quotient, remainder) = fee.div_mod(gas_price);
 		if remainder.is_zero() {
@@ -1608,8 +1600,8 @@ where
 	}
 
 	/// Convert a native balance to EVM balance.
-	fn convert_native_to_evm(value: BalanceWithDust<BalanceOf<T>>) -> U256 {
-		let BalanceWithDust { value, dust } = value;
+	fn convert_native_to_evm(value: impl Into<BalanceWithDust<BalanceOf<T>>>) -> U256 {
+		let BalanceWithDust { value, dust } = value.into();
 		value
 			.into()
 			.saturating_mul(T::NativeToEthRatio::get().into())
diff --git a/substrate/frame/revive/src/storage.rs b/substrate/frame/revive/src/storage.rs
index 2cd8d7e08bcc..40493282496f 100644
--- a/substrate/frame/revive/src/storage.rs
+++ b/substrate/frame/revive/src/storage.rs
@@ -175,6 +175,17 @@ impl<T: Config> AccountInfo<T> {
 		let AccountType::Contract(contract_info) = info.account_type else { return None };
 		Some(contract_info)
 	}
+
+	/// Insert a contract, existing dust if any will be unchanged.
+	pub fn insert_contract(address: &H160, contract: ContractInfo<T>) {
+		AccountInfoOf::<T>::mutate(address, |account| {
+			if let Some(account) = account {
+				account.account_type = contract.clone().into();
+			} else {
+				*account = Some(AccountInfo { account_type: contract.clone().into(), dust: 0 });
+			}
+		});
+	}
 }
 
 impl<T: Config> ContractInfo<T> {
diff --git a/substrate/frame/revive/src/test_utils/builder.rs b/substrate/frame/revive/src/test_utils/builder.rs
index afa194c92434..d00d27a5906d 100644
--- a/substrate/frame/revive/src/test_utils/builder.rs
+++ b/substrate/frame/revive/src/test_utils/builder.rs
@@ -17,9 +17,8 @@
 
 use super::{deposit_limit, GAS_LIMIT};
 use crate::{
-	address::AddressMapper, AccountIdOf, BalanceOf, BalanceWithDust, BumpNonce, Code, Config,
-	ContractResult, DepositLimit, ExecReturnValue, InstantiateReturnValue, OriginFor, Pallet,
-	Weight,
+	address::AddressMapper, AccountIdOf, BalanceOf, BumpNonce, Code, Config, ContractResult,
+	DepositLimit, ExecReturnValue, InstantiateReturnValue, OriginFor, Pallet, Weight, U256,
 };
 use alloc::{vec, vec::Vec};
 use frame_support::pallet_prelude::DispatchResultWithPostInfo;
@@ -133,7 +132,7 @@ builder!(
 builder!(
 	bare_instantiate(
 		origin: OriginFor<T>,
-		value: BalanceWithDust<BalanceOf<T>>,
+		value: U256,
 		gas_limit: Weight,
 		storage_deposit_limit: DepositLimit<BalanceOf<T>>,
 		code: Code,
@@ -199,7 +198,7 @@ builder!(
 	bare_call(
 		origin: OriginFor<T>,
 		dest: H160,
-		value: BalanceWithDust<BalanceOf<T>>,
+		value: U256,
 		gas_limit: Weight,
 		storage_deposit_limit: DepositLimit<BalanceOf<T>>,
 		data: Vec<u8>,
diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index 3daa0071e6ff..4387b9c1b805 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -110,10 +110,7 @@ pub mod test_utils {
 		let address =
 			<<Test as Config>::AddressMapper as AddressMapper<Test>>::to_address(&address);
 		let contract = <ContractInfo<Test>>::new(&address, 0, code_hash).unwrap();
-		<AccountInfoOf<Test>>::insert(
-			address,
-			AccountInfo { account_type: contract.into(), dust: 0 },
-		);
+		AccountInfo::<Test>::insert_contract(&address, contract);
 	}
 	pub fn set_balance(who: &AccountIdOf<Test>, amount: u64) {
 		let _ = <Test as Config>::Currency::set_balance(who, amount);
@@ -414,8 +411,13 @@ impl ExtBuilder {
 		self.set_associated_consts();
 		let mut t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
 		let checking_account = Pallet::<Test>::checking_account();
+		let dust_account = Pallet::<Test>::dust_account_id();
+
 		pallet_balances::GenesisConfig::<Test> {
-			balances: vec![(checking_account.clone(), 1_000_000_000_000)],
+			balances: vec![
+				(checking_account.clone(), 1_000_000_000_000),
+				(dust_account, <Test as Config>::Currency::minimum_balance()),
+			],
 			..Default::default()
 		}
 		.assimilate_storage(&mut t)
@@ -456,25 +458,6 @@ impl Default for Origin<Test> {
 	}
 }
 
-#[test]
-fn calling_plain_account_is_balance_transfer() {
-	ExtBuilder::default().build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000);
-		assert!(!<AccountInfoOf<Test>>::contains_key(BOB_ADDR));
-		assert_eq!(test_utils::get_balance(&BOB_FALLBACK), 0);
-
-		let result = builder::bare_call(BOB_ADDR)
-			.value(crate::BalanceWithDust { value: 42, dust: 0 })
-			.build_and_unwrap_result();
-
-		assert_eq!(
-			test_utils::get_balance(&BOB_FALLBACK),
-			42 + <Test as Config>::Currency::minimum_balance()
-		);
-		assert_eq!(result, Default::default());
-	});
-}
-
 #[test]
 fn transfer_with_dust_works() {
 	struct TestCase {
@@ -511,6 +494,16 @@ fn transfer_with_dust_works() {
 			expected_to_balance: BalanceWithDust { value: 1, dust: 10 },
 			expected_dust_account_balance: 1,
 		},
+		TestCase {
+			description: "just dust",
+			from_balance: BalanceWithDust { value: 100, dust: 0 },
+			to_balance: BalanceWithDust { value: 0, dust: 0 },
+			dust_account_balance: 0,
+			amount: BalanceWithDust { value: 0, dust: 10 },
+			expected_from_balance: BalanceWithDust { value: 99, dust: plank - 10 },
+			expected_to_balance: BalanceWithDust { value: 0, dust: 10 },
+			expected_dust_account_balance: 1,
+		},
 		TestCase {
 			description: "with existing dust",
 			from_balance: BalanceWithDust { value: 100, dust: 5 },
@@ -552,7 +545,9 @@ fn transfer_with_dust_works() {
 
 			let total_issuance = <Test as Config>::Currency::total_issuance();
 
-			let result = builder::bare_call(BOB_ADDR).value(amount).build_and_unwrap_result();
+			let result = builder::bare_call(BOB_ADDR)
+				.value(Pallet::<Test>::convert_native_to_evm(amount))
+				.build_and_unwrap_result();
 			assert_eq!(result, Default::default(), "{description} tx failed");
 
 			assert_eq!(
@@ -610,7 +605,7 @@ fn instantiate_and_call_and_deposit_event() {
 
 		// Check at the end to get hash on error easily
 		let Contract { addr, account_id } = builder::bare_instantiate(Code::Existing(code_hash))
-			.value(value.into())
+			.value(Pallet::<Test>::convert_native_to_evm(value))
 			.build_and_unwrap_contract();
 		assert!(AccountInfoOf::<Test>::contains_key(&addr));
 
@@ -965,7 +960,7 @@ fn deploy_and_call_other_contract() {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
 		let Contract { addr: caller_addr, account_id: caller_account } =
 			builder::bare_instantiate(Code::Upload(caller_binary))
-				.value(100_000.into())
+				.value(Pallet::<Test>::convert_native_to_evm(100_000u64))
 				.build_and_unwrap_contract();
 
 		let callee_addr = create2(
@@ -1142,20 +1137,20 @@ fn delegate_call_with_deposit_limit() {
 		// Instantiate the 'caller'
 		let Contract { addr: caller_addr, .. } =
 			builder::bare_instantiate(Code::Upload(caller_binary))
-				.value(300_000.into())
+				.value(Pallet::<Test>::convert_native_to_evm(300_000u64))
 				.build_and_unwrap_contract();
 
 		// Instantiate the 'callee'
 		let Contract { addr: callee_addr, .. } =
 			builder::bare_instantiate(Code::Upload(callee_binary))
-				.value(100_000.into())
+				.value(Pallet::<Test>::convert_native_to_evm(100_000u64))
 				.build_and_unwrap_contract();
 
 		// Delegate call will write 1 storage and deposit of 2 (1 item) + 32 (bytes) is required.
 		// + 32 + 16 for blake2_128concat
 		// Fails, not enough deposit
 		let ret = builder::bare_call(caller_addr)
-			.value(1337.into())
+			.value(Pallet::<Test>::convert_native_to_evm(1337u64))
 			.data((callee_addr, 81u64).encode())
 			.build_and_unwrap_result();
 		assert_return_code!(ret, RuntimeReturnCode::OutOfResources);
@@ -1214,7 +1209,7 @@ fn cannot_self_destruct_through_draining() {
 
 		// Instantiate the BOB contract.
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.value(value.into())
+			.value(Pallet::<Test>::convert_native_to_evm(value))
 			.build_and_unwrap_contract();
 		let account = <Test as Config>::AddressMapper::to_account_id(&addr);
 
@@ -1310,7 +1305,7 @@ fn self_destruct_works() {
 
 		// Instantiate the BOB contract.
 		let contract = builder::bare_instantiate(Code::Upload(binary))
-			.value(100_000.into())
+			.value(Pallet::<Test>::convert_native_to_evm(100_000u64))
 			.build_and_unwrap_contract();
 
 		// Check that the BOB contract has been instantiated.
@@ -1387,7 +1382,7 @@ fn destroy_contract_and_transfer_funds() {
 		// construction.
 		let Contract { addr: addr_bob, .. } =
 			builder::bare_instantiate(Code::Upload(caller_binary))
-				.value(200_000.into())
+				.value(Pallet::<Test>::convert_native_to_evm(200_000u64))
 				.data(callee_code_hash.as_ref().to_vec())
 				.build_and_unwrap_contract();
 
@@ -1464,7 +1459,7 @@ fn transfer_return_code() {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
 
 		let contract = builder::bare_instantiate(Code::Upload(binary))
-			.value((min_balance * 100).into())
+			.value(Pallet::<Test>::convert_native_to_evm(min_balance * 100))
 			.build_and_unwrap_contract();
 
 		// Contract has only the minimal balance so any transfer will fail.
@@ -1486,7 +1481,7 @@ fn call_return_code() {
 		let _ = <Test as Config>::Currency::set_balance(&CHARLIE, 1000 * min_balance);
 
 		let bob = builder::bare_instantiate(Code::Upload(caller_code))
-			.value((min_balance * 100).into())
+			.value(Pallet::<Test>::convert_native_to_evm(min_balance * 100))
 			.build_and_unwrap_contract();
 
 		// BOB cannot pay the ed which is needed to pull DJANGO into existence
@@ -1502,7 +1497,7 @@ fn call_return_code() {
 		// Contract calls into Django which is no valid contract
 		// This will be a balance transfer into a new account
 		// with more than the contract has which will make the transfer fail
-		let value = Pallet::<Test>::convert_native_to_evm((min_balance * 200).into());
+		let value = Pallet::<Test>::convert_native_to_evm(min_balance * 200);
 		let result = builder::bare_call(bob.addr)
 			.data(
 				AsRef::<[u8]>::as_ref(&DJANGO_ADDR)
@@ -1519,7 +1514,7 @@ fn call_return_code() {
 		let alice_before = test_utils::get_balance(&ALICE_FALLBACK);
 		assert_eq!(test_utils::get_balance(&DJANGO_FALLBACK), 0);
 
-		let value = Pallet::<Test>::convert_native_to_evm(1u64.into());
+		let value = Pallet::<Test>::convert_native_to_evm(1u64);
 		let result = builder::bare_call(bob.addr)
 			.data(
 				AsRef::<[u8]>::as_ref(&DJANGO_ADDR)
@@ -1539,7 +1534,7 @@ fn call_return_code() {
 			.build_and_unwrap_contract();
 
 		// Sending more than the contract has will make the transfer fail.
-		let value = Pallet::<Test>::convert_native_to_evm((min_balance * 300).into());
+		let value = Pallet::<Test>::convert_native_to_evm(min_balance * 300);
 		let result = builder::bare_call(bob.addr)
 			.data(
 				AsRef::<[u8]>::as_ref(&django.addr)
@@ -1554,7 +1549,7 @@ fn call_return_code() {
 
 		// Contract has enough balance but callee reverts because "1" is passed.
 		<Test as Config>::Currency::set_balance(&bob.account_id, min_balance + 1000);
-		let value = Pallet::<Test>::convert_native_to_evm(5u64.into());
+		let value = Pallet::<Test>::convert_native_to_evm(5u64);
 		let result = builder::bare_call(bob.addr)
 			.data(
 				AsRef::<[u8]>::as_ref(&django.addr)
@@ -1767,10 +1762,7 @@ fn lazy_removal_partial_remove_works() {
 		for val in &vals {
 			info.write(&Key::Fix(val.0), Some(val.2.clone()), None, false).unwrap();
 		}
-		<AccountInfoOf<Test>>::insert(
-			&addr,
-			AccountInfo { account_type: info.clone().into(), dust: 0 },
-		);
+		AccountInfo::<Test>::insert_contract(&addr, info.clone());
 
 		// Terminate the contract
 		assert_ok!(builder::call(addr).build());
@@ -1895,10 +1887,7 @@ fn lazy_removal_does_not_use_all_weight() {
 		for val in &vals {
 			info.write(&Key::Fix(val.0), Some(val.2.clone()), None, false).unwrap();
 		}
-		<AccountInfoOf<Test>>::insert(
-			&addr,
-			AccountInfo { account_type: info.clone().into(), dust: 0 },
-		);
+		AccountInfo::<Test>::insert_contract(&addr, info.clone());
 
 		// Terminate the contract
 		assert_ok!(builder::call(addr).build());
@@ -2405,7 +2394,7 @@ fn instantiate_with_below_existential_deposit_works() {
 
 		// Instantiate the BOB contract.
 		let Contract { addr, account_id } = builder::bare_instantiate(Code::Upload(binary))
-			.value(value.into())
+			.value(Pallet::<Test>::convert_native_to_evm(value))
 			.build_and_unwrap_contract();
 
 		// Ensure the contract was stored and get expected deposit amount to be reserved.
@@ -2615,7 +2604,7 @@ fn slash_cannot_kill_account() {
 		let min_balance = Contracts::min_balance();
 
 		let Contract { addr, account_id } = builder::bare_instantiate(Code::Upload(binary))
-			.value(value.into())
+			.value(Pallet::<Test>::convert_native_to_evm(value))
 			.build_and_unwrap_contract();
 
 		// Drop previous events
@@ -2897,7 +2886,7 @@ fn deposit_limit_in_nested_instantiate() {
 		// Create caller contract
 		let Contract { addr: addr_caller, account_id: caller_id } =
 			builder::bare_instantiate(Code::Upload(binary_caller))
-				.value(10_000u64.into()) // this balance is later passed to the deployed contract
+				.value(Pallet::<Test>::convert_native_to_evm(10_000u64)) // this balance is later passed to the deployed contract
 				.build_and_unwrap_contract();
 		// Deploy a contract to get its occupied storage size
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary_callee))
@@ -4230,7 +4219,7 @@ fn tracing_works_for_transfers() {
 			Some(CallTrace {
 				from: ALICE_ADDR,
 				to: BOB_ADDR,
-				value: Some(U256::from(10_000_000)),
+				value: Some(U256::from(10)),
 				call_type: CallType::Call,
 				..Default::default()
 			})
@@ -4354,7 +4343,7 @@ fn call_tracing_works() {
 												CallTrace {
 													from: addr,
 													to: BOB_ADDR,
-													value: Some(U256::from(1_000_000_000)),
+													value: Some(U256::from(100)),
 													call_type: CallType::Call,
 													..Default::default()
 												}
@@ -4417,7 +4406,7 @@ fn create_call_tracing_works() {
 			CallTrace {
 				from: ALICE_ADDR,
 				to: addr,
-				value: Some(Pallet::<Test>::convert_native_to_evm(100.into())),
+				value: Some(100.into()),
 				input: Bytes(code.clone()),
 				call_type: CallType::Create,
 				..Default::default()
@@ -4471,7 +4460,7 @@ fn prestate_tracing_works() {
 				.build_and_unwrap_contract();
 
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code.clone()))
-			.value(10_000_000.into())
+			.value(Pallet::<Test>::convert_native_to_evm(10_000_000))
 			.build_and_unwrap_contract();
 
 		// redact balance so that tests are resilient to weight changes
@@ -4514,7 +4503,7 @@ fn prestate_tracing_works() {
 					(
 						addr,
 						PrestateTraceInfo {
-							balance: Some(U256::from(10_000_000_000_000u128)),
+							balance: Some(U256::from(10_000_000u64)),
 							code: Some(Bytes(code.clone())),
 							nonce: Some(1),
 							..Default::default()
@@ -4538,14 +4527,14 @@ fn prestate_tracing_works() {
 						(
 							BOB_ADDR,
 							PrestateTraceInfo {
-								balance: Some(U256::from(1_000_000_000u64)),
+								balance: Some(U256::from(100u64)),
 								..Default::default()
 							},
 						),
 						(
 							addr,
 							PrestateTraceInfo {
-								balance: Some(U256::from(9_999_000_000_000u128)),
+								balance: Some(U256::from(9_999_900u64)),
 								code: Some(Bytes(code.clone())),
 								nonce: Some(1),
 								..Default::default()
@@ -4556,14 +4545,14 @@ fn prestate_tracing_works() {
 						(
 							BOB_ADDR,
 							PrestateTraceInfo {
-								balance: Some(U256::from(2_000_000_000u64)),
+								balance: Some(U256::from(200u64)),
 								..Default::default()
 							},
 						),
 						(
 							addr,
 							PrestateTraceInfo {
-								balance: Some(U256::from(99_98_000_000_000u64)),
+								balance: Some(U256::from(9_999_800u64)),
 								..Default::default()
 							},
 						),
diff --git a/substrate/frame/revive/src/vm/runtime.rs b/substrate/frame/revive/src/vm/runtime.rs
index 8db4c965bc76..a501c0652560 100644
--- a/substrate/frame/revive/src/vm/runtime.rs
+++ b/substrate/frame/revive/src/vm/runtime.rs
@@ -26,7 +26,7 @@ use crate::{
 	precompiles::{All as AllPrecompiles, Precompiles},
 	primitives::ExecReturnValue,
 	weights::WeightInfo,
-	Config, Error, LOG_TARGET, SENTINEL,
+	Config, Error, Pallet, LOG_TARGET, SENTINEL,
 };
 use alloc::{vec, vec::Vec};
 use codec::Encode;
@@ -343,11 +343,12 @@ pub enum RuntimeCosts {
 	/// Weight of reading and decoding the input to a precompile.
 	PrecompileDecode(u32),
 	/// Weight of the transfer performed during a call.
-	CallTransferSurcharge,
+	/// parameter `with_dust` indicates whether the transfer has a `dust` value.
+	CallTransferSurcharge { with_dust: bool },
 	/// Weight per byte that is cloned by supplying the `CLONE_INPUT` flag.
 	CallInputCloned(u32),
 	/// Weight of calling `seal_instantiate` for the given input length.
-	Instantiate { input_data_len: u32 },
+	Instantiate { input_data_len: u32, transfer_with_dust: bool },
 	/// Weight of calling `Ripemd160` precompile for the given input size.
 	Ripemd160(u32),
 	/// Weight of calling `Sha256` precompile for the given input size.
@@ -493,14 +494,15 @@ impl<T: Config> Token<T> for RuntimeCosts {
 			TakeTransientStorage(len) => {
 				cost_storage!(write_transient, seal_take_transient_storage, len)
 			},
-			CallBase => T::WeightInfo::seal_call(0, 0),
+			CallBase => T::WeightInfo::seal_call(0, 0, 0),
 			DelegateCallBase => T::WeightInfo::seal_delegate_call(),
 			PrecompileBase => T::WeightInfo::seal_call_precompile(0, 0),
 			PrecompileWithInfoBase => T::WeightInfo::seal_call_precompile(1, 0),
 			PrecompileDecode(len) => cost_args!(seal_call_precompile, 0, len),
-			CallTransferSurcharge => cost_args!(seal_call, 1, 0),
-			CallInputCloned(len) => cost_args!(seal_call, 0, len),
-			Instantiate { input_data_len } => T::WeightInfo::seal_instantiate(input_data_len),
+			CallTransferSurcharge { with_dust } => cost_args!(seal_call, 1, with_dust.into(), 0),
+			CallInputCloned(len) => cost_args!(seal_call, 0, 0, len),
+			Instantiate { input_data_len, transfer_with_dust } =>
+				T::WeightInfo::seal_instantiate(input_data_len, transfer_with_dust.into()),
 			HashSha256(len) => T::WeightInfo::sha2_256(len),
 			Ripemd160(len) => T::WeightInfo::ripemd_160(len),
 			HashKeccak256(len) => T::WeightInfo::seal_hash_keccak_256(len),
@@ -1093,7 +1095,10 @@ impl<'a, E: Ext, M: ?Sized + Memory<E::T>> Runtime<'a, E, M> {
 					if read_only || self.ext.is_read_only() {
 						return Err(Error::<E::T>::StateChangeDenied.into());
 					}
-					self.charge_gas(RuntimeCosts::CallTransferSurcharge)?;
+
+					self.charge_gas(RuntimeCosts::CallTransferSurcharge {
+						with_dust: Pallet::<E::T>::has_dust(value),
+					})?;
 				}
 				self.ext.call(
 					weight,
@@ -1159,9 +1164,23 @@ impl<'a, E: Ext, M: ?Sized + Memory<E::T>> Runtime<'a, E, M> {
 		output_len_ptr: u32,
 		salt_ptr: u32,
 	) -> Result<ReturnErrorCode, TrapReason> {
-		self.charge_gas(RuntimeCosts::Instantiate { input_data_len })?;
+		let value = match memory.read_u256(value_ptr) {
+			Ok(value) => {
+				self.charge_gas(RuntimeCosts::Instantiate {
+					input_data_len,
+					transfer_with_dust: Pallet::<E::T>::has_dust(value),
+				})?;
+				value
+			},
+			Err(err) => {
+				self.charge_gas(RuntimeCosts::Instantiate {
+					input_data_len,
+					transfer_with_dust: false,
+				})?;
+				return Err(err.into());
+			},
+		};
 		let deposit_limit: U256 = memory.read_u256(deposit_ptr)?;
-		let value = memory.read_u256(value_ptr)?;
 		let code_hash = memory.read_h256(code_hash_ptr)?;
 		let input_data = memory.read(input_data_ptr, input_data_len)?;
 		let salt = if salt_ptr == SENTINEL {
diff --git a/substrate/frame/revive/src/weights.rs b/substrate/frame/revive/src/weights.rs
index 602fc7057b86..b88600b3a560 100644
--- a/substrate/frame/revive/src/weights.rs
+++ b/substrate/frame/revive/src/weights.rs
@@ -138,10 +138,10 @@ pub trait WeightInfo {
 	fn seal_get_transient_storage(n: u32, ) -> Weight;
 	fn seal_contains_transient_storage(n: u32, ) -> Weight;
 	fn seal_take_transient_storage(n: u32, ) -> Weight;
-	fn seal_call(t: u32, i: u32, ) -> Weight;
+	fn seal_call(t: u32, d: u32, i: u32, ) -> Weight;
 	fn seal_call_precompile(d: u32, i: u32, ) -> Weight;
 	fn seal_delegate_call() -> Weight;
-	fn seal_instantiate(i: u32, ) -> Weight;
+	fn seal_instantiate(i: u32, d: u32) -> Weight;
 	fn sha2_256(n: u32, ) -> Weight;
 	fn identity(n: u32, ) -> Weight;
 	fn ripemd_160(n: u32, ) -> Weight;
@@ -928,7 +928,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
 	/// The range of component `t` is `[0, 1]`.
 	/// The range of component `i` is `[0, 262144]`.
-	fn seal_call(t: u32, i: u32, ) -> Weight {
+	fn seal_call(t: u32, _d: u32, i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1545 + t * (206 ±0)`
 		//  Estimated: `5010 + t * (2608 ±0)`
@@ -986,7 +986,7 @@ 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 `i` is `[0, 262144]`.
-	fn seal_instantiate(i: u32, ) -> Weight {
+	fn seal_instantiate(i: u32,_d: u32 ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1260`
 		//  Estimated: `4728`
@@ -1915,7 +1915,7 @@ impl WeightInfo for () {
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
 	/// The range of component `t` is `[0, 1]`.
 	/// The range of component `i` is `[0, 262144]`.
-	fn seal_call(t: u32, i: u32, ) -> Weight {
+	fn seal_call(t: u32, i: u32, _d: u32 ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1545 + t * (206 ±0)`
 		//  Estimated: `5010 + t * (2608 ±0)`
@@ -1973,7 +1973,7 @@ 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 `i` is `[0, 262144]`.
-	fn seal_instantiate(i: u32, ) -> Weight {
+	fn seal_instantiate(i: u32, _d: u32) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1260`
 		//  Estimated: `4728`

From 01a91c66cd7e9e07de6b9dee1463a121454a491e Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 4 Jul 2025 15:16:48 +0200
Subject: [PATCH 012/186] make test pass again

---
 substrate/frame/revive/src/tests.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index 4387b9c1b805..98cab35d2fde 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -4460,7 +4460,7 @@ fn prestate_tracing_works() {
 				.build_and_unwrap_contract();
 
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code.clone()))
-			.value(Pallet::<Test>::convert_native_to_evm(10_000_000))
+			.value(Pallet::<Test>::convert_native_to_evm(10))
 			.build_and_unwrap_contract();
 
 		// redact balance so that tests are resilient to weight changes

From 179b82944a3d2bc76d54a9900efac162e81e8ff4 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 4 Jul 2025 15:30:22 +0200
Subject: [PATCH 013/186] fix proc-acro

---
 substrate/frame/revive/src/lib.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index afdf04890345..f38e772c78dc 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -1087,7 +1087,7 @@ where
 	pub fn bare_call(
 		origin: OriginFor<T>,
 		dest: H160,
-		value: U256,
+		evm_value: U256,
 		gas_limit: Weight,
 		storage_deposit_limit: DepositLimit<BalanceOf<T>>,
 		data: Vec<u8>,
@@ -1107,7 +1107,7 @@ where
 				dest,
 				&mut gas_meter,
 				&mut storage_meter,
-				value,
+				evm_value,
 				data,
 				storage_deposit_limit.is_unchecked(),
 			)?;
@@ -1145,7 +1145,7 @@ where
 	/// more information to the caller useful to estimate the cost of the operation.
 	pub fn bare_instantiate(
 		origin: OriginFor<T>,
-		value: U256,
+		evm_value: U256,
 		gas_limit: Weight,
 		storage_deposit_limit: DepositLimit<BalanceOf<T>>,
 		code: Code,
@@ -1192,7 +1192,7 @@ where
 				executable,
 				&mut gas_meter,
 				&mut storage_meter,
-				value,
+				evm_value,
 				data,
 				salt.as_ref(),
 				unchecked_deposit_limit,
@@ -1600,7 +1600,7 @@ where
 	}
 
 	/// Convert a native balance to EVM balance.
-	fn convert_native_to_evm(value: impl Into<BalanceWithDust<BalanceOf<T>>>) -> U256 {
+	pub fn convert_native_to_evm(value: impl Into<BalanceWithDust<BalanceOf<T>>>) -> U256 {
 		let BalanceWithDust { value, dust } = value.into();
 		value
 			.into()
@@ -1867,7 +1867,7 @@ macro_rules! impl_runtime_apis_plus_revive {
 					$crate::Pallet::<Self>::bare_call(
 						<Self as $crate::frame_system::Config>::RuntimeOrigin::signed(origin),
 						dest,
-						Into::<$crate::BalanceWithDust<_>>::into(value),
+						$crate::Pallet::<Self>::convert_native_to_evm(value),
 						gas_limit.unwrap_or(blockweights.max_block),
 						$crate::DepositLimit::Balance(storage_deposit_limit.unwrap_or(u128::MAX)),
 						input_data,
@@ -1890,7 +1890,7 @@ macro_rules! impl_runtime_apis_plus_revive {
 					$crate::Pallet::<Self>::prepare_dry_run(&origin);
 					$crate::Pallet::<Self>::bare_instantiate(
 						<Self as $crate::frame_system::Config>::RuntimeOrigin::signed(origin),
-						Into::<$crate::BalanceWithDust<_>>::into(value),
+						$crate::Pallet::<Self>::convert_native_to_evm(value),
 						gas_limit.unwrap_or(blockweights.max_block),
 						$crate::DepositLimit::Balance(storage_deposit_limit.unwrap_or(u128::MAX)),
 						code,

From b5d6bedad123cc49b905dc54e62765ade14ff56e Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 4 Jul 2025 16:01:28 +0200
Subject: [PATCH 014/186] use native_value for clarity in tests

---
 .../frame/revive/src/test_utils/builder.rs    |  20 +++-
 substrate/frame/revive/src/tests.rs           | 104 +++++++++---------
 2 files changed, 68 insertions(+), 56 deletions(-)

diff --git a/substrate/frame/revive/src/test_utils/builder.rs b/substrate/frame/revive/src/test_utils/builder.rs
index d00d27a5906d..572a1764a2ba 100644
--- a/substrate/frame/revive/src/test_utils/builder.rs
+++ b/substrate/frame/revive/src/test_utils/builder.rs
@@ -132,7 +132,7 @@ builder!(
 builder!(
 	bare_instantiate(
 		origin: OriginFor<T>,
-		value: U256,
+		evm_value: U256,
 		gas_limit: Weight,
 		storage_deposit_limit: DepositLimit<BalanceOf<T>>,
 		code: Code,
@@ -141,6 +141,12 @@ builder!(
 		bump_nonce: BumpNonce,
 	) -> ContractResult<InstantiateReturnValue, BalanceOf<T>>;
 
+	/// Set the call's evm_value using a native_value amount.
+	pub fn native_value(mut self, value: BalanceOf<T>) -> Self {
+		self.evm_value = Pallet::<T>::convert_native_to_evm(value);
+		self
+	}
+
 	/// Build the instantiate call and unwrap the result.
 	pub fn build_and_unwrap_result(self) -> InstantiateReturnValue {
 		self.build().result.unwrap()
@@ -160,7 +166,7 @@ builder!(
 	pub fn bare_instantiate(origin: OriginFor<T>, code: Code) -> Self {
 		Self {
 			origin,
-			value: Default::default(),
+			evm_value: Default::default(),
 			gas_limit: GAS_LIMIT,
 			storage_deposit_limit: DepositLimit::Balance(deposit_limit::<T>()),
 			code,
@@ -198,12 +204,18 @@ builder!(
 	bare_call(
 		origin: OriginFor<T>,
 		dest: H160,
-		value: U256,
+		evm_value: U256,
 		gas_limit: Weight,
 		storage_deposit_limit: DepositLimit<BalanceOf<T>>,
 		data: Vec<u8>,
 	) -> ContractResult<ExecReturnValue, BalanceOf<T>>;
 
+	/// Set the call's evm_value using a native_value amount.
+	pub fn native_value(mut self, value: BalanceOf<T>) -> Self {
+		self.evm_value = Pallet::<T>::convert_native_to_evm(value);
+		self
+	}
+
 	/// Build the call and unwrap the result.
 	pub fn build_and_unwrap_result(self) -> ExecReturnValue {
 		self.build().result.unwrap()
@@ -214,7 +226,7 @@ builder!(
 		Self {
 			origin,
 			dest,
-			value: Default::default(),
+			evm_value: Default::default(),
 			gas_limit: GAS_LIMIT,
 			storage_deposit_limit: DepositLimit::Balance(deposit_limit::<T>()),
 			data: vec![],
diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index 98cab35d2fde..35defca0a75d 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -546,7 +546,7 @@ fn transfer_with_dust_works() {
 			let total_issuance = <Test as Config>::Currency::total_issuance();
 
 			let result = builder::bare_call(BOB_ADDR)
-				.value(Pallet::<Test>::convert_native_to_evm(amount))
+				.evm_value(Pallet::<Test>::convert_native_to_evm(amount))
 				.build_and_unwrap_result();
 			assert_eq!(result, Default::default(), "{description} tx failed");
 
@@ -605,7 +605,7 @@ fn instantiate_and_call_and_deposit_event() {
 
 		// Check at the end to get hash on error easily
 		let Contract { addr, account_id } = builder::bare_instantiate(Code::Existing(code_hash))
-			.value(Pallet::<Test>::convert_native_to_evm(value))
+			.native_value(value)
 			.build_and_unwrap_contract();
 		assert!(AccountInfoOf::<Test>::contains_key(&addr));
 
@@ -717,7 +717,7 @@ fn deposit_event_max_value_limit() {
 		// Create
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.value(30_000.into())
+			.native_value(30_000)
 			.build_and_unwrap_contract();
 
 		// Call contract with allowed storage value.
@@ -743,7 +743,7 @@ fn run_out_of_fuel_engine() {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
 
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.value((100 * min_balance).into())
+			.native_value(100 * min_balance)
 			.build_and_unwrap_contract();
 
 		// Call the contract with a fixed gas limit. It must run out of gas because it just
@@ -844,7 +844,7 @@ fn storage_work() {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
 		let min_balance = Contracts::min_balance();
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-			.value((min_balance * 100).into())
+			.native_value(min_balance * 100)
 			.build_and_unwrap_contract();
 
 		builder::bare_call(addr).build_and_unwrap_result();
@@ -859,7 +859,7 @@ fn storage_max_value_limit() {
 		// Create
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.value(30_000.into())
+			.native_value(30_000)
 			.build_and_unwrap_contract();
 		get_contract(&addr);
 
@@ -885,7 +885,7 @@ fn clear_storage_on_zero_value() {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
 		let min_balance = Contracts::min_balance();
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-			.value((min_balance * 100).into())
+			.native_value(min_balance * 100)
 			.build_and_unwrap_contract();
 
 		builder::bare_call(addr).build_and_unwrap_result();
@@ -900,7 +900,7 @@ fn transient_storage_work() {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
 		let min_balance = Contracts::min_balance();
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-			.value((min_balance * 100).into())
+			.native_value(min_balance * 100)
 			.build_and_unwrap_contract();
 
 		builder::bare_call(addr).build_and_unwrap_result();
@@ -960,7 +960,7 @@ fn deploy_and_call_other_contract() {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
 		let Contract { addr: caller_addr, account_id: caller_account } =
 			builder::bare_instantiate(Code::Upload(caller_binary))
-				.value(Pallet::<Test>::convert_native_to_evm(100_000u64))
+				.native_value(100_000)
 				.build_and_unwrap_contract();
 
 		let callee_addr = create2(
@@ -1051,13 +1051,13 @@ fn delegate_call() {
 		// Instantiate the 'caller'
 		let Contract { addr: caller_addr, .. } =
 			builder::bare_instantiate(Code::Upload(caller_binary))
-				.value(300_000.into())
+				.native_value(300_000)
 				.build_and_unwrap_contract();
 
 		// Instantiate the 'callee'
 		let Contract { addr: callee_addr, .. } =
 			builder::bare_instantiate(Code::Upload(callee_binary))
-				.value(100_000.into())
+				.native_value(100_000)
 				.build_and_unwrap_contract();
 
 		assert_ok!(builder::call(caller_addr)
@@ -1077,7 +1077,7 @@ fn delegate_call_non_existant_is_noop() {
 		// Instantiate the 'caller'
 		let Contract { addr: caller_addr, .. } =
 			builder::bare_instantiate(Code::Upload(caller_binary))
-				.value(300_000.into())
+				.native_value(300_000)
 				.build_and_unwrap_contract();
 
 		assert_ok!(builder::call(caller_addr)
@@ -1100,19 +1100,19 @@ fn delegate_call_with_weight_limit() {
 		// Instantiate the 'caller'
 		let Contract { addr: caller_addr, .. } =
 			builder::bare_instantiate(Code::Upload(caller_binary))
-				.value(300_000.into())
+				.native_value(300_000)
 				.build_and_unwrap_contract();
 
 		// Instantiate the 'callee'
 		let Contract { addr: callee_addr, .. } =
 			builder::bare_instantiate(Code::Upload(callee_binary))
-				.value(100_000.into())
+				.native_value(100_000)
 				.build_and_unwrap_contract();
 
 		// fails, not enough weight
 		assert_err!(
 			builder::bare_call(caller_addr)
-				.value(1337.into())
+				.native_value(1337)
 				.data((callee_addr, 100u64, 100u64).encode())
 				.build()
 				.result,
@@ -1137,20 +1137,20 @@ fn delegate_call_with_deposit_limit() {
 		// Instantiate the 'caller'
 		let Contract { addr: caller_addr, .. } =
 			builder::bare_instantiate(Code::Upload(caller_binary))
-				.value(Pallet::<Test>::convert_native_to_evm(300_000u64))
+				.native_value(300_000)
 				.build_and_unwrap_contract();
 
 		// Instantiate the 'callee'
 		let Contract { addr: callee_addr, .. } =
 			builder::bare_instantiate(Code::Upload(callee_binary))
-				.value(Pallet::<Test>::convert_native_to_evm(100_000u64))
+				.native_value(100_000)
 				.build_and_unwrap_contract();
 
 		// Delegate call will write 1 storage and deposit of 2 (1 item) + 32 (bytes) is required.
 		// + 32 + 16 for blake2_128concat
 		// Fails, not enough deposit
 		let ret = builder::bare_call(caller_addr)
-			.value(Pallet::<Test>::convert_native_to_evm(1337u64))
+			.native_value(1337)
 			.data((callee_addr, 81u64).encode())
 			.build_and_unwrap_result();
 		assert_return_code!(ret, RuntimeReturnCode::OutOfResources);
@@ -1170,7 +1170,7 @@ fn transfer_expendable_cannot_kill_account() {
 
 		// Instantiate the BOB contract.
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.value(1_000.into())
+			.native_value(1_000)
 			.build_and_unwrap_contract();
 
 		// Check that the BOB contract has been instantiated.
@@ -1209,7 +1209,7 @@ fn cannot_self_destruct_through_draining() {
 
 		// Instantiate the BOB contract.
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.value(Pallet::<Test>::convert_native_to_evm(value))
+			.native_value(value)
 			.build_and_unwrap_contract();
 		let account = <Test as Config>::AddressMapper::to_account_id(&addr);
 
@@ -1277,7 +1277,7 @@ fn cannot_self_destruct_while_live() {
 
 		// Instantiate the BOB contract.
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.value(100_000.into())
+			.native_value(100_000)
 			.build_and_unwrap_contract();
 
 		// Check that the BOB contract has been instantiated.
@@ -1305,7 +1305,7 @@ fn self_destruct_works() {
 
 		// Instantiate the BOB contract.
 		let contract = builder::bare_instantiate(Code::Upload(binary))
-			.value(Pallet::<Test>::convert_native_to_evm(100_000u64))
+			.native_value(100_000)
 			.build_and_unwrap_contract();
 
 		// Check that the BOB contract has been instantiated.
@@ -1382,7 +1382,7 @@ fn destroy_contract_and_transfer_funds() {
 		// construction.
 		let Contract { addr: addr_bob, .. } =
 			builder::bare_instantiate(Code::Upload(caller_binary))
-				.value(Pallet::<Test>::convert_native_to_evm(200_000u64))
+				.native_value(200_000)
 				.data(callee_code_hash.as_ref().to_vec())
 				.build_and_unwrap_contract();
 
@@ -1422,7 +1422,7 @@ fn crypto_hashes() {
 
 		// Instantiate the CRYPTO_HASHES contract.
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.value(100_000.into())
+			.native_value(100_000)
 			.build_and_unwrap_contract();
 		// Perform the call.
 		let input = b"_DEAD_BEEF";
@@ -1459,7 +1459,7 @@ fn transfer_return_code() {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
 
 		let contract = builder::bare_instantiate(Code::Upload(binary))
-			.value(Pallet::<Test>::convert_native_to_evm(min_balance * 100))
+			.native_value(min_balance * 100)
 			.build_and_unwrap_contract();
 
 		// Contract has only the minimal balance so any transfer will fail.
@@ -1481,7 +1481,7 @@ fn call_return_code() {
 		let _ = <Test as Config>::Currency::set_balance(&CHARLIE, 1000 * min_balance);
 
 		let bob = builder::bare_instantiate(Code::Upload(caller_code))
-			.value(Pallet::<Test>::convert_native_to_evm(min_balance * 100))
+			.native_value(min_balance * 100)
 			.build_and_unwrap_contract();
 
 		// BOB cannot pay the ed which is needed to pull DJANGO into existence
@@ -1530,7 +1530,7 @@ fn call_return_code() {
 
 		let django = builder::bare_instantiate(Code::Upload(callee_code))
 			.origin(RuntimeOrigin::signed(CHARLIE))
-			.value((min_balance * 100).into())
+			.native_value(min_balance * 100)
 			.build_and_unwrap_contract();
 
 		// Sending more than the contract has will make the transfer fail.
@@ -1590,7 +1590,7 @@ fn instantiate_return_code() {
 		assert_ok!(builder::instantiate_with_code(callee_code).value(min_balance * 100).build());
 
 		let contract = builder::bare_instantiate(Code::Upload(caller_code))
-			.value((min_balance * 100).into())
+			.native_value(min_balance * 100)
 			.build_and_unwrap_contract();
 
 		// bob cannot pay the ED to create the contract as he has no money
@@ -1647,7 +1647,7 @@ fn lazy_removal_works() {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
 
 		let contract = builder::bare_instantiate(Code::Upload(code))
-			.value((min_balance * 100).into())
+			.native_value(min_balance * 100)
 			.build_and_unwrap_contract();
 
 		let info = get_contract(&contract.addr);
@@ -1683,7 +1683,7 @@ fn lazy_batch_removal_works() {
 
 		for i in 0..3u8 {
 			let contract = builder::bare_instantiate(Code::Upload(code.clone()))
-				.value((min_balance * 100).into())
+				.native_value(min_balance * 100)
 				.salt(Some([i; 32]))
 				.build_and_unwrap_contract();
 
@@ -1753,7 +1753,7 @@ fn lazy_removal_partial_remove_works() {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
 
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-			.value((min_balance * 100).into())
+			.native_value(min_balance * 100)
 			.build_and_unwrap_contract();
 
 		let info = get_contract(&addr);
@@ -1817,7 +1817,7 @@ fn lazy_removal_does_no_run_on_low_remaining_weight() {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
 
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-			.value((min_balance * 100).into())
+			.native_value(min_balance * 100)
 			.build_and_unwrap_contract();
 
 		let info = get_contract(&addr);
@@ -1871,7 +1871,7 @@ fn lazy_removal_does_not_use_all_weight() {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
 
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-			.value((min_balance * 100).into())
+			.native_value(min_balance * 100)
 			.build_and_unwrap_contract();
 
 		let info = get_contract(&addr);
@@ -1945,7 +1945,7 @@ fn deletion_queue_ring_buffer_overflow() {
 		// add 3 contracts to the deletion queue
 		for i in 0..3u8 {
 			let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code.clone()))
-				.value((min_balance * 100).into())
+				.native_value(min_balance * 100)
 				.salt(Some([i; 32]))
 				.build_and_unwrap_contract();
 
@@ -1986,18 +1986,18 @@ fn refcounter() {
 
 		// Create two contracts with the same code and check that they do in fact share it.
 		let Contract { addr: addr0, .. } = builder::bare_instantiate(Code::Upload(binary.clone()))
-			.value((min_balance * 100).into())
+			.native_value(min_balance * 100)
 			.salt(Some([0; 32]))
 			.build_and_unwrap_contract();
 		let Contract { addr: addr1, .. } = builder::bare_instantiate(Code::Upload(binary.clone()))
-			.value((min_balance * 100).into())
+			.native_value(min_balance * 100)
 			.salt(Some([1; 32]))
 			.build_and_unwrap_contract();
 		assert_refcount!(code_hash, 2);
 
 		// Sharing should also work with the usual instantiate call
 		let Contract { addr: addr2, .. } = builder::bare_instantiate(Code::Existing(code_hash))
-			.value((min_balance * 100).into())
+			.native_value(min_balance * 100)
 			.salt(Some([2; 32]))
 			.build_and_unwrap_contract();
 		assert_refcount!(code_hash, 3);
@@ -2032,11 +2032,11 @@ fn gas_estimation_for_subcalls() {
 
 		let Contract { addr: addr_caller, .. } =
 			builder::bare_instantiate(Code::Upload(caller_code))
-				.value((min_balance * 100).into())
+				.native_value(min_balance * 100)
 				.build_and_unwrap_contract();
 
 		let Contract { addr: addr_dummy, .. } = builder::bare_instantiate(Code::Upload(dummy_code))
-			.value((min_balance * 100).into())
+			.native_value(min_balance * 100)
 			.build_and_unwrap_contract();
 
 		// Run the test for all of those weight limits for the subcall
@@ -2108,7 +2108,7 @@ fn call_runtime_reentrancy_guarded() {
 
 		let Contract { addr: addr_callee, .. } =
 			builder::bare_instantiate(Code::Upload(callee_code))
-				.value((min_balance * 100).into())
+				.native_value(min_balance * 100)
 				.salt(Some([1; 32]))
 				.build_and_unwrap_contract();
 
@@ -2144,7 +2144,7 @@ fn sr25519_verify() {
 
 		// Instantiate the sr25519_verify contract.
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.value(100_000.into())
+			.native_value(100_000)
 			.build_and_unwrap_contract();
 
 		let call_with = |message: &[u8; 11]| {
@@ -2394,7 +2394,7 @@ fn instantiate_with_below_existential_deposit_works() {
 
 		// Instantiate the BOB contract.
 		let Contract { addr, account_id } = builder::bare_instantiate(Code::Upload(binary))
-			.value(Pallet::<Test>::convert_native_to_evm(value))
+			.native_value(value)
 			.build_and_unwrap_contract();
 
 		// Ensure the contract was stored and get expected deposit amount to be reserved.
@@ -2604,7 +2604,7 @@ fn slash_cannot_kill_account() {
 		let min_balance = Contracts::min_balance();
 
 		let Contract { addr, account_id } = builder::bare_instantiate(Code::Upload(binary))
-			.value(Pallet::<Test>::convert_native_to_evm(value))
+			.native_value(value)
 			.build_and_unwrap_contract();
 
 		// Drop previous events
@@ -2705,7 +2705,7 @@ fn set_code_hash() {
 
 		// Instantiate the 'caller'
 		let Contract { addr: contract_addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.value(300_000.into())
+			.native_value(300_000)
 			.build_and_unwrap_contract();
 		// upload new code
 		assert_ok!(Contracts::upload_code(
@@ -2886,7 +2886,7 @@ fn deposit_limit_in_nested_instantiate() {
 		// Create caller contract
 		let Contract { addr: addr_caller, account_id: caller_id } =
 			builder::bare_instantiate(Code::Upload(binary_caller))
-				.value(Pallet::<Test>::convert_native_to_evm(10_000u64)) // this balance is later passed to the deployed contract
+				.native_value(10_000) // this balance is later passed to the deployed contract
 				.build_and_unwrap_contract();
 		// Deploy a contract to get its occupied storage size
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary_callee))
@@ -4210,7 +4210,7 @@ fn tracing_works_for_transfers() {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000);
 		let mut tracer = CallTracer::new(Default::default(), |_| U256::zero());
 		trace(&mut tracer, || {
-			builder::bare_call(BOB_ADDR).value(10.into()).build_and_unwrap_result();
+			builder::bare_call(BOB_ADDR).evm_value(10.into()).build_and_unwrap_result();
 		});
 
 		let trace = tracer.collect_trace();
@@ -4240,7 +4240,7 @@ fn call_tracing_works() {
 			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
 
 		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).value(10_000_000.into()).build_and_unwrap_contract();
+			builder::bare_instantiate(Code::Upload(code)).evm_value(10_000_000.into()).build_and_unwrap_contract();
 
 
 		let tracer_configs = vec![
@@ -4395,7 +4395,7 @@ fn create_call_tracing_works() {
 
 		let Contract { addr, .. } = trace(&mut tracer, || {
 			builder::bare_instantiate(Code::Upload(code.clone()))
-				.value(100.into())
+				.evm_value(100.into())
 				.salt(None)
 				.build_and_unwrap_contract()
 		});
@@ -4460,7 +4460,7 @@ fn prestate_tracing_works() {
 				.build_and_unwrap_contract();
 
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code.clone()))
-			.value(Pallet::<Test>::convert_native_to_evm(10))
+			.native_value(10)
 			.build_and_unwrap_contract();
 
 		// redact balance so that tests are resilient to weight changes
@@ -4722,7 +4722,7 @@ fn pure_precompile_works() {
 		ExtBuilder::default().build().execute_with(|| {
 			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
 			let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-				.value(1_000.into())
+				.native_value(1_000)
 				.build_and_unwrap_contract();
 
 			let result = builder::bare_call(addr)
@@ -4795,7 +4795,7 @@ fn precompiles_work() {
 			let id = <Test as Config>::AddressMapper::to_account_id(&precompile_addr);
 			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
 			let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-				.value(1000.into())
+				.native_value(1000)
 				.build_and_unwrap_contract();
 
 			let result = builder::bare_call(addr)
@@ -4840,7 +4840,7 @@ fn precompiles_with_info_creates_contract() {
 			let id = <Test as Config>::AddressMapper::to_account_id(&precompile_addr);
 			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
 			let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-				.value(1000.into())
+				.native_value(1000)
 				.build_and_unwrap_contract();
 
 			let result = builder::bare_call(addr)

From 2c05cfe856993ef913c6e6beeef24b7ee655e2a2 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 4 Jul 2025 17:22:13 +0200
Subject: [PATCH 015/186] Add benchmark for eth_ extrinsics

---
 substrate/frame/revive/src/benchmarking.rs | 101 +++++++++++++++++++++
 substrate/frame/revive/src/lib.rs          |   4 +-
 substrate/frame/revive/src/weights.rs      |   2 +
 3 files changed, 105 insertions(+), 2 deletions(-)

diff --git a/substrate/frame/revive/src/benchmarking.rs b/substrate/frame/revive/src/benchmarking.rs
index c4d6c9515eb6..fcbe439f8911 100644
--- a/substrate/frame/revive/src/benchmarking.rs
+++ b/substrate/frame/revive/src/benchmarking.rs
@@ -223,6 +223,60 @@ mod benchmarks {
 		assert_eq!(T::Currency::balance(&account_id), value + Pallet::<T>::min_balance());
 	}
 
+	// `c`: Size of the code in bytes.
+	// `i`: Size of the input in bytes.
+	// `d`: with or without dust value to transfer
+	#[benchmark(pov_mode = Measured)]
+	fn eth_instantiate_with_code(
+		c: Linear<0, { limits::code::STATIC_MEMORY_BYTES / limits::code::BYTES_PER_INSTRUCTION }>,
+		i: Linear<0, { limits::code::BLOB_BYTES }>,
+		d: Linear<0, 1>,
+	) {
+		let input = vec![42u8; i as usize];
+
+		let value = Pallet::<T>::min_balance();
+		let dust = 42u32 * d;
+		let evm_value = Pallet::<T>::convert_native_to_evm(BalanceWithDust { value, dust });
+
+		let caller = whitelisted_caller();
+		T::Currency::set_balance(&caller, caller_funding::<T>());
+		let VmBinaryModule { code, .. } = VmBinaryModule::sized(c);
+		let origin = RawOrigin::Signed(caller.clone());
+		Contracts::<T>::map_account(origin.clone().into()).unwrap();
+		let deployer = T::AddressMapper::to_address(&caller);
+		let nonce = System::<T>::account_nonce(&caller).try_into().unwrap_or_default();
+		let addr = crate::address::create1(&deployer, nonce);
+		let account_id = T::AddressMapper::to_fallback_account_id(&addr);
+		let storage_deposit = default_deposit_limit::<T>();
+
+		assert!(AccountInfoOf::<T>::get(&deployer).is_none());
+
+		#[extrinsic_call]
+		_(origin, evm_value, Weight::MAX, storage_deposit, code, input);
+
+		let deposit =
+			T::Currency::balance_on_hold(&HoldReason::StorageDepositReserve.into(), &account_id);
+		// uploading the code reserves some balance in the callers account
+		let code_deposit =
+			T::Currency::balance_on_hold(&HoldReason::CodeUploadDepositReserve.into(), &caller);
+		let mapping_deposit =
+			T::Currency::balance_on_hold(&HoldReason::AddressMapping.into(), &caller);
+
+		assert_eq!(
+			Pallet::<T>::evm_balance(&deployer),
+			Pallet::<T>::convert_native_to_evm(
+				caller_funding::<T>() -
+					Pallet::<T>::min_balance() -
+					Pallet::<T>::min_balance() -
+					value - deposit - code_deposit -
+					mapping_deposit,
+			) - dust,
+		);
+
+		// contract has the full value
+		assert_eq!(Pallet::<T>::evm_balance(&addr), evm_value);
+	}
+
 	// `i`: Size of the input in bytes.
 	// `s`: Size of e salt in bytes.
 	#[benchmark(pov_mode = Measured)]
@@ -309,6 +363,53 @@ mod benchmarks {
 		Ok(())
 	}
 
+	// `d`: with or without dust value to transfer
+	#[benchmark(pov_mode = Measured)]
+	fn eth_call(d: Linear<0, 1>) -> Result<(), BenchmarkError> {
+		let data = vec![42u8; 1024];
+		let instance =
+			Contract::<T>::with_caller(whitelisted_caller(), VmBinaryModule::dummy(), vec![])?;
+
+		let value = Pallet::<T>::min_balance();
+		let dust = 42u32 * d;
+		let evm_value = Pallet::<T>::convert_native_to_evm(BalanceWithDust { value, dust });
+
+		let caller_addr = T::AddressMapper::to_address(&instance.caller);
+		let origin = RawOrigin::Signed(instance.caller.clone());
+		let before = Pallet::<T>::evm_balance(&instance.address);
+		let storage_deposit = default_deposit_limit::<T>();
+		#[extrinsic_call]
+		_(origin, instance.address, evm_value, Weight::MAX, storage_deposit, data);
+		let deposit = T::Currency::balance_on_hold(
+			&HoldReason::StorageDepositReserve.into(),
+			&instance.account_id,
+		);
+		let code_deposit = T::Currency::balance_on_hold(
+			&HoldReason::CodeUploadDepositReserve.into(),
+			&instance.caller,
+		);
+		let mapping_deposit =
+			T::Currency::balance_on_hold(&HoldReason::AddressMapping.into(), &instance.caller);
+		// value and value transferred via call should be removed from the caller
+		assert_eq!(
+			Pallet::<T>::evm_balance(&caller_addr),
+			Pallet::<T>::convert_native_to_evm(
+				caller_funding::<T>() -
+					Pallet::<T>::min_balance() -
+					Pallet::<T>::min_balance() -
+					value - deposit - code_deposit -
+					mapping_deposit,
+			) - dust,
+		);
+
+		// contract should have received the value
+		assert_eq!(Pallet::<T>::evm_balance(&instance.address), before + evm_value);
+		// contract should still exist
+		instance.info()?;
+
+		Ok(())
+	}
+
 	// This constructs a contract that is maximal expensive to instrument.
 	// It creates a maximum number of metering blocks per byte.
 	// `c`: Size of the code in bytes.
diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index f38e772c78dc..e178910f594d 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -871,7 +871,7 @@ pub mod pallet {
 		/// times within a batch call transaction.
 		#[pallet::call_index(10)]
 		#[pallet::weight(
-			T::WeightInfo::instantiate_with_code(code.len() as u32, data.len() as u32)
+			T::WeightInfo::eth_instantiate_with_code(code.len() as u32, data.len() as u32, Pallet::<T>::has_dust(*value).into())
 			.saturating_add(*gas_limit)
 		)]
 		pub fn eth_instantiate_with_code(
@@ -910,7 +910,7 @@ pub mod pallet {
 		/// Same as [`Self::call`], but intended to be dispatched **only**
 		/// by an EVM transaction through the EVM compatibility layer.
 		#[pallet::call_index(11)]
-		#[pallet::weight(T::WeightInfo::call().saturating_add(*gas_limit))]
+		#[pallet::weight(T::WeightInfo::eth_call(Pallet::<T>::has_dust(*value).into()).saturating_add(*gas_limit))]
 		pub fn eth_call(
 			origin: OriginFor<T>,
 			dest: H160,
diff --git a/substrate/frame/revive/src/weights.rs b/substrate/frame/revive/src/weights.rs
index b88600b3a560..4c4a57247a99 100644
--- a/substrate/frame/revive/src/weights.rs
+++ b/substrate/frame/revive/src/weights.rs
@@ -76,8 +76,10 @@ pub trait WeightInfo {
 	fn call_with_code_per_byte(c: u32, ) -> Weight;
 	fn basic_block_compilation(b: u32, ) -> Weight;
 	fn instantiate_with_code(c: u32, i: u32, ) -> Weight;
+	fn eth_instantiate_with_code(c: u32, i: u32, _d: u32) -> Weight { Self::instantiate_with_code(c, i) }
 	fn instantiate(i: u32, ) -> Weight;
 	fn call() -> Weight;
+	fn eth_call(_d: u32) -> Weight { Self::call() }
 	fn upload_code(c: u32, ) -> Weight;
 	fn remove_code() -> Weight;
 	fn set_code() -> Weight;

From b2f33010d49475c02f0f081afd55a7719f1e67f0 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 4 Jul 2025 17:41:24 +0200
Subject: [PATCH 016/186] create the account if it does not exists

---
 substrate/frame/revive/src/exec.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index baed85083635..ebca65b87a41 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -1458,6 +1458,12 @@ where
 		let plank = T::NativeToEthRatio::get();
 
 		if from_info.dust < dust {
+			// If the dust account does not exist, we need to create it.
+			if System::<T>::account_exists(&dust_account_id) {
+				let ed = <T as Config>::Currency::minimum_balance();
+				T::Currency::set_balance(&dust_account_id, ed);
+			}
+
 			transfer(from, &dust_account_id, 1u32.into())?;
 			from_info.dust = from_info
 				.dust

From 18108f743185cf36ecfd3b0931341c5e033f9dd1 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 4 Jul 2025 17:42:23 +0200
Subject: [PATCH 017/186] fix

---
 substrate/frame/revive/src/exec.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index ebca65b87a41..4c84e6b8dab9 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -1459,7 +1459,7 @@ where
 
 		if from_info.dust < dust {
 			// If the dust account does not exist, we need to create it.
-			if System::<T>::account_exists(&dust_account_id) {
+			if !System::<T>::account_exists(&dust_account_id) {
 				let ed = <T as Config>::Currency::minimum_balance();
 				T::Currency::set_balance(&dust_account_id, ed);
 			}

From 68e4ae478684f4701ff0826b75621c59eac79722 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 4 Jul 2025 17:51:29 +0200
Subject: [PATCH 018/186] fixes

---
 substrate/frame/revive/src/exec.rs       |  8 +++-----
 substrate/frame/revive/src/primitives.rs | 13 +------------
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index 4c84e6b8dab9..63037e8b5e56 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -1399,7 +1399,7 @@ where
 		let origin = origin.account_id()?;
 		let ed = <T as Config>::Currency::minimum_balance();
 		with_transaction(|| -> TransactionOutcome<ExecResult> {
-			let res = match T::Currency::transfer(origin, to, ed, Preservation::Preserve)
+			match T::Currency::transfer(origin, to, ed, Preservation::Preserve)
 				.map_err(|_| Error::<T>::StorageDepositNotEnoughFunds.into())
 				.and_then(|_| Self::transfer_with_dust(from, to, value))
 			{
@@ -1410,9 +1410,7 @@ where
 					TransactionOutcome::Commit(Ok(Default::default()))
 				},
 				Err(err) => TransactionOutcome::Rollback(Err(err)),
-			};
-
-			res
+			}
 		})
 	}
 
@@ -1629,7 +1627,7 @@ where
 
 		info.queue_trie_for_deletion();
 		let account_address = T::AddressMapper::to_address(&frame.account_id);
-		AccountInfoOf::<T>::remove(&account_address); // TODO handle dust
+		AccountInfoOf::<T>::remove(&account_address);
 		ImmutableDataOf::<T>::remove(&account_address);
 		<CodeInfo<T>>::decrement_refcount(info.code_hash)?;
 
diff --git a/substrate/frame/revive/src/primitives.rs b/substrate/frame/revive/src/primitives.rs
index 52832fdde2bf..3b42b4ef3e62 100644
--- a/substrate/frame/revive/src/primitives.rs
+++ b/substrate/frame/revive/src/primitives.rs
@@ -110,18 +110,7 @@ pub enum EthTransactError {
 
 /// A Balance amount along with some "dust" to represent the lowest decimals that can't be expressed
 /// in the native currency
-#[derive(
-	Default,
-	codec::DecodeWithMemTracking,
-	Clone,
-	Copy,
-	Eq,
-	Encode,
-	Decode,
-	TypeInfo,
-	PartialEq,
-	Debug,
-)]
+#[derive(Default, Clone, Copy, Eq, Encode, Decode, TypeInfo, PartialEq, Debug)]
 pub struct BalanceWithDust<Balance> {
 	/// The value expressed in the native currency
 	pub value: Balance,

From 7f650f3626464218e3dc87c8c8bf2b7df7256423 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Sat, 5 Jul 2025 00:40:13 +0200
Subject: [PATCH 019/186] fixes

---
 substrate/frame/revive/src/exec/tests.rs     |  7 ++++---
 substrate/frame/revive/src/impl_fungibles.rs |  8 ++++----
 substrate/frame/revive/src/lib.rs            | 12 ++++++++++--
 substrate/frame/revive/src/primitives.rs     |  6 ++++--
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/substrate/frame/revive/src/exec/tests.rs b/substrate/frame/revive/src/exec/tests.rs
index 85d41716a062..206df22e35da 100644
--- a/substrate/frame/revive/src/exec/tests.rs
+++ b/substrate/frame/revive/src/exec/tests.rs
@@ -267,6 +267,7 @@ fn transfer_to_nonexistent_account_works() {
 	ExtBuilder::default().build().execute_with(|| {
 		let ed = <Test as Config>::Currency::minimum_balance();
 		let value = 1024;
+		let evm_value = Pallet::<Test>::convert_native_to_evm(value);
 		let mut storage_meter = storage::meter::Meter::new(u64::MAX);
 
 		// Transfers to nonexistent accounts should work
@@ -277,7 +278,7 @@ fn transfer_to_nonexistent_account_works() {
 			&Origin::from_account_id(ALICE),
 			&BOB,
 			&CHARLIE,
-			Pallet::<Test>::convert_native_to_evm(value),
+			evm_value,
 			&mut storage_meter,
 		));
 		assert_eq!(get_balance(&ALICE), ed);
@@ -292,7 +293,7 @@ fn transfer_to_nonexistent_account_works() {
 				&Origin::from_account_id(ALICE),
 				&BOB,
 				&DJANGO,
-				Pallet::<Test>::convert_native_to_evm(value),
+				evm_value,
 				&mut storage_meter
 			),
 			<Error<Test>>::StorageDepositNotEnoughFunds,
@@ -306,7 +307,7 @@ fn transfer_to_nonexistent_account_works() {
 				&Origin::from_account_id(ALICE),
 				&BOB,
 				&EVE,
-				Pallet::<Test>::convert_native_to_evm(value),
+				evm_value,
 				&mut storage_meter
 			),
 			<Error<Test>>::TransferFailed
diff --git a/substrate/frame/revive/src/impl_fungibles.rs b/substrate/frame/revive/src/impl_fungibles.rs
index bad9af69218a..55c42a509109 100644
--- a/substrate/frame/revive/src/impl_fungibles.rs
+++ b/substrate/frame/revive/src/impl_fungibles.rs
@@ -75,7 +75,7 @@ where
 		let ContractResult { result, .. } = Self::bare_call(
 			T::RuntimeOrigin::signed(Self::checking_account()),
 			asset_id,
-			Default::default(),
+			U256::zero(),
 			GAS_LIMIT,
 			DepositLimit::Balance(
 				<<T as pallet::Config>::Currency as fungible::Inspect<_>>::total_issuance(),
@@ -111,7 +111,7 @@ where
 		let ContractResult { result, .. } = Self::bare_call(
 			T::RuntimeOrigin::signed(account_id.clone()),
 			asset_id,
-			Default::default(),
+			U256::zero(),
 			GAS_LIMIT,
 			DepositLimit::Balance(
 				<<T as pallet::Config>::Currency as fungible::Inspect<_>>::total_issuance(),
@@ -186,7 +186,7 @@ where
 		let ContractResult { result, gas_consumed, .. } = Self::bare_call(
 			T::RuntimeOrigin::signed(who.clone()),
 			asset_id,
-			Default::default(),
+			U256::zero(),
 			GAS_LIMIT,
 			DepositLimit::Balance(
 				<<T as pallet::Config>::Currency as fungible::Inspect<_>>::total_issuance(),
@@ -223,7 +223,7 @@ where
 		let ContractResult { result, .. } = Self::bare_call(
 			T::RuntimeOrigin::signed(Self::checking_account()),
 			asset_id,
-			Default::default(),
+			U256::zero(),
 			GAS_LIMIT,
 			DepositLimit::Balance(
 				<<T as pallet::Config>::Currency as fungible::Inspect<_>>::total_issuance(),
diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index e178910f594d..3e509476eb76 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -903,7 +903,11 @@ pub mod pallet {
 			dispatch_result(
 				output.result.map(|result| result.result),
 				output.gas_consumed,
-				T::WeightInfo::instantiate_with_code(code_len, data_len),
+				T::WeightInfo::eth_instantiate_with_code(
+					code_len,
+					data_len,
+					Pallet::<T>::has_dust(value).into(),
+				),
 			)
 		}
 
@@ -933,7 +937,11 @@ pub mod pallet {
 					output.result = Err(<Error<T>>::ContractReverted.into());
 				}
 			}
-			dispatch_result(output.result, output.gas_consumed, T::WeightInfo::call())
+			dispatch_result(
+				output.result,
+				output.gas_consumed,
+				T::WeightInfo::eth_call(Pallet::<T>::has_dust(value).into()),
+			)
 		}
 
 		/// Upload new `code` without instantiating a contract from it.
diff --git a/substrate/frame/revive/src/primitives.rs b/substrate/frame/revive/src/primitives.rs
index 3b42b4ef3e62..9f889c3adc54 100644
--- a/substrate/frame/revive/src/primitives.rs
+++ b/substrate/frame/revive/src/primitives.rs
@@ -110,12 +110,12 @@ pub enum EthTransactError {
 
 /// A Balance amount along with some "dust" to represent the lowest decimals that can't be expressed
 /// in the native currency
-#[derive(Default, Clone, Copy, Eq, Encode, Decode, TypeInfo, PartialEq, Debug)]
+#[derive(Default, Clone, Copy, Eq, PartialEq, Debug)]
 pub struct BalanceWithDust<Balance> {
 	/// The value expressed in the native currency
 	pub value: Balance,
 	/// The dust, representing up to 1 unit of the native currency.
-	/// The dust will be bounded between 0 and `crate::Config::NativeToEthRatio`
+	/// The dust is bounded between 0 and `crate::Config::NativeToEthRatio`
 	pub dust: u32,
 }
 
@@ -131,10 +131,12 @@ impl<Balance: Zero + One + Saturating> BalanceWithDust<Balance> {
 		Self { value, dust }
 	}
 
+	/// Returns true if both the value and dust are zero.
 	pub fn is_zero(&self) -> bool {
 		self.value.is_zero() && self.dust == 0
 	}
 
+	/// Returns the Balance rounded to the nearest whole unit if the dust is non-zero.
 	pub fn into_rounded_balance(self) -> Balance {
 		if self.dust == 0 {
 			self.value

From 380a1b4ef4e448cf265d285645fe5558cae28db7 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Sat, 5 Jul 2025 10:51:34 +0200
Subject: [PATCH 020/186] fix build

---
 .../runtimes/assets/common/src/erc20_transactor.rs       | 9 +++------
 substrate/frame/revive/src/weights.rs                    | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/cumulus/parachains/runtimes/assets/common/src/erc20_transactor.rs b/cumulus/parachains/runtimes/assets/common/src/erc20_transactor.rs
index ec4e3adad3ba..29e40d1ab1cf 100644
--- a/cumulus/parachains/runtimes/assets/common/src/erc20_transactor.rs
+++ b/cumulus/parachains/runtimes/assets/common/src/erc20_transactor.rs
@@ -18,10 +18,7 @@
 
 use core::marker::PhantomData;
 use ethereum_standards::IERC20;
-use frame_support::{
-	pallet_prelude::Zero,
-	traits::{fungible::Inspect, OriginTrait},
-};
+use frame_support::traits::{fungible::Inspect, OriginTrait};
 use pallet_revive::{
 	precompiles::alloy::{
 		primitives::{Address, U256 as EU256},
@@ -127,7 +124,7 @@ where
 			pallet_revive::Pallet::<T>::bare_call(
 				T::RuntimeOrigin::signed(who.clone()),
 				asset_id,
-				BalanceOf::<T>::zero(),
+				U256::zero(),
 				gas_limit,
 				DepositLimit::Balance(StorageDepositLimit::get()),
 				data,
@@ -185,7 +182,7 @@ where
 			pallet_revive::Pallet::<T>::bare_call(
 				T::RuntimeOrigin::signed(TransfersCheckingAccount::get()),
 				asset_id,
-				BalanceOf::<T>::zero(),
+				U256::zero(),
 				gas_limit,
 				DepositLimit::Balance(StorageDepositLimit::get()),
 				data,
diff --git a/substrate/frame/revive/src/weights.rs b/substrate/frame/revive/src/weights.rs
index 4c4a57247a99..58ba9a2fa4f9 100644
--- a/substrate/frame/revive/src/weights.rs
+++ b/substrate/frame/revive/src/weights.rs
@@ -1917,7 +1917,7 @@ impl WeightInfo for () {
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
 	/// The range of component `t` is `[0, 1]`.
 	/// The range of component `i` is `[0, 262144]`.
-	fn seal_call(t: u32, i: u32, _d: u32 ) -> Weight {
+	fn seal_call(t: u32, _d: u32, i: u32) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1545 + t * (206 ±0)`
 		//  Estimated: `5010 + t * (2608 ±0)`

From e0e5316774d59ffa12ab9719e8889b9675f92430 Mon Sep 17 00:00:00 2001
From: "cmd[bot]" <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 5 Jul 2025 11:58:43 +0000
Subject: [PATCH 021/186] Update from github-actions[bot] running command
 'bench --runtime dev --pallet pallet_revive'

---
 substrate/frame/revive/src/weights.rs | 1480 ++++++++++++++-----------
 1 file changed, 819 insertions(+), 661 deletions(-)

diff --git a/substrate/frame/revive/src/weights.rs b/substrate/frame/revive/src/weights.rs
index 58ba9a2fa4f9..a62b4313c03d 100644
--- a/substrate/frame/revive/src/weights.rs
+++ b/substrate/frame/revive/src/weights.rs
@@ -35,9 +35,9 @@
 //! Autogenerated weights for `pallet_revive`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
-//! DATE: 2025-04-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2025-07-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `cd6bf3e6c4c6`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! HOSTNAME: `4fb324baf64b`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
@@ -76,10 +76,10 @@ pub trait WeightInfo {
 	fn call_with_code_per_byte(c: u32, ) -> Weight;
 	fn basic_block_compilation(b: u32, ) -> Weight;
 	fn instantiate_with_code(c: u32, i: u32, ) -> Weight;
-	fn eth_instantiate_with_code(c: u32, i: u32, _d: u32) -> Weight { Self::instantiate_with_code(c, i) }
+	fn eth_instantiate_with_code(c: u32, i: u32, d: u32, ) -> Weight;
 	fn instantiate(i: u32, ) -> Weight;
 	fn call() -> Weight;
-	fn eth_call(_d: u32) -> Weight { Self::call() }
+	fn eth_call(d: u32, ) -> Weight;
 	fn upload_code(c: u32, ) -> Weight;
 	fn remove_code() -> Weight;
 	fn set_code() -> Weight;
@@ -143,7 +143,7 @@ pub trait WeightInfo {
 	fn seal_call(t: u32, d: u32, i: u32, ) -> Weight;
 	fn seal_call_precompile(d: u32, i: u32, ) -> Weight;
 	fn seal_delegate_call() -> Weight;
-	fn seal_instantiate(i: u32, d: u32) -> Weight;
+	fn seal_instantiate(t: u32, d: u32, i: u32, ) -> Weight;
 	fn sha2_256(n: u32, ) -> Weight;
 	fn identity(n: u32, ) -> Weight;
 	fn ripemd_160(n: u32, ) -> Weight;
@@ -171,8 +171,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `147`
 		//  Estimated: `1632`
-		// Minimum execution time: 2_971_000 picoseconds.
-		Weight::from_parts(3_218_000, 1632)
+		// Minimum execution time: 3_087_000 picoseconds.
+		Weight::from_parts(3_247_000, 1632)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -180,12 +180,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `k` is `[0, 1024]`.
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `425 + k * (69 ±0)`
-		//  Estimated: `415 + k * (70 ±0)`
-		// Minimum execution time: 14_042_000 picoseconds.
-		Weight::from_parts(14_510_000, 415)
-			// Standard Error: 1_047
-			.saturating_add(Weight::from_parts(1_167_098, 0).saturating_mul(k.into()))
+		//  Measured:  `458 + k * (69 ±0)`
+		//  Estimated: `448 + k * (70 ±0)`
+		// Minimum execution time: 13_997_000 picoseconds.
+		Weight::from_parts(14_266_000, 448)
+			// Standard Error: 866
+			.saturating_add(Weight::from_parts(1_180_593, 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))
@@ -194,8 +194,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	}
 	/// Storage: `Revive::OriginalAccount` (r:2 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
-	/// Storage: `Revive::ContractInfoOf` (r:1 w:1)
-	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(242), added: 2717, mode: `Measured`)
+	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
@@ -207,20 +207,20 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `c` is `[0, 104857]`.
 	fn call_with_code_per_byte(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1178 + c * (1 ±0)`
-		//  Estimated: `7119 + c * (1 ±0)`
-		// Minimum execution time: 81_842_000 picoseconds.
-		Weight::from_parts(110_091_076, 7119)
-			// Standard Error: 12
-			.saturating_add(Weight::from_parts(2_123, 0).saturating_mul(c.into()))
+		//  Measured:  `1180 + c * (1 ±0)`
+		//  Estimated: `7121 + c * (1 ±0)`
+		// Minimum execution time: 80_371_000 picoseconds.
+		Weight::from_parts(119_339_648, 7121)
+			// Standard Error: 10
+			.saturating_add(Weight::from_parts(1_689, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(c.into()))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:2 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
-	/// Storage: `Revive::ContractInfoOf` (r:1 w:1)
-	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(242), added: 2717, mode: `Measured`)
+	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
@@ -232,23 +232,23 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `b` is `[0, 1]`.
 	fn basic_block_compilation(b: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `4513`
-		//  Estimated: `10453`
-		// Minimum execution time: 121_768_000 picoseconds.
-		Weight::from_parts(126_040_712, 10453)
-			// Standard Error: 315_571
-			.saturating_add(Weight::from_parts(961_687, 0).saturating_mul(b.into()))
+		//  Measured:  `4515`
+		//  Estimated: `10455`
+		// Minimum execution time: 121_300_000 picoseconds.
+		Weight::from_parts(125_943_332, 10455)
+			// Standard Error: 583_852
+			.saturating_add(Weight::from_parts(1_306_067, 0).saturating_mul(b.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	/// Storage: `Balances::Holds` (r:2 w:2)
-	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(409), added: 2884, mode: `Measured`)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
-	/// Storage: `Revive::ContractInfoOf` (r:1 w:1)
-	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(242), added: 2717, mode: `Measured`)
+	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Timestamp::Now` (r:1 w:0)
 	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
 	/// Storage: `System::Account` (r:1 w:1)
@@ -261,45 +261,80 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1122`
 		//  Estimated: `7010`
-		// Minimum execution time: 1_593_697_000 picoseconds.
-		Weight::from_parts(150_335_332, 7010)
-			// Standard Error: 34
-			.saturating_add(Weight::from_parts(19_710, 0).saturating_mul(c.into()))
-			// Standard Error: 13
-			.saturating_add(Weight::from_parts(5_466, 0).saturating_mul(i.into()))
+		// Minimum execution time: 1_319_981_000 picoseconds.
+		Weight::from_parts(208_776_560, 7010)
+			// Standard Error: 47
+			.saturating_add(Weight::from_parts(19_063, 0).saturating_mul(c.into()))
+			// Standard Error: 18
+			.saturating_add(Weight::from_parts(4_327, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Storage: `Balances::Holds` (r:2 w:2)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
+	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
+	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
+	/// Storage: `Revive::AccountInfoOf` (r:2 w:2)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Revive::PristineCode` (r:0 w:1)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(262180), added: 264655, mode: `Measured`)
+	/// The range of component `c` is `[0, 104857]`.
+	/// The range of component `i` is `[0, 262144]`.
+	/// The range of component `d` is `[0, 1]`.
+	fn eth_instantiate_with_code(c: u32, i: u32, d: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `1122`
+		//  Estimated: `7062 + d * (2475 ±0)`
+		// Minimum execution time: 352_464_000 picoseconds.
+		Weight::from_parts(144_030_696, 7062)
+			// Standard Error: 32
+			.saturating_add(Weight::from_parts(15_029, 0).saturating_mul(c.into()))
+			// Standard Error: 12
+			.saturating_add(Weight::from_parts(489, 0).saturating_mul(i.into()))
+			// Standard Error: 2_162_506
+			.saturating_add(Weight::from_parts(62_297_017, 0).saturating_mul(d.into()))
+			.saturating_add(T::DbWeight::get().reads(7_u64))
+			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(d.into())))
+			.saturating_add(T::DbWeight::get().writes(6_u64))
+			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(d.into())))
+			.saturating_add(Weight::from_parts(0, 2475).saturating_mul(d.into()))
+	}
+	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(262180), added: 264655, mode: `Measured`)
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
-	/// Storage: `Revive::ContractInfoOf` (r:1 w:1)
-	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(242), added: 2717, mode: `Measured`)
+	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Timestamp::Now` (r:1 w:0)
 	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
 	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
 	/// Storage: `Balances::Holds` (r:1 w:1)
-	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(409), added: 2884, mode: `Measured`)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	/// The range of component `i` is `[0, 262144]`.
 	fn instantiate(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1886`
-		//  Estimated: `5346`
-		// Minimum execution time: 155_867_000 picoseconds.
-		Weight::from_parts(88_055_300, 5346)
-			// Standard Error: 25
-			.saturating_add(Weight::from_parts(5_561, 0).saturating_mul(i.into()))
+		//  Measured:  `1912`
+		//  Estimated: `5348`
+		// Minimum execution time: 157_257_000 picoseconds.
+		Weight::from_parts(145_200_684, 5348)
+			// Standard Error: 15
+			.saturating_add(Weight::from_parts(4_497, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:2 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
-	/// Storage: `Revive::ContractInfoOf` (r:1 w:1)
-	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(242), added: 2717, mode: `Measured`)
+	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
@@ -310,17 +345,44 @@ 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:  `1812`
-		//  Estimated: `7752`
-		// Minimum execution time: 85_908_000 picoseconds.
-		Weight::from_parts(87_953_000, 7752)
+		//  Measured:  `1853`
+		//  Estimated: `7793`
+		// Minimum execution time: 85_755_000 picoseconds.
+		Weight::from_parts(87_660_000, 7793)
+			.saturating_add(T::DbWeight::get().reads(7_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
+	}
+	/// Storage: `Revive::OriginalAccount` (r:2 w:0)
+	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
+	/// Storage: `Revive::AccountInfoOf` (r:2 w:2)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
+	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Storage: `Revive::PristineCode` (r:1 w:0)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(262180), added: 264655, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// The range of component `d` is `[0, 1]`.
+	fn eth_call(d: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `1853`
+		//  Estimated: `7793 + d * (2475 ±0)`
+		// Minimum execution time: 84_102_000 picoseconds.
+		Weight::from_parts(87_454_814, 7793)
+			// Standard Error: 355_862
+			.saturating_add(Weight::from_parts(60_086_885, 0).saturating_mul(d.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
+			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(d.into())))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
+			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(d.into())))
+			.saturating_add(Weight::from_parts(0, 2475).saturating_mul(d.into()))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	/// Storage: `Balances::Holds` (r:1 w:1)
-	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(409), added: 2884, mode: `Measured`)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:0 w:1)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(262180), added: 264655, mode: `Measured`)
 	/// The range of component `c` is `[0, 104857]`.
@@ -328,64 +390,64 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `505`
 		//  Estimated: `3970`
-		// Minimum execution time: 51_305_000 picoseconds.
-		Weight::from_parts(27_197_599, 3970)
-			// Standard Error: 20
-			.saturating_add(Weight::from_parts(14_721, 0).saturating_mul(c.into()))
+		// Minimum execution time: 49_266_000 picoseconds.
+		Weight::from_parts(36_681_890, 3970)
+			// Standard Error: 18
+			.saturating_add(Weight::from_parts(14_655, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	/// Storage: `Balances::Holds` (r:1 w:1)
-	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(409), added: 2884, mode: `Measured`)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:0 w:1)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(262180), added: 264655, mode: `Measured`)
 	fn remove_code() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `658`
 		//  Estimated: `4123`
-		// Minimum execution time: 41_900_000 picoseconds.
-		Weight::from_parts(42_985_000, 4123)
+		// Minimum execution time: 40_426_000 picoseconds.
+		Weight::from_parts(41_134_000, 4123)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
-	/// Storage: `Revive::ContractInfoOf` (r:1 w:1)
-	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(242), added: 2717, mode: `Measured`)
+	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:2 w:2)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	fn set_code() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `528`
-		//  Estimated: `6468`
-		// Minimum execution time: 20_254_000 picoseconds.
-		Weight::from_parts(21_122_000, 6468)
+		//  Measured:  `530`
+		//  Estimated: `6470`
+		// Minimum execution time: 19_768_000 picoseconds.
+		Weight::from_parts(20_504_000, 6470)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:1)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
 	/// Storage: `Balances::Holds` (r:1 w:1)
-	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(409), added: 2884, mode: `Measured`)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	fn map_account() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `813`
 		//  Estimated: `4278`
-		// Minimum execution time: 50_406_000 picoseconds.
-		Weight::from_parts(51_939_000, 4278)
+		// Minimum execution time: 48_814_000 picoseconds.
+		Weight::from_parts(49_994_000, 4278)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
 	/// Storage: `Balances::Holds` (r:1 w:1)
-	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(409), added: 2884, mode: `Measured`)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	/// Storage: `Revive::OriginalAccount` (r:0 w:1)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
 	fn unmap_account() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `395`
 		//  Estimated: `3860`
-		// Minimum execution time: 37_679_000 picoseconds.
-		Weight::from_parts(39_183_000, 3860)
+		// Minimum execution time: 36_296_000 picoseconds.
+		Weight::from_parts(37_551_000, 3860)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -397,8 +459,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `145`
 		//  Estimated: `3610`
-		// Minimum execution time: 12_684_000 picoseconds.
-		Weight::from_parts(13_240_000, 3610)
+		// Minimum execution time: 12_732_000 picoseconds.
+		Weight::from_parts(13_474_000, 3610)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 	}
 	/// The range of component `r` is `[0, 1600]`.
@@ -406,139 +468,141 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_583_000 picoseconds.
-		Weight::from_parts(8_416_964, 0)
-			// Standard Error: 170
-			.saturating_add(Weight::from_parts(164_523, 0).saturating_mul(r.into()))
+		// Minimum execution time: 6_947_000 picoseconds.
+		Weight::from_parts(7_549_381, 0)
+			// Standard Error: 190
+			.saturating_add(Weight::from_parts(186_127, 0).saturating_mul(r.into()))
 	}
 	fn seal_caller() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 199_000 picoseconds.
-		Weight::from_parts(233_000, 0)
+		// Minimum execution time: 364_000 picoseconds.
+		Weight::from_parts(417_000, 0)
 	}
 	fn seal_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 184_000 picoseconds.
-		Weight::from_parts(206_000, 0)
+		// Minimum execution time: 318_000 picoseconds.
+		Weight::from_parts(349_000, 0)
 	}
-	/// Storage: `Revive::ContractInfoOf` (r:1 w:0)
-	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(242), added: 2717, mode: `Measured`)
+	/// Storage: `Revive::AccountInfoOf` (r:1 w:0)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	fn seal_is_contract() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `306`
-		//  Estimated: `3771`
-		// Minimum execution time: 8_270_000 picoseconds.
-		Weight::from_parts(8_700_000, 3771)
+		//  Measured:  `403`
+		//  Estimated: `3868`
+		// Minimum execution time: 8_693_000 picoseconds.
+		Weight::from_parts(9_070_000, 3868)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
 	fn seal_to_account_id() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `538`
-		//  Estimated: `4003`
-		// Minimum execution time: 9_364_000 picoseconds.
-		Weight::from_parts(9_672_000, 4003)
+		//  Measured:  `571`
+		//  Estimated: `4036`
+		// Minimum execution time: 9_465_000 picoseconds.
+		Weight::from_parts(9_705_000, 4036)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
-	/// Storage: `Revive::ContractInfoOf` (r:1 w:0)
-	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(242), added: 2717, mode: `Measured`)
+	/// Storage: `Revive::AccountInfoOf` (r:1 w:0)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	fn seal_code_hash() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `402`
-		//  Estimated: `3867`
-		// Minimum execution time: 9_183_000 picoseconds.
-		Weight::from_parts(9_609_000, 3867)
+		//  Measured:  `403`
+		//  Estimated: `3868`
+		// Minimum execution time: 8_735_000 picoseconds.
+		Weight::from_parts(8_967_000, 3868)
 			.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: 131_000 picoseconds.
-		Weight::from_parts(176_000, 0)
+		// Minimum execution time: 238_000 picoseconds.
+		Weight::from_parts(270_000, 0)
 	}
-	/// Storage: `Revive::ContractInfoOf` (r:1 w:0)
-	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(242), added: 2717, mode: `Measured`)
+	/// Storage: `Revive::AccountInfoOf` (r:1 w:0)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	fn seal_code_size() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `472`
-		//  Estimated: `3937`
-		// Minimum execution time: 12_217_000 picoseconds.
-		Weight::from_parts(13_005_000, 3937)
+		//  Measured:  `474`
+		//  Estimated: `3939`
+		// Minimum execution time: 11_885_000 picoseconds.
+		Weight::from_parts(12_387_000, 3939)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 	}
 	fn seal_caller_is_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 208_000 picoseconds.
-		Weight::from_parts(228_000, 0)
+		// Minimum execution time: 284_000 picoseconds.
+		Weight::from_parts(335_000, 0)
 	}
 	fn seal_caller_is_root() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 170_000 picoseconds.
-		Weight::from_parts(203_000, 0)
+		// Minimum execution time: 244_000 picoseconds.
+		Weight::from_parts(278_000, 0)
 	}
 	fn seal_address() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 182_000 picoseconds.
-		Weight::from_parts(204_000, 0)
+		// Minimum execution time: 256_000 picoseconds.
+		Weight::from_parts(306_000, 0)
 	}
 	fn seal_weight_left() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 576_000 picoseconds.
-		Weight::from_parts(637_000, 0)
+		// Minimum execution time: 621_000 picoseconds.
+		Weight::from_parts(681_000, 0)
 	}
 	fn seal_ref_time_left() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 131_000 picoseconds.
-		Weight::from_parts(168_000, 0)
+		// Minimum execution time: 239_000 picoseconds.
+		Weight::from_parts(268_000, 0)
 	}
 	fn seal_balance() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `103`
+		//  Measured:  `469`
 		//  Estimated: `0`
-		// Minimum execution time: 4_466_000 picoseconds.
-		Weight::from_parts(4_813_000, 0)
+		// Minimum execution time: 11_459_000 picoseconds.
+		Weight::from_parts(11_955_000, 0)
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
 	/// Storage: `System::Account` (r:1 w:0)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Revive::AccountInfoOf` (r:1 w:0)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	fn seal_balance_of() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `517`
-		//  Estimated: `3982`
-		// Minimum execution time: 8_786_000 picoseconds.
-		Weight::from_parts(9_450_000, 3982)
-			.saturating_add(T::DbWeight::get().reads(2_u64))
+		//  Measured:  `590`
+		//  Estimated: `4055`
+		// Minimum execution time: 12_943_000 picoseconds.
+		Weight::from_parts(13_436_000, 4055)
+			.saturating_add(T::DbWeight::get().reads(3_u64))
 	}
 	/// Storage: `Revive::ImmutableDataOf` (r:1 w:0)
 	/// Proof: `Revive::ImmutableDataOf` (`max_values`: None, `max_size`: Some(4118), added: 6593, mode: `Measured`)
 	/// The range of component `n` is `[1, 4096]`.
 	fn seal_get_immutable_data(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `238 + n * (1 ±0)`
-		//  Estimated: `3703 + n * (1 ±0)`
-		// Minimum execution time: 5_796_000 picoseconds.
-		Weight::from_parts(6_399_722, 3703)
-			// Standard Error: 4
-			.saturating_add(Weight::from_parts(581, 0).saturating_mul(n.into()))
+		//  Measured:  `271 + n * (1 ±0)`
+		//  Estimated: `3736 + n * (1 ±0)`
+		// Minimum execution time: 5_671_000 picoseconds.
+		Weight::from_parts(6_350_878, 3736)
+			// Standard Error: 6
+			.saturating_add(Weight::from_parts(620, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -549,67 +613,67 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_950_000 picoseconds.
-		Weight::from_parts(2_072_690, 0)
-			// Standard Error: 1
-			.saturating_add(Weight::from_parts(633, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_765_000 picoseconds.
+		Weight::from_parts(2_040_371, 0)
+			// Standard Error: 2
+			.saturating_add(Weight::from_parts(685, 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: 151_000 picoseconds.
-		Weight::from_parts(170_000, 0)
+		// Minimum execution time: 249_000 picoseconds.
+		Weight::from_parts(274_000, 0)
 	}
 	fn seal_minimum_balance() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 127_000 picoseconds.
-		Weight::from_parts(151_000, 0)
+		// Minimum execution time: 260_000 picoseconds.
+		Weight::from_parts(290_000, 0)
 	}
 	fn seal_return_data_size() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 112_000 picoseconds.
-		Weight::from_parts(149_000, 0)
+		// Minimum execution time: 226_000 picoseconds.
+		Weight::from_parts(271_000, 0)
 	}
 	fn seal_call_data_size() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 124_000 picoseconds.
-		Weight::from_parts(154_000, 0)
+		// Minimum execution time: 228_000 picoseconds.
+		Weight::from_parts(277_000, 0)
 	}
 	fn seal_gas_limit() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 331_000 picoseconds.
-		Weight::from_parts(370_000, 0)
+		// Minimum execution time: 415_000 picoseconds.
+		Weight::from_parts(456_000, 0)
 	}
 	fn seal_gas_price() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 137_000 picoseconds.
-		Weight::from_parts(163_000, 0)
+		// Minimum execution time: 214_000 picoseconds.
+		Weight::from_parts(246_000, 0)
 	}
 	fn seal_base_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 130_000 picoseconds.
-		Weight::from_parts(154_000, 0)
+		// Minimum execution time: 236_000 picoseconds.
+		Weight::from_parts(273_000, 0)
 	}
 	fn seal_block_number() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 150_000 picoseconds.
-		Weight::from_parts(167_000, 0)
+		// Minimum execution time: 236_000 picoseconds.
+		Weight::from_parts(278_000, 0)
 	}
 	/// Storage: `Session::Validators` (r:1 w:0)
 	/// Proof: `Session::Validators` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -617,8 +681,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `141`
 		//  Estimated: `1626`
-		// Minimum execution time: 19_205_000 picoseconds.
-		Weight::from_parts(19_687_000, 1626)
+		// Minimum execution time: 20_669_000 picoseconds.
+		Weight::from_parts(20_950_000, 1626)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `System::BlockHash` (r:1 w:0)
@@ -627,60 +691,60 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `30`
 		//  Estimated: `3495`
-		// Minimum execution time: 3_333_000 picoseconds.
-		Weight::from_parts(3_522_000, 3495)
+		// Minimum execution time: 3_476_000 picoseconds.
+		Weight::from_parts(3_697_000, 3495)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	fn seal_now() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 126_000 picoseconds.
-		Weight::from_parts(156_000, 0)
+		// Minimum execution time: 223_000 picoseconds.
+		Weight::from_parts(257_000, 0)
 	}
 	fn seal_weight_to_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_364_000 picoseconds.
-		Weight::from_parts(1_477_000, 0)
+		// Minimum execution time: 1_476_000 picoseconds.
+		Weight::from_parts(1_617_000, 0)
 	}
 	/// The range of component `n` is `[0, 262140]`.
 	fn seal_copy_to_contract(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 309_000 picoseconds.
-		Weight::from_parts(603_516, 0)
+		// Minimum execution time: 358_000 picoseconds.
+		Weight::from_parts(561_222, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(294, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(259, 0).saturating_mul(n.into()))
 	}
 	fn seal_call_data_load() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 120_000 picoseconds.
-		Weight::from_parts(142_000, 0)
+		// Minimum execution time: 232_000 picoseconds.
+		Weight::from_parts(270_000, 0)
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn seal_call_data_copy(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 121_000 picoseconds.
-		Weight::from_parts(125_420, 0)
+		// Minimum execution time: 219_000 picoseconds.
+		Weight::from_parts(77_326, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(149, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(115, 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: 150_000 picoseconds.
-		Weight::from_parts(445_753, 0)
+		// Minimum execution time: 255_000 picoseconds.
+		Weight::from_parts(489_092, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(296, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(259, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
@@ -694,10 +758,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `Revive::ImmutableDataOf` (`max_values`: None, `max_size`: Some(4118), added: 6593, mode: `Measured`)
 	fn seal_terminate() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `585`
-		//  Estimated: `4050`
-		// Minimum execution time: 16_990_000 picoseconds.
-		Weight::from_parts(17_538_000, 4050)
+		//  Measured:  `582`
+		//  Estimated: `4047`
+		// Minimum execution time: 15_923_000 picoseconds.
+		Weight::from_parts(16_445_000, 4047)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -707,12 +771,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_218_000 picoseconds.
-		Weight::from_parts(4_143_231, 0)
-			// Standard Error: 3_302
-			.saturating_add(Weight::from_parts(235_681, 0).saturating_mul(t.into()))
-			// Standard Error: 36
-			.saturating_add(Weight::from_parts(1_298, 0).saturating_mul(n.into()))
+		// Minimum execution time: 4_273_000 picoseconds.
+		Weight::from_parts(4_192_452, 0)
+			// Standard Error: 2_820
+			.saturating_add(Weight::from_parts(194_732, 0).saturating_mul(t.into()))
+			// Standard Error: 31
+			.saturating_add(Weight::from_parts(1_218, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
 	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -720,8 +784,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `648`
 		//  Estimated: `648`
-		// Minimum execution time: 6_942_000 picoseconds.
-		Weight::from_parts(7_454_000, 648)
+		// Minimum execution time: 7_138_000 picoseconds.
+		Weight::from_parts(7_691_000, 648)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -730,8 +794,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `10658`
 		//  Estimated: `10658`
-		// Minimum execution time: 41_245_000 picoseconds.
-		Weight::from_parts(42_033_000, 10658)
+		// Minimum execution time: 40_853_000 picoseconds.
+		Weight::from_parts(41_403_000, 10658)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -740,8 +804,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `648`
 		//  Estimated: `648`
-		// Minimum execution time: 7_877_000 picoseconds.
-		Weight::from_parts(8_376_000, 648)
+		// Minimum execution time: 8_258_000 picoseconds.
+		Weight::from_parts(8_676_000, 648)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -751,8 +815,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `10658`
 		//  Estimated: `10658`
-		// Minimum execution time: 42_844_000 picoseconds.
-		Weight::from_parts(43_778_000, 10658)
+		// Minimum execution time: 42_393_000 picoseconds.
+		Weight::from_parts(43_592_000, 10658)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -764,12 +828,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: 8_517_000 picoseconds.
-		Weight::from_parts(9_327_675, 247)
-			// Standard Error: 52
-			.saturating_add(Weight::from_parts(407, 0).saturating_mul(n.into()))
-			// Standard Error: 52
-			.saturating_add(Weight::from_parts(434, 0).saturating_mul(o.into()))
+		// Minimum execution time: 8_740_000 picoseconds.
+		Weight::from_parts(9_229_170, 247)
+			// Standard Error: 62
+			.saturating_add(Weight::from_parts(920, 0).saturating_mul(n.into()))
+			// Standard Error: 62
+			.saturating_add(Weight::from_parts(972, 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()))
@@ -781,10 +845,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_144_000 picoseconds.
-		Weight::from_parts(9_105_918, 247)
-			// Standard Error: 72
-			.saturating_add(Weight::from_parts(684, 0).saturating_mul(n.into()))
+		// Minimum execution time: 8_772_000 picoseconds.
+		Weight::from_parts(9_596_651, 247)
+			// Standard Error: 73
+			.saturating_add(Weight::from_parts(524, 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()))
@@ -796,10 +860,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: 7_914_000 picoseconds.
-		Weight::from_parts(8_683_792, 247)
-			// Standard Error: 65
-			.saturating_add(Weight::from_parts(1_267, 0).saturating_mul(n.into()))
+		// Minimum execution time: 7_905_000 picoseconds.
+		Weight::from_parts(8_856_432, 247)
+			// Standard Error: 78
+			.saturating_add(Weight::from_parts(1_795, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -810,10 +874,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: 7_287_000 picoseconds.
-		Weight::from_parts(8_027_630, 247)
-			// Standard Error: 56
-			.saturating_add(Weight::from_parts(698, 0).saturating_mul(n.into()))
+		// Minimum execution time: 7_408_000 picoseconds.
+		Weight::from_parts(8_288_564, 247)
+			// Standard Error: 65
+			.saturating_add(Weight::from_parts(1_004, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -824,10 +888,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_870_000 picoseconds.
-		Weight::from_parts(9_939_099, 247)
-			// Standard Error: 225
-			.saturating_add(Weight::from_parts(832, 0).saturating_mul(n.into()))
+		// Minimum execution time: 9_053_000 picoseconds.
+		Weight::from_parts(10_110_316, 247)
+			// Standard Error: 200
+			.saturating_add(Weight::from_parts(1_330, 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()))
@@ -836,36 +900,36 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_306_000 picoseconds.
-		Weight::from_parts(1_404_000, 0)
+		// Minimum execution time: 1_503_000 picoseconds.
+		Weight::from_parts(1_573_000, 0)
 	}
 	fn set_transient_storage_full() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_689_000 picoseconds.
-		Weight::from_parts(1_811_000, 0)
+		// Minimum execution time: 1_848_000 picoseconds.
+		Weight::from_parts(1_969_000, 0)
 	}
 	fn get_transient_storage_empty() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_302_000 picoseconds.
-		Weight::from_parts(1_387_000, 0)
+		// Minimum execution time: 1_447_000 picoseconds.
+		Weight::from_parts(1_523_000, 0)
 	}
 	fn get_transient_storage_full() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_450_000 picoseconds.
-		Weight::from_parts(1_531_000, 0)
+		// Minimum execution time: 1_560_000 picoseconds.
+		Weight::from_parts(1_681_000, 0)
 	}
 	fn rollback_transient_storage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_003_000 picoseconds.
-		Weight::from_parts(1_083_000, 0)
+		// Minimum execution time: 1_079_000 picoseconds.
+		Weight::from_parts(1_163_000, 0)
 	}
 	/// The range of component `n` is `[0, 416]`.
 	/// The range of component `o` is `[0, 416]`.
@@ -873,258 +937,273 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_147_000 picoseconds.
-		Weight::from_parts(2_400_128, 0)
-			// Standard Error: 15
-			.saturating_add(Weight::from_parts(305, 0).saturating_mul(n.into()))
-			// Standard Error: 15
-			.saturating_add(Weight::from_parts(275, 0).saturating_mul(o.into()))
+		// Minimum execution time: 2_151_000 picoseconds.
+		Weight::from_parts(2_362_287, 0)
+			// Standard Error: 14
+			.saturating_add(Weight::from_parts(336, 0).saturating_mul(n.into()))
+			// Standard Error: 14
+			.saturating_add(Weight::from_parts(322, 0).saturating_mul(o.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_clear_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_941_000 picoseconds.
-		Weight::from_parts(2_245_468, 0)
-			// Standard Error: 18
-			.saturating_add(Weight::from_parts(407, 0).saturating_mul(n.into()))
+		// Minimum execution time: 2_051_000 picoseconds.
+		Weight::from_parts(2_347_102, 0)
+			// Standard Error: 22
+			.saturating_add(Weight::from_parts(279, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_get_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_738_000 picoseconds.
-		Weight::from_parts(1_944_507, 0)
-			// Standard Error: 16
-			.saturating_add(Weight::from_parts(275, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_772_000 picoseconds.
+		Weight::from_parts(1_994_332, 0)
+			// Standard Error: 18
+			.saturating_add(Weight::from_parts(407, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_contains_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_521_000 picoseconds.
-		Weight::from_parts(1_725_877, 0)
-			// Standard Error: 13
-			.saturating_add(Weight::from_parts(184, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_669_000 picoseconds.
+		Weight::from_parts(1_841_322, 0)
+			// Standard Error: 15
+			.saturating_add(Weight::from_parts(244, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_take_transient_storage(_n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_366_000 picoseconds.
-		Weight::from_parts(2_590_846, 0)
+		// Minimum execution time: 2_468_000 picoseconds.
+		Weight::from_parts(2_699_464, 0)
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
-	/// Storage: `Revive::ContractInfoOf` (r:1 w:0)
-	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(242), added: 2717, mode: `Measured`)
+	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(262180), added: 264655, mode: `Measured`)
-	/// Storage: `System::Account` (r:1 w:0)
+	/// Storage: `System::Account` (r:2 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
 	/// The range of component `t` is `[0, 1]`.
+	/// The range of component `d` is `[0, 1]`.
 	/// The range of component `i` is `[0, 262144]`.
-	fn seal_call(t: u32, _d: u32, i: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1545 + t * (206 ±0)`
-		//  Estimated: `5010 + t * (2608 ±0)`
-		// Minimum execution time: 34_508_000 picoseconds.
-		Weight::from_parts(35_724_702, 5010)
-			// Standard Error: 42_504
-			.saturating_add(Weight::from_parts(5_295_834, 0).saturating_mul(t.into()))
+	fn seal_call(t: u32, d: u32, i: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `1891`
+		//  Estimated: `5356 + d * (2475 ±0)`
+		// Minimum execution time: 81_428_000 picoseconds.
+		Weight::from_parts(66_368_659, 5356)
+			// Standard Error: 157_294
+			.saturating_add(Weight::from_parts(16_457_009, 0).saturating_mul(t.into()))
+			// Standard Error: 157_294
+			.saturating_add(Weight::from_parts(55_683_287, 0).saturating_mul(d.into()))
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(2, 0).saturating_mul(i.into()))
-			.saturating_add(T::DbWeight::get().reads(4_u64))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(t.into())))
+			.saturating_add(Weight::from_parts(6, 0).saturating_mul(i.into()))
+			.saturating_add(T::DbWeight::get().reads(5_u64))
+			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(d.into())))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
-			.saturating_add(Weight::from_parts(0, 2608).saturating_mul(t.into()))
+			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(t.into())))
+			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(d.into())))
+			.saturating_add(Weight::from_parts(0, 2475).saturating_mul(d.into()))
 	}
-	/// Storage: `Revive::ContractInfoOf` (r:1 w:1)
-	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(242), added: 2717, mode: `Measured`)
+	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `System::Account` (r:1 w:0)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
 	/// The range of component `d` is `[0, 1]`.
 	/// The range of component `i` is `[0, 262144]`.
 	fn seal_call_precompile(d: u32, i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `0 + d * (453 ±0)`
-		//  Estimated: `1959 + d * (1959 ±0)`
-		// Minimum execution time: 19_412_000 picoseconds.
-		Weight::from_parts(3_906_222, 1959)
-			// Standard Error: 378_943
-			.saturating_add(Weight::from_parts(16_405_804, 0).saturating_mul(d.into()))
-			// Standard Error: 2
-			.saturating_add(Weight::from_parts(1_205, 0).saturating_mul(i.into()))
+		//  Measured:  `366 + d * (212 ±0)`
+		//  Estimated: `2022 + d * (2022 ±0)`
+		// Minimum execution time: 22_771_000 picoseconds.
+		Weight::from_parts(10_343_634, 2022)
+			// Standard Error: 233_557
+			.saturating_add(Weight::from_parts(13_939_188, 0).saturating_mul(d.into()))
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(387, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(d.into())))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(d.into())))
-			.saturating_add(Weight::from_parts(0, 1959).saturating_mul(d.into()))
+			.saturating_add(Weight::from_parts(0, 2022).saturating_mul(d.into()))
 	}
-	/// Storage: `Revive::ContractInfoOf` (r:1 w:0)
-	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(242), added: 2717, mode: `Measured`)
+	/// Storage: `Revive::AccountInfoOf` (r:1 w:0)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
 	/// 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:  `1236`
-		//  Estimated: `4701`
-		// Minimum execution time: 28_834_000 picoseconds.
-		Weight::from_parts(30_072_000, 4701)
+		//  Measured:  `1362`
+		//  Estimated: `4827`
+		// Minimum execution time: 31_704_000 picoseconds.
+		Weight::from_parts(32_992_000, 4827)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(262180), added: 264655, mode: `Measured`)
-	/// Storage: `Revive::ContractInfoOf` (r:1 w:1)
-	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(242), added: 2717, mode: `Measured`)
-	/// Storage: `System::Account` (r:1 w:1)
+	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
+	/// Storage: `System::Account` (r:2 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// The range of component `t` is `[0, 1]`.
+	/// The range of component `d` is `[0, 1]`.
 	/// The range of component `i` is `[0, 262144]`.
-	fn seal_instantiate(i: u32,_d: u32 ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1260`
-		//  Estimated: `4728`
-		// Minimum execution time: 112_787_000 picoseconds.
-		Weight::from_parts(105_258_744, 4728)
+	fn seal_instantiate(t: u32, d: u32, i: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `1341`
+		//  Estimated: `4801 + d * (2500 ±1) + t * (25 ±1)`
+		// Minimum execution time: 169_945_000 picoseconds.
+		Weight::from_parts(48_476_960, 4801)
+			// Standard Error: 1_790_324
+			.saturating_add(Weight::from_parts(12_953_884, 0).saturating_mul(t.into()))
+			// Standard Error: 1_790_324
+			.saturating_add(Weight::from_parts(87_463_666, 0).saturating_mul(d.into()))
 			// Standard Error: 10
-			.saturating_add(Weight::from_parts(4_163, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(4_318, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(d.into())))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
+			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(d.into())))
+			.saturating_add(Weight::from_parts(0, 2500).saturating_mul(d.into()))
+			.saturating_add(Weight::from_parts(0, 25).saturating_mul(t.into()))
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn sha2_256(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 792_000 picoseconds.
-		Weight::from_parts(4_505_628, 0)
+		// Minimum execution time: 1_053_000 picoseconds.
+		Weight::from_parts(5_469_095, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_285, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(1_284, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn identity(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 300_000 picoseconds.
-		Weight::from_parts(468_743, 0)
-			// Standard Error: 0
-			.saturating_add(Weight::from_parts(148, 0).saturating_mul(n.into()))
+		// Minimum execution time: 670_000 picoseconds.
+		Weight::from_parts(562_181, 0)
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(118, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn ripemd_160(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 744_000 picoseconds.
-		Weight::from_parts(771_000, 0)
+		// Minimum execution time: 1_126_000 picoseconds.
+		Weight::from_parts(2_125_003, 0)
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(3_928, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(3_890, 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_002_000 picoseconds.
-		Weight::from_parts(3_889_121, 0)
+		// Minimum execution time: 1_103_000 picoseconds.
+		Weight::from_parts(5_893_654, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(3_666, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(3_646, 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: 562_000 picoseconds.
-		Weight::from_parts(3_823_066, 0)
+		// Minimum execution time: 602_000 picoseconds.
+		Weight::from_parts(4_564_770, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_569, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(1_577, 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: 543_000 picoseconds.
-		Weight::from_parts(3_582_133, 0)
-			// Standard Error: 2
-			.saturating_add(Weight::from_parts(1_576, 0).saturating_mul(n.into()))
+		// Minimum execution time: 624_000 picoseconds.
+		Weight::from_parts(4_151_646, 0)
+			// Standard Error: 3
+			.saturating_add(Weight::from_parts(1_591, 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_702_000 picoseconds.
-		Weight::from_parts(30_839_817, 0)
+		// Minimum execution time: 43_030_000 picoseconds.
+		Weight::from_parts(34_794_207, 0)
 			// Standard Error: 10
-			.saturating_add(Weight::from_parts(5_086, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(5_070, 0).saturating_mul(n.into()))
 	}
 	fn ecdsa_recover() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 44_770_000 picoseconds.
-		Weight::from_parts(45_791_000, 0)
+		// Minimum execution time: 45_517_000 picoseconds.
+		Weight::from_parts(46_666_000, 0)
 	}
 	fn bn128_add() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 15_705_000 picoseconds.
-		Weight::from_parts(16_885_000, 0)
+		// Minimum execution time: 15_541_000 picoseconds.
+		Weight::from_parts(16_507_000, 0)
 	}
 	fn bn128_mul() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_018_103_000 picoseconds.
-		Weight::from_parts(1_023_315_000, 0)
+		// Minimum execution time: 986_307_000 picoseconds.
+		Weight::from_parts(1_026_600_000, 0)
 	}
 	/// The range of component `n` is `[0, 20]`.
 	fn bn128_pairing(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 378_000 picoseconds.
-		Weight::from_parts(5_119_381_361, 0)
-			// Standard Error: 10_821_771
-			.saturating_add(Weight::from_parts(6_202_434_383, 0).saturating_mul(n.into()))
+		// Minimum execution time: 743_000 picoseconds.
+		Weight::from_parts(4_879_987_815, 0)
+			// Standard Error: 11_985_618
+			.saturating_add(Weight::from_parts(6_027_007_050, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 1200]`.
 	fn blake2f(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 435_000 picoseconds.
-		Weight::from_parts(658_540, 0)
-			// Standard Error: 6
-			.saturating_add(Weight::from_parts(22_679, 0).saturating_mul(n.into()))
+		// Minimum execution time: 861_000 picoseconds.
+		Weight::from_parts(1_051_090, 0)
+			// Standard Error: 7
+			.saturating_add(Weight::from_parts(23_382, 0).saturating_mul(n.into()))
 	}
 	fn seal_ecdsa_to_eth_address() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 12_639_000 picoseconds.
-		Weight::from_parts(12_782_000, 0)
+		// Minimum execution time: 12_800_000 picoseconds.
+		Weight::from_parts(12_970_000, 0)
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	fn seal_set_code_hash() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `300`
-		//  Estimated: `3765`
-		// Minimum execution time: 12_210_000 picoseconds.
-		Weight::from_parts(12_747_000, 3765)
+		//  Measured:  `296`
+		//  Estimated: `3761`
+		// Minimum execution time: 9_436_000 picoseconds.
+		Weight::from_parts(9_995_000, 3761)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -1133,20 +1212,20 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 11_244_000 picoseconds.
-		Weight::from_parts(48_207_913, 0)
-			// Standard Error: 495
-			.saturating_add(Weight::from_parts(125_133, 0).saturating_mul(r.into()))
+		// Minimum execution time: 12_006_000 picoseconds.
+		Weight::from_parts(49_478_841, 0)
+			// Standard Error: 816
+			.saturating_add(Weight::from_parts(134_226, 0).saturating_mul(r.into()))
 	}
 	/// The range of component `r` is `[0, 100000]`.
 	fn instr_empty_loop(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_776_000 picoseconds.
-		Weight::from_parts(6_412_428, 0)
-			// Standard Error: 17
-			.saturating_add(Weight::from_parts(72_988, 0).saturating_mul(r.into()))
+		// Minimum execution time: 2_661_000 picoseconds.
+		Weight::from_parts(7_913_108, 0)
+			// Standard Error: 23
+			.saturating_add(Weight::from_parts(72_528, 0).saturating_mul(r.into()))
 	}
 }
 
@@ -1158,8 +1237,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `147`
 		//  Estimated: `1632`
-		// Minimum execution time: 2_971_000 picoseconds.
-		Weight::from_parts(3_218_000, 1632)
+		// Minimum execution time: 3_087_000 picoseconds.
+		Weight::from_parts(3_247_000, 1632)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -1167,12 +1246,12 @@ impl WeightInfo for () {
 	/// The range of component `k` is `[0, 1024]`.
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `425 + k * (69 ±0)`
-		//  Estimated: `415 + k * (70 ±0)`
-		// Minimum execution time: 14_042_000 picoseconds.
-		Weight::from_parts(14_510_000, 415)
-			// Standard Error: 1_047
-			.saturating_add(Weight::from_parts(1_167_098, 0).saturating_mul(k.into()))
+		//  Measured:  `458 + k * (69 ±0)`
+		//  Estimated: `448 + k * (70 ±0)`
+		// Minimum execution time: 13_997_000 picoseconds.
+		Weight::from_parts(14_266_000, 448)
+			// Standard Error: 866
+			.saturating_add(Weight::from_parts(1_180_593, 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))
@@ -1181,8 +1260,8 @@ impl WeightInfo for () {
 	}
 	/// Storage: `Revive::OriginalAccount` (r:2 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
-	/// Storage: `Revive::ContractInfoOf` (r:1 w:1)
-	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(242), added: 2717, mode: `Measured`)
+	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
@@ -1194,20 +1273,20 @@ impl WeightInfo for () {
 	/// The range of component `c` is `[0, 104857]`.
 	fn call_with_code_per_byte(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1178 + c * (1 ±0)`
-		//  Estimated: `7119 + c * (1 ±0)`
-		// Minimum execution time: 81_842_000 picoseconds.
-		Weight::from_parts(110_091_076, 7119)
-			// Standard Error: 12
-			.saturating_add(Weight::from_parts(2_123, 0).saturating_mul(c.into()))
+		//  Measured:  `1180 + c * (1 ±0)`
+		//  Estimated: `7121 + c * (1 ±0)`
+		// Minimum execution time: 80_371_000 picoseconds.
+		Weight::from_parts(119_339_648, 7121)
+			// Standard Error: 10
+			.saturating_add(Weight::from_parts(1_689, 0).saturating_mul(c.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(c.into()))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:2 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
-	/// Storage: `Revive::ContractInfoOf` (r:1 w:1)
-	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(242), added: 2717, mode: `Measured`)
+	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
@@ -1219,23 +1298,23 @@ impl WeightInfo for () {
 	/// The range of component `b` is `[0, 1]`.
 	fn basic_block_compilation(b: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `4513`
-		//  Estimated: `10453`
-		// Minimum execution time: 121_768_000 picoseconds.
-		Weight::from_parts(126_040_712, 10453)
-			// Standard Error: 315_571
-			.saturating_add(Weight::from_parts(961_687, 0).saturating_mul(b.into()))
+		//  Measured:  `4515`
+		//  Estimated: `10455`
+		// Minimum execution time: 121_300_000 picoseconds.
+		Weight::from_parts(125_943_332, 10455)
+			// Standard Error: 583_852
+			.saturating_add(Weight::from_parts(1_306_067, 0).saturating_mul(b.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	/// Storage: `Balances::Holds` (r:2 w:2)
-	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(409), added: 2884, mode: `Measured`)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
-	/// Storage: `Revive::ContractInfoOf` (r:1 w:1)
-	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(242), added: 2717, mode: `Measured`)
+	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Timestamp::Now` (r:1 w:0)
 	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
 	/// Storage: `System::Account` (r:1 w:1)
@@ -1248,45 +1327,80 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1122`
 		//  Estimated: `7010`
-		// Minimum execution time: 1_593_697_000 picoseconds.
-		Weight::from_parts(150_335_332, 7010)
-			// Standard Error: 34
-			.saturating_add(Weight::from_parts(19_710, 0).saturating_mul(c.into()))
-			// Standard Error: 13
-			.saturating_add(Weight::from_parts(5_466, 0).saturating_mul(i.into()))
+		// Minimum execution time: 1_319_981_000 picoseconds.
+		Weight::from_parts(208_776_560, 7010)
+			// Standard Error: 47
+			.saturating_add(Weight::from_parts(19_063, 0).saturating_mul(c.into()))
+			// Standard Error: 18
+			.saturating_add(Weight::from_parts(4_327, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Storage: `Balances::Holds` (r:2 w:2)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
+	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
+	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
+	/// Storage: `Revive::AccountInfoOf` (r:2 w:2)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Revive::PristineCode` (r:0 w:1)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(262180), added: 264655, mode: `Measured`)
+	/// The range of component `c` is `[0, 104857]`.
+	/// The range of component `i` is `[0, 262144]`.
+	/// The range of component `d` is `[0, 1]`.
+	fn eth_instantiate_with_code(c: u32, i: u32, d: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `1122`
+		//  Estimated: `7062 + d * (2475 ±0)`
+		// Minimum execution time: 352_464_000 picoseconds.
+		Weight::from_parts(144_030_696, 7062)
+			// Standard Error: 32
+			.saturating_add(Weight::from_parts(15_029, 0).saturating_mul(c.into()))
+			// Standard Error: 12
+			.saturating_add(Weight::from_parts(489, 0).saturating_mul(i.into()))
+			// Standard Error: 2_162_506
+			.saturating_add(Weight::from_parts(62_297_017, 0).saturating_mul(d.into()))
+			.saturating_add(RocksDbWeight::get().reads(7_u64))
+			.saturating_add(RocksDbWeight::get().reads((2_u64).saturating_mul(d.into())))
+			.saturating_add(RocksDbWeight::get().writes(6_u64))
+			.saturating_add(RocksDbWeight::get().writes((2_u64).saturating_mul(d.into())))
+			.saturating_add(Weight::from_parts(0, 2475).saturating_mul(d.into()))
+	}
+	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(262180), added: 264655, mode: `Measured`)
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
-	/// Storage: `Revive::ContractInfoOf` (r:1 w:1)
-	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(242), added: 2717, mode: `Measured`)
+	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Timestamp::Now` (r:1 w:0)
 	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
 	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
 	/// Storage: `Balances::Holds` (r:1 w:1)
-	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(409), added: 2884, mode: `Measured`)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	/// The range of component `i` is `[0, 262144]`.
 	fn instantiate(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1886`
-		//  Estimated: `5346`
-		// Minimum execution time: 155_867_000 picoseconds.
-		Weight::from_parts(88_055_300, 5346)
-			// Standard Error: 25
-			.saturating_add(Weight::from_parts(5_561, 0).saturating_mul(i.into()))
+		//  Measured:  `1912`
+		//  Estimated: `5348`
+		// Minimum execution time: 157_257_000 picoseconds.
+		Weight::from_parts(145_200_684, 5348)
+			// Standard Error: 15
+			.saturating_add(Weight::from_parts(4_497, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:2 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
-	/// Storage: `Revive::ContractInfoOf` (r:1 w:1)
-	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(242), added: 2717, mode: `Measured`)
+	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
@@ -1297,17 +1411,44 @@ 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:  `1812`
-		//  Estimated: `7752`
-		// Minimum execution time: 85_908_000 picoseconds.
-		Weight::from_parts(87_953_000, 7752)
+		//  Measured:  `1853`
+		//  Estimated: `7793`
+		// Minimum execution time: 85_755_000 picoseconds.
+		Weight::from_parts(87_660_000, 7793)
+			.saturating_add(RocksDbWeight::get().reads(7_u64))
+			.saturating_add(RocksDbWeight::get().writes(2_u64))
+	}
+	/// Storage: `Revive::OriginalAccount` (r:2 w:0)
+	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
+	/// Storage: `Revive::AccountInfoOf` (r:2 w:2)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
+	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Storage: `Revive::PristineCode` (r:1 w:0)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(262180), added: 264655, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// The range of component `d` is `[0, 1]`.
+	fn eth_call(d: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `1853`
+		//  Estimated: `7793 + d * (2475 ±0)`
+		// Minimum execution time: 84_102_000 picoseconds.
+		Weight::from_parts(87_454_814, 7793)
+			// Standard Error: 355_862
+			.saturating_add(Weight::from_parts(60_086_885, 0).saturating_mul(d.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
+			.saturating_add(RocksDbWeight::get().reads((2_u64).saturating_mul(d.into())))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
+			.saturating_add(RocksDbWeight::get().writes((2_u64).saturating_mul(d.into())))
+			.saturating_add(Weight::from_parts(0, 2475).saturating_mul(d.into()))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	/// Storage: `Balances::Holds` (r:1 w:1)
-	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(409), added: 2884, mode: `Measured`)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:0 w:1)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(262180), added: 264655, mode: `Measured`)
 	/// The range of component `c` is `[0, 104857]`.
@@ -1315,64 +1456,64 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `505`
 		//  Estimated: `3970`
-		// Minimum execution time: 51_305_000 picoseconds.
-		Weight::from_parts(27_197_599, 3970)
-			// Standard Error: 20
-			.saturating_add(Weight::from_parts(14_721, 0).saturating_mul(c.into()))
+		// Minimum execution time: 49_266_000 picoseconds.
+		Weight::from_parts(36_681_890, 3970)
+			// Standard Error: 18
+			.saturating_add(Weight::from_parts(14_655, 0).saturating_mul(c.into()))
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	/// Storage: `Balances::Holds` (r:1 w:1)
-	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(409), added: 2884, mode: `Measured`)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:0 w:1)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(262180), added: 264655, mode: `Measured`)
 	fn remove_code() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `658`
 		//  Estimated: `4123`
-		// Minimum execution time: 41_900_000 picoseconds.
-		Weight::from_parts(42_985_000, 4123)
+		// Minimum execution time: 40_426_000 picoseconds.
+		Weight::from_parts(41_134_000, 4123)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
-	/// Storage: `Revive::ContractInfoOf` (r:1 w:1)
-	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(242), added: 2717, mode: `Measured`)
+	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:2 w:2)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	fn set_code() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `528`
-		//  Estimated: `6468`
-		// Minimum execution time: 20_254_000 picoseconds.
-		Weight::from_parts(21_122_000, 6468)
+		//  Measured:  `530`
+		//  Estimated: `6470`
+		// Minimum execution time: 19_768_000 picoseconds.
+		Weight::from_parts(20_504_000, 6470)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:1)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
 	/// Storage: `Balances::Holds` (r:1 w:1)
-	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(409), added: 2884, mode: `Measured`)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	fn map_account() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `813`
 		//  Estimated: `4278`
-		// Minimum execution time: 50_406_000 picoseconds.
-		Weight::from_parts(51_939_000, 4278)
+		// Minimum execution time: 48_814_000 picoseconds.
+		Weight::from_parts(49_994_000, 4278)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
 	/// Storage: `Balances::Holds` (r:1 w:1)
-	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(409), added: 2884, mode: `Measured`)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	/// Storage: `Revive::OriginalAccount` (r:0 w:1)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
 	fn unmap_account() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `395`
 		//  Estimated: `3860`
-		// Minimum execution time: 37_679_000 picoseconds.
-		Weight::from_parts(39_183_000, 3860)
+		// Minimum execution time: 36_296_000 picoseconds.
+		Weight::from_parts(37_551_000, 3860)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -1384,8 +1525,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `145`
 		//  Estimated: `3610`
-		// Minimum execution time: 12_684_000 picoseconds.
-		Weight::from_parts(13_240_000, 3610)
+		// Minimum execution time: 12_732_000 picoseconds.
+		Weight::from_parts(13_474_000, 3610)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 	}
 	/// The range of component `r` is `[0, 1600]`.
@@ -1393,139 +1534,141 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_583_000 picoseconds.
-		Weight::from_parts(8_416_964, 0)
-			// Standard Error: 170
-			.saturating_add(Weight::from_parts(164_523, 0).saturating_mul(r.into()))
+		// Minimum execution time: 6_947_000 picoseconds.
+		Weight::from_parts(7_549_381, 0)
+			// Standard Error: 190
+			.saturating_add(Weight::from_parts(186_127, 0).saturating_mul(r.into()))
 	}
 	fn seal_caller() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 199_000 picoseconds.
-		Weight::from_parts(233_000, 0)
+		// Minimum execution time: 364_000 picoseconds.
+		Weight::from_parts(417_000, 0)
 	}
 	fn seal_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 184_000 picoseconds.
-		Weight::from_parts(206_000, 0)
+		// Minimum execution time: 318_000 picoseconds.
+		Weight::from_parts(349_000, 0)
 	}
-	/// Storage: `Revive::ContractInfoOf` (r:1 w:0)
-	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(242), added: 2717, mode: `Measured`)
+	/// Storage: `Revive::AccountInfoOf` (r:1 w:0)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	fn seal_is_contract() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `306`
-		//  Estimated: `3771`
-		// Minimum execution time: 8_270_000 picoseconds.
-		Weight::from_parts(8_700_000, 3771)
+		//  Measured:  `403`
+		//  Estimated: `3868`
+		// Minimum execution time: 8_693_000 picoseconds.
+		Weight::from_parts(9_070_000, 3868)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
 	fn seal_to_account_id() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `538`
-		//  Estimated: `4003`
-		// Minimum execution time: 9_364_000 picoseconds.
-		Weight::from_parts(9_672_000, 4003)
+		//  Measured:  `571`
+		//  Estimated: `4036`
+		// Minimum execution time: 9_465_000 picoseconds.
+		Weight::from_parts(9_705_000, 4036)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
-	/// Storage: `Revive::ContractInfoOf` (r:1 w:0)
-	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(242), added: 2717, mode: `Measured`)
+	/// Storage: `Revive::AccountInfoOf` (r:1 w:0)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	fn seal_code_hash() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `402`
-		//  Estimated: `3867`
-		// Minimum execution time: 9_183_000 picoseconds.
-		Weight::from_parts(9_609_000, 3867)
+		//  Measured:  `403`
+		//  Estimated: `3868`
+		// Minimum execution time: 8_735_000 picoseconds.
+		Weight::from_parts(8_967_000, 3868)
 			.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: 131_000 picoseconds.
-		Weight::from_parts(176_000, 0)
+		// Minimum execution time: 238_000 picoseconds.
+		Weight::from_parts(270_000, 0)
 	}
-	/// Storage: `Revive::ContractInfoOf` (r:1 w:0)
-	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(242), added: 2717, mode: `Measured`)
+	/// Storage: `Revive::AccountInfoOf` (r:1 w:0)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	fn seal_code_size() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `472`
-		//  Estimated: `3937`
-		// Minimum execution time: 12_217_000 picoseconds.
-		Weight::from_parts(13_005_000, 3937)
+		//  Measured:  `474`
+		//  Estimated: `3939`
+		// Minimum execution time: 11_885_000 picoseconds.
+		Weight::from_parts(12_387_000, 3939)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 	}
 	fn seal_caller_is_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 208_000 picoseconds.
-		Weight::from_parts(228_000, 0)
+		// Minimum execution time: 284_000 picoseconds.
+		Weight::from_parts(335_000, 0)
 	}
 	fn seal_caller_is_root() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 170_000 picoseconds.
-		Weight::from_parts(203_000, 0)
+		// Minimum execution time: 244_000 picoseconds.
+		Weight::from_parts(278_000, 0)
 	}
 	fn seal_address() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 182_000 picoseconds.
-		Weight::from_parts(204_000, 0)
+		// Minimum execution time: 256_000 picoseconds.
+		Weight::from_parts(306_000, 0)
 	}
 	fn seal_weight_left() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 576_000 picoseconds.
-		Weight::from_parts(637_000, 0)
+		// Minimum execution time: 621_000 picoseconds.
+		Weight::from_parts(681_000, 0)
 	}
 	fn seal_ref_time_left() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 131_000 picoseconds.
-		Weight::from_parts(168_000, 0)
+		// Minimum execution time: 239_000 picoseconds.
+		Weight::from_parts(268_000, 0)
 	}
 	fn seal_balance() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `103`
+		//  Measured:  `469`
 		//  Estimated: `0`
-		// Minimum execution time: 4_466_000 picoseconds.
-		Weight::from_parts(4_813_000, 0)
+		// Minimum execution time: 11_459_000 picoseconds.
+		Weight::from_parts(11_955_000, 0)
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
 	/// Storage: `System::Account` (r:1 w:0)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Revive::AccountInfoOf` (r:1 w:0)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	fn seal_balance_of() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `517`
-		//  Estimated: `3982`
-		// Minimum execution time: 8_786_000 picoseconds.
-		Weight::from_parts(9_450_000, 3982)
-			.saturating_add(RocksDbWeight::get().reads(2_u64))
+		//  Measured:  `590`
+		//  Estimated: `4055`
+		// Minimum execution time: 12_943_000 picoseconds.
+		Weight::from_parts(13_436_000, 4055)
+			.saturating_add(RocksDbWeight::get().reads(3_u64))
 	}
 	/// Storage: `Revive::ImmutableDataOf` (r:1 w:0)
 	/// Proof: `Revive::ImmutableDataOf` (`max_values`: None, `max_size`: Some(4118), added: 6593, mode: `Measured`)
 	/// The range of component `n` is `[1, 4096]`.
 	fn seal_get_immutable_data(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `238 + n * (1 ±0)`
-		//  Estimated: `3703 + n * (1 ±0)`
-		// Minimum execution time: 5_796_000 picoseconds.
-		Weight::from_parts(6_399_722, 3703)
-			// Standard Error: 4
-			.saturating_add(Weight::from_parts(581, 0).saturating_mul(n.into()))
+		//  Measured:  `271 + n * (1 ±0)`
+		//  Estimated: `3736 + n * (1 ±0)`
+		// Minimum execution time: 5_671_000 picoseconds.
+		Weight::from_parts(6_350_878, 3736)
+			// Standard Error: 6
+			.saturating_add(Weight::from_parts(620, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -1536,67 +1679,67 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_950_000 picoseconds.
-		Weight::from_parts(2_072_690, 0)
-			// Standard Error: 1
-			.saturating_add(Weight::from_parts(633, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_765_000 picoseconds.
+		Weight::from_parts(2_040_371, 0)
+			// Standard Error: 2
+			.saturating_add(Weight::from_parts(685, 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: 151_000 picoseconds.
-		Weight::from_parts(170_000, 0)
+		// Minimum execution time: 249_000 picoseconds.
+		Weight::from_parts(274_000, 0)
 	}
 	fn seal_minimum_balance() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 127_000 picoseconds.
-		Weight::from_parts(151_000, 0)
+		// Minimum execution time: 260_000 picoseconds.
+		Weight::from_parts(290_000, 0)
 	}
 	fn seal_return_data_size() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 112_000 picoseconds.
-		Weight::from_parts(149_000, 0)
+		// Minimum execution time: 226_000 picoseconds.
+		Weight::from_parts(271_000, 0)
 	}
 	fn seal_call_data_size() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 124_000 picoseconds.
-		Weight::from_parts(154_000, 0)
+		// Minimum execution time: 228_000 picoseconds.
+		Weight::from_parts(277_000, 0)
 	}
 	fn seal_gas_limit() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 331_000 picoseconds.
-		Weight::from_parts(370_000, 0)
+		// Minimum execution time: 415_000 picoseconds.
+		Weight::from_parts(456_000, 0)
 	}
 	fn seal_gas_price() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 137_000 picoseconds.
-		Weight::from_parts(163_000, 0)
+		// Minimum execution time: 214_000 picoseconds.
+		Weight::from_parts(246_000, 0)
 	}
 	fn seal_base_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 130_000 picoseconds.
-		Weight::from_parts(154_000, 0)
+		// Minimum execution time: 236_000 picoseconds.
+		Weight::from_parts(273_000, 0)
 	}
 	fn seal_block_number() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 150_000 picoseconds.
-		Weight::from_parts(167_000, 0)
+		// Minimum execution time: 236_000 picoseconds.
+		Weight::from_parts(278_000, 0)
 	}
 	/// Storage: `Session::Validators` (r:1 w:0)
 	/// Proof: `Session::Validators` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -1604,8 +1747,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `141`
 		//  Estimated: `1626`
-		// Minimum execution time: 19_205_000 picoseconds.
-		Weight::from_parts(19_687_000, 1626)
+		// Minimum execution time: 20_669_000 picoseconds.
+		Weight::from_parts(20_950_000, 1626)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `System::BlockHash` (r:1 w:0)
@@ -1614,60 +1757,60 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `30`
 		//  Estimated: `3495`
-		// Minimum execution time: 3_333_000 picoseconds.
-		Weight::from_parts(3_522_000, 3495)
+		// Minimum execution time: 3_476_000 picoseconds.
+		Weight::from_parts(3_697_000, 3495)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	fn seal_now() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 126_000 picoseconds.
-		Weight::from_parts(156_000, 0)
+		// Minimum execution time: 223_000 picoseconds.
+		Weight::from_parts(257_000, 0)
 	}
 	fn seal_weight_to_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_364_000 picoseconds.
-		Weight::from_parts(1_477_000, 0)
+		// Minimum execution time: 1_476_000 picoseconds.
+		Weight::from_parts(1_617_000, 0)
 	}
 	/// The range of component `n` is `[0, 262140]`.
 	fn seal_copy_to_contract(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 309_000 picoseconds.
-		Weight::from_parts(603_516, 0)
+		// Minimum execution time: 358_000 picoseconds.
+		Weight::from_parts(561_222, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(294, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(259, 0).saturating_mul(n.into()))
 	}
 	fn seal_call_data_load() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 120_000 picoseconds.
-		Weight::from_parts(142_000, 0)
+		// Minimum execution time: 232_000 picoseconds.
+		Weight::from_parts(270_000, 0)
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn seal_call_data_copy(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 121_000 picoseconds.
-		Weight::from_parts(125_420, 0)
+		// Minimum execution time: 219_000 picoseconds.
+		Weight::from_parts(77_326, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(149, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(115, 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: 150_000 picoseconds.
-		Weight::from_parts(445_753, 0)
+		// Minimum execution time: 255_000 picoseconds.
+		Weight::from_parts(489_092, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(296, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(259, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
@@ -1681,10 +1824,10 @@ impl WeightInfo for () {
 	/// Proof: `Revive::ImmutableDataOf` (`max_values`: None, `max_size`: Some(4118), added: 6593, mode: `Measured`)
 	fn seal_terminate() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `585`
-		//  Estimated: `4050`
-		// Minimum execution time: 16_990_000 picoseconds.
-		Weight::from_parts(17_538_000, 4050)
+		//  Measured:  `582`
+		//  Estimated: `4047`
+		// Minimum execution time: 15_923_000 picoseconds.
+		Weight::from_parts(16_445_000, 4047)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -1694,12 +1837,12 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_218_000 picoseconds.
-		Weight::from_parts(4_143_231, 0)
-			// Standard Error: 3_302
-			.saturating_add(Weight::from_parts(235_681, 0).saturating_mul(t.into()))
-			// Standard Error: 36
-			.saturating_add(Weight::from_parts(1_298, 0).saturating_mul(n.into()))
+		// Minimum execution time: 4_273_000 picoseconds.
+		Weight::from_parts(4_192_452, 0)
+			// Standard Error: 2_820
+			.saturating_add(Weight::from_parts(194_732, 0).saturating_mul(t.into()))
+			// Standard Error: 31
+			.saturating_add(Weight::from_parts(1_218, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
 	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -1707,8 +1850,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `648`
 		//  Estimated: `648`
-		// Minimum execution time: 6_942_000 picoseconds.
-		Weight::from_parts(7_454_000, 648)
+		// Minimum execution time: 7_138_000 picoseconds.
+		Weight::from_parts(7_691_000, 648)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -1717,8 +1860,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `10658`
 		//  Estimated: `10658`
-		// Minimum execution time: 41_245_000 picoseconds.
-		Weight::from_parts(42_033_000, 10658)
+		// Minimum execution time: 40_853_000 picoseconds.
+		Weight::from_parts(41_403_000, 10658)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -1727,8 +1870,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `648`
 		//  Estimated: `648`
-		// Minimum execution time: 7_877_000 picoseconds.
-		Weight::from_parts(8_376_000, 648)
+		// Minimum execution time: 8_258_000 picoseconds.
+		Weight::from_parts(8_676_000, 648)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -1738,8 +1881,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `10658`
 		//  Estimated: `10658`
-		// Minimum execution time: 42_844_000 picoseconds.
-		Weight::from_parts(43_778_000, 10658)
+		// Minimum execution time: 42_393_000 picoseconds.
+		Weight::from_parts(43_592_000, 10658)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -1751,12 +1894,12 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + o * (1 ±0)`
 		//  Estimated: `247 + o * (1 ±0)`
-		// Minimum execution time: 8_517_000 picoseconds.
-		Weight::from_parts(9_327_675, 247)
-			// Standard Error: 52
-			.saturating_add(Weight::from_parts(407, 0).saturating_mul(n.into()))
-			// Standard Error: 52
-			.saturating_add(Weight::from_parts(434, 0).saturating_mul(o.into()))
+		// Minimum execution time: 8_740_000 picoseconds.
+		Weight::from_parts(9_229_170, 247)
+			// Standard Error: 62
+			.saturating_add(Weight::from_parts(920, 0).saturating_mul(n.into()))
+			// Standard Error: 62
+			.saturating_add(Weight::from_parts(972, 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()))
@@ -1768,10 +1911,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 8_144_000 picoseconds.
-		Weight::from_parts(9_105_918, 247)
-			// Standard Error: 72
-			.saturating_add(Weight::from_parts(684, 0).saturating_mul(n.into()))
+		// Minimum execution time: 8_772_000 picoseconds.
+		Weight::from_parts(9_596_651, 247)
+			// Standard Error: 73
+			.saturating_add(Weight::from_parts(524, 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()))
@@ -1783,10 +1926,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 7_914_000 picoseconds.
-		Weight::from_parts(8_683_792, 247)
-			// Standard Error: 65
-			.saturating_add(Weight::from_parts(1_267, 0).saturating_mul(n.into()))
+		// Minimum execution time: 7_905_000 picoseconds.
+		Weight::from_parts(8_856_432, 247)
+			// Standard Error: 78
+			.saturating_add(Weight::from_parts(1_795, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -1797,10 +1940,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 7_287_000 picoseconds.
-		Weight::from_parts(8_027_630, 247)
-			// Standard Error: 56
-			.saturating_add(Weight::from_parts(698, 0).saturating_mul(n.into()))
+		// Minimum execution time: 7_408_000 picoseconds.
+		Weight::from_parts(8_288_564, 247)
+			// Standard Error: 65
+			.saturating_add(Weight::from_parts(1_004, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -1811,10 +1954,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 8_870_000 picoseconds.
-		Weight::from_parts(9_939_099, 247)
-			// Standard Error: 225
-			.saturating_add(Weight::from_parts(832, 0).saturating_mul(n.into()))
+		// Minimum execution time: 9_053_000 picoseconds.
+		Weight::from_parts(10_110_316, 247)
+			// Standard Error: 200
+			.saturating_add(Weight::from_parts(1_330, 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()))
@@ -1823,36 +1966,36 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_306_000 picoseconds.
-		Weight::from_parts(1_404_000, 0)
+		// Minimum execution time: 1_503_000 picoseconds.
+		Weight::from_parts(1_573_000, 0)
 	}
 	fn set_transient_storage_full() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_689_000 picoseconds.
-		Weight::from_parts(1_811_000, 0)
+		// Minimum execution time: 1_848_000 picoseconds.
+		Weight::from_parts(1_969_000, 0)
 	}
 	fn get_transient_storage_empty() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_302_000 picoseconds.
-		Weight::from_parts(1_387_000, 0)
+		// Minimum execution time: 1_447_000 picoseconds.
+		Weight::from_parts(1_523_000, 0)
 	}
 	fn get_transient_storage_full() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_450_000 picoseconds.
-		Weight::from_parts(1_531_000, 0)
+		// Minimum execution time: 1_560_000 picoseconds.
+		Weight::from_parts(1_681_000, 0)
 	}
 	fn rollback_transient_storage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_003_000 picoseconds.
-		Weight::from_parts(1_083_000, 0)
+		// Minimum execution time: 1_079_000 picoseconds.
+		Weight::from_parts(1_163_000, 0)
 	}
 	/// The range of component `n` is `[0, 416]`.
 	/// The range of component `o` is `[0, 416]`.
@@ -1860,258 +2003,273 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_147_000 picoseconds.
-		Weight::from_parts(2_400_128, 0)
-			// Standard Error: 15
-			.saturating_add(Weight::from_parts(305, 0).saturating_mul(n.into()))
-			// Standard Error: 15
-			.saturating_add(Weight::from_parts(275, 0).saturating_mul(o.into()))
+		// Minimum execution time: 2_151_000 picoseconds.
+		Weight::from_parts(2_362_287, 0)
+			// Standard Error: 14
+			.saturating_add(Weight::from_parts(336, 0).saturating_mul(n.into()))
+			// Standard Error: 14
+			.saturating_add(Weight::from_parts(322, 0).saturating_mul(o.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_clear_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_941_000 picoseconds.
-		Weight::from_parts(2_245_468, 0)
-			// Standard Error: 18
-			.saturating_add(Weight::from_parts(407, 0).saturating_mul(n.into()))
+		// Minimum execution time: 2_051_000 picoseconds.
+		Weight::from_parts(2_347_102, 0)
+			// Standard Error: 22
+			.saturating_add(Weight::from_parts(279, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_get_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_738_000 picoseconds.
-		Weight::from_parts(1_944_507, 0)
-			// Standard Error: 16
-			.saturating_add(Weight::from_parts(275, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_772_000 picoseconds.
+		Weight::from_parts(1_994_332, 0)
+			// Standard Error: 18
+			.saturating_add(Weight::from_parts(407, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_contains_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_521_000 picoseconds.
-		Weight::from_parts(1_725_877, 0)
-			// Standard Error: 13
-			.saturating_add(Weight::from_parts(184, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_669_000 picoseconds.
+		Weight::from_parts(1_841_322, 0)
+			// Standard Error: 15
+			.saturating_add(Weight::from_parts(244, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_take_transient_storage(_n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_366_000 picoseconds.
-		Weight::from_parts(2_590_846, 0)
+		// Minimum execution time: 2_468_000 picoseconds.
+		Weight::from_parts(2_699_464, 0)
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
-	/// Storage: `Revive::ContractInfoOf` (r:1 w:0)
-	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(242), added: 2717, mode: `Measured`)
+	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(262180), added: 264655, mode: `Measured`)
-	/// Storage: `System::Account` (r:1 w:0)
+	/// Storage: `System::Account` (r:2 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
 	/// The range of component `t` is `[0, 1]`.
+	/// The range of component `d` is `[0, 1]`.
 	/// The range of component `i` is `[0, 262144]`.
-	fn seal_call(t: u32, _d: u32, i: u32) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1545 + t * (206 ±0)`
-		//  Estimated: `5010 + t * (2608 ±0)`
-		// Minimum execution time: 34_508_000 picoseconds.
-		Weight::from_parts(35_724_702, 5010)
-			// Standard Error: 42_504
-			.saturating_add(Weight::from_parts(5_295_834, 0).saturating_mul(t.into()))
+	fn seal_call(t: u32, d: u32, i: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `1891`
+		//  Estimated: `5356 + d * (2475 ±0)`
+		// Minimum execution time: 81_428_000 picoseconds.
+		Weight::from_parts(66_368_659, 5356)
+			// Standard Error: 157_294
+			.saturating_add(Weight::from_parts(16_457_009, 0).saturating_mul(t.into()))
+			// Standard Error: 157_294
+			.saturating_add(Weight::from_parts(55_683_287, 0).saturating_mul(d.into()))
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(2, 0).saturating_mul(i.into()))
-			.saturating_add(RocksDbWeight::get().reads(4_u64))
-			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(t.into())))
+			.saturating_add(Weight::from_parts(6, 0).saturating_mul(i.into()))
+			.saturating_add(RocksDbWeight::get().reads(5_u64))
+			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(d.into())))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
-			.saturating_add(Weight::from_parts(0, 2608).saturating_mul(t.into()))
+			.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(t.into())))
+			.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(d.into())))
+			.saturating_add(Weight::from_parts(0, 2475).saturating_mul(d.into()))
 	}
-	/// Storage: `Revive::ContractInfoOf` (r:1 w:1)
-	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(242), added: 2717, mode: `Measured`)
+	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `System::Account` (r:1 w:0)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
 	/// The range of component `d` is `[0, 1]`.
 	/// The range of component `i` is `[0, 262144]`.
 	fn seal_call_precompile(d: u32, i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `0 + d * (453 ±0)`
-		//  Estimated: `1959 + d * (1959 ±0)`
-		// Minimum execution time: 19_412_000 picoseconds.
-		Weight::from_parts(3_906_222, 1959)
-			// Standard Error: 378_943
-			.saturating_add(Weight::from_parts(16_405_804, 0).saturating_mul(d.into()))
-			// Standard Error: 2
-			.saturating_add(Weight::from_parts(1_205, 0).saturating_mul(i.into()))
+		//  Measured:  `366 + d * (212 ±0)`
+		//  Estimated: `2022 + d * (2022 ±0)`
+		// Minimum execution time: 22_771_000 picoseconds.
+		Weight::from_parts(10_343_634, 2022)
+			// Standard Error: 233_557
+			.saturating_add(Weight::from_parts(13_939_188, 0).saturating_mul(d.into()))
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(387, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads((2_u64).saturating_mul(d.into())))
 			.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(d.into())))
-			.saturating_add(Weight::from_parts(0, 1959).saturating_mul(d.into()))
+			.saturating_add(Weight::from_parts(0, 2022).saturating_mul(d.into()))
 	}
-	/// Storage: `Revive::ContractInfoOf` (r:1 w:0)
-	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(242), added: 2717, mode: `Measured`)
+	/// Storage: `Revive::AccountInfoOf` (r:1 w:0)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
 	/// 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:  `1236`
-		//  Estimated: `4701`
-		// Minimum execution time: 28_834_000 picoseconds.
-		Weight::from_parts(30_072_000, 4701)
+		//  Measured:  `1362`
+		//  Estimated: `4827`
+		// Minimum execution time: 31_704_000 picoseconds.
+		Weight::from_parts(32_992_000, 4827)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(262180), added: 264655, mode: `Measured`)
-	/// Storage: `Revive::ContractInfoOf` (r:1 w:1)
-	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(242), added: 2717, mode: `Measured`)
-	/// Storage: `System::Account` (r:1 w:1)
+	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
+	/// Storage: `System::Account` (r:2 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// The range of component `t` is `[0, 1]`.
+	/// The range of component `d` is `[0, 1]`.
 	/// The range of component `i` is `[0, 262144]`.
-	fn seal_instantiate(i: u32, _d: u32) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1260`
-		//  Estimated: `4728`
-		// Minimum execution time: 112_787_000 picoseconds.
-		Weight::from_parts(105_258_744, 4728)
+	fn seal_instantiate(t: u32, d: u32, i: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `1341`
+		//  Estimated: `4801 + d * (2500 ±1) + t * (25 ±1)`
+		// Minimum execution time: 169_945_000 picoseconds.
+		Weight::from_parts(48_476_960, 4801)
+			// Standard Error: 1_790_324
+			.saturating_add(Weight::from_parts(12_953_884, 0).saturating_mul(t.into()))
+			// Standard Error: 1_790_324
+			.saturating_add(Weight::from_parts(87_463_666, 0).saturating_mul(d.into()))
 			// Standard Error: 10
-			.saturating_add(Weight::from_parts(4_163, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(4_318, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
+			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(d.into())))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
+			.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(d.into())))
+			.saturating_add(Weight::from_parts(0, 2500).saturating_mul(d.into()))
+			.saturating_add(Weight::from_parts(0, 25).saturating_mul(t.into()))
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn sha2_256(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 792_000 picoseconds.
-		Weight::from_parts(4_505_628, 0)
+		// Minimum execution time: 1_053_000 picoseconds.
+		Weight::from_parts(5_469_095, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_285, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(1_284, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn identity(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 300_000 picoseconds.
-		Weight::from_parts(468_743, 0)
-			// Standard Error: 0
-			.saturating_add(Weight::from_parts(148, 0).saturating_mul(n.into()))
+		// Minimum execution time: 670_000 picoseconds.
+		Weight::from_parts(562_181, 0)
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(118, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn ripemd_160(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 744_000 picoseconds.
-		Weight::from_parts(771_000, 0)
+		// Minimum execution time: 1_126_000 picoseconds.
+		Weight::from_parts(2_125_003, 0)
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(3_928, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(3_890, 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_002_000 picoseconds.
-		Weight::from_parts(3_889_121, 0)
+		// Minimum execution time: 1_103_000 picoseconds.
+		Weight::from_parts(5_893_654, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(3_666, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(3_646, 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: 562_000 picoseconds.
-		Weight::from_parts(3_823_066, 0)
+		// Minimum execution time: 602_000 picoseconds.
+		Weight::from_parts(4_564_770, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_569, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(1_577, 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: 543_000 picoseconds.
-		Weight::from_parts(3_582_133, 0)
-			// Standard Error: 2
-			.saturating_add(Weight::from_parts(1_576, 0).saturating_mul(n.into()))
+		// Minimum execution time: 624_000 picoseconds.
+		Weight::from_parts(4_151_646, 0)
+			// Standard Error: 3
+			.saturating_add(Weight::from_parts(1_591, 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_702_000 picoseconds.
-		Weight::from_parts(30_839_817, 0)
+		// Minimum execution time: 43_030_000 picoseconds.
+		Weight::from_parts(34_794_207, 0)
 			// Standard Error: 10
-			.saturating_add(Weight::from_parts(5_086, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(5_070, 0).saturating_mul(n.into()))
 	}
 	fn ecdsa_recover() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 44_770_000 picoseconds.
-		Weight::from_parts(45_791_000, 0)
+		// Minimum execution time: 45_517_000 picoseconds.
+		Weight::from_parts(46_666_000, 0)
 	}
 	fn bn128_add() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 15_705_000 picoseconds.
-		Weight::from_parts(16_885_000, 0)
+		// Minimum execution time: 15_541_000 picoseconds.
+		Weight::from_parts(16_507_000, 0)
 	}
 	fn bn128_mul() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_018_103_000 picoseconds.
-		Weight::from_parts(1_023_315_000, 0)
+		// Minimum execution time: 986_307_000 picoseconds.
+		Weight::from_parts(1_026_600_000, 0)
 	}
 	/// The range of component `n` is `[0, 20]`.
 	fn bn128_pairing(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 378_000 picoseconds.
-		Weight::from_parts(5_119_381_361, 0)
-			// Standard Error: 10_821_771
-			.saturating_add(Weight::from_parts(6_202_434_383, 0).saturating_mul(n.into()))
+		// Minimum execution time: 743_000 picoseconds.
+		Weight::from_parts(4_879_987_815, 0)
+			// Standard Error: 11_985_618
+			.saturating_add(Weight::from_parts(6_027_007_050, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 1200]`.
 	fn blake2f(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 435_000 picoseconds.
-		Weight::from_parts(658_540, 0)
-			// Standard Error: 6
-			.saturating_add(Weight::from_parts(22_679, 0).saturating_mul(n.into()))
+		// Minimum execution time: 861_000 picoseconds.
+		Weight::from_parts(1_051_090, 0)
+			// Standard Error: 7
+			.saturating_add(Weight::from_parts(23_382, 0).saturating_mul(n.into()))
 	}
 	fn seal_ecdsa_to_eth_address() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 12_639_000 picoseconds.
-		Weight::from_parts(12_782_000, 0)
+		// Minimum execution time: 12_800_000 picoseconds.
+		Weight::from_parts(12_970_000, 0)
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	fn seal_set_code_hash() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `300`
-		//  Estimated: `3765`
-		// Minimum execution time: 12_210_000 picoseconds.
-		Weight::from_parts(12_747_000, 3765)
+		//  Measured:  `296`
+		//  Estimated: `3761`
+		// Minimum execution time: 9_436_000 picoseconds.
+		Weight::from_parts(9_995_000, 3761)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -2120,19 +2278,19 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 11_244_000 picoseconds.
-		Weight::from_parts(48_207_913, 0)
-			// Standard Error: 495
-			.saturating_add(Weight::from_parts(125_133, 0).saturating_mul(r.into()))
+		// Minimum execution time: 12_006_000 picoseconds.
+		Weight::from_parts(49_478_841, 0)
+			// Standard Error: 816
+			.saturating_add(Weight::from_parts(134_226, 0).saturating_mul(r.into()))
 	}
 	/// The range of component `r` is `[0, 100000]`.
 	fn instr_empty_loop(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_776_000 picoseconds.
-		Weight::from_parts(6_412_428, 0)
-			// Standard Error: 17
-			.saturating_add(Weight::from_parts(72_988, 0).saturating_mul(r.into()))
+		// Minimum execution time: 2_661_000 picoseconds.
+		Weight::from_parts(7_913_108, 0)
+			// Standard Error: 23
+			.saturating_add(Weight::from_parts(72_528, 0).saturating_mul(r.into()))
 	}
 }

From 8c21f11475c806c749c9aae308f90fc4823966a6 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Sun, 6 Jul 2025 21:28:18 +0200
Subject: [PATCH 022/186] Fix seal_call benchmark

---
 substrate/frame/revive/src/benchmarking.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/substrate/frame/revive/src/benchmarking.rs b/substrate/frame/revive/src/benchmarking.rs
index 93e698a0082c..2cb98a46c459 100644
--- a/substrate/frame/revive/src/benchmarking.rs
+++ b/substrate/frame/revive/src/benchmarking.rs
@@ -1580,6 +1580,7 @@ mod benchmarks {
 		// This is why we set the input here instead of passig it as pointer to the `bench_call`.
 		setup.set_data(vec![42; i as usize]);
 		setup.set_origin(Origin::from_account_id(setup.contract().account_id.clone()));
+		setup.set_balance(value + Pallet::<T>::min_balance());
 
 		let (mut ext, _) = setup.ext();
 		let mut runtime = crate::vm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
@@ -1599,7 +1600,7 @@ mod benchmarks {
 			);
 		}
 
-		assert_ok!(result);
+		assert_eq!(result.unwrap(), ReturnErrorCode::Success);
 	}
 
 	// d: 1 if the associated pre-compile has a contract info that needs to be loaded

From 8158cea6de2584f247c12c310686ebdc36e20122 Mon Sep 17 00:00:00 2001
From: "cmd[bot]" <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 6 Jul 2025 19:34:32 +0000
Subject: [PATCH 023/186] Update from github-actions[bot] running command
 'prdoc --audience runtime_dev --bump patch'

---
 prdoc/pr_9112.prdoc | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 prdoc/pr_9112.prdoc

diff --git a/prdoc/pr_9112.prdoc b/prdoc/pr_9112.prdoc
new file mode 100644
index 000000000000..25eb3100cf67
--- /dev/null
+++ b/prdoc/pr_9112.prdoc
@@ -0,0 +1,7 @@
+title: Fix seal_call benchmark
+doc:
+- audience: Runtime Dev
+  description: Fix seal_call benchmark, ensure that the call actually succeed
+crates:
+- name: pallet-revive
+  bump: patch

From 215e8a324aef2dad880151af8d68e1751a8a2f43 Mon Sep 17 00:00:00 2001
From: "cmd[bot]" <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 6 Jul 2025 20:12:51 +0000
Subject: [PATCH 024/186] Update from github-actions[bot] running command
 'bench --runtime dev --pallet pallet_revive'

---
 substrate/frame/revive/src/weights.rs | 1058 +++++++++++++------------
 1 file changed, 532 insertions(+), 526 deletions(-)

diff --git a/substrate/frame/revive/src/weights.rs b/substrate/frame/revive/src/weights.rs
index 602fc7057b86..fc8c60088f67 100644
--- a/substrate/frame/revive/src/weights.rs
+++ b/substrate/frame/revive/src/weights.rs
@@ -35,9 +35,9 @@
 //! Autogenerated weights for `pallet_revive`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
-//! DATE: 2025-04-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2025-07-06, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `cd6bf3e6c4c6`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! HOSTNAME: `b9a0bf5f296d`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
@@ -169,8 +169,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `147`
 		//  Estimated: `1632`
-		// Minimum execution time: 2_971_000 picoseconds.
-		Weight::from_parts(3_218_000, 1632)
+		// Minimum execution time: 2_968_000 picoseconds.
+		Weight::from_parts(3_185_000, 1632)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -180,10 +180,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `425 + k * (69 ±0)`
 		//  Estimated: `415 + k * (70 ±0)`
-		// Minimum execution time: 14_042_000 picoseconds.
-		Weight::from_parts(14_510_000, 415)
-			// Standard Error: 1_047
-			.saturating_add(Weight::from_parts(1_167_098, 0).saturating_mul(k.into()))
+		// Minimum execution time: 13_484_000 picoseconds.
+		Weight::from_parts(14_098_000, 415)
+			// Standard Error: 890
+			.saturating_add(Weight::from_parts(1_188_357, 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))
@@ -207,10 +207,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1178 + c * (1 ±0)`
 		//  Estimated: `7119 + c * (1 ±0)`
-		// Minimum execution time: 81_842_000 picoseconds.
-		Weight::from_parts(110_091_076, 7119)
-			// Standard Error: 12
-			.saturating_add(Weight::from_parts(2_123, 0).saturating_mul(c.into()))
+		// Minimum execution time: 79_236_000 picoseconds.
+		Weight::from_parts(116_626_812, 7119)
+			// Standard Error: 10
+			.saturating_add(Weight::from_parts(1_434, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(c.into()))
@@ -232,17 +232,17 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `4513`
 		//  Estimated: `10453`
-		// Minimum execution time: 121_768_000 picoseconds.
-		Weight::from_parts(126_040_712, 10453)
-			// Standard Error: 315_571
-			.saturating_add(Weight::from_parts(961_687, 0).saturating_mul(b.into()))
+		// Minimum execution time: 117_459_000 picoseconds.
+		Weight::from_parts(121_799_942, 10453)
+			// Standard Error: 302_002
+			.saturating_add(Weight::from_parts(673_857, 0).saturating_mul(b.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	/// Storage: `Balances::Holds` (r:2 w:2)
-	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(409), added: 2884, mode: `Measured`)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
 	/// Storage: `Revive::ContractInfoOf` (r:1 w:1)
@@ -259,12 +259,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1122`
 		//  Estimated: `7010`
-		// Minimum execution time: 1_593_697_000 picoseconds.
-		Weight::from_parts(150_335_332, 7010)
-			// Standard Error: 34
-			.saturating_add(Weight::from_parts(19_710, 0).saturating_mul(c.into()))
-			// Standard Error: 13
-			.saturating_add(Weight::from_parts(5_466, 0).saturating_mul(i.into()))
+		// Minimum execution time: 1_351_628_000 picoseconds.
+		Weight::from_parts(207_352_706, 7010)
+			// Standard Error: 49
+			.saturating_add(Weight::from_parts(18_927, 0).saturating_mul(c.into()))
+			// Standard Error: 19
+			.saturating_add(Weight::from_parts(4_377, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
@@ -281,16 +281,16 @@ 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`)
 	/// Storage: `Balances::Holds` (r:1 w:1)
-	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(409), added: 2884, mode: `Measured`)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	/// The range of component `i` is `[0, 262144]`.
 	fn instantiate(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1886`
-		//  Estimated: `5346`
-		// Minimum execution time: 155_867_000 picoseconds.
-		Weight::from_parts(88_055_300, 5346)
-			// Standard Error: 25
-			.saturating_add(Weight::from_parts(5_561, 0).saturating_mul(i.into()))
+		//  Estimated: `5365`
+		// Minimum execution time: 149_282_000 picoseconds.
+		Weight::from_parts(139_445_983, 5365)
+			// Standard Error: 14
+			.saturating_add(Weight::from_parts(4_487, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -308,17 +308,17 @@ 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:  `1812`
-		//  Estimated: `7752`
-		// Minimum execution time: 85_908_000 picoseconds.
-		Weight::from_parts(87_953_000, 7752)
+		//  Measured:  `1851`
+		//  Estimated: `7791`
+		// Minimum execution time: 83_373_000 picoseconds.
+		Weight::from_parts(85_877_000, 7791)
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	/// Storage: `Balances::Holds` (r:1 w:1)
-	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(409), added: 2884, mode: `Measured`)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:0 w:1)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(262180), added: 264655, mode: `Measured`)
 	/// The range of component `c` is `[0, 104857]`.
@@ -326,25 +326,25 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `505`
 		//  Estimated: `3970`
-		// Minimum execution time: 51_305_000 picoseconds.
-		Weight::from_parts(27_197_599, 3970)
-			// Standard Error: 20
-			.saturating_add(Weight::from_parts(14_721, 0).saturating_mul(c.into()))
+		// Minimum execution time: 48_786_000 picoseconds.
+		Weight::from_parts(40_005_445, 3970)
+			// Standard Error: 17
+			.saturating_add(Weight::from_parts(14_686, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	/// Storage: `Balances::Holds` (r:1 w:1)
-	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(409), added: 2884, mode: `Measured`)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:0 w:1)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(262180), added: 264655, mode: `Measured`)
 	fn remove_code() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `658`
 		//  Estimated: `4123`
-		// Minimum execution time: 41_900_000 picoseconds.
-		Weight::from_parts(42_985_000, 4123)
+		// Minimum execution time: 38_923_000 picoseconds.
+		Weight::from_parts(40_902_000, 4123)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -356,34 +356,34 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `528`
 		//  Estimated: `6468`
-		// Minimum execution time: 20_254_000 picoseconds.
-		Weight::from_parts(21_122_000, 6468)
+		// Minimum execution time: 20_518_000 picoseconds.
+		Weight::from_parts(21_168_000, 6468)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:1)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
 	/// Storage: `Balances::Holds` (r:1 w:1)
-	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(409), added: 2884, mode: `Measured`)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	fn map_account() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `813`
 		//  Estimated: `4278`
-		// Minimum execution time: 50_406_000 picoseconds.
-		Weight::from_parts(51_939_000, 4278)
+		// Minimum execution time: 49_960_000 picoseconds.
+		Weight::from_parts(51_281_000, 4278)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
 	/// Storage: `Balances::Holds` (r:1 w:1)
-	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(409), added: 2884, mode: `Measured`)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	/// Storage: `Revive::OriginalAccount` (r:0 w:1)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
 	fn unmap_account() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `395`
 		//  Estimated: `3860`
-		// Minimum execution time: 37_679_000 picoseconds.
-		Weight::from_parts(39_183_000, 3860)
+		// Minimum execution time: 36_241_000 picoseconds.
+		Weight::from_parts(37_288_000, 3860)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -395,8 +395,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `145`
 		//  Estimated: `3610`
-		// Minimum execution time: 12_684_000 picoseconds.
-		Weight::from_parts(13_240_000, 3610)
+		// Minimum execution time: 12_550_000 picoseconds.
+		Weight::from_parts(13_159_000, 3610)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 	}
 	/// The range of component `r` is `[0, 1600]`.
@@ -404,24 +404,24 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_583_000 picoseconds.
-		Weight::from_parts(8_416_964, 0)
-			// Standard Error: 170
-			.saturating_add(Weight::from_parts(164_523, 0).saturating_mul(r.into()))
+		// Minimum execution time: 6_634_000 picoseconds.
+		Weight::from_parts(7_820_891, 0)
+			// Standard Error: 188
+			.saturating_add(Weight::from_parts(179_141, 0).saturating_mul(r.into()))
 	}
 	fn seal_caller() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 199_000 picoseconds.
-		Weight::from_parts(233_000, 0)
+		// Minimum execution time: 259_000 picoseconds.
+		Weight::from_parts(330_000, 0)
 	}
 	fn seal_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 184_000 picoseconds.
-		Weight::from_parts(206_000, 0)
+		// Minimum execution time: 263_000 picoseconds.
+		Weight::from_parts(316_000, 0)
 	}
 	/// Storage: `Revive::ContractInfoOf` (r:1 w:0)
 	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(242), added: 2717, mode: `Measured`)
@@ -429,8 +429,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `306`
 		//  Estimated: `3771`
-		// Minimum execution time: 8_270_000 picoseconds.
-		Weight::from_parts(8_700_000, 3771)
+		// Minimum execution time: 8_462_000 picoseconds.
+		Weight::from_parts(8_874_000, 3771)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
@@ -439,8 +439,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `538`
 		//  Estimated: `4003`
-		// Minimum execution time: 9_364_000 picoseconds.
-		Weight::from_parts(9_672_000, 4003)
+		// Minimum execution time: 9_118_000 picoseconds.
+		Weight::from_parts(9_721_000, 4003)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Revive::ContractInfoOf` (r:1 w:0)
@@ -449,16 +449,16 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `402`
 		//  Estimated: `3867`
-		// Minimum execution time: 9_183_000 picoseconds.
-		Weight::from_parts(9_609_000, 3867)
+		// Minimum execution time: 9_219_000 picoseconds.
+		Weight::from_parts(9_600_000, 3867)
 			.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: 131_000 picoseconds.
-		Weight::from_parts(176_000, 0)
+		// Minimum execution time: 243_000 picoseconds.
+		Weight::from_parts(279_000, 0)
 	}
 	/// Storage: `Revive::ContractInfoOf` (r:1 w:0)
 	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(242), added: 2717, mode: `Measured`)
@@ -468,51 +468,51 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `472`
 		//  Estimated: `3937`
-		// Minimum execution time: 12_217_000 picoseconds.
-		Weight::from_parts(13_005_000, 3937)
+		// Minimum execution time: 12_254_000 picoseconds.
+		Weight::from_parts(13_083_000, 3937)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 	}
 	fn seal_caller_is_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 208_000 picoseconds.
-		Weight::from_parts(228_000, 0)
+		// Minimum execution time: 282_000 picoseconds.
+		Weight::from_parts(331_000, 0)
 	}
 	fn seal_caller_is_root() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 170_000 picoseconds.
-		Weight::from_parts(203_000, 0)
+		// Minimum execution time: 213_000 picoseconds.
+		Weight::from_parts(272_000, 0)
 	}
 	fn seal_address() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 182_000 picoseconds.
-		Weight::from_parts(204_000, 0)
+		// Minimum execution time: 255_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: 576_000 picoseconds.
-		Weight::from_parts(637_000, 0)
+		// Minimum execution time: 603_000 picoseconds.
+		Weight::from_parts(668_000, 0)
 	}
 	fn seal_ref_time_left() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 131_000 picoseconds.
-		Weight::from_parts(168_000, 0)
+		// Minimum execution time: 208_000 picoseconds.
+		Weight::from_parts(227_000, 0)
 	}
 	fn seal_balance() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `103`
+		//  Measured:  `140`
 		//  Estimated: `0`
-		// Minimum execution time: 4_466_000 picoseconds.
-		Weight::from_parts(4_813_000, 0)
+		// Minimum execution time: 4_974_000 picoseconds.
+		Weight::from_parts(5_276_000, 0)
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
@@ -522,8 +522,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `517`
 		//  Estimated: `3982`
-		// Minimum execution time: 8_786_000 picoseconds.
-		Weight::from_parts(9_450_000, 3982)
+		// Minimum execution time: 8_191_000 picoseconds.
+		Weight::from_parts(8_944_000, 3982)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 	}
 	/// Storage: `Revive::ImmutableDataOf` (r:1 w:0)
@@ -533,10 +533,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `238 + n * (1 ±0)`
 		//  Estimated: `3703 + n * (1 ±0)`
-		// Minimum execution time: 5_796_000 picoseconds.
-		Weight::from_parts(6_399_722, 3703)
-			// Standard Error: 4
-			.saturating_add(Weight::from_parts(581, 0).saturating_mul(n.into()))
+		// Minimum execution time: 5_524_000 picoseconds.
+		Weight::from_parts(6_296_866, 3703)
+			// Standard Error: 5
+			.saturating_add(Weight::from_parts(642, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -547,67 +547,67 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_950_000 picoseconds.
-		Weight::from_parts(2_072_690, 0)
-			// Standard Error: 1
-			.saturating_add(Weight::from_parts(633, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_809_000 picoseconds.
+		Weight::from_parts(2_026_741, 0)
+			// Standard Error: 2
+			.saturating_add(Weight::from_parts(648, 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: 151_000 picoseconds.
-		Weight::from_parts(170_000, 0)
+		// Minimum execution time: 246_000 picoseconds.
+		Weight::from_parts(273_000, 0)
 	}
 	fn seal_minimum_balance() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 127_000 picoseconds.
-		Weight::from_parts(151_000, 0)
+		// Minimum execution time: 239_000 picoseconds.
+		Weight::from_parts(264_000, 0)
 	}
 	fn seal_return_data_size() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 112_000 picoseconds.
-		Weight::from_parts(149_000, 0)
+		// Minimum execution time: 217_000 picoseconds.
+		Weight::from_parts(253_000, 0)
 	}
 	fn seal_call_data_size() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 124_000 picoseconds.
-		Weight::from_parts(154_000, 0)
+		// Minimum execution time: 204_000 picoseconds.
+		Weight::from_parts(248_000, 0)
 	}
 	fn seal_gas_limit() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 331_000 picoseconds.
-		Weight::from_parts(370_000, 0)
+		// Minimum execution time: 403_000 picoseconds.
+		Weight::from_parts(459_000, 0)
 	}
 	fn seal_gas_price() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 137_000 picoseconds.
-		Weight::from_parts(163_000, 0)
+		// Minimum execution time: 221_000 picoseconds.
+		Weight::from_parts(258_000, 0)
 	}
 	fn seal_base_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 130_000 picoseconds.
-		Weight::from_parts(154_000, 0)
+		// Minimum execution time: 218_000 picoseconds.
+		Weight::from_parts(256_000, 0)
 	}
 	fn seal_block_number() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 150_000 picoseconds.
-		Weight::from_parts(167_000, 0)
+		// Minimum execution time: 206_000 picoseconds.
+		Weight::from_parts(246_000, 0)
 	}
 	/// Storage: `Session::Validators` (r:1 w:0)
 	/// Proof: `Session::Validators` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -615,8 +615,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `141`
 		//  Estimated: `1626`
-		// Minimum execution time: 19_205_000 picoseconds.
-		Weight::from_parts(19_687_000, 1626)
+		// Minimum execution time: 19_623_000 picoseconds.
+		Weight::from_parts(20_186_000, 1626)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `System::BlockHash` (r:1 w:0)
@@ -625,60 +625,60 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `30`
 		//  Estimated: `3495`
-		// Minimum execution time: 3_333_000 picoseconds.
-		Weight::from_parts(3_522_000, 3495)
+		// Minimum execution time: 3_427_000 picoseconds.
+		Weight::from_parts(3_602_000, 3495)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	fn seal_now() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 126_000 picoseconds.
-		Weight::from_parts(156_000, 0)
+		// Minimum execution time: 215_000 picoseconds.
+		Weight::from_parts(279_000, 0)
 	}
 	fn seal_weight_to_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_364_000 picoseconds.
-		Weight::from_parts(1_477_000, 0)
+		// Minimum execution time: 1_431_000 picoseconds.
+		Weight::from_parts(1_572_000, 0)
 	}
 	/// The range of component `n` is `[0, 262140]`.
 	fn seal_copy_to_contract(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 309_000 picoseconds.
-		Weight::from_parts(603_516, 0)
+		// Minimum execution time: 371_000 picoseconds.
+		Weight::from_parts(638_258, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(294, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(200, 0).saturating_mul(n.into()))
 	}
 	fn seal_call_data_load() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 120_000 picoseconds.
-		Weight::from_parts(142_000, 0)
+		// Minimum execution time: 220_000 picoseconds.
+		Weight::from_parts(250_000, 0)
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn seal_call_data_copy(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 121_000 picoseconds.
-		Weight::from_parts(125_420, 0)
+		// Minimum execution time: 215_000 picoseconds.
+		Weight::from_parts(162_755, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(149, 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: 150_000 picoseconds.
-		Weight::from_parts(445_753, 0)
+		// Minimum execution time: 216_000 picoseconds.
+		Weight::from_parts(412_905, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(296, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(201, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
@@ -694,8 +694,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `585`
 		//  Estimated: `4050`
-		// Minimum execution time: 16_990_000 picoseconds.
-		Weight::from_parts(17_538_000, 4050)
+		// Minimum execution time: 16_899_000 picoseconds.
+		Weight::from_parts(17_366_000, 4050)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -705,12 +705,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_218_000 picoseconds.
-		Weight::from_parts(4_143_231, 0)
-			// Standard Error: 3_302
-			.saturating_add(Weight::from_parts(235_681, 0).saturating_mul(t.into()))
+		// Minimum execution time: 4_110_000 picoseconds.
+		Weight::from_parts(4_192_200, 0)
+			// Standard Error: 3_323
+			.saturating_add(Weight::from_parts(199_815, 0).saturating_mul(t.into()))
 			// Standard Error: 36
-			.saturating_add(Weight::from_parts(1_298, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(1_111, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
 	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -718,8 +718,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `648`
 		//  Estimated: `648`
-		// Minimum execution time: 6_942_000 picoseconds.
-		Weight::from_parts(7_454_000, 648)
+		// Minimum execution time: 6_986_000 picoseconds.
+		Weight::from_parts(7_574_000, 648)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -728,8 +728,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `10658`
 		//  Estimated: `10658`
-		// Minimum execution time: 41_245_000 picoseconds.
-		Weight::from_parts(42_033_000, 10658)
+		// Minimum execution time: 41_254_000 picoseconds.
+		Weight::from_parts(42_144_000, 10658)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -738,8 +738,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `648`
 		//  Estimated: `648`
-		// Minimum execution time: 7_877_000 picoseconds.
-		Weight::from_parts(8_376_000, 648)
+		// Minimum execution time: 7_987_000 picoseconds.
+		Weight::from_parts(8_494_000, 648)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -749,8 +749,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `10658`
 		//  Estimated: `10658`
-		// Minimum execution time: 42_844_000 picoseconds.
-		Weight::from_parts(43_778_000, 10658)
+		// Minimum execution time: 42_515_000 picoseconds.
+		Weight::from_parts(43_659_000, 10658)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -762,12 +762,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: 8_517_000 picoseconds.
-		Weight::from_parts(9_327_675, 247)
-			// Standard Error: 52
-			.saturating_add(Weight::from_parts(407, 0).saturating_mul(n.into()))
-			// Standard Error: 52
-			.saturating_add(Weight::from_parts(434, 0).saturating_mul(o.into()))
+		// Minimum execution time: 8_421_000 picoseconds.
+		Weight::from_parts(9_014_520, 247)
+			// Standard Error: 55
+			.saturating_add(Weight::from_parts(879, 0).saturating_mul(n.into()))
+			// Standard Error: 55
+			.saturating_add(Weight::from_parts(900, 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()))
@@ -779,10 +779,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_144_000 picoseconds.
-		Weight::from_parts(9_105_918, 247)
-			// Standard Error: 72
-			.saturating_add(Weight::from_parts(684, 0).saturating_mul(n.into()))
+		// Minimum execution time: 8_195_000 picoseconds.
+		Weight::from_parts(9_339_778, 247)
+			// Standard Error: 78
+			.saturating_add(Weight::from_parts(14, 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()))
@@ -794,10 +794,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: 7_914_000 picoseconds.
-		Weight::from_parts(8_683_792, 247)
-			// Standard Error: 65
-			.saturating_add(Weight::from_parts(1_267, 0).saturating_mul(n.into()))
+		// Minimum execution time: 7_703_000 picoseconds.
+		Weight::from_parts(8_803_673, 247)
+			// Standard Error: 85
+			.saturating_add(Weight::from_parts(1_736, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -808,10 +808,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: 7_287_000 picoseconds.
-		Weight::from_parts(8_027_630, 247)
-			// Standard Error: 56
-			.saturating_add(Weight::from_parts(698, 0).saturating_mul(n.into()))
+		// Minimum execution time: 7_284_000 picoseconds.
+		Weight::from_parts(8_140_896, 247)
+			// Standard Error: 75
+			.saturating_add(Weight::from_parts(978, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -822,10 +822,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_870_000 picoseconds.
-		Weight::from_parts(9_939_099, 247)
-			// Standard Error: 225
-			.saturating_add(Weight::from_parts(832, 0).saturating_mul(n.into()))
+		// Minimum execution time: 8_689_000 picoseconds.
+		Weight::from_parts(10_000_090, 247)
+			// Standard Error: 92
+			.saturating_add(Weight::from_parts(852, 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()))
@@ -834,36 +834,36 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_306_000 picoseconds.
-		Weight::from_parts(1_404_000, 0)
+		// Minimum execution time: 1_406_000 picoseconds.
+		Weight::from_parts(1_522_000, 0)
 	}
 	fn set_transient_storage_full() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_689_000 picoseconds.
-		Weight::from_parts(1_811_000, 0)
+		// Minimum execution time: 1_821_000 picoseconds.
+		Weight::from_parts(1_977_000, 0)
 	}
 	fn get_transient_storage_empty() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_302_000 picoseconds.
-		Weight::from_parts(1_387_000, 0)
+		// Minimum execution time: 1_382_000 picoseconds.
+		Weight::from_parts(1_482_000, 0)
 	}
 	fn get_transient_storage_full() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_450_000 picoseconds.
-		Weight::from_parts(1_531_000, 0)
+		// Minimum execution time: 1_573_000 picoseconds.
+		Weight::from_parts(1_648_000, 0)
 	}
 	fn rollback_transient_storage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_003_000 picoseconds.
-		Weight::from_parts(1_083_000, 0)
+		// Minimum execution time: 1_059_000 picoseconds.
+		Weight::from_parts(1_150_000, 0)
 	}
 	/// The range of component `n` is `[0, 416]`.
 	/// The range of component `o` is `[0, 416]`.
@@ -871,77 +871,80 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_147_000 picoseconds.
-		Weight::from_parts(2_400_128, 0)
+		// Minimum execution time: 2_152_000 picoseconds.
+		Weight::from_parts(2_371_885, 0)
 			// Standard Error: 15
-			.saturating_add(Weight::from_parts(305, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(233, 0).saturating_mul(n.into()))
 			// Standard Error: 15
-			.saturating_add(Weight::from_parts(275, 0).saturating_mul(o.into()))
+			.saturating_add(Weight::from_parts(296, 0).saturating_mul(o.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_clear_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_941_000 picoseconds.
-		Weight::from_parts(2_245_468, 0)
-			// Standard Error: 18
-			.saturating_add(Weight::from_parts(407, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_915_000 picoseconds.
+		Weight::from_parts(2_267_706, 0)
+			// Standard Error: 23
+			.saturating_add(Weight::from_parts(400, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_get_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_738_000 picoseconds.
-		Weight::from_parts(1_944_507, 0)
-			// Standard Error: 16
-			.saturating_add(Weight::from_parts(275, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_771_000 picoseconds.
+		Weight::from_parts(1_974_777, 0)
+			// Standard Error: 15
+			.saturating_add(Weight::from_parts(329, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_contains_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_521_000 picoseconds.
-		Weight::from_parts(1_725_877, 0)
-			// Standard Error: 13
-			.saturating_add(Weight::from_parts(184, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_598_000 picoseconds.
+		Weight::from_parts(1_796_103, 0)
+			// Standard Error: 14
+			.saturating_add(Weight::from_parts(152, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
-	fn seal_take_transient_storage(_n: u32, ) -> Weight {
+	fn seal_take_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_366_000 picoseconds.
-		Weight::from_parts(2_590_846, 0)
+		// Minimum execution time: 2_374_000 picoseconds.
+		Weight::from_parts(2_610_603, 0)
+			// Standard Error: 19
+			.saturating_add(Weight::from_parts(108, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
-	/// Storage: `Revive::ContractInfoOf` (r:1 w:0)
+	/// Storage: `Revive::ContractInfoOf` (r:1 w:1)
 	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(242), added: 2717, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(262180), added: 264655, mode: `Measured`)
-	/// Storage: `System::Account` (r:1 w:0)
+	/// 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 `t` is `[0, 1]`.
 	/// The range of component `i` is `[0, 262144]`.
 	fn seal_call(t: u32, i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1545 + t * (206 ±0)`
-		//  Estimated: `5010 + t * (2608 ±0)`
-		// Minimum execution time: 34_508_000 picoseconds.
-		Weight::from_parts(35_724_702, 5010)
-			// Standard Error: 42_504
-			.saturating_add(Weight::from_parts(5_295_834, 0).saturating_mul(t.into()))
+		//  Measured:  `1545 + t * (280 ±0)`
+		//  Estimated: `5010 + t * (2645 ±0)`
+		// Minimum execution time: 33_306_000 picoseconds.
+		Weight::from_parts(34_266_859, 5010)
+			// Standard Error: 77_183
+			.saturating_add(Weight::from_parts(45_479_387, 0).saturating_mul(t.into()))
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(2, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(5, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(t.into())))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
-			.saturating_add(Weight::from_parts(0, 2608).saturating_mul(t.into()))
+			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(t.into())))
+			.saturating_add(Weight::from_parts(0, 2645).saturating_mul(t.into()))
 	}
 	/// Storage: `Revive::ContractInfoOf` (r:1 w:1)
 	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(242), added: 2717, mode: `Measured`)
@@ -953,12 +956,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0 + d * (453 ±0)`
 		//  Estimated: `1959 + d * (1959 ±0)`
-		// Minimum execution time: 19_412_000 picoseconds.
-		Weight::from_parts(3_906_222, 1959)
-			// Standard Error: 378_943
-			.saturating_add(Weight::from_parts(16_405_804, 0).saturating_mul(d.into()))
-			// Standard Error: 2
-			.saturating_add(Weight::from_parts(1_205, 0).saturating_mul(i.into()))
+		// Minimum execution time: 19_782_000 picoseconds.
+		Weight::from_parts(3_753_710, 1959)
+			// Standard Error: 104_191
+			.saturating_add(Weight::from_parts(16_621_171, 0).saturating_mul(d.into()))
+			// Standard Error: 0
+			.saturating_add(Weight::from_parts(328, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(d.into())))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(d.into())))
 			.saturating_add(Weight::from_parts(0, 1959).saturating_mul(d.into()))
@@ -973,8 +976,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1236`
 		//  Estimated: `4701`
-		// Minimum execution time: 28_834_000 picoseconds.
-		Weight::from_parts(30_072_000, 4701)
+		// Minimum execution time: 28_003_000 picoseconds.
+		Weight::from_parts(29_360_000, 4701)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
@@ -988,12 +991,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:  `1260`
-		//  Estimated: `4728`
-		// Minimum execution time: 112_787_000 picoseconds.
-		Weight::from_parts(105_258_744, 4728)
+		//  Measured:  `1297`
+		//  Estimated: `4758`
+		// Minimum execution time: 112_796_000 picoseconds.
+		Weight::from_parts(104_083_971, 4758)
 			// Standard Error: 10
-			.saturating_add(Weight::from_parts(4_163, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(4_089, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -1002,118 +1005,118 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 792_000 picoseconds.
-		Weight::from_parts(4_505_628, 0)
+		// Minimum execution time: 1_180_000 picoseconds.
+		Weight::from_parts(4_874_735, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_285, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(1_288, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn identity(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 300_000 picoseconds.
-		Weight::from_parts(468_743, 0)
+		// Minimum execution time: 646_000 picoseconds.
+		Weight::from_parts(820_170, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(148, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(111, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn ripemd_160(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 744_000 picoseconds.
-		Weight::from_parts(771_000, 0)
+		// Minimum execution time: 1_134_000 picoseconds.
+		Weight::from_parts(186_595, 0)
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(3_928, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(3_900, 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_002_000 picoseconds.
-		Weight::from_parts(3_889_121, 0)
+		// Minimum execution time: 1_059_000 picoseconds.
+		Weight::from_parts(5_157_127, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(3_666, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(3_587, 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: 562_000 picoseconds.
-		Weight::from_parts(3_823_066, 0)
+		// Minimum execution time: 735_000 picoseconds.
+		Weight::from_parts(3_778_449, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_569, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(1_521, 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: 543_000 picoseconds.
-		Weight::from_parts(3_582_133, 0)
-			// Standard Error: 2
-			.saturating_add(Weight::from_parts(1_576, 0).saturating_mul(n.into()))
+		// Minimum execution time: 585_000 picoseconds.
+		Weight::from_parts(5_783_868, 0)
+			// Standard Error: 3
+			.saturating_add(Weight::from_parts(1_510, 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_702_000 picoseconds.
-		Weight::from_parts(30_839_817, 0)
+		// Minimum execution time: 43_084_000 picoseconds.
+		Weight::from_parts(32_814_367, 0)
 			// Standard Error: 10
-			.saturating_add(Weight::from_parts(5_086, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(5_249, 0).saturating_mul(n.into()))
 	}
 	fn ecdsa_recover() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 44_770_000 picoseconds.
-		Weight::from_parts(45_791_000, 0)
+		// Minimum execution time: 46_605_000 picoseconds.
+		Weight::from_parts(47_393_000, 0)
 	}
 	fn bn128_add() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 15_705_000 picoseconds.
-		Weight::from_parts(16_885_000, 0)
+		// Minimum execution time: 16_364_000 picoseconds.
+		Weight::from_parts(18_227_000, 0)
 	}
 	fn bn128_mul() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_018_103_000 picoseconds.
-		Weight::from_parts(1_023_315_000, 0)
+		// Minimum execution time: 998_630_000 picoseconds.
+		Weight::from_parts(1_006_587_000, 0)
 	}
 	/// The range of component `n` is `[0, 20]`.
 	fn bn128_pairing(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 378_000 picoseconds.
-		Weight::from_parts(5_119_381_361, 0)
-			// Standard Error: 10_821_771
-			.saturating_add(Weight::from_parts(6_202_434_383, 0).saturating_mul(n.into()))
+		// Minimum execution time: 707_000 picoseconds.
+		Weight::from_parts(4_870_335_588, 0)
+			// Standard Error: 11_658_035
+			.saturating_add(Weight::from_parts(6_013_735_348, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 1200]`.
 	fn blake2f(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 435_000 picoseconds.
-		Weight::from_parts(658_540, 0)
-			// Standard Error: 6
-			.saturating_add(Weight::from_parts(22_679, 0).saturating_mul(n.into()))
+		// Minimum execution time: 788_000 picoseconds.
+		Weight::from_parts(1_020_239, 0)
+			// Standard Error: 7
+			.saturating_add(Weight::from_parts(22_812, 0).saturating_mul(n.into()))
 	}
 	fn seal_ecdsa_to_eth_address() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 12_639_000 picoseconds.
-		Weight::from_parts(12_782_000, 0)
+		// Minimum execution time: 12_764_000 picoseconds.
+		Weight::from_parts(12_870_000, 0)
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
@@ -1121,8 +1124,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `300`
 		//  Estimated: `3765`
-		// Minimum execution time: 12_210_000 picoseconds.
-		Weight::from_parts(12_747_000, 3765)
+		// Minimum execution time: 12_153_000 picoseconds.
+		Weight::from_parts(12_626_000, 3765)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -1131,20 +1134,20 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 11_244_000 picoseconds.
-		Weight::from_parts(48_207_913, 0)
-			// Standard Error: 495
-			.saturating_add(Weight::from_parts(125_133, 0).saturating_mul(r.into()))
+		// Minimum execution time: 11_533_000 picoseconds.
+		Weight::from_parts(55_129_499, 0)
+			// Standard Error: 469
+			.saturating_add(Weight::from_parts(114_564, 0).saturating_mul(r.into()))
 	}
 	/// The range of component `r` is `[0, 100000]`.
 	fn instr_empty_loop(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_776_000 picoseconds.
-		Weight::from_parts(6_412_428, 0)
-			// Standard Error: 17
-			.saturating_add(Weight::from_parts(72_988, 0).saturating_mul(r.into()))
+		// Minimum execution time: 2_710_000 picoseconds.
+		Weight::from_parts(7_535_954, 0)
+			// Standard Error: 10
+			.saturating_add(Weight::from_parts(72_451, 0).saturating_mul(r.into()))
 	}
 }
 
@@ -1156,8 +1159,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `147`
 		//  Estimated: `1632`
-		// Minimum execution time: 2_971_000 picoseconds.
-		Weight::from_parts(3_218_000, 1632)
+		// Minimum execution time: 2_968_000 picoseconds.
+		Weight::from_parts(3_185_000, 1632)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -1167,10 +1170,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `425 + k * (69 ±0)`
 		//  Estimated: `415 + k * (70 ±0)`
-		// Minimum execution time: 14_042_000 picoseconds.
-		Weight::from_parts(14_510_000, 415)
-			// Standard Error: 1_047
-			.saturating_add(Weight::from_parts(1_167_098, 0).saturating_mul(k.into()))
+		// Minimum execution time: 13_484_000 picoseconds.
+		Weight::from_parts(14_098_000, 415)
+			// Standard Error: 890
+			.saturating_add(Weight::from_parts(1_188_357, 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))
@@ -1194,10 +1197,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1178 + c * (1 ±0)`
 		//  Estimated: `7119 + c * (1 ±0)`
-		// Minimum execution time: 81_842_000 picoseconds.
-		Weight::from_parts(110_091_076, 7119)
-			// Standard Error: 12
-			.saturating_add(Weight::from_parts(2_123, 0).saturating_mul(c.into()))
+		// Minimum execution time: 79_236_000 picoseconds.
+		Weight::from_parts(116_626_812, 7119)
+			// Standard Error: 10
+			.saturating_add(Weight::from_parts(1_434, 0).saturating_mul(c.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(c.into()))
@@ -1219,17 +1222,17 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `4513`
 		//  Estimated: `10453`
-		// Minimum execution time: 121_768_000 picoseconds.
-		Weight::from_parts(126_040_712, 10453)
-			// Standard Error: 315_571
-			.saturating_add(Weight::from_parts(961_687, 0).saturating_mul(b.into()))
+		// Minimum execution time: 117_459_000 picoseconds.
+		Weight::from_parts(121_799_942, 10453)
+			// Standard Error: 302_002
+			.saturating_add(Weight::from_parts(673_857, 0).saturating_mul(b.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	/// Storage: `Balances::Holds` (r:2 w:2)
-	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(409), added: 2884, mode: `Measured`)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
 	/// Storage: `Revive::ContractInfoOf` (r:1 w:1)
@@ -1246,12 +1249,12 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1122`
 		//  Estimated: `7010`
-		// Minimum execution time: 1_593_697_000 picoseconds.
-		Weight::from_parts(150_335_332, 7010)
-			// Standard Error: 34
-			.saturating_add(Weight::from_parts(19_710, 0).saturating_mul(c.into()))
-			// Standard Error: 13
-			.saturating_add(Weight::from_parts(5_466, 0).saturating_mul(i.into()))
+		// Minimum execution time: 1_351_628_000 picoseconds.
+		Weight::from_parts(207_352_706, 7010)
+			// Standard Error: 49
+			.saturating_add(Weight::from_parts(18_927, 0).saturating_mul(c.into()))
+			// Standard Error: 19
+			.saturating_add(Weight::from_parts(4_377, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
@@ -1268,16 +1271,16 @@ impl WeightInfo for () {
 	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
 	/// Storage: `Balances::Holds` (r:1 w:1)
-	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(409), added: 2884, mode: `Measured`)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	/// The range of component `i` is `[0, 262144]`.
 	fn instantiate(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1886`
-		//  Estimated: `5346`
-		// Minimum execution time: 155_867_000 picoseconds.
-		Weight::from_parts(88_055_300, 5346)
-			// Standard Error: 25
-			.saturating_add(Weight::from_parts(5_561, 0).saturating_mul(i.into()))
+		//  Estimated: `5365`
+		// Minimum execution time: 149_282_000 picoseconds.
+		Weight::from_parts(139_445_983, 5365)
+			// Standard Error: 14
+			.saturating_add(Weight::from_parts(4_487, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -1295,17 +1298,17 @@ 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:  `1812`
-		//  Estimated: `7752`
-		// Minimum execution time: 85_908_000 picoseconds.
-		Weight::from_parts(87_953_000, 7752)
+		//  Measured:  `1851`
+		//  Estimated: `7791`
+		// Minimum execution time: 83_373_000 picoseconds.
+		Weight::from_parts(85_877_000, 7791)
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	/// Storage: `Balances::Holds` (r:1 w:1)
-	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(409), added: 2884, mode: `Measured`)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:0 w:1)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(262180), added: 264655, mode: `Measured`)
 	/// The range of component `c` is `[0, 104857]`.
@@ -1313,25 +1316,25 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `505`
 		//  Estimated: `3970`
-		// Minimum execution time: 51_305_000 picoseconds.
-		Weight::from_parts(27_197_599, 3970)
-			// Standard Error: 20
-			.saturating_add(Weight::from_parts(14_721, 0).saturating_mul(c.into()))
+		// Minimum execution time: 48_786_000 picoseconds.
+		Weight::from_parts(40_005_445, 3970)
+			// Standard Error: 17
+			.saturating_add(Weight::from_parts(14_686, 0).saturating_mul(c.into()))
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	/// Storage: `Balances::Holds` (r:1 w:1)
-	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(409), added: 2884, mode: `Measured`)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:0 w:1)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(262180), added: 264655, mode: `Measured`)
 	fn remove_code() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `658`
 		//  Estimated: `4123`
-		// Minimum execution time: 41_900_000 picoseconds.
-		Weight::from_parts(42_985_000, 4123)
+		// Minimum execution time: 38_923_000 picoseconds.
+		Weight::from_parts(40_902_000, 4123)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -1343,34 +1346,34 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `528`
 		//  Estimated: `6468`
-		// Minimum execution time: 20_254_000 picoseconds.
-		Weight::from_parts(21_122_000, 6468)
+		// Minimum execution time: 20_518_000 picoseconds.
+		Weight::from_parts(21_168_000, 6468)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:1)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
 	/// Storage: `Balances::Holds` (r:1 w:1)
-	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(409), added: 2884, mode: `Measured`)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	fn map_account() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `813`
 		//  Estimated: `4278`
-		// Minimum execution time: 50_406_000 picoseconds.
-		Weight::from_parts(51_939_000, 4278)
+		// Minimum execution time: 49_960_000 picoseconds.
+		Weight::from_parts(51_281_000, 4278)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
 	/// Storage: `Balances::Holds` (r:1 w:1)
-	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(409), added: 2884, mode: `Measured`)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	/// Storage: `Revive::OriginalAccount` (r:0 w:1)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
 	fn unmap_account() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `395`
 		//  Estimated: `3860`
-		// Minimum execution time: 37_679_000 picoseconds.
-		Weight::from_parts(39_183_000, 3860)
+		// Minimum execution time: 36_241_000 picoseconds.
+		Weight::from_parts(37_288_000, 3860)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -1382,8 +1385,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `145`
 		//  Estimated: `3610`
-		// Minimum execution time: 12_684_000 picoseconds.
-		Weight::from_parts(13_240_000, 3610)
+		// Minimum execution time: 12_550_000 picoseconds.
+		Weight::from_parts(13_159_000, 3610)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 	}
 	/// The range of component `r` is `[0, 1600]`.
@@ -1391,24 +1394,24 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_583_000 picoseconds.
-		Weight::from_parts(8_416_964, 0)
-			// Standard Error: 170
-			.saturating_add(Weight::from_parts(164_523, 0).saturating_mul(r.into()))
+		// Minimum execution time: 6_634_000 picoseconds.
+		Weight::from_parts(7_820_891, 0)
+			// Standard Error: 188
+			.saturating_add(Weight::from_parts(179_141, 0).saturating_mul(r.into()))
 	}
 	fn seal_caller() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 199_000 picoseconds.
-		Weight::from_parts(233_000, 0)
+		// Minimum execution time: 259_000 picoseconds.
+		Weight::from_parts(330_000, 0)
 	}
 	fn seal_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 184_000 picoseconds.
-		Weight::from_parts(206_000, 0)
+		// Minimum execution time: 263_000 picoseconds.
+		Weight::from_parts(316_000, 0)
 	}
 	/// Storage: `Revive::ContractInfoOf` (r:1 w:0)
 	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(242), added: 2717, mode: `Measured`)
@@ -1416,8 +1419,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `306`
 		//  Estimated: `3771`
-		// Minimum execution time: 8_270_000 picoseconds.
-		Weight::from_parts(8_700_000, 3771)
+		// Minimum execution time: 8_462_000 picoseconds.
+		Weight::from_parts(8_874_000, 3771)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
@@ -1426,8 +1429,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `538`
 		//  Estimated: `4003`
-		// Minimum execution time: 9_364_000 picoseconds.
-		Weight::from_parts(9_672_000, 4003)
+		// Minimum execution time: 9_118_000 picoseconds.
+		Weight::from_parts(9_721_000, 4003)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Revive::ContractInfoOf` (r:1 w:0)
@@ -1436,16 +1439,16 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `402`
 		//  Estimated: `3867`
-		// Minimum execution time: 9_183_000 picoseconds.
-		Weight::from_parts(9_609_000, 3867)
+		// Minimum execution time: 9_219_000 picoseconds.
+		Weight::from_parts(9_600_000, 3867)
 			.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: 131_000 picoseconds.
-		Weight::from_parts(176_000, 0)
+		// Minimum execution time: 243_000 picoseconds.
+		Weight::from_parts(279_000, 0)
 	}
 	/// Storage: `Revive::ContractInfoOf` (r:1 w:0)
 	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(242), added: 2717, mode: `Measured`)
@@ -1455,51 +1458,51 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `472`
 		//  Estimated: `3937`
-		// Minimum execution time: 12_217_000 picoseconds.
-		Weight::from_parts(13_005_000, 3937)
+		// Minimum execution time: 12_254_000 picoseconds.
+		Weight::from_parts(13_083_000, 3937)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 	}
 	fn seal_caller_is_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 208_000 picoseconds.
-		Weight::from_parts(228_000, 0)
+		// Minimum execution time: 282_000 picoseconds.
+		Weight::from_parts(331_000, 0)
 	}
 	fn seal_caller_is_root() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 170_000 picoseconds.
-		Weight::from_parts(203_000, 0)
+		// Minimum execution time: 213_000 picoseconds.
+		Weight::from_parts(272_000, 0)
 	}
 	fn seal_address() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 182_000 picoseconds.
-		Weight::from_parts(204_000, 0)
+		// Minimum execution time: 255_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: 576_000 picoseconds.
-		Weight::from_parts(637_000, 0)
+		// Minimum execution time: 603_000 picoseconds.
+		Weight::from_parts(668_000, 0)
 	}
 	fn seal_ref_time_left() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 131_000 picoseconds.
-		Weight::from_parts(168_000, 0)
+		// Minimum execution time: 208_000 picoseconds.
+		Weight::from_parts(227_000, 0)
 	}
 	fn seal_balance() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `103`
+		//  Measured:  `140`
 		//  Estimated: `0`
-		// Minimum execution time: 4_466_000 picoseconds.
-		Weight::from_parts(4_813_000, 0)
+		// Minimum execution time: 4_974_000 picoseconds.
+		Weight::from_parts(5_276_000, 0)
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
@@ -1509,8 +1512,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `517`
 		//  Estimated: `3982`
-		// Minimum execution time: 8_786_000 picoseconds.
-		Weight::from_parts(9_450_000, 3982)
+		// Minimum execution time: 8_191_000 picoseconds.
+		Weight::from_parts(8_944_000, 3982)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 	}
 	/// Storage: `Revive::ImmutableDataOf` (r:1 w:0)
@@ -1520,10 +1523,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `238 + n * (1 ±0)`
 		//  Estimated: `3703 + n * (1 ±0)`
-		// Minimum execution time: 5_796_000 picoseconds.
-		Weight::from_parts(6_399_722, 3703)
-			// Standard Error: 4
-			.saturating_add(Weight::from_parts(581, 0).saturating_mul(n.into()))
+		// Minimum execution time: 5_524_000 picoseconds.
+		Weight::from_parts(6_296_866, 3703)
+			// Standard Error: 5
+			.saturating_add(Weight::from_parts(642, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -1534,67 +1537,67 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_950_000 picoseconds.
-		Weight::from_parts(2_072_690, 0)
-			// Standard Error: 1
-			.saturating_add(Weight::from_parts(633, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_809_000 picoseconds.
+		Weight::from_parts(2_026_741, 0)
+			// Standard Error: 2
+			.saturating_add(Weight::from_parts(648, 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: 151_000 picoseconds.
-		Weight::from_parts(170_000, 0)
+		// Minimum execution time: 246_000 picoseconds.
+		Weight::from_parts(273_000, 0)
 	}
 	fn seal_minimum_balance() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 127_000 picoseconds.
-		Weight::from_parts(151_000, 0)
+		// Minimum execution time: 239_000 picoseconds.
+		Weight::from_parts(264_000, 0)
 	}
 	fn seal_return_data_size() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 112_000 picoseconds.
-		Weight::from_parts(149_000, 0)
+		// Minimum execution time: 217_000 picoseconds.
+		Weight::from_parts(253_000, 0)
 	}
 	fn seal_call_data_size() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 124_000 picoseconds.
-		Weight::from_parts(154_000, 0)
+		// Minimum execution time: 204_000 picoseconds.
+		Weight::from_parts(248_000, 0)
 	}
 	fn seal_gas_limit() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 331_000 picoseconds.
-		Weight::from_parts(370_000, 0)
+		// Minimum execution time: 403_000 picoseconds.
+		Weight::from_parts(459_000, 0)
 	}
 	fn seal_gas_price() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 137_000 picoseconds.
-		Weight::from_parts(163_000, 0)
+		// Minimum execution time: 221_000 picoseconds.
+		Weight::from_parts(258_000, 0)
 	}
 	fn seal_base_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 130_000 picoseconds.
-		Weight::from_parts(154_000, 0)
+		// Minimum execution time: 218_000 picoseconds.
+		Weight::from_parts(256_000, 0)
 	}
 	fn seal_block_number() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 150_000 picoseconds.
-		Weight::from_parts(167_000, 0)
+		// Minimum execution time: 206_000 picoseconds.
+		Weight::from_parts(246_000, 0)
 	}
 	/// Storage: `Session::Validators` (r:1 w:0)
 	/// Proof: `Session::Validators` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -1602,8 +1605,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `141`
 		//  Estimated: `1626`
-		// Minimum execution time: 19_205_000 picoseconds.
-		Weight::from_parts(19_687_000, 1626)
+		// Minimum execution time: 19_623_000 picoseconds.
+		Weight::from_parts(20_186_000, 1626)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `System::BlockHash` (r:1 w:0)
@@ -1612,60 +1615,60 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `30`
 		//  Estimated: `3495`
-		// Minimum execution time: 3_333_000 picoseconds.
-		Weight::from_parts(3_522_000, 3495)
+		// Minimum execution time: 3_427_000 picoseconds.
+		Weight::from_parts(3_602_000, 3495)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	fn seal_now() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 126_000 picoseconds.
-		Weight::from_parts(156_000, 0)
+		// Minimum execution time: 215_000 picoseconds.
+		Weight::from_parts(279_000, 0)
 	}
 	fn seal_weight_to_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_364_000 picoseconds.
-		Weight::from_parts(1_477_000, 0)
+		// Minimum execution time: 1_431_000 picoseconds.
+		Weight::from_parts(1_572_000, 0)
 	}
 	/// The range of component `n` is `[0, 262140]`.
 	fn seal_copy_to_contract(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 309_000 picoseconds.
-		Weight::from_parts(603_516, 0)
+		// Minimum execution time: 371_000 picoseconds.
+		Weight::from_parts(638_258, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(294, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(200, 0).saturating_mul(n.into()))
 	}
 	fn seal_call_data_load() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 120_000 picoseconds.
-		Weight::from_parts(142_000, 0)
+		// Minimum execution time: 220_000 picoseconds.
+		Weight::from_parts(250_000, 0)
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn seal_call_data_copy(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 121_000 picoseconds.
-		Weight::from_parts(125_420, 0)
+		// Minimum execution time: 215_000 picoseconds.
+		Weight::from_parts(162_755, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(149, 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: 150_000 picoseconds.
-		Weight::from_parts(445_753, 0)
+		// Minimum execution time: 216_000 picoseconds.
+		Weight::from_parts(412_905, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(296, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(201, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
@@ -1681,8 +1684,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `585`
 		//  Estimated: `4050`
-		// Minimum execution time: 16_990_000 picoseconds.
-		Weight::from_parts(17_538_000, 4050)
+		// Minimum execution time: 16_899_000 picoseconds.
+		Weight::from_parts(17_366_000, 4050)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -1692,12 +1695,12 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_218_000 picoseconds.
-		Weight::from_parts(4_143_231, 0)
-			// Standard Error: 3_302
-			.saturating_add(Weight::from_parts(235_681, 0).saturating_mul(t.into()))
+		// Minimum execution time: 4_110_000 picoseconds.
+		Weight::from_parts(4_192_200, 0)
+			// Standard Error: 3_323
+			.saturating_add(Weight::from_parts(199_815, 0).saturating_mul(t.into()))
 			// Standard Error: 36
-			.saturating_add(Weight::from_parts(1_298, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(1_111, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
 	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -1705,8 +1708,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `648`
 		//  Estimated: `648`
-		// Minimum execution time: 6_942_000 picoseconds.
-		Weight::from_parts(7_454_000, 648)
+		// Minimum execution time: 6_986_000 picoseconds.
+		Weight::from_parts(7_574_000, 648)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -1715,8 +1718,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `10658`
 		//  Estimated: `10658`
-		// Minimum execution time: 41_245_000 picoseconds.
-		Weight::from_parts(42_033_000, 10658)
+		// Minimum execution time: 41_254_000 picoseconds.
+		Weight::from_parts(42_144_000, 10658)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -1725,8 +1728,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `648`
 		//  Estimated: `648`
-		// Minimum execution time: 7_877_000 picoseconds.
-		Weight::from_parts(8_376_000, 648)
+		// Minimum execution time: 7_987_000 picoseconds.
+		Weight::from_parts(8_494_000, 648)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -1736,8 +1739,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `10658`
 		//  Estimated: `10658`
-		// Minimum execution time: 42_844_000 picoseconds.
-		Weight::from_parts(43_778_000, 10658)
+		// Minimum execution time: 42_515_000 picoseconds.
+		Weight::from_parts(43_659_000, 10658)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -1749,12 +1752,12 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + o * (1 ±0)`
 		//  Estimated: `247 + o * (1 ±0)`
-		// Minimum execution time: 8_517_000 picoseconds.
-		Weight::from_parts(9_327_675, 247)
-			// Standard Error: 52
-			.saturating_add(Weight::from_parts(407, 0).saturating_mul(n.into()))
-			// Standard Error: 52
-			.saturating_add(Weight::from_parts(434, 0).saturating_mul(o.into()))
+		// Minimum execution time: 8_421_000 picoseconds.
+		Weight::from_parts(9_014_520, 247)
+			// Standard Error: 55
+			.saturating_add(Weight::from_parts(879, 0).saturating_mul(n.into()))
+			// Standard Error: 55
+			.saturating_add(Weight::from_parts(900, 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()))
@@ -1766,10 +1769,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 8_144_000 picoseconds.
-		Weight::from_parts(9_105_918, 247)
-			// Standard Error: 72
-			.saturating_add(Weight::from_parts(684, 0).saturating_mul(n.into()))
+		// Minimum execution time: 8_195_000 picoseconds.
+		Weight::from_parts(9_339_778, 247)
+			// Standard Error: 78
+			.saturating_add(Weight::from_parts(14, 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()))
@@ -1781,10 +1784,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 7_914_000 picoseconds.
-		Weight::from_parts(8_683_792, 247)
-			// Standard Error: 65
-			.saturating_add(Weight::from_parts(1_267, 0).saturating_mul(n.into()))
+		// Minimum execution time: 7_703_000 picoseconds.
+		Weight::from_parts(8_803_673, 247)
+			// Standard Error: 85
+			.saturating_add(Weight::from_parts(1_736, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -1795,10 +1798,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 7_287_000 picoseconds.
-		Weight::from_parts(8_027_630, 247)
-			// Standard Error: 56
-			.saturating_add(Weight::from_parts(698, 0).saturating_mul(n.into()))
+		// Minimum execution time: 7_284_000 picoseconds.
+		Weight::from_parts(8_140_896, 247)
+			// Standard Error: 75
+			.saturating_add(Weight::from_parts(978, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -1809,10 +1812,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 8_870_000 picoseconds.
-		Weight::from_parts(9_939_099, 247)
-			// Standard Error: 225
-			.saturating_add(Weight::from_parts(832, 0).saturating_mul(n.into()))
+		// Minimum execution time: 8_689_000 picoseconds.
+		Weight::from_parts(10_000_090, 247)
+			// Standard Error: 92
+			.saturating_add(Weight::from_parts(852, 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()))
@@ -1821,36 +1824,36 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_306_000 picoseconds.
-		Weight::from_parts(1_404_000, 0)
+		// Minimum execution time: 1_406_000 picoseconds.
+		Weight::from_parts(1_522_000, 0)
 	}
 	fn set_transient_storage_full() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_689_000 picoseconds.
-		Weight::from_parts(1_811_000, 0)
+		// Minimum execution time: 1_821_000 picoseconds.
+		Weight::from_parts(1_977_000, 0)
 	}
 	fn get_transient_storage_empty() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_302_000 picoseconds.
-		Weight::from_parts(1_387_000, 0)
+		// Minimum execution time: 1_382_000 picoseconds.
+		Weight::from_parts(1_482_000, 0)
 	}
 	fn get_transient_storage_full() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_450_000 picoseconds.
-		Weight::from_parts(1_531_000, 0)
+		// Minimum execution time: 1_573_000 picoseconds.
+		Weight::from_parts(1_648_000, 0)
 	}
 	fn rollback_transient_storage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_003_000 picoseconds.
-		Weight::from_parts(1_083_000, 0)
+		// Minimum execution time: 1_059_000 picoseconds.
+		Weight::from_parts(1_150_000, 0)
 	}
 	/// The range of component `n` is `[0, 416]`.
 	/// The range of component `o` is `[0, 416]`.
@@ -1858,77 +1861,80 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_147_000 picoseconds.
-		Weight::from_parts(2_400_128, 0)
+		// Minimum execution time: 2_152_000 picoseconds.
+		Weight::from_parts(2_371_885, 0)
 			// Standard Error: 15
-			.saturating_add(Weight::from_parts(305, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(233, 0).saturating_mul(n.into()))
 			// Standard Error: 15
-			.saturating_add(Weight::from_parts(275, 0).saturating_mul(o.into()))
+			.saturating_add(Weight::from_parts(296, 0).saturating_mul(o.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_clear_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_941_000 picoseconds.
-		Weight::from_parts(2_245_468, 0)
-			// Standard Error: 18
-			.saturating_add(Weight::from_parts(407, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_915_000 picoseconds.
+		Weight::from_parts(2_267_706, 0)
+			// Standard Error: 23
+			.saturating_add(Weight::from_parts(400, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_get_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_738_000 picoseconds.
-		Weight::from_parts(1_944_507, 0)
-			// Standard Error: 16
-			.saturating_add(Weight::from_parts(275, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_771_000 picoseconds.
+		Weight::from_parts(1_974_777, 0)
+			// Standard Error: 15
+			.saturating_add(Weight::from_parts(329, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_contains_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_521_000 picoseconds.
-		Weight::from_parts(1_725_877, 0)
-			// Standard Error: 13
-			.saturating_add(Weight::from_parts(184, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_598_000 picoseconds.
+		Weight::from_parts(1_796_103, 0)
+			// Standard Error: 14
+			.saturating_add(Weight::from_parts(152, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
-	fn seal_take_transient_storage(_n: u32, ) -> Weight {
+	fn seal_take_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_366_000 picoseconds.
-		Weight::from_parts(2_590_846, 0)
+		// Minimum execution time: 2_374_000 picoseconds.
+		Weight::from_parts(2_610_603, 0)
+			// Standard Error: 19
+			.saturating_add(Weight::from_parts(108, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
-	/// Storage: `Revive::ContractInfoOf` (r:1 w:0)
+	/// Storage: `Revive::ContractInfoOf` (r:1 w:1)
 	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(242), added: 2717, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(262180), added: 264655, mode: `Measured`)
-	/// Storage: `System::Account` (r:1 w:0)
+	/// 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 `t` is `[0, 1]`.
 	/// The range of component `i` is `[0, 262144]`.
 	fn seal_call(t: u32, i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1545 + t * (206 ±0)`
-		//  Estimated: `5010 + t * (2608 ±0)`
-		// Minimum execution time: 34_508_000 picoseconds.
-		Weight::from_parts(35_724_702, 5010)
-			// Standard Error: 42_504
-			.saturating_add(Weight::from_parts(5_295_834, 0).saturating_mul(t.into()))
+		//  Measured:  `1545 + t * (280 ±0)`
+		//  Estimated: `5010 + t * (2645 ±0)`
+		// Minimum execution time: 33_306_000 picoseconds.
+		Weight::from_parts(34_266_859, 5010)
+			// Standard Error: 77_183
+			.saturating_add(Weight::from_parts(45_479_387, 0).saturating_mul(t.into()))
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(2, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(5, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(t.into())))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
-			.saturating_add(Weight::from_parts(0, 2608).saturating_mul(t.into()))
+			.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(t.into())))
+			.saturating_add(Weight::from_parts(0, 2645).saturating_mul(t.into()))
 	}
 	/// Storage: `Revive::ContractInfoOf` (r:1 w:1)
 	/// Proof: `Revive::ContractInfoOf` (`max_values`: None, `max_size`: Some(242), added: 2717, mode: `Measured`)
@@ -1940,12 +1946,12 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0 + d * (453 ±0)`
 		//  Estimated: `1959 + d * (1959 ±0)`
-		// Minimum execution time: 19_412_000 picoseconds.
-		Weight::from_parts(3_906_222, 1959)
-			// Standard Error: 378_943
-			.saturating_add(Weight::from_parts(16_405_804, 0).saturating_mul(d.into()))
-			// Standard Error: 2
-			.saturating_add(Weight::from_parts(1_205, 0).saturating_mul(i.into()))
+		// Minimum execution time: 19_782_000 picoseconds.
+		Weight::from_parts(3_753_710, 1959)
+			// Standard Error: 104_191
+			.saturating_add(Weight::from_parts(16_621_171, 0).saturating_mul(d.into()))
+			// Standard Error: 0
+			.saturating_add(Weight::from_parts(328, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads((2_u64).saturating_mul(d.into())))
 			.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(d.into())))
 			.saturating_add(Weight::from_parts(0, 1959).saturating_mul(d.into()))
@@ -1960,8 +1966,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1236`
 		//  Estimated: `4701`
-		// Minimum execution time: 28_834_000 picoseconds.
-		Weight::from_parts(30_072_000, 4701)
+		// Minimum execution time: 28_003_000 picoseconds.
+		Weight::from_parts(29_360_000, 4701)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
@@ -1975,12 +1981,12 @@ impl WeightInfo for () {
 	/// The range of component `i` is `[0, 262144]`.
 	fn seal_instantiate(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1260`
-		//  Estimated: `4728`
-		// Minimum execution time: 112_787_000 picoseconds.
-		Weight::from_parts(105_258_744, 4728)
+		//  Measured:  `1297`
+		//  Estimated: `4758`
+		// Minimum execution time: 112_796_000 picoseconds.
+		Weight::from_parts(104_083_971, 4758)
 			// Standard Error: 10
-			.saturating_add(Weight::from_parts(4_163, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(4_089, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -1989,118 +1995,118 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 792_000 picoseconds.
-		Weight::from_parts(4_505_628, 0)
+		// Minimum execution time: 1_180_000 picoseconds.
+		Weight::from_parts(4_874_735, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_285, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(1_288, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn identity(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 300_000 picoseconds.
-		Weight::from_parts(468_743, 0)
+		// Minimum execution time: 646_000 picoseconds.
+		Weight::from_parts(820_170, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(148, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(111, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn ripemd_160(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 744_000 picoseconds.
-		Weight::from_parts(771_000, 0)
+		// Minimum execution time: 1_134_000 picoseconds.
+		Weight::from_parts(186_595, 0)
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(3_928, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(3_900, 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_002_000 picoseconds.
-		Weight::from_parts(3_889_121, 0)
+		// Minimum execution time: 1_059_000 picoseconds.
+		Weight::from_parts(5_157_127, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(3_666, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(3_587, 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: 562_000 picoseconds.
-		Weight::from_parts(3_823_066, 0)
+		// Minimum execution time: 735_000 picoseconds.
+		Weight::from_parts(3_778_449, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_569, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(1_521, 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: 543_000 picoseconds.
-		Weight::from_parts(3_582_133, 0)
-			// Standard Error: 2
-			.saturating_add(Weight::from_parts(1_576, 0).saturating_mul(n.into()))
+		// Minimum execution time: 585_000 picoseconds.
+		Weight::from_parts(5_783_868, 0)
+			// Standard Error: 3
+			.saturating_add(Weight::from_parts(1_510, 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_702_000 picoseconds.
-		Weight::from_parts(30_839_817, 0)
+		// Minimum execution time: 43_084_000 picoseconds.
+		Weight::from_parts(32_814_367, 0)
 			// Standard Error: 10
-			.saturating_add(Weight::from_parts(5_086, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(5_249, 0).saturating_mul(n.into()))
 	}
 	fn ecdsa_recover() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 44_770_000 picoseconds.
-		Weight::from_parts(45_791_000, 0)
+		// Minimum execution time: 46_605_000 picoseconds.
+		Weight::from_parts(47_393_000, 0)
 	}
 	fn bn128_add() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 15_705_000 picoseconds.
-		Weight::from_parts(16_885_000, 0)
+		// Minimum execution time: 16_364_000 picoseconds.
+		Weight::from_parts(18_227_000, 0)
 	}
 	fn bn128_mul() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_018_103_000 picoseconds.
-		Weight::from_parts(1_023_315_000, 0)
+		// Minimum execution time: 998_630_000 picoseconds.
+		Weight::from_parts(1_006_587_000, 0)
 	}
 	/// The range of component `n` is `[0, 20]`.
 	fn bn128_pairing(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 378_000 picoseconds.
-		Weight::from_parts(5_119_381_361, 0)
-			// Standard Error: 10_821_771
-			.saturating_add(Weight::from_parts(6_202_434_383, 0).saturating_mul(n.into()))
+		// Minimum execution time: 707_000 picoseconds.
+		Weight::from_parts(4_870_335_588, 0)
+			// Standard Error: 11_658_035
+			.saturating_add(Weight::from_parts(6_013_735_348, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 1200]`.
 	fn blake2f(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 435_000 picoseconds.
-		Weight::from_parts(658_540, 0)
-			// Standard Error: 6
-			.saturating_add(Weight::from_parts(22_679, 0).saturating_mul(n.into()))
+		// Minimum execution time: 788_000 picoseconds.
+		Weight::from_parts(1_020_239, 0)
+			// Standard Error: 7
+			.saturating_add(Weight::from_parts(22_812, 0).saturating_mul(n.into()))
 	}
 	fn seal_ecdsa_to_eth_address() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 12_639_000 picoseconds.
-		Weight::from_parts(12_782_000, 0)
+		// Minimum execution time: 12_764_000 picoseconds.
+		Weight::from_parts(12_870_000, 0)
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
@@ -2108,8 +2114,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `300`
 		//  Estimated: `3765`
-		// Minimum execution time: 12_210_000 picoseconds.
-		Weight::from_parts(12_747_000, 3765)
+		// Minimum execution time: 12_153_000 picoseconds.
+		Weight::from_parts(12_626_000, 3765)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -2118,19 +2124,19 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 11_244_000 picoseconds.
-		Weight::from_parts(48_207_913, 0)
-			// Standard Error: 495
-			.saturating_add(Weight::from_parts(125_133, 0).saturating_mul(r.into()))
+		// Minimum execution time: 11_533_000 picoseconds.
+		Weight::from_parts(55_129_499, 0)
+			// Standard Error: 469
+			.saturating_add(Weight::from_parts(114_564, 0).saturating_mul(r.into()))
 	}
 	/// The range of component `r` is `[0, 100000]`.
 	fn instr_empty_loop(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_776_000 picoseconds.
-		Weight::from_parts(6_412_428, 0)
-			// Standard Error: 17
-			.saturating_add(Weight::from_parts(72_988, 0).saturating_mul(r.into()))
+		// Minimum execution time: 2_710_000 picoseconds.
+		Weight::from_parts(7_535_954, 0)
+			// Standard Error: 10
+			.saturating_add(Weight::from_parts(72_451, 0).saturating_mul(r.into()))
 	}
 }

From be987099f857172325b0b37e26696d866b86df80 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Mon, 7 Jul 2025 09:41:18 +0200
Subject: [PATCH 025/186] fixes

---
 substrate/frame/revive/src/benchmarking.rs | 16 -------------
 substrate/frame/revive/src/exec.rs         |  4 +---
 substrate/frame/revive/src/lib.rs          |  7 +++++-
 substrate/frame/revive/src/tests.rs        | 13 +++++++----
 substrate/frame/revive/src/vm/runtime.rs   | 27 ++++++++++++++--------
 5 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/substrate/frame/revive/src/benchmarking.rs b/substrate/frame/revive/src/benchmarking.rs
index fcbe439f8911..663aa74eba09 100644
--- a/substrate/frame/revive/src/benchmarking.rs
+++ b/substrate/frame/revive/src/benchmarking.rs
@@ -549,22 +549,6 @@ mod benchmarks {
 		);
 	}
 
-	#[benchmark(pov_mode = Measured)]
-	fn seal_is_contract() {
-		let Contract { account_id, .. } =
-			Contract::<T>::with_index(1, VmBinaryModule::dummy(), vec![]).unwrap();
-
-		build_runtime!(runtime, memory: [account_id.encode(), ]);
-
-		let result;
-		#[block]
-		{
-			result = runtime.bench_is_contract(memory.as_mut_slice(), 0);
-		}
-
-		assert_eq!(result.unwrap(), 1);
-	}
-
 	#[benchmark(pov_mode = Measured)]
 	fn seal_to_account_id() {
 		// use a mapped address for the benchmark, to ensure that we bench the worst
diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index 023d1b0fc5b5..c3d5e80d9c16 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -1756,7 +1756,7 @@ where
 				salt,
 				input_data: input_data.as_ref(),
 			},
-			value.try_into().map_err(|_| Error::<T>::BalanceConversionFailed)?,
+			value,
 			gas_limit,
 			deposit_limit.saturated_into::<BalanceOf<T>>(),
 			self.is_read_only(),
@@ -1812,8 +1812,6 @@ where
 				return Err(<Error<T>>::ReentranceDenied.into());
 			}
 
-			let value = value.try_into().map_err(|_| Error::<T>::BalanceConversionFailed)?;
-
 			// We ignore instantiate frames in our search for a cached contract.
 			// Otherwise it would be possible to recursively call a contract from its own
 			// constructor: We disallow calling not fully constructed contracts.
diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index ba1a56f974a1..0b332b3611f7 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -682,6 +682,11 @@ pub mod pallet {
 		pub fn has_dust(value: U256) -> bool {
 			value % U256::from(<T>::NativeToEthRatio::get()) != U256::zero()
 		}
+
+		/// Returns true if the evm value carries balance.
+		pub fn has_balance(value: U256) -> bool {
+			value >= U256::from(<T>::NativeToEthRatio::get())
+		}
 	}
 
 	#[pallet::call]
@@ -1660,7 +1665,7 @@ impl<T: Config> Pallet<T> {
 		if let Some(code) = <All<T>>::code(address.as_fixed_bytes()) {
 			return code.into()
 		}
-		<ContractInfoOf<T>>::get(&address)
+		AccountInfo::<T>::load_contract(&address)
 			.and_then(|contract| <PristineCode<T>>::get(contract.code_hash))
 			.map(|code| code.into())
 			.unwrap_or_default()
diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index a8466b7567e0..84b60be63585 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -58,7 +58,7 @@ use sp_io::hashing::blake2_256;
 use sp_keystore::{testing::MemoryKeystore, KeystoreExt};
 use sp_runtime::{
 	testing::H256,
-	traits::{BlakeTwo256, Convert, IdentityLookup, One},
+	traits::{BlakeTwo256, Convert, IdentityLookup, One, Zero},
 	AccountId32, BuildStorage, DispatchError, Perbill, TokenError,
 };
 
@@ -544,10 +544,13 @@ fn transfer_with_dust_works() {
 			<Test as Config>::Currency::mint_into(&dust_account_id, dust_account_balance).unwrap();
 
 			let total_issuance = <Test as Config>::Currency::total_issuance();
+			let evm_value = Pallet::<Test>::convert_native_to_evm(amount);
 
-			let result = builder::bare_call(BOB_ADDR)
-				.evm_value(Pallet::<Test>::convert_native_to_evm(amount))
-				.build_and_unwrap_result();
+			assert_eq!(Pallet::<Test>::has_dust(evm_value), !amount.dust.is_zero());
+			assert_eq!(Pallet::<Test>::has_balance(evm_value), !amount.value.is_zero());
+
+			let result =
+				builder::bare_call(BOB_ADDR).evm_value(evm_value).build_and_unwrap_result();
 			assert_eq!(result, Default::default(), "{description} tx failed");
 
 			assert_eq!(
@@ -4938,7 +4941,7 @@ fn code_size_for_precompiles_works() {
 	ExtBuilder::default().build().execute_with(|| {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
 		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-			.value(1000)
+			.native_value(1000)
 			.build_and_unwrap_contract();
 
 		// the primitive pre-compiles return 0 code size on eth
diff --git a/substrate/frame/revive/src/vm/runtime.rs b/substrate/frame/revive/src/vm/runtime.rs
index 89829e2590e1..a9afeda978c0 100644
--- a/substrate/frame/revive/src/vm/runtime.rs
+++ b/substrate/frame/revive/src/vm/runtime.rs
@@ -341,12 +341,12 @@ pub enum RuntimeCosts {
 	/// Weight of reading and decoding the input to a precompile.
 	PrecompileDecode(u32),
 	/// Weight of the transfer performed during a call.
-	/// parameter `with_dust` indicates whether the transfer has a `dust` value.
-	CallTransferSurcharge { with_dust: bool },
+	/// parameter `dust_transfer` indicates whether the transfer has a `dust` value.
+	CallTransferSurcharge { dust_transfer: bool },
 	/// Weight per byte that is cloned by supplying the `CLONE_INPUT` flag.
 	CallInputCloned(u32),
-	/// Weight of calling `seal_instantiate` for the given input length.
-	Instantiate { input_data_len: u32, transfer_with_dust: bool },
+	/// Weight of calling `seal_instantiate`.
+	Instantiate { input_data_len: u32, balance_transfer: bool, dust_transfer: bool },
 	/// Weight of calling `Ripemd160` precompile for the given input size.
 	Ripemd160(u32),
 	/// Weight of calling `Sha256` precompile for the given input size.
@@ -496,10 +496,15 @@ impl<T: Config> Token<T> for RuntimeCosts {
 			PrecompileBase => T::WeightInfo::seal_call_precompile(0, 0),
 			PrecompileWithInfoBase => T::WeightInfo::seal_call_precompile(1, 0),
 			PrecompileDecode(len) => cost_args!(seal_call_precompile, 0, len),
-			CallTransferSurcharge { with_dust } => cost_args!(seal_call, 1, with_dust.into(), 0),
+			CallTransferSurcharge { dust_transfer } =>
+				cost_args!(seal_call, 1, dust_transfer.into(), 0),
 			CallInputCloned(len) => cost_args!(seal_call, 0, 0, len),
-			Instantiate { input_data_len, transfer_with_dust } =>
-				T::WeightInfo::seal_instantiate(input_data_len, transfer_with_dust.into()),
+			Instantiate { input_data_len, balance_transfer, dust_transfer } =>
+				T::WeightInfo::seal_instantiate(
+					input_data_len,
+					balance_transfer.into(),
+					dust_transfer.into(),
+				),
 			HashSha256(len) => T::WeightInfo::sha2_256(len),
 			Ripemd160(len) => T::WeightInfo::ripemd_160(len),
 			HashKeccak256(len) => T::WeightInfo::seal_hash_keccak_256(len),
@@ -1094,7 +1099,7 @@ impl<'a, E: Ext, M: ?Sized + Memory<E::T>> Runtime<'a, E, M> {
 					}
 
 					self.charge_gas(RuntimeCosts::CallTransferSurcharge {
-						with_dust: Pallet::<E::T>::has_dust(value),
+						dust_transfer: Pallet::<E::T>::has_dust(value),
 					})?;
 				}
 				self.ext.call(
@@ -1165,14 +1170,16 @@ impl<'a, E: Ext, M: ?Sized + Memory<E::T>> Runtime<'a, E, M> {
 			Ok(value) => {
 				self.charge_gas(RuntimeCosts::Instantiate {
 					input_data_len,
-					transfer_with_dust: Pallet::<E::T>::has_dust(value),
+					balance_transfer: Pallet::<E::T>::has_balance(value),
+					dust_transfer: Pallet::<E::T>::has_dust(value),
 				})?;
 				value
 			},
 			Err(err) => {
 				self.charge_gas(RuntimeCosts::Instantiate {
 					input_data_len,
-					transfer_with_dust: false,
+					balance_transfer: false,
+					dust_transfer: false,
 				})?;
 				return Err(err.into());
 			},

From 66d14f848e257b56ab3f0c665530c679fafd6177 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Mon, 7 Jul 2025 11:40:23 +0200
Subject: [PATCH 026/186] add migration

---
 .../assets/asset-hub-westend/src/lib.rs       |   2 +-
 substrate/frame/revive/src/benchmarking.rs    |  24 +++-
 substrate/frame/revive/src/lib.rs             |   1 +
 substrate/frame/revive/src/migrations.rs      |  24 ++++
 substrate/frame/revive/src/migrations/v1.rs   | 131 ++++++++++++++++++
 substrate/frame/revive/src/storage.rs         |   4 +-
 substrate/frame/revive/src/weights.rs         |   1 +
 7 files changed, 183 insertions(+), 4 deletions(-)
 create mode 100644 substrate/frame/revive/src/migrations.rs
 create mode 100644 substrate/frame/revive/src/migrations/v1.rs

diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
index 3de29c5b4067..794b306ce13f 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
@@ -1200,7 +1200,7 @@ parameter_types! {
 impl pallet_migrations::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	#[cfg(not(feature = "runtime-benchmarks"))]
-	type Migrations = pallet_migrations::migrations::ResetPallet<Runtime, Revive>;
+	type Migrations = pallet_revive::migrations::v1::Migration<Runtime>;
 	// Benchmarks need mocked migrations to guarantee that they succeed.
 	#[cfg(feature = "runtime-benchmarks")]
 	type Migrations = pallet_migrations::mock_helpers::MockedMigrations;
diff --git a/substrate/frame/revive/src/benchmarking.rs b/substrate/frame/revive/src/benchmarking.rs
index 663aa74eba09..ff5a759eeafe 100644
--- a/substrate/frame/revive/src/benchmarking.rs
+++ b/substrate/frame/revive/src/benchmarking.rs
@@ -18,7 +18,6 @@
 //! Benchmarks for the revive pallet.
 
 #![cfg(feature = "runtime-benchmarks")]
-
 use crate::{
 	call_builder::{caller_funding, default_deposit_limit, CallSetup, Contract, VmBinaryModule},
 	evm::runtime::GAS_PRICE,
@@ -33,6 +32,7 @@ use codec::{Encode, MaxEncodedLen};
 use frame_benchmarking::v2::*;
 use frame_support::{
 	self, assert_ok,
+	migrations::SteppedMigration,
 	storage::child,
 	traits::fungible::InspectHold,
 	weights::{Weight, WeightMeter},
@@ -2250,6 +2250,28 @@ mod benchmarks {
 		}
 	}
 
+	#[benchmark]
+	fn v1_migration_step() {
+		use crate::migrations::v1;
+		let addr = H160::from([1u8; 20]);
+		let contract_info = ContractInfo::new(&addr, 1u32.into(), Default::default()).unwrap();
+
+		v1::old::ContractInfoOf::<T>::insert(addr, contract_info.clone());
+		let mut meter = WeightMeter::new();
+		assert_eq!(AccountInfo::<T>::load_contract(&addr), None);
+
+		#[block]
+		{
+			v1::Migration::<T>::step(None, &mut meter).unwrap();
+		}
+
+		assert_eq!(v1::old::ContractInfoOf::<T>::get(&addr), None);
+		assert_eq!(AccountInfo::<T>::load_contract(&addr).unwrap(), contract_info);
+
+		// uses twice the weight once for migration and then for checking if there is another key.
+		assert_eq!(meter.consumed(), <T as Config>::WeightInfo::v1_migration_step() * 2);
+	}
+
 	impl_benchmark_test_suite!(
 		Contracts,
 		crate::tests::ExtBuilder::default().build(),
diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index 0b332b3611f7..88c0685bfd4a 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -37,6 +37,7 @@ mod transient_storage;
 mod vm;
 
 pub mod evm;
+pub mod migrations;
 pub mod precompiles;
 pub mod test_utils;
 pub mod tracing;
diff --git a/substrate/frame/revive/src/migrations.rs b/substrate/frame/revive/src/migrations.rs
new file mode 100644
index 000000000000..88c7a8c2fd8b
--- /dev/null
+++ b/substrate/frame/revive/src/migrations.rs
@@ -0,0 +1,24 @@
+// 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.
+
+/// # Multi-Block Migrations Module
+
+/// Migrations from the old `ContractInfoOf` to the new `AccountInfoOf` storage
+pub mod v1;
+
+/// A unique identifier across all pallets.
+pub const PALLET_MIGRATIONS_ID: &[u8; 17] = b"pallet-revive-mbm";
diff --git a/substrate/frame/revive/src/migrations/v1.rs b/substrate/frame/revive/src/migrations/v1.rs
new file mode 100644
index 000000000000..3d7a09a902ff
--- /dev/null
+++ b/substrate/frame/revive/src/migrations/v1.rs
@@ -0,0 +1,131 @@
+// 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.
+
+//! # Multi-Block Migration v1
+//!
+//! This migrat the old `ContractInfoOf` storage to the new `AccountInfoOf`.
+
+extern crate alloc;
+
+use super::PALLET_MIGRATIONS_ID;
+use crate::{weights::WeightInfo, AccountInfo, AccountInfoOf, Config, H160};
+use frame_support::{
+	migrations::{MigrationId, SteppedMigration, SteppedMigrationError},
+	pallet_prelude::PhantomData,
+	weights::WeightMeter,
+};
+
+#[cfg(feature = "try-runtime")]
+use alloc::collections::btree_map::BTreeMap;
+
+#[cfg(feature = "try-runtime")]
+use alloc::vec::Vec;
+
+/// Module containing the old storage items.
+pub mod old {
+	use super::Config;
+	use crate::{pallet::Pallet, ContractInfo, H160};
+	use frame_support::{storage_alias, Identity};
+
+	#[storage_alias]
+	/// The storage item that is being migrated from.
+	pub type ContractInfoOf<T: Config> = StorageMap<Pallet<T>, Identity, H160, ContractInfo<T>>;
+}
+
+/// Migrates the items of the [`old::ContractInfoOf`] map into [`crate::AccountInfoOf`].
+pub struct Migration<T: Config>(PhantomData<T>);
+
+impl<T: Config> SteppedMigration for Migration<T> {
+	type Cursor = H160;
+	type Identifier = MigrationId<17>;
+
+	fn id() -> Self::Identifier {
+		MigrationId { pallet_id: *PALLET_MIGRATIONS_ID, version_from: 0, version_to: 1 }
+	}
+
+	fn step(
+		mut cursor: Option<Self::Cursor>,
+		meter: &mut WeightMeter,
+	) -> Result<Option<Self::Cursor>, SteppedMigrationError> {
+		let required = <T as Config>::WeightInfo::v1_migration_step();
+		if meter.remaining().any_lt(required) {
+			return Err(SteppedMigrationError::InsufficientWeight { required });
+		}
+
+		loop {
+			if meter.try_consume(required).is_err() {
+				break;
+			}
+
+			let mut iter = if let Some(last_key) = cursor {
+				old::ContractInfoOf::<T>::iter_from(old::ContractInfoOf::<T>::hashed_key_for(
+					last_key,
+				))
+			} else {
+				old::ContractInfoOf::<T>::iter()
+			};
+
+			if let Some((last_key, value)) = iter.next() {
+				old::ContractInfoOf::<T>::remove(last_key);
+				AccountInfoOf::<T>::insert(
+					last_key,
+					AccountInfo { account_type: value.into(), ..Default::default() },
+				);
+				cursor = Some(last_key)
+			} else {
+				cursor = None;
+				break
+			}
+		}
+		Ok(cursor)
+	}
+
+	#[cfg(feature = "try-runtime")]
+	fn pre_upgrade() -> Result<Vec<u8>, frame_support::sp_runtime::TryRuntimeError> {
+		use codec::Encode;
+
+		// Return the state of the storage before the migration.
+		Ok(old::ContractInfoOf::<T>::iter().collect::<BTreeMap<_, _>>().encode())
+	}
+
+	#[cfg(feature = "try-runtime")]
+	fn post_upgrade(prev: Vec<u8>) -> Result<(), frame_support::sp_runtime::TryRuntimeError> {
+		use codec::Decode;
+
+		// Check the state of the storage after the migration.
+		let prev_map = BTreeMap::<H160, ContractInfo<T>>::decode(&mut &prev[..])
+			.expect("Failed to decode the previous storage state");
+
+		// Check the len of prev and post are the same.
+		assert_eq!(
+			AccountInfoOf::<T>::iter().count(),
+			prev_map.len(),
+			"Migration failed: the number of items in the storage after the migration is not the same as before"
+		);
+
+		for (key, value) in prev_map {
+			let new_value = AccountInfo::<T>::load_contract(&key);
+			assert_eq!(
+				Some(value),
+				new_value,
+				"Migration failed: the value after the migration is not the same as before"
+			);
+		}
+
+		Ok(())
+	}
+}
diff --git a/substrate/frame/revive/src/storage.rs b/substrate/frame/revive/src/storage.rs
index 40493282496f..b69ea0f6a816 100644
--- a/substrate/frame/revive/src/storage.rs
+++ b/substrate/frame/revive/src/storage.rs
@@ -34,7 +34,7 @@ use core::marker::PhantomData;
 use frame_support::{
 	storage::child::{self, ChildInfo},
 	weights::{Weight, WeightMeter},
-	CloneNoBound, DefaultNoBound,
+	CloneNoBound, DebugNoBound, DefaultNoBound,
 };
 use scale_info::TypeInfo;
 use sp_core::{Get, H160};
@@ -97,7 +97,7 @@ pub enum AccountType<T: Config> {
 
 /// Information for managing an account and its sub trie abstraction.
 /// This is the required info to cache for an account.
-#[derive(Encode, Decode, CloneNoBound, PartialEq, Eq, RuntimeDebug, TypeInfo, MaxEncodedLen)]
+#[derive(Encode, Decode, CloneNoBound, PartialEq, Eq, DebugNoBound, TypeInfo, MaxEncodedLen)]
 #[scale_info(skip_type_params(T))]
 pub struct ContractInfo<T: Config> {
 	/// Unique ID for the subtree encoded as a bytes vector.
diff --git a/substrate/frame/revive/src/weights.rs b/substrate/frame/revive/src/weights.rs
index 85ea6c2fec3c..0723cf7d4112 100644
--- a/substrate/frame/revive/src/weights.rs
+++ b/substrate/frame/revive/src/weights.rs
@@ -71,6 +71,7 @@ use core::marker::PhantomData;
 
 /// Weight functions needed for `pallet_revive`.
 pub trait WeightInfo {
+	fn v1_migration_step() -> Weight { Weight::from_parts(100, 100) }
 	fn on_process_deletion_queue_batch() -> Weight;
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight;
 	fn call_with_code_per_byte(c: u32, ) -> Weight;

From cb064899432a11ecc380310be17d20536b9c8116 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Mon, 7 Jul 2025 11:56:13 +0200
Subject: [PATCH 027/186] get rid of dust_account_id

---
 substrate/frame/revive/src/exec.rs       | 22 +++++------
 substrate/frame/revive/src/exec/tests.rs |  2 +-
 substrate/frame/revive/src/lib.rs        |  8 +---
 substrate/frame/revive/src/tests.rs      | 49 ++++++------------------
 4 files changed, 24 insertions(+), 57 deletions(-)

diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index c3d5e80d9c16..5ad5e1d6d914 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -26,8 +26,7 @@ use crate::{
 	tracing::if_tracing,
 	transient_storage::TransientStorage,
 	AccountInfo, AccountInfoOf, BalanceOf, BalanceWithDust, CodeInfo, CodeInfoOf, Config,
-	ContractInfo, Error, Event, ImmutableData, ImmutableDataOf, Pallet, Pallet as Contracts,
-	RuntimeCosts,
+	ContractInfo, Error, Event, ImmutableData, ImmutableDataOf, Pallet as Contracts, RuntimeCosts,
 };
 use alloc::vec::Vec;
 use core::{fmt::Debug, marker::PhantomData, mem};
@@ -37,7 +36,7 @@ use frame_support::{
 	storage::{with_transaction, TransactionOutcome},
 	traits::{
 		fungible::{Inspect, Mutate},
-		tokens::Preservation,
+		tokens::{Fortitude, Precision, Preservation},
 		Time,
 	},
 	weights::Weight,
@@ -1446,17 +1445,16 @@ where
 		let to_addr = <T::AddressMapper as AddressMapper<T>>::to_address(to);
 		let mut to_info = AccountInfoOf::<T>::get(&to_addr).unwrap_or_default();
 
-		let dust_account_id = Pallet::<T>::dust_account_id();
 		let plank = T::NativeToEthRatio::get();
 
 		if from_info.dust < dust {
-			// If the dust account does not exist, we need to create it.
-			if !System::<T>::account_exists(&dust_account_id) {
-				let ed = <T as Config>::Currency::minimum_balance();
-				T::Currency::set_balance(&dust_account_id, ed);
-			}
-
-			transfer(from, &dust_account_id, 1u32.into())?;
+			T::Currency::burn_from(
+				from,
+				1u32.into(),
+				Preservation::Preserve,
+				Precision::Exact,
+				Fortitude::Polite,
+			)?;
 			from_info.dust = from_info
 				.dust
 				.checked_add(plank)
@@ -1467,7 +1465,7 @@ where
 		transfer_dust(&mut from_info, &mut to_info, dust)?;
 
 		if to_info.dust.saturating_add(dust) >= plank {
-			transfer(&dust_account_id, to, 1u32.into())?;
+			T::Currency::mint_into(to, 1u32.into())?;
 			to_info.dust = to_info
 				.dust
 				.checked_sub(plank)
diff --git a/substrate/frame/revive/src/exec/tests.rs b/substrate/frame/revive/src/exec/tests.rs
index ef809e65194d..eacf1353e8b3 100644
--- a/substrate/frame/revive/src/exec/tests.rs
+++ b/substrate/frame/revive/src/exec/tests.rs
@@ -30,7 +30,7 @@ use crate::{
 		test_utils::{get_balance, place_contract, set_balance},
 		ExtBuilder, RuntimeEvent as MetaEvent, Test,
 	},
-	AddressMapper, Error,
+	AddressMapper, Error, Pallet,
 };
 use assert_matches::assert_matches;
 use frame_support::{assert_err, assert_ok, parameter_types};
diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index 88c0685bfd4a..039b5ec7dccb 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -129,7 +129,7 @@ const LOG_TARGET: &str = "runtime::revive";
 #[frame_support::pallet]
 pub mod pallet {
 	use super::*;
-	use frame_support::{pallet_prelude::*, traits::FindAuthor, PalletId};
+	use frame_support::{pallet_prelude::*, traits::FindAuthor};
 	use frame_system::pallet_prelude::*;
 	use sp_core::U256;
 	use sp_runtime::Perbill;
@@ -673,12 +673,6 @@ pub mod pallet {
 	}
 
 	impl<T: Config> Pallet<T> {
-		/// The dust account ID used for exchange Plank for dust.
-		pub fn dust_account_id() -> <T as frame_system::Config>::AccountId {
-			use sp_runtime::traits::AccountIdConversion;
-			PalletId(*b"py/revdt").into_account_truncating()
-		}
-
 		/// Returns true if the evm value carries dust.
 		pub fn has_dust(value: U256) -> bool {
 			value % U256::from(<T>::NativeToEthRatio::get()) != U256::zero()
diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index 84b60be63585..7b2b0c354d6d 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -43,7 +43,7 @@ use frame_support::{
 	storage::child,
 	traits::{
 		fungible::{BalancedHold, Inspect, Mutate, MutateHold},
-		tokens::{Fortitude::Polite, Preservation, Preservation::Preserve},
+		tokens::Preservation,
 		ConstU32, ConstU64, FindAuthor, OnIdle, OnInitialize, StorageVersion,
 	},
 	weights::{constants::WEIGHT_REF_TIME_PER_SECOND, FixedFee, IdentityFee, Weight, WeightMeter},
@@ -411,13 +411,9 @@ impl ExtBuilder {
 		self.set_associated_consts();
 		let mut t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
 		let checking_account = Pallet::<Test>::checking_account();
-		let dust_account = Pallet::<Test>::dust_account_id();
 
 		pallet_balances::GenesisConfig::<Test> {
-			balances: vec![
-				(checking_account.clone(), 1_000_000_000_000),
-				(dust_account, <Test as Config>::Currency::minimum_balance()),
-			],
+			balances: vec![(checking_account.clone(), 1_000_000_000_000)],
 			..Default::default()
 		}
 		.assimilate_storage(&mut t)
@@ -464,11 +460,10 @@ fn transfer_with_dust_works() {
 		description: &'static str,
 		from_balance: BalanceWithDust<u64>,
 		to_balance: BalanceWithDust<u64>,
-		dust_account_balance: u64,
 		amount: BalanceWithDust<u64>,
 		expected_from_balance: BalanceWithDust<u64>,
 		expected_to_balance: BalanceWithDust<u64>,
-		expected_dust_account_balance: u64,
+		total_issuance_diff: i64,
 	}
 
 	let plank: u32 = <Test as Config>::NativeToEthRatio::get();
@@ -478,51 +473,46 @@ fn transfer_with_dust_works() {
 			description: "without dust",
 			from_balance: BalanceWithDust { value: 100, dust: 0 },
 			to_balance: BalanceWithDust { value: 0, dust: 0 },
-			dust_account_balance: 0,
 			amount: BalanceWithDust { value: 1, dust: 0 },
 			expected_from_balance: BalanceWithDust { value: 99, dust: 0 },
 			expected_to_balance: BalanceWithDust { value: 1, dust: 0 },
-			expected_dust_account_balance: 0,
+			total_issuance_diff: 0,
 		},
 		TestCase {
 			description: "with dust",
 			from_balance: BalanceWithDust { value: 100, dust: 0 },
 			to_balance: BalanceWithDust { value: 0, dust: 0 },
-			dust_account_balance: 0,
 			amount: BalanceWithDust { value: 1, dust: 10 },
 			expected_from_balance: BalanceWithDust { value: 98, dust: plank - 10 },
 			expected_to_balance: BalanceWithDust { value: 1, dust: 10 },
-			expected_dust_account_balance: 1,
+			total_issuance_diff: 1,
 		},
 		TestCase {
 			description: "just dust",
 			from_balance: BalanceWithDust { value: 100, dust: 0 },
 			to_balance: BalanceWithDust { value: 0, dust: 0 },
-			dust_account_balance: 0,
 			amount: BalanceWithDust { value: 0, dust: 10 },
 			expected_from_balance: BalanceWithDust { value: 99, dust: plank - 10 },
 			expected_to_balance: BalanceWithDust { value: 0, dust: 10 },
-			expected_dust_account_balance: 1,
+			total_issuance_diff: 1,
 		},
 		TestCase {
 			description: "with existing dust",
 			from_balance: BalanceWithDust { value: 100, dust: 5 },
 			to_balance: BalanceWithDust { value: 0, dust: plank - 5 },
-			dust_account_balance: 1,
 			amount: BalanceWithDust { value: 1, dust: 10 },
 			expected_from_balance: BalanceWithDust { value: 98, dust: plank - 5 },
 			expected_to_balance: BalanceWithDust { value: 2, dust: 5 },
-			expected_dust_account_balance: 1,
+			total_issuance_diff: 0,
 		},
 		TestCase {
 			description: "with enough existing dust",
 			from_balance: BalanceWithDust { value: 100, dust: 10 },
 			to_balance: BalanceWithDust { value: 0, dust: plank - 10 },
-			dust_account_balance: 1,
 			amount: BalanceWithDust { value: 1, dust: 10 },
 			expected_from_balance: BalanceWithDust { value: 99, dust: 0 },
 			expected_to_balance: BalanceWithDust { value: 2, dust: 0 },
-			expected_dust_account_balance: 0,
+			total_issuance_diff: -1,
 		},
 	];
 
@@ -530,18 +520,15 @@ fn transfer_with_dust_works() {
 		description,
 		from_balance,
 		to_balance,
-		dust_account_balance,
 		amount,
 		expected_from_balance,
 		expected_to_balance,
-		expected_dust_account_balance,
+		total_issuance_diff,
 	} in test_cases.into_iter()
 	{
-		let dust_account_id = Pallet::<Test>::dust_account_id();
 		ExtBuilder::default().build().execute_with(|| {
 			test_utils::set_balance_with_dust(&ALICE_ADDR, from_balance);
 			test_utils::set_balance_with_dust(&BOB_ADDR, to_balance);
-			<Test as Config>::Currency::mint_into(&dust_account_id, dust_account_balance).unwrap();
 
 			let total_issuance = <Test as Config>::Currency::total_issuance();
 			let evm_value = Pallet::<Test>::convert_native_to_evm(amount);
@@ -566,21 +553,9 @@ fn transfer_with_dust_works() {
 			);
 
 			assert_eq!(
-				<Test as Config>::Currency::reducible_balance(&dust_account_id, Preserve, Polite),
-				expected_dust_account_balance,
-				"{description}: invalid dust balance"
-			);
-
-			assert_eq!(
-				total_issuance,
-				<Test as Config>::Currency::total_issuance(),
-				"{description}: total issuance has not changed"
-			);
-
-			assert_eq!(
-				(expected_from_balance.dust + expected_to_balance.dust) / plank,
-				expected_dust_account_balance as u32,
-				"{description}: Total dust should match the balance held by the dust_account",
+				total_issuance as i64 - total_issuance_diff,
+				<Test as Config>::Currency::total_issuance() as i64,
+				"{description}: total issuance should match"
 			);
 		});
 	}

From 1edd2c242ce5192b42e6b7956d30208c1b6db582 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Mon, 7 Jul 2025 12:09:31 +0200
Subject: [PATCH 028/186] fixes

---
 substrate/frame/revive/src/exec.rs          | 7 ++++++-
 substrate/frame/revive/src/migrations/v1.rs | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index 5ad5e1d6d914..6acb2377870f 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -1454,7 +1454,12 @@ where
 				Preservation::Preserve,
 				Precision::Exact,
 				Fortitude::Polite,
-			)?;
+			)
+			.map_err(|err| {
+				log::debug!(target: crate::LOG_TARGET, "Burning 1 plank from {from:?} failed. Err: {err:?}");
+				ExecError::from(Error::<T>::TransferFailed)
+			})?;
+
 			from_info.dust = from_info
 				.dust
 				.checked_add(plank)
diff --git a/substrate/frame/revive/src/migrations/v1.rs b/substrate/frame/revive/src/migrations/v1.rs
index 3d7a09a902ff..cf11a28d99f4 100644
--- a/substrate/frame/revive/src/migrations/v1.rs
+++ b/substrate/frame/revive/src/migrations/v1.rs
@@ -107,7 +107,7 @@ impl<T: Config> SteppedMigration for Migration<T> {
 		use codec::Decode;
 
 		// Check the state of the storage after the migration.
-		let prev_map = BTreeMap::<H160, ContractInfo<T>>::decode(&mut &prev[..])
+		let prev_map = BTreeMap::<H160, crate::ContractInfo<T>>::decode(&mut &prev[..])
 			.expect("Failed to decode the previous storage state");
 
 		// Check the len of prev and post are the same.

From 7840bddc5831b0db2082f26cef74ee6b92c441a0 Mon Sep 17 00:00:00 2001
From: "cmd[bot]" <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 7 Jul 2025 11:30:53 +0000
Subject: [PATCH 029/186] Update from github-actions[bot] running command
 'bench --runtime dev --pallet pallet_revive'

---
 substrate/frame/revive/src/weights.rs | 1170 +++++++++++++------------
 1 file changed, 591 insertions(+), 579 deletions(-)

diff --git a/substrate/frame/revive/src/weights.rs b/substrate/frame/revive/src/weights.rs
index 0723cf7d4112..1ef378112155 100644
--- a/substrate/frame/revive/src/weights.rs
+++ b/substrate/frame/revive/src/weights.rs
@@ -35,9 +35,9 @@
 //! Autogenerated weights for `pallet_revive`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
-//! DATE: 2025-07-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2025-07-07, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `4fb324baf64b`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! HOSTNAME: `21662c3ecae1`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
@@ -71,7 +71,6 @@ use core::marker::PhantomData;
 
 /// Weight functions needed for `pallet_revive`.
 pub trait WeightInfo {
-	fn v1_migration_step() -> Weight { Weight::from_parts(100, 100) }
 	fn on_process_deletion_queue_batch() -> Weight;
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight;
 	fn call_with_code_per_byte(c: u32, ) -> Weight;
@@ -160,6 +159,7 @@ pub trait WeightInfo {
 	fn seal_set_code_hash() -> Weight;
 	fn instr(r: u32, ) -> Weight;
 	fn instr_empty_loop(r: u32, ) -> Weight;
+	fn v1_migration_step() -> Weight;
 }
 
 /// Weights for `pallet_revive` using the Substrate node and recommended hardware.
@@ -171,8 +171,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `147`
 		//  Estimated: `1632`
-		// Minimum execution time: 3_087_000 picoseconds.
-		Weight::from_parts(3_247_000, 1632)
+		// Minimum execution time: 3_022_000 picoseconds.
+		Weight::from_parts(3_275_000, 1632)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -182,10 +182,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `458 + k * (69 ±0)`
 		//  Estimated: `448 + k * (70 ±0)`
-		// Minimum execution time: 13_997_000 picoseconds.
-		Weight::from_parts(14_266_000, 448)
-			// Standard Error: 866
-			.saturating_add(Weight::from_parts(1_180_593, 0).saturating_mul(k.into()))
+		// Minimum execution time: 13_874_000 picoseconds.
+		Weight::from_parts(14_194_000, 448)
+			// Standard Error: 1_039
+			.saturating_add(Weight::from_parts(1_188_412, 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))
@@ -209,10 +209,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1180 + c * (1 ±0)`
 		//  Estimated: `7121 + c * (1 ±0)`
-		// Minimum execution time: 80_371_000 picoseconds.
-		Weight::from_parts(119_339_648, 7121)
+		// Minimum execution time: 77_961_000 picoseconds.
+		Weight::from_parts(116_526_220, 7121)
 			// Standard Error: 10
-			.saturating_add(Weight::from_parts(1_689, 0).saturating_mul(c.into()))
+			.saturating_add(Weight::from_parts(1_542, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(c.into()))
@@ -230,14 +230,12 @@ 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 `b` is `[0, 1]`.
-	fn basic_block_compilation(b: u32, ) -> Weight {
+	fn basic_block_compilation(_b: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `4515`
 		//  Estimated: `10455`
-		// Minimum execution time: 121_300_000 picoseconds.
-		Weight::from_parts(125_943_332, 10455)
-			// Standard Error: 583_852
-			.saturating_add(Weight::from_parts(1_306_067, 0).saturating_mul(b.into()))
+		// Minimum execution time: 119_646_000 picoseconds.
+		Weight::from_parts(124_019_340, 10455)
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -261,12 +259,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1122`
 		//  Estimated: `7010`
-		// Minimum execution time: 1_319_981_000 picoseconds.
-		Weight::from_parts(208_776_560, 7010)
-			// Standard Error: 47
-			.saturating_add(Weight::from_parts(19_063, 0).saturating_mul(c.into()))
+		// Minimum execution time: 1_327_609_000 picoseconds.
+		Weight::from_parts(179_913_315, 7010)
+			// Standard Error: 46
+			.saturating_add(Weight::from_parts(19_768, 0).saturating_mul(c.into()))
 			// Standard Error: 18
-			.saturating_add(Weight::from_parts(4_327, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(4_410, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
@@ -280,7 +278,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Timestamp::Now` (r:1 w:0)
 	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
-	/// Storage: `System::Account` (r:2 w:2)
+	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:0 w:1)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(262180), added: 264655, mode: `Measured`)
@@ -291,18 +289,18 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1122`
 		//  Estimated: `7062 + d * (2475 ±0)`
-		// Minimum execution time: 352_464_000 picoseconds.
-		Weight::from_parts(144_030_696, 7062)
-			// Standard Error: 32
-			.saturating_add(Weight::from_parts(15_029, 0).saturating_mul(c.into()))
-			// Standard Error: 12
-			.saturating_add(Weight::from_parts(489, 0).saturating_mul(i.into()))
-			// Standard Error: 2_162_506
-			.saturating_add(Weight::from_parts(62_297_017, 0).saturating_mul(d.into()))
+		// Minimum execution time: 318_798_000 picoseconds.
+		Weight::from_parts(139_013_493, 7062)
+			// Standard Error: 35
+			.saturating_add(Weight::from_parts(15_521, 0).saturating_mul(c.into()))
+			// Standard Error: 14
+			.saturating_add(Weight::from_parts(460, 0).saturating_mul(i.into()))
+			// Standard Error: 2_345_026
+			.saturating_add(Weight::from_parts(39_907_207, 0).saturating_mul(d.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
-			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(d.into())))
+			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(d.into())))
 			.saturating_add(T::DbWeight::get().writes(6_u64))
-			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(d.into())))
+			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(d.into())))
 			.saturating_add(Weight::from_parts(0, 2475).saturating_mul(d.into()))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
@@ -322,12 +320,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:  `1912`
-		//  Estimated: `5348`
-		// Minimum execution time: 157_257_000 picoseconds.
-		Weight::from_parts(145_200_684, 5348)
-			// Standard Error: 15
-			.saturating_add(Weight::from_parts(4_497, 0).saturating_mul(i.into()))
+		//  Measured:  `1926`
+		//  Estimated: `5378`
+		// Minimum execution time: 156_918_000 picoseconds.
+		Weight::from_parts(142_913_155, 5378)
+			// Standard Error: 14
+			.saturating_add(Weight::from_parts(4_488, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -345,10 +343,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:  `1853`
-		//  Estimated: `7793`
-		// Minimum execution time: 85_755_000 picoseconds.
-		Weight::from_parts(87_660_000, 7793)
+		//  Measured:  `1903`
+		//  Estimated: `7843`
+		// Minimum execution time: 82_585_000 picoseconds.
+		Weight::from_parts(85_924_000, 7843)
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -362,21 +360,21 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(262180), added: 264655, mode: `Measured`)
 	/// Storage: `Timestamp::Now` (r:1 w:0)
 	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
-	/// Storage: `System::Account` (r:2 w:2)
+	/// 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 `d` is `[0, 1]`.
 	fn eth_call(d: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1853`
-		//  Estimated: `7793 + d * (2475 ±0)`
-		// Minimum execution time: 84_102_000 picoseconds.
-		Weight::from_parts(87_454_814, 7793)
-			// Standard Error: 355_862
-			.saturating_add(Weight::from_parts(60_086_885, 0).saturating_mul(d.into()))
+		//  Measured:  `1903`
+		//  Estimated: `7843 + d * (2475 ±0)`
+		// Minimum execution time: 81_895_000 picoseconds.
+		Weight::from_parts(85_628_961, 7843)
+			// Standard Error: 317_863
+			.saturating_add(Weight::from_parts(23_205_338, 0).saturating_mul(d.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
-			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(d.into())))
+			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(d.into())))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
-			.saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(d.into())))
+			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(d.into())))
 			.saturating_add(Weight::from_parts(0, 2475).saturating_mul(d.into()))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
@@ -390,10 +388,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `505`
 		//  Estimated: `3970`
-		// Minimum execution time: 49_266_000 picoseconds.
-		Weight::from_parts(36_681_890, 3970)
-			// Standard Error: 18
-			.saturating_add(Weight::from_parts(14_655, 0).saturating_mul(c.into()))
+		// Minimum execution time: 47_704_000 picoseconds.
+		Weight::from_parts(36_150_999, 3970)
+			// Standard Error: 20
+			.saturating_add(Weight::from_parts(14_504, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -407,8 +405,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `658`
 		//  Estimated: `4123`
-		// Minimum execution time: 40_426_000 picoseconds.
-		Weight::from_parts(41_134_000, 4123)
+		// Minimum execution time: 40_605_000 picoseconds.
+		Weight::from_parts(41_546_000, 4123)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -420,8 +418,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `530`
 		//  Estimated: `6470`
-		// Minimum execution time: 19_768_000 picoseconds.
-		Weight::from_parts(20_504_000, 6470)
+		// Minimum execution time: 20_044_000 picoseconds.
+		Weight::from_parts(20_635_000, 6470)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -433,8 +431,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `813`
 		//  Estimated: `4278`
-		// Minimum execution time: 48_814_000 picoseconds.
-		Weight::from_parts(49_994_000, 4278)
+		// Minimum execution time: 48_997_000 picoseconds.
+		Weight::from_parts(49_667_000, 4278)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -446,8 +444,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `395`
 		//  Estimated: `3860`
-		// Minimum execution time: 36_296_000 picoseconds.
-		Weight::from_parts(37_551_000, 3860)
+		// Minimum execution time: 36_743_000 picoseconds.
+		Weight::from_parts(37_493_000, 3860)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -459,8 +457,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `145`
 		//  Estimated: `3610`
-		// Minimum execution time: 12_732_000 picoseconds.
-		Weight::from_parts(13_474_000, 3610)
+		// Minimum execution time: 12_596_000 picoseconds.
+		Weight::from_parts(13_147_000, 3610)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 	}
 	/// The range of component `r` is `[0, 1600]`.
@@ -468,24 +466,24 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_947_000 picoseconds.
-		Weight::from_parts(7_549_381, 0)
-			// Standard Error: 190
-			.saturating_add(Weight::from_parts(186_127, 0).saturating_mul(r.into()))
+		// Minimum execution time: 6_828_000 picoseconds.
+		Weight::from_parts(7_640_533, 0)
+			// Standard Error: 255
+			.saturating_add(Weight::from_parts(177_400, 0).saturating_mul(r.into()))
 	}
 	fn seal_caller() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 364_000 picoseconds.
-		Weight::from_parts(417_000, 0)
+		// Minimum execution time: 324_000 picoseconds.
+		Weight::from_parts(356_000, 0)
 	}
 	fn seal_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 318_000 picoseconds.
-		Weight::from_parts(349_000, 0)
+		// Minimum execution time: 295_000 picoseconds.
+		Weight::from_parts(325_000, 0)
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
@@ -493,8 +491,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `571`
 		//  Estimated: `4036`
-		// Minimum execution time: 9_465_000 picoseconds.
-		Weight::from_parts(9_705_000, 4036)
+		// Minimum execution time: 9_263_000 picoseconds.
+		Weight::from_parts(9_663_000, 4036)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:0)
@@ -503,16 +501,16 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `403`
 		//  Estimated: `3868`
-		// Minimum execution time: 8_735_000 picoseconds.
-		Weight::from_parts(8_967_000, 3868)
+		// Minimum execution time: 9_037_000 picoseconds.
+		Weight::from_parts(9_379_000, 3868)
 			.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: 238_000 picoseconds.
-		Weight::from_parts(270_000, 0)
+		// Minimum execution time: 271_000 picoseconds.
+		Weight::from_parts(308_000, 0)
 	}
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:0)
 	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
@@ -522,51 +520,51 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `474`
 		//  Estimated: `3939`
-		// Minimum execution time: 11_885_000 picoseconds.
-		Weight::from_parts(12_387_000, 3939)
+		// Minimum execution time: 12_341_000 picoseconds.
+		Weight::from_parts(12_803_000, 3939)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 	}
 	fn seal_caller_is_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 284_000 picoseconds.
-		Weight::from_parts(335_000, 0)
+		// Minimum execution time: 320_000 picoseconds.
+		Weight::from_parts(367_000, 0)
 	}
 	fn seal_caller_is_root() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 244_000 picoseconds.
-		Weight::from_parts(278_000, 0)
+		// Minimum execution time: 250_000 picoseconds.
+		Weight::from_parts(291_000, 0)
 	}
 	fn seal_address() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 256_000 picoseconds.
-		Weight::from_parts(306_000, 0)
+		// Minimum execution time: 275_000 picoseconds.
+		Weight::from_parts(320_000, 0)
 	}
 	fn seal_weight_left() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 621_000 picoseconds.
-		Weight::from_parts(681_000, 0)
+		// Minimum execution time: 626_000 picoseconds.
+		Weight::from_parts(688_000, 0)
 	}
 	fn seal_ref_time_left() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 239_000 picoseconds.
-		Weight::from_parts(268_000, 0)
+		// Minimum execution time: 243_000 picoseconds.
+		Weight::from_parts(275_000, 0)
 	}
 	fn seal_balance() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `469`
 		//  Estimated: `0`
-		// Minimum execution time: 11_459_000 picoseconds.
-		Weight::from_parts(11_955_000, 0)
+		// Minimum execution time: 11_762_000 picoseconds.
+		Weight::from_parts(12_023_000, 0)
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
@@ -578,8 +576,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `590`
 		//  Estimated: `4055`
-		// Minimum execution time: 12_943_000 picoseconds.
-		Weight::from_parts(13_436_000, 4055)
+		// Minimum execution time: 13_264_000 picoseconds.
+		Weight::from_parts(13_747_000, 4055)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 	}
 	/// Storage: `Revive::ImmutableDataOf` (r:1 w:0)
@@ -589,10 +587,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `271 + n * (1 ±0)`
 		//  Estimated: `3736 + n * (1 ±0)`
-		// Minimum execution time: 5_671_000 picoseconds.
-		Weight::from_parts(6_350_878, 3736)
-			// Standard Error: 6
-			.saturating_add(Weight::from_parts(620, 0).saturating_mul(n.into()))
+		// Minimum execution time: 5_660_000 picoseconds.
+		Weight::from_parts(6_367_742, 3736)
+			// Standard Error: 5
+			.saturating_add(Weight::from_parts(626, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -603,67 +601,67 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_765_000 picoseconds.
-		Weight::from_parts(2_040_371, 0)
+		// Minimum execution time: 1_827_000 picoseconds.
+		Weight::from_parts(2_093_143, 0)
 			// Standard Error: 2
-			.saturating_add(Weight::from_parts(685, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(632, 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: 249_000 picoseconds.
-		Weight::from_parts(274_000, 0)
+		// Minimum execution time: 259_000 picoseconds.
+		Weight::from_parts(286_000, 0)
 	}
 	fn seal_minimum_balance() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 260_000 picoseconds.
-		Weight::from_parts(290_000, 0)
+		// Minimum execution time: 240_000 picoseconds.
+		Weight::from_parts(288_000, 0)
 	}
 	fn seal_return_data_size() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 226_000 picoseconds.
-		Weight::from_parts(271_000, 0)
+		// Minimum execution time: 241_000 picoseconds.
+		Weight::from_parts(269_000, 0)
 	}
 	fn seal_call_data_size() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 228_000 picoseconds.
-		Weight::from_parts(277_000, 0)
+		// Minimum execution time: 254_000 picoseconds.
+		Weight::from_parts(276_000, 0)
 	}
 	fn seal_gas_limit() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 415_000 picoseconds.
-		Weight::from_parts(456_000, 0)
+		// Minimum execution time: 418_000 picoseconds.
+		Weight::from_parts(472_000, 0)
 	}
 	fn seal_gas_price() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 214_000 picoseconds.
-		Weight::from_parts(246_000, 0)
+		// Minimum execution time: 242_000 picoseconds.
+		Weight::from_parts(272_000, 0)
 	}
 	fn seal_base_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 236_000 picoseconds.
-		Weight::from_parts(273_000, 0)
+		// Minimum execution time: 245_000 picoseconds.
+		Weight::from_parts(284_000, 0)
 	}
 	fn seal_block_number() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 236_000 picoseconds.
-		Weight::from_parts(278_000, 0)
+		// Minimum execution time: 260_000 picoseconds.
+		Weight::from_parts(295_000, 0)
 	}
 	/// Storage: `Session::Validators` (r:1 w:0)
 	/// Proof: `Session::Validators` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -671,8 +669,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `141`
 		//  Estimated: `1626`
-		// Minimum execution time: 20_669_000 picoseconds.
-		Weight::from_parts(20_950_000, 1626)
+		// Minimum execution time: 19_877_000 picoseconds.
+		Weight::from_parts(20_558_000, 1626)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `System::BlockHash` (r:1 w:0)
@@ -681,48 +679,48 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `30`
 		//  Estimated: `3495`
-		// Minimum execution time: 3_476_000 picoseconds.
-		Weight::from_parts(3_697_000, 3495)
+		// Minimum execution time: 3_320_000 picoseconds.
+		Weight::from_parts(3_491_000, 3495)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	fn seal_now() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 223_000 picoseconds.
-		Weight::from_parts(257_000, 0)
+		// Minimum execution time: 246_000 picoseconds.
+		Weight::from_parts(275_000, 0)
 	}
 	fn seal_weight_to_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_476_000 picoseconds.
-		Weight::from_parts(1_617_000, 0)
+		// Minimum execution time: 1_422_000 picoseconds.
+		Weight::from_parts(1_544_000, 0)
 	}
 	/// The range of component `n` is `[0, 262140]`.
 	fn seal_copy_to_contract(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 358_000 picoseconds.
-		Weight::from_parts(561_222, 0)
+		// Minimum execution time: 374_000 picoseconds.
+		Weight::from_parts(570_694, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(259, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(200, 0).saturating_mul(n.into()))
 	}
 	fn seal_call_data_load() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 232_000 picoseconds.
-		Weight::from_parts(270_000, 0)
+		// Minimum execution time: 257_000 picoseconds.
+		Weight::from_parts(281_000, 0)
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn seal_call_data_copy(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 219_000 picoseconds.
-		Weight::from_parts(77_326, 0)
+		// Minimum execution time: 253_000 picoseconds.
+		Weight::from_parts(196_095, 0)
 			// Standard Error: 0
 			.saturating_add(Weight::from_parts(115, 0).saturating_mul(n.into()))
 	}
@@ -731,10 +729,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 255_000 picoseconds.
-		Weight::from_parts(489_092, 0)
+		// Minimum execution time: 274_000 picoseconds.
+		Weight::from_parts(394_229, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(259, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(201, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
@@ -750,8 +748,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `582`
 		//  Estimated: `4047`
-		// Minimum execution time: 15_923_000 picoseconds.
-		Weight::from_parts(16_445_000, 4047)
+		// Minimum execution time: 16_090_000 picoseconds.
+		Weight::from_parts(16_632_000, 4047)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -761,12 +759,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_273_000 picoseconds.
-		Weight::from_parts(4_192_452, 0)
-			// Standard Error: 2_820
-			.saturating_add(Weight::from_parts(194_732, 0).saturating_mul(t.into()))
-			// Standard Error: 31
-			.saturating_add(Weight::from_parts(1_218, 0).saturating_mul(n.into()))
+		// Minimum execution time: 4_198_000 picoseconds.
+		Weight::from_parts(4_183_416, 0)
+			// Standard Error: 2_981
+			.saturating_add(Weight::from_parts(213_016, 0).saturating_mul(t.into()))
+			// Standard Error: 32
+			.saturating_add(Weight::from_parts(1_105, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
 	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -774,8 +772,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `648`
 		//  Estimated: `648`
-		// Minimum execution time: 7_138_000 picoseconds.
-		Weight::from_parts(7_691_000, 648)
+		// Minimum execution time: 7_070_000 picoseconds.
+		Weight::from_parts(7_525_000, 648)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -784,8 +782,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `10658`
 		//  Estimated: `10658`
-		// Minimum execution time: 40_853_000 picoseconds.
-		Weight::from_parts(41_403_000, 10658)
+		// Minimum execution time: 41_471_000 picoseconds.
+		Weight::from_parts(42_118_000, 10658)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -794,8 +792,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `648`
 		//  Estimated: `648`
-		// Minimum execution time: 8_258_000 picoseconds.
-		Weight::from_parts(8_676_000, 648)
+		// Minimum execution time: 8_309_000 picoseconds.
+		Weight::from_parts(8_669_000, 648)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -805,8 +803,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `10658`
 		//  Estimated: `10658`
-		// Minimum execution time: 42_393_000 picoseconds.
-		Weight::from_parts(43_592_000, 10658)
+		// Minimum execution time: 42_556_000 picoseconds.
+		Weight::from_parts(43_428_000, 10658)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -818,12 +816,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: 8_740_000 picoseconds.
-		Weight::from_parts(9_229_170, 247)
-			// Standard Error: 62
-			.saturating_add(Weight::from_parts(920, 0).saturating_mul(n.into()))
-			// Standard Error: 62
-			.saturating_add(Weight::from_parts(972, 0).saturating_mul(o.into()))
+		// Minimum execution time: 8_599_000 picoseconds.
+		Weight::from_parts(9_274_787, 247)
+			// Standard Error: 52
+			.saturating_add(Weight::from_parts(429, 0).saturating_mul(n.into()))
+			// Standard Error: 52
+			.saturating_add(Weight::from_parts(913, 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()))
@@ -835,10 +833,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_772_000 picoseconds.
-		Weight::from_parts(9_596_651, 247)
-			// Standard Error: 73
-			.saturating_add(Weight::from_parts(524, 0).saturating_mul(n.into()))
+		// Minimum execution time: 8_547_000 picoseconds.
+		Weight::from_parts(9_242_831, 247)
+			// Standard Error: 67
+			.saturating_add(Weight::from_parts(891, 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()))
@@ -850,10 +848,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: 7_905_000 picoseconds.
-		Weight::from_parts(8_856_432, 247)
-			// Standard Error: 78
-			.saturating_add(Weight::from_parts(1_795, 0).saturating_mul(n.into()))
+		// Minimum execution time: 7_942_000 picoseconds.
+		Weight::from_parts(9_065_769, 247)
+			// Standard Error: 94
+			.saturating_add(Weight::from_parts(1_372, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -864,10 +862,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: 7_408_000 picoseconds.
-		Weight::from_parts(8_288_564, 247)
-			// Standard Error: 65
-			.saturating_add(Weight::from_parts(1_004, 0).saturating_mul(n.into()))
+		// Minimum execution time: 7_491_000 picoseconds.
+		Weight::from_parts(8_032_251, 247)
+			// Standard Error: 60
+			.saturating_add(Weight::from_parts(1_195, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -878,10 +876,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_053_000 picoseconds.
-		Weight::from_parts(10_110_316, 247)
-			// Standard Error: 200
-			.saturating_add(Weight::from_parts(1_330, 0).saturating_mul(n.into()))
+		// Minimum execution time: 8_773_000 picoseconds.
+		Weight::from_parts(10_027_688, 247)
+			// Standard Error: 86
+			.saturating_add(Weight::from_parts(1_672, 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()))
@@ -890,36 +888,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_573_000, 0)
+		// Minimum execution time: 1_445_000 picoseconds.
+		Weight::from_parts(1_558_000, 0)
 	}
 	fn set_transient_storage_full() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_848_000 picoseconds.
-		Weight::from_parts(1_969_000, 0)
+		// Minimum execution time: 1_867_000 picoseconds.
+		Weight::from_parts(1_988_000, 0)
 	}
 	fn get_transient_storage_empty() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_447_000 picoseconds.
-		Weight::from_parts(1_523_000, 0)
+		// Minimum execution time: 1_455_000 picoseconds.
+		Weight::from_parts(1_539_000, 0)
 	}
 	fn get_transient_storage_full() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_560_000 picoseconds.
-		Weight::from_parts(1_681_000, 0)
+		// Minimum execution time: 1_626_000 picoseconds.
+		Weight::from_parts(1_714_000, 0)
 	}
 	fn rollback_transient_storage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_079_000 picoseconds.
-		Weight::from_parts(1_163_000, 0)
+		// Minimum execution time: 1_056_000 picoseconds.
+		Weight::from_parts(1_204_000, 0)
 	}
 	/// The range of component `n` is `[0, 416]`.
 	/// The range of component `o` is `[0, 416]`.
@@ -927,50 +925,52 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_151_000 picoseconds.
-		Weight::from_parts(2_362_287, 0)
-			// Standard Error: 14
-			.saturating_add(Weight::from_parts(336, 0).saturating_mul(n.into()))
-			// Standard Error: 14
-			.saturating_add(Weight::from_parts(322, 0).saturating_mul(o.into()))
+		// Minimum execution time: 2_248_000 picoseconds.
+		Weight::from_parts(2_470_381, 0)
+			// Standard Error: 13
+			.saturating_add(Weight::from_parts(272, 0).saturating_mul(n.into()))
+			// Standard Error: 13
+			.saturating_add(Weight::from_parts(297, 0).saturating_mul(o.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_clear_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_051_000 picoseconds.
-		Weight::from_parts(2_347_102, 0)
-			// Standard Error: 22
-			.saturating_add(Weight::from_parts(279, 0).saturating_mul(n.into()))
+		// Minimum execution time: 2_045_000 picoseconds.
+		Weight::from_parts(2_357_164, 0)
+			// Standard Error: 18
+			.saturating_add(Weight::from_parts(484, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_get_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_772_000 picoseconds.
-		Weight::from_parts(1_994_332, 0)
-			// Standard Error: 18
-			.saturating_add(Weight::from_parts(407, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_908_000 picoseconds.
+		Weight::from_parts(2_125_522, 0)
+			// Standard Error: 13
+			.saturating_add(Weight::from_parts(249, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_contains_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_669_000 picoseconds.
-		Weight::from_parts(1_841_322, 0)
-			// Standard Error: 15
-			.saturating_add(Weight::from_parts(244, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_623_000 picoseconds.
+		Weight::from_parts(1_860_447, 0)
+			// Standard Error: 16
+			.saturating_add(Weight::from_parts(108, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
-	fn seal_take_transient_storage(_n: u32, ) -> Weight {
+	fn seal_take_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_468_000 picoseconds.
-		Weight::from_parts(2_699_464, 0)
+		// Minimum execution time: 2_513_000 picoseconds.
+		Weight::from_parts(2_746_905, 0)
+			// Standard Error: 17
+			.saturating_add(Weight::from_parts(34, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
@@ -980,29 +980,26 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(262180), added: 264655, mode: `Measured`)
-	/// Storage: `System::Account` (r:2 w:2)
+	/// 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 `t` is `[0, 1]`.
 	/// The range of component `d` is `[0, 1]`.
 	/// The range of component `i` is `[0, 262144]`.
 	fn seal_call(t: u32, d: u32, i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1891`
-		//  Estimated: `5356 + d * (2475 ±0)`
-		// Minimum execution time: 81_428_000 picoseconds.
-		Weight::from_parts(66_368_659, 5356)
-			// Standard Error: 157_294
-			.saturating_add(Weight::from_parts(16_457_009, 0).saturating_mul(t.into()))
-			// Standard Error: 157_294
-			.saturating_add(Weight::from_parts(55_683_287, 0).saturating_mul(d.into()))
+		//  Measured:  `1877`
+		//  Estimated: `5342`
+		// Minimum execution time: 80_268_000 picoseconds.
+		Weight::from_parts(66_796_299, 5342)
+			// Standard Error: 94_015
+			.saturating_add(Weight::from_parts(15_564_668, 0).saturating_mul(t.into()))
+			// Standard Error: 94_015
+			.saturating_add(Weight::from_parts(21_950_543, 0).saturating_mul(d.into()))
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(6, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(3, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(5_u64))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(d.into())))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(t.into())))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(d.into())))
-			.saturating_add(Weight::from_parts(0, 2475).saturating_mul(d.into()))
 	}
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
 	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
@@ -1014,12 +1011,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `366 + d * (212 ±0)`
 		//  Estimated: `2022 + d * (2022 ±0)`
-		// Minimum execution time: 22_771_000 picoseconds.
-		Weight::from_parts(10_343_634, 2022)
-			// Standard Error: 233_557
-			.saturating_add(Weight::from_parts(13_939_188, 0).saturating_mul(d.into()))
-			// Standard Error: 1
-			.saturating_add(Weight::from_parts(387, 0).saturating_mul(i.into()))
+		// Minimum execution time: 23_277_000 picoseconds.
+		Weight::from_parts(10_838_272, 2022)
+			// Standard Error: 95_204
+			.saturating_add(Weight::from_parts(13_298_819, 0).saturating_mul(d.into()))
+			// Standard Error: 0
+			.saturating_add(Weight::from_parts(323, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(d.into())))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(d.into())))
 			.saturating_add(Weight::from_parts(0, 2022).saturating_mul(d.into()))
@@ -1034,8 +1031,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1362`
 		//  Estimated: `4827`
-		// Minimum execution time: 31_704_000 picoseconds.
-		Weight::from_parts(32_992_000, 4827)
+		// Minimum execution time: 30_782_000 picoseconds.
+		Weight::from_parts(31_804_000, 4827)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
@@ -1044,147 +1041,143 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(262180), added: 264655, mode: `Measured`)
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
 	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
-	/// Storage: `System::Account` (r:2 w:2)
+	/// 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 `t` is `[0, 1]`.
 	/// The range of component `d` is `[0, 1]`.
 	/// The range of component `i` is `[0, 262144]`.
 	fn seal_instantiate(t: u32, d: u32, i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1341`
-		//  Estimated: `4801 + d * (2500 ±1) + t * (25 ±1)`
-		// Minimum execution time: 169_945_000 picoseconds.
-		Weight::from_parts(48_476_960, 4801)
-			// Standard Error: 1_790_324
-			.saturating_add(Weight::from_parts(12_953_884, 0).saturating_mul(t.into()))
-			// Standard Error: 1_790_324
-			.saturating_add(Weight::from_parts(87_463_666, 0).saturating_mul(d.into()))
-			// Standard Error: 10
-			.saturating_add(Weight::from_parts(4_318, 0).saturating_mul(i.into()))
+		//  Measured:  `1380`
+		//  Estimated: `4879`
+		// Minimum execution time: 137_360_000 picoseconds.
+		Weight::from_parts(62_972_334, 4879)
+			// Standard Error: 1_382_634
+			.saturating_add(Weight::from_parts(22_862_476, 0).saturating_mul(t.into()))
+			// Standard Error: 1_382_634
+			.saturating_add(Weight::from_parts(35_695_464, 0).saturating_mul(d.into()))
+			// Standard Error: 8
+			.saturating_add(Weight::from_parts(4_155, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(4_u64))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(d.into())))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(d.into())))
-			.saturating_add(Weight::from_parts(0, 2500).saturating_mul(d.into()))
-			.saturating_add(Weight::from_parts(0, 25).saturating_mul(t.into()))
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn sha2_256(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_053_000 picoseconds.
-		Weight::from_parts(5_469_095, 0)
+		// Minimum execution time: 1_238_000 picoseconds.
+		Weight::from_parts(7_565_135, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_284, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(1_256, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn identity(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 670_000 picoseconds.
-		Weight::from_parts(562_181, 0)
-			// Standard Error: 1
-			.saturating_add(Weight::from_parts(118, 0).saturating_mul(n.into()))
+		// Minimum execution time: 748_000 picoseconds.
+		Weight::from_parts(872_115, 0)
+			// Standard Error: 0
+			.saturating_add(Weight::from_parts(111, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn ripemd_160(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_126_000 picoseconds.
-		Weight::from_parts(2_125_003, 0)
+		// Minimum execution time: 1_244_000 picoseconds.
+		Weight::from_parts(1_290_000, 0)
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(3_890, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(3_904, 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_103_000 picoseconds.
-		Weight::from_parts(5_893_654, 0)
+		// Minimum execution time: 1_035_000 picoseconds.
+		Weight::from_parts(4_386_268, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(3_646, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(3_581, 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: 602_000 picoseconds.
-		Weight::from_parts(4_564_770, 0)
+		// Minimum execution time: 685_000 picoseconds.
+		Weight::from_parts(4_751_819, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_577, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(1_512, 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: 624_000 picoseconds.
-		Weight::from_parts(4_151_646, 0)
+		// Minimum execution time: 637_000 picoseconds.
+		Weight::from_parts(4_843_335, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_591, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(1_512, 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: 43_030_000 picoseconds.
-		Weight::from_parts(34_794_207, 0)
-			// Standard Error: 10
-			.saturating_add(Weight::from_parts(5_070, 0).saturating_mul(n.into()))
+		// Minimum execution time: 49_250_000 picoseconds.
+		Weight::from_parts(37_526_998, 0)
+			// Standard Error: 9
+			.saturating_add(Weight::from_parts(4_895, 0).saturating_mul(n.into()))
 	}
 	fn ecdsa_recover() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 45_517_000 picoseconds.
-		Weight::from_parts(46_666_000, 0)
+		// Minimum execution time: 45_745_000 picoseconds.
+		Weight::from_parts(46_501_000, 0)
 	}
 	fn bn128_add() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 15_541_000 picoseconds.
-		Weight::from_parts(16_507_000, 0)
+		// Minimum execution time: 15_787_000 picoseconds.
+		Weight::from_parts(16_309_000, 0)
 	}
 	fn bn128_mul() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 986_307_000 picoseconds.
-		Weight::from_parts(1_026_600_000, 0)
+		// Minimum execution time: 978_227_000 picoseconds.
+		Weight::from_parts(983_178_000, 0)
 	}
 	/// The range of component `n` is `[0, 20]`.
 	fn bn128_pairing(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 743_000 picoseconds.
-		Weight::from_parts(4_879_987_815, 0)
-			// Standard Error: 11_985_618
-			.saturating_add(Weight::from_parts(6_027_007_050, 0).saturating_mul(n.into()))
+		// Minimum execution time: 849_000 picoseconds.
+		Weight::from_parts(5_028_067_161, 0)
+			// Standard Error: 10_967_345
+			.saturating_add(Weight::from_parts(6_010_481_761, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 1200]`.
 	fn blake2f(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 861_000 picoseconds.
-		Weight::from_parts(1_051_090, 0)
-			// Standard Error: 7
-			.saturating_add(Weight::from_parts(23_382, 0).saturating_mul(n.into()))
+		// Minimum execution time: 920_000 picoseconds.
+		Weight::from_parts(1_115_920, 0)
+			// Standard Error: 8
+			.saturating_add(Weight::from_parts(22_705, 0).saturating_mul(n.into()))
 	}
 	fn seal_ecdsa_to_eth_address() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 12_800_000 picoseconds.
-		Weight::from_parts(12_970_000, 0)
+		// Minimum execution time: 12_728_000 picoseconds.
+		Weight::from_parts(12_877_000, 0)
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
@@ -1192,8 +1185,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `296`
 		//  Estimated: `3761`
-		// Minimum execution time: 9_436_000 picoseconds.
-		Weight::from_parts(9_995_000, 3761)
+		// Minimum execution time: 9_781_000 picoseconds.
+		Weight::from_parts(10_016_000, 3761)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -1202,20 +1195,33 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 12_006_000 picoseconds.
-		Weight::from_parts(49_478_841, 0)
-			// Standard Error: 816
-			.saturating_add(Weight::from_parts(134_226, 0).saturating_mul(r.into()))
+		// Minimum execution time: 11_494_000 picoseconds.
+		Weight::from_parts(57_030_670, 0)
+			// Standard Error: 386
+			.saturating_add(Weight::from_parts(121_589, 0).saturating_mul(r.into()))
 	}
 	/// The range of component `r` is `[0, 100000]`.
 	fn instr_empty_loop(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_661_000 picoseconds.
-		Weight::from_parts(7_913_108, 0)
-			// Standard Error: 23
-			.saturating_add(Weight::from_parts(72_528, 0).saturating_mul(r.into()))
+		// Minimum execution time: 2_770_000 picoseconds.
+		Weight::from_parts(2_172_554, 0)
+			// Standard Error: 76
+			.saturating_add(Weight::from_parts(72_829, 0).saturating_mul(r.into()))
+	}
+	/// Storage: UNKNOWN KEY `0x735f040a5d490f1107ad9c56f5ca00d2060e99e5378e562537cf3bc983e17b91` (r:2 w:1)
+	/// Proof: UNKNOWN KEY `0x735f040a5d490f1107ad9c56f5ca00d2060e99e5378e562537cf3bc983e17b91` (r:2 w:1)
+	/// Storage: `Revive::AccountInfoOf` (r:0 w:1)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `MaxEncodedLen`)
+	fn v1_migration_step() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `316`
+		//  Estimated: `6256`
+		// Minimum execution time: 11_693_000 picoseconds.
+		Weight::from_parts(12_377_000, 6256)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
 }
 
@@ -1227,8 +1233,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `147`
 		//  Estimated: `1632`
-		// Minimum execution time: 3_087_000 picoseconds.
-		Weight::from_parts(3_247_000, 1632)
+		// Minimum execution time: 3_022_000 picoseconds.
+		Weight::from_parts(3_275_000, 1632)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -1238,10 +1244,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `458 + k * (69 ±0)`
 		//  Estimated: `448 + k * (70 ±0)`
-		// Minimum execution time: 13_997_000 picoseconds.
-		Weight::from_parts(14_266_000, 448)
-			// Standard Error: 866
-			.saturating_add(Weight::from_parts(1_180_593, 0).saturating_mul(k.into()))
+		// Minimum execution time: 13_874_000 picoseconds.
+		Weight::from_parts(14_194_000, 448)
+			// Standard Error: 1_039
+			.saturating_add(Weight::from_parts(1_188_412, 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))
@@ -1265,10 +1271,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1180 + c * (1 ±0)`
 		//  Estimated: `7121 + c * (1 ±0)`
-		// Minimum execution time: 80_371_000 picoseconds.
-		Weight::from_parts(119_339_648, 7121)
+		// Minimum execution time: 77_961_000 picoseconds.
+		Weight::from_parts(116_526_220, 7121)
 			// Standard Error: 10
-			.saturating_add(Weight::from_parts(1_689, 0).saturating_mul(c.into()))
+			.saturating_add(Weight::from_parts(1_542, 0).saturating_mul(c.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(c.into()))
@@ -1286,14 +1292,12 @@ 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 `b` is `[0, 1]`.
-	fn basic_block_compilation(b: u32, ) -> Weight {
+	fn basic_block_compilation(_b: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `4515`
 		//  Estimated: `10455`
-		// Minimum execution time: 121_300_000 picoseconds.
-		Weight::from_parts(125_943_332, 10455)
-			// Standard Error: 583_852
-			.saturating_add(Weight::from_parts(1_306_067, 0).saturating_mul(b.into()))
+		// Minimum execution time: 119_646_000 picoseconds.
+		Weight::from_parts(124_019_340, 10455)
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -1317,12 +1321,12 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1122`
 		//  Estimated: `7010`
-		// Minimum execution time: 1_319_981_000 picoseconds.
-		Weight::from_parts(208_776_560, 7010)
-			// Standard Error: 47
-			.saturating_add(Weight::from_parts(19_063, 0).saturating_mul(c.into()))
+		// Minimum execution time: 1_327_609_000 picoseconds.
+		Weight::from_parts(179_913_315, 7010)
+			// Standard Error: 46
+			.saturating_add(Weight::from_parts(19_768, 0).saturating_mul(c.into()))
 			// Standard Error: 18
-			.saturating_add(Weight::from_parts(4_327, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(4_410, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
@@ -1336,7 +1340,7 @@ impl WeightInfo for () {
 	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Timestamp::Now` (r:1 w:0)
 	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
-	/// Storage: `System::Account` (r:2 w:2)
+	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:0 w:1)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(262180), added: 264655, mode: `Measured`)
@@ -1347,18 +1351,18 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1122`
 		//  Estimated: `7062 + d * (2475 ±0)`
-		// Minimum execution time: 352_464_000 picoseconds.
-		Weight::from_parts(144_030_696, 7062)
-			// Standard Error: 32
-			.saturating_add(Weight::from_parts(15_029, 0).saturating_mul(c.into()))
-			// Standard Error: 12
-			.saturating_add(Weight::from_parts(489, 0).saturating_mul(i.into()))
-			// Standard Error: 2_162_506
-			.saturating_add(Weight::from_parts(62_297_017, 0).saturating_mul(d.into()))
+		// Minimum execution time: 318_798_000 picoseconds.
+		Weight::from_parts(139_013_493, 7062)
+			// Standard Error: 35
+			.saturating_add(Weight::from_parts(15_521, 0).saturating_mul(c.into()))
+			// Standard Error: 14
+			.saturating_add(Weight::from_parts(460, 0).saturating_mul(i.into()))
+			// Standard Error: 2_345_026
+			.saturating_add(Weight::from_parts(39_907_207, 0).saturating_mul(d.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
-			.saturating_add(RocksDbWeight::get().reads((2_u64).saturating_mul(d.into())))
+			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(d.into())))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
-			.saturating_add(RocksDbWeight::get().writes((2_u64).saturating_mul(d.into())))
+			.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(d.into())))
 			.saturating_add(Weight::from_parts(0, 2475).saturating_mul(d.into()))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
@@ -1378,12 +1382,12 @@ impl WeightInfo for () {
 	/// The range of component `i` is `[0, 262144]`.
 	fn instantiate(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1912`
-		//  Estimated: `5348`
-		// Minimum execution time: 157_257_000 picoseconds.
-		Weight::from_parts(145_200_684, 5348)
-			// Standard Error: 15
-			.saturating_add(Weight::from_parts(4_497, 0).saturating_mul(i.into()))
+		//  Measured:  `1926`
+		//  Estimated: `5378`
+		// Minimum execution time: 156_918_000 picoseconds.
+		Weight::from_parts(142_913_155, 5378)
+			// Standard Error: 14
+			.saturating_add(Weight::from_parts(4_488, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -1401,10 +1405,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:  `1853`
-		//  Estimated: `7793`
-		// Minimum execution time: 85_755_000 picoseconds.
-		Weight::from_parts(87_660_000, 7793)
+		//  Measured:  `1903`
+		//  Estimated: `7843`
+		// Minimum execution time: 82_585_000 picoseconds.
+		Weight::from_parts(85_924_000, 7843)
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -1418,21 +1422,21 @@ impl WeightInfo for () {
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(262180), added: 264655, mode: `Measured`)
 	/// Storage: `Timestamp::Now` (r:1 w:0)
 	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
-	/// Storage: `System::Account` (r:2 w:2)
+	/// 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 `d` is `[0, 1]`.
 	fn eth_call(d: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1853`
-		//  Estimated: `7793 + d * (2475 ±0)`
-		// Minimum execution time: 84_102_000 picoseconds.
-		Weight::from_parts(87_454_814, 7793)
-			// Standard Error: 355_862
-			.saturating_add(Weight::from_parts(60_086_885, 0).saturating_mul(d.into()))
+		//  Measured:  `1903`
+		//  Estimated: `7843 + d * (2475 ±0)`
+		// Minimum execution time: 81_895_000 picoseconds.
+		Weight::from_parts(85_628_961, 7843)
+			// Standard Error: 317_863
+			.saturating_add(Weight::from_parts(23_205_338, 0).saturating_mul(d.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
-			.saturating_add(RocksDbWeight::get().reads((2_u64).saturating_mul(d.into())))
+			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(d.into())))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
-			.saturating_add(RocksDbWeight::get().writes((2_u64).saturating_mul(d.into())))
+			.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(d.into())))
 			.saturating_add(Weight::from_parts(0, 2475).saturating_mul(d.into()))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
@@ -1446,10 +1450,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `505`
 		//  Estimated: `3970`
-		// Minimum execution time: 49_266_000 picoseconds.
-		Weight::from_parts(36_681_890, 3970)
-			// Standard Error: 18
-			.saturating_add(Weight::from_parts(14_655, 0).saturating_mul(c.into()))
+		// Minimum execution time: 47_704_000 picoseconds.
+		Weight::from_parts(36_150_999, 3970)
+			// Standard Error: 20
+			.saturating_add(Weight::from_parts(14_504, 0).saturating_mul(c.into()))
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -1463,8 +1467,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `658`
 		//  Estimated: `4123`
-		// Minimum execution time: 40_426_000 picoseconds.
-		Weight::from_parts(41_134_000, 4123)
+		// Minimum execution time: 40_605_000 picoseconds.
+		Weight::from_parts(41_546_000, 4123)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -1476,8 +1480,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `530`
 		//  Estimated: `6470`
-		// Minimum execution time: 19_768_000 picoseconds.
-		Weight::from_parts(20_504_000, 6470)
+		// Minimum execution time: 20_044_000 picoseconds.
+		Weight::from_parts(20_635_000, 6470)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -1489,8 +1493,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `813`
 		//  Estimated: `4278`
-		// Minimum execution time: 48_814_000 picoseconds.
-		Weight::from_parts(49_994_000, 4278)
+		// Minimum execution time: 48_997_000 picoseconds.
+		Weight::from_parts(49_667_000, 4278)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -1502,8 +1506,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `395`
 		//  Estimated: `3860`
-		// Minimum execution time: 36_296_000 picoseconds.
-		Weight::from_parts(37_551_000, 3860)
+		// Minimum execution time: 36_743_000 picoseconds.
+		Weight::from_parts(37_493_000, 3860)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -1515,8 +1519,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `145`
 		//  Estimated: `3610`
-		// Minimum execution time: 12_732_000 picoseconds.
-		Weight::from_parts(13_474_000, 3610)
+		// Minimum execution time: 12_596_000 picoseconds.
+		Weight::from_parts(13_147_000, 3610)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 	}
 	/// The range of component `r` is `[0, 1600]`.
@@ -1524,24 +1528,24 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_947_000 picoseconds.
-		Weight::from_parts(7_549_381, 0)
-			// Standard Error: 190
-			.saturating_add(Weight::from_parts(186_127, 0).saturating_mul(r.into()))
+		// Minimum execution time: 6_828_000 picoseconds.
+		Weight::from_parts(7_640_533, 0)
+			// Standard Error: 255
+			.saturating_add(Weight::from_parts(177_400, 0).saturating_mul(r.into()))
 	}
 	fn seal_caller() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 364_000 picoseconds.
-		Weight::from_parts(417_000, 0)
+		// Minimum execution time: 324_000 picoseconds.
+		Weight::from_parts(356_000, 0)
 	}
 	fn seal_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 318_000 picoseconds.
-		Weight::from_parts(349_000, 0)
+		// Minimum execution time: 295_000 picoseconds.
+		Weight::from_parts(325_000, 0)
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
@@ -1549,8 +1553,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `571`
 		//  Estimated: `4036`
-		// Minimum execution time: 9_465_000 picoseconds.
-		Weight::from_parts(9_705_000, 4036)
+		// Minimum execution time: 9_263_000 picoseconds.
+		Weight::from_parts(9_663_000, 4036)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:0)
@@ -1559,16 +1563,16 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `403`
 		//  Estimated: `3868`
-		// Minimum execution time: 8_735_000 picoseconds.
-		Weight::from_parts(8_967_000, 3868)
+		// Minimum execution time: 9_037_000 picoseconds.
+		Weight::from_parts(9_379_000, 3868)
 			.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: 238_000 picoseconds.
-		Weight::from_parts(270_000, 0)
+		// Minimum execution time: 271_000 picoseconds.
+		Weight::from_parts(308_000, 0)
 	}
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:0)
 	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
@@ -1578,51 +1582,51 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `474`
 		//  Estimated: `3939`
-		// Minimum execution time: 11_885_000 picoseconds.
-		Weight::from_parts(12_387_000, 3939)
+		// Minimum execution time: 12_341_000 picoseconds.
+		Weight::from_parts(12_803_000, 3939)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 	}
 	fn seal_caller_is_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 284_000 picoseconds.
-		Weight::from_parts(335_000, 0)
+		// Minimum execution time: 320_000 picoseconds.
+		Weight::from_parts(367_000, 0)
 	}
 	fn seal_caller_is_root() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 244_000 picoseconds.
-		Weight::from_parts(278_000, 0)
+		// Minimum execution time: 250_000 picoseconds.
+		Weight::from_parts(291_000, 0)
 	}
 	fn seal_address() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 256_000 picoseconds.
-		Weight::from_parts(306_000, 0)
+		// Minimum execution time: 275_000 picoseconds.
+		Weight::from_parts(320_000, 0)
 	}
 	fn seal_weight_left() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 621_000 picoseconds.
-		Weight::from_parts(681_000, 0)
+		// Minimum execution time: 626_000 picoseconds.
+		Weight::from_parts(688_000, 0)
 	}
 	fn seal_ref_time_left() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 239_000 picoseconds.
-		Weight::from_parts(268_000, 0)
+		// Minimum execution time: 243_000 picoseconds.
+		Weight::from_parts(275_000, 0)
 	}
 	fn seal_balance() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `469`
 		//  Estimated: `0`
-		// Minimum execution time: 11_459_000 picoseconds.
-		Weight::from_parts(11_955_000, 0)
+		// Minimum execution time: 11_762_000 picoseconds.
+		Weight::from_parts(12_023_000, 0)
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
@@ -1634,8 +1638,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `590`
 		//  Estimated: `4055`
-		// Minimum execution time: 12_943_000 picoseconds.
-		Weight::from_parts(13_436_000, 4055)
+		// Minimum execution time: 13_264_000 picoseconds.
+		Weight::from_parts(13_747_000, 4055)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 	}
 	/// Storage: `Revive::ImmutableDataOf` (r:1 w:0)
@@ -1645,10 +1649,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `271 + n * (1 ±0)`
 		//  Estimated: `3736 + n * (1 ±0)`
-		// Minimum execution time: 5_671_000 picoseconds.
-		Weight::from_parts(6_350_878, 3736)
-			// Standard Error: 6
-			.saturating_add(Weight::from_parts(620, 0).saturating_mul(n.into()))
+		// Minimum execution time: 5_660_000 picoseconds.
+		Weight::from_parts(6_367_742, 3736)
+			// Standard Error: 5
+			.saturating_add(Weight::from_parts(626, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -1659,67 +1663,67 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_765_000 picoseconds.
-		Weight::from_parts(2_040_371, 0)
+		// Minimum execution time: 1_827_000 picoseconds.
+		Weight::from_parts(2_093_143, 0)
 			// Standard Error: 2
-			.saturating_add(Weight::from_parts(685, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(632, 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: 249_000 picoseconds.
-		Weight::from_parts(274_000, 0)
+		// Minimum execution time: 259_000 picoseconds.
+		Weight::from_parts(286_000, 0)
 	}
 	fn seal_minimum_balance() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 260_000 picoseconds.
-		Weight::from_parts(290_000, 0)
+		// Minimum execution time: 240_000 picoseconds.
+		Weight::from_parts(288_000, 0)
 	}
 	fn seal_return_data_size() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 226_000 picoseconds.
-		Weight::from_parts(271_000, 0)
+		// Minimum execution time: 241_000 picoseconds.
+		Weight::from_parts(269_000, 0)
 	}
 	fn seal_call_data_size() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 228_000 picoseconds.
-		Weight::from_parts(277_000, 0)
+		// Minimum execution time: 254_000 picoseconds.
+		Weight::from_parts(276_000, 0)
 	}
 	fn seal_gas_limit() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 415_000 picoseconds.
-		Weight::from_parts(456_000, 0)
+		// Minimum execution time: 418_000 picoseconds.
+		Weight::from_parts(472_000, 0)
 	}
 	fn seal_gas_price() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 214_000 picoseconds.
-		Weight::from_parts(246_000, 0)
+		// Minimum execution time: 242_000 picoseconds.
+		Weight::from_parts(272_000, 0)
 	}
 	fn seal_base_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 236_000 picoseconds.
-		Weight::from_parts(273_000, 0)
+		// Minimum execution time: 245_000 picoseconds.
+		Weight::from_parts(284_000, 0)
 	}
 	fn seal_block_number() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 236_000 picoseconds.
-		Weight::from_parts(278_000, 0)
+		// Minimum execution time: 260_000 picoseconds.
+		Weight::from_parts(295_000, 0)
 	}
 	/// Storage: `Session::Validators` (r:1 w:0)
 	/// Proof: `Session::Validators` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -1727,8 +1731,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `141`
 		//  Estimated: `1626`
-		// Minimum execution time: 20_669_000 picoseconds.
-		Weight::from_parts(20_950_000, 1626)
+		// Minimum execution time: 19_877_000 picoseconds.
+		Weight::from_parts(20_558_000, 1626)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `System::BlockHash` (r:1 w:0)
@@ -1737,48 +1741,48 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `30`
 		//  Estimated: `3495`
-		// Minimum execution time: 3_476_000 picoseconds.
-		Weight::from_parts(3_697_000, 3495)
+		// Minimum execution time: 3_320_000 picoseconds.
+		Weight::from_parts(3_491_000, 3495)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	fn seal_now() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 223_000 picoseconds.
-		Weight::from_parts(257_000, 0)
+		// Minimum execution time: 246_000 picoseconds.
+		Weight::from_parts(275_000, 0)
 	}
 	fn seal_weight_to_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_476_000 picoseconds.
-		Weight::from_parts(1_617_000, 0)
+		// Minimum execution time: 1_422_000 picoseconds.
+		Weight::from_parts(1_544_000, 0)
 	}
 	/// The range of component `n` is `[0, 262140]`.
 	fn seal_copy_to_contract(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 358_000 picoseconds.
-		Weight::from_parts(561_222, 0)
+		// Minimum execution time: 374_000 picoseconds.
+		Weight::from_parts(570_694, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(259, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(200, 0).saturating_mul(n.into()))
 	}
 	fn seal_call_data_load() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 232_000 picoseconds.
-		Weight::from_parts(270_000, 0)
+		// Minimum execution time: 257_000 picoseconds.
+		Weight::from_parts(281_000, 0)
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn seal_call_data_copy(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 219_000 picoseconds.
-		Weight::from_parts(77_326, 0)
+		// Minimum execution time: 253_000 picoseconds.
+		Weight::from_parts(196_095, 0)
 			// Standard Error: 0
 			.saturating_add(Weight::from_parts(115, 0).saturating_mul(n.into()))
 	}
@@ -1787,10 +1791,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 255_000 picoseconds.
-		Weight::from_parts(489_092, 0)
+		// Minimum execution time: 274_000 picoseconds.
+		Weight::from_parts(394_229, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(259, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(201, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
@@ -1806,8 +1810,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `582`
 		//  Estimated: `4047`
-		// Minimum execution time: 15_923_000 picoseconds.
-		Weight::from_parts(16_445_000, 4047)
+		// Minimum execution time: 16_090_000 picoseconds.
+		Weight::from_parts(16_632_000, 4047)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -1817,12 +1821,12 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_273_000 picoseconds.
-		Weight::from_parts(4_192_452, 0)
-			// Standard Error: 2_820
-			.saturating_add(Weight::from_parts(194_732, 0).saturating_mul(t.into()))
-			// Standard Error: 31
-			.saturating_add(Weight::from_parts(1_218, 0).saturating_mul(n.into()))
+		// Minimum execution time: 4_198_000 picoseconds.
+		Weight::from_parts(4_183_416, 0)
+			// Standard Error: 2_981
+			.saturating_add(Weight::from_parts(213_016, 0).saturating_mul(t.into()))
+			// Standard Error: 32
+			.saturating_add(Weight::from_parts(1_105, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
 	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -1830,8 +1834,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `648`
 		//  Estimated: `648`
-		// Minimum execution time: 7_138_000 picoseconds.
-		Weight::from_parts(7_691_000, 648)
+		// Minimum execution time: 7_070_000 picoseconds.
+		Weight::from_parts(7_525_000, 648)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -1840,8 +1844,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `10658`
 		//  Estimated: `10658`
-		// Minimum execution time: 40_853_000 picoseconds.
-		Weight::from_parts(41_403_000, 10658)
+		// Minimum execution time: 41_471_000 picoseconds.
+		Weight::from_parts(42_118_000, 10658)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -1850,8 +1854,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `648`
 		//  Estimated: `648`
-		// Minimum execution time: 8_258_000 picoseconds.
-		Weight::from_parts(8_676_000, 648)
+		// Minimum execution time: 8_309_000 picoseconds.
+		Weight::from_parts(8_669_000, 648)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -1861,8 +1865,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `10658`
 		//  Estimated: `10658`
-		// Minimum execution time: 42_393_000 picoseconds.
-		Weight::from_parts(43_592_000, 10658)
+		// Minimum execution time: 42_556_000 picoseconds.
+		Weight::from_parts(43_428_000, 10658)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -1874,12 +1878,12 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + o * (1 ±0)`
 		//  Estimated: `247 + o * (1 ±0)`
-		// Minimum execution time: 8_740_000 picoseconds.
-		Weight::from_parts(9_229_170, 247)
-			// Standard Error: 62
-			.saturating_add(Weight::from_parts(920, 0).saturating_mul(n.into()))
-			// Standard Error: 62
-			.saturating_add(Weight::from_parts(972, 0).saturating_mul(o.into()))
+		// Minimum execution time: 8_599_000 picoseconds.
+		Weight::from_parts(9_274_787, 247)
+			// Standard Error: 52
+			.saturating_add(Weight::from_parts(429, 0).saturating_mul(n.into()))
+			// Standard Error: 52
+			.saturating_add(Weight::from_parts(913, 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()))
@@ -1891,10 +1895,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 8_772_000 picoseconds.
-		Weight::from_parts(9_596_651, 247)
-			// Standard Error: 73
-			.saturating_add(Weight::from_parts(524, 0).saturating_mul(n.into()))
+		// Minimum execution time: 8_547_000 picoseconds.
+		Weight::from_parts(9_242_831, 247)
+			// Standard Error: 67
+			.saturating_add(Weight::from_parts(891, 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()))
@@ -1906,10 +1910,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 7_905_000 picoseconds.
-		Weight::from_parts(8_856_432, 247)
-			// Standard Error: 78
-			.saturating_add(Weight::from_parts(1_795, 0).saturating_mul(n.into()))
+		// Minimum execution time: 7_942_000 picoseconds.
+		Weight::from_parts(9_065_769, 247)
+			// Standard Error: 94
+			.saturating_add(Weight::from_parts(1_372, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -1920,10 +1924,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 7_408_000 picoseconds.
-		Weight::from_parts(8_288_564, 247)
-			// Standard Error: 65
-			.saturating_add(Weight::from_parts(1_004, 0).saturating_mul(n.into()))
+		// Minimum execution time: 7_491_000 picoseconds.
+		Weight::from_parts(8_032_251, 247)
+			// Standard Error: 60
+			.saturating_add(Weight::from_parts(1_195, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -1934,10 +1938,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 9_053_000 picoseconds.
-		Weight::from_parts(10_110_316, 247)
-			// Standard Error: 200
-			.saturating_add(Weight::from_parts(1_330, 0).saturating_mul(n.into()))
+		// Minimum execution time: 8_773_000 picoseconds.
+		Weight::from_parts(10_027_688, 247)
+			// Standard Error: 86
+			.saturating_add(Weight::from_parts(1_672, 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()))
@@ -1946,36 +1950,36 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_503_000 picoseconds.
-		Weight::from_parts(1_573_000, 0)
+		// Minimum execution time: 1_445_000 picoseconds.
+		Weight::from_parts(1_558_000, 0)
 	}
 	fn set_transient_storage_full() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_848_000 picoseconds.
-		Weight::from_parts(1_969_000, 0)
+		// Minimum execution time: 1_867_000 picoseconds.
+		Weight::from_parts(1_988_000, 0)
 	}
 	fn get_transient_storage_empty() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_447_000 picoseconds.
-		Weight::from_parts(1_523_000, 0)
+		// Minimum execution time: 1_455_000 picoseconds.
+		Weight::from_parts(1_539_000, 0)
 	}
 	fn get_transient_storage_full() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_560_000 picoseconds.
-		Weight::from_parts(1_681_000, 0)
+		// Minimum execution time: 1_626_000 picoseconds.
+		Weight::from_parts(1_714_000, 0)
 	}
 	fn rollback_transient_storage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_079_000 picoseconds.
-		Weight::from_parts(1_163_000, 0)
+		// Minimum execution time: 1_056_000 picoseconds.
+		Weight::from_parts(1_204_000, 0)
 	}
 	/// The range of component `n` is `[0, 416]`.
 	/// The range of component `o` is `[0, 416]`.
@@ -1983,50 +1987,52 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_151_000 picoseconds.
-		Weight::from_parts(2_362_287, 0)
-			// Standard Error: 14
-			.saturating_add(Weight::from_parts(336, 0).saturating_mul(n.into()))
-			// Standard Error: 14
-			.saturating_add(Weight::from_parts(322, 0).saturating_mul(o.into()))
+		// Minimum execution time: 2_248_000 picoseconds.
+		Weight::from_parts(2_470_381, 0)
+			// Standard Error: 13
+			.saturating_add(Weight::from_parts(272, 0).saturating_mul(n.into()))
+			// Standard Error: 13
+			.saturating_add(Weight::from_parts(297, 0).saturating_mul(o.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_clear_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_051_000 picoseconds.
-		Weight::from_parts(2_347_102, 0)
-			// Standard Error: 22
-			.saturating_add(Weight::from_parts(279, 0).saturating_mul(n.into()))
+		// Minimum execution time: 2_045_000 picoseconds.
+		Weight::from_parts(2_357_164, 0)
+			// Standard Error: 18
+			.saturating_add(Weight::from_parts(484, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_get_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_772_000 picoseconds.
-		Weight::from_parts(1_994_332, 0)
-			// Standard Error: 18
-			.saturating_add(Weight::from_parts(407, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_908_000 picoseconds.
+		Weight::from_parts(2_125_522, 0)
+			// Standard Error: 13
+			.saturating_add(Weight::from_parts(249, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_contains_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_669_000 picoseconds.
-		Weight::from_parts(1_841_322, 0)
-			// Standard Error: 15
-			.saturating_add(Weight::from_parts(244, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_623_000 picoseconds.
+		Weight::from_parts(1_860_447, 0)
+			// Standard Error: 16
+			.saturating_add(Weight::from_parts(108, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
-	fn seal_take_transient_storage(_n: u32, ) -> Weight {
+	fn seal_take_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_468_000 picoseconds.
-		Weight::from_parts(2_699_464, 0)
+		// Minimum execution time: 2_513_000 picoseconds.
+		Weight::from_parts(2_746_905, 0)
+			// Standard Error: 17
+			.saturating_add(Weight::from_parts(34, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
@@ -2036,29 +2042,26 @@ impl WeightInfo for () {
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(262180), added: 264655, mode: `Measured`)
-	/// Storage: `System::Account` (r:2 w:2)
+	/// 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 `t` is `[0, 1]`.
 	/// The range of component `d` is `[0, 1]`.
 	/// The range of component `i` is `[0, 262144]`.
 	fn seal_call(t: u32, d: u32, i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1891`
-		//  Estimated: `5356 + d * (2475 ±0)`
-		// Minimum execution time: 81_428_000 picoseconds.
-		Weight::from_parts(66_368_659, 5356)
-			// Standard Error: 157_294
-			.saturating_add(Weight::from_parts(16_457_009, 0).saturating_mul(t.into()))
-			// Standard Error: 157_294
-			.saturating_add(Weight::from_parts(55_683_287, 0).saturating_mul(d.into()))
+		//  Measured:  `1877`
+		//  Estimated: `5342`
+		// Minimum execution time: 80_268_000 picoseconds.
+		Weight::from_parts(66_796_299, 5342)
+			// Standard Error: 94_015
+			.saturating_add(Weight::from_parts(15_564_668, 0).saturating_mul(t.into()))
+			// Standard Error: 94_015
+			.saturating_add(Weight::from_parts(21_950_543, 0).saturating_mul(d.into()))
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(6, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(3, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(5_u64))
-			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(d.into())))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 			.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(t.into())))
-			.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(d.into())))
-			.saturating_add(Weight::from_parts(0, 2475).saturating_mul(d.into()))
 	}
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
 	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
@@ -2070,12 +2073,12 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `366 + d * (212 ±0)`
 		//  Estimated: `2022 + d * (2022 ±0)`
-		// Minimum execution time: 22_771_000 picoseconds.
-		Weight::from_parts(10_343_634, 2022)
-			// Standard Error: 233_557
-			.saturating_add(Weight::from_parts(13_939_188, 0).saturating_mul(d.into()))
-			// Standard Error: 1
-			.saturating_add(Weight::from_parts(387, 0).saturating_mul(i.into()))
+		// Minimum execution time: 23_277_000 picoseconds.
+		Weight::from_parts(10_838_272, 2022)
+			// Standard Error: 95_204
+			.saturating_add(Weight::from_parts(13_298_819, 0).saturating_mul(d.into()))
+			// Standard Error: 0
+			.saturating_add(Weight::from_parts(323, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads((2_u64).saturating_mul(d.into())))
 			.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(d.into())))
 			.saturating_add(Weight::from_parts(0, 2022).saturating_mul(d.into()))
@@ -2090,8 +2093,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1362`
 		//  Estimated: `4827`
-		// Minimum execution time: 31_704_000 picoseconds.
-		Weight::from_parts(32_992_000, 4827)
+		// Minimum execution time: 30_782_000 picoseconds.
+		Weight::from_parts(31_804_000, 4827)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
@@ -2100,147 +2103,143 @@ impl WeightInfo for () {
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(262180), added: 264655, mode: `Measured`)
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
 	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
-	/// Storage: `System::Account` (r:2 w:2)
+	/// 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 `t` is `[0, 1]`.
 	/// The range of component `d` is `[0, 1]`.
 	/// The range of component `i` is `[0, 262144]`.
 	fn seal_instantiate(t: u32, d: u32, i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1341`
-		//  Estimated: `4801 + d * (2500 ±1) + t * (25 ±1)`
-		// Minimum execution time: 169_945_000 picoseconds.
-		Weight::from_parts(48_476_960, 4801)
-			// Standard Error: 1_790_324
-			.saturating_add(Weight::from_parts(12_953_884, 0).saturating_mul(t.into()))
-			// Standard Error: 1_790_324
-			.saturating_add(Weight::from_parts(87_463_666, 0).saturating_mul(d.into()))
-			// Standard Error: 10
-			.saturating_add(Weight::from_parts(4_318, 0).saturating_mul(i.into()))
+		//  Measured:  `1380`
+		//  Estimated: `4879`
+		// Minimum execution time: 137_360_000 picoseconds.
+		Weight::from_parts(62_972_334, 4879)
+			// Standard Error: 1_382_634
+			.saturating_add(Weight::from_parts(22_862_476, 0).saturating_mul(t.into()))
+			// Standard Error: 1_382_634
+			.saturating_add(Weight::from_parts(35_695_464, 0).saturating_mul(d.into()))
+			// Standard Error: 8
+			.saturating_add(Weight::from_parts(4_155, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
-			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(d.into())))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
-			.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(d.into())))
-			.saturating_add(Weight::from_parts(0, 2500).saturating_mul(d.into()))
-			.saturating_add(Weight::from_parts(0, 25).saturating_mul(t.into()))
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn sha2_256(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_053_000 picoseconds.
-		Weight::from_parts(5_469_095, 0)
+		// Minimum execution time: 1_238_000 picoseconds.
+		Weight::from_parts(7_565_135, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_284, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(1_256, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn identity(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 670_000 picoseconds.
-		Weight::from_parts(562_181, 0)
-			// Standard Error: 1
-			.saturating_add(Weight::from_parts(118, 0).saturating_mul(n.into()))
+		// Minimum execution time: 748_000 picoseconds.
+		Weight::from_parts(872_115, 0)
+			// Standard Error: 0
+			.saturating_add(Weight::from_parts(111, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn ripemd_160(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_126_000 picoseconds.
-		Weight::from_parts(2_125_003, 0)
+		// Minimum execution time: 1_244_000 picoseconds.
+		Weight::from_parts(1_290_000, 0)
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(3_890, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(3_904, 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_103_000 picoseconds.
-		Weight::from_parts(5_893_654, 0)
+		// Minimum execution time: 1_035_000 picoseconds.
+		Weight::from_parts(4_386_268, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(3_646, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(3_581, 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: 602_000 picoseconds.
-		Weight::from_parts(4_564_770, 0)
+		// Minimum execution time: 685_000 picoseconds.
+		Weight::from_parts(4_751_819, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_577, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(1_512, 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: 624_000 picoseconds.
-		Weight::from_parts(4_151_646, 0)
+		// Minimum execution time: 637_000 picoseconds.
+		Weight::from_parts(4_843_335, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_591, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(1_512, 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: 43_030_000 picoseconds.
-		Weight::from_parts(34_794_207, 0)
-			// Standard Error: 10
-			.saturating_add(Weight::from_parts(5_070, 0).saturating_mul(n.into()))
+		// Minimum execution time: 49_250_000 picoseconds.
+		Weight::from_parts(37_526_998, 0)
+			// Standard Error: 9
+			.saturating_add(Weight::from_parts(4_895, 0).saturating_mul(n.into()))
 	}
 	fn ecdsa_recover() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 45_517_000 picoseconds.
-		Weight::from_parts(46_666_000, 0)
+		// Minimum execution time: 45_745_000 picoseconds.
+		Weight::from_parts(46_501_000, 0)
 	}
 	fn bn128_add() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 15_541_000 picoseconds.
-		Weight::from_parts(16_507_000, 0)
+		// Minimum execution time: 15_787_000 picoseconds.
+		Weight::from_parts(16_309_000, 0)
 	}
 	fn bn128_mul() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 986_307_000 picoseconds.
-		Weight::from_parts(1_026_600_000, 0)
+		// Minimum execution time: 978_227_000 picoseconds.
+		Weight::from_parts(983_178_000, 0)
 	}
 	/// The range of component `n` is `[0, 20]`.
 	fn bn128_pairing(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 743_000 picoseconds.
-		Weight::from_parts(4_879_987_815, 0)
-			// Standard Error: 11_985_618
-			.saturating_add(Weight::from_parts(6_027_007_050, 0).saturating_mul(n.into()))
+		// Minimum execution time: 849_000 picoseconds.
+		Weight::from_parts(5_028_067_161, 0)
+			// Standard Error: 10_967_345
+			.saturating_add(Weight::from_parts(6_010_481_761, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 1200]`.
 	fn blake2f(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 861_000 picoseconds.
-		Weight::from_parts(1_051_090, 0)
-			// Standard Error: 7
-			.saturating_add(Weight::from_parts(23_382, 0).saturating_mul(n.into()))
+		// Minimum execution time: 920_000 picoseconds.
+		Weight::from_parts(1_115_920, 0)
+			// Standard Error: 8
+			.saturating_add(Weight::from_parts(22_705, 0).saturating_mul(n.into()))
 	}
 	fn seal_ecdsa_to_eth_address() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 12_800_000 picoseconds.
-		Weight::from_parts(12_970_000, 0)
+		// Minimum execution time: 12_728_000 picoseconds.
+		Weight::from_parts(12_877_000, 0)
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
@@ -2248,8 +2247,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `296`
 		//  Estimated: `3761`
-		// Minimum execution time: 9_436_000 picoseconds.
-		Weight::from_parts(9_995_000, 3761)
+		// Minimum execution time: 9_781_000 picoseconds.
+		Weight::from_parts(10_016_000, 3761)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -2258,19 +2257,32 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 12_006_000 picoseconds.
-		Weight::from_parts(49_478_841, 0)
-			// Standard Error: 816
-			.saturating_add(Weight::from_parts(134_226, 0).saturating_mul(r.into()))
+		// Minimum execution time: 11_494_000 picoseconds.
+		Weight::from_parts(57_030_670, 0)
+			// Standard Error: 386
+			.saturating_add(Weight::from_parts(121_589, 0).saturating_mul(r.into()))
 	}
 	/// The range of component `r` is `[0, 100000]`.
 	fn instr_empty_loop(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_661_000 picoseconds.
-		Weight::from_parts(7_913_108, 0)
-			// Standard Error: 23
-			.saturating_add(Weight::from_parts(72_528, 0).saturating_mul(r.into()))
+		// Minimum execution time: 2_770_000 picoseconds.
+		Weight::from_parts(2_172_554, 0)
+			// Standard Error: 76
+			.saturating_add(Weight::from_parts(72_829, 0).saturating_mul(r.into()))
+	}
+	/// Storage: UNKNOWN KEY `0x735f040a5d490f1107ad9c56f5ca00d2060e99e5378e562537cf3bc983e17b91` (r:2 w:1)
+	/// Proof: UNKNOWN KEY `0x735f040a5d490f1107ad9c56f5ca00d2060e99e5378e562537cf3bc983e17b91` (r:2 w:1)
+	/// Storage: `Revive::AccountInfoOf` (r:0 w:1)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `MaxEncodedLen`)
+	fn v1_migration_step() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `316`
+		//  Estimated: `6256`
+		// Minimum execution time: 11_693_000 picoseconds.
+		Weight::from_parts(12_377_000, 6256)
+			.saturating_add(RocksDbWeight::get().reads(2_u64))
+			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
 }

From 3631e9047e12e8b88a26114926369efa695de33c Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Mon, 7 Jul 2025 13:24:14 +0200
Subject: [PATCH 030/186] lint fix

---
 substrate/frame/revive/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index 039b5ec7dccb..9c88bd1fb4a9 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -1455,7 +1455,7 @@ where
 
 	/// Get the balance with EVM decimals of the given `address`.
 	pub fn evm_balance(address: &H160) -> U256 {
-		let balance = AccountInfo::<T>::balance(address.clone().into());
+		let balance = AccountInfo::<T>::balance((*address).into());
 		Self::convert_native_to_evm(balance)
 	}
 

From c387d1342e8d3690254ee14066453cefc7deb8a0 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Mon, 7 Jul 2025 17:00:02 +0200
Subject: [PATCH 031/186] nit updates

---
 substrate/frame/revive/src/call_builder.rs | 13 +++++--------
 substrate/frame/revive/src/lib.rs          | 12 ++++--------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/substrate/frame/revive/src/call_builder.rs b/substrate/frame/revive/src/call_builder.rs
index b45dce397976..183df8667ccd 100644
--- a/substrate/frame/revive/src/call_builder.rs
+++ b/substrate/frame/revive/src/call_builder.rs
@@ -32,9 +32,8 @@ use crate::{
 	storage::meter::Meter,
 	transient_storage::MeterEntry,
 	vm::{PreparedCall, Runtime},
-	AccountInfo, AccountInfoOf, BalanceOf, BumpNonce, Code, CodeInfoOf, Config, ContractBlob,
-	ContractInfo, DepositLimit, Error, GasMeter, MomentOf, Origin, Pallet as Contracts,
-	PristineCode, Weight,
+	AccountInfo, BalanceOf, BumpNonce, Code, CodeInfoOf, Config, ContractBlob, ContractInfo,
+	DepositLimit, Error, GasMeter, MomentOf, Origin, Pallet as Contracts, PristineCode, Weight,
 };
 use alloc::{vec, vec::Vec};
 use frame_support::{storage::child, traits::fungible::Mutate};
@@ -265,7 +264,7 @@ where
 
 		let outcome = Contracts::<T>::bare_instantiate(
 			origin,
-			Default::default(),
+			U256::zero(),
 			Weight::MAX,
 			DepositLimit::Balance(default_deposit_limit::<T>()),
 			Code::Upload(module.code),
@@ -309,10 +308,8 @@ where
 			info.write(&Key::Fix(item.0), Some(item.1.clone()), None, false)
 				.map_err(|_| "Failed to write storage to restoration dest")?;
 		}
-		<AccountInfoOf<T>>::insert(
-			&self.address,
-			AccountInfo { account_type: info.into(), dust: 0 },
-		);
+
+		AccountInfo::<T>::insert_contract(&self.address, info);
 		Ok(())
 	}
 
diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index 9c88bd1fb4a9..c5e79d62aeb3 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -1551,10 +1551,8 @@ where
 
 	/// Query storage of a specified contract under a specified key.
 	pub fn get_storage(address: H160, key: [u8; 32]) -> GetStorageResult {
-		let account = AccountInfoOf::<T>::get(&address).ok_or(ContractAccessError::DoesntExist)?;
-		let AccountType::Contract(contract_info) = account.account_type else {
-			return Err(ContractAccessError::DoesntExist)
-		};
+		let contract_info =
+			AccountInfo::<T>::load_contract(&address).ok_or(ContractAccessError::DoesntExist)?;
 
 		let maybe_value = contract_info.read(&Key::from_fixed(key));
 		Ok(maybe_value)
@@ -1562,10 +1560,8 @@ where
 
 	/// Query storage of a specified contract under a specified variable-sized key.
 	pub fn get_storage_var_key(address: H160, key: Vec<u8>) -> GetStorageResult {
-		let account = AccountInfoOf::<T>::get(&address).ok_or(ContractAccessError::DoesntExist)?;
-		let AccountType::Contract(contract_info) = account.account_type else {
-			return Err(ContractAccessError::DoesntExist)
-		};
+		let contract_info =
+			AccountInfo::<T>::load_contract(&address).ok_or(ContractAccessError::DoesntExist)?;
 
 		let maybe_value = contract_info.read(
 			&Key::try_from_var(key)

From e9e6038fed89545a867dcdaafca5093ec9095922 Mon Sep 17 00:00:00 2001
From: "cmd[bot]" <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 7 Jul 2025 15:26:13 +0000
Subject: [PATCH 032/186] Update from github-actions[bot] running command
 'prdoc --audience runtime_dev --bump patch'

---
 prdoc/pr_9101.prdoc | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 prdoc/pr_9101.prdoc

diff --git a/prdoc/pr_9101.prdoc b/prdoc/pr_9101.prdoc
new file mode 100644
index 000000000000..475bad253e0d
--- /dev/null
+++ b/prdoc/pr_9101.prdoc
@@ -0,0 +1,23 @@
+title: '[revive] eth-decimals'
+doc:
+- audience: Runtime Dev
+  description: |-
+    On Ethereum, 1 ETH is represented as 10^18 wei (wei being the smallest unit).
+    On Polkadot 1 DOT is defined as 1010 plancks. It means that any value smaller than 10^8 wei can not be expressed with the native balance. Any contract that attempts to use such a value currently reverts with a DecimalPrecisionLoss error.
+
+    In theory, RPC can define a decimal representation different from Ethereum mainnet (10^18). In practice tools (frontend libraries, wallets, and compilers) ignore it and expect 18 decimals.
+
+    The current behaviour breaks eth compatibility and needs to be updated. See issue #109 for more details.
+
+
+    Fix  https://github.com/paritytech/contract-issues/issues/109
+    [weights compare](https://weights.tasty.limo/compare?unit=weight&ignore_errors=true&threshold=10&method=asymptotic&repo=polkadot-sdk&old=master&new=pg/eth-decimals&path_pattern=substrate/frame/**/src/weights.rs,polkadot/runtime/*/src/weights/**/*.rs,polkadot/bridges/modules/*/src/weights.rs,cumulus/**/weights/*.rs,cumulus/**/weights/xcm/*.rs,cumulus/**/src/weights.rs)
+crates:
+- name: pallet-revive
+  bump: patch
+- name: pallet-revive-fixtures
+  bump: patch
+- name: assets-common
+  bump: patch
+- name: asset-hub-westend-runtime
+  bump: patch

From 3ce1df7de310ebcd25c4aac83972279e3077592a Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Tue, 8 Jul 2025 15:26:00 +0200
Subject: [PATCH 033/186] fix pallet-xcm test

---
 polkadot/xcm/pallet-xcm/src/precompiles.rs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/polkadot/xcm/pallet-xcm/src/precompiles.rs b/polkadot/xcm/pallet-xcm/src/precompiles.rs
index 91a624006ae0..cc20bd6ebe49 100644
--- a/polkadot/xcm/pallet-xcm/src/precompiles.rs
+++ b/polkadot/xcm/pallet-xcm/src/precompiles.rs
@@ -167,7 +167,7 @@ mod test {
 			},
 			H160,
 		},
-		DepositLimit,
+		DepositLimit, U256,
 	};
 	use polkadot_parachain_primitives::primitives::Id as ParaId;
 	use sp_runtime::traits::AccountIdConversion;
@@ -212,7 +212,7 @@ mod test {
 			let result = pallet_revive::Pallet::<Test>::bare_call(
 				RuntimeOrigin::signed(ALICE),
 				xcm_precompile_addr,
-				0u128,
+				U256::zero(),
 				Weight::MAX,
 				DepositLimit::UnsafeOnlyForDryRun,
 				encoded_call,
@@ -260,7 +260,7 @@ mod test {
 			let result = pallet_revive::Pallet::<Test>::bare_call(
 				RuntimeOrigin::signed(ALICE),
 				xcm_precompile_addr,
-				0u128,
+				U256::zero(),
 				Weight::MAX,
 				DepositLimit::UnsafeOnlyForDryRun,
 				encoded_call,
@@ -308,7 +308,7 @@ mod test {
 			let result = pallet_revive::Pallet::<Test>::bare_call(
 				RuntimeOrigin::signed(ALICE),
 				xcm_precompile_addr,
-				0u128,
+				U256::zero(),
 				Weight::MAX,
 				DepositLimit::UnsafeOnlyForDryRun,
 				encoded_call,
@@ -350,7 +350,7 @@ mod test {
 			let xcm_weight_results = pallet_revive::Pallet::<Test>::bare_call(
 				RuntimeOrigin::signed(ALICE),
 				xcm_precompile_addr,
-				0u128,
+				U256::zero(),
 				Weight::MAX,
 				DepositLimit::UnsafeOnlyForDryRun,
 				encoded_weight_call,
@@ -372,7 +372,7 @@ mod test {
 			let result = pallet_revive::Pallet::<Test>::bare_call(
 				RuntimeOrigin::signed(ALICE),
 				xcm_precompile_addr,
-				0u128,
+				U256::zero(),
 				Weight::MAX,
 				DepositLimit::UnsafeOnlyForDryRun,
 				encoded_call,
@@ -410,7 +410,7 @@ mod test {
 			let xcm_weight_results = pallet_revive::Pallet::<Test>::bare_call(
 				RuntimeOrigin::signed(ALICE),
 				xcm_precompile_addr,
-				0u128,
+				U256::zero(),
 				Weight::MAX,
 				DepositLimit::UnsafeOnlyForDryRun,
 				encoded_weight_call,
@@ -432,7 +432,7 @@ mod test {
 			let result = pallet_revive::Pallet::<Test>::bare_call(
 				RuntimeOrigin::signed(ALICE),
 				xcm_precompile_addr,
-				0u128,
+				U256::zero(),
 				Weight::MAX,
 				DepositLimit::UnsafeOnlyForDryRun,
 				encoded_call,
@@ -478,7 +478,7 @@ mod test {
 			let xcm_weight_results = pallet_revive::Pallet::<Test>::bare_call(
 				RuntimeOrigin::signed(ALICE),
 				xcm_precompile_addr,
-				0u128,
+				U256::zero(),
 				Weight::MAX,
 				DepositLimit::UnsafeOnlyForDryRun,
 				encoded_weight_call,
@@ -500,7 +500,7 @@ mod test {
 			let result = pallet_revive::Pallet::<Test>::bare_call(
 				RuntimeOrigin::signed(ALICE),
 				xcm_precompile_addr,
-				0u128,
+				U256::zero(),
 				Weight::MAX,
 				DepositLimit::UnsafeOnlyForDryRun,
 				encoded_call,

From a1d9b7cde5840ce05c023c10d0100a5514de6398 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Tue, 8 Jul 2025 19:04:48 +0200
Subject: [PATCH 034/186] fix build err

---
 substrate/frame/revive/src/call_builder.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/substrate/frame/revive/src/call_builder.rs b/substrate/frame/revive/src/call_builder.rs
index 183df8667ccd..4b6ee60512d5 100644
--- a/substrate/frame/revive/src/call_builder.rs
+++ b/substrate/frame/revive/src/call_builder.rs
@@ -94,7 +94,7 @@ where
 			// Whitelist the contract's contractInfo as it is already accounted for in the call
 			// benchmark
 			frame_benchmarking::benchmarking::add_to_whitelist(
-				AccountInfoOf::<T>::hashed_key_for(&T::AddressMapper::to_address(
+				crate::AccountInfoOf::<T>::hashed_key_for(&T::AddressMapper::to_address(
 					&contract.account_id,
 				))
 				.into(),

From 3f271595e568087addc23597c57b152ba628e8e3 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Tue, 8 Jul 2025 19:38:17 +0200
Subject: [PATCH 035/186] fix assets precompible build

---
 substrate/frame/assets/src/precompiles.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/substrate/frame/assets/src/precompiles.rs b/substrate/frame/assets/src/precompiles.rs
index 6d0c08ba3eec..3190bdf09127 100644
--- a/substrate/frame/assets/src/precompiles.rs
+++ b/substrate/frame/assets/src/precompiles.rs
@@ -369,7 +369,7 @@ mod test {
 			pallet_revive::Pallet::<Test>::bare_call(
 				RuntimeOrigin::signed(1),
 				H160::from(asset_addr),
-				0u64,
+				U256::zero(),
 				Weight::MAX,
 				DepositLimit::UnsafeOnlyForDryRun,
 				data,
@@ -405,7 +405,7 @@ mod test {
 			let data = pallet_revive::Pallet::<Test>::bare_call(
 				RuntimeOrigin::signed(1),
 				H160::from(asset_addr),
-				0u64,
+				U256::zero(),
 				Weight::MAX,
 				DepositLimit::UnsafeOnlyForDryRun,
 				data,
@@ -436,7 +436,7 @@ mod test {
 			let data = pallet_revive::Pallet::<Test>::bare_call(
 				RuntimeOrigin::signed(1),
 				H160::from(asset_addr),
-				0u64,
+				U256::zero(),
 				Weight::MAX,
 				DepositLimit::UnsafeOnlyForDryRun,
 				data,
@@ -482,7 +482,7 @@ mod test {
 			pallet_revive::Pallet::<Test>::bare_call(
 				RuntimeOrigin::signed(owner),
 				H160::from(asset_addr),
-				0u64,
+				U256::zero(),
 				Weight::MAX,
 				DepositLimit::UnsafeOnlyForDryRun,
 				data,
@@ -506,7 +506,7 @@ mod test {
 			let data = pallet_revive::Pallet::<Test>::bare_call(
 				RuntimeOrigin::signed(owner),
 				H160::from(asset_addr),
-				0u64,
+				U256::zero(),
 				Weight::MAX,
 				DepositLimit::UnsafeOnlyForDryRun,
 				data,

From e3403f323d0f22260530c0117ca16aab6f76dca5 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Tue, 8 Jul 2025 19:41:49 +0200
Subject: [PATCH 036/186] fix

---
 substrate/frame/assets/src/precompiles.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/substrate/frame/assets/src/precompiles.rs b/substrate/frame/assets/src/precompiles.rs
index 3190bdf09127..107145a524d8 100644
--- a/substrate/frame/assets/src/precompiles.rs
+++ b/substrate/frame/assets/src/precompiles.rs
@@ -369,7 +369,7 @@ mod test {
 			pallet_revive::Pallet::<Test>::bare_call(
 				RuntimeOrigin::signed(1),
 				H160::from(asset_addr),
-				U256::zero(),
+				0u32.into(),
 				Weight::MAX,
 				DepositLimit::UnsafeOnlyForDryRun,
 				data,
@@ -405,7 +405,7 @@ mod test {
 			let data = pallet_revive::Pallet::<Test>::bare_call(
 				RuntimeOrigin::signed(1),
 				H160::from(asset_addr),
-				U256::zero(),
+				0u32.into(),
 				Weight::MAX,
 				DepositLimit::UnsafeOnlyForDryRun,
 				data,
@@ -436,7 +436,7 @@ mod test {
 			let data = pallet_revive::Pallet::<Test>::bare_call(
 				RuntimeOrigin::signed(1),
 				H160::from(asset_addr),
-				U256::zero(),
+				0u32.into(),
 				Weight::MAX,
 				DepositLimit::UnsafeOnlyForDryRun,
 				data,
@@ -482,7 +482,7 @@ mod test {
 			pallet_revive::Pallet::<Test>::bare_call(
 				RuntimeOrigin::signed(owner),
 				H160::from(asset_addr),
-				U256::zero(),
+				0u32.into(),
 				Weight::MAX,
 				DepositLimit::UnsafeOnlyForDryRun,
 				data,
@@ -506,7 +506,7 @@ mod test {
 			let data = pallet_revive::Pallet::<Test>::bare_call(
 				RuntimeOrigin::signed(owner),
 				H160::from(asset_addr),
-				U256::zero(),
+				0u32.into(),
 				Weight::MAX,
 				DepositLimit::UnsafeOnlyForDryRun,
 				data,
@@ -528,7 +528,7 @@ mod test {
 			pallet_revive::Pallet::<Test>::bare_call(
 				RuntimeOrigin::signed(spender),
 				H160::from(asset_addr),
-				0u64,
+				0u32.into(),
 				Weight::MAX,
 				DepositLimit::UnsafeOnlyForDryRun,
 				data,

From 5b9c6edd40e371b425b550218115d4cb770a9700 Mon Sep 17 00:00:00 2001
From: "cmd[bot]" <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 8 Jul 2025 18:07:38 +0000
Subject: [PATCH 037/186] Update from github-actions[bot] running command
 'prdoc --audience runtime_dev --bump major --force'

---
 prdoc/pr_9101.prdoc | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/prdoc/pr_9101.prdoc b/prdoc/pr_9101.prdoc
index 475bad253e0d..a0610122a6ba 100644
--- a/prdoc/pr_9101.prdoc
+++ b/prdoc/pr_9101.prdoc
@@ -14,10 +14,14 @@ doc:
     [weights compare](https://weights.tasty.limo/compare?unit=weight&ignore_errors=true&threshold=10&method=asymptotic&repo=polkadot-sdk&old=master&new=pg/eth-decimals&path_pattern=substrate/frame/**/src/weights.rs,polkadot/runtime/*/src/weights/**/*.rs,polkadot/bridges/modules/*/src/weights.rs,cumulus/**/weights/*.rs,cumulus/**/weights/xcm/*.rs,cumulus/**/src/weights.rs)
 crates:
 - name: pallet-revive
-  bump: patch
+  bump: major
 - name: pallet-revive-fixtures
-  bump: patch
+  bump: major
 - name: assets-common
-  bump: patch
+  bump: major
 - name: asset-hub-westend-runtime
-  bump: patch
+  bump: major
+- name: pallet-xcm
+  bump: major
+- name: pallet-assets
+  bump: major

From 5f7adfa084509dd96fddb1409756c2ecded3440e Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Wed, 9 Jul 2025 08:25:19 +0200
Subject: [PATCH 038/186] pallet-xcm

---
 polkadot/xcm/pallet-xcm/src/precompiles.rs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/polkadot/xcm/pallet-xcm/src/precompiles.rs b/polkadot/xcm/pallet-xcm/src/precompiles.rs
index c394b4bc756e..b673a1183055 100644
--- a/polkadot/xcm/pallet-xcm/src/precompiles.rs
+++ b/polkadot/xcm/pallet-xcm/src/precompiles.rs
@@ -325,7 +325,7 @@ mod test {
 			let result = pallet_revive::Pallet::<Test>::bare_call(
 				RuntimeOrigin::signed(ALICE),
 				xcm_precompile_addr,
-				0u128,
+				U256::zero(),
 				Weight::MAX,
 				DepositLimit::UnsafeOnlyForDryRun,
 				encoded_call,
@@ -374,7 +374,7 @@ mod test {
 			let result = pallet_revive::Pallet::<Test>::bare_call(
 				RuntimeOrigin::signed(ALICE),
 				xcm_precompile_addr,
-				0u128,
+				U256::zero(),
 				Weight::MAX,
 				DepositLimit::UnsafeOnlyForDryRun,
 				encoded_call,
@@ -449,7 +449,7 @@ mod test {
 			let result = pallet_revive::Pallet::<Test>::bare_call(
 				RuntimeOrigin::signed(ALICE),
 				xcm_precompile_addr,
-				0u128,
+				U256::zero(),
 				Weight::MAX,
 				DepositLimit::UnsafeOnlyForDryRun,
 				encoded_call,
@@ -476,7 +476,7 @@ mod test {
 			let result = pallet_revive::Pallet::<Test>::bare_call(
 				RuntimeOrigin::signed(ALICE),
 				xcm_precompile_addr,
-				0u128,
+				U256::zero(),
 				Weight::MAX,
 				DepositLimit::UnsafeOnlyForDryRun,
 				encoded_call,
@@ -713,7 +713,7 @@ mod test {
 			let xcm_weight_results = pallet_revive::Pallet::<Test>::bare_call(
 				RuntimeOrigin::signed(ALICE),
 				xcm_precompile_addr,
-				0u128,
+				U256::zero(),
 				Weight::MAX,
 				DepositLimit::UnsafeOnlyForDryRun,
 				encoded_weight_call,
@@ -742,7 +742,7 @@ mod test {
 			let result = pallet_revive::Pallet::<Test>::bare_call(
 				RuntimeOrigin::signed(ALICE),
 				xcm_precompile_addr,
-				0u128,
+				U256::zero(),
 				Weight::MAX,
 				DepositLimit::UnsafeOnlyForDryRun,
 				encoded_call,
@@ -768,7 +768,7 @@ mod test {
 			let result = pallet_revive::Pallet::<Test>::bare_call(
 				RuntimeOrigin::signed(ALICE),
 				xcm_precompile_addr,
-				0u128,
+				U256::zero(),
 				Weight::MAX,
 				DepositLimit::UnsafeOnlyForDryRun,
 				encoded_call,
@@ -816,7 +816,7 @@ mod test {
 			let xcm_weight_results = pallet_revive::Pallet::<Test>::bare_call(
 				RuntimeOrigin::signed(ALICE),
 				xcm_precompile_addr,
-				0u128,
+				U256::zero(),
 				Weight::MAX,
 				DepositLimit::UnsafeOnlyForDryRun,
 				encoded_weight_call,
@@ -840,7 +840,7 @@ mod test {
 			let xcm_weight_results = pallet_revive::Pallet::<Test>::bare_call(
 				RuntimeOrigin::signed(ALICE),
 				xcm_precompile_addr,
-				0u128,
+				U256::zero(),
 				Weight::MAX,
 				DepositLimit::UnsafeOnlyForDryRun,
 				encoded_weight_call,

From 0cae21fee1b348b3ebc2e6ad84ade9062bcb16de Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Wed, 9 Jul 2025 10:05:16 +0200
Subject: [PATCH 039/186] Update bench tests

---
 substrate/frame/revive/src/address.rs      | 14 +++++++++++-
 substrate/frame/revive/src/benchmarking.rs | 26 +++++++++++++++++++---
 substrate/frame/revive/src/call_builder.rs | 15 ++++++++-----
 3 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/substrate/frame/revive/src/address.rs b/substrate/frame/revive/src/address.rs
index 928397ec6363..7748ee5966d0 100644
--- a/substrate/frame/revive/src/address.rs
+++ b/substrate/frame/revive/src/address.rs
@@ -62,6 +62,11 @@ pub trait AddressMapper<T: Config>: private::Sealed {
 	/// `account_id` instead of the fallback account id.
 	fn map(account_id: &T::AccountId) -> DispatchResult;
 
+	#[cfg(feature = "runtime-benchmarks")]
+	fn bench_map(account_id: &T::AccountId) -> DispatchResult {
+		Self::map(account_id)
+	}
+
 	/// Remove the mapping in order to reclaim the deposit.
 	///
 	/// There is no reason why one would unmap their `account_id` except
@@ -140,6 +145,13 @@ where
 		Ok(())
 	}
 
+	#[cfg(feature = "runtime-benchmarks")]
+	fn bench_map(account_id: &T::AccountId) -> DispatchResult {
+		ensure!(!Self::is_mapped(account_id), <Error<T>>::AccountAlreadyMapped);
+		<OriginalAccount<T>>::insert(Self::to_address(account_id), account_id);
+		Ok(())
+	}
+
 	fn unmap(account_id: &T::AccountId) -> DispatchResult {
 		// will do nothing if address is not mapped so no check required
 		<OriginalAccount<T>>::remove(Self::to_address(account_id));
@@ -192,7 +204,7 @@ where
 ///
 /// This is a stateless check that just compares the last 12 bytes. Please note that it is
 /// theoretically possible to create an ed25519 keypair that passed this filter. However,
-/// this can't be used for an attack. It also won't happen by accident since everbody is using
+/// this can't be used for an attack. It also won't happen by accident since everybody is using
 /// sr25519 where this is not a valid public key.
 pub fn is_eth_derived(account_id: &AccountId32) -> bool {
 	let account_bytes: &[u8; 32] = account_id.as_ref();
diff --git a/substrate/frame/revive/src/benchmarking.rs b/substrate/frame/revive/src/benchmarking.rs
index ff5a759eeafe..7083300d67c9 100644
--- a/substrate/frame/revive/src/benchmarking.rs
+++ b/substrate/frame/revive/src/benchmarking.rs
@@ -705,23 +705,37 @@ mod benchmarks {
 
 	#[benchmark(pov_mode = Measured)]
 	fn seal_balance() {
-		build_runtime!(runtime, memory: [[0u8;32], ]);
+		build_runtime!(runtime, contract, memory: [[0u8;32], ]);
+		contract.set_balance(BalanceWithDust {
+			value: Pallet::<T>::min_balance() * 2u32.into(),
+			dust: 42u32,
+		});
+
 		let result;
 		#[block]
 		{
 			result = runtime.bench_balance(memory.as_mut_slice(), 0);
 		}
 		assert_ok!(result);
-		assert_eq!(U256::from_little_endian(&memory[..]), runtime.ext().balance());
+		assert_eq!(
+			U256::from_little_endian(&memory[..]),
+			Pallet::<T>::convert_native_to_evm(BalanceWithDust {
+				value: Pallet::<T>::min_balance(),
+				dust: 42
+			})
+		);
 	}
 
 	#[benchmark(pov_mode = Measured)]
 	fn seal_balance_of() {
 		let len = <sp_core::U256 as MaxEncodedLen>::max_encoded_len();
 		let account = account::<T::AccountId>("target", 0, 0);
+		<T as Config>::AddressMapper::bench_map(&account).unwrap();
+
 		let address = T::AddressMapper::to_address(&account);
 		let balance = Pallet::<T>::min_balance() * 2u32.into();
 		T::Currency::set_balance(&account, balance);
+		AccountInfoOf::<T>::insert(&address, AccountInfo { dust: 42, ..Default::default() });
 
 		build_runtime!(runtime, memory: [vec![0u8; len], address.0, ]);
 
@@ -732,7 +746,13 @@ mod benchmarks {
 		}
 
 		assert_ok!(result);
-		assert_eq!(U256::from_little_endian(&memory[..len]), runtime.ext().balance_of(&address));
+		assert_eq!(
+			U256::from_little_endian(&memory[..len]),
+			Pallet::<T>::convert_native_to_evm(BalanceWithDust {
+				value: Pallet::<T>::min_balance(),
+				dust: 42
+			})
+		);
 	}
 
 	#[benchmark(pov_mode = Measured)]
diff --git a/substrate/frame/revive/src/call_builder.rs b/substrate/frame/revive/src/call_builder.rs
index 4b6ee60512d5..dc04a7a4eb42 100644
--- a/substrate/frame/revive/src/call_builder.rs
+++ b/substrate/frame/revive/src/call_builder.rs
@@ -32,8 +32,9 @@ use crate::{
 	storage::meter::Meter,
 	transient_storage::MeterEntry,
 	vm::{PreparedCall, Runtime},
-	AccountInfo, BalanceOf, BumpNonce, Code, CodeInfoOf, Config, ContractBlob, ContractInfo,
-	DepositLimit, Error, GasMeter, MomentOf, Origin, Pallet as Contracts, PristineCode, Weight,
+	AccountInfo, BalanceOf, BalanceWithDust, BumpNonce, Code, CodeInfoOf, Config, ContractBlob,
+	ContractInfo, DepositLimit, Error, GasMeter, MomentOf, Origin, Pallet as Contracts,
+	PristineCode, Weight,
 };
 use alloc::{vec, vec::Vec};
 use frame_support::{storage::child, traits::fungible::Mutate};
@@ -124,7 +125,7 @@ where
 	}
 
 	/// Set the contract's balance.
-	pub fn set_balance(&mut self, value: BalanceOf<T>) {
+	pub fn set_balance(&mut self, value: impl Into<BalanceWithDust<BalanceOf<T>>>) {
 		self.contract.set_balance(value);
 	}
 
@@ -361,8 +362,12 @@ where
 	}
 
 	/// Set the balance of the contract to the supplied amount.
-	pub fn set_balance(&self, balance: BalanceOf<T>) {
-		T::Currency::set_balance(&self.account_id, balance);
+	pub fn set_balance(&self, value: impl Into<BalanceWithDust<BalanceOf<T>>>) {
+		let BalanceWithDust { value, dust } = value.into();
+		T::Currency::set_balance(&self.account_id, value);
+		crate::AccountInfoOf::<T>::mutate(&self.address, |account| {
+			account.as_mut().map(|a| a.dust = dust);
+		});
 	}
 
 	/// Returns `true` iff all storage entries related to code storage exist.

From 8a11d71ea30cad93ade20a55a66c9c40eb1498eb Mon Sep 17 00:00:00 2001
From: "cmd[bot]" <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 08:47:49 +0000
Subject: [PATCH 040/186] Update from github-actions[bot] running command
 'bench --runtime dev --pallet pallet_revive'

---
 substrate/frame/revive/src/weights.rs | 1052 +++++++++++++------------
 1 file changed, 528 insertions(+), 524 deletions(-)

diff --git a/substrate/frame/revive/src/weights.rs b/substrate/frame/revive/src/weights.rs
index 1ef378112155..b85b5f00faa2 100644
--- a/substrate/frame/revive/src/weights.rs
+++ b/substrate/frame/revive/src/weights.rs
@@ -35,9 +35,9 @@
 //! Autogenerated weights for `pallet_revive`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
-//! DATE: 2025-07-07, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2025-07-09, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `21662c3ecae1`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! HOSTNAME: `d3ca912f6e75`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
@@ -171,8 +171,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `147`
 		//  Estimated: `1632`
-		// Minimum execution time: 3_022_000 picoseconds.
-		Weight::from_parts(3_275_000, 1632)
+		// Minimum execution time: 3_043_000 picoseconds.
+		Weight::from_parts(3_289_000, 1632)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -182,10 +182,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `458 + k * (69 ±0)`
 		//  Estimated: `448 + k * (70 ±0)`
-		// Minimum execution time: 13_874_000 picoseconds.
-		Weight::from_parts(14_194_000, 448)
-			// Standard Error: 1_039
-			.saturating_add(Weight::from_parts(1_188_412, 0).saturating_mul(k.into()))
+		// Minimum execution time: 14_062_000 picoseconds.
+		Weight::from_parts(14_347_000, 448)
+			// Standard Error: 869
+			.saturating_add(Weight::from_parts(1_173_255, 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))
@@ -209,10 +209,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1180 + c * (1 ±0)`
 		//  Estimated: `7121 + c * (1 ±0)`
-		// Minimum execution time: 77_961_000 picoseconds.
-		Weight::from_parts(116_526_220, 7121)
-			// Standard Error: 10
-			.saturating_add(Weight::from_parts(1_542, 0).saturating_mul(c.into()))
+		// Minimum execution time: 80_130_000 picoseconds.
+		Weight::from_parts(119_341_468, 7121)
+			// Standard Error: 11
+			.saturating_add(Weight::from_parts(1_477, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(c.into()))
@@ -230,12 +230,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 `b` is `[0, 1]`.
-	fn basic_block_compilation(_b: u32, ) -> Weight {
+	fn basic_block_compilation(b: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `4515`
 		//  Estimated: `10455`
-		// Minimum execution time: 119_646_000 picoseconds.
-		Weight::from_parts(124_019_340, 10455)
+		// Minimum execution time: 121_130_000 picoseconds.
+		Weight::from_parts(124_944_816, 10455)
+			// Standard Error: 401_911
+			.saturating_add(Weight::from_parts(3_859_383, 0).saturating_mul(b.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -259,12 +261,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1122`
 		//  Estimated: `7010`
-		// Minimum execution time: 1_327_609_000 picoseconds.
-		Weight::from_parts(179_913_315, 7010)
-			// Standard Error: 46
-			.saturating_add(Weight::from_parts(19_768, 0).saturating_mul(c.into()))
-			// Standard Error: 18
-			.saturating_add(Weight::from_parts(4_410, 0).saturating_mul(i.into()))
+		// Minimum execution time: 1_336_764_000 picoseconds.
+		Weight::from_parts(197_731_668, 7010)
+			// Standard Error: 49
+			.saturating_add(Weight::from_parts(19_405, 0).saturating_mul(c.into()))
+			// Standard Error: 19
+			.saturating_add(Weight::from_parts(4_397, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
@@ -289,14 +291,14 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1122`
 		//  Estimated: `7062 + d * (2475 ±0)`
-		// Minimum execution time: 318_798_000 picoseconds.
-		Weight::from_parts(139_013_493, 7062)
-			// Standard Error: 35
-			.saturating_add(Weight::from_parts(15_521, 0).saturating_mul(c.into()))
-			// Standard Error: 14
-			.saturating_add(Weight::from_parts(460, 0).saturating_mul(i.into()))
-			// Standard Error: 2_345_026
-			.saturating_add(Weight::from_parts(39_907_207, 0).saturating_mul(d.into()))
+		// Minimum execution time: 331_682_000 picoseconds.
+		Weight::from_parts(131_218_916, 7062)
+			// Standard Error: 30
+			.saturating_add(Weight::from_parts(15_446, 0).saturating_mul(c.into()))
+			// Standard Error: 12
+			.saturating_add(Weight::from_parts(532, 0).saturating_mul(i.into()))
+			// Standard Error: 2_048_006
+			.saturating_add(Weight::from_parts(32_258_264, 0).saturating_mul(d.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(d.into())))
 			.saturating_add(T::DbWeight::get().writes(6_u64))
@@ -322,10 +324,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1926`
 		//  Estimated: `5378`
-		// Minimum execution time: 156_918_000 picoseconds.
-		Weight::from_parts(142_913_155, 5378)
+		// Minimum execution time: 158_278_000 picoseconds.
+		Weight::from_parts(145_169_816, 5378)
 			// Standard Error: 14
-			.saturating_add(Weight::from_parts(4_488, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(4_546, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -345,8 +347,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1903`
 		//  Estimated: `7843`
-		// Minimum execution time: 82_585_000 picoseconds.
-		Weight::from_parts(85_924_000, 7843)
+		// Minimum execution time: 84_092_000 picoseconds.
+		Weight::from_parts(86_159_000, 7843)
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -367,10 +369,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1903`
 		//  Estimated: `7843 + d * (2475 ±0)`
-		// Minimum execution time: 81_895_000 picoseconds.
-		Weight::from_parts(85_628_961, 7843)
-			// Standard Error: 317_863
-			.saturating_add(Weight::from_parts(23_205_338, 0).saturating_mul(d.into()))
+		// Minimum execution time: 82_115_000 picoseconds.
+		Weight::from_parts(86_241_116, 7843)
+			// Standard Error: 436_122
+			.saturating_add(Weight::from_parts(23_139_783, 0).saturating_mul(d.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(d.into())))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
@@ -388,10 +390,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `505`
 		//  Estimated: `3970`
-		// Minimum execution time: 47_704_000 picoseconds.
-		Weight::from_parts(36_150_999, 3970)
-			// Standard Error: 20
-			.saturating_add(Weight::from_parts(14_504, 0).saturating_mul(c.into()))
+		// Minimum execution time: 49_161_000 picoseconds.
+		Weight::from_parts(35_743_335, 3970)
+			// Standard Error: 19
+			.saturating_add(Weight::from_parts(14_635, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -405,8 +407,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `658`
 		//  Estimated: `4123`
-		// Minimum execution time: 40_605_000 picoseconds.
-		Weight::from_parts(41_546_000, 4123)
+		// Minimum execution time: 39_410_000 picoseconds.
+		Weight::from_parts(40_835_000, 4123)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -418,8 +420,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `530`
 		//  Estimated: `6470`
-		// Minimum execution time: 20_044_000 picoseconds.
-		Weight::from_parts(20_635_000, 6470)
+		// Minimum execution time: 19_716_000 picoseconds.
+		Weight::from_parts(20_467_000, 6470)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -431,8 +433,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `813`
 		//  Estimated: `4278`
-		// Minimum execution time: 48_997_000 picoseconds.
-		Weight::from_parts(49_667_000, 4278)
+		// Minimum execution time: 48_594_000 picoseconds.
+		Weight::from_parts(49_587_000, 4278)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -444,8 +446,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `395`
 		//  Estimated: `3860`
-		// Minimum execution time: 36_743_000 picoseconds.
-		Weight::from_parts(37_493_000, 3860)
+		// Minimum execution time: 36_171_000 picoseconds.
+		Weight::from_parts(37_113_000, 3860)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -457,8 +459,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `145`
 		//  Estimated: `3610`
-		// Minimum execution time: 12_596_000 picoseconds.
-		Weight::from_parts(13_147_000, 3610)
+		// Minimum execution time: 12_890_000 picoseconds.
+		Weight::from_parts(13_347_000, 3610)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 	}
 	/// The range of component `r` is `[0, 1600]`.
@@ -466,24 +468,24 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_828_000 picoseconds.
-		Weight::from_parts(7_640_533, 0)
-			// Standard Error: 255
-			.saturating_add(Weight::from_parts(177_400, 0).saturating_mul(r.into()))
+		// Minimum execution time: 7_252_000 picoseconds.
+		Weight::from_parts(8_059_477, 0)
+			// Standard Error: 229
+			.saturating_add(Weight::from_parts(175_187, 0).saturating_mul(r.into()))
 	}
 	fn seal_caller() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 324_000 picoseconds.
-		Weight::from_parts(356_000, 0)
+		// Minimum execution time: 300_000 picoseconds.
+		Weight::from_parts(338_000, 0)
 	}
 	fn seal_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 295_000 picoseconds.
-		Weight::from_parts(325_000, 0)
+		// Minimum execution time: 276_000 picoseconds.
+		Weight::from_parts(305_000, 0)
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
@@ -491,8 +493,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `571`
 		//  Estimated: `4036`
-		// Minimum execution time: 9_263_000 picoseconds.
-		Weight::from_parts(9_663_000, 4036)
+		// Minimum execution time: 9_600_000 picoseconds.
+		Weight::from_parts(10_067_000, 4036)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:0)
@@ -501,15 +503,15 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `403`
 		//  Estimated: `3868`
-		// Minimum execution time: 9_037_000 picoseconds.
-		Weight::from_parts(9_379_000, 3868)
+		// Minimum execution time: 8_920_000 picoseconds.
+		Weight::from_parts(9_224_000, 3868)
 			.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: 271_000 picoseconds.
+		// Minimum execution time: 269_000 picoseconds.
 		Weight::from_parts(308_000, 0)
 	}
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:0)
@@ -520,51 +522,51 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `474`
 		//  Estimated: `3939`
-		// Minimum execution time: 12_341_000 picoseconds.
-		Weight::from_parts(12_803_000, 3939)
+		// Minimum execution time: 11_910_000 picoseconds.
+		Weight::from_parts(12_895_000, 3939)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 	}
 	fn seal_caller_is_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 320_000 picoseconds.
-		Weight::from_parts(367_000, 0)
+		// Minimum execution time: 327_000 picoseconds.
+		Weight::from_parts(355_000, 0)
 	}
 	fn seal_caller_is_root() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 250_000 picoseconds.
-		Weight::from_parts(291_000, 0)
+		// Minimum execution time: 257_000 picoseconds.
+		Weight::from_parts(289_000, 0)
 	}
 	fn seal_address() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 275_000 picoseconds.
-		Weight::from_parts(320_000, 0)
+		// Minimum execution time: 290_000 picoseconds.
+		Weight::from_parts(318_000, 0)
 	}
 	fn seal_weight_left() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 626_000 picoseconds.
-		Weight::from_parts(688_000, 0)
+		// Minimum execution time: 709_000 picoseconds.
+		Weight::from_parts(767_000, 0)
 	}
 	fn seal_ref_time_left() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 243_000 picoseconds.
-		Weight::from_parts(275_000, 0)
+		// Minimum execution time: 240_000 picoseconds.
+		Weight::from_parts(269_000, 0)
 	}
 	fn seal_balance() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `469`
 		//  Estimated: `0`
-		// Minimum execution time: 11_762_000 picoseconds.
-		Weight::from_parts(12_023_000, 0)
+		// Minimum execution time: 11_525_000 picoseconds.
+		Weight::from_parts(12_068_000, 0)
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
@@ -574,10 +576,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	fn seal_balance_of() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `590`
-		//  Estimated: `4055`
-		// Minimum execution time: 13_264_000 picoseconds.
-		Weight::from_parts(13_747_000, 4055)
+		//  Measured:  `791`
+		//  Estimated: `4256`
+		// Minimum execution time: 17_539_000 picoseconds.
+		Weight::from_parts(18_468_000, 4256)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 	}
 	/// Storage: `Revive::ImmutableDataOf` (r:1 w:0)
@@ -587,10 +589,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `271 + n * (1 ±0)`
 		//  Estimated: `3736 + n * (1 ±0)`
-		// Minimum execution time: 5_660_000 picoseconds.
-		Weight::from_parts(6_367_742, 3736)
+		// Minimum execution time: 5_634_000 picoseconds.
+		Weight::from_parts(6_303_126, 3736)
 			// Standard Error: 5
-			.saturating_add(Weight::from_parts(626, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(652, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -601,67 +603,67 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_827_000 picoseconds.
-		Weight::from_parts(2_093_143, 0)
+		// Minimum execution time: 1_838_000 picoseconds.
+		Weight::from_parts(2_085_202, 0)
 			// Standard Error: 2
-			.saturating_add(Weight::from_parts(632, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(651, 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: 259_000 picoseconds.
-		Weight::from_parts(286_000, 0)
+		// Minimum execution time: 253_000 picoseconds.
+		Weight::from_parts(291_000, 0)
 	}
 	fn seal_minimum_balance() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 240_000 picoseconds.
-		Weight::from_parts(288_000, 0)
+		// Minimum execution time: 269_000 picoseconds.
+		Weight::from_parts(314_000, 0)
 	}
 	fn seal_return_data_size() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 241_000 picoseconds.
-		Weight::from_parts(269_000, 0)
+		// Minimum execution time: 252_000 picoseconds.
+		Weight::from_parts(298_000, 0)
 	}
 	fn seal_call_data_size() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 254_000 picoseconds.
-		Weight::from_parts(276_000, 0)
+		// Minimum execution time: 248_000 picoseconds.
+		Weight::from_parts(287_000, 0)
 	}
 	fn seal_gas_limit() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 418_000 picoseconds.
-		Weight::from_parts(472_000, 0)
+		// Minimum execution time: 431_000 picoseconds.
+		Weight::from_parts(454_000, 0)
 	}
 	fn seal_gas_price() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 242_000 picoseconds.
-		Weight::from_parts(272_000, 0)
+		// Minimum execution time: 247_000 picoseconds.
+		Weight::from_parts(288_000, 0)
 	}
 	fn seal_base_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 245_000 picoseconds.
-		Weight::from_parts(284_000, 0)
+		// Minimum execution time: 254_000 picoseconds.
+		Weight::from_parts(283_000, 0)
 	}
 	fn seal_block_number() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 260_000 picoseconds.
-		Weight::from_parts(295_000, 0)
+		// Minimum execution time: 262_000 picoseconds.
+		Weight::from_parts(281_000, 0)
 	}
 	/// Storage: `Session::Validators` (r:1 w:0)
 	/// Proof: `Session::Validators` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -669,8 +671,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `141`
 		//  Estimated: `1626`
-		// Minimum execution time: 19_877_000 picoseconds.
-		Weight::from_parts(20_558_000, 1626)
+		// Minimum execution time: 20_318_000 picoseconds.
+		Weight::from_parts(20_667_000, 1626)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `System::BlockHash` (r:1 w:0)
@@ -679,60 +681,60 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `30`
 		//  Estimated: `3495`
-		// Minimum execution time: 3_320_000 picoseconds.
-		Weight::from_parts(3_491_000, 3495)
+		// Minimum execution time: 3_442_000 picoseconds.
+		Weight::from_parts(3_568_000, 3495)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	fn seal_now() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 246_000 picoseconds.
-		Weight::from_parts(275_000, 0)
+		// Minimum execution time: 233_000 picoseconds.
+		Weight::from_parts(259_000, 0)
 	}
 	fn seal_weight_to_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_422_000 picoseconds.
-		Weight::from_parts(1_544_000, 0)
+		// Minimum execution time: 1_624_000 picoseconds.
+		Weight::from_parts(1_714_000, 0)
 	}
 	/// The range of component `n` is `[0, 262140]`.
 	fn seal_copy_to_contract(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 374_000 picoseconds.
-		Weight::from_parts(570_694, 0)
+		// Minimum execution time: 384_000 picoseconds.
+		Weight::from_parts(634_837, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(200, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(237, 0).saturating_mul(n.into()))
 	}
 	fn seal_call_data_load() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 257_000 picoseconds.
-		Weight::from_parts(281_000, 0)
+		// Minimum execution time: 279_000 picoseconds.
+		Weight::from_parts(315_000, 0)
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn seal_call_data_copy(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 253_000 picoseconds.
-		Weight::from_parts(196_095, 0)
+		// Minimum execution time: 232_000 picoseconds.
+		Weight::from_parts(235_521, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(115, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(150, 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: 274_000 picoseconds.
-		Weight::from_parts(394_229, 0)
+		// Minimum execution time: 253_000 picoseconds.
+		Weight::from_parts(340_907, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(201, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(239, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
@@ -748,8 +750,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `582`
 		//  Estimated: `4047`
-		// Minimum execution time: 16_090_000 picoseconds.
-		Weight::from_parts(16_632_000, 4047)
+		// Minimum execution time: 15_882_000 picoseconds.
+		Weight::from_parts(16_517_000, 4047)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -759,12 +761,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_198_000 picoseconds.
-		Weight::from_parts(4_183_416, 0)
-			// Standard Error: 2_981
-			.saturating_add(Weight::from_parts(213_016, 0).saturating_mul(t.into()))
-			// Standard Error: 32
-			.saturating_add(Weight::from_parts(1_105, 0).saturating_mul(n.into()))
+		// Minimum execution time: 4_332_000 picoseconds.
+		Weight::from_parts(4_318_945, 0)
+			// Standard Error: 3_170
+			.saturating_add(Weight::from_parts(194_779, 0).saturating_mul(t.into()))
+			// Standard Error: 34
+			.saturating_add(Weight::from_parts(1_042, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
 	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -772,8 +774,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `648`
 		//  Estimated: `648`
-		// Minimum execution time: 7_070_000 picoseconds.
-		Weight::from_parts(7_525_000, 648)
+		// Minimum execution time: 6_964_000 picoseconds.
+		Weight::from_parts(7_324_000, 648)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -782,8 +784,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `10658`
 		//  Estimated: `10658`
-		// Minimum execution time: 41_471_000 picoseconds.
-		Weight::from_parts(42_118_000, 10658)
+		// Minimum execution time: 41_365_000 picoseconds.
+		Weight::from_parts(41_879_000, 10658)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -792,8 +794,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `648`
 		//  Estimated: `648`
-		// Minimum execution time: 8_309_000 picoseconds.
-		Weight::from_parts(8_669_000, 648)
+		// Minimum execution time: 7_959_000 picoseconds.
+		Weight::from_parts(8_588_000, 648)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -803,8 +805,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `10658`
 		//  Estimated: `10658`
-		// Minimum execution time: 42_556_000 picoseconds.
-		Weight::from_parts(43_428_000, 10658)
+		// Minimum execution time: 42_728_000 picoseconds.
+		Weight::from_parts(43_784_000, 10658)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -816,12 +818,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: 8_599_000 picoseconds.
-		Weight::from_parts(9_274_787, 247)
-			// Standard Error: 52
-			.saturating_add(Weight::from_parts(429, 0).saturating_mul(n.into()))
-			// Standard Error: 52
-			.saturating_add(Weight::from_parts(913, 0).saturating_mul(o.into()))
+		// Minimum execution time: 8_445_000 picoseconds.
+		Weight::from_parts(9_087_787, 247)
+			// Standard Error: 64
+			.saturating_add(Weight::from_parts(534, 0).saturating_mul(n.into()))
+			// Standard Error: 64
+			.saturating_add(Weight::from_parts(663, 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()))
@@ -833,10 +835,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_547_000 picoseconds.
-		Weight::from_parts(9_242_831, 247)
-			// Standard Error: 67
-			.saturating_add(Weight::from_parts(891, 0).saturating_mul(n.into()))
+		// Minimum execution time: 8_326_000 picoseconds.
+		Weight::from_parts(9_096_173, 247)
+			// Standard Error: 64
+			.saturating_add(Weight::from_parts(730, 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()))
@@ -848,10 +850,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: 7_942_000 picoseconds.
-		Weight::from_parts(9_065_769, 247)
-			// Standard Error: 94
-			.saturating_add(Weight::from_parts(1_372, 0).saturating_mul(n.into()))
+		// Minimum execution time: 7_915_000 picoseconds.
+		Weight::from_parts(8_736_774, 247)
+			// Standard Error: 63
+			.saturating_add(Weight::from_parts(1_409, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -862,10 +864,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: 7_491_000 picoseconds.
-		Weight::from_parts(8_032_251, 247)
-			// Standard Error: 60
-			.saturating_add(Weight::from_parts(1_195, 0).saturating_mul(n.into()))
+		// Minimum execution time: 7_190_000 picoseconds.
+		Weight::from_parts(8_103_802, 247)
+			// Standard Error: 70
+			.saturating_add(Weight::from_parts(585, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -876,10 +878,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_773_000 picoseconds.
-		Weight::from_parts(10_027_688, 247)
-			// Standard Error: 86
-			.saturating_add(Weight::from_parts(1_672, 0).saturating_mul(n.into()))
+		// Minimum execution time: 8_925_000 picoseconds.
+		Weight::from_parts(9_923_070, 247)
+			// Standard Error: 81
+			.saturating_add(Weight::from_parts(1_249, 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()))
@@ -888,36 +890,36 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_445_000 picoseconds.
-		Weight::from_parts(1_558_000, 0)
+		// Minimum execution time: 1_473_000 picoseconds.
+		Weight::from_parts(1_577_000, 0)
 	}
 	fn set_transient_storage_full() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_867_000 picoseconds.
-		Weight::from_parts(1_988_000, 0)
+		// Minimum execution time: 1_875_000 picoseconds.
+		Weight::from_parts(1_954_000, 0)
 	}
 	fn get_transient_storage_empty() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_455_000 picoseconds.
-		Weight::from_parts(1_539_000, 0)
+		// Minimum execution time: 1_447_000 picoseconds.
+		Weight::from_parts(1_552_000, 0)
 	}
 	fn get_transient_storage_full() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_626_000 picoseconds.
-		Weight::from_parts(1_714_000, 0)
+		// Minimum execution time: 1_566_000 picoseconds.
+		Weight::from_parts(1_715_000, 0)
 	}
 	fn rollback_transient_storage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_056_000 picoseconds.
-		Weight::from_parts(1_204_000, 0)
+		// Minimum execution time: 1_102_000 picoseconds.
+		Weight::from_parts(1_158_000, 0)
 	}
 	/// The range of component `n` is `[0, 416]`.
 	/// The range of component `o` is `[0, 416]`.
@@ -925,52 +927,52 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_248_000 picoseconds.
-		Weight::from_parts(2_470_381, 0)
-			// Standard Error: 13
-			.saturating_add(Weight::from_parts(272, 0).saturating_mul(n.into()))
-			// Standard Error: 13
-			.saturating_add(Weight::from_parts(297, 0).saturating_mul(o.into()))
+		// Minimum execution time: 2_137_000 picoseconds.
+		Weight::from_parts(2_397_358, 0)
+			// Standard Error: 14
+			.saturating_add(Weight::from_parts(220, 0).saturating_mul(n.into()))
+			// Standard Error: 14
+			.saturating_add(Weight::from_parts(293, 0).saturating_mul(o.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_clear_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_045_000 picoseconds.
-		Weight::from_parts(2_357_164, 0)
-			// Standard Error: 18
-			.saturating_add(Weight::from_parts(484, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_952_000 picoseconds.
+		Weight::from_parts(2_253_937, 0)
+			// Standard Error: 19
+			.saturating_add(Weight::from_parts(400, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_get_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_908_000 picoseconds.
-		Weight::from_parts(2_125_522, 0)
+		// Minimum execution time: 1_884_000 picoseconds.
+		Weight::from_parts(2_083_595, 0)
 			// Standard Error: 13
-			.saturating_add(Weight::from_parts(249, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(366, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_contains_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_623_000 picoseconds.
-		Weight::from_parts(1_860_447, 0)
+		// Minimum execution time: 1_664_000 picoseconds.
+		Weight::from_parts(1_865_517, 0)
 			// Standard Error: 16
-			.saturating_add(Weight::from_parts(108, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(176, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_take_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_513_000 picoseconds.
-		Weight::from_parts(2_746_905, 0)
-			// Standard Error: 17
-			.saturating_add(Weight::from_parts(34, 0).saturating_mul(n.into()))
+		// Minimum execution time: 2_398_000 picoseconds.
+		Weight::from_parts(2_602_853, 0)
+			// Standard Error: 18
+			.saturating_add(Weight::from_parts(128, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
@@ -989,12 +991,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1877`
 		//  Estimated: `5342`
-		// Minimum execution time: 80_268_000 picoseconds.
-		Weight::from_parts(66_796_299, 5342)
-			// Standard Error: 94_015
-			.saturating_add(Weight::from_parts(15_564_668, 0).saturating_mul(t.into()))
-			// Standard Error: 94_015
-			.saturating_add(Weight::from_parts(21_950_543, 0).saturating_mul(d.into()))
+		// Minimum execution time: 79_994_000 picoseconds.
+		Weight::from_parts(67_026_603, 5342)
+			// Standard Error: 104_004
+			.saturating_add(Weight::from_parts(15_752_934, 0).saturating_mul(t.into()))
+			// Standard Error: 104_004
+			.saturating_add(Weight::from_parts(22_031_893, 0).saturating_mul(d.into()))
 			// Standard Error: 0
 			.saturating_add(Weight::from_parts(3, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(5_u64))
@@ -1011,12 +1013,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `366 + d * (212 ±0)`
 		//  Estimated: `2022 + d * (2022 ±0)`
-		// Minimum execution time: 23_277_000 picoseconds.
-		Weight::from_parts(10_838_272, 2022)
-			// Standard Error: 95_204
-			.saturating_add(Weight::from_parts(13_298_819, 0).saturating_mul(d.into()))
+		// Minimum execution time: 23_267_000 picoseconds.
+		Weight::from_parts(10_503_924, 2022)
+			// Standard Error: 90_515
+			.saturating_add(Weight::from_parts(13_669_215, 0).saturating_mul(d.into()))
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(323, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(398, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(d.into())))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(d.into())))
 			.saturating_add(Weight::from_parts(0, 2022).saturating_mul(d.into()))
@@ -1031,8 +1033,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1362`
 		//  Estimated: `4827`
-		// Minimum execution time: 30_782_000 picoseconds.
-		Weight::from_parts(31_804_000, 4827)
+		// Minimum execution time: 31_304_000 picoseconds.
+		Weight::from_parts(32_277_000, 4827)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
@@ -1050,14 +1052,14 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1380`
 		//  Estimated: `4879`
-		// Minimum execution time: 137_360_000 picoseconds.
-		Weight::from_parts(62_972_334, 4879)
-			// Standard Error: 1_382_634
-			.saturating_add(Weight::from_parts(22_862_476, 0).saturating_mul(t.into()))
-			// Standard Error: 1_382_634
-			.saturating_add(Weight::from_parts(35_695_464, 0).saturating_mul(d.into()))
-			// Standard Error: 8
-			.saturating_add(Weight::from_parts(4_155, 0).saturating_mul(i.into()))
+		// Minimum execution time: 137_167_000 picoseconds.
+		Weight::from_parts(85_440_893, 4879)
+			// Standard Error: 1_336_150
+			.saturating_add(Weight::from_parts(9_685_645, 0).saturating_mul(t.into()))
+			// Standard Error: 1_336_150
+			.saturating_add(Weight::from_parts(29_000_210, 0).saturating_mul(d.into()))
+			// Standard Error: 7
+			.saturating_add(Weight::from_parts(4_189, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -1066,118 +1068,118 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_238_000 picoseconds.
-		Weight::from_parts(7_565_135, 0)
+		// Minimum execution time: 1_171_000 picoseconds.
+		Weight::from_parts(5_893_694, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_256, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(1_306, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn identity(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 748_000 picoseconds.
-		Weight::from_parts(872_115, 0)
+		// Minimum execution time: 700_000 picoseconds.
+		Weight::from_parts(881_730, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(111, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(147, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn ripemd_160(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_244_000 picoseconds.
-		Weight::from_parts(1_290_000, 0)
+		// Minimum execution time: 1_155_000 picoseconds.
+		Weight::from_parts(1_405_447, 0)
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(3_904, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(3_933, 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_035_000 picoseconds.
-		Weight::from_parts(4_386_268, 0)
+		// Minimum execution time: 1_092_000 picoseconds.
+		Weight::from_parts(5_007_473, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(3_581, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(3_609, 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: 685_000 picoseconds.
-		Weight::from_parts(4_751_819, 0)
+		// Minimum execution time: 717_000 picoseconds.
+		Weight::from_parts(4_446_814, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_512, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(1_563, 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: 637_000 picoseconds.
-		Weight::from_parts(4_843_335, 0)
+		// Minimum execution time: 669_000 picoseconds.
+		Weight::from_parts(4_926_711, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_512, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(1_544, 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: 49_250_000 picoseconds.
-		Weight::from_parts(37_526_998, 0)
-			// Standard Error: 9
-			.saturating_add(Weight::from_parts(4_895, 0).saturating_mul(n.into()))
+		// Minimum execution time: 42_506_000 picoseconds.
+		Weight::from_parts(28_448_655, 0)
+			// Standard Error: 11
+			.saturating_add(Weight::from_parts(4_963, 0).saturating_mul(n.into()))
 	}
 	fn ecdsa_recover() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 45_745_000 picoseconds.
-		Weight::from_parts(46_501_000, 0)
+		// Minimum execution time: 45_679_000 picoseconds.
+		Weight::from_parts(46_719_000, 0)
 	}
 	fn bn128_add() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 15_787_000 picoseconds.
-		Weight::from_parts(16_309_000, 0)
+		// Minimum execution time: 15_728_000 picoseconds.
+		Weight::from_parts(16_969_000, 0)
 	}
 	fn bn128_mul() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 978_227_000 picoseconds.
-		Weight::from_parts(983_178_000, 0)
+		// Minimum execution time: 984_987_000 picoseconds.
+		Weight::from_parts(991_894_000, 0)
 	}
 	/// The range of component `n` is `[0, 20]`.
 	fn bn128_pairing(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 849_000 picoseconds.
-		Weight::from_parts(5_028_067_161, 0)
-			// Standard Error: 10_967_345
-			.saturating_add(Weight::from_parts(6_010_481_761, 0).saturating_mul(n.into()))
+		// Minimum execution time: 773_000 picoseconds.
+		Weight::from_parts(5_078_593_567, 0)
+			// Standard Error: 13_417_667
+			.saturating_add(Weight::from_parts(6_036_792_666, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 1200]`.
 	fn blake2f(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 920_000 picoseconds.
-		Weight::from_parts(1_115_920, 0)
-			// Standard Error: 8
-			.saturating_add(Weight::from_parts(22_705, 0).saturating_mul(n.into()))
+		// Minimum execution time: 847_000 picoseconds.
+		Weight::from_parts(1_070_176, 0)
+			// Standard Error: 6
+			.saturating_add(Weight::from_parts(22_815, 0).saturating_mul(n.into()))
 	}
 	fn seal_ecdsa_to_eth_address() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 12_728_000 picoseconds.
-		Weight::from_parts(12_877_000, 0)
+		// Minimum execution time: 12_696_000 picoseconds.
+		Weight::from_parts(12_856_000, 0)
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
@@ -1185,8 +1187,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `296`
 		//  Estimated: `3761`
-		// Minimum execution time: 9_781_000 picoseconds.
-		Weight::from_parts(10_016_000, 3761)
+		// Minimum execution time: 9_494_000 picoseconds.
+		Weight::from_parts(9_986_000, 3761)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -1195,20 +1197,20 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 11_494_000 picoseconds.
-		Weight::from_parts(57_030_670, 0)
-			// Standard Error: 386
-			.saturating_add(Weight::from_parts(121_589, 0).saturating_mul(r.into()))
+		// Minimum execution time: 10_835_000 picoseconds.
+		Weight::from_parts(41_789_560, 0)
+			// Standard Error: 1_113
+			.saturating_add(Weight::from_parts(148_884, 0).saturating_mul(r.into()))
 	}
 	/// The range of component `r` is `[0, 100000]`.
 	fn instr_empty_loop(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_770_000 picoseconds.
-		Weight::from_parts(2_172_554, 0)
-			// Standard Error: 76
-			.saturating_add(Weight::from_parts(72_829, 0).saturating_mul(r.into()))
+		// Minimum execution time: 2_755_000 picoseconds.
+		Weight::from_parts(5_125_050, 0)
+			// Standard Error: 29
+			.saturating_add(Weight::from_parts(72_514, 0).saturating_mul(r.into()))
 	}
 	/// Storage: UNKNOWN KEY `0x735f040a5d490f1107ad9c56f5ca00d2060e99e5378e562537cf3bc983e17b91` (r:2 w:1)
 	/// Proof: UNKNOWN KEY `0x735f040a5d490f1107ad9c56f5ca00d2060e99e5378e562537cf3bc983e17b91` (r:2 w:1)
@@ -1218,8 +1220,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `316`
 		//  Estimated: `6256`
-		// Minimum execution time: 11_693_000 picoseconds.
-		Weight::from_parts(12_377_000, 6256)
+		// Minimum execution time: 12_245_000 picoseconds.
+		Weight::from_parts(12_780_000, 6256)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -1233,8 +1235,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `147`
 		//  Estimated: `1632`
-		// Minimum execution time: 3_022_000 picoseconds.
-		Weight::from_parts(3_275_000, 1632)
+		// Minimum execution time: 3_043_000 picoseconds.
+		Weight::from_parts(3_289_000, 1632)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -1244,10 +1246,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `458 + k * (69 ±0)`
 		//  Estimated: `448 + k * (70 ±0)`
-		// Minimum execution time: 13_874_000 picoseconds.
-		Weight::from_parts(14_194_000, 448)
-			// Standard Error: 1_039
-			.saturating_add(Weight::from_parts(1_188_412, 0).saturating_mul(k.into()))
+		// Minimum execution time: 14_062_000 picoseconds.
+		Weight::from_parts(14_347_000, 448)
+			// Standard Error: 869
+			.saturating_add(Weight::from_parts(1_173_255, 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))
@@ -1271,10 +1273,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1180 + c * (1 ±0)`
 		//  Estimated: `7121 + c * (1 ±0)`
-		// Minimum execution time: 77_961_000 picoseconds.
-		Weight::from_parts(116_526_220, 7121)
-			// Standard Error: 10
-			.saturating_add(Weight::from_parts(1_542, 0).saturating_mul(c.into()))
+		// Minimum execution time: 80_130_000 picoseconds.
+		Weight::from_parts(119_341_468, 7121)
+			// Standard Error: 11
+			.saturating_add(Weight::from_parts(1_477, 0).saturating_mul(c.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(c.into()))
@@ -1292,12 +1294,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 `b` is `[0, 1]`.
-	fn basic_block_compilation(_b: u32, ) -> Weight {
+	fn basic_block_compilation(b: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `4515`
 		//  Estimated: `10455`
-		// Minimum execution time: 119_646_000 picoseconds.
-		Weight::from_parts(124_019_340, 10455)
+		// Minimum execution time: 121_130_000 picoseconds.
+		Weight::from_parts(124_944_816, 10455)
+			// Standard Error: 401_911
+			.saturating_add(Weight::from_parts(3_859_383, 0).saturating_mul(b.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -1321,12 +1325,12 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1122`
 		//  Estimated: `7010`
-		// Minimum execution time: 1_327_609_000 picoseconds.
-		Weight::from_parts(179_913_315, 7010)
-			// Standard Error: 46
-			.saturating_add(Weight::from_parts(19_768, 0).saturating_mul(c.into()))
-			// Standard Error: 18
-			.saturating_add(Weight::from_parts(4_410, 0).saturating_mul(i.into()))
+		// Minimum execution time: 1_336_764_000 picoseconds.
+		Weight::from_parts(197_731_668, 7010)
+			// Standard Error: 49
+			.saturating_add(Weight::from_parts(19_405, 0).saturating_mul(c.into()))
+			// Standard Error: 19
+			.saturating_add(Weight::from_parts(4_397, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
@@ -1351,14 +1355,14 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1122`
 		//  Estimated: `7062 + d * (2475 ±0)`
-		// Minimum execution time: 318_798_000 picoseconds.
-		Weight::from_parts(139_013_493, 7062)
-			// Standard Error: 35
-			.saturating_add(Weight::from_parts(15_521, 0).saturating_mul(c.into()))
-			// Standard Error: 14
-			.saturating_add(Weight::from_parts(460, 0).saturating_mul(i.into()))
-			// Standard Error: 2_345_026
-			.saturating_add(Weight::from_parts(39_907_207, 0).saturating_mul(d.into()))
+		// Minimum execution time: 331_682_000 picoseconds.
+		Weight::from_parts(131_218_916, 7062)
+			// Standard Error: 30
+			.saturating_add(Weight::from_parts(15_446, 0).saturating_mul(c.into()))
+			// Standard Error: 12
+			.saturating_add(Weight::from_parts(532, 0).saturating_mul(i.into()))
+			// Standard Error: 2_048_006
+			.saturating_add(Weight::from_parts(32_258_264, 0).saturating_mul(d.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(d.into())))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
@@ -1384,10 +1388,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1926`
 		//  Estimated: `5378`
-		// Minimum execution time: 156_918_000 picoseconds.
-		Weight::from_parts(142_913_155, 5378)
+		// Minimum execution time: 158_278_000 picoseconds.
+		Weight::from_parts(145_169_816, 5378)
 			// Standard Error: 14
-			.saturating_add(Weight::from_parts(4_488, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(4_546, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -1407,8 +1411,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1903`
 		//  Estimated: `7843`
-		// Minimum execution time: 82_585_000 picoseconds.
-		Weight::from_parts(85_924_000, 7843)
+		// Minimum execution time: 84_092_000 picoseconds.
+		Weight::from_parts(86_159_000, 7843)
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -1429,10 +1433,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1903`
 		//  Estimated: `7843 + d * (2475 ±0)`
-		// Minimum execution time: 81_895_000 picoseconds.
-		Weight::from_parts(85_628_961, 7843)
-			// Standard Error: 317_863
-			.saturating_add(Weight::from_parts(23_205_338, 0).saturating_mul(d.into()))
+		// Minimum execution time: 82_115_000 picoseconds.
+		Weight::from_parts(86_241_116, 7843)
+			// Standard Error: 436_122
+			.saturating_add(Weight::from_parts(23_139_783, 0).saturating_mul(d.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(d.into())))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
@@ -1450,10 +1454,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `505`
 		//  Estimated: `3970`
-		// Minimum execution time: 47_704_000 picoseconds.
-		Weight::from_parts(36_150_999, 3970)
-			// Standard Error: 20
-			.saturating_add(Weight::from_parts(14_504, 0).saturating_mul(c.into()))
+		// Minimum execution time: 49_161_000 picoseconds.
+		Weight::from_parts(35_743_335, 3970)
+			// Standard Error: 19
+			.saturating_add(Weight::from_parts(14_635, 0).saturating_mul(c.into()))
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -1467,8 +1471,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `658`
 		//  Estimated: `4123`
-		// Minimum execution time: 40_605_000 picoseconds.
-		Weight::from_parts(41_546_000, 4123)
+		// Minimum execution time: 39_410_000 picoseconds.
+		Weight::from_parts(40_835_000, 4123)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -1480,8 +1484,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `530`
 		//  Estimated: `6470`
-		// Minimum execution time: 20_044_000 picoseconds.
-		Weight::from_parts(20_635_000, 6470)
+		// Minimum execution time: 19_716_000 picoseconds.
+		Weight::from_parts(20_467_000, 6470)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -1493,8 +1497,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `813`
 		//  Estimated: `4278`
-		// Minimum execution time: 48_997_000 picoseconds.
-		Weight::from_parts(49_667_000, 4278)
+		// Minimum execution time: 48_594_000 picoseconds.
+		Weight::from_parts(49_587_000, 4278)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -1506,8 +1510,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `395`
 		//  Estimated: `3860`
-		// Minimum execution time: 36_743_000 picoseconds.
-		Weight::from_parts(37_493_000, 3860)
+		// Minimum execution time: 36_171_000 picoseconds.
+		Weight::from_parts(37_113_000, 3860)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -1519,8 +1523,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `145`
 		//  Estimated: `3610`
-		// Minimum execution time: 12_596_000 picoseconds.
-		Weight::from_parts(13_147_000, 3610)
+		// Minimum execution time: 12_890_000 picoseconds.
+		Weight::from_parts(13_347_000, 3610)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 	}
 	/// The range of component `r` is `[0, 1600]`.
@@ -1528,24 +1532,24 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_828_000 picoseconds.
-		Weight::from_parts(7_640_533, 0)
-			// Standard Error: 255
-			.saturating_add(Weight::from_parts(177_400, 0).saturating_mul(r.into()))
+		// Minimum execution time: 7_252_000 picoseconds.
+		Weight::from_parts(8_059_477, 0)
+			// Standard Error: 229
+			.saturating_add(Weight::from_parts(175_187, 0).saturating_mul(r.into()))
 	}
 	fn seal_caller() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 324_000 picoseconds.
-		Weight::from_parts(356_000, 0)
+		// Minimum execution time: 300_000 picoseconds.
+		Weight::from_parts(338_000, 0)
 	}
 	fn seal_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 295_000 picoseconds.
-		Weight::from_parts(325_000, 0)
+		// Minimum execution time: 276_000 picoseconds.
+		Weight::from_parts(305_000, 0)
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
@@ -1553,8 +1557,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `571`
 		//  Estimated: `4036`
-		// Minimum execution time: 9_263_000 picoseconds.
-		Weight::from_parts(9_663_000, 4036)
+		// Minimum execution time: 9_600_000 picoseconds.
+		Weight::from_parts(10_067_000, 4036)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:0)
@@ -1563,15 +1567,15 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `403`
 		//  Estimated: `3868`
-		// Minimum execution time: 9_037_000 picoseconds.
-		Weight::from_parts(9_379_000, 3868)
+		// Minimum execution time: 8_920_000 picoseconds.
+		Weight::from_parts(9_224_000, 3868)
 			.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: 271_000 picoseconds.
+		// Minimum execution time: 269_000 picoseconds.
 		Weight::from_parts(308_000, 0)
 	}
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:0)
@@ -1582,51 +1586,51 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `474`
 		//  Estimated: `3939`
-		// Minimum execution time: 12_341_000 picoseconds.
-		Weight::from_parts(12_803_000, 3939)
+		// Minimum execution time: 11_910_000 picoseconds.
+		Weight::from_parts(12_895_000, 3939)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 	}
 	fn seal_caller_is_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 320_000 picoseconds.
-		Weight::from_parts(367_000, 0)
+		// Minimum execution time: 327_000 picoseconds.
+		Weight::from_parts(355_000, 0)
 	}
 	fn seal_caller_is_root() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 250_000 picoseconds.
-		Weight::from_parts(291_000, 0)
+		// Minimum execution time: 257_000 picoseconds.
+		Weight::from_parts(289_000, 0)
 	}
 	fn seal_address() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 275_000 picoseconds.
-		Weight::from_parts(320_000, 0)
+		// Minimum execution time: 290_000 picoseconds.
+		Weight::from_parts(318_000, 0)
 	}
 	fn seal_weight_left() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 626_000 picoseconds.
-		Weight::from_parts(688_000, 0)
+		// Minimum execution time: 709_000 picoseconds.
+		Weight::from_parts(767_000, 0)
 	}
 	fn seal_ref_time_left() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 243_000 picoseconds.
-		Weight::from_parts(275_000, 0)
+		// Minimum execution time: 240_000 picoseconds.
+		Weight::from_parts(269_000, 0)
 	}
 	fn seal_balance() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `469`
 		//  Estimated: `0`
-		// Minimum execution time: 11_762_000 picoseconds.
-		Weight::from_parts(12_023_000, 0)
+		// Minimum execution time: 11_525_000 picoseconds.
+		Weight::from_parts(12_068_000, 0)
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
@@ -1636,10 +1640,10 @@ impl WeightInfo for () {
 	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	fn seal_balance_of() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `590`
-		//  Estimated: `4055`
-		// Minimum execution time: 13_264_000 picoseconds.
-		Weight::from_parts(13_747_000, 4055)
+		//  Measured:  `791`
+		//  Estimated: `4256`
+		// Minimum execution time: 17_539_000 picoseconds.
+		Weight::from_parts(18_468_000, 4256)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 	}
 	/// Storage: `Revive::ImmutableDataOf` (r:1 w:0)
@@ -1649,10 +1653,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `271 + n * (1 ±0)`
 		//  Estimated: `3736 + n * (1 ±0)`
-		// Minimum execution time: 5_660_000 picoseconds.
-		Weight::from_parts(6_367_742, 3736)
+		// Minimum execution time: 5_634_000 picoseconds.
+		Weight::from_parts(6_303_126, 3736)
 			// Standard Error: 5
-			.saturating_add(Weight::from_parts(626, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(652, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -1663,67 +1667,67 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_827_000 picoseconds.
-		Weight::from_parts(2_093_143, 0)
+		// Minimum execution time: 1_838_000 picoseconds.
+		Weight::from_parts(2_085_202, 0)
 			// Standard Error: 2
-			.saturating_add(Weight::from_parts(632, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(651, 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: 259_000 picoseconds.
-		Weight::from_parts(286_000, 0)
+		// Minimum execution time: 253_000 picoseconds.
+		Weight::from_parts(291_000, 0)
 	}
 	fn seal_minimum_balance() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 240_000 picoseconds.
-		Weight::from_parts(288_000, 0)
+		// Minimum execution time: 269_000 picoseconds.
+		Weight::from_parts(314_000, 0)
 	}
 	fn seal_return_data_size() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 241_000 picoseconds.
-		Weight::from_parts(269_000, 0)
+		// Minimum execution time: 252_000 picoseconds.
+		Weight::from_parts(298_000, 0)
 	}
 	fn seal_call_data_size() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 254_000 picoseconds.
-		Weight::from_parts(276_000, 0)
+		// Minimum execution time: 248_000 picoseconds.
+		Weight::from_parts(287_000, 0)
 	}
 	fn seal_gas_limit() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 418_000 picoseconds.
-		Weight::from_parts(472_000, 0)
+		// Minimum execution time: 431_000 picoseconds.
+		Weight::from_parts(454_000, 0)
 	}
 	fn seal_gas_price() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 242_000 picoseconds.
-		Weight::from_parts(272_000, 0)
+		// Minimum execution time: 247_000 picoseconds.
+		Weight::from_parts(288_000, 0)
 	}
 	fn seal_base_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 245_000 picoseconds.
-		Weight::from_parts(284_000, 0)
+		// Minimum execution time: 254_000 picoseconds.
+		Weight::from_parts(283_000, 0)
 	}
 	fn seal_block_number() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 260_000 picoseconds.
-		Weight::from_parts(295_000, 0)
+		// Minimum execution time: 262_000 picoseconds.
+		Weight::from_parts(281_000, 0)
 	}
 	/// Storage: `Session::Validators` (r:1 w:0)
 	/// Proof: `Session::Validators` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -1731,8 +1735,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `141`
 		//  Estimated: `1626`
-		// Minimum execution time: 19_877_000 picoseconds.
-		Weight::from_parts(20_558_000, 1626)
+		// Minimum execution time: 20_318_000 picoseconds.
+		Weight::from_parts(20_667_000, 1626)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `System::BlockHash` (r:1 w:0)
@@ -1741,60 +1745,60 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `30`
 		//  Estimated: `3495`
-		// Minimum execution time: 3_320_000 picoseconds.
-		Weight::from_parts(3_491_000, 3495)
+		// Minimum execution time: 3_442_000 picoseconds.
+		Weight::from_parts(3_568_000, 3495)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	fn seal_now() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 246_000 picoseconds.
-		Weight::from_parts(275_000, 0)
+		// Minimum execution time: 233_000 picoseconds.
+		Weight::from_parts(259_000, 0)
 	}
 	fn seal_weight_to_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_422_000 picoseconds.
-		Weight::from_parts(1_544_000, 0)
+		// Minimum execution time: 1_624_000 picoseconds.
+		Weight::from_parts(1_714_000, 0)
 	}
 	/// The range of component `n` is `[0, 262140]`.
 	fn seal_copy_to_contract(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 374_000 picoseconds.
-		Weight::from_parts(570_694, 0)
+		// Minimum execution time: 384_000 picoseconds.
+		Weight::from_parts(634_837, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(200, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(237, 0).saturating_mul(n.into()))
 	}
 	fn seal_call_data_load() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 257_000 picoseconds.
-		Weight::from_parts(281_000, 0)
+		// Minimum execution time: 279_000 picoseconds.
+		Weight::from_parts(315_000, 0)
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn seal_call_data_copy(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 253_000 picoseconds.
-		Weight::from_parts(196_095, 0)
+		// Minimum execution time: 232_000 picoseconds.
+		Weight::from_parts(235_521, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(115, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(150, 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: 274_000 picoseconds.
-		Weight::from_parts(394_229, 0)
+		// Minimum execution time: 253_000 picoseconds.
+		Weight::from_parts(340_907, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(201, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(239, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
@@ -1810,8 +1814,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `582`
 		//  Estimated: `4047`
-		// Minimum execution time: 16_090_000 picoseconds.
-		Weight::from_parts(16_632_000, 4047)
+		// Minimum execution time: 15_882_000 picoseconds.
+		Weight::from_parts(16_517_000, 4047)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -1821,12 +1825,12 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_198_000 picoseconds.
-		Weight::from_parts(4_183_416, 0)
-			// Standard Error: 2_981
-			.saturating_add(Weight::from_parts(213_016, 0).saturating_mul(t.into()))
-			// Standard Error: 32
-			.saturating_add(Weight::from_parts(1_105, 0).saturating_mul(n.into()))
+		// Minimum execution time: 4_332_000 picoseconds.
+		Weight::from_parts(4_318_945, 0)
+			// Standard Error: 3_170
+			.saturating_add(Weight::from_parts(194_779, 0).saturating_mul(t.into()))
+			// Standard Error: 34
+			.saturating_add(Weight::from_parts(1_042, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
 	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -1834,8 +1838,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `648`
 		//  Estimated: `648`
-		// Minimum execution time: 7_070_000 picoseconds.
-		Weight::from_parts(7_525_000, 648)
+		// Minimum execution time: 6_964_000 picoseconds.
+		Weight::from_parts(7_324_000, 648)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -1844,8 +1848,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `10658`
 		//  Estimated: `10658`
-		// Minimum execution time: 41_471_000 picoseconds.
-		Weight::from_parts(42_118_000, 10658)
+		// Minimum execution time: 41_365_000 picoseconds.
+		Weight::from_parts(41_879_000, 10658)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -1854,8 +1858,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `648`
 		//  Estimated: `648`
-		// Minimum execution time: 8_309_000 picoseconds.
-		Weight::from_parts(8_669_000, 648)
+		// Minimum execution time: 7_959_000 picoseconds.
+		Weight::from_parts(8_588_000, 648)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -1865,8 +1869,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `10658`
 		//  Estimated: `10658`
-		// Minimum execution time: 42_556_000 picoseconds.
-		Weight::from_parts(43_428_000, 10658)
+		// Minimum execution time: 42_728_000 picoseconds.
+		Weight::from_parts(43_784_000, 10658)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -1878,12 +1882,12 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + o * (1 ±0)`
 		//  Estimated: `247 + o * (1 ±0)`
-		// Minimum execution time: 8_599_000 picoseconds.
-		Weight::from_parts(9_274_787, 247)
-			// Standard Error: 52
-			.saturating_add(Weight::from_parts(429, 0).saturating_mul(n.into()))
-			// Standard Error: 52
-			.saturating_add(Weight::from_parts(913, 0).saturating_mul(o.into()))
+		// Minimum execution time: 8_445_000 picoseconds.
+		Weight::from_parts(9_087_787, 247)
+			// Standard Error: 64
+			.saturating_add(Weight::from_parts(534, 0).saturating_mul(n.into()))
+			// Standard Error: 64
+			.saturating_add(Weight::from_parts(663, 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()))
@@ -1895,10 +1899,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 8_547_000 picoseconds.
-		Weight::from_parts(9_242_831, 247)
-			// Standard Error: 67
-			.saturating_add(Weight::from_parts(891, 0).saturating_mul(n.into()))
+		// Minimum execution time: 8_326_000 picoseconds.
+		Weight::from_parts(9_096_173, 247)
+			// Standard Error: 64
+			.saturating_add(Weight::from_parts(730, 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()))
@@ -1910,10 +1914,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 7_942_000 picoseconds.
-		Weight::from_parts(9_065_769, 247)
-			// Standard Error: 94
-			.saturating_add(Weight::from_parts(1_372, 0).saturating_mul(n.into()))
+		// Minimum execution time: 7_915_000 picoseconds.
+		Weight::from_parts(8_736_774, 247)
+			// Standard Error: 63
+			.saturating_add(Weight::from_parts(1_409, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -1924,10 +1928,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 7_491_000 picoseconds.
-		Weight::from_parts(8_032_251, 247)
-			// Standard Error: 60
-			.saturating_add(Weight::from_parts(1_195, 0).saturating_mul(n.into()))
+		// Minimum execution time: 7_190_000 picoseconds.
+		Weight::from_parts(8_103_802, 247)
+			// Standard Error: 70
+			.saturating_add(Weight::from_parts(585, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -1938,10 +1942,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 8_773_000 picoseconds.
-		Weight::from_parts(10_027_688, 247)
-			// Standard Error: 86
-			.saturating_add(Weight::from_parts(1_672, 0).saturating_mul(n.into()))
+		// Minimum execution time: 8_925_000 picoseconds.
+		Weight::from_parts(9_923_070, 247)
+			// Standard Error: 81
+			.saturating_add(Weight::from_parts(1_249, 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()))
@@ -1950,36 +1954,36 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_445_000 picoseconds.
-		Weight::from_parts(1_558_000, 0)
+		// Minimum execution time: 1_473_000 picoseconds.
+		Weight::from_parts(1_577_000, 0)
 	}
 	fn set_transient_storage_full() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_867_000 picoseconds.
-		Weight::from_parts(1_988_000, 0)
+		// Minimum execution time: 1_875_000 picoseconds.
+		Weight::from_parts(1_954_000, 0)
 	}
 	fn get_transient_storage_empty() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_455_000 picoseconds.
-		Weight::from_parts(1_539_000, 0)
+		// Minimum execution time: 1_447_000 picoseconds.
+		Weight::from_parts(1_552_000, 0)
 	}
 	fn get_transient_storage_full() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_626_000 picoseconds.
-		Weight::from_parts(1_714_000, 0)
+		// Minimum execution time: 1_566_000 picoseconds.
+		Weight::from_parts(1_715_000, 0)
 	}
 	fn rollback_transient_storage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_056_000 picoseconds.
-		Weight::from_parts(1_204_000, 0)
+		// Minimum execution time: 1_102_000 picoseconds.
+		Weight::from_parts(1_158_000, 0)
 	}
 	/// The range of component `n` is `[0, 416]`.
 	/// The range of component `o` is `[0, 416]`.
@@ -1987,52 +1991,52 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_248_000 picoseconds.
-		Weight::from_parts(2_470_381, 0)
-			// Standard Error: 13
-			.saturating_add(Weight::from_parts(272, 0).saturating_mul(n.into()))
-			// Standard Error: 13
-			.saturating_add(Weight::from_parts(297, 0).saturating_mul(o.into()))
+		// Minimum execution time: 2_137_000 picoseconds.
+		Weight::from_parts(2_397_358, 0)
+			// Standard Error: 14
+			.saturating_add(Weight::from_parts(220, 0).saturating_mul(n.into()))
+			// Standard Error: 14
+			.saturating_add(Weight::from_parts(293, 0).saturating_mul(o.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_clear_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_045_000 picoseconds.
-		Weight::from_parts(2_357_164, 0)
-			// Standard Error: 18
-			.saturating_add(Weight::from_parts(484, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_952_000 picoseconds.
+		Weight::from_parts(2_253_937, 0)
+			// Standard Error: 19
+			.saturating_add(Weight::from_parts(400, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_get_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_908_000 picoseconds.
-		Weight::from_parts(2_125_522, 0)
+		// Minimum execution time: 1_884_000 picoseconds.
+		Weight::from_parts(2_083_595, 0)
 			// Standard Error: 13
-			.saturating_add(Weight::from_parts(249, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(366, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_contains_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_623_000 picoseconds.
-		Weight::from_parts(1_860_447, 0)
+		// Minimum execution time: 1_664_000 picoseconds.
+		Weight::from_parts(1_865_517, 0)
 			// Standard Error: 16
-			.saturating_add(Weight::from_parts(108, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(176, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_take_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_513_000 picoseconds.
-		Weight::from_parts(2_746_905, 0)
-			// Standard Error: 17
-			.saturating_add(Weight::from_parts(34, 0).saturating_mul(n.into()))
+		// Minimum execution time: 2_398_000 picoseconds.
+		Weight::from_parts(2_602_853, 0)
+			// Standard Error: 18
+			.saturating_add(Weight::from_parts(128, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
@@ -2051,12 +2055,12 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1877`
 		//  Estimated: `5342`
-		// Minimum execution time: 80_268_000 picoseconds.
-		Weight::from_parts(66_796_299, 5342)
-			// Standard Error: 94_015
-			.saturating_add(Weight::from_parts(15_564_668, 0).saturating_mul(t.into()))
-			// Standard Error: 94_015
-			.saturating_add(Weight::from_parts(21_950_543, 0).saturating_mul(d.into()))
+		// Minimum execution time: 79_994_000 picoseconds.
+		Weight::from_parts(67_026_603, 5342)
+			// Standard Error: 104_004
+			.saturating_add(Weight::from_parts(15_752_934, 0).saturating_mul(t.into()))
+			// Standard Error: 104_004
+			.saturating_add(Weight::from_parts(22_031_893, 0).saturating_mul(d.into()))
 			// Standard Error: 0
 			.saturating_add(Weight::from_parts(3, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(5_u64))
@@ -2073,12 +2077,12 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `366 + d * (212 ±0)`
 		//  Estimated: `2022 + d * (2022 ±0)`
-		// Minimum execution time: 23_277_000 picoseconds.
-		Weight::from_parts(10_838_272, 2022)
-			// Standard Error: 95_204
-			.saturating_add(Weight::from_parts(13_298_819, 0).saturating_mul(d.into()))
+		// Minimum execution time: 23_267_000 picoseconds.
+		Weight::from_parts(10_503_924, 2022)
+			// Standard Error: 90_515
+			.saturating_add(Weight::from_parts(13_669_215, 0).saturating_mul(d.into()))
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(323, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(398, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads((2_u64).saturating_mul(d.into())))
 			.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(d.into())))
 			.saturating_add(Weight::from_parts(0, 2022).saturating_mul(d.into()))
@@ -2093,8 +2097,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1362`
 		//  Estimated: `4827`
-		// Minimum execution time: 30_782_000 picoseconds.
-		Weight::from_parts(31_804_000, 4827)
+		// Minimum execution time: 31_304_000 picoseconds.
+		Weight::from_parts(32_277_000, 4827)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
@@ -2112,14 +2116,14 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1380`
 		//  Estimated: `4879`
-		// Minimum execution time: 137_360_000 picoseconds.
-		Weight::from_parts(62_972_334, 4879)
-			// Standard Error: 1_382_634
-			.saturating_add(Weight::from_parts(22_862_476, 0).saturating_mul(t.into()))
-			// Standard Error: 1_382_634
-			.saturating_add(Weight::from_parts(35_695_464, 0).saturating_mul(d.into()))
-			// Standard Error: 8
-			.saturating_add(Weight::from_parts(4_155, 0).saturating_mul(i.into()))
+		// Minimum execution time: 137_167_000 picoseconds.
+		Weight::from_parts(85_440_893, 4879)
+			// Standard Error: 1_336_150
+			.saturating_add(Weight::from_parts(9_685_645, 0).saturating_mul(t.into()))
+			// Standard Error: 1_336_150
+			.saturating_add(Weight::from_parts(29_000_210, 0).saturating_mul(d.into()))
+			// Standard Error: 7
+			.saturating_add(Weight::from_parts(4_189, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -2128,118 +2132,118 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_238_000 picoseconds.
-		Weight::from_parts(7_565_135, 0)
+		// Minimum execution time: 1_171_000 picoseconds.
+		Weight::from_parts(5_893_694, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_256, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(1_306, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn identity(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 748_000 picoseconds.
-		Weight::from_parts(872_115, 0)
+		// Minimum execution time: 700_000 picoseconds.
+		Weight::from_parts(881_730, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(111, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(147, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 262144]`.
 	fn ripemd_160(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_244_000 picoseconds.
-		Weight::from_parts(1_290_000, 0)
+		// Minimum execution time: 1_155_000 picoseconds.
+		Weight::from_parts(1_405_447, 0)
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(3_904, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(3_933, 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_035_000 picoseconds.
-		Weight::from_parts(4_386_268, 0)
+		// Minimum execution time: 1_092_000 picoseconds.
+		Weight::from_parts(5_007_473, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(3_581, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(3_609, 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: 685_000 picoseconds.
-		Weight::from_parts(4_751_819, 0)
+		// Minimum execution time: 717_000 picoseconds.
+		Weight::from_parts(4_446_814, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_512, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(1_563, 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: 637_000 picoseconds.
-		Weight::from_parts(4_843_335, 0)
+		// Minimum execution time: 669_000 picoseconds.
+		Weight::from_parts(4_926_711, 0)
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_512, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(1_544, 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: 49_250_000 picoseconds.
-		Weight::from_parts(37_526_998, 0)
-			// Standard Error: 9
-			.saturating_add(Weight::from_parts(4_895, 0).saturating_mul(n.into()))
+		// Minimum execution time: 42_506_000 picoseconds.
+		Weight::from_parts(28_448_655, 0)
+			// Standard Error: 11
+			.saturating_add(Weight::from_parts(4_963, 0).saturating_mul(n.into()))
 	}
 	fn ecdsa_recover() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 45_745_000 picoseconds.
-		Weight::from_parts(46_501_000, 0)
+		// Minimum execution time: 45_679_000 picoseconds.
+		Weight::from_parts(46_719_000, 0)
 	}
 	fn bn128_add() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 15_787_000 picoseconds.
-		Weight::from_parts(16_309_000, 0)
+		// Minimum execution time: 15_728_000 picoseconds.
+		Weight::from_parts(16_969_000, 0)
 	}
 	fn bn128_mul() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 978_227_000 picoseconds.
-		Weight::from_parts(983_178_000, 0)
+		// Minimum execution time: 984_987_000 picoseconds.
+		Weight::from_parts(991_894_000, 0)
 	}
 	/// The range of component `n` is `[0, 20]`.
 	fn bn128_pairing(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 849_000 picoseconds.
-		Weight::from_parts(5_028_067_161, 0)
-			// Standard Error: 10_967_345
-			.saturating_add(Weight::from_parts(6_010_481_761, 0).saturating_mul(n.into()))
+		// Minimum execution time: 773_000 picoseconds.
+		Weight::from_parts(5_078_593_567, 0)
+			// Standard Error: 13_417_667
+			.saturating_add(Weight::from_parts(6_036_792_666, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 1200]`.
 	fn blake2f(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 920_000 picoseconds.
-		Weight::from_parts(1_115_920, 0)
-			// Standard Error: 8
-			.saturating_add(Weight::from_parts(22_705, 0).saturating_mul(n.into()))
+		// Minimum execution time: 847_000 picoseconds.
+		Weight::from_parts(1_070_176, 0)
+			// Standard Error: 6
+			.saturating_add(Weight::from_parts(22_815, 0).saturating_mul(n.into()))
 	}
 	fn seal_ecdsa_to_eth_address() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 12_728_000 picoseconds.
-		Weight::from_parts(12_877_000, 0)
+		// Minimum execution time: 12_696_000 picoseconds.
+		Weight::from_parts(12_856_000, 0)
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
@@ -2247,8 +2251,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `296`
 		//  Estimated: `3761`
-		// Minimum execution time: 9_781_000 picoseconds.
-		Weight::from_parts(10_016_000, 3761)
+		// Minimum execution time: 9_494_000 picoseconds.
+		Weight::from_parts(9_986_000, 3761)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -2257,20 +2261,20 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 11_494_000 picoseconds.
-		Weight::from_parts(57_030_670, 0)
-			// Standard Error: 386
-			.saturating_add(Weight::from_parts(121_589, 0).saturating_mul(r.into()))
+		// Minimum execution time: 10_835_000 picoseconds.
+		Weight::from_parts(41_789_560, 0)
+			// Standard Error: 1_113
+			.saturating_add(Weight::from_parts(148_884, 0).saturating_mul(r.into()))
 	}
 	/// The range of component `r` is `[0, 100000]`.
 	fn instr_empty_loop(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_770_000 picoseconds.
-		Weight::from_parts(2_172_554, 0)
-			// Standard Error: 76
-			.saturating_add(Weight::from_parts(72_829, 0).saturating_mul(r.into()))
+		// Minimum execution time: 2_755_000 picoseconds.
+		Weight::from_parts(5_125_050, 0)
+			// Standard Error: 29
+			.saturating_add(Weight::from_parts(72_514, 0).saturating_mul(r.into()))
 	}
 	/// Storage: UNKNOWN KEY `0x735f040a5d490f1107ad9c56f5ca00d2060e99e5378e562537cf3bc983e17b91` (r:2 w:1)
 	/// Proof: UNKNOWN KEY `0x735f040a5d490f1107ad9c56f5ca00d2060e99e5378e562537cf3bc983e17b91` (r:2 w:1)
@@ -2280,8 +2284,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `316`
 		//  Estimated: `6256`
-		// Minimum execution time: 11_693_000 picoseconds.
-		Weight::from_parts(12_377_000, 6256)
+		// Minimum execution time: 12_245_000 picoseconds.
+		Weight::from_parts(12_780_000, 6256)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}

From 74cb0031609f68f83b1028dab972a6af0af18873 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Wed, 16 Jul 2025 14:47:53 +0000
Subject: [PATCH 041/186] Update cargo files

---
 Cargo.lock                        | 397 +++++++++++++++++++++++++-----
 Cargo.toml                        |   2 +
 substrate/frame/revive/Cargo.toml |   6 +-
 3 files changed, 338 insertions(+), 67 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 33473fd9e001..38b93d12e3d5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -154,6 +154,28 @@ dependencies = [
  "winnow 0.7.10",
 ]
 
+[[package]]
+name = "alloy-eip2930"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b82752a889170df67bbb36d42ca63c531eb16274f0d7299ae2a680facba17bd"
+dependencies = [
+ "alloy-primitives",
+ "alloy-rlp",
+]
+
+[[package]]
+name = "alloy-eip7702"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d4769c6ffddca380b0070d71c8b7f30bed375543fe76bb2f74ec0acf4b7cd16"
+dependencies = [
+ "alloy-primitives",
+ "alloy-rlp",
+ "k256",
+ "thiserror 2.0.12",
+]
+
 [[package]]
 name = "alloy-json-abi"
 version = "1.1.2"
@@ -168,9 +190,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-primitives"
-version = "1.1.2"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18c35fc4b03ace65001676358ffbbaefe2a2b27ee50fe777c345082c7c888be8"
+checksum = "6177ed26655d4e84e00b65cb494d4e0b8830e7cae7ef5d63087d445a2600fb55"
 dependencies = [
  "alloy-rlp",
  "bytes",
@@ -199,11 +221,23 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cc0fac0fc16baf1f63f78b47c3d24718f3619b0714076f6a02957d808d52cbef"
 dependencies = [
+ "alloy-rlp-derive",
  "arrayvec 0.7.4",
  "bytes",
  "smol_str",
 ]
 
+[[package]]
+name = "alloy-rlp-derive"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64b728d511962dda67c1bc7ea7c03736ec275ed2cf4c35d9585298ac9ccf3b73"
+dependencies = [
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "alloy-sol-macro"
 version = "1.1.2"
@@ -448,6 +482,17 @@ dependencies = [
  "ark-std 0.4.0",
 ]
 
+[[package]]
+name = "ark-bn254"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d69eab57e8d2663efa5c63135b2af4f396d66424f88954c21104125ab6b3e6bc"
+dependencies = [
+ "ark-ec 0.5.0",
+ "ark-ff 0.5.0",
+ "ark-std 0.5.0",
+]
+
 [[package]]
 name = "ark-bw6-761"
 version = "0.4.0"
@@ -889,7 +934,7 @@ dependencies = [
  "digest 0.10.7",
  "rand_chacha 0.3.1",
  "rayon",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "w3f-ring-proof",
  "zeroize",
 ]
@@ -1727,16 +1772,25 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "aurora-engine-modexp"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "518bc5745a6264b5fd7b09dffb9667e400ee9e2bbe18555fac75e1fe9afa0df9"
+dependencies = [
+ "hex",
+ "num",
+]
+
 [[package]]
 name = "auto_impl"
-version = "1.1.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fee3da8ef1276b0bee5dd1c7258010d8fffd31801447323115a25560e1327b89"
+checksum = "ffdcb70bdbc4d478427380519163274ac86e52916e10f0a8889adf0f96d3fee7"
 dependencies = [
- "proc-macro-error",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 1.0.109",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -1877,7 +1931,7 @@ dependencies = [
  "k256",
  "rand_core 0.6.4",
  "ripemd",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "subtle 2.5.0",
  "zeroize",
 ]
@@ -1948,9 +2002,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.6.0"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
 dependencies = [
  "serde",
 ]
@@ -2856,7 +2910,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4"
 dependencies = [
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "tinyvec",
 ]
 
@@ -5479,9 +5533,9 @@ dependencies = [
 
 [[package]]
 name = "derive-where"
-version = "1.2.7"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25"
+checksum = "510c292c8cf384b1a340b816a9a6cf2599eb8f566a44949024af88418000c50b"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
@@ -5826,7 +5880,7 @@ dependencies = [
  "ed25519",
  "rand_core 0.6.4",
  "serde",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "subtle 2.5.0",
  "zeroize",
 ]
@@ -5856,7 +5910,7 @@ dependencies = [
  "hashbrown 0.14.5",
  "hex",
  "rand_core 0.6.4",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "zeroize",
 ]
 
@@ -5874,9 +5928,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.13.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 dependencies = [
  "serde",
 ]
@@ -7447,7 +7501,7 @@ version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3fda788993cc341f69012feba8bf45c0ba4f3291fcc08e214b4d5a7332d88aff"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "libc",
  "libgit2-sys",
  "log",
@@ -8984,7 +9038,7 @@ dependencies = [
  "elliptic-curve",
  "once_cell",
  "serdect",
- "sha2 0.10.8",
+ "sha2 0.10.9",
 ]
 
 [[package]]
@@ -9455,7 +9509,7 @@ dependencies = [
  "multihash 0.19.1",
  "quick-protobuf 0.8.1",
  "rand 0.8.5",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "thiserror 1.0.65",
  "tracing",
  "zeroize",
@@ -9481,7 +9535,7 @@ dependencies = [
  "quick-protobuf 0.8.1",
  "quick-protobuf-codec",
  "rand 0.8.5",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "smallvec",
  "thiserror 1.0.65",
  "tracing",
@@ -9546,7 +9600,7 @@ dependencies = [
  "once_cell",
  "quick-protobuf 0.8.1",
  "rand 0.8.5",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "snow",
  "static_assertions",
  "thiserror 1.0.65",
@@ -9940,7 +9994,7 @@ dependencies = [
  "prost-build",
  "rand 0.8.5",
  "serde",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "simple-dns",
  "smallvec",
  "snow",
@@ -10534,7 +10588,7 @@ dependencies = [
  "core2",
  "digest 0.10.7",
  "multihash-derive",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "sha3 0.10.8",
  "unsigned-varint 0.7.2",
 ]
@@ -10737,7 +10791,7 @@ version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "cfg-if",
  "libc",
 ]
@@ -10748,7 +10802,7 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "cfg-if",
  "cfg_aliases 0.2.1",
  "libc",
@@ -11086,6 +11140,27 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "num_enum"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a973b4e44ce6cad84ce69d797acf9a044532e4184c4f267913d1b546a0727b7a"
+dependencies = [
+ "num_enum_derive",
+ "rustversion",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d"
+dependencies = [
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "num_threads"
 version = "0.1.7"
@@ -11183,7 +11258,7 @@ version = "0.10.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -11291,6 +11366,18 @@ version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
 
+[[package]]
+name = "p256"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b"
+dependencies = [
+ "ecdsa",
+ "elliptic-curve",
+ "primeorder",
+ "sha2 0.10.9",
+]
+
 [[package]]
 name = "pallet-ah-ops"
 version = "0.1.0"
@@ -13126,6 +13213,7 @@ dependencies = [
  "pretty_assertions",
  "rand 0.8.5",
  "rand_pcg",
+ "revm",
  "ripemd",
  "rlp 0.6.1",
  "scale-info",
@@ -14768,7 +14856,7 @@ checksum = "56af0a30af74d0445c0bf6d9d051c979b516a1a5af790d251daee76005420a48"
 dependencies = [
  "once_cell",
  "pest",
- "sha2 0.10.8",
+ "sha2 0.10.9",
 ]
 
 [[package]]
@@ -17434,6 +17522,15 @@ dependencies = [
  "syn 2.0.98",
 ]
 
+[[package]]
+name = "primeorder"
+version = "0.13.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6"
+dependencies = [
+ "elliptic-curve",
+]
+
 [[package]]
 name = "primitive-types"
 version = "0.12.2"
@@ -17584,7 +17681,7 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "chrono",
  "flate2",
  "hex",
@@ -17599,7 +17696,7 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "chrono",
  "hex",
 ]
@@ -17661,7 +17758,7 @@ checksum = "14cae93065090804185d3b75f0bf93b8eeda30c7a9b4a33d3bdb3988d6229e50"
 dependencies = [
  "bit-set",
  "bit-vec",
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "lazy_static",
  "num-traits",
  "rand 0.8.5",
@@ -18147,7 +18244,7 @@ version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
 ]
 
 [[package]]
@@ -18437,6 +18534,178 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "revm"
+version = "27.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70a84455f03d3480d4ed2e7271c15f2ec95b758e86d57cb8d258a8ff1c22e9a4"
+dependencies = [
+ "revm-bytecode",
+ "revm-context",
+ "revm-context-interface",
+ "revm-database",
+ "revm-database-interface",
+ "revm-handler",
+ "revm-inspector",
+ "revm-interpreter",
+ "revm-precompile",
+ "revm-primitives",
+ "revm-state",
+]
+
+[[package]]
+name = "revm-bytecode"
+version = "6.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a685758a4f375ae9392b571014b9779cfa63f0d8eb91afb4626ddd958b23615"
+dependencies = [
+ "bitvec",
+ "once_cell",
+ "revm-primitives",
+]
+
+[[package]]
+name = "revm-context"
+version = "8.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a990abf66b47895ca3e915d5f3652bb7c6a4cff6e5351fdf0fc2795171fd411c"
+dependencies = [
+ "cfg-if",
+ "derive-where",
+ "revm-bytecode",
+ "revm-context-interface",
+ "revm-database-interface",
+ "revm-primitives",
+ "revm-state",
+]
+
+[[package]]
+name = "revm-context-interface"
+version = "8.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a303a93102fceccec628265efd550ce49f2817b38ac3a492c53f7d524f18a1ca"
+dependencies = [
+ "alloy-eip2930",
+ "alloy-eip7702",
+ "auto_impl",
+ "either",
+ "revm-database-interface",
+ "revm-primitives",
+ "revm-state",
+]
+
+[[package]]
+name = "revm-database"
+version = "7.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7db360729b61cc347f9c2f12adb9b5e14413aea58778cf9a3b7676c6a4afa115"
+dependencies = [
+ "revm-bytecode",
+ "revm-database-interface",
+ "revm-primitives",
+ "revm-state",
+]
+
+[[package]]
+name = "revm-database-interface"
+version = "7.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8500194cad0b9b1f0567d72370795fd1a5e0de9ec719b1607fa1566a23f039a"
+dependencies = [
+ "auto_impl",
+ "either",
+ "revm-primitives",
+ "revm-state",
+]
+
+[[package]]
+name = "revm-handler"
+version = "8.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03c35a17a38203976f97109e20eccf6732447ce6c9c42973bae42732b2e957ff"
+dependencies = [
+ "auto_impl",
+ "derive-where",
+ "revm-bytecode",
+ "revm-context",
+ "revm-context-interface",
+ "revm-database-interface",
+ "revm-interpreter",
+ "revm-precompile",
+ "revm-primitives",
+ "revm-state",
+]
+
+[[package]]
+name = "revm-inspector"
+version = "8.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e69abf6a076741bd5cd87b7d6c1b48be2821acc58932f284572323e81a8d4179"
+dependencies = [
+ "auto_impl",
+ "either",
+ "revm-context",
+ "revm-database-interface",
+ "revm-handler",
+ "revm-interpreter",
+ "revm-primitives",
+ "revm-state",
+]
+
+[[package]]
+name = "revm-interpreter"
+version = "23.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d95c4a9a1662d10b689b66b536ddc2eb1e89f5debfcabc1a2d7b8417a2fa47cd"
+dependencies = [
+ "revm-bytecode",
+ "revm-context-interface",
+ "revm-primitives",
+]
+
+[[package]]
+name = "revm-precompile"
+version = "24.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b68d54a4733ac36bd29ee645c3c2e5e782fb63f199088d49e2c48c64a9fedc15"
+dependencies = [
+ "ark-bls12-381 0.5.0",
+ "ark-bn254",
+ "ark-ec 0.5.0",
+ "ark-ff 0.5.0",
+ "ark-serialize 0.5.0",
+ "arrayref",
+ "aurora-engine-modexp",
+ "cfg-if",
+ "k256",
+ "once_cell",
+ "p256",
+ "revm-primitives",
+ "ripemd",
+ "sha2 0.10.9",
+]
+
+[[package]]
+name = "revm-primitives"
+version = "20.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52cdf897b3418f2ee05bcade64985e5faed2dbaa349b2b5f27d3d6bfd10fff2a"
+dependencies = [
+ "alloy-primitives",
+ "num_enum",
+]
+
+[[package]]
+name = "revm-state"
+version = "7.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "106fec5c634420118c7d07a6c37110186ae7f23025ceac3a5dbe182eea548363"
+dependencies = [
+ "bitflags 2.9.1",
+ "revm-bytecode",
+ "revm-primitives",
+]
+
 [[package]]
 name = "rfc6979"
 version = "0.4.0"
@@ -18951,7 +19220,7 @@ version = "0.38.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "errno",
  "libc",
  "linux-raw-sys 0.4.14",
@@ -21083,7 +21352,7 @@ dependencies = [
  "merlin",
  "rand_core 0.6.4",
  "serde_bytes",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "subtle 2.5.0",
  "zeroize",
 ]
@@ -21115,7 +21384,7 @@ dependencies = [
  "password-hash",
  "pbkdf2",
  "salsa20",
- "sha2 0.10.8",
+ "sha2 0.10.9",
 ]
 
 [[package]]
@@ -21215,7 +21484,7 @@ version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -21482,9 +21751,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.10.8"
+version = "0.10.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -21586,7 +21855,7 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dee851d0e5e7af3721faea1843e8015e820a234f81fda3dea9247e15bac9a86a"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
 ]
 
 [[package]]
@@ -21746,7 +22015,7 @@ dependencies = [
  "schnorrkel 0.10.2",
  "serde",
  "serde_json",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "sha3 0.10.8",
  "siphasher 0.3.11",
  "slab",
@@ -21800,7 +22069,7 @@ dependencies = [
  "schnorrkel 0.11.4",
  "serde",
  "serde_json",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "sha3 0.10.8",
  "siphasher 1.0.1",
  "slab",
@@ -21903,7 +22172,7 @@ dependencies = [
  "rand_core 0.6.4",
  "ring 0.17.8",
  "rustc_version 0.4.0",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "subtle 2.5.0",
 ]
 
@@ -22954,7 +23223,7 @@ dependencies = [
  "secrecy 0.8.0",
  "serde",
  "serde_json",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "sp-crypto-hashing 0.1.0",
  "sp-debug-derive 14.0.0",
  "sp-externalities 0.25.0",
@@ -23160,7 +23429,7 @@ dependencies = [
  "byteorder",
  "criterion",
  "digest 0.10.7",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "sha3 0.10.8",
  "sp-crypto-hashing-proc-macro 0.1.0",
  "twox-hash",
@@ -23175,7 +23444,7 @@ dependencies = [
  "blake2b_simd 1.0.2",
  "byteorder",
  "digest 0.10.7",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "sha3 0.10.8",
  "twox-hash",
 ]
@@ -23845,7 +24114,7 @@ dependencies = [
  "parity-scale-codec",
  "rand 0.8.5",
  "scale-info",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "sp-api 26.0.0",
  "sp-application-crypto 30.0.0",
  "sp-core 28.0.0",
@@ -24245,7 +24514,7 @@ dependencies = [
  "percent-encoding",
  "serde",
  "serde_json",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "smallvec",
  "sqlformat",
  "thiserror 1.0.65",
@@ -24283,7 +24552,7 @@ dependencies = [
  "quote 1.0.40",
  "serde",
  "serde_json",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "sqlx-core",
  "sqlx-mysql",
  "sqlx-postgres",
@@ -24302,7 +24571,7 @@ checksum = "64bb4714269afa44aef2755150a0fc19d756fb580a67db8885608cf02f47d06a"
 dependencies = [
  "atoi",
  "base64 0.22.1",
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "byteorder",
  "bytes",
  "crc",
@@ -24327,7 +24596,7 @@ dependencies = [
  "rsa",
  "serde",
  "sha1",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "smallvec",
  "sqlx-core",
  "stringprep",
@@ -24344,7 +24613,7 @@ checksum = "6fa91a732d854c5d7726349bb4bb879bb9478993ceb764247660aee25f67c2f8"
 dependencies = [
  "atoi",
  "base64 0.22.1",
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "byteorder",
  "crc",
  "dotenvy",
@@ -24365,7 +24634,7 @@ dependencies = [
  "rand 0.8.5",
  "serde",
  "serde_json",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "smallvec",
  "sqlx-core",
  "stringprep",
@@ -24734,7 +25003,7 @@ dependencies = [
  "pbkdf2",
  "rustc-hex",
  "schnorrkel 0.11.4",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "zeroize",
 ]
 
@@ -24747,7 +25016,7 @@ dependencies = [
  "hmac 0.12.1",
  "pbkdf2",
  "schnorrkel 0.11.4",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "zeroize",
 ]
 
@@ -25478,7 +25747,7 @@ dependencies = [
  "secrecy 0.10.3",
  "serde",
  "serde_json",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "subxt-core 0.38.0",
  "zeroize",
 ]
@@ -25506,7 +25775,7 @@ dependencies = [
  "secrecy 0.10.3",
  "serde",
  "serde_json",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "subxt-core 0.41.0",
  "thiserror 2.0.12",
@@ -25735,7 +26004,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "core-foundation",
  "system-configuration-sys 0.6.0",
 ]
@@ -26415,7 +26684,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140"
 dependencies = [
  "base64 0.21.7",
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "bytes",
  "futures-core",
  "futures-util",
@@ -26435,7 +26704,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "bytes",
  "http 1.1.0",
  "http-body 1.0.0",
@@ -27044,7 +27313,7 @@ dependencies = [
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "rand_core 0.6.4",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "sha3 0.10.8",
  "zeroize",
 ]
@@ -27478,7 +27747,7 @@ dependencies = [
  "log",
  "rustix 0.36.15",
  "serde",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "toml 0.5.11",
  "windows-sys 0.45.0",
  "zstd 0.11.2+zstd.1.5.2",
@@ -28277,7 +28546,7 @@ version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
 ]
 
 [[package]]
@@ -28853,7 +29122,7 @@ dependencies = [
  "reqwest",
  "serde",
  "serde_json",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "sp-core 35.0.0",
  "subxt 0.38.1",
  "subxt-signer 0.38.0",
@@ -28897,7 +29166,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_yaml",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "tar",
  "thiserror 1.0.65",
  "tokio",
diff --git a/Cargo.toml b/Cargo.toml
index 74b269fce84f..2df417bd552f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1472,6 +1472,8 @@ zombienet-configuration = { version = "0.3.6" }
 zombienet-orchestrator = { version = "0.3.6" }
 zombienet-sdk = { version = "0.3.6" }
 zstd = { version = "0.12.4", default-features = false }
+revm = { version = "27.0.2", default-features = false }
+
 
 [profile.release]
 # Polkadot runtime requires unwinding.
diff --git a/substrate/frame/revive/Cargo.toml b/substrate/frame/revive/Cargo.toml
index 7758137b1210..a1bbaae761f3 100644
--- a/substrate/frame/revive/Cargo.toml
+++ b/substrate/frame/revive/Cargo.toml
@@ -32,12 +32,13 @@ num-integer = { workspace = true }
 num-traits = { workspace = true }
 paste = { workspace = true }
 polkavm = { version = "0.26.0", default-features = false }
-polkavm-common = { version = "0.26.0", default-features = false, optional = true }
+polkavm-common = { version = "0.26.0", default-features = false }
 rand = { workspace = true, optional = true }
 rand_pcg = { workspace = true, optional = true }
 rlp = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 serde = { features = ["alloc", "derive"], workspace = true, default-features = false }
+revm = { workspace = true }
 
 # Polkadot SDK Dependencies
 bn = { workspace = true }
@@ -62,7 +63,6 @@ subxt-signer = { workspace = true, optional = true, features = ["unstable-eth"]
 [dev-dependencies]
 array-bytes = { workspace = true, default-features = true }
 assert_matches = { workspace = true }
-polkavm-common = { version = "0.26.0" }
 pretty_assertions = { workspace = true }
 secp256k1 = { workspace = true, features = ["recovery"] }
 serde_json = { workspace = true }
@@ -96,7 +96,7 @@ std = [
 	"pallet-timestamp/std",
 	"pallet-transaction-payment/std",
 	"pallet-utility/std",
-	"polkavm-common?/std",
+	"polkavm-common/std",
 	"polkavm/std",
 	"rand?/std",
 	"ripemd/std",

From fc31a0ee8248166fe271f5051d5b6bf45533f9dc Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Wed, 16 Jul 2025 21:33:05 +0000
Subject: [PATCH 042/186] store the runtime code for EVM instantiate

---
 substrate/frame/revive/src/exec.rs       | 42 +++++++++++++++++++-----
 substrate/frame/revive/src/exec/tests.rs |  4 +++
 substrate/frame/revive/src/lib.rs        | 41 ++++++++++++++---------
 substrate/frame/revive/src/vm/mod.rs     | 27 +++++++++++++--
 4 files changed, 88 insertions(+), 26 deletions(-)

diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index 6acb2377870f..f75783b7ebb2 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -476,6 +476,11 @@ pub trait Executable<T: Config>: Sized {
 
 	/// The code hash of the executable.
 	fn code_hash(&self) -> &H256;
+
+	/// Returns true if the executable is a PVM blob.
+	fn is_pvm(&self) -> bool {
+		self.code().starts_with(&polkavm_common::program::BLOB_MAGIC)
+	}
 }
 
 /// The complete call stack of a contract execution.
@@ -569,6 +574,13 @@ impl<T: Config, E: Executable<T>, Env> ExecutableOrPrecompile<T, E, Env> {
 		}
 	}
 
+	fn is_pvm(&self) -> bool {
+		match self {
+			Self::Executable(e) => e.is_pvm(),
+			_ => false,
+		}
+	}
+
 	fn as_precompile(&self) -> Option<&PrecompileInstance<Env>> {
 		if let Self::Precompile { instance, .. } = self {
 			Some(instance)
@@ -1089,6 +1101,7 @@ where
 	) -> Result<(), ExecError> {
 		let frame = self.top_frame();
 		let entry_point = frame.entry_point;
+		let is_pvm = executable.is_pvm();
 
 		if_tracing(|tracer| {
 			tracer.enter_child_span(
@@ -1118,6 +1131,7 @@ where
 
 		let do_transaction = || -> ExecResult {
 			let caller = self.caller();
+			let skip_transfer = self.skip_transfer;
 			let frame = top_frame_mut!(self);
 			let account_id = &frame.account_id.clone();
 
@@ -1152,12 +1166,14 @@ where
 					<System<T>>::inc_account_nonce(caller.account_id()?);
 				}
 				// The incremented refcount should be visible to the constructor.
-				<CodeInfo<T>>::increment_refcount(
-					*executable
-						.as_executable()
-						.expect("Precompiles cannot be instantiated; qed")
-						.code_hash(),
-				)?;
+				if is_pvm {
+					<CodeInfo<T>>::increment_refcount(
+						*executable
+							.as_executable()
+							.expect("Precompiles cannot be instantiated; qed")
+							.code_hash(),
+					)?;
+				}
 			}
 
 			// Every non delegate call or instantiate also optionally transfers the balance.
@@ -1192,12 +1208,12 @@ where
 				}
 			}
 
-			let code_deposit = executable
+			let mut code_deposit = executable
 				.as_executable()
 				.map(|exec| exec.code_info().deposit())
 				.unwrap_or_default();
 
-			let output = match executable {
+			let mut output = match executable {
 				ExecutableOrPrecompile::Executable(executable) =>
 					executable.execute(self, entry_point, input_data),
 				ExecutableOrPrecompile::Precompile { instance, .. } =>
@@ -1215,6 +1231,16 @@ where
 			// The deposit we charge for a contract depends on the size of the immutable data.
 			// Hence we need to delay charging the base deposit after execution.
 			if entry_point == ExportedFunction::Constructor {
+				// if we are dealing with EVM bytecode
+				// We upload the new runtime code, and update the code
+				if !is_pvm {
+					let caller = caller.account_id()?.clone();
+					let addr = T::AddressMapper::to_address(account_id).0.to_vec();
+					let data = core::mem::replace(&mut output.data, addr);
+					let mut module = crate::ContractBlob::<T>::from_evm_code(data, caller)?;
+					code_deposit = module.store_code(skip_transfer)?;
+				}
+
 				let deposit = frame.contract_info().update_base_deposit(code_deposit);
 				frame
 					.nested_storage
diff --git a/substrate/frame/revive/src/exec/tests.rs b/substrate/frame/revive/src/exec/tests.rs
index eacf1353e8b3..68d87be00752 100644
--- a/substrate/frame/revive/src/exec/tests.rs
+++ b/substrate/frame/revive/src/exec/tests.rs
@@ -176,6 +176,10 @@ impl Executable<Test> for MockExecutable {
 		self.code_hash.as_ref()
 	}
 
+	fn is_pvm(&self) -> bool {
+		true
+	}
+
 	fn code_hash(&self) -> &H256 {
 		&self.code_hash
 	}
diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index c5e79d62aeb3..33af548cd776 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -1174,9 +1174,9 @@ where
 
 			if_tracing(|t| t.instantiate_code(&code, salt.as_ref()));
 			let (executable, upload_deposit) = match code {
-				Code::Upload(code) => {
+				Code::Upload(code) if code.starts_with(&polkavm_common::program::BLOB_MAGIC) => {
 					let upload_account = T::UploadOrigin::ensure_origin(origin)?;
-					let (executable, upload_deposit) = Self::try_upload_code(
+					let (executable, upload_deposit) = Self::try_upload_pvm_code(
 						upload_account,
 						code,
 						storage_deposit_limit,
@@ -1185,6 +1185,11 @@ where
 					storage_deposit_limit.saturating_reduce(upload_deposit);
 					(executable, upload_deposit)
 				},
+				Code::Upload(code) => {
+					let origin = T::UploadOrigin::ensure_origin(origin)?;
+					let executable = ContractBlob::from_evm_code(code, origin)?;
+					(executable, Default::default())
+				},
 				Code::Existing(code_hash) =>
 					(ContractBlob::from_storage(code_hash, &mut gas_meter)?, Default::default()),
 			};
@@ -1375,16 +1380,21 @@ where
 			// A contract deployment
 			None => {
 				// Extract code and data from the input.
-				let (code, data) = match polkavm::ProgramBlob::blob_length(&input) {
-					Some(blob_len) => blob_len
-						.try_into()
-						.ok()
-						.and_then(|blob_len| (input.split_at_checked(blob_len)))
-						.unwrap_or_else(|| (&input[..], &[][..])),
-					_ => {
-						log::debug!(target: LOG_TARGET, "Failed to extract polkavm blob length");
-						(&input[..], &[][..])
-					},
+				let (code, data) = if input.starts_with(&polkavm_common::program::BLOB_MAGIC) {
+					match polkavm::ProgramBlob::blob_length(&input) {
+						Some(blob_len) => blob_len
+							.try_into()
+							.ok()
+							.and_then(|blob_len| (input.split_at_checked(blob_len)))
+							.unwrap_or_else(|| (&input[..], &[][..])),
+						_ => {
+							log::debug!(target: LOG_TARGET, "Failed to extract polkavm blob length");
+							(&input[..], &[][..])
+						},
+					}
+				} else {
+					// TODO support EVM
+					return Err(EthTransactError::Message("Invalid transaction".into()));
 				};
 
 				// Dry run the call.
@@ -1545,7 +1555,8 @@ where
 		storage_deposit_limit: BalanceOf<T>,
 	) -> CodeUploadResult<BalanceOf<T>> {
 		let origin = T::UploadOrigin::ensure_origin(origin)?;
-		let (module, deposit) = Self::try_upload_code(origin, code, storage_deposit_limit, false)?;
+		let (module, deposit) =
+			Self::try_upload_pvm_code(origin, code, storage_deposit_limit, false)?;
 		Ok(CodeUploadReturnValue { code_hash: *module.code_hash(), deposit })
 	}
 
@@ -1572,13 +1583,13 @@ where
 	}
 
 	/// Uploads new code and returns the Vm binary contract blob and deposit amount collected.
-	fn try_upload_code(
+	fn try_upload_pvm_code(
 		origin: T::AccountId,
 		code: Vec<u8>,
 		storage_deposit_limit: BalanceOf<T>,
 		skip_transfer: bool,
 	) -> Result<(ContractBlob<T>, BalanceOf<T>), DispatchError> {
-		let mut module = ContractBlob::from_code(code, origin)?;
+		let mut module = ContractBlob::from_pvm_code(code, origin)?;
 		let deposit = module.store_code(skip_transfer)?;
 		ensure!(storage_deposit_limit >= deposit, <Error<T>>::StorageDepositLimitExhausted);
 		Ok((module, deposit))
diff --git a/substrate/frame/revive/src/vm/mod.rs b/substrate/frame/revive/src/vm/mod.rs
index d55250ff2ac9..e90af93775a4 100644
--- a/substrate/frame/revive/src/vm/mod.rs
+++ b/substrate/frame/revive/src/vm/mod.rs
@@ -133,7 +133,7 @@ where
 	BalanceOf<T>: Into<U256> + TryFrom<U256>,
 {
 	/// We only check for size and nothing else when the code is uploaded.
-	pub fn from_code(code: Vec<u8>, owner: AccountIdOf<T>) -> Result<Self, DispatchError> {
+	pub fn from_pvm_code(code: Vec<u8>, owner: AccountIdOf<T>) -> Result<Self, DispatchError> {
 		// We do validation only when new code is deployed. This allows us to increase
 		// the limits later without affecting already deployed code.
 		let available_syscalls = runtime::list_syscalls(T::UnsafeUnstableInterface::get());
@@ -155,6 +155,20 @@ where
 		Ok(ContractBlob { code, code_info, code_hash })
 	}
 
+	pub fn from_evm_code(code: Vec<u8>, owner: AccountIdOf<T>) -> Result<Self, DispatchError> {
+		let code: CodeVec = code.try_into().map_err(|_| <Error<T>>::BlobTooLarge)?;
+		let code_len = code.len() as u32;
+		let code_info = CodeInfo {
+			owner,
+			deposit: Default::default(),
+			refcount: 0,
+			code_len,
+			behaviour_version: Default::default(),
+		};
+		let code_hash = H256(sp_io::hashing::keccak_256(&code));
+		Ok(ContractBlob { code, code_info, code_hash })
+	}
+
 	/// Remove the code from storage and refund the deposit to its owner.
 	///
 	/// Applies all necessary checks before removing the code.
@@ -406,8 +420,15 @@ where
 		function: ExportedFunction,
 		input_data: Vec<u8>,
 	) -> ExecResult {
-		let prepared_call = self.prepare_call(Runtime::new(ext, input_data), function, 0)?;
-		prepared_call.call()
+		if self.is_pvm() {
+			let prepared_call = self.prepare_call(Runtime::new(ext, input_data), function, 0)?;
+			prepared_call.call()
+		} else {
+			// use revm::bytecode::Bytecode;
+			// let bytecode = Bytecode::new_raw(self.code.into_inner().into());
+
+			unimplemented!("EVM execution is not implemented yet")
+		}
 	}
 
 	fn code(&self) -> &[u8] {

From bf2c04635627267d8fc96898e0fd06a78be418ee Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Thu, 17 Jul 2025 12:16:01 +0000
Subject: [PATCH 043/186] wip

---
 substrate/frame/revive/src/vm/evm.rs | 183 +++++++++++++++++++++++++++
 substrate/frame/revive/src/vm/mod.rs |   7 +-
 2 files changed, 187 insertions(+), 3 deletions(-)
 create mode 100644 substrate/frame/revive/src/vm/evm.rs

diff --git a/substrate/frame/revive/src/vm/evm.rs b/substrate/frame/revive/src/vm/evm.rs
new file mode 100644
index 000000000000..57689823ca16
--- /dev/null
+++ b/substrate/frame/revive/src/vm/evm.rs
@@ -0,0 +1,183 @@
+use crate::vm::ExecResult;
+use revm::{
+	bytecode::Bytecode,
+	context_interface::{
+		context::{SStoreResult, SelfDestructResult, StateLoad},
+		journaled_state::AccountLoad,
+	},
+	interpreter::{
+		host::Host,
+		instruction_table,
+		interpreter::{EthInterpreter, ExtBytecode},
+		interpreter_action::{
+			CallInputs, CreateInputs, CreateOutcome, FrameInput, InterpreterAction,
+		},
+		interpreter_types::ReturnData,
+		CallInput, InputsImpl, Interpreter, InterpreterResult, SharedMemory,
+	},
+	primitives::{hardfork::SpecId, Address, Bytes, Log, StorageKey, StorageValue, B256, U256},
+};
+
+pub fn call(bytecode: Bytecode, input_data: Vec<u8>) -> ExecResult {
+	let inputs = InputsImpl {
+		// TODO set these values
+		caller_address: Default::default(),
+		target_address: Default::default(),
+		call_value: Default::default(),
+		bytecode_address: None,
+		input: CallInput::Bytes(input_data.into()),
+	};
+
+	let mut interpreter = Interpreter::new(
+		SharedMemory::new(),
+		ExtBytecode::new(bytecode),
+		inputs,
+		false,
+		SpecId::default(),
+		1_000_000,
+	);
+
+	let table = instruction_table::<EthInterpreter, MockHost>();
+	let _result = run(&mut interpreter, &table, &mut MockHost::default());
+	todo!()
+}
+
+fn run(
+	interpreter: &mut Interpreter<EthInterpreter>,
+	table: &revm::interpreter::InstructionTable<EthInterpreter, MockHost>,
+	host: &mut MockHost,
+) -> InterpreterResult {
+	loop {
+		let action = interpreter.run_plain(table, host);
+		match action {
+			InterpreterAction::NewFrame(frame_input) => match frame_input {
+				FrameInput::Call(input) => {
+					let result = host.call(&input);
+					interpreter.return_data.set_buffer(result.output.clone());
+					let _ = interpreter.stack.push(U256::from(result.result.is_ok() as u8));
+				},
+				FrameInput::Create(input) => {
+					let outcome = host.create(&input);
+					let address = outcome.address.unwrap_or_default();
+					let _ = interpreter.stack.push(U256::from_be_slice(address.as_slice()));
+				},
+				FrameInput::Empty => {
+					panic!("Unexpected empty frame input");
+				},
+			},
+			InterpreterAction::Return(result) => return result,
+		}
+	}
+}
+
+/// Mock [`Host`] implementation
+#[derive(Debug, Default)]
+struct MockHost;
+
+impl MockHost {
+	/// Mock calling a child contract.
+	pub fn call(&mut self, call_inputs: &CallInputs) -> InterpreterResult {
+		let mock_result = Bytes::from(U256::from(42u64).to_be_bytes_vec());
+
+		InterpreterResult::new(
+			revm::interpreter::InstructionResult::Return,
+			mock_result,
+			revm::interpreter::Gas::new(call_inputs.gas_limit - 100), // Consume some gas
+		)
+	}
+
+	/// Mock creating a new contract.
+	pub fn create(&mut self, create_inputs: &CreateInputs) -> CreateOutcome {
+		// Generate a mock contract address
+		let contract_address = Address::from_slice(&[42u8; 20]);
+
+		CreateOutcome::new(
+			InterpreterResult::new(
+				revm::interpreter::InstructionResult::Return,
+				Bytes::default(),
+				revm::interpreter::Gas::new(create_inputs.gas_limit - 200), // Consume some gas
+			),
+			Some(contract_address),
+		)
+	}
+}
+
+impl Host for MockHost {
+	fn basefee(&self) -> U256 {
+		U256::ZERO
+	}
+	fn blob_gasprice(&self) -> U256 {
+		U256::ZERO
+	}
+	fn gas_limit(&self) -> U256 {
+		U256::from(30_000_000u64)
+	}
+	fn difficulty(&self) -> U256 {
+		U256::ZERO
+	}
+	fn prevrandao(&self) -> Option<U256> {
+		None
+	}
+	fn block_number(&self) -> U256 {
+		U256::from(1u64)
+	}
+	fn timestamp(&self) -> U256 {
+		U256::from(1000u64)
+	}
+	fn beneficiary(&self) -> Address {
+		Address::ZERO
+	}
+	fn chain_id(&self) -> U256 {
+		U256::from(1u64)
+	}
+	fn effective_gas_price(&self) -> U256 {
+		U256::ZERO
+	}
+	fn caller(&self) -> Address {
+		Address::ZERO
+	}
+	fn blob_hash(&self, _number: usize) -> Option<U256> {
+		None
+	}
+	fn max_initcode_size(&self) -> usize {
+		0x40000
+	}
+	fn block_hash(&mut self, _number: u64) -> Option<B256> {
+		None
+	}
+	fn selfdestruct(
+		&mut self,
+		_address: Address,
+		_target: Address,
+	) -> Option<StateLoad<SelfDestructResult>> {
+		None
+	}
+	fn log(&mut self, _log: Log) {}
+	fn sstore(
+		&mut self,
+		_address: Address,
+		_key: StorageKey,
+		_value: StorageValue,
+	) -> Option<StateLoad<SStoreResult>> {
+		None
+	}
+	fn sload(&mut self, _address: Address, _key: StorageKey) -> Option<StateLoad<StorageValue>> {
+		None
+	}
+	fn tstore(&mut self, _address: Address, _key: StorageKey, _value: StorageValue) {}
+	fn tload(&mut self, _address: Address, _key: StorageKey) -> StorageValue {
+		StorageValue::ZERO
+	}
+	fn balance(&mut self, _address: Address) -> Option<StateLoad<U256>> {
+		None
+	}
+	fn load_account_delegated(&mut self, _address: Address) -> Option<StateLoad<AccountLoad>> {
+		Some(StateLoad::new(AccountLoad { is_delegate_account_cold: None, is_empty: true }, true))
+	}
+	fn load_account_code(&mut self, _address: Address) -> Option<StateLoad<Bytes>> {
+		None
+	}
+	fn load_account_code_hash(&mut self, _address: Address) -> Option<StateLoad<B256>> {
+		None
+	}
+}
diff --git a/substrate/frame/revive/src/vm/mod.rs b/substrate/frame/revive/src/vm/mod.rs
index e90af93775a4..4d082145ffee 100644
--- a/substrate/frame/revive/src/vm/mod.rs
+++ b/substrate/frame/revive/src/vm/mod.rs
@@ -18,6 +18,7 @@
 //! This module provides a means for executing contracts
 //! represented in vm bytecode.
 
+mod evm;
 mod runtime;
 
 #[cfg(doc)]
@@ -424,10 +425,10 @@ where
 			let prepared_call = self.prepare_call(Runtime::new(ext, input_data), function, 0)?;
 			prepared_call.call()
 		} else {
-			// use revm::bytecode::Bytecode;
-			// let bytecode = Bytecode::new_raw(self.code.into_inner().into());
+			use revm::bytecode::Bytecode;
+			let bytecode = Bytecode::new_raw(self.code.into_inner().into());
 
-			unimplemented!("EVM execution is not implemented yet")
+			evm::call(bytecode, input_data)
 		}
 	}
 

From 4c3c09fb029848e3d0ae4b6cc7da61a7dad60c40 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Thu, 17 Jul 2025 16:42:23 +0000
Subject: [PATCH 044/186] wip

---
 substrate/frame/revive/src/exec.rs            |  5 +++-
 substrate/frame/revive/src/tests.rs           | 27 +++++++++++++++++++
 .../frame/revive/src/tests/Fibonacci.abi      |  1 +
 .../frame/revive/src/tests/fibonacci.sol      | 11 ++++++++
 substrate/frame/revive/src/vm/evm.rs          | 20 +++++++++++---
 substrate/frame/revive/src/vm/mod.rs          | 10 +++++--
 6 files changed, 67 insertions(+), 7 deletions(-)
 create mode 100644 substrate/frame/revive/src/tests/Fibonacci.abi
 create mode 100644 substrate/frame/revive/src/tests/fibonacci.sol

diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index f75783b7ebb2..23e07045acf1 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -1231,17 +1231,20 @@ where
 			// The deposit we charge for a contract depends on the size of the immutable data.
 			// Hence we need to delay charging the base deposit after execution.
 			if entry_point == ExportedFunction::Constructor {
+				let contract_info = frame.contract_info();
 				// if we are dealing with EVM bytecode
 				// We upload the new runtime code, and update the code
 				if !is_pvm {
 					let caller = caller.account_id()?.clone();
 					let addr = T::AddressMapper::to_address(account_id).0.to_vec();
 					let data = core::mem::replace(&mut output.data, addr);
+
 					let mut module = crate::ContractBlob::<T>::from_evm_code(data, caller)?;
 					code_deposit = module.store_code(skip_transfer)?;
+					contract_info.code_hash = *module.code_hash();
 				}
 
-				let deposit = frame.contract_info().update_base_deposit(code_deposit);
+				let deposit = contract_info.update_base_deposit(code_deposit);
 				frame
 					.nested_storage
 					.charge_deposit(frame.account_id.clone(), StorageDeposit::Charge(deposit));
diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index 7b2b0c354d6d..d46bfa0625ab 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -4930,3 +4930,30 @@ fn code_size_for_precompiles_works() {
 			.build_and_unwrap_result();
 	});
 }
+
+#[test]
+fn basic_evm_flow_works() {
+	use alloy_core::{hex, primitives, sol_types::SolInterface};
+	let code = hex::decode(include_str!("tests/Fibonacci.bin")).unwrap();
+	let init_code_hash = H256::from(sp_io::hashing::keccak_256(&code));
+
+	alloy_core::sol!("src/tests/fibonacci.sol");
+
+	ExtBuilder::default().build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code.clone()))
+			.native_value(1000)
+			.build_and_unwrap_contract();
+
+		let data =
+			Fibonacci::FibonacciCalls::fib(Fibonacci::fibCall { n: primitives::U256::from(10u64) })
+				.abi_encode();
+
+		// check the code exists
+		let contract = test_utils::get_contract_checked(&addr).unwrap();
+		ensure_stored(contract.code_hash);
+
+		let result = builder::bare_call(addr).data(data).build_and_unwrap_result();
+		println!("Fib(10) result: {:?}", result.data);
+	});
+}
diff --git a/substrate/frame/revive/src/tests/Fibonacci.abi b/substrate/frame/revive/src/tests/Fibonacci.abi
new file mode 100644
index 000000000000..01feb2277761
--- /dev/null
+++ b/substrate/frame/revive/src/tests/Fibonacci.abi
@@ -0,0 +1 @@
+[{"inputs":[{"internalType":"uint256","name":"n","type":"uint256"}],"name":"fib","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"pure","type":"function"}]
\ No newline at end of file
diff --git a/substrate/frame/revive/src/tests/fibonacci.sol b/substrate/frame/revive/src/tests/fibonacci.sol
new file mode 100644
index 000000000000..8e54fc3b062d
--- /dev/null
+++ b/substrate/frame/revive/src/tests/fibonacci.sol
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+contract Fibonacci {
+    function fib(uint n) public pure returns (uint) {
+        if (n <= 1) {
+            return n;
+        }
+        return fib(n - 1) + fib(n - 2);
+    }
+}
\ No newline at end of file
diff --git a/substrate/frame/revive/src/vm/evm.rs b/substrate/frame/revive/src/vm/evm.rs
index 57689823ca16..3f70054ef67d 100644
--- a/substrate/frame/revive/src/vm/evm.rs
+++ b/substrate/frame/revive/src/vm/evm.rs
@@ -1,4 +1,8 @@
-use crate::vm::ExecResult;
+use crate::{
+	vm::{ExecResult, ExportedFunction},
+	ExecReturnValue,
+};
+use pallet_revive_uapi::ReturnFlags;
 use revm::{
 	bytecode::Bytecode,
 	context_interface::{
@@ -18,9 +22,9 @@ use revm::{
 	primitives::{hardfork::SpecId, Address, Bytes, Log, StorageKey, StorageValue, B256, U256},
 };
 
-pub fn call(bytecode: Bytecode, input_data: Vec<u8>) -> ExecResult {
+/// TODO handle error case
+pub fn call(bytecode: Bytecode, function: ExportedFunction, input_data: Vec<u8>) -> ExecResult {
 	let inputs = InputsImpl {
-		// TODO set these values
 		caller_address: Default::default(),
 		target_address: Default::default(),
 		call_value: Default::default(),
@@ -38,7 +42,15 @@ pub fn call(bytecode: Bytecode, input_data: Vec<u8>) -> ExecResult {
 	);
 
 	let table = instruction_table::<EthInterpreter, MockHost>();
-	let _result = run(&mut interpreter, &table, &mut MockHost::default());
+	let result = run(&mut interpreter, &table, &mut MockHost::default());
+
+	if result.is_ok() {
+		return Ok(ExecReturnValue {
+			flags: if result.is_revert() { ReturnFlags::REVERT } else { ReturnFlags::empty() },
+			data: result.output.to_vec(),
+		})
+	}
+
 	todo!()
 }
 
diff --git a/substrate/frame/revive/src/vm/mod.rs b/substrate/frame/revive/src/vm/mod.rs
index 4d082145ffee..0fba3142bfda 100644
--- a/substrate/frame/revive/src/vm/mod.rs
+++ b/substrate/frame/revive/src/vm/mod.rs
@@ -157,7 +157,14 @@ where
 	}
 
 	pub fn from_evm_code(code: Vec<u8>, owner: AccountIdOf<T>) -> Result<Self, DispatchError> {
+		use revm::{bytecode::Bytecode, primitives::Bytes};
+
 		let code: CodeVec = code.try_into().map_err(|_| <Error<T>>::BlobTooLarge)?;
+		Bytecode::new_raw_checked(Bytes::from(code.to_vec())).map_err(|err| {
+			log::debug!(target: LOG_TARGET, "failed to create evm bytecode from code: {err:?}" );
+			<Error<T>>::CodeRejected
+		})?;
+
 		let code_len = code.len() as u32;
 		let code_info = CodeInfo {
 			owner,
@@ -427,8 +434,7 @@ where
 		} else {
 			use revm::bytecode::Bytecode;
 			let bytecode = Bytecode::new_raw(self.code.into_inner().into());
-
-			evm::call(bytecode, input_data)
+			evm::call(bytecode, function, input_data)
 		}
 	}
 

From 279c13264e501313974af99af9db570a8b84984a Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Thu, 17 Jul 2025 16:50:23 +0000
Subject: [PATCH 045/186] fix

---
 substrate/frame/revive/src/tests.rs  |  3 +--
 substrate/frame/revive/src/vm/evm.rs | 10 ++++------
 substrate/frame/revive/src/vm/mod.rs |  2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index d46bfa0625ab..b5e9ebb226c5 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -4935,7 +4935,6 @@ fn code_size_for_precompiles_works() {
 fn basic_evm_flow_works() {
 	use alloy_core::{hex, primitives, sol_types::SolInterface};
 	let code = hex::decode(include_str!("tests/Fibonacci.bin")).unwrap();
-	let init_code_hash = H256::from(sp_io::hashing::keccak_256(&code));
 
 	alloy_core::sol!("src/tests/fibonacci.sol");
 
@@ -4954,6 +4953,6 @@ fn basic_evm_flow_works() {
 		ensure_stored(contract.code_hash);
 
 		let result = builder::bare_call(addr).data(data).build_and_unwrap_result();
-		println!("Fib(10) result: {:?}", result.data);
+		assert_eq!(U256::from(55u32), U256::from_big_endian(&result.data));
 	});
 }
diff --git a/substrate/frame/revive/src/vm/evm.rs b/substrate/frame/revive/src/vm/evm.rs
index 3f70054ef67d..a5edf39d7d50 100644
--- a/substrate/frame/revive/src/vm/evm.rs
+++ b/substrate/frame/revive/src/vm/evm.rs
@@ -1,7 +1,4 @@
-use crate::{
-	vm::{ExecResult, ExportedFunction},
-	ExecReturnValue,
-};
+use crate::{vm::ExecResult, ExecReturnValue};
 use pallet_revive_uapi::ReturnFlags;
 use revm::{
 	bytecode::Bytecode,
@@ -23,7 +20,8 @@ use revm::{
 };
 
 /// TODO handle error case
-pub fn call(bytecode: Bytecode, function: ExportedFunction, input_data: Vec<u8>) -> ExecResult {
+pub fn call(bytecode: Bytecode, input_data: Vec<u8>) -> ExecResult {
+	// TODO replace this with a proper trait impl
 	let inputs = InputsImpl {
 		caller_address: Default::default(),
 		target_address: Default::default(),
@@ -51,7 +49,7 @@ pub fn call(bytecode: Bytecode, function: ExportedFunction, input_data: Vec<u8>)
 		})
 	}
 
-	todo!()
+	todo!("Handle error case properly");
 }
 
 fn run(
diff --git a/substrate/frame/revive/src/vm/mod.rs b/substrate/frame/revive/src/vm/mod.rs
index 0fba3142bfda..8fbf1f8472df 100644
--- a/substrate/frame/revive/src/vm/mod.rs
+++ b/substrate/frame/revive/src/vm/mod.rs
@@ -434,7 +434,7 @@ where
 		} else {
 			use revm::bytecode::Bytecode;
 			let bytecode = Bytecode::new_raw(self.code.into_inner().into());
-			evm::call(bytecode, function, input_data)
+			evm::call(bytecode, input_data)
 		}
 	}
 

From 9e7ee088f7c3d82b2258379096c88d96bee33740 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Thu, 17 Jul 2025 16:52:00 +0000
Subject: [PATCH 046/186] fix

---
 substrate/frame/revive/src/tests.rs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index b5e9ebb226c5..7f4d593cb3e6 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -4944,15 +4944,18 @@ fn basic_evm_flow_works() {
 			.native_value(1000)
 			.build_and_unwrap_contract();
 
-		let data =
-			Fibonacci::FibonacciCalls::fib(Fibonacci::fibCall { n: primitives::U256::from(10u64) })
-				.abi_encode();
-
 		// check the code exists
 		let contract = test_utils::get_contract_checked(&addr).unwrap();
 		ensure_stored(contract.code_hash);
 
-		let result = builder::bare_call(addr).data(data).build_and_unwrap_result();
+		let result = builder::bare_call(addr)
+			.data(
+				Fibonacci::FibonacciCalls::fib(Fibonacci::fibCall {
+					n: primitives::U256::from(10u64),
+				})
+				.abi_encode(),
+			)
+			.build_and_unwrap_result();
 		assert_eq!(U256::from(55u32), U256::from_big_endian(&result.data));
 	});
 }

From a37dd1510379d4e51f5a4b0dd3d6cf9d1251e3e4 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 18 Jul 2025 07:41:21 +0000
Subject: [PATCH 047/186] PR review move has_dust and has_balance and remove
 pub

---
 substrate/frame/revive/src/lib.rs | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index c5e79d62aeb3..3a7e337eaace 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -672,18 +672,6 @@ pub mod pallet {
 		}
 	}
 
-	impl<T: Config> Pallet<T> {
-		/// Returns true if the evm value carries dust.
-		pub fn has_dust(value: U256) -> bool {
-			value % U256::from(<T>::NativeToEthRatio::get()) != U256::zero()
-		}
-
-		/// Returns true if the evm value carries balance.
-		pub fn has_balance(value: U256) -> bool {
-			value >= U256::from(<T>::NativeToEthRatio::get())
-		}
-	}
-
 	#[pallet::call]
 	impl<T: Config> Pallet<T>
 	where
@@ -1627,6 +1615,16 @@ where
 }
 
 impl<T: Config> Pallet<T> {
+	/// Returns true if the evm value carries dust.
+	fn has_dust(value: U256) -> bool {
+		value % U256::from(<T>::NativeToEthRatio::get()) != U256::zero()
+	}
+
+	/// Returns true if the evm value carries balance.
+	fn has_balance(value: U256) -> bool {
+		value >= U256::from(<T>::NativeToEthRatio::get())
+	}
+
 	/// Return the existential deposit of [`Config::Currency`].
 	fn min_balance() -> BalanceOf<T> {
 		<T::Currency as Inspect<AccountIdOf<T>>>::minimum_balance()

From a7643440a6cd02a057f89c80b76caf98ef178c64 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 18 Jul 2025 08:16:12 +0000
Subject: [PATCH 048/186] use local function instead of closure

---
 substrate/frame/revive/src/exec.rs | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index 6acb2377870f..060e48e549a6 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -1414,16 +1414,24 @@ where
 	) -> Result<(), ExecError> {
 		let BalanceWithDust { value, dust } = value;
 
-		let transfer = |from, to, value| {
+		fn transfer_balance<T: Config>(
+			from: &AccountIdOf<T>,
+			to: &AccountIdOf<T>,
+			value: BalanceOf<T>,
+		) -> Result<(), ExecError> {
 			T::Currency::transfer(from, to, value, Preservation::Preserve)
 				.map_err(|err| {
 					log::debug!(target: crate::LOG_TARGET, "Transfer failed: from {from:?} to {to:?} (value: ${value:?}). Err: {err:?}");
 					ExecError::from(Error::<T>::TransferFailed)
 				})?;
 			return Ok(())
-		};
+		}
 
-		let transfer_dust = |from: &mut AccountInfo<T>, to: &mut AccountInfo<T>, dust| {
+		fn transfer_dust<T: Config>(
+			from: &mut AccountInfo<T>,
+			to: &mut AccountInfo<T>,
+			dust: u32,
+		) -> Result<(), ExecError> {
 			from.dust = from
 				.dust
 				.checked_sub(dust)
@@ -1433,10 +1441,10 @@ where
 				.checked_add(dust)
 				.ok_or_else(|| ExecError::from(Error::<T>::TransferFailed))?;
 			Ok::<(), ExecError>(())
-		};
+		}
 
 		if dust.is_zero() {
-			return transfer(from, to, value)
+			return transfer_balance::<T>(from, to, value)
 		}
 
 		let from_addr = <T::AddressMapper as AddressMapper<T>>::to_address(from);
@@ -1466,8 +1474,8 @@ where
 				.ok_or_else(|| ExecError::from(Error::<T>::TransferFailed))?;
 		}
 
-		transfer(from, to, value)?;
-		transfer_dust(&mut from_info, &mut to_info, dust)?;
+		transfer_balance::<T>(from, to, value)?;
+		transfer_dust::<T>(&mut from_info, &mut to_info, dust)?;
 
 		if to_info.dust.saturating_add(dust) >= plank {
 			T::Currency::mint_into(to, 1u32.into())?;

From 6eb87c8b4f3f98152c72165e6d76c0827a40753d Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 18 Jul 2025 08:16:24 +0000
Subject: [PATCH 049/186] make migration

---
 substrate/frame/revive/src/migrations.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/substrate/frame/revive/src/migrations.rs b/substrate/frame/revive/src/migrations.rs
index 88c7a8c2fd8b..694ecfd75d2f 100644
--- a/substrate/frame/revive/src/migrations.rs
+++ b/substrate/frame/revive/src/migrations.rs
@@ -21,4 +21,4 @@
 pub mod v1;
 
 /// A unique identifier across all pallets.
-pub const PALLET_MIGRATIONS_ID: &[u8; 17] = b"pallet-revive-mbm";
+const PALLET_MIGRATIONS_ID: &[u8; 17] = b"pallet-revive-mbm";

From 2959185a62f15ea34eaf7eb0cf8481a15988dfdd Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 18 Jul 2025 08:32:52 +0000
Subject: [PATCH 050/186] scope function

---
 substrate/frame/revive/src/exec.rs | 172 ++++++++++++++---------------
 1 file changed, 86 insertions(+), 86 deletions(-)

diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index 060e48e549a6..b24cdbc2131b 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -1380,13 +1380,97 @@ where
 		value: U256,
 		storage_meter: &mut storage::meter::GenericMeter<T, S>,
 	) -> ExecResult {
+		fn transfer_with_dust<T: Config>(
+			from: &AccountIdOf<T>,
+			to: &AccountIdOf<T>,
+			value: BalanceWithDust<BalanceOf<T>>,
+		) -> Result<(), ExecError> {
+			let BalanceWithDust { value, dust } = value;
+
+			fn transfer_balance<T: Config>(
+				from: &AccountIdOf<T>,
+				to: &AccountIdOf<T>,
+				value: BalanceOf<T>,
+			) -> Result<(), ExecError> {
+				T::Currency::transfer(from, to, value, Preservation::Preserve)
+				.map_err(|err| {
+					log::debug!(target: crate::LOG_TARGET, "Transfer failed: from {from:?} to {to:?} (value: ${value:?}). Err: {err:?}");
+					ExecError::from(Error::<T>::TransferFailed)
+				})?;
+				return Ok(())
+			}
+
+			fn transfer_dust<T: Config>(
+				from: &mut AccountInfo<T>,
+				to: &mut AccountInfo<T>,
+				dust: u32,
+			) -> Result<(), ExecError> {
+				from.dust = from
+					.dust
+					.checked_sub(dust)
+					.ok_or_else(|| ExecError::from(Error::<T>::TransferFailed))?;
+				to.dust = to
+					.dust
+					.checked_add(dust)
+					.ok_or_else(|| ExecError::from(Error::<T>::TransferFailed))?;
+				Ok::<(), ExecError>(())
+			}
+
+			if dust.is_zero() {
+				return transfer_balance::<T>(from, to, value)
+			}
+
+			let from_addr = <T::AddressMapper as AddressMapper<T>>::to_address(from);
+			let mut from_info = AccountInfoOf::<T>::get(&from_addr).unwrap_or_default();
+
+			let to_addr = <T::AddressMapper as AddressMapper<T>>::to_address(to);
+			let mut to_info = AccountInfoOf::<T>::get(&to_addr).unwrap_or_default();
+
+			let plank = T::NativeToEthRatio::get();
+
+			if from_info.dust < dust {
+				T::Currency::burn_from(
+					from,
+					1u32.into(),
+					Preservation::Preserve,
+					Precision::Exact,
+					Fortitude::Polite,
+				)
+				.map_err(|err| {
+					log::debug!(target: crate::LOG_TARGET, "Burning 1 plank from {from:?} failed. Err: {err:?}");
+					ExecError::from(Error::<T>::TransferFailed)
+				})?;
+
+				from_info.dust = from_info
+					.dust
+					.checked_add(plank)
+					.ok_or_else(|| ExecError::from(Error::<T>::TransferFailed))?;
+			}
+
+			transfer_balance::<T>(from, to, value)?;
+			transfer_dust::<T>(&mut from_info, &mut to_info, dust)?;
+
+			if to_info.dust.saturating_add(dust) >= plank {
+				T::Currency::mint_into(to, 1u32.into())?;
+				to_info.dust = to_info
+					.dust
+					.checked_sub(plank)
+					.ok_or_else(|| ExecError::from(Error::<T>::TransferFailed))?;
+			}
+
+			AccountInfoOf::<T>::set(&from_addr, Some(from_info));
+			AccountInfoOf::<T>::set(&to_addr, Some(to_info));
+
+			Ok(())
+		}
+
 		let value = crate::Pallet::<T>::convert_evm_to_native(value)?;
 		if value.is_zero() {
 			return Ok(Default::default());
 		}
 
 		if <System<T>>::account_exists(to) {
-			return Self::transfer_with_dust(from, to, value).map(|_| Default::default())
+			return transfer_with_dust::<T>(from, to, value).map(|_| Default::default())
 		}
 
 		let origin = origin.account_id()?;
@@ -1394,7 +1478,7 @@ where
 		with_transaction(|| -> TransactionOutcome<ExecResult> {
 			match T::Currency::transfer(origin, to, ed, Preservation::Preserve)
 				.map_err(|_| Error::<T>::StorageDepositNotEnoughFunds.into())
-				.and_then(|_| Self::transfer_with_dust(from, to, value))
+				.and_then(|_| transfer_with_dust::<T>(from, to, value))
 			{
 				Ok(_) => {
 					// ed is taken from the transaction signer so it should be
@@ -1407,90 +1491,6 @@ where
 		})
 	}
 
-	fn transfer_with_dust(
-		from: &AccountIdOf<T>,
-		to: &AccountIdOf<T>,
-		value: BalanceWithDust<BalanceOf<T>>,
-	) -> Result<(), ExecError> {
-		let BalanceWithDust { value, dust } = value;
-
-		fn transfer_balance<T: Config>(
-			from: &AccountIdOf<T>,
-			to: &AccountIdOf<T>,
-			value: BalanceOf<T>,
-		) -> Result<(), ExecError> {
-			T::Currency::transfer(from, to, value, Preservation::Preserve)
-				.map_err(|err| {
-					log::debug!(target: crate::LOG_TARGET, "Transfer failed: from {from:?} to {to:?} (value: ${value:?}). Err: {err:?}");
-					ExecError::from(Error::<T>::TransferFailed)
-				})?;
-			return Ok(())
-		}
-
-		fn transfer_dust<T: Config>(
-			from: &mut AccountInfo<T>,
-			to: &mut AccountInfo<T>,
-			dust: u32,
-		) -> Result<(), ExecError> {
-			from.dust = from
-				.dust
-				.checked_sub(dust)
-				.ok_or_else(|| ExecError::from(Error::<T>::TransferFailed))?;
-			to.dust = to
-				.dust
-				.checked_add(dust)
-				.ok_or_else(|| ExecError::from(Error::<T>::TransferFailed))?;
-			Ok::<(), ExecError>(())
-		}
-
-		if dust.is_zero() {
-			return transfer_balance::<T>(from, to, value)
-		}
-
-		let from_addr = <T::AddressMapper as AddressMapper<T>>::to_address(from);
-		let mut from_info = AccountInfoOf::<T>::get(&from_addr).unwrap_or_default();
-
-		let to_addr = <T::AddressMapper as AddressMapper<T>>::to_address(to);
-		let mut to_info = AccountInfoOf::<T>::get(&to_addr).unwrap_or_default();
-
-		let plank = T::NativeToEthRatio::get();
-
-		if from_info.dust < dust {
-			T::Currency::burn_from(
-				from,
-				1u32.into(),
-				Preservation::Preserve,
-				Precision::Exact,
-				Fortitude::Polite,
-			)
-			.map_err(|err| {
-				log::debug!(target: crate::LOG_TARGET, "Burning 1 plank from {from:?} failed. Err: {err:?}");
-				ExecError::from(Error::<T>::TransferFailed)
-			})?;
-
-			from_info.dust = from_info
-				.dust
-				.checked_add(plank)
-				.ok_or_else(|| ExecError::from(Error::<T>::TransferFailed))?;
-		}
-
-		transfer_balance::<T>(from, to, value)?;
-		transfer_dust::<T>(&mut from_info, &mut to_info, dust)?;
-
-		if to_info.dust.saturating_add(dust) >= plank {
-			T::Currency::mint_into(to, 1u32.into())?;
-			to_info.dust = to_info
-				.dust
-				.checked_sub(plank)
-				.ok_or_else(|| ExecError::from(Error::<T>::TransferFailed))?;
-		}
-
-		AccountInfoOf::<T>::set(&from_addr, Some(from_info));
-		AccountInfoOf::<T>::set(&to_addr, Some(to_info));
-
-		Ok(())
-	}
-
 	/// Same as `transfer` but `from` is an `Origin`.
 	fn transfer_from_origin<S: storage::meter::State + Default + Debug>(
 		origin: &Origin<T>,

From 41c7afd544712283b830b5ba349268ab7b84d9f3 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 18 Jul 2025 08:36:21 +0000
Subject: [PATCH 051/186] charge 0 for input_data_len on err

---
 substrate/frame/revive/src/vm/runtime.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/substrate/frame/revive/src/vm/runtime.rs b/substrate/frame/revive/src/vm/runtime.rs
index a9afeda978c0..5296658d3d92 100644
--- a/substrate/frame/revive/src/vm/runtime.rs
+++ b/substrate/frame/revive/src/vm/runtime.rs
@@ -1177,7 +1177,7 @@ impl<'a, E: Ext, M: ?Sized + Memory<E::T>> Runtime<'a, E, M> {
 			},
 			Err(err) => {
 				self.charge_gas(RuntimeCosts::Instantiate {
-					input_data_len,
+					input_data_len: 0,
 					balance_transfer: false,
 					dust_transfer: false,
 				})?;

From e74ed2161559ca36d807482c5aa6a56ecd7c10f8 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 18 Jul 2025 09:04:26 +0000
Subject: [PATCH 052/186] comment bench_map

---
 substrate/frame/revive/src/address.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/substrate/frame/revive/src/address.rs b/substrate/frame/revive/src/address.rs
index 7748ee5966d0..fcba05c99771 100644
--- a/substrate/frame/revive/src/address.rs
+++ b/substrate/frame/revive/src/address.rs
@@ -145,6 +145,7 @@ where
 		Ok(())
 	}
 
+	/// Convenience function for benchmarking, to map an account id without taking any deposit.
 	#[cfg(feature = "runtime-benchmarks")]
 	fn bench_map(account_id: &T::AccountId) -> DispatchResult {
 		ensure!(!Self::is_mapped(account_id), <Error<T>>::AccountAlreadyMapped);

From 2d8d417f3daa7a55121db49cecf61cfe78c638ee Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 18 Jul 2025 09:05:21 +0000
Subject: [PATCH 053/186] use drain to remove old storage in migration

---
 substrate/frame/revive/src/migrations/v1.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/substrate/frame/revive/src/migrations/v1.rs b/substrate/frame/revive/src/migrations/v1.rs
index cf11a28d99f4..460911e0bbc2 100644
--- a/substrate/frame/revive/src/migrations/v1.rs
+++ b/substrate/frame/revive/src/migrations/v1.rs
@@ -71,7 +71,7 @@ impl<T: Config> SteppedMigration for Migration<T> {
 				break;
 			}
 
-			let mut iter = if let Some(last_key) = cursor {
+			let iter = if let Some(last_key) = cursor {
 				old::ContractInfoOf::<T>::iter_from(old::ContractInfoOf::<T>::hashed_key_for(
 					last_key,
 				))
@@ -79,8 +79,9 @@ impl<T: Config> SteppedMigration for Migration<T> {
 				old::ContractInfoOf::<T>::iter()
 			};
 
+			let mut iter = iter.drain();
+
 			if let Some((last_key, value)) = iter.next() {
-				old::ContractInfoOf::<T>::remove(last_key);
 				AccountInfoOf::<T>::insert(
 					last_key,
 					AccountInfo { account_type: value.into(), ..Default::default() },

From bdc1365e48a8afb625cb170710acb8d6036a3697 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 18 Jul 2025 09:52:02 +0000
Subject: [PATCH 054/186] make balance, dust private in BalanceWithDust

---
 substrate/frame/revive/src/benchmarking.rs | 36 ++++++++------
 substrate/frame/revive/src/call_builder.rs |  2 +-
 substrate/frame/revive/src/exec.rs         |  4 +-
 substrate/frame/revive/src/lib.rs          | 17 +------
 substrate/frame/revive/src/primitives.rs   | 35 +++++++++++--
 substrate/frame/revive/src/storage.rs      |  2 +-
 substrate/frame/revive/src/tests.rs        | 57 +++++++++++-----------
 7 files changed, 85 insertions(+), 68 deletions(-)

diff --git a/substrate/frame/revive/src/benchmarking.rs b/substrate/frame/revive/src/benchmarking.rs
index 7083300d67c9..aa9ee845afc0 100644
--- a/substrate/frame/revive/src/benchmarking.rs
+++ b/substrate/frame/revive/src/benchmarking.rs
@@ -236,7 +236,8 @@ mod benchmarks {
 
 		let value = Pallet::<T>::min_balance();
 		let dust = 42u32 * d;
-		let evm_value = Pallet::<T>::convert_native_to_evm(BalanceWithDust { value, dust });
+		let evm_value =
+			Pallet::<T>::convert_native_to_evm(BalanceWithDust::new_unchecked::<T>(value, dust));
 
 		let caller = whitelisted_caller();
 		T::Currency::set_balance(&caller, caller_funding::<T>());
@@ -372,7 +373,8 @@ mod benchmarks {
 
 		let value = Pallet::<T>::min_balance();
 		let dust = 42u32 * d;
-		let evm_value = Pallet::<T>::convert_native_to_evm(BalanceWithDust { value, dust });
+		let evm_value =
+			Pallet::<T>::convert_native_to_evm(BalanceWithDust::new_unchecked::<T>(value, dust));
 
 		let caller_addr = T::AddressMapper::to_address(&instance.caller);
 		let origin = RawOrigin::Signed(instance.caller.clone());
@@ -706,10 +708,10 @@ mod benchmarks {
 	#[benchmark(pov_mode = Measured)]
 	fn seal_balance() {
 		build_runtime!(runtime, contract, memory: [[0u8;32], ]);
-		contract.set_balance(BalanceWithDust {
-			value: Pallet::<T>::min_balance() * 2u32.into(),
-			dust: 42u32,
-		});
+		contract.set_balance(BalanceWithDust::new_unchecked::<T>(
+			Pallet::<T>::min_balance() * 2u32.into(),
+			42u32,
+		));
 
 		let result;
 		#[block]
@@ -719,10 +721,10 @@ mod benchmarks {
 		assert_ok!(result);
 		assert_eq!(
 			U256::from_little_endian(&memory[..]),
-			Pallet::<T>::convert_native_to_evm(BalanceWithDust {
-				value: Pallet::<T>::min_balance(),
-				dust: 42
-			})
+			Pallet::<T>::convert_native_to_evm(BalanceWithDust::new_unchecked::<T>(
+				Pallet::<T>::min_balance(),
+				42
+			))
 		);
 	}
 
@@ -748,10 +750,10 @@ mod benchmarks {
 		assert_ok!(result);
 		assert_eq!(
 			U256::from_little_endian(&memory[..len]),
-			Pallet::<T>::convert_native_to_evm(BalanceWithDust {
-				value: Pallet::<T>::min_balance(),
-				dust: 42
-			})
+			Pallet::<T>::convert_native_to_evm(BalanceWithDust::new_unchecked::<T>(
+				Pallet::<T>::min_balance(),
+				42
+			))
 		);
 	}
 
@@ -1679,7 +1681,8 @@ mod benchmarks {
 
 		let value: BalanceOf<T> = (1_000_000u32 * t).into();
 		let dust = 100u32 * d;
-		let evm_value = Pallet::<T>::convert_native_to_evm(BalanceWithDust { value, dust });
+		let evm_value =
+			Pallet::<T>::convert_native_to_evm(BalanceWithDust::new_unchecked::<T>(value, dust));
 		let value_bytes = evm_value.encode();
 
 		let deposit: BalanceOf<T> = (u32::MAX - 100).into();
@@ -1834,7 +1837,8 @@ mod benchmarks {
 
 		let value: BalanceOf<T> = (1_000_000u32 * t).into();
 		let dust = 100u32 * d;
-		let evm_value = Pallet::<T>::convert_native_to_evm(BalanceWithDust { value, dust });
+		let evm_value =
+			Pallet::<T>::convert_native_to_evm(BalanceWithDust::new_unchecked::<T>(value, dust));
 		let value_bytes = evm_value.encode();
 		let value_len = value_bytes.len() as u32;
 
diff --git a/substrate/frame/revive/src/call_builder.rs b/substrate/frame/revive/src/call_builder.rs
index dc04a7a4eb42..871800cfad44 100644
--- a/substrate/frame/revive/src/call_builder.rs
+++ b/substrate/frame/revive/src/call_builder.rs
@@ -363,7 +363,7 @@ where
 
 	/// Set the balance of the contract to the supplied amount.
 	pub fn set_balance(&self, value: impl Into<BalanceWithDust<BalanceOf<T>>>) {
-		let BalanceWithDust { value, dust } = value.into();
+		let (value, dust) = value.into().deconstruct();
 		T::Currency::set_balance(&self.account_id, value);
 		crate::AccountInfoOf::<T>::mutate(&self.address, |account| {
 			account.as_mut().map(|a| a.dust = dust);
diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index b24cdbc2131b..5b29390ff0d9 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -1385,7 +1385,7 @@ where
 			to: &AccountIdOf<T>,
 			value: BalanceWithDust<BalanceOf<T>>,
 		) -> Result<(), ExecError> {
-			let BalanceWithDust { value, dust } = value;
+			let (value, dust) = value.deconstruct();
 
 			fn transfer_balance<T: Config>(
 				from: &AccountIdOf<T>,
@@ -1464,7 +1464,7 @@ where
 			Ok(())
 		}
 
-		let value = crate::Pallet::<T>::convert_evm_to_native(value)?;
+		let value = BalanceWithDust::<BalanceOf<T>>::from_value::<T>(value)?;
 		if value.is_zero() {
 			return Ok(Default::default());
 		}
diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index 3a7e337eaace..c7dc0d5ab21a 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -1472,7 +1472,7 @@ where
 	/// Convert a gas value into a substrate fee
 	fn evm_gas_to_fee(gas: U256, gas_price: U256) -> Result<BalanceOf<T>, Error<T>> {
 		let fee = gas.saturating_mul(gas_price);
-		let value = Self::convert_evm_to_native(fee)?;
+		let value = BalanceWithDust::<BalanceOf<T>>::from_value::<T>(fee)?;
 		Ok(value.into_rounded_balance())
 	}
 
@@ -1593,25 +1593,12 @@ where
 
 	/// Convert a native balance to EVM balance.
 	pub fn convert_native_to_evm(value: impl Into<BalanceWithDust<BalanceOf<T>>>) -> U256 {
-		let BalanceWithDust { value, dust } = value.into();
+		let (value, dust) = value.into().deconstruct();
 		value
 			.into()
 			.saturating_mul(T::NativeToEthRatio::get().into())
 			.saturating_add(dust.into())
 	}
-
-	/// Convert an EVM balance to a native balance.
-	fn convert_evm_to_native(value: U256) -> Result<BalanceWithDust<BalanceOf<T>>, Error<T>> {
-		if value.is_zero() {
-			return Ok(Default::default())
-		}
-
-		let (quotient, remainder) = value.div_mod(T::NativeToEthRatio::get().into());
-		let value = quotient.try_into().map_err(|_| Error::<T>::BalanceConversionFailed)?;
-		let dust = remainder.try_into().map_err(|_| Error::<T>::BalanceConversionFailed)?;
-
-		Ok(BalanceWithDust::new(value, dust))
-	}
 }
 
 impl<T: Config> Pallet<T> {
diff --git a/substrate/frame/revive/src/primitives.rs b/substrate/frame/revive/src/primitives.rs
index 9f889c3adc54..b7185f0e3109 100644
--- a/substrate/frame/revive/src/primitives.rs
+++ b/substrate/frame/revive/src/primitives.rs
@@ -17,12 +17,13 @@
 
 //! A crate that hosts a common definitions that are relevant for the pallet-revive.
 
-use crate::{H160, U256};
+use crate::{BalanceOf, Config, Error, H160, U256};
 use alloc::{string::String, vec::Vec};
 use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::weights::Weight;
 use pallet_revive_uapi::ReturnFlags;
 use scale_info::TypeInfo;
+use sp_core::Get;
 use sp_runtime::{
 	traits::{One, Saturating, Zero},
 	DispatchError, RuntimeDebug,
@@ -113,10 +114,10 @@ pub enum EthTransactError {
 #[derive(Default, Clone, Copy, Eq, PartialEq, Debug)]
 pub struct BalanceWithDust<Balance> {
 	/// The value expressed in the native currency
-	pub value: Balance,
+	value: Balance,
 	/// The dust, representing up to 1 unit of the native currency.
 	/// The dust is bounded between 0 and `crate::Config::NativeToEthRatio`
-	pub dust: u32,
+	dust: u32,
 }
 
 impl<Balance> From<Balance> for BalanceWithDust<Balance> {
@@ -125,12 +126,36 @@ impl<Balance> From<Balance> for BalanceWithDust<Balance> {
 	}
 }
 
-impl<Balance: Zero + One + Saturating> BalanceWithDust<Balance> {
+impl<Balance> BalanceWithDust<Balance> {
+	/// Deconstructs the `BalanceWithDust` into its components.
+	pub fn deconstruct(self) -> (Balance, u32) {
+		(self.value, self.dust)
+	}
+
 	/// Creates a new `BalanceWithDust` with the given value and dust.
-	pub fn new(value: Balance, dust: u32) -> Self {
+	pub fn new_unchecked<T: Config>(value: Balance, dust: u32) -> Self {
+		debug_assert!(dust < T::NativeToEthRatio::get());
 		Self { value, dust }
 	}
 
+	/// Creates a new `BalanceWithDust` from the given EVM value.
+	pub fn from_value<T: Config>(value: U256) -> Result<BalanceWithDust<BalanceOf<T>>, Error<T>>
+	where
+		BalanceOf<T>: TryFrom<U256>,
+	{
+		if value.is_zero() {
+			return Ok(Default::default())
+		}
+
+		let (quotient, remainder) = value.div_mod(T::NativeToEthRatio::get().into());
+		let value = quotient.try_into().map_err(|_| Error::<T>::BalanceConversionFailed)?;
+		let dust = remainder.try_into().map_err(|_| Error::<T>::BalanceConversionFailed)?;
+
+		Ok(BalanceWithDust { value, dust })
+	}
+}
+
+impl<Balance: Zero + One + Saturating> BalanceWithDust<Balance> {
 	/// Returns true if both the value and dust are zero.
 	pub fn is_zero(&self) -> bool {
 		self.value.is_zero() && self.dust == 0
diff --git a/substrate/frame/revive/src/storage.rs b/substrate/frame/revive/src/storage.rs
index b69ea0f6a816..80f957b500b9 100644
--- a/substrate/frame/revive/src/storage.rs
+++ b/substrate/frame/revive/src/storage.rs
@@ -166,7 +166,7 @@ impl<T: Config> AccountInfo<T> {
 
 		let value = T::Currency::reducible_balance(&account.account_id(), Preserve, Polite);
 		let dust = <AccountInfoOf<T>>::get(account.address()).map(|a| a.dust).unwrap_or_default();
-		BalanceWithDust { value, dust }
+		BalanceWithDust::new_unchecked::<T>(value, dust)
 	}
 
 	/// Loads the contract information for a given address.
diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index 7b2b0c354d6d..b2342168cba3 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -179,7 +179,7 @@ pub mod test_utils {
 	pub fn set_balance_with_dust(address: &H160, value: BalanceWithDust<BalanceOf<Test>>) {
 		use frame_support::traits::Currency;
 		let ed = <Test as Config>::Currency::minimum_balance();
-		let BalanceWithDust { value, dust } = value;
+		let (value, dust) = value.deconstruct();
 		let account_id = <Test as Config>::AddressMapper::to_account_id(&address);
 		<Test as Config>::Currency::set_balance(&account_id, ed + value);
 		if dust > 0 {
@@ -471,47 +471,47 @@ fn transfer_with_dust_works() {
 	let test_cases = vec![
 		TestCase {
 			description: "without dust",
-			from_balance: BalanceWithDust { value: 100, dust: 0 },
-			to_balance: BalanceWithDust { value: 0, dust: 0 },
-			amount: BalanceWithDust { value: 1, dust: 0 },
-			expected_from_balance: BalanceWithDust { value: 99, dust: 0 },
-			expected_to_balance: BalanceWithDust { value: 1, dust: 0 },
+			from_balance: BalanceWithDust::new_unchecked::<Test>(100, 0),
+			to_balance: BalanceWithDust::new_unchecked::<Test>(0, 0),
+			amount: BalanceWithDust::new_unchecked::<Test>(1, 0),
+			expected_from_balance: BalanceWithDust::new_unchecked::<Test>(99, 0),
+			expected_to_balance: BalanceWithDust::new_unchecked::<Test>(1, 0),
 			total_issuance_diff: 0,
 		},
 		TestCase {
 			description: "with dust",
-			from_balance: BalanceWithDust { value: 100, dust: 0 },
-			to_balance: BalanceWithDust { value: 0, dust: 0 },
-			amount: BalanceWithDust { value: 1, dust: 10 },
-			expected_from_balance: BalanceWithDust { value: 98, dust: plank - 10 },
-			expected_to_balance: BalanceWithDust { value: 1, dust: 10 },
+			from_balance: BalanceWithDust::new_unchecked::<Test>(100, 0),
+			to_balance: BalanceWithDust::new_unchecked::<Test>(0, 0),
+			amount: BalanceWithDust::new_unchecked::<Test>(1, 10),
+			expected_from_balance: BalanceWithDust::new_unchecked::<Test>(98, plank - 10),
+			expected_to_balance: BalanceWithDust::new_unchecked::<Test>(1, 10),
 			total_issuance_diff: 1,
 		},
 		TestCase {
 			description: "just dust",
-			from_balance: BalanceWithDust { value: 100, dust: 0 },
-			to_balance: BalanceWithDust { value: 0, dust: 0 },
-			amount: BalanceWithDust { value: 0, dust: 10 },
-			expected_from_balance: BalanceWithDust { value: 99, dust: plank - 10 },
-			expected_to_balance: BalanceWithDust { value: 0, dust: 10 },
+			from_balance: BalanceWithDust::new_unchecked::<Test>(100, 0),
+			to_balance: BalanceWithDust::new_unchecked::<Test>(0, 0),
+			amount: BalanceWithDust::new_unchecked::<Test>(0, 10),
+			expected_from_balance: BalanceWithDust::new_unchecked::<Test>(99, plank - 10),
+			expected_to_balance: BalanceWithDust::new_unchecked::<Test>(0, 10),
 			total_issuance_diff: 1,
 		},
 		TestCase {
 			description: "with existing dust",
-			from_balance: BalanceWithDust { value: 100, dust: 5 },
-			to_balance: BalanceWithDust { value: 0, dust: plank - 5 },
-			amount: BalanceWithDust { value: 1, dust: 10 },
-			expected_from_balance: BalanceWithDust { value: 98, dust: plank - 5 },
-			expected_to_balance: BalanceWithDust { value: 2, dust: 5 },
+			from_balance: BalanceWithDust::new_unchecked::<Test>(100, 5),
+			to_balance: BalanceWithDust::new_unchecked::<Test>(0, plank - 5),
+			amount: BalanceWithDust::new_unchecked::<Test>(1, 10),
+			expected_from_balance: BalanceWithDust::new_unchecked::<Test>(98, plank - 5),
+			expected_to_balance: BalanceWithDust::new_unchecked::<Test>(2, 5),
 			total_issuance_diff: 0,
 		},
 		TestCase {
 			description: "with enough existing dust",
-			from_balance: BalanceWithDust { value: 100, dust: 10 },
-			to_balance: BalanceWithDust { value: 0, dust: plank - 10 },
-			amount: BalanceWithDust { value: 1, dust: 10 },
-			expected_from_balance: BalanceWithDust { value: 99, dust: 0 },
-			expected_to_balance: BalanceWithDust { value: 2, dust: 0 },
+			from_balance: BalanceWithDust::new_unchecked::<Test>(100, 10),
+			to_balance: BalanceWithDust::new_unchecked::<Test>(0, plank - 10),
+			amount: BalanceWithDust::new_unchecked::<Test>(1, 10),
+			expected_from_balance: BalanceWithDust::new_unchecked::<Test>(99, 0),
+			expected_to_balance: BalanceWithDust::new_unchecked::<Test>(2, 0),
 			total_issuance_diff: -1,
 		},
 	];
@@ -533,8 +533,9 @@ fn transfer_with_dust_works() {
 			let total_issuance = <Test as Config>::Currency::total_issuance();
 			let evm_value = Pallet::<Test>::convert_native_to_evm(amount);
 
-			assert_eq!(Pallet::<Test>::has_dust(evm_value), !amount.dust.is_zero());
-			assert_eq!(Pallet::<Test>::has_balance(evm_value), !amount.value.is_zero());
+			let (value, dust) = amount.deconstruct();
+			assert_eq!(Pallet::<Test>::has_dust(evm_value), !dust.is_zero());
+			assert_eq!(Pallet::<Test>::has_balance(evm_value), !value.is_zero());
 
 			let result =
 				builder::bare_call(BOB_ADDR).evm_value(evm_value).build_and_unwrap_result();

From c94be4fa9b5ab5d37c6a89b5993ef2de7b0569b6 Mon Sep 17 00:00:00 2001
From: PG Herveou <pgherveou@gmail.com>
Date: Fri, 18 Jul 2025 11:53:41 +0200
Subject: [PATCH 055/186] Update substrate/frame/revive/src/migrations/v1.rs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Alexander Theißen <alex.theissen@me.com>
---
 substrate/frame/revive/src/migrations/v1.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/substrate/frame/revive/src/migrations/v1.rs b/substrate/frame/revive/src/migrations/v1.rs
index 460911e0bbc2..1549a7e1afa4 100644
--- a/substrate/frame/revive/src/migrations/v1.rs
+++ b/substrate/frame/revive/src/migrations/v1.rs
@@ -36,7 +36,10 @@ use alloc::collections::btree_map::BTreeMap;
 use alloc::vec::Vec;
 
 /// Module containing the old storage items.
-pub mod old {
+#[cfg(feature = "runtime-benchmarks")]
+pub(crate) use old;
+
+mod old {
 	use super::Config;
 	use crate::{pallet::Pallet, ContractInfo, H160};
 	use frame_support::{storage_alias, Identity};

From 7d3bca0484ce951f2868591b88f42924aca5252a Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 18 Jul 2025 10:05:43 +0000
Subject: [PATCH 056/186] Revert "Update
 substrate/frame/revive/src/migrations/v1.rs"

This reverts commit c94be4fa9b5ab5d37c6a89b5993ef2de7b0569b6.
---
 substrate/frame/revive/src/migrations/v1.rs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/substrate/frame/revive/src/migrations/v1.rs b/substrate/frame/revive/src/migrations/v1.rs
index 1549a7e1afa4..460911e0bbc2 100644
--- a/substrate/frame/revive/src/migrations/v1.rs
+++ b/substrate/frame/revive/src/migrations/v1.rs
@@ -36,10 +36,7 @@ use alloc::collections::btree_map::BTreeMap;
 use alloc::vec::Vec;
 
 /// Module containing the old storage items.
-#[cfg(feature = "runtime-benchmarks")]
-pub(crate) use old;
-
-mod old {
+pub mod old {
 	use super::Config;
 	use crate::{pallet::Pallet, ContractInfo, H160};
 	use frame_support::{storage_alias, Identity};

From a2a5a18ab5cff8aea8861e0e025a6c3e9df0b724 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 18 Jul 2025 10:29:53 +0000
Subject: [PATCH 057/186] add migration unit test

---
 substrate/frame/revive/src/migrations/v1.rs | 26 +++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/substrate/frame/revive/src/migrations/v1.rs b/substrate/frame/revive/src/migrations/v1.rs
index 460911e0bbc2..8ef8e332052b 100644
--- a/substrate/frame/revive/src/migrations/v1.rs
+++ b/substrate/frame/revive/src/migrations/v1.rs
@@ -130,3 +130,29 @@ impl<T: Config> SteppedMigration for Migration<T> {
 		Ok(())
 	}
 }
+
+#[test]
+fn migrate_to_v1() {
+	use crate::{
+		tests::{ExtBuilder, Test},
+		ContractInfo,
+	};
+	ExtBuilder::default().build().execute_with(|| {
+		for i in 0..10u8 {
+			let addr = H160::from([i; 20]);
+			old::ContractInfoOf::<Test>::insert(
+				addr,
+				ContractInfo::new(&addr, 1u32.into(), Default::default()).unwrap(),
+			);
+		}
+
+		let mut cursor = None;
+		let mut weight_meter = WeightMeter::new();
+		while let Some(new_cursor) = Migration::<Test>::step(cursor, &mut weight_meter).unwrap() {
+			cursor = Some(new_cursor);
+		}
+
+		assert_eq!(old::ContractInfoOf::<Test>::iter().count(), 0);
+		assert_eq!(AccountInfoOf::<Test>::iter().count(), 10);
+	})
+}

From 0dc2210728bed21e6dc1346079bd45d2c0259e42 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 18 Jul 2025 10:30:36 +0000
Subject: [PATCH 058/186] typo

---
 substrate/frame/revive/src/migrations/v1.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/substrate/frame/revive/src/migrations/v1.rs b/substrate/frame/revive/src/migrations/v1.rs
index 8ef8e332052b..188ffcf32e4b 100644
--- a/substrate/frame/revive/src/migrations/v1.rs
+++ b/substrate/frame/revive/src/migrations/v1.rs
@@ -17,7 +17,7 @@
 
 //! # Multi-Block Migration v1
 //!
-//! This migrat the old `ContractInfoOf` storage to the new `AccountInfoOf`.
+//! This migrate the old `ContractInfoOf` storage to the new `AccountInfoOf`.
 
 extern crate alloc;
 

From e8ca9fb1eb80d47ab792025131846a3aa7953dcf Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 18 Jul 2025 12:28:21 +0000
Subject: [PATCH 059/186] Add additional tests

---
 .../fixtures/contracts/call_with_value.rs     | 49 +++++++++++++++++++
 .../frame/revive/src/test_utils/builder.rs    | 23 +++++++++
 substrate/frame/revive/src/tests.rs           | 41 ++++++++++++++++
 3 files changed, 113 insertions(+)
 create mode 100644 substrate/frame/revive/fixtures/contracts/call_with_value.rs

diff --git a/substrate/frame/revive/fixtures/contracts/call_with_value.rs b/substrate/frame/revive/fixtures/contracts/call_with_value.rs
new file mode 100644
index 000000000000..cc8958e1f711
--- /dev/null
+++ b/substrate/frame/revive/fixtures/contracts/call_with_value.rs
@@ -0,0 +1,49 @@
+// 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.
+
+//! This calls another contract as passed as its account id.
+#![no_std]
+#![no_main]
+include!("../panic_handler.rs");
+
+use uapi::{input, HostFn, HostFnImpl as api};
+
+#[no_mangle]
+#[polkavm_derive::polkavm_export]
+pub extern "C" fn deploy() {}
+
+#[no_mangle]
+#[polkavm_derive::polkavm_export]
+pub extern "C" fn call() {
+	input!(
+		value: &[u8; 32],
+		callee_addr: &[u8; 20],
+	);
+
+	// Call the callee
+	api::call(
+		uapi::CallFlags::empty(),
+		callee_addr,
+		u64::MAX,       // How much ref_time to devote for the execution. u64::MAX = use all.
+		u64::MAX,       // How much proof_size to devote for the execution. u64::MAX = use all.
+		&[u8::MAX; 32], // No deposit limit.
+		value,          // Value transferred to the contract.
+		&[0u8; 0],      // input
+		None,
+	)
+	.unwrap();
+}
diff --git a/substrate/frame/revive/src/test_utils/builder.rs b/substrate/frame/revive/src/test_utils/builder.rs
index 572a1764a2ba..2769484c6855 100644
--- a/substrate/frame/revive/src/test_utils/builder.rs
+++ b/substrate/frame/revive/src/test_utils/builder.rs
@@ -233,3 +233,26 @@ builder!(
 		}
 	}
 );
+
+builder!(
+	eth_call(
+		origin: OriginFor<T>,
+		dest: H160,
+		value: U256,
+		gas_limit: Weight,
+		storage_deposit_limit: BalanceOf<T>,
+		data: Vec<u8>,
+	) -> DispatchResultWithPostInfo;
+
+	/// Create a [`EthCallBuilder`] with default values.
+	pub fn eth_call(origin: OriginFor<T>, dest: H160) -> Self {
+		Self {
+			origin,
+			dest,
+			value: 0u32.into(),
+			gas_limit: GAS_LIMIT,
+			storage_deposit_limit: deposit_limit::<T>(),
+			data: vec![],
+		}
+	}
+);
diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index b2342168cba3..0cadd8eebdc8 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -225,6 +225,10 @@ mod builder {
 	pub fn call(dest: H160) -> CallBuilder<Test> {
 		CallBuilder::<Test>::call(RuntimeOrigin::signed(ALICE), dest)
 	}
+
+	pub fn eth_call(dest: H160) -> EthCallBuilder<Test> {
+		EthCallBuilder::<Test>::eth_call(RuntimeOrigin::signed(ALICE), dest)
+	}
 }
 
 impl Test {
@@ -562,6 +566,43 @@ fn transfer_with_dust_works() {
 	}
 }
 
+#[test]
+fn eth_call_transfer_with_dust_works() {
+	let (binary, _) = compile_module("dummy").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
+
+		let balance =
+			Pallet::<Test>::convert_native_to_evm(BalanceWithDust::new_unchecked::<Test>(100, 10));
+		assert_ok!(builder::eth_call(addr).value(balance).build());
+
+		assert_eq!(Pallet::<Test>::evm_balance(&addr), balance);
+	});
+}
+
+#[test]
+fn contract_call_transfer_with_dust_works() {
+	let (binary_caller, _code_hash_caller) = compile_module("call_with_value").unwrap();
+	let (binary_callee, _code_hash_callee) = compile_module("dummy").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let Contract { addr: addr_caller, .. } =
+			builder::bare_instantiate(Code::Upload(binary_caller))
+				.native_value(200)
+				.build_and_unwrap_contract();
+		let Contract { addr: addr_callee, .. } =
+			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
+
+		let balance =
+			Pallet::<Test>::convert_native_to_evm(BalanceWithDust::new_unchecked::<Test>(100, 10));
+		assert_ok!(builder::call(addr_caller).data((balance, addr_callee).encode()).build());
+
+		assert_eq!(Pallet::<Test>::evm_balance(&addr_callee), balance);
+	});
+}
+
 #[test]
 fn instantiate_and_call_and_deposit_event() {
 	let (binary, code_hash) = compile_module("event_and_return_on_deploy").unwrap();

From 874e7c0a6fd26ad04508ce650f3ae1c0d8925876 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 18 Jul 2025 13:54:05 +0000
Subject: [PATCH 060/186] update lock

---
 Cargo.lock | 3587 ++++++++++++++++++----------------------------------
 1 file changed, 1231 insertions(+), 2356 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 38b93d12e3d5..b86a6ffc91fe 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -77,26 +77,6 @@ dependencies = [
  "subtle 2.5.0",
 ]
 
-[[package]]
-name = "affix"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50e7ea84d3fa2009f355f8429a0b418a96849135a4188fadf384f59127d5d4bc"
-dependencies = [
- "convert_case 0.5.0",
-]
-
-[[package]]
-name = "ahash"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
-dependencies = [
- "getrandom 0.2.10",
- "once_cell",
- "version_check",
-]
-
 [[package]]
 name = "ahash"
 version = "0.8.11"
@@ -211,7 +191,7 @@ dependencies = [
  "ruint",
  "rustc-hash 2.1.1",
  "serde",
- "sha3 0.10.8",
+ "sha3",
  "tiny-keccak",
 ]
 
@@ -542,7 +522,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43d68f2d516162846c1238e755a7c4d131b892b70cc70c471a8e3ca3ed818fce"
 dependencies = [
- "ahash 0.8.11",
+ "ahash",
  "ark-ff 0.5.0",
  "ark-poly 0.5.0",
  "ark-serialize 0.5.0",
@@ -779,7 +759,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "579305839da207f02b89cd1679e50e67b4331e2f9294a57693e5051b7703fe27"
 dependencies = [
- "ahash 0.8.11",
+ "ahash",
  "ark-ff 0.5.0",
  "ark-serialize 0.5.0",
  "ark-std 0.5.0",
@@ -916,7 +896,7 @@ dependencies = [
  "ark-std 0.5.0",
  "digest 0.10.7",
  "rand_core 0.6.4",
- "sha3 0.10.8",
+ "sha3",
 ]
 
 [[package]]
@@ -969,12 +949,6 @@ dependencies = [
  "nodrop",
 ]
 
-[[package]]
-name = "arrayvec"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
-
 [[package]]
 name = "arrayvec"
 version = "0.7.4"
@@ -1110,7 +1084,7 @@ dependencies = [
  "rococo-runtime-constants",
  "rococo-system-emulated-network",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "staging-xcm",
  "staging-xcm-executor",
  "xcm-runtime-apis",
@@ -1144,7 +1118,6 @@ dependencies = [
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
  "hex-literal",
- "log",
  "pallet-asset-conversion",
  "pallet-asset-conversion-ops",
  "pallet-asset-conversion-tx-payment",
@@ -1178,7 +1151,7 @@ dependencies = [
  "rococo-runtime-constants",
  "scale-info",
  "serde_json",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core 28.0.0",
@@ -1186,18 +1159,19 @@ dependencies = [
  "sp-inherents",
  "sp-keyring",
  "sp-offchain",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-session",
  "sp-storage 19.0.0",
  "sp-transaction-pool",
- "sp-version 29.0.0",
- "sp-weights 27.0.0",
+ "sp-version",
+ "sp-weights",
  "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
  "substrate-wasm-builder",
  "testnet-parachains-constants",
+ "tracing",
  "xcm-runtime-apis",
 ]
 
@@ -1241,7 +1215,7 @@ dependencies = [
  "parity-scale-codec",
  "polkadot-runtime-common",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-tracing 16.0.0",
  "staging-xcm",
  "staging-xcm-builder",
@@ -1280,7 +1254,6 @@ dependencies = [
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
  "hex-literal",
- "log",
  "pallet-ah-ops",
  "pallet-asset-conversion",
  "pallet-asset-conversion-ops",
@@ -1342,30 +1315,31 @@ dependencies = [
  "snowbridge-outbound-queue-primitives",
  "snowbridge-pallet-system-frontend",
  "snowbridge-runtime-common",
- "sp-api 26.0.0",
- "sp-arithmetic 23.0.0",
+ "sp-api",
+ "sp-arithmetic",
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core 28.0.0",
  "sp-genesis-builder",
  "sp-inherents",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-keyring",
  "sp-npos-elections",
  "sp-offchain",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-session",
  "sp-staking",
  "sp-std 14.0.0",
  "sp-storage 19.0.0",
  "sp-transaction-pool",
- "sp-version 29.0.0",
+ "sp-version",
  "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
  "substrate-wasm-builder",
  "testnet-parachains-constants",
+ "tracing",
  "westend-runtime-constants",
  "xcm-runtime-apis",
 ]
@@ -1390,8 +1364,8 @@ dependencies = [
  "parachains-common",
  "parachains-runtimes-test-utils",
  "parity-scale-codec",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
@@ -1416,9 +1390,9 @@ dependencies = [
  "parachains-common",
  "parity-scale-codec",
  "scale-info",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -1887,7 +1861,7 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -2053,17 +2027,6 @@ dependencies = [
  "constant_time_eq 0.1.5",
 ]
 
-[[package]]
-name = "blake2b_simd"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"
-dependencies = [
- "arrayref",
- "arrayvec 0.5.2",
- "constant_time_eq 0.1.5",
-]
-
 [[package]]
 name = "blake2b_simd"
 version = "1.0.2"
@@ -2075,17 +2038,6 @@ dependencies = [
  "constant_time_eq 0.3.0",
 ]
 
-[[package]]
-name = "blake2s_simd"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e461a7034e85b211a4acb57ee2e6730b32912b06c08cc242243c39fc21ae6a2"
-dependencies = [
- "arrayref",
- "arrayvec 0.5.2",
- "constant_time_eq 0.1.5",
-]
-
 [[package]]
 name = "blake2s_simd"
 version = "1.0.1"
@@ -2116,7 +2068,6 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
 dependencies = [
- "block-padding",
  "generic-array 0.14.7",
 ]
 
@@ -2129,12 +2080,6 @@ dependencies = [
  "generic-array 0.14.7",
 ]
 
-[[package]]
-name = "block-padding"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
-
 [[package]]
 name = "blocking"
 version = "1.3.1"
@@ -2208,7 +2153,7 @@ dependencies = [
  "frame-support",
  "parity-scale-codec",
  "scale-info",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-core 28.0.0",
  "staging-xcm",
  "testnet-parachains-constants",
@@ -2225,7 +2170,7 @@ dependencies = [
  "frame-support",
  "parity-scale-codec",
  "scale-info",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-core 28.0.0",
  "staging-xcm",
  "testnet-parachains-constants",
@@ -2244,7 +2189,7 @@ dependencies = [
  "scale-info",
  "serde",
  "sp-consensus-beefy",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-std 14.0.0",
 ]
 
@@ -2259,7 +2204,7 @@ dependencies = [
  "frame-system",
  "parachains-common",
  "polkadot-primitives",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-std 14.0.0",
 ]
 
@@ -2273,8 +2218,8 @@ dependencies = [
  "bp-xcm-bridge-hub",
  "frame-support",
  "parity-scale-codec",
- "sp-api 26.0.0",
- "sp-runtime 31.0.1",
+ "sp-api",
+ "sp-runtime",
  "sp-std 14.0.0",
 ]
 
@@ -2288,8 +2233,8 @@ dependencies = [
  "bp-xcm-bridge-hub",
  "frame-support",
  "parity-scale-codec",
- "sp-api 26.0.0",
- "sp-runtime 31.0.1",
+ "sp-api",
+ "sp-runtime",
  "sp-std 14.0.0",
 ]
 
@@ -2308,7 +2253,7 @@ dependencies = [
  "serde",
  "sp-consensus-grandpa",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-std 14.0.0",
 ]
 
@@ -2325,7 +2270,7 @@ dependencies = [
  "scale-info",
  "serde",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-std 14.0.0",
 ]
 
@@ -2341,7 +2286,7 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-std 14.0.0",
 ]
 
@@ -2357,8 +2302,8 @@ dependencies = [
  "frame-system",
  "parity-scale-codec",
  "scale-info",
- "sp-api 26.0.0",
- "sp-runtime 31.0.1",
+ "sp-api",
+ "sp-runtime",
  "sp-std 14.0.0",
 ]
 
@@ -2375,7 +2320,7 @@ dependencies = [
  "scale-info",
  "serde",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-std 14.0.0",
 ]
 
@@ -2393,7 +2338,7 @@ dependencies = [
  "pallet-utility",
  "parity-scale-codec",
  "scale-info",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-std 14.0.0",
 ]
 
@@ -2405,7 +2350,7 @@ dependencies = [
  "bp-polkadot-core",
  "bp-runtime",
  "frame-support",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-std 14.0.0",
 ]
 
@@ -2424,12 +2369,12 @@ dependencies = [
  "scale-info",
  "serde",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
- "sp-state-machine 0.35.0",
+ "sp-io",
+ "sp-runtime",
+ "sp-state-machine",
  "sp-std 14.0.0",
- "sp-trie 29.0.0",
- "trie-db 0.30.0",
+ "sp-trie",
+ "trie-db",
 ]
 
 [[package]]
@@ -2443,12 +2388,12 @@ dependencies = [
  "ed25519-dalek",
  "finality-grandpa",
  "parity-scale-codec",
- "sp-application-crypto 30.0.0",
+ "sp-application-crypto",
  "sp-consensus-grandpa",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-std 14.0.0",
- "sp-trie 29.0.0",
+ "sp-trie",
 ]
 
 [[package]]
@@ -2459,7 +2404,7 @@ dependencies = [
  "bp-polkadot-core",
  "bp-runtime",
  "frame-support",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-std 14.0.0",
 ]
 
@@ -2474,7 +2419,7 @@ dependencies = [
  "scale-info",
  "serde",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-std 14.0.0",
  "staging-xcm",
 ]
@@ -2486,7 +2431,7 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "staging-xcm",
 ]
 
@@ -2501,7 +2446,7 @@ dependencies = [
  "scale-info",
  "snowbridge-core",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-std 14.0.0",
  "staging-xcm",
  "staging-xcm-builder",
@@ -2551,7 +2496,7 @@ dependencies = [
  "snowbridge-pallet-outbound-queue",
  "snowbridge-pallet-system",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -2572,7 +2517,6 @@ dependencies = [
  "bp-polkadot-bulletin",
  "bp-polkadot-core",
  "bp-relayers",
- "bp-rococo",
  "bp-runtime",
  "bp-westend",
  "bp-xcm-bridge-hub-router",
@@ -2597,7 +2541,6 @@ dependencies = [
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
  "hex-literal",
- "log",
  "pallet-aura",
  "pallet-authorship",
  "pallet-balances",
@@ -2635,30 +2578,30 @@ dependencies = [
  "snowbridge-pallet-inbound-queue",
  "snowbridge-pallet-outbound-queue",
  "snowbridge-pallet-system",
- "snowbridge-runtime-common",
  "snowbridge-runtime-test-common",
  "snowbridge-system-runtime-api",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core 28.0.0",
  "sp-genesis-builder",
  "sp-inherents",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-keyring",
  "sp-offchain",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-session",
  "sp-std 14.0.0",
  "sp-storage 19.0.0",
  "sp-transaction-pool",
- "sp-version 29.0.0",
+ "sp-version",
  "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
  "substrate-wasm-builder",
  "testnet-parachains-constants",
+ "tracing",
  "xcm-runtime-apis",
 ]
 
@@ -2679,7 +2622,6 @@ dependencies = [
  "frame-support",
  "frame-system",
  "impl-trait-for-tuples",
- "log",
  "pallet-balances",
  "pallet-bridge-grandpa",
  "pallet-bridge-messages",
@@ -2693,14 +2635,15 @@ dependencies = [
  "parachains-runtimes-test-utils",
  "parity-scale-codec",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-keyring",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-std 14.0.0",
  "sp-tracing 16.0.0",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
+ "tracing",
 ]
 
 [[package]]
@@ -2754,8 +2697,8 @@ dependencies = [
  "snowbridge-pallet-system",
  "snowbridge-pallet-system-v2",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -2777,7 +2720,6 @@ dependencies = [
  "bp-relayers",
  "bp-rococo",
  "bp-runtime",
- "bp-westend",
  "bp-xcm-bridge-hub-router",
  "bridge-hub-common",
  "bridge-hub-test-utils",
@@ -2840,25 +2782,24 @@ dependencies = [
  "snowbridge-pallet-outbound-queue-v2",
  "snowbridge-pallet-system",
  "snowbridge-pallet-system-v2",
- "snowbridge-runtime-common",
  "snowbridge-runtime-test-common",
  "snowbridge-system-runtime-api",
  "snowbridge-system-v2-runtime-api",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core 28.0.0",
  "sp-genesis-builder",
  "sp-inherents",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-keyring",
  "sp-offchain",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-session",
  "sp-std 14.0.0",
  "sp-storage 19.0.0",
  "sp-transaction-pool",
- "sp-version 29.0.0",
+ "sp-version",
  "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
@@ -2894,11 +2835,11 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-std 14.0.0",
- "sp-trie 29.0.0",
- "sp-weights 27.0.0",
+ "sp-trie",
+ "sp-weights",
  "staging-xcm",
  "static_assertions",
  "tuplex",
@@ -2994,25 +2935,6 @@ dependencies = [
  "ppv-lite86",
 ]
 
-[[package]]
-name = "calm_io"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ea0608700fe42d90ec17ad0f86335cf229b67df2e34e7f463e8241ce7b8fa5f"
-dependencies = [
- "calmio_filters",
-]
-
-[[package]]
-name = "calmio_filters"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "846501f4575cd66766a40bb7ab6d8e960adc7eb49f753c8232bd8e0e09cf6ca2"
-dependencies = [
- "quote 1.0.40",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "camino"
 version = "1.1.6"
@@ -3157,11 +3079,11 @@ dependencies = [
  "scale-info",
  "serde",
  "serde_json",
- "sp-application-crypto 30.0.0",
+ "sp-application-crypto",
  "sp-core 28.0.0",
  "sp-genesis-builder",
  "sp-keyring",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "substrate-wasm-builder",
 ]
 
@@ -3207,17 +3129,6 @@ dependencies = [
  "half",
 ]
 
-[[package]]
-name = "cid"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8709d481fb78b9808f34a1b4b4fadd08a15a0971052c18bc2b751faefaed595e"
-dependencies = [
- "multibase 0.8.0",
- "multihash 0.11.4",
- "unsigned-varint 0.3.3",
-]
-
 [[package]]
 name = "cid"
 version = "0.9.0"
@@ -3225,7 +3136,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9b68e3193982cd54187d71afdb2a271ad4cf8af157858e9cb911b91321de143"
 dependencies = [
  "core2",
- "multibase 0.9.1",
+ "multibase",
  "multihash 0.17.0",
  "serde",
  "unsigned-varint 0.7.2",
@@ -3238,7 +3149,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3147d8272e8fa0ccd29ce51194dd98f79ddfb8191ba9e3409884e751798acf3a"
 dependencies = [
  "core2",
- "multibase 0.9.1",
+ "multibase",
  "multihash 0.19.1",
  "unsigned-varint 0.8.0",
 ]
@@ -3402,7 +3313,7 @@ dependencies = [
  "pallet-xcm",
  "parity-scale-codec",
  "polkadot-runtime-common",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "staging-xcm",
  "staging-xcm-executor",
  "westend-runtime-constants",
@@ -3430,7 +3341,6 @@ dependencies = [
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
  "hex-literal",
- "log",
  "pallet-alliance",
  "pallet-asset-rate",
  "pallet-aura",
@@ -3464,28 +3374,29 @@ dependencies = [
  "polkadot-runtime-common",
  "scale-info",
  "serde_json",
- "sp-api 26.0.0",
- "sp-arithmetic 23.0.0",
+ "sp-api",
+ "sp-arithmetic",
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core 28.0.0",
  "sp-genesis-builder",
  "sp-inherents",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-keyring",
  "sp-offchain",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-session",
  "sp-std 14.0.0",
  "sp-storage 19.0.0",
  "sp-transaction-pool",
- "sp-version 29.0.0",
+ "sp-version",
  "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
  "substrate-wasm-builder",
  "testnet-parachains-constants",
+ "tracing",
  "westend-runtime-constants",
  "xcm-runtime-apis",
 ]
@@ -3567,42 +3478,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2382f75942f4b3be3690fe4f86365e9c853c1587d6ee58212cebf6e2a9ccd101"
 
-[[package]]
-name = "comparable"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb513ee8037bf08c5270ecefa48da249f4c58e57a71ccfce0a5b0877d2a20eb2"
-dependencies = [
- "comparable_derive",
- "comparable_helper",
- "pretty_assertions",
- "serde",
-]
-
-[[package]]
-name = "comparable_derive"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a54b9c40054eb8999c5d1d36fdc90e4e5f7ff0d1d9621706f360b3cbc8beb828"
-dependencies = [
- "convert_case 0.4.0",
- "proc-macro2 1.0.95",
- "quote 1.0.40",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "comparable_helper"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5437e327e861081c91270becff184859f706e3e50f5301a9d4dc8eb50752c3"
-dependencies = [
- "convert_case 0.6.0",
- "proc-macro2 1.0.95",
- "quote 1.0.40",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "concurrent-queue"
 version = "2.5.0"
@@ -3710,21 +3585,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
 
-[[package]]
-name = "convert_case"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb4a24b1aaf0fd0ce8b45161144d6f42cd91677fd5940fd431183eb023b3a2b8"
-
-[[package]]
-name = "convert_case"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
-dependencies = [
- "unicode-segmentation",
-]
-
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -3775,7 +3635,7 @@ dependencies = [
  "polkadot-runtime-parachains",
  "rococo-runtime-constants",
  "rococo-system-emulated-network",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "staging-xcm",
 ]
 
@@ -3800,7 +3660,6 @@ dependencies = [
  "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
- "log",
  "pallet-aura",
  "pallet-authorship",
  "pallet-balances",
@@ -3826,7 +3685,7 @@ dependencies = [
  "scale-info",
  "serde",
  "serde_json",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core 28.0.0",
@@ -3834,17 +3693,18 @@ dependencies = [
  "sp-inherents",
  "sp-keyring",
  "sp-offchain",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-session",
  "sp-storage 19.0.0",
  "sp-transaction-pool",
- "sp-version 29.0.0",
+ "sp-version",
  "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
  "substrate-wasm-builder",
  "testnet-parachains-constants",
+ "tracing",
  "xcm-runtime-apis",
 ]
 
@@ -3871,7 +3731,7 @@ dependencies = [
  "pallet-broker",
  "pallet-message-queue",
  "polkadot-runtime-parachains",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "staging-xcm",
  "staging-xcm-executor",
  "westend-runtime-constants",
@@ -3899,7 +3759,6 @@ dependencies = [
  "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
- "log",
  "pallet-aura",
  "pallet-authorship",
  "pallet-balances",
@@ -3924,7 +3783,7 @@ dependencies = [
  "scale-info",
  "serde",
  "serde_json",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core 28.0.0",
@@ -3932,17 +3791,18 @@ dependencies = [
  "sp-inherents",
  "sp-keyring",
  "sp-offchain",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-session",
  "sp-storage 19.0.0",
  "sp-transaction-pool",
- "sp-version 29.0.0",
+ "sp-version",
  "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
  "substrate-wasm-builder",
  "testnet-parachains-constants",
+ "tracing",
  "westend-runtime-constants",
  "xcm-runtime-apis",
 ]
@@ -4287,7 +4147,6 @@ version = "0.1.0"
 dependencies = [
  "array-bytes 6.2.2",
  "async-channel 1.9.0",
- "cumulus-client-network",
  "cumulus-primitives-core",
  "cumulus-relay-chain-interface",
  "futures",
@@ -4302,7 +4161,7 @@ dependencies = [
  "sc-network",
  "sc-service",
  "sp-consensus-babe",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "tokio",
 ]
 
@@ -4318,7 +4177,7 @@ dependencies = [
  "sc-service",
  "sp-blockchain",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "url",
 ]
 
@@ -4342,12 +4201,12 @@ dependencies = [
  "polkadot-overseer",
  "polkadot-primitives",
  "sc-client-api",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-consensus",
  "sp-core 28.0.0",
- "sp-maybe-compressed-blob 11.0.0",
- "sp-runtime 31.0.1",
- "sp-state-machine 0.35.0",
+ "sp-maybe-compressed-blob",
+ "sp-runtime",
+ "sp-state-machine",
  "sp-tracing 16.0.0",
  "tracing",
 ]
@@ -4383,8 +4242,8 @@ dependencies = [
  "sc-telemetry",
  "sc-utils",
  "schnellru",
- "sp-api 26.0.0",
- "sp-application-crypto 30.0.0",
+ "sp-api",
+ "sp-application-crypto",
  "sp-block-builder",
  "sp-blockchain",
  "sp-consensus",
@@ -4392,13 +4251,13 @@ dependencies = [
  "sp-core 28.0.0",
  "sp-inherents",
  "sp-keyring",
- "sp-keystore 0.34.0",
- "sp-runtime 31.0.1",
- "sp-state-machine 0.35.0",
+ "sp-keystore",
+ "sp-runtime",
+ "sp-state-machine",
  "sp-timestamp",
  "sp-tracing 16.0.0",
- "sp-trie 29.0.0",
- "sp-version 29.0.0",
+ "sp-trie",
+ "sp-version",
  "substrate-prometheus-endpoint",
  "tokio",
  "tracing",
@@ -4430,11 +4289,11 @@ dependencies = [
  "sp-consensus",
  "sp-consensus-slots",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-timestamp",
  "sp-tracing 16.0.0",
- "sp-trie 29.0.0",
- "sp-version 29.0.0",
+ "sp-trie",
+ "sp-version",
  "substrate-prometheus-endpoint",
  "tracing",
 ]
@@ -4448,8 +4307,8 @@ dependencies = [
  "cumulus-primitives-parachain-inherent",
  "sp-consensus",
  "sp-inherents",
- "sp-runtime 31.0.1",
- "sp-state-machine 0.35.0",
+ "sp-runtime",
+ "sp-state-machine",
  "thiserror 1.0.65",
 ]
 
@@ -4464,13 +4323,13 @@ dependencies = [
  "futures",
  "parking_lot 0.12.3",
  "sc-consensus",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-block-builder",
  "sp-blockchain",
  "sp-consensus",
  "sp-core 28.0.0",
  "sp-inherents",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "substrate-prometheus-endpoint",
  "tracing",
 ]
@@ -4496,15 +4355,15 @@ dependencies = [
  "rstest",
  "sc-client-api",
  "sc-network",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-blockchain",
  "sp-consensus",
  "sp-core 28.0.0",
  "sp-keyring",
- "sp-keystore 0.34.0",
- "sp-runtime 31.0.1",
- "sp-state-machine 0.35.0",
- "sp-version 29.0.0",
+ "sp-keystore",
+ "sp-runtime",
+ "sp-state-machine",
+ "sp-version",
  "tokio",
  "tracing",
 ]
@@ -4523,8 +4382,8 @@ dependencies = [
  "sc-consensus-babe",
  "sp-crypto-hashing 0.1.0",
  "sp-inherents",
- "sp-runtime 31.0.1",
- "sp-state-machine 0.35.0",
+ "sp-runtime",
+ "sp-state-machine",
  "sp-storage 19.0.0",
  "tracing",
 ]
@@ -4552,13 +4411,13 @@ dependencies = [
  "sc-consensus",
  "sc-network",
  "sc-utils",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-blockchain",
  "sp-consensus",
- "sp-maybe-compressed-blob 11.0.0",
- "sp-runtime 31.0.1",
+ "sp-maybe-compressed-blob",
+ "sp-runtime",
  "sp-tracing 16.0.0",
- "sp-version 29.0.0",
+ "sp-version",
  "tokio",
  "tracing",
 ]
@@ -4593,12 +4452,12 @@ dependencies = [
  "sc-telemetry",
  "sc-transaction-pool",
  "sc-utils",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-blockchain",
  "sp-consensus",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-transaction-pool",
 ]
 
@@ -4616,12 +4475,12 @@ dependencies = [
  "parity-scale-codec",
  "rstest",
  "scale-info",
- "sp-application-crypto 30.0.0",
+ "sp-application-crypto",
  "sp-consensus-aura",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
- "sp-version 29.0.0",
+ "sp-io",
+ "sp-runtime",
+ "sp-version",
 ]
 
 [[package]]
@@ -4636,8 +4495,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-tracing 16.0.0",
  "staging-xcm",
 ]
@@ -4676,17 +4535,17 @@ dependencies = [
  "sp-crypto-hashing 0.1.0",
  "sp-externalities 0.25.0",
  "sp-inherents",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-keyring",
- "sp-runtime 31.0.1",
- "sp-state-machine 0.35.0",
+ "sp-runtime",
+ "sp-state-machine",
  "sp-std 14.0.0",
  "sp-tracing 16.0.0",
- "sp-trie 29.0.0",
- "sp-version 29.0.0",
+ "sp-trie",
+ "sp-version",
  "staging-xcm",
  "staging-xcm-builder",
- "trie-db 0.30.0",
+ "trie-db",
  "trie-standardmap",
 ]
 
@@ -4709,7 +4568,7 @@ dependencies = [
  "frame-system",
  "pallet-session",
  "parity-scale-codec",
- "sp-runtime 31.0.1",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -4723,7 +4582,7 @@ dependencies = [
  "parity-scale-codec",
  "polkadot-primitives",
  "scale-info",
- "sp-runtime 31.0.1",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -4740,9 +4599,9 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "scale-info",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
- "sp-trie 29.0.0",
+ "sp-io",
+ "sp-runtime",
+ "sp-trie",
 ]
 
 [[package]]
@@ -4754,8 +4613,8 @@ dependencies = [
  "frame-system",
  "parity-scale-codec",
  "scale-info",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "staging-xcm",
 ]
 
@@ -4771,7 +4630,6 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "log",
  "pallet-balances",
  "pallet-message-queue",
  "parity-scale-codec",
@@ -4779,11 +4637,12 @@ dependencies = [
  "polkadot-runtime-parachains",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
+ "tracing",
 ]
 
 [[package]]
@@ -4796,7 +4655,7 @@ dependencies = [
  "frame-system",
  "parity-scale-codec",
  "scale-info",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "staging-xcm",
 ]
 
@@ -4810,10 +4669,10 @@ dependencies = [
  "polkadot-node-primitives",
  "polkadot-parachain-primitives",
  "polkadot-primitives",
- "sc-executor 0.32.0",
+ "sc-executor",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-maybe-compressed-blob 11.0.0",
+ "sp-io",
+ "sp-maybe-compressed-blob",
  "tracing",
  "tracing-subscriber",
 ]
@@ -4822,7 +4681,7 @@ dependencies = [
 name = "cumulus-primitives-aura"
 version = "0.7.0"
 dependencies = [
- "sp-api 26.0.0",
+ "sp-api",
  "sp-consensus-aura",
 ]
 
@@ -4835,9 +4694,9 @@ dependencies = [
  "polkadot-parachain-primitives",
  "polkadot-primitives",
  "scale-info",
- "sp-api 26.0.0",
- "sp-runtime 31.0.1",
- "sp-trie 29.0.0",
+ "sp-api",
+ "sp-runtime",
+ "sp-trie",
  "staging-xcm",
  "tracing",
 ]
@@ -4848,12 +4707,11 @@ version = "0.7.0"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
- "cumulus-test-relay-sproof-builder",
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
  "sp-inherents",
- "sp-trie 29.0.0",
+ "sp-trie",
 ]
 
 [[package]]
@@ -4862,10 +4720,10 @@ version = "0.2.0"
 dependencies = [
  "sp-core 28.0.0",
  "sp-externalities 0.25.0",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-runtime-interface 24.0.0",
- "sp-state-machine 0.35.0",
- "sp-trie 29.0.0",
+ "sp-state-machine",
+ "sp-trie",
 ]
 
 [[package]]
@@ -4882,9 +4740,9 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "scale-info",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
- "sp-trie 29.0.0",
+ "sp-io",
+ "sp-runtime",
+ "sp-trie",
 ]
 
 [[package]]
@@ -4906,7 +4764,7 @@ dependencies = [
  "pallet-asset-conversion",
  "parity-scale-codec",
  "polkadot-runtime-common",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -4934,12 +4792,12 @@ dependencies = [
  "sc-sysinfo",
  "sc-telemetry",
  "sc-tracing",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-consensus",
  "sp-core 28.0.0",
  "sp-keyring",
- "sp-runtime 31.0.1",
- "sp-state-machine 0.35.0",
+ "sp-runtime",
+ "sp-state-machine",
 ]
 
 [[package]]
@@ -4954,10 +4812,10 @@ dependencies = [
  "polkadot-overseer",
  "sc-client-api",
  "sc-network",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-blockchain",
- "sp-state-machine 0.35.0",
- "sp-version 29.0.0",
+ "sp-state-machine",
+ "sp-version",
  "thiserror 1.0.65",
 ]
 
@@ -4987,11 +4845,11 @@ dependencies = [
  "sc-service",
  "sc-tracing",
  "sc-utils",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-babe",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "substrate-prometheus-endpoint",
  "tracing",
 ]
@@ -5025,10 +4883,10 @@ dependencies = [
  "sp-authority-discovery",
  "sp-consensus-babe",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
- "sp-state-machine 0.35.0",
+ "sp-runtime",
+ "sp-state-machine",
  "sp-storage 19.0.0",
- "sp-version 29.0.0",
+ "sp-version",
  "substrate-prometheus-endpoint",
  "thiserror 1.0.65",
  "tokio",
@@ -5045,7 +4903,7 @@ dependencies = [
  "futures",
  "polkadot-node-subsystem",
  "polkadot-primitives",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-consensus",
  "tracing",
 ]
@@ -5070,19 +4928,19 @@ dependencies = [
  "sc-block-builder",
  "sc-consensus",
  "sc-consensus-aura",
- "sc-executor 0.32.0",
- "sc-executor-common 0.29.0",
+ "sc-executor",
+ "sc-executor-common",
  "sc-service",
- "sp-api 26.0.0",
- "sp-application-crypto 30.0.0",
+ "sp-api",
+ "sp-application-crypto",
  "sp-blockchain",
  "sp-consensus-aura",
  "sp-core 28.0.0",
  "sp-inherents",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-keyring",
- "sp-keystore 0.34.0",
- "sp-runtime 31.0.1",
+ "sp-keystore",
+ "sp-runtime",
  "sp-timestamp",
  "substrate-test-client",
 ]
@@ -5094,9 +4952,9 @@ dependencies = [
  "cumulus-primitives-core",
  "parity-scale-codec",
  "polkadot-primitives",
- "sp-runtime 31.0.1",
- "sp-state-machine 0.35.0",
- "sp-trie 29.0.0",
+ "sp-runtime",
+ "sp-state-machine",
+ "sp-trie",
 ]
 
 [[package]]
@@ -5124,19 +4982,19 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde_json",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core 28.0.0",
  "sp-genesis-builder",
  "sp-inherents",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-keyring",
  "sp-offchain",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-session",
  "sp-transaction-pool",
- "sp-version 29.0.0",
+ "sp-version",
  "staging-parachain-info",
  "substrate-wasm-builder",
 ]
@@ -5187,9 +5045,9 @@ dependencies = [
  "sc-client-api",
  "sc-consensus",
  "sc-consensus-aura",
- "sc-executor 0.32.0",
- "sc-executor-common 0.29.0",
- "sc-executor-wasmtime 0.29.0",
+ "sc-executor",
+ "sc-executor-common",
+ "sc-executor-wasmtime",
  "sc-network",
  "sc-service",
  "sc-telemetry",
@@ -5198,17 +5056,17 @@ dependencies = [
  "sc-transaction-pool-api",
  "serde",
  "serde_json",
- "sp-api 26.0.0",
- "sp-arithmetic 23.0.0",
+ "sp-api",
+ "sp-arithmetic",
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-aura",
  "sp-core 28.0.0",
  "sp-genesis-builder",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-keyring",
- "sp-runtime 31.0.1",
- "sp-state-machine 0.35.0",
+ "sp-runtime",
+ "sp-state-machine",
  "sp-timestamp",
  "sp-tracing 16.0.0",
  "substrate-test-client",
@@ -5238,6 +5096,7 @@ dependencies = [
  "anyhow",
  "cumulus-zombienet-sdk-helpers",
  "env_logger 0.11.3",
+ "futures",
  "log",
  "polkadot-primitives",
  "serde",
@@ -5246,6 +5105,7 @@ dependencies = [
  "sp-keyring",
  "sp-statement-store",
  "tokio",
+ "zombienet-configuration",
  "zombienet-orchestrator",
  "zombienet-sdk",
 ]
@@ -5281,19 +5141,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "curve25519-dalek"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61"
-dependencies = [
- "byteorder",
- "digest 0.9.0",
- "rand_core 0.5.1",
- "subtle 2.5.0",
- "zeroize",
-]
-
 [[package]]
 name = "curve25519-dalek"
 version = "4.1.3"
@@ -5559,7 +5406,7 @@ version = "0.99.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
 dependencies = [
- "convert_case 0.4.0",
+ "convert_case",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "rustc_version 0.4.0",
@@ -5760,15 +5607,6 @@ dependencies = [
  "walkdir",
 ]
 
-[[package]]
-name = "document-features"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0"
-dependencies = [
- "litrs",
-]
-
 [[package]]
 name = "dotenvy"
 version = "0.15.7"
@@ -5876,7 +5714,7 @@ version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
 dependencies = [
- "curve25519-dalek 4.1.3",
+ "curve25519-dalek",
  "ed25519",
  "rand_core 0.6.4",
  "serde",
@@ -5885,27 +5723,13 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "ed25519-zebra"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c24f403d068ad0b359e577a77f92392118be3f3c927538f2bb544a5ecd828c6"
-dependencies = [
- "curve25519-dalek 3.2.0",
- "hashbrown 0.12.3",
- "hex",
- "rand_core 0.6.4",
- "sha2 0.9.9",
- "zeroize",
-]
-
 [[package]]
 name = "ed25519-zebra"
 version = "4.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d9ce6874da5d4415896cd45ffbc4d1cfc0c4f9c079427bd870742c30f2f65a9"
 dependencies = [
- "curve25519-dalek 4.1.3",
+ "curve25519-dalek",
  "ed25519",
  "hashbrown 0.14.5",
  "hex",
@@ -5973,7 +5797,6 @@ dependencies = [
  "pallet-balances",
  "pallet-bridge-messages",
  "pallet-message-queue",
- "pallet-preimage",
  "pallet-whitelist",
  "pallet-xcm",
  "pallet-xcm-bridge-hub",
@@ -5989,7 +5812,7 @@ dependencies = [
  "sp-consensus-beefy",
  "sp-core 28.0.0",
  "sp-keyring",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -6208,7 +6031,7 @@ dependencies = [
  "fixed-hash",
  "impl-codec 0.7.1",
  "impl-rlp",
- "impl-serde 0.5.0",
+ "impl-serde",
  "scale-info",
  "tiny-keccak",
 ]
@@ -6230,7 +6053,7 @@ dependencies = [
  "fixed-hash",
  "impl-codec 0.7.1",
  "impl-rlp",
- "impl-serde 0.5.0",
+ "impl-serde",
  "primitive-types 0.13.1",
  "scale-info",
  "uint 0.10.0",
@@ -6320,6 +6143,17 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649"
 
+[[package]]
+name = "fancy-regex"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e24cb5a94bcae1e5408b0effca5cd7172ea3c5755049c5f3af4cd283a165298"
+dependencies = [
+ "bit-set",
+ "regex-automata 0.4.8",
+ "regex-syntax 0.8.5",
+]
+
 [[package]]
 name = "fastrand"
 version = "1.9.0"
@@ -6639,15 +6473,15 @@ dependencies = [
  "sc-client-db",
  "scale-info",
  "serde",
- "sp-api 26.0.0",
- "sp-application-crypto 30.0.0",
+ "sp-api",
+ "sp-application-crypto",
  "sp-core 28.0.0",
  "sp-externalities 0.25.0",
- "sp-io 30.0.0",
- "sp-keystore 0.34.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-keystore",
+ "sp-runtime",
  "sp-runtime-interface 24.0.0",
- "sp-state-machine 0.35.0",
+ "sp-state-machine",
  "sp-storage 19.0.0",
  "static_assertions",
 ]
@@ -6683,15 +6517,15 @@ dependencies = [
  "sc-cli",
  "sc-client-api",
  "sc-client-db",
- "sc-executor 0.32.0",
- "sc-executor-common 0.29.0",
- "sc-executor-wasmtime 0.29.0",
+ "sc-executor",
+ "sc-executor-common",
+ "sc-executor-wasmtime",
  "sc-runtime-utilities",
  "sc-service",
  "sc-sysinfo",
  "serde",
  "serde_json",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-block-builder",
  "sp-blockchain",
  "sp-core 28.0.0",
@@ -6699,15 +6533,15 @@ dependencies = [
  "sp-externalities 0.25.0",
  "sp-genesis-builder",
  "sp-inherents",
- "sp-io 30.0.0",
- "sp-keystore 0.34.0",
- "sp-runtime 31.0.1",
- "sp-state-machine 0.35.0",
+ "sp-io",
+ "sp-keystore",
+ "sp-runtime",
+ "sp-state-machine",
  "sp-storage 19.0.0",
  "sp-timestamp",
  "sp-transaction-pool",
- "sp-trie 29.0.0",
- "sp-version 29.0.0",
+ "sp-trie",
+ "sp-version",
  "sp-wasm-interface 20.0.0",
  "substrate-test-runtime",
  "subxt 0.41.0",
@@ -6726,8 +6560,8 @@ dependencies = [
  "frame-system",
  "parity-scale-codec",
  "scale-info",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -6769,7 +6603,7 @@ dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "scale-info",
- "sp-arithmetic 23.0.0",
+ "sp-arithmetic",
  "syn 2.0.98",
  "trybuild",
 ]
@@ -6784,11 +6618,11 @@ dependencies = [
  "parity-scale-codec",
  "rand 0.8.5",
  "scale-info",
- "sp-arithmetic 23.0.0",
+ "sp-arithmetic",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-npos-elections",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-std 14.0.0",
 ]
 
@@ -6801,8 +6635,8 @@ dependencies = [
  "frame-support",
  "honggfuzz",
  "parity-scale-codec",
- "sp-arithmetic 23.0.0",
- "sp-runtime 31.0.1",
+ "sp-arithmetic",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -6821,25 +6655,13 @@ dependencies = [
  "scale-info",
  "sp-core 28.0.0",
  "sp-inherents",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-tracing 16.0.0",
- "sp-version 29.0.0",
+ "sp-version",
  "substrate-test-runtime-client",
 ]
 
-[[package]]
-name = "frame-metadata"
-version = "16.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cf1549fba25a6fcac22785b61698317d958e96cac72a59102ea45b9ae64692"
-dependencies = [
- "cfg-if",
- "parity-scale-codec",
- "scale-info",
- "serde",
-]
-
 [[package]]
 name = "frame-metadata"
 version = "17.0.0"
@@ -6890,8 +6712,8 @@ dependencies = [
  "merkleized-metadata",
  "parity-scale-codec",
  "scale-info",
- "sp-api 26.0.0",
- "sp-runtime 31.0.1",
+ "sp-api",
+ "sp-runtime",
  "sp-tracing 16.0.0",
  "sp-transaction-pool",
  "substrate-test-runtime-client",
@@ -6910,7 +6732,7 @@ dependencies = [
  "sc-chain-spec",
  "sc-cli",
  "sp-genesis-builder",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-statement-store",
  "tempfile",
  "tracing-subscriber",
@@ -6928,9 +6750,9 @@ dependencies = [
  "serde",
  "sp-core 28.0.0",
  "sp-crypto-hashing 0.1.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
- "sp-state-machine 0.35.0",
+ "sp-io",
+ "sp-runtime",
+ "sp-state-machine",
  "sp-tracing 16.0.0",
  "spinners",
  "substrate-rpc-client",
@@ -6945,9 +6767,9 @@ dependencies = [
  "cumulus-pallet-parachain-system",
  "parity-scale-codec",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
- "sp-state-machine 0.35.0",
- "sp-trie 29.0.0",
+ "sp-runtime",
+ "sp-state-machine",
+ "sp-trie",
  "substrate-wasm-builder",
 ]
 
@@ -6975,24 +6797,24 @@ dependencies = [
  "scale-info",
  "serde",
  "serde_json",
- "sp-api 26.0.0",
- "sp-arithmetic 23.0.0",
+ "sp-api",
+ "sp-arithmetic",
  "sp-core 28.0.0",
  "sp-crypto-hashing 0.1.0",
- "sp-crypto-hashing-proc-macro 0.1.0",
+ "sp-crypto-hashing-proc-macro",
  "sp-debug-derive 14.0.0",
  "sp-genesis-builder",
  "sp-inherents",
- "sp-io 30.0.0",
- "sp-metadata-ir 0.6.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-metadata-ir",
+ "sp-runtime",
  "sp-staking",
- "sp-state-machine 0.35.0",
+ "sp-state-machine",
  "sp-std 14.0.0",
  "sp-timestamp",
  "sp-tracing 16.0.0",
- "sp-trie 29.0.0",
- "sp-weights 27.0.0",
+ "sp-trie",
+ "sp-weights",
  "tt-call",
 ]
 
@@ -7019,9 +6841,9 @@ dependencies = [
  "regex",
  "scale-info",
  "sp-crypto-hashing 0.1.0",
- "sp-io 30.0.0",
- "sp-metadata-ir 0.6.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-metadata-ir",
+ "sp-runtime",
  "syn 2.0.98",
 ]
 
@@ -7060,14 +6882,14 @@ dependencies = [
  "rustversion",
  "scale-info",
  "serde",
- "sp-api 26.0.0",
- "sp-arithmetic 23.0.0",
- "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-metadata-ir 0.6.0",
- "sp-runtime 31.0.1",
- "sp-state-machine 0.35.0",
- "sp-version 29.0.0",
+ "sp-api",
+ "sp-arithmetic",
+ "sp-core 28.0.0",
+ "sp-io",
+ "sp-metadata-ir",
+ "sp-runtime",
+ "sp-state-machine",
+ "sp-version",
  "static_assertions",
  "trybuild",
 ]
@@ -7081,8 +6903,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
- "sp-version 29.0.0",
+ "sp-runtime",
+ "sp-version",
 ]
 
 [[package]]
@@ -7094,7 +6916,7 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
- "sp-runtime 31.0.1",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -7120,10 +6942,10 @@ dependencies = [
  "serde",
  "sp-core 28.0.0",
  "sp-externalities 0.25.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
- "sp-version 29.0.0",
- "sp-weights 27.0.0",
+ "sp-io",
+ "sp-runtime",
+ "sp-version",
+ "sp-weights",
  "substrate-test-runtime-client",
 ]
 
@@ -7138,9 +6960,9 @@ dependencies = [
  "scale-info",
  "sp-core 28.0.0",
  "sp-externalities 0.25.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
- "sp-version 29.0.0",
+ "sp-io",
+ "sp-runtime",
+ "sp-version",
 ]
 
 [[package]]
@@ -7149,7 +6971,7 @@ version = "26.0.0"
 dependencies = [
  "docify",
  "parity-scale-codec",
- "sp-api 26.0.0",
+ "sp-api",
 ]
 
 [[package]]
@@ -7158,8 +6980,8 @@ version = "0.34.0"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
- "sp-api 26.0.0",
- "sp-runtime 31.0.1",
+ "sp-api",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -7591,7 +7413,7 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde_json",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core 28.0.0",
@@ -7599,11 +7421,11 @@ dependencies = [
  "sp-inherents",
  "sp-keyring",
  "sp-offchain",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-session",
  "sp-storage 19.0.0",
  "sp-transaction-pool",
- "sp-version 29.0.0",
+ "sp-version",
  "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
@@ -7626,7 +7448,7 @@ dependencies = [
  "pallet-xcm",
  "parity-scale-codec",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "staging-xcm",
  "westend-runtime",
  "westend-system-emulated-network",
@@ -7739,9 +7561,6 @@ name = "hashbrown"
 version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-dependencies = [
- "ahash 0.7.8",
-]
 
 [[package]]
 name = "hashbrown"
@@ -7749,7 +7568,7 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
 dependencies = [
- "ahash 0.8.11",
+ "ahash",
 ]
 
 [[package]]
@@ -7758,7 +7577,7 @@ version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 dependencies = [
- "ahash 0.8.11",
+ "ahash",
  "allocator-api2",
  "serde",
 ]
@@ -8486,15 +8305,6 @@ dependencies = [
  "rlp 0.6.1",
 ]
 
-[[package]]
-name = "impl-serde"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebc88fc67028ae3db0c853baa36269d398d5f45b6982f95549ff5def78c935cd"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "impl-serde"
 version = "0.5.0"
@@ -8637,29 +8447,6 @@ dependencies = [
  "winreg",
 ]
 
-[[package]]
-name = "ipfs-hasher"
-version = "0.21.3"
-source = "git+https://github.com/chevdor/subwasm?rev=v0.21.3#aa8acb6fdfb34144ac51ab95618a9b37fa251295"
-dependencies = [
- "ipfs-unixfs",
- "thiserror 1.0.65",
-]
-
-[[package]]
-name = "ipfs-unixfs"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67d1cf65363f3d01682283456651d1cea436019de5be7a974bb61716c940d44f"
-dependencies = [
- "cid 0.5.1",
- "either",
- "filetime",
- "multihash 0.11.4",
- "quick-protobuf 0.7.0",
- "sha2 0.9.9",
-]
-
 [[package]]
 name = "ipnet"
 version = "2.8.0"
@@ -9193,7 +8980,7 @@ version = "0.87.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d8893eb18fbf6bb6c80ef6ee7dd11ec32b1dc3c034c988ac1b3a84d46a230ae"
 dependencies = [
- "ahash 0.8.11",
+ "ahash",
  "async-trait",
  "backoff",
  "derivative",
@@ -9447,7 +9234,7 @@ dependencies = [
  "once_cell",
  "parking_lot 0.12.3",
  "pin-project",
- "quick-protobuf 0.8.1",
+ "quick-protobuf",
  "rand 0.8.5",
  "rw-stream-sink",
  "smallvec",
@@ -9489,7 +9276,7 @@ dependencies = [
  "libp2p-identity",
  "libp2p-swarm",
  "lru 0.12.3",
- "quick-protobuf 0.8.1",
+ "quick-protobuf",
  "quick-protobuf-codec",
  "smallvec",
  "thiserror 1.0.65",
@@ -9507,7 +9294,7 @@ dependencies = [
  "ed25519-dalek",
  "hkdf",
  "multihash 0.19.1",
- "quick-protobuf 0.8.1",
+ "quick-protobuf",
  "rand 0.8.5",
  "sha2 0.10.9",
  "thiserror 1.0.65",
@@ -9532,7 +9319,7 @@ dependencies = [
  "libp2p-core",
  "libp2p-identity",
  "libp2p-swarm",
- "quick-protobuf 0.8.1",
+ "quick-protobuf",
  "quick-protobuf-codec",
  "rand 0.8.5",
  "sha2 0.10.9",
@@ -9591,14 +9378,14 @@ checksum = "36b137cb1ae86ee39f8e5d6245a296518912014eaa87427d24e6ff58cfc1b28c"
 dependencies = [
  "asynchronous-codec 0.7.0",
  "bytes",
- "curve25519-dalek 4.1.3",
+ "curve25519-dalek",
  "futures",
  "libp2p-core",
  "libp2p-identity",
  "multiaddr 0.18.1",
  "multihash 0.19.1",
  "once_cell",
- "quick-protobuf 0.8.1",
+ "quick-protobuf",
  "rand 0.8.5",
  "sha2 0.10.9",
  "snow",
@@ -10015,12 +9802,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "litrs"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5"
-
 [[package]]
 name = "lock_api"
 version = "0.4.10"
@@ -10269,19 +10050,11 @@ dependencies = [
 
 [[package]]
 name = "memory-db"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808b50db46293432a45e63bc15ea51e0ab4c0a1647b8eb114e31a3e698dd6fbe"
-dependencies = [
- "hash-db",
-]
-
-[[package]]
-name = "memory-db"
-version = "0.33.0"
+version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6da20dba965bd218a14c3b335b90d3e07c09ede190c7c19b50deb23d418a322"
+checksum = "7e300c54e3239a86f9c61cc63ab0f03862eb40b1c6e065dc6fd6ceaeff6da93d"
 dependencies = [
+ "foldhash",
  "hash-db",
  "hashbrown 0.15.3",
 ]
@@ -10326,7 +10099,7 @@ dependencies = [
  "num-traits",
  "parking_lot 0.12.3",
  "relay-utils",
- "sp-arithmetic 23.0.0",
+ "sp-arithmetic",
  "sp-core 28.0.0",
 ]
 
@@ -10398,7 +10171,7 @@ dependencies = [
  "bitflags 1.3.2",
  "blake2 0.10.6",
  "c2-chacha",
- "curve25519-dalek 4.1.3",
+ "curve25519-dalek",
  "either",
  "hashlink 0.8.4",
  "lioness",
@@ -10423,13 +10196,13 @@ dependencies = [
  "sc-block-builder",
  "sc-client-api",
  "sc-offchain",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-beefy",
  "sp-core 28.0.0",
  "sp-mmr-primitives",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-tracing 16.0.0",
  "substrate-test-runtime-client",
  "tokio",
@@ -10443,11 +10216,11 @@ dependencies = [
  "parity-scale-codec",
  "serde",
  "serde_json",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-blockchain",
  "sp-core 28.0.0",
  "sp-mmr-primitives",
- "sp-runtime 31.0.1",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -10511,7 +10284,7 @@ dependencies = [
  "byteorder",
  "data-encoding",
  "log",
- "multibase 0.9.1",
+ "multibase",
  "multihash 0.17.0",
  "percent-encoding",
  "serde",
@@ -10530,7 +10303,7 @@ dependencies = [
  "byteorder",
  "data-encoding",
  "libp2p-identity",
- "multibase 0.9.1",
+ "multibase",
  "multihash 0.19.1",
  "percent-encoding",
  "serde",
@@ -10539,17 +10312,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "multibase"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b78c60039650ff12e140ae867ef5299a58e19dded4d334c849dc7177083667e2"
-dependencies = [
- "base-x",
- "data-encoding",
- "data-encoding-macro",
-]
-
 [[package]]
 name = "multibase"
 version = "0.9.1"
@@ -10561,35 +10323,20 @@ dependencies = [
  "data-encoding-macro",
 ]
 
-[[package]]
-name = "multihash"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567122ab6492f49b59def14ecc36e13e64dca4188196dd0cd41f9f3f979f3df6"
-dependencies = [
- "blake2b_simd 0.5.11",
- "blake2s_simd 0.5.11",
- "digest 0.9.0",
- "sha-1",
- "sha2 0.9.9",
- "sha3 0.9.1",
- "unsigned-varint 0.5.1",
-]
-
 [[package]]
 name = "multihash"
 version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40"
 dependencies = [
- "blake2b_simd 1.0.2",
- "blake2s_simd 1.0.1",
+ "blake2b_simd",
+ "blake2s_simd",
  "blake3",
  "core2",
  "digest 0.10.7",
  "multihash-derive",
  "sha2 0.10.9",
- "sha3 0.10.8",
+ "sha3",
  "unsigned-varint 0.7.2",
 ]
 
@@ -10848,11 +10595,11 @@ dependencies = [
  "sp-consensus",
  "sp-core 28.0.0",
  "sp-inherents",
- "sp-runtime 31.0.1",
- "sp-state-machine 0.35.0",
+ "sp-runtime",
+ "sp-state-machine",
  "sp-timestamp",
  "sp-tracing 16.0.0",
- "sp-trie 29.0.0",
+ "sp-trie",
  "tempfile",
 ]
 
@@ -10861,7 +10608,7 @@ name = "node-primitives"
 version = "2.0.0"
 dependencies = [
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -10884,15 +10631,15 @@ dependencies = [
  "sc-rpc",
  "sc-sync-state-rpc",
  "sc-transaction-pool-api",
- "sp-api 26.0.0",
- "sp-application-crypto 30.0.0",
+ "sp-api",
+ "sp-application-crypto",
  "sp-block-builder",
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-babe",
  "sp-consensus-beefy",
- "sp-keystore 0.34.0",
- "sp-runtime 31.0.1",
+ "sp-keystore",
+ "sp-runtime",
  "sp-statement-store",
  "substrate-frame-rpc-system",
  "substrate-state-trie-migration-rpc",
@@ -10940,9 +10687,9 @@ dependencies = [
  "sc-client-api",
  "sc-client-db",
  "sc-consensus",
- "sc-executor 0.32.0",
+ "sc-executor",
  "sc-service",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-block-builder",
  "sp-blockchain",
  "sp-consensus",
@@ -10950,7 +10697,7 @@ dependencies = [
  "sp-crypto-hashing 0.1.0",
  "sp-inherents",
  "sp-keyring",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-timestamp",
  "staging-node-cli",
  "substrate-test-client",
@@ -11382,7 +11129,6 @@ dependencies = [
 name = "pallet-ah-ops"
 version = "0.1.0"
 dependencies = [
- "cumulus-primitives-core",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -11392,10 +11138,10 @@ dependencies = [
  "pallet-utility",
  "parity-scale-codec",
  "scale-info",
- "sp-application-crypto 30.0.0",
+ "sp-application-crypto",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-std 14.0.0",
 ]
 
@@ -11441,8 +11187,8 @@ dependencies = [
  "scale-info",
  "sp-core 28.0.0",
  "sp-crypto-hashing 0.1.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -11458,11 +11204,11 @@ dependencies = [
  "parity-scale-codec",
  "primitive-types 0.13.1",
  "scale-info",
- "sp-api 26.0.0",
- "sp-arithmetic 23.0.0",
+ "sp-api",
+ "sp-arithmetic",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -11479,10 +11225,10 @@ dependencies = [
  "parity-scale-codec",
  "primitive-types 0.13.1",
  "scale-info",
- "sp-arithmetic 23.0.0",
+ "sp-arithmetic",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -11498,8 +11244,8 @@ dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
  "scale-info",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -11513,8 +11259,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -11530,11 +11276,11 @@ dependencies = [
  "parity-scale-codec",
  "primitive-types 0.13.1",
  "scale-info",
- "sp-api 26.0.0",
- "sp-arithmetic 23.0.0",
+ "sp-api",
+ "sp-arithmetic",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-std 14.0.0",
 ]
 
@@ -11552,8 +11298,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -11571,8 +11317,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -11600,8 +11346,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -11624,11 +11370,11 @@ dependencies = [
  "pallet-timestamp",
  "parity-scale-codec",
  "scale-info",
- "sp-application-crypto 30.0.0",
+ "sp-application-crypto",
  "sp-consensus-aura",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -11641,11 +11387,11 @@ dependencies = [
  "pallet-session",
  "parity-scale-codec",
  "scale-info",
- "sp-application-crypto 30.0.0",
+ "sp-application-crypto",
  "sp-authority-discovery",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -11658,8 +11404,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -11680,11 +11426,11 @@ dependencies = [
  "pallet-timestamp",
  "parity-scale-codec",
  "scale-info",
- "sp-application-crypto 30.0.0",
+ "sp-application-crypto",
  "sp-consensus-babe",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-session",
  "sp-staking",
  "sp-tracing 16.0.0",
@@ -11705,8 +11451,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-tracing 16.0.0",
 ]
 
@@ -11731,7 +11477,7 @@ dependencies = [
  "pallet-bags-list",
  "pallet-staking",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -11748,8 +11494,8 @@ dependencies = [
  "paste",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -11772,11 +11518,11 @@ dependencies = [
  "serde",
  "sp-consensus-beefy",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-state-machine 0.35.0",
+ "sp-state-machine",
  "sp-tracing 16.0.0",
 ]
 
@@ -11797,13 +11543,13 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-consensus-beefy",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-staking",
- "sp-state-machine 0.35.0",
+ "sp-state-machine",
 ]
 
 [[package]]
@@ -11819,8 +11565,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -11842,8 +11588,8 @@ dependencies = [
  "serde",
  "sp-consensus-beefy",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-std 14.0.0",
 ]
 
@@ -11862,8 +11608,8 @@ dependencies = [
  "scale-info",
  "sp-consensus-grandpa",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-std 14.0.0",
 ]
 
@@ -11884,10 +11630,10 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-std 14.0.0",
- "sp-trie 29.0.0",
+ "sp-trie",
 ]
 
 [[package]]
@@ -11907,8 +11653,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-std 14.0.0",
 ]
 
@@ -11935,10 +11681,10 @@ dependencies = [
  "pallet-utility",
  "parity-scale-codec",
  "scale-info",
- "sp-arithmetic 23.0.0",
+ "sp-arithmetic",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -11953,11 +11699,11 @@ dependencies = [
  "parity-scale-codec",
  "pretty_assertions",
  "scale-info",
- "sp-api 26.0.0",
- "sp-arithmetic 23.0.0",
+ "sp-api",
+ "sp-arithmetic",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-tracing 16.0.0",
 ]
 
@@ -11975,8 +11721,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -11996,8 +11742,8 @@ dependencies = [
  "rand 0.8.5",
  "scale-info",
  "sp-consensus-aura",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-staking",
  "sp-tracing 16.0.0",
 ]
@@ -12015,8 +11761,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -12029,8 +11775,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -12061,11 +11807,11 @@ dependencies = [
  "scale-info",
  "serde",
  "smallvec",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-keystore 0.34.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-keystore",
+ "sp-runtime",
  "sp-tracing 16.0.0",
  "staging-xcm",
  "staging-xcm-builder",
@@ -12081,7 +11827,7 @@ dependencies = [
  "anyhow",
  "frame-system",
  "parity-wasm",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "tempfile",
  "toml 0.8.19",
  "twox-hash",
@@ -12106,11 +11852,11 @@ dependencies = [
  "polkadot-primitives",
  "polkadot-runtime-parachains",
  "scale-info",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-keystore 0.34.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-keystore",
+ "sp-runtime",
  "sp-tracing 16.0.0",
  "staging-xcm",
  "staging-xcm-builder",
@@ -12150,8 +11896,8 @@ dependencies = [
  "scale-info",
  "serde",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -12165,10 +11911,10 @@ dependencies = [
  "pallet-ranked-collective",
  "parity-scale-codec",
  "scale-info",
- "sp-arithmetic 23.0.0",
+ "sp-arithmetic",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -12180,8 +11926,8 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "scale-info",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -12200,8 +11946,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-staking",
  "sp-tracing 16.0.0",
 ]
@@ -12221,8 +11967,8 @@ dependencies = [
  "scale-info",
  "serde",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -12236,8 +11982,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -12251,11 +11997,11 @@ dependencies = [
  "pallet-people",
  "parity-scale-codec",
  "scale-info",
- "sp-api 26.0.0",
- "sp-arithmetic 23.0.0",
+ "sp-api",
+ "sp-arithmetic",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "verifiable",
 ]
 
@@ -12279,9 +12025,9 @@ dependencies = [
  "parking_lot 0.12.3",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-npos-elections",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-staking",
  "sp-tracing 16.0.0",
 ]
@@ -12300,11 +12046,11 @@ dependencies = [
  "parking_lot 0.12.3",
  "rand 0.8.5",
  "scale-info",
- "sp-arithmetic 23.0.0",
+ "sp-arithmetic",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-npos-elections",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-std 14.0.0",
  "sp-tracing 16.0.0",
 ]
@@ -12325,11 +12071,11 @@ dependencies = [
  "parking_lot 0.12.3",
  "rand 0.8.5",
  "scale-info",
- "sp-arithmetic 23.0.0",
+ "sp-arithmetic",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-npos-elections",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-tracing 16.0.0",
  "strum 0.26.3",
  "tokio",
@@ -12344,7 +12090,7 @@ dependencies = [
  "frame-system",
  "parity-scale-codec",
  "sp-npos-elections",
- "sp-runtime 31.0.1",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -12359,9 +12105,9 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-npos-elections",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-staking",
  "sp-tracing 16.0.0",
  "substrate-test-utils",
@@ -12380,9 +12126,9 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-keyring",
- "sp-runtime 31.0.1",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -12397,8 +12143,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -12422,8 +12168,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -12437,7 +12183,7 @@ dependencies = [
  "pallet-migrations",
  "parity-scale-codec",
  "scale-info",
- "sp-io 30.0.0",
+ "sp-io",
 ]
 
 [[package]]
@@ -12451,9 +12197,9 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-keystore 0.34.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-keystore",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -12468,9 +12214,9 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
- "sp-version 29.0.0",
+ "sp-io",
+ "sp-runtime",
+ "sp-version",
 ]
 
 [[package]]
@@ -12484,7 +12230,7 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
+ "sp-io",
 ]
 
 [[package]]
@@ -12498,8 +12244,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -12514,9 +12260,9 @@ dependencies = [
  "pretty_assertions",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-metadata-ir 0.6.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-metadata-ir",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -12553,8 +12299,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-staking",
  "sp-tracing 16.0.0",
 ]
@@ -12572,8 +12318,8 @@ dependencies = [
  "scale-info",
  "sp-core 28.0.0",
  "sp-inherents",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -12595,12 +12341,12 @@ dependencies = [
  "pallet-timestamp",
  "parity-scale-codec",
  "scale-info",
- "sp-application-crypto 30.0.0",
+ "sp-application-crypto",
  "sp-consensus-grandpa",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-keyring",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-session",
  "sp-staking",
  "sp-tracing 16.0.0",
@@ -12619,9 +12365,9 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-keystore 0.34.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-keystore",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -12637,10 +12383,10 @@ dependencies = [
  "pallet-session",
  "parity-scale-codec",
  "scale-info",
- "sp-application-crypto 30.0.0",
+ "sp-application-crypto",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-staking",
 ]
 
@@ -12655,8 +12401,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -12681,8 +12427,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -12696,8 +12442,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -12714,13 +12460,13 @@ dependencies = [
  "rand_distr",
  "scale-info",
  "serde",
- "sp-arithmetic 23.0.0",
+ "sp-arithmetic",
  "sp-core 28.0.0",
  "sp-crypto-hashing 0.1.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-tracing 16.0.0",
- "sp-weights 27.0.0",
+ "sp-weights",
 ]
 
 [[package]]
@@ -12738,10 +12484,10 @@ dependencies = [
  "scale-info",
  "serde",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-keyring",
- "sp-keystore 0.34.0",
- "sp-runtime 31.0.1",
+ "sp-keystore",
+ "sp-runtime",
  "sp-std 14.0.0",
 ]
 
@@ -12761,8 +12507,8 @@ dependencies = [
  "pretty_assertions",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-tracing 16.0.0",
 ]
 
@@ -12784,7 +12530,7 @@ dependencies = [
  "polkadot-sdk-frame",
  "scale-info",
  "serde",
- "sp-application-crypto 30.0.0",
+ "sp-application-crypto",
  "sp-mixnet",
 ]
 
@@ -12838,9 +12584,9 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-keystore 0.34.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-keystore",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -12848,7 +12594,7 @@ name = "pallet-nfts-runtime-api"
 version = "14.0.0"
 dependencies = [
  "parity-scale-codec",
- "sp-api 26.0.0",
+ "sp-api",
 ]
 
 [[package]]
@@ -12859,7 +12605,7 @@ dependencies = [
  "parity-scale-codec",
  "polkadot-sdk-frame",
  "scale-info",
- "sp-io 30.0.0",
+ "sp-io",
 ]
 
 [[package]]
@@ -12883,8 +12629,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-staking",
  "sp-tracing 16.0.0",
 ]
@@ -12907,8 +12653,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-runtime-interface 24.0.0",
  "sp-staking",
 ]
@@ -12923,8 +12669,8 @@ dependencies = [
  "log",
  "pallet-nomination-pools",
  "rand 0.8.5",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-tracing 16.0.0",
 ]
 
@@ -12934,7 +12680,7 @@ version = "23.0.0"
 dependencies = [
  "pallet-nomination-pools",
  "parity-scale-codec",
- "sp-api 26.0.0",
+ "sp-api",
 ]
 
 [[package]]
@@ -12955,8 +12701,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-staking",
  "sp-tracing 16.0.0",
 ]
@@ -12972,8 +12718,8 @@ dependencies = [
  "scale-info",
  "serde",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-staking",
 ]
 
@@ -12998,8 +12744,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-staking",
  "sp-tracing 16.0.0",
 ]
@@ -13015,10 +12761,10 @@ dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
  "scale-info",
- "sp-arithmetic 23.0.0",
+ "sp-arithmetic",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -13029,7 +12775,7 @@ dependencies = [
  "parity-scale-codec",
  "polkadot-sdk-frame",
  "scale-info",
- "sp-metadata-ir 0.6.0",
+ "sp-metadata-ir",
 ]
 
 [[package]]
@@ -13066,8 +12812,8 @@ dependencies = [
  "scale-info",
  "serde",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -13080,10 +12826,10 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "scale-info",
- "sp-arithmetic 23.0.0",
+ "sp-arithmetic",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "verifiable",
 ]
 
@@ -13099,8 +12845,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -13125,10 +12871,10 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "scale-info",
- "sp-arithmetic 23.0.0",
+ "sp-arithmetic",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -13156,10 +12902,10 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
- "sp-arithmetic 23.0.0",
+ "sp-arithmetic",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -13173,8 +12919,8 @@ dependencies = [
  "scale-info",
  "serde",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -13208,7 +12954,7 @@ dependencies = [
  "pallet-utility",
  "parity-scale-codec",
  "paste",
- "polkavm 0.26.0",
+ "polkavm",
  "polkavm-common 0.26.0",
  "pretty_assertions",
  "rand 0.8.5",
@@ -13220,15 +12966,15 @@ dependencies = [
  "secp256k1 0.28.2",
  "serde",
  "serde_json",
- "sp-api 26.0.0",
- "sp-arithmetic 23.0.0",
+ "sp-api",
+ "sp-arithmetic",
  "sp-consensus-aura",
  "sp-consensus-babe",
  "sp-consensus-slots",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-keystore 0.34.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-keystore",
+ "sp-runtime",
  "sp-tracing 16.0.0",
  "substrate-bn",
  "subxt-signer 0.41.0",
@@ -13256,12 +13002,12 @@ dependencies = [
  "sc-rpc-api",
  "sc-service",
  "serde_json",
- "sp-arithmetic 23.0.0",
+ "sp-arithmetic",
  "sp-core 28.0.0",
  "sp-crypto-hashing 0.1.0",
  "sp-rpc",
- "sp-runtime 31.0.1",
- "sp-weights 27.0.0",
+ "sp-runtime",
+ "sp-weights",
  "sqlx",
  "static_init",
  "substrate-cli-test-utils",
@@ -13281,7 +13027,7 @@ dependencies = [
  "pallet-revive-uapi",
  "polkavm-linker",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
+ "sp-io",
  "toml 0.8.19",
 ]
 
@@ -13320,8 +13066,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-staking",
 ]
 
@@ -13333,8 +13079,8 @@ dependencies = [
  "frame-system",
  "parity-scale-codec",
  "scale-info",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -13375,8 +13121,8 @@ dependencies = [
  "sp-consensus-sassafras",
  "sp-core 28.0.0",
  "sp-crypto-hashing 0.1.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -13392,9 +13138,9 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
- "sp-weights 27.0.0",
+ "sp-io",
+ "sp-runtime",
+ "sp-weights",
  "substrate-test-utils",
 ]
 
@@ -13407,8 +13153,8 @@ dependencies = [
  "pallet-balances",
  "parity-scale-codec",
  "scale-info",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -13424,12 +13170,12 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-state-machine 0.35.0",
- "sp-trie 29.0.0",
+ "sp-state-machine",
+ "sp-trie",
 ]
 
 [[package]]
@@ -13448,8 +13194,8 @@ dependencies = [
  "parity-scale-codec",
  "rand 0.8.5",
  "scale-info",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-session",
  "sp-staking",
 ]
@@ -13462,7 +13208,7 @@ dependencies = [
  "frame-system",
  "parity-scale-codec",
  "scale-info",
- "sp-runtime 31.0.1",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -13478,10 +13224,10 @@ dependencies = [
  "parity-scale-codec",
  "rand_chacha 0.3.1",
  "scale-info",
- "sp-arithmetic 23.0.0",
+ "sp-arithmetic",
  "sp-crypto-hashing 0.1.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -13503,11 +13249,11 @@ dependencies = [
  "rand_chacha 0.3.1",
  "scale-info",
  "serde",
- "sp-application-crypto 30.0.0",
+ "sp-application-crypto",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-npos-elections",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-staking",
  "sp-tracing 16.0.0",
  "substrate-test-utils",
@@ -13530,11 +13276,11 @@ dependencies = [
  "rand_chacha 0.3.1",
  "scale-info",
  "serde",
- "sp-application-crypto 30.0.0",
+ "sp-application-crypto",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-npos-elections",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-staking",
  "sp-tracing 16.0.0",
  "substrate-test-utils",
@@ -13555,8 +13301,8 @@ dependencies = [
  "scale-info",
  "serde",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-staking",
 ]
 
@@ -13564,7 +13310,6 @@ dependencies = [
 name = "pallet-staking-async-parachain-runtime"
 version = "0.15.0"
 dependencies = [
- "asset-test-utils",
  "assets-common",
  "bp-asset-hub-rococo",
  "bp-bridge-hub-rococo",
@@ -13613,7 +13358,6 @@ dependencies = [
  "pallet-nfts-runtime-api",
  "pallet-nomination-pools",
  "pallet-nomination-pools-runtime-api",
- "pallet-parameters",
  "pallet-preimage",
  "pallet-proxy",
  "pallet-referenda",
@@ -13636,15 +13380,14 @@ dependencies = [
  "pallet-xcm-benchmarks",
  "pallet-xcm-bridge-hub-router",
  "parachains-common",
- "parachains-runtimes-test-utils",
  "parity-scale-codec",
  "polkadot-parachain-primitives",
  "polkadot-runtime-common",
  "primitive-types 0.13.1",
  "scale-info",
  "serde_json",
- "sp-api 26.0.0",
- "sp-arithmetic 23.0.0",
+ "sp-api",
+ "sp-arithmetic",
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core 28.0.0",
@@ -13653,14 +13396,14 @@ dependencies = [
  "sp-keyring",
  "sp-npos-elections",
  "sp-offchain",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-session",
  "sp-staking",
  "sp-std 14.0.0",
  "sp-storage 19.0.0",
  "sp-tracing 16.0.0",
  "sp-transaction-pool",
- "sp-version 29.0.0",
+ "sp-version",
  "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
@@ -13682,7 +13425,7 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-staking",
  "staging-xcm",
 ]
@@ -13715,22 +13458,16 @@ dependencies = [
  "pallet-beefy",
  "pallet-beefy-mmr",
  "pallet-conviction-voting",
- "pallet-delegated-staking",
  "pallet-election-provider-multi-phase",
  "pallet-election-provider-support-benchmarking",
- "pallet-elections-phragmen",
  "pallet-fast-unstake",
  "pallet-grandpa",
  "pallet-identity",
  "pallet-indices",
- "pallet-membership",
  "pallet-message-queue",
  "pallet-migrations",
  "pallet-mmr",
  "pallet-multisig",
- "pallet-nomination-pools",
- "pallet-nomination-pools-benchmarking",
- "pallet-nomination-pools-runtime-api",
  "pallet-offences",
  "pallet-offences-benchmarking",
  "pallet-parameters",
@@ -13742,12 +13479,10 @@ dependencies = [
  "pallet-scheduler",
  "pallet-session",
  "pallet-session-benchmarking",
- "pallet-society",
  "pallet-staking",
  "pallet-staking-async-ah-client",
  "pallet-staking-async-rc-client",
  "pallet-staking-async-rc-runtime-constants",
- "pallet-state-trie-migration",
  "pallet-sudo",
  "pallet-timestamp",
  "pallet-transaction-payment",
@@ -13768,9 +13503,9 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "smallvec",
- "sp-api 26.0.0",
- "sp-application-crypto 30.0.0",
- "sp-arithmetic 23.0.0",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-arithmetic",
  "sp-authority-discovery",
  "sp-block-builder",
  "sp-consensus-babe",
@@ -13779,18 +13514,18 @@ dependencies = [
  "sp-core 28.0.0",
  "sp-genesis-builder",
  "sp-inherents",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-keyring",
  "sp-mmr-primitives",
  "sp-npos-elections",
  "sp-offchain",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-session",
  "sp-staking",
  "sp-storage 19.0.0",
  "sp-tracing 16.0.0",
  "sp-transaction-pool",
- "sp-version 29.0.0",
+ "sp-version",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -13809,8 +13544,8 @@ dependencies = [
  "polkadot-runtime-common",
  "smallvec",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
- "sp-weights 27.0.0",
+ "sp-runtime",
+ "sp-weights",
  "staging-xcm",
  "staging-xcm-builder",
 ]
@@ -13820,7 +13555,7 @@ name = "pallet-staking-async-reward-fn"
 version = "19.0.0"
 dependencies = [
  "log",
- "sp-arithmetic 23.0.0",
+ "sp-arithmetic",
 ]
 
 [[package]]
@@ -13828,7 +13563,7 @@ name = "pallet-staking-async-runtime-api"
 version = "14.0.0"
 dependencies = [
  "parity-scale-codec",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-staking",
 ]
 
@@ -13839,7 +13574,7 @@ dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "syn 2.0.98",
 ]
 
@@ -13848,7 +13583,7 @@ name = "pallet-staking-reward-fn"
 version = "19.0.0"
 dependencies = [
  "log",
- "sp-arithmetic 23.0.0",
+ "sp-arithmetic",
 ]
 
 [[package]]
@@ -13856,7 +13591,7 @@ name = "pallet-staking-runtime-api"
 version = "14.0.0"
 dependencies = [
  "parity-scale-codec",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-staking",
 ]
 
@@ -13874,8 +13609,8 @@ dependencies = [
  "scale-info",
  "serde",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-tracing 16.0.0",
  "substrate-state-trie-migration-rpc",
  "thousands",
@@ -13893,10 +13628,10 @@ dependencies = [
  "pallet-balances",
  "parity-scale-codec",
  "scale-info",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-statement-store",
 ]
 
@@ -13910,8 +13645,8 @@ dependencies = [
  "frame-system",
  "parity-scale-codec",
  "scale-info",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -13924,8 +13659,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -13940,8 +13675,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-inherents",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-storage 19.0.0",
  "sp-timestamp",
 ]
@@ -13960,8 +13695,8 @@ dependencies = [
  "scale-info",
  "serde",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-storage 19.0.0",
 ]
 
@@ -13977,8 +13712,8 @@ dependencies = [
  "scale-info",
  "serde",
  "serde_json",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -13988,12 +13723,12 @@ dependencies = [
  "jsonrpsee",
  "pallet-transaction-payment-rpc-runtime-api",
  "parity-scale-codec",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-blockchain",
  "sp-core 28.0.0",
  "sp-rpc",
- "sp-runtime 31.0.1",
- "sp-weights 27.0.0",
+ "sp-runtime",
+ "sp-weights",
 ]
 
 [[package]]
@@ -14002,9 +13737,9 @@ version = "28.0.0"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
- "sp-api 26.0.0",
- "sp-runtime 31.0.1",
- "sp-weights 27.0.0",
+ "sp-api",
+ "sp-runtime",
+ "sp-weights",
 ]
 
 [[package]]
@@ -14021,8 +13756,8 @@ dependencies = [
  "scale-info",
  "serde",
  "sp-inherents",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-transaction-storage-proof",
 ]
 
@@ -14042,8 +13777,8 @@ dependencies = [
  "scale-info",
  "serde",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -14070,8 +13805,8 @@ dependencies = [
  "pallet-balances",
  "parity-scale-codec",
  "scale-info",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -14088,8 +13823,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -14101,9 +13836,9 @@ dependencies = [
  "frame-system",
  "parity-scale-codec",
  "scale-info",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
- "sp-weights 27.0.0",
+ "sp-io",
+ "sp-runtime",
+ "sp-weights",
 ]
 
 [[package]]
@@ -14117,8 +13852,8 @@ dependencies = [
  "pallet-balances",
  "parity-scale-codec",
  "scale-info",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -14140,6 +13875,7 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "hex-literal",
  "pallet-assets",
  "pallet-balances",
  "pallet-revive",
@@ -14150,8 +13886,8 @@ dependencies = [
  "scale-info",
  "serde",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-tracing 16.0.0",
  "staging-xcm",
  "staging-xcm-builder",
@@ -14171,8 +13907,8 @@ dependencies = [
  "pallet-balances",
  "parity-scale-codec",
  "scale-info",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-tracing 16.0.0",
  "staging-xcm",
  "staging-xcm-builder",
@@ -14190,7 +13926,6 @@ dependencies = [
  "bp-xcm-bridge-hub-router",
  "frame-support",
  "frame-system",
- "log",
  "pallet-balances",
  "pallet-bridge-messages",
  "pallet-xcm-bridge-hub-router",
@@ -14198,12 +13933,13 @@ dependencies = [
  "polkadot-parachain-primitives",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-std 14.0.0",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
+ "tracing",
 ]
 
 [[package]]
@@ -14214,16 +13950,16 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "log",
  "parity-scale-codec",
  "polkadot-runtime-parachains",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-std 14.0.0",
  "staging-xcm",
  "staging-xcm-builder",
+ "tracing",
 ]
 
 [[package]]
@@ -14274,7 +14010,6 @@ dependencies = [
  "cumulus-primitives-utility",
  "frame-support",
  "frame-system",
- "log",
  "pallet-asset-tx-payment",
  "pallet-assets",
  "pallet-authorship",
@@ -14289,11 +14024,12 @@ dependencies = [
  "scale-info",
  "sp-consensus-aura",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-executor",
+ "tracing",
 ]
 
 [[package]]
@@ -14331,8 +14067,8 @@ dependencies = [
  "polkadot-parachain-primitives",
  "sp-consensus-aura",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-tracing 16.0.0",
  "staging-parachain-info",
  "staging-xcm",
@@ -14562,7 +14298,6 @@ dependencies = [
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
  "hex-literal",
- "log",
  "pallet-asset-conversion",
  "pallet-asset-tx-payment",
  "pallet-assets",
@@ -14588,7 +14323,7 @@ dependencies = [
  "scale-info",
  "serde_json",
  "smallvec",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core 28.0.0",
@@ -14596,17 +14331,18 @@ dependencies = [
  "sp-inherents",
  "sp-keyring",
  "sp-offchain",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-session",
  "sp-storage 19.0.0",
  "sp-transaction-pool",
- "sp-version 29.0.0",
+ "sp-version",
  "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
  "substrate-wasm-builder",
  "testnet-parachains-constants",
+ "tracing",
  "xcm-runtime-apis",
 ]
 
@@ -14633,7 +14369,7 @@ dependencies = [
  "pallet-balances",
  "parachains-common",
  "rococo-system-emulated-network",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "staging-xcm",
  "staging-xcm-executor",
 ]
@@ -14659,7 +14395,6 @@ dependencies = [
  "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
- "log",
  "pallet-aura",
  "pallet-authorship",
  "pallet-balances",
@@ -14685,7 +14420,7 @@ dependencies = [
  "scale-info",
  "serde",
  "serde_json",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core 28.0.0",
@@ -14693,17 +14428,18 @@ dependencies = [
  "sp-inherents",
  "sp-keyring",
  "sp-offchain",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-session",
  "sp-storage 19.0.0",
  "sp-transaction-pool",
- "sp-version 29.0.0",
+ "sp-version",
  "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
  "substrate-wasm-builder",
  "testnet-parachains-constants",
+ "tracing",
  "xcm-runtime-apis",
 ]
 
@@ -14732,7 +14468,7 @@ dependencies = [
  "pallet-xcm",
  "parachains-common",
  "parity-scale-codec",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "staging-xcm",
  "staging-xcm-executor",
  "westend-runtime",
@@ -14760,7 +14496,6 @@ dependencies = [
  "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
- "log",
  "pallet-aura",
  "pallet-authorship",
  "pallet-balances",
@@ -14785,7 +14520,7 @@ dependencies = [
  "scale-info",
  "serde",
  "serde_json",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core 28.0.0",
@@ -14793,18 +14528,19 @@ dependencies = [
  "sp-inherents",
  "sp-keyring",
  "sp-offchain",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-session",
  "sp-statement-store",
  "sp-storage 19.0.0",
  "sp-transaction-pool",
- "sp-version 29.0.0",
+ "sp-version",
  "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
  "substrate-wasm-builder",
  "testnet-parachains-constants",
+ "tracing",
  "westend-runtime-constants",
  "xcm-runtime-apis",
 ]
@@ -14998,7 +14734,7 @@ dependencies = [
  "rand_core 0.6.4",
  "sc-keystore",
  "schnorrkel 0.11.4",
- "sp-application-crypto 30.0.0",
+ "sp-application-crypto",
  "sp-authority-discovery",
  "sp-core 28.0.0",
  "sp-tracing 16.0.0",
@@ -15021,11 +14757,11 @@ dependencies = [
  "polkadot-primitives",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
- "sp-application-crypto 30.0.0",
+ "sp-application-crypto",
  "sp-authority-discovery",
  "sp-core 28.0.0",
  "sp-keyring",
- "sp-keystore 0.34.0",
+ "sp-keystore",
  "sp-tracing 16.0.0",
  "tracing-gum",
 ]
@@ -15054,7 +14790,7 @@ dependencies = [
  "schnellru",
  "sp-core 28.0.0",
  "sp-keyring",
- "sp-keystore 0.34.0",
+ "sp-keystore",
  "sp-tracing 16.0.0",
  "thiserror 1.0.65",
  "tracing-gum",
@@ -15121,7 +14857,7 @@ dependencies = [
  "sc-tracing",
  "sp-core 28.0.0",
  "sp-keyring",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "substrate-build-script-utils",
  "thiserror 1.0.65",
 ]
@@ -15150,8 +14886,8 @@ dependencies = [
  "schnellru",
  "sp-core 28.0.0",
  "sp-keyring",
- "sp-keystore 0.34.0",
- "sp-runtime 31.0.1",
+ "sp-keystore",
+ "sp-runtime",
  "sp-tracing 16.0.0",
  "thiserror 1.0.65",
  "tokio",
@@ -15166,7 +14902,7 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -15190,9 +14926,9 @@ dependencies = [
  "polkadot-primitives-test-helpers",
  "sc-keystore",
  "sc-network",
- "sp-application-crypto 30.0.0",
+ "sp-application-crypto",
  "sp-keyring",
- "sp-keystore 0.34.0",
+ "sp-keystore",
  "sp-tracing 16.0.0",
  "thiserror 1.0.65",
  "tracing-gum",
@@ -15209,7 +14945,7 @@ dependencies = [
  "quickcheck",
  "reed-solomon-novelpoly",
  "sp-core 28.0.0",
- "sp-trie 29.0.0",
+ "sp-trie",
  "thiserror 1.0.65",
 ]
 
@@ -15231,13 +14967,13 @@ dependencies = [
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "sc-network",
- "sp-application-crypto 30.0.0",
+ "sp-application-crypto",
  "sp-authority-discovery",
  "sp-consensus-babe",
  "sp-core 28.0.0",
  "sp-crypto-hashing 0.1.0",
  "sp-keyring",
- "sp-keystore 0.34.0",
+ "sp-keystore",
  "sp-tracing 16.0.0",
  "tracing-gum",
 ]
@@ -15322,14 +15058,14 @@ dependencies = [
  "sc-keystore",
  "schnellru",
  "schnorrkel 0.11.4",
- "sp-application-crypto 30.0.0",
+ "sp-application-crypto",
  "sp-consensus",
  "sp-consensus-babe",
  "sp-consensus-slots",
  "sp-core 28.0.0",
  "sp-keyring",
- "sp-keystore 0.34.0",
- "sp-runtime 31.0.1",
+ "sp-keystore",
+ "sp-runtime",
  "sp-tracing 16.0.0",
  "thiserror 1.0.65",
  "tracing-gum",
@@ -15411,10 +15147,10 @@ dependencies = [
  "polkadot-statement-table",
  "sc-keystore",
  "schnellru",
- "sp-application-crypto 30.0.0",
+ "sp-application-crypto",
  "sp-core 28.0.0",
  "sp-keyring",
- "sp-keystore 0.34.0",
+ "sp-keystore",
  "sp-tracing 16.0.0",
  "thiserror 1.0.65",
  "tracing-gum",
@@ -15430,7 +15166,7 @@ dependencies = [
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
  "polkadot-primitives-test-helpers",
- "sp-keystore 0.34.0",
+ "sp-keystore",
  "thiserror 1.0.65",
  "tracing-gum",
  "wasm-timer",
@@ -15456,11 +15192,11 @@ dependencies = [
  "polkadot-primitives",
  "polkadot-primitives-test-helpers",
  "rstest",
- "sp-application-crypto 30.0.0",
+ "sp-application-crypto",
  "sp-core 28.0.0",
  "sp-keyring",
- "sp-keystore 0.34.0",
- "sp-maybe-compressed-blob 11.0.0",
+ "sp-keystore",
+ "sp-maybe-compressed-blob",
  "tracing-gum",
 ]
 
@@ -15523,10 +15259,10 @@ dependencies = [
  "polkadot-subsystem-bench",
  "sc-keystore",
  "schnellru",
- "sp-application-crypto 30.0.0",
+ "sp-application-crypto",
  "sp-core 28.0.0",
  "sp-keyring",
- "sp-keystore 0.34.0",
+ "sp-keystore",
  "sp-tracing 16.0.0",
  "thiserror 1.0.65",
  "tracing-gum",
@@ -15582,8 +15318,8 @@ dependencies = [
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
  "polkadot-primitives-test-helpers",
- "sp-application-crypto 30.0.0",
- "sp-keystore 0.34.0",
+ "sp-application-crypto",
+ "sp-keystore",
  "thiserror 1.0.65",
  "tracing-gum",
 ]
@@ -15620,7 +15356,7 @@ dependencies = [
  "sc-tracing",
  "slotmap",
  "sp-core 28.0.0",
- "sp-maybe-compressed-blob 11.0.0",
+ "sp-maybe-compressed-blob",
  "strum 0.26.3",
  "tempfile",
  "test-parachain-adder",
@@ -15642,11 +15378,11 @@ dependencies = [
  "polkadot-primitives",
  "polkadot-primitives-test-helpers",
  "sc-keystore",
- "sp-application-crypto 30.0.0",
+ "sp-application-crypto",
  "sp-core 28.0.0",
  "sp-keyring",
- "sp-keystore 0.34.0",
- "sp-runtime 31.0.1",
+ "sp-keystore",
+ "sp-runtime",
  "tracing-gum",
 ]
 
@@ -15664,14 +15400,14 @@ dependencies = [
  "polkadot-node-primitives",
  "polkadot-parachain-primitives",
  "polkadot-primitives",
- "sc-executor 0.32.0",
- "sc-executor-common 0.29.0",
- "sc-executor-wasmtime 0.29.0",
+ "sc-executor",
+ "sc-executor-common",
+ "sc-executor-wasmtime",
  "seccompiler",
  "sp-core 28.0.0",
  "sp-crypto-hashing 0.1.0",
  "sp-externalities 0.25.0",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-tracing 16.0.0",
  "tempfile",
  "thiserror 1.0.65",
@@ -15691,7 +15427,7 @@ dependencies = [
  "polkadot-node-primitives",
  "polkadot-parachain-primitives",
  "polkadot-primitives",
- "sp-maybe-compressed-blob 11.0.0",
+ "sp-maybe-compressed-blob",
  "tracing-gum",
 ]
 
@@ -15707,7 +15443,7 @@ dependencies = [
  "polkadot-node-core-pvf-common",
  "polkadot-primitives",
  "rococo-runtime",
- "sp-maybe-compressed-blob 11.0.0",
+ "sp-maybe-compressed-blob",
  "staging-tracking-allocator",
  "tikv-jemalloc-ctl",
  "tikv-jemallocator",
@@ -15728,7 +15464,7 @@ dependencies = [
  "polkadot-primitives",
  "polkadot-primitives-test-helpers",
  "schnellru",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-consensus-babe",
  "sp-core 28.0.0",
  "sp-keyring",
@@ -15777,7 +15513,7 @@ dependencies = [
  "sc-authority-discovery",
  "sc-network",
  "sc-network-types",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "strum 0.26.3",
  "thiserror 1.0.65",
  "tracing-gum",
@@ -15797,11 +15533,11 @@ dependencies = [
  "sc-keystore",
  "schnorrkel 0.11.4",
  "serde",
- "sp-application-crypto 30.0.0",
+ "sp-application-crypto",
  "sp-consensus-babe",
  "sp-consensus-slots",
- "sp-keystore 0.34.0",
- "sp-maybe-compressed-blob 11.0.0",
+ "sp-keystore",
+ "sp-maybe-compressed-blob",
  "thiserror 1.0.65",
  "zstd 0.12.4",
 ]
@@ -15829,10 +15565,10 @@ dependencies = [
  "sc-client-api",
  "sc-keystore",
  "sc-utils",
- "sp-application-crypto 30.0.0",
+ "sp-application-crypto",
  "sp-core 28.0.0",
  "sp-keyring",
- "sp-keystore 0.34.0",
+ "sp-keystore",
 ]
 
 [[package]]
@@ -15853,11 +15589,11 @@ dependencies = [
  "sc-network-types",
  "sc-transaction-pool-api",
  "smallvec",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-authority-discovery",
  "sp-blockchain",
  "sp-consensus-babe",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "substrate-prometheus-endpoint",
  "thiserror 1.0.65",
 ]
@@ -15888,9 +15624,9 @@ dependencies = [
  "prioritized-metered-channel",
  "rand 0.8.5",
  "schnellru",
- "sp-application-crypto 30.0.0",
+ "sp-application-crypto",
  "sp-core 28.0.0",
- "sp-keystore 0.34.0",
+ "sp-keystore",
  "tempfile",
  "thiserror 1.0.65",
  "tracing-gum",
@@ -15952,7 +15688,7 @@ dependencies = [
  "sc-client-db",
  "sc-consensus",
  "sc-consensus-manual-seal",
- "sc-executor 0.32.0",
+ "sc-executor",
  "sc-keystore",
  "sc-network",
  "sc-network-statement",
@@ -15970,23 +15706,23 @@ dependencies = [
  "scale-info",
  "serde",
  "serde_json",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-block-builder",
  "sp-consensus",
  "sp-consensus-aura",
  "sp-core 28.0.0",
  "sp-genesis-builder",
  "sp-inherents",
- "sp-keystore 0.34.0",
+ "sp-keystore",
  "sp-offchain",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-session",
  "sp-statement-store",
  "sp-storage 19.0.0",
  "sp-timestamp",
  "sp-transaction-pool",
- "sp-version 29.0.0",
- "sp-weights 27.0.0",
+ "sp-version",
+ "sp-weights",
  "staging-chain-spec-builder",
  "substrate-frame-rpc-system",
  "substrate-prometheus-endpoint",
@@ -16068,8 +15804,8 @@ dependencies = [
  "scale-info",
  "serde",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
- "sp-weights 27.0.0",
+ "sp-runtime",
+ "sp-weights",
 ]
 
 [[package]]
@@ -16085,16 +15821,16 @@ dependencies = [
  "polkadot-parachain-primitives",
  "scale-info",
  "serde",
- "sp-api 26.0.0",
- "sp-application-crypto 30.0.0",
- "sp-arithmetic 23.0.0",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-arithmetic",
  "sp-authority-discovery",
  "sp-consensus-slots",
  "sp-core 28.0.0",
  "sp-inherents",
- "sp-io 30.0.0",
- "sp-keystore 0.34.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-keystore",
+ "sp-runtime",
  "sp-staking",
  "sp-std 14.0.0",
  "thiserror 1.0.65",
@@ -16106,10 +15842,10 @@ version = "1.0.0"
 dependencies = [
  "polkadot-primitives",
  "rand 0.8.5",
- "sp-application-crypto 30.0.0",
+ "sp-application-crypto",
  "sp-core 28.0.0",
  "sp-keyring",
- "sp-runtime 31.0.1",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -16131,15 +15867,15 @@ dependencies = [
  "sc-rpc",
  "sc-sync-state-rpc",
  "sc-transaction-pool-api",
- "sp-api 26.0.0",
- "sp-application-crypto 30.0.0",
+ "sp-api",
+ "sp-application-crypto",
  "sp-block-builder",
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-babe",
  "sp-consensus-beefy",
- "sp-keystore 0.34.0",
- "sp-runtime 31.0.1",
+ "sp-keystore",
+ "sp-runtime",
  "substrate-frame-rpc-system",
  "substrate-state-trie-migration-rpc",
 ]
@@ -16182,14 +15918,14 @@ dependencies = [
  "serde",
  "serde_json",
  "slot-range-helper",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-core 28.0.0",
  "sp-inherents",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-keyring",
- "sp-keystore 0.34.0",
+ "sp-keystore",
  "sp-npos-elections",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-session",
  "sp-staking",
  "staging-xcm",
@@ -16247,16 +15983,16 @@ dependencies = [
  "scale-info",
  "serde",
  "serde_json",
- "sp-api 26.0.0",
- "sp-application-crypto 30.0.0",
- "sp-arithmetic 23.0.0",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-arithmetic",
  "sp-core 28.0.0",
  "sp-crypto-hashing 0.1.0",
  "sp-inherents",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-keyring",
- "sp-keystore 0.34.0",
- "sp-runtime 31.0.1",
+ "sp-keystore",
+ "sp-runtime",
  "sp-session",
  "sp-staking",
  "sp-std 14.0.0",
@@ -16513,7 +16249,7 @@ dependencies = [
  "polkadot-service",
  "polkadot-statement-distribution",
  "polkadot-statement-table",
- "sc-allocator 23.0.0",
+ "sc-allocator",
  "sc-authority-discovery",
  "sc-basic-authorship",
  "sc-block-builder",
@@ -16534,10 +16270,10 @@ dependencies = [
  "sc-consensus-manual-seal",
  "sc-consensus-pow",
  "sc-consensus-slots",
- "sc-executor 0.32.0",
- "sc-executor-common 0.29.0",
- "sc-executor-polkavm 0.29.0",
- "sc-executor-wasmtime 0.29.0",
+ "sc-executor",
+ "sc-executor-common",
+ "sc-executor-polkavm",
+ "sc-executor-wasmtime",
  "sc-informant",
  "sc-keystore",
  "sc-mixnet",
@@ -16569,10 +16305,10 @@ dependencies = [
  "sc-transaction-pool-api",
  "sc-utils",
  "slot-range-helper",
- "sp-api 26.0.0",
- "sp-api-proc-macro 15.0.0",
- "sp-application-crypto 30.0.0",
- "sp-arithmetic 23.0.0",
+ "sp-api",
+ "sp-api-proc-macro",
+ "sp-application-crypto",
+ "sp-arithmetic",
  "sp-authority-discovery",
  "sp-block-builder",
  "sp-blockchain",
@@ -16588,29 +16324,29 @@ dependencies = [
  "sp-core-hashing-proc-macro",
  "sp-crypto-ec-utils",
  "sp-crypto-hashing 0.1.0",
- "sp-crypto-hashing-proc-macro 0.1.0",
+ "sp-crypto-hashing-proc-macro",
  "sp-database",
  "sp-debug-derive 14.0.0",
  "sp-externalities 0.25.0",
  "sp-genesis-builder",
  "sp-inherents",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-keyring",
- "sp-keystore 0.34.0",
- "sp-maybe-compressed-blob 11.0.0",
- "sp-metadata-ir 0.6.0",
+ "sp-keystore",
+ "sp-maybe-compressed-blob",
+ "sp-metadata-ir",
  "sp-mixnet",
  "sp-mmr-primitives",
  "sp-npos-elections",
  "sp-offchain",
- "sp-panic-handler 13.0.0",
+ "sp-panic-handler",
  "sp-rpc",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-runtime-interface 24.0.0",
  "sp-runtime-interface-proc-macro 17.0.0",
  "sp-session",
  "sp-staking",
- "sp-state-machine 0.35.0",
+ "sp-state-machine",
  "sp-statement-store",
  "sp-std 14.0.0",
  "sp-storage 19.0.0",
@@ -16618,11 +16354,11 @@ dependencies = [
  "sp-tracing 16.0.0",
  "sp-transaction-pool",
  "sp-transaction-storage-proof",
- "sp-trie 29.0.0",
- "sp-version 29.0.0",
- "sp-version-proc-macro 13.0.0",
+ "sp-trie",
+ "sp-version",
+ "sp-version-proc-macro",
  "sp-wasm-interface 20.0.0",
- "sp-weights 27.0.0",
+ "sp-weights",
  "staging-chain-spec-builder",
  "staging-node-inspect",
  "staging-parachain-info",
@@ -16716,7 +16452,7 @@ dependencies = [
  "sc-consensus-grandpa",
  "sc-consensus-manual-seal",
  "sc-consensus-pow",
- "sc-executor 0.32.0",
+ "sc-executor",
  "sc-network",
  "sc-rpc",
  "sc-rpc-api",
@@ -16725,20 +16461,20 @@ dependencies = [
  "serde_json",
  "simple-mermaid",
  "solochain-template-runtime",
- "sp-api 26.0.0",
- "sp-arithmetic 23.0.0",
+ "sp-api",
+ "sp-arithmetic",
  "sp-core 28.0.0",
  "sp-genesis-builder",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-keyring",
  "sp-offchain",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-runtime-interface 24.0.0",
  "sp-std 14.0.0",
  "sp-storage 19.0.0",
  "sp-tracing 16.0.0",
- "sp-version 29.0.0",
- "sp-weights 27.0.0",
+ "sp-version",
+ "sp-weights",
  "staging-chain-spec-builder",
  "staging-node-cli",
  "staging-parachain-info",
@@ -16797,22 +16533,22 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
- "sp-api 26.0.0",
- "sp-arithmetic 23.0.0",
+ "sp-api",
+ "sp-arithmetic",
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-consensus-grandpa",
  "sp-core 28.0.0",
  "sp-genesis-builder",
  "sp-inherents",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-keyring",
  "sp-offchain",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-session",
  "sp-storage 19.0.0",
  "sp-transaction-pool",
- "sp-version 29.0.0",
+ "sp-version",
 ]
 
 [[package]]
@@ -16886,7 +16622,7 @@ dependencies = [
  "sc-consensus-beefy",
  "sc-consensus-grandpa",
  "sc-consensus-slots",
- "sc-executor 0.32.0",
+ "sc-executor",
  "sc-keystore",
  "sc-network",
  "sc-network-sync",
@@ -16899,7 +16635,7 @@ dependencies = [
  "sc-transaction-pool-api",
  "serde",
  "serde_json",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-authority-discovery",
  "sp-block-builder",
  "sp-blockchain",
@@ -16910,17 +16646,17 @@ dependencies = [
  "sp-core 28.0.0",
  "sp-genesis-builder",
  "sp-inherents",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-keyring",
  "sp-mmr-primitives",
  "sp-offchain",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-session",
  "sp-timestamp",
  "sp-tracing 16.0.0",
  "sp-transaction-pool",
- "sp-version 29.0.0",
- "sp-weights 27.0.0",
+ "sp-version",
+ "sp-weights",
  "staging-xcm",
  "substrate-prometheus-endpoint",
  "tempfile",
@@ -16954,11 +16690,11 @@ dependencies = [
  "rstest",
  "sc-keystore",
  "sc-network",
- "sp-application-crypto 30.0.0",
+ "sp-application-crypto",
  "sp-authority-discovery",
  "sp-core 28.0.0",
  "sp-keyring",
- "sp-keystore 0.34.0",
+ "sp-keystore",
  "sp-tracing 16.0.0",
  "thiserror 1.0.65",
  "tracing-gum",
@@ -17024,13 +16760,13 @@ dependencies = [
  "serde_json",
  "serde_yaml",
  "sha1",
- "sp-application-crypto 30.0.0",
+ "sp-application-crypto",
  "sp-consensus",
  "sp-consensus-babe",
  "sp-core 28.0.0",
  "sp-keyring",
- "sp-keystore 0.34.0",
- "sp-runtime 31.0.1",
+ "sp-keystore",
+ "sp-runtime",
  "sp-timestamp",
  "sp-tracing 16.0.0",
  "strum 0.26.3",
@@ -17053,15 +16789,15 @@ dependencies = [
  "sc-block-builder",
  "sc-consensus",
  "sc-service",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-babe",
  "sp-inherents",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-keyring",
- "sp-runtime 31.0.1",
- "sp-state-machine 0.35.0",
+ "sp-runtime",
+ "sp-state-machine",
  "sp-timestamp",
  "substrate-test-client",
 ]
@@ -17125,7 +16861,7 @@ dependencies = [
  "polkadot-runtime-parachains",
  "scale-info",
  "serde",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-authority-discovery",
  "sp-block-builder",
  "sp-consensus-babe",
@@ -17133,14 +16869,14 @@ dependencies = [
  "sp-core 28.0.0",
  "sp-genesis-builder",
  "sp-inherents",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-mmr-primitives",
  "sp-offchain",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-session",
  "sp-staking",
  "sp-transaction-pool",
- "sp-version 29.0.0",
+ "sp-version",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -17176,15 +16912,15 @@ dependencies = [
  "sc-service",
  "sc-tracing",
  "serde_json",
- "sp-arithmetic 23.0.0",
+ "sp-arithmetic",
  "sp-authority-discovery",
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-babe",
  "sp-core 28.0.0",
  "sp-keyring",
- "sp-runtime 31.0.1",
- "sp-state-machine 0.35.0",
+ "sp-runtime",
+ "sp-state-machine",
  "substrate-test-client",
  "test-runtime-constants",
  "tokio",
@@ -17209,10 +16945,12 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "polkadot-primitives",
+ "sc-executor",
+ "sc-runtime-utilities",
  "serde",
  "serde_json",
+ "sp-io",
  "substrate-build-script-utils",
- "subwasmlib",
  "subxt 0.38.1",
  "tokio",
  "tokio-util",
@@ -17220,19 +16958,6 @@ dependencies = [
  "zombienet-sdk",
 ]
 
-[[package]]
-name = "polkavm"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a3693e5efdb2bf74e449cd25fd777a28bd7ed87e41f5d5da75eb31b4de48b94"
-dependencies = [
- "libc",
- "log",
- "polkavm-assembler 0.9.0",
- "polkavm-common 0.9.0",
- "polkavm-linux-raw 0.9.0",
-]
-
 [[package]]
 name = "polkavm"
 version = "0.26.0"
@@ -17241,18 +16966,9 @@ checksum = "fa028f713d0613f0f08b8b3367402cb859218854f6b96fcbe39a501862894d6f"
 dependencies = [
  "libc",
  "log",
- "polkavm-assembler 0.26.0",
+ "polkavm-assembler",
  "polkavm-common 0.26.0",
- "polkavm-linux-raw 0.26.0",
-]
-
-[[package]]
-name = "polkavm-assembler"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fa96d6d868243acc12de813dd48e756cbadcc8e13964c70d272753266deadc1"
-dependencies = [
- "log",
+ "polkavm-linux-raw",
 ]
 
 [[package]]
@@ -17269,9 +16985,6 @@ name = "polkavm-common"
 version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d9428a5cfcc85c5d7b9fc4b6a18c4b802d0173d768182a51cc7751640f08b92"
-dependencies = [
- "log",
-]
 
 [[package]]
 name = "polkavm-common"
@@ -17281,7 +16994,7 @@ checksum = "49a5794b695626ba70d29e66e3f4f4835767452a6723f3a0bc20884b07088fe8"
 dependencies = [
  "blake3",
  "log",
- "polkavm-assembler 0.26.0",
+ "polkavm-assembler",
 ]
 
 [[package]]
@@ -17362,12 +17075,6 @@ dependencies = [
  "rustc-demangle",
 ]
 
-[[package]]
-name = "polkavm-linux-raw"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26e85d3456948e650dff0cfc85603915847faf893ed1e66b020bb82ef4557120"
-
 [[package]]
 name = "polkavm-linux-raw"
 version = "0.26.0"
@@ -17539,8 +17246,6 @@ checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2"
 dependencies = [
  "fixed-hash",
  "impl-codec 0.6.0",
- "impl-serde 0.4.0",
- "scale-info",
  "uint 0.9.5",
 ]
 
@@ -17554,7 +17259,7 @@ dependencies = [
  "impl-codec 0.7.1",
  "impl-num-traits",
  "impl-rlp",
- "impl-serde 0.5.0",
+ "impl-serde",
  "scale-info",
  "uint 0.10.0",
 ]
@@ -17930,15 +17635,6 @@ version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
-[[package]]
-name = "quick-protobuf"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e489d4a83c17ea69b0291630229b5d4c92a94a3bf0165f7f72f506e94cda8b4b"
-dependencies = [
- "byteorder",
-]
-
 [[package]]
 name = "quick-protobuf"
 version = "0.8.1"
@@ -17956,7 +17652,7 @@ checksum = "15a0580ab32b169745d7a39db2ba969226ca16738931be152a3209b409de2474"
 dependencies = [
  "asynchronous-codec 0.7.0",
  "bytes",
- "quick-protobuf 0.8.1",
+ "quick-protobuf",
  "thiserror 1.0.65",
  "unsigned-varint 0.8.0",
 ]
@@ -17967,7 +17663,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5253a3a0d56548d5b0be25414171dc780cc6870727746d05bd2bde352eee96c5"
 dependencies = [
- "ahash 0.8.11",
+ "ahash",
  "hashbrown 0.13.2",
  "parking_lot 0.12.3",
 ]
@@ -18099,12 +17795,6 @@ dependencies = [
  "rand_core 0.9.1",
 ]
 
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-
 [[package]]
 name = "rand_core"
 version = "0.6.4"
@@ -18402,10 +18092,10 @@ dependencies = [
  "sp-consensus-grandpa",
  "sp-core 28.0.0",
  "sp-rpc",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-std 14.0.0",
- "sp-trie 29.0.0",
- "sp-version 29.0.0",
+ "sp-trie",
+ "sp-version",
  "staging-xcm",
  "thiserror 1.0.65",
  "tokio",
@@ -18427,7 +18117,7 @@ dependencies = [
  "num-traits",
  "parking_lot 0.12.3",
  "serde_json",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-tracing 16.0.0",
  "substrate-prometheus-endpoint",
  "sysinfo",
@@ -18841,7 +18531,7 @@ dependencies = [
  "polkadot-runtime-common",
  "scale-info",
  "serde_json",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core 28.0.0",
@@ -18849,10 +18539,10 @@ dependencies = [
  "sp-inherents",
  "sp-keyring",
  "sp-offchain",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-session",
  "sp-transaction-pool",
- "sp-version 29.0.0",
+ "sp-version",
  "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
@@ -18931,8 +18621,8 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
- "sp-api 26.0.0",
- "sp-arithmetic 23.0.0",
+ "sp-api",
+ "sp-arithmetic",
  "sp-authority-discovery",
  "sp-block-builder",
  "sp-consensus-babe",
@@ -18941,17 +18631,17 @@ dependencies = [
  "sp-core 28.0.0",
  "sp-genesis-builder",
  "sp-inherents",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-keyring",
  "sp-mmr-primitives",
  "sp-offchain",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-session",
  "sp-staking",
  "sp-storage 19.0.0",
  "sp-tracing 16.0.0",
  "sp-transaction-pool",
- "sp-version 29.0.0",
+ "sp-version",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -18969,8 +18659,8 @@ dependencies = [
  "polkadot-runtime-common",
  "smallvec",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
- "sp-weights 27.0.0",
+ "sp-runtime",
+ "sp-weights",
  "staging-xcm",
  "staging-xcm-builder",
 ]
@@ -19239,20 +18929,6 @@ dependencies = [
  "sct",
 ]
 
-[[package]]
-name = "rustls"
-version = "0.22.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
-dependencies = [
- "log",
- "ring 0.17.8",
- "rustls-pki-types",
- "rustls-webpki 0.102.8",
- "subtle 2.5.0",
- "zeroize",
-]
-
 [[package]]
 name = "rustls"
 version = "0.23.18"
@@ -19481,18 +19157,6 @@ dependencies = [
  "thiserror 1.0.65",
 ]
 
-[[package]]
-name = "sc-allocator"
-version = "28.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3f01218e73ea57916be5f08987995ac802d6f4ede4ea5ce0242e468c590e4e2"
-dependencies = [
- "log",
- "sp-core 33.0.1",
- "sp-wasm-interface 21.0.1",
- "thiserror 1.0.65",
-]
-
 [[package]]
 name = "sc-authority-discovery"
 version = "0.34.0"
@@ -19515,12 +19179,12 @@ dependencies = [
  "sc-service",
  "serde",
  "serde_json",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-authority-discovery",
  "sp-blockchain",
  "sp-core 28.0.0",
- "sp-keystore 0.34.0",
- "sp-runtime 31.0.1",
+ "sp-keystore",
+ "sp-runtime",
  "sp-tracing 16.0.0",
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
@@ -19543,12 +19207,12 @@ dependencies = [
  "sc-telemetry",
  "sc-transaction-pool",
  "sc-transaction-pool-api",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-blockchain",
  "sp-consensus",
  "sp-core 28.0.0",
  "sp-inherents",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
 ]
@@ -19558,14 +19222,14 @@ name = "sc-block-builder"
 version = "0.33.0"
 dependencies = [
  "parity-scale-codec",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-block-builder",
  "sp-blockchain",
  "sp-core 28.0.0",
  "sp-inherents",
- "sp-runtime 31.0.1",
- "sp-state-machine 0.35.0",
- "sp-trie 29.0.0",
+ "sp-runtime",
+ "sp-state-machine",
+ "sp-trie",
  "substrate-test-runtime-client",
 ]
 
@@ -19582,21 +19246,21 @@ dependencies = [
  "regex",
  "sc-chain-spec-derive",
  "sc-client-api",
- "sc-executor 0.32.0",
+ "sc-executor",
  "sc-network",
  "sc-telemetry",
  "serde",
  "serde_json",
- "sp-application-crypto 30.0.0",
+ "sp-application-crypto",
  "sp-blockchain",
  "sp-consensus-babe",
  "sp-core 28.0.0",
  "sp-crypto-hashing 0.1.0",
  "sp-genesis-builder",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-keyring",
- "sp-runtime 31.0.1",
- "sp-state-machine 0.35.0",
+ "sp-runtime",
+ "sp-state-machine",
  "sp-tracing 16.0.0",
  "substrate-test-runtime",
 ]
@@ -19645,11 +19309,11 @@ dependencies = [
  "sp-blockchain",
  "sp-core 28.0.0",
  "sp-keyring",
- "sp-keystore 0.34.0",
- "sp-panic-handler 13.0.0",
- "sp-runtime 31.0.1",
+ "sp-keystore",
+ "sp-panic-handler",
+ "sp-runtime",
  "sp-tracing 16.0.0",
- "sp-version 29.0.0",
+ "sp-version",
  "tempfile",
  "thiserror 1.0.65",
  "tokio",
@@ -19664,19 +19328,19 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "parking_lot 0.12.3",
- "sc-executor 0.32.0",
+ "sc-executor",
  "sc-transaction-pool-api",
  "sc-utils",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-blockchain",
  "sp-consensus",
  "sp-core 28.0.0",
  "sp-database",
  "sp-externalities 0.25.0",
- "sp-runtime 31.0.1",
- "sp-state-machine 0.35.0",
+ "sp-runtime",
+ "sp-state-machine",
  "sp-storage 19.0.0",
- "sp-trie 29.0.0",
+ "sp-trie",
  "substrate-prometheus-endpoint",
  "substrate-test-runtime",
 ]
@@ -19701,14 +19365,14 @@ dependencies = [
  "sc-client-api",
  "sc-state-db",
  "schnellru",
- "sp-arithmetic 23.0.0",
+ "sp-arithmetic",
  "sp-blockchain",
  "sp-core 28.0.0",
  "sp-database",
- "sp-runtime 31.0.1",
- "sp-state-machine 0.35.0",
+ "sp-runtime",
+ "sp-state-machine",
  "sp-tracing 16.0.0",
- "sp-trie 29.0.0",
+ "sp-trie",
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
  "sysinfo",
@@ -19731,8 +19395,8 @@ dependencies = [
  "sp-blockchain",
  "sp-consensus",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
- "sp-state-machine 0.35.0",
+ "sp-runtime",
+ "sp-state-machine",
  "sp-test-primitives",
  "substrate-prometheus-endpoint",
  "thiserror 1.0.65",
@@ -19755,8 +19419,8 @@ dependencies = [
  "sc-network",
  "sc-network-test",
  "sc-telemetry",
- "sp-api 26.0.0",
- "sp-application-crypto 30.0.0",
+ "sp-api",
+ "sp-application-crypto",
  "sp-block-builder",
  "sp-blockchain",
  "sp-consensus",
@@ -19765,8 +19429,8 @@ dependencies = [
  "sp-core 28.0.0",
  "sp-inherents",
  "sp-keyring",
- "sp-keystore 0.34.0",
- "sp-runtime 31.0.1",
+ "sp-keystore",
+ "sp-runtime",
  "sp-timestamp",
  "sp-tracing 16.0.0",
  "substrate-prometheus-endpoint",
@@ -19797,8 +19461,8 @@ dependencies = [
  "sc-network-test",
  "sc-telemetry",
  "sc-transaction-pool-api",
- "sp-api 26.0.0",
- "sp-application-crypto 30.0.0",
+ "sp-api",
+ "sp-application-crypto",
  "sp-block-builder",
  "sp-blockchain",
  "sp-consensus",
@@ -19808,8 +19472,8 @@ dependencies = [
  "sp-crypto-hashing 0.1.0",
  "sp-inherents",
  "sp-keyring",
- "sp-keystore 0.34.0",
- "sp-runtime 31.0.1",
+ "sp-keystore",
+ "sp-runtime",
  "sp-timestamp",
  "sp-tracing 16.0.0",
  "substrate-prometheus-endpoint",
@@ -19830,15 +19494,15 @@ dependencies = [
  "sc-rpc-api",
  "sc-transaction-pool-api",
  "serde",
- "sp-api 26.0.0",
- "sp-application-crypto 30.0.0",
+ "sp-api",
+ "sp-application-crypto",
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-babe",
  "sp-core 28.0.0",
  "sp-keyring",
- "sp-keystore 0.34.0",
- "sp-runtime 31.0.1",
+ "sp-keystore",
+ "sp-runtime",
  "substrate-test-runtime-client",
  "thiserror 1.0.65",
  "tokio",
@@ -19865,16 +19529,16 @@ dependencies = [
  "sc-network-types",
  "sc-utils",
  "serde",
- "sp-api 26.0.0",
- "sp-application-crypto 30.0.0",
- "sp-arithmetic 23.0.0",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-arithmetic",
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-beefy",
  "sp-core 28.0.0",
- "sp-keystore 0.34.0",
+ "sp-keystore",
  "sp-mmr-primitives",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-tracing 16.0.0",
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
@@ -19895,10 +19559,10 @@ dependencies = [
  "sc-consensus-beefy",
  "sc-rpc",
  "serde",
- "sp-application-crypto 30.0.0",
+ "sp-application-crypto",
  "sp-consensus-beefy",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "substrate-test-runtime-client",
  "thiserror 1.0.65",
  "tokio",
@@ -19913,14 +19577,14 @@ dependencies = [
  "sc-client-api",
  "sc-consensus",
  "sp-blockchain",
- "sp-runtime 31.0.1",
+ "sp-runtime",
 ]
 
 [[package]]
 name = "sc-consensus-grandpa"
 version = "0.19.0"
 dependencies = [
- "ahash 0.8.11",
+ "ahash",
  "array-bytes 6.2.2",
  "assert_matches",
  "async-trait",
@@ -19947,17 +19611,17 @@ dependencies = [
  "sc-transaction-pool-api",
  "sc-utils",
  "serde_json",
- "sp-api 26.0.0",
- "sp-application-crypto 30.0.0",
- "sp-arithmetic 23.0.0",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-arithmetic",
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-grandpa",
  "sp-core 28.0.0",
  "sp-crypto-hashing 0.1.0",
  "sp-keyring",
- "sp-keystore 0.34.0",
- "sp-runtime 31.0.1",
+ "sp-keystore",
+ "sp-runtime",
  "sp-tracing 16.0.0",
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
@@ -19983,7 +19647,7 @@ dependencies = [
  "sp-consensus-grandpa",
  "sp-core 28.0.0",
  "sp-keyring",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "substrate-test-runtime-client",
  "thiserror 1.0.65",
  "tokio",
@@ -20009,7 +19673,7 @@ dependencies = [
  "sc-transaction-pool",
  "sc-transaction-pool-api",
  "serde",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-aura",
@@ -20017,8 +19681,8 @@ dependencies = [
  "sp-consensus-slots",
  "sp-core 28.0.0",
  "sp-inherents",
- "sp-keystore 0.34.0",
- "sp-runtime 31.0.1",
+ "sp-keystore",
+ "sp-runtime",
  "sp-timestamp",
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
@@ -20039,14 +19703,14 @@ dependencies = [
  "parking_lot 0.12.3",
  "sc-client-api",
  "sc-consensus",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-block-builder",
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-pow",
  "sp-core 28.0.0",
  "sp-inherents",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "substrate-prometheus-endpoint",
  "thiserror 1.0.65",
 ]
@@ -20063,14 +19727,14 @@ dependencies = [
  "sc-client-api",
  "sc-consensus",
  "sc-telemetry",
- "sp-arithmetic 23.0.0",
+ "sp-arithmetic",
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-slots",
  "sp-core 28.0.0",
  "sp-inherents",
- "sp-runtime 31.0.1",
- "sp-state-machine 0.35.0",
+ "sp-runtime",
+ "sp-state-machine",
  "substrate-test-runtime-client",
 ]
 
@@ -20085,25 +19749,25 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.3",
  "paste",
- "sc-executor-common 0.29.0",
- "sc-executor-polkavm 0.29.0",
- "sc-executor-wasmtime 0.29.0",
+ "sc-executor-common",
+ "sc-executor-polkavm",
+ "sc-executor-wasmtime",
  "sc-runtime-test",
  "sc-tracing",
  "schnellru",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-core 28.0.0",
  "sp-crypto-hashing 0.1.0",
  "sp-externalities 0.25.0",
- "sp-io 30.0.0",
- "sp-maybe-compressed-blob 11.0.0",
- "sp-panic-handler 13.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-maybe-compressed-blob",
+ "sp-panic-handler",
+ "sp-runtime",
  "sp-runtime-interface 24.0.0",
- "sp-state-machine 0.35.0",
+ "sp-state-machine",
  "sp-tracing 16.0.0",
- "sp-trie 29.0.0",
- "sp-version 29.0.0",
+ "sp-trie",
+ "sp-version",
  "sp-wasm-interface 20.0.0",
  "substrate-test-runtime",
  "tempfile",
@@ -20112,78 +19776,28 @@ dependencies = [
  "wat",
 ]
 
-[[package]]
-name = "sc-executor"
-version = "0.38.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "321e9431a3d5c95514b1ba775dd425efd4b18bd79dfdb6d8e397f0c96d6831e9"
-dependencies = [
- "parity-scale-codec",
- "parking_lot 0.12.3",
- "sc-executor-common 0.34.0",
- "sc-executor-polkavm 0.31.0",
- "sc-executor-wasmtime 0.34.0",
- "schnellru",
- "sp-api 32.0.0",
- "sp-core 33.0.1",
- "sp-externalities 0.28.0",
- "sp-io 36.0.0",
- "sp-panic-handler 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-runtime-interface 27.0.0",
- "sp-trie 35.0.0",
- "sp-version 35.0.0",
- "sp-wasm-interface 21.0.1",
- "tracing",
-]
-
 [[package]]
 name = "sc-executor-common"
 version = "0.29.0"
 dependencies = [
- "polkavm 0.26.0",
- "sc-allocator 23.0.0",
- "sp-maybe-compressed-blob 11.0.0",
+ "polkavm",
+ "sc-allocator",
+ "sp-maybe-compressed-blob",
  "sp-wasm-interface 20.0.0",
  "thiserror 1.0.65",
  "wasm-instrument",
 ]
 
-[[package]]
-name = "sc-executor-common"
-version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aad16187c613f81feab35f0d6c12c15c1d88eea0794c886b5dca3495d26746de"
-dependencies = [
- "polkavm 0.9.3",
- "sc-allocator 28.0.0",
- "sp-maybe-compressed-blob 11.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-wasm-interface 21.0.1",
- "thiserror 1.0.65",
- "wasm-instrument",
-]
-
 [[package]]
 name = "sc-executor-polkavm"
 version = "0.29.0"
 dependencies = [
  "log",
- "polkavm 0.26.0",
- "sc-executor-common 0.29.0",
+ "polkavm",
+ "sc-executor-common",
  "sp-wasm-interface 20.0.0",
 ]
 
-[[package]]
-name = "sc-executor-polkavm"
-version = "0.31.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db336a08ea53b6a89972a6ad6586e664c15db2add9d1cfb508afc768de387304"
-dependencies = [
- "log",
- "polkavm 0.9.3",
- "sc-executor-common 0.34.0",
- "sp-wasm-interface 21.0.1",
-]
-
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.29.0"
@@ -20195,10 +19809,10 @@ dependencies = [
  "parking_lot 0.12.3",
  "paste",
  "rustix 0.36.15",
- "sc-allocator 23.0.0",
- "sc-executor-common 0.29.0",
+ "sc-allocator",
+ "sc-executor-common",
  "sc-runtime-test",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-runtime-interface 24.0.0",
  "sp-wasm-interface 20.0.0",
  "tempfile",
@@ -20206,25 +19820,6 @@ dependencies = [
  "wat",
 ]
 
-[[package]]
-name = "sc-executor-wasmtime"
-version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b97b324b2737447b7b208e913fef4988d5c38ecc21f57c3dd33e3f1e1e3bb08"
-dependencies = [
- "anyhow",
- "cfg-if",
- "libc",
- "log",
- "parking_lot 0.12.3",
- "rustix 0.36.15",
- "sc-allocator 28.0.0",
- "sc-executor-common 0.34.0",
- "sp-runtime-interface 27.0.0",
- "sp-wasm-interface 21.0.1",
- "wasmtime",
-]
-
 [[package]]
 name = "sc-informant"
 version = "0.33.0"
@@ -20237,7 +19832,7 @@ dependencies = [
  "sc-network",
  "sc-network-sync",
  "sp-blockchain",
- "sp-runtime 31.0.1",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -20247,9 +19842,9 @@ dependencies = [
  "array-bytes 6.2.2",
  "parking_lot 0.12.3",
  "serde_json",
- "sp-application-crypto 30.0.0",
+ "sp-application-crypto",
  "sp-core 28.0.0",
- "sp-keystore 0.34.0",
+ "sp-keystore",
  "tempfile",
  "thiserror 1.0.65",
 ]
@@ -20272,12 +19867,12 @@ dependencies = [
  "sc-network",
  "sc-network-types",
  "sc-transaction-pool-api",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-consensus",
  "sp-core 28.0.0",
- "sp-keystore 0.34.0",
+ "sp-keystore",
  "sp-mixnet",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "thiserror 1.0.65",
 ]
 
@@ -20320,12 +19915,12 @@ dependencies = [
  "serde",
  "serde_json",
  "smallvec",
- "sp-arithmetic 23.0.0",
+ "sp-arithmetic",
  "sp-blockchain",
  "sp-consensus",
  "sp-core 28.0.0",
  "sp-crypto-hashing 0.1.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-tracing 16.0.0",
  "substrate-prometheus-endpoint",
  "substrate-test-runtime",
@@ -20347,14 +19942,14 @@ version = "0.33.0"
 dependencies = [
  "bitflags 1.3.2",
  "parity-scale-codec",
- "sp-runtime 31.0.1",
+ "sp-runtime",
 ]
 
 [[package]]
 name = "sc-network-gossip"
 version = "0.34.0"
 dependencies = [
- "ahash 0.8.11",
+ "ahash",
  "async-trait",
  "futures",
  "futures-timer",
@@ -20366,7 +19961,7 @@ dependencies = [
  "sc-network-sync",
  "sc-network-types",
  "schnellru",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
  "tokio",
@@ -20389,7 +19984,7 @@ dependencies = [
  "sc-network-types",
  "sp-blockchain",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "thiserror 1.0.65",
 ]
 
@@ -20407,7 +20002,7 @@ dependencies = [
  "sc-network-sync",
  "sc-network-types",
  "sp-consensus",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-statement-store",
  "substrate-prometheus-endpoint",
 ]
@@ -20436,12 +20031,12 @@ dependencies = [
  "sc-utils",
  "schnellru",
  "smallvec",
- "sp-arithmetic 23.0.0",
+ "sp-arithmetic",
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-grandpa",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-test-primitives",
  "sp-tracing 16.0.0",
  "substrate-prometheus-endpoint",
@@ -20476,7 +20071,7 @@ dependencies = [
  "sp-blockchain",
  "sp-consensus",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-tracing 16.0.0",
  "substrate-test-runtime",
  "substrate-test-runtime-client",
@@ -20497,7 +20092,7 @@ dependencies = [
  "sc-network-types",
  "sc-utils",
  "sp-consensus",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "substrate-prometheus-endpoint",
 ]
 
@@ -20549,13 +20144,13 @@ dependencies = [
  "sc-transaction-pool",
  "sc-transaction-pool-api",
  "sc-utils",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-consensus",
  "sp-core 28.0.0",
  "sp-externalities 0.25.0",
- "sp-keystore 0.34.0",
+ "sp-keystore",
  "sp-offchain",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-tracing 16.0.0",
  "substrate-test-runtime-client",
  "threadpool",
@@ -20593,18 +20188,18 @@ dependencies = [
  "sc-transaction-pool-api",
  "sc-utils",
  "serde_json",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-blockchain",
  "sp-consensus",
  "sp-core 28.0.0",
  "sp-crypto-hashing 0.1.0",
- "sp-keystore 0.34.0",
+ "sp-keystore",
  "sp-offchain",
  "sp-rpc",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-session",
  "sp-statement-store",
- "sp-version 29.0.0",
+ "sp-version",
  "substrate-test-runtime-client",
  "tokio",
 ]
@@ -20623,8 +20218,8 @@ dependencies = [
  "serde_json",
  "sp-core 28.0.0",
  "sp-rpc",
- "sp-runtime 31.0.1",
- "sp-version 29.0.0",
+ "sp-runtime",
+ "sp-version",
  "thiserror 1.0.65",
 ]
 
@@ -20679,15 +20274,15 @@ dependencies = [
  "schnellru",
  "serde",
  "serde_json",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-blockchain",
  "sp-consensus",
  "sp-core 28.0.0",
  "sp-externalities 0.25.0",
- "sp-maybe-compressed-blob 11.0.0",
+ "sp-maybe-compressed-blob",
  "sp-rpc",
- "sp-runtime 31.0.1",
- "sp-version 29.0.0",
+ "sp-runtime",
+ "sp-version",
  "substrate-prometheus-endpoint",
  "substrate-test-runtime",
  "substrate-test-runtime-client",
@@ -20702,8 +20297,8 @@ name = "sc-runtime-test"
 version = "2.0.0"
 dependencies = [
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-runtime-interface 24.0.0",
  "substrate-wasm-builder",
 ]
@@ -20715,13 +20310,13 @@ dependencies = [
  "cumulus-primitives-proof-size-hostfunction",
  "cumulus-test-runtime",
  "parity-scale-codec",
- "sc-executor 0.32.0",
- "sc-executor-common 0.29.0",
+ "sc-executor",
+ "sc-executor-common",
  "sp-core 28.0.0",
  "sp-crypto-hashing 0.1.0",
- "sp-io 30.0.0",
- "sp-state-machine 0.35.0",
- "sp-version 29.0.0",
+ "sp-io",
+ "sp-state-machine",
+ "sp-version",
  "sp-wasm-interface 20.0.0",
  "subxt 0.41.0",
  "thiserror 1.0.65",
@@ -20746,7 +20341,7 @@ dependencies = [
  "sc-client-api",
  "sc-client-db",
  "sc-consensus",
- "sc-executor 0.32.0",
+ "sc-executor",
  "sc-informant",
  "sc-keystore",
  "sc-network",
@@ -20767,20 +20362,20 @@ dependencies = [
  "schnellru",
  "serde",
  "serde_json",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-blockchain",
  "sp-consensus",
  "sp-core 28.0.0",
  "sp-externalities 0.25.0",
- "sp-keystore 0.34.0",
- "sp-runtime 31.0.1",
+ "sp-keystore",
+ "sp-runtime",
  "sp-session",
- "sp-state-machine 0.35.0",
+ "sp-state-machine",
  "sp-storage 19.0.0",
  "sp-transaction-pool",
  "sp-transaction-storage-proof",
- "sp-trie 29.0.0",
- "sp-version 29.0.0",
+ "sp-trie",
+ "sp-version",
  "static_init",
  "substrate-prometheus-endpoint",
  "substrate-test-runtime",
@@ -20807,18 +20402,18 @@ dependencies = [
  "sc-client-api",
  "sc-client-db",
  "sc-consensus",
- "sc-executor 0.32.0",
+ "sc-executor",
  "sc-network",
  "sc-network-sync",
  "sc-service",
  "sc-transaction-pool-api",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-blockchain",
  "sp-consensus",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
- "sp-state-machine 0.35.0",
+ "sp-io",
+ "sp-runtime",
+ "sp-state-machine",
  "sp-storage 19.0.0",
  "sp-tracing 16.0.0",
  "substrate-test-runtime",
@@ -20846,10 +20441,10 @@ dependencies = [
  "parking_lot 0.12.3",
  "sc-client-api",
  "sc-keystore",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-blockchain",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-statement-store",
  "sp-tracing 16.0.0",
  "substrate-prometheus-endpoint",
@@ -20883,7 +20478,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sp-blockchain",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "thiserror 1.0.65",
 ]
 
@@ -20903,8 +20498,8 @@ dependencies = [
  "serde_json",
  "sp-core 28.0.0",
  "sp-crypto-hashing 0.1.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -20942,11 +20537,11 @@ dependencies = [
  "sc-client-api",
  "sc-tracing-proc-macro",
  "serde",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-blockchain",
  "sp-core 28.0.0",
  "sp-rpc",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-tracing 16.0.0",
  "thiserror 1.0.65",
  "tracing",
@@ -20989,12 +20584,12 @@ dependencies = [
  "sc-utils",
  "serde",
  "serde_json",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-blockchain",
  "sp-consensus",
  "sp-core 28.0.0",
  "sp-crypto-hashing 0.1.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-tracing 16.0.0",
  "sp-transaction-pool",
  "substrate-prometheus-endpoint",
@@ -21024,7 +20619,7 @@ dependencies = [
  "serde_json",
  "sp-blockchain",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "thiserror 1.0.65",
 ]
 
@@ -21038,7 +20633,7 @@ dependencies = [
  "log",
  "parking_lot 0.12.3",
  "prometheus",
- "sp-arithmetic 23.0.0",
+ "sp-arithmetic",
  "tokio-test",
 ]
 
@@ -21316,7 +20911,7 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c9a8ef13a93c54d20580de1e5c413e624e53121d42fc7e2c11d10ef7f8b02367"
 dependencies = [
- "ahash 0.8.11",
+ "ahash",
  "cfg-if",
  "hashbrown 0.13.2",
 ]
@@ -21347,7 +20942,7 @@ dependencies = [
  "aead",
  "arrayref",
  "arrayvec 0.7.4",
- "curve25519-dalek 4.1.3",
+ "curve25519-dalek",
  "getrandom_or_panic",
  "merlin",
  "rand_core 0.6.4",
@@ -21760,18 +21355,6 @@ dependencies = [
  "digest 0.10.7",
 ]
 
-[[package]]
-name = "sha3"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809"
-dependencies = [
- "block-buffer 0.9.0",
- "digest 0.9.0",
- "keccak",
- "opaque-debug 0.3.0",
-]
-
 [[package]]
 name = "sha3"
 version = "0.10.8"
@@ -21898,7 +21481,7 @@ dependencies = [
  "enumn",
  "parity-scale-codec",
  "paste",
- "sp-runtime 31.0.1",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -21989,7 +21572,7 @@ dependencies = [
  "chacha20",
  "crossbeam-queue",
  "derive_more 0.99.17",
- "ed25519-zebra 4.0.3",
+ "ed25519-zebra",
  "either",
  "event-listener 2.5.3",
  "fnv",
@@ -22016,7 +21599,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2 0.10.9",
- "sha3 0.10.8",
+ "sha3",
  "siphasher 0.3.11",
  "slab",
  "smallvec",
@@ -22043,7 +21626,7 @@ dependencies = [
  "chacha20",
  "crossbeam-queue",
  "derive_more 0.99.17",
- "ed25519-zebra 4.0.3",
+ "ed25519-zebra",
  "either",
  "event-listener 5.3.1",
  "fnv",
@@ -22070,7 +21653,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2 0.10.9",
- "sha3 0.10.8",
+ "sha3",
  "siphasher 1.0.1",
  "slab",
  "smallvec",
@@ -22168,7 +21751,7 @@ dependencies = [
  "aes-gcm",
  "blake2 0.10.6",
  "chacha20poly1305",
- "curve25519-dalek 4.1.3",
+ "curve25519-dalek",
  "rand_core 0.6.4",
  "ring 0.17.8",
  "rustc_version 0.4.0",
@@ -22201,8 +21784,8 @@ dependencies = [
  "snowbridge-ethereum",
  "snowbridge-milagro-bls",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-std 14.0.0",
  "ssz_rs",
  "ssz_rs_derive",
@@ -22221,10 +21804,10 @@ dependencies = [
  "polkadot-parachain-primitives",
  "scale-info",
  "serde",
- "sp-arithmetic 23.0.0",
+ "sp-arithmetic",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-std 14.0.0",
  "staging-xcm",
  "staging-xcm-builder",
@@ -22245,8 +21828,8 @@ dependencies = [
  "scale-info",
  "serde",
  "serde-big-array",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-std 14.0.0",
 ]
 
@@ -22266,8 +21849,8 @@ dependencies = [
  "snowbridge-test-utils",
  "snowbridge-verification-primitives",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-std 14.0.0",
  "staging-xcm",
  "staging-xcm-builder",
@@ -22285,7 +21868,7 @@ dependencies = [
  "scale-info",
  "sp-core 28.0.0",
  "sp-crypto-hashing 0.1.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-tracing 16.0.0",
 ]
 
@@ -22319,10 +21902,10 @@ dependencies = [
  "scale-info",
  "snowbridge-core",
  "snowbridge-verification-primitives",
- "sp-arithmetic 23.0.0",
+ "sp-arithmetic",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-std 14.0.0",
  "staging-xcm",
  "staging-xcm-builder",
@@ -22338,7 +21921,7 @@ dependencies = [
  "snowbridge-core",
  "snowbridge-merkle-tree",
  "snowbridge-outbound-queue-primitives",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-std 14.0.0",
 ]
 
@@ -22350,7 +21933,7 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "snowbridge-merkle-tree",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-std 14.0.0",
 ]
 
@@ -22374,8 +21957,8 @@ dependencies = [
  "snowbridge-pallet-ethereum-client-fixtures",
  "snowbridge-verification-primitives",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-std 14.0.0",
  "static_assertions",
 ]
@@ -22411,9 +21994,9 @@ dependencies = [
  "snowbridge-pallet-ethereum-client",
  "snowbridge-pallet-inbound-queue-fixtures",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-keyring",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-std 14.0.0",
  "staging-xcm",
  "staging-xcm-executor",
@@ -22452,9 +22035,9 @@ dependencies = [
  "snowbridge-pallet-inbound-queue-v2-fixtures",
  "snowbridge-test-utils",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-keyring",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-std 14.0.0",
  "staging-xcm",
  "staging-xcm-builder",
@@ -22490,10 +22073,10 @@ dependencies = [
  "snowbridge-core",
  "snowbridge-merkle-tree",
  "snowbridge-outbound-queue-primitives",
- "sp-arithmetic 23.0.0",
+ "sp-arithmetic",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-std 14.0.0",
 ]
 
@@ -22519,10 +22102,10 @@ dependencies = [
  "snowbridge-outbound-queue-primitives",
  "snowbridge-test-utils",
  "snowbridge-verification-primitives",
- "sp-arithmetic 23.0.0",
+ "sp-arithmetic",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-std 14.0.0",
  "staging-xcm",
  "staging-xcm-builder",
@@ -22548,8 +22131,8 @@ dependencies = [
  "snowbridge-outbound-queue-primitives",
  "snowbridge-pallet-outbound-queue",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-std 14.0.0",
  "staging-xcm",
  "staging-xcm-executor",
@@ -22570,9 +22153,9 @@ dependencies = [
  "snowbridge-core",
  "snowbridge-test-utils",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-keyring",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-std 14.0.0",
  "staging-xcm",
  "staging-xcm-executor",
@@ -22596,9 +22179,9 @@ dependencies = [
  "snowbridge-pallet-system",
  "snowbridge-test-utils",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-keyring",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-std 14.0.0",
  "staging-xcm",
  "staging-xcm-executor",
@@ -22614,9 +22197,7 @@ dependencies = [
  "log",
  "pallet-xcm",
  "parity-scale-codec",
- "snowbridge-core",
- "snowbridge-outbound-queue-primitives",
- "sp-arithmetic 23.0.0",
+ "sp-arithmetic",
  "sp-std 14.0.0",
  "staging-xcm",
  "staging-xcm-builder",
@@ -22645,9 +22226,9 @@ dependencies = [
  "snowbridge-pallet-outbound-queue",
  "snowbridge-pallet-system",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-keyring",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-executor",
@@ -22659,7 +22240,7 @@ version = "0.2.0"
 dependencies = [
  "parity-scale-codec",
  "snowbridge-core",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-std 14.0.0",
  "staging-xcm",
 ]
@@ -22670,7 +22251,7 @@ version = "0.2.0"
 dependencies = [
  "parity-scale-codec",
  "snowbridge-core",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-std 14.0.0",
  "staging-xcm",
 ]
@@ -22685,7 +22266,6 @@ dependencies = [
  "frame-system",
  "log",
  "pallet-asset-conversion",
- "pallet-xcm",
  "parity-scale-codec",
  "scale-info",
  "snowbridge-core",
@@ -22777,7 +22357,7 @@ dependencies = [
  "sc-consensus",
  "sc-consensus-aura",
  "sc-consensus-grandpa",
- "sc-executor 0.32.0",
+ "sc-executor",
  "sc-network",
  "sc-offchain",
  "sc-service",
@@ -22785,16 +22365,16 @@ dependencies = [
  "sc-transaction-pool",
  "sc-transaction-pool-api",
  "solochain-template-runtime",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-block-builder",
  "sp-blockchain",
  "sp-consensus-aura",
  "sp-core 28.0.0",
  "sp-genesis-builder",
  "sp-inherents",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-keyring",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-timestamp",
  "substrate-build-script-utils",
  "substrate-frame-rpc-system",
@@ -22823,7 +22403,7 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde_json",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-consensus-grandpa",
@@ -22832,11 +22412,11 @@ dependencies = [
  "sp-inherents",
  "sp-keyring",
  "sp-offchain",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-session",
  "sp-storage 19.0.0",
  "sp-transaction-pool",
- "sp-version 29.0.0",
+ "sp-version",
  "substrate-wasm-builder",
 ]
 
@@ -22849,39 +22429,16 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "scale-info",
- "sp-api-proc-macro 15.0.0",
+ "sp-api-proc-macro",
  "sp-core 28.0.0",
  "sp-externalities 0.25.0",
- "sp-metadata-ir 0.6.0",
- "sp-runtime 31.0.1",
+ "sp-metadata-ir",
+ "sp-runtime",
  "sp-runtime-interface 24.0.0",
- "sp-state-machine 0.35.0",
+ "sp-state-machine",
  "sp-test-primitives",
- "sp-trie 29.0.0",
- "sp-version 29.0.0",
- "thiserror 1.0.65",
-]
-
-[[package]]
-name = "sp-api"
-version = "32.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f84f09c4b928e814e07dede0ece91f1f6eae1bff946a0e5e4a76bed19a095f1"
-dependencies = [
- "hash-db",
- "log",
- "parity-scale-codec",
- "scale-info",
- "sp-api-proc-macro 19.0.0",
- "sp-core 33.0.1",
- "sp-externalities 0.28.0",
- "sp-metadata-ir 0.7.0",
- "sp-runtime 37.0.0",
- "sp-runtime-interface 27.0.0",
- "sp-state-machine 0.41.0",
- "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-trie 35.0.0",
- "sp-version 35.0.0",
+ "sp-trie",
+ "sp-version",
  "thiserror 1.0.65",
 ]
 
@@ -22899,21 +22456,6 @@ dependencies = [
  "syn 2.0.98",
 ]
 
-[[package]]
-name = "sp-api-proc-macro"
-version = "19.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213a4bec1b18bd0750e7b81d11d8276c24f68b53cde83950b00b178ecc9ab24a"
-dependencies = [
- "Inflector",
- "blake2 0.10.6",
- "expander",
- "proc-macro-crate 3.1.0",
- "proc-macro2 1.0.95",
- "quote 1.0.40",
- "syn 2.0.98",
-]
-
 [[package]]
 name = "sp-api-test"
 version = "2.0.1"
@@ -22925,14 +22467,14 @@ dependencies = [
  "rustversion",
  "sc-block-builder",
  "scale-info",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-consensus",
  "sp-core 28.0.0",
- "sp-metadata-ir 0.6.0",
- "sp-runtime 31.0.1",
- "sp-state-machine 0.35.0",
+ "sp-metadata-ir",
+ "sp-runtime",
+ "sp-state-machine",
  "sp-tracing 16.0.0",
- "sp-version 29.0.0",
+ "sp-version",
  "static_assertions",
  "substrate-test-runtime-client",
  "trybuild",
@@ -22946,45 +22488,17 @@ dependencies = [
  "scale-info",
  "serde",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
-]
-
-[[package]]
-name = "sp-application-crypto"
-version = "35.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57541120624a76379cc993cbb85064a5148957a92da032567e54bce7977f51fc"
-dependencies = [
- "parity-scale-codec",
- "scale-info",
- "serde",
- "sp-core 32.0.0",
- "sp-io 35.0.0",
- "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "sp-application-crypto"
-version = "36.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "296282f718f15d4d812664415942665302a484d3495cf8d2e2ab3192b32d2c73"
-dependencies = [
- "parity-scale-codec",
- "scale-info",
- "serde",
- "sp-core 33.0.1",
- "sp-io 36.0.0",
- "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sp-io",
 ]
 
 [[package]]
 name = "sp-application-crypto-test"
 version = "2.0.0"
 dependencies = [
- "sp-api 26.0.0",
- "sp-application-crypto 30.0.0",
+ "sp-api",
+ "sp-application-crypto",
  "sp-core 28.0.0",
- "sp-keystore 0.34.0",
+ "sp-keystore",
  "sp-tracing 16.0.0",
  "substrate-test-runtime-client",
 ]
@@ -23006,22 +22520,6 @@ dependencies = [
  "static_assertions",
 ]
 
-[[package]]
-name = "sp-arithmetic"
-version = "26.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46d0d0a4c591c421d3231ddd5e27d828618c24456d51445d21a1f79fcee97c23"
-dependencies = [
- "docify",
- "integer-sqrt",
- "num-traits",
- "parity-scale-codec",
- "scale-info",
- "serde",
- "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "static_assertions",
-]
-
 [[package]]
 name = "sp-arithmetic-fuzzer"
 version = "2.0.0"
@@ -23030,7 +22528,7 @@ dependencies = [
  "fraction",
  "honggfuzz",
  "num-bigint",
- "sp-arithmetic 23.0.0",
+ "sp-arithmetic",
 ]
 
 [[package]]
@@ -23039,18 +22537,18 @@ version = "26.0.0"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
- "sp-api 26.0.0",
- "sp-application-crypto 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-runtime",
 ]
 
 [[package]]
 name = "sp-block-builder"
 version = "26.0.0"
 dependencies = [
- "sp-api 26.0.0",
+ "sp-api",
  "sp-inherents",
- "sp-runtime 31.0.1",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -23061,12 +22559,12 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.3",
  "schnellru",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-consensus",
  "sp-core 28.0.0",
  "sp-database",
- "sp-runtime 31.0.1",
- "sp-state-machine 0.35.0",
+ "sp-runtime",
+ "sp-state-machine",
  "thiserror 1.0.65",
  "tracing",
 ]
@@ -23079,8 +22577,8 @@ dependencies = [
  "futures",
  "log",
  "sp-inherents",
- "sp-runtime 31.0.1",
- "sp-state-machine 0.35.0",
+ "sp-runtime",
+ "sp-state-machine",
  "thiserror 1.0.65",
 ]
 
@@ -23091,11 +22589,11 @@ dependencies = [
  "async-trait",
  "parity-scale-codec",
  "scale-info",
- "sp-api 26.0.0",
- "sp-application-crypto 30.0.0",
+ "sp-api",
+ "sp-application-crypto",
  "sp-consensus-slots",
  "sp-inherents",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-timestamp",
 ]
 
@@ -23107,12 +22605,12 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
- "sp-api 26.0.0",
- "sp-application-crypto 30.0.0",
+ "sp-api",
+ "sp-application-crypto",
  "sp-consensus-slots",
  "sp-core 28.0.0",
  "sp-inherents",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-timestamp",
 ]
 
@@ -23124,15 +22622,15 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
- "sp-api 26.0.0",
- "sp-application-crypto 30.0.0",
+ "sp-api",
+ "sp-application-crypto",
  "sp-core 28.0.0",
  "sp-crypto-hashing 0.1.0",
- "sp-io 30.0.0",
- "sp-keystore 0.34.0",
+ "sp-io",
+ "sp-keystore",
  "sp-mmr-primitives",
- "sp-runtime 31.0.1",
- "sp-weights 27.0.0",
+ "sp-runtime",
+ "sp-weights",
  "strum 0.26.3",
  "w3f-bls",
 ]
@@ -23146,11 +22644,11 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
- "sp-api 26.0.0",
- "sp-application-crypto 30.0.0",
+ "sp-api",
+ "sp-application-crypto",
  "sp-core 28.0.0",
- "sp-keystore 0.34.0",
- "sp-runtime 31.0.1",
+ "sp-keystore",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -23158,9 +22656,9 @@ name = "sp-consensus-pow"
 version = "0.32.0"
 dependencies = [
  "parity-scale-codec",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -23170,11 +22668,11 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
- "sp-api 26.0.0",
- "sp-application-crypto 30.0.0",
+ "sp-api",
+ "sp-application-crypto",
  "sp-consensus-slots",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -23198,13 +22696,12 @@ dependencies = [
  "bounded-collections 0.3.2",
  "bs58",
  "criterion",
- "dyn-clonable",
  "dyn-clone",
- "ed25519-zebra 4.0.3",
+ "ed25519-zebra",
  "futures",
  "hash-db",
  "hash256-std-hasher",
- "impl-serde 0.5.0",
+ "impl-serde",
  "itertools 0.11.0",
  "k256",
  "libsecp256k1",
@@ -23227,7 +22724,6 @@ dependencies = [
  "sp-crypto-hashing 0.1.0",
  "sp-debug-derive 14.0.0",
  "sp-externalities 0.25.0",
- "sp-runtime-interface 24.0.0",
  "sp-std 14.0.0",
  "sp-storage 19.0.0",
  "ss58-registry",
@@ -23240,9 +22736,9 @@ dependencies = [
 
 [[package]]
 name = "sp-core"
-version = "32.0.0"
+version = "35.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2dac7e47c7ddbb61efe196d5cce99f6ea88926c961fa39909bfeae46fc5a7b"
+checksum = "4532774405a712a366a98080cbb4daa28c38ddff0ec595902ad6ee6a78a809f8"
 dependencies = [
  "array-bytes 6.2.2",
  "bitflags 1.3.2",
@@ -23250,12 +22746,12 @@ dependencies = [
  "bounded-collections 0.2.3",
  "bs58",
  "dyn-clonable",
- "ed25519-zebra 3.1.0",
+ "ed25519-zebra",
  "futures",
  "hash-db",
  "hash256-std-hasher",
- "impl-serde 0.4.0",
- "itertools 0.10.5",
+ "impl-serde",
+ "itertools 0.11.0",
  "k256",
  "libsecp256k1",
  "log",
@@ -23264,7 +22760,7 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.3",
  "paste",
- "primitive-types 0.12.2",
+ "primitive-types 0.13.1",
  "rand 0.8.5",
  "scale-info",
  "schnorrkel 0.11.4",
@@ -23273,10 +22769,10 @@ dependencies = [
  "serde",
  "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "sp-debug-derive 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-externalities 0.28.0",
- "sp-runtime-interface 27.0.0",
+ "sp-externalities 0.30.0",
+ "sp-runtime-interface 29.0.0",
  "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-storage 21.0.0",
+ "sp-storage 22.0.0",
  "ss58-registry",
  "substrate-bip39 0.6.0",
  "thiserror 1.0.65",
@@ -23286,111 +22782,17 @@ dependencies = [
 ]
 
 [[package]]
-name = "sp-core"
-version = "33.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3368e32f6fda6e20b8af51f94308d033ab70a021e87f6abbd3fed5aca942b745"
+name = "sp-core-fuzz"
+version = "0.0.0"
 dependencies = [
- "array-bytes 6.2.2",
- "bitflags 1.3.2",
- "blake2 0.10.6",
- "bounded-collections 0.2.3",
- "bs58",
- "dyn-clonable",
- "ed25519-zebra 4.0.3",
- "futures",
- "hash-db",
- "hash256-std-hasher",
- "impl-serde 0.4.0",
- "itertools 0.11.0",
- "k256",
- "libsecp256k1",
- "log",
- "merlin",
- "parity-bip39",
- "parity-scale-codec",
- "parking_lot 0.12.3",
- "paste",
- "primitive-types 0.12.2",
- "rand 0.8.5",
- "scale-info",
- "schnorrkel 0.11.4",
- "secp256k1 0.28.2",
- "secrecy 0.8.0",
- "serde",
- "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-debug-derive 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-externalities 0.28.0",
- "sp-runtime-interface 27.0.0",
- "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-storage 21.0.0",
- "ss58-registry",
- "substrate-bip39 0.6.0",
- "thiserror 1.0.65",
- "tracing",
- "w3f-bls",
- "zeroize",
+ "libfuzzer-sys",
+ "regex",
+ "sp-core 28.0.0",
 ]
 
 [[package]]
-name = "sp-core"
-version = "35.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4532774405a712a366a98080cbb4daa28c38ddff0ec595902ad6ee6a78a809f8"
-dependencies = [
- "array-bytes 6.2.2",
- "bitflags 1.3.2",
- "blake2 0.10.6",
- "bounded-collections 0.2.3",
- "bs58",
- "dyn-clonable",
- "ed25519-zebra 4.0.3",
- "futures",
- "hash-db",
- "hash256-std-hasher",
- "impl-serde 0.5.0",
- "itertools 0.11.0",
- "k256",
- "libsecp256k1",
- "log",
- "merlin",
- "parity-bip39",
- "parity-scale-codec",
- "parking_lot 0.12.3",
- "paste",
- "primitive-types 0.13.1",
- "rand 0.8.5",
- "scale-info",
- "schnorrkel 0.11.4",
- "secp256k1 0.28.2",
- "secrecy 0.8.0",
- "serde",
- "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-debug-derive 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-externalities 0.30.0",
- "sp-runtime-interface 29.0.0",
- "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-storage 22.0.0",
- "ss58-registry",
- "substrate-bip39 0.6.0",
- "thiserror 1.0.65",
- "tracing",
- "w3f-bls",
- "zeroize",
-]
-
-[[package]]
-name = "sp-core-fuzz"
-version = "0.0.0"
-dependencies = [
- "libfuzzer-sys",
- "regex",
- "sp-core 28.0.0",
-]
-
-[[package]]
-name = "sp-core-hashing"
-version = "15.0.0"
+name = "sp-core-hashing"
+version = "15.0.0"
 dependencies = [
  "sp-crypto-hashing 0.1.0",
 ]
@@ -23399,7 +22801,7 @@ dependencies = [
 name = "sp-core-hashing-proc-macro"
 version = "15.0.0"
 dependencies = [
- "sp-crypto-hashing-proc-macro 0.1.0",
+ "sp-crypto-hashing-proc-macro",
 ]
 
 [[package]]
@@ -23425,13 +22827,13 @@ dependencies = [
 name = "sp-crypto-hashing"
 version = "0.1.0"
 dependencies = [
- "blake2b_simd 1.0.2",
+ "blake2b_simd",
  "byteorder",
  "criterion",
  "digest 0.10.7",
  "sha2 0.10.9",
- "sha3 0.10.8",
- "sp-crypto-hashing-proc-macro 0.1.0",
+ "sha3",
+ "sp-crypto-hashing-proc-macro",
  "twox-hash",
 ]
 
@@ -23441,11 +22843,11 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc9927a7f81334ed5b8a98a4a978c81324d12bd9713ec76b5c68fd410174c5eb"
 dependencies = [
- "blake2b_simd 1.0.2",
+ "blake2b_simd",
  "byteorder",
  "digest 0.10.7",
  "sha2 0.10.9",
- "sha3 0.10.8",
+ "sha3",
  "twox-hash",
 ]
 
@@ -23458,17 +22860,6 @@ dependencies = [
  "syn 2.0.98",
 ]
 
-[[package]]
-name = "sp-crypto-hashing-proc-macro"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b85d0f1f1e44bd8617eb2a48203ee854981229e3e79e6f468c7175d5fd37489b"
-dependencies = [
- "quote 1.0.40",
- "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 2.0.98",
-]
-
 [[package]]
 name = "sp-database"
 version = "10.0.0"
@@ -23506,17 +22897,6 @@ dependencies = [
  "sp-storage 19.0.0",
 ]
 
-[[package]]
-name = "sp-externalities"
-version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33abaec4be69b1613796bbf430decbbcaaf978756379e2016e683a4d6379cd02"
-dependencies = [
- "environmental",
- "parity-scale-codec",
- "sp-storage 21.0.0",
-]
-
 [[package]]
 name = "sp-externalities"
 version = "0.30.0"
@@ -23535,8 +22915,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde_json",
- "sp-api 26.0.0",
- "sp-runtime 31.0.1",
+ "sp-api",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -23548,7 +22928,7 @@ dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
  "scale-info",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "thiserror 1.0.65",
 ]
 
@@ -23568,65 +22948,11 @@ dependencies = [
  "sp-core 28.0.0",
  "sp-crypto-hashing 0.1.0",
  "sp-externalities 0.25.0",
- "sp-keystore 0.34.0",
+ "sp-keystore",
  "sp-runtime-interface 24.0.0",
- "sp-state-machine 0.35.0",
+ "sp-state-machine",
  "sp-tracing 16.0.0",
- "sp-trie 29.0.0",
- "tracing",
- "tracing-core",
-]
-
-[[package]]
-name = "sp-io"
-version = "35.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b64ab18a0e29def6511139a8c45a59c14a846105aab6f9cc653523bd3b81f55"
-dependencies = [
- "bytes",
- "ed25519-dalek",
- "libsecp256k1",
- "log",
- "parity-scale-codec",
- "polkavm-derive 0.9.1",
- "rustversion",
- "secp256k1 0.28.2",
- "sp-core 32.0.0",
- "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-externalities 0.28.0",
- "sp-keystore 0.38.0",
- "sp-runtime-interface 27.0.0",
- "sp-state-machine 0.40.0",
- "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-tracing 17.0.1",
- "sp-trie 34.0.0",
- "tracing",
- "tracing-core",
-]
-
-[[package]]
-name = "sp-io"
-version = "36.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7a31ce27358b73656a09b4933f09a700019d63afa15ede966f7c9893c1d4db5"
-dependencies = [
- "bytes",
- "ed25519-dalek",
- "libsecp256k1",
- "log",
- "parity-scale-codec",
- "polkavm-derive 0.9.1",
- "rustversion",
- "secp256k1 0.28.2",
- "sp-core 33.0.1",
- "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-externalities 0.28.0",
- "sp-keystore 0.39.0",
- "sp-runtime-interface 27.0.0",
- "sp-state-machine 0.41.0",
- "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-tracing 17.0.1",
- "sp-trie 35.0.0",
+ "sp-trie",
  "tracing",
  "tracing-core",
 ]
@@ -23636,7 +22962,7 @@ name = "sp-keyring"
 version = "31.0.0"
 dependencies = [
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "strum 0.26.3",
 ]
 
@@ -23650,30 +22976,6 @@ dependencies = [
  "sp-externalities 0.25.0",
 ]
 
-[[package]]
-name = "sp-keystore"
-version = "0.38.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e6c7a7abd860a5211a356cf9d5fcabf0eb37d997985e5d722b6b33dcc815528"
-dependencies = [
- "parity-scale-codec",
- "parking_lot 0.12.3",
- "sp-core 32.0.0",
- "sp-externalities 0.28.0",
-]
-
-[[package]]
-name = "sp-keystore"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92a909528663a80829b95d582a20dd4c9acd6e575650dee2bcaf56f4740b305e"
-dependencies = [
- "parity-scale-codec",
- "parking_lot 0.12.3",
- "sp-core 33.0.1",
- "sp-externalities 0.28.0",
-]
-
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "11.0.0"
@@ -23682,16 +22984,6 @@ dependencies = [
  "zstd 0.12.4",
 ]
 
-[[package]]
-name = "sp-maybe-compressed-blob"
-version = "11.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0c768c11afbe698a090386876911da4236af199cd38a5866748df4d8628aeff"
-dependencies = [
- "thiserror 1.0.65",
- "zstd 0.12.4",
-]
-
 [[package]]
 name = "sp-metadata-ir"
 version = "0.6.0"
@@ -23701,25 +22993,14 @@ dependencies = [
  "scale-info",
 ]
 
-[[package]]
-name = "sp-metadata-ir"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a616fa51350b35326682a472ee8e6ba742fdacb18babac38ecd46b3e05ead869"
-dependencies = [
- "frame-metadata 16.0.0",
- "parity-scale-codec",
- "scale-info",
-]
-
 [[package]]
 name = "sp-mixnet"
 version = "0.4.0"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
- "sp-api 26.0.0",
- "sp-application-crypto 30.0.0",
+ "sp-api",
+ "sp-application-crypto",
 ]
 
 [[package]]
@@ -23732,10 +23013,10 @@ dependencies = [
  "polkadot-ckb-merkle-mountain-range",
  "scale-info",
  "serde",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-core 28.0.0",
  "sp-debug-derive 14.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "thiserror 1.0.65",
 ]
 
@@ -23746,9 +23027,9 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
- "sp-arithmetic 23.0.0",
+ "sp-arithmetic",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "substrate-test-utils",
 ]
 
@@ -23760,34 +23041,23 @@ dependencies = [
  "honggfuzz",
  "rand 0.8.5",
  "sp-npos-elections",
- "sp-runtime 31.0.1",
+ "sp-runtime",
 ]
 
 [[package]]
 name = "sp-offchain"
 version = "26.0.0"
 dependencies = [
- "sp-api 26.0.0",
+ "sp-api",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
-]
-
-[[package]]
-name = "sp-panic-handler"
-version = "13.0.0"
-dependencies = [
- "backtrace",
- "regex",
+ "sp-runtime",
 ]
 
 [[package]]
 name = "sp-panic-handler"
 version = "13.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8f5a17a0a11de029a8b811cb6e8b32ce7e02183cc04a3e965c383246798c416"
 dependencies = [
  "backtrace",
- "lazy_static",
  "regex",
 ]
 
@@ -23819,73 +23089,22 @@ dependencies = [
  "serde",
  "serde_json",
  "simple-mermaid",
- "sp-api 26.0.0",
- "sp-application-crypto 30.0.0",
- "sp-arithmetic 23.0.0",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-arithmetic",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-state-machine 0.35.0",
+ "sp-io",
+ "sp-state-machine",
  "sp-std 14.0.0",
  "sp-tracing 16.0.0",
- "sp-trie 29.0.0",
- "sp-weights 27.0.0",
+ "sp-trie",
+ "sp-weights",
  "substrate-test-runtime-client",
  "tracing",
  "tuplex",
  "zstd 0.12.4",
 ]
 
-[[package]]
-name = "sp-runtime"
-version = "36.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6b85cb874b78ebb17307a910fc27edf259a0455ac5155d87eaed8754c037e07"
-dependencies = [
- "docify",
- "either",
- "hash256-std-hasher",
- "impl-trait-for-tuples",
- "log",
- "parity-scale-codec",
- "paste",
- "rand 0.8.5",
- "scale-info",
- "serde",
- "simple-mermaid",
- "sp-application-crypto 35.0.0",
- "sp-arithmetic 26.0.0",
- "sp-core 32.0.0",
- "sp-io 35.0.0",
- "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-weights 31.0.0",
-]
-
-[[package]]
-name = "sp-runtime"
-version = "37.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c2a6148bf0ba74999ecfea9b4c1ade544f0663e0baba19630bb7761b2142b19"
-dependencies = [
- "docify",
- "either",
- "hash256-std-hasher",
- "impl-trait-for-tuples",
- "log",
- "num-traits",
- "parity-scale-codec",
- "paste",
- "rand 0.8.5",
- "scale-info",
- "serde",
- "simple-mermaid",
- "sp-application-crypto 36.0.0",
- "sp-arithmetic 26.0.0",
- "sp-core 33.0.1",
- "sp-io 36.0.0",
- "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-weights 31.0.0",
-]
-
 [[package]]
 name = "sp-runtime-interface"
 version = "24.0.0"
@@ -23894,13 +23113,12 @@ dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
  "polkavm-derive 0.26.0",
- "primitive-types 0.13.1",
  "rustversion",
  "sp-externalities 0.25.0",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-runtime-interface-proc-macro 17.0.0",
  "sp-runtime-interface-test-wasm",
- "sp-state-machine 0.35.0",
+ "sp-state-machine",
  "sp-std 14.0.0",
  "sp-storage 19.0.0",
  "sp-tracing 16.0.0",
@@ -23909,26 +23127,6 @@ dependencies = [
  "trybuild",
 ]
 
-[[package]]
-name = "sp-runtime-interface"
-version = "27.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "647db5e1dc481686628b41554e832df6ab400c4b43a6a54e54d3b0a71ca404aa"
-dependencies = [
- "bytes",
- "impl-trait-for-tuples",
- "parity-scale-codec",
- "polkavm-derive 0.9.1",
- "primitive-types 0.12.2",
- "sp-externalities 0.28.0",
- "sp-runtime-interface-proc-macro 18.0.0",
- "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-storage 21.0.0",
- "sp-tracing 17.0.1",
- "sp-wasm-interface 21.0.1",
- "static_assertions",
-]
-
 [[package]]
 name = "sp-runtime-interface"
 version = "29.0.0"
@@ -23979,14 +23177,14 @@ dependencies = [
 name = "sp-runtime-interface-test"
 version = "2.0.0"
 dependencies = [
- "sc-executor 0.32.0",
- "sc-executor-common 0.29.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sc-executor",
+ "sc-executor-common",
+ "sp-io",
+ "sp-runtime",
  "sp-runtime-interface 24.0.0",
  "sp-runtime-interface-test-wasm",
  "sp-runtime-interface-test-wasm-deprecated",
- "sp-state-machine 0.35.0",
+ "sp-state-machine",
  "tracing",
  "tracing-core",
 ]
@@ -23997,7 +23195,7 @@ version = "2.0.0"
 dependencies = [
  "bytes",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-runtime-interface 24.0.0",
  "substrate-wasm-builder",
 ]
@@ -24007,7 +23205,7 @@ name = "sp-runtime-interface-test-wasm-deprecated"
 version = "2.0.0"
 dependencies = [
  "sp-core 28.0.0",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-runtime-interface 24.0.0",
  "substrate-wasm-builder",
 ]
@@ -24018,10 +23216,10 @@ version = "27.0.0"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-core 28.0.0",
- "sp-keystore 0.34.0",
- "sp-runtime 31.0.1",
+ "sp-keystore",
+ "sp-runtime",
  "sp-staking",
 ]
 
@@ -24034,7 +23232,7 @@ dependencies = [
  "scale-info",
  "serde",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -24053,54 +23251,12 @@ dependencies = [
  "smallvec",
  "sp-core 28.0.0",
  "sp-externalities 0.25.0",
- "sp-panic-handler 13.0.0",
- "sp-runtime 31.0.1",
- "sp-trie 29.0.0",
- "thiserror 1.0.65",
- "tracing",
- "trie-db 0.30.0",
-]
-
-[[package]]
-name = "sp-state-machine"
-version = "0.40.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18084cb996c27d5d99a88750e0a8eb4af6870a40df97872a5923e6d293d95fb9"
-dependencies = [
- "hash-db",
- "log",
- "parity-scale-codec",
- "parking_lot 0.12.3",
- "rand 0.8.5",
- "smallvec",
- "sp-core 32.0.0",
- "sp-externalities 0.28.0",
- "sp-panic-handler 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-trie 34.0.0",
+ "sp-panic-handler",
+ "sp-runtime",
+ "sp-trie",
  "thiserror 1.0.65",
  "tracing",
- "trie-db 0.29.1",
-]
-
-[[package]]
-name = "sp-state-machine"
-version = "0.41.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f6ac196ea92c4d0613c071e1a050765dbfa30107a990224a4aba02c7dbcd063"
-dependencies = [
- "hash-db",
- "log",
- "parity-scale-codec",
- "parking_lot 0.12.3",
- "rand 0.8.5",
- "smallvec",
- "sp-core 33.0.1",
- "sp-externalities 0.28.0",
- "sp-panic-handler 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-trie 35.0.0",
- "thiserror 1.0.65",
- "tracing",
- "trie-db 0.29.1",
+ "trie-db",
 ]
 
 [[package]]
@@ -24108,19 +23264,19 @@ name = "sp-statement-store"
 version = "10.0.0"
 dependencies = [
  "aes-gcm",
- "curve25519-dalek 4.1.3",
+ "curve25519-dalek",
  "ed25519-dalek",
  "hkdf",
  "parity-scale-codec",
  "rand 0.8.5",
  "scale-info",
  "sha2 0.10.9",
- "sp-api 26.0.0",
- "sp-application-crypto 30.0.0",
+ "sp-api",
+ "sp-application-crypto",
  "sp-core 28.0.0",
  "sp-crypto-hashing 0.1.0",
  "sp-externalities 0.25.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-runtime-interface 24.0.0",
  "thiserror 1.0.65",
  "x25519-dalek",
@@ -24140,33 +23296,20 @@ checksum = "12f8ee986414b0a9ad741776762f4083cd3a5128449b982a3919c4df36874834"
 name = "sp-storage"
 version = "19.0.0"
 dependencies = [
- "impl-serde 0.5.0",
+ "impl-serde",
  "parity-scale-codec",
  "ref-cast",
  "serde",
  "sp-debug-derive 14.0.0",
 ]
 
-[[package]]
-name = "sp-storage"
-version = "21.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99c82989b3a4979a7e1ad848aad9f5d0b4388f1f454cc131766526601ab9e8f8"
-dependencies = [
- "impl-serde 0.4.0",
- "parity-scale-codec",
- "ref-cast",
- "serde",
- "sp-debug-derive 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "sp-storage"
 version = "22.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee3b70ca340e41cde9d2e069d354508a6e37a6573d66f7cc38f11549002f64ec"
 dependencies = [
- "impl-serde 0.5.0",
+ "impl-serde",
  "parity-scale-codec",
  "ref-cast",
  "serde",
@@ -24180,9 +23323,9 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
- "sp-application-crypto 30.0.0",
+ "sp-application-crypto",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -24192,7 +23335,7 @@ dependencies = [
  "async-trait",
  "parity-scale-codec",
  "sp-inherents",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "thiserror 1.0.65",
 ]
 
@@ -24223,8 +23366,8 @@ dependencies = [
 name = "sp-transaction-pool"
 version = "26.0.0"
 dependencies = [
- "sp-api 26.0.0",
- "sp-runtime 31.0.1",
+ "sp-api",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -24236,19 +23379,21 @@ dependencies = [
  "scale-info",
  "sp-core 28.0.0",
  "sp-inherents",
- "sp-runtime 31.0.1",
- "sp-trie 29.0.0",
+ "sp-runtime",
+ "sp-trie",
 ]
 
 [[package]]
 name = "sp-trie"
 version = "29.0.0"
 dependencies = [
- "ahash 0.8.11",
+ "ahash",
  "array-bytes 6.2.2",
  "criterion",
+ "foldhash",
  "hash-db",
- "memory-db 0.33.0",
+ "hashbrown 0.15.3",
+ "memory-db",
  "nohash-hasher",
  "parity-scale-codec",
  "parking_lot 0.12.3",
@@ -24257,95 +23402,29 @@ dependencies = [
  "schnellru",
  "sp-core 28.0.0",
  "sp-externalities 0.25.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "substrate-prometheus-endpoint",
  "thiserror 1.0.65",
  "tracing",
  "trie-bench",
- "trie-db 0.30.0",
+ "trie-db",
  "trie-root",
  "trie-standardmap",
 ]
 
-[[package]]
-name = "sp-trie"
-version = "34.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87727eced997f14d0f79e3a5186a80e38a9de87f6e9dc0baea5ebf8b7f9d8b66"
-dependencies = [
- "ahash 0.8.11",
- "hash-db",
- "lazy_static",
- "memory-db 0.32.0",
- "nohash-hasher",
- "parity-scale-codec",
- "parking_lot 0.12.3",
- "rand 0.8.5",
- "scale-info",
- "schnellru",
- "sp-core 32.0.0",
- "sp-externalities 0.28.0",
- "thiserror 1.0.65",
- "tracing",
- "trie-db 0.29.1",
- "trie-root",
-]
-
-[[package]]
-name = "sp-trie"
-version = "35.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a61ab0c3e003f457203702e4753aa5fe9e762380543fada44650b1217e4aa5a5"
-dependencies = [
- "ahash 0.8.11",
- "hash-db",
- "lazy_static",
- "memory-db 0.32.0",
- "nohash-hasher",
- "parity-scale-codec",
- "parking_lot 0.12.3",
- "rand 0.8.5",
- "scale-info",
- "schnellru",
- "sp-core 33.0.1",
- "sp-externalities 0.28.0",
- "thiserror 1.0.65",
- "tracing",
- "trie-db 0.29.1",
- "trie-root",
-]
-
 [[package]]
 name = "sp-version"
 version = "29.0.0"
 dependencies = [
- "impl-serde 0.5.0",
+ "impl-serde",
  "parity-scale-codec",
  "parity-wasm",
  "scale-info",
  "serde",
- "sp-crypto-hashing-proc-macro 0.1.0",
- "sp-runtime 31.0.1",
+ "sp-crypto-hashing-proc-macro",
+ "sp-runtime",
  "sp-std 14.0.0",
- "sp-version-proc-macro 13.0.0",
- "thiserror 1.0.65",
-]
-
-[[package]]
-name = "sp-version"
-version = "35.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff74bf12b4f7d29387eb1caeec5553209a505f90a2511d2831143b970f89659"
-dependencies = [
- "impl-serde 0.4.0",
- "parity-scale-codec",
- "parity-wasm",
- "scale-info",
- "serde",
- "sp-crypto-hashing-proc-macro 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-runtime 37.0.0",
- "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-version-proc-macro 14.0.0",
+ "sp-version-proc-macro",
  "thiserror 1.0.65",
 ]
 
@@ -24357,19 +23436,7 @@ dependencies = [
  "proc-macro-warning",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "sp-version 29.0.0",
- "syn 2.0.98",
-]
-
-[[package]]
-name = "sp-version-proc-macro"
-version = "14.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aee8f6730641a65fcf0c8f9b1e448af4b3bb083d08058b47528188bccc7b7a7"
-dependencies = [
- "parity-scale-codec",
- "proc-macro2 1.0.95",
- "quote 1.0.40",
+ "sp-version",
  "syn 2.0.98",
 ]
 
@@ -24394,7 +23461,6 @@ dependencies = [
  "impl-trait-for-tuples",
  "log",
  "parity-scale-codec",
- "wasmtime",
 ]
 
 [[package]]
@@ -24407,25 +23473,10 @@ dependencies = [
  "schemars",
  "serde",
  "smallvec",
- "sp-arithmetic 23.0.0",
+ "sp-arithmetic",
  "sp-debug-derive 14.0.0",
 ]
 
-[[package]]
-name = "sp-weights"
-version = "31.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93cdaf72a1dad537bbb130ba4d47307ebe5170405280ed1aa31fa712718a400e"
-dependencies = [
- "bounded-collections 0.2.3",
- "parity-scale-codec",
- "scale-info",
- "serde",
- "smallvec",
- "sp-arithmetic 26.0.0",
- "sp-debug-derive 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "spin"
 version = "0.5.2"
@@ -24773,8 +23824,8 @@ dependencies = [
  "sc-service",
  "sp-blockchain",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-statement-store",
  "thiserror 1.0.65",
 ]
@@ -24788,7 +23839,7 @@ dependencies = [
  "frame-system",
  "parity-scale-codec",
  "scale-info",
- "sp-runtime 31.0.1",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -24806,14 +23857,14 @@ dependencies = [
  "frame-support",
  "hex-literal",
  "impl-trait-for-tuples",
- "log",
  "parity-scale-codec",
  "scale-info",
  "schemars",
  "serde",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
- "sp-weights 27.0.0",
+ "sp-io",
+ "sp-runtime",
+ "sp-weights",
+ "tracing",
  "xcm-procedural",
 ]
 
@@ -24838,12 +23889,12 @@ dependencies = [
  "polkadot-test-runtime",
  "primitive-types 0.13.1",
  "scale-info",
- "sp-arithmetic 23.0.0",
+ "sp-arithmetic",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-tracing 16.0.0",
- "sp-weights 27.0.0",
+ "sp-weights",
  "staging-xcm",
  "staging-xcm-executor",
  "tracing",
@@ -24860,11 +23911,11 @@ dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
  "scale-info",
- "sp-arithmetic 23.0.0",
+ "sp-arithmetic",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
- "sp-weights 27.0.0",
+ "sp-io",
+ "sp-runtime",
+ "sp-weights",
  "staging-xcm",
  "tracing",
 ]
@@ -24983,17 +24034,6 @@ dependencies = [
  "sc-cli",
 ]
 
-[[package]]
-name = "subrpcer"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a00780fcd4ebedf099da78a562744c6f17bda08d1223928c3104dd26081b44"
-dependencies = [
- "affix",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "substrate-bip39"
 version = "0.4.7"
@@ -25054,23 +24094,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "substrate-differ"
-version = "0.21.3"
-source = "git+https://github.com/chevdor/subwasm?rev=v0.21.3#aa8acb6fdfb34144ac51ab95618a9b37fa251295"
-dependencies = [
- "comparable",
- "document-features",
- "frame-metadata 16.0.0",
- "log",
- "num-format",
- "scale-info",
- "serde",
- "serde_json",
- "thiserror 1.0.65",
- "wasm-testbed",
-]
-
 [[package]]
 name = "substrate-frame-rpc-support"
 version = "29.0.0"
@@ -25083,7 +24106,7 @@ dependencies = [
  "scale-info",
  "serde",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-storage 19.0.0",
  "tokio",
 ]
@@ -25102,11 +24125,11 @@ dependencies = [
  "sc-rpc-api",
  "sc-transaction-pool",
  "sc-transaction-pool-api",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-block-builder",
  "sp-blockchain",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-tracing 16.0.0",
  "substrate-test-runtime-client",
  "tokio",
@@ -25161,8 +24184,8 @@ dependencies = [
  "scale-info",
  "sp-consensus-grandpa",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
- "sp-trie 29.0.0",
+ "sp-runtime",
+ "sp-trie",
  "strum 0.26.3",
  "thiserror 1.0.65",
 ]
@@ -25177,26 +24200,10 @@ dependencies = [
  "sc-rpc-api",
  "serde",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "tokio",
 ]
 
-[[package]]
-name = "substrate-runtime-proposal-hash"
-version = "0.21.3"
-source = "git+https://github.com/chevdor/subwasm?rev=v0.21.3#aa8acb6fdfb34144ac51ab95618a9b37fa251295"
-dependencies = [
- "blake2 0.10.6",
- "frame-metadata 16.0.0",
- "hex",
- "parity-scale-codec",
- "sp-core 32.0.0",
- "sp-io 35.0.0",
- "sp-runtime 36.0.0",
- "sp-wasm-interface 21.0.1",
- "thiserror 1.0.65",
-]
-
 [[package]]
 name = "substrate-state-trie-migration-rpc"
 version = "27.0.0"
@@ -25207,10 +24214,10 @@ dependencies = [
  "sc-rpc-api",
  "serde",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
- "sp-state-machine 0.35.0",
- "sp-trie 29.0.0",
- "trie-db 0.30.0",
+ "sp-runtime",
+ "sp-state-machine",
+ "sp-trie",
+ "trie-db",
 ]
 
 [[package]]
@@ -25224,7 +24231,7 @@ dependencies = [
  "sc-client-api",
  "sc-client-db",
  "sc-consensus",
- "sc-executor 0.32.0",
+ "sc-executor",
  "sc-service",
  "serde",
  "serde_json",
@@ -25232,8 +24239,8 @@ dependencies = [
  "sp-consensus",
  "sp-core 28.0.0",
  "sp-keyring",
- "sp-keystore 0.34.0",
- "sp-runtime 31.0.1",
+ "sp-keystore",
+ "sp-runtime",
  "tokio",
 ]
 
@@ -25257,14 +24264,14 @@ dependencies = [
  "pretty_assertions",
  "sc-block-builder",
  "sc-chain-spec",
- "sc-executor 0.32.0",
- "sc-executor-common 0.29.0",
+ "sc-executor",
+ "sc-executor-common",
  "sc-service",
  "scale-info",
  "serde",
  "serde_json",
- "sp-api 26.0.0",
- "sp-application-crypto 30.0.0",
+ "sp-api",
+ "sp-application-crypto",
  "sp-block-builder",
  "sp-consensus",
  "sp-consensus-aura",
@@ -25276,20 +24283,20 @@ dependencies = [
  "sp-externalities 0.25.0",
  "sp-genesis-builder",
  "sp-inherents",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-keyring",
  "sp-offchain",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-session",
- "sp-state-machine 0.35.0",
+ "sp-state-machine",
  "sp-tracing 16.0.0",
  "sp-transaction-pool",
- "sp-trie 29.0.0",
- "sp-version 29.0.0",
+ "sp-trie",
+ "sp-version",
  "substrate-test-runtime-client",
  "substrate-wasm-builder",
  "tracing",
- "trie-db 0.30.0",
+ "trie-db",
 ]
 
 [[package]]
@@ -25300,11 +24307,11 @@ dependencies = [
  "sc-block-builder",
  "sc-client-api",
  "sc-consensus",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-blockchain",
  "sp-consensus",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "substrate-test-client",
  "substrate-test-runtime",
 ]
@@ -25321,7 +24328,7 @@ dependencies = [
  "sc-transaction-pool",
  "sc-transaction-pool-api",
  "sp-blockchain",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "substrate-test-runtime-client",
  "thiserror 1.0.65",
 ]
@@ -25379,13 +24386,13 @@ dependencies = [
  "parity-scale-codec",
  "parity-wasm",
  "polkavm-linker",
- "sc-executor 0.32.0",
+ "sc-executor",
  "shlex",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-maybe-compressed-blob 11.0.0",
+ "sp-io",
+ "sp-maybe-compressed-blob",
  "sp-tracing 16.0.0",
- "sp-version 29.0.0",
+ "sp-version",
  "strum 0.26.3",
  "tempfile",
  "toml 0.8.19",
@@ -25411,32 +24418,6 @@ version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142"
 
-[[package]]
-name = "subwasmlib"
-version = "0.21.3"
-source = "git+https://github.com/chevdor/subwasm?rev=v0.21.3#aa8acb6fdfb34144ac51ab95618a9b37fa251295"
-dependencies = [
- "calm_io",
- "frame-metadata 16.0.0",
- "hex",
- "ipfs-hasher",
- "log",
- "num-format",
- "rand 0.8.5",
- "reqwest",
- "scale-info",
- "semver 1.0.18",
- "serde",
- "serde_json",
- "sp-version 35.0.0",
- "substrate-differ",
- "thiserror 1.0.65",
- "url",
- "uuid",
- "wasm-loader",
- "wasm-testbed",
-]
-
 [[package]]
 name = "subxt"
 version = "0.38.1"
@@ -25449,7 +24430,7 @@ dependencies = [
  "frame-metadata 17.0.0",
  "futures",
  "hex",
- "impl-serde 0.5.0",
+ "impl-serde",
  "jsonrpsee",
  "parity-scale-codec",
  "polkadot-sdk 0.7.0",
@@ -25558,7 +24539,7 @@ dependencies = [
  "frame-metadata 17.0.0",
  "hashbrown 0.14.5",
  "hex",
- "impl-serde 0.5.0",
+ "impl-serde",
  "keccak-hash",
  "parity-scale-codec",
  "polkadot-sdk 0.7.0",
@@ -25587,7 +24568,7 @@ dependencies = [
  "frame-metadata 20.0.0",
  "hashbrown 0.14.5",
  "hex",
- "impl-serde 0.5.0",
+ "impl-serde",
  "keccak-hash",
  "parity-scale-codec",
  "primitive-types 0.13.1",
@@ -25710,7 +24691,7 @@ dependencies = [
  "frame-metadata 20.0.0",
  "futures",
  "hex",
- "impl-serde 0.5.0",
+ "impl-serde",
  "jsonrpsee",
  "parity-scale-codec",
  "primitive-types 0.13.1",
@@ -26150,7 +25131,7 @@ dependencies = [
  "dlmalloc",
  "parity-scale-codec",
  "polkadot-parachain-primitives",
- "sp-io 30.0.0",
+ "sp-io",
  "substrate-wasm-builder",
  "tiny-keccak",
 ]
@@ -26197,7 +25178,7 @@ dependencies = [
  "parity-scale-codec",
  "polkadot-parachain-primitives",
  "polkadot-primitives",
- "sp-io 30.0.0",
+ "sp-io",
  "substrate-wasm-builder",
  "tiny-keccak",
 ]
@@ -26236,7 +25217,7 @@ dependencies = [
  "frame-support",
  "polkadot-primitives",
  "smallvec",
- "sp-runtime 31.0.1",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -26248,7 +25229,7 @@ dependencies = [
  "polkadot-core-primitives",
  "rococo-runtime-constants",
  "smallvec",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "staging-xcm",
  "westend-runtime-constants",
 ]
@@ -26825,32 +25806,20 @@ dependencies = [
 
 [[package]]
 name = "trie-bench"
-version = "0.41.0"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0445f19cd0e58d9aef1eef590739fc10c4291611722c98f8995b70ce8529f198"
+checksum = "972be214c558b1a5550d34c8c7e55a284f6439cefc51226d6ffbfc152de5cc58"
 dependencies = [
  "criterion",
  "hash-db",
  "keccak-hasher",
- "memory-db 0.33.0",
+ "memory-db",
  "parity-scale-codec",
- "trie-db 0.30.0",
+ "trie-db",
  "trie-root",
  "trie-standardmap",
 ]
 
-[[package]]
-name = "trie-db"
-version = "0.29.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c992b4f40c234a074d48a757efeabb1a6be88af84c0c23f7ca158950cb0ae7f"
-dependencies = [
- "hash-db",
- "log",
- "rustc-hex",
- "smallvec",
-]
-
 [[package]]
 name = "trie-db"
 version = "0.30.0"
@@ -26929,28 +25898,6 @@ dependencies = [
  "utf-8",
 ]
 
-[[package]]
-name = "tungstenite"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1"
-dependencies = [
- "byteorder",
- "bytes",
- "data-encoding",
- "http 1.1.0",
- "httparse",
- "log",
- "rand 0.8.5",
- "rustls 0.22.4",
- "rustls-native-certs 0.7.0",
- "rustls-pki-types",
- "sha1",
- "thiserror 1.0.65",
- "url",
- "utf-8",
-]
-
 [[package]]
 name = "tungstenite"
 version = "0.26.2"
@@ -27110,18 +26057,6 @@ version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
 
-[[package]]
-name = "unsigned-varint"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f67332660eb59a6f1eb24ff1220c9e8d01738a8503c6002e30bcfe4bd9f2b4a9"
-
-[[package]]
-name = "unsigned-varint"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7fdeedbf205afadfe39ae559b75c3240f24e257d0ca27e85f85cb82aa19ac35"
-
 [[package]]
 name = "unsigned-varint"
 version = "0.7.2"
@@ -27156,24 +26091,6 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
-[[package]]
-name = "ureq"
-version = "2.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a"
-dependencies = [
- "base64 0.22.1",
- "flate2",
- "log",
- "once_cell",
- "rustls 0.23.18",
- "rustls-pki-types",
- "serde",
- "serde_json",
- "url",
- "webpki-roots 0.26.3",
-]
-
 [[package]]
 name = "url"
 version = "2.5.4"
@@ -27314,7 +26231,7 @@ dependencies = [
  "rand_chacha 0.3.1",
  "rand_core 0.6.4",
  "sha2 0.10.9",
- "sha3 0.10.8",
+ "sha3",
  "zeroize",
 ]
 
@@ -27509,25 +26426,6 @@ dependencies = [
  "parity-wasm",
 ]
 
-[[package]]
-name = "wasm-loader"
-version = "0.21.3"
-source = "git+https://github.com/chevdor/subwasm?rev=v0.21.3#aa8acb6fdfb34144ac51ab95618a9b37fa251295"
-dependencies = [
- "array-bytes 6.2.2",
- "log",
- "multibase 0.9.1",
- "multihash 0.19.1",
- "serde",
- "serde_json",
- "sp-maybe-compressed-blob 11.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "subrpcer",
- "thiserror 1.0.65",
- "tungstenite 0.21.0",
- "ureq",
- "url",
-]
-
 [[package]]
 name = "wasm-opt"
 version = "0.116.0"
@@ -27568,29 +26466,6 @@ dependencies = [
  "cxx-build",
 ]
 
-[[package]]
-name = "wasm-testbed"
-version = "0.21.3"
-source = "git+https://github.com/chevdor/subwasm?rev=v0.21.3#aa8acb6fdfb34144ac51ab95618a9b37fa251295"
-dependencies = [
- "frame-metadata 16.0.0",
- "hex",
- "log",
- "parity-scale-codec",
- "sc-executor 0.38.0",
- "sc-executor-common 0.34.0",
- "scale-info",
- "sp-core 33.0.1",
- "sp-io 36.0.0",
- "sp-runtime 37.0.0",
- "sp-state-machine 0.41.0",
- "sp-version 35.0.0",
- "sp-wasm-interface 21.0.1",
- "substrate-runtime-proposal-hash",
- "thiserror 1.0.65",
- "wasm-loader",
-]
-
 [[package]]
 name = "wasm-timer"
 version = "0.2.5"
@@ -27648,7 +26523,7 @@ version = "0.32.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c128c039340ffd50d4195c3f8ce31aac357f06804cfc494c8b9508d4b30dca4"
 dependencies = [
- "ahash 0.8.11",
+ "ahash",
  "hashbrown 0.14.5",
  "string-interner",
 ]
@@ -27960,7 +26835,7 @@ dependencies = [
  "sp-consensus-babe",
  "sp-consensus-beefy",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "westend-runtime",
  "westend-runtime-constants",
 ]
@@ -28043,9 +26918,9 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
- "sp-api 26.0.0",
- "sp-application-crypto 30.0.0",
- "sp-arithmetic 23.0.0",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-arithmetic",
  "sp-authority-discovery",
  "sp-block-builder",
  "sp-consensus-babe",
@@ -28054,18 +26929,18 @@ dependencies = [
  "sp-core 28.0.0",
  "sp-genesis-builder",
  "sp-inherents",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-keyring",
  "sp-mmr-primitives",
  "sp-npos-elections",
  "sp-offchain",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-session",
  "sp-staking",
  "sp-storage 19.0.0",
  "sp-tracing 16.0.0",
  "sp-transaction-pool",
- "sp-version 29.0.0",
+ "sp-version",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -28084,8 +26959,8 @@ dependencies = [
  "polkadot-runtime-common",
  "smallvec",
  "sp-core 28.0.0",
- "sp-runtime 31.0.1",
- "sp-weights 27.0.0",
+ "sp-runtime",
+ "sp-weights",
  "staging-xcm",
  "staging-xcm-builder",
 ]
@@ -28576,7 +27451,7 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277"
 dependencies = [
- "curve25519-dalek 4.1.3",
+ "curve25519-dalek",
  "rand_core 0.6.4",
  "serde",
  "zeroize",
@@ -28638,8 +27513,8 @@ dependencies = [
  "polkadot-sdk-frame",
  "scale-info",
  "simple-mermaid",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -28669,11 +27544,11 @@ dependencies = [
  "polkadot-parachain-primitives",
  "polkadot-primitives",
  "polkadot-runtime-parachains",
- "sp-arithmetic 23.0.0",
+ "sp-arithmetic",
  "sp-core 28.0.0",
  "sp-crypto-hashing 0.1.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-tracing 16.0.0",
  "staging-xcm",
  "staging-xcm-executor",
@@ -28697,8 +27572,8 @@ dependencies = [
  "polkadot-test-service",
  "sp-consensus",
  "sp-keyring",
- "sp-runtime 31.0.1",
- "sp-state-machine 0.35.0",
+ "sp-runtime",
+ "sp-state-machine",
  "sp-tracing 16.0.0",
  "staging-xcm",
  "staging-xcm-executor",
@@ -28724,19 +27599,19 @@ dependencies = [
  "frame-support",
  "frame-system",
  "hex-literal",
- "log",
  "pallet-assets",
  "pallet-balances",
  "pallet-xcm",
  "parity-scale-codec",
  "scale-info",
- "sp-api 26.0.0",
- "sp-io 30.0.0",
+ "sp-api",
+ "sp-io",
  "sp-tracing 16.0.0",
- "sp-weights 27.0.0",
+ "sp-weights",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
+ "tracing",
  "xcm-simulator",
 ]
 
@@ -28753,8 +27628,8 @@ dependencies = [
  "polkadot-primitives",
  "polkadot-runtime-parachains",
  "scale-info",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -28766,7 +27641,6 @@ version = "7.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
- "log",
  "pallet-balances",
  "pallet-message-queue",
  "pallet-uniques",
@@ -28776,12 +27650,13 @@ dependencies = [
  "polkadot-runtime-parachains",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "sp-tracing 16.0.0",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
+ "tracing",
  "xcm-simulator",
 ]
 
@@ -28804,8 +27679,8 @@ dependencies = [
  "polkadot-runtime-parachains",
  "scale-info",
  "sp-core 28.0.0",
- "sp-io 30.0.0",
- "sp-runtime 31.0.1",
+ "sp-io",
+ "sp-runtime",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -28920,25 +27795,24 @@ dependencies = [
  "polkadot-runtime-common",
  "scale-info",
  "serde_json",
- "sp-api 26.0.0",
+ "sp-api",
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core 28.0.0",
  "sp-genesis-builder",
  "sp-inherents",
- "sp-io 30.0.0",
+ "sp-io",
  "sp-keyring",
  "sp-offchain",
- "sp-runtime 31.0.1",
+ "sp-runtime",
  "sp-session",
  "sp-transaction-pool",
- "sp-version 29.0.0",
+ "sp-version",
  "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
  "substrate-wasm-builder",
- "testnet-parachains-constants",
 ]
 
 [[package]]
@@ -29084,9 +27958,9 @@ dependencies = [
 
 [[package]]
 name = "zombienet-configuration"
-version = "0.3.6"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42e734ceb92e298b509dd757c55607d1715e07ab3379e48d84f6880082b8d49c"
+checksum = "44219ccb5c89d60525839c9f2737da2e7f13526b9ca09c60fd8f6c48f611a925"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -29105,12 +27979,13 @@ dependencies = [
 
 [[package]]
 name = "zombienet-orchestrator"
-version = "0.3.6"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9ae1ccac7bf93c94b458bca8ab9f43e000ad99be95f5c103f044b60f6561b5d"
+checksum = "0d7e28aafee53c025762afbc77ebb31b34ef81066bd967ed569508fc42057934"
 dependencies = [
  "anyhow",
  "async-trait",
+ "fancy-regex",
  "futures",
  "glob-match",
  "hex",
@@ -29138,9 +28013,9 @@ dependencies = [
 
 [[package]]
 name = "zombienet-prom-metrics-parser"
-version = "0.3.6"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f54a3dc97fa80db5278603d16e0b5156ab534cbc0f30e2116c16424622ecbe4e"
+checksum = "43cb4c30b1d238ca070ae045b20f303abeb19260f1d9c9101e076937085bf2eb"
 dependencies = [
  "pest",
  "pest_derive",
@@ -29149,9 +28024,9 @@ dependencies = [
 
 [[package]]
 name = "zombienet-provider"
-version = "0.3.6"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8cc8dd76e23460a0e8d33ad3e9747a91854a499c07dc2bc6ee18248df3e59"
+checksum = "1728bafa74be9955e2369fe967b31c2b0656141229019c98f4e2fd5be25dc611"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -29180,9 +28055,9 @@ dependencies = [
 
 [[package]]
 name = "zombienet-sdk"
-version = "0.3.6"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f1f20ac187b9591649a4efea38acc7b93f93fb79d843bc00a591d7bf55a3ff9"
+checksum = "91beaacd1c1e824d34b1ff8322834f0762cb5e38e3272611f43d8c1225e6b80c"
 dependencies = [
  "async-trait",
  "futures",
@@ -29198,9 +28073,9 @@ dependencies = [
 
 [[package]]
 name = "zombienet-support"
-version = "0.3.6"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "944d1bbd9c4063c7c88ac4531410ea1b197ae7d05fd83992738095d495b053f1"
+checksum = "f9ea1ac6e8056820408ab85870bd0130e734c933ae3aefbf0641075cb1041643"
 dependencies = [
  "anyhow",
  "async-trait",

From d7eb8883cf9e41c333f001420596f7a6eb2bff01 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Sat, 19 Jul 2025 16:18:58 +0000
Subject: [PATCH 061/186] wip

---
 substrate/frame/revive/src/tests.rs  | 260 +++++++++++++++------------
 substrate/frame/revive/src/vm/evm.rs | 197 +++++++++++++++++---
 substrate/frame/revive/src/vm/mod.rs |   8 +-
 3 files changed, 325 insertions(+), 140 deletions(-)

diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index ce570d84273a..73db0c30dac8 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -20,9 +20,11 @@ mod precompiles;
 
 use self::test_utils::{ensure_stored, expected_deposit};
 use crate::{
-	self as pallet_revive,
-	address::{create1, create2, AddressMapper},
-	evm::{runtime::GAS_PRICE, CallTrace, CallTracer, CallType, GenericTransaction},
+	self as pallet_revive, AccountId32Mapper, AccountInfo, AccountInfoOf, BalanceOf,
+	BalanceWithDust, BumpNonce, Code, CodeInfoOf, Config, ContractInfo, DeletionQueueCounter,
+	DepositLimit, Error, EthTransactError, H160, HoldReason, Origin, Pallet, PristineCode,
+	address::{AddressMapper, create1, create2},
+	evm::{CallTrace, CallTracer, CallType, GenericTransaction, runtime::GAS_PRICE},
 	exec::Key,
 	limits,
 	storage::DeletionQueueManager,
@@ -30,9 +32,6 @@ use crate::{
 	tests::test_utils::{get_contract, get_contract_checked},
 	tracing::trace,
 	weights::WeightInfo,
-	AccountId32Mapper, AccountInfo, AccountInfoOf, BalanceOf, BalanceWithDust, BumpNonce, Code,
-	CodeInfoOf, Config, ContractInfo, DeletionQueueCounter, DepositLimit, Error, EthTransactError,
-	HoldReason, Origin, Pallet, PristineCode, H160,
 };
 use assert_matches::assert_matches;
 use codec::Encode;
@@ -42,11 +41,11 @@ use frame_support::{
 	parameter_types,
 	storage::child,
 	traits::{
+		ConstU32, ConstU64, FindAuthor, OnIdle, OnInitialize, StorageVersion,
 		fungible::{BalancedHold, Inspect, Mutate, MutateHold},
 		tokens::Preservation,
-		ConstU32, ConstU64, FindAuthor, OnIdle, OnInitialize, StorageVersion,
 	},
-	weights::{constants::WEIGHT_REF_TIME_PER_SECOND, FixedFee, IdentityFee, Weight, WeightMeter},
+	weights::{FixedFee, IdentityFee, Weight, WeightMeter, constants::WEIGHT_REF_TIME_PER_SECOND},
 };
 use frame_system::{EventRecord, Phase};
 use pallet_revive_fixtures::compile_module;
@@ -55,11 +54,11 @@ use pallet_transaction_payment::{ConstFeeMultiplier, Multiplier};
 use pretty_assertions::{assert_eq, assert_ne};
 use sp_core::{Get, U256};
 use sp_io::hashing::blake2_256;
-use sp_keystore::{testing::MemoryKeystore, KeystoreExt};
+use sp_keystore::{KeystoreExt, testing::MemoryKeystore};
 use sp_runtime::{
+	AccountId32, BuildStorage, DispatchError, Perbill, TokenError,
 	testing::H256,
 	traits::{BlakeTwo256, Convert, IdentityLookup, One, Zero},
-	AccountId32, BuildStorage, DispatchError, Perbill, TokenError,
 };
 
 type Block = frame_system::mocking::MockBlock<Test>;
@@ -97,8 +96,8 @@ pub mod test_utils {
 		Test,
 	};
 	use crate::{
-		address::AddressMapper, exec::AccountIdOf, AccountInfo, AccountInfoOf, BalanceOf, CodeInfo,
-		CodeInfoOf, Config, ContractInfo, PristineCode,
+		AccountInfo, AccountInfoOf, BalanceOf, CodeInfo, CodeInfoOf, Config, ContractInfo,
+		PristineCode, address::AddressMapper, exec::AccountIdOf,
 	};
 	use codec::{Encode, MaxEncodedLen};
 	use frame_support::traits::fungible::{InspectHold, Mutate};
@@ -197,9 +196,9 @@ pub mod test_utils {
 mod builder {
 	use super::Test;
 	use crate::{
-		test_utils::{builder::*, ALICE},
-		tests::RuntimeOrigin,
 		Code,
+		test_utils::{ALICE, builder::*},
+		tests::RuntimeOrigin,
 	};
 	use sp_core::{H160, H256};
 
@@ -755,10 +754,12 @@ fn deposit_event_max_value_limit() {
 			.build_and_unwrap_contract();
 
 		// Call contract with allowed storage value.
-		assert_ok!(builder::call(addr)
-			.gas_limit(GAS_LIMIT.set_ref_time(GAS_LIMIT.ref_time() * 2)) // we are copying a huge buffer,
-			.data(limits::PAYLOAD_BYTES.encode())
-			.build());
+		assert_ok!(
+			builder::call(addr)
+				.gas_limit(GAS_LIMIT.set_ref_time(GAS_LIMIT.ref_time() * 2)) // we are copying a huge buffer,
+				.data(limits::PAYLOAD_BYTES.encode())
+				.build()
+		);
 
 		// Call contract with too large a storage value.
 		assert_err_ignore_postinfo!(
@@ -898,10 +899,12 @@ fn storage_max_value_limit() {
 		get_contract(&addr);
 
 		// Call contract with allowed storage value.
-		assert_ok!(builder::call(addr)
-			.gas_limit(GAS_LIMIT.set_ref_time(GAS_LIMIT.ref_time() * 2)) // we are copying a huge buffer
-			.data(limits::PAYLOAD_BYTES.encode())
-			.build());
+		assert_ok!(
+			builder::call(addr)
+				.gas_limit(GAS_LIMIT.set_ref_time(GAS_LIMIT.ref_time() * 2)) // we are copying a huge buffer
+				.data(limits::PAYLOAD_BYTES.encode())
+				.build()
+		);
 
 		// Call contract with too large a storage value.
 		assert_err_ignore_postinfo!(
@@ -957,9 +960,9 @@ fn transient_storage_limit_in_call() {
 
 		// Call contracts with storage values within the limit.
 		// Caller and Callee contracts each set a transient storage value of size 100.
-		assert_ok!(builder::call(addr_caller)
-			.data((100u32, 100u32, &addr_callee).encode())
-			.build(),);
+		assert_ok!(
+			builder::call(addr_caller).data((100u32, 100u32, &addr_callee).encode()).build(),
+		);
 
 		// Call a contract with a storage value that is too large.
 		// Limit exceeded in the caller contract.
@@ -1017,12 +1020,14 @@ fn deploy_and_call_other_contract() {
 
 		// Call BOB contract, which attempts to instantiate and call the callee contract and
 		// makes various assertions on the results from those calls.
-		assert_ok!(builder::call(caller_addr)
-			.data(
-				(callee_code_hash, code_load_weight.ref_time(), code_load_weight.proof_size())
-					.encode()
-			)
-			.build());
+		assert_ok!(
+			builder::call(caller_addr)
+				.data(
+					(callee_code_hash, code_load_weight.ref_time(), code_load_weight.proof_size())
+						.encode()
+				)
+				.build()
+		);
 
 		assert_eq!(
 			System::events(),
@@ -1106,10 +1111,12 @@ fn delegate_call() {
 				.native_value(100_000)
 				.build_and_unwrap_contract();
 
-		assert_ok!(builder::call(caller_addr)
-			.value(1337)
-			.data((callee_addr, u64::MAX, u64::MAX).encode())
-			.build());
+		assert_ok!(
+			builder::call(caller_addr)
+				.value(1337)
+				.data((callee_addr, u64::MAX, u64::MAX).encode())
+				.build()
+		);
 	});
 }
 
@@ -1126,10 +1133,12 @@ fn delegate_call_non_existant_is_noop() {
 				.native_value(300_000)
 				.build_and_unwrap_contract();
 
-		assert_ok!(builder::call(caller_addr)
-			.value(1337)
-			.data((BOB_ADDR, u64::MAX, u64::MAX).encode())
-			.build());
+		assert_ok!(
+			builder::call(caller_addr)
+				.value(1337)
+				.data((BOB_ADDR, u64::MAX, u64::MAX).encode())
+				.build()
+		);
 
 		assert_eq!(test_utils::get_balance(&BOB_FALLBACK), 0);
 	});
@@ -1165,10 +1174,12 @@ fn delegate_call_with_weight_limit() {
 			Error::<Test>::ContractTrapped,
 		);
 
-		assert_ok!(builder::call(caller_addr)
-			.value(1337)
-			.data((callee_addr, 500_000_000u64, 100_000u64).encode())
-			.build());
+		assert_ok!(
+			builder::call(caller_addr)
+				.value(1337)
+				.data((callee_addr, 500_000_000u64, 100_000u64).encode())
+				.build()
+		);
 	});
 }
 
@@ -1201,10 +1212,12 @@ fn delegate_call_with_deposit_limit() {
 			.build_and_unwrap_result();
 		assert_return_code!(ret, RuntimeReturnCode::OutOfResources);
 
-		assert_ok!(builder::call(caller_addr)
-			.value(1337)
-			.data((callee_addr, 82u64).encode())
-			.build());
+		assert_ok!(
+			builder::call(caller_addr)
+				.value(1337)
+				.data((callee_addr, 82u64).encode())
+				.build()
+		);
 	});
 }
 
@@ -2913,10 +2926,12 @@ fn storage_deposit_limit_is_enforced() {
 		);
 
 		// now with enough limit
-		assert_ok!(builder::call(addr)
-			.storage_deposit_limit(51)
-			.data(1u32.to_le_bytes().to_vec())
-			.build());
+		assert_ok!(
+			builder::call(addr)
+				.storage_deposit_limit(51)
+				.data(1u32.to_le_bytes().to_vec())
+				.build()
+		);
 
 		// Use 4 more bytes of the storage for the same item, which requires 4 Balance.
 		// Should fail as DefaultDepositLimit is 3 and hence isn't enough.
@@ -2946,10 +2961,12 @@ fn deposit_limit_in_nested_calls() {
 		// Create 100 bytes of storage with a price of per byte
 		// This is 100 Balance + 2 Balance for the item
 		// 48 for the key
-		assert_ok!(builder::call(addr_callee)
-			.storage_deposit_limit(102 + 48)
-			.data(100u32.to_le_bytes().to_vec())
-			.build());
+		assert_ok!(
+			builder::call(addr_callee)
+				.storage_deposit_limit(102 + 48)
+				.data(100u32.to_le_bytes().to_vec())
+				.build()
+		);
 
 		// We do not remove any storage but add a storage item of 12 bytes in the caller
 		// contract. This would cost 12 + 2 + 72 = 86 Balance.
@@ -3011,10 +3028,12 @@ fn deposit_limit_in_nested_calls() {
 		// Free up enough storage in the callee so that the caller can create a new item
 		// We set the special deposit limit of 1 Balance for the nested call, which isn't
 		// enforced as callee frees up storage. This should pass.
-		assert_ok!(builder::call(addr_caller)
-			.storage_deposit_limit(1)
-			.data((0u32, &addr_callee, U256::from(1u64)).encode())
-			.build());
+		assert_ok!(
+			builder::call(addr_caller)
+				.storage_deposit_limit(1)
+				.data((0u32, &addr_callee, U256::from(1u64)).encode())
+				.build()
+		);
 	});
 }
 
@@ -3294,9 +3313,11 @@ fn block_hash_works() {
 			&crate::BlockNumberFor::<Test>::from(0u32),
 			<Test as frame_system::Config>::Hash::from(&block_hash),
 		);
-		assert_ok!(builder::call(addr)
-			.data((U256::zero(), H256::from(block_hash)).encode())
-			.build());
+		assert_ok!(
+			builder::call(addr)
+				.data((U256::zero(), H256::from(block_hash)).encode())
+				.build()
+		);
 
 		// A block number out of range returns the zero value
 		assert_ok!(builder::call(addr).data((U256::from(1), H256::zero()).encode()).build());
@@ -3860,10 +3881,12 @@ fn return_data_api_works() {
 			.build_and_unwrap_contract();
 
 		// Call the contract: It will issue calls and deploys, asserting on
-		assert_ok!(builder::call(addr)
-			.value(10 * 1024)
-			.data(hash_return_with_data.encode())
-			.build());
+		assert_ok!(
+			builder::call(addr)
+				.value(10 * 1024)
+				.data(hash_return_with_data.encode())
+				.build()
+		);
 	});
 }
 
@@ -3983,9 +4006,11 @@ fn to_account_id_works() {
 			[0xEE; 12],
 			"fallback suffix found where none should be"
 		);
-		assert_ok!(builder::call(addr)
-			.data((EVE_ADDR, expected_mapped_account_id).encode())
-			.build());
+		assert_ok!(
+			builder::call(addr)
+				.data((EVE_ADDR, expected_mapped_account_id).encode())
+				.build()
+		);
 
 		// fallback for unmapped accounts
 		let expected_fallback_account_id =
@@ -3995,15 +4020,17 @@ fn to_account_id_works() {
 			[0xEE; 12],
 			"no fallback suffix found where one should be"
 		);
-		assert_ok!(builder::call(addr)
-			.data((BOB_ADDR, expected_fallback_account_id).encode())
-			.build());
+		assert_ok!(
+			builder::call(addr)
+				.data((BOB_ADDR, expected_fallback_account_id).encode())
+				.build()
+		);
 	});
 }
 
 #[test]
 fn code_hash_works() {
-	use crate::precompiles::{Precompile, EVM_REVERT};
+	use crate::precompiles::{EVM_REVERT, Precompile};
 	use precompiles::NoInfo;
 
 	let builtin_precompile = H160(NoInfo::<Test>::MATCHER.base_address());
@@ -4025,13 +4052,17 @@ fn code_hash_works() {
 		// code hash of itself
 		assert_ok!(builder::call(addr).data((addr, self_code_hash).encode()).build());
 		// code hash of primitive pre-compile (exist but have no bytecode)
-		assert_ok!(builder::call(addr)
-			.data((primitive_precompile, crate::exec::EMPTY_CODE_HASH).encode())
-			.build());
+		assert_ok!(
+			builder::call(addr)
+				.data((primitive_precompile, crate::exec::EMPTY_CODE_HASH).encode())
+				.build()
+		);
 		// code hash of normal pre-compile (do have a bytecode)
-		assert_ok!(builder::call(addr)
-			.data((builtin_precompile, sp_io::hashing::keccak_256(&EVM_REVERT)).encode())
-			.build());
+		assert_ok!(
+			builder::call(addr)
+				.data((builtin_precompile, sp_io::hashing::keccak_256(&EVM_REVERT)).encode())
+				.build()
+		);
 
 		// EOA doesn't exists
 		assert_err!(
@@ -4051,9 +4082,11 @@ fn code_hash_works() {
 		);
 
 		// EOA returns empty code hash
-		assert_ok!(builder::call(addr)
-			.data((BOB_ADDR, crate::exec::EMPTY_CODE_HASH).encode())
-			.build());
+		assert_ok!(
+			builder::call(addr)
+				.data((BOB_ADDR, crate::exec::EMPTY_CODE_HASH).encode())
+				.build()
+		);
 	});
 }
 
@@ -4077,9 +4110,9 @@ fn code_size_works() {
 		assert_ok!(builder::call(tester_addr).data((dummy_addr, dummy_code_len).encode()).build());
 
 		// code size of own contract address
-		assert_ok!(builder::call(tester_addr)
-			.data((tester_addr, tester_code_len).encode())
-			.build());
+		assert_ok!(
+			builder::call(tester_addr).data((tester_addr, tester_code_len).encode()).build()
+		);
 
 		// code size of non contract accounts
 		assert_ok!(builder::call(tester_addr).data(([8u8; 20], 0u64).encode()).build());
@@ -4242,18 +4275,20 @@ fn skip_transfer_works() {
 		// we didn't roll back the storage changes done by the previous
 		// call. So the item already exists. We simply increase the size of
 		// the storage item to incur some deposits (which bob can't pay).
-		assert!(Pallet::<Test>::dry_run_eth_transact(
-			GenericTransaction {
-				from: Some(BOB_ADDR),
-				to: Some(caller_addr),
-				input: (1u32, &addr).encode().into(),
-				gas: Some(1u32.into()),
-				..Default::default()
-			},
-			Weight::MAX,
-			|_, _| 0u64,
-		)
-		.is_err(),);
+		assert!(
+			Pallet::<Test>::dry_run_eth_transact(
+				GenericTransaction {
+					from: Some(BOB_ADDR),
+					to: Some(caller_addr),
+					input: (1u32, &addr).encode().into(),
+					gas: Some(1u32.into()),
+					..Default::default()
+				},
+				Weight::MAX,
+				|_, _| 0u64,
+			)
+			.is_err(),
+		);
 
 		// works when no gas is specified (skip transfer)
 		assert_ok!(Pallet::<Test>::dry_run_eth_transact(
@@ -4294,18 +4329,20 @@ fn skip_transfer_works() {
 		));
 
 		// fails when trying to increase the storage item size
-		assert!(Pallet::<Test>::dry_run_eth_transact(
-			GenericTransaction {
-				from: Some(BOB_ADDR),
-				to: Some(caller_addr),
-				input: (3u32, &addr).encode().into(),
-				gas: Some(1u32.into()),
-				..Default::default()
-			},
-			Weight::MAX,
-			|_, _| 0u64,
-		)
-		.is_err());
+		assert!(
+			Pallet::<Test>::dry_run_eth_transact(
+				GenericTransaction {
+					from: Some(BOB_ADDR),
+					to: Some(caller_addr),
+					input: (3u32, &addr).encode().into(),
+					gas: Some(1u32.into()),
+					..Default::default()
+				},
+				Weight::MAX,
+				|_, _| 0u64,
+			)
+			.is_err()
+		);
 	});
 }
 
@@ -5106,9 +5143,8 @@ fn basic_evm_flow_works() {
 
 	ExtBuilder::default().build().execute_with(|| {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code.clone()))
-			.native_value(1000)
-			.build_and_unwrap_contract();
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code.clone())).build_and_unwrap_contract();
 
 		// check the code exists
 		let contract = test_utils::get_contract_checked(&addr).unwrap();
diff --git a/substrate/frame/revive/src/vm/evm.rs b/substrate/frame/revive/src/vm/evm.rs
index a5edf39d7d50..df251f818ff1 100644
--- a/substrate/frame/revive/src/vm/evm.rs
+++ b/substrate/frame/revive/src/vm/evm.rs
@@ -1,4 +1,9 @@
-use crate::{vm::ExecResult, ExecReturnValue};
+use crate::{
+	address::AddressMapper,
+	exec::PrecompileExt,
+	vm::{ExecResult, Ext},
+	Config, ExecReturnValue,
+};
 use pallet_revive_uapi::ReturnFlags;
 use revm::{
 	bytecode::Bytecode,
@@ -9,37 +14,31 @@ use revm::{
 	interpreter::{
 		host::Host,
 		instruction_table,
-		interpreter::{EthInterpreter, ExtBytecode},
+		interpreter::{ExtBytecode, ReturnDataImpl, RuntimeFlags},
 		interpreter_action::{
 			CallInputs, CreateInputs, CreateOutcome, FrameInput, InterpreterAction,
 		},
-		interpreter_types::ReturnData,
-		CallInput, InputsImpl, Interpreter, InterpreterResult, SharedMemory,
+		interpreter_types::{InputsTr, ReturnData, StackTr},
+		CallInput, Gas, Interpreter, InterpreterResult, InterpreterTypes, SharedMemory, Stack,
 	},
 	primitives::{hardfork::SpecId, Address, Bytes, Log, StorageKey, StorageValue, B256, U256},
 };
+use sp_core::H256;
 
 /// TODO handle error case
-pub fn call(bytecode: Bytecode, input_data: Vec<u8>) -> ExecResult {
-	// TODO replace this with a proper trait impl
-	let inputs = InputsImpl {
-		caller_address: Default::default(),
-		target_address: Default::default(),
-		call_value: Default::default(),
-		bytecode_address: None,
-		input: CallInput::Bytes(input_data.into()),
+pub fn call<'a, E: Ext>(bytecode: Bytecode, inputs: EVMInputs<'a, E>) -> ExecResult {
+	let mut interpreter: Interpreter<EVMInterpreter<'a, E>> = Interpreter {
+		bytecode: ExtBytecode::new(bytecode),
+		gas: Gas::new(30_000_000),
+		stack: Stack::new(),
+		return_data: Default::default(),
+		memory: SharedMemory::new(),
+		input: inputs,
+		runtime_flag: RuntimeFlags { is_static: false, spec_id: SpecId::default() },
+		extend: Default::default(),
 	};
 
-	let mut interpreter = Interpreter::new(
-		SharedMemory::new(),
-		ExtBytecode::new(bytecode),
-		inputs,
-		false,
-		SpecId::default(),
-		1_000_000,
-	);
-
-	let table = instruction_table::<EthInterpreter, MockHost>();
+	let table = instruction_table::<EVMInterpreter<'a, E>, MockHost>();
 	let result = run(&mut interpreter, &table, &mut MockHost::default());
 
 	if result.is_ok() {
@@ -49,12 +48,13 @@ pub fn call(bytecode: Bytecode, input_data: Vec<u8>) -> ExecResult {
 		})
 	}
 
+	dbg!(result);
 	todo!("Handle error case properly");
 }
 
-fn run(
-	interpreter: &mut Interpreter<EthInterpreter>,
-	table: &revm::interpreter::InstructionTable<EthInterpreter, MockHost>,
+fn run<WIRE: InterpreterTypes>(
+	interpreter: &mut Interpreter<WIRE>,
+	table: &revm::interpreter::InstructionTable<WIRE, MockHost>,
 	host: &mut MockHost,
 ) -> InterpreterResult {
 	loop {
@@ -80,6 +80,59 @@ fn run(
 	}
 }
 
+pub struct EVMInterpreter<'a, E: Ext> {
+	_phantom: core::marker::PhantomData<&'a E>,
+}
+
+impl<'a, E: Ext> InterpreterTypes for EVMInterpreter<'a, E> {
+	type Stack = Stack;
+	type Memory = SharedMemory;
+	type Bytecode = ExtBytecode;
+	type ReturnData = ReturnDataImpl;
+	type Input = EVMInputs<'a, E>;
+	type RuntimeFlag = RuntimeFlags;
+	type Extend = ();
+	type Output = InterpreterAction;
+}
+
+pub struct EVMInputs<'a, E: Ext> {
+	ext: &'a mut E,
+	input: CallInput,
+}
+
+impl<'a, E: Ext> EVMInputs<'a, E> {
+	pub fn new(ext: &'a mut E, input: Vec<u8>) -> Self {
+		Self { ext, input: CallInput::Bytes(input.into()) }
+	}
+}
+
+impl<'a, E: Ext> InputsTr for EVMInputs<'a, E> {
+	fn target_address(&self) -> Address {
+		let address = self.ext.address();
+		address.0.into()
+	}
+
+	fn caller_address(&self) -> Address {
+		let caller = self.ext.caller();
+		let Ok(caller) = caller.account_id() else { return Address::ZERO };
+
+		let addr = <<E as PrecompileExt>::T as Config>::AddressMapper::to_address(caller);
+		addr.0.into()
+	}
+
+	fn bytecode_address(&self) -> Option<&Address> {
+		todo!()
+	}
+
+	fn input(&self) -> &CallInput {
+		&self.input
+	}
+
+	fn call_value(&self) -> U256 {
+		U256::from_limbs(self.ext.value_transferred().0)
+	}
+}
+
 /// Mock [`Host`] implementation
 #[derive(Debug, Default)]
 struct MockHost;
@@ -112,6 +165,100 @@ impl MockHost {
 	}
 }
 
+pub struct EVMRuntime<'a, E: Ext> {
+	ext: &'a mut E,
+}
+
+use frame_support::traits::Get;
+impl<'a, E: Ext> Host for EVMRuntime<'a, E> {
+	fn basefee(&self) -> U256 {
+		U256::ZERO
+	}
+	fn blob_gasprice(&self) -> U256 {
+		U256::ZERO
+	}
+	fn gas_limit(&self) -> U256 {
+		U256::from(30_000_000u64)
+	}
+	fn difficulty(&self) -> U256 {
+		U256::ZERO
+	}
+	fn prevrandao(&self) -> Option<U256> {
+		None
+	}
+	fn block_number(&self) -> U256 {
+		U256::from_limbs(self.ext.block_number().0)
+	}
+	fn timestamp(&self) -> U256 {
+		U256::from_limbs(self.ext.now().0)
+	}
+	fn beneficiary(&self) -> Address {
+		self.ext.block_author().unwrap_or_default().0.into()
+	}
+	fn chain_id(&self) -> U256 {
+		U256::from(<E::T as Config>::ChainId::get())
+	}
+	fn effective_gas_price(&self) -> U256 {
+		U256::ZERO
+	}
+	fn caller(&self) -> Address {
+		let caller = self.ext.caller();
+		let Ok(id) = caller.account_id() else { return Address::default() };
+		let addr = <E::T as Config>::AddressMapper::to_address(id);
+		addr.0.into()
+	}
+	fn blob_hash(&self, _number: usize) -> Option<U256> {
+		None
+	}
+	fn max_initcode_size(&self) -> usize {
+		0x40000
+	}
+	fn block_hash(&mut self, number: u64) -> Option<B256> {
+		self.ext.block_hash(number.into()).map(|h| B256::from(h.0))
+	}
+	fn selfdestruct(
+		&mut self,
+		_address: Address,
+		_target: Address,
+	) -> Option<StateLoad<SelfDestructResult>> {
+		None
+	}
+
+	fn log(&mut self, log: Log) {
+		let (topics, data) = log.data.split();
+		let topics = topics.into_iter().map(|v| H256::from(v.0)).collect();
+		self.ext.deposit_event(topics, data.into());
+	}
+
+	fn sstore(
+		&mut self,
+		_address: Address,
+		_key: StorageKey,
+		_value: StorageValue,
+	) -> Option<StateLoad<SStoreResult>> {
+		None
+	}
+	fn sload(&mut self, _address: Address, _key: StorageKey) -> Option<StateLoad<StorageValue>> {
+		None
+	}
+	fn tstore(&mut self, _address: Address, _key: StorageKey, _value: StorageValue) {}
+	fn tload(&mut self, _address: Address, _key: StorageKey) -> StorageValue {
+		StorageValue::ZERO
+	}
+	fn balance(&mut self, _address: Address) -> Option<StateLoad<U256>> {
+		None
+	}
+	fn load_account_delegated(&mut self, _address: Address) -> Option<StateLoad<AccountLoad>> {
+		Some(StateLoad::new(AccountLoad { is_delegate_account_cold: None, is_empty: true }, true))
+	}
+	fn load_account_code(&mut self, _address: Address) -> Option<StateLoad<Bytes>> {
+		None
+	}
+	fn load_account_code_hash(&mut self, _address: Address) -> Option<StateLoad<B256>> {
+		None
+	}
+}
+
 impl Host for MockHost {
 	fn basefee(&self) -> U256 {
 		U256::ZERO
diff --git a/substrate/frame/revive/src/vm/mod.rs b/substrate/frame/revive/src/vm/mod.rs
index 8fbf1f8472df..e26a6712a256 100644
--- a/substrate/frame/revive/src/vm/mod.rs
+++ b/substrate/frame/revive/src/vm/mod.rs
@@ -30,13 +30,13 @@ pub use crate::vm::runtime::{ReturnData, TrapReason};
 pub use crate::vm::runtime::{Runtime, RuntimeCosts};
 
 use crate::{
+	AccountIdOf, BadOrigin, BalanceOf, CodeInfoOf, CodeVec, Config, Error, ExecError, HoldReason,
+	LOG_TARGET, PristineCode, Weight,
 	exec::{ExecResult, Executable, ExportedFunction, Ext},
 	gas::{GasMeter, Token},
 	limits,
 	storage::meter::Diff,
 	weights::WeightInfo,
-	AccountIdOf, BadOrigin, BalanceOf, CodeInfoOf, CodeVec, Config, Error, ExecError, HoldReason,
-	PristineCode, Weight, LOG_TARGET,
 };
 use alloc::vec::Vec;
 use codec::{Decode, Encode, MaxEncodedLen};
@@ -432,9 +432,11 @@ where
 			let prepared_call = self.prepare_call(Runtime::new(ext, input_data), function, 0)?;
 			prepared_call.call()
 		} else {
+			use crate::vm::evm::EVMInputs;
 			use revm::bytecode::Bytecode;
+			let inputs = EVMInputs::new(ext, input_data);
 			let bytecode = Bytecode::new_raw(self.code.into_inner().into());
-			evm::call(bytecode, input_data)
+			evm::call(bytecode, inputs)
 		}
 	}
 

From 38c2b804433bfc5991ad930ad6a893566e33a51d Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Sun, 20 Jul 2025 09:41:51 +0000
Subject: [PATCH 062/186] add instructions

---
 substrate/frame/revive/src/vm/evm.rs          |  10 +-
 .../src/vm/evm/instructions/arithmetic.rs     | 134 +++++
 .../revive/src/vm/evm/instructions/bitwise.rs | 528 ++++++++++++++++++
 .../src/vm/evm/instructions/block_info.rs     |  93 +++
 .../src/vm/evm/instructions/contract.rs       | 288 ++++++++++
 .../evm/instructions/contract/call_helpers.rs |  71 +++
 .../revive/src/vm/evm/instructions/control.rs | 120 ++++
 .../revive/src/vm/evm/instructions/host.rs    | 308 ++++++++++
 .../revive/src/vm/evm/instructions/i256.rs    | 252 +++++++++
 .../revive/src/vm/evm/instructions/macros.rs  | 218 ++++++++
 .../revive/src/vm/evm/instructions/memory.rs  |  78 +++
 .../revive/src/vm/evm/instructions/mod.rs     | 224 ++++++++
 .../revive/src/vm/evm/instructions/stack.rs   |  68 +++
 .../revive/src/vm/evm/instructions/system.rs  | 247 ++++++++
 .../revive/src/vm/evm/instructions/tx_info.rs |  44 ++
 .../revive/src/vm/evm/instructions/utility.rs | 111 ++++
 16 files changed, 2790 insertions(+), 4 deletions(-)
 create mode 100644 substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs
 create mode 100644 substrate/frame/revive/src/vm/evm/instructions/bitwise.rs
 create mode 100644 substrate/frame/revive/src/vm/evm/instructions/block_info.rs
 create mode 100644 substrate/frame/revive/src/vm/evm/instructions/contract.rs
 create mode 100644 substrate/frame/revive/src/vm/evm/instructions/contract/call_helpers.rs
 create mode 100644 substrate/frame/revive/src/vm/evm/instructions/control.rs
 create mode 100644 substrate/frame/revive/src/vm/evm/instructions/host.rs
 create mode 100644 substrate/frame/revive/src/vm/evm/instructions/i256.rs
 create mode 100644 substrate/frame/revive/src/vm/evm/instructions/macros.rs
 create mode 100644 substrate/frame/revive/src/vm/evm/instructions/memory.rs
 create mode 100644 substrate/frame/revive/src/vm/evm/instructions/mod.rs
 create mode 100644 substrate/frame/revive/src/vm/evm/instructions/stack.rs
 create mode 100644 substrate/frame/revive/src/vm/evm/instructions/system.rs
 create mode 100644 substrate/frame/revive/src/vm/evm/instructions/tx_info.rs
 create mode 100644 substrate/frame/revive/src/vm/evm/instructions/utility.rs

diff --git a/substrate/frame/revive/src/vm/evm.rs b/substrate/frame/revive/src/vm/evm.rs
index df251f818ff1..3a0d04752a36 100644
--- a/substrate/frame/revive/src/vm/evm.rs
+++ b/substrate/frame/revive/src/vm/evm.rs
@@ -1,9 +1,12 @@
+mod instructions;
+
 use crate::{
+	Config, ExecReturnValue,
 	address::AddressMapper,
 	exec::PrecompileExt,
 	vm::{ExecResult, Ext},
-	Config, ExecReturnValue,
 };
+use instructions::instruction_table;
 use pallet_revive_uapi::ReturnFlags;
 use revm::{
 	bytecode::Bytecode,
@@ -12,16 +15,15 @@ use revm::{
 		journaled_state::AccountLoad,
 	},
 	interpreter::{
+		CallInput, Gas, Interpreter, InterpreterResult, InterpreterTypes, SharedMemory, Stack,
 		host::Host,
-		instruction_table,
 		interpreter::{ExtBytecode, ReturnDataImpl, RuntimeFlags},
 		interpreter_action::{
 			CallInputs, CreateInputs, CreateOutcome, FrameInput, InterpreterAction,
 		},
 		interpreter_types::{InputsTr, ReturnData, StackTr},
-		CallInput, Gas, Interpreter, InterpreterResult, InterpreterTypes, SharedMemory, Stack,
 	},
-	primitives::{hardfork::SpecId, Address, Bytes, Log, StorageKey, StorageValue, B256, U256},
+	primitives::{Address, B256, Bytes, Log, StorageKey, StorageValue, U256, hardfork::SpecId},
 };
 use sp_core::H256;
 
diff --git a/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs b/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs
new file mode 100644
index 000000000000..686b6f33d9f2
--- /dev/null
+++ b/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs
@@ -0,0 +1,134 @@
+use super::i256::{i256_div, i256_mod};
+use revm::interpreter::{
+    gas as revm_gas,
+    interpreter_types::{InterpreterTypes, RuntimeFlag, StackTr},
+    InstructionContext,
+};
+use revm::primitives::U256;
+
+/// Implements the ADD instruction - adds two values from stack.
+pub fn add<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    gas!(context.interpreter, revm_gas::VERYLOW);
+    popn_top!([op1], op2, context.interpreter);
+    *op2 = op1.wrapping_add(*op2);
+}
+
+/// Implements the MUL instruction - multiplies two values from stack.
+pub fn mul<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    gas!(context.interpreter, revm_gas::LOW);
+    popn_top!([op1], op2, context.interpreter);
+    *op2 = op1.wrapping_mul(*op2);
+}
+
+/// Implements the SUB instruction - subtracts two values from stack.
+pub fn sub<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    gas!(context.interpreter, revm_gas::VERYLOW);
+    popn_top!([op1], op2, context.interpreter);
+    *op2 = op1.wrapping_sub(*op2);
+}
+
+/// Implements the DIV instruction - divides two values from stack.
+pub fn div<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    gas!(context.interpreter, revm_gas::LOW);
+    popn_top!([op1], op2, context.interpreter);
+    if !op2.is_zero() {
+        *op2 = op1.wrapping_div(*op2);
+    }
+}
+
+/// Implements the SDIV instruction.
+///
+/// Performs signed division of two values from stack.
+pub fn sdiv<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    gas!(context.interpreter, revm_gas::LOW);
+    popn_top!([op1], op2, context.interpreter);
+    *op2 = i256_div(op1, *op2);
+}
+
+/// Implements the MOD instruction.
+///
+/// Pops two values from stack and pushes the remainder of their division.
+pub fn rem<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    gas!(context.interpreter, revm_gas::LOW);
+    popn_top!([op1], op2, context.interpreter);
+    if !op2.is_zero() {
+        *op2 = op1.wrapping_rem(*op2);
+    }
+}
+
+/// Implements the SMOD instruction.
+///
+/// Performs signed modulo of two values from stack.
+pub fn smod<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    gas!(context.interpreter, revm_gas::LOW);
+    popn_top!([op1], op2, context.interpreter);
+    *op2 = i256_mod(op1, *op2)
+}
+
+/// Implements the ADDMOD instruction.
+///
+/// Pops three values from stack and pushes (a + b) % n.
+pub fn addmod<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    gas!(context.interpreter, revm_gas::MID);
+    popn_top!([op1, op2], op3, context.interpreter);
+    *op3 = op1.add_mod(op2, *op3)
+}
+
+/// Implements the MULMOD instruction.
+///
+/// Pops three values from stack and pushes (a * b) % n.
+pub fn mulmod<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    gas!(context.interpreter, revm_gas::MID);
+    popn_top!([op1, op2], op3, context.interpreter);
+    *op3 = op1.mul_mod(op2, *op3)
+}
+
+/// Implements the EXP instruction - exponentiates two values from stack.
+pub fn exp<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    let spec_id = context.interpreter.runtime_flag.spec_id();
+    popn_top!([op1], op2, context.interpreter);
+    gas_or_fail!(context.interpreter, revm_gas::exp_cost(spec_id, *op2));
+    *op2 = op1.pow(*op2);
+}
+
+/// Implements the `SIGNEXTEND` opcode as defined in the Ethereum Yellow Paper.
+///
+/// In the yellow paper `SIGNEXTEND` is defined to take two inputs, we will call them
+/// `x` and `y`, and produce one output.
+///
+/// The first `t` bits of the output (numbering from the left, starting from 0) are
+/// equal to the `t`-th bit of `y`, where `t` is equal to `256 - 8(x + 1)`.
+///
+/// The remaining bits of the output are equal to the corresponding bits of `y`.
+///
+/// **Note**: If `x >= 32` then the output is equal to `y` since `t <= 0`.
+///
+/// To efficiently implement this algorithm in the case `x < 32` we do the following.
+///
+/// Let `b` be equal to the `t`-th bit of `y` and let `s = 255 - t = 8x + 7`
+/// (this is effectively the same index as `t`, but numbering the bits from the
+/// right instead of the left).
+///
+/// We can create a bit mask which is all zeros up to and including the `t`-th bit,
+/// and all ones afterwards by computing the quantity `2^s - 1`.
+///
+/// We can use this mask to compute the output depending on the value of `b`.
+///
+/// If `b == 1` then the yellow paper says the output should be all ones up to
+/// and including the `t`-th bit, followed by the remaining bits of `y`; this is equal to
+/// `y | !mask` where `|` is the bitwise `OR` and `!` is bitwise negation.
+///
+/// Similarly, if `b == 0` then the yellow paper says the output should start with all zeros,
+/// then end with bits from `b`; this is equal to `y & mask` where `&` is bitwise `AND`.
+pub fn signextend<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    gas!(context.interpreter, revm_gas::LOW);
+    popn_top!([ext], x, context.interpreter);
+    // For 31 we also don't need to do anything.
+    if ext < U256::from(31) {
+        let ext = ext.as_limbs()[0];
+        let bit_index = (8 * ext + 7) as usize;
+        let bit = x.bit(bit_index);
+        let mask = (U256::from(1) << bit_index) - U256::from(1);
+        *x = if bit { *x | !mask } else { *x & mask };
+    }
+}
diff --git a/substrate/frame/revive/src/vm/evm/instructions/bitwise.rs b/substrate/frame/revive/src/vm/evm/instructions/bitwise.rs
new file mode 100644
index 000000000000..c59a69b5886b
--- /dev/null
+++ b/substrate/frame/revive/src/vm/evm/instructions/bitwise.rs
@@ -0,0 +1,528 @@
+use super::i256::i256_cmp;
+use core::cmp::Ordering;
+use revm::{
+	interpreter::{
+		InstructionContext, gas as revm_gas,
+		interpreter_types::{InterpreterTypes, RuntimeFlag, StackTr},
+	},
+	primitives::U256,
+};
+
+/// Implements the LT instruction - less than comparison.
+pub fn lt<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+	gas!(context.interpreter, revm_gas::VERYLOW);
+	popn_top!([op1], op2, context.interpreter);
+	*op2 = U256::from(op1 < *op2);
+}
+
+/// Implements the GT instruction - greater than comparison.
+pub fn gt<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+	gas!(context.interpreter, revm_gas::VERYLOW);
+	popn_top!([op1], op2, context.interpreter);
+
+	*op2 = U256::from(op1 > *op2);
+}
+
+/// Implements the CLZ instruction - count leading zeros.
+pub fn clz<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+	check!(context.interpreter, OSAKA);
+	gas!(context.interpreter, revm_gas::VERYLOW);
+	popn_top!([], op1, context.interpreter);
+
+	let leading_zeros = op1.leading_zeros();
+	*op1 = U256::from(leading_zeros);
+}
+
+/// Implements the SLT instruction.
+///
+/// Signed less than comparison of two values from stack.
+pub fn slt<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+	gas!(context.interpreter, revm_gas::VERYLOW);
+	popn_top!([op1], op2, context.interpreter);
+
+	*op2 = U256::from(i256_cmp(&op1, op2) == Ordering::Less);
+}
+
+/// Implements the SGT instruction.
+///
+/// Signed greater than comparison of two values from stack.
+pub fn sgt<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+	gas!(context.interpreter, revm_gas::VERYLOW);
+	popn_top!([op1], op2, context.interpreter);
+
+	*op2 = U256::from(i256_cmp(&op1, op2) == Ordering::Greater);
+}
+
+/// Implements the EQ instruction.
+///
+/// Equality comparison of two values from stack.
+pub fn eq<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+	gas!(context.interpreter, revm_gas::VERYLOW);
+	popn_top!([op1], op2, context.interpreter);
+
+	*op2 = U256::from(op1 == *op2);
+}
+
+/// Implements the ISZERO instruction.
+///
+/// Checks if the top stack value is zero.
+pub fn iszero<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+	gas!(context.interpreter, revm_gas::VERYLOW);
+	popn_top!([], op1, context.interpreter);
+	*op1 = U256::from(op1.is_zero());
+}
+
+/// Implements the AND instruction.
+///
+/// Bitwise AND of two values from stack.
+pub fn bitand<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+	gas!(context.interpreter, revm_gas::VERYLOW);
+	popn_top!([op1], op2, context.interpreter);
+	*op2 = op1 & *op2;
+}
+
+/// Implements the OR instruction.
+///
+/// Bitwise OR of two values from stack.
+pub fn bitor<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+	gas!(context.interpreter, revm_gas::VERYLOW);
+	popn_top!([op1], op2, context.interpreter);
+
+	*op2 = op1 | *op2;
+}
+
+/// Implements the XOR instruction.
+///
+/// Bitwise XOR of two values from stack.
+pub fn bitxor<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+	gas!(context.interpreter, revm_gas::VERYLOW);
+	popn_top!([op1], op2, context.interpreter);
+
+	*op2 = op1 ^ *op2;
+}
+
+/// Implements the NOT instruction.
+///
+/// Bitwise NOT (negation) of the top stack value.
+pub fn not<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+	gas!(context.interpreter, revm_gas::VERYLOW);
+	popn_top!([], op1, context.interpreter);
+
+	*op1 = !*op1;
+}
+
+/// Implements the BYTE instruction.
+///
+/// Extracts a single byte from a word at a given index.
+pub fn byte<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+	gas!(context.interpreter, revm_gas::VERYLOW);
+	popn_top!([op1], op2, context.interpreter);
+
+	let o1 = as_usize_saturated!(op1);
+	*op2 = if o1 < 32 {
+		// `31 - o1` because `byte` returns LE, while we want BE
+		U256::from(op2.byte(31 - o1))
+	} else {
+		U256::ZERO
+	};
+}
+
+/// EIP-145: Bitwise shifting instructions in EVM
+pub fn shl<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+	check!(context.interpreter, CONSTANTINOPLE);
+	gas!(context.interpreter, revm_gas::VERYLOW);
+	popn_top!([op1], op2, context.interpreter);
+
+	let shift = as_usize_saturated!(op1);
+	*op2 = if shift < 256 { *op2 << shift } else { U256::ZERO }
+}
+
+/// EIP-145: Bitwise shifting instructions in EVM
+pub fn shr<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+	check!(context.interpreter, CONSTANTINOPLE);
+	gas!(context.interpreter, revm_gas::VERYLOW);
+	popn_top!([op1], op2, context.interpreter);
+
+	let shift = as_usize_saturated!(op1);
+	*op2 = if shift < 256 { *op2 >> shift } else { U256::ZERO }
+}
+
+/// EIP-145: Bitwise shifting instructions in EVM
+pub fn sar<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+	check!(context.interpreter, CONSTANTINOPLE);
+	gas!(context.interpreter, revm_gas::VERYLOW);
+	popn_top!([op1], op2, context.interpreter);
+
+	let shift = as_usize_saturated!(op1);
+	*op2 = if shift < 256 {
+		op2.arithmetic_shr(shift)
+	} else if op2.bit(255) {
+		U256::MAX
+	} else {
+		U256::ZERO
+	};
+}
+
+#[cfg(test)]
+mod tests {
+	use super::{byte, clz, sar, shl, shr};
+	use revm::{
+		interpreter::{InstructionContext, Interpreter, host::DummyHost},
+		primitives::{U256, hardfork::SpecId, uint},
+	};
+
+	#[test]
+	fn test_shift_left() {
+		let mut interpreter = Interpreter::default();
+
+		struct TestCase {
+			value: U256,
+			shift: U256,
+			expected: U256,
+		}
+
+		uint! {
+			let test_cases = [
+				TestCase {
+					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+					shift: 0x00_U256,
+					expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+				},
+				TestCase {
+					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+					shift: 0x01_U256,
+					expected: 0x0000000000000000000000000000000000000000000000000000000000000002_U256,
+				},
+				TestCase {
+					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+					shift: 0xff_U256,
+					expected: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
+				},
+				TestCase {
+					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+					shift: 0x0100_U256,
+					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+				},
+				TestCase {
+					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+					shift: 0x0101_U256,
+					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+				},
+				TestCase {
+					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+					shift: 0x00_U256,
+					expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+				},
+				TestCase {
+					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+					shift: 0x01_U256,
+					expected: 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe_U256,
+				},
+				TestCase {
+					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+					shift: 0xff_U256,
+					expected: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
+				},
+				TestCase {
+					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+					shift: 0x0100_U256,
+					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+				},
+				TestCase {
+					value: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+					shift: 0x01_U256,
+					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+				},
+				TestCase {
+					value: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+					shift: 0x01_U256,
+					expected: 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe_U256,
+				},
+			];
+		}
+
+		for test in test_cases {
+			push!(interpreter, test.value);
+			push!(interpreter, test.shift);
+			let context =
+				InstructionContext { host: &mut DummyHost, interpreter: &mut interpreter };
+			shl(context);
+			let res = interpreter.stack.pop().unwrap();
+			assert_eq!(res, test.expected);
+		}
+	}
+
+	#[test]
+	fn test_logical_shift_right() {
+		let mut interpreter = Interpreter::default();
+
+		struct TestCase {
+			value: U256,
+			shift: U256,
+			expected: U256,
+		}
+
+		uint! {
+			let test_cases = [
+				TestCase {
+					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+					shift: 0x00_U256,
+					expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+				},
+				TestCase {
+					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+					shift: 0x01_U256,
+					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+				},
+				TestCase {
+					value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
+					shift: 0x01_U256,
+					expected: 0x4000000000000000000000000000000000000000000000000000000000000000_U256,
+				},
+				TestCase {
+					value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
+					shift: 0xff_U256,
+					expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+				},
+				TestCase {
+					value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
+					shift: 0x0100_U256,
+					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+				},
+				TestCase {
+					value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
+					shift: 0x0101_U256,
+					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+				},
+				TestCase {
+					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+					shift: 0x00_U256,
+					expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+				},
+				TestCase {
+					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+					shift: 0x01_U256,
+					expected: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+				},
+				TestCase {
+					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+					shift: 0xff_U256,
+					expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+				},
+				TestCase {
+					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+					shift: 0x0100_U256,
+					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+				},
+				TestCase {
+					value: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+					shift: 0x01_U256,
+					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+				},
+			];
+		}
+
+		for test in test_cases {
+			push!(interpreter, test.value);
+			push!(interpreter, test.shift);
+			let context =
+				InstructionContext { host: &mut DummyHost, interpreter: &mut interpreter };
+			shr(context);
+			let res = interpreter.stack.pop().unwrap();
+			assert_eq!(res, test.expected);
+		}
+	}
+
+	#[test]
+	fn test_arithmetic_shift_right() {
+		let mut interpreter = Interpreter::default();
+
+		struct TestCase {
+			value: U256,
+			shift: U256,
+			expected: U256,
+		}
+
+		uint! {
+		let test_cases = [
+			TestCase {
+				value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+				shift: 0x00_U256,
+				expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+			},
+			TestCase {
+				value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+				shift: 0x01_U256,
+				expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+			},
+			TestCase {
+				value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
+				shift: 0x01_U256,
+				expected: 0xc000000000000000000000000000000000000000000000000000000000000000_U256,
+			},
+			TestCase {
+				value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
+				shift: 0xff_U256,
+				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+			},
+			TestCase {
+				value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
+				shift: 0x0100_U256,
+				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+			},
+			TestCase {
+				value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
+				shift: 0x0101_U256,
+				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+			},
+			TestCase {
+				value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+				shift: 0x00_U256,
+				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+			},
+			TestCase {
+				value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+				shift: 0x01_U256,
+				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+			},
+			TestCase {
+				value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+				shift: 0xff_U256,
+				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+			},
+			TestCase {
+				value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+				shift: 0x0100_U256,
+				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+			},
+			TestCase {
+				value: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+				shift: 0x01_U256,
+				expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+			},
+			TestCase {
+				value: 0x4000000000000000000000000000000000000000000000000000000000000000_U256,
+				shift: 0xfe_U256,
+				expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+			},
+			TestCase {
+				value: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+				shift: 0xf8_U256,
+				expected: 0x000000000000000000000000000000000000000000000000000000000000007f_U256,
+			},
+			TestCase {
+				value: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+				shift: 0xfe_U256,
+				expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+			},
+			TestCase {
+				value: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+				shift: 0xff_U256,
+				expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+			},
+			TestCase {
+				value: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+				shift: 0x0100_U256,
+				expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+			},
+		];
+			}
+
+		for test in test_cases {
+			push!(interpreter, test.value);
+			push!(interpreter, test.shift);
+			let context =
+				InstructionContext { host: &mut DummyHost, interpreter: &mut interpreter };
+			sar(context);
+			let res = interpreter.stack.pop().unwrap();
+			assert_eq!(res, test.expected);
+		}
+	}
+
+	#[test]
+	fn test_byte() {
+		struct TestCase {
+			input: U256,
+			index: usize,
+			expected: U256,
+		}
+
+		let mut interpreter = Interpreter::default();
+
+		let input_value = U256::from(0x1234567890abcdef1234567890abcdef_u128);
+		let test_cases = (0..32)
+			.map(|i| {
+				let byte_pos = 31 - i;
+
+				let shift_amount = U256::from(byte_pos * 8);
+				let byte_value = (input_value >> shift_amount) & U256::from(0xFF);
+				TestCase { input: input_value, index: i, expected: byte_value }
+			})
+			.collect::<Vec<_>>();
+
+		for test in test_cases.iter() {
+			push!(interpreter, test.input);
+			push!(interpreter, U256::from(test.index));
+			let context =
+				InstructionContext { host: &mut DummyHost, interpreter: &mut interpreter };
+			byte(context);
+			let res = interpreter.stack.pop().unwrap();
+			assert_eq!(res, test.expected, "Failed at index: {}", test.index);
+		}
+	}
+
+	#[test]
+	fn test_clz() {
+		let mut interpreter = Interpreter::default();
+		interpreter.set_spec_id(SpecId::OSAKA);
+
+		struct TestCase {
+			value: U256,
+			expected: U256,
+		}
+
+		uint! {
+			let test_cases = [
+				TestCase { value: 0x0_U256, expected: 256_U256 },
+				TestCase { value: 0x1_U256, expected: 255_U256 },
+				TestCase { value: 0x2_U256, expected: 254_U256 },
+				TestCase { value: 0x3_U256, expected: 254_U256 },
+				TestCase { value: 0x4_U256, expected: 253_U256 },
+				TestCase { value: 0x7_U256, expected: 253_U256 },
+				TestCase { value: 0x8_U256, expected: 252_U256 },
+				TestCase { value: 0xff_U256, expected: 248_U256 },
+				TestCase { value: 0x100_U256, expected: 247_U256 },
+				TestCase { value: 0xffff_U256, expected: 240_U256 },
+				TestCase {
+					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256, // U256::MAX
+					expected: 0_U256,
+				},
+				TestCase {
+					value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256, // 1 << 255
+					expected: 0_U256,
+				},
+				TestCase { // Smallest value with 1 leading zero
+					value: 0x4000000000000000000000000000000000000000000000000000000000000000_U256, // 1 << 254
+					expected: 1_U256,
+				},
+				TestCase { // Value just below 1 << 255
+					value: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+					expected: 1_U256,
+				},
+			];
+		}
+
+		for test in test_cases {
+			push!(interpreter, test.value);
+			let context =
+				InstructionContext { host: &mut DummyHost, interpreter: &mut interpreter };
+			clz(context);
+			let res = interpreter.stack.pop().unwrap();
+			assert_eq!(
+				res, test.expected,
+				"CLZ for value {:#x} failed. Expected: {}, Got: {}",
+				test.value, test.expected, res
+			);
+		}
+	}
+}
diff --git a/substrate/frame/revive/src/vm/evm/instructions/block_info.rs b/substrate/frame/revive/src/vm/evm/instructions/block_info.rs
new file mode 100644
index 000000000000..3969e1fab238
--- /dev/null
+++ b/substrate/frame/revive/src/vm/evm/instructions/block_info.rs
@@ -0,0 +1,93 @@
+use revm::interpreter::{
+    gas as revm_gas,
+    interpreter_types::{InterpreterTypes, RuntimeFlag, StackTr},
+    host::Host,
+    InstructionContext,
+};
+use revm::primitives::{hardfork::SpecId::*, U256};
+
+/// EIP-1344: ChainID opcode
+pub fn chainid<WIRE: InterpreterTypes, H: Host + ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    check!(context.interpreter, ISTANBUL);
+    gas!(context.interpreter, revm_gas::BASE);
+    push!(context.interpreter, context.host.chain_id());
+}
+
+/// Implements the COINBASE instruction.
+///
+/// Pushes the current block's beneficiary address onto the stack.
+pub fn coinbase<WIRE: InterpreterTypes, H: Host + ?Sized>(
+    context: InstructionContext<'_, H, WIRE>,
+) {
+    gas!(context.interpreter, revm_gas::BASE);
+    push!(
+        context.interpreter,
+        context.host.beneficiary().into_word().into()
+    );
+}
+
+/// Implements the TIMESTAMP instruction.
+///
+/// Pushes the current block's timestamp onto the stack.
+pub fn timestamp<WIRE: InterpreterTypes, H: Host + ?Sized>(
+    context: InstructionContext<'_, H, WIRE>,
+) {
+    gas!(context.interpreter, revm_gas::BASE);
+    push!(context.interpreter, context.host.timestamp());
+}
+
+/// Implements the NUMBER instruction.
+///
+/// Pushes the current block number onto the stack.
+pub fn block_number<WIRE: InterpreterTypes, H: Host + ?Sized>(
+    context: InstructionContext<'_, H, WIRE>,
+) {
+    gas!(context.interpreter, revm_gas::BASE);
+    push!(context.interpreter, U256::from(context.host.block_number()));
+}
+
+/// Implements the DIFFICULTY/PREVRANDAO instruction.
+///
+/// Pushes the block difficulty (pre-merge) or prevrandao (post-merge) onto the stack.
+pub fn difficulty<WIRE: InterpreterTypes, H: Host + ?Sized>(
+    context: InstructionContext<'_, H, WIRE>,
+) {
+    gas!(context.interpreter, revm_gas::BASE);
+    if context
+        .interpreter
+        .runtime_flag
+        .spec_id()
+        .is_enabled_in(MERGE)
+    {
+        // Unwrap is safe as this fields is checked in validation handler.
+        push!(context.interpreter, context.host.prevrandao().unwrap());
+    } else {
+        push!(context.interpreter, context.host.difficulty());
+    }
+}
+
+/// Implements the GASLIMIT instruction.
+///
+/// Pushes the current block's gas limit onto the stack.
+pub fn gaslimit<WIRE: InterpreterTypes, H: Host + ?Sized>(
+    context: InstructionContext<'_, H, WIRE>,
+) {
+    gas!(context.interpreter, revm_gas::BASE);
+    push!(context.interpreter, context.host.gas_limit());
+}
+
+/// EIP-3198: BASEFEE opcode
+pub fn basefee<WIRE: InterpreterTypes, H: Host + ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    check!(context.interpreter, LONDON);
+    gas!(context.interpreter, revm_gas::BASE);
+    push!(context.interpreter, context.host.basefee());
+}
+
+/// EIP-7516: BLOBBASEFEE opcode
+pub fn blob_basefee<WIRE: InterpreterTypes, H: Host + ?Sized>(
+    context: InstructionContext<'_, H, WIRE>,
+) {
+    check!(context.interpreter, CANCUN);
+    gas!(context.interpreter, revm_gas::BASE);
+    push!(context.interpreter, context.host.blob_gasprice());
+}
diff --git a/substrate/frame/revive/src/vm/evm/instructions/contract.rs b/substrate/frame/revive/src/vm/evm/instructions/contract.rs
new file mode 100644
index 000000000000..ca49a8e022de
--- /dev/null
+++ b/substrate/frame/revive/src/vm/evm/instructions/contract.rs
@@ -0,0 +1,288 @@
+mod call_helpers;
+
+pub use call_helpers::{calc_call_gas, get_memory_input_and_out_ranges};
+
+use super::utility::IntoAddress;
+use revm::{
+	context_interface::CreateScheme,
+	interpreter::{
+		CallInput, InstructionContext, InstructionResult, gas as revm_gas,
+		host::Host,
+		interpreter_action::{
+			CallInputs, CallScheme, CallValue, CreateInputs, FrameInput, InterpreterAction,
+		},
+		interpreter_types::{
+			InputsTr, InterpreterTypes, LoopControl, MemoryTr, RuntimeFlag, StackTr,
+		},
+	},
+	primitives::{Address, B256, Bytes, U256, hardfork::SpecId},
+};
+use std::boxed::Box;
+
+/// Implements the CREATE/CREATE2 instruction.
+///
+/// Creates a new contract with provided bytecode.
+pub fn create<WIRE: InterpreterTypes, const IS_CREATE2: bool, H: Host + ?Sized>(
+	context: InstructionContext<'_, H, WIRE>,
+) {
+	require_non_staticcall!(context.interpreter);
+
+	// EIP-1014: Skinny CREATE2
+	if IS_CREATE2 {
+		check!(context.interpreter, PETERSBURG);
+	}
+
+	popn!([value, code_offset, len], context.interpreter);
+	let len = as_usize_or_fail!(context.interpreter, len);
+
+	let mut code = Bytes::new();
+	if len != 0 {
+		// EIP-3860: Limit and meter initcode
+		if context.interpreter.runtime_flag.spec_id().is_enabled_in(SpecId::SHANGHAI) {
+			// Limit is set as double of max contract bytecode size
+			if len > context.host.max_initcode_size() {
+				context.interpreter.halt(InstructionResult::CreateInitCodeSizeLimit);
+				return;
+			}
+			gas!(context.interpreter, revm_gas::initcode_cost(len));
+		}
+
+		let code_offset = as_usize_or_fail!(context.interpreter, code_offset);
+		resize_memory!(context.interpreter, code_offset, len);
+		code =
+			Bytes::copy_from_slice(context.interpreter.memory.slice_len(code_offset, len).as_ref());
+	}
+
+	// EIP-1014: Skinny CREATE2
+	let scheme = if IS_CREATE2 {
+		popn!([salt], context.interpreter);
+		// SAFETY: `len` is reasonable in size as gas for it is already deducted.
+		gas_or_fail!(context.interpreter, revm_gas::create2_cost(len));
+		CreateScheme::Create2 { salt }
+	} else {
+		gas!(context.interpreter, revm_gas::CREATE);
+		CreateScheme::Create
+	};
+
+	let mut gas_limit = context.interpreter.gas.remaining();
+
+	// EIP-150: Gas cost changes for IO-heavy operations
+	if context.interpreter.runtime_flag.spec_id().is_enabled_in(SpecId::TANGERINE) {
+		// Take remaining gas and deduce l64 part of it.
+		gas_limit -= gas_limit / 64
+	}
+	gas!(context.interpreter, gas_limit);
+
+	// Call host to interact with target contract
+	context
+		.interpreter
+		.bytecode
+		.set_action(InterpreterAction::NewFrame(FrameInput::Create(Box::new(CreateInputs {
+			caller: context.interpreter.input.target_address(),
+			scheme,
+			value,
+			init_code: code,
+			gas_limit,
+		}))));
+}
+
+/// Implements the CALL instruction.
+///
+/// Message call with value transfer to another account.
+pub fn call<WIRE: InterpreterTypes, H: Host + ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+	popn!([local_gas_limit, to, value], context.interpreter);
+	let to = to.into_address();
+	// Max gas limit is not possible in real ethereum situation.
+	let local_gas_limit = u64::try_from(local_gas_limit).unwrap_or(u64::MAX);
+
+	let has_transfer = !value.is_zero();
+	if context.interpreter.runtime_flag.is_static() && has_transfer {
+		context.interpreter.halt(InstructionResult::CallNotAllowedInsideStatic);
+		return;
+	}
+
+	let Some((input, return_memory_offset)) = get_memory_input_and_out_ranges(context.interpreter)
+	else {
+		return;
+	};
+
+	let Some(account_load) = context.host.load_account_delegated(to) else {
+		context.interpreter.halt(InstructionResult::FatalExternalError);
+		return;
+	};
+
+	let Some(mut gas_limit) =
+		calc_call_gas(context.interpreter, account_load, has_transfer, local_gas_limit)
+	else {
+		return;
+	};
+
+	gas!(context.interpreter, gas_limit);
+
+	// Add call stipend if there is value to be transferred.
+	if has_transfer {
+		gas_limit = gas_limit.saturating_add(revm_gas::CALL_STIPEND);
+	}
+
+	// Call host to interact with target contract
+	context
+		.interpreter
+		.bytecode
+		.set_action(InterpreterAction::NewFrame(FrameInput::Call(Box::new(CallInputs {
+			input: CallInput::SharedBuffer(input),
+			gas_limit,
+			target_address: to,
+			caller: context.interpreter.input.target_address(),
+			bytecode_address: to,
+			value: CallValue::Transfer(value),
+			scheme: CallScheme::Call,
+			is_static: context.interpreter.runtime_flag.is_static(),
+			return_memory_offset,
+		}))));
+}
+
+/// Implements the CALLCODE instruction.
+///
+/// Message call with alternative account's code.
+pub fn call_code<WIRE: InterpreterTypes, H: Host + ?Sized>(
+	context: InstructionContext<'_, H, WIRE>,
+) {
+	popn!([local_gas_limit, to, value], context.interpreter);
+	let to = Address::from_word(B256::from(to));
+	// Max gas limit is not possible in real ethereum situation.
+	let local_gas_limit = u64::try_from(local_gas_limit).unwrap_or(u64::MAX);
+
+	//pop!(context.interpreter, value);
+	let Some((input, return_memory_offset)) = get_memory_input_and_out_ranges(context.interpreter)
+	else {
+		return;
+	};
+
+	let Some(mut load) = context.host.load_account_delegated(to) else {
+		context.interpreter.halt(InstructionResult::FatalExternalError);
+		return;
+	};
+
+	// Set `is_empty` to false as we are not creating this account.
+	load.is_empty = false;
+	let Some(mut gas_limit) =
+		calc_call_gas(context.interpreter, load, !value.is_zero(), local_gas_limit)
+	else {
+		return;
+	};
+
+	gas!(context.interpreter, gas_limit);
+
+	// Add call stipend if there is value to be transferred.
+	if !value.is_zero() {
+		gas_limit = gas_limit.saturating_add(revm_gas::CALL_STIPEND);
+	}
+
+	// Call host to interact with target contract
+	context
+		.interpreter
+		.bytecode
+		.set_action(InterpreterAction::NewFrame(FrameInput::Call(Box::new(CallInputs {
+			input: CallInput::SharedBuffer(input),
+			gas_limit,
+			target_address: context.interpreter.input.target_address(),
+			caller: context.interpreter.input.target_address(),
+			bytecode_address: to,
+			value: CallValue::Transfer(value),
+			scheme: CallScheme::CallCode,
+			is_static: context.interpreter.runtime_flag.is_static(),
+			return_memory_offset,
+		}))));
+}
+
+/// Implements the DELEGATECALL instruction.
+///
+/// Message call with alternative account's code but same sender and value.
+pub fn delegate_call<WIRE: InterpreterTypes, H: Host + ?Sized>(
+	context: InstructionContext<'_, H, WIRE>,
+) {
+	check!(context.interpreter, HOMESTEAD);
+	popn!([local_gas_limit, to], context.interpreter);
+	let to = Address::from_word(B256::from(to));
+	// Max gas limit is not possible in real ethereum situation.
+	let local_gas_limit = u64::try_from(local_gas_limit).unwrap_or(u64::MAX);
+
+	let Some((input, return_memory_offset)) = get_memory_input_and_out_ranges(context.interpreter)
+	else {
+		return;
+	};
+
+	let Some(mut load) = context.host.load_account_delegated(to) else {
+		context.interpreter.halt(InstructionResult::FatalExternalError);
+		return;
+	};
+
+	// Set is_empty to false as we are not creating this account.
+	load.is_empty = false;
+	let Some(gas_limit) = calc_call_gas(context.interpreter, load, false, local_gas_limit) else {
+		return;
+	};
+
+	gas!(context.interpreter, gas_limit);
+
+	// Call host to interact with target contract
+	context
+		.interpreter
+		.bytecode
+		.set_action(InterpreterAction::NewFrame(FrameInput::Call(Box::new(CallInputs {
+			input: CallInput::SharedBuffer(input),
+			gas_limit,
+			target_address: context.interpreter.input.target_address(),
+			caller: context.interpreter.input.caller_address(),
+			bytecode_address: to,
+			value: CallValue::Apparent(context.interpreter.input.call_value()),
+			scheme: CallScheme::DelegateCall,
+			is_static: context.interpreter.runtime_flag.is_static(),
+			return_memory_offset,
+		}))));
+}
+
+/// Implements the STATICCALL instruction.
+///
+/// Static message call (cannot modify state).
+pub fn static_call<WIRE: InterpreterTypes, H: Host + ?Sized>(
+	context: InstructionContext<'_, H, WIRE>,
+) {
+	check!(context.interpreter, BYZANTIUM);
+	popn!([local_gas_limit, to], context.interpreter);
+	let to = Address::from_word(B256::from(to));
+	// Max gas limit is not possible in real ethereum situation.
+	let local_gas_limit = u64::try_from(local_gas_limit).unwrap_or(u64::MAX);
+
+	let Some((input, return_memory_offset)) = get_memory_input_and_out_ranges(context.interpreter)
+	else {
+		return;
+	};
+
+	let Some(mut load) = context.host.load_account_delegated(to) else {
+		context.interpreter.halt(InstructionResult::FatalExternalError);
+		return;
+	};
+	// Set `is_empty` to false as we are not creating this account.
+	load.is_empty = false;
+	let Some(gas_limit) = calc_call_gas(context.interpreter, load, false, local_gas_limit) else {
+		return;
+	};
+	gas!(context.interpreter, gas_limit);
+
+	// Call host to interact with target contract
+	context
+		.interpreter
+		.bytecode
+		.set_action(InterpreterAction::NewFrame(FrameInput::Call(Box::new(CallInputs {
+			input: CallInput::SharedBuffer(input),
+			gas_limit,
+			target_address: to,
+			caller: context.interpreter.input.target_address(),
+			bytecode_address: to,
+			value: CallValue::Transfer(U256::ZERO),
+			scheme: CallScheme::StaticCall,
+			is_static: true,
+			return_memory_offset,
+		}))));
+}
diff --git a/substrate/frame/revive/src/vm/evm/instructions/contract/call_helpers.rs b/substrate/frame/revive/src/vm/evm/instructions/contract/call_helpers.rs
new file mode 100644
index 000000000000..24a5cbf1ac1e
--- /dev/null
+++ b/substrate/frame/revive/src/vm/evm/instructions/contract/call_helpers.rs
@@ -0,0 +1,71 @@
+use revm::interpreter::{
+    gas as revm_gas,
+    Interpreter,
+    interpreter_types::{InterpreterTypes, MemoryTr, RuntimeFlag, StackTr},
+};
+use revm::context_interface::{context::StateLoad, journaled_state::AccountLoad};
+use core::{cmp::min, ops::Range};
+use revm::primitives::{hardfork::SpecId::*, U256};
+
+/// Gets memory input and output ranges for call instructions.
+#[inline]
+pub fn get_memory_input_and_out_ranges(
+    interpreter: &mut Interpreter<impl InterpreterTypes>,
+) -> Option<(Range<usize>, Range<usize>)> {
+    popn!([in_offset, in_len, out_offset, out_len], interpreter, None);
+
+    let mut in_range = resize_memory(interpreter, in_offset, in_len)?;
+
+    if !in_range.is_empty() {
+        let offset = interpreter.memory.local_memory_offset();
+        in_range = in_range.start.saturating_add(offset)..in_range.end.saturating_add(offset);
+    }
+
+    let ret_range = resize_memory(interpreter, out_offset, out_len)?;
+    Some((in_range, ret_range))
+}
+
+/// Resize memory and return range of memory.
+/// If `len` is 0 dont touch memory and return `usize::MAX` as offset and 0 as length.
+#[inline]
+pub fn resize_memory(
+    interpreter: &mut Interpreter<impl InterpreterTypes>,
+    offset: U256,
+    len: U256,
+) -> Option<Range<usize>> {
+    let len = as_usize_or_fail_ret!(interpreter, len, None);
+    let offset = if len != 0 {
+        let offset = as_usize_or_fail_ret!(interpreter, offset, None);
+        resize_memory!(interpreter, offset, len, None);
+        offset
+    } else {
+        usize::MAX //unrealistic value so we are sure it is not used
+    };
+    Some(offset..offset + len)
+}
+
+/// Calculates gas cost and limit for call instructions.
+#[inline]
+pub fn calc_call_gas(
+    interpreter: &mut Interpreter<impl InterpreterTypes>,
+    account_load: StateLoad<AccountLoad>,
+    has_transfer: bool,
+    local_gas_limit: u64,
+) -> Option<u64> {
+    let call_cost = revm_gas::call_cost(
+        interpreter.runtime_flag.spec_id(),
+        has_transfer,
+        account_load,
+    );
+    gas!(interpreter, call_cost, None);
+
+    // EIP-150: Gas cost changes for IO-heavy operations
+    let gas_limit = if interpreter.runtime_flag.spec_id().is_enabled_in(TANGERINE) {
+        // Take l64 part of gas_limit
+        min(interpreter.gas.remaining_63_of_64_parts(), local_gas_limit)
+    } else {
+        local_gas_limit
+    };
+
+    Some(gas_limit)
+}
diff --git a/substrate/frame/revive/src/vm/evm/instructions/control.rs b/substrate/frame/revive/src/vm/evm/instructions/control.rs
new file mode 100644
index 000000000000..95e0020b678a
--- /dev/null
+++ b/substrate/frame/revive/src/vm/evm/instructions/control.rs
@@ -0,0 +1,120 @@
+use revm::interpreter::interpreter_action::InterpreterAction;
+use revm::interpreter::{
+    gas as revm_gas,
+    Interpreter,
+    interpreter_types::{InterpreterTypes, Jumps, LoopControl, MemoryTr, RuntimeFlag, StackTr},
+    InstructionContext,
+    InstructionResult,
+};
+use revm::primitives::{Bytes, U256};
+
+/// Implements the JUMP instruction.
+///
+/// Unconditional jump to a valid destination.
+pub fn jump<ITy: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, ITy>) {
+    gas!(context.interpreter, revm_gas::MID);
+    popn!([target], context.interpreter);
+    jump_inner(context.interpreter, target);
+}
+
+/// Implements the JUMPI instruction.
+///
+/// Conditional jump to a valid destination if condition is true.
+pub fn jumpi<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    gas!(context.interpreter, revm_gas::HIGH);
+    popn!([target, cond], context.interpreter);
+
+    if !cond.is_zero() {
+        jump_inner(context.interpreter, target);
+    }
+}
+
+#[inline(always)]
+/// Internal helper function for jump operations.
+///
+/// Validates jump target and performs the actual jump.
+fn jump_inner<WIRE: InterpreterTypes>(interpreter: &mut Interpreter<WIRE>, target: U256) {
+    let target = as_usize_or_fail!(interpreter, target, InstructionResult::InvalidJump);
+    if !interpreter.bytecode.is_valid_legacy_jump(target) {
+        interpreter.halt(InstructionResult::InvalidJump);
+        return;
+    }
+    // SAFETY: `is_valid_jump` ensures that `dest` is in bounds.
+    interpreter.bytecode.absolute_jump(target);
+}
+
+/// Implements the JUMPDEST instruction.
+///
+/// Marks a valid destination for jump operations.
+pub fn jumpdest<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    gas!(context.interpreter, revm_gas::JUMPDEST);
+}
+
+/// Implements the PC instruction.
+///
+/// Pushes the current program counter onto the stack.
+pub fn pc<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    gas!(context.interpreter, revm_gas::BASE);
+    // - 1 because we have already advanced the instruction pointer in `Interpreter::step`
+    push!(
+        context.interpreter,
+        U256::from(context.interpreter.bytecode.pc() - 1)
+    );
+}
+
+#[inline]
+/// Internal helper function for return operations.
+///
+/// Handles memory data retrieval and sets the return action.
+fn return_inner(
+    interpreter: &mut Interpreter<impl InterpreterTypes>,
+    instruction_result: InstructionResult,
+) {
+    // Zero gas cost
+    // gas!(interpreter, revm_gas::ZERO)
+    popn!([offset, len], interpreter);
+    let len = as_usize_or_fail!(interpreter, len);
+    // Important: Offset must be ignored if len is zeros
+    let mut output = Bytes::default();
+    if len != 0 {
+        let offset = as_usize_or_fail!(interpreter, offset);
+        resize_memory!(interpreter, offset, len);
+        output = interpreter.memory.slice_len(offset, len).to_vec().into()
+    }
+
+    interpreter
+        .bytecode
+        .set_action(InterpreterAction::new_return(
+            instruction_result,
+            output,
+            interpreter.gas,
+        ));
+}
+
+/// Implements the RETURN instruction.
+///
+/// Halts execution and returns data from memory.
+pub fn ret<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    return_inner(context.interpreter, InstructionResult::Return);
+}
+
+/// EIP-140: REVERT instruction
+pub fn revert<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    check!(context.interpreter, BYZANTIUM);
+    return_inner(context.interpreter, InstructionResult::Revert);
+}
+
+/// Stop opcode. This opcode halts the execution.
+pub fn stop<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    context.interpreter.halt(InstructionResult::Stop);
+}
+
+/// Invalid opcode. This opcode halts the execution.
+pub fn invalid<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    context.interpreter.halt(InstructionResult::InvalidFEOpcode);
+}
+
+/// Unknown opcode. This opcode halts the execution.
+pub fn unknown<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    context.interpreter.halt(InstructionResult::OpcodeNotFound);
+}
diff --git a/substrate/frame/revive/src/vm/evm/instructions/host.rs b/substrate/frame/revive/src/vm/evm/instructions/host.rs
new file mode 100644
index 000000000000..7cbe4119ef64
--- /dev/null
+++ b/substrate/frame/revive/src/vm/evm/instructions/host.rs
@@ -0,0 +1,308 @@
+use super::utility::{IntoAddress, IntoU256};
+use core::cmp::min;
+use revm::{
+	interpreter::{
+		InstructionContext, InstructionResult,
+		gas::{self, CALL_STIPEND, warm_cold_cost},
+		host::Host,
+		interpreter_types::{InputsTr, InterpreterTypes, MemoryTr, RuntimeFlag, StackTr},
+	},
+	primitives::{B256, BLOCK_HASH_HISTORY, Bytes, Log, LogData, U256, hardfork::SpecId::*},
+};
+
+/// Implements the BALANCE instruction.
+///
+/// Gets the balance of the given account.
+pub fn balance<WIRE: InterpreterTypes, H: Host + ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+	popn_top!([], top, context.interpreter);
+	let address = top.into_address();
+	let Some(balance) = context.host.balance(address) else {
+		context.interpreter.halt(InstructionResult::FatalExternalError);
+		return;
+	};
+	let spec_id = context.interpreter.runtime_flag.spec_id();
+	gas!(
+		context.interpreter,
+		if spec_id.is_enabled_in(BERLIN) {
+			warm_cold_cost(balance.is_cold)
+		} else if spec_id.is_enabled_in(ISTANBUL) {
+			// EIP-1884: Repricing for trie-size-dependent opcodes
+			700
+		} else if spec_id.is_enabled_in(TANGERINE) {
+			400
+		} else {
+			20
+		}
+	);
+	*top = balance.data;
+}
+
+/// EIP-1884: Repricing for trie-size-dependent opcodes
+pub fn selfbalance<WIRE: InterpreterTypes, H: Host + ?Sized>(
+	context: InstructionContext<'_, H, WIRE>,
+) {
+	check!(context.interpreter, ISTANBUL);
+	gas!(context.interpreter, gas::LOW);
+
+	let Some(balance) = context.host.balance(context.interpreter.input.target_address()) else {
+		context.interpreter.halt(InstructionResult::FatalExternalError);
+		return;
+	};
+	push!(context.interpreter, balance.data);
+}
+
+/// Implements the EXTCODESIZE instruction.
+///
+/// Gets the size of an account's code.
+pub fn extcodesize<WIRE: InterpreterTypes, H: Host + ?Sized>(
+	context: InstructionContext<'_, H, WIRE>,
+) {
+	popn_top!([], top, context.interpreter);
+	let address = top.into_address();
+	let Some(code) = context.host.load_account_code(address) else {
+		context.interpreter.halt(InstructionResult::FatalExternalError);
+		return;
+	};
+	let spec_id = context.interpreter.runtime_flag.spec_id();
+	if spec_id.is_enabled_in(BERLIN) {
+		gas!(context.interpreter, warm_cold_cost(code.is_cold));
+	} else if spec_id.is_enabled_in(TANGERINE) {
+		gas!(context.interpreter, 700);
+	} else {
+		gas!(context.interpreter, 20);
+	}
+
+	*top = U256::from(code.len());
+}
+
+/// EIP-1052: EXTCODEHASH opcode
+pub fn extcodehash<WIRE: InterpreterTypes, H: Host + ?Sized>(
+	context: InstructionContext<'_, H, WIRE>,
+) {
+	check!(context.interpreter, CONSTANTINOPLE);
+	popn_top!([], top, context.interpreter);
+	let address = top.into_address();
+	let Some(code_hash) = context.host.load_account_code_hash(address) else {
+		context.interpreter.halt(InstructionResult::FatalExternalError);
+		return;
+	};
+	let spec_id = context.interpreter.runtime_flag.spec_id();
+	if spec_id.is_enabled_in(BERLIN) {
+		gas!(context.interpreter, warm_cold_cost(code_hash.is_cold));
+	} else if spec_id.is_enabled_in(ISTANBUL) {
+		gas!(context.interpreter, 700);
+	} else {
+		gas!(context.interpreter, 400);
+	}
+	*top = code_hash.into_u256();
+}
+
+/// Implements the EXTCODECOPY instruction.
+///
+/// Copies a portion of an account's code to memory.
+pub fn extcodecopy<WIRE: InterpreterTypes, H: Host + ?Sized>(
+	context: InstructionContext<'_, H, WIRE>,
+) {
+	popn!([address, memory_offset, code_offset, len_u256], context.interpreter);
+	let address = address.into_address();
+	let Some(code) = context.host.load_account_code(address) else {
+		context.interpreter.halt(InstructionResult::FatalExternalError);
+		return;
+	};
+
+	let len = as_usize_or_fail!(context.interpreter, len_u256);
+	gas_or_fail!(
+		context.interpreter,
+		gas::extcodecopy_cost(context.interpreter.runtime_flag.spec_id(), len, code.is_cold)
+	);
+	if len == 0 {
+		return;
+	}
+	let memory_offset = as_usize_or_fail!(context.interpreter, memory_offset);
+	let code_offset = min(as_usize_saturated!(code_offset), code.len());
+	resize_memory!(context.interpreter, memory_offset, len);
+
+	// Note: This can't panic because we resized memory to fit.
+	context.interpreter.memory.set_data(memory_offset, code_offset, len, &code);
+}
+
+/// Implements the BLOCKHASH instruction.
+///
+/// Gets the hash of one of the 256 most recent complete blocks.
+pub fn blockhash<WIRE: InterpreterTypes, H: Host + ?Sized>(
+	context: InstructionContext<'_, H, WIRE>,
+) {
+	gas!(context.interpreter, gas::BLOCKHASH);
+	popn_top!([], number, context.interpreter);
+
+	let requested_number = *number;
+	let block_number = context.host.block_number();
+
+	let Some(diff) = block_number.checked_sub(requested_number) else {
+		*number = U256::ZERO;
+		return;
+	};
+
+	let diff = as_u64_saturated!(diff);
+
+	// blockhash should push zero if number is same as current block number.
+	if diff == 0 {
+		*number = U256::ZERO;
+		return;
+	}
+
+	*number = if diff <= BLOCK_HASH_HISTORY {
+		let Some(hash) = context.host.block_hash(as_u64_saturated!(requested_number)) else {
+			context.interpreter.halt(InstructionResult::FatalExternalError);
+			return;
+		};
+		U256::from_be_bytes(hash.0)
+	} else {
+		U256::ZERO
+	}
+}
+
+/// Implements the SLOAD instruction.
+///
+/// Loads a word from storage.
+pub fn sload<WIRE: InterpreterTypes, H: Host + ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+	popn_top!([], index, context.interpreter);
+
+	let Some(value) = context.host.sload(context.interpreter.input.target_address(), *index) else {
+		context.interpreter.halt(InstructionResult::FatalExternalError);
+		return;
+	};
+
+	gas!(
+		context.interpreter,
+		gas::sload_cost(context.interpreter.runtime_flag.spec_id(), value.is_cold)
+	);
+	*index = value.data;
+}
+
+/// Implements the SSTORE instruction.
+///
+/// Stores a word to storage.
+pub fn sstore<WIRE: InterpreterTypes, H: Host + ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+	require_non_staticcall!(context.interpreter);
+
+	popn!([index, value], context.interpreter);
+
+	let Some(state_load) =
+		context.host.sstore(context.interpreter.input.target_address(), index, value)
+	else {
+		context.interpreter.halt(InstructionResult::FatalExternalError);
+		return;
+	};
+
+	// EIP-1706 Disable SSTORE with gasleft lower than call stipend
+	if context.interpreter.runtime_flag.spec_id().is_enabled_in(ISTANBUL) &&
+		context.interpreter.gas.remaining() <= CALL_STIPEND
+	{
+		context.interpreter.halt(InstructionResult::ReentrancySentryOOG);
+		return;
+	}
+	gas!(
+		context.interpreter,
+		gas::sstore_cost(
+			context.interpreter.runtime_flag.spec_id(),
+			&state_load.data,
+			state_load.is_cold
+		)
+	);
+
+	context.interpreter.gas.record_refund(gas::sstore_refund(
+		context.interpreter.runtime_flag.spec_id(),
+		&state_load.data,
+	));
+}
+
+/// EIP-1153: Transient storage opcodes
+/// Store value to transient storage
+pub fn tstore<WIRE: InterpreterTypes, H: Host + ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+	check!(context.interpreter, CANCUN);
+	require_non_staticcall!(context.interpreter);
+	gas!(context.interpreter, gas::WARM_STORAGE_READ_COST);
+
+	popn!([index, value], context.interpreter);
+
+	context.host.tstore(context.interpreter.input.target_address(), index, value);
+}
+
+/// EIP-1153: Transient storage opcodes
+/// Load value from transient storage
+pub fn tload<WIRE: InterpreterTypes, H: Host + ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+	check!(context.interpreter, CANCUN);
+	gas!(context.interpreter, gas::WARM_STORAGE_READ_COST);
+
+	popn_top!([], index, context.interpreter);
+
+	*index = context.host.tload(context.interpreter.input.target_address(), *index);
+}
+
+/// Implements the LOG0-LOG4 instructions.
+///
+/// Appends log record with N topics.
+pub fn log<const N: usize, H: Host + ?Sized>(
+	context: InstructionContext<'_, H, impl InterpreterTypes>,
+) {
+	require_non_staticcall!(context.interpreter);
+
+	popn!([offset, len], context.interpreter);
+	let len = as_usize_or_fail!(context.interpreter, len);
+	gas_or_fail!(context.interpreter, gas::log_cost(N as u8, len as u64));
+	let data = if len == 0 {
+		Bytes::new()
+	} else {
+		let offset = as_usize_or_fail!(context.interpreter, offset);
+		resize_memory!(context.interpreter, offset, len);
+		Bytes::copy_from_slice(context.interpreter.memory.slice_len(offset, len).as_ref())
+	};
+	if context.interpreter.stack.len() < N {
+		context.interpreter.halt(InstructionResult::StackUnderflow);
+		return;
+	}
+	let Some(topics) = context.interpreter.stack.popn::<N>() else {
+		context.interpreter.halt(InstructionResult::StackUnderflow);
+		return;
+	};
+
+	let log = Log {
+		address: context.interpreter.input.target_address(),
+		data: LogData::new(topics.into_iter().map(B256::from).collect(), data)
+			.expect("LogData should have <=4 topics"),
+	};
+
+	context.host.log(log);
+}
+
+/// Implements the SELFDESTRUCT instruction.
+///
+/// Halt execution and register account for later deletion.
+pub fn selfdestruct<WIRE: InterpreterTypes, H: Host + ?Sized>(
+	context: InstructionContext<'_, H, WIRE>,
+) {
+	require_non_staticcall!(context.interpreter);
+	popn!([target], context.interpreter);
+	let target = target.into_address();
+
+	let Some(res) = context.host.selfdestruct(context.interpreter.input.target_address(), target)
+	else {
+		context.interpreter.halt(InstructionResult::FatalExternalError);
+		return;
+	};
+
+	// EIP-3529: Reduction in refunds
+	if !context.interpreter.runtime_flag.spec_id().is_enabled_in(LONDON) &&
+		!res.previously_destroyed
+	{
+		context.interpreter.gas.record_refund(gas::SELFDESTRUCT)
+	}
+
+	gas!(
+		context.interpreter,
+		gas::selfdestruct_cost(context.interpreter.runtime_flag.spec_id(), res)
+	);
+
+	context.interpreter.halt(InstructionResult::SelfDestruct);
+}
diff --git a/substrate/frame/revive/src/vm/evm/instructions/i256.rs b/substrate/frame/revive/src/vm/evm/instructions/i256.rs
new file mode 100644
index 000000000000..adcec1c4cb36
--- /dev/null
+++ b/substrate/frame/revive/src/vm/evm/instructions/i256.rs
@@ -0,0 +1,252 @@
+use core::cmp::Ordering;
+use revm::primitives::U256;
+
+/// Represents the sign of a 256-bit signed integer value.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[repr(i8)]
+pub enum Sign {
+	// Same as `cmp::Ordering`
+	/// Negative value sign
+	Minus = -1,
+	/// Zero value sign
+	Zero = 0,
+	#[allow(dead_code)] // "constructed" with `mem::transmute` in `i256_sign` below
+	/// Positive value sign
+	Plus = 1,
+}
+
+#[cfg(test)]
+/// The maximum positive value for a 256-bit signed integer.
+pub const MAX_POSITIVE_VALUE: U256 = U256::from_limbs([
+	0xffffffffffffffff,
+	0xffffffffffffffff,
+	0xffffffffffffffff,
+	0x7fffffffffffffff,
+]);
+
+/// The minimum negative value for a 256-bit signed integer.
+pub const MIN_NEGATIVE_VALUE: U256 = U256::from_limbs([
+	0x0000000000000000,
+	0x0000000000000000,
+	0x0000000000000000,
+	0x8000000000000000,
+]);
+
+const FLIPH_BITMASK_U64: u64 = 0x7FFF_FFFF_FFFF_FFFF;
+
+/// Determines the sign of a 256-bit signed integer.
+#[inline]
+pub fn i256_sign(val: &U256) -> Sign {
+	if val.bit(U256::BITS - 1) {
+		Sign::Minus
+	} else {
+		// SAFETY: false == 0 == Zero, true == 1 == Plus
+		unsafe { core::mem::transmute::<bool, Sign>(!val.is_zero()) }
+	}
+}
+
+/// Determines the sign of a 256-bit signed integer and converts it to its absolute value.
+#[inline]
+pub fn i256_sign_compl(val: &mut U256) -> Sign {
+	let sign = i256_sign(val);
+	if sign == Sign::Minus {
+		two_compl_mut(val);
+	}
+	sign
+}
+
+#[inline]
+fn u256_remove_sign(val: &mut U256) {
+	// SAFETY: U256 does not have any padding bytes
+	unsafe {
+		val.as_limbs_mut()[3] &= FLIPH_BITMASK_U64;
+	}
+}
+
+/// Computes the two's complement of a U256 value in place.
+#[inline]
+pub fn two_compl_mut(op: &mut U256) {
+	*op = two_compl(*op);
+}
+
+/// Computes the two's complement of a U256 value.
+#[inline]
+pub fn two_compl(op: U256) -> U256 {
+	op.wrapping_neg()
+}
+
+/// Compares two 256-bit signed integers.
+#[inline]
+pub fn i256_cmp(first: &U256, second: &U256) -> Ordering {
+	let first_sign = i256_sign(first);
+	let second_sign = i256_sign(second);
+	match first_sign.cmp(&second_sign) {
+		// Note: Adding `if first_sign != Sign::Zero` to short circuit zero comparisons performs
+		// slower on average, as of #582
+		Ordering::Equal => first.cmp(second),
+		o => o,
+	}
+}
+
+/// Performs signed division of two 256-bit integers.
+#[inline]
+pub fn i256_div(mut first: U256, mut second: U256) -> U256 {
+	let second_sign = i256_sign_compl(&mut second);
+	if second_sign == Sign::Zero {
+		return U256::ZERO;
+	}
+
+	let first_sign = i256_sign_compl(&mut first);
+	if first == MIN_NEGATIVE_VALUE && second == U256::from(1) {
+		return two_compl(MIN_NEGATIVE_VALUE);
+	}
+
+	// Necessary overflow checks are done above, perform the division
+	let mut d = first / second;
+
+	// Set sign bit to zero
+	u256_remove_sign(&mut d);
+
+	// Two's complement only if the signs are different
+	// Note: This condition has better codegen than an exhaustive match, as of #582
+	if (first_sign == Sign::Minus && second_sign != Sign::Minus) ||
+		(second_sign == Sign::Minus && first_sign != Sign::Minus)
+	{
+		two_compl(d)
+	} else {
+		d
+	}
+}
+
+/// Performs signed modulo of two 256-bit integers.
+#[inline]
+pub fn i256_mod(mut first: U256, mut second: U256) -> U256 {
+	let first_sign = i256_sign_compl(&mut first);
+	if first_sign == Sign::Zero {
+		return U256::ZERO;
+	}
+
+	let second_sign = i256_sign_compl(&mut second);
+	if second_sign == Sign::Zero {
+		return U256::ZERO;
+	}
+
+	let mut r = first % second;
+
+	// Set sign bit to zero
+	u256_remove_sign(&mut r);
+
+	if first_sign == Sign::Minus { two_compl(r) } else { r }
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use core::num::Wrapping;
+	use revm::primitives::uint;
+
+	#[test]
+	fn div_i256() {
+		// Sanity checks based on i8. Notice that we need to use `Wrapping` here because
+		// Rust will prevent the overflow by default whereas the EVM does not.
+		assert_eq!(Wrapping(i8::MIN) / Wrapping(-1), Wrapping(i8::MIN));
+		assert_eq!(i8::MAX / -1, -i8::MAX);
+
+		uint! {
+			assert_eq!(i256_div(MIN_NEGATIVE_VALUE, -1_U256), MIN_NEGATIVE_VALUE);
+			assert_eq!(i256_div(MIN_NEGATIVE_VALUE, 1_U256), MIN_NEGATIVE_VALUE);
+			assert_eq!(i256_div(MAX_POSITIVE_VALUE, 1_U256), MAX_POSITIVE_VALUE);
+			assert_eq!(i256_div(MAX_POSITIVE_VALUE, -1_U256), -1_U256 * MAX_POSITIVE_VALUE);
+			assert_eq!(i256_div(100_U256, -1_U256), -100_U256);
+			assert_eq!(i256_div(100_U256, 2_U256), 50_U256);
+		}
+	}
+	#[test]
+	fn test_i256_sign() {
+		uint! {
+			assert_eq!(i256_sign(&0_U256), Sign::Zero);
+			assert_eq!(i256_sign(&1_U256), Sign::Plus);
+			assert_eq!(i256_sign(&-1_U256), Sign::Minus);
+			assert_eq!(i256_sign(&MIN_NEGATIVE_VALUE), Sign::Minus);
+			assert_eq!(i256_sign(&MAX_POSITIVE_VALUE), Sign::Plus);
+		}
+	}
+
+	#[test]
+	fn test_i256_sign_compl() {
+		uint! {
+			let mut zero = 0_U256;
+			let mut positive = 1_U256;
+			let mut negative = -1_U256;
+			assert_eq!(i256_sign_compl(&mut zero), Sign::Zero);
+			assert_eq!(i256_sign_compl(&mut positive), Sign::Plus);
+			assert_eq!(i256_sign_compl(&mut negative), Sign::Minus);
+		}
+	}
+
+	#[test]
+	fn test_two_compl() {
+		uint! {
+			assert_eq!(two_compl(0_U256), 0_U256);
+			assert_eq!(two_compl(1_U256), -1_U256);
+			assert_eq!(two_compl(-1_U256), 1_U256);
+			assert_eq!(two_compl(2_U256), -2_U256);
+			assert_eq!(two_compl(-2_U256), 2_U256);
+
+			// Two's complement of the min value is itself.
+			assert_eq!(two_compl(MIN_NEGATIVE_VALUE), MIN_NEGATIVE_VALUE);
+		}
+	}
+
+	#[test]
+	fn test_two_compl_mut() {
+		uint! {
+			let mut value = 1_U256;
+			two_compl_mut(&mut value);
+			assert_eq!(value, -1_U256);
+		}
+	}
+
+	#[test]
+	fn test_i256_cmp() {
+		uint! {
+			assert_eq!(i256_cmp(&1_U256, &2_U256), Ordering::Less);
+			assert_eq!(i256_cmp(&2_U256, &2_U256), Ordering::Equal);
+			assert_eq!(i256_cmp(&3_U256, &2_U256), Ordering::Greater);
+			assert_eq!(i256_cmp(&-1_U256, &-1_U256), Ordering::Equal);
+			assert_eq!(i256_cmp(&-1_U256, &-2_U256), Ordering::Greater);
+			assert_eq!(i256_cmp(&-1_U256, &0_U256), Ordering::Less);
+			assert_eq!(i256_cmp(&-2_U256, &2_U256), Ordering::Less);
+		}
+	}
+
+	#[test]
+	fn test_i256_div() {
+		uint! {
+			assert_eq!(i256_div(1_U256, 0_U256), 0_U256);
+			assert_eq!(i256_div(0_U256, 1_U256), 0_U256);
+			assert_eq!(i256_div(0_U256, -1_U256), 0_U256);
+			assert_eq!(i256_div(MIN_NEGATIVE_VALUE, 1_U256), MIN_NEGATIVE_VALUE);
+			assert_eq!(i256_div(4_U256, 2_U256), 2_U256);
+			assert_eq!(i256_div(MIN_NEGATIVE_VALUE, MIN_NEGATIVE_VALUE), 1_U256);
+			assert_eq!(i256_div(2_U256, -1_U256), -2_U256);
+			assert_eq!(i256_div(-2_U256, -1_U256), 2_U256);
+		}
+	}
+
+	#[test]
+	fn test_i256_mod() {
+		uint! {
+			assert_eq!(i256_mod(0_U256, 1_U256), 0_U256);
+			assert_eq!(i256_mod(1_U256, 0_U256), 0_U256);
+			assert_eq!(i256_mod(4_U256, 2_U256), 0_U256);
+			assert_eq!(i256_mod(3_U256, 2_U256), 1_U256);
+			assert_eq!(i256_mod(MIN_NEGATIVE_VALUE, 1_U256), 0_U256);
+			assert_eq!(i256_mod(2_U256, 2_U256), 0_U256);
+			assert_eq!(i256_mod(2_U256, 3_U256), 2_U256);
+			assert_eq!(i256_mod(-2_U256, 3_U256), -2_U256);
+			assert_eq!(i256_mod(2_U256, -3_U256), 2_U256);
+			assert_eq!(i256_mod(-2_U256, -3_U256), -2_U256);
+		}
+	}
+}
diff --git a/substrate/frame/revive/src/vm/evm/instructions/macros.rs b/substrate/frame/revive/src/vm/evm/instructions/macros.rs
new file mode 100644
index 000000000000..57f3218c0f9f
--- /dev/null
+++ b/substrate/frame/revive/src/vm/evm/instructions/macros.rs
@@ -0,0 +1,218 @@
+//! Utility macros to help implementing opcode instruction functions.
+
+/// `const` Option `?`.
+#[macro_export]
+macro_rules! tri {
+    ($e:expr) => {
+        match $e {
+            Some(v) => v,
+            None => return None,
+        }
+    };
+}
+
+/// Fails the instruction if the current call is static.
+#[macro_export]
+macro_rules! require_non_staticcall {
+    ($interpreter:expr) => {
+        if $interpreter.runtime_flag.is_static() {
+            $interpreter.halt(revm::interpreter::InstructionResult::StateChangeDuringStaticCall);
+            return;
+        }
+    };
+}
+
+/// Macro for optional try - returns early if the expression evaluates to None.
+/// Similar to the `?` operator but for use in instruction implementations.
+#[macro_export]
+macro_rules! otry {
+    ($expression: expr) => {{
+        let Some(value) = $expression else {
+            return;
+        };
+        value
+    }};
+}
+
+/// Error if the current call is executing EOF.
+#[macro_export]
+macro_rules! require_eof {
+    ($interpreter:expr) => {
+        if !$interpreter.runtime_flag.is_eof() {
+            $interpreter.halt(revm::interpreter::InstructionResult::EOFOpcodeDisabledInLegacy);
+            return;
+        }
+    };
+}
+
+/// Check if the `SPEC` is enabled, and fail the instruction if it is not.
+#[macro_export]
+macro_rules! check {
+    ($interpreter:expr, $min:ident) => {
+        if !$interpreter
+            .runtime_flag
+            .spec_id()
+            .is_enabled_in(revm::primitives::hardfork::SpecId::$min)
+        {
+            $interpreter.halt(revm::interpreter::InstructionResult::NotActivated);
+            return;
+        }
+    };
+}
+
+/// Records a `gas` cost and fails the instruction if it would exceed the available gas.
+#[macro_export]
+macro_rules! gas {
+    ($interpreter:expr, $gas:expr) => {
+        gas!($interpreter, $gas, ())
+    };
+    ($interpreter:expr, $gas:expr, $ret:expr) => {
+        if !$interpreter.gas.record_cost($gas) {
+            $interpreter.halt(revm::interpreter::InstructionResult::OutOfGas);
+            return $ret;
+        }
+    };
+}
+
+/// Same as [`gas!`], but with `gas` as an option.
+#[macro_export]
+macro_rules! gas_or_fail {
+    ($interpreter:expr, $gas:expr) => {
+        gas_or_fail!($interpreter, $gas, ())
+    };
+    ($interpreter:expr, $gas:expr, $ret:expr) => {
+        match $gas {
+            Some(gas_used) => gas!($interpreter, gas_used, $ret),
+            None => {
+                $interpreter.halt(revm::interpreter::InstructionResult::OutOfGas);
+                return $ret;
+            }
+        }
+    };
+}
+
+/// Resizes the interpreterreter memory if necessary. Fails the instruction if the memory or gas limit
+/// is exceeded.
+#[macro_export]
+macro_rules! resize_memory {
+    ($interpreter:expr, $offset:expr, $len:expr) => {
+        resize_memory!($interpreter, $offset, $len, ())
+    };
+    ($interpreter:expr, $offset:expr, $len:expr, $ret:expr) => {
+        let words_num = revm::interpreter::num_words($offset.saturating_add($len));
+        match $interpreter.gas.record_memory_expansion(words_num) {
+            revm::interpreter::gas::MemoryExtensionResult::Extended => {
+                $interpreter.memory.resize(words_num * 32);
+            }
+            revm::interpreter::gas::MemoryExtensionResult::OutOfGas => {
+                $interpreter.halt(revm::interpreter::InstructionResult::MemoryOOG);
+                return $ret;
+            }
+            revm::interpreter::gas::MemoryExtensionResult::Same => (), // no action
+        };
+    };
+}
+
+/// Pops n values from the stack. Fails the instruction if n values can't be popped.
+#[macro_export]
+macro_rules! popn {
+    ([ $($x:ident),* ],$interpreterreter:expr $(,$ret:expr)? ) => {
+        let Some([$( $x ),*]) = $interpreterreter.stack.popn() else {
+            $interpreterreter.halt(revm::interpreter::InstructionResult::StackUnderflow);
+            return $($ret)?;
+        };
+    };
+}
+
+/// Pops n values from the stack and returns the top value. Fails the instruction if n values can't be popped.
+#[macro_export]
+macro_rules! popn_top {
+    ([ $($x:ident),* ], $top:ident, $interpreter:expr $(,$ret:expr)? ) => {
+        let Some(([$( $x ),*], $top)) = $interpreter.stack.popn_top() else {
+            $interpreter.halt(revm::interpreter::InstructionResult::StackUnderflow);
+            return $($ret)?;
+        };
+    };
+}
+
+/// Pushes a `B256` value onto the stack. Fails the instruction if the stack is full.
+#[macro_export]
+macro_rules! push {
+    ($interpreter:expr, $x:expr $(,$ret:item)?) => (
+        if !($interpreter.stack.push($x)) {
+            $interpreter.halt(revm::interpreter::InstructionResult::StackOverflow);
+            return $($ret)?;
+        }
+    )
+}
+
+/// Converts a `U256` value to a `u64`, saturating to `MAX` if the value is too large.
+#[macro_export]
+macro_rules! as_u64_saturated {
+    ($v:expr) => {
+        match $v.as_limbs() {
+            x => {
+                if (x[1] == 0) & (x[2] == 0) & (x[3] == 0) {
+                    x[0]
+                } else {
+                    u64::MAX
+                }
+            }
+        }
+    };
+}
+
+/// Converts a `U256` value to a `usize`, saturating to `MAX` if the value is too large.
+#[macro_export]
+macro_rules! as_usize_saturated {
+    ($v:expr) => {
+        usize::try_from(as_u64_saturated!($v)).unwrap_or(usize::MAX)
+    };
+}
+
+/// Converts a `U256` value to a `isize`, saturating to `isize::MAX` if the value is too large.
+#[macro_export]
+macro_rules! as_isize_saturated {
+    ($v:expr) => {
+        // `isize_try_from(u64::MAX)`` will fail and return isize::MAX
+        // This is expected behavior as we are saturating the value.
+        isize::try_from(as_u64_saturated!($v)).unwrap_or(isize::MAX)
+    };
+}
+
+/// Converts a `U256` value to a `usize`, failing the instruction if the value is too large.
+#[macro_export]
+macro_rules! as_usize_or_fail {
+    ($interpreter:expr, $v:expr) => {
+        as_usize_or_fail_ret!($interpreter, $v, ())
+    };
+    ($interpreter:expr, $v:expr, $reason:expr) => {
+        as_usize_or_fail_ret!($interpreter, $v, $reason, ())
+    };
+}
+
+/// Converts a `U256` value to a `usize` and returns `ret`,
+/// failing the instruction if the value is too large.
+#[macro_export]
+macro_rules! as_usize_or_fail_ret {
+    ($interpreter:expr, $v:expr, $ret:expr) => {
+        as_usize_or_fail_ret!(
+            $interpreter,
+            $v,
+            revm::interpreter::InstructionResult::InvalidOperandOOG,
+            $ret
+        )
+    };
+
+    ($interpreter:expr, $v:expr, $reason:expr, $ret:expr) => {
+        match $v.as_limbs() {
+            x => {
+                if (x[0] > usize::MAX as u64) | (x[1] != 0) | (x[2] != 0) | (x[3] != 0) {
+                    $interpreter.halt($reason);
+                    return $ret;
+                }
+                x[0] as usize
+            }
+        }
+    };
+}
diff --git a/substrate/frame/revive/src/vm/evm/instructions/memory.rs b/substrate/frame/revive/src/vm/evm/instructions/memory.rs
new file mode 100644
index 000000000000..6e6737596972
--- /dev/null
+++ b/substrate/frame/revive/src/vm/evm/instructions/memory.rs
@@ -0,0 +1,78 @@
+use revm::interpreter::{
+    gas as revm_gas,
+    interpreter_types::{InterpreterTypes, MemoryTr, RuntimeFlag, StackTr},
+    InstructionContext,
+};
+use core::cmp::max;
+use revm::primitives::U256;
+
+/// Implements the MLOAD instruction.
+///
+/// Loads a 32-byte word from memory.
+pub fn mload<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    gas!(context.interpreter, revm_gas::VERYLOW);
+    popn_top!([], top, context.interpreter);
+    let offset = as_usize_or_fail!(context.interpreter, top);
+    resize_memory!(context.interpreter, offset, 32);
+    *top =
+        U256::try_from_be_slice(context.interpreter.memory.slice_len(offset, 32).as_ref()).unwrap()
+}
+
+/// Implements the MSTORE instruction.
+///
+/// Stores a 32-byte word to memory.
+pub fn mstore<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    gas!(context.interpreter, revm_gas::VERYLOW);
+    popn!([offset, value], context.interpreter);
+    let offset = as_usize_or_fail!(context.interpreter, offset);
+    resize_memory!(context.interpreter, offset, 32);
+    context
+        .interpreter
+        .memory
+        .set(offset, &value.to_be_bytes::<32>());
+}
+
+/// Implements the MSTORE8 instruction.
+///
+/// Stores a single byte to memory.
+pub fn mstore8<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    gas!(context.interpreter, revm_gas::VERYLOW);
+    popn!([offset, value], context.interpreter);
+    let offset = as_usize_or_fail!(context.interpreter, offset);
+    resize_memory!(context.interpreter, offset, 1);
+    context.interpreter.memory.set(offset, &[value.byte(0)]);
+}
+
+/// Implements the MSIZE instruction.
+///
+/// Gets the size of active memory in bytes.
+pub fn msize<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    gas!(context.interpreter, revm_gas::BASE);
+    push!(
+        context.interpreter,
+        U256::from(context.interpreter.memory.size())
+    );
+}
+
+/// Implements the MCOPY instruction.
+///
+/// EIP-5656: Memory copying instruction that copies memory from one location to another.
+pub fn mcopy<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    check!(context.interpreter, CANCUN);
+    popn!([dst, src, len], context.interpreter);
+
+    // Into usize or fail
+    let len = as_usize_or_fail!(context.interpreter, len);
+    // Deduce gas
+    gas_or_fail!(context.interpreter, revm_gas::copy_cost_verylow(len));
+    if len == 0 {
+        return;
+    }
+
+    let dst = as_usize_or_fail!(context.interpreter, dst);
+    let src = as_usize_or_fail!(context.interpreter, src);
+    // Resize memory
+    resize_memory!(context.interpreter, max(dst, src), len);
+    // Copy memory in place
+    context.interpreter.memory.copy(dst, src, len);
+}
diff --git a/substrate/frame/revive/src/vm/evm/instructions/mod.rs b/substrate/frame/revive/src/vm/evm/instructions/mod.rs
new file mode 100644
index 000000000000..fc3dcc55a400
--- /dev/null
+++ b/substrate/frame/revive/src/vm/evm/instructions/mod.rs
@@ -0,0 +1,224 @@
+//! EVM opcode implementations.
+
+#[macro_use]
+pub mod macros;
+/// Arithmetic operations (ADD, SUB, MUL, DIV, etc.).
+pub mod arithmetic;
+/// Bitwise operations (AND, OR, XOR, NOT, etc.).
+pub mod bitwise;
+/// Block information instructions (COINBASE, TIMESTAMP, etc.).
+pub mod block_info;
+/// Contract operations (CALL, CREATE, DELEGATECALL, etc.).
+pub mod contract;
+/// Control flow instructions (JUMP, JUMPI, REVERT, etc.).
+pub mod control;
+/// Host environment interactions (SLOAD, SSTORE, LOG, etc.).
+pub mod host;
+/// Signed 256-bit integer operations.
+pub mod i256;
+/// Memory operations (MLOAD, MSTORE, MSIZE, etc.).
+pub mod memory;
+/// Stack operations (PUSH, POP, DUP, SWAP, etc.).
+pub mod stack;
+/// System information instructions (ADDRESS, CALLER, etc.).
+pub mod system;
+/// Transaction information instructions (ORIGIN, GASPRICE, etc.).
+pub mod tx_info;
+/// Utility functions and helpers for instruction implementation.
+pub mod utility;
+
+use revm::interpreter::{Instruction, InterpreterTypes, host::Host};
+
+/// Returns the instruction table for the given spec.
+pub const fn instruction_table<WIRE: InterpreterTypes, H: Host + ?Sized>()
+-> [Instruction<WIRE, H>; 256] {
+	use revm::bytecode::opcode::*;
+	let mut table = [control::unknown as Instruction<WIRE, H>; 256];
+
+	table[STOP as usize] = control::stop;
+	table[ADD as usize] = arithmetic::add;
+	table[MUL as usize] = arithmetic::mul;
+	table[SUB as usize] = arithmetic::sub;
+	table[DIV as usize] = arithmetic::div;
+	table[SDIV as usize] = arithmetic::sdiv;
+	table[MOD as usize] = arithmetic::rem;
+	table[SMOD as usize] = arithmetic::smod;
+	table[ADDMOD as usize] = arithmetic::addmod;
+	table[MULMOD as usize] = arithmetic::mulmod;
+	table[EXP as usize] = arithmetic::exp;
+	table[SIGNEXTEND as usize] = arithmetic::signextend;
+
+	table[LT as usize] = bitwise::lt;
+	table[GT as usize] = bitwise::gt;
+	table[SLT as usize] = bitwise::slt;
+	table[SGT as usize] = bitwise::sgt;
+	table[EQ as usize] = bitwise::eq;
+	table[ISZERO as usize] = bitwise::iszero;
+	table[AND as usize] = bitwise::bitand;
+	table[OR as usize] = bitwise::bitor;
+	table[XOR as usize] = bitwise::bitxor;
+	table[NOT as usize] = bitwise::not;
+	table[BYTE as usize] = bitwise::byte;
+	table[SHL as usize] = bitwise::shl;
+	table[SHR as usize] = bitwise::shr;
+	table[SAR as usize] = bitwise::sar;
+	table[CLZ as usize] = bitwise::clz;
+
+	table[KECCAK256 as usize] = system::keccak256;
+
+	table[ADDRESS as usize] = system::address;
+	table[BALANCE as usize] = host::balance;
+	table[ORIGIN as usize] = tx_info::origin;
+	table[CALLER as usize] = system::caller;
+	table[CALLVALUE as usize] = system::callvalue;
+	table[CALLDATALOAD as usize] = system::calldataload;
+	table[CALLDATASIZE as usize] = system::calldatasize;
+	table[CALLDATACOPY as usize] = system::calldatacopy;
+	table[CODESIZE as usize] = system::codesize;
+	table[CODECOPY as usize] = system::codecopy;
+
+	table[GASPRICE as usize] = tx_info::gasprice;
+	table[EXTCODESIZE as usize] = host::extcodesize;
+	table[EXTCODECOPY as usize] = host::extcodecopy;
+	table[RETURNDATASIZE as usize] = system::returndatasize;
+	table[RETURNDATACOPY as usize] = system::returndatacopy;
+	table[EXTCODEHASH as usize] = host::extcodehash;
+	table[BLOCKHASH as usize] = host::blockhash;
+	table[COINBASE as usize] = block_info::coinbase;
+	table[TIMESTAMP as usize] = block_info::timestamp;
+	table[NUMBER as usize] = block_info::block_number;
+	table[DIFFICULTY as usize] = block_info::difficulty;
+	table[GASLIMIT as usize] = block_info::gaslimit;
+	table[CHAINID as usize] = block_info::chainid;
+	table[SELFBALANCE as usize] = host::selfbalance;
+	table[BASEFEE as usize] = block_info::basefee;
+	table[BLOBHASH as usize] = tx_info::blob_hash;
+	table[BLOBBASEFEE as usize] = block_info::blob_basefee;
+
+	table[POP as usize] = stack::pop;
+	table[MLOAD as usize] = memory::mload;
+	table[MSTORE as usize] = memory::mstore;
+	table[MSTORE8 as usize] = memory::mstore8;
+	table[SLOAD as usize] = host::sload;
+	table[SSTORE as usize] = host::sstore;
+	table[JUMP as usize] = control::jump;
+	table[JUMPI as usize] = control::jumpi;
+	table[PC as usize] = control::pc;
+	table[MSIZE as usize] = memory::msize;
+	table[GAS as usize] = system::gas;
+	table[JUMPDEST as usize] = control::jumpdest;
+	table[TLOAD as usize] = host::tload;
+	table[TSTORE as usize] = host::tstore;
+	table[MCOPY as usize] = memory::mcopy;
+
+	table[PUSH0 as usize] = stack::push0;
+	table[PUSH1 as usize] = stack::push::<1, _, _>;
+	table[PUSH2 as usize] = stack::push::<2, _, _>;
+	table[PUSH3 as usize] = stack::push::<3, _, _>;
+	table[PUSH4 as usize] = stack::push::<4, _, _>;
+	table[PUSH5 as usize] = stack::push::<5, _, _>;
+	table[PUSH6 as usize] = stack::push::<6, _, _>;
+	table[PUSH7 as usize] = stack::push::<7, _, _>;
+	table[PUSH8 as usize] = stack::push::<8, _, _>;
+	table[PUSH9 as usize] = stack::push::<9, _, _>;
+	table[PUSH10 as usize] = stack::push::<10, _, _>;
+	table[PUSH11 as usize] = stack::push::<11, _, _>;
+	table[PUSH12 as usize] = stack::push::<12, _, _>;
+	table[PUSH13 as usize] = stack::push::<13, _, _>;
+	table[PUSH14 as usize] = stack::push::<14, _, _>;
+	table[PUSH15 as usize] = stack::push::<15, _, _>;
+	table[PUSH16 as usize] = stack::push::<16, _, _>;
+	table[PUSH17 as usize] = stack::push::<17, _, _>;
+	table[PUSH18 as usize] = stack::push::<18, _, _>;
+	table[PUSH19 as usize] = stack::push::<19, _, _>;
+	table[PUSH20 as usize] = stack::push::<20, _, _>;
+	table[PUSH21 as usize] = stack::push::<21, _, _>;
+	table[PUSH22 as usize] = stack::push::<22, _, _>;
+	table[PUSH23 as usize] = stack::push::<23, _, _>;
+	table[PUSH24 as usize] = stack::push::<24, _, _>;
+	table[PUSH25 as usize] = stack::push::<25, _, _>;
+	table[PUSH26 as usize] = stack::push::<26, _, _>;
+	table[PUSH27 as usize] = stack::push::<27, _, _>;
+	table[PUSH28 as usize] = stack::push::<28, _, _>;
+	table[PUSH29 as usize] = stack::push::<29, _, _>;
+	table[PUSH30 as usize] = stack::push::<30, _, _>;
+	table[PUSH31 as usize] = stack::push::<31, _, _>;
+	table[PUSH32 as usize] = stack::push::<32, _, _>;
+
+	table[DUP1 as usize] = stack::dup::<1, _, _>;
+	table[DUP2 as usize] = stack::dup::<2, _, _>;
+	table[DUP3 as usize] = stack::dup::<3, _, _>;
+	table[DUP4 as usize] = stack::dup::<4, _, _>;
+	table[DUP5 as usize] = stack::dup::<5, _, _>;
+	table[DUP6 as usize] = stack::dup::<6, _, _>;
+	table[DUP7 as usize] = stack::dup::<7, _, _>;
+	table[DUP8 as usize] = stack::dup::<8, _, _>;
+	table[DUP9 as usize] = stack::dup::<9, _, _>;
+	table[DUP10 as usize] = stack::dup::<10, _, _>;
+	table[DUP11 as usize] = stack::dup::<11, _, _>;
+	table[DUP12 as usize] = stack::dup::<12, _, _>;
+	table[DUP13 as usize] = stack::dup::<13, _, _>;
+	table[DUP14 as usize] = stack::dup::<14, _, _>;
+	table[DUP15 as usize] = stack::dup::<15, _, _>;
+	table[DUP16 as usize] = stack::dup::<16, _, _>;
+
+	table[SWAP1 as usize] = stack::swap::<1, _, _>;
+	table[SWAP2 as usize] = stack::swap::<2, _, _>;
+	table[SWAP3 as usize] = stack::swap::<3, _, _>;
+	table[SWAP4 as usize] = stack::swap::<4, _, _>;
+	table[SWAP5 as usize] = stack::swap::<5, _, _>;
+	table[SWAP6 as usize] = stack::swap::<6, _, _>;
+	table[SWAP7 as usize] = stack::swap::<7, _, _>;
+	table[SWAP8 as usize] = stack::swap::<8, _, _>;
+	table[SWAP9 as usize] = stack::swap::<9, _, _>;
+	table[SWAP10 as usize] = stack::swap::<10, _, _>;
+	table[SWAP11 as usize] = stack::swap::<11, _, _>;
+	table[SWAP12 as usize] = stack::swap::<12, _, _>;
+	table[SWAP13 as usize] = stack::swap::<13, _, _>;
+	table[SWAP14 as usize] = stack::swap::<14, _, _>;
+	table[SWAP15 as usize] = stack::swap::<15, _, _>;
+	table[SWAP16 as usize] = stack::swap::<16, _, _>;
+
+	table[LOG0 as usize] = host::log::<0, _>;
+	table[LOG1 as usize] = host::log::<1, _>;
+	table[LOG2 as usize] = host::log::<2, _>;
+	table[LOG3 as usize] = host::log::<3, _>;
+	table[LOG4 as usize] = host::log::<4, _>;
+
+	table[CREATE as usize] = contract::create::<_, false, _>;
+	table[CALL as usize] = contract::call;
+	table[CALLCODE as usize] = contract::call_code;
+	table[RETURN as usize] = control::ret;
+	table[DELEGATECALL as usize] = contract::delegate_call;
+	table[CREATE2 as usize] = contract::create::<_, true, _>;
+
+	table[STATICCALL as usize] = contract::static_call;
+	table[REVERT as usize] = control::revert;
+	table[INVALID as usize] = control::invalid;
+	table[SELFDESTRUCT as usize] = host::selfdestruct;
+	table
+}
+
+#[cfg(test)]
+mod tests {
+	use super::instruction_table;
+	use revm::{
+		bytecode::opcode::*,
+		interpreter::{host::DummyHost, interpreter::EthInterpreter},
+	};
+
+	#[test]
+	fn all_instructions_and_opcodes_used() {
+		// known unknown instruction we compare it with other instructions from table.
+		let unknown_instruction = 0x0C_usize;
+		let instr_table = instruction_table::<EthInterpreter, DummyHost>();
+
+		let unknown_istr = instr_table[unknown_instruction];
+		for (i, instr) in instr_table.iter().enumerate() {
+			let is_opcode_unknown = OpCode::new(i as u8).is_none();
+			//
+			let is_instr_unknown = std::ptr::fn_addr_eq(*instr, unknown_istr);
+			assert_eq!(is_instr_unknown, is_opcode_unknown, "Opcode 0x{i:X?} is not handled",);
+		}
+	}
+}
diff --git a/substrate/frame/revive/src/vm/evm/instructions/stack.rs b/substrate/frame/revive/src/vm/evm/instructions/stack.rs
new file mode 100644
index 000000000000..c011fc572511
--- /dev/null
+++ b/substrate/frame/revive/src/vm/evm/instructions/stack.rs
@@ -0,0 +1,68 @@
+use super::utility::cast_slice_to_u256;
+use revm::{
+	interpreter::{
+		InstructionContext, InstructionResult, gas as revm_gas,
+		interpreter_types::{Immediates, InterpreterTypes, Jumps, RuntimeFlag, StackTr},
+	},
+	primitives::U256,
+};
+
+/// Implements the POP instruction.
+///
+/// Removes the top item from the stack.
+pub fn pop<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+	gas!(context.interpreter, revm_gas::BASE);
+	// Can ignore return. as relative N jump is safe operation.
+	popn!([_i], context.interpreter);
+}
+
+/// EIP-3855: PUSH0 instruction
+///
+/// Introduce a new instruction which pushes the constant value 0 onto the stack.
+pub fn push0<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+	check!(context.interpreter, SHANGHAI);
+	gas!(context.interpreter, revm_gas::BASE);
+	push!(context.interpreter, U256::ZERO);
+}
+
+/// Implements the PUSH1-PUSH32 instructions.
+///
+/// Pushes N bytes from bytecode onto the stack as a 32-byte value.
+pub fn push<const N: usize, WIRE: InterpreterTypes, H: ?Sized>(
+	context: InstructionContext<'_, H, WIRE>,
+) {
+	gas!(context.interpreter, revm_gas::VERYLOW);
+	push!(context.interpreter, U256::ZERO);
+	popn_top!([], top, context.interpreter);
+
+	let imm = context.interpreter.bytecode.read_slice(N);
+	cast_slice_to_u256(imm, top);
+
+	// Can ignore return. as relative N jump is safe operation
+	context.interpreter.bytecode.relative_jump(N as isize);
+}
+
+/// Implements the DUP1-DUP16 instructions.
+///
+/// Duplicates the Nth stack item to the top of the stack.
+pub fn dup<const N: usize, WIRE: InterpreterTypes, H: ?Sized>(
+	context: InstructionContext<'_, H, WIRE>,
+) {
+	gas!(context.interpreter, revm_gas::VERYLOW);
+	if !context.interpreter.stack.dup(N) {
+		context.interpreter.halt(InstructionResult::StackOverflow);
+	}
+}
+
+/// Implements the SWAP1-SWAP16 instructions.
+///
+/// Swaps the top stack item with the Nth stack item.
+pub fn swap<const N: usize, WIRE: InterpreterTypes, H: ?Sized>(
+	context: InstructionContext<'_, H, WIRE>,
+) {
+	gas!(context.interpreter, revm_gas::VERYLOW);
+	assert!(N != 0);
+	if !context.interpreter.stack.exchange(0, N) {
+		context.interpreter.halt(InstructionResult::StackOverflow);
+	}
+}
diff --git a/substrate/frame/revive/src/vm/evm/instructions/system.rs b/substrate/frame/revive/src/vm/evm/instructions/system.rs
new file mode 100644
index 000000000000..e5acb88a76ed
--- /dev/null
+++ b/substrate/frame/revive/src/vm/evm/instructions/system.rs
@@ -0,0 +1,247 @@
+use revm::interpreter::CallInput;
+use revm::interpreter::{
+    gas as revm_gas,
+    Interpreter,
+    interpreter_types::{
+        InputsTr, InterpreterTypes, LegacyBytecode, MemoryTr, ReturnData, RuntimeFlag, StackTr,
+    },
+    InstructionContext,
+    InstructionResult,
+};
+use core::ptr;
+use revm::primitives::{B256, KECCAK_EMPTY, U256};
+
+/// Implements the KECCAK256 instruction.
+///
+/// Computes Keccak-256 hash of memory data.
+pub fn keccak256<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    popn_top!([offset], top, context.interpreter);
+    let len = as_usize_or_fail!(context.interpreter, top);
+    gas_or_fail!(context.interpreter, revm_gas::keccak256_cost(len));
+    let hash = if len == 0 {
+        KECCAK_EMPTY
+    } else {
+        let from = as_usize_or_fail!(context.interpreter, offset);
+        resize_memory!(context.interpreter, from, len);
+        revm::primitives::keccak256(context.interpreter.memory.slice_len(from, len).as_ref())
+    };
+    *top = hash.into();
+}
+
+/// Implements the ADDRESS instruction.
+///
+/// Pushes the current contract's address onto the stack.
+pub fn address<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    gas!(context.interpreter, revm_gas::BASE);
+    push!(
+        context.interpreter,
+        context
+            .interpreter
+            .input
+            .target_address()
+            .into_word()
+            .into()
+    );
+}
+
+/// Implements the CALLER instruction.
+///
+/// Pushes the caller's address onto the stack.
+pub fn caller<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    gas!(context.interpreter, revm_gas::BASE);
+    push!(
+        context.interpreter,
+        context
+            .interpreter
+            .input
+            .caller_address()
+            .into_word()
+            .into()
+    );
+}
+
+/// Implements the CODESIZE instruction.
+///
+/// Pushes the size of running contract's bytecode onto the stack.
+pub fn codesize<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    gas!(context.interpreter, revm_gas::BASE);
+    push!(
+        context.interpreter,
+        U256::from(context.interpreter.bytecode.bytecode_len())
+    );
+}
+
+/// Implements the CODECOPY instruction.
+///
+/// Copies running contract's bytecode to memory.
+pub fn codecopy<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    popn!([memory_offset, code_offset, len], context.interpreter);
+    let len = as_usize_or_fail!(context.interpreter, len);
+    let Some(memory_offset) = memory_resize(context.interpreter, memory_offset, len) else {
+        return;
+    };
+    let code_offset = as_usize_saturated!(code_offset);
+
+    // Note: This can't panic because we resized memory to fit.
+    context.interpreter.memory.set_data(
+        memory_offset,
+        code_offset,
+        len,
+        context.interpreter.bytecode.bytecode_slice(),
+    );
+}
+
+/// Implements the CALLDATALOAD instruction.
+///
+/// Loads 32 bytes of input data from the specified offset.
+pub fn calldataload<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    gas!(context.interpreter, revm_gas::VERYLOW);
+    //pop_top!(interpreter, offset_ptr);
+    popn_top!([], offset_ptr, context.interpreter);
+    let mut word = B256::ZERO;
+    let offset = as_usize_saturated!(offset_ptr);
+    let input = context.interpreter.input.input();
+    let input_len = input.len();
+    if offset < input_len {
+        let count = 32.min(input_len - offset);
+
+        // SAFETY: `count` is bounded by the calldata length.
+        // This is `word[..count].copy_from_slice(input[offset..offset + count])`, written using
+        // raw pointers as apparently the compiler cannot optimize the slice version, and using
+        // `get_unchecked` twice is uglier.
+        match context.interpreter.input.input() {
+            CallInput::Bytes(bytes) => {
+                unsafe {
+                    ptr::copy_nonoverlapping(bytes.as_ptr().add(offset), word.as_mut_ptr(), count)
+                };
+            }
+            CallInput::SharedBuffer(range) => {
+                let input_slice = context.interpreter.memory.global_slice(range.clone());
+                unsafe {
+                    ptr::copy_nonoverlapping(
+                        input_slice.as_ptr().add(offset),
+                        word.as_mut_ptr(),
+                        count,
+                    )
+                };
+            }
+        }
+    }
+    *offset_ptr = word.into();
+}
+
+/// Implements the CALLDATASIZE instruction.
+///
+/// Pushes the size of input data onto the stack.
+pub fn calldatasize<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    gas!(context.interpreter, revm_gas::BASE);
+    push!(
+        context.interpreter,
+        U256::from(context.interpreter.input.input().len())
+    );
+}
+
+/// Implements the CALLVALUE instruction.
+///
+/// Pushes the value sent with the current call onto the stack.
+pub fn callvalue<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    gas!(context.interpreter, revm_gas::BASE);
+    push!(context.interpreter, context.interpreter.input.call_value());
+}
+
+/// Implements the CALLDATACOPY instruction.
+///
+/// Copies input data to memory.
+pub fn calldatacopy<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    popn!([memory_offset, data_offset, len], context.interpreter);
+    let len = as_usize_or_fail!(context.interpreter, len);
+    let Some(memory_offset) = memory_resize(context.interpreter, memory_offset, len) else {
+        return;
+    };
+
+    let data_offset = as_usize_saturated!(data_offset);
+    match context.interpreter.input.input() {
+        CallInput::Bytes(bytes) => {
+            context
+                .interpreter
+                .memory
+                .set_data(memory_offset, data_offset, len, bytes.as_ref());
+        }
+        CallInput::SharedBuffer(range) => {
+            context.interpreter.memory.set_data_from_global(
+                memory_offset,
+                data_offset,
+                len,
+                range.clone(),
+            );
+        }
+    }
+}
+
+/// EIP-211: New opcodes: RETURNDATASIZE and RETURNDATACOPY
+pub fn returndatasize<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    check!(context.interpreter, BYZANTIUM);
+    gas!(context.interpreter, revm_gas::BASE);
+    push!(
+        context.interpreter,
+        U256::from(context.interpreter.return_data.buffer().len())
+    );
+}
+
+/// EIP-211: New opcodes: RETURNDATASIZE and RETURNDATACOPY
+pub fn returndatacopy<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    check!(context.interpreter, BYZANTIUM);
+    popn!([memory_offset, offset, len], context.interpreter);
+
+    let len = as_usize_or_fail!(context.interpreter, len);
+    let data_offset = as_usize_saturated!(offset);
+
+    // Old legacy behavior is to panic if data_end is out of scope of return buffer.
+    let data_end = data_offset.saturating_add(len);
+    if data_end > context.interpreter.return_data.buffer().len() {
+        context.interpreter.halt(InstructionResult::OutOfOffset);
+        return;
+    }
+
+    let Some(memory_offset) = memory_resize(context.interpreter, memory_offset, len) else {
+        return;
+    };
+
+    // Note: This can't panic because we resized memory to fit.
+    context.interpreter.memory.set_data(
+        memory_offset,
+        data_offset,
+        len,
+        context.interpreter.return_data.buffer(),
+    );
+}
+
+/// Implements the GAS instruction.
+///
+/// Pushes the amount of remaining gas onto the stack.
+pub fn gas<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    gas!(context.interpreter, revm_gas::BASE);
+    push!(
+        context.interpreter,
+        U256::from(context.interpreter.gas.remaining())
+    );
+}
+
+/// Common logic for copying data from a source buffer to the EVM's memory.
+///
+/// Handles memory expansion and gas calculation for data copy operations.
+pub fn memory_resize(
+    interpreter: &mut Interpreter<impl InterpreterTypes>,
+    memory_offset: U256,
+    len: usize,
+) -> Option<usize> {
+    // Safe to cast usize to u64
+    gas_or_fail!(interpreter, revm_gas::copy_cost_verylow(len), None);
+    if len == 0 {
+        return None;
+    }
+    let memory_offset = as_usize_or_fail_ret!(interpreter, memory_offset, None);
+    resize_memory!(interpreter, memory_offset, len, None);
+
+    Some(memory_offset)
+}
diff --git a/substrate/frame/revive/src/vm/evm/instructions/tx_info.rs b/substrate/frame/revive/src/vm/evm/instructions/tx_info.rs
new file mode 100644
index 000000000000..2c248f2c4ea2
--- /dev/null
+++ b/substrate/frame/revive/src/vm/evm/instructions/tx_info.rs
@@ -0,0 +1,44 @@
+use revm::interpreter::{
+    gas as revm_gas,
+    interpreter_types::{InterpreterTypes, RuntimeFlag, StackTr},
+    host::Host,
+    InstructionContext,
+};
+use revm::primitives::U256;
+
+/// Implements the GASPRICE instruction.
+///
+/// Gets the gas price of the originating transaction.
+pub fn gasprice<WIRE: InterpreterTypes, H: Host + ?Sized>(
+    context: InstructionContext<'_, H, WIRE>,
+) {
+    gas!(context.interpreter, revm_gas::BASE);
+    push!(
+        context.interpreter,
+        U256::from(context.host.effective_gas_price())
+    );
+}
+
+/// Implements the ORIGIN instruction.
+///
+/// Gets the execution origination address.
+pub fn origin<WIRE: InterpreterTypes, H: Host + ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+    gas!(context.interpreter, revm_gas::BASE);
+    push!(
+        context.interpreter,
+        context.host.caller().into_word().into()
+    );
+}
+
+/// Implements the BLOBHASH instruction.
+///
+/// EIP-4844: Shard Blob Transactions - gets the hash of a transaction blob.
+pub fn blob_hash<WIRE: InterpreterTypes, H: Host + ?Sized>(
+    context: InstructionContext<'_, H, WIRE>,
+) {
+    check!(context.interpreter, CANCUN);
+    gas!(context.interpreter, revm_gas::VERYLOW);
+    popn_top!([], index, context.interpreter);
+    let i = as_usize_saturated!(index);
+    *index = context.host.blob_hash(i).unwrap_or_default();
+}
diff --git a/substrate/frame/revive/src/vm/evm/instructions/utility.rs b/substrate/frame/revive/src/vm/evm/instructions/utility.rs
new file mode 100644
index 000000000000..524be1cb3dc9
--- /dev/null
+++ b/substrate/frame/revive/src/vm/evm/instructions/utility.rs
@@ -0,0 +1,111 @@
+use revm::primitives::{Address, B256, U256};
+
+/// Pushes an arbitrary length slice of bytes onto the stack, padding the last word with zeros
+/// if necessary.
+///
+/// # Panics
+///
+/// Panics if slice is longer than 32 bytes.
+#[inline]
+pub fn cast_slice_to_u256(slice: &[u8], dest: &mut U256) {
+    if slice.is_empty() {
+        return;
+    }
+    assert!(slice.len() <= 32, "slice too long");
+
+    let n_words = slice.len().div_ceil(32);
+
+    // SAFETY: Length checked above.
+    unsafe {
+        //let dst = self.data.as_mut_ptr().add(self.data.len()).cast::<u64>();
+        //self.data.set_len(new_len);
+        let dst = dest.as_limbs_mut().as_mut_ptr();
+
+        let mut i = 0;
+
+        // Write full words
+        let words = slice.chunks_exact(32);
+        let partial_last_word = words.remainder();
+        for word in words {
+            // Note: We unroll `U256::from_be_bytes` here to write directly into the buffer,
+            // instead of creating a 32 byte array on the stack and then copying it over.
+            for l in word.rchunks_exact(8) {
+                dst.add(i).write(u64::from_be_bytes(l.try_into().unwrap()));
+                i += 1;
+            }
+        }
+
+        if partial_last_word.is_empty() {
+            return;
+        }
+
+        // Write limbs of partial last word
+        let limbs = partial_last_word.rchunks_exact(8);
+        let partial_last_limb = limbs.remainder();
+        for l in limbs {
+            dst.add(i).write(u64::from_be_bytes(l.try_into().unwrap()));
+            i += 1;
+        }
+
+        // Write partial last limb by padding with zeros
+        if !partial_last_limb.is_empty() {
+            let mut tmp = [0u8; 8];
+            tmp[8 - partial_last_limb.len()..].copy_from_slice(partial_last_limb);
+            dst.add(i).write(u64::from_be_bytes(tmp));
+            i += 1;
+        }
+
+        debug_assert_eq!(i.div_ceil(4), n_words, "wrote too much");
+
+        // Zero out upper bytes of last word
+        let m = i % 4; // 32 / 8
+        if m != 0 {
+            dst.add(i).write_bytes(0, 4 - m);
+        }
+    }
+}
+
+/// Trait for converting types into U256 values.
+pub trait IntoU256 {
+    /// Converts the implementing type into a U256 value.
+    fn into_u256(self) -> U256;
+}
+
+impl IntoU256 for Address {
+    fn into_u256(self) -> U256 {
+        self.into_word().into_u256()
+    }
+}
+
+impl IntoU256 for B256 {
+    fn into_u256(self) -> U256 {
+        U256::from_be_bytes(self.0)
+    }
+}
+
+/// Trait for converting types into Address values.
+pub trait IntoAddress {
+    /// Converts the implementing type into an Address value.
+    fn into_address(self) -> Address;
+}
+
+impl IntoAddress for U256 {
+    fn into_address(self) -> Address {
+        Address::from_word(B256::from(self.to_be_bytes()))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use revm::primitives::address;
+
+    use super::*;
+
+    #[test]
+    fn test_into_u256() {
+        let addr = address!("0x0000000000000000000000000000000000000001");
+        let u256 = addr.into_u256();
+        assert_eq!(u256, U256::from(0x01));
+        assert_eq!(u256.into_address(), addr);
+    }
+}

From a55cc7ab5c13d1b9ff82bfbfd66df61764cc7462 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Sun, 20 Jul 2025 10:16:17 +0000
Subject: [PATCH 063/186] wip

---
 substrate/frame/revive/src/vm/evm.rs     | 258 ++---------------------
 substrate/frame/revive/src/vm/runtime.rs |  14 +-
 2 files changed, 19 insertions(+), 253 deletions(-)

diff --git a/substrate/frame/revive/src/vm/evm.rs b/substrate/frame/revive/src/vm/evm.rs
index 3a0d04752a36..ab0d526818ee 100644
--- a/substrate/frame/revive/src/vm/evm.rs
+++ b/substrate/frame/revive/src/vm/evm.rs
@@ -1,7 +1,7 @@
 mod instructions;
 
 use crate::{
-	Config, ExecReturnValue,
+	Config, Error, ExecReturnValue,
 	address::AddressMapper,
 	exec::PrecompileExt,
 	vm::{ExecResult, Ext},
@@ -10,28 +10,21 @@ use instructions::instruction_table;
 use pallet_revive_uapi::ReturnFlags;
 use revm::{
 	bytecode::Bytecode,
-	context_interface::{
-		context::{SStoreResult, SelfDestructResult, StateLoad},
-		journaled_state::AccountLoad,
-	},
 	interpreter::{
 		CallInput, Gas, Interpreter, InterpreterResult, InterpreterTypes, SharedMemory, Stack,
-		host::Host,
+		host::DummyHost,
 		interpreter::{ExtBytecode, ReturnDataImpl, RuntimeFlags},
-		interpreter_action::{
-			CallInputs, CreateInputs, CreateOutcome, FrameInput, InterpreterAction,
-		},
-		interpreter_types::{InputsTr, ReturnData, StackTr},
+		interpreter_action::InterpreterAction,
+		interpreter_types::InputsTr,
 	},
-	primitives::{Address, B256, Bytes, Log, StorageKey, StorageValue, U256, hardfork::SpecId},
+	primitives::{Address, U256, hardfork::SpecId},
 };
-use sp_core::H256;
 
 /// TODO handle error case
 pub fn call<'a, E: Ext>(bytecode: Bytecode, inputs: EVMInputs<'a, E>) -> ExecResult {
 	let mut interpreter: Interpreter<EVMInterpreter<'a, E>> = Interpreter {
+		gas: Gas::new(30_000_000), // TODO clean up
 		bytecode: ExtBytecode::new(bytecode),
-		gas: Gas::new(30_000_000),
 		stack: Stack::new(),
 		return_data: Default::default(),
 		memory: SharedMemory::new(),
@@ -40,44 +33,29 @@ pub fn call<'a, E: Ext>(bytecode: Bytecode, inputs: EVMInputs<'a, E>) -> ExecRes
 		extend: Default::default(),
 	};
 
-	let table = instruction_table::<EVMInterpreter<'a, E>, MockHost>();
-	let result = run(&mut interpreter, &table, &mut MockHost::default());
+	let table = instruction_table::<EVMInterpreter<'a, E>, DummyHost>();
+	let result = run(&mut interpreter, &table);
 
-	if result.is_ok() {
-		return Ok(ExecReturnValue {
+	if result.is_error() {
+		Err(Error::<E::T>::ContractTrapped.into())
+	} else {
+		Ok(ExecReturnValue {
 			flags: if result.is_revert() { ReturnFlags::REVERT } else { ReturnFlags::empty() },
 			data: result.output.to_vec(),
 		})
 	}
-
-	dbg!(result);
-	todo!("Handle error case properly");
 }
 
 fn run<WIRE: InterpreterTypes>(
 	interpreter: &mut Interpreter<WIRE>,
-	table: &revm::interpreter::InstructionTable<WIRE, MockHost>,
-	host: &mut MockHost,
+	table: &revm::interpreter::InstructionTable<WIRE, DummyHost>,
 ) -> InterpreterResult {
+	let host = &mut DummyHost {};
 	loop {
 		let action = interpreter.run_plain(table, host);
 		match action {
-			InterpreterAction::NewFrame(frame_input) => match frame_input {
-				FrameInput::Call(input) => {
-					let result = host.call(&input);
-					interpreter.return_data.set_buffer(result.output.clone());
-					let _ = interpreter.stack.push(U256::from(result.result.is_ok() as u8));
-				},
-				FrameInput::Create(input) => {
-					let outcome = host.create(&input);
-					let address = outcome.address.unwrap_or_default();
-					let _ = interpreter.stack.push(U256::from_be_slice(address.as_slice()));
-				},
-				FrameInput::Empty => {
-					panic!("Unexpected empty frame input");
-				},
-			},
 			InterpreterAction::Return(result) => return result,
+			_ => panic!("Unexpected action: {:?}", action),
 		}
 	}
 }
@@ -134,209 +112,3 @@ impl<'a, E: Ext> InputsTr for EVMInputs<'a, E> {
 		U256::from_limbs(self.ext.value_transferred().0)
 	}
 }
-
-/// Mock [`Host`] implementation
-#[derive(Debug, Default)]
-struct MockHost;
-
-impl MockHost {
-	/// Mock calling a child contract.
-	pub fn call(&mut self, call_inputs: &CallInputs) -> InterpreterResult {
-		let mock_result = Bytes::from(U256::from(42u64).to_be_bytes_vec());
-
-		InterpreterResult::new(
-			revm::interpreter::InstructionResult::Return,
-			mock_result,
-			revm::interpreter::Gas::new(call_inputs.gas_limit - 100), // Consume some gas
-		)
-	}
-
-	/// Mock creating a new contract.
-	pub fn create(&mut self, create_inputs: &CreateInputs) -> CreateOutcome {
-		// Generate a mock contract address
-		let contract_address = Address::from_slice(&[42u8; 20]);
-
-		CreateOutcome::new(
-			InterpreterResult::new(
-				revm::interpreter::InstructionResult::Return,
-				Bytes::default(),
-				revm::interpreter::Gas::new(create_inputs.gas_limit - 200), // Consume some gas
-			),
-			Some(contract_address),
-		)
-	}
-}
-
-pub struct EVMRuntime<'a, E: Ext> {
-	ext: &'a mut E,
-}
-
-use frame_support::traits::Get;
-impl<'a, E: Ext> Host for EVMRuntime<'a, E> {
-	fn basefee(&self) -> U256 {
-		U256::ZERO
-	}
-	fn blob_gasprice(&self) -> U256 {
-		U256::ZERO
-	}
-	fn gas_limit(&self) -> U256 {
-		U256::from(30_000_000u64)
-	}
-	fn difficulty(&self) -> U256 {
-		U256::ZERO
-	}
-	fn prevrandao(&self) -> Option<U256> {
-		None
-	}
-	fn block_number(&self) -> U256 {
-		U256::from_limbs(self.ext.block_number().0)
-	}
-	fn timestamp(&self) -> U256 {
-		U256::from_limbs(self.ext.now().0)
-	}
-	fn beneficiary(&self) -> Address {
-		self.ext.block_author().unwrap_or_default().0.into()
-	}
-	fn chain_id(&self) -> U256 {
-		U256::from(<E::T as Config>::ChainId::get())
-	}
-	fn effective_gas_price(&self) -> U256 {
-		U256::ZERO
-	}
-	fn caller(&self) -> Address {
-		let caller = self.ext.caller();
-		let Ok(id) = caller.account_id() else { return Address::default() };
-		let addr = <E::T as Config>::AddressMapper::to_address(id);
-		addr.0.into()
-	}
-	fn blob_hash(&self, _number: usize) -> Option<U256> {
-		None
-	}
-	fn max_initcode_size(&self) -> usize {
-		0x40000
-	}
-	fn block_hash(&mut self, number: u64) -> Option<B256> {
-		self.ext.block_hash(number.into()).map(|h| B256::from(h.0))
-	}
-	fn selfdestruct(
-		&mut self,
-		_address: Address,
-		_target: Address,
-	) -> Option<StateLoad<SelfDestructResult>> {
-		None
-	}
-
-	fn log(&mut self, log: Log) {
-		let (topics, data) = log.data.split();
-		let topics = topics.into_iter().map(|v| H256::from(v.0)).collect();
-		self.ext.deposit_event(topics, data.into());
-	}
-
-	fn sstore(
-		&mut self,
-		_address: Address,
-		_key: StorageKey,
-		_value: StorageValue,
-	) -> Option<StateLoad<SStoreResult>> {
-		None
-	}
-	fn sload(&mut self, _address: Address, _key: StorageKey) -> Option<StateLoad<StorageValue>> {
-		None
-	}
-	fn tstore(&mut self, _address: Address, _key: StorageKey, _value: StorageValue) {}
-	fn tload(&mut self, _address: Address, _key: StorageKey) -> StorageValue {
-		StorageValue::ZERO
-	}
-	fn balance(&mut self, _address: Address) -> Option<StateLoad<U256>> {
-		None
-	}
-	fn load_account_delegated(&mut self, _address: Address) -> Option<StateLoad<AccountLoad>> {
-		Some(StateLoad::new(AccountLoad { is_delegate_account_cold: None, is_empty: true }, true))
-	}
-	fn load_account_code(&mut self, _address: Address) -> Option<StateLoad<Bytes>> {
-		None
-	}
-	fn load_account_code_hash(&mut self, _address: Address) -> Option<StateLoad<B256>> {
-		None
-	}
-}
-
-impl Host for MockHost {
-	fn basefee(&self) -> U256 {
-		U256::ZERO
-	}
-	fn blob_gasprice(&self) -> U256 {
-		U256::ZERO
-	}
-	fn gas_limit(&self) -> U256 {
-		U256::from(30_000_000u64)
-	}
-	fn difficulty(&self) -> U256 {
-		U256::ZERO
-	}
-	fn prevrandao(&self) -> Option<U256> {
-		None
-	}
-	fn block_number(&self) -> U256 {
-		U256::from(1u64)
-	}
-	fn timestamp(&self) -> U256 {
-		U256::from(1000u64)
-	}
-	fn beneficiary(&self) -> Address {
-		Address::ZERO
-	}
-	fn chain_id(&self) -> U256 {
-		U256::from(1u64)
-	}
-	fn effective_gas_price(&self) -> U256 {
-		U256::ZERO
-	}
-	fn caller(&self) -> Address {
-		Address::ZERO
-	}
-	fn blob_hash(&self, _number: usize) -> Option<U256> {
-		None
-	}
-	fn max_initcode_size(&self) -> usize {
-		0x40000
-	}
-	fn block_hash(&mut self, _number: u64) -> Option<B256> {
-		None
-	}
-	fn selfdestruct(
-		&mut self,
-		_address: Address,
-		_target: Address,
-	) -> Option<StateLoad<SelfDestructResult>> {
-		None
-	}
-	fn log(&mut self, _log: Log) {}
-	fn sstore(
-		&mut self,
-		_address: Address,
-		_key: StorageKey,
-		_value: StorageValue,
-	) -> Option<StateLoad<SStoreResult>> {
-		None
-	}
-	fn sload(&mut self, _address: Address, _key: StorageKey) -> Option<StateLoad<StorageValue>> {
-		None
-	}
-	fn tstore(&mut self, _address: Address, _key: StorageKey, _value: StorageValue) {}
-	fn tload(&mut self, _address: Address, _key: StorageKey) -> StorageValue {
-		StorageValue::ZERO
-	}
-	fn balance(&mut self, _address: Address) -> Option<StateLoad<U256>> {
-		None
-	}
-	fn load_account_delegated(&mut self, _address: Address) -> Option<StateLoad<AccountLoad>> {
-		Some(StateLoad::new(AccountLoad { is_delegate_account_cold: None, is_empty: true }, true))
-	}
-	fn load_account_code(&mut self, _address: Address) -> Option<StateLoad<Bytes>> {
-		None
-	}
-	fn load_account_code_hash(&mut self, _address: Address) -> Option<StateLoad<B256>> {
-		None
-	}
-}
diff --git a/substrate/frame/revive/src/vm/runtime.rs b/substrate/frame/revive/src/vm/runtime.rs
index 5296658d3d92..a3cda4d743f4 100644
--- a/substrate/frame/revive/src/vm/runtime.rs
+++ b/substrate/frame/revive/src/vm/runtime.rs
@@ -18,6 +18,7 @@
 //! Environment definition of the vm smart-contract runtime.
 
 use crate::{
+	Config, Error, LOG_TARGET, Pallet, SENTINEL,
 	address::AddressMapper,
 	evm::runtime::GAS_PRICE,
 	exec::{ExecError, ExecResult, Ext, Key},
@@ -26,7 +27,6 @@ use crate::{
 	precompiles::{All as AllPrecompiles, Precompiles},
 	primitives::ExecReturnValue,
 	weights::WeightInfo,
-	Config, Error, Pallet, LOG_TARGET, SENTINEL,
 };
 use alloc::{vec, vec::Vec};
 use codec::Encode;
@@ -195,11 +195,7 @@ impl<T: Config> PolkaVmInstance<T> for polkavm::RawInstance {
 
 impl From<&ExecReturnValue> for ReturnErrorCode {
 	fn from(from: &ExecReturnValue) -> Self {
-		if from.flags.contains(ReturnFlags::REVERT) {
-			Self::CalleeReverted
-		} else {
-			Self::Success
-		}
+		if from.flags.contains(ReturnFlags::REVERT) { Self::CalleeReverted } else { Self::Success }
 	}
 }
 
@@ -545,9 +541,7 @@ impl<T: Config> Token<T> for RuntimeCosts {
 /// We need this access as a macro because sometimes hiding the lifetimes behind
 /// a function won't work out.
 macro_rules! charge_gas {
-	($runtime:expr, $costs:expr) => {{
-		$runtime.ext.gas_meter_mut().charge($costs)
-	}};
+	($runtime:expr, $costs:expr) => {{ $runtime.ext.gas_meter_mut().charge($costs) }};
 }
 
 /// The kind of call that should be performed.
@@ -598,7 +592,7 @@ enum StorageReadMode {
 	/// VariableOutput mode: if the key exists, the full stored value is returned
 	/// using the caller‑provided output length.
 	VariableOutput { output_len_ptr: u32 },
-	/// Ethereum commpatible(FixedOutput32) mode: always write a 32-byte value into the output
+	/// Ethereum compatible(FixedOutput32) mode: always write a 32-byte value into the output
 	/// buffer. If the key is missing, write 32 bytes of zeros.
 	FixedOutput32,
 }

From 3a42cf77256d11150a33840e2d6782cb8b52a07f Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Sun, 20 Jul 2025 11:18:08 +0000
Subject: [PATCH 064/186] split evm / pvm

---
 substrate/frame/revive/src/benchmarking.rs    |   68 +-
 substrate/frame/revive/src/call_builder.rs    |    8 +-
 substrate/frame/revive/src/lib.rs             |   33 +-
 .../revive/src/precompiles/builtin/blake2f.rs |    2 +-
 substrate/frame/revive/src/vm/evm.rs          |   36 +-
 substrate/frame/revive/src/vm/mod.rs          |  173 +-
 substrate/frame/revive/src/vm/pvm.rs          |  929 +++++++
 substrate/frame/revive/src/vm/pvm/env.rs      | 1060 ++++++++
 substrate/frame/revive/src/vm/runtime.rs      | 2127 -----------------
 .../frame/revive/src/vm/runtime_costs.rs      |  299 +++
 10 files changed, 2387 insertions(+), 2348 deletions(-)
 create mode 100644 substrate/frame/revive/src/vm/pvm.rs
 create mode 100644 substrate/frame/revive/src/vm/pvm/env.rs
 delete mode 100644 substrate/frame/revive/src/vm/runtime.rs
 create mode 100644 substrate/frame/revive/src/vm/runtime_costs.rs

diff --git a/substrate/frame/revive/src/benchmarking.rs b/substrate/frame/revive/src/benchmarking.rs
index aa9ee845afc0..d445128133c0 100644
--- a/substrate/frame/revive/src/benchmarking.rs
+++ b/substrate/frame/revive/src/benchmarking.rs
@@ -19,13 +19,14 @@
 
 #![cfg(feature = "runtime-benchmarks")]
 use crate::{
-	call_builder::{caller_funding, default_deposit_limit, CallSetup, Contract, VmBinaryModule},
+	Pallet as Contracts,
+	call_builder::{CallSetup, Contract, VmBinaryModule, caller_funding, default_deposit_limit},
 	evm::runtime::GAS_PRICE,
 	exec::{Key, MomentOf, PrecompileExt},
 	limits,
 	precompiles::{self, run::builtin as run_builtin_precompile},
 	storage::WriteOutcome,
-	Pallet as Contracts, *,
+	*,
 };
 use alloc::{vec, vec::Vec};
 use codec::{Encode, MaxEncodedLen};
@@ -38,11 +39,11 @@ use frame_support::{
 	weights::{Weight, WeightMeter},
 };
 use frame_system::RawOrigin;
-use pallet_revive_uapi::{pack_hi_lo, CallFlags, ReturnErrorCode, StorageFlags};
+use pallet_revive_uapi::{CallFlags, ReturnErrorCode, StorageFlags, pack_hi_lo};
 use sp_consensus_aura::AURA_ENGINE_ID;
 use sp_consensus_babe::{
-	digests::{PreDigest, PrimaryPreDigest},
 	BABE_ENGINE_ID,
+	digests::{PreDigest, PrimaryPreDigest},
 };
 use sp_consensus_slots::Slot;
 use sp_runtime::{
@@ -76,7 +77,7 @@ macro_rules! build_runtime(
 		let $contract = setup.contract();
 		let input = setup.data();
 		let (mut ext, _) = setup.ext();
-		let mut $runtime = crate::vm::Runtime::<_, [u8]>::new(&mut ext, input);
+		let mut $runtime = crate::vm::pvm::Runtime::<_, [u8]>::new(&mut ext, input);
 	};
 );
 
@@ -650,7 +651,7 @@ mod benchmarks {
 		let mut setup = CallSetup::<T>::default();
 		setup.set_origin(Origin::Root);
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::Runtime::new(&mut ext, vec![]);
+		let mut runtime = crate::vm::pvm::Runtime::new(&mut ext, vec![]);
 
 		let result;
 		#[block]
@@ -789,7 +790,7 @@ mod benchmarks {
 		let (mut ext, _) = setup.ext();
 		ext.override_export(crate::exec::ExportedFunction::Constructor);
 
-		let mut runtime = crate::vm::Runtime::<_, [u8]>::new(&mut ext, input);
+		let mut runtime = crate::vm::pvm::Runtime::<_, [u8]>::new(&mut ext, input);
 
 		let result;
 		#[block]
@@ -829,7 +830,7 @@ mod benchmarks {
 	fn seal_return_data_size() {
 		let mut setup = CallSetup::<T>::default();
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::Runtime::new(&mut ext, vec![]);
+		let mut runtime = crate::vm::pvm::Runtime::new(&mut ext, vec![]);
 		let mut memory = memory!(vec![],);
 		*runtime.ext().last_frame_output_mut() =
 			ExecReturnValue { data: vec![42; 256], ..Default::default() };
@@ -845,7 +846,7 @@ mod benchmarks {
 	fn seal_call_data_size() {
 		let mut setup = CallSetup::<T>::default();
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::Runtime::new(&mut ext, vec![42u8; 128 as usize]);
+		let mut runtime = crate::vm::pvm::Runtime::new(&mut ext, vec![42u8; 128 as usize]);
 		let mut memory = memory!(vec![0u8; 4],);
 		let result;
 		#[block]
@@ -958,7 +959,7 @@ mod benchmarks {
 		let (mut ext, _) = setup.ext();
 		ext.set_block_number(BlockNumberFor::<T>::from(1u32));
 
-		let mut runtime = crate::vm::Runtime::<_, [u8]>::new(&mut ext, input);
+		let mut runtime = crate::vm::pvm::Runtime::<_, [u8]>::new(&mut ext, input);
 
 		let block_hash = H256::from([1; 32]);
 		frame_system::BlockHash::<T>::insert(
@@ -1009,7 +1010,7 @@ mod benchmarks {
 	fn seal_copy_to_contract(n: Linear<0, { limits::code::BLOB_BYTES - 4 }>) {
 		let mut setup = CallSetup::<T>::default();
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::Runtime::new(&mut ext, vec![]);
+		let mut runtime = crate::vm::pvm::Runtime::new(&mut ext, vec![]);
 		let mut memory = memory!(n.encode(), vec![0u8; n as usize],);
 		let result;
 		#[block]
@@ -1032,7 +1033,7 @@ mod benchmarks {
 	fn seal_call_data_load() {
 		let mut setup = CallSetup::<T>::default();
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::Runtime::new(&mut ext, vec![42u8; 32]);
+		let mut runtime = crate::vm::pvm::Runtime::new(&mut ext, vec![42u8; 32]);
 		let mut memory = memory!(vec![0u8; 32],);
 		let result;
 		#[block]
@@ -1047,7 +1048,7 @@ mod benchmarks {
 	fn seal_call_data_copy(n: Linear<0, { limits::code::BLOB_BYTES }>) {
 		let mut setup = CallSetup::<T>::default();
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::Runtime::new(&mut ext, vec![42u8; n as usize]);
+		let mut runtime = crate::vm::pvm::Runtime::new(&mut ext, vec![42u8; n as usize]);
 		let mut memory = memory!(vec![0u8; n as usize],);
 		let result;
 		#[block]
@@ -1068,7 +1069,10 @@ mod benchmarks {
 			result = runtime.bench_seal_return(memory.as_mut_slice(), 0, 0, n);
 		}
 
-		assert!(matches!(result, Err(crate::vm::TrapReason::Return(crate::vm::ReturnData { .. }))));
+		assert!(matches!(
+			result,
+			Err(crate::vm::pvm::TrapReason::Return(crate::vm::pvm::ReturnData { .. }))
+		));
 	}
 
 	#[benchmark(pov_mode = Measured)]
@@ -1083,7 +1087,7 @@ mod benchmarks {
 			result = runtime.bench_terminate(memory.as_mut_slice(), 0);
 		}
 
-		assert!(matches!(result, Err(crate::vm::TrapReason::Termination)));
+		assert!(matches!(result, Err(crate::vm::pvm::TrapReason::Termination)));
 
 		Ok(())
 	}
@@ -1387,7 +1391,7 @@ mod benchmarks {
 		let value = Some(vec![42u8; max_value_len as _]);
 		let mut setup = CallSetup::<T>::default();
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
+		let mut runtime = crate::vm::pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
 		runtime.ext().transient_storage().meter().current_mut().limit = u32::MAX;
 		let result;
 		#[block]
@@ -1410,7 +1414,7 @@ mod benchmarks {
 		let mut setup = CallSetup::<T>::default();
 		setup.set_transient_storage_size(limits::TRANSIENT_STORAGE_BYTES);
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
+		let mut runtime = crate::vm::pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
 		runtime.ext().transient_storage().meter().current_mut().limit = u32::MAX;
 		let result;
 		#[block]
@@ -1432,7 +1436,7 @@ mod benchmarks {
 
 		let mut setup = CallSetup::<T>::default();
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
+		let mut runtime = crate::vm::pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
 		runtime.ext().transient_storage().meter().current_mut().limit = u32::MAX;
 		runtime
 			.ext()
@@ -1458,7 +1462,7 @@ mod benchmarks {
 		let mut setup = CallSetup::<T>::default();
 		setup.set_transient_storage_size(limits::TRANSIENT_STORAGE_BYTES);
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
+		let mut runtime = crate::vm::pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
 		runtime.ext().transient_storage().meter().current_mut().limit = u32::MAX;
 		runtime
 			.ext()
@@ -1485,7 +1489,7 @@ mod benchmarks {
 		let mut setup = CallSetup::<T>::default();
 		setup.set_transient_storage_size(limits::TRANSIENT_STORAGE_BYTES);
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
+		let mut runtime = crate::vm::pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
 		runtime.ext().transient_storage().meter().current_mut().limit = u32::MAX;
 		runtime.ext().transient_storage().start_transaction();
 		runtime
@@ -1698,7 +1702,7 @@ mod benchmarks {
 		setup.set_balance(value + 1u32.into() + Pallet::<T>::min_balance());
 
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
+		let mut runtime = crate::vm::pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
 		let mut memory = memory!(callee_bytes, deposit_bytes, value_bytes,);
 
 		let result;
@@ -1755,7 +1759,7 @@ mod benchmarks {
 		setup.set_storage_deposit_limit(deposit);
 
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
+		let mut runtime = crate::vm::pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
 		let mut memory = memory!(callee_bytes, deposit_bytes, value_bytes, input_bytes,);
 
 		let mut do_benchmark = || {
@@ -1801,7 +1805,7 @@ mod benchmarks {
 		setup.set_origin(Origin::from_account_id(setup.contract().account_id.clone()));
 
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
+		let mut runtime = crate::vm::pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
 		let mut memory = memory!(address_bytes, deposit_bytes,);
 
 		let result;
@@ -1852,7 +1856,7 @@ mod benchmarks {
 
 		let account_id = &setup.contract().account_id.clone();
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
+		let mut runtime = crate::vm::pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
 
 		let input = vec![42u8; i as _];
 		let input_len = hash_bytes.len() as u32 + input.len() as u32;
@@ -2052,7 +2056,9 @@ mod benchmarks {
 	fn bn128_add() {
 		use hex_literal::hex;
 		let input = hex!("089142debb13c461f61523586a60732d8b69c5b38a3380a74da7b2961d867dbf2d5fc7bbc013c16d7945f190b232eacc25da675c0eb093fe6b9f1b4b4e107b3625f8c89ea3437f44f8fc8b6bfbb6312074dc6f983809a5e809ff4e1d076dd5850b38c7ced6e4daef9c4347f370d6d8b58f4b1d8dc61a3c59d651a0644a2a27cf").to_vec();
-		let expected = hex!("0a6678fd675aa4d8f0d03a1feb921a27f38ebdcb860cc083653519655acd6d79172fd5b3b2bfdd44e43bcec3eace9347608f9f0a16f1e184cb3f52e6f259cbeb");
+		let expected = hex!(
+			"0a6678fd675aa4d8f0d03a1feb921a27f38ebdcb860cc083653519655acd6d79172fd5b3b2bfdd44e43bcec3eace9347608f9f0a16f1e184cb3f52e6f259cbeb"
+		);
 		let mut call_setup = CallSetup::<T>::default();
 		let (mut ext, _) = call_setup.ext();
 
@@ -2070,7 +2076,9 @@ mod benchmarks {
 	fn bn128_mul() {
 		use hex_literal::hex;
 		let input = hex!("089142debb13c461f61523586a60732d8b69c5b38a3380a74da7b2961d867dbf2d5fc7bbc013c16d7945f190b232eacc25da675c0eb093fe6b9f1b4b4e107b36ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").to_vec();
-		let expected = hex!("0bf982b98a2757878c051bfe7eee228b12bc69274b918f08d9fcb21e9184ddc10b17c77cbf3c19d5d27e18cbd4a8c336afb488d0e92c18d56e64dd4ea5c437e6");
+		let expected = hex!(
+			"0bf982b98a2757878c051bfe7eee228b12bc69274b918f08d9fcb21e9184ddc10b17c77cbf3c19d5d27e18cbd4a8c336afb488d0e92c18d56e64dd4ea5c437e6"
+		);
 		let mut call_setup = CallSetup::<T>::default();
 		let (mut ext, _) = call_setup.ext();
 
@@ -2088,7 +2096,7 @@ mod benchmarks {
 	#[benchmark(pov_mode = Measured)]
 	fn bn128_pairing(n: Linear<0, { 20 }>) {
 		fn generate_random_ecpairs(n: usize) -> Vec<u8> {
-			use bn::{AffineG1, AffineG2, Fr, Group, G1, G2};
+			use bn::{AffineG1, AffineG2, Fr, G1, G2, Group};
 			use rand::SeedableRng;
 			use rand_pcg::Pcg64;
 			let mut rng = Pcg64::seed_from_u64(1);
@@ -2137,7 +2145,9 @@ mod benchmarks {
 	#[benchmark(pov_mode = Measured)]
 	fn blake2f(n: Linear<0, 1200>) {
 		use hex_literal::hex;
-		let input = hex!("48c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b61626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000001");
+		let input = hex!(
+			"48c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b61626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000001"
+		);
 		let input = n.to_be_bytes().to_vec().into_iter().chain(input.to_vec()).collect::<Vec<_>>();
 		let mut call_setup = CallSetup::<T>::default();
 		let (mut ext, _) = call_setup.ext();
@@ -2197,7 +2207,7 @@ mod benchmarks {
 	// and then accessing it so that each instruction generates two cache misses.
 	#[benchmark(pov_mode = Ignored)]
 	fn instr(r: Linear<0, 10_000>) {
-		use rand::{seq::SliceRandom, SeedableRng};
+		use rand::{SeedableRng, seq::SliceRandom};
 		use rand_pcg::Pcg64;
 
 		// Ideally, this needs to be bigger than the cache.
diff --git a/substrate/frame/revive/src/call_builder.rs b/substrate/frame/revive/src/call_builder.rs
index 871800cfad44..8934fe8605be 100644
--- a/substrate/frame/revive/src/call_builder.rs
+++ b/substrate/frame/revive/src/call_builder.rs
@@ -26,15 +26,15 @@
 #![cfg_attr(test, allow(dead_code))]
 
 use crate::{
+	AccountInfo, BalanceOf, BalanceWithDust, BumpNonce, Code, CodeInfoOf, Config, ContractBlob,
+	ContractInfo, DepositLimit, Error, GasMeter, MomentOf, Origin, Pallet as Contracts,
+	PristineCode, Weight,
 	address::AddressMapper,
 	exec::{ExportedFunction, Key, PrecompileExt, Stack},
 	limits,
 	storage::meter::Meter,
 	transient_storage::MeterEntry,
-	vm::{PreparedCall, Runtime},
-	AccountInfo, BalanceOf, BalanceWithDust, BumpNonce, Code, CodeInfoOf, Config, ContractBlob,
-	ContractInfo, DepositLimit, Error, GasMeter, MomentOf, Origin, Pallet as Contracts,
-	PristineCode, Weight,
+	vm::pvm::{PreparedCall, Runtime},
 };
 use alloc::{vec, vec::Vec};
 use frame_support::{storage::child, traits::fungible::Mutate};
diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index 32de4a954b39..531fc6aec488 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -45,13 +45,13 @@ pub mod weights;
 
 use crate::{
 	evm::{
-		runtime::GAS_PRICE, CallTracer, GasEncoder, GenericTransaction, PrestateTracer, Trace,
-		Tracer, TracerType, TYPE_EIP1559,
+		CallTracer, GasEncoder, GenericTransaction, PrestateTracer, TYPE_EIP1559, Trace, Tracer,
+		TracerType, runtime::GAS_PRICE,
 	},
 	exec::{AccountIdOf, ExecError, Executable, Key, Stack as ExecStack},
 	gas::GasMeter,
 	storage::{
-		meter::Meter as StorageMeter, AccountInfo, AccountType, ContractInfo, DeletionQueueManager,
+		AccountInfo, AccountType, ContractInfo, DeletionQueueManager, meter::Meter as StorageMeter,
 	},
 	tracing::if_tracing,
 	vm::{CodeInfo, ContractBlob, RuntimeCosts},
@@ -60,6 +60,7 @@ use alloc::{boxed::Box, format, vec};
 use codec::{Codec, Decode, Encode};
 use environmental::*;
 use frame_support::{
+	BoundedVec, RuntimeDebugNoBound,
 	dispatch::{
 		DispatchErrorWithPostInfo, DispatchResultWithPostInfo, GetDispatchInfo, Pays,
 		PostDispatchInfo, RawOrigin,
@@ -67,27 +68,25 @@ use frame_support::{
 	ensure,
 	pallet_prelude::DispatchClass,
 	traits::{
-		fungible::{Inspect, Mutate, MutateHold},
 		ConstU32, ConstU64, EnsureOrigin, Get, IsType, OriginTrait, Time,
+		fungible::{Inspect, Mutate, MutateHold},
 	},
 	weights::WeightMeter,
-	BoundedVec, RuntimeDebugNoBound,
 };
 use frame_system::{
-	ensure_signed,
+	Pallet as System, ensure_signed,
 	pallet_prelude::{BlockNumberFor, OriginFor},
-	Pallet as System,
 };
 use pallet_transaction_payment::OnChargeTransaction;
 use scale_info::TypeInfo;
 use sp_runtime::{
-	traits::{BadOrigin, Bounded, Convert, Dispatchable, Saturating},
 	AccountId32, DispatchError,
+	traits::{BadOrigin, Bounded, Convert, Dispatchable, Saturating},
 };
 
 pub use crate::{
 	address::{
-		create1, create2, is_eth_derived, AccountId32Mapper, AddressMapper, TestAccountMapper,
+		AccountId32Mapper, AddressMapper, TestAccountMapper, create1, create2, is_eth_derived,
 	},
 	exec::{MomentOf, Origin},
 	pallet::*,
@@ -102,7 +101,7 @@ pub use sp_runtime;
 pub use weights::WeightInfo;
 
 #[cfg(doc)]
-pub use crate::vm::SyscallDoc;
+pub use crate::vm::pvm::SyscallDoc;
 
 pub type BalanceOf<T> =
 	<<T as Config>::Currency as Inspect<<T as frame_system::Config>::AccountId>>::Balance;
@@ -1282,10 +1281,10 @@ where
 				err == Error::<T>::StorageDepositLimitExhausted.into()
 			{
 				let balance = Self::evm_balance(&from);
-				return Err(EthTransactError::Message(
-						format!("insufficient funds for gas * price + value: address {from:?} have {balance} (supplied gas {})",
-							tx.gas.unwrap_or_default()))
-					);
+				return Err(EthTransactError::Message(format!(
+					"insufficient funds for gas * price + value: address {from:?} have {balance} (supplied gas {})",
+					tx.gas.unwrap_or_default()
+				)));
 			}
 
 			return Err(EthTransactError::Message(format!(
@@ -1472,11 +1471,7 @@ where
 		let fee = Self::convert_native_to_evm(fee);
 		let gas_price = GAS_PRICE.into();
 		let (quotient, remainder) = fee.div_mod(gas_price);
-		if remainder.is_zero() {
-			quotient
-		} else {
-			quotient + U256::one()
-		}
+		if remainder.is_zero() { quotient } else { quotient + U256::one() }
 	}
 
 	/// Convert a gas value into a substrate fee
diff --git a/substrate/frame/revive/src/precompiles/builtin/blake2f.rs b/substrate/frame/revive/src/precompiles/builtin/blake2f.rs
index bad0fa27f613..affefcad6d86 100644
--- a/substrate/frame/revive/src/precompiles/builtin/blake2f.rs
+++ b/substrate/frame/revive/src/precompiles/builtin/blake2f.rs
@@ -16,9 +16,9 @@
 // limitations under the License.
 
 use crate::{
+	Config,
 	precompiles::{BuiltinAddressMatcher, Error, Ext, PrimitivePrecompile},
 	vm::RuntimeCosts,
-	Config,
 };
 use alloc::vec::Vec;
 use core::{marker::PhantomData, num::NonZero};
diff --git a/substrate/frame/revive/src/vm/evm.rs b/substrate/frame/revive/src/vm/evm.rs
index ab0d526818ee..e48838140397 100644
--- a/substrate/frame/revive/src/vm/evm.rs
+++ b/substrate/frame/revive/src/vm/evm.rs
@@ -1,7 +1,8 @@
 mod instructions;
 
 use crate::{
-	Config, Error, ExecReturnValue,
+	AccountIdOf, BalanceOf, CodeInfo, CodeVec, Config, ContractBlob, DispatchError, Error,
+	ExecReturnValue, H256, LOG_TARGET, U256,
 	address::AddressMapper,
 	exec::PrecompileExt,
 	vm::{ExecResult, Ext},
@@ -17,9 +18,36 @@ use revm::{
 		interpreter_action::InterpreterAction,
 		interpreter_types::InputsTr,
 	},
-	primitives::{Address, U256, hardfork::SpecId},
+	primitives::{self, Address, hardfork::SpecId},
 };
 
+impl<T: Config> ContractBlob<T>
+where
+	BalanceOf<T>: Into<U256> + TryFrom<U256>,
+{
+	/// Create a new contract from EVM code.
+	pub fn from_evm_code(code: Vec<u8>, owner: AccountIdOf<T>) -> Result<Self, DispatchError> {
+		use revm::{bytecode::Bytecode, primitives::Bytes};
+
+		let code: CodeVec = code.try_into().map_err(|_| <Error<T>>::BlobTooLarge)?;
+		Bytecode::new_raw_checked(Bytes::from(code.to_vec())).map_err(|err| {
+			log::debug!(target: LOG_TARGET, "failed to create evm bytecode from code: {err:?}" );
+			<Error<T>>::CodeRejected
+		})?;
+
+		let code_len = code.len() as u32;
+		let code_info = CodeInfo {
+			owner,
+			deposit: Default::default(),
+			refcount: 0,
+			code_len,
+			behaviour_version: Default::default(),
+		};
+		let code_hash = H256(sp_io::hashing::keccak_256(&code));
+		Ok(ContractBlob { code, code_info, code_hash })
+	}
+}
+
 /// TODO handle error case
 pub fn call<'a, E: Ext>(bytecode: Bytecode, inputs: EVMInputs<'a, E>) -> ExecResult {
 	let mut interpreter: Interpreter<EVMInterpreter<'a, E>> = Interpreter {
@@ -108,7 +136,7 @@ impl<'a, E: Ext> InputsTr for EVMInputs<'a, E> {
 		&self.input
 	}
 
-	fn call_value(&self) -> U256 {
-		U256::from_limbs(self.ext.value_transferred().0)
+	fn call_value(&self) -> primitives::U256 {
+		primitives::U256::from_limbs(self.ext.value_transferred().0)
 	}
 }
diff --git a/substrate/frame/revive/src/vm/mod.rs b/substrate/frame/revive/src/vm/mod.rs
index e26a6712a256..161ff022b839 100644
--- a/substrate/frame/revive/src/vm/mod.rs
+++ b/substrate/frame/revive/src/vm/mod.rs
@@ -18,24 +18,17 @@
 //! This module provides a means for executing contracts
 //! represented in vm bytecode.
 
-mod evm;
-mod runtime;
+pub mod evm;
+pub mod pvm;
+mod runtime_costs;
 
-#[cfg(doc)]
-pub use crate::vm::runtime::SyscallDoc;
-
-#[cfg(feature = "runtime-benchmarks")]
-pub use crate::vm::runtime::{ReturnData, TrapReason};
-
-pub use crate::vm::runtime::{Runtime, RuntimeCosts};
+pub use runtime_costs::RuntimeCosts;
 
 use crate::{
-	AccountIdOf, BadOrigin, BalanceOf, CodeInfoOf, CodeVec, Config, Error, ExecError, HoldReason,
-	LOG_TARGET, PristineCode, Weight,
+	AccountIdOf, BadOrigin, BalanceOf, CodeInfoOf, CodeVec, Config, Error, HoldReason, LOG_TARGET,
+	PristineCode, Weight,
 	exec::{ExecResult, Executable, ExportedFunction, Ext},
 	gas::{GasMeter, Token},
-	limits,
-	storage::meter::Diff,
 	weights::WeightInfo,
 };
 use alloc::vec::Vec;
@@ -45,7 +38,7 @@ use frame_support::{
 	ensure,
 	traits::{fungible::MutateHold, tokens::Precision::BestEffort},
 };
-use sp_core::{Get, H256, U256};
+use sp_core::{H256, U256};
 use sp_runtime::DispatchError;
 
 /// Validated Vm module ready for execution.
@@ -133,50 +126,6 @@ impl<T: Config> ContractBlob<T>
 where
 	BalanceOf<T>: Into<U256> + TryFrom<U256>,
 {
-	/// We only check for size and nothing else when the code is uploaded.
-	pub fn from_pvm_code(code: Vec<u8>, owner: AccountIdOf<T>) -> Result<Self, DispatchError> {
-		// We do validation only when new code is deployed. This allows us to increase
-		// the limits later without affecting already deployed code.
-		let available_syscalls = runtime::list_syscalls(T::UnsafeUnstableInterface::get());
-		let code = limits::code::enforce::<T>(code, available_syscalls)?;
-
-		let code_len = code.len() as u32;
-		let bytes_added = code_len.saturating_add(<CodeInfo<T>>::max_encoded_len() as u32);
-		let deposit = Diff { bytes_added, items_added: 2, ..Default::default() }
-			.update_contract::<T>(None)
-			.charge_or_zero();
-		let code_info = CodeInfo {
-			owner,
-			deposit,
-			refcount: 0,
-			code_len,
-			behaviour_version: Default::default(),
-		};
-		let code_hash = H256(sp_io::hashing::keccak_256(&code));
-		Ok(ContractBlob { code, code_info, code_hash })
-	}
-
-	pub fn from_evm_code(code: Vec<u8>, owner: AccountIdOf<T>) -> Result<Self, DispatchError> {
-		use revm::{bytecode::Bytecode, primitives::Bytes};
-
-		let code: CodeVec = code.try_into().map_err(|_| <Error<T>>::BlobTooLarge)?;
-		Bytecode::new_raw_checked(Bytes::from(code.to_vec())).map_err(|err| {
-			log::debug!(target: LOG_TARGET, "failed to create evm bytecode from code: {err:?}" );
-			<Error<T>>::CodeRejected
-		})?;
-
-		let code_len = code.len() as u32;
-		let code_info = CodeInfo {
-			owner,
-			deposit: Default::default(),
-			refcount: 0,
-			code_len,
-			behaviour_version: Default::default(),
-		};
-		let code_hash = H256(sp_io::hashing::keccak_256(&code));
-		Ok(ContractBlob { code, code_info, code_hash })
-	}
-
 	/// Remove the code from storage and refund the deposit to its owner.
 	///
 	/// Applies all necessary checks before removing the code.
@@ -306,111 +255,6 @@ impl<T: Config> CodeInfo<T> {
 	}
 }
 
-pub struct PreparedCall<'a, E: Ext> {
-	module: polkavm::Module,
-	instance: polkavm::RawInstance,
-	runtime: Runtime<'a, E, polkavm::RawInstance>,
-}
-
-impl<'a, E: Ext> PreparedCall<'a, E>
-where
-	BalanceOf<E::T>: Into<U256>,
-	BalanceOf<E::T>: TryFrom<U256>,
-{
-	pub fn call(mut self) -> ExecResult {
-		let exec_result = loop {
-			let interrupt = self.instance.run();
-			if let Some(exec_result) =
-				self.runtime.handle_interrupt(interrupt, &self.module, &mut self.instance)
-			{
-				break exec_result
-			}
-		};
-		let _ = self.runtime.ext().gas_meter_mut().sync_from_executor(self.instance.gas())?;
-		exec_result
-	}
-
-	/// The guest memory address at which the aux data is located.
-	#[cfg(feature = "runtime-benchmarks")]
-	pub fn aux_data_base(&self) -> u32 {
-		self.instance.module().memory_map().aux_data_address()
-	}
-
-	/// Copies `data` to the aux data at address `offset`.
-	///
-	/// It sets `a0` to the beginning of data inside the aux data.
-	/// It sets `a1` to the value passed.
-	///
-	/// Only used in benchmarking so far.
-	#[cfg(feature = "runtime-benchmarks")]
-	pub fn setup_aux_data(&mut self, data: &[u8], offset: u32, a1: u64) -> DispatchResult {
-		let a0 = self.aux_data_base().saturating_add(offset);
-		self.instance.write_memory(a0, data).map_err(|err| {
-			log::debug!(target: LOG_TARGET, "failed to write aux data: {err:?}");
-			Error::<E::T>::CodeRejected
-		})?;
-		self.instance.set_reg(polkavm::Reg::A0, a0.into());
-		self.instance.set_reg(polkavm::Reg::A1, a1);
-		Ok(())
-	}
-}
-
-impl<T: Config> ContractBlob<T> {
-	/// Compile and instantiate contract.
-	///
-	/// `aux_data_size` is only used for runtime benchmarks. Real contracts
-	/// don't make use of this buffer. Hence this should not be set to anything
-	/// other than `0` when not used for benchmarking.
-	pub fn prepare_call<E: Ext<T = T>>(
-		self,
-		mut runtime: Runtime<E, polkavm::RawInstance>,
-		entry_point: ExportedFunction,
-		aux_data_size: u32,
-	) -> Result<PreparedCall<E>, ExecError> {
-		let mut config = polkavm::Config::default();
-		config.set_backend(Some(polkavm::BackendKind::Interpreter));
-		config.set_cache_enabled(false);
-		#[cfg(feature = "std")]
-		if std::env::var_os("REVIVE_USE_COMPILER").is_some() {
-			log::warn!(target: LOG_TARGET, "Using PolkaVM compiler backend because env var REVIVE_USE_COMPILER is set");
-			config.set_backend(Some(polkavm::BackendKind::Compiler));
-		}
-		let engine = polkavm::Engine::new(&config).expect(
-			"on-chain (no_std) use of interpreter is hard coded.
-				interpreter is available on all platforms; qed",
-		);
-
-		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);
-		module_config.set_aux_data_size(aux_data_size);
-		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:?}");
-			Error::<T>::CodeRejected
-		})?;
-
-		let entry_program_counter = module
-			.exports()
-			.find(|export| export.symbol().as_bytes() == entry_point.identifier().as_bytes())
-			.ok_or_else(|| <Error<T>>::CodeRejected)?
-			.program_counter();
-
-		let gas_limit_polkavm: polkavm::Gas = runtime.ext().gas_meter_mut().engine_fuel_left()?;
-
-		let mut instance = module.instantiate().map_err(|err| {
-			log::debug!(target: LOG_TARGET, "failed to instantiate polkavm module: {err:?}");
-			Error::<T>::CodeRejected
-		})?;
-
-		instance.set_gas(gas_limit_polkavm);
-		instance.prepare_call_untyped(entry_program_counter, &[]);
-
-		Ok(PreparedCall { module, instance, runtime })
-	}
-}
-
 impl<T: Config> Executable<T> for ContractBlob<T>
 where
 	BalanceOf<T>: Into<U256> + TryFrom<U256>,
@@ -429,7 +273,8 @@ where
 		input_data: Vec<u8>,
 	) -> ExecResult {
 		if self.is_pvm() {
-			let prepared_call = self.prepare_call(Runtime::new(ext, input_data), function, 0)?;
+			let prepared_call =
+				self.prepare_call(pvm::Runtime::new(ext, input_data), function, 0)?;
 			prepared_call.call()
 		} else {
 			use crate::vm::evm::EVMInputs;
diff --git a/substrate/frame/revive/src/vm/pvm.rs b/substrate/frame/revive/src/vm/pvm.rs
new file mode 100644
index 000000000000..8b00251cf0d4
--- /dev/null
+++ b/substrate/frame/revive/src/vm/pvm.rs
@@ -0,0 +1,929 @@
+// 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.
+
+//! Environment definition of the vm smart-contract runtime.
+
+pub mod env;
+
+#[cfg(doc)]
+pub use env::SyscallDoc;
+
+use crate::{
+	BalanceOf, Config, Error, LOG_TARGET, Pallet, RuntimeCosts, SENTINEL,
+	evm::runtime::GAS_PRICE,
+	exec::{ExecError, ExecResult, Ext, Key},
+	gas::ChargedAmount,
+	limits,
+	precompiles::{All as AllPrecompiles, Precompiles},
+	primitives::ExecReturnValue,
+};
+use alloc::{vec, vec::Vec};
+use codec::Encode;
+use core::{fmt, marker::PhantomData, mem};
+use frame_support::{ensure, weights::Weight};
+use pallet_revive_uapi::{CallFlags, ReturnErrorCode, ReturnFlags, StorageFlags};
+use sp_core::{H160, H256, U256};
+use sp_runtime::{DispatchError, RuntimeDebug};
+
+/// Abstraction over the memory access within syscalls.
+///
+/// The reason for this abstraction is that we run syscalls on the host machine when
+/// benchmarking them. In that case we have direct access to the contract's memory. However, when
+/// running within PolkaVM we need to resort to copying as we can't map the contracts memory into
+/// the host (as of now).
+pub trait Memory<T: Config> {
+	/// Read designated chunk from the sandbox memory into the supplied buffer.
+	///
+	/// Returns `Err` if one of the following conditions occurs:
+	///
+	/// - requested buffer is not within the bounds of the sandbox memory.
+	fn read_into_buf(&self, ptr: u32, buf: &mut [u8]) -> Result<(), DispatchError>;
+
+	/// Write the given buffer to the designated location in the sandbox memory.
+	///
+	/// Returns `Err` if one of the following conditions occurs:
+	///
+	/// - designated area is not within the bounds of the sandbox memory.
+	fn write(&mut self, ptr: u32, buf: &[u8]) -> Result<(), DispatchError>;
+
+	/// Zero the designated location in the sandbox memory.
+	///
+	/// Returns `Err` if one of the following conditions occurs:
+	///
+	/// - designated area is not within the bounds of the sandbox memory.
+	fn zero(&mut self, ptr: u32, len: u32) -> Result<(), DispatchError>;
+
+	/// Read designated chunk from the sandbox memory.
+	///
+	/// Returns `Err` if one of the following conditions occurs:
+	///
+	/// - requested buffer is not within the bounds of the sandbox memory.
+	fn read(&self, ptr: u32, len: u32) -> Result<Vec<u8>, DispatchError> {
+		let mut buf = vec![0u8; len as usize];
+		self.read_into_buf(ptr, buf.as_mut_slice())?;
+		Ok(buf)
+	}
+
+	/// Same as `read` but reads into a fixed size buffer.
+	fn read_array<const N: usize>(&self, ptr: u32) -> Result<[u8; N], DispatchError> {
+		let mut buf = [0u8; N];
+		self.read_into_buf(ptr, &mut buf)?;
+		Ok(buf)
+	}
+
+	/// Read a `u32` from the sandbox memory.
+	fn read_u32(&self, ptr: u32) -> Result<u32, DispatchError> {
+		let buf: [u8; 4] = self.read_array(ptr)?;
+		Ok(u32::from_le_bytes(buf))
+	}
+
+	/// Read a `U256` from the sandbox memory.
+	fn read_u256(&self, ptr: u32) -> Result<U256, DispatchError> {
+		let buf: [u8; 32] = self.read_array(ptr)?;
+		Ok(U256::from_little_endian(&buf))
+	}
+
+	/// Read a `H160` from the sandbox memory.
+	fn read_h160(&self, ptr: u32) -> Result<H160, DispatchError> {
+		let mut buf = H160::default();
+		self.read_into_buf(ptr, buf.as_bytes_mut())?;
+		Ok(buf)
+	}
+
+	/// Read a `H256` from the sandbox memory.
+	fn read_h256(&self, ptr: u32) -> Result<H256, DispatchError> {
+		let mut code_hash = H256::default();
+		self.read_into_buf(ptr, code_hash.as_bytes_mut())?;
+		Ok(code_hash)
+	}
+}
+
+/// Allows syscalls access to the PolkaVM instance they are executing in.
+///
+/// In case a contract is executing within PolkaVM its `memory` argument will also implement
+/// this trait. The benchmarking implementation of syscalls will only require `Memory`
+/// to be implemented.
+pub trait PolkaVmInstance<T: Config>: Memory<T> {
+	fn gas(&self) -> polkavm::Gas;
+	fn set_gas(&mut self, gas: polkavm::Gas);
+	fn read_input_regs(&self) -> (u64, u64, u64, u64, u64, u64);
+	fn write_output(&mut self, output: u64);
+}
+
+// Memory implementation used in benchmarking where guest memory is mapped into the host.
+//
+// Please note that we could optimize the `read_as_*` functions by decoding directly from
+// memory without a copy. However, we don't do that because as it would change the behaviour
+// of those functions: A `read_as` with a `len` larger than the actual type can succeed
+// in the streaming implementation while it could fail with a segfault in the copy implementation.
+#[cfg(feature = "runtime-benchmarks")]
+impl<T: Config> Memory<T> for [u8] {
+	fn read_into_buf(&self, ptr: u32, buf: &mut [u8]) -> Result<(), DispatchError> {
+		let ptr = ptr as usize;
+		let bound_checked =
+			self.get(ptr..ptr + buf.len()).ok_or_else(|| Error::<T>::OutOfBounds)?;
+		buf.copy_from_slice(bound_checked);
+		Ok(())
+	}
+
+	fn write(&mut self, ptr: u32, buf: &[u8]) -> Result<(), DispatchError> {
+		let ptr = ptr as usize;
+		let bound_checked =
+			self.get_mut(ptr..ptr + buf.len()).ok_or_else(|| Error::<T>::OutOfBounds)?;
+		bound_checked.copy_from_slice(buf);
+		Ok(())
+	}
+
+	fn zero(&mut self, ptr: u32, len: u32) -> Result<(), DispatchError> {
+		<[u8] as Memory<T>>::write(self, ptr, &vec![0; len as usize])
+	}
+}
+
+impl<T: Config> Memory<T> for polkavm::RawInstance {
+	fn read_into_buf(&self, ptr: u32, buf: &mut [u8]) -> Result<(), DispatchError> {
+		self.read_memory_into(ptr, buf)
+			.map(|_| ())
+			.map_err(|_| Error::<T>::OutOfBounds.into())
+	}
+
+	fn write(&mut self, ptr: u32, buf: &[u8]) -> Result<(), DispatchError> {
+		self.write_memory(ptr, buf).map_err(|_| Error::<T>::OutOfBounds.into())
+	}
+
+	fn zero(&mut self, ptr: u32, len: u32) -> Result<(), DispatchError> {
+		self.zero_memory(ptr, len).map_err(|_| Error::<T>::OutOfBounds.into())
+	}
+}
+
+impl<T: Config> PolkaVmInstance<T> for polkavm::RawInstance {
+	fn gas(&self) -> polkavm::Gas {
+		self.gas()
+	}
+
+	fn set_gas(&mut self, gas: polkavm::Gas) {
+		self.set_gas(gas)
+	}
+
+	fn read_input_regs(&self) -> (u64, u64, u64, u64, u64, u64) {
+		(
+			self.reg(polkavm::Reg::A0),
+			self.reg(polkavm::Reg::A1),
+			self.reg(polkavm::Reg::A2),
+			self.reg(polkavm::Reg::A3),
+			self.reg(polkavm::Reg::A4),
+			self.reg(polkavm::Reg::A5),
+		)
+	}
+
+	fn write_output(&mut self, output: u64) {
+		self.set_reg(polkavm::Reg::A0, output);
+	}
+}
+
+impl From<&ExecReturnValue> for ReturnErrorCode {
+	fn from(from: &ExecReturnValue) -> Self {
+		if from.flags.contains(ReturnFlags::REVERT) { Self::CalleeReverted } else { Self::Success }
+	}
+}
+
+/// The data passed through when a contract uses `seal_return`.
+#[derive(RuntimeDebug)]
+pub struct ReturnData {
+	/// The flags as passed through by the contract. They are still unchecked and
+	/// will later be parsed into a `ReturnFlags` bitflags struct.
+	flags: u32,
+	/// The output buffer passed by the contract as return data.
+	data: Vec<u8>,
+}
+
+/// Enumerates all possible reasons why a trap was generated.
+///
+/// This is either used to supply the caller with more information about why an error
+/// occurred (the SupervisorError variant).
+/// The other case is where the trap does not constitute an error but rather was invoked
+/// as a quick way to terminate the application (all other variants).
+#[derive(RuntimeDebug)]
+pub enum TrapReason {
+	/// The supervisor trapped the contract because of an error condition occurred during
+	/// execution in privileged code.
+	SupervisorError(DispatchError),
+	/// Signals that trap was generated in response to call `seal_return` host function.
+	Return(ReturnData),
+	/// Signals that a trap was generated in response to a successful call to the
+	/// `seal_terminate` host function.
+	Termination,
+}
+
+impl<T: Into<DispatchError>> From<T> for TrapReason {
+	fn from(from: T) -> Self {
+		Self::SupervisorError(from.into())
+	}
+}
+
+impl fmt::Display for TrapReason {
+	fn fmt(&self, _f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
+		Ok(())
+	}
+}
+
+/// Same as [`Runtime::charge_gas`].
+///
+/// We need this access as a macro because sometimes hiding the lifetimes behind
+/// a function won't work out.
+macro_rules! charge_gas {
+	($runtime:expr, $costs:expr) => {{ $runtime.ext.gas_meter_mut().charge($costs) }};
+}
+
+/// The kind of call that should be performed.
+enum CallType {
+	/// Execute another instantiated contract
+	Call { value_ptr: u32 },
+	/// Execute another contract code in the context (storage, account ID, value) of the caller
+	/// contract
+	DelegateCall,
+}
+
+impl CallType {
+	fn cost(&self) -> RuntimeCosts {
+		match self {
+			CallType::Call { .. } => RuntimeCosts::CallBase,
+			CallType::DelegateCall => RuntimeCosts::DelegateCallBase,
+		}
+	}
+}
+
+/// This is only appropriate when writing out data of constant size that does not depend on user
+/// input. In this case the costs for this copy was already charged as part of the token at
+/// the beginning of the API entry point.
+fn already_charged(_: u32) -> Option<RuntimeCosts> {
+	None
+}
+
+/// Helper to extract two `u32` values from a given `u64` register.
+fn extract_hi_lo(reg: u64) -> (u32, u32) {
+	((reg >> 32) as u32, reg as u32)
+}
+
+/// Provides storage variants to support standard and Etheruem compatible semantics.
+enum StorageValue {
+	/// Indicates that the storage value should be read from a memory buffer.
+	/// - `ptr`: A pointer to the start of the data in sandbox memory.
+	/// - `len`: The length (in bytes) of the data.
+	Memory { ptr: u32, len: u32 },
+
+	/// Indicates that the storage value is provided inline as a fixed-size (256-bit) value.
+	/// This is used by set_storage_or_clear() to avoid double reads.
+	/// This variant is used to implement Ethereum SSTORE-like semantics.
+	Value(Vec<u8>),
+}
+
+/// Controls the output behavior for storage reads, both when a key is found and when it is not.
+enum StorageReadMode {
+	/// VariableOutput mode: if the key exists, the full stored value is returned
+	/// using the caller‑provided output length.
+	VariableOutput { output_len_ptr: u32 },
+	/// Ethereum compatible(FixedOutput32) mode: always write a 32-byte value into the output
+	/// buffer. If the key is missing, write 32 bytes of zeros.
+	FixedOutput32,
+}
+
+/// Can only be used for one call.
+pub struct Runtime<'a, E: Ext, M: ?Sized> {
+	ext: &'a mut E,
+	input_data: Option<Vec<u8>>,
+	_phantom_data: PhantomData<M>,
+}
+
+impl<'a, E: Ext, M: ?Sized + Memory<E::T>> Runtime<'a, E, M> {
+	pub fn new(ext: &'a mut E, input_data: Vec<u8>) -> Self {
+		Self { ext, input_data: Some(input_data), _phantom_data: Default::default() }
+	}
+
+	/// Get a mutable reference to the inner `Ext`.
+	pub fn ext(&mut self) -> &mut E {
+		self.ext
+	}
+
+	/// Charge the gas meter with the specified token.
+	///
+	/// Returns `Err(HostError)` if there is not enough gas.
+	fn charge_gas(&mut self, costs: RuntimeCosts) -> Result<ChargedAmount, DispatchError> {
+		charge_gas!(self, costs)
+	}
+
+	/// Adjust a previously charged amount down to its actual amount.
+	///
+	/// This is when a maximum a priori amount was charged and then should be partially
+	/// refunded to match the actual amount.
+	fn adjust_gas(&mut self, charged: ChargedAmount, actual_costs: RuntimeCosts) {
+		self.ext.gas_meter_mut().adjust_gas(charged, actual_costs);
+	}
+
+	/// Write the given buffer and its length to the designated locations in sandbox memory and
+	/// charge gas according to the token returned by `create_token`.
+	///
+	/// `out_ptr` is the location in sandbox memory where `buf` should be written to.
+	/// `out_len_ptr` is an in-out location in sandbox memory. It is read to determine the
+	/// length of the buffer located at `out_ptr`. If that buffer is smaller than the actual
+	/// `buf.len()`, only what fits into that buffer is written to `out_ptr`.
+	/// The actual amount of bytes copied to `out_ptr` is written to `out_len_ptr`.
+	///
+	/// If `out_ptr` is set to the sentinel value of `SENTINEL` and `allow_skip` is true the
+	/// operation is skipped and `Ok` is returned. This is supposed to help callers to make copying
+	/// output optional. For example to skip copying back the output buffer of an `seal_call`
+	/// when the caller is not interested in the result.
+	///
+	/// `create_token` can optionally instruct this function to charge the gas meter with the token
+	/// it returns. `create_token` receives the variable amount of bytes that are about to be copied
+	/// by this function.
+	///
+	/// In addition to the error conditions of `Memory::write` this functions returns
+	/// `Err` if the size of the buffer located at `out_ptr` is too small to fit `buf`.
+	pub fn write_sandbox_output(
+		&mut self,
+		memory: &mut M,
+		out_ptr: u32,
+		out_len_ptr: u32,
+		buf: &[u8],
+		allow_skip: bool,
+		create_token: impl FnOnce(u32) -> Option<RuntimeCosts>,
+	) -> Result<(), DispatchError> {
+		if allow_skip && out_ptr == SENTINEL {
+			return Ok(());
+		}
+
+		let len = memory.read_u32(out_len_ptr)?;
+		let buf_len = len.min(buf.len() as u32);
+
+		if let Some(costs) = create_token(buf_len) {
+			self.charge_gas(costs)?;
+		}
+
+		memory.write(out_ptr, &buf[..buf_len as usize])?;
+		memory.write(out_len_ptr, &buf_len.encode())
+	}
+
+	/// Same as `write_sandbox_output` but for static size output.
+	pub fn write_fixed_sandbox_output(
+		&mut self,
+		memory: &mut M,
+		out_ptr: u32,
+		buf: &[u8],
+		allow_skip: bool,
+		create_token: impl FnOnce(u32) -> Option<RuntimeCosts>,
+	) -> Result<(), DispatchError> {
+		if buf.is_empty() || (allow_skip && out_ptr == SENTINEL) {
+			return Ok(());
+		}
+
+		let buf_len = buf.len() as u32;
+		if let Some(costs) = create_token(buf_len) {
+			self.charge_gas(costs)?;
+		}
+
+		memory.write(out_ptr, buf)
+	}
+
+	/// Computes the given hash function on the supplied input.
+	///
+	/// Reads from the sandboxed input buffer into an intermediate buffer.
+	/// Returns the result directly to the output buffer of the sandboxed memory.
+	///
+	/// It is the callers responsibility to provide an output buffer that
+	/// is large enough to hold the expected amount of bytes returned by the
+	/// chosen hash function.
+	///
+	/// # Note
+	///
+	/// The `input` and `output` buffers may overlap.
+	fn compute_hash_on_intermediate_buffer<F, R>(
+		&self,
+		memory: &mut M,
+		hash_fn: F,
+		input_ptr: u32,
+		input_len: u32,
+		output_ptr: u32,
+	) -> Result<(), DispatchError>
+	where
+		F: FnOnce(&[u8]) -> R,
+		R: AsRef<[u8]>,
+	{
+		// Copy input into supervisor memory.
+		let input = memory.read(input_ptr, input_len)?;
+		// Compute the hash on the input buffer using the given hash function.
+		let hash = hash_fn(&input);
+		// Write the resulting hash back into the sandboxed output buffer.
+		memory.write(output_ptr, hash.as_ref())?;
+		Ok(())
+	}
+
+	/// Fallible conversion of a `ExecError` to `ReturnErrorCode`.
+	///
+	/// This is used when converting the error returned from a subcall in order to decide
+	/// whether to trap the caller or allow handling of the error.
+	fn exec_error_into_return_code(from: ExecError) -> Result<ReturnErrorCode, DispatchError> {
+		use crate::exec::ErrorOrigin::Callee;
+		use ReturnErrorCode::*;
+
+		let transfer_failed = Error::<E::T>::TransferFailed.into();
+		let out_of_gas = Error::<E::T>::OutOfGas.into();
+		let out_of_deposit = Error::<E::T>::StorageDepositLimitExhausted.into();
+		let duplicate_contract = Error::<E::T>::DuplicateContract.into();
+		let unsupported_precompile = Error::<E::T>::UnsupportedPrecompileAddress.into();
+
+		// errors in the callee do not trap the caller
+		match (from.error, from.origin) {
+			(err, _) if err == transfer_failed => Ok(TransferFailed),
+			(err, _) if err == duplicate_contract => Ok(DuplicateContractAddress),
+			(err, _) if err == unsupported_precompile => Err(err),
+			(err, Callee) if err == out_of_gas || err == out_of_deposit => Ok(OutOfResources),
+			(_, Callee) => Ok(CalleeTrapped),
+			(err, _) => Err(err),
+		}
+	}
+
+	fn decode_key(&self, memory: &M, key_ptr: u32, key_len: u32) -> Result<Key, TrapReason> {
+		let res = match key_len {
+			SENTINEL => {
+				let mut buffer = [0u8; 32];
+				memory.read_into_buf(key_ptr, buffer.as_mut())?;
+				Ok(Key::from_fixed(buffer))
+			},
+			len => {
+				ensure!(len <= limits::STORAGE_KEY_BYTES, Error::<E::T>::DecodingFailed);
+				let key = memory.read(key_ptr, len)?;
+				Key::try_from_var(key)
+			},
+		};
+
+		res.map_err(|_| Error::<E::T>::DecodingFailed.into())
+	}
+
+	fn is_transient(flags: u32) -> Result<bool, TrapReason> {
+		StorageFlags::from_bits(flags)
+			.ok_or_else(|| <Error<E::T>>::InvalidStorageFlags.into())
+			.map(|flags| flags.contains(StorageFlags::TRANSIENT))
+	}
+
+	fn set_storage(
+		&mut self,
+		memory: &M,
+		flags: u32,
+		key_ptr: u32,
+		key_len: u32,
+		value: StorageValue,
+	) -> Result<u32, TrapReason> {
+		let transient = Self::is_transient(flags)?;
+		let costs = |new_bytes: u32, old_bytes: u32| {
+			if transient {
+				RuntimeCosts::SetTransientStorage { new_bytes, old_bytes }
+			} else {
+				RuntimeCosts::SetStorage { new_bytes, old_bytes }
+			}
+		};
+
+		let value_len = match &value {
+			StorageValue::Memory { ptr: _, len } => *len,
+			StorageValue::Value(data) => data.len() as u32,
+		};
+
+		let max_size = self.ext.max_value_size();
+		let charged = self.charge_gas(costs(value_len, self.ext.max_value_size()))?;
+		if value_len > max_size {
+			return Err(Error::<E::T>::ValueTooLarge.into());
+		}
+
+		let key = self.decode_key(memory, key_ptr, key_len)?;
+
+		let value = match value {
+			StorageValue::Memory { ptr, len } => Some(memory.read(ptr, len)?),
+			StorageValue::Value(data) => Some(data),
+		};
+
+		let write_outcome = if transient {
+			self.ext.set_transient_storage(&key, value, false)?
+		} else {
+			self.ext.set_storage(&key, value, false)?
+		};
+
+		self.adjust_gas(charged, costs(value_len, write_outcome.old_len()));
+		Ok(write_outcome.old_len_with_sentinel())
+	}
+
+	fn clear_storage(
+		&mut self,
+		memory: &M,
+		flags: u32,
+		key_ptr: u32,
+		key_len: u32,
+	) -> Result<u32, TrapReason> {
+		let transient = Self::is_transient(flags)?;
+		let costs = |len| {
+			if transient {
+				RuntimeCosts::ClearTransientStorage(len)
+			} else {
+				RuntimeCosts::ClearStorage(len)
+			}
+		};
+		let charged = self.charge_gas(costs(self.ext.max_value_size()))?;
+		let key = self.decode_key(memory, key_ptr, key_len)?;
+		let outcome = if transient {
+			self.ext.set_transient_storage(&key, None, false)?
+		} else {
+			self.ext.set_storage(&key, None, false)?
+		};
+		self.adjust_gas(charged, costs(outcome.old_len()));
+		Ok(outcome.old_len_with_sentinel())
+	}
+
+	fn get_storage(
+		&mut self,
+		memory: &mut M,
+		flags: u32,
+		key_ptr: u32,
+		key_len: u32,
+		out_ptr: u32,
+		read_mode: StorageReadMode,
+	) -> Result<ReturnErrorCode, TrapReason> {
+		let transient = Self::is_transient(flags)?;
+		let costs = |len| {
+			if transient {
+				RuntimeCosts::GetTransientStorage(len)
+			} else {
+				RuntimeCosts::GetStorage(len)
+			}
+		};
+		let charged = self.charge_gas(costs(self.ext.max_value_size()))?;
+		let key = self.decode_key(memory, key_ptr, key_len)?;
+		let outcome = if transient {
+			self.ext.get_transient_storage(&key)
+		} else {
+			self.ext.get_storage(&key)
+		};
+
+		if let Some(value) = outcome {
+			self.adjust_gas(charged, costs(value.len() as u32));
+
+			match read_mode {
+				StorageReadMode::FixedOutput32 => {
+					let mut fixed_output = [0u8; 32];
+					let len = value.len().min(fixed_output.len());
+					fixed_output[..len].copy_from_slice(&value[..len]);
+
+					self.write_fixed_sandbox_output(
+						memory,
+						out_ptr,
+						&fixed_output,
+						false,
+						already_charged,
+					)?;
+					Ok(ReturnErrorCode::Success)
+				},
+				StorageReadMode::VariableOutput { output_len_ptr: out_len_ptr } => {
+					self.write_sandbox_output(
+						memory,
+						out_ptr,
+						out_len_ptr,
+						&value,
+						false,
+						already_charged,
+					)?;
+					Ok(ReturnErrorCode::Success)
+				},
+			}
+		} else {
+			self.adjust_gas(charged, costs(0));
+
+			match read_mode {
+				StorageReadMode::FixedOutput32 => {
+					self.write_fixed_sandbox_output(
+						memory,
+						out_ptr,
+						&[0u8; 32],
+						false,
+						already_charged,
+					)?;
+					Ok(ReturnErrorCode::Success)
+				},
+				StorageReadMode::VariableOutput { .. } => Ok(ReturnErrorCode::KeyNotFound),
+			}
+		}
+	}
+
+	fn contains_storage(
+		&mut self,
+		memory: &M,
+		flags: u32,
+		key_ptr: u32,
+		key_len: u32,
+	) -> Result<u32, TrapReason> {
+		let transient = Self::is_transient(flags)?;
+		let costs = |len| {
+			if transient {
+				RuntimeCosts::ContainsTransientStorage(len)
+			} else {
+				RuntimeCosts::ContainsStorage(len)
+			}
+		};
+		let charged = self.charge_gas(costs(self.ext.max_value_size()))?;
+		let key = self.decode_key(memory, key_ptr, key_len)?;
+		let outcome = if transient {
+			self.ext.get_transient_storage_size(&key)
+		} else {
+			self.ext.get_storage_size(&key)
+		};
+		self.adjust_gas(charged, costs(outcome.unwrap_or(0)));
+		Ok(outcome.unwrap_or(SENTINEL))
+	}
+
+	fn take_storage(
+		&mut self,
+		memory: &mut M,
+		flags: u32,
+		key_ptr: u32,
+		key_len: u32,
+		out_ptr: u32,
+		out_len_ptr: u32,
+	) -> Result<ReturnErrorCode, TrapReason> {
+		let transient = Self::is_transient(flags)?;
+		let costs = |len| {
+			if transient {
+				RuntimeCosts::TakeTransientStorage(len)
+			} else {
+				RuntimeCosts::TakeStorage(len)
+			}
+		};
+		let charged = self.charge_gas(costs(self.ext.max_value_size()))?;
+		let key = self.decode_key(memory, key_ptr, key_len)?;
+		let outcome = if transient {
+			self.ext.set_transient_storage(&key, None, true)?
+		} else {
+			self.ext.set_storage(&key, None, true)?
+		};
+
+		if let crate::storage::WriteOutcome::Taken(value) = outcome {
+			self.adjust_gas(charged, costs(value.len() as u32));
+			self.write_sandbox_output(
+				memory,
+				out_ptr,
+				out_len_ptr,
+				&value,
+				false,
+				already_charged,
+			)?;
+			Ok(ReturnErrorCode::Success)
+		} else {
+			self.adjust_gas(charged, costs(0));
+			Ok(ReturnErrorCode::KeyNotFound)
+		}
+	}
+
+	fn call(
+		&mut self,
+		memory: &mut M,
+		flags: CallFlags,
+		call_type: CallType,
+		callee_ptr: u32,
+		deposit_ptr: u32,
+		weight: Weight,
+		input_data_ptr: u32,
+		input_data_len: u32,
+		output_ptr: u32,
+		output_len_ptr: u32,
+	) -> Result<ReturnErrorCode, TrapReason> {
+		let callee = memory.read_h160(callee_ptr)?;
+		let precompile = <AllPrecompiles<E::T>>::get::<E>(&callee.as_fixed_bytes());
+		match &precompile {
+			Some(precompile) if precompile.has_contract_info() =>
+				self.charge_gas(RuntimeCosts::PrecompileWithInfoBase)?,
+			Some(_) => self.charge_gas(RuntimeCosts::PrecompileBase)?,
+			None => self.charge_gas(call_type.cost())?,
+		};
+
+		let deposit_limit = memory.read_u256(deposit_ptr)?;
+
+		let input_data = if flags.contains(CallFlags::CLONE_INPUT) {
+			let input = self.input_data.as_ref().ok_or(Error::<E::T>::InputForwarded)?;
+			charge_gas!(self, RuntimeCosts::CallInputCloned(input.len() as u32))?;
+			input.clone()
+		} else if flags.contains(CallFlags::FORWARD_INPUT) {
+			self.input_data.take().ok_or(Error::<E::T>::InputForwarded)?
+		} else {
+			if precompile.is_some() {
+				self.charge_gas(RuntimeCosts::PrecompileDecode(input_data_len))?;
+			} else {
+				self.charge_gas(RuntimeCosts::CopyFromContract(input_data_len))?;
+			}
+			memory.read(input_data_ptr, input_data_len)?
+		};
+
+		let call_outcome = match call_type {
+			CallType::Call { value_ptr } => {
+				let read_only = flags.contains(CallFlags::READ_ONLY);
+				let value = memory.read_u256(value_ptr)?;
+				if value > 0u32.into() {
+					// If the call value is non-zero and state change is not allowed, issue an
+					// error.
+					if read_only || self.ext.is_read_only() {
+						return Err(Error::<E::T>::StateChangeDenied.into());
+					}
+
+					self.charge_gas(RuntimeCosts::CallTransferSurcharge {
+						dust_transfer: Pallet::<E::T>::has_dust(value),
+					})?;
+				}
+				self.ext.call(
+					weight,
+					deposit_limit,
+					&callee,
+					value,
+					input_data,
+					flags.contains(CallFlags::ALLOW_REENTRY),
+					read_only,
+				)
+			},
+			CallType::DelegateCall => {
+				if flags.intersects(CallFlags::ALLOW_REENTRY | CallFlags::READ_ONLY) {
+					return Err(Error::<E::T>::InvalidCallFlags.into());
+				}
+				self.ext.delegate_call(weight, deposit_limit, callee, input_data)
+			},
+		};
+
+		match call_outcome {
+			// `TAIL_CALL` only matters on an `OK` result. Otherwise the call stack comes to
+			// a halt anyways without anymore code being executed.
+			Ok(_) if flags.contains(CallFlags::TAIL_CALL) => {
+				let output = mem::take(self.ext.last_frame_output_mut());
+				return Err(TrapReason::Return(ReturnData {
+					flags: output.flags.bits(),
+					data: output.data,
+				}));
+			},
+			Ok(_) => {
+				let output = mem::take(self.ext.last_frame_output_mut());
+				let write_result = self.write_sandbox_output(
+					memory,
+					output_ptr,
+					output_len_ptr,
+					&output.data,
+					true,
+					|len| Some(RuntimeCosts::CopyToContract(len)),
+				);
+				*self.ext.last_frame_output_mut() = output;
+				write_result?;
+				Ok(self.ext.last_frame_output().into())
+			},
+			Err(err) => {
+				let error_code = Self::exec_error_into_return_code(err)?;
+				memory.write(output_len_ptr, &0u32.to_le_bytes())?;
+				Ok(error_code)
+			},
+		}
+	}
+
+	fn instantiate(
+		&mut self,
+		memory: &mut M,
+		code_hash_ptr: u32,
+		weight: Weight,
+		deposit_ptr: u32,
+		value_ptr: u32,
+		input_data_ptr: u32,
+		input_data_len: u32,
+		address_ptr: u32,
+		output_ptr: u32,
+		output_len_ptr: u32,
+		salt_ptr: u32,
+	) -> Result<ReturnErrorCode, TrapReason> {
+		let value = match memory.read_u256(value_ptr) {
+			Ok(value) => {
+				self.charge_gas(RuntimeCosts::Instantiate {
+					input_data_len,
+					balance_transfer: Pallet::<E::T>::has_balance(value),
+					dust_transfer: Pallet::<E::T>::has_dust(value),
+				})?;
+				value
+			},
+			Err(err) => {
+				self.charge_gas(RuntimeCosts::Instantiate {
+					input_data_len: 0,
+					balance_transfer: false,
+					dust_transfer: false,
+				})?;
+				return Err(err.into());
+			},
+		};
+		let deposit_limit: U256 = memory.read_u256(deposit_ptr)?;
+		let code_hash = memory.read_h256(code_hash_ptr)?;
+		let input_data = memory.read(input_data_ptr, input_data_len)?;
+		let salt = if salt_ptr == SENTINEL {
+			None
+		} else {
+			let salt: [u8; 32] = memory.read_array(salt_ptr)?;
+			Some(salt)
+		};
+
+		match self.ext.instantiate(
+			weight,
+			deposit_limit,
+			code_hash,
+			value,
+			input_data,
+			salt.as_ref(),
+		) {
+			Ok(address) => {
+				if !self.ext.last_frame_output().flags.contains(ReturnFlags::REVERT) {
+					self.write_fixed_sandbox_output(
+						memory,
+						address_ptr,
+						&address.as_bytes(),
+						true,
+						already_charged,
+					)?;
+				}
+				let output = mem::take(self.ext.last_frame_output_mut());
+				let write_result = self.write_sandbox_output(
+					memory,
+					output_ptr,
+					output_len_ptr,
+					&output.data,
+					true,
+					|len| Some(RuntimeCosts::CopyToContract(len)),
+				);
+				*self.ext.last_frame_output_mut() = output;
+				write_result?;
+				Ok(self.ext.last_frame_output().into())
+			},
+			Err(err) => Ok(Self::exec_error_into_return_code(err)?),
+		}
+	}
+}
+
+pub struct PreparedCall<'a, E: Ext> {
+	module: polkavm::Module,
+	instance: polkavm::RawInstance,
+	runtime: Runtime<'a, E, polkavm::RawInstance>,
+}
+
+impl<'a, E: Ext> PreparedCall<'a, E>
+where
+	BalanceOf<E::T>: Into<U256>,
+	BalanceOf<E::T>: TryFrom<U256>,
+{
+	pub fn call(mut self) -> ExecResult {
+		let exec_result = loop {
+			let interrupt = self.instance.run();
+			if let Some(exec_result) =
+				self.runtime.handle_interrupt(interrupt, &self.module, &mut self.instance)
+			{
+				break exec_result
+			}
+		};
+		let _ = self.runtime.ext().gas_meter_mut().sync_from_executor(self.instance.gas())?;
+		exec_result
+	}
+
+	/// The guest memory address at which the aux data is located.
+	#[cfg(feature = "runtime-benchmarks")]
+	pub fn aux_data_base(&self) -> u32 {
+		self.instance.module().memory_map().aux_data_address()
+	}
+
+	/// Copies `data` to the aux data at address `offset`.
+	///
+	/// It sets `a0` to the beginning of data inside the aux data.
+	/// It sets `a1` to the value passed.
+	///
+	/// Only used in benchmarking so far.
+	#[cfg(feature = "runtime-benchmarks")]
+	pub fn setup_aux_data(
+		&mut self,
+		data: &[u8],
+		offset: u32,
+		a1: u64,
+	) -> frame_support::dispatch::DispatchResult {
+		let a0 = self.aux_data_base().saturating_add(offset);
+		self.instance.write_memory(a0, data).map_err(|err| {
+			log::debug!(target: LOG_TARGET, "failed to write aux data: {err:?}");
+			Error::<E::T>::CodeRejected
+		})?;
+		self.instance.set_reg(polkavm::Reg::A0, a0.into());
+		self.instance.set_reg(polkavm::Reg::A1, a1);
+		Ok(())
+	}
+}
diff --git a/substrate/frame/revive/src/vm/pvm/env.rs b/substrate/frame/revive/src/vm/pvm/env.rs
new file mode 100644
index 000000000000..4aa1bce26631
--- /dev/null
+++ b/substrate/frame/revive/src/vm/pvm/env.rs
@@ -0,0 +1,1060 @@
+use super::*;
+
+use crate::{
+	AccountIdOf, BalanceOf, CodeInfo, Config, ContractBlob, Error, SENTINEL, Weight,
+	address::AddressMapper,
+	exec::Ext,
+	limits,
+	primitives::ExecReturnValue,
+	storage::meter::Diff,
+	vm::{ExportedFunction, RuntimeCosts},
+};
+use alloc::vec::Vec;
+use codec::{Encode, MaxEncodedLen};
+use core::mem;
+use frame_support::traits::Get;
+use pallet_revive_proc_macro::define_env;
+use pallet_revive_uapi::{CallFlags, ReturnErrorCode, ReturnFlags};
+use sp_core::{H160, H256, U256};
+use sp_io::hashing::{blake2_128, blake2_256, keccak_256};
+use sp_runtime::DispatchError;
+
+impl<T: Config> ContractBlob<T> {
+	/// Compile and instantiate contract.
+	///
+	/// `aux_data_size` is only used for runtime benchmarks. Real contracts
+	/// don't make use of this buffer. Hence this should not be set to anything
+	/// other than `0` when not used for benchmarking.
+	pub fn prepare_call<E: Ext<T = T>>(
+		self,
+		mut runtime: Runtime<E, polkavm::RawInstance>,
+		entry_point: ExportedFunction,
+		aux_data_size: u32,
+	) -> Result<PreparedCall<E>, ExecError> {
+		let mut config = polkavm::Config::default();
+		config.set_backend(Some(polkavm::BackendKind::Interpreter));
+		config.set_cache_enabled(false);
+		#[cfg(feature = "std")]
+		if std::env::var_os("REVIVE_USE_COMPILER").is_some() {
+			log::warn!(target: LOG_TARGET, "Using PolkaVM compiler backend because env var REVIVE_USE_COMPILER is set");
+			config.set_backend(Some(polkavm::BackendKind::Compiler));
+		}
+		let engine = polkavm::Engine::new(&config).expect(
+			"on-chain (no_std) use of interpreter is hard coded.
+				interpreter is available on all platforms; qed",
+		);
+
+		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);
+		module_config.set_aux_data_size(aux_data_size);
+		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:?}");
+			Error::<T>::CodeRejected
+		})?;
+
+		let entry_program_counter = module
+			.exports()
+			.find(|export| export.symbol().as_bytes() == entry_point.identifier().as_bytes())
+			.ok_or_else(|| <Error<T>>::CodeRejected)?
+			.program_counter();
+
+		let gas_limit_polkavm: polkavm::Gas = runtime.ext().gas_meter_mut().engine_fuel_left()?;
+
+		let mut instance = module.instantiate().map_err(|err| {
+			log::debug!(target: LOG_TARGET, "failed to instantiate polkavm module: {err:?}");
+			Error::<T>::CodeRejected
+		})?;
+
+		instance.set_gas(gas_limit_polkavm);
+		instance.prepare_call_untyped(entry_program_counter, &[]);
+
+		Ok(PreparedCall { module, instance, runtime })
+	}
+}
+
+impl<T: Config> ContractBlob<T>
+where
+	BalanceOf<T>: Into<U256> + TryFrom<U256>,
+{
+	/// We only check for size and nothing else when the code is uploaded.
+	pub fn from_pvm_code(code: Vec<u8>, owner: AccountIdOf<T>) -> Result<Self, DispatchError> {
+		// We do validation only when new code is deployed. This allows us to increase
+		// the limits later without affecting already deployed code.
+		let available_syscalls = list_syscalls(T::UnsafeUnstableInterface::get());
+		let code = limits::code::enforce::<T>(code, available_syscalls)?;
+
+		let code_len = code.len() as u32;
+		let bytes_added = code_len.saturating_add(<CodeInfo<T>>::max_encoded_len() as u32);
+		let deposit = Diff { bytes_added, items_added: 2, ..Default::default() }
+			.update_contract::<T>(None)
+			.charge_or_zero();
+		let code_info = CodeInfo {
+			owner,
+			deposit,
+			refcount: 0,
+			code_len,
+			behaviour_version: Default::default(),
+		};
+		let code_hash = H256(sp_io::hashing::keccak_256(&code));
+		Ok(ContractBlob { code, code_info, code_hash })
+	}
+}
+
+impl<'a, E: Ext, M: PolkaVmInstance<E::T>> Runtime<'a, E, M> {
+	pub fn handle_interrupt(
+		&mut self,
+		interrupt: Result<polkavm::InterruptKind, polkavm::Error>,
+		module: &polkavm::Module,
+		instance: &mut M,
+	) -> Option<ExecResult> {
+		use polkavm::InterruptKind::*;
+
+		match interrupt {
+			Err(error) => {
+				// in contrast to the other returns this "should" not happen: log level error
+				log::error!(target: LOG_TARGET, "polkavm execution error: {error}");
+				Some(Err(Error::<E::T>::ExecutionFailed.into()))
+			},
+			Ok(Finished) =>
+				Some(Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: Vec::new() })),
+			Ok(Trap) => Some(Err(Error::<E::T>::ContractTrapped.into())),
+			Ok(Segfault(_)) => Some(Err(Error::<E::T>::ExecutionFailed.into())),
+			Ok(NotEnoughGas) => Some(Err(Error::<E::T>::OutOfGas.into())),
+			Ok(Step) => None,
+			Ok(Ecalli(idx)) => {
+				// This is a special hard coded syscall index which is used by benchmarks
+				// to abort contract execution. It is used to terminate the execution without
+				// breaking up a basic block. The fixed index is used so that the benchmarks
+				// don't have to deal with import tables.
+				if cfg!(feature = "runtime-benchmarks") && idx == SENTINEL {
+					return Some(Ok(ExecReturnValue {
+						flags: ReturnFlags::empty(),
+						data: Vec::new(),
+					}))
+				}
+				let Some(syscall_symbol) = module.imports().get(idx) else {
+					return Some(Err(<Error<E::T>>::InvalidSyscall.into()));
+				};
+				match self.handle_ecall(instance, syscall_symbol.as_bytes()) {
+					Ok(None) => None,
+					Ok(Some(return_value)) => {
+						instance.write_output(return_value);
+						None
+					},
+					Err(TrapReason::Return(ReturnData { flags, data })) =>
+						match ReturnFlags::from_bits(flags) {
+							None => Some(Err(Error::<E::T>::InvalidCallFlags.into())),
+							Some(flags) => Some(Ok(ExecReturnValue { flags, data })),
+						},
+					Err(TrapReason::Termination) => Some(Ok(Default::default())),
+					Err(TrapReason::SupervisorError(error)) => Some(Err(error.into())),
+				}
+			},
+		}
+	}
+}
+
+// This is the API exposed to contracts.
+//
+// # Note
+//
+// Any input that leads to a out of bound error (reading or writing) or failing to decode
+// data passed to the supervisor will lead to a trap. This is not documented explicitly
+// for every function.
+#[define_env]
+pub mod env {
+	/// Noop function used to benchmark the time it takes to execute an empty function.
+	///
+	/// Marked as stable because it needs to be called from benchmarks even when the benchmarked
+	/// parachain has unstable functions disabled.
+	#[cfg(feature = "runtime-benchmarks")]
+	#[stable]
+	fn noop(&mut self, memory: &mut M) -> Result<(), TrapReason> {
+		Ok(())
+	}
+
+	/// Set the value at the given key in the contract storage.
+	/// See [`pallet_revive_uapi::HostFn::set_storage_v2`]
+	#[stable]
+	#[mutating]
+	fn set_storage(
+		&mut self,
+		memory: &mut M,
+		flags: u32,
+		key_ptr: u32,
+		key_len: u32,
+		value_ptr: u32,
+		value_len: u32,
+	) -> Result<u32, TrapReason> {
+		self.set_storage(
+			memory,
+			flags,
+			key_ptr,
+			key_len,
+			StorageValue::Memory { ptr: value_ptr, len: value_len },
+		)
+	}
+
+	/// Sets the storage at a fixed 256-bit key with a fixed 256-bit value.
+	/// See [`pallet_revive_uapi::HostFn::set_storage_or_clear`].
+	#[stable]
+	#[mutating]
+	fn set_storage_or_clear(
+		&mut self,
+		memory: &mut M,
+		flags: u32,
+		key_ptr: u32,
+		value_ptr: u32,
+	) -> Result<u32, TrapReason> {
+		let value = memory.read(value_ptr, 32)?;
+
+		if value.iter().all(|&b| b == 0) {
+			self.clear_storage(memory, flags, key_ptr, SENTINEL)
+		} else {
+			self.set_storage(memory, flags, key_ptr, SENTINEL, StorageValue::Value(value))
+		}
+	}
+
+	/// Retrieve the value under the given key from storage.
+	/// See [`pallet_revive_uapi::HostFn::get_storage`]
+	#[stable]
+	fn get_storage(
+		&mut self,
+		memory: &mut M,
+		flags: u32,
+		key_ptr: u32,
+		key_len: u32,
+		out_ptr: u32,
+		out_len_ptr: u32,
+	) -> Result<ReturnErrorCode, TrapReason> {
+		self.get_storage(
+			memory,
+			flags,
+			key_ptr,
+			key_len,
+			out_ptr,
+			StorageReadMode::VariableOutput { output_len_ptr: out_len_ptr },
+		)
+	}
+
+	/// Reads the storage at a fixed 256-bit key and writes back a fixed 256-bit value.
+	/// See [`pallet_revive_uapi::HostFn::get_storage_or_zero`].
+	#[stable]
+	fn get_storage_or_zero(
+		&mut self,
+		memory: &mut M,
+		flags: u32,
+		key_ptr: u32,
+		out_ptr: u32,
+	) -> Result<(), TrapReason> {
+		let _ = self.get_storage(
+			memory,
+			flags,
+			key_ptr,
+			SENTINEL,
+			out_ptr,
+			StorageReadMode::FixedOutput32,
+		)?;
+
+		Ok(())
+	}
+
+	/// Make a call to another contract.
+	/// See [`pallet_revive_uapi::HostFn::call`].
+	#[stable]
+	fn call(
+		&mut self,
+		memory: &mut M,
+		flags_and_callee: u64,
+		ref_time_limit: u64,
+		proof_size_limit: u64,
+		deposit_and_value: u64,
+		input_data: u64,
+		output_data: u64,
+	) -> Result<ReturnErrorCode, TrapReason> {
+		let (flags, callee_ptr) = extract_hi_lo(flags_and_callee);
+		let (deposit_ptr, value_ptr) = extract_hi_lo(deposit_and_value);
+		let (input_data_len, input_data_ptr) = extract_hi_lo(input_data);
+		let (output_len_ptr, output_ptr) = extract_hi_lo(output_data);
+
+		self.call(
+			memory,
+			CallFlags::from_bits(flags).ok_or(Error::<E::T>::InvalidCallFlags)?,
+			CallType::Call { value_ptr },
+			callee_ptr,
+			deposit_ptr,
+			Weight::from_parts(ref_time_limit, proof_size_limit),
+			input_data_ptr,
+			input_data_len,
+			output_ptr,
+			output_len_ptr,
+		)
+	}
+
+	/// Execute code in the context (storage, caller, value) of the current contract.
+	/// See [`pallet_revive_uapi::HostFn::delegate_call`].
+	#[stable]
+	fn delegate_call(
+		&mut self,
+		memory: &mut M,
+		flags_and_callee: u64,
+		ref_time_limit: u64,
+		proof_size_limit: u64,
+		deposit_ptr: u32,
+		input_data: u64,
+		output_data: u64,
+	) -> Result<ReturnErrorCode, TrapReason> {
+		let (flags, address_ptr) = extract_hi_lo(flags_and_callee);
+		let (input_data_len, input_data_ptr) = extract_hi_lo(input_data);
+		let (output_len_ptr, output_ptr) = extract_hi_lo(output_data);
+
+		self.call(
+			memory,
+			CallFlags::from_bits(flags).ok_or(Error::<E::T>::InvalidCallFlags)?,
+			CallType::DelegateCall,
+			address_ptr,
+			deposit_ptr,
+			Weight::from_parts(ref_time_limit, proof_size_limit),
+			input_data_ptr,
+			input_data_len,
+			output_ptr,
+			output_len_ptr,
+		)
+	}
+
+	/// Instantiate a contract with the specified code hash.
+	/// See [`pallet_revive_uapi::HostFn::instantiate`].
+	#[stable]
+	#[mutating]
+	fn instantiate(
+		&mut self,
+		memory: &mut M,
+		ref_time_limit: u64,
+		proof_size_limit: u64,
+		deposit_and_value: u64,
+		input_data: u64,
+		output_data: u64,
+		address_and_salt: u64,
+	) -> Result<ReturnErrorCode, TrapReason> {
+		let (deposit_ptr, value_ptr) = extract_hi_lo(deposit_and_value);
+		let (input_data_len, code_hash_ptr) = extract_hi_lo(input_data);
+		let (output_len_ptr, output_ptr) = extract_hi_lo(output_data);
+		let (address_ptr, salt_ptr) = extract_hi_lo(address_and_salt);
+		let Some(input_data_ptr) = code_hash_ptr.checked_add(32) else {
+			return Err(Error::<E::T>::OutOfBounds.into());
+		};
+		let Some(input_data_len) = input_data_len.checked_sub(32) else {
+			return Err(Error::<E::T>::OutOfBounds.into());
+		};
+
+		self.instantiate(
+			memory,
+			code_hash_ptr,
+			Weight::from_parts(ref_time_limit, proof_size_limit),
+			deposit_ptr,
+			value_ptr,
+			input_data_ptr,
+			input_data_len,
+			address_ptr,
+			output_ptr,
+			output_len_ptr,
+			salt_ptr,
+		)
+	}
+
+	/// Returns the total size of the contract call input data.
+	/// See [`pallet_revive_uapi::HostFn::call_data_size `].
+	#[stable]
+	fn call_data_size(&mut self, memory: &mut M) -> Result<u64, TrapReason> {
+		self.charge_gas(RuntimeCosts::CallDataSize)?;
+		Ok(self
+			.input_data
+			.as_ref()
+			.map(|input| input.len().try_into().expect("usize fits into u64; qed"))
+			.unwrap_or_default())
+	}
+
+	/// Stores the input passed by the caller into the supplied buffer.
+	/// See [`pallet_revive_uapi::HostFn::call_data_copy`].
+	#[stable]
+	fn call_data_copy(
+		&mut self,
+		memory: &mut M,
+		out_ptr: u32,
+		out_len: u32,
+		offset: u32,
+	) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::CallDataCopy(out_len))?;
+
+		let Some(input) = self.input_data.as_ref() else {
+			return Err(Error::<E::T>::InputForwarded.into());
+		};
+
+		let start = offset as usize;
+		if start >= input.len() {
+			memory.zero(out_ptr, out_len)?;
+			return Ok(());
+		}
+
+		let end = start.saturating_add(out_len as usize).min(input.len());
+		memory.write(out_ptr, &input[start..end])?;
+
+		let bytes_written = (end - start) as u32;
+		memory.zero(out_ptr.saturating_add(bytes_written), out_len - bytes_written)?;
+
+		Ok(())
+	}
+
+	/// Stores the U256 value at given call input `offset` into the supplied buffer.
+	/// See [`pallet_revive_uapi::HostFn::call_data_load`].
+	#[stable]
+	fn call_data_load(
+		&mut self,
+		memory: &mut M,
+		out_ptr: u32,
+		offset: u32,
+	) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::CallDataLoad)?;
+
+		let Some(input) = self.input_data.as_ref() else {
+			return Err(Error::<E::T>::InputForwarded.into());
+		};
+
+		let mut data = [0; 32];
+		let start = offset as usize;
+		let data = if start >= input.len() {
+			data // Any index is valid to request; OOB offsets return zero.
+		} else {
+			let end = start.saturating_add(32).min(input.len());
+			data[..end - start].copy_from_slice(&input[start..end]);
+			data.reverse();
+			data // Solidity expects right-padded data
+		};
+
+		self.write_fixed_sandbox_output(memory, out_ptr, &data, false, already_charged)?;
+
+		Ok(())
+	}
+
+	/// Cease contract execution and save a data buffer as a result of the execution.
+	/// See [`pallet_revive_uapi::HostFn::return_value`].
+	#[stable]
+	fn seal_return(
+		&mut self,
+		memory: &mut M,
+		flags: u32,
+		data_ptr: u32,
+		data_len: u32,
+	) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::CopyFromContract(data_len))?;
+		Err(TrapReason::Return(ReturnData { flags, data: memory.read(data_ptr, data_len)? }))
+	}
+
+	/// Stores the address of the caller into the supplied buffer.
+	/// See [`pallet_revive_uapi::HostFn::caller`].
+	#[stable]
+	fn caller(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::Caller)?;
+		let caller = <E::T as Config>::AddressMapper::to_address(self.ext.caller().account_id()?);
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			caller.as_bytes(),
+			false,
+			already_charged,
+		)?)
+	}
+
+	/// Stores the address of the call stack origin into the supplied buffer.
+	/// See [`pallet_revive_uapi::HostFn::origin`].
+	#[stable]
+	fn origin(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::Origin)?;
+		let origin = <E::T as Config>::AddressMapper::to_address(self.ext.origin().account_id()?);
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			origin.as_bytes(),
+			false,
+			already_charged,
+		)?)
+	}
+
+	/// Retrieve the code hash for a specified contract address.
+	/// See [`pallet_revive_uapi::HostFn::code_hash`].
+	#[stable]
+	fn code_hash(&mut self, memory: &mut M, addr_ptr: u32, out_ptr: u32) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::CodeHash)?;
+		let address = memory.read_h160(addr_ptr)?;
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			&self.ext.code_hash(&address).as_bytes(),
+			false,
+			already_charged,
+		)?)
+	}
+
+	/// Retrieve the code size for a given contract address.
+	/// See [`pallet_revive_uapi::HostFn::code_size`].
+	#[stable]
+	fn code_size(&mut self, memory: &mut M, addr_ptr: u32) -> Result<u64, TrapReason> {
+		self.charge_gas(RuntimeCosts::CodeSize)?;
+		let address = memory.read_h160(addr_ptr)?;
+		Ok(self.ext.code_size(&address))
+	}
+
+	/// Stores the address of the current contract into the supplied buffer.
+	/// See [`pallet_revive_uapi::HostFn::address`].
+	#[stable]
+	fn address(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::Address)?;
+		let address = self.ext.address();
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			address.as_bytes(),
+			false,
+			already_charged,
+		)?)
+	}
+
+	/// Stores the price for the specified amount of weight into the supplied buffer.
+	/// See [`pallet_revive_uapi::HostFn::weight_to_fee`].
+	#[stable]
+	fn weight_to_fee(
+		&mut self,
+		memory: &mut M,
+		ref_time_limit: u64,
+		proof_size_limit: u64,
+		out_ptr: u32,
+	) -> Result<(), TrapReason> {
+		let weight = Weight::from_parts(ref_time_limit, proof_size_limit);
+		self.charge_gas(RuntimeCosts::WeightToFee)?;
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			&self.ext.get_weight_price(weight).encode(),
+			false,
+			already_charged,
+		)?)
+	}
+
+	/// Stores the immutable data into the supplied buffer.
+	/// See [`pallet_revive_uapi::HostFn::get_immutable_data`].
+	#[stable]
+	fn get_immutable_data(
+		&mut self,
+		memory: &mut M,
+		out_ptr: u32,
+		out_len_ptr: u32,
+	) -> Result<(), TrapReason> {
+		// quering the length is free as it is stored with the contract metadata
+		let len = self.ext.immutable_data_len();
+		self.charge_gas(RuntimeCosts::GetImmutableData(len))?;
+		let data = self.ext.get_immutable_data()?;
+		self.write_sandbox_output(memory, out_ptr, out_len_ptr, &data, false, already_charged)?;
+		Ok(())
+	}
+
+	/// Attaches the supplied immutable data to the currently executing contract.
+	/// See [`pallet_revive_uapi::HostFn::set_immutable_data`].
+	#[stable]
+	fn set_immutable_data(&mut self, memory: &mut M, ptr: u32, len: u32) -> Result<(), TrapReason> {
+		if len > limits::IMMUTABLE_BYTES {
+			return Err(Error::<E::T>::OutOfBounds.into());
+		}
+		self.charge_gas(RuntimeCosts::SetImmutableData(len))?;
+		let buf = memory.read(ptr, len)?;
+		let data = buf.try_into().expect("bailed out earlier; qed");
+		self.ext.set_immutable_data(data)?;
+		Ok(())
+	}
+
+	/// Stores the *free* balance of the current account into the supplied buffer.
+	/// See [`pallet_revive_uapi::HostFn::balance`].
+	#[stable]
+	fn balance(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::Balance)?;
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			&self.ext.balance().to_little_endian(),
+			false,
+			already_charged,
+		)?)
+	}
+
+	/// Stores the *free* balance of the supplied address into the supplied buffer.
+	/// See [`pallet_revive_uapi::HostFn::balance`].
+	#[stable]
+	fn balance_of(
+		&mut self,
+		memory: &mut M,
+		addr_ptr: u32,
+		out_ptr: u32,
+	) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::BalanceOf)?;
+		let address = memory.read_h160(addr_ptr)?;
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			&self.ext.balance_of(&address).to_little_endian(),
+			false,
+			already_charged,
+		)?)
+	}
+
+	/// Returns the chain ID.
+	/// See [`pallet_revive_uapi::HostFn::chain_id`].
+	#[stable]
+	fn chain_id(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			&U256::from(<E::T as Config>::ChainId::get()).to_little_endian(),
+			false,
+			|_| Some(RuntimeCosts::CopyToContract(32)),
+		)?)
+	}
+
+	/// Returns the block ref_time limit.
+	/// See [`pallet_revive_uapi::HostFn::gas_limit`].
+	#[stable]
+	fn gas_limit(&mut self, memory: &mut M) -> Result<u64, TrapReason> {
+		self.charge_gas(RuntimeCosts::GasLimit)?;
+		Ok(<E::T as frame_system::Config>::BlockWeights::get().max_block.ref_time())
+	}
+
+	/// Stores the value transferred along with this call/instantiate into the supplied buffer.
+	/// See [`pallet_revive_uapi::HostFn::value_transferred`].
+	#[stable]
+	fn value_transferred(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::ValueTransferred)?;
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			&self.ext.value_transferred().to_little_endian(),
+			false,
+			already_charged,
+		)?)
+	}
+
+	/// Returns the simulated ethereum `GASPRICE` value.
+	/// See [`pallet_revive_uapi::HostFn::gas_price`].
+	#[stable]
+	fn gas_price(&mut self, memory: &mut M) -> Result<u64, TrapReason> {
+		self.charge_gas(RuntimeCosts::GasPrice)?;
+		Ok(GAS_PRICE.into())
+	}
+
+	/// Returns the simulated ethereum `BASEFEE` value.
+	/// See [`pallet_revive_uapi::HostFn::base_fee`].
+	#[stable]
+	fn base_fee(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::BaseFee)?;
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			&U256::zero().to_little_endian(),
+			false,
+			already_charged,
+		)?)
+	}
+
+	/// Load the latest block timestamp into the supplied buffer
+	/// See [`pallet_revive_uapi::HostFn::now`].
+	#[stable]
+	fn now(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::Now)?;
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			&self.ext.now().to_little_endian(),
+			false,
+			already_charged,
+		)?)
+	}
+
+	/// Deposit a contract event with the data buffer and optional list of topics.
+	/// See [pallet_revive_uapi::HostFn::deposit_event]
+	#[stable]
+	#[mutating]
+	fn deposit_event(
+		&mut self,
+		memory: &mut M,
+		topics_ptr: u32,
+		num_topic: u32,
+		data_ptr: u32,
+		data_len: u32,
+	) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::DepositEvent { num_topic, len: data_len })?;
+
+		if num_topic > limits::NUM_EVENT_TOPICS {
+			return Err(Error::<E::T>::TooManyTopics.into());
+		}
+
+		if data_len > self.ext.max_value_size() {
+			return Err(Error::<E::T>::ValueTooLarge.into());
+		}
+
+		let topics: Vec<H256> = match num_topic {
+			0 => Vec::new(),
+			_ => {
+				let mut v = Vec::with_capacity(num_topic as usize);
+				let topics_len = num_topic * H256::len_bytes() as u32;
+				let buf = memory.read(topics_ptr, topics_len)?;
+				for chunk in buf.chunks_exact(H256::len_bytes()) {
+					v.push(H256::from_slice(chunk));
+				}
+				v
+			},
+		};
+
+		let event_data = memory.read(data_ptr, data_len)?;
+		self.ext.deposit_event(topics, event_data);
+		Ok(())
+	}
+
+	/// Stores the current block number of the current contract into the supplied buffer.
+	/// See [`pallet_revive_uapi::HostFn::block_number`].
+	#[stable]
+	fn block_number(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::BlockNumber)?;
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			&self.ext.block_number().to_little_endian(),
+			false,
+			already_charged,
+		)?)
+	}
+
+	/// Stores the block hash at given block height into the supplied buffer.
+	/// See [`pallet_revive_uapi::HostFn::block_hash`].
+	#[stable]
+	fn block_hash(
+		&mut self,
+		memory: &mut M,
+		block_number_ptr: u32,
+		out_ptr: u32,
+	) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::BlockHash)?;
+		let block_number = memory.read_u256(block_number_ptr)?;
+		let block_hash = self.ext.block_hash(block_number).unwrap_or(H256::zero());
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			&block_hash.as_bytes(),
+			false,
+			already_charged,
+		)?)
+	}
+
+	/// Stores the current block author into the supplied buffer.
+	/// See [`pallet_revive_uapi::HostFn::block_author`].
+	#[stable]
+	fn block_author(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::BlockAuthor)?;
+		let block_author = self.ext.block_author().unwrap_or(H160::zero());
+
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			&block_author.as_bytes(),
+			false,
+			already_charged,
+		)?)
+	}
+
+	/// Computes the KECCAK 256-bit hash on the given input buffer.
+	/// See [`pallet_revive_uapi::HostFn::hash_keccak_256`].
+	#[stable]
+	fn hash_keccak_256(
+		&mut self,
+		memory: &mut M,
+		input_ptr: u32,
+		input_len: u32,
+		output_ptr: u32,
+	) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::HashKeccak256(input_len))?;
+		Ok(self.compute_hash_on_intermediate_buffer(
+			memory, keccak_256, input_ptr, input_len, output_ptr,
+		)?)
+	}
+
+	/// Stores the length of the data returned by the last call into the supplied buffer.
+	/// See [`pallet_revive_uapi::HostFn::return_data_size`].
+	#[stable]
+	fn return_data_size(&mut self, memory: &mut M) -> Result<u64, TrapReason> {
+		self.charge_gas(RuntimeCosts::ReturnDataSize)?;
+		Ok(self
+			.ext
+			.last_frame_output()
+			.data
+			.len()
+			.try_into()
+			.expect("usize fits into u64; qed"))
+	}
+
+	/// Stores data returned by the last call, starting from `offset`, into the supplied buffer.
+	/// See [`pallet_revive_uapi::HostFn::return_data`].
+	#[stable]
+	fn return_data_copy(
+		&mut self,
+		memory: &mut M,
+		out_ptr: u32,
+		out_len_ptr: u32,
+		offset: u32,
+	) -> Result<(), TrapReason> {
+		let output = mem::take(self.ext.last_frame_output_mut());
+		let result = if offset as usize > output.data.len() {
+			Err(Error::<E::T>::OutOfBounds.into())
+		} else {
+			self.write_sandbox_output(
+				memory,
+				out_ptr,
+				out_len_ptr,
+				&output.data[offset as usize..],
+				false,
+				|len| Some(RuntimeCosts::CopyToContract(len)),
+			)
+		};
+		*self.ext.last_frame_output_mut() = output;
+		Ok(result?)
+	}
+
+	/// Returns the amount of ref_time left.
+	/// See [`pallet_revive_uapi::HostFn::ref_time_left`].
+	#[stable]
+	fn ref_time_left(&mut self, memory: &mut M) -> Result<u64, TrapReason> {
+		self.charge_gas(RuntimeCosts::RefTimeLeft)?;
+		Ok(self.ext.gas_meter().gas_left().ref_time())
+	}
+
+	/// Checks whether the caller of the current contract is the origin of the whole call stack.
+	/// See [`pallet_revive_uapi::HostFn::caller_is_origin`].
+	fn caller_is_origin(&mut self, _memory: &mut M) -> Result<u32, TrapReason> {
+		self.charge_gas(RuntimeCosts::CallerIsOrigin)?;
+		Ok(self.ext.caller_is_origin() as u32)
+	}
+
+	/// Checks whether the caller of the current contract is root.
+	/// See [`pallet_revive_uapi::HostFn::caller_is_root`].
+	fn caller_is_root(&mut self, _memory: &mut M) -> Result<u32, TrapReason> {
+		self.charge_gas(RuntimeCosts::CallerIsRoot)?;
+		Ok(self.ext.caller_is_root() as u32)
+	}
+
+	/// Clear the value at the given key in the contract storage.
+	/// See [`pallet_revive_uapi::HostFn::clear_storage`]
+	#[mutating]
+	fn clear_storage(
+		&mut self,
+		memory: &mut M,
+		flags: u32,
+		key_ptr: u32,
+		key_len: u32,
+	) -> Result<u32, TrapReason> {
+		self.clear_storage(memory, flags, key_ptr, key_len)
+	}
+
+	/// Checks whether there is a value stored under the given key.
+	/// See [`pallet_revive_uapi::HostFn::contains_storage`]
+	fn contains_storage(
+		&mut self,
+		memory: &mut M,
+		flags: u32,
+		key_ptr: u32,
+		key_len: u32,
+	) -> Result<u32, TrapReason> {
+		self.contains_storage(memory, flags, key_ptr, key_len)
+	}
+
+	/// Calculates Ethereum address from the ECDSA compressed public key and stores
+	/// See [`pallet_revive_uapi::HostFn::ecdsa_to_eth_address`].
+	fn ecdsa_to_eth_address(
+		&mut self,
+		memory: &mut M,
+		key_ptr: u32,
+		out_ptr: u32,
+	) -> Result<ReturnErrorCode, TrapReason> {
+		self.charge_gas(RuntimeCosts::EcdsaToEthAddress)?;
+		let mut compressed_key: [u8; 33] = [0; 33];
+		memory.read_into_buf(key_ptr, &mut compressed_key)?;
+		let result = self.ext.ecdsa_to_eth_address(&compressed_key);
+		match result {
+			Ok(eth_address) => {
+				memory.write(out_ptr, eth_address.as_ref())?;
+				Ok(ReturnErrorCode::Success)
+			},
+			Err(_) => Ok(ReturnErrorCode::EcdsaRecoveryFailed),
+		}
+	}
+
+	/// Computes the BLAKE2 128-bit hash on the given input buffer.
+	/// See [`pallet_revive_uapi::HostFn::hash_blake2_128`].
+	fn hash_blake2_128(
+		&mut self,
+		memory: &mut M,
+		input_ptr: u32,
+		input_len: u32,
+		output_ptr: u32,
+	) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::HashBlake128(input_len))?;
+		Ok(self.compute_hash_on_intermediate_buffer(
+			memory, blake2_128, input_ptr, input_len, output_ptr,
+		)?)
+	}
+
+	/// Computes the BLAKE2 256-bit hash on the given input buffer.
+	/// See [`pallet_revive_uapi::HostFn::hash_blake2_256`].
+	fn hash_blake2_256(
+		&mut self,
+		memory: &mut M,
+		input_ptr: u32,
+		input_len: u32,
+		output_ptr: u32,
+	) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::HashBlake256(input_len))?;
+		Ok(self.compute_hash_on_intermediate_buffer(
+			memory, blake2_256, input_ptr, input_len, output_ptr,
+		)?)
+	}
+
+	/// Stores the minimum balance (a.k.a. existential deposit) into the supplied buffer.
+	/// See [`pallet_revive_uapi::HostFn::minimum_balance`].
+	fn minimum_balance(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::MinimumBalance)?;
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			&self.ext.minimum_balance().to_little_endian(),
+			false,
+			already_charged,
+		)?)
+	}
+
+	/// Retrieve the code hash of the currently executing contract.
+	/// See [`pallet_revive_uapi::HostFn::own_code_hash`].
+	fn own_code_hash(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::OwnCodeHash)?;
+		let code_hash = *self.ext.own_code_hash();
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			code_hash.as_bytes(),
+			false,
+			already_charged,
+		)?)
+	}
+
+	/// Replace the contract code at the specified address with new code.
+	/// See [`pallet_revive_uapi::HostFn::set_code_hash`].
+	///
+	/// Disabled until the internal implementation takes care of collecting
+	/// the immutable data of the new code hash.
+	#[mutating]
+	fn set_code_hash(&mut self, memory: &mut M, code_hash_ptr: u32) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::SetCodeHash)?;
+		let code_hash: H256 = memory.read_h256(code_hash_ptr)?;
+		self.ext.set_code_hash(code_hash)?;
+		Ok(())
+	}
+
+	/// Verify a sr25519 signature
+	/// See [`pallet_revive_uapi::HostFn::sr25519_verify`].
+	fn sr25519_verify(
+		&mut self,
+		memory: &mut M,
+		signature_ptr: u32,
+		pub_key_ptr: u32,
+		message_len: u32,
+		message_ptr: u32,
+	) -> Result<ReturnErrorCode, TrapReason> {
+		self.charge_gas(RuntimeCosts::Sr25519Verify(message_len))?;
+
+		let mut signature: [u8; 64] = [0; 64];
+		memory.read_into_buf(signature_ptr, &mut signature)?;
+
+		let mut pub_key: [u8; 32] = [0; 32];
+		memory.read_into_buf(pub_key_ptr, &mut pub_key)?;
+
+		let message: Vec<u8> = memory.read(message_ptr, message_len)?;
+
+		if self.ext.sr25519_verify(&signature, &message, &pub_key) {
+			Ok(ReturnErrorCode::Success)
+		} else {
+			Ok(ReturnErrorCode::Sr25519VerifyFailed)
+		}
+	}
+
+	/// Retrieve and remove the value under the given key from storage.
+	/// See [`pallet_revive_uapi::HostFn::take_storage`]
+	#[mutating]
+	fn take_storage(
+		&mut self,
+		memory: &mut M,
+		flags: u32,
+		key_ptr: u32,
+		key_len: u32,
+		out_ptr: u32,
+		out_len_ptr: u32,
+	) -> Result<ReturnErrorCode, TrapReason> {
+		self.take_storage(memory, flags, key_ptr, key_len, out_ptr, out_len_ptr)
+	}
+
+	/// Remove the calling account and transfer remaining **free** balance.
+	/// See [`pallet_revive_uapi::HostFn::terminate`].
+	#[mutating]
+	fn terminate(&mut self, memory: &mut M, beneficiary_ptr: u32) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::Terminate)?;
+		let beneficiary = memory.read_h160(beneficiary_ptr)?;
+		self.ext.terminate(&beneficiary)?;
+		Err(TrapReason::Termination)
+	}
+
+	/// Stores the amount of weight left into the supplied buffer.
+	/// See [`pallet_revive_uapi::HostFn::weight_left`].
+	fn weight_left(
+		&mut self,
+		memory: &mut M,
+		out_ptr: u32,
+		out_len_ptr: u32,
+	) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::WeightLeft)?;
+		let gas_left = &self.ext.gas_meter().gas_left().encode();
+		Ok(self.write_sandbox_output(
+			memory,
+			out_ptr,
+			out_len_ptr,
+			gas_left,
+			false,
+			already_charged,
+		)?)
+	}
+
+	/// Retrieves the account id for a specified contract address.
+	///
+	/// See [`pallet_revive_uapi::HostFn::to_account_id`].
+	fn to_account_id(
+		&mut self,
+		memory: &mut M,
+		addr_ptr: u32,
+		out_ptr: u32,
+	) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::ToAccountId)?;
+		let address = memory.read_h160(addr_ptr)?;
+		let account_id = self.ext.to_account_id(&address);
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			&account_id.encode(),
+			false,
+			already_charged,
+		)?)
+	}
+}
diff --git a/substrate/frame/revive/src/vm/runtime.rs b/substrate/frame/revive/src/vm/runtime.rs
deleted file mode 100644
index a3cda4d743f4..000000000000
--- a/substrate/frame/revive/src/vm/runtime.rs
+++ /dev/null
@@ -1,2127 +0,0 @@
-// 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.
-
-//! Environment definition of the vm smart-contract runtime.
-
-use crate::{
-	Config, Error, LOG_TARGET, Pallet, SENTINEL,
-	address::AddressMapper,
-	evm::runtime::GAS_PRICE,
-	exec::{ExecError, ExecResult, Ext, Key},
-	gas::{ChargedAmount, Token},
-	limits,
-	precompiles::{All as AllPrecompiles, Precompiles},
-	primitives::ExecReturnValue,
-	weights::WeightInfo,
-};
-use alloc::{vec, vec::Vec};
-use codec::Encode;
-use core::{fmt, marker::PhantomData, mem};
-use frame_support::{ensure, traits::Get, weights::Weight};
-use pallet_revive_proc_macro::define_env;
-use pallet_revive_uapi::{CallFlags, ReturnErrorCode, ReturnFlags, StorageFlags};
-use sp_core::{H160, H256, U256};
-use sp_io::hashing::{blake2_128, blake2_256, keccak_256};
-use sp_runtime::{DispatchError, RuntimeDebug};
-
-/// Abstraction over the memory access within syscalls.
-///
-/// The reason for this abstraction is that we run syscalls on the host machine when
-/// benchmarking them. In that case we have direct access to the contract's memory. However, when
-/// running within PolkaVM we need to resort to copying as we can't map the contracts memory into
-/// the host (as of now).
-pub trait Memory<T: Config> {
-	/// Read designated chunk from the sandbox memory into the supplied buffer.
-	///
-	/// Returns `Err` if one of the following conditions occurs:
-	///
-	/// - requested buffer is not within the bounds of the sandbox memory.
-	fn read_into_buf(&self, ptr: u32, buf: &mut [u8]) -> Result<(), DispatchError>;
-
-	/// Write the given buffer to the designated location in the sandbox memory.
-	///
-	/// Returns `Err` if one of the following conditions occurs:
-	///
-	/// - designated area is not within the bounds of the sandbox memory.
-	fn write(&mut self, ptr: u32, buf: &[u8]) -> Result<(), DispatchError>;
-
-	/// Zero the designated location in the sandbox memory.
-	///
-	/// Returns `Err` if one of the following conditions occurs:
-	///
-	/// - designated area is not within the bounds of the sandbox memory.
-	fn zero(&mut self, ptr: u32, len: u32) -> Result<(), DispatchError>;
-
-	/// Read designated chunk from the sandbox memory.
-	///
-	/// Returns `Err` if one of the following conditions occurs:
-	///
-	/// - requested buffer is not within the bounds of the sandbox memory.
-	fn read(&self, ptr: u32, len: u32) -> Result<Vec<u8>, DispatchError> {
-		let mut buf = vec![0u8; len as usize];
-		self.read_into_buf(ptr, buf.as_mut_slice())?;
-		Ok(buf)
-	}
-
-	/// Same as `read` but reads into a fixed size buffer.
-	fn read_array<const N: usize>(&self, ptr: u32) -> Result<[u8; N], DispatchError> {
-		let mut buf = [0u8; N];
-		self.read_into_buf(ptr, &mut buf)?;
-		Ok(buf)
-	}
-
-	/// Read a `u32` from the sandbox memory.
-	fn read_u32(&self, ptr: u32) -> Result<u32, DispatchError> {
-		let buf: [u8; 4] = self.read_array(ptr)?;
-		Ok(u32::from_le_bytes(buf))
-	}
-
-	/// Read a `U256` from the sandbox memory.
-	fn read_u256(&self, ptr: u32) -> Result<U256, DispatchError> {
-		let buf: [u8; 32] = self.read_array(ptr)?;
-		Ok(U256::from_little_endian(&buf))
-	}
-
-	/// Read a `H160` from the sandbox memory.
-	fn read_h160(&self, ptr: u32) -> Result<H160, DispatchError> {
-		let mut buf = H160::default();
-		self.read_into_buf(ptr, buf.as_bytes_mut())?;
-		Ok(buf)
-	}
-
-	/// Read a `H256` from the sandbox memory.
-	fn read_h256(&self, ptr: u32) -> Result<H256, DispatchError> {
-		let mut code_hash = H256::default();
-		self.read_into_buf(ptr, code_hash.as_bytes_mut())?;
-		Ok(code_hash)
-	}
-}
-
-/// Allows syscalls access to the PolkaVM instance they are executing in.
-///
-/// In case a contract is executing within PolkaVM its `memory` argument will also implement
-/// this trait. The benchmarking implementation of syscalls will only require `Memory`
-/// to be implemented.
-pub trait PolkaVmInstance<T: Config>: Memory<T> {
-	fn gas(&self) -> polkavm::Gas;
-	fn set_gas(&mut self, gas: polkavm::Gas);
-	fn read_input_regs(&self) -> (u64, u64, u64, u64, u64, u64);
-	fn write_output(&mut self, output: u64);
-}
-
-// Memory implementation used in benchmarking where guest memory is mapped into the host.
-//
-// Please note that we could optimize the `read_as_*` functions by decoding directly from
-// memory without a copy. However, we don't do that because as it would change the behaviour
-// of those functions: A `read_as` with a `len` larger than the actual type can succeed
-// in the streaming implementation while it could fail with a segfault in the copy implementation.
-#[cfg(feature = "runtime-benchmarks")]
-impl<T: Config> Memory<T> for [u8] {
-	fn read_into_buf(&self, ptr: u32, buf: &mut [u8]) -> Result<(), DispatchError> {
-		let ptr = ptr as usize;
-		let bound_checked =
-			self.get(ptr..ptr + buf.len()).ok_or_else(|| Error::<T>::OutOfBounds)?;
-		buf.copy_from_slice(bound_checked);
-		Ok(())
-	}
-
-	fn write(&mut self, ptr: u32, buf: &[u8]) -> Result<(), DispatchError> {
-		let ptr = ptr as usize;
-		let bound_checked =
-			self.get_mut(ptr..ptr + buf.len()).ok_or_else(|| Error::<T>::OutOfBounds)?;
-		bound_checked.copy_from_slice(buf);
-		Ok(())
-	}
-
-	fn zero(&mut self, ptr: u32, len: u32) -> Result<(), DispatchError> {
-		<[u8] as Memory<T>>::write(self, ptr, &vec![0; len as usize])
-	}
-}
-
-impl<T: Config> Memory<T> for polkavm::RawInstance {
-	fn read_into_buf(&self, ptr: u32, buf: &mut [u8]) -> Result<(), DispatchError> {
-		self.read_memory_into(ptr, buf)
-			.map(|_| ())
-			.map_err(|_| Error::<T>::OutOfBounds.into())
-	}
-
-	fn write(&mut self, ptr: u32, buf: &[u8]) -> Result<(), DispatchError> {
-		self.write_memory(ptr, buf).map_err(|_| Error::<T>::OutOfBounds.into())
-	}
-
-	fn zero(&mut self, ptr: u32, len: u32) -> Result<(), DispatchError> {
-		self.zero_memory(ptr, len).map_err(|_| Error::<T>::OutOfBounds.into())
-	}
-}
-
-impl<T: Config> PolkaVmInstance<T> for polkavm::RawInstance {
-	fn gas(&self) -> polkavm::Gas {
-		self.gas()
-	}
-
-	fn set_gas(&mut self, gas: polkavm::Gas) {
-		self.set_gas(gas)
-	}
-
-	fn read_input_regs(&self) -> (u64, u64, u64, u64, u64, u64) {
-		(
-			self.reg(polkavm::Reg::A0),
-			self.reg(polkavm::Reg::A1),
-			self.reg(polkavm::Reg::A2),
-			self.reg(polkavm::Reg::A3),
-			self.reg(polkavm::Reg::A4),
-			self.reg(polkavm::Reg::A5),
-		)
-	}
-
-	fn write_output(&mut self, output: u64) {
-		self.set_reg(polkavm::Reg::A0, output);
-	}
-}
-
-impl From<&ExecReturnValue> for ReturnErrorCode {
-	fn from(from: &ExecReturnValue) -> Self {
-		if from.flags.contains(ReturnFlags::REVERT) { Self::CalleeReverted } else { Self::Success }
-	}
-}
-
-/// The data passed through when a contract uses `seal_return`.
-#[derive(RuntimeDebug)]
-pub struct ReturnData {
-	/// The flags as passed through by the contract. They are still unchecked and
-	/// will later be parsed into a `ReturnFlags` bitflags struct.
-	flags: u32,
-	/// The output buffer passed by the contract as return data.
-	data: Vec<u8>,
-}
-
-/// Enumerates all possible reasons why a trap was generated.
-///
-/// This is either used to supply the caller with more information about why an error
-/// occurred (the SupervisorError variant).
-/// The other case is where the trap does not constitute an error but rather was invoked
-/// as a quick way to terminate the application (all other variants).
-#[derive(RuntimeDebug)]
-pub enum TrapReason {
-	/// The supervisor trapped the contract because of an error condition occurred during
-	/// execution in privileged code.
-	SupervisorError(DispatchError),
-	/// Signals that trap was generated in response to call `seal_return` host function.
-	Return(ReturnData),
-	/// Signals that a trap was generated in response to a successful call to the
-	/// `seal_terminate` host function.
-	Termination,
-}
-
-impl<T: Into<DispatchError>> From<T> for TrapReason {
-	fn from(from: T) -> Self {
-		Self::SupervisorError(from.into())
-	}
-}
-
-impl fmt::Display for TrapReason {
-	fn fmt(&self, _f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-		Ok(())
-	}
-}
-
-#[cfg_attr(test, derive(Debug, PartialEq, Eq))]
-#[derive(Copy, Clone)]
-pub enum RuntimeCosts {
-	/// Base Weight of calling a host function.
-	HostFn,
-	/// Weight charged for copying data from the sandbox.
-	CopyFromContract(u32),
-	/// Weight charged for copying data to the sandbox.
-	CopyToContract(u32),
-	/// Weight of calling `seal_call_data_load``.
-	CallDataLoad,
-	/// Weight of calling `seal_call_data_copy`.
-	CallDataCopy(u32),
-	/// Weight of calling `seal_caller`.
-	Caller,
-	/// Weight of calling `seal_call_data_size`.
-	CallDataSize,
-	/// Weight of calling `seal_return_data_size`.
-	ReturnDataSize,
-	/// Weight of calling `seal_to_account_id`.
-	ToAccountId,
-	/// Weight of calling `seal_origin`.
-	Origin,
-	/// Weight of calling `seal_code_hash`.
-	CodeHash,
-	/// Weight of calling `seal_own_code_hash`.
-	OwnCodeHash,
-	/// Weight of calling `seal_code_size`.
-	CodeSize,
-	/// Weight of calling `seal_caller_is_origin`.
-	CallerIsOrigin,
-	/// Weight of calling `caller_is_root`.
-	CallerIsRoot,
-	/// Weight of calling `seal_address`.
-	Address,
-	/// Weight of calling `seal_ref_time_left`.
-	RefTimeLeft,
-	/// Weight of calling `seal_weight_left`.
-	WeightLeft,
-	/// Weight of calling `seal_balance`.
-	Balance,
-	/// Weight of calling `seal_balance_of`.
-	BalanceOf,
-	/// Weight of calling `seal_value_transferred`.
-	ValueTransferred,
-	/// Weight of calling `seal_minimum_balance`.
-	MinimumBalance,
-	/// Weight of calling `seal_block_number`.
-	BlockNumber,
-	/// Weight of calling `seal_block_hash`.
-	BlockHash,
-	/// Weight of calling `seal_block_author`.
-	BlockAuthor,
-	/// Weight of calling `seal_gas_price`.
-	GasPrice,
-	/// Weight of calling `seal_base_fee`.
-	BaseFee,
-	/// Weight of calling `seal_now`.
-	Now,
-	/// Weight of calling `seal_gas_limit`.
-	GasLimit,
-	/// Weight of calling `seal_weight_to_fee`.
-	WeightToFee,
-	/// Weight of calling `seal_terminate`.
-	Terminate,
-	/// Weight of calling `seal_deposit_event` with the given number of topics and event size.
-	DepositEvent { num_topic: u32, len: u32 },
-	/// Weight of calling `seal_set_storage` for the given storage item sizes.
-	SetStorage { old_bytes: u32, new_bytes: u32 },
-	/// Weight of calling `seal_clear_storage` per cleared byte.
-	ClearStorage(u32),
-	/// Weight of calling `seal_contains_storage` per byte of the checked item.
-	ContainsStorage(u32),
-	/// Weight of calling `seal_get_storage` with the specified size in storage.
-	GetStorage(u32),
-	/// Weight of calling `seal_take_storage` for the given size.
-	TakeStorage(u32),
-	/// Weight of calling `seal_set_transient_storage` for the given storage item sizes.
-	SetTransientStorage { old_bytes: u32, new_bytes: u32 },
-	/// Weight of calling `seal_clear_transient_storage` per cleared byte.
-	ClearTransientStorage(u32),
-	/// Weight of calling `seal_contains_transient_storage` per byte of the checked item.
-	ContainsTransientStorage(u32),
-	/// Weight of calling `seal_get_transient_storage` with the specified size in storage.
-	GetTransientStorage(u32),
-	/// Weight of calling `seal_take_transient_storage` for the given size.
-	TakeTransientStorage(u32),
-	/// Base weight of calling `seal_call`.
-	CallBase,
-	/// Weight of calling `seal_delegate_call` for the given input size.
-	DelegateCallBase,
-	/// Weight of calling a precompile.
-	PrecompileBase,
-	/// Weight of calling a precompile that has a contract info.
-	PrecompileWithInfoBase,
-	/// Weight of reading and decoding the input to a precompile.
-	PrecompileDecode(u32),
-	/// Weight of the transfer performed during a call.
-	/// parameter `dust_transfer` indicates whether the transfer has a `dust` value.
-	CallTransferSurcharge { dust_transfer: bool },
-	/// Weight per byte that is cloned by supplying the `CLONE_INPUT` flag.
-	CallInputCloned(u32),
-	/// Weight of calling `seal_instantiate`.
-	Instantiate { input_data_len: u32, balance_transfer: bool, dust_transfer: bool },
-	/// Weight of calling `Ripemd160` precompile for the given input size.
-	Ripemd160(u32),
-	/// Weight of calling `Sha256` precompile for the given input size.
-	HashSha256(u32),
-	/// Weight of calling `seal_hash_keccak_256` for the given input size.
-	HashKeccak256(u32),
-	/// Weight of calling `seal_hash_blake2_256` for the given input size.
-	HashBlake256(u32),
-	/// Weight of calling `seal_hash_blake2_128` for the given input size.
-	HashBlake128(u32),
-	/// Weight of calling `ECERecover` precompile.
-	EcdsaRecovery,
-	/// Weight of calling `seal_sr25519_verify` for the given input size.
-	Sr25519Verify(u32),
-	/// Weight charged by a precompile.
-	Precompile(Weight),
-	/// Weight of calling `seal_set_code_hash`
-	SetCodeHash,
-	/// Weight of calling `ecdsa_to_eth_address`
-	EcdsaToEthAddress,
-	/// Weight of calling `get_immutable_dependency`
-	GetImmutableData(u32),
-	/// Weight of calling `set_immutable_dependency`
-	SetImmutableData(u32),
-	/// Weight of calling `Bn128Add` precompile
-	Bn128Add,
-	/// Weight of calling `Bn128Add` precompile
-	Bn128Mul,
-	/// Weight of calling `Bn128Pairing` precompile for the given number of input pairs.
-	Bn128Pairing(u32),
-	/// Weight of calling `Identity` precompile for the given number of input length.
-	Identity(u32),
-	/// Weight of calling `Blake2F` precompile for the given number of rounds.
-	Blake2F(u32),
-	/// Weight of calling `Modexp` precompile
-	Modexp(u64),
-}
-
-/// For functions that modify storage, benchmarks are performed with one item in the
-/// storage. To account for the worst-case scenario, the weight of the overhead of
-/// writing to or reading from full storage is included. For transient storage writes,
-/// the rollback weight is added to reflect the worst-case scenario for this operation.
-macro_rules! cost_storage {
-    (write_transient, $name:ident $(, $arg:expr )*) => {
-        T::WeightInfo::$name($( $arg ),*)
-            .saturating_add(T::WeightInfo::rollback_transient_storage())
-            .saturating_add(T::WeightInfo::set_transient_storage_full()
-            .saturating_sub(T::WeightInfo::set_transient_storage_empty()))
-    };
-
-    (read_transient, $name:ident $(, $arg:expr )*) => {
-        T::WeightInfo::$name($( $arg ),*)
-            .saturating_add(T::WeightInfo::get_transient_storage_full()
-            .saturating_sub(T::WeightInfo::get_transient_storage_empty()))
-    };
-
-    (write, $name:ident $(, $arg:expr )*) => {
-        T::WeightInfo::$name($( $arg ),*)
-            .saturating_add(T::WeightInfo::set_storage_full()
-            .saturating_sub(T::WeightInfo::set_storage_empty()))
-    };
-
-    (read, $name:ident $(, $arg:expr )*) => {
-        T::WeightInfo::$name($( $arg ),*)
-            .saturating_add(T::WeightInfo::get_storage_full()
-            .saturating_sub(T::WeightInfo::get_storage_empty()))
-    };
-}
-
-macro_rules! cost_args {
-	// cost_args!(name, a, b, c) -> T::WeightInfo::name(a, b, c).saturating_sub(T::WeightInfo::name(0, 0, 0))
-	($name:ident, $( $arg: expr ),+) => {
-		(T::WeightInfo::$name($( $arg ),+).saturating_sub(cost_args!(@call_zero $name, $( $arg ),+)))
-	};
-	// Transform T::WeightInfo::name(a, b, c) into T::WeightInfo::name(0, 0, 0)
-	(@call_zero $name:ident, $( $arg:expr ),*) => {
-		T::WeightInfo::$name($( cost_args!(@replace_token $arg) ),*)
-	};
-	// Replace the token with 0.
-	(@replace_token $_in:tt) => { 0 };
-}
-
-impl<T: Config> Token<T> for RuntimeCosts {
-	fn influence_lowest_gas_limit(&self) -> bool {
-		true
-	}
-
-	fn weight(&self) -> Weight {
-		use self::RuntimeCosts::*;
-		match *self {
-			HostFn => cost_args!(noop_host_fn, 1),
-			CopyToContract(len) => T::WeightInfo::seal_copy_to_contract(len),
-			CopyFromContract(len) => T::WeightInfo::seal_return(len),
-			CallDataSize => T::WeightInfo::seal_call_data_size(),
-			ReturnDataSize => T::WeightInfo::seal_return_data_size(),
-			CallDataLoad => T::WeightInfo::seal_call_data_load(),
-			CallDataCopy(len) => T::WeightInfo::seal_call_data_copy(len),
-			Caller => T::WeightInfo::seal_caller(),
-			Origin => T::WeightInfo::seal_origin(),
-			ToAccountId => T::WeightInfo::seal_to_account_id(),
-			CodeHash => T::WeightInfo::seal_code_hash(),
-			CodeSize => T::WeightInfo::seal_code_size(),
-			OwnCodeHash => T::WeightInfo::seal_own_code_hash(),
-			CallerIsOrigin => T::WeightInfo::seal_caller_is_origin(),
-			CallerIsRoot => T::WeightInfo::seal_caller_is_root(),
-			Address => T::WeightInfo::seal_address(),
-			RefTimeLeft => T::WeightInfo::seal_ref_time_left(),
-			WeightLeft => T::WeightInfo::seal_weight_left(),
-			Balance => T::WeightInfo::seal_balance(),
-			BalanceOf => T::WeightInfo::seal_balance_of(),
-			ValueTransferred => T::WeightInfo::seal_value_transferred(),
-			MinimumBalance => T::WeightInfo::seal_minimum_balance(),
-			BlockNumber => T::WeightInfo::seal_block_number(),
-			BlockHash => T::WeightInfo::seal_block_hash(),
-			BlockAuthor => T::WeightInfo::seal_block_author(),
-			GasPrice => T::WeightInfo::seal_gas_price(),
-			BaseFee => T::WeightInfo::seal_base_fee(),
-			Now => T::WeightInfo::seal_now(),
-			GasLimit => T::WeightInfo::seal_gas_limit(),
-			WeightToFee => T::WeightInfo::seal_weight_to_fee(),
-			Terminate => T::WeightInfo::seal_terminate(),
-			DepositEvent { num_topic, len } => T::WeightInfo::seal_deposit_event(num_topic, len),
-			SetStorage { new_bytes, old_bytes } => {
-				cost_storage!(write, seal_set_storage, new_bytes, old_bytes)
-			},
-			ClearStorage(len) => cost_storage!(write, seal_clear_storage, len),
-			ContainsStorage(len) => cost_storage!(read, seal_contains_storage, len),
-			GetStorage(len) => cost_storage!(read, seal_get_storage, len),
-			TakeStorage(len) => cost_storage!(write, seal_take_storage, len),
-			SetTransientStorage { new_bytes, old_bytes } => {
-				cost_storage!(write_transient, seal_set_transient_storage, new_bytes, old_bytes)
-			},
-			ClearTransientStorage(len) => {
-				cost_storage!(write_transient, seal_clear_transient_storage, len)
-			},
-			ContainsTransientStorage(len) => {
-				cost_storage!(read_transient, seal_contains_transient_storage, len)
-			},
-			GetTransientStorage(len) => {
-				cost_storage!(read_transient, seal_get_transient_storage, len)
-			},
-			TakeTransientStorage(len) => {
-				cost_storage!(write_transient, seal_take_transient_storage, len)
-			},
-			CallBase => T::WeightInfo::seal_call(0, 0, 0),
-			DelegateCallBase => T::WeightInfo::seal_delegate_call(),
-			PrecompileBase => T::WeightInfo::seal_call_precompile(0, 0),
-			PrecompileWithInfoBase => T::WeightInfo::seal_call_precompile(1, 0),
-			PrecompileDecode(len) => cost_args!(seal_call_precompile, 0, len),
-			CallTransferSurcharge { dust_transfer } =>
-				cost_args!(seal_call, 1, dust_transfer.into(), 0),
-			CallInputCloned(len) => cost_args!(seal_call, 0, 0, len),
-			Instantiate { input_data_len, balance_transfer, dust_transfer } =>
-				T::WeightInfo::seal_instantiate(
-					input_data_len,
-					balance_transfer.into(),
-					dust_transfer.into(),
-				),
-			HashSha256(len) => T::WeightInfo::sha2_256(len),
-			Ripemd160(len) => T::WeightInfo::ripemd_160(len),
-			HashKeccak256(len) => T::WeightInfo::seal_hash_keccak_256(len),
-			HashBlake256(len) => T::WeightInfo::seal_hash_blake2_256(len),
-			HashBlake128(len) => T::WeightInfo::seal_hash_blake2_128(len),
-			EcdsaRecovery => T::WeightInfo::ecdsa_recover(),
-			Sr25519Verify(len) => T::WeightInfo::seal_sr25519_verify(len),
-			Precompile(weight) => weight,
-			SetCodeHash => T::WeightInfo::seal_set_code_hash(),
-			EcdsaToEthAddress => T::WeightInfo::seal_ecdsa_to_eth_address(),
-			GetImmutableData(len) => T::WeightInfo::seal_get_immutable_data(len),
-			SetImmutableData(len) => T::WeightInfo::seal_set_immutable_data(len),
-			Bn128Add => T::WeightInfo::bn128_add(),
-			Bn128Mul => T::WeightInfo::bn128_mul(),
-			Bn128Pairing(len) => T::WeightInfo::bn128_pairing(len),
-			Identity(len) => T::WeightInfo::identity(len),
-			Blake2F(rounds) => T::WeightInfo::blake2f(rounds),
-			Modexp(gas) => {
-				use frame_support::weights::constants::WEIGHT_REF_TIME_PER_SECOND;
-				/// Current approximation of the gas/s consumption considering
-				/// EVM execution over compiled WASM (on 4.4Ghz CPU).
-				/// Given the 2000ms Weight, from which 75% only are used for transactions,
-				/// the total EVM execution gas limit is: GAS_PER_SECOND * 2 * 0.75 ~= 60_000_000.
-				const GAS_PER_SECOND: u64 = 40_000_000;
-
-				/// Approximate ratio of the amount of Weight per Gas.
-				/// u64 works for approximations because Weight is a very small unit compared to
-				/// gas.
-				const WEIGHT_PER_GAS: u64 = WEIGHT_REF_TIME_PER_SECOND / GAS_PER_SECOND;
-				Weight::from_parts(gas.saturating_mul(WEIGHT_PER_GAS), 0)
-			},
-		}
-	}
-}
-
-/// Same as [`Runtime::charge_gas`].
-///
-/// We need this access as a macro because sometimes hiding the lifetimes behind
-/// a function won't work out.
-macro_rules! charge_gas {
-	($runtime:expr, $costs:expr) => {{ $runtime.ext.gas_meter_mut().charge($costs) }};
-}
-
-/// The kind of call that should be performed.
-enum CallType {
-	/// Execute another instantiated contract
-	Call { value_ptr: u32 },
-	/// Execute another contract code in the context (storage, account ID, value) of the caller
-	/// contract
-	DelegateCall,
-}
-
-impl CallType {
-	fn cost(&self) -> RuntimeCosts {
-		match self {
-			CallType::Call { .. } => RuntimeCosts::CallBase,
-			CallType::DelegateCall => RuntimeCosts::DelegateCallBase,
-		}
-	}
-}
-
-/// This is only appropriate when writing out data of constant size that does not depend on user
-/// input. In this case the costs for this copy was already charged as part of the token at
-/// the beginning of the API entry point.
-fn already_charged(_: u32) -> Option<RuntimeCosts> {
-	None
-}
-
-/// Helper to extract two `u32` values from a given `u64` register.
-fn extract_hi_lo(reg: u64) -> (u32, u32) {
-	((reg >> 32) as u32, reg as u32)
-}
-
-/// Provides storage variants to support standard and Etheruem compatible semantics.
-enum StorageValue {
-	/// Indicates that the storage value should be read from a memory buffer.
-	/// - `ptr`: A pointer to the start of the data in sandbox memory.
-	/// - `len`: The length (in bytes) of the data.
-	Memory { ptr: u32, len: u32 },
-
-	/// Indicates that the storage value is provided inline as a fixed-size (256-bit) value.
-	/// This is used by set_storage_or_clear() to avoid double reads.
-	/// This variant is used to implement Ethereum SSTORE-like semantics.
-	Value(Vec<u8>),
-}
-
-/// Controls the output behavior for storage reads, both when a key is found and when it is not.
-enum StorageReadMode {
-	/// VariableOutput mode: if the key exists, the full stored value is returned
-	/// using the caller‑provided output length.
-	VariableOutput { output_len_ptr: u32 },
-	/// Ethereum compatible(FixedOutput32) mode: always write a 32-byte value into the output
-	/// buffer. If the key is missing, write 32 bytes of zeros.
-	FixedOutput32,
-}
-
-/// Can only be used for one call.
-pub struct Runtime<'a, E: Ext, M: ?Sized> {
-	ext: &'a mut E,
-	input_data: Option<Vec<u8>>,
-	_phantom_data: PhantomData<M>,
-}
-
-impl<'a, E: Ext, M: PolkaVmInstance<E::T>> Runtime<'a, E, M> {
-	pub fn handle_interrupt(
-		&mut self,
-		interrupt: Result<polkavm::InterruptKind, polkavm::Error>,
-		module: &polkavm::Module,
-		instance: &mut M,
-	) -> Option<ExecResult> {
-		use polkavm::InterruptKind::*;
-
-		match interrupt {
-			Err(error) => {
-				// in contrast to the other returns this "should" not happen: log level error
-				log::error!(target: LOG_TARGET, "polkavm execution error: {error}");
-				Some(Err(Error::<E::T>::ExecutionFailed.into()))
-			},
-			Ok(Finished) =>
-				Some(Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: Vec::new() })),
-			Ok(Trap) => Some(Err(Error::<E::T>::ContractTrapped.into())),
-			Ok(Segfault(_)) => Some(Err(Error::<E::T>::ExecutionFailed.into())),
-			Ok(NotEnoughGas) => Some(Err(Error::<E::T>::OutOfGas.into())),
-			Ok(Step) => None,
-			Ok(Ecalli(idx)) => {
-				// This is a special hard coded syscall index which is used by benchmarks
-				// to abort contract execution. It is used to terminate the execution without
-				// breaking up a basic block. The fixed index is used so that the benchmarks
-				// don't have to deal with import tables.
-				if cfg!(feature = "runtime-benchmarks") && idx == SENTINEL {
-					return Some(Ok(ExecReturnValue {
-						flags: ReturnFlags::empty(),
-						data: Vec::new(),
-					}))
-				}
-				let Some(syscall_symbol) = module.imports().get(idx) else {
-					return Some(Err(<Error<E::T>>::InvalidSyscall.into()));
-				};
-				match self.handle_ecall(instance, syscall_symbol.as_bytes()) {
-					Ok(None) => None,
-					Ok(Some(return_value)) => {
-						instance.write_output(return_value);
-						None
-					},
-					Err(TrapReason::Return(ReturnData { flags, data })) =>
-						match ReturnFlags::from_bits(flags) {
-							None => Some(Err(Error::<E::T>::InvalidCallFlags.into())),
-							Some(flags) => Some(Ok(ExecReturnValue { flags, data })),
-						},
-					Err(TrapReason::Termination) => Some(Ok(Default::default())),
-					Err(TrapReason::SupervisorError(error)) => Some(Err(error.into())),
-				}
-			},
-		}
-	}
-}
-
-impl<'a, E: Ext, M: ?Sized + Memory<E::T>> Runtime<'a, E, M> {
-	pub fn new(ext: &'a mut E, input_data: Vec<u8>) -> Self {
-		Self { ext, input_data: Some(input_data), _phantom_data: Default::default() }
-	}
-
-	/// Get a mutable reference to the inner `Ext`.
-	pub fn ext(&mut self) -> &mut E {
-		self.ext
-	}
-
-	/// Charge the gas meter with the specified token.
-	///
-	/// Returns `Err(HostError)` if there is not enough gas.
-	fn charge_gas(&mut self, costs: RuntimeCosts) -> Result<ChargedAmount, DispatchError> {
-		charge_gas!(self, costs)
-	}
-
-	/// Adjust a previously charged amount down to its actual amount.
-	///
-	/// This is when a maximum a priori amount was charged and then should be partially
-	/// refunded to match the actual amount.
-	fn adjust_gas(&mut self, charged: ChargedAmount, actual_costs: RuntimeCosts) {
-		self.ext.gas_meter_mut().adjust_gas(charged, actual_costs);
-	}
-
-	/// Write the given buffer and its length to the designated locations in sandbox memory and
-	/// charge gas according to the token returned by `create_token`.
-	///
-	/// `out_ptr` is the location in sandbox memory where `buf` should be written to.
-	/// `out_len_ptr` is an in-out location in sandbox memory. It is read to determine the
-	/// length of the buffer located at `out_ptr`. If that buffer is smaller than the actual
-	/// `buf.len()`, only what fits into that buffer is written to `out_ptr`.
-	/// The actual amount of bytes copied to `out_ptr` is written to `out_len_ptr`.
-	///
-	/// If `out_ptr` is set to the sentinel value of `SENTINEL` and `allow_skip` is true the
-	/// operation is skipped and `Ok` is returned. This is supposed to help callers to make copying
-	/// output optional. For example to skip copying back the output buffer of an `seal_call`
-	/// when the caller is not interested in the result.
-	///
-	/// `create_token` can optionally instruct this function to charge the gas meter with the token
-	/// it returns. `create_token` receives the variable amount of bytes that are about to be copied
-	/// by this function.
-	///
-	/// In addition to the error conditions of `Memory::write` this functions returns
-	/// `Err` if the size of the buffer located at `out_ptr` is too small to fit `buf`.
-	pub fn write_sandbox_output(
-		&mut self,
-		memory: &mut M,
-		out_ptr: u32,
-		out_len_ptr: u32,
-		buf: &[u8],
-		allow_skip: bool,
-		create_token: impl FnOnce(u32) -> Option<RuntimeCosts>,
-	) -> Result<(), DispatchError> {
-		if allow_skip && out_ptr == SENTINEL {
-			return Ok(());
-		}
-
-		let len = memory.read_u32(out_len_ptr)?;
-		let buf_len = len.min(buf.len() as u32);
-
-		if let Some(costs) = create_token(buf_len) {
-			self.charge_gas(costs)?;
-		}
-
-		memory.write(out_ptr, &buf[..buf_len as usize])?;
-		memory.write(out_len_ptr, &buf_len.encode())
-	}
-
-	/// Same as `write_sandbox_output` but for static size output.
-	pub fn write_fixed_sandbox_output(
-		&mut self,
-		memory: &mut M,
-		out_ptr: u32,
-		buf: &[u8],
-		allow_skip: bool,
-		create_token: impl FnOnce(u32) -> Option<RuntimeCosts>,
-	) -> Result<(), DispatchError> {
-		if buf.is_empty() || (allow_skip && out_ptr == SENTINEL) {
-			return Ok(());
-		}
-
-		let buf_len = buf.len() as u32;
-		if let Some(costs) = create_token(buf_len) {
-			self.charge_gas(costs)?;
-		}
-
-		memory.write(out_ptr, buf)
-	}
-
-	/// Computes the given hash function on the supplied input.
-	///
-	/// Reads from the sandboxed input buffer into an intermediate buffer.
-	/// Returns the result directly to the output buffer of the sandboxed memory.
-	///
-	/// It is the callers responsibility to provide an output buffer that
-	/// is large enough to hold the expected amount of bytes returned by the
-	/// chosen hash function.
-	///
-	/// # Note
-	///
-	/// The `input` and `output` buffers may overlap.
-	fn compute_hash_on_intermediate_buffer<F, R>(
-		&self,
-		memory: &mut M,
-		hash_fn: F,
-		input_ptr: u32,
-		input_len: u32,
-		output_ptr: u32,
-	) -> Result<(), DispatchError>
-	where
-		F: FnOnce(&[u8]) -> R,
-		R: AsRef<[u8]>,
-	{
-		// Copy input into supervisor memory.
-		let input = memory.read(input_ptr, input_len)?;
-		// Compute the hash on the input buffer using the given hash function.
-		let hash = hash_fn(&input);
-		// Write the resulting hash back into the sandboxed output buffer.
-		memory.write(output_ptr, hash.as_ref())?;
-		Ok(())
-	}
-
-	/// Fallible conversion of a `ExecError` to `ReturnErrorCode`.
-	///
-	/// This is used when converting the error returned from a subcall in order to decide
-	/// whether to trap the caller or allow handling of the error.
-	fn exec_error_into_return_code(from: ExecError) -> Result<ReturnErrorCode, DispatchError> {
-		use crate::exec::ErrorOrigin::Callee;
-		use ReturnErrorCode::*;
-
-		let transfer_failed = Error::<E::T>::TransferFailed.into();
-		let out_of_gas = Error::<E::T>::OutOfGas.into();
-		let out_of_deposit = Error::<E::T>::StorageDepositLimitExhausted.into();
-		let duplicate_contract = Error::<E::T>::DuplicateContract.into();
-		let unsupported_precompile = Error::<E::T>::UnsupportedPrecompileAddress.into();
-
-		// errors in the callee do not trap the caller
-		match (from.error, from.origin) {
-			(err, _) if err == transfer_failed => Ok(TransferFailed),
-			(err, _) if err == duplicate_contract => Ok(DuplicateContractAddress),
-			(err, _) if err == unsupported_precompile => Err(err),
-			(err, Callee) if err == out_of_gas || err == out_of_deposit => Ok(OutOfResources),
-			(_, Callee) => Ok(CalleeTrapped),
-			(err, _) => Err(err),
-		}
-	}
-
-	fn decode_key(&self, memory: &M, key_ptr: u32, key_len: u32) -> Result<Key, TrapReason> {
-		let res = match key_len {
-			SENTINEL => {
-				let mut buffer = [0u8; 32];
-				memory.read_into_buf(key_ptr, buffer.as_mut())?;
-				Ok(Key::from_fixed(buffer))
-			},
-			len => {
-				ensure!(len <= limits::STORAGE_KEY_BYTES, Error::<E::T>::DecodingFailed);
-				let key = memory.read(key_ptr, len)?;
-				Key::try_from_var(key)
-			},
-		};
-
-		res.map_err(|_| Error::<E::T>::DecodingFailed.into())
-	}
-
-	fn is_transient(flags: u32) -> Result<bool, TrapReason> {
-		StorageFlags::from_bits(flags)
-			.ok_or_else(|| <Error<E::T>>::InvalidStorageFlags.into())
-			.map(|flags| flags.contains(StorageFlags::TRANSIENT))
-	}
-
-	fn set_storage(
-		&mut self,
-		memory: &M,
-		flags: u32,
-		key_ptr: u32,
-		key_len: u32,
-		value: StorageValue,
-	) -> Result<u32, TrapReason> {
-		let transient = Self::is_transient(flags)?;
-		let costs = |new_bytes: u32, old_bytes: u32| {
-			if transient {
-				RuntimeCosts::SetTransientStorage { new_bytes, old_bytes }
-			} else {
-				RuntimeCosts::SetStorage { new_bytes, old_bytes }
-			}
-		};
-
-		let value_len = match &value {
-			StorageValue::Memory { ptr: _, len } => *len,
-			StorageValue::Value(data) => data.len() as u32,
-		};
-
-		let max_size = self.ext.max_value_size();
-		let charged = self.charge_gas(costs(value_len, self.ext.max_value_size()))?;
-		if value_len > max_size {
-			return Err(Error::<E::T>::ValueTooLarge.into());
-		}
-
-		let key = self.decode_key(memory, key_ptr, key_len)?;
-
-		let value = match value {
-			StorageValue::Memory { ptr, len } => Some(memory.read(ptr, len)?),
-			StorageValue::Value(data) => Some(data),
-		};
-
-		let write_outcome = if transient {
-			self.ext.set_transient_storage(&key, value, false)?
-		} else {
-			self.ext.set_storage(&key, value, false)?
-		};
-
-		self.adjust_gas(charged, costs(value_len, write_outcome.old_len()));
-		Ok(write_outcome.old_len_with_sentinel())
-	}
-
-	fn clear_storage(
-		&mut self,
-		memory: &M,
-		flags: u32,
-		key_ptr: u32,
-		key_len: u32,
-	) -> Result<u32, TrapReason> {
-		let transient = Self::is_transient(flags)?;
-		let costs = |len| {
-			if transient {
-				RuntimeCosts::ClearTransientStorage(len)
-			} else {
-				RuntimeCosts::ClearStorage(len)
-			}
-		};
-		let charged = self.charge_gas(costs(self.ext.max_value_size()))?;
-		let key = self.decode_key(memory, key_ptr, key_len)?;
-		let outcome = if transient {
-			self.ext.set_transient_storage(&key, None, false)?
-		} else {
-			self.ext.set_storage(&key, None, false)?
-		};
-		self.adjust_gas(charged, costs(outcome.old_len()));
-		Ok(outcome.old_len_with_sentinel())
-	}
-
-	fn get_storage(
-		&mut self,
-		memory: &mut M,
-		flags: u32,
-		key_ptr: u32,
-		key_len: u32,
-		out_ptr: u32,
-		read_mode: StorageReadMode,
-	) -> Result<ReturnErrorCode, TrapReason> {
-		let transient = Self::is_transient(flags)?;
-		let costs = |len| {
-			if transient {
-				RuntimeCosts::GetTransientStorage(len)
-			} else {
-				RuntimeCosts::GetStorage(len)
-			}
-		};
-		let charged = self.charge_gas(costs(self.ext.max_value_size()))?;
-		let key = self.decode_key(memory, key_ptr, key_len)?;
-		let outcome = if transient {
-			self.ext.get_transient_storage(&key)
-		} else {
-			self.ext.get_storage(&key)
-		};
-
-		if let Some(value) = outcome {
-			self.adjust_gas(charged, costs(value.len() as u32));
-
-			match read_mode {
-				StorageReadMode::FixedOutput32 => {
-					let mut fixed_output = [0u8; 32];
-					let len = value.len().min(fixed_output.len());
-					fixed_output[..len].copy_from_slice(&value[..len]);
-
-					self.write_fixed_sandbox_output(
-						memory,
-						out_ptr,
-						&fixed_output,
-						false,
-						already_charged,
-					)?;
-					Ok(ReturnErrorCode::Success)
-				},
-				StorageReadMode::VariableOutput { output_len_ptr: out_len_ptr } => {
-					self.write_sandbox_output(
-						memory,
-						out_ptr,
-						out_len_ptr,
-						&value,
-						false,
-						already_charged,
-					)?;
-					Ok(ReturnErrorCode::Success)
-				},
-			}
-		} else {
-			self.adjust_gas(charged, costs(0));
-
-			match read_mode {
-				StorageReadMode::FixedOutput32 => {
-					self.write_fixed_sandbox_output(
-						memory,
-						out_ptr,
-						&[0u8; 32],
-						false,
-						already_charged,
-					)?;
-					Ok(ReturnErrorCode::Success)
-				},
-				StorageReadMode::VariableOutput { .. } => Ok(ReturnErrorCode::KeyNotFound),
-			}
-		}
-	}
-
-	fn contains_storage(
-		&mut self,
-		memory: &M,
-		flags: u32,
-		key_ptr: u32,
-		key_len: u32,
-	) -> Result<u32, TrapReason> {
-		let transient = Self::is_transient(flags)?;
-		let costs = |len| {
-			if transient {
-				RuntimeCosts::ContainsTransientStorage(len)
-			} else {
-				RuntimeCosts::ContainsStorage(len)
-			}
-		};
-		let charged = self.charge_gas(costs(self.ext.max_value_size()))?;
-		let key = self.decode_key(memory, key_ptr, key_len)?;
-		let outcome = if transient {
-			self.ext.get_transient_storage_size(&key)
-		} else {
-			self.ext.get_storage_size(&key)
-		};
-		self.adjust_gas(charged, costs(outcome.unwrap_or(0)));
-		Ok(outcome.unwrap_or(SENTINEL))
-	}
-
-	fn take_storage(
-		&mut self,
-		memory: &mut M,
-		flags: u32,
-		key_ptr: u32,
-		key_len: u32,
-		out_ptr: u32,
-		out_len_ptr: u32,
-	) -> Result<ReturnErrorCode, TrapReason> {
-		let transient = Self::is_transient(flags)?;
-		let costs = |len| {
-			if transient {
-				RuntimeCosts::TakeTransientStorage(len)
-			} else {
-				RuntimeCosts::TakeStorage(len)
-			}
-		};
-		let charged = self.charge_gas(costs(self.ext.max_value_size()))?;
-		let key = self.decode_key(memory, key_ptr, key_len)?;
-		let outcome = if transient {
-			self.ext.set_transient_storage(&key, None, true)?
-		} else {
-			self.ext.set_storage(&key, None, true)?
-		};
-
-		if let crate::storage::WriteOutcome::Taken(value) = outcome {
-			self.adjust_gas(charged, costs(value.len() as u32));
-			self.write_sandbox_output(
-				memory,
-				out_ptr,
-				out_len_ptr,
-				&value,
-				false,
-				already_charged,
-			)?;
-			Ok(ReturnErrorCode::Success)
-		} else {
-			self.adjust_gas(charged, costs(0));
-			Ok(ReturnErrorCode::KeyNotFound)
-		}
-	}
-
-	fn call(
-		&mut self,
-		memory: &mut M,
-		flags: CallFlags,
-		call_type: CallType,
-		callee_ptr: u32,
-		deposit_ptr: u32,
-		weight: Weight,
-		input_data_ptr: u32,
-		input_data_len: u32,
-		output_ptr: u32,
-		output_len_ptr: u32,
-	) -> Result<ReturnErrorCode, TrapReason> {
-		let callee = memory.read_h160(callee_ptr)?;
-		let precompile = <AllPrecompiles<E::T>>::get::<E>(&callee.as_fixed_bytes());
-		match &precompile {
-			Some(precompile) if precompile.has_contract_info() =>
-				self.charge_gas(RuntimeCosts::PrecompileWithInfoBase)?,
-			Some(_) => self.charge_gas(RuntimeCosts::PrecompileBase)?,
-			None => self.charge_gas(call_type.cost())?,
-		};
-
-		let deposit_limit = memory.read_u256(deposit_ptr)?;
-
-		let input_data = if flags.contains(CallFlags::CLONE_INPUT) {
-			let input = self.input_data.as_ref().ok_or(Error::<E::T>::InputForwarded)?;
-			charge_gas!(self, RuntimeCosts::CallInputCloned(input.len() as u32))?;
-			input.clone()
-		} else if flags.contains(CallFlags::FORWARD_INPUT) {
-			self.input_data.take().ok_or(Error::<E::T>::InputForwarded)?
-		} else {
-			if precompile.is_some() {
-				self.charge_gas(RuntimeCosts::PrecompileDecode(input_data_len))?;
-			} else {
-				self.charge_gas(RuntimeCosts::CopyFromContract(input_data_len))?;
-			}
-			memory.read(input_data_ptr, input_data_len)?
-		};
-
-		let call_outcome = match call_type {
-			CallType::Call { value_ptr } => {
-				let read_only = flags.contains(CallFlags::READ_ONLY);
-				let value = memory.read_u256(value_ptr)?;
-				if value > 0u32.into() {
-					// If the call value is non-zero and state change is not allowed, issue an
-					// error.
-					if read_only || self.ext.is_read_only() {
-						return Err(Error::<E::T>::StateChangeDenied.into());
-					}
-
-					self.charge_gas(RuntimeCosts::CallTransferSurcharge {
-						dust_transfer: Pallet::<E::T>::has_dust(value),
-					})?;
-				}
-				self.ext.call(
-					weight,
-					deposit_limit,
-					&callee,
-					value,
-					input_data,
-					flags.contains(CallFlags::ALLOW_REENTRY),
-					read_only,
-				)
-			},
-			CallType::DelegateCall => {
-				if flags.intersects(CallFlags::ALLOW_REENTRY | CallFlags::READ_ONLY) {
-					return Err(Error::<E::T>::InvalidCallFlags.into());
-				}
-				self.ext.delegate_call(weight, deposit_limit, callee, input_data)
-			},
-		};
-
-		match call_outcome {
-			// `TAIL_CALL` only matters on an `OK` result. Otherwise the call stack comes to
-			// a halt anyways without anymore code being executed.
-			Ok(_) if flags.contains(CallFlags::TAIL_CALL) => {
-				let output = mem::take(self.ext.last_frame_output_mut());
-				return Err(TrapReason::Return(ReturnData {
-					flags: output.flags.bits(),
-					data: output.data,
-				}));
-			},
-			Ok(_) => {
-				let output = mem::take(self.ext.last_frame_output_mut());
-				let write_result = self.write_sandbox_output(
-					memory,
-					output_ptr,
-					output_len_ptr,
-					&output.data,
-					true,
-					|len| Some(RuntimeCosts::CopyToContract(len)),
-				);
-				*self.ext.last_frame_output_mut() = output;
-				write_result?;
-				Ok(self.ext.last_frame_output().into())
-			},
-			Err(err) => {
-				let error_code = Self::exec_error_into_return_code(err)?;
-				memory.write(output_len_ptr, &0u32.to_le_bytes())?;
-				Ok(error_code)
-			},
-		}
-	}
-
-	fn instantiate(
-		&mut self,
-		memory: &mut M,
-		code_hash_ptr: u32,
-		weight: Weight,
-		deposit_ptr: u32,
-		value_ptr: u32,
-		input_data_ptr: u32,
-		input_data_len: u32,
-		address_ptr: u32,
-		output_ptr: u32,
-		output_len_ptr: u32,
-		salt_ptr: u32,
-	) -> Result<ReturnErrorCode, TrapReason> {
-		let value = match memory.read_u256(value_ptr) {
-			Ok(value) => {
-				self.charge_gas(RuntimeCosts::Instantiate {
-					input_data_len,
-					balance_transfer: Pallet::<E::T>::has_balance(value),
-					dust_transfer: Pallet::<E::T>::has_dust(value),
-				})?;
-				value
-			},
-			Err(err) => {
-				self.charge_gas(RuntimeCosts::Instantiate {
-					input_data_len: 0,
-					balance_transfer: false,
-					dust_transfer: false,
-				})?;
-				return Err(err.into());
-			},
-		};
-		let deposit_limit: U256 = memory.read_u256(deposit_ptr)?;
-		let code_hash = memory.read_h256(code_hash_ptr)?;
-		let input_data = memory.read(input_data_ptr, input_data_len)?;
-		let salt = if salt_ptr == SENTINEL {
-			None
-		} else {
-			let salt: [u8; 32] = memory.read_array(salt_ptr)?;
-			Some(salt)
-		};
-
-		match self.ext.instantiate(
-			weight,
-			deposit_limit,
-			code_hash,
-			value,
-			input_data,
-			salt.as_ref(),
-		) {
-			Ok(address) => {
-				if !self.ext.last_frame_output().flags.contains(ReturnFlags::REVERT) {
-					self.write_fixed_sandbox_output(
-						memory,
-						address_ptr,
-						&address.as_bytes(),
-						true,
-						already_charged,
-					)?;
-				}
-				let output = mem::take(self.ext.last_frame_output_mut());
-				let write_result = self.write_sandbox_output(
-					memory,
-					output_ptr,
-					output_len_ptr,
-					&output.data,
-					true,
-					|len| Some(RuntimeCosts::CopyToContract(len)),
-				);
-				*self.ext.last_frame_output_mut() = output;
-				write_result?;
-				Ok(self.ext.last_frame_output().into())
-			},
-			Err(err) => Ok(Self::exec_error_into_return_code(err)?),
-		}
-	}
-}
-
-// This is the API exposed to contracts.
-//
-// # Note
-//
-// Any input that leads to a out of bound error (reading or writing) or failing to decode
-// data passed to the supervisor will lead to a trap. This is not documented explicitly
-// for every function.
-#[define_env]
-pub mod env {
-	/// Noop function used to benchmark the time it takes to execute an empty function.
-	///
-	/// Marked as stable because it needs to be called from benchmarks even when the benchmarked
-	/// parachain has unstable functions disabled.
-	#[cfg(feature = "runtime-benchmarks")]
-	#[stable]
-	fn noop(&mut self, memory: &mut M) -> Result<(), TrapReason> {
-		Ok(())
-	}
-
-	/// Set the value at the given key in the contract storage.
-	/// See [`pallet_revive_uapi::HostFn::set_storage_v2`]
-	#[stable]
-	#[mutating]
-	fn set_storage(
-		&mut self,
-		memory: &mut M,
-		flags: u32,
-		key_ptr: u32,
-		key_len: u32,
-		value_ptr: u32,
-		value_len: u32,
-	) -> Result<u32, TrapReason> {
-		self.set_storage(
-			memory,
-			flags,
-			key_ptr,
-			key_len,
-			StorageValue::Memory { ptr: value_ptr, len: value_len },
-		)
-	}
-
-	/// Sets the storage at a fixed 256-bit key with a fixed 256-bit value.
-	/// See [`pallet_revive_uapi::HostFn::set_storage_or_clear`].
-	#[stable]
-	#[mutating]
-	fn set_storage_or_clear(
-		&mut self,
-		memory: &mut M,
-		flags: u32,
-		key_ptr: u32,
-		value_ptr: u32,
-	) -> Result<u32, TrapReason> {
-		let value = memory.read(value_ptr, 32)?;
-
-		if value.iter().all(|&b| b == 0) {
-			self.clear_storage(memory, flags, key_ptr, SENTINEL)
-		} else {
-			self.set_storage(memory, flags, key_ptr, SENTINEL, StorageValue::Value(value))
-		}
-	}
-
-	/// Retrieve the value under the given key from storage.
-	/// See [`pallet_revive_uapi::HostFn::get_storage`]
-	#[stable]
-	fn get_storage(
-		&mut self,
-		memory: &mut M,
-		flags: u32,
-		key_ptr: u32,
-		key_len: u32,
-		out_ptr: u32,
-		out_len_ptr: u32,
-	) -> Result<ReturnErrorCode, TrapReason> {
-		self.get_storage(
-			memory,
-			flags,
-			key_ptr,
-			key_len,
-			out_ptr,
-			StorageReadMode::VariableOutput { output_len_ptr: out_len_ptr },
-		)
-	}
-
-	/// Reads the storage at a fixed 256-bit key and writes back a fixed 256-bit value.
-	/// See [`pallet_revive_uapi::HostFn::get_storage_or_zero`].
-	#[stable]
-	fn get_storage_or_zero(
-		&mut self,
-		memory: &mut M,
-		flags: u32,
-		key_ptr: u32,
-		out_ptr: u32,
-	) -> Result<(), TrapReason> {
-		let _ = self.get_storage(
-			memory,
-			flags,
-			key_ptr,
-			SENTINEL,
-			out_ptr,
-			StorageReadMode::FixedOutput32,
-		)?;
-
-		Ok(())
-	}
-
-	/// Make a call to another contract.
-	/// See [`pallet_revive_uapi::HostFn::call`].
-	#[stable]
-	fn call(
-		&mut self,
-		memory: &mut M,
-		flags_and_callee: u64,
-		ref_time_limit: u64,
-		proof_size_limit: u64,
-		deposit_and_value: u64,
-		input_data: u64,
-		output_data: u64,
-	) -> Result<ReturnErrorCode, TrapReason> {
-		let (flags, callee_ptr) = extract_hi_lo(flags_and_callee);
-		let (deposit_ptr, value_ptr) = extract_hi_lo(deposit_and_value);
-		let (input_data_len, input_data_ptr) = extract_hi_lo(input_data);
-		let (output_len_ptr, output_ptr) = extract_hi_lo(output_data);
-
-		self.call(
-			memory,
-			CallFlags::from_bits(flags).ok_or(Error::<E::T>::InvalidCallFlags)?,
-			CallType::Call { value_ptr },
-			callee_ptr,
-			deposit_ptr,
-			Weight::from_parts(ref_time_limit, proof_size_limit),
-			input_data_ptr,
-			input_data_len,
-			output_ptr,
-			output_len_ptr,
-		)
-	}
-
-	/// Execute code in the context (storage, caller, value) of the current contract.
-	/// See [`pallet_revive_uapi::HostFn::delegate_call`].
-	#[stable]
-	fn delegate_call(
-		&mut self,
-		memory: &mut M,
-		flags_and_callee: u64,
-		ref_time_limit: u64,
-		proof_size_limit: u64,
-		deposit_ptr: u32,
-		input_data: u64,
-		output_data: u64,
-	) -> Result<ReturnErrorCode, TrapReason> {
-		let (flags, address_ptr) = extract_hi_lo(flags_and_callee);
-		let (input_data_len, input_data_ptr) = extract_hi_lo(input_data);
-		let (output_len_ptr, output_ptr) = extract_hi_lo(output_data);
-
-		self.call(
-			memory,
-			CallFlags::from_bits(flags).ok_or(Error::<E::T>::InvalidCallFlags)?,
-			CallType::DelegateCall,
-			address_ptr,
-			deposit_ptr,
-			Weight::from_parts(ref_time_limit, proof_size_limit),
-			input_data_ptr,
-			input_data_len,
-			output_ptr,
-			output_len_ptr,
-		)
-	}
-
-	/// Instantiate a contract with the specified code hash.
-	/// See [`pallet_revive_uapi::HostFn::instantiate`].
-	#[stable]
-	#[mutating]
-	fn instantiate(
-		&mut self,
-		memory: &mut M,
-		ref_time_limit: u64,
-		proof_size_limit: u64,
-		deposit_and_value: u64,
-		input_data: u64,
-		output_data: u64,
-		address_and_salt: u64,
-	) -> Result<ReturnErrorCode, TrapReason> {
-		let (deposit_ptr, value_ptr) = extract_hi_lo(deposit_and_value);
-		let (input_data_len, code_hash_ptr) = extract_hi_lo(input_data);
-		let (output_len_ptr, output_ptr) = extract_hi_lo(output_data);
-		let (address_ptr, salt_ptr) = extract_hi_lo(address_and_salt);
-		let Some(input_data_ptr) = code_hash_ptr.checked_add(32) else {
-			return Err(Error::<E::T>::OutOfBounds.into());
-		};
-		let Some(input_data_len) = input_data_len.checked_sub(32) else {
-			return Err(Error::<E::T>::OutOfBounds.into());
-		};
-
-		self.instantiate(
-			memory,
-			code_hash_ptr,
-			Weight::from_parts(ref_time_limit, proof_size_limit),
-			deposit_ptr,
-			value_ptr,
-			input_data_ptr,
-			input_data_len,
-			address_ptr,
-			output_ptr,
-			output_len_ptr,
-			salt_ptr,
-		)
-	}
-
-	/// Returns the total size of the contract call input data.
-	/// See [`pallet_revive_uapi::HostFn::call_data_size `].
-	#[stable]
-	fn call_data_size(&mut self, memory: &mut M) -> Result<u64, TrapReason> {
-		self.charge_gas(RuntimeCosts::CallDataSize)?;
-		Ok(self
-			.input_data
-			.as_ref()
-			.map(|input| input.len().try_into().expect("usize fits into u64; qed"))
-			.unwrap_or_default())
-	}
-
-	/// Stores the input passed by the caller into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::call_data_copy`].
-	#[stable]
-	fn call_data_copy(
-		&mut self,
-		memory: &mut M,
-		out_ptr: u32,
-		out_len: u32,
-		offset: u32,
-	) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::CallDataCopy(out_len))?;
-
-		let Some(input) = self.input_data.as_ref() else {
-			return Err(Error::<E::T>::InputForwarded.into());
-		};
-
-		let start = offset as usize;
-		if start >= input.len() {
-			memory.zero(out_ptr, out_len)?;
-			return Ok(());
-		}
-
-		let end = start.saturating_add(out_len as usize).min(input.len());
-		memory.write(out_ptr, &input[start..end])?;
-
-		let bytes_written = (end - start) as u32;
-		memory.zero(out_ptr.saturating_add(bytes_written), out_len - bytes_written)?;
-
-		Ok(())
-	}
-
-	/// Stores the U256 value at given call input `offset` into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::call_data_load`].
-	#[stable]
-	fn call_data_load(
-		&mut self,
-		memory: &mut M,
-		out_ptr: u32,
-		offset: u32,
-	) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::CallDataLoad)?;
-
-		let Some(input) = self.input_data.as_ref() else {
-			return Err(Error::<E::T>::InputForwarded.into());
-		};
-
-		let mut data = [0; 32];
-		let start = offset as usize;
-		let data = if start >= input.len() {
-			data // Any index is valid to request; OOB offsets return zero.
-		} else {
-			let end = start.saturating_add(32).min(input.len());
-			data[..end - start].copy_from_slice(&input[start..end]);
-			data.reverse();
-			data // Solidity expects right-padded data
-		};
-
-		self.write_fixed_sandbox_output(memory, out_ptr, &data, false, already_charged)?;
-
-		Ok(())
-	}
-
-	/// Cease contract execution and save a data buffer as a result of the execution.
-	/// See [`pallet_revive_uapi::HostFn::return_value`].
-	#[stable]
-	fn seal_return(
-		&mut self,
-		memory: &mut M,
-		flags: u32,
-		data_ptr: u32,
-		data_len: u32,
-	) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::CopyFromContract(data_len))?;
-		Err(TrapReason::Return(ReturnData { flags, data: memory.read(data_ptr, data_len)? }))
-	}
-
-	/// Stores the address of the caller into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::caller`].
-	#[stable]
-	fn caller(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::Caller)?;
-		let caller = <E::T as Config>::AddressMapper::to_address(self.ext.caller().account_id()?);
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			caller.as_bytes(),
-			false,
-			already_charged,
-		)?)
-	}
-
-	/// Stores the address of the call stack origin into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::origin`].
-	#[stable]
-	fn origin(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::Origin)?;
-		let origin = <E::T as Config>::AddressMapper::to_address(self.ext.origin().account_id()?);
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			origin.as_bytes(),
-			false,
-			already_charged,
-		)?)
-	}
-
-	/// Retrieve the code hash for a specified contract address.
-	/// See [`pallet_revive_uapi::HostFn::code_hash`].
-	#[stable]
-	fn code_hash(&mut self, memory: &mut M, addr_ptr: u32, out_ptr: u32) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::CodeHash)?;
-		let address = memory.read_h160(addr_ptr)?;
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			&self.ext.code_hash(&address).as_bytes(),
-			false,
-			already_charged,
-		)?)
-	}
-
-	/// Retrieve the code size for a given contract address.
-	/// See [`pallet_revive_uapi::HostFn::code_size`].
-	#[stable]
-	fn code_size(&mut self, memory: &mut M, addr_ptr: u32) -> Result<u64, TrapReason> {
-		self.charge_gas(RuntimeCosts::CodeSize)?;
-		let address = memory.read_h160(addr_ptr)?;
-		Ok(self.ext.code_size(&address))
-	}
-
-	/// Stores the address of the current contract into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::address`].
-	#[stable]
-	fn address(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::Address)?;
-		let address = self.ext.address();
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			address.as_bytes(),
-			false,
-			already_charged,
-		)?)
-	}
-
-	/// Stores the price for the specified amount of weight into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::weight_to_fee`].
-	#[stable]
-	fn weight_to_fee(
-		&mut self,
-		memory: &mut M,
-		ref_time_limit: u64,
-		proof_size_limit: u64,
-		out_ptr: u32,
-	) -> Result<(), TrapReason> {
-		let weight = Weight::from_parts(ref_time_limit, proof_size_limit);
-		self.charge_gas(RuntimeCosts::WeightToFee)?;
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			&self.ext.get_weight_price(weight).encode(),
-			false,
-			already_charged,
-		)?)
-	}
-
-	/// Stores the immutable data into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::get_immutable_data`].
-	#[stable]
-	fn get_immutable_data(
-		&mut self,
-		memory: &mut M,
-		out_ptr: u32,
-		out_len_ptr: u32,
-	) -> Result<(), TrapReason> {
-		// quering the length is free as it is stored with the contract metadata
-		let len = self.ext.immutable_data_len();
-		self.charge_gas(RuntimeCosts::GetImmutableData(len))?;
-		let data = self.ext.get_immutable_data()?;
-		self.write_sandbox_output(memory, out_ptr, out_len_ptr, &data, false, already_charged)?;
-		Ok(())
-	}
-
-	/// Attaches the supplied immutable data to the currently executing contract.
-	/// See [`pallet_revive_uapi::HostFn::set_immutable_data`].
-	#[stable]
-	fn set_immutable_data(&mut self, memory: &mut M, ptr: u32, len: u32) -> Result<(), TrapReason> {
-		if len > limits::IMMUTABLE_BYTES {
-			return Err(Error::<E::T>::OutOfBounds.into());
-		}
-		self.charge_gas(RuntimeCosts::SetImmutableData(len))?;
-		let buf = memory.read(ptr, len)?;
-		let data = buf.try_into().expect("bailed out earlier; qed");
-		self.ext.set_immutable_data(data)?;
-		Ok(())
-	}
-
-	/// Stores the *free* balance of the current account into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::balance`].
-	#[stable]
-	fn balance(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::Balance)?;
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			&self.ext.balance().to_little_endian(),
-			false,
-			already_charged,
-		)?)
-	}
-
-	/// Stores the *free* balance of the supplied address into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::balance`].
-	#[stable]
-	fn balance_of(
-		&mut self,
-		memory: &mut M,
-		addr_ptr: u32,
-		out_ptr: u32,
-	) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::BalanceOf)?;
-		let address = memory.read_h160(addr_ptr)?;
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			&self.ext.balance_of(&address).to_little_endian(),
-			false,
-			already_charged,
-		)?)
-	}
-
-	/// Returns the chain ID.
-	/// See [`pallet_revive_uapi::HostFn::chain_id`].
-	#[stable]
-	fn chain_id(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			&U256::from(<E::T as Config>::ChainId::get()).to_little_endian(),
-			false,
-			|_| Some(RuntimeCosts::CopyToContract(32)),
-		)?)
-	}
-
-	/// Returns the block ref_time limit.
-	/// See [`pallet_revive_uapi::HostFn::gas_limit`].
-	#[stable]
-	fn gas_limit(&mut self, memory: &mut M) -> Result<u64, TrapReason> {
-		self.charge_gas(RuntimeCosts::GasLimit)?;
-		Ok(<E::T as frame_system::Config>::BlockWeights::get().max_block.ref_time())
-	}
-
-	/// Stores the value transferred along with this call/instantiate into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::value_transferred`].
-	#[stable]
-	fn value_transferred(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::ValueTransferred)?;
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			&self.ext.value_transferred().to_little_endian(),
-			false,
-			already_charged,
-		)?)
-	}
-
-	/// Returns the simulated ethereum `GASPRICE` value.
-	/// See [`pallet_revive_uapi::HostFn::gas_price`].
-	#[stable]
-	fn gas_price(&mut self, memory: &mut M) -> Result<u64, TrapReason> {
-		self.charge_gas(RuntimeCosts::GasPrice)?;
-		Ok(GAS_PRICE.into())
-	}
-
-	/// Returns the simulated ethereum `BASEFEE` value.
-	/// See [`pallet_revive_uapi::HostFn::base_fee`].
-	#[stable]
-	fn base_fee(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::BaseFee)?;
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			&U256::zero().to_little_endian(),
-			false,
-			already_charged,
-		)?)
-	}
-
-	/// Load the latest block timestamp into the supplied buffer
-	/// See [`pallet_revive_uapi::HostFn::now`].
-	#[stable]
-	fn now(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::Now)?;
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			&self.ext.now().to_little_endian(),
-			false,
-			already_charged,
-		)?)
-	}
-
-	/// Deposit a contract event with the data buffer and optional list of topics.
-	/// See [pallet_revive_uapi::HostFn::deposit_event]
-	#[stable]
-	#[mutating]
-	fn deposit_event(
-		&mut self,
-		memory: &mut M,
-		topics_ptr: u32,
-		num_topic: u32,
-		data_ptr: u32,
-		data_len: u32,
-	) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::DepositEvent { num_topic, len: data_len })?;
-
-		if num_topic > limits::NUM_EVENT_TOPICS {
-			return Err(Error::<E::T>::TooManyTopics.into());
-		}
-
-		if data_len > self.ext.max_value_size() {
-			return Err(Error::<E::T>::ValueTooLarge.into());
-		}
-
-		let topics: Vec<H256> = match num_topic {
-			0 => Vec::new(),
-			_ => {
-				let mut v = Vec::with_capacity(num_topic as usize);
-				let topics_len = num_topic * H256::len_bytes() as u32;
-				let buf = memory.read(topics_ptr, topics_len)?;
-				for chunk in buf.chunks_exact(H256::len_bytes()) {
-					v.push(H256::from_slice(chunk));
-				}
-				v
-			},
-		};
-
-		let event_data = memory.read(data_ptr, data_len)?;
-		self.ext.deposit_event(topics, event_data);
-		Ok(())
-	}
-
-	/// Stores the current block number of the current contract into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::block_number`].
-	#[stable]
-	fn block_number(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::BlockNumber)?;
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			&self.ext.block_number().to_little_endian(),
-			false,
-			already_charged,
-		)?)
-	}
-
-	/// Stores the block hash at given block height into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::block_hash`].
-	#[stable]
-	fn block_hash(
-		&mut self,
-		memory: &mut M,
-		block_number_ptr: u32,
-		out_ptr: u32,
-	) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::BlockHash)?;
-		let block_number = memory.read_u256(block_number_ptr)?;
-		let block_hash = self.ext.block_hash(block_number).unwrap_or(H256::zero());
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			&block_hash.as_bytes(),
-			false,
-			already_charged,
-		)?)
-	}
-
-	/// Stores the current block author into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::block_author`].
-	#[stable]
-	fn block_author(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::BlockAuthor)?;
-		let block_author = self.ext.block_author().unwrap_or(H160::zero());
-
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			&block_author.as_bytes(),
-			false,
-			already_charged,
-		)?)
-	}
-
-	/// Computes the KECCAK 256-bit hash on the given input buffer.
-	/// See [`pallet_revive_uapi::HostFn::hash_keccak_256`].
-	#[stable]
-	fn hash_keccak_256(
-		&mut self,
-		memory: &mut M,
-		input_ptr: u32,
-		input_len: u32,
-		output_ptr: u32,
-	) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::HashKeccak256(input_len))?;
-		Ok(self.compute_hash_on_intermediate_buffer(
-			memory, keccak_256, input_ptr, input_len, output_ptr,
-		)?)
-	}
-
-	/// Stores the length of the data returned by the last call into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::return_data_size`].
-	#[stable]
-	fn return_data_size(&mut self, memory: &mut M) -> Result<u64, TrapReason> {
-		self.charge_gas(RuntimeCosts::ReturnDataSize)?;
-		Ok(self
-			.ext
-			.last_frame_output()
-			.data
-			.len()
-			.try_into()
-			.expect("usize fits into u64; qed"))
-	}
-
-	/// Stores data returned by the last call, starting from `offset`, into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::return_data`].
-	#[stable]
-	fn return_data_copy(
-		&mut self,
-		memory: &mut M,
-		out_ptr: u32,
-		out_len_ptr: u32,
-		offset: u32,
-	) -> Result<(), TrapReason> {
-		let output = mem::take(self.ext.last_frame_output_mut());
-		let result = if offset as usize > output.data.len() {
-			Err(Error::<E::T>::OutOfBounds.into())
-		} else {
-			self.write_sandbox_output(
-				memory,
-				out_ptr,
-				out_len_ptr,
-				&output.data[offset as usize..],
-				false,
-				|len| Some(RuntimeCosts::CopyToContract(len)),
-			)
-		};
-		*self.ext.last_frame_output_mut() = output;
-		Ok(result?)
-	}
-
-	/// Returns the amount of ref_time left.
-	/// See [`pallet_revive_uapi::HostFn::ref_time_left`].
-	#[stable]
-	fn ref_time_left(&mut self, memory: &mut M) -> Result<u64, TrapReason> {
-		self.charge_gas(RuntimeCosts::RefTimeLeft)?;
-		Ok(self.ext.gas_meter().gas_left().ref_time())
-	}
-
-	/// Checks whether the caller of the current contract is the origin of the whole call stack.
-	/// See [`pallet_revive_uapi::HostFn::caller_is_origin`].
-	fn caller_is_origin(&mut self, _memory: &mut M) -> Result<u32, TrapReason> {
-		self.charge_gas(RuntimeCosts::CallerIsOrigin)?;
-		Ok(self.ext.caller_is_origin() as u32)
-	}
-
-	/// Checks whether the caller of the current contract is root.
-	/// See [`pallet_revive_uapi::HostFn::caller_is_root`].
-	fn caller_is_root(&mut self, _memory: &mut M) -> Result<u32, TrapReason> {
-		self.charge_gas(RuntimeCosts::CallerIsRoot)?;
-		Ok(self.ext.caller_is_root() as u32)
-	}
-
-	/// Clear the value at the given key in the contract storage.
-	/// See [`pallet_revive_uapi::HostFn::clear_storage`]
-	#[mutating]
-	fn clear_storage(
-		&mut self,
-		memory: &mut M,
-		flags: u32,
-		key_ptr: u32,
-		key_len: u32,
-	) -> Result<u32, TrapReason> {
-		self.clear_storage(memory, flags, key_ptr, key_len)
-	}
-
-	/// Checks whether there is a value stored under the given key.
-	/// See [`pallet_revive_uapi::HostFn::contains_storage`]
-	fn contains_storage(
-		&mut self,
-		memory: &mut M,
-		flags: u32,
-		key_ptr: u32,
-		key_len: u32,
-	) -> Result<u32, TrapReason> {
-		self.contains_storage(memory, flags, key_ptr, key_len)
-	}
-
-	/// Calculates Ethereum address from the ECDSA compressed public key and stores
-	/// See [`pallet_revive_uapi::HostFn::ecdsa_to_eth_address`].
-	fn ecdsa_to_eth_address(
-		&mut self,
-		memory: &mut M,
-		key_ptr: u32,
-		out_ptr: u32,
-	) -> Result<ReturnErrorCode, TrapReason> {
-		self.charge_gas(RuntimeCosts::EcdsaToEthAddress)?;
-		let mut compressed_key: [u8; 33] = [0; 33];
-		memory.read_into_buf(key_ptr, &mut compressed_key)?;
-		let result = self.ext.ecdsa_to_eth_address(&compressed_key);
-		match result {
-			Ok(eth_address) => {
-				memory.write(out_ptr, eth_address.as_ref())?;
-				Ok(ReturnErrorCode::Success)
-			},
-			Err(_) => Ok(ReturnErrorCode::EcdsaRecoveryFailed),
-		}
-	}
-
-	/// Computes the BLAKE2 128-bit hash on the given input buffer.
-	/// See [`pallet_revive_uapi::HostFn::hash_blake2_128`].
-	fn hash_blake2_128(
-		&mut self,
-		memory: &mut M,
-		input_ptr: u32,
-		input_len: u32,
-		output_ptr: u32,
-	) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::HashBlake128(input_len))?;
-		Ok(self.compute_hash_on_intermediate_buffer(
-			memory, blake2_128, input_ptr, input_len, output_ptr,
-		)?)
-	}
-
-	/// Computes the BLAKE2 256-bit hash on the given input buffer.
-	/// See [`pallet_revive_uapi::HostFn::hash_blake2_256`].
-	fn hash_blake2_256(
-		&mut self,
-		memory: &mut M,
-		input_ptr: u32,
-		input_len: u32,
-		output_ptr: u32,
-	) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::HashBlake256(input_len))?;
-		Ok(self.compute_hash_on_intermediate_buffer(
-			memory, blake2_256, input_ptr, input_len, output_ptr,
-		)?)
-	}
-
-	/// Stores the minimum balance (a.k.a. existential deposit) into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::minimum_balance`].
-	fn minimum_balance(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::MinimumBalance)?;
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			&self.ext.minimum_balance().to_little_endian(),
-			false,
-			already_charged,
-		)?)
-	}
-
-	/// Retrieve the code hash of the currently executing contract.
-	/// See [`pallet_revive_uapi::HostFn::own_code_hash`].
-	fn own_code_hash(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::OwnCodeHash)?;
-		let code_hash = *self.ext.own_code_hash();
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			code_hash.as_bytes(),
-			false,
-			already_charged,
-		)?)
-	}
-
-	/// Replace the contract code at the specified address with new code.
-	/// See [`pallet_revive_uapi::HostFn::set_code_hash`].
-	///
-	/// Disabled until the internal implementation takes care of collecting
-	/// the immutable data of the new code hash.
-	#[mutating]
-	fn set_code_hash(&mut self, memory: &mut M, code_hash_ptr: u32) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::SetCodeHash)?;
-		let code_hash: H256 = memory.read_h256(code_hash_ptr)?;
-		self.ext.set_code_hash(code_hash)?;
-		Ok(())
-	}
-
-	/// Verify a sr25519 signature
-	/// See [`pallet_revive_uapi::HostFn::sr25519_verify`].
-	fn sr25519_verify(
-		&mut self,
-		memory: &mut M,
-		signature_ptr: u32,
-		pub_key_ptr: u32,
-		message_len: u32,
-		message_ptr: u32,
-	) -> Result<ReturnErrorCode, TrapReason> {
-		self.charge_gas(RuntimeCosts::Sr25519Verify(message_len))?;
-
-		let mut signature: [u8; 64] = [0; 64];
-		memory.read_into_buf(signature_ptr, &mut signature)?;
-
-		let mut pub_key: [u8; 32] = [0; 32];
-		memory.read_into_buf(pub_key_ptr, &mut pub_key)?;
-
-		let message: Vec<u8> = memory.read(message_ptr, message_len)?;
-
-		if self.ext.sr25519_verify(&signature, &message, &pub_key) {
-			Ok(ReturnErrorCode::Success)
-		} else {
-			Ok(ReturnErrorCode::Sr25519VerifyFailed)
-		}
-	}
-
-	/// Retrieve and remove the value under the given key from storage.
-	/// See [`pallet_revive_uapi::HostFn::take_storage`]
-	#[mutating]
-	fn take_storage(
-		&mut self,
-		memory: &mut M,
-		flags: u32,
-		key_ptr: u32,
-		key_len: u32,
-		out_ptr: u32,
-		out_len_ptr: u32,
-	) -> Result<ReturnErrorCode, TrapReason> {
-		self.take_storage(memory, flags, key_ptr, key_len, out_ptr, out_len_ptr)
-	}
-
-	/// Remove the calling account and transfer remaining **free** balance.
-	/// See [`pallet_revive_uapi::HostFn::terminate`].
-	#[mutating]
-	fn terminate(&mut self, memory: &mut M, beneficiary_ptr: u32) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::Terminate)?;
-		let beneficiary = memory.read_h160(beneficiary_ptr)?;
-		self.ext.terminate(&beneficiary)?;
-		Err(TrapReason::Termination)
-	}
-
-	/// Stores the amount of weight left into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::weight_left`].
-	fn weight_left(
-		&mut self,
-		memory: &mut M,
-		out_ptr: u32,
-		out_len_ptr: u32,
-	) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::WeightLeft)?;
-		let gas_left = &self.ext.gas_meter().gas_left().encode();
-		Ok(self.write_sandbox_output(
-			memory,
-			out_ptr,
-			out_len_ptr,
-			gas_left,
-			false,
-			already_charged,
-		)?)
-	}
-
-	/// Retrieves the account id for a specified contract address.
-	///
-	/// See [`pallet_revive_uapi::HostFn::to_account_id`].
-	fn to_account_id(
-		&mut self,
-		memory: &mut M,
-		addr_ptr: u32,
-		out_ptr: u32,
-	) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::ToAccountId)?;
-		let address = memory.read_h160(addr_ptr)?;
-		let account_id = self.ext.to_account_id(&address);
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			&account_id.encode(),
-			false,
-			already_charged,
-		)?)
-	}
-}
diff --git a/substrate/frame/revive/src/vm/runtime_costs.rs b/substrate/frame/revive/src/vm/runtime_costs.rs
new file mode 100644
index 000000000000..dac950f863a8
--- /dev/null
+++ b/substrate/frame/revive/src/vm/runtime_costs.rs
@@ -0,0 +1,299 @@
+use crate::{Config, gas::Token, weights::WeightInfo};
+use frame_support::weights::Weight;
+
+#[cfg_attr(test, derive(Debug, PartialEq, Eq))]
+#[derive(Copy, Clone)]
+pub enum RuntimeCosts {
+	/// Base Weight of calling a host function.
+	HostFn,
+	/// Weight charged for copying data from the sandbox.
+	CopyFromContract(u32),
+	/// Weight charged for copying data to the sandbox.
+	CopyToContract(u32),
+	/// Weight of calling `seal_call_data_load``.
+	CallDataLoad,
+	/// Weight of calling `seal_call_data_copy`.
+	CallDataCopy(u32),
+	/// Weight of calling `seal_caller`.
+	Caller,
+	/// Weight of calling `seal_call_data_size`.
+	CallDataSize,
+	/// Weight of calling `seal_return_data_size`.
+	ReturnDataSize,
+	/// Weight of calling `seal_to_account_id`.
+	ToAccountId,
+	/// Weight of calling `seal_origin`.
+	Origin,
+	/// Weight of calling `seal_code_hash`.
+	CodeHash,
+	/// Weight of calling `seal_own_code_hash`.
+	OwnCodeHash,
+	/// Weight of calling `seal_code_size`.
+	CodeSize,
+	/// Weight of calling `seal_caller_is_origin`.
+	CallerIsOrigin,
+	/// Weight of calling `caller_is_root`.
+	CallerIsRoot,
+	/// Weight of calling `seal_address`.
+	Address,
+	/// Weight of calling `seal_ref_time_left`.
+	RefTimeLeft,
+	/// Weight of calling `seal_weight_left`.
+	WeightLeft,
+	/// Weight of calling `seal_balance`.
+	Balance,
+	/// Weight of calling `seal_balance_of`.
+	BalanceOf,
+	/// Weight of calling `seal_value_transferred`.
+	ValueTransferred,
+	/// Weight of calling `seal_minimum_balance`.
+	MinimumBalance,
+	/// Weight of calling `seal_block_number`.
+	BlockNumber,
+	/// Weight of calling `seal_block_hash`.
+	BlockHash,
+	/// Weight of calling `seal_block_author`.
+	BlockAuthor,
+	/// Weight of calling `seal_gas_price`.
+	GasPrice,
+	/// Weight of calling `seal_base_fee`.
+	BaseFee,
+	/// Weight of calling `seal_now`.
+	Now,
+	/// Weight of calling `seal_gas_limit`.
+	GasLimit,
+	/// Weight of calling `seal_weight_to_fee`.
+	WeightToFee,
+	/// Weight of calling `seal_terminate`.
+	Terminate,
+	/// Weight of calling `seal_deposit_event` with the given number of topics and event size.
+	DepositEvent { num_topic: u32, len: u32 },
+	/// Weight of calling `seal_set_storage` for the given storage item sizes.
+	SetStorage { old_bytes: u32, new_bytes: u32 },
+	/// Weight of calling `seal_clear_storage` per cleared byte.
+	ClearStorage(u32),
+	/// Weight of calling `seal_contains_storage` per byte of the checked item.
+	ContainsStorage(u32),
+	/// Weight of calling `seal_get_storage` with the specified size in storage.
+	GetStorage(u32),
+	/// Weight of calling `seal_take_storage` for the given size.
+	TakeStorage(u32),
+	/// Weight of calling `seal_set_transient_storage` for the given storage item sizes.
+	SetTransientStorage { old_bytes: u32, new_bytes: u32 },
+	/// Weight of calling `seal_clear_transient_storage` per cleared byte.
+	ClearTransientStorage(u32),
+	/// Weight of calling `seal_contains_transient_storage` per byte of the checked item.
+	ContainsTransientStorage(u32),
+	/// Weight of calling `seal_get_transient_storage` with the specified size in storage.
+	GetTransientStorage(u32),
+	/// Weight of calling `seal_take_transient_storage` for the given size.
+	TakeTransientStorage(u32),
+	/// Base weight of calling `seal_call`.
+	CallBase,
+	/// Weight of calling `seal_delegate_call` for the given input size.
+	DelegateCallBase,
+	/// Weight of calling a precompile.
+	PrecompileBase,
+	/// Weight of calling a precompile that has a contract info.
+	PrecompileWithInfoBase,
+	/// Weight of reading and decoding the input to a precompile.
+	PrecompileDecode(u32),
+	/// Weight of the transfer performed during a call.
+	/// parameter `dust_transfer` indicates whether the transfer has a `dust` value.
+	CallTransferSurcharge { dust_transfer: bool },
+	/// Weight per byte that is cloned by supplying the `CLONE_INPUT` flag.
+	CallInputCloned(u32),
+	/// Weight of calling `seal_instantiate`.
+	Instantiate { input_data_len: u32, balance_transfer: bool, dust_transfer: bool },
+	/// Weight of calling `Ripemd160` precompile for the given input size.
+	Ripemd160(u32),
+	/// Weight of calling `Sha256` precompile for the given input size.
+	HashSha256(u32),
+	/// Weight of calling `seal_hash_keccak_256` for the given input size.
+	HashKeccak256(u32),
+	/// Weight of calling `seal_hash_blake2_256` for the given input size.
+	HashBlake256(u32),
+	/// Weight of calling `seal_hash_blake2_128` for the given input size.
+	HashBlake128(u32),
+	/// Weight of calling `ECERecover` precompile.
+	EcdsaRecovery,
+	/// Weight of calling `seal_sr25519_verify` for the given input size.
+	Sr25519Verify(u32),
+	/// Weight charged by a precompile.
+	Precompile(Weight),
+	/// Weight of calling `seal_set_code_hash`
+	SetCodeHash,
+	/// Weight of calling `ecdsa_to_eth_address`
+	EcdsaToEthAddress,
+	/// Weight of calling `get_immutable_dependency`
+	GetImmutableData(u32),
+	/// Weight of calling `set_immutable_dependency`
+	SetImmutableData(u32),
+	/// Weight of calling `Bn128Add` precompile
+	Bn128Add,
+	/// Weight of calling `Bn128Add` precompile
+	Bn128Mul,
+	/// Weight of calling `Bn128Pairing` precompile for the given number of input pairs.
+	Bn128Pairing(u32),
+	/// Weight of calling `Identity` precompile for the given number of input length.
+	Identity(u32),
+	/// Weight of calling `Blake2F` precompile for the given number of rounds.
+	Blake2F(u32),
+	/// Weight of calling `Modexp` precompile
+	Modexp(u64),
+}
+
+/// For functions that modify storage, benchmarks are performed with one item in the
+/// storage. To account for the worst-case scenario, the weight of the overhead of
+/// writing to or reading from full storage is included. For transient storage writes,
+/// the rollback weight is added to reflect the worst-case scenario for this operation.
+macro_rules! cost_storage {
+    (write_transient, $name:ident $(, $arg:expr )*) => {
+        T::WeightInfo::$name($( $arg ),*)
+            .saturating_add(T::WeightInfo::rollback_transient_storage())
+            .saturating_add(T::WeightInfo::set_transient_storage_full()
+            .saturating_sub(T::WeightInfo::set_transient_storage_empty()))
+    };
+
+    (read_transient, $name:ident $(, $arg:expr )*) => {
+        T::WeightInfo::$name($( $arg ),*)
+            .saturating_add(T::WeightInfo::get_transient_storage_full()
+            .saturating_sub(T::WeightInfo::get_transient_storage_empty()))
+    };
+
+    (write, $name:ident $(, $arg:expr )*) => {
+        T::WeightInfo::$name($( $arg ),*)
+            .saturating_add(T::WeightInfo::set_storage_full()
+            .saturating_sub(T::WeightInfo::set_storage_empty()))
+    };
+
+    (read, $name:ident $(, $arg:expr )*) => {
+        T::WeightInfo::$name($( $arg ),*)
+            .saturating_add(T::WeightInfo::get_storage_full()
+            .saturating_sub(T::WeightInfo::get_storage_empty()))
+    };
+}
+
+macro_rules! cost_args {
+	// cost_args!(name, a, b, c) -> T::WeightInfo::name(a, b, c).saturating_sub(T::WeightInfo::name(0, 0, 0))
+	($name:ident, $( $arg: expr ),+) => {
+		(T::WeightInfo::$name($( $arg ),+).saturating_sub(cost_args!(@call_zero $name, $( $arg ),+)))
+	};
+	// Transform T::WeightInfo::name(a, b, c) into T::WeightInfo::name(0, 0, 0)
+	(@call_zero $name:ident, $( $arg:expr ),*) => {
+		T::WeightInfo::$name($( cost_args!(@replace_token $arg) ),*)
+	};
+	// Replace the token with 0.
+	(@replace_token $_in:tt) => { 0 };
+}
+
+impl<T: Config> Token<T> for RuntimeCosts {
+	fn influence_lowest_gas_limit(&self) -> bool {
+		true
+	}
+
+	fn weight(&self) -> Weight {
+		use self::RuntimeCosts::*;
+		match *self {
+			HostFn => cost_args!(noop_host_fn, 1),
+			CopyToContract(len) => T::WeightInfo::seal_copy_to_contract(len),
+			CopyFromContract(len) => T::WeightInfo::seal_return(len),
+			CallDataSize => T::WeightInfo::seal_call_data_size(),
+			ReturnDataSize => T::WeightInfo::seal_return_data_size(),
+			CallDataLoad => T::WeightInfo::seal_call_data_load(),
+			CallDataCopy(len) => T::WeightInfo::seal_call_data_copy(len),
+			Caller => T::WeightInfo::seal_caller(),
+			Origin => T::WeightInfo::seal_origin(),
+			ToAccountId => T::WeightInfo::seal_to_account_id(),
+			CodeHash => T::WeightInfo::seal_code_hash(),
+			CodeSize => T::WeightInfo::seal_code_size(),
+			OwnCodeHash => T::WeightInfo::seal_own_code_hash(),
+			CallerIsOrigin => T::WeightInfo::seal_caller_is_origin(),
+			CallerIsRoot => T::WeightInfo::seal_caller_is_root(),
+			Address => T::WeightInfo::seal_address(),
+			RefTimeLeft => T::WeightInfo::seal_ref_time_left(),
+			WeightLeft => T::WeightInfo::seal_weight_left(),
+			Balance => T::WeightInfo::seal_balance(),
+			BalanceOf => T::WeightInfo::seal_balance_of(),
+			ValueTransferred => T::WeightInfo::seal_value_transferred(),
+			MinimumBalance => T::WeightInfo::seal_minimum_balance(),
+			BlockNumber => T::WeightInfo::seal_block_number(),
+			BlockHash => T::WeightInfo::seal_block_hash(),
+			BlockAuthor => T::WeightInfo::seal_block_author(),
+			GasPrice => T::WeightInfo::seal_gas_price(),
+			BaseFee => T::WeightInfo::seal_base_fee(),
+			Now => T::WeightInfo::seal_now(),
+			GasLimit => T::WeightInfo::seal_gas_limit(),
+			WeightToFee => T::WeightInfo::seal_weight_to_fee(),
+			Terminate => T::WeightInfo::seal_terminate(),
+			DepositEvent { num_topic, len } => T::WeightInfo::seal_deposit_event(num_topic, len),
+			SetStorage { new_bytes, old_bytes } => {
+				cost_storage!(write, seal_set_storage, new_bytes, old_bytes)
+			},
+			ClearStorage(len) => cost_storage!(write, seal_clear_storage, len),
+			ContainsStorage(len) => cost_storage!(read, seal_contains_storage, len),
+			GetStorage(len) => cost_storage!(read, seal_get_storage, len),
+			TakeStorage(len) => cost_storage!(write, seal_take_storage, len),
+			SetTransientStorage { new_bytes, old_bytes } => {
+				cost_storage!(write_transient, seal_set_transient_storage, new_bytes, old_bytes)
+			},
+			ClearTransientStorage(len) => {
+				cost_storage!(write_transient, seal_clear_transient_storage, len)
+			},
+			ContainsTransientStorage(len) => {
+				cost_storage!(read_transient, seal_contains_transient_storage, len)
+			},
+			GetTransientStorage(len) => {
+				cost_storage!(read_transient, seal_get_transient_storage, len)
+			},
+			TakeTransientStorage(len) => {
+				cost_storage!(write_transient, seal_take_transient_storage, len)
+			},
+			CallBase => T::WeightInfo::seal_call(0, 0, 0),
+			DelegateCallBase => T::WeightInfo::seal_delegate_call(),
+			PrecompileBase => T::WeightInfo::seal_call_precompile(0, 0),
+			PrecompileWithInfoBase => T::WeightInfo::seal_call_precompile(1, 0),
+			PrecompileDecode(len) => cost_args!(seal_call_precompile, 0, len),
+			CallTransferSurcharge { dust_transfer } =>
+				cost_args!(seal_call, 1, dust_transfer.into(), 0),
+			CallInputCloned(len) => cost_args!(seal_call, 0, 0, len),
+			Instantiate { input_data_len, balance_transfer, dust_transfer } =>
+				T::WeightInfo::seal_instantiate(
+					input_data_len,
+					balance_transfer.into(),
+					dust_transfer.into(),
+				),
+			HashSha256(len) => T::WeightInfo::sha2_256(len),
+			Ripemd160(len) => T::WeightInfo::ripemd_160(len),
+			HashKeccak256(len) => T::WeightInfo::seal_hash_keccak_256(len),
+			HashBlake256(len) => T::WeightInfo::seal_hash_blake2_256(len),
+			HashBlake128(len) => T::WeightInfo::seal_hash_blake2_128(len),
+			EcdsaRecovery => T::WeightInfo::ecdsa_recover(),
+			Sr25519Verify(len) => T::WeightInfo::seal_sr25519_verify(len),
+			Precompile(weight) => weight,
+			SetCodeHash => T::WeightInfo::seal_set_code_hash(),
+			EcdsaToEthAddress => T::WeightInfo::seal_ecdsa_to_eth_address(),
+			GetImmutableData(len) => T::WeightInfo::seal_get_immutable_data(len),
+			SetImmutableData(len) => T::WeightInfo::seal_set_immutable_data(len),
+			Bn128Add => T::WeightInfo::bn128_add(),
+			Bn128Mul => T::WeightInfo::bn128_mul(),
+			Bn128Pairing(len) => T::WeightInfo::bn128_pairing(len),
+			Identity(len) => T::WeightInfo::identity(len),
+			Blake2F(rounds) => T::WeightInfo::blake2f(rounds),
+			Modexp(gas) => {
+				use frame_support::weights::constants::WEIGHT_REF_TIME_PER_SECOND;
+				/// Current approximation of the gas/s consumption considering
+				/// EVM execution over compiled WASM (on 4.4Ghz CPU).
+				/// Given the 2000ms Weight, from which 75% only are used for transactions,
+				/// the total EVM execution gas limit is: GAS_PER_SECOND * 2 * 0.75 ~= 60_000_000.
+				const GAS_PER_SECOND: u64 = 40_000_000;
+
+				/// Approximate ratio of the amount of Weight per Gas.
+				/// u64 works for approximations because Weight is a very small unit compared to
+				/// gas.
+				const WEIGHT_PER_GAS: u64 = WEIGHT_REF_TIME_PER_SECOND / GAS_PER_SECOND;
+				Weight::from_parts(gas.saturating_mul(WEIGHT_PER_GAS), 0)
+			},
+		}
+	}
+}

From 8af812d93ee559cf231d8ee29b41929e573ea943 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Sun, 20 Jul 2025 14:21:01 +0000
Subject: [PATCH 065/186] basic host interaction

---
 substrate/frame/revive/src/tests.rs           | 27 +++++-
 .../frame/revive/src/tests/Fibonacci.abi      |  1 -
 .../tests/{fibonacci.sol => playground.sol}   |  8 +-
 substrate/frame/revive/src/vm/evm.rs          | 47 ++++------
 .../src/vm/evm/instructions/block_info.rs     | 89 +++++++++----------
 .../revive/src/vm/evm/instructions/mod.rs     | 21 +++--
 substrate/frame/revive/src/vm/mod.rs          |  8 +-
 7 files changed, 108 insertions(+), 93 deletions(-)
 delete mode 100644 substrate/frame/revive/src/tests/Fibonacci.abi
 rename substrate/frame/revive/src/tests/{fibonacci.sol => playground.sol} (68%)

diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index 73db0c30dac8..66da410192d7 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -5134,12 +5134,12 @@ fn code_size_for_precompiles_works() {
 	});
 }
 
+alloy_core::sol!("src/tests/playground.sol");
+
 #[test]
 fn basic_evm_flow_works() {
 	use alloy_core::{hex, primitives, sol_types::SolInterface};
-	let code = hex::decode(include_str!("tests/Fibonacci.bin")).unwrap();
-
-	alloy_core::sol!("src/tests/fibonacci.sol");
+	let code = hex::decode(include_str!("tests/Playground.bin")).unwrap();
 
 	ExtBuilder::default().build().execute_with(|| {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
@@ -5152,7 +5152,7 @@ fn basic_evm_flow_works() {
 
 		let result = builder::bare_call(addr)
 			.data(
-				Fibonacci::FibonacciCalls::fib(Fibonacci::fibCall {
+				Playground::PlaygroundCalls::fib(Playground::fibCall {
 					n: primitives::U256::from(10u64),
 				})
 				.abi_encode(),
@@ -5161,3 +5161,22 @@ fn basic_evm_flow_works() {
 		assert_eq!(U256::from(55u32), U256::from_big_endian(&result.data));
 	});
 }
+
+#[test]
+fn basic_evm_host_interaction_works() {
+	use alloy_core::{hex, sol_types::SolInterface};
+	let code = hex::decode(include_str!("tests/Playground.bin")).unwrap();
+
+	ExtBuilder::default().build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code.clone())).build_and_unwrap_contract();
+
+		System::set_block_number(42);
+
+		let result = builder::bare_call(addr)
+			.data(Playground::PlaygroundCalls::bn(Playground::bnCall {}).abi_encode())
+			.build_and_unwrap_result();
+		assert_eq!(U256::from(42u32), U256::from_big_endian(&result.data));
+	});
+}
diff --git a/substrate/frame/revive/src/tests/Fibonacci.abi b/substrate/frame/revive/src/tests/Fibonacci.abi
deleted file mode 100644
index 01feb2277761..000000000000
--- a/substrate/frame/revive/src/tests/Fibonacci.abi
+++ /dev/null
@@ -1 +0,0 @@
-[{"inputs":[{"internalType":"uint256","name":"n","type":"uint256"}],"name":"fib","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"pure","type":"function"}]
\ No newline at end of file
diff --git a/substrate/frame/revive/src/tests/fibonacci.sol b/substrate/frame/revive/src/tests/playground.sol
similarity index 68%
rename from substrate/frame/revive/src/tests/fibonacci.sol
rename to substrate/frame/revive/src/tests/playground.sol
index 8e54fc3b062d..4d0663c515a5 100644
--- a/substrate/frame/revive/src/tests/fibonacci.sol
+++ b/substrate/frame/revive/src/tests/playground.sol
@@ -1,11 +1,15 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-contract Fibonacci {
+contract Playground {
     function fib(uint n) public pure returns (uint) {
         if (n <= 1) {
             return n;
         }
         return fib(n - 1) + fib(n - 2);
     }
-}
\ No newline at end of file
+
+	function bn() public view returns (uint) {
+		return block.number;
+	}
+}
diff --git a/substrate/frame/revive/src/vm/evm.rs b/substrate/frame/revive/src/vm/evm.rs
index e48838140397..7e079559e26d 100644
--- a/substrate/frame/revive/src/vm/evm.rs
+++ b/substrate/frame/revive/src/vm/evm.rs
@@ -1,24 +1,22 @@
 mod instructions;
 
 use crate::{
+	vm::{ExecResult, Ext},
 	AccountIdOf, BalanceOf, CodeInfo, CodeVec, Config, ContractBlob, DispatchError, Error,
 	ExecReturnValue, H256, LOG_TARGET, U256,
-	address::AddressMapper,
-	exec::PrecompileExt,
-	vm::{ExecResult, Ext},
 };
 use instructions::instruction_table;
 use pallet_revive_uapi::ReturnFlags;
 use revm::{
 	bytecode::Bytecode,
 	interpreter::{
-		CallInput, Gas, Interpreter, InterpreterResult, InterpreterTypes, SharedMemory, Stack,
 		host::DummyHost,
 		interpreter::{ExtBytecode, ReturnDataImpl, RuntimeFlags},
 		interpreter_action::InterpreterAction,
 		interpreter_types::InputsTr,
+		CallInput, Gas, Interpreter, InterpreterResult, InterpreterTypes, SharedMemory, Stack,
 	},
-	primitives::{self, Address, hardfork::SpecId},
+	primitives::{self, hardfork::SpecId, Address},
 };
 
 impl<T: Config> ContractBlob<T>
@@ -49,7 +47,7 @@ where
 }
 
 /// TODO handle error case
-pub fn call<'a, E: Ext>(bytecode: Bytecode, inputs: EVMInputs<'a, E>) -> ExecResult {
+pub fn call<'a, E: Ext>(bytecode: Bytecode, ext: &'a mut E, inputs: EVMInputs) -> ExecResult {
 	let mut interpreter: Interpreter<EVMInterpreter<'a, E>> = Interpreter {
 		gas: Gas::new(30_000_000), // TODO clean up
 		bytecode: ExtBytecode::new(bytecode),
@@ -58,10 +56,10 @@ pub fn call<'a, E: Ext>(bytecode: Bytecode, inputs: EVMInputs<'a, E>) -> ExecRes
 		memory: SharedMemory::new(),
 		input: inputs,
 		runtime_flag: RuntimeFlags { is_static: false, spec_id: SpecId::default() },
-		extend: Default::default(),
+		extend: ext,
 	};
 
-	let table = instruction_table::<EVMInterpreter<'a, E>, DummyHost>();
+	let table = instruction_table::<'a, E>();
 	let result = run(&mut interpreter, &table);
 
 	if result.is_error() {
@@ -97,46 +95,39 @@ impl<'a, E: Ext> InterpreterTypes for EVMInterpreter<'a, E> {
 	type Memory = SharedMemory;
 	type Bytecode = ExtBytecode;
 	type ReturnData = ReturnDataImpl;
-	type Input = EVMInputs<'a, E>;
+	type Input = EVMInputs;
 	type RuntimeFlag = RuntimeFlags;
-	type Extend = ();
+	type Extend = &'a mut E;
 	type Output = InterpreterAction;
 }
 
-pub struct EVMInputs<'a, E: Ext> {
-	ext: &'a mut E,
-	input: CallInput,
-}
+pub struct EVMInputs(CallInput);
 
-impl<'a, E: Ext> EVMInputs<'a, E> {
-	pub fn new(ext: &'a mut E, input: Vec<u8>) -> Self {
-		Self { ext, input: CallInput::Bytes(input.into()) }
+impl EVMInputs {
+	pub fn new(input: Vec<u8>) -> Self {
+		Self(CallInput::Bytes(input.into()))
 	}
 }
 
-impl<'a, E: Ext> InputsTr for EVMInputs<'a, E> {
+impl InputsTr for EVMInputs {
 	fn target_address(&self) -> Address {
-		let address = self.ext.address();
-		address.0.into()
+		panic!()
 	}
 
 	fn caller_address(&self) -> Address {
-		let caller = self.ext.caller();
-		let Ok(caller) = caller.account_id() else { return Address::ZERO };
-
-		let addr = <<E as PrecompileExt>::T as Config>::AddressMapper::to_address(caller);
-		addr.0.into()
+		panic!()
 	}
 
 	fn bytecode_address(&self) -> Option<&Address> {
-		todo!()
+		panic!()
 	}
 
 	fn input(&self) -> &CallInput {
-		&self.input
+		&self.0
 	}
 
 	fn call_value(&self) -> primitives::U256 {
-		primitives::U256::from_limbs(self.ext.value_transferred().0)
+		// TODO replae by panic once instruction that use call_value are updated
+		primitives::U256::ZERO
 	}
 }
diff --git a/substrate/frame/revive/src/vm/evm/instructions/block_info.rs b/substrate/frame/revive/src/vm/evm/instructions/block_info.rs
index 3969e1fab238..3c18f4cbea48 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/block_info.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/block_info.rs
@@ -1,93 +1,92 @@
-use revm::interpreter::{
-    gas as revm_gas,
-    interpreter_types::{InterpreterTypes, RuntimeFlag, StackTr},
-    host::Host,
-    InstructionContext,
+use revm::{
+	interpreter::{
+		gas as revm_gas,
+		host::Host,
+		interpreter_types::{InterpreterTypes, RuntimeFlag, StackTr},
+		InstructionContext,
+	},
+	primitives::{hardfork::SpecId::*, U256},
 };
-use revm::primitives::{hardfork::SpecId::*, U256};
 
 /// EIP-1344: ChainID opcode
 pub fn chainid<WIRE: InterpreterTypes, H: Host + ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    check!(context.interpreter, ISTANBUL);
-    gas!(context.interpreter, revm_gas::BASE);
-    push!(context.interpreter, context.host.chain_id());
+	check!(context.interpreter, ISTANBUL);
+	gas!(context.interpreter, revm_gas::BASE);
+	push!(context.interpreter, context.host.chain_id());
 }
 
 /// Implements the COINBASE instruction.
 ///
 /// Pushes the current block's beneficiary address onto the stack.
 pub fn coinbase<WIRE: InterpreterTypes, H: Host + ?Sized>(
-    context: InstructionContext<'_, H, WIRE>,
+	context: InstructionContext<'_, H, WIRE>,
 ) {
-    gas!(context.interpreter, revm_gas::BASE);
-    push!(
-        context.interpreter,
-        context.host.beneficiary().into_word().into()
-    );
+	gas!(context.interpreter, revm_gas::BASE);
+	push!(context.interpreter, context.host.beneficiary().into_word().into());
 }
 
 /// Implements the TIMESTAMP instruction.
 ///
 /// Pushes the current block's timestamp onto the stack.
 pub fn timestamp<WIRE: InterpreterTypes, H: Host + ?Sized>(
-    context: InstructionContext<'_, H, WIRE>,
+	context: InstructionContext<'_, H, WIRE>,
 ) {
-    gas!(context.interpreter, revm_gas::BASE);
-    push!(context.interpreter, context.host.timestamp());
+	gas!(context.interpreter, revm_gas::BASE);
+	push!(context.interpreter, context.host.timestamp());
 }
 
 /// Implements the NUMBER instruction.
 ///
 /// Pushes the current block number onto the stack.
-pub fn block_number<WIRE: InterpreterTypes, H: Host + ?Sized>(
-    context: InstructionContext<'_, H, WIRE>,
+pub fn block_number<'a, E: crate::vm::Ext>(
+	context: InstructionContext<
+		'_,
+		crate::vm::evm::DummyHost,
+		crate::vm::evm::EVMInterpreter<'a, E>,
+	>,
 ) {
-    gas!(context.interpreter, revm_gas::BASE);
-    push!(context.interpreter, U256::from(context.host.block_number()));
+	gas!(context.interpreter, revm_gas::BASE);
+	let block_number = context.interpreter.extend.block_number();
+	push!(context.interpreter, U256::from_limbs(block_number.0));
 }
 
 /// Implements the DIFFICULTY/PREVRANDAO instruction.
 ///
 /// Pushes the block difficulty (pre-merge) or prevrandao (post-merge) onto the stack.
 pub fn difficulty<WIRE: InterpreterTypes, H: Host + ?Sized>(
-    context: InstructionContext<'_, H, WIRE>,
+	context: InstructionContext<'_, H, WIRE>,
 ) {
-    gas!(context.interpreter, revm_gas::BASE);
-    if context
-        .interpreter
-        .runtime_flag
-        .spec_id()
-        .is_enabled_in(MERGE)
-    {
-        // Unwrap is safe as this fields is checked in validation handler.
-        push!(context.interpreter, context.host.prevrandao().unwrap());
-    } else {
-        push!(context.interpreter, context.host.difficulty());
-    }
+	gas!(context.interpreter, revm_gas::BASE);
+	if context.interpreter.runtime_flag.spec_id().is_enabled_in(MERGE) {
+		// Unwrap is safe as this fields is checked in validation handler.
+		push!(context.interpreter, context.host.prevrandao().unwrap());
+	} else {
+		push!(context.interpreter, context.host.difficulty());
+	}
 }
 
 /// Implements the GASLIMIT instruction.
 ///
 /// Pushes the current block's gas limit onto the stack.
 pub fn gaslimit<WIRE: InterpreterTypes, H: Host + ?Sized>(
-    context: InstructionContext<'_, H, WIRE>,
+	context: InstructionContext<'_, H, WIRE>,
 ) {
-    gas!(context.interpreter, revm_gas::BASE);
-    push!(context.interpreter, context.host.gas_limit());
+	gas!(context.interpreter, revm_gas::BASE);
+	push!(context.interpreter, context.host.gas_limit());
 }
 
 /// EIP-3198: BASEFEE opcode
 pub fn basefee<WIRE: InterpreterTypes, H: Host + ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    check!(context.interpreter, LONDON);
-    gas!(context.interpreter, revm_gas::BASE);
-    push!(context.interpreter, context.host.basefee());
+	check!(context.interpreter, LONDON);
+	gas!(context.interpreter, revm_gas::BASE);
+	push!(context.interpreter, context.host.basefee());
 }
 
 /// EIP-7516: BLOBBASEFEE opcode
 pub fn blob_basefee<WIRE: InterpreterTypes, H: Host + ?Sized>(
-    context: InstructionContext<'_, H, WIRE>,
+	context: InstructionContext<'_, H, WIRE>,
 ) {
-    check!(context.interpreter, CANCUN);
-    gas!(context.interpreter, revm_gas::BASE);
-    push!(context.interpreter, context.host.blob_gasprice());
+	check!(context.interpreter, CANCUN);
+	gas!(context.interpreter, revm_gas::BASE);
+	push!(context.interpreter, context.host.blob_gasprice());
 }
diff --git a/substrate/frame/revive/src/vm/evm/instructions/mod.rs b/substrate/frame/revive/src/vm/evm/instructions/mod.rs
index fc3dcc55a400..e79f497a4767 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/mod.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/mod.rs
@@ -27,13 +27,17 @@ pub mod tx_info;
 /// Utility functions and helpers for instruction implementation.
 pub mod utility;
 
-use revm::interpreter::{Instruction, InterpreterTypes, host::Host};
+use crate::vm::{
+	evm::{DummyHost, EVMInterpreter},
+	Ext,
+};
+use revm::interpreter::Instruction;
 
 /// Returns the instruction table for the given spec.
-pub const fn instruction_table<WIRE: InterpreterTypes, H: Host + ?Sized>()
--> [Instruction<WIRE, H>; 256] {
+pub const fn instruction_table<'a, E: Ext>() -> [Instruction<EVMInterpreter<'a, E>, DummyHost>; 256]
+{
 	use revm::bytecode::opcode::*;
-	let mut table = [control::unknown as Instruction<WIRE, H>; 256];
+	let mut table = [control::unknown as Instruction<EVMInterpreter<'a, E>, DummyHost>; 256];
 
 	table[STOP as usize] = control::stop;
 	table[ADD as usize] = arithmetic::add;
@@ -202,16 +206,15 @@ pub const fn instruction_table<WIRE: InterpreterTypes, H: Host + ?Sized>()
 #[cfg(test)]
 mod tests {
 	use super::instruction_table;
-	use revm::{
-		bytecode::opcode::*,
-		interpreter::{host::DummyHost, interpreter::EthInterpreter},
-	};
+	use revm::bytecode::opcode::*;
 
 	#[test]
 	fn all_instructions_and_opcodes_used() {
 		// known unknown instruction we compare it with other instructions from table.
 		let unknown_instruction = 0x0C_usize;
-		let instr_table = instruction_table::<EthInterpreter, DummyHost>();
+
+		use crate::{exec::Stack, tests::Test, ContractBlob};
+		let instr_table = instruction_table::<'static, Stack<'static, Test, ContractBlob<Test>>>();
 
 		let unknown_istr = instr_table[unknown_instruction];
 		for (i, instr) in instr_table.iter().enumerate() {
diff --git a/substrate/frame/revive/src/vm/mod.rs b/substrate/frame/revive/src/vm/mod.rs
index 161ff022b839..0a33e89948bb 100644
--- a/substrate/frame/revive/src/vm/mod.rs
+++ b/substrate/frame/revive/src/vm/mod.rs
@@ -25,11 +25,11 @@ mod runtime_costs;
 pub use runtime_costs::RuntimeCosts;
 
 use crate::{
-	AccountIdOf, BadOrigin, BalanceOf, CodeInfoOf, CodeVec, Config, Error, HoldReason, LOG_TARGET,
-	PristineCode, Weight,
 	exec::{ExecResult, Executable, ExportedFunction, Ext},
 	gas::{GasMeter, Token},
 	weights::WeightInfo,
+	AccountIdOf, BadOrigin, BalanceOf, CodeInfoOf, CodeVec, Config, Error, HoldReason,
+	PristineCode, Weight, LOG_TARGET,
 };
 use alloc::vec::Vec;
 use codec::{Decode, Encode, MaxEncodedLen};
@@ -279,9 +279,9 @@ where
 		} else {
 			use crate::vm::evm::EVMInputs;
 			use revm::bytecode::Bytecode;
-			let inputs = EVMInputs::new(ext, input_data);
+			let inputs = EVMInputs::new(input_data);
 			let bytecode = Bytecode::new_raw(self.code.into_inner().into());
-			evm::call(bytecode, inputs)
+			evm::call(bytecode, ext, inputs)
 		}
 	}
 

From 165b7e7a44d1dc49ea64b84034f2a9cbe08ba423 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Mon, 21 Jul 2025 07:29:18 +0000
Subject: [PATCH 066/186] fix gas

---
 .../src/vm/evm/instructions/block_info.rs     |   8 +-
 .../revive/src/vm/evm/instructions/macros.rs  | 255 +++++++++---------
 2 files changed, 138 insertions(+), 125 deletions(-)

diff --git a/substrate/frame/revive/src/vm/evm/instructions/block_info.rs b/substrate/frame/revive/src/vm/evm/instructions/block_info.rs
index 3c18f4cbea48..f5644f0c4bbd 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/block_info.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/block_info.rs
@@ -1,11 +1,11 @@
+use crate::RuntimeCosts;
 use revm::{
 	interpreter::{
-		gas as revm_gas,
+		InstructionContext, gas as revm_gas,
 		host::Host,
 		interpreter_types::{InterpreterTypes, RuntimeFlag, StackTr},
-		InstructionContext,
 	},
-	primitives::{hardfork::SpecId::*, U256},
+	primitives::{U256, hardfork::SpecId::*},
 };
 
 /// EIP-1344: ChainID opcode
@@ -45,7 +45,7 @@ pub fn block_number<'a, E: crate::vm::Ext>(
 		crate::vm::evm::EVMInterpreter<'a, E>,
 	>,
 ) {
-	gas!(context.interpreter, revm_gas::BASE);
+	gas_new!(context.interpreter, RuntimeCosts::BlockNumber);
 	let block_number = context.interpreter.extend.block_number();
 	push!(context.interpreter, U256::from_limbs(block_number.0));
 }
diff --git a/substrate/frame/revive/src/vm/evm/instructions/macros.rs b/substrate/frame/revive/src/vm/evm/instructions/macros.rs
index 57f3218c0f9f..15401f09c45b 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/macros.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/macros.rs
@@ -3,114 +3,127 @@
 /// `const` Option `?`.
 #[macro_export]
 macro_rules! tri {
-    ($e:expr) => {
-        match $e {
-            Some(v) => v,
-            None => return None,
-        }
-    };
+	($e:expr) => {
+		match $e {
+			Some(v) => v,
+			None => return None,
+		}
+	};
 }
 
 /// Fails the instruction if the current call is static.
 #[macro_export]
 macro_rules! require_non_staticcall {
-    ($interpreter:expr) => {
-        if $interpreter.runtime_flag.is_static() {
-            $interpreter.halt(revm::interpreter::InstructionResult::StateChangeDuringStaticCall);
-            return;
-        }
-    };
+	($interpreter:expr) => {
+		if $interpreter.runtime_flag.is_static() {
+			$interpreter.halt(revm::interpreter::InstructionResult::StateChangeDuringStaticCall);
+			return;
+		}
+	};
 }
 
 /// Macro for optional try - returns early if the expression evaluates to None.
 /// Similar to the `?` operator but for use in instruction implementations.
 #[macro_export]
 macro_rules! otry {
-    ($expression: expr) => {{
-        let Some(value) = $expression else {
-            return;
-        };
-        value
-    }};
+	($expression: expr) => {{
+		let Some(value) = $expression else {
+			return;
+		};
+		value
+	}};
 }
 
 /// Error if the current call is executing EOF.
 #[macro_export]
 macro_rules! require_eof {
-    ($interpreter:expr) => {
-        if !$interpreter.runtime_flag.is_eof() {
-            $interpreter.halt(revm::interpreter::InstructionResult::EOFOpcodeDisabledInLegacy);
-            return;
-        }
-    };
+	($interpreter:expr) => {
+		if !$interpreter.runtime_flag.is_eof() {
+			$interpreter.halt(revm::interpreter::InstructionResult::EOFOpcodeDisabledInLegacy);
+			return;
+		}
+	};
 }
 
 /// Check if the `SPEC` is enabled, and fail the instruction if it is not.
 #[macro_export]
 macro_rules! check {
-    ($interpreter:expr, $min:ident) => {
-        if !$interpreter
-            .runtime_flag
-            .spec_id()
-            .is_enabled_in(revm::primitives::hardfork::SpecId::$min)
-        {
-            $interpreter.halt(revm::interpreter::InstructionResult::NotActivated);
-            return;
-        }
-    };
+	($interpreter:expr, $min:ident) => {
+		if !$interpreter
+			.runtime_flag
+			.spec_id()
+			.is_enabled_in(revm::primitives::hardfork::SpecId::$min)
+		{
+			$interpreter.halt(revm::interpreter::InstructionResult::NotActivated);
+			return;
+		}
+	};
 }
 
 /// Records a `gas` cost and fails the instruction if it would exceed the available gas.
 #[macro_export]
 macro_rules! gas {
-    ($interpreter:expr, $gas:expr) => {
-        gas!($interpreter, $gas, ())
-    };
-    ($interpreter:expr, $gas:expr, $ret:expr) => {
-        if !$interpreter.gas.record_cost($gas) {
-            $interpreter.halt(revm::interpreter::InstructionResult::OutOfGas);
-            return $ret;
-        }
-    };
+	($interpreter:expr, $gas:expr) => {
+		gas!($interpreter, $gas, ())
+	};
+	($interpreter:expr, $gas:expr, $ret:expr) => {
+		if !$interpreter.gas.record_cost($gas) {
+			$interpreter.halt(revm::interpreter::InstructionResult::OutOfGas);
+			return $ret;
+		}
+	};
+}
+
+#[macro_export]
+macro_rules! gas_new {
+	($interpreter:expr, $gas:expr) => {
+		gas_new!($interpreter, $gas, ())
+	};
+	($interpreter:expr, $gas:expr, $ret:expr) => {
+		if $interpreter.extend.gas_meter_mut().charge($gas).is_err() {
+			$interpreter.halt(revm::interpreter::InstructionResult::OutOfGas);
+			return $ret;
+		}
+	};
 }
 
 /// Same as [`gas!`], but with `gas` as an option.
 #[macro_export]
 macro_rules! gas_or_fail {
-    ($interpreter:expr, $gas:expr) => {
-        gas_or_fail!($interpreter, $gas, ())
-    };
-    ($interpreter:expr, $gas:expr, $ret:expr) => {
-        match $gas {
-            Some(gas_used) => gas!($interpreter, gas_used, $ret),
-            None => {
-                $interpreter.halt(revm::interpreter::InstructionResult::OutOfGas);
-                return $ret;
-            }
-        }
-    };
-}
-
-/// Resizes the interpreterreter memory if necessary. Fails the instruction if the memory or gas limit
-/// is exceeded.
+	($interpreter:expr, $gas:expr) => {
+		gas_or_fail!($interpreter, $gas, ())
+	};
+	($interpreter:expr, $gas:expr, $ret:expr) => {
+		match $gas {
+			Some(gas_used) => gas!($interpreter, gas_used, $ret),
+			None => {
+				$interpreter.halt(revm::interpreter::InstructionResult::OutOfGas);
+				return $ret;
+			},
+		}
+	};
+}
+
+/// Resizes the interpreterreter memory if necessary. Fails the instruction if the memory or gas
+/// limit is exceeded.
 #[macro_export]
 macro_rules! resize_memory {
-    ($interpreter:expr, $offset:expr, $len:expr) => {
-        resize_memory!($interpreter, $offset, $len, ())
-    };
-    ($interpreter:expr, $offset:expr, $len:expr, $ret:expr) => {
-        let words_num = revm::interpreter::num_words($offset.saturating_add($len));
-        match $interpreter.gas.record_memory_expansion(words_num) {
-            revm::interpreter::gas::MemoryExtensionResult::Extended => {
-                $interpreter.memory.resize(words_num * 32);
-            }
-            revm::interpreter::gas::MemoryExtensionResult::OutOfGas => {
-                $interpreter.halt(revm::interpreter::InstructionResult::MemoryOOG);
-                return $ret;
-            }
-            revm::interpreter::gas::MemoryExtensionResult::Same => (), // no action
-        };
-    };
+	($interpreter:expr, $offset:expr, $len:expr) => {
+		resize_memory!($interpreter, $offset, $len, ())
+	};
+	($interpreter:expr, $offset:expr, $len:expr, $ret:expr) => {
+		let words_num = revm::interpreter::num_words($offset.saturating_add($len));
+		match $interpreter.gas.record_memory_expansion(words_num) {
+			revm::interpreter::gas::MemoryExtensionResult::Extended => {
+				$interpreter.memory.resize(words_num * 32);
+			},
+			revm::interpreter::gas::MemoryExtensionResult::OutOfGas => {
+				$interpreter.halt(revm::interpreter::InstructionResult::MemoryOOG);
+				return $ret;
+			},
+			revm::interpreter::gas::MemoryExtensionResult::Same => (), // no action
+		};
+	};
 }
 
 /// Pops n values from the stack. Fails the instruction if n values can't be popped.
@@ -124,7 +137,8 @@ macro_rules! popn {
     };
 }
 
-/// Pops n values from the stack and returns the top value. Fails the instruction if n values can't be popped.
+/// Pops n values from the stack and returns the top value. Fails the instruction if n values can't
+/// be popped.
 #[macro_export]
 macro_rules! popn_top {
     ([ $($x:ident),* ], $top:ident, $interpreter:expr $(,$ret:expr)? ) => {
@@ -149,70 +163,69 @@ macro_rules! push {
 /// Converts a `U256` value to a `u64`, saturating to `MAX` if the value is too large.
 #[macro_export]
 macro_rules! as_u64_saturated {
-    ($v:expr) => {
-        match $v.as_limbs() {
-            x => {
-                if (x[1] == 0) & (x[2] == 0) & (x[3] == 0) {
-                    x[0]
-                } else {
-                    u64::MAX
-                }
-            }
-        }
-    };
+	($v:expr) => {
+		match $v.as_limbs() {
+			x =>
+				if (x[1] == 0) & (x[2] == 0) & (x[3] == 0) {
+					x[0]
+				} else {
+					u64::MAX
+				},
+		}
+	};
 }
 
 /// Converts a `U256` value to a `usize`, saturating to `MAX` if the value is too large.
 #[macro_export]
 macro_rules! as_usize_saturated {
-    ($v:expr) => {
-        usize::try_from(as_u64_saturated!($v)).unwrap_or(usize::MAX)
-    };
+	($v:expr) => {
+		usize::try_from(as_u64_saturated!($v)).unwrap_or(usize::MAX)
+	};
 }
 
 /// Converts a `U256` value to a `isize`, saturating to `isize::MAX` if the value is too large.
 #[macro_export]
 macro_rules! as_isize_saturated {
-    ($v:expr) => {
-        // `isize_try_from(u64::MAX)`` will fail and return isize::MAX
-        // This is expected behavior as we are saturating the value.
-        isize::try_from(as_u64_saturated!($v)).unwrap_or(isize::MAX)
-    };
+	($v:expr) => {
+		// `isize_try_from(u64::MAX)`` will fail and return isize::MAX
+		// This is expected behavior as we are saturating the value.
+		isize::try_from(as_u64_saturated!($v)).unwrap_or(isize::MAX)
+	};
 }
 
 /// Converts a `U256` value to a `usize`, failing the instruction if the value is too large.
 #[macro_export]
 macro_rules! as_usize_or_fail {
-    ($interpreter:expr, $v:expr) => {
-        as_usize_or_fail_ret!($interpreter, $v, ())
-    };
-    ($interpreter:expr, $v:expr, $reason:expr) => {
-        as_usize_or_fail_ret!($interpreter, $v, $reason, ())
-    };
+	($interpreter:expr, $v:expr) => {
+		as_usize_or_fail_ret!($interpreter, $v, ())
+	};
+	($interpreter:expr, $v:expr, $reason:expr) => {
+		as_usize_or_fail_ret!($interpreter, $v, $reason, ())
+	};
 }
 
 /// Converts a `U256` value to a `usize` and returns `ret`,
 /// failing the instruction if the value is too large.
 #[macro_export]
 macro_rules! as_usize_or_fail_ret {
-    ($interpreter:expr, $v:expr, $ret:expr) => {
-        as_usize_or_fail_ret!(
-            $interpreter,
-            $v,
-            revm::interpreter::InstructionResult::InvalidOperandOOG,
-            $ret
-        )
-    };
-
-    ($interpreter:expr, $v:expr, $reason:expr, $ret:expr) => {
-        match $v.as_limbs() {
-            x => {
-                if (x[0] > usize::MAX as u64) | (x[1] != 0) | (x[2] != 0) | (x[3] != 0) {
-                    $interpreter.halt($reason);
-                    return $ret;
-                }
-                x[0] as usize
-            }
-        }
-    };
+	($interpreter:expr, $v:expr, $ret:expr) => {
+		as_usize_or_fail_ret!(
+			$interpreter,
+			$v,
+			revm::interpreter::InstructionResult::InvalidOperandOOG,
+			$ret
+		)
+	};
+
+	($interpreter:expr, $v:expr, $reason:expr, $ret:expr) => {
+		match $v.as_limbs() {
+			x => {
+				if (x[0] > usize::MAX as u64) | (x[1] != 0) | (x[2] != 0) | (x[3] != 0) {
+					$interpreter.halt($reason);
+					return $ret;
+				}
+				x[0] as usize
+			},
+		}
+	};
 }

From ade709b022728760322794f678ddb1582208bbbb Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Tue, 22 Jul 2025 08:49:29 +0000
Subject: [PATCH 067/186] wip

---
 Cargo.toml                                    |   2 +-
 substrate/frame/revive/Cargo.toml             |   3 +-
 substrate/frame/revive/src/benchmarking.rs    |  13 +-
 substrate/frame/revive/src/call_builder.rs    |   6 +-
 substrate/frame/revive/src/lib.rs             |  23 +-
 .../revive/src/precompiles/builtin/blake2f.rs |   2 +-
 substrate/frame/revive/src/tests.rs           | 255 ++++++--------
 .../src/vm/evm/instructions/arithmetic.rs     | 102 +++---
 .../revive/src/vm/evm/instructions/bitwise.rs |   7 +-
 .../src/vm/evm/instructions/block_info.rs     |   5 +-
 .../src/vm/evm/instructions/contract.rs       |   5 +-
 .../evm/instructions/contract/call_helpers.rs |  91 +++--
 .../revive/src/vm/evm/instructions/control.rs | 107 +++---
 .../revive/src/vm/evm/instructions/host.rs    |   6 +-
 .../revive/src/vm/evm/instructions/i256.rs    |   6 +-
 .../revive/src/vm/evm/instructions/memory.rs  |  86 +++--
 .../revive/src/vm/evm/instructions/stack.rs   |   3 +-
 .../revive/src/vm/evm/instructions/system.rs  | 313 ++++++++----------
 .../revive/src/vm/evm/instructions/tx_info.rs |  42 ++-
 .../revive/src/vm/evm/instructions/utility.rs | 154 ++++-----
 substrate/frame/revive/src/vm/pvm.rs          |  12 +-
 substrate/frame/revive/src/vm/pvm/env.rs      |   2 +-
 .../frame/revive/src/vm/runtime_costs.rs      |   2 +-
 23 files changed, 594 insertions(+), 653 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 87a6a383a818..7c06628f3faa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1185,6 +1185,7 @@ regex = { version = "1.10.2" }
 relay-substrate-client = { path = "bridges/relays/client-substrate" }
 relay-utils = { path = "bridges/relays/utils" }
 remote-externalities = { path = "substrate/utils/frame/remote-externalities", default-features = false, package = "frame-remote-externalities" }
+revm = { version = "27.0.2", default-features = false }
 ripemd = { version = "0.1.3", default-features = false }
 rlp = { version = "0.6.1", default-features = false }
 rococo-emulated-chain = { path = "cumulus/parachains/integration-tests/emulated/chains/relays/rococo" }
@@ -1473,7 +1474,6 @@ zombienet-configuration = { version = "0.3.8" }
 zombienet-orchestrator = { version = "0.3.8" }
 zombienet-sdk = { version = "0.3.8" }
 zstd = { version = "0.12.4", default-features = false }
-revm = { version = "27.0.2", default-features = false }
 
 
 [profile.release]
diff --git a/substrate/frame/revive/Cargo.toml b/substrate/frame/revive/Cargo.toml
index a1bbaae761f3..ed2be60ebf19 100644
--- a/substrate/frame/revive/Cargo.toml
+++ b/substrate/frame/revive/Cargo.toml
@@ -35,10 +35,10 @@ polkavm = { version = "0.26.0", default-features = false }
 polkavm-common = { version = "0.26.0", default-features = false }
 rand = { workspace = true, optional = true }
 rand_pcg = { workspace = true, optional = true }
+revm = { workspace = true }
 rlp = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 serde = { features = ["alloc", "derive"], workspace = true, default-features = false }
-revm = { workspace = true }
 
 # Polkadot SDK Dependencies
 bn = { workspace = true }
@@ -115,6 +115,7 @@ std = [
 	"sp-keystore/std",
 	"sp-runtime/std",
 	"subxt-signer",
+	"revm/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
diff --git a/substrate/frame/revive/src/benchmarking.rs b/substrate/frame/revive/src/benchmarking.rs
index 14a207387a4e..5fa1ac37e49e 100644
--- a/substrate/frame/revive/src/benchmarking.rs
+++ b/substrate/frame/revive/src/benchmarking.rs
@@ -19,14 +19,13 @@
 
 #![cfg(feature = "runtime-benchmarks")]
 use crate::{
-	Pallet as Contracts,
-	call_builder::{CallSetup, Contract, VmBinaryModule, caller_funding, default_deposit_limit},
+	call_builder::{caller_funding, default_deposit_limit, CallSetup, Contract, VmBinaryModule},
 	evm::runtime::GAS_PRICE,
 	exec::{Key, MomentOf, PrecompileExt},
 	limits,
 	precompiles::{self, run::builtin as run_builtin_precompile},
 	storage::WriteOutcome,
-	*
+	Pallet as Contracts, *,
 };
 use alloc::{vec, vec::Vec};
 use codec::{Encode, MaxEncodedLen};
@@ -39,11 +38,11 @@ use frame_support::{
 	weights::{Weight, WeightMeter},
 };
 use frame_system::RawOrigin;
-use pallet_revive_uapi::{CallFlags, ReturnErrorCode, StorageFlags, pack_hi_lo};
+use pallet_revive_uapi::{pack_hi_lo, CallFlags, ReturnErrorCode, StorageFlags};
 use sp_consensus_aura::AURA_ENGINE_ID;
 use sp_consensus_babe::{
-	BABE_ENGINE_ID,
 	digests::{PreDigest, PrimaryPreDigest},
+	BABE_ENGINE_ID,
 };
 use sp_consensus_slots::Slot;
 use sp_runtime::{
@@ -2096,7 +2095,7 @@ mod benchmarks {
 	#[benchmark(pov_mode = Measured)]
 	fn bn128_pairing(n: Linear<0, { 20 }>) {
 		fn generate_random_ecpairs(n: usize) -> Vec<u8> {
-			use bn::{AffineG1, AffineG2, Fr, G1, G2, Group};
+			use bn::{AffineG1, AffineG2, Fr, Group, G1, G2};
 			use rand::SeedableRng;
 			use rand_pcg::Pcg64;
 			let mut rng = Pcg64::seed_from_u64(1);
@@ -2207,7 +2206,7 @@ mod benchmarks {
 	// and then accessing it so that each instruction generates two cache misses.
 	#[benchmark(pov_mode = Ignored)]
 	fn instr(r: Linear<0, 10_000>) {
-		use rand::{SeedableRng, seq::SliceRandom};
+		use rand::{seq::SliceRandom, SeedableRng};
 		use rand_pcg::Pcg64;
 
 		// Ideally, this needs to be bigger than the cache.
diff --git a/substrate/frame/revive/src/call_builder.rs b/substrate/frame/revive/src/call_builder.rs
index 8934fe8605be..931fef4a6bd3 100644
--- a/substrate/frame/revive/src/call_builder.rs
+++ b/substrate/frame/revive/src/call_builder.rs
@@ -26,15 +26,15 @@
 #![cfg_attr(test, allow(dead_code))]
 
 use crate::{
-	AccountInfo, BalanceOf, BalanceWithDust, BumpNonce, Code, CodeInfoOf, Config, ContractBlob,
-	ContractInfo, DepositLimit, Error, GasMeter, MomentOf, Origin, Pallet as Contracts,
-	PristineCode, Weight,
 	address::AddressMapper,
 	exec::{ExportedFunction, Key, PrecompileExt, Stack},
 	limits,
 	storage::meter::Meter,
 	transient_storage::MeterEntry,
 	vm::pvm::{PreparedCall, Runtime},
+	AccountInfo, BalanceOf, BalanceWithDust, BumpNonce, Code, CodeInfoOf, Config, ContractBlob,
+	ContractInfo, DepositLimit, Error, GasMeter, MomentOf, Origin, Pallet as Contracts,
+	PristineCode, Weight,
 };
 use alloc::{vec, vec::Vec};
 use frame_support::{storage::child, traits::fungible::Mutate};
diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index 531fc6aec488..619a345cd2d7 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -45,13 +45,13 @@ pub mod weights;
 
 use crate::{
 	evm::{
-		CallTracer, GasEncoder, GenericTransaction, PrestateTracer, TYPE_EIP1559, Trace, Tracer,
-		TracerType, runtime::GAS_PRICE,
+		runtime::GAS_PRICE, CallTracer, GasEncoder, GenericTransaction, PrestateTracer, Trace,
+		Tracer, TracerType, TYPE_EIP1559,
 	},
 	exec::{AccountIdOf, ExecError, Executable, Key, Stack as ExecStack},
 	gas::GasMeter,
 	storage::{
-		AccountInfo, AccountType, ContractInfo, DeletionQueueManager, meter::Meter as StorageMeter,
+		meter::Meter as StorageMeter, AccountInfo, AccountType, ContractInfo, DeletionQueueManager,
 	},
 	tracing::if_tracing,
 	vm::{CodeInfo, ContractBlob, RuntimeCosts},
@@ -60,7 +60,6 @@ use alloc::{boxed::Box, format, vec};
 use codec::{Codec, Decode, Encode};
 use environmental::*;
 use frame_support::{
-	BoundedVec, RuntimeDebugNoBound,
 	dispatch::{
 		DispatchErrorWithPostInfo, DispatchResultWithPostInfo, GetDispatchInfo, Pays,
 		PostDispatchInfo, RawOrigin,
@@ -68,25 +67,27 @@ use frame_support::{
 	ensure,
 	pallet_prelude::DispatchClass,
 	traits::{
-		ConstU32, ConstU64, EnsureOrigin, Get, IsType, OriginTrait, Time,
 		fungible::{Inspect, Mutate, MutateHold},
+		ConstU32, ConstU64, EnsureOrigin, Get, IsType, OriginTrait, Time,
 	},
 	weights::WeightMeter,
+	BoundedVec, RuntimeDebugNoBound,
 };
 use frame_system::{
-	Pallet as System, ensure_signed,
+	ensure_signed,
 	pallet_prelude::{BlockNumberFor, OriginFor},
+	Pallet as System,
 };
 use pallet_transaction_payment::OnChargeTransaction;
 use scale_info::TypeInfo;
 use sp_runtime::{
-	AccountId32, DispatchError,
 	traits::{BadOrigin, Bounded, Convert, Dispatchable, Saturating},
+	AccountId32, DispatchError,
 };
 
 pub use crate::{
 	address::{
-		AccountId32Mapper, AddressMapper, TestAccountMapper, create1, create2, is_eth_derived,
+		create1, create2, is_eth_derived, AccountId32Mapper, AddressMapper, TestAccountMapper,
 	},
 	exec::{MomentOf, Origin},
 	pallet::*,
@@ -1471,7 +1472,11 @@ where
 		let fee = Self::convert_native_to_evm(fee);
 		let gas_price = GAS_PRICE.into();
 		let (quotient, remainder) = fee.div_mod(gas_price);
-		if remainder.is_zero() { quotient } else { quotient + U256::one() }
+		if remainder.is_zero() {
+			quotient
+		} else {
+			quotient + U256::one()
+		}
 	}
 
 	/// Convert a gas value into a substrate fee
diff --git a/substrate/frame/revive/src/precompiles/builtin/blake2f.rs b/substrate/frame/revive/src/precompiles/builtin/blake2f.rs
index affefcad6d86..bad0fa27f613 100644
--- a/substrate/frame/revive/src/precompiles/builtin/blake2f.rs
+++ b/substrate/frame/revive/src/precompiles/builtin/blake2f.rs
@@ -16,9 +16,9 @@
 // limitations under the License.
 
 use crate::{
-	Config,
 	precompiles::{BuiltinAddressMatcher, Error, Ext, PrimitivePrecompile},
 	vm::RuntimeCosts,
+	Config,
 };
 use alloc::vec::Vec;
 use core::{marker::PhantomData, num::NonZero};
diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index 66da410192d7..ef1d0af7b0bd 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -20,11 +20,9 @@ mod precompiles;
 
 use self::test_utils::{ensure_stored, expected_deposit};
 use crate::{
-	self as pallet_revive, AccountId32Mapper, AccountInfo, AccountInfoOf, BalanceOf,
-	BalanceWithDust, BumpNonce, Code, CodeInfoOf, Config, ContractInfo, DeletionQueueCounter,
-	DepositLimit, Error, EthTransactError, H160, HoldReason, Origin, Pallet, PristineCode,
-	address::{AddressMapper, create1, create2},
-	evm::{CallTrace, CallTracer, CallType, GenericTransaction, runtime::GAS_PRICE},
+	self as pallet_revive,
+	address::{create1, create2, AddressMapper},
+	evm::{runtime::GAS_PRICE, CallTrace, CallTracer, CallType, GenericTransaction},
 	exec::Key,
 	limits,
 	storage::DeletionQueueManager,
@@ -32,6 +30,9 @@ use crate::{
 	tests::test_utils::{get_contract, get_contract_checked},
 	tracing::trace,
 	weights::WeightInfo,
+	AccountId32Mapper, AccountInfo, AccountInfoOf, BalanceOf, BalanceWithDust, BumpNonce, Code,
+	CodeInfoOf, Config, ContractInfo, DeletionQueueCounter, DepositLimit, Error, EthTransactError,
+	HoldReason, Origin, Pallet, PristineCode, H160,
 };
 use assert_matches::assert_matches;
 use codec::Encode;
@@ -41,11 +42,11 @@ use frame_support::{
 	parameter_types,
 	storage::child,
 	traits::{
-		ConstU32, ConstU64, FindAuthor, OnIdle, OnInitialize, StorageVersion,
 		fungible::{BalancedHold, Inspect, Mutate, MutateHold},
 		tokens::Preservation,
+		ConstU32, ConstU64, FindAuthor, OnIdle, OnInitialize, StorageVersion,
 	},
-	weights::{FixedFee, IdentityFee, Weight, WeightMeter, constants::WEIGHT_REF_TIME_PER_SECOND},
+	weights::{constants::WEIGHT_REF_TIME_PER_SECOND, FixedFee, IdentityFee, Weight, WeightMeter},
 };
 use frame_system::{EventRecord, Phase};
 use pallet_revive_fixtures::compile_module;
@@ -54,11 +55,11 @@ use pallet_transaction_payment::{ConstFeeMultiplier, Multiplier};
 use pretty_assertions::{assert_eq, assert_ne};
 use sp_core::{Get, U256};
 use sp_io::hashing::blake2_256;
-use sp_keystore::{KeystoreExt, testing::MemoryKeystore};
+use sp_keystore::{testing::MemoryKeystore, KeystoreExt};
 use sp_runtime::{
-	AccountId32, BuildStorage, DispatchError, Perbill, TokenError,
 	testing::H256,
 	traits::{BlakeTwo256, Convert, IdentityLookup, One, Zero},
+	AccountId32, BuildStorage, DispatchError, Perbill, TokenError,
 };
 
 type Block = frame_system::mocking::MockBlock<Test>;
@@ -96,8 +97,8 @@ pub mod test_utils {
 		Test,
 	};
 	use crate::{
-		AccountInfo, AccountInfoOf, BalanceOf, CodeInfo, CodeInfoOf, Config, ContractInfo,
-		PristineCode, address::AddressMapper, exec::AccountIdOf,
+		address::AddressMapper, exec::AccountIdOf, AccountInfo, AccountInfoOf, BalanceOf, CodeInfo,
+		CodeInfoOf, Config, ContractInfo, PristineCode,
 	};
 	use codec::{Encode, MaxEncodedLen};
 	use frame_support::traits::fungible::{InspectHold, Mutate};
@@ -196,9 +197,9 @@ pub mod test_utils {
 mod builder {
 	use super::Test;
 	use crate::{
-		Code,
-		test_utils::{ALICE, builder::*},
+		test_utils::{builder::*, ALICE},
 		tests::RuntimeOrigin,
+		Code,
 	};
 	use sp_core::{H160, H256};
 
@@ -754,12 +755,10 @@ fn deposit_event_max_value_limit() {
 			.build_and_unwrap_contract();
 
 		// Call contract with allowed storage value.
-		assert_ok!(
-			builder::call(addr)
-				.gas_limit(GAS_LIMIT.set_ref_time(GAS_LIMIT.ref_time() * 2)) // we are copying a huge buffer,
-				.data(limits::PAYLOAD_BYTES.encode())
-				.build()
-		);
+		assert_ok!(builder::call(addr)
+			.gas_limit(GAS_LIMIT.set_ref_time(GAS_LIMIT.ref_time() * 2)) // we are copying a huge buffer,
+			.data(limits::PAYLOAD_BYTES.encode())
+			.build());
 
 		// Call contract with too large a storage value.
 		assert_err_ignore_postinfo!(
@@ -899,12 +898,10 @@ fn storage_max_value_limit() {
 		get_contract(&addr);
 
 		// Call contract with allowed storage value.
-		assert_ok!(
-			builder::call(addr)
-				.gas_limit(GAS_LIMIT.set_ref_time(GAS_LIMIT.ref_time() * 2)) // we are copying a huge buffer
-				.data(limits::PAYLOAD_BYTES.encode())
-				.build()
-		);
+		assert_ok!(builder::call(addr)
+			.gas_limit(GAS_LIMIT.set_ref_time(GAS_LIMIT.ref_time() * 2)) // we are copying a huge buffer
+			.data(limits::PAYLOAD_BYTES.encode())
+			.build());
 
 		// Call contract with too large a storage value.
 		assert_err_ignore_postinfo!(
@@ -960,9 +957,9 @@ fn transient_storage_limit_in_call() {
 
 		// Call contracts with storage values within the limit.
 		// Caller and Callee contracts each set a transient storage value of size 100.
-		assert_ok!(
-			builder::call(addr_caller).data((100u32, 100u32, &addr_callee).encode()).build(),
-		);
+		assert_ok!(builder::call(addr_caller)
+			.data((100u32, 100u32, &addr_callee).encode())
+			.build(),);
 
 		// Call a contract with a storage value that is too large.
 		// Limit exceeded in the caller contract.
@@ -1020,14 +1017,12 @@ fn deploy_and_call_other_contract() {
 
 		// Call BOB contract, which attempts to instantiate and call the callee contract and
 		// makes various assertions on the results from those calls.
-		assert_ok!(
-			builder::call(caller_addr)
-				.data(
-					(callee_code_hash, code_load_weight.ref_time(), code_load_weight.proof_size())
-						.encode()
-				)
-				.build()
-		);
+		assert_ok!(builder::call(caller_addr)
+			.data(
+				(callee_code_hash, code_load_weight.ref_time(), code_load_weight.proof_size())
+					.encode()
+			)
+			.build());
 
 		assert_eq!(
 			System::events(),
@@ -1111,12 +1106,10 @@ fn delegate_call() {
 				.native_value(100_000)
 				.build_and_unwrap_contract();
 
-		assert_ok!(
-			builder::call(caller_addr)
-				.value(1337)
-				.data((callee_addr, u64::MAX, u64::MAX).encode())
-				.build()
-		);
+		assert_ok!(builder::call(caller_addr)
+			.value(1337)
+			.data((callee_addr, u64::MAX, u64::MAX).encode())
+			.build());
 	});
 }
 
@@ -1133,12 +1126,10 @@ fn delegate_call_non_existant_is_noop() {
 				.native_value(300_000)
 				.build_and_unwrap_contract();
 
-		assert_ok!(
-			builder::call(caller_addr)
-				.value(1337)
-				.data((BOB_ADDR, u64::MAX, u64::MAX).encode())
-				.build()
-		);
+		assert_ok!(builder::call(caller_addr)
+			.value(1337)
+			.data((BOB_ADDR, u64::MAX, u64::MAX).encode())
+			.build());
 
 		assert_eq!(test_utils::get_balance(&BOB_FALLBACK), 0);
 	});
@@ -1174,12 +1165,10 @@ fn delegate_call_with_weight_limit() {
 			Error::<Test>::ContractTrapped,
 		);
 
-		assert_ok!(
-			builder::call(caller_addr)
-				.value(1337)
-				.data((callee_addr, 500_000_000u64, 100_000u64).encode())
-				.build()
-		);
+		assert_ok!(builder::call(caller_addr)
+			.value(1337)
+			.data((callee_addr, 500_000_000u64, 100_000u64).encode())
+			.build());
 	});
 }
 
@@ -1212,12 +1201,10 @@ fn delegate_call_with_deposit_limit() {
 			.build_and_unwrap_result();
 		assert_return_code!(ret, RuntimeReturnCode::OutOfResources);
 
-		assert_ok!(
-			builder::call(caller_addr)
-				.value(1337)
-				.data((callee_addr, 82u64).encode())
-				.build()
-		);
+		assert_ok!(builder::call(caller_addr)
+			.value(1337)
+			.data((callee_addr, 82u64).encode())
+			.build());
 	});
 }
 
@@ -2926,12 +2913,10 @@ fn storage_deposit_limit_is_enforced() {
 		);
 
 		// now with enough limit
-		assert_ok!(
-			builder::call(addr)
-				.storage_deposit_limit(51)
-				.data(1u32.to_le_bytes().to_vec())
-				.build()
-		);
+		assert_ok!(builder::call(addr)
+			.storage_deposit_limit(51)
+			.data(1u32.to_le_bytes().to_vec())
+			.build());
 
 		// Use 4 more bytes of the storage for the same item, which requires 4 Balance.
 		// Should fail as DefaultDepositLimit is 3 and hence isn't enough.
@@ -2961,12 +2946,10 @@ fn deposit_limit_in_nested_calls() {
 		// Create 100 bytes of storage with a price of per byte
 		// This is 100 Balance + 2 Balance for the item
 		// 48 for the key
-		assert_ok!(
-			builder::call(addr_callee)
-				.storage_deposit_limit(102 + 48)
-				.data(100u32.to_le_bytes().to_vec())
-				.build()
-		);
+		assert_ok!(builder::call(addr_callee)
+			.storage_deposit_limit(102 + 48)
+			.data(100u32.to_le_bytes().to_vec())
+			.build());
 
 		// We do not remove any storage but add a storage item of 12 bytes in the caller
 		// contract. This would cost 12 + 2 + 72 = 86 Balance.
@@ -3028,12 +3011,10 @@ fn deposit_limit_in_nested_calls() {
 		// Free up enough storage in the callee so that the caller can create a new item
 		// We set the special deposit limit of 1 Balance for the nested call, which isn't
 		// enforced as callee frees up storage. This should pass.
-		assert_ok!(
-			builder::call(addr_caller)
-				.storage_deposit_limit(1)
-				.data((0u32, &addr_callee, U256::from(1u64)).encode())
-				.build()
-		);
+		assert_ok!(builder::call(addr_caller)
+			.storage_deposit_limit(1)
+			.data((0u32, &addr_callee, U256::from(1u64)).encode())
+			.build());
 	});
 }
 
@@ -3313,11 +3294,9 @@ fn block_hash_works() {
 			&crate::BlockNumberFor::<Test>::from(0u32),
 			<Test as frame_system::Config>::Hash::from(&block_hash),
 		);
-		assert_ok!(
-			builder::call(addr)
-				.data((U256::zero(), H256::from(block_hash)).encode())
-				.build()
-		);
+		assert_ok!(builder::call(addr)
+			.data((U256::zero(), H256::from(block_hash)).encode())
+			.build());
 
 		// A block number out of range returns the zero value
 		assert_ok!(builder::call(addr).data((U256::from(1), H256::zero()).encode()).build());
@@ -3881,12 +3860,10 @@ fn return_data_api_works() {
 			.build_and_unwrap_contract();
 
 		// Call the contract: It will issue calls and deploys, asserting on
-		assert_ok!(
-			builder::call(addr)
-				.value(10 * 1024)
-				.data(hash_return_with_data.encode())
-				.build()
-		);
+		assert_ok!(builder::call(addr)
+			.value(10 * 1024)
+			.data(hash_return_with_data.encode())
+			.build());
 	});
 }
 
@@ -4006,11 +3983,9 @@ fn to_account_id_works() {
 			[0xEE; 12],
 			"fallback suffix found where none should be"
 		);
-		assert_ok!(
-			builder::call(addr)
-				.data((EVE_ADDR, expected_mapped_account_id).encode())
-				.build()
-		);
+		assert_ok!(builder::call(addr)
+			.data((EVE_ADDR, expected_mapped_account_id).encode())
+			.build());
 
 		// fallback for unmapped accounts
 		let expected_fallback_account_id =
@@ -4020,17 +3995,15 @@ fn to_account_id_works() {
 			[0xEE; 12],
 			"no fallback suffix found where one should be"
 		);
-		assert_ok!(
-			builder::call(addr)
-				.data((BOB_ADDR, expected_fallback_account_id).encode())
-				.build()
-		);
+		assert_ok!(builder::call(addr)
+			.data((BOB_ADDR, expected_fallback_account_id).encode())
+			.build());
 	});
 }
 
 #[test]
 fn code_hash_works() {
-	use crate::precompiles::{EVM_REVERT, Precompile};
+	use crate::precompiles::{Precompile, EVM_REVERT};
 	use precompiles::NoInfo;
 
 	let builtin_precompile = H160(NoInfo::<Test>::MATCHER.base_address());
@@ -4052,17 +4025,13 @@ fn code_hash_works() {
 		// code hash of itself
 		assert_ok!(builder::call(addr).data((addr, self_code_hash).encode()).build());
 		// code hash of primitive pre-compile (exist but have no bytecode)
-		assert_ok!(
-			builder::call(addr)
-				.data((primitive_precompile, crate::exec::EMPTY_CODE_HASH).encode())
-				.build()
-		);
+		assert_ok!(builder::call(addr)
+			.data((primitive_precompile, crate::exec::EMPTY_CODE_HASH).encode())
+			.build());
 		// code hash of normal pre-compile (do have a bytecode)
-		assert_ok!(
-			builder::call(addr)
-				.data((builtin_precompile, sp_io::hashing::keccak_256(&EVM_REVERT)).encode())
-				.build()
-		);
+		assert_ok!(builder::call(addr)
+			.data((builtin_precompile, sp_io::hashing::keccak_256(&EVM_REVERT)).encode())
+			.build());
 
 		// EOA doesn't exists
 		assert_err!(
@@ -4082,11 +4051,9 @@ fn code_hash_works() {
 		);
 
 		// EOA returns empty code hash
-		assert_ok!(
-			builder::call(addr)
-				.data((BOB_ADDR, crate::exec::EMPTY_CODE_HASH).encode())
-				.build()
-		);
+		assert_ok!(builder::call(addr)
+			.data((BOB_ADDR, crate::exec::EMPTY_CODE_HASH).encode())
+			.build());
 	});
 }
 
@@ -4110,9 +4077,9 @@ fn code_size_works() {
 		assert_ok!(builder::call(tester_addr).data((dummy_addr, dummy_code_len).encode()).build());
 
 		// code size of own contract address
-		assert_ok!(
-			builder::call(tester_addr).data((tester_addr, tester_code_len).encode()).build()
-		);
+		assert_ok!(builder::call(tester_addr)
+			.data((tester_addr, tester_code_len).encode())
+			.build());
 
 		// code size of non contract accounts
 		assert_ok!(builder::call(tester_addr).data(([8u8; 20], 0u64).encode()).build());
@@ -4275,20 +4242,18 @@ fn skip_transfer_works() {
 		// we didn't roll back the storage changes done by the previous
 		// call. So the item already exists. We simply increase the size of
 		// the storage item to incur some deposits (which bob can't pay).
-		assert!(
-			Pallet::<Test>::dry_run_eth_transact(
-				GenericTransaction {
-					from: Some(BOB_ADDR),
-					to: Some(caller_addr),
-					input: (1u32, &addr).encode().into(),
-					gas: Some(1u32.into()),
-					..Default::default()
-				},
-				Weight::MAX,
-				|_, _| 0u64,
-			)
-			.is_err(),
-		);
+		assert!(Pallet::<Test>::dry_run_eth_transact(
+			GenericTransaction {
+				from: Some(BOB_ADDR),
+				to: Some(caller_addr),
+				input: (1u32, &addr).encode().into(),
+				gas: Some(1u32.into()),
+				..Default::default()
+			},
+			Weight::MAX,
+			|_, _| 0u64,
+		)
+		.is_err(),);
 
 		// works when no gas is specified (skip transfer)
 		assert_ok!(Pallet::<Test>::dry_run_eth_transact(
@@ -4329,20 +4294,18 @@ fn skip_transfer_works() {
 		));
 
 		// fails when trying to increase the storage item size
-		assert!(
-			Pallet::<Test>::dry_run_eth_transact(
-				GenericTransaction {
-					from: Some(BOB_ADDR),
-					to: Some(caller_addr),
-					input: (3u32, &addr).encode().into(),
-					gas: Some(1u32.into()),
-					..Default::default()
-				},
-				Weight::MAX,
-				|_, _| 0u64,
-			)
-			.is_err()
-		);
+		assert!(Pallet::<Test>::dry_run_eth_transact(
+			GenericTransaction {
+				from: Some(BOB_ADDR),
+				to: Some(caller_addr),
+				input: (3u32, &addr).encode().into(),
+				gas: Some(1u32.into()),
+				..Default::default()
+			},
+			Weight::MAX,
+			|_, _| 0u64,
+		)
+		.is_err());
 	});
 }
 
diff --git a/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs b/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs
index 686b6f33d9f2..1c2f57240f3a 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs
@@ -1,94 +1,96 @@
 use super::i256::{i256_div, i256_mod};
-use revm::interpreter::{
-    gas as revm_gas,
-    interpreter_types::{InterpreterTypes, RuntimeFlag, StackTr},
-    InstructionContext,
+use revm::{
+	interpreter::{
+		gas as revm_gas,
+		interpreter_types::{InterpreterTypes, RuntimeFlag, StackTr},
+		InstructionContext,
+	},
+	primitives::U256,
 };
-use revm::primitives::U256;
 
 /// Implements the ADD instruction - adds two values from stack.
 pub fn add<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    gas!(context.interpreter, revm_gas::VERYLOW);
-    popn_top!([op1], op2, context.interpreter);
-    *op2 = op1.wrapping_add(*op2);
+	gas!(context.interpreter, revm_gas::VERYLOW);
+	popn_top!([op1], op2, context.interpreter);
+	*op2 = op1.wrapping_add(*op2);
 }
 
 /// Implements the MUL instruction - multiplies two values from stack.
 pub fn mul<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    gas!(context.interpreter, revm_gas::LOW);
-    popn_top!([op1], op2, context.interpreter);
-    *op2 = op1.wrapping_mul(*op2);
+	gas!(context.interpreter, revm_gas::LOW);
+	popn_top!([op1], op2, context.interpreter);
+	*op2 = op1.wrapping_mul(*op2);
 }
 
 /// Implements the SUB instruction - subtracts two values from stack.
 pub fn sub<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    gas!(context.interpreter, revm_gas::VERYLOW);
-    popn_top!([op1], op2, context.interpreter);
-    *op2 = op1.wrapping_sub(*op2);
+	gas!(context.interpreter, revm_gas::VERYLOW);
+	popn_top!([op1], op2, context.interpreter);
+	*op2 = op1.wrapping_sub(*op2);
 }
 
 /// Implements the DIV instruction - divides two values from stack.
 pub fn div<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    gas!(context.interpreter, revm_gas::LOW);
-    popn_top!([op1], op2, context.interpreter);
-    if !op2.is_zero() {
-        *op2 = op1.wrapping_div(*op2);
-    }
+	gas!(context.interpreter, revm_gas::LOW);
+	popn_top!([op1], op2, context.interpreter);
+	if !op2.is_zero() {
+		*op2 = op1.wrapping_div(*op2);
+	}
 }
 
 /// Implements the SDIV instruction.
 ///
 /// Performs signed division of two values from stack.
 pub fn sdiv<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    gas!(context.interpreter, revm_gas::LOW);
-    popn_top!([op1], op2, context.interpreter);
-    *op2 = i256_div(op1, *op2);
+	gas!(context.interpreter, revm_gas::LOW);
+	popn_top!([op1], op2, context.interpreter);
+	*op2 = i256_div(op1, *op2);
 }
 
 /// Implements the MOD instruction.
 ///
 /// Pops two values from stack and pushes the remainder of their division.
 pub fn rem<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    gas!(context.interpreter, revm_gas::LOW);
-    popn_top!([op1], op2, context.interpreter);
-    if !op2.is_zero() {
-        *op2 = op1.wrapping_rem(*op2);
-    }
+	gas!(context.interpreter, revm_gas::LOW);
+	popn_top!([op1], op2, context.interpreter);
+	if !op2.is_zero() {
+		*op2 = op1.wrapping_rem(*op2);
+	}
 }
 
 /// Implements the SMOD instruction.
 ///
 /// Performs signed modulo of two values from stack.
 pub fn smod<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    gas!(context.interpreter, revm_gas::LOW);
-    popn_top!([op1], op2, context.interpreter);
-    *op2 = i256_mod(op1, *op2)
+	gas!(context.interpreter, revm_gas::LOW);
+	popn_top!([op1], op2, context.interpreter);
+	*op2 = i256_mod(op1, *op2)
 }
 
 /// Implements the ADDMOD instruction.
 ///
 /// Pops three values from stack and pushes (a + b) % n.
 pub fn addmod<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    gas!(context.interpreter, revm_gas::MID);
-    popn_top!([op1, op2], op3, context.interpreter);
-    *op3 = op1.add_mod(op2, *op3)
+	gas!(context.interpreter, revm_gas::MID);
+	popn_top!([op1, op2], op3, context.interpreter);
+	*op3 = op1.add_mod(op2, *op3)
 }
 
 /// Implements the MULMOD instruction.
 ///
 /// Pops three values from stack and pushes (a * b) % n.
 pub fn mulmod<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    gas!(context.interpreter, revm_gas::MID);
-    popn_top!([op1, op2], op3, context.interpreter);
-    *op3 = op1.mul_mod(op2, *op3)
+	gas!(context.interpreter, revm_gas::MID);
+	popn_top!([op1, op2], op3, context.interpreter);
+	*op3 = op1.mul_mod(op2, *op3)
 }
 
 /// Implements the EXP instruction - exponentiates two values from stack.
 pub fn exp<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    let spec_id = context.interpreter.runtime_flag.spec_id();
-    popn_top!([op1], op2, context.interpreter);
-    gas_or_fail!(context.interpreter, revm_gas::exp_cost(spec_id, *op2));
-    *op2 = op1.pow(*op2);
+	let spec_id = context.interpreter.runtime_flag.spec_id();
+	popn_top!([op1], op2, context.interpreter);
+	gas_or_fail!(context.interpreter, revm_gas::exp_cost(spec_id, *op2));
+	*op2 = op1.pow(*op2);
 }
 
 /// Implements the `SIGNEXTEND` opcode as defined in the Ethereum Yellow Paper.
@@ -121,14 +123,14 @@ pub fn exp<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H,
 /// Similarly, if `b == 0` then the yellow paper says the output should start with all zeros,
 /// then end with bits from `b`; this is equal to `y & mask` where `&` is bitwise `AND`.
 pub fn signextend<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    gas!(context.interpreter, revm_gas::LOW);
-    popn_top!([ext], x, context.interpreter);
-    // For 31 we also don't need to do anything.
-    if ext < U256::from(31) {
-        let ext = ext.as_limbs()[0];
-        let bit_index = (8 * ext + 7) as usize;
-        let bit = x.bit(bit_index);
-        let mask = (U256::from(1) << bit_index) - U256::from(1);
-        *x = if bit { *x | !mask } else { *x & mask };
-    }
+	gas!(context.interpreter, revm_gas::LOW);
+	popn_top!([ext], x, context.interpreter);
+	// For 31 we also don't need to do anything.
+	if ext < U256::from(31) {
+		let ext = ext.as_limbs()[0];
+		let bit_index = (8 * ext + 7) as usize;
+		let bit = x.bit(bit_index);
+		let mask = (U256::from(1) << bit_index) - U256::from(1);
+		*x = if bit { *x | !mask } else { *x & mask };
+	}
 }
diff --git a/substrate/frame/revive/src/vm/evm/instructions/bitwise.rs b/substrate/frame/revive/src/vm/evm/instructions/bitwise.rs
index c59a69b5886b..1281839f23bc 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/bitwise.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/bitwise.rs
@@ -2,8 +2,9 @@ use super::i256::i256_cmp;
 use core::cmp::Ordering;
 use revm::{
 	interpreter::{
-		InstructionContext, gas as revm_gas,
+		gas as revm_gas,
 		interpreter_types::{InterpreterTypes, RuntimeFlag, StackTr},
+		InstructionContext,
 	},
 	primitives::U256,
 };
@@ -167,8 +168,8 @@ pub fn sar<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H,
 mod tests {
 	use super::{byte, clz, sar, shl, shr};
 	use revm::{
-		interpreter::{InstructionContext, Interpreter, host::DummyHost},
-		primitives::{U256, hardfork::SpecId, uint},
+		interpreter::{host::DummyHost, InstructionContext, Interpreter},
+		primitives::{hardfork::SpecId, uint, U256},
 	};
 
 	#[test]
diff --git a/substrate/frame/revive/src/vm/evm/instructions/block_info.rs b/substrate/frame/revive/src/vm/evm/instructions/block_info.rs
index f5644f0c4bbd..60f261f21418 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/block_info.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/block_info.rs
@@ -1,11 +1,12 @@
 use crate::RuntimeCosts;
 use revm::{
 	interpreter::{
-		InstructionContext, gas as revm_gas,
+		gas as revm_gas,
 		host::Host,
 		interpreter_types::{InterpreterTypes, RuntimeFlag, StackTr},
+		InstructionContext,
 	},
-	primitives::{U256, hardfork::SpecId::*},
+	primitives::{hardfork::SpecId::*, U256},
 };
 
 /// EIP-1344: ChainID opcode
diff --git a/substrate/frame/revive/src/vm/evm/instructions/contract.rs b/substrate/frame/revive/src/vm/evm/instructions/contract.rs
index ca49a8e022de..c4447b3637dc 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/contract.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/contract.rs
@@ -6,7 +6,7 @@ use super::utility::IntoAddress;
 use revm::{
 	context_interface::CreateScheme,
 	interpreter::{
-		CallInput, InstructionContext, InstructionResult, gas as revm_gas,
+		gas as revm_gas,
 		host::Host,
 		interpreter_action::{
 			CallInputs, CallScheme, CallValue, CreateInputs, FrameInput, InterpreterAction,
@@ -14,8 +14,9 @@ use revm::{
 		interpreter_types::{
 			InputsTr, InterpreterTypes, LoopControl, MemoryTr, RuntimeFlag, StackTr,
 		},
+		CallInput, InstructionContext, InstructionResult,
 	},
-	primitives::{Address, B256, Bytes, U256, hardfork::SpecId},
+	primitives::{hardfork::SpecId, Address, Bytes, B256, U256},
 };
 use std::boxed::Box;
 
diff --git a/substrate/frame/revive/src/vm/evm/instructions/contract/call_helpers.rs b/substrate/frame/revive/src/vm/evm/instructions/contract/call_helpers.rs
index 24a5cbf1ac1e..c22b5a188d07 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/contract/call_helpers.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/contract/call_helpers.rs
@@ -1,71 +1,70 @@
-use revm::interpreter::{
-    gas as revm_gas,
-    Interpreter,
-    interpreter_types::{InterpreterTypes, MemoryTr, RuntimeFlag, StackTr},
-};
-use revm::context_interface::{context::StateLoad, journaled_state::AccountLoad};
 use core::{cmp::min, ops::Range};
-use revm::primitives::{hardfork::SpecId::*, U256};
+use revm::{
+	context_interface::{context::StateLoad, journaled_state::AccountLoad},
+	interpreter::{
+		gas as revm_gas,
+		interpreter_types::{InterpreterTypes, MemoryTr, RuntimeFlag, StackTr},
+		Interpreter,
+	},
+	primitives::{hardfork::SpecId::*, U256},
+};
 
 /// Gets memory input and output ranges for call instructions.
 #[inline]
 pub fn get_memory_input_and_out_ranges(
-    interpreter: &mut Interpreter<impl InterpreterTypes>,
+	interpreter: &mut Interpreter<impl InterpreterTypes>,
 ) -> Option<(Range<usize>, Range<usize>)> {
-    popn!([in_offset, in_len, out_offset, out_len], interpreter, None);
+	popn!([in_offset, in_len, out_offset, out_len], interpreter, None);
 
-    let mut in_range = resize_memory(interpreter, in_offset, in_len)?;
+	let mut in_range = resize_memory(interpreter, in_offset, in_len)?;
 
-    if !in_range.is_empty() {
-        let offset = interpreter.memory.local_memory_offset();
-        in_range = in_range.start.saturating_add(offset)..in_range.end.saturating_add(offset);
-    }
+	if !in_range.is_empty() {
+		let offset = interpreter.memory.local_memory_offset();
+		in_range = in_range.start.saturating_add(offset)..in_range.end.saturating_add(offset);
+	}
 
-    let ret_range = resize_memory(interpreter, out_offset, out_len)?;
-    Some((in_range, ret_range))
+	let ret_range = resize_memory(interpreter, out_offset, out_len)?;
+	Some((in_range, ret_range))
 }
 
 /// Resize memory and return range of memory.
 /// If `len` is 0 dont touch memory and return `usize::MAX` as offset and 0 as length.
 #[inline]
 pub fn resize_memory(
-    interpreter: &mut Interpreter<impl InterpreterTypes>,
-    offset: U256,
-    len: U256,
+	interpreter: &mut Interpreter<impl InterpreterTypes>,
+	offset: U256,
+	len: U256,
 ) -> Option<Range<usize>> {
-    let len = as_usize_or_fail_ret!(interpreter, len, None);
-    let offset = if len != 0 {
-        let offset = as_usize_or_fail_ret!(interpreter, offset, None);
-        resize_memory!(interpreter, offset, len, None);
-        offset
-    } else {
-        usize::MAX //unrealistic value so we are sure it is not used
-    };
-    Some(offset..offset + len)
+	let len = as_usize_or_fail_ret!(interpreter, len, None);
+	let offset = if len != 0 {
+		let offset = as_usize_or_fail_ret!(interpreter, offset, None);
+		resize_memory!(interpreter, offset, len, None);
+		offset
+	} else {
+		usize::MAX //unrealistic value so we are sure it is not used
+	};
+	Some(offset..offset + len)
 }
 
 /// Calculates gas cost and limit for call instructions.
 #[inline]
 pub fn calc_call_gas(
-    interpreter: &mut Interpreter<impl InterpreterTypes>,
-    account_load: StateLoad<AccountLoad>,
-    has_transfer: bool,
-    local_gas_limit: u64,
+	interpreter: &mut Interpreter<impl InterpreterTypes>,
+	account_load: StateLoad<AccountLoad>,
+	has_transfer: bool,
+	local_gas_limit: u64,
 ) -> Option<u64> {
-    let call_cost = revm_gas::call_cost(
-        interpreter.runtime_flag.spec_id(),
-        has_transfer,
-        account_load,
-    );
-    gas!(interpreter, call_cost, None);
+	let call_cost =
+		revm_gas::call_cost(interpreter.runtime_flag.spec_id(), has_transfer, account_load);
+	gas!(interpreter, call_cost, None);
 
-    // EIP-150: Gas cost changes for IO-heavy operations
-    let gas_limit = if interpreter.runtime_flag.spec_id().is_enabled_in(TANGERINE) {
-        // Take l64 part of gas_limit
-        min(interpreter.gas.remaining_63_of_64_parts(), local_gas_limit)
-    } else {
-        local_gas_limit
-    };
+	// EIP-150: Gas cost changes for IO-heavy operations
+	let gas_limit = if interpreter.runtime_flag.spec_id().is_enabled_in(TANGERINE) {
+		// Take l64 part of gas_limit
+		min(interpreter.gas.remaining_63_of_64_parts(), local_gas_limit)
+	} else {
+		local_gas_limit
+	};
 
-    Some(gas_limit)
+	Some(gas_limit)
 }
diff --git a/substrate/frame/revive/src/vm/evm/instructions/control.rs b/substrate/frame/revive/src/vm/evm/instructions/control.rs
index 95e0020b678a..8afda9b8db98 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/control.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/control.rs
@@ -1,32 +1,32 @@
-use revm::interpreter::interpreter_action::InterpreterAction;
-use revm::interpreter::{
-    gas as revm_gas,
-    Interpreter,
-    interpreter_types::{InterpreterTypes, Jumps, LoopControl, MemoryTr, RuntimeFlag, StackTr},
-    InstructionContext,
-    InstructionResult,
+use revm::{
+	interpreter::{
+		gas as revm_gas,
+		interpreter_action::InterpreterAction,
+		interpreter_types::{InterpreterTypes, Jumps, LoopControl, MemoryTr, RuntimeFlag, StackTr},
+		InstructionContext, InstructionResult, Interpreter,
+	},
+	primitives::{Bytes, U256},
 };
-use revm::primitives::{Bytes, U256};
 
 /// Implements the JUMP instruction.
 ///
 /// Unconditional jump to a valid destination.
 pub fn jump<ITy: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, ITy>) {
-    gas!(context.interpreter, revm_gas::MID);
-    popn!([target], context.interpreter);
-    jump_inner(context.interpreter, target);
+	gas!(context.interpreter, revm_gas::MID);
+	popn!([target], context.interpreter);
+	jump_inner(context.interpreter, target);
 }
 
 /// Implements the JUMPI instruction.
 ///
 /// Conditional jump to a valid destination if condition is true.
 pub fn jumpi<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    gas!(context.interpreter, revm_gas::HIGH);
-    popn!([target, cond], context.interpreter);
+	gas!(context.interpreter, revm_gas::HIGH);
+	popn!([target, cond], context.interpreter);
 
-    if !cond.is_zero() {
-        jump_inner(context.interpreter, target);
-    }
+	if !cond.is_zero() {
+		jump_inner(context.interpreter, target);
+	}
 }
 
 #[inline(always)]
@@ -34,32 +34,29 @@ pub fn jumpi<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_,
 ///
 /// Validates jump target and performs the actual jump.
 fn jump_inner<WIRE: InterpreterTypes>(interpreter: &mut Interpreter<WIRE>, target: U256) {
-    let target = as_usize_or_fail!(interpreter, target, InstructionResult::InvalidJump);
-    if !interpreter.bytecode.is_valid_legacy_jump(target) {
-        interpreter.halt(InstructionResult::InvalidJump);
-        return;
-    }
-    // SAFETY: `is_valid_jump` ensures that `dest` is in bounds.
-    interpreter.bytecode.absolute_jump(target);
+	let target = as_usize_or_fail!(interpreter, target, InstructionResult::InvalidJump);
+	if !interpreter.bytecode.is_valid_legacy_jump(target) {
+		interpreter.halt(InstructionResult::InvalidJump);
+		return;
+	}
+	// SAFETY: `is_valid_jump` ensures that `dest` is in bounds.
+	interpreter.bytecode.absolute_jump(target);
 }
 
 /// Implements the JUMPDEST instruction.
 ///
 /// Marks a valid destination for jump operations.
 pub fn jumpdest<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    gas!(context.interpreter, revm_gas::JUMPDEST);
+	gas!(context.interpreter, revm_gas::JUMPDEST);
 }
 
 /// Implements the PC instruction.
 ///
 /// Pushes the current program counter onto the stack.
 pub fn pc<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    gas!(context.interpreter, revm_gas::BASE);
-    // - 1 because we have already advanced the instruction pointer in `Interpreter::step`
-    push!(
-        context.interpreter,
-        U256::from(context.interpreter.bytecode.pc() - 1)
-    );
+	gas!(context.interpreter, revm_gas::BASE);
+	// - 1 because we have already advanced the instruction pointer in `Interpreter::step`
+	push!(context.interpreter, U256::from(context.interpreter.bytecode.pc() - 1));
 }
 
 #[inline]
@@ -67,54 +64,52 @@ pub fn pc<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H,
 ///
 /// Handles memory data retrieval and sets the return action.
 fn return_inner(
-    interpreter: &mut Interpreter<impl InterpreterTypes>,
-    instruction_result: InstructionResult,
+	interpreter: &mut Interpreter<impl InterpreterTypes>,
+	instruction_result: InstructionResult,
 ) {
-    // Zero gas cost
-    // gas!(interpreter, revm_gas::ZERO)
-    popn!([offset, len], interpreter);
-    let len = as_usize_or_fail!(interpreter, len);
-    // Important: Offset must be ignored if len is zeros
-    let mut output = Bytes::default();
-    if len != 0 {
-        let offset = as_usize_or_fail!(interpreter, offset);
-        resize_memory!(interpreter, offset, len);
-        output = interpreter.memory.slice_len(offset, len).to_vec().into()
-    }
+	// Zero gas cost
+	// gas!(interpreter, revm_gas::ZERO)
+	popn!([offset, len], interpreter);
+	let len = as_usize_or_fail!(interpreter, len);
+	// Important: Offset must be ignored if len is zeros
+	let mut output = Bytes::default();
+	if len != 0 {
+		let offset = as_usize_or_fail!(interpreter, offset);
+		resize_memory!(interpreter, offset, len);
+		output = interpreter.memory.slice_len(offset, len).to_vec().into()
+	}
 
-    interpreter
-        .bytecode
-        .set_action(InterpreterAction::new_return(
-            instruction_result,
-            output,
-            interpreter.gas,
-        ));
+	interpreter.bytecode.set_action(InterpreterAction::new_return(
+		instruction_result,
+		output,
+		interpreter.gas,
+	));
 }
 
 /// Implements the RETURN instruction.
 ///
 /// Halts execution and returns data from memory.
 pub fn ret<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    return_inner(context.interpreter, InstructionResult::Return);
+	return_inner(context.interpreter, InstructionResult::Return);
 }
 
 /// EIP-140: REVERT instruction
 pub fn revert<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    check!(context.interpreter, BYZANTIUM);
-    return_inner(context.interpreter, InstructionResult::Revert);
+	check!(context.interpreter, BYZANTIUM);
+	return_inner(context.interpreter, InstructionResult::Revert);
 }
 
 /// Stop opcode. This opcode halts the execution.
 pub fn stop<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    context.interpreter.halt(InstructionResult::Stop);
+	context.interpreter.halt(InstructionResult::Stop);
 }
 
 /// Invalid opcode. This opcode halts the execution.
 pub fn invalid<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    context.interpreter.halt(InstructionResult::InvalidFEOpcode);
+	context.interpreter.halt(InstructionResult::InvalidFEOpcode);
 }
 
 /// Unknown opcode. This opcode halts the execution.
 pub fn unknown<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    context.interpreter.halt(InstructionResult::OpcodeNotFound);
+	context.interpreter.halt(InstructionResult::OpcodeNotFound);
 }
diff --git a/substrate/frame/revive/src/vm/evm/instructions/host.rs b/substrate/frame/revive/src/vm/evm/instructions/host.rs
index 7cbe4119ef64..d405d1620a53 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/host.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/host.rs
@@ -2,12 +2,12 @@ use super::utility::{IntoAddress, IntoU256};
 use core::cmp::min;
 use revm::{
 	interpreter::{
-		InstructionContext, InstructionResult,
-		gas::{self, CALL_STIPEND, warm_cold_cost},
+		gas::{self, warm_cold_cost, CALL_STIPEND},
 		host::Host,
 		interpreter_types::{InputsTr, InterpreterTypes, MemoryTr, RuntimeFlag, StackTr},
+		InstructionContext, InstructionResult,
 	},
-	primitives::{B256, BLOCK_HASH_HISTORY, Bytes, Log, LogData, U256, hardfork::SpecId::*},
+	primitives::{hardfork::SpecId::*, Bytes, Log, LogData, B256, BLOCK_HASH_HISTORY, U256},
 };
 
 /// Implements the BALANCE instruction.
diff --git a/substrate/frame/revive/src/vm/evm/instructions/i256.rs b/substrate/frame/revive/src/vm/evm/instructions/i256.rs
index adcec1c4cb36..8f14ec0f871f 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/i256.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/i256.rs
@@ -136,7 +136,11 @@ pub fn i256_mod(mut first: U256, mut second: U256) -> U256 {
 	// Set sign bit to zero
 	u256_remove_sign(&mut r);
 
-	if first_sign == Sign::Minus { two_compl(r) } else { r }
+	if first_sign == Sign::Minus {
+		two_compl(r)
+	} else {
+		r
+	}
 }
 
 #[cfg(test)]
diff --git a/substrate/frame/revive/src/vm/evm/instructions/memory.rs b/substrate/frame/revive/src/vm/evm/instructions/memory.rs
index 6e6737596972..13fbcfc7d4ae 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/memory.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/memory.rs
@@ -1,78 +1,74 @@
-use revm::interpreter::{
-    gas as revm_gas,
-    interpreter_types::{InterpreterTypes, MemoryTr, RuntimeFlag, StackTr},
-    InstructionContext,
-};
 use core::cmp::max;
-use revm::primitives::U256;
+use revm::{
+	interpreter::{
+		gas as revm_gas,
+		interpreter_types::{InterpreterTypes, MemoryTr, RuntimeFlag, StackTr},
+		InstructionContext,
+	},
+	primitives::U256,
+};
 
 /// Implements the MLOAD instruction.
 ///
 /// Loads a 32-byte word from memory.
 pub fn mload<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    gas!(context.interpreter, revm_gas::VERYLOW);
-    popn_top!([], top, context.interpreter);
-    let offset = as_usize_or_fail!(context.interpreter, top);
-    resize_memory!(context.interpreter, offset, 32);
-    *top =
-        U256::try_from_be_slice(context.interpreter.memory.slice_len(offset, 32).as_ref()).unwrap()
+	gas!(context.interpreter, revm_gas::VERYLOW);
+	popn_top!([], top, context.interpreter);
+	let offset = as_usize_or_fail!(context.interpreter, top);
+	resize_memory!(context.interpreter, offset, 32);
+	*top =
+		U256::try_from_be_slice(context.interpreter.memory.slice_len(offset, 32).as_ref()).unwrap()
 }
 
 /// Implements the MSTORE instruction.
 ///
 /// Stores a 32-byte word to memory.
 pub fn mstore<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    gas!(context.interpreter, revm_gas::VERYLOW);
-    popn!([offset, value], context.interpreter);
-    let offset = as_usize_or_fail!(context.interpreter, offset);
-    resize_memory!(context.interpreter, offset, 32);
-    context
-        .interpreter
-        .memory
-        .set(offset, &value.to_be_bytes::<32>());
+	gas!(context.interpreter, revm_gas::VERYLOW);
+	popn!([offset, value], context.interpreter);
+	let offset = as_usize_or_fail!(context.interpreter, offset);
+	resize_memory!(context.interpreter, offset, 32);
+	context.interpreter.memory.set(offset, &value.to_be_bytes::<32>());
 }
 
 /// Implements the MSTORE8 instruction.
 ///
 /// Stores a single byte to memory.
 pub fn mstore8<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    gas!(context.interpreter, revm_gas::VERYLOW);
-    popn!([offset, value], context.interpreter);
-    let offset = as_usize_or_fail!(context.interpreter, offset);
-    resize_memory!(context.interpreter, offset, 1);
-    context.interpreter.memory.set(offset, &[value.byte(0)]);
+	gas!(context.interpreter, revm_gas::VERYLOW);
+	popn!([offset, value], context.interpreter);
+	let offset = as_usize_or_fail!(context.interpreter, offset);
+	resize_memory!(context.interpreter, offset, 1);
+	context.interpreter.memory.set(offset, &[value.byte(0)]);
 }
 
 /// Implements the MSIZE instruction.
 ///
 /// Gets the size of active memory in bytes.
 pub fn msize<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    gas!(context.interpreter, revm_gas::BASE);
-    push!(
-        context.interpreter,
-        U256::from(context.interpreter.memory.size())
-    );
+	gas!(context.interpreter, revm_gas::BASE);
+	push!(context.interpreter, U256::from(context.interpreter.memory.size()));
 }
 
 /// Implements the MCOPY instruction.
 ///
 /// EIP-5656: Memory copying instruction that copies memory from one location to another.
 pub fn mcopy<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    check!(context.interpreter, CANCUN);
-    popn!([dst, src, len], context.interpreter);
+	check!(context.interpreter, CANCUN);
+	popn!([dst, src, len], context.interpreter);
 
-    // Into usize or fail
-    let len = as_usize_or_fail!(context.interpreter, len);
-    // Deduce gas
-    gas_or_fail!(context.interpreter, revm_gas::copy_cost_verylow(len));
-    if len == 0 {
-        return;
-    }
+	// Into usize or fail
+	let len = as_usize_or_fail!(context.interpreter, len);
+	// Deduce gas
+	gas_or_fail!(context.interpreter, revm_gas::copy_cost_verylow(len));
+	if len == 0 {
+		return;
+	}
 
-    let dst = as_usize_or_fail!(context.interpreter, dst);
-    let src = as_usize_or_fail!(context.interpreter, src);
-    // Resize memory
-    resize_memory!(context.interpreter, max(dst, src), len);
-    // Copy memory in place
-    context.interpreter.memory.copy(dst, src, len);
+	let dst = as_usize_or_fail!(context.interpreter, dst);
+	let src = as_usize_or_fail!(context.interpreter, src);
+	// Resize memory
+	resize_memory!(context.interpreter, max(dst, src), len);
+	// Copy memory in place
+	context.interpreter.memory.copy(dst, src, len);
 }
diff --git a/substrate/frame/revive/src/vm/evm/instructions/stack.rs b/substrate/frame/revive/src/vm/evm/instructions/stack.rs
index c011fc572511..971458c10b47 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/stack.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/stack.rs
@@ -1,8 +1,9 @@
 use super::utility::cast_slice_to_u256;
 use revm::{
 	interpreter::{
-		InstructionContext, InstructionResult, gas as revm_gas,
+		gas as revm_gas,
 		interpreter_types::{Immediates, InterpreterTypes, Jumps, RuntimeFlag, StackTr},
+		InstructionContext, InstructionResult,
 	},
 	primitives::U256,
 };
diff --git a/substrate/frame/revive/src/vm/evm/instructions/system.rs b/substrate/frame/revive/src/vm/evm/instructions/system.rs
index e5acb88a76ed..259e10e2cf34 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/system.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/system.rs
@@ -1,247 +1,218 @@
-use revm::interpreter::CallInput;
-use revm::interpreter::{
-    gas as revm_gas,
-    Interpreter,
-    interpreter_types::{
-        InputsTr, InterpreterTypes, LegacyBytecode, MemoryTr, ReturnData, RuntimeFlag, StackTr,
-    },
-    InstructionContext,
-    InstructionResult,
-};
 use core::ptr;
-use revm::primitives::{B256, KECCAK_EMPTY, U256};
+use revm::{
+	interpreter::{
+		gas as revm_gas,
+		interpreter_types::{
+			InputsTr, InterpreterTypes, LegacyBytecode, MemoryTr, ReturnData, RuntimeFlag, StackTr,
+		},
+		CallInput, InstructionContext, InstructionResult, Interpreter,
+	},
+	primitives::{B256, KECCAK_EMPTY, U256},
+};
 
 /// Implements the KECCAK256 instruction.
 ///
 /// Computes Keccak-256 hash of memory data.
 pub fn keccak256<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    popn_top!([offset], top, context.interpreter);
-    let len = as_usize_or_fail!(context.interpreter, top);
-    gas_or_fail!(context.interpreter, revm_gas::keccak256_cost(len));
-    let hash = if len == 0 {
-        KECCAK_EMPTY
-    } else {
-        let from = as_usize_or_fail!(context.interpreter, offset);
-        resize_memory!(context.interpreter, from, len);
-        revm::primitives::keccak256(context.interpreter.memory.slice_len(from, len).as_ref())
-    };
-    *top = hash.into();
+	popn_top!([offset], top, context.interpreter);
+	let len = as_usize_or_fail!(context.interpreter, top);
+	gas_or_fail!(context.interpreter, revm_gas::keccak256_cost(len));
+	let hash = if len == 0 {
+		KECCAK_EMPTY
+	} else {
+		let from = as_usize_or_fail!(context.interpreter, offset);
+		resize_memory!(context.interpreter, from, len);
+		revm::primitives::keccak256(context.interpreter.memory.slice_len(from, len).as_ref())
+	};
+	*top = hash.into();
 }
 
 /// Implements the ADDRESS instruction.
 ///
 /// Pushes the current contract's address onto the stack.
 pub fn address<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    gas!(context.interpreter, revm_gas::BASE);
-    push!(
-        context.interpreter,
-        context
-            .interpreter
-            .input
-            .target_address()
-            .into_word()
-            .into()
-    );
+	gas!(context.interpreter, revm_gas::BASE);
+	push!(context.interpreter, context.interpreter.input.target_address().into_word().into());
 }
 
 /// Implements the CALLER instruction.
 ///
 /// Pushes the caller's address onto the stack.
 pub fn caller<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    gas!(context.interpreter, revm_gas::BASE);
-    push!(
-        context.interpreter,
-        context
-            .interpreter
-            .input
-            .caller_address()
-            .into_word()
-            .into()
-    );
+	gas!(context.interpreter, revm_gas::BASE);
+	push!(context.interpreter, context.interpreter.input.caller_address().into_word().into());
 }
 
 /// Implements the CODESIZE instruction.
 ///
 /// Pushes the size of running contract's bytecode onto the stack.
 pub fn codesize<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    gas!(context.interpreter, revm_gas::BASE);
-    push!(
-        context.interpreter,
-        U256::from(context.interpreter.bytecode.bytecode_len())
-    );
+	gas!(context.interpreter, revm_gas::BASE);
+	push!(context.interpreter, U256::from(context.interpreter.bytecode.bytecode_len()));
 }
 
 /// Implements the CODECOPY instruction.
 ///
 /// Copies running contract's bytecode to memory.
 pub fn codecopy<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    popn!([memory_offset, code_offset, len], context.interpreter);
-    let len = as_usize_or_fail!(context.interpreter, len);
-    let Some(memory_offset) = memory_resize(context.interpreter, memory_offset, len) else {
-        return;
-    };
-    let code_offset = as_usize_saturated!(code_offset);
-
-    // Note: This can't panic because we resized memory to fit.
-    context.interpreter.memory.set_data(
-        memory_offset,
-        code_offset,
-        len,
-        context.interpreter.bytecode.bytecode_slice(),
-    );
+	popn!([memory_offset, code_offset, len], context.interpreter);
+	let len = as_usize_or_fail!(context.interpreter, len);
+	let Some(memory_offset) = memory_resize(context.interpreter, memory_offset, len) else {
+		return;
+	};
+	let code_offset = as_usize_saturated!(code_offset);
+
+	// Note: This can't panic because we resized memory to fit.
+	context.interpreter.memory.set_data(
+		memory_offset,
+		code_offset,
+		len,
+		context.interpreter.bytecode.bytecode_slice(),
+	);
 }
 
 /// Implements the CALLDATALOAD instruction.
 ///
 /// Loads 32 bytes of input data from the specified offset.
 pub fn calldataload<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    gas!(context.interpreter, revm_gas::VERYLOW);
-    //pop_top!(interpreter, offset_ptr);
-    popn_top!([], offset_ptr, context.interpreter);
-    let mut word = B256::ZERO;
-    let offset = as_usize_saturated!(offset_ptr);
-    let input = context.interpreter.input.input();
-    let input_len = input.len();
-    if offset < input_len {
-        let count = 32.min(input_len - offset);
-
-        // SAFETY: `count` is bounded by the calldata length.
-        // This is `word[..count].copy_from_slice(input[offset..offset + count])`, written using
-        // raw pointers as apparently the compiler cannot optimize the slice version, and using
-        // `get_unchecked` twice is uglier.
-        match context.interpreter.input.input() {
-            CallInput::Bytes(bytes) => {
-                unsafe {
-                    ptr::copy_nonoverlapping(bytes.as_ptr().add(offset), word.as_mut_ptr(), count)
-                };
-            }
-            CallInput::SharedBuffer(range) => {
-                let input_slice = context.interpreter.memory.global_slice(range.clone());
-                unsafe {
-                    ptr::copy_nonoverlapping(
-                        input_slice.as_ptr().add(offset),
-                        word.as_mut_ptr(),
-                        count,
-                    )
-                };
-            }
-        }
-    }
-    *offset_ptr = word.into();
+	gas!(context.interpreter, revm_gas::VERYLOW);
+	//pop_top!(interpreter, offset_ptr);
+	popn_top!([], offset_ptr, context.interpreter);
+	let mut word = B256::ZERO;
+	let offset = as_usize_saturated!(offset_ptr);
+	let input = context.interpreter.input.input();
+	let input_len = input.len();
+	if offset < input_len {
+		let count = 32.min(input_len - offset);
+
+		// SAFETY: `count` is bounded by the calldata length.
+		// This is `word[..count].copy_from_slice(input[offset..offset + count])`, written using
+		// raw pointers as apparently the compiler cannot optimize the slice version, and using
+		// `get_unchecked` twice is uglier.
+		match context.interpreter.input.input() {
+			CallInput::Bytes(bytes) => {
+				unsafe {
+					ptr::copy_nonoverlapping(bytes.as_ptr().add(offset), word.as_mut_ptr(), count)
+				};
+			},
+			CallInput::SharedBuffer(range) => {
+				let input_slice = context.interpreter.memory.global_slice(range.clone());
+				unsafe {
+					ptr::copy_nonoverlapping(
+						input_slice.as_ptr().add(offset),
+						word.as_mut_ptr(),
+						count,
+					)
+				};
+			},
+		}
+	}
+	*offset_ptr = word.into();
 }
 
 /// Implements the CALLDATASIZE instruction.
 ///
 /// Pushes the size of input data onto the stack.
 pub fn calldatasize<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    gas!(context.interpreter, revm_gas::BASE);
-    push!(
-        context.interpreter,
-        U256::from(context.interpreter.input.input().len())
-    );
+	gas!(context.interpreter, revm_gas::BASE);
+	push!(context.interpreter, U256::from(context.interpreter.input.input().len()));
 }
 
 /// Implements the CALLVALUE instruction.
 ///
 /// Pushes the value sent with the current call onto the stack.
 pub fn callvalue<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    gas!(context.interpreter, revm_gas::BASE);
-    push!(context.interpreter, context.interpreter.input.call_value());
+	gas!(context.interpreter, revm_gas::BASE);
+	push!(context.interpreter, context.interpreter.input.call_value());
 }
 
 /// Implements the CALLDATACOPY instruction.
 ///
 /// Copies input data to memory.
 pub fn calldatacopy<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    popn!([memory_offset, data_offset, len], context.interpreter);
-    let len = as_usize_or_fail!(context.interpreter, len);
-    let Some(memory_offset) = memory_resize(context.interpreter, memory_offset, len) else {
-        return;
-    };
-
-    let data_offset = as_usize_saturated!(data_offset);
-    match context.interpreter.input.input() {
-        CallInput::Bytes(bytes) => {
-            context
-                .interpreter
-                .memory
-                .set_data(memory_offset, data_offset, len, bytes.as_ref());
-        }
-        CallInput::SharedBuffer(range) => {
-            context.interpreter.memory.set_data_from_global(
-                memory_offset,
-                data_offset,
-                len,
-                range.clone(),
-            );
-        }
-    }
+	popn!([memory_offset, data_offset, len], context.interpreter);
+	let len = as_usize_or_fail!(context.interpreter, len);
+	let Some(memory_offset) = memory_resize(context.interpreter, memory_offset, len) else {
+		return;
+	};
+
+	let data_offset = as_usize_saturated!(data_offset);
+	match context.interpreter.input.input() {
+		CallInput::Bytes(bytes) => {
+			context
+				.interpreter
+				.memory
+				.set_data(memory_offset, data_offset, len, bytes.as_ref());
+		},
+		CallInput::SharedBuffer(range) => {
+			context.interpreter.memory.set_data_from_global(
+				memory_offset,
+				data_offset,
+				len,
+				range.clone(),
+			);
+		},
+	}
 }
 
 /// EIP-211: New opcodes: RETURNDATASIZE and RETURNDATACOPY
 pub fn returndatasize<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    check!(context.interpreter, BYZANTIUM);
-    gas!(context.interpreter, revm_gas::BASE);
-    push!(
-        context.interpreter,
-        U256::from(context.interpreter.return_data.buffer().len())
-    );
+	check!(context.interpreter, BYZANTIUM);
+	gas!(context.interpreter, revm_gas::BASE);
+	push!(context.interpreter, U256::from(context.interpreter.return_data.buffer().len()));
 }
 
 /// EIP-211: New opcodes: RETURNDATASIZE and RETURNDATACOPY
 pub fn returndatacopy<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    check!(context.interpreter, BYZANTIUM);
-    popn!([memory_offset, offset, len], context.interpreter);
-
-    let len = as_usize_or_fail!(context.interpreter, len);
-    let data_offset = as_usize_saturated!(offset);
-
-    // Old legacy behavior is to panic if data_end is out of scope of return buffer.
-    let data_end = data_offset.saturating_add(len);
-    if data_end > context.interpreter.return_data.buffer().len() {
-        context.interpreter.halt(InstructionResult::OutOfOffset);
-        return;
-    }
-
-    let Some(memory_offset) = memory_resize(context.interpreter, memory_offset, len) else {
-        return;
-    };
-
-    // Note: This can't panic because we resized memory to fit.
-    context.interpreter.memory.set_data(
-        memory_offset,
-        data_offset,
-        len,
-        context.interpreter.return_data.buffer(),
-    );
+	check!(context.interpreter, BYZANTIUM);
+	popn!([memory_offset, offset, len], context.interpreter);
+
+	let len = as_usize_or_fail!(context.interpreter, len);
+	let data_offset = as_usize_saturated!(offset);
+
+	// Old legacy behavior is to panic if data_end is out of scope of return buffer.
+	let data_end = data_offset.saturating_add(len);
+	if data_end > context.interpreter.return_data.buffer().len() {
+		context.interpreter.halt(InstructionResult::OutOfOffset);
+		return;
+	}
+
+	let Some(memory_offset) = memory_resize(context.interpreter, memory_offset, len) else {
+		return;
+	};
+
+	// Note: This can't panic because we resized memory to fit.
+	context.interpreter.memory.set_data(
+		memory_offset,
+		data_offset,
+		len,
+		context.interpreter.return_data.buffer(),
+	);
 }
 
 /// Implements the GAS instruction.
 ///
 /// Pushes the amount of remaining gas onto the stack.
 pub fn gas<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    gas!(context.interpreter, revm_gas::BASE);
-    push!(
-        context.interpreter,
-        U256::from(context.interpreter.gas.remaining())
-    );
+	gas!(context.interpreter, revm_gas::BASE);
+	push!(context.interpreter, U256::from(context.interpreter.gas.remaining()));
 }
 
 /// Common logic for copying data from a source buffer to the EVM's memory.
 ///
 /// Handles memory expansion and gas calculation for data copy operations.
 pub fn memory_resize(
-    interpreter: &mut Interpreter<impl InterpreterTypes>,
-    memory_offset: U256,
-    len: usize,
+	interpreter: &mut Interpreter<impl InterpreterTypes>,
+	memory_offset: U256,
+	len: usize,
 ) -> Option<usize> {
-    // Safe to cast usize to u64
-    gas_or_fail!(interpreter, revm_gas::copy_cost_verylow(len), None);
-    if len == 0 {
-        return None;
-    }
-    let memory_offset = as_usize_or_fail_ret!(interpreter, memory_offset, None);
-    resize_memory!(interpreter, memory_offset, len, None);
-
-    Some(memory_offset)
+	// Safe to cast usize to u64
+	gas_or_fail!(interpreter, revm_gas::copy_cost_verylow(len), None);
+	if len == 0 {
+		return None;
+	}
+	let memory_offset = as_usize_or_fail_ret!(interpreter, memory_offset, None);
+	resize_memory!(interpreter, memory_offset, len, None);
+
+	Some(memory_offset)
 }
diff --git a/substrate/frame/revive/src/vm/evm/instructions/tx_info.rs b/substrate/frame/revive/src/vm/evm/instructions/tx_info.rs
index 2c248f2c4ea2..ec90617c002e 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/tx_info.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/tx_info.rs
@@ -1,44 +1,40 @@
-use revm::interpreter::{
-    gas as revm_gas,
-    interpreter_types::{InterpreterTypes, RuntimeFlag, StackTr},
-    host::Host,
-    InstructionContext,
+use revm::{
+	interpreter::{
+		gas as revm_gas,
+		host::Host,
+		interpreter_types::{InterpreterTypes, RuntimeFlag, StackTr},
+		InstructionContext,
+	},
+	primitives::U256,
 };
-use revm::primitives::U256;
 
 /// Implements the GASPRICE instruction.
 ///
 /// Gets the gas price of the originating transaction.
 pub fn gasprice<WIRE: InterpreterTypes, H: Host + ?Sized>(
-    context: InstructionContext<'_, H, WIRE>,
+	context: InstructionContext<'_, H, WIRE>,
 ) {
-    gas!(context.interpreter, revm_gas::BASE);
-    push!(
-        context.interpreter,
-        U256::from(context.host.effective_gas_price())
-    );
+	gas!(context.interpreter, revm_gas::BASE);
+	push!(context.interpreter, U256::from(context.host.effective_gas_price()));
 }
 
 /// Implements the ORIGIN instruction.
 ///
 /// Gets the execution origination address.
 pub fn origin<WIRE: InterpreterTypes, H: Host + ?Sized>(context: InstructionContext<'_, H, WIRE>) {
-    gas!(context.interpreter, revm_gas::BASE);
-    push!(
-        context.interpreter,
-        context.host.caller().into_word().into()
-    );
+	gas!(context.interpreter, revm_gas::BASE);
+	push!(context.interpreter, context.host.caller().into_word().into());
 }
 
 /// Implements the BLOBHASH instruction.
 ///
 /// EIP-4844: Shard Blob Transactions - gets the hash of a transaction blob.
 pub fn blob_hash<WIRE: InterpreterTypes, H: Host + ?Sized>(
-    context: InstructionContext<'_, H, WIRE>,
+	context: InstructionContext<'_, H, WIRE>,
 ) {
-    check!(context.interpreter, CANCUN);
-    gas!(context.interpreter, revm_gas::VERYLOW);
-    popn_top!([], index, context.interpreter);
-    let i = as_usize_saturated!(index);
-    *index = context.host.blob_hash(i).unwrap_or_default();
+	check!(context.interpreter, CANCUN);
+	gas!(context.interpreter, revm_gas::VERYLOW);
+	popn_top!([], index, context.interpreter);
+	let i = as_usize_saturated!(index);
+	*index = context.host.blob_hash(i).unwrap_or_default();
 }
diff --git a/substrate/frame/revive/src/vm/evm/instructions/utility.rs b/substrate/frame/revive/src/vm/evm/instructions/utility.rs
index 524be1cb3dc9..4c82c1c98c48 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/utility.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/utility.rs
@@ -8,104 +8,104 @@ use revm::primitives::{Address, B256, U256};
 /// Panics if slice is longer than 32 bytes.
 #[inline]
 pub fn cast_slice_to_u256(slice: &[u8], dest: &mut U256) {
-    if slice.is_empty() {
-        return;
-    }
-    assert!(slice.len() <= 32, "slice too long");
-
-    let n_words = slice.len().div_ceil(32);
-
-    // SAFETY: Length checked above.
-    unsafe {
-        //let dst = self.data.as_mut_ptr().add(self.data.len()).cast::<u64>();
-        //self.data.set_len(new_len);
-        let dst = dest.as_limbs_mut().as_mut_ptr();
-
-        let mut i = 0;
-
-        // Write full words
-        let words = slice.chunks_exact(32);
-        let partial_last_word = words.remainder();
-        for word in words {
-            // Note: We unroll `U256::from_be_bytes` here to write directly into the buffer,
-            // instead of creating a 32 byte array on the stack and then copying it over.
-            for l in word.rchunks_exact(8) {
-                dst.add(i).write(u64::from_be_bytes(l.try_into().unwrap()));
-                i += 1;
-            }
-        }
-
-        if partial_last_word.is_empty() {
-            return;
-        }
-
-        // Write limbs of partial last word
-        let limbs = partial_last_word.rchunks_exact(8);
-        let partial_last_limb = limbs.remainder();
-        for l in limbs {
-            dst.add(i).write(u64::from_be_bytes(l.try_into().unwrap()));
-            i += 1;
-        }
-
-        // Write partial last limb by padding with zeros
-        if !partial_last_limb.is_empty() {
-            let mut tmp = [0u8; 8];
-            tmp[8 - partial_last_limb.len()..].copy_from_slice(partial_last_limb);
-            dst.add(i).write(u64::from_be_bytes(tmp));
-            i += 1;
-        }
-
-        debug_assert_eq!(i.div_ceil(4), n_words, "wrote too much");
-
-        // Zero out upper bytes of last word
-        let m = i % 4; // 32 / 8
-        if m != 0 {
-            dst.add(i).write_bytes(0, 4 - m);
-        }
-    }
+	if slice.is_empty() {
+		return;
+	}
+	assert!(slice.len() <= 32, "slice too long");
+
+	let n_words = slice.len().div_ceil(32);
+
+	// SAFETY: Length checked above.
+	unsafe {
+		//let dst = self.data.as_mut_ptr().add(self.data.len()).cast::<u64>();
+		//self.data.set_len(new_len);
+		let dst = dest.as_limbs_mut().as_mut_ptr();
+
+		let mut i = 0;
+
+		// Write full words
+		let words = slice.chunks_exact(32);
+		let partial_last_word = words.remainder();
+		for word in words {
+			// Note: We unroll `U256::from_be_bytes` here to write directly into the buffer,
+			// instead of creating a 32 byte array on the stack and then copying it over.
+			for l in word.rchunks_exact(8) {
+				dst.add(i).write(u64::from_be_bytes(l.try_into().unwrap()));
+				i += 1;
+			}
+		}
+
+		if partial_last_word.is_empty() {
+			return;
+		}
+
+		// Write limbs of partial last word
+		let limbs = partial_last_word.rchunks_exact(8);
+		let partial_last_limb = limbs.remainder();
+		for l in limbs {
+			dst.add(i).write(u64::from_be_bytes(l.try_into().unwrap()));
+			i += 1;
+		}
+
+		// Write partial last limb by padding with zeros
+		if !partial_last_limb.is_empty() {
+			let mut tmp = [0u8; 8];
+			tmp[8 - partial_last_limb.len()..].copy_from_slice(partial_last_limb);
+			dst.add(i).write(u64::from_be_bytes(tmp));
+			i += 1;
+		}
+
+		debug_assert_eq!(i.div_ceil(4), n_words, "wrote too much");
+
+		// Zero out upper bytes of last word
+		let m = i % 4; // 32 / 8
+		if m != 0 {
+			dst.add(i).write_bytes(0, 4 - m);
+		}
+	}
 }
 
 /// Trait for converting types into U256 values.
 pub trait IntoU256 {
-    /// Converts the implementing type into a U256 value.
-    fn into_u256(self) -> U256;
+	/// Converts the implementing type into a U256 value.
+	fn into_u256(self) -> U256;
 }
 
 impl IntoU256 for Address {
-    fn into_u256(self) -> U256 {
-        self.into_word().into_u256()
-    }
+	fn into_u256(self) -> U256 {
+		self.into_word().into_u256()
+	}
 }
 
 impl IntoU256 for B256 {
-    fn into_u256(self) -> U256 {
-        U256::from_be_bytes(self.0)
-    }
+	fn into_u256(self) -> U256 {
+		U256::from_be_bytes(self.0)
+	}
 }
 
 /// Trait for converting types into Address values.
 pub trait IntoAddress {
-    /// Converts the implementing type into an Address value.
-    fn into_address(self) -> Address;
+	/// Converts the implementing type into an Address value.
+	fn into_address(self) -> Address;
 }
 
 impl IntoAddress for U256 {
-    fn into_address(self) -> Address {
-        Address::from_word(B256::from(self.to_be_bytes()))
-    }
+	fn into_address(self) -> Address {
+		Address::from_word(B256::from(self.to_be_bytes()))
+	}
 }
 
 #[cfg(test)]
 mod tests {
-    use revm::primitives::address;
+	use revm::primitives::address;
 
-    use super::*;
+	use super::*;
 
-    #[test]
-    fn test_into_u256() {
-        let addr = address!("0x0000000000000000000000000000000000000001");
-        let u256 = addr.into_u256();
-        assert_eq!(u256, U256::from(0x01));
-        assert_eq!(u256.into_address(), addr);
-    }
+	#[test]
+	fn test_into_u256() {
+		let addr = address!("0x0000000000000000000000000000000000000001");
+		let u256 = addr.into_u256();
+		assert_eq!(u256, U256::from(0x01));
+		assert_eq!(u256.into_address(), addr);
+	}
 }
diff --git a/substrate/frame/revive/src/vm/pvm.rs b/substrate/frame/revive/src/vm/pvm.rs
index 8b00251cf0d4..ddbb9ddfddb3 100644
--- a/substrate/frame/revive/src/vm/pvm.rs
+++ b/substrate/frame/revive/src/vm/pvm.rs
@@ -23,13 +23,13 @@ pub mod env;
 pub use env::SyscallDoc;
 
 use crate::{
-	BalanceOf, Config, Error, LOG_TARGET, Pallet, RuntimeCosts, SENTINEL,
 	evm::runtime::GAS_PRICE,
 	exec::{ExecError, ExecResult, Ext, Key},
 	gas::ChargedAmount,
 	limits,
 	precompiles::{All as AllPrecompiles, Precompiles},
 	primitives::ExecReturnValue,
+	BalanceOf, Config, Error, Pallet, RuntimeCosts, LOG_TARGET, SENTINEL,
 };
 use alloc::{vec, vec::Vec};
 use codec::Encode;
@@ -196,7 +196,11 @@ impl<T: Config> PolkaVmInstance<T> for polkavm::RawInstance {
 
 impl From<&ExecReturnValue> for ReturnErrorCode {
 	fn from(from: &ExecReturnValue) -> Self {
-		if from.flags.contains(ReturnFlags::REVERT) { Self::CalleeReverted } else { Self::Success }
+		if from.flags.contains(ReturnFlags::REVERT) {
+			Self::CalleeReverted
+		} else {
+			Self::Success
+		}
 	}
 }
 
@@ -245,7 +249,9 @@ impl fmt::Display for TrapReason {
 /// We need this access as a macro because sometimes hiding the lifetimes behind
 /// a function won't work out.
 macro_rules! charge_gas {
-	($runtime:expr, $costs:expr) => {{ $runtime.ext.gas_meter_mut().charge($costs) }};
+	($runtime:expr, $costs:expr) => {{
+		$runtime.ext.gas_meter_mut().charge($costs)
+	}};
 }
 
 /// The kind of call that should be performed.
diff --git a/substrate/frame/revive/src/vm/pvm/env.rs b/substrate/frame/revive/src/vm/pvm/env.rs
index 4aa1bce26631..74da5b996444 100644
--- a/substrate/frame/revive/src/vm/pvm/env.rs
+++ b/substrate/frame/revive/src/vm/pvm/env.rs
@@ -1,13 +1,13 @@
 use super::*;
 
 use crate::{
-	AccountIdOf, BalanceOf, CodeInfo, Config, ContractBlob, Error, SENTINEL, Weight,
 	address::AddressMapper,
 	exec::Ext,
 	limits,
 	primitives::ExecReturnValue,
 	storage::meter::Diff,
 	vm::{ExportedFunction, RuntimeCosts},
+	AccountIdOf, BalanceOf, CodeInfo, Config, ContractBlob, Error, Weight, SENTINEL,
 };
 use alloc::vec::Vec;
 use codec::{Encode, MaxEncodedLen};
diff --git a/substrate/frame/revive/src/vm/runtime_costs.rs b/substrate/frame/revive/src/vm/runtime_costs.rs
index dac950f863a8..4627f5bde03c 100644
--- a/substrate/frame/revive/src/vm/runtime_costs.rs
+++ b/substrate/frame/revive/src/vm/runtime_costs.rs
@@ -1,4 +1,4 @@
-use crate::{Config, gas::Token, weights::WeightInfo};
+use crate::{gas::Token, weights::WeightInfo, Config};
 use frame_support::weights::Weight;
 
 #[cfg_attr(test, derive(Debug, PartialEq, Eq))]

From 65ddd589b717f26c14f2c4c2afcb0fad1ddc6af5 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Tue, 22 Jul 2025 08:59:07 +0000
Subject: [PATCH 068/186] update lock

---
 Cargo.lock | 302 +++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 256 insertions(+), 46 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b86a6ffc91fe..a93cf77d3cc2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -107,9 +107,9 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
 
 [[package]]
 name = "alloy-core"
-version = "1.1.2"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3c5a28f166629752f2e7246b813cdea3243cca59aab2d4264b1fd68392c10eb"
+checksum = "ad31216895d27d307369daa1393f5850b50bbbd372478a9fa951c095c210627e"
 dependencies = [
  "alloy-dyn-abi",
  "alloy-json-abi",
@@ -120,9 +120,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-dyn-abi"
-version = "1.1.2"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18cc14d832bc3331ca22a1c7819de1ede99f58f61a7d123952af7dde8de124a6"
+checksum = "7b95b3deca680efc7e9cba781f1a1db352fa1ea50e6384a514944dcf4419e652"
 dependencies = [
  "alloy-json-abi",
  "alloy-primitives",
@@ -134,6 +134,19 @@ dependencies = [
  "winnow 0.7.10",
 ]
 
+[[package]]
+name = "alloy-eip2124"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "741bdd7499908b3aa0b159bba11e71c8cddd009a2c2eb7a06e825f1ec87900a5"
+dependencies = [
+ "alloy-primitives",
+ "alloy-rlp",
+ "crc",
+ "serde",
+ "thiserror 2.0.12",
+]
+
 [[package]]
 name = "alloy-eip2930"
 version = "0.2.1"
@@ -142,6 +155,7 @@ checksum = "7b82752a889170df67bbb36d42ca63c531eb16274f0d7299ae2a680facba17bd"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
+ "serde",
 ]
 
 [[package]]
@@ -153,14 +167,35 @@ dependencies = [
  "alloy-primitives",
  "alloy-rlp",
  "k256",
+ "serde",
  "thiserror 2.0.12",
 ]
 
+[[package]]
+name = "alloy-eips"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f562a81278a3ed83290e68361f2d1c75d018ae3b8589a314faf9303883e18ec9"
+dependencies = [
+ "alloy-eip2124",
+ "alloy-eip2930",
+ "alloy-eip7702",
+ "alloy-primitives",
+ "alloy-rlp",
+ "alloy-serde",
+ "auto_impl",
+ "c-kzg",
+ "derive_more 2.0.1",
+ "either",
+ "serde",
+ "sha2 0.10.9",
+]
+
 [[package]]
 name = "alloy-json-abi"
-version = "1.1.2"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ccaa79753d7bf15f06399ea76922afbfaf8d18bebed9e8fc452984b4a90dcc9"
+checksum = "15516116086325c157c18261d768a20677f0f699348000ed391d4ad0dcb82530"
 dependencies = [
  "alloy-primitives",
  "alloy-sol-type-parser",
@@ -197,14 +232,13 @@ dependencies = [
 
 [[package]]
 name = "alloy-rlp"
-version = "0.3.3"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc0fac0fc16baf1f63f78b47c3d24718f3619b0714076f6a02957d808d52cbef"
+checksum = "5f70d83b765fdc080dbcd4f4db70d8d23fe4761f2f02ebfa9146b833900634b4"
 dependencies = [
  "alloy-rlp-derive",
  "arrayvec 0.7.4",
  "bytes",
- "smol_str",
 ]
 
 [[package]]
@@ -218,11 +252,22 @@ dependencies = [
  "syn 2.0.98",
 ]
 
+[[package]]
+name = "alloy-serde"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae699248d02ade9db493bbdae61822277dc14ae0f82a5a4153203b60e34422a6"
+dependencies = [
+ "alloy-primitives",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "alloy-sol-macro"
-version = "1.1.2"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8612e0658964d616344f199ab251a49d48113992d81b92dab93ed855faa66383"
+checksum = "a14f21d053aea4c6630687c2f4ad614bed4c81e14737a9b904798b24f30ea849"
 dependencies = [
  "alloy-sol-macro-expander",
  "alloy-sol-macro-input",
@@ -234,9 +279,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-sol-macro-expander"
-version = "1.1.2"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a384edac7283bc4c010a355fb648082860c04b826bb7a814c45263c8f304c74"
+checksum = "34d99282e7c9ef14eb62727981a985a01869e586d1dec729d3bb33679094c100"
 dependencies = [
  "alloy-sol-macro-input",
  "const-hex",
@@ -252,9 +297,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-sol-macro-input"
-version = "1.1.2"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd588c2d516da7deb421b8c166dc60b7ae31bca5beea29ab6621fcfa53d6ca5"
+checksum = "eda029f955b78e493360ee1d7bd11e1ab9f2a220a5715449babc79d6d0a01105"
 dependencies = [
  "const-hex",
  "dunce",
@@ -268,9 +313,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-sol-type-parser"
-version = "1.1.2"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e86ddeb70792c7ceaad23e57d52250107ebbb86733e52f4a25d8dc1abc931837"
+checksum = "10db1bd7baa35bc8d4a1b07efbf734e73e5ba09f2580fb8cee3483a36087ceb2"
 dependencies = [
  "serde",
  "winnow 0.7.10",
@@ -278,9 +323,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-sol-types"
-version = "1.1.2"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "584cb97bfc5746cb9dcc4def77da11694b5d6d7339be91b7480a6a68dc129387"
+checksum = "58377025a47d8b8426b3e4846a251f2c1991033b27f517aade368146f6ab1dfe"
 dependencies = [
  "alloy-json-abi",
  "alloy-primitives",
@@ -470,6 +515,7 @@ checksum = "d69eab57e8d2663efa5c63135b2af4f396d66424f88954c21104125ab6b3e6bc"
 dependencies = [
  "ark-ec 0.5.0",
  "ark-ff 0.5.0",
+ "ark-r1cs-std",
  "ark-std 0.5.0",
 ]
 
@@ -769,6 +815,35 @@ dependencies = [
  "rayon",
 ]
 
+[[package]]
+name = "ark-r1cs-std"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "941551ef1df4c7a401de7068758db6503598e6f01850bdb2cfdb614a1f9dbea1"
+dependencies = [
+ "ark-ec 0.5.0",
+ "ark-ff 0.5.0",
+ "ark-relations",
+ "ark-std 0.5.0",
+ "educe",
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+ "tracing",
+]
+
+[[package]]
+name = "ark-relations"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec46ddc93e7af44bcab5230937635b06fb5744464dd6a7e7b083e80ebd274384"
+dependencies = [
+ "ark-ff 0.5.0",
+ "ark-std 0.5.0",
+ "tracing",
+ "tracing-subscriber 0.2.25",
+]
+
 [[package]]
 name = "ark-scale"
 version = "0.0.12"
@@ -1784,6 +1859,12 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "az"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973"
+
 [[package]]
 name = "backoff"
 version = "0.4.0"
@@ -2095,6 +2176,18 @@ dependencies = [
  "log",
 ]
 
+[[package]]
+name = "blst"
+version = "0.3.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fd49896f12ac9b6dcd7a5998466b9b58263a695a3dd1ecc1aaca2e12a90b080"
+dependencies = [
+ "cc",
+ "glob",
+ "threadpool",
+ "zeroize",
+]
+
 [[package]]
 name = "bounded-collections"
 version = "0.1.9"
@@ -2925,6 +3018,21 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "c-kzg"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7318cfa722931cb5fe0838b98d3ce5621e75f6a6408abc21721d80de9223f2e4"
+dependencies = [
+ "blst",
+ "cc",
+ "glob",
+ "hex",
+ "libc",
+ "once_cell",
+ "serde",
+]
+
 [[package]]
 name = "c2-chacha"
 version = "0.3.3"
@@ -2981,9 +3089,9 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6"
 
 [[package]]
 name = "cc"
-version = "1.1.24"
+version = "1.2.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938"
+checksum = "deec109607ca693028562ed836a5f1c4b8bd77755c4e132fc5ce11b0b6211ae7"
 dependencies = [
  "jobserver",
  "libc",
@@ -4674,7 +4782,7 @@ dependencies = [
  "sp-io",
  "sp-maybe-compressed-blob",
  "tracing",
- "tracing-subscriber",
+ "tracing-subscriber 0.3.18",
 ]
 
 [[package]]
@@ -5997,7 +6105,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -6735,7 +6843,7 @@ dependencies = [
  "sp-runtime",
  "sp-statement-store",
  "tempfile",
- "tracing-subscriber",
+ "tracing-subscriber 0.3.18",
 ]
 
 [[package]]
@@ -7434,6 +7542,16 @@ dependencies = [
  "testnet-parachains-constants",
 ]
 
+[[package]]
+name = "gmp-mpfr-sys"
+version = "1.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c66d61197a68f6323b9afa616cf83d55d69191e1bf364d4eb7d35ae18defe776"
+dependencies = [
+ "libc",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "governance-westend-integration-tests"
 version = "0.0.0"
@@ -9832,7 +9950,7 @@ dependencies = [
  "generator",
  "scoped-tls",
  "tracing",
- "tracing-subscriber",
+ "tracing-subscriber 0.3.18",
 ]
 
 [[package]]
@@ -10903,6 +11021,7 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d"
 dependencies = [
+ "proc-macro-crate 1.3.1",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "syn 2.0.98",
@@ -14605,6 +14724,48 @@ dependencies = [
  "indexmap 2.9.0",
 ]
 
+[[package]]
+name = "phf"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
+dependencies = [
+ "phf_macros",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
+dependencies = [
+ "phf_shared",
+ "rand 0.8.5",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
+dependencies = [
+ "siphasher 1.0.1",
+]
+
 [[package]]
 name = "pin-project"
 version = "1.1.10"
@@ -17512,7 +17673,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8650aabb6c35b860610e9cff5dc1af886c9e25073b7b1712a68972af4281302"
 dependencies = [
  "bytes",
- "heck 0.5.0",
+ "heck 0.4.1",
  "itertools 0.13.0",
  "log",
  "multimap",
@@ -18251,7 +18412,9 @@ checksum = "7a685758a4f375ae9392b571014b9779cfa63f0d8eb91afb4626ddd958b23615"
 dependencies = [
  "bitvec",
  "once_cell",
+ "phf",
  "revm-primitives",
+ "serde",
 ]
 
 [[package]]
@@ -18267,6 +18430,7 @@ dependencies = [
  "revm-database-interface",
  "revm-primitives",
  "revm-state",
+ "serde",
 ]
 
 [[package]]
@@ -18282,6 +18446,7 @@ dependencies = [
  "revm-database-interface",
  "revm-primitives",
  "revm-state",
+ "serde",
 ]
 
 [[package]]
@@ -18290,10 +18455,12 @@ version = "7.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7db360729b61cc347f9c2f12adb9b5e14413aea58778cf9a3b7676c6a4afa115"
 dependencies = [
+ "alloy-eips",
  "revm-bytecode",
  "revm-database-interface",
  "revm-primitives",
  "revm-state",
+ "serde",
 ]
 
 [[package]]
@@ -18306,6 +18473,7 @@ dependencies = [
  "either",
  "revm-primitives",
  "revm-state",
+ "serde",
 ]
 
 [[package]]
@@ -18324,6 +18492,7 @@ dependencies = [
  "revm-precompile",
  "revm-primitives",
  "revm-state",
+ "serde",
 ]
 
 [[package]]
@@ -18340,6 +18509,8 @@ dependencies = [
  "revm-interpreter",
  "revm-primitives",
  "revm-state",
+ "serde",
+ "serde_json",
 ]
 
 [[package]]
@@ -18351,6 +18522,7 @@ dependencies = [
  "revm-bytecode",
  "revm-context-interface",
  "revm-primitives",
+ "serde",
 ]
 
 [[package]]
@@ -18366,12 +18538,16 @@ dependencies = [
  "ark-serialize 0.5.0",
  "arrayref",
  "aurora-engine-modexp",
+ "c-kzg",
  "cfg-if",
  "k256",
+ "libsecp256k1",
  "once_cell",
  "p256",
  "revm-primitives",
  "ripemd",
+ "rug",
+ "secp256k1 0.31.1",
  "sha2 0.10.9",
 ]
 
@@ -18383,6 +18559,7 @@ checksum = "52cdf897b3418f2ee05bcade64985e5faed2dbaa349b2b5f27d3d6bfd10fff2a"
 dependencies = [
  "alloy-primitives",
  "num_enum",
+ "serde",
 ]
 
 [[package]]
@@ -18394,6 +18571,7 @@ dependencies = [
  "bitflags 2.9.1",
  "revm-bytecode",
  "revm-primitives",
+ "serde",
 ]
 
 [[package]]
@@ -18783,6 +18961,18 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "rug"
+version = "1.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4207e8d668e5b8eb574bda8322088ccd0d7782d3d03c7e8d562e82ed82bdcbc3"
+dependencies = [
+ "az",
+ "gmp-mpfr-sys",
+ "libc",
+ "libm",
+]
+
 [[package]]
 name = "ruint"
 version = "1.15.0"
@@ -18914,7 +19104,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys 0.4.14",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -19772,7 +19962,7 @@ dependencies = [
  "substrate-test-runtime",
  "tempfile",
  "tracing",
- "tracing-subscriber",
+ "tracing-subscriber 0.3.18",
  "wat",
 ]
 
@@ -20546,7 +20736,7 @@ dependencies = [
  "thiserror 1.0.65",
  "tracing",
  "tracing-log",
- "tracing-subscriber",
+ "tracing-subscriber 0.3.18",
 ]
 
 [[package]]
@@ -20601,7 +20791,7 @@ dependencies = [
  "tokio",
  "tokio-stream",
  "tracing",
- "tracing-subscriber",
+ "tracing-subscriber 0.3.18",
  "zombienet-configuration",
  "zombienet-sdk",
 ]
@@ -21036,6 +21226,17 @@ dependencies = [
  "secp256k1-sys 0.10.1",
 ]
 
+[[package]]
+name = "secp256k1"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c3c81b43dc2d8877c216a3fccf76677ee1ebccd429566d3e67447290d0c42b2"
+dependencies = [
+ "bitcoin_hashes 0.14.0",
+ "rand 0.9.0",
+ "secp256k1-sys 0.11.0",
+]
+
 [[package]]
 name = "secp256k1-sys"
 version = "0.9.2"
@@ -21054,6 +21255,15 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "secp256k1-sys"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcb913707158fadaf0d8702c2db0e857de66eb003ccfdda5924b5f5ac98efb38"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "secrecy"
 version = "0.8.0"
@@ -21547,15 +21757,6 @@ dependencies = [
  "futures-lite 2.3.0",
 ]
 
-[[package]]
-name = "smol_str"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "smoldot"
 version = "0.11.0"
@@ -23347,7 +23548,7 @@ dependencies = [
  "regex",
  "tracing",
  "tracing-core",
- "tracing-subscriber",
+ "tracing-subscriber 0.3.18",
 ]
 
 [[package]]
@@ -23359,7 +23560,7 @@ dependencies = [
  "parity-scale-codec",
  "tracing",
  "tracing-core",
- "tracing-subscriber",
+ "tracing-subscriber 0.3.18",
 ]
 
 [[package]]
@@ -24368,7 +24569,7 @@ dependencies = [
  "tokio",
  "tokio-util",
  "tracing",
- "tracing-subscriber",
+ "tracing-subscriber 0.3.18",
 ]
 
 [[package]]
@@ -24911,9 +25112,9 @@ dependencies = [
 
 [[package]]
 name = "syn-solidity"
-version = "1.1.2"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5d879005cc1b5ba4e18665be9e9501d9da3a9b95f625497c4cb7ee082b532e"
+checksum = "b9ac494e7266fcdd2ad80bf4375d55d27a117ea5c866c26d0e97fe5b3caeeb75"
 dependencies = [
  "paste",
  "proc-macro2 1.0.95",
@@ -25055,7 +25256,7 @@ dependencies = [
  "fastrand 2.3.0",
  "once_cell",
  "rustix 0.38.42",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -25110,7 +25311,7 @@ checksum = "3dffced63c2b5c7be278154d76b479f9f9920ed34e7574201407f0b14e2bbb93"
 dependencies = [
  "env_logger 0.11.3",
  "test-log-macros",
- "tracing-subscriber",
+ "tracing-subscriber 0.3.18",
 ]
 
 [[package]]
@@ -25783,6 +25984,15 @@ dependencies = [
  "tracing-core",
 ]
 
+[[package]]
+name = "tracing-subscriber"
+version = "0.2.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71"
+dependencies = [
+ "tracing-core",
+]
+
 [[package]]
 name = "tracing-subscriber"
 version = "0.3.18"

From 006cb153458ddc71af2e2d4e2d082a6b0717b056 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Tue, 22 Jul 2025 09:04:16 +0000
Subject: [PATCH 069/186] fix

---
 .../src/benchmarking/call_builder.rs          |  2 +-
 substrate/frame/revive/src/benchmarking.rs    | 37 ++++++++++---------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/substrate/frame/contracts/src/benchmarking/call_builder.rs b/substrate/frame/contracts/src/benchmarking/call_builder.rs
index 5833639d7ce2..66e76a3de8e3 100644
--- a/substrate/frame/contracts/src/benchmarking/call_builder.rs
+++ b/substrate/frame/contracts/src/benchmarking/call_builder.rs
@@ -231,6 +231,6 @@ macro_rules! build_runtime(
 		let $contract = setup.contract();
 		let input = setup.data();
 		let (mut ext, _) = setup.ext();
-		let mut $runtime = crate::wasm::Runtime::new(&mut ext, input);
+		let mut $runtime = $crate::wasm::Runtime::new(&mut ext, input);
 	};
 );
diff --git a/substrate/frame/revive/src/benchmarking.rs b/substrate/frame/revive/src/benchmarking.rs
index 5fa1ac37e49e..367b0069b925 100644
--- a/substrate/frame/revive/src/benchmarking.rs
+++ b/substrate/frame/revive/src/benchmarking.rs
@@ -19,6 +19,7 @@
 
 #![cfg(feature = "runtime-benchmarks")]
 use crate::{
+	vm::pvm,
 	call_builder::{caller_funding, default_deposit_limit, CallSetup, Contract, VmBinaryModule},
 	evm::runtime::GAS_PRICE,
 	exec::{Key, MomentOf, PrecompileExt},
@@ -76,7 +77,7 @@ macro_rules! build_runtime(
 		let $contract = setup.contract();
 		let input = setup.data();
 		let (mut ext, _) = setup.ext();
-		let mut $runtime = crate::vm::pvm::Runtime::<_, [u8]>::new(&mut ext, input);
+		let mut $runtime = $crate::vm::pvm::Runtime::<_, [u8]>::new(&mut ext, input);
 	};
 );
 
@@ -650,7 +651,7 @@ mod benchmarks {
 		let mut setup = CallSetup::<T>::default();
 		setup.set_origin(Origin::Root);
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::pvm::Runtime::new(&mut ext, vec![]);
+		let mut runtime = pvm::Runtime::new(&mut ext, vec![]);
 
 		let result;
 		#[block]
@@ -789,7 +790,7 @@ mod benchmarks {
 		let (mut ext, _) = setup.ext();
 		ext.override_export(crate::exec::ExportedFunction::Constructor);
 
-		let mut runtime = crate::vm::pvm::Runtime::<_, [u8]>::new(&mut ext, input);
+		let mut runtime = pvm::Runtime::<_, [u8]>::new(&mut ext, input);
 
 		let result;
 		#[block]
@@ -829,7 +830,7 @@ mod benchmarks {
 	fn seal_return_data_size() {
 		let mut setup = CallSetup::<T>::default();
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::pvm::Runtime::new(&mut ext, vec![]);
+		let mut runtime = pvm::Runtime::new(&mut ext, vec![]);
 		let mut memory = memory!(vec![],);
 		*runtime.ext().last_frame_output_mut() =
 			ExecReturnValue { data: vec![42; 256], ..Default::default() };
@@ -845,7 +846,7 @@ mod benchmarks {
 	fn seal_call_data_size() {
 		let mut setup = CallSetup::<T>::default();
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::pvm::Runtime::new(&mut ext, vec![42u8; 128 as usize]);
+		let mut runtime = pvm::Runtime::new(&mut ext, vec![42u8; 128 as usize]);
 		let mut memory = memory!(vec![0u8; 4],);
 		let result;
 		#[block]
@@ -958,7 +959,7 @@ mod benchmarks {
 		let (mut ext, _) = setup.ext();
 		ext.set_block_number(BlockNumberFor::<T>::from(1u32));
 
-		let mut runtime = crate::vm::pvm::Runtime::<_, [u8]>::new(&mut ext, input);
+		let mut runtime = pvm::Runtime::<_, [u8]>::new(&mut ext, input);
 
 		let block_hash = H256::from([1; 32]);
 		frame_system::BlockHash::<T>::insert(
@@ -1009,7 +1010,7 @@ mod benchmarks {
 	fn seal_copy_to_contract(n: Linear<0, { limits::code::BLOB_BYTES - 4 }>) {
 		let mut setup = CallSetup::<T>::default();
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::pvm::Runtime::new(&mut ext, vec![]);
+		let mut runtime = pvm::Runtime::new(&mut ext, vec![]);
 		let mut memory = memory!(n.encode(), vec![0u8; n as usize],);
 		let result;
 		#[block]
@@ -1032,7 +1033,7 @@ mod benchmarks {
 	fn seal_call_data_load() {
 		let mut setup = CallSetup::<T>::default();
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::pvm::Runtime::new(&mut ext, vec![42u8; 32]);
+		let mut runtime = pvm::Runtime::new(&mut ext, vec![42u8; 32]);
 		let mut memory = memory!(vec![0u8; 32],);
 		let result;
 		#[block]
@@ -1047,7 +1048,7 @@ mod benchmarks {
 	fn seal_call_data_copy(n: Linear<0, { limits::code::BLOB_BYTES }>) {
 		let mut setup = CallSetup::<T>::default();
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::pvm::Runtime::new(&mut ext, vec![42u8; n as usize]);
+		let mut runtime = pvm::Runtime::new(&mut ext, vec![42u8; n as usize]);
 		let mut memory = memory!(vec![0u8; n as usize],);
 		let result;
 		#[block]
@@ -1390,7 +1391,7 @@ mod benchmarks {
 		let value = Some(vec![42u8; max_value_len as _]);
 		let mut setup = CallSetup::<T>::default();
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
+		let mut runtime = pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
 		runtime.ext().transient_storage().meter().current_mut().limit = u32::MAX;
 		let result;
 		#[block]
@@ -1413,7 +1414,7 @@ mod benchmarks {
 		let mut setup = CallSetup::<T>::default();
 		setup.set_transient_storage_size(limits::TRANSIENT_STORAGE_BYTES);
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
+		let mut runtime = pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
 		runtime.ext().transient_storage().meter().current_mut().limit = u32::MAX;
 		let result;
 		#[block]
@@ -1435,7 +1436,7 @@ mod benchmarks {
 
 		let mut setup = CallSetup::<T>::default();
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
+		let mut runtime = pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
 		runtime.ext().transient_storage().meter().current_mut().limit = u32::MAX;
 		runtime
 			.ext()
@@ -1461,7 +1462,7 @@ mod benchmarks {
 		let mut setup = CallSetup::<T>::default();
 		setup.set_transient_storage_size(limits::TRANSIENT_STORAGE_BYTES);
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
+		let mut runtime = pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
 		runtime.ext().transient_storage().meter().current_mut().limit = u32::MAX;
 		runtime
 			.ext()
@@ -1488,7 +1489,7 @@ mod benchmarks {
 		let mut setup = CallSetup::<T>::default();
 		setup.set_transient_storage_size(limits::TRANSIENT_STORAGE_BYTES);
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
+		let mut runtime = pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
 		runtime.ext().transient_storage().meter().current_mut().limit = u32::MAX;
 		runtime.ext().transient_storage().start_transaction();
 		runtime
@@ -1701,7 +1702,7 @@ mod benchmarks {
 		setup.set_balance(value + 1u32.into() + Pallet::<T>::min_balance());
 
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
+		let mut runtime = pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
 		let mut memory = memory!(callee_bytes, deposit_bytes, value_bytes,);
 
 		let result;
@@ -1758,7 +1759,7 @@ mod benchmarks {
 		setup.set_storage_deposit_limit(deposit);
 
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
+		let mut runtime = pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
 		let mut memory = memory!(callee_bytes, deposit_bytes, value_bytes, input_bytes,);
 
 		let mut do_benchmark = || {
@@ -1804,7 +1805,7 @@ mod benchmarks {
 		setup.set_origin(Origin::from_account_id(setup.contract().account_id.clone()));
 
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
+		let mut runtime = pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
 		let mut memory = memory!(address_bytes, deposit_bytes,);
 
 		let result;
@@ -1855,7 +1856,7 @@ mod benchmarks {
 
 		let account_id = &setup.contract().account_id.clone();
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
+		let mut runtime = pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
 
 		let input = vec![42u8; i as _];
 		let input_len = hash_bytes.len() as u32 + input.len() as u32;

From c3ff24a5458b4649738fdd65c9a9e5eb7c178505 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Tue, 22 Jul 2025 09:07:40 +0000
Subject: [PATCH 070/186] rm

---
 substrate/frame/revive/src/vm/runtime.rs | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 substrate/frame/revive/src/vm/runtime.rs

diff --git a/substrate/frame/revive/src/vm/runtime.rs b/substrate/frame/revive/src/vm/runtime.rs
deleted file mode 100644
index e69de29bb2d1..000000000000

From 661d25145b54f24732ecff0e35a4d6d0690721ec Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Tue, 22 Jul 2025 09:38:18 +0000
Subject: [PATCH 071/186] fix

---
 substrate/frame/revive/src/vm/evm.rs | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/substrate/frame/revive/src/vm/evm.rs b/substrate/frame/revive/src/vm/evm.rs
index 7e079559e26d..41f4ed7d4c8d 100644
--- a/substrate/frame/revive/src/vm/evm.rs
+++ b/substrate/frame/revive/src/vm/evm.rs
@@ -46,7 +46,7 @@ where
 	}
 }
 
-/// TODO handle error case
+/// Calls the EVM interpreter with the provided bytecode and inputs.
 pub fn call<'a, E: Ext>(bytecode: Bytecode, ext: &'a mut E, inputs: EVMInputs) -> ExecResult {
 	let mut interpreter: Interpreter<EVMInterpreter<'a, E>> = Interpreter {
 		gas: Gas::new(30_000_000), // TODO clean up
@@ -72,6 +72,7 @@ pub fn call<'a, E: Ext>(bytecode: Bytecode, ext: &'a mut E, inputs: EVMInputs) -
 	}
 }
 
+/// Runs the EVM interpreter until it returns an action.
 fn run<WIRE: InterpreterTypes>(
 	interpreter: &mut Interpreter<WIRE>,
 	table: &revm::interpreter::InstructionTable<WIRE, DummyHost>,
@@ -81,11 +82,17 @@ fn run<WIRE: InterpreterTypes>(
 		let action = interpreter.run_plain(table, host);
 		match action {
 			InterpreterAction::Return(result) => return result,
-			_ => panic!("Unexpected action: {:?}", action),
+			InterpreterAction::NewFrame(_) => unimplemented!(),
 		}
 	}
 }
 
+/// EVMInterpreter implements the `InterpreterTypes`.
+///
+/// Note:
+///
+/// Our implementation set the `InterpreterTypes::Extend` associated type, to the `Ext` trait, to
+/// reuse all the host functions that are defined by this trait
 pub struct EVMInterpreter<'a, E: Ext> {
 	_phantom: core::marker::PhantomData<&'a E>,
 }
@@ -101,6 +108,13 @@ impl<'a, E: Ext> InterpreterTypes for EVMInterpreter<'a, E> {
 	type Output = InterpreterAction;
 }
 
+/// EVMInputs implements the `InputsTr` trait for EVM inputs, allowing the EVM interpreter to access
+/// the call input data.
+///
+/// Note:
+///
+/// In our implementation of the instruction table, Everything except the call input data will be accessed through the `InterpreterTypes::Extend`
+/// associated type, our implementation will panic if any of those methods are called.
 pub struct EVMInputs(CallInput);
 
 impl EVMInputs {

From 8b55fe8dda33e65a3878fb80235534c0a0024641 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Tue, 22 Jul 2025 11:21:44 +0000
Subject: [PATCH 072/186] Update

---
 substrate/frame/revive/src/benchmarking.rs    |   2 +-
 substrate/frame/revive/src/vm/evm.rs          |   5 +-
 .../src/vm/evm/instructions/arithmetic.rs     |  31 ++--
 .../revive/src/vm/evm/instructions/bitwise.rs |  36 ++---
 .../src/vm/evm/instructions/block_info.rs     |  42 ++---
 .../src/vm/evm/instructions/contract.rs       |  27 ++--
 .../revive/src/vm/evm/instructions/control.rs |  46 ++++--
 .../revive/src/vm/evm/instructions/host.rs    |  50 +++---
 .../revive/src/vm/evm/instructions/macros.rs  |   4 +-
 .../revive/src/vm/evm/instructions/memory.rs  |  15 +-
 .../revive/src/vm/evm/instructions/mod.rs     | 151 +++++++++---------
 .../revive/src/vm/evm/instructions/stack.rs   |  23 ++-
 .../revive/src/vm/evm/instructions/system.rs  |  28 ++--
 .../revive/src/vm/evm/instructions/tx_info.rs |  16 +-
 14 files changed, 227 insertions(+), 249 deletions(-)

diff --git a/substrate/frame/revive/src/benchmarking.rs b/substrate/frame/revive/src/benchmarking.rs
index 367b0069b925..2e2a5da89368 100644
--- a/substrate/frame/revive/src/benchmarking.rs
+++ b/substrate/frame/revive/src/benchmarking.rs
@@ -19,13 +19,13 @@
 
 #![cfg(feature = "runtime-benchmarks")]
 use crate::{
-	vm::pvm,
 	call_builder::{caller_funding, default_deposit_limit, CallSetup, Contract, VmBinaryModule},
 	evm::runtime::GAS_PRICE,
 	exec::{Key, MomentOf, PrecompileExt},
 	limits,
 	precompiles::{self, run::builtin as run_builtin_precompile},
 	storage::WriteOutcome,
+	vm::pvm,
 	Pallet as Contracts, *,
 };
 use alloc::{vec, vec::Vec};
diff --git a/substrate/frame/revive/src/vm/evm.rs b/substrate/frame/revive/src/vm/evm.rs
index 41f4ed7d4c8d..a7f71cff6e50 100644
--- a/substrate/frame/revive/src/vm/evm.rs
+++ b/substrate/frame/revive/src/vm/evm.rs
@@ -113,8 +113,9 @@ impl<'a, E: Ext> InterpreterTypes for EVMInterpreter<'a, E> {
 ///
 /// Note:
 ///
-/// In our implementation of the instruction table, Everything except the call input data will be accessed through the `InterpreterTypes::Extend`
-/// associated type, our implementation will panic if any of those methods are called.
+/// In our implementation of the instruction table, Everything except the call input data will be
+/// accessed through the `InterpreterTypes::Extend` associated type, our implementation will panic
+/// if any of those methods are called.
 pub struct EVMInputs(CallInput);
 
 impl EVMInputs {
diff --git a/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs b/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs
index 1c2f57240f3a..48a75c9c2637 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs
@@ -1,36 +1,39 @@
-use super::i256::{i256_div, i256_mod};
+use super::{
+	i256::{i256_div, i256_mod},
+	Context,
+};
+use crate::vm::Ext;
 use revm::{
 	interpreter::{
 		gas as revm_gas,
-		interpreter_types::{InterpreterTypes, RuntimeFlag, StackTr},
-		InstructionContext,
+		interpreter_types::{RuntimeFlag, StackTr},
 	},
 	primitives::U256,
 };
 
 /// Implements the ADD instruction - adds two values from stack.
-pub fn add<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn add<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([op1], op2, context.interpreter);
 	*op2 = op1.wrapping_add(*op2);
 }
 
 /// Implements the MUL instruction - multiplies two values from stack.
-pub fn mul<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn mul<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::LOW);
 	popn_top!([op1], op2, context.interpreter);
 	*op2 = op1.wrapping_mul(*op2);
 }
 
 /// Implements the SUB instruction - subtracts two values from stack.
-pub fn sub<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn sub<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([op1], op2, context.interpreter);
 	*op2 = op1.wrapping_sub(*op2);
 }
 
 /// Implements the DIV instruction - divides two values from stack.
-pub fn div<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn div<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::LOW);
 	popn_top!([op1], op2, context.interpreter);
 	if !op2.is_zero() {
@@ -41,7 +44,7 @@ pub fn div<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H,
 /// Implements the SDIV instruction.
 ///
 /// Performs signed division of two values from stack.
-pub fn sdiv<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn sdiv<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::LOW);
 	popn_top!([op1], op2, context.interpreter);
 	*op2 = i256_div(op1, *op2);
@@ -50,7 +53,7 @@ pub fn sdiv<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H
 /// Implements the MOD instruction.
 ///
 /// Pops two values from stack and pushes the remainder of their division.
-pub fn rem<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn rem<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::LOW);
 	popn_top!([op1], op2, context.interpreter);
 	if !op2.is_zero() {
@@ -61,7 +64,7 @@ pub fn rem<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H,
 /// Implements the SMOD instruction.
 ///
 /// Performs signed modulo of two values from stack.
-pub fn smod<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn smod<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::LOW);
 	popn_top!([op1], op2, context.interpreter);
 	*op2 = i256_mod(op1, *op2)
@@ -70,7 +73,7 @@ pub fn smod<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H
 /// Implements the ADDMOD instruction.
 ///
 /// Pops three values from stack and pushes (a + b) % n.
-pub fn addmod<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn addmod<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::MID);
 	popn_top!([op1, op2], op3, context.interpreter);
 	*op3 = op1.add_mod(op2, *op3)
@@ -79,14 +82,14 @@ pub fn addmod<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_,
 /// Implements the MULMOD instruction.
 ///
 /// Pops three values from stack and pushes (a * b) % n.
-pub fn mulmod<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn mulmod<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::MID);
 	popn_top!([op1, op2], op3, context.interpreter);
 	*op3 = op1.mul_mod(op2, *op3)
 }
 
 /// Implements the EXP instruction - exponentiates two values from stack.
-pub fn exp<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn exp<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	let spec_id = context.interpreter.runtime_flag.spec_id();
 	popn_top!([op1], op2, context.interpreter);
 	gas_or_fail!(context.interpreter, revm_gas::exp_cost(spec_id, *op2));
@@ -122,7 +125,7 @@ pub fn exp<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H,
 ///
 /// Similarly, if `b == 0` then the yellow paper says the output should start with all zeros,
 /// then end with bits from `b`; this is equal to `y & mask` where `&` is bitwise `AND`.
-pub fn signextend<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn signextend<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::LOW);
 	popn_top!([ext], x, context.interpreter);
 	// For 31 we also don't need to do anything.
diff --git a/substrate/frame/revive/src/vm/evm/instructions/bitwise.rs b/substrate/frame/revive/src/vm/evm/instructions/bitwise.rs
index 1281839f23bc..9789d43cb8d8 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/bitwise.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/bitwise.rs
@@ -1,23 +1,23 @@
-use super::i256::i256_cmp;
+use super::{i256::i256_cmp, Context};
+use crate::vm::Ext;
 use core::cmp::Ordering;
 use revm::{
 	interpreter::{
 		gas as revm_gas,
-		interpreter_types::{InterpreterTypes, RuntimeFlag, StackTr},
-		InstructionContext,
+		interpreter_types::{RuntimeFlag, StackTr},
 	},
 	primitives::U256,
 };
 
 /// Implements the LT instruction - less than comparison.
-pub fn lt<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn lt<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([op1], op2, context.interpreter);
 	*op2 = U256::from(op1 < *op2);
 }
 
 /// Implements the GT instruction - greater than comparison.
-pub fn gt<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn gt<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([op1], op2, context.interpreter);
 
@@ -25,7 +25,7 @@ pub fn gt<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H,
 }
 
 /// Implements the CLZ instruction - count leading zeros.
-pub fn clz<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn clz<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	check!(context.interpreter, OSAKA);
 	gas!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([], op1, context.interpreter);
@@ -37,7 +37,7 @@ pub fn clz<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H,
 /// Implements the SLT instruction.
 ///
 /// Signed less than comparison of two values from stack.
-pub fn slt<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn slt<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([op1], op2, context.interpreter);
 
@@ -47,7 +47,7 @@ pub fn slt<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H,
 /// Implements the SGT instruction.
 ///
 /// Signed greater than comparison of two values from stack.
-pub fn sgt<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn sgt<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([op1], op2, context.interpreter);
 
@@ -57,7 +57,7 @@ pub fn sgt<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H,
 /// Implements the EQ instruction.
 ///
 /// Equality comparison of two values from stack.
-pub fn eq<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn eq<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([op1], op2, context.interpreter);
 
@@ -67,7 +67,7 @@ pub fn eq<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H,
 /// Implements the ISZERO instruction.
 ///
 /// Checks if the top stack value is zero.
-pub fn iszero<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn iszero<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([], op1, context.interpreter);
 	*op1 = U256::from(op1.is_zero());
@@ -76,7 +76,7 @@ pub fn iszero<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_,
 /// Implements the AND instruction.
 ///
 /// Bitwise AND of two values from stack.
-pub fn bitand<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn bitand<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([op1], op2, context.interpreter);
 	*op2 = op1 & *op2;
@@ -85,7 +85,7 @@ pub fn bitand<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_,
 /// Implements the OR instruction.
 ///
 /// Bitwise OR of two values from stack.
-pub fn bitor<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn bitor<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([op1], op2, context.interpreter);
 
@@ -95,7 +95,7 @@ pub fn bitor<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_,
 /// Implements the XOR instruction.
 ///
 /// Bitwise XOR of two values from stack.
-pub fn bitxor<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn bitxor<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([op1], op2, context.interpreter);
 
@@ -105,7 +105,7 @@ pub fn bitxor<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_,
 /// Implements the NOT instruction.
 ///
 /// Bitwise NOT (negation) of the top stack value.
-pub fn not<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn not<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([], op1, context.interpreter);
 
@@ -115,7 +115,7 @@ pub fn not<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H,
 /// Implements the BYTE instruction.
 ///
 /// Extracts a single byte from a word at a given index.
-pub fn byte<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn byte<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([op1], op2, context.interpreter);
 
@@ -129,7 +129,7 @@ pub fn byte<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H
 }
 
 /// EIP-145: Bitwise shifting instructions in EVM
-pub fn shl<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn shl<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	check!(context.interpreter, CONSTANTINOPLE);
 	gas!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([op1], op2, context.interpreter);
@@ -139,7 +139,7 @@ pub fn shl<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H,
 }
 
 /// EIP-145: Bitwise shifting instructions in EVM
-pub fn shr<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn shr<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	check!(context.interpreter, CONSTANTINOPLE);
 	gas!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([op1], op2, context.interpreter);
@@ -149,7 +149,7 @@ pub fn shr<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H,
 }
 
 /// EIP-145: Bitwise shifting instructions in EVM
-pub fn sar<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn sar<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	check!(context.interpreter, CONSTANTINOPLE);
 	gas!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([op1], op2, context.interpreter);
diff --git a/substrate/frame/revive/src/vm/evm/instructions/block_info.rs b/substrate/frame/revive/src/vm/evm/instructions/block_info.rs
index 60f261f21418..2677e6c6c7e2 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/block_info.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/block_info.rs
@@ -1,16 +1,12 @@
-use crate::RuntimeCosts;
+use super::Context;
+use crate::{vm::Ext, RuntimeCosts};
 use revm::{
-	interpreter::{
-		gas as revm_gas,
-		host::Host,
-		interpreter_types::{InterpreterTypes, RuntimeFlag, StackTr},
-		InstructionContext,
-	},
+	interpreter::{gas as revm_gas, host::Host, interpreter_types::RuntimeFlag},
 	primitives::{hardfork::SpecId::*, U256},
 };
 
 /// EIP-1344: ChainID opcode
-pub fn chainid<WIRE: InterpreterTypes, H: Host + ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn chainid<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	check!(context.interpreter, ISTANBUL);
 	gas!(context.interpreter, revm_gas::BASE);
 	push!(context.interpreter, context.host.chain_id());
@@ -19,9 +15,7 @@ pub fn chainid<WIRE: InterpreterTypes, H: Host + ?Sized>(context: InstructionCon
 /// Implements the COINBASE instruction.
 ///
 /// Pushes the current block's beneficiary address onto the stack.
-pub fn coinbase<WIRE: InterpreterTypes, H: Host + ?Sized>(
-	context: InstructionContext<'_, H, WIRE>,
-) {
+pub fn coinbase<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::BASE);
 	push!(context.interpreter, context.host.beneficiary().into_word().into());
 }
@@ -29,9 +23,7 @@ pub fn coinbase<WIRE: InterpreterTypes, H: Host + ?Sized>(
 /// Implements the TIMESTAMP instruction.
 ///
 /// Pushes the current block's timestamp onto the stack.
-pub fn timestamp<WIRE: InterpreterTypes, H: Host + ?Sized>(
-	context: InstructionContext<'_, H, WIRE>,
-) {
+pub fn timestamp<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::BASE);
 	push!(context.interpreter, context.host.timestamp());
 }
@@ -39,13 +31,7 @@ pub fn timestamp<WIRE: InterpreterTypes, H: Host + ?Sized>(
 /// Implements the NUMBER instruction.
 ///
 /// Pushes the current block number onto the stack.
-pub fn block_number<'a, E: crate::vm::Ext>(
-	context: InstructionContext<
-		'_,
-		crate::vm::evm::DummyHost,
-		crate::vm::evm::EVMInterpreter<'a, E>,
-	>,
-) {
+pub fn block_number<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas_new!(context.interpreter, RuntimeCosts::BlockNumber);
 	let block_number = context.interpreter.extend.block_number();
 	push!(context.interpreter, U256::from_limbs(block_number.0));
@@ -54,9 +40,7 @@ pub fn block_number<'a, E: crate::vm::Ext>(
 /// Implements the DIFFICULTY/PREVRANDAO instruction.
 ///
 /// Pushes the block difficulty (pre-merge) or prevrandao (post-merge) onto the stack.
-pub fn difficulty<WIRE: InterpreterTypes, H: Host + ?Sized>(
-	context: InstructionContext<'_, H, WIRE>,
-) {
+pub fn difficulty<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::BASE);
 	if context.interpreter.runtime_flag.spec_id().is_enabled_in(MERGE) {
 		// Unwrap is safe as this fields is checked in validation handler.
@@ -69,24 +53,20 @@ pub fn difficulty<WIRE: InterpreterTypes, H: Host + ?Sized>(
 /// Implements the GASLIMIT instruction.
 ///
 /// Pushes the current block's gas limit onto the stack.
-pub fn gaslimit<WIRE: InterpreterTypes, H: Host + ?Sized>(
-	context: InstructionContext<'_, H, WIRE>,
-) {
+pub fn gaslimit<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::BASE);
 	push!(context.interpreter, context.host.gas_limit());
 }
 
 /// EIP-3198: BASEFEE opcode
-pub fn basefee<WIRE: InterpreterTypes, H: Host + ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn basefee<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	check!(context.interpreter, LONDON);
 	gas!(context.interpreter, revm_gas::BASE);
 	push!(context.interpreter, context.host.basefee());
 }
 
 /// EIP-7516: BLOBBASEFEE opcode
-pub fn blob_basefee<WIRE: InterpreterTypes, H: Host + ?Sized>(
-	context: InstructionContext<'_, H, WIRE>,
-) {
+pub fn blob_basefee<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	check!(context.interpreter, CANCUN);
 	gas!(context.interpreter, revm_gas::BASE);
 	push!(context.interpreter, context.host.blob_gasprice());
diff --git a/substrate/frame/revive/src/vm/evm/instructions/contract.rs b/substrate/frame/revive/src/vm/evm/instructions/contract.rs
index c4447b3637dc..c2ae178387f1 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/contract.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/contract.rs
@@ -2,7 +2,8 @@ mod call_helpers;
 
 pub use call_helpers::{calc_call_gas, get_memory_input_and_out_ranges};
 
-use super::utility::IntoAddress;
+use super::{utility::IntoAddress, Context};
+use crate::vm::Ext;
 use revm::{
 	context_interface::CreateScheme,
 	interpreter::{
@@ -11,10 +12,8 @@ use revm::{
 		interpreter_action::{
 			CallInputs, CallScheme, CallValue, CreateInputs, FrameInput, InterpreterAction,
 		},
-		interpreter_types::{
-			InputsTr, InterpreterTypes, LoopControl, MemoryTr, RuntimeFlag, StackTr,
-		},
-		CallInput, InstructionContext, InstructionResult,
+		interpreter_types::{InputsTr, LoopControl, RuntimeFlag, StackTr},
+		CallInput, InstructionResult,
 	},
 	primitives::{hardfork::SpecId, Address, Bytes, B256, U256},
 };
@@ -23,9 +22,7 @@ use std::boxed::Box;
 /// Implements the CREATE/CREATE2 instruction.
 ///
 /// Creates a new contract with provided bytecode.
-pub fn create<WIRE: InterpreterTypes, const IS_CREATE2: bool, H: Host + ?Sized>(
-	context: InstructionContext<'_, H, WIRE>,
-) {
+pub fn create<'ext, const IS_CREATE2: bool, E: Ext>(context: Context<'_, 'ext, E>) {
 	require_non_staticcall!(context.interpreter);
 
 	// EIP-1014: Skinny CREATE2
@@ -90,7 +87,7 @@ pub fn create<WIRE: InterpreterTypes, const IS_CREATE2: bool, H: Host + ?Sized>(
 /// Implements the CALL instruction.
 ///
 /// Message call with value transfer to another account.
-pub fn call<WIRE: InterpreterTypes, H: Host + ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn call<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	popn!([local_gas_limit, to, value], context.interpreter);
 	let to = to.into_address();
 	// Max gas limit is not possible in real ethereum situation.
@@ -145,9 +142,7 @@ pub fn call<WIRE: InterpreterTypes, H: Host + ?Sized>(context: InstructionContex
 /// Implements the CALLCODE instruction.
 ///
 /// Message call with alternative account's code.
-pub fn call_code<WIRE: InterpreterTypes, H: Host + ?Sized>(
-	context: InstructionContext<'_, H, WIRE>,
-) {
+pub fn call_code<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	popn!([local_gas_limit, to, value], context.interpreter);
 	let to = Address::from_word(B256::from(to));
 	// Max gas limit is not possible in real ethereum situation.
@@ -199,9 +194,7 @@ pub fn call_code<WIRE: InterpreterTypes, H: Host + ?Sized>(
 /// Implements the DELEGATECALL instruction.
 ///
 /// Message call with alternative account's code but same sender and value.
-pub fn delegate_call<WIRE: InterpreterTypes, H: Host + ?Sized>(
-	context: InstructionContext<'_, H, WIRE>,
-) {
+pub fn delegate_call<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	check!(context.interpreter, HOMESTEAD);
 	popn!([local_gas_limit, to], context.interpreter);
 	let to = Address::from_word(B256::from(to));
@@ -246,9 +239,7 @@ pub fn delegate_call<WIRE: InterpreterTypes, H: Host + ?Sized>(
 /// Implements the STATICCALL instruction.
 ///
 /// Static message call (cannot modify state).
-pub fn static_call<WIRE: InterpreterTypes, H: Host + ?Sized>(
-	context: InstructionContext<'_, H, WIRE>,
-) {
+pub fn static_call<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	check!(context.interpreter, BYZANTIUM);
 	popn!([local_gas_limit, to], context.interpreter);
 	let to = Address::from_word(B256::from(to));
diff --git a/substrate/frame/revive/src/vm/evm/instructions/control.rs b/substrate/frame/revive/src/vm/evm/instructions/control.rs
index 8afda9b8db98..7ab3148d8ad6 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/control.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/control.rs
@@ -1,9 +1,11 @@
+use super::Context;
+use crate::vm::Ext;
 use revm::{
 	interpreter::{
 		gas as revm_gas,
 		interpreter_action::InterpreterAction,
-		interpreter_types::{InterpreterTypes, Jumps, LoopControl, MemoryTr, RuntimeFlag, StackTr},
-		InstructionContext, InstructionResult, Interpreter,
+		interpreter_types::{Jumps, LoopControl, MemoryTr, RuntimeFlag, StackTr},
+		InstructionResult, Interpreter,
 	},
 	primitives::{Bytes, U256},
 };
@@ -11,18 +13,24 @@ use revm::{
 /// Implements the JUMP instruction.
 ///
 /// Unconditional jump to a valid destination.
-pub fn jump<ITy: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, ITy>) {
+pub fn jump<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::MID);
-	popn!([target], context.interpreter);
+	let Some([target]) = <_ as StackTr>::popn(&mut context.interpreter.stack) else {
+		context.interpreter.halt(InstructionResult::StackUnderflow);
+		return;
+	};
 	jump_inner(context.interpreter, target);
 }
 
 /// Implements the JUMPI instruction.
 ///
 /// Conditional jump to a valid destination if condition is true.
-pub fn jumpi<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn jumpi<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::HIGH);
-	popn!([target, cond], context.interpreter);
+	let Some([target, cond]) = <_ as StackTr>::popn(&mut context.interpreter.stack) else {
+		context.interpreter.halt(InstructionResult::StackUnderflow);
+		return;
+	};
 
 	if !cond.is_zero() {
 		jump_inner(context.interpreter, target);
@@ -33,7 +41,10 @@ pub fn jumpi<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_,
 /// Internal helper function for jump operations.
 ///
 /// Validates jump target and performs the actual jump.
-fn jump_inner<WIRE: InterpreterTypes>(interpreter: &mut Interpreter<WIRE>, target: U256) {
+fn jump_inner(
+	interpreter: &mut Interpreter<impl revm::interpreter::interpreter_types::InterpreterTypes>,
+	target: U256,
+) {
 	let target = as_usize_or_fail!(interpreter, target, InstructionResult::InvalidJump);
 	if !interpreter.bytecode.is_valid_legacy_jump(target) {
 		interpreter.halt(InstructionResult::InvalidJump);
@@ -46,14 +57,14 @@ fn jump_inner<WIRE: InterpreterTypes>(interpreter: &mut Interpreter<WIRE>, targe
 /// Implements the JUMPDEST instruction.
 ///
 /// Marks a valid destination for jump operations.
-pub fn jumpdest<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn jumpdest<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::JUMPDEST);
 }
 
 /// Implements the PC instruction.
 ///
 /// Pushes the current program counter onto the stack.
-pub fn pc<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn pc<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::BASE);
 	// - 1 because we have already advanced the instruction pointer in `Interpreter::step`
 	push!(context.interpreter, U256::from(context.interpreter.bytecode.pc() - 1));
@@ -64,12 +75,15 @@ pub fn pc<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H,
 ///
 /// Handles memory data retrieval and sets the return action.
 fn return_inner(
-	interpreter: &mut Interpreter<impl InterpreterTypes>,
+	interpreter: &mut Interpreter<impl revm::interpreter::interpreter_types::InterpreterTypes>,
 	instruction_result: InstructionResult,
 ) {
 	// Zero gas cost
 	// gas!(interpreter, revm_gas::ZERO)
-	popn!([offset, len], interpreter);
+	let Some([offset, len]) = <_ as StackTr>::popn(&mut interpreter.stack) else {
+		interpreter.halt(InstructionResult::StackUnderflow);
+		return;
+	};
 	let len = as_usize_or_fail!(interpreter, len);
 	// Important: Offset must be ignored if len is zeros
 	let mut output = Bytes::default();
@@ -89,27 +103,27 @@ fn return_inner(
 /// Implements the RETURN instruction.
 ///
 /// Halts execution and returns data from memory.
-pub fn ret<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn ret<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	return_inner(context.interpreter, InstructionResult::Return);
 }
 
 /// EIP-140: REVERT instruction
-pub fn revert<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn revert<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	check!(context.interpreter, BYZANTIUM);
 	return_inner(context.interpreter, InstructionResult::Revert);
 }
 
 /// Stop opcode. This opcode halts the execution.
-pub fn stop<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn stop<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	context.interpreter.halt(InstructionResult::Stop);
 }
 
 /// Invalid opcode. This opcode halts the execution.
-pub fn invalid<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn invalid<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	context.interpreter.halt(InstructionResult::InvalidFEOpcode);
 }
 
 /// Unknown opcode. This opcode halts the execution.
-pub fn unknown<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn unknown<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	context.interpreter.halt(InstructionResult::OpcodeNotFound);
 }
diff --git a/substrate/frame/revive/src/vm/evm/instructions/host.rs b/substrate/frame/revive/src/vm/evm/instructions/host.rs
index d405d1620a53..48060f7d0f41 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/host.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/host.rs
@@ -1,11 +1,15 @@
-use super::utility::{IntoAddress, IntoU256};
+use super::{
+	utility::{IntoAddress, IntoU256},
+	Context,
+};
+use crate::vm::Ext;
 use core::cmp::min;
 use revm::{
 	interpreter::{
 		gas::{self, warm_cold_cost, CALL_STIPEND},
 		host::Host,
-		interpreter_types::{InputsTr, InterpreterTypes, MemoryTr, RuntimeFlag, StackTr},
-		InstructionContext, InstructionResult,
+		interpreter_types::{InputsTr, RuntimeFlag, StackTr},
+		InstructionResult,
 	},
 	primitives::{hardfork::SpecId::*, Bytes, Log, LogData, B256, BLOCK_HASH_HISTORY, U256},
 };
@@ -13,7 +17,7 @@ use revm::{
 /// Implements the BALANCE instruction.
 ///
 /// Gets the balance of the given account.
-pub fn balance<WIRE: InterpreterTypes, H: Host + ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn balance<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	popn_top!([], top, context.interpreter);
 	let address = top.into_address();
 	let Some(balance) = context.host.balance(address) else {
@@ -38,9 +42,7 @@ pub fn balance<WIRE: InterpreterTypes, H: Host + ?Sized>(context: InstructionCon
 }
 
 /// EIP-1884: Repricing for trie-size-dependent opcodes
-pub fn selfbalance<WIRE: InterpreterTypes, H: Host + ?Sized>(
-	context: InstructionContext<'_, H, WIRE>,
-) {
+pub fn selfbalance<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	check!(context.interpreter, ISTANBUL);
 	gas!(context.interpreter, gas::LOW);
 
@@ -54,9 +56,7 @@ pub fn selfbalance<WIRE: InterpreterTypes, H: Host + ?Sized>(
 /// Implements the EXTCODESIZE instruction.
 ///
 /// Gets the size of an account's code.
-pub fn extcodesize<WIRE: InterpreterTypes, H: Host + ?Sized>(
-	context: InstructionContext<'_, H, WIRE>,
-) {
+pub fn extcodesize<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	popn_top!([], top, context.interpreter);
 	let address = top.into_address();
 	let Some(code) = context.host.load_account_code(address) else {
@@ -76,9 +76,7 @@ pub fn extcodesize<WIRE: InterpreterTypes, H: Host + ?Sized>(
 }
 
 /// EIP-1052: EXTCODEHASH opcode
-pub fn extcodehash<WIRE: InterpreterTypes, H: Host + ?Sized>(
-	context: InstructionContext<'_, H, WIRE>,
-) {
+pub fn extcodehash<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	check!(context.interpreter, CONSTANTINOPLE);
 	popn_top!([], top, context.interpreter);
 	let address = top.into_address();
@@ -100,9 +98,7 @@ pub fn extcodehash<WIRE: InterpreterTypes, H: Host + ?Sized>(
 /// Implements the EXTCODECOPY instruction.
 ///
 /// Copies a portion of an account's code to memory.
-pub fn extcodecopy<WIRE: InterpreterTypes, H: Host + ?Sized>(
-	context: InstructionContext<'_, H, WIRE>,
-) {
+pub fn extcodecopy<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	popn!([address, memory_offset, code_offset, len_u256], context.interpreter);
 	let address = address.into_address();
 	let Some(code) = context.host.load_account_code(address) else {
@@ -129,9 +125,7 @@ pub fn extcodecopy<WIRE: InterpreterTypes, H: Host + ?Sized>(
 /// Implements the BLOCKHASH instruction.
 ///
 /// Gets the hash of one of the 256 most recent complete blocks.
-pub fn blockhash<WIRE: InterpreterTypes, H: Host + ?Sized>(
-	context: InstructionContext<'_, H, WIRE>,
-) {
+pub fn blockhash<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, gas::BLOCKHASH);
 	popn_top!([], number, context.interpreter);
 
@@ -165,7 +159,7 @@ pub fn blockhash<WIRE: InterpreterTypes, H: Host + ?Sized>(
 /// Implements the SLOAD instruction.
 ///
 /// Loads a word from storage.
-pub fn sload<WIRE: InterpreterTypes, H: Host + ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn sload<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	popn_top!([], index, context.interpreter);
 
 	let Some(value) = context.host.sload(context.interpreter.input.target_address(), *index) else {
@@ -183,7 +177,7 @@ pub fn sload<WIRE: InterpreterTypes, H: Host + ?Sized>(context: InstructionConte
 /// Implements the SSTORE instruction.
 ///
 /// Stores a word to storage.
-pub fn sstore<WIRE: InterpreterTypes, H: Host + ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn sstore<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	require_non_staticcall!(context.interpreter);
 
 	popn!([index, value], context.interpreter);
@@ -219,7 +213,7 @@ pub fn sstore<WIRE: InterpreterTypes, H: Host + ?Sized>(context: InstructionCont
 
 /// EIP-1153: Transient storage opcodes
 /// Store value to transient storage
-pub fn tstore<WIRE: InterpreterTypes, H: Host + ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn tstore<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	check!(context.interpreter, CANCUN);
 	require_non_staticcall!(context.interpreter);
 	gas!(context.interpreter, gas::WARM_STORAGE_READ_COST);
@@ -231,7 +225,7 @@ pub fn tstore<WIRE: InterpreterTypes, H: Host + ?Sized>(context: InstructionCont
 
 /// EIP-1153: Transient storage opcodes
 /// Load value from transient storage
-pub fn tload<WIRE: InterpreterTypes, H: Host + ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn tload<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	check!(context.interpreter, CANCUN);
 	gas!(context.interpreter, gas::WARM_STORAGE_READ_COST);
 
@@ -243,9 +237,7 @@ pub fn tload<WIRE: InterpreterTypes, H: Host + ?Sized>(context: InstructionConte
 /// Implements the LOG0-LOG4 instructions.
 ///
 /// Appends log record with N topics.
-pub fn log<const N: usize, H: Host + ?Sized>(
-	context: InstructionContext<'_, H, impl InterpreterTypes>,
-) {
+pub fn log<'ext, const N: usize, E: Ext>(context: Context<'_, 'ext, E>) {
 	require_non_staticcall!(context.interpreter);
 
 	popn!([offset, len], context.interpreter);
@@ -262,7 +254,7 @@ pub fn log<const N: usize, H: Host + ?Sized>(
 		context.interpreter.halt(InstructionResult::StackUnderflow);
 		return;
 	}
-	let Some(topics) = context.interpreter.stack.popn::<N>() else {
+	let Some(topics) = <_ as StackTr>::popn::<N>(&mut context.interpreter.stack) else {
 		context.interpreter.halt(InstructionResult::StackUnderflow);
 		return;
 	};
@@ -279,9 +271,7 @@ pub fn log<const N: usize, H: Host + ?Sized>(
 /// Implements the SELFDESTRUCT instruction.
 ///
 /// Halt execution and register account for later deletion.
-pub fn selfdestruct<WIRE: InterpreterTypes, H: Host + ?Sized>(
-	context: InstructionContext<'_, H, WIRE>,
-) {
+pub fn selfdestruct<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	require_non_staticcall!(context.interpreter);
 	popn!([target], context.interpreter);
 	let target = target.into_address();
diff --git a/substrate/frame/revive/src/vm/evm/instructions/macros.rs b/substrate/frame/revive/src/vm/evm/instructions/macros.rs
index 15401f09c45b..efb98a51e6f8 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/macros.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/macros.rs
@@ -130,7 +130,7 @@ macro_rules! resize_memory {
 #[macro_export]
 macro_rules! popn {
     ([ $($x:ident),* ],$interpreterreter:expr $(,$ret:expr)? ) => {
-        let Some([$( $x ),*]) = $interpreterreter.stack.popn() else {
+        let Some([$( $x ),*]) = <_ as StackTr>::popn(&mut $interpreterreter.stack) else {
             $interpreterreter.halt(revm::interpreter::InstructionResult::StackUnderflow);
             return $($ret)?;
         };
@@ -142,7 +142,7 @@ macro_rules! popn {
 #[macro_export]
 macro_rules! popn_top {
     ([ $($x:ident),* ], $top:ident, $interpreter:expr $(,$ret:expr)? ) => {
-        let Some(([$( $x ),*], $top)) = $interpreter.stack.popn_top() else {
+		let Some(([$($x),*], $top)) = <_ as StackTr>::popn_top(&mut $interpreter.stack) else {
             $interpreter.halt(revm::interpreter::InstructionResult::StackUnderflow);
             return $($ret)?;
         };
diff --git a/substrate/frame/revive/src/vm/evm/instructions/memory.rs b/substrate/frame/revive/src/vm/evm/instructions/memory.rs
index 13fbcfc7d4ae..d184bf95f7f5 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/memory.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/memory.rs
@@ -1,9 +1,10 @@
+use super::Context;
+use crate::vm::Ext;
 use core::cmp::max;
 use revm::{
 	interpreter::{
 		gas as revm_gas,
-		interpreter_types::{InterpreterTypes, MemoryTr, RuntimeFlag, StackTr},
-		InstructionContext,
+		interpreter_types::{MemoryTr, RuntimeFlag, StackTr},
 	},
 	primitives::U256,
 };
@@ -11,7 +12,7 @@ use revm::{
 /// Implements the MLOAD instruction.
 ///
 /// Loads a 32-byte word from memory.
-pub fn mload<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn mload<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([], top, context.interpreter);
 	let offset = as_usize_or_fail!(context.interpreter, top);
@@ -23,7 +24,7 @@ pub fn mload<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_,
 /// Implements the MSTORE instruction.
 ///
 /// Stores a 32-byte word to memory.
-pub fn mstore<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn mstore<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::VERYLOW);
 	popn!([offset, value], context.interpreter);
 	let offset = as_usize_or_fail!(context.interpreter, offset);
@@ -34,7 +35,7 @@ pub fn mstore<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_,
 /// Implements the MSTORE8 instruction.
 ///
 /// Stores a single byte to memory.
-pub fn mstore8<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn mstore8<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::VERYLOW);
 	popn!([offset, value], context.interpreter);
 	let offset = as_usize_or_fail!(context.interpreter, offset);
@@ -45,7 +46,7 @@ pub fn mstore8<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_
 /// Implements the MSIZE instruction.
 ///
 /// Gets the size of active memory in bytes.
-pub fn msize<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn msize<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::BASE);
 	push!(context.interpreter, U256::from(context.interpreter.memory.size()));
 }
@@ -53,7 +54,7 @@ pub fn msize<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_,
 /// Implements the MCOPY instruction.
 ///
 /// EIP-5656: Memory copying instruction that copies memory from one location to another.
-pub fn mcopy<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn mcopy<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	check!(context.interpreter, CANCUN);
 	popn!([dst, src, len], context.interpreter);
 
diff --git a/substrate/frame/revive/src/vm/evm/instructions/mod.rs b/substrate/frame/revive/src/vm/evm/instructions/mod.rs
index e79f497a4767..1dbe0dbde879 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/mod.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/mod.rs
@@ -1,5 +1,14 @@
 //! EVM opcode implementations.
 
+use crate::vm::{
+	evm::{DummyHost, EVMInterpreter},
+	Ext,
+};
+use revm::interpreter::{Instruction, InstructionContext};
+
+pub type Context<'ctx, 'ext, E> =
+	InstructionContext<'ctx, crate::vm::evm::DummyHost, crate::vm::evm::EVMInterpreter<'ext, E>>;
+
 #[macro_use]
 pub mod macros;
 /// Arithmetic operations (ADD, SUB, MUL, DIV, etc.).
@@ -27,12 +36,6 @@ pub mod tx_info;
 /// Utility functions and helpers for instruction implementation.
 pub mod utility;
 
-use crate::vm::{
-	evm::{DummyHost, EVMInterpreter},
-	Ext,
-};
-use revm::interpreter::Instruction;
-
 /// Returns the instruction table for the given spec.
 pub const fn instruction_table<'a, E: Ext>() -> [Instruction<EVMInterpreter<'a, E>, DummyHost>; 256]
 {
@@ -116,72 +119,72 @@ pub const fn instruction_table<'a, E: Ext>() -> [Instruction<EVMInterpreter<'a,
 	table[MCOPY as usize] = memory::mcopy;
 
 	table[PUSH0 as usize] = stack::push0;
-	table[PUSH1 as usize] = stack::push::<1, _, _>;
-	table[PUSH2 as usize] = stack::push::<2, _, _>;
-	table[PUSH3 as usize] = stack::push::<3, _, _>;
-	table[PUSH4 as usize] = stack::push::<4, _, _>;
-	table[PUSH5 as usize] = stack::push::<5, _, _>;
-	table[PUSH6 as usize] = stack::push::<6, _, _>;
-	table[PUSH7 as usize] = stack::push::<7, _, _>;
-	table[PUSH8 as usize] = stack::push::<8, _, _>;
-	table[PUSH9 as usize] = stack::push::<9, _, _>;
-	table[PUSH10 as usize] = stack::push::<10, _, _>;
-	table[PUSH11 as usize] = stack::push::<11, _, _>;
-	table[PUSH12 as usize] = stack::push::<12, _, _>;
-	table[PUSH13 as usize] = stack::push::<13, _, _>;
-	table[PUSH14 as usize] = stack::push::<14, _, _>;
-	table[PUSH15 as usize] = stack::push::<15, _, _>;
-	table[PUSH16 as usize] = stack::push::<16, _, _>;
-	table[PUSH17 as usize] = stack::push::<17, _, _>;
-	table[PUSH18 as usize] = stack::push::<18, _, _>;
-	table[PUSH19 as usize] = stack::push::<19, _, _>;
-	table[PUSH20 as usize] = stack::push::<20, _, _>;
-	table[PUSH21 as usize] = stack::push::<21, _, _>;
-	table[PUSH22 as usize] = stack::push::<22, _, _>;
-	table[PUSH23 as usize] = stack::push::<23, _, _>;
-	table[PUSH24 as usize] = stack::push::<24, _, _>;
-	table[PUSH25 as usize] = stack::push::<25, _, _>;
-	table[PUSH26 as usize] = stack::push::<26, _, _>;
-	table[PUSH27 as usize] = stack::push::<27, _, _>;
-	table[PUSH28 as usize] = stack::push::<28, _, _>;
-	table[PUSH29 as usize] = stack::push::<29, _, _>;
-	table[PUSH30 as usize] = stack::push::<30, _, _>;
-	table[PUSH31 as usize] = stack::push::<31, _, _>;
-	table[PUSH32 as usize] = stack::push::<32, _, _>;
-
-	table[DUP1 as usize] = stack::dup::<1, _, _>;
-	table[DUP2 as usize] = stack::dup::<2, _, _>;
-	table[DUP3 as usize] = stack::dup::<3, _, _>;
-	table[DUP4 as usize] = stack::dup::<4, _, _>;
-	table[DUP5 as usize] = stack::dup::<5, _, _>;
-	table[DUP6 as usize] = stack::dup::<6, _, _>;
-	table[DUP7 as usize] = stack::dup::<7, _, _>;
-	table[DUP8 as usize] = stack::dup::<8, _, _>;
-	table[DUP9 as usize] = stack::dup::<9, _, _>;
-	table[DUP10 as usize] = stack::dup::<10, _, _>;
-	table[DUP11 as usize] = stack::dup::<11, _, _>;
-	table[DUP12 as usize] = stack::dup::<12, _, _>;
-	table[DUP13 as usize] = stack::dup::<13, _, _>;
-	table[DUP14 as usize] = stack::dup::<14, _, _>;
-	table[DUP15 as usize] = stack::dup::<15, _, _>;
-	table[DUP16 as usize] = stack::dup::<16, _, _>;
-
-	table[SWAP1 as usize] = stack::swap::<1, _, _>;
-	table[SWAP2 as usize] = stack::swap::<2, _, _>;
-	table[SWAP3 as usize] = stack::swap::<3, _, _>;
-	table[SWAP4 as usize] = stack::swap::<4, _, _>;
-	table[SWAP5 as usize] = stack::swap::<5, _, _>;
-	table[SWAP6 as usize] = stack::swap::<6, _, _>;
-	table[SWAP7 as usize] = stack::swap::<7, _, _>;
-	table[SWAP8 as usize] = stack::swap::<8, _, _>;
-	table[SWAP9 as usize] = stack::swap::<9, _, _>;
-	table[SWAP10 as usize] = stack::swap::<10, _, _>;
-	table[SWAP11 as usize] = stack::swap::<11, _, _>;
-	table[SWAP12 as usize] = stack::swap::<12, _, _>;
-	table[SWAP13 as usize] = stack::swap::<13, _, _>;
-	table[SWAP14 as usize] = stack::swap::<14, _, _>;
-	table[SWAP15 as usize] = stack::swap::<15, _, _>;
-	table[SWAP16 as usize] = stack::swap::<16, _, _>;
+	table[PUSH1 as usize] = stack::push::<1, E>;
+	table[PUSH2 as usize] = stack::push::<2, E>;
+	table[PUSH3 as usize] = stack::push::<3, E>;
+	table[PUSH4 as usize] = stack::push::<4, E>;
+	table[PUSH5 as usize] = stack::push::<5, E>;
+	table[PUSH6 as usize] = stack::push::<6, E>;
+	table[PUSH7 as usize] = stack::push::<7, E>;
+	table[PUSH8 as usize] = stack::push::<8, E>;
+	table[PUSH9 as usize] = stack::push::<9, E>;
+	table[PUSH10 as usize] = stack::push::<10, E>;
+	table[PUSH11 as usize] = stack::push::<11, E>;
+	table[PUSH12 as usize] = stack::push::<12, E>;
+	table[PUSH13 as usize] = stack::push::<13, E>;
+	table[PUSH14 as usize] = stack::push::<14, E>;
+	table[PUSH15 as usize] = stack::push::<15, E>;
+	table[PUSH16 as usize] = stack::push::<16, E>;
+	table[PUSH17 as usize] = stack::push::<17, E>;
+	table[PUSH18 as usize] = stack::push::<18, E>;
+	table[PUSH19 as usize] = stack::push::<19, E>;
+	table[PUSH20 as usize] = stack::push::<20, E>;
+	table[PUSH21 as usize] = stack::push::<21, E>;
+	table[PUSH22 as usize] = stack::push::<22, E>;
+	table[PUSH23 as usize] = stack::push::<23, E>;
+	table[PUSH24 as usize] = stack::push::<24, E>;
+	table[PUSH25 as usize] = stack::push::<25, E>;
+	table[PUSH26 as usize] = stack::push::<26, E>;
+	table[PUSH27 as usize] = stack::push::<27, E>;
+	table[PUSH28 as usize] = stack::push::<28, E>;
+	table[PUSH29 as usize] = stack::push::<29, E>;
+	table[PUSH30 as usize] = stack::push::<30, E>;
+	table[PUSH31 as usize] = stack::push::<31, E>;
+	table[PUSH32 as usize] = stack::push::<32, E>;
+
+	table[DUP1 as usize] = stack::dup::<1, E>;
+	table[DUP2 as usize] = stack::dup::<2, E>;
+	table[DUP3 as usize] = stack::dup::<3, E>;
+	table[DUP4 as usize] = stack::dup::<4, E>;
+	table[DUP5 as usize] = stack::dup::<5, E>;
+	table[DUP6 as usize] = stack::dup::<6, E>;
+	table[DUP7 as usize] = stack::dup::<7, E>;
+	table[DUP8 as usize] = stack::dup::<8, E>;
+	table[DUP9 as usize] = stack::dup::<9, E>;
+	table[DUP10 as usize] = stack::dup::<10, E>;
+	table[DUP11 as usize] = stack::dup::<11, E>;
+	table[DUP12 as usize] = stack::dup::<12, E>;
+	table[DUP13 as usize] = stack::dup::<13, E>;
+	table[DUP14 as usize] = stack::dup::<14, E>;
+	table[DUP15 as usize] = stack::dup::<15, E>;
+	table[DUP16 as usize] = stack::dup::<16, E>;
+
+	table[SWAP1 as usize] = stack::swap::<1, E>;
+	table[SWAP2 as usize] = stack::swap::<2, E>;
+	table[SWAP3 as usize] = stack::swap::<3, E>;
+	table[SWAP4 as usize] = stack::swap::<4, E>;
+	table[SWAP5 as usize] = stack::swap::<5, E>;
+	table[SWAP6 as usize] = stack::swap::<6, E>;
+	table[SWAP7 as usize] = stack::swap::<7, E>;
+	table[SWAP8 as usize] = stack::swap::<8, E>;
+	table[SWAP9 as usize] = stack::swap::<9, E>;
+	table[SWAP10 as usize] = stack::swap::<10, E>;
+	table[SWAP11 as usize] = stack::swap::<11, E>;
+	table[SWAP12 as usize] = stack::swap::<12, E>;
+	table[SWAP13 as usize] = stack::swap::<13, E>;
+	table[SWAP14 as usize] = stack::swap::<14, E>;
+	table[SWAP15 as usize] = stack::swap::<15, E>;
+	table[SWAP16 as usize] = stack::swap::<16, E>;
 
 	table[LOG0 as usize] = host::log::<0, _>;
 	table[LOG1 as usize] = host::log::<1, _>;
@@ -189,12 +192,12 @@ pub const fn instruction_table<'a, E: Ext>() -> [Instruction<EVMInterpreter<'a,
 	table[LOG3 as usize] = host::log::<3, _>;
 	table[LOG4 as usize] = host::log::<4, _>;
 
-	table[CREATE as usize] = contract::create::<_, false, _>;
+	table[CREATE as usize] = contract::create::<false, E>;
 	table[CALL as usize] = contract::call;
 	table[CALLCODE as usize] = contract::call_code;
 	table[RETURN as usize] = control::ret;
 	table[DELEGATECALL as usize] = contract::delegate_call;
-	table[CREATE2 as usize] = contract::create::<_, true, _>;
+	table[CREATE2 as usize] = contract::create::<true, E>;
 
 	table[STATICCALL as usize] = contract::static_call;
 	table[REVERT as usize] = control::revert;
diff --git a/substrate/frame/revive/src/vm/evm/instructions/stack.rs b/substrate/frame/revive/src/vm/evm/instructions/stack.rs
index 971458c10b47..b606647e9865 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/stack.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/stack.rs
@@ -1,9 +1,10 @@
-use super::utility::cast_slice_to_u256;
+use super::{utility::cast_slice_to_u256, Context};
+use crate::vm::Ext;
 use revm::{
 	interpreter::{
 		gas as revm_gas,
-		interpreter_types::{Immediates, InterpreterTypes, Jumps, RuntimeFlag, StackTr},
-		InstructionContext, InstructionResult,
+		interpreter_types::{Immediates, Jumps, RuntimeFlag, StackTr},
+		InstructionResult,
 	},
 	primitives::U256,
 };
@@ -11,7 +12,7 @@ use revm::{
 /// Implements the POP instruction.
 ///
 /// Removes the top item from the stack.
-pub fn pop<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn pop<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::BASE);
 	// Can ignore return. as relative N jump is safe operation.
 	popn!([_i], context.interpreter);
@@ -20,7 +21,7 @@ pub fn pop<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H,
 /// EIP-3855: PUSH0 instruction
 ///
 /// Introduce a new instruction which pushes the constant value 0 onto the stack.
-pub fn push0<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn push0<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	check!(context.interpreter, SHANGHAI);
 	gas!(context.interpreter, revm_gas::BASE);
 	push!(context.interpreter, U256::ZERO);
@@ -29,9 +30,7 @@ pub fn push0<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_,
 /// Implements the PUSH1-PUSH32 instructions.
 ///
 /// Pushes N bytes from bytecode onto the stack as a 32-byte value.
-pub fn push<const N: usize, WIRE: InterpreterTypes, H: ?Sized>(
-	context: InstructionContext<'_, H, WIRE>,
-) {
+pub fn push<'ext, const N: usize, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::VERYLOW);
 	push!(context.interpreter, U256::ZERO);
 	popn_top!([], top, context.interpreter);
@@ -46,9 +45,7 @@ pub fn push<const N: usize, WIRE: InterpreterTypes, H: ?Sized>(
 /// Implements the DUP1-DUP16 instructions.
 ///
 /// Duplicates the Nth stack item to the top of the stack.
-pub fn dup<const N: usize, WIRE: InterpreterTypes, H: ?Sized>(
-	context: InstructionContext<'_, H, WIRE>,
-) {
+pub fn dup<'ext, const N: usize, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::VERYLOW);
 	if !context.interpreter.stack.dup(N) {
 		context.interpreter.halt(InstructionResult::StackOverflow);
@@ -58,9 +55,7 @@ pub fn dup<const N: usize, WIRE: InterpreterTypes, H: ?Sized>(
 /// Implements the SWAP1-SWAP16 instructions.
 ///
 /// Swaps the top stack item with the Nth stack item.
-pub fn swap<const N: usize, WIRE: InterpreterTypes, H: ?Sized>(
-	context: InstructionContext<'_, H, WIRE>,
-) {
+pub fn swap<'ext, const N: usize, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::VERYLOW);
 	assert!(N != 0);
 	if !context.interpreter.stack.exchange(0, N) {
diff --git a/substrate/frame/revive/src/vm/evm/instructions/system.rs b/substrate/frame/revive/src/vm/evm/instructions/system.rs
index 259e10e2cf34..071726348a6e 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/system.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/system.rs
@@ -1,3 +1,5 @@
+use super::Context;
+use crate::vm::Ext;
 use core::ptr;
 use revm::{
 	interpreter::{
@@ -5,7 +7,7 @@ use revm::{
 		interpreter_types::{
 			InputsTr, InterpreterTypes, LegacyBytecode, MemoryTr, ReturnData, RuntimeFlag, StackTr,
 		},
-		CallInput, InstructionContext, InstructionResult, Interpreter,
+		CallInput, InstructionResult, Interpreter,
 	},
 	primitives::{B256, KECCAK_EMPTY, U256},
 };
@@ -13,7 +15,7 @@ use revm::{
 /// Implements the KECCAK256 instruction.
 ///
 /// Computes Keccak-256 hash of memory data.
-pub fn keccak256<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn keccak256<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	popn_top!([offset], top, context.interpreter);
 	let len = as_usize_or_fail!(context.interpreter, top);
 	gas_or_fail!(context.interpreter, revm_gas::keccak256_cost(len));
@@ -30,7 +32,7 @@ pub fn keccak256<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<
 /// Implements the ADDRESS instruction.
 ///
 /// Pushes the current contract's address onto the stack.
-pub fn address<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn address<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::BASE);
 	push!(context.interpreter, context.interpreter.input.target_address().into_word().into());
 }
@@ -38,7 +40,7 @@ pub fn address<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_
 /// Implements the CALLER instruction.
 ///
 /// Pushes the caller's address onto the stack.
-pub fn caller<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn caller<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::BASE);
 	push!(context.interpreter, context.interpreter.input.caller_address().into_word().into());
 }
@@ -46,7 +48,7 @@ pub fn caller<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_,
 /// Implements the CODESIZE instruction.
 ///
 /// Pushes the size of running contract's bytecode onto the stack.
-pub fn codesize<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn codesize<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::BASE);
 	push!(context.interpreter, U256::from(context.interpreter.bytecode.bytecode_len()));
 }
@@ -54,7 +56,7 @@ pub fn codesize<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'
 /// Implements the CODECOPY instruction.
 ///
 /// Copies running contract's bytecode to memory.
-pub fn codecopy<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn codecopy<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	popn!([memory_offset, code_offset, len], context.interpreter);
 	let len = as_usize_or_fail!(context.interpreter, len);
 	let Some(memory_offset) = memory_resize(context.interpreter, memory_offset, len) else {
@@ -74,7 +76,7 @@ pub fn codecopy<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'
 /// Implements the CALLDATALOAD instruction.
 ///
 /// Loads 32 bytes of input data from the specified offset.
-pub fn calldataload<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn calldataload<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::VERYLOW);
 	//pop_top!(interpreter, offset_ptr);
 	popn_top!([], offset_ptr, context.interpreter);
@@ -113,7 +115,7 @@ pub fn calldataload<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionConte
 /// Implements the CALLDATASIZE instruction.
 ///
 /// Pushes the size of input data onto the stack.
-pub fn calldatasize<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn calldatasize<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::BASE);
 	push!(context.interpreter, U256::from(context.interpreter.input.input().len()));
 }
@@ -121,7 +123,7 @@ pub fn calldatasize<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionConte
 /// Implements the CALLVALUE instruction.
 ///
 /// Pushes the value sent with the current call onto the stack.
-pub fn callvalue<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn callvalue<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::BASE);
 	push!(context.interpreter, context.interpreter.input.call_value());
 }
@@ -129,7 +131,7 @@ pub fn callvalue<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<
 /// Implements the CALLDATACOPY instruction.
 ///
 /// Copies input data to memory.
-pub fn calldatacopy<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn calldatacopy<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	popn!([memory_offset, data_offset, len], context.interpreter);
 	let len = as_usize_or_fail!(context.interpreter, len);
 	let Some(memory_offset) = memory_resize(context.interpreter, memory_offset, len) else {
@@ -156,14 +158,14 @@ pub fn calldatacopy<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionConte
 }
 
 /// EIP-211: New opcodes: RETURNDATASIZE and RETURNDATACOPY
-pub fn returndatasize<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn returndatasize<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	check!(context.interpreter, BYZANTIUM);
 	gas!(context.interpreter, revm_gas::BASE);
 	push!(context.interpreter, U256::from(context.interpreter.return_data.buffer().len()));
 }
 
 /// EIP-211: New opcodes: RETURNDATASIZE and RETURNDATACOPY
-pub fn returndatacopy<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn returndatacopy<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	check!(context.interpreter, BYZANTIUM);
 	popn!([memory_offset, offset, len], context.interpreter);
 
@@ -193,7 +195,7 @@ pub fn returndatacopy<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionCon
 /// Implements the GAS instruction.
 ///
 /// Pushes the amount of remaining gas onto the stack.
-pub fn gas<WIRE: InterpreterTypes, H: ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn gas<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::BASE);
 	push!(context.interpreter, U256::from(context.interpreter.gas.remaining()));
 }
diff --git a/substrate/frame/revive/src/vm/evm/instructions/tx_info.rs b/substrate/frame/revive/src/vm/evm/instructions/tx_info.rs
index ec90617c002e..25a183e53d0c 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/tx_info.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/tx_info.rs
@@ -2,18 +2,18 @@ use revm::{
 	interpreter::{
 		gas as revm_gas,
 		host::Host,
-		interpreter_types::{InterpreterTypes, RuntimeFlag, StackTr},
-		InstructionContext,
+		interpreter_types::{RuntimeFlag, StackTr},
 	},
 	primitives::U256,
 };
 
+use super::Context;
+use crate::vm::Ext;
+
 /// Implements the GASPRICE instruction.
 ///
 /// Gets the gas price of the originating transaction.
-pub fn gasprice<WIRE: InterpreterTypes, H: Host + ?Sized>(
-	context: InstructionContext<'_, H, WIRE>,
-) {
+pub fn gasprice<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::BASE);
 	push!(context.interpreter, U256::from(context.host.effective_gas_price()));
 }
@@ -21,7 +21,7 @@ pub fn gasprice<WIRE: InterpreterTypes, H: Host + ?Sized>(
 /// Implements the ORIGIN instruction.
 ///
 /// Gets the execution origination address.
-pub fn origin<WIRE: InterpreterTypes, H: Host + ?Sized>(context: InstructionContext<'_, H, WIRE>) {
+pub fn origin<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	gas!(context.interpreter, revm_gas::BASE);
 	push!(context.interpreter, context.host.caller().into_word().into());
 }
@@ -29,9 +29,7 @@ pub fn origin<WIRE: InterpreterTypes, H: Host + ?Sized>(context: InstructionCont
 /// Implements the BLOBHASH instruction.
 ///
 /// EIP-4844: Shard Blob Transactions - gets the hash of a transaction blob.
-pub fn blob_hash<WIRE: InterpreterTypes, H: Host + ?Sized>(
-	context: InstructionContext<'_, H, WIRE>,
-) {
+pub fn blob_hash<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	check!(context.interpreter, CANCUN);
 	gas!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([], index, context.interpreter);

From 833534060b770d92f17a26c040d78294dd55411f Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Tue, 22 Jul 2025 11:24:22 +0000
Subject: [PATCH 073/186] fix

---
 .../revive/src/vm/evm/instructions/mod.rs     | 136 +++++++++---------
 1 file changed, 68 insertions(+), 68 deletions(-)

diff --git a/substrate/frame/revive/src/vm/evm/instructions/mod.rs b/substrate/frame/revive/src/vm/evm/instructions/mod.rs
index 1dbe0dbde879..e06e5973eb5f 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/mod.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/mod.rs
@@ -119,72 +119,72 @@ pub const fn instruction_table<'a, E: Ext>() -> [Instruction<EVMInterpreter<'a,
 	table[MCOPY as usize] = memory::mcopy;
 
 	table[PUSH0 as usize] = stack::push0;
-	table[PUSH1 as usize] = stack::push::<1, E>;
-	table[PUSH2 as usize] = stack::push::<2, E>;
-	table[PUSH3 as usize] = stack::push::<3, E>;
-	table[PUSH4 as usize] = stack::push::<4, E>;
-	table[PUSH5 as usize] = stack::push::<5, E>;
-	table[PUSH6 as usize] = stack::push::<6, E>;
-	table[PUSH7 as usize] = stack::push::<7, E>;
-	table[PUSH8 as usize] = stack::push::<8, E>;
-	table[PUSH9 as usize] = stack::push::<9, E>;
-	table[PUSH10 as usize] = stack::push::<10, E>;
-	table[PUSH11 as usize] = stack::push::<11, E>;
-	table[PUSH12 as usize] = stack::push::<12, E>;
-	table[PUSH13 as usize] = stack::push::<13, E>;
-	table[PUSH14 as usize] = stack::push::<14, E>;
-	table[PUSH15 as usize] = stack::push::<15, E>;
-	table[PUSH16 as usize] = stack::push::<16, E>;
-	table[PUSH17 as usize] = stack::push::<17, E>;
-	table[PUSH18 as usize] = stack::push::<18, E>;
-	table[PUSH19 as usize] = stack::push::<19, E>;
-	table[PUSH20 as usize] = stack::push::<20, E>;
-	table[PUSH21 as usize] = stack::push::<21, E>;
-	table[PUSH22 as usize] = stack::push::<22, E>;
-	table[PUSH23 as usize] = stack::push::<23, E>;
-	table[PUSH24 as usize] = stack::push::<24, E>;
-	table[PUSH25 as usize] = stack::push::<25, E>;
-	table[PUSH26 as usize] = stack::push::<26, E>;
-	table[PUSH27 as usize] = stack::push::<27, E>;
-	table[PUSH28 as usize] = stack::push::<28, E>;
-	table[PUSH29 as usize] = stack::push::<29, E>;
-	table[PUSH30 as usize] = stack::push::<30, E>;
-	table[PUSH31 as usize] = stack::push::<31, E>;
-	table[PUSH32 as usize] = stack::push::<32, E>;
-
-	table[DUP1 as usize] = stack::dup::<1, E>;
-	table[DUP2 as usize] = stack::dup::<2, E>;
-	table[DUP3 as usize] = stack::dup::<3, E>;
-	table[DUP4 as usize] = stack::dup::<4, E>;
-	table[DUP5 as usize] = stack::dup::<5, E>;
-	table[DUP6 as usize] = stack::dup::<6, E>;
-	table[DUP7 as usize] = stack::dup::<7, E>;
-	table[DUP8 as usize] = stack::dup::<8, E>;
-	table[DUP9 as usize] = stack::dup::<9, E>;
-	table[DUP10 as usize] = stack::dup::<10, E>;
-	table[DUP11 as usize] = stack::dup::<11, E>;
-	table[DUP12 as usize] = stack::dup::<12, E>;
-	table[DUP13 as usize] = stack::dup::<13, E>;
-	table[DUP14 as usize] = stack::dup::<14, E>;
-	table[DUP15 as usize] = stack::dup::<15, E>;
-	table[DUP16 as usize] = stack::dup::<16, E>;
-
-	table[SWAP1 as usize] = stack::swap::<1, E>;
-	table[SWAP2 as usize] = stack::swap::<2, E>;
-	table[SWAP3 as usize] = stack::swap::<3, E>;
-	table[SWAP4 as usize] = stack::swap::<4, E>;
-	table[SWAP5 as usize] = stack::swap::<5, E>;
-	table[SWAP6 as usize] = stack::swap::<6, E>;
-	table[SWAP7 as usize] = stack::swap::<7, E>;
-	table[SWAP8 as usize] = stack::swap::<8, E>;
-	table[SWAP9 as usize] = stack::swap::<9, E>;
-	table[SWAP10 as usize] = stack::swap::<10, E>;
-	table[SWAP11 as usize] = stack::swap::<11, E>;
-	table[SWAP12 as usize] = stack::swap::<12, E>;
-	table[SWAP13 as usize] = stack::swap::<13, E>;
-	table[SWAP14 as usize] = stack::swap::<14, E>;
-	table[SWAP15 as usize] = stack::swap::<15, E>;
-	table[SWAP16 as usize] = stack::swap::<16, E>;
+	table[PUSH1 as usize] = stack::push::<1, _>;
+	table[PUSH2 as usize] = stack::push::<2, _>;
+	table[PUSH3 as usize] = stack::push::<3, _>;
+	table[PUSH4 as usize] = stack::push::<4, _>;
+	table[PUSH5 as usize] = stack::push::<5, _>;
+	table[PUSH6 as usize] = stack::push::<6, _>;
+	table[PUSH7 as usize] = stack::push::<7, _>;
+	table[PUSH8 as usize] = stack::push::<8, _>;
+	table[PUSH9 as usize] = stack::push::<9, _>;
+	table[PUSH10 as usize] = stack::push::<10, _>;
+	table[PUSH11 as usize] = stack::push::<11, _>;
+	table[PUSH12 as usize] = stack::push::<12, _>;
+	table[PUSH13 as usize] = stack::push::<13, _>;
+	table[PUSH14 as usize] = stack::push::<14, _>;
+	table[PUSH15 as usize] = stack::push::<15, _>;
+	table[PUSH16 as usize] = stack::push::<16, _>;
+	table[PUSH17 as usize] = stack::push::<17, _>;
+	table[PUSH18 as usize] = stack::push::<18, _>;
+	table[PUSH19 as usize] = stack::push::<19, _>;
+	table[PUSH20 as usize] = stack::push::<20, _>;
+	table[PUSH21 as usize] = stack::push::<21, _>;
+	table[PUSH22 as usize] = stack::push::<22, _>;
+	table[PUSH23 as usize] = stack::push::<23, _>;
+	table[PUSH24 as usize] = stack::push::<24, _>;
+	table[PUSH25 as usize] = stack::push::<25, _>;
+	table[PUSH26 as usize] = stack::push::<26, _>;
+	table[PUSH27 as usize] = stack::push::<27, _>;
+	table[PUSH28 as usize] = stack::push::<28, _>;
+	table[PUSH29 as usize] = stack::push::<29, _>;
+	table[PUSH30 as usize] = stack::push::<30, _>;
+	table[PUSH31 as usize] = stack::push::<31, _>;
+	table[PUSH32 as usize] = stack::push::<32, _>;
+
+	table[DUP1 as usize] = stack::dup::<1, _>;
+	table[DUP2 as usize] = stack::dup::<2, _>;
+	table[DUP3 as usize] = stack::dup::<3, _>;
+	table[DUP4 as usize] = stack::dup::<4, _>;
+	table[DUP5 as usize] = stack::dup::<5, _>;
+	table[DUP6 as usize] = stack::dup::<6, _>;
+	table[DUP7 as usize] = stack::dup::<7, _>;
+	table[DUP8 as usize] = stack::dup::<8, _>;
+	table[DUP9 as usize] = stack::dup::<9, _>;
+	table[DUP10 as usize] = stack::dup::<10, _>;
+	table[DUP11 as usize] = stack::dup::<11, _>;
+	table[DUP12 as usize] = stack::dup::<12, _>;
+	table[DUP13 as usize] = stack::dup::<13, _>;
+	table[DUP14 as usize] = stack::dup::<14, _>;
+	table[DUP15 as usize] = stack::dup::<15, _>;
+	table[DUP16 as usize] = stack::dup::<16, _>;
+
+	table[SWAP1 as usize] = stack::swap::<1, _>;
+	table[SWAP2 as usize] = stack::swap::<2, _>;
+	table[SWAP3 as usize] = stack::swap::<3, _>;
+	table[SWAP4 as usize] = stack::swap::<4, _>;
+	table[SWAP5 as usize] = stack::swap::<5, _>;
+	table[SWAP6 as usize] = stack::swap::<6, _>;
+	table[SWAP7 as usize] = stack::swap::<7, _>;
+	table[SWAP8 as usize] = stack::swap::<8, _>;
+	table[SWAP9 as usize] = stack::swap::<9, _>;
+	table[SWAP10 as usize] = stack::swap::<10, _>;
+	table[SWAP11 as usize] = stack::swap::<11, _>;
+	table[SWAP12 as usize] = stack::swap::<12, _>;
+	table[SWAP13 as usize] = stack::swap::<13, _>;
+	table[SWAP14 as usize] = stack::swap::<14, _>;
+	table[SWAP15 as usize] = stack::swap::<15, _>;
+	table[SWAP16 as usize] = stack::swap::<16, _>;
 
 	table[LOG0 as usize] = host::log::<0, _>;
 	table[LOG1 as usize] = host::log::<1, _>;
@@ -192,12 +192,12 @@ pub const fn instruction_table<'a, E: Ext>() -> [Instruction<EVMInterpreter<'a,
 	table[LOG3 as usize] = host::log::<3, _>;
 	table[LOG4 as usize] = host::log::<4, _>;
 
-	table[CREATE as usize] = contract::create::<false, E>;
+	table[CREATE as usize] = contract::create::<false, _>;
 	table[CALL as usize] = contract::call;
 	table[CALLCODE as usize] = contract::call_code;
 	table[RETURN as usize] = control::ret;
 	table[DELEGATECALL as usize] = contract::delegate_call;
-	table[CREATE2 as usize] = contract::create::<true, E>;
+	table[CREATE2 as usize] = contract::create::<true, _>;
 
 	table[STATICCALL as usize] = contract::static_call;
 	table[REVERT as usize] = control::revert;

From 538bf49f55d99aea244683206f55e8414fe23516 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Tue, 22 Jul 2025 13:47:33 +0000
Subject: [PATCH 074/186] comment bitwise test for now

---
 .../revive/src/vm/evm/instructions/bitwise.rs | 726 +++++++++---------
 1 file changed, 363 insertions(+), 363 deletions(-)

diff --git a/substrate/frame/revive/src/vm/evm/instructions/bitwise.rs b/substrate/frame/revive/src/vm/evm/instructions/bitwise.rs
index 9789d43cb8d8..377117985ee3 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/bitwise.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/bitwise.rs
@@ -164,366 +164,366 @@ pub fn sar<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	};
 }
 
-#[cfg(test)]
-mod tests {
-	use super::{byte, clz, sar, shl, shr};
-	use revm::{
-		interpreter::{host::DummyHost, InstructionContext, Interpreter},
-		primitives::{hardfork::SpecId, uint, U256},
-	};
-
-	#[test]
-	fn test_shift_left() {
-		let mut interpreter = Interpreter::default();
-
-		struct TestCase {
-			value: U256,
-			shift: U256,
-			expected: U256,
-		}
-
-		uint! {
-			let test_cases = [
-				TestCase {
-					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
-					shift: 0x00_U256,
-					expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
-				},
-				TestCase {
-					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
-					shift: 0x01_U256,
-					expected: 0x0000000000000000000000000000000000000000000000000000000000000002_U256,
-				},
-				TestCase {
-					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
-					shift: 0xff_U256,
-					expected: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
-				},
-				TestCase {
-					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
-					shift: 0x0100_U256,
-					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
-				},
-				TestCase {
-					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
-					shift: 0x0101_U256,
-					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
-				},
-				TestCase {
-					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-					shift: 0x00_U256,
-					expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-				},
-				TestCase {
-					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-					shift: 0x01_U256,
-					expected: 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe_U256,
-				},
-				TestCase {
-					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-					shift: 0xff_U256,
-					expected: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
-				},
-				TestCase {
-					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-					shift: 0x0100_U256,
-					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
-				},
-				TestCase {
-					value: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
-					shift: 0x01_U256,
-					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
-				},
-				TestCase {
-					value: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-					shift: 0x01_U256,
-					expected: 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe_U256,
-				},
-			];
-		}
-
-		for test in test_cases {
-			push!(interpreter, test.value);
-			push!(interpreter, test.shift);
-			let context =
-				InstructionContext { host: &mut DummyHost, interpreter: &mut interpreter };
-			shl(context);
-			let res = interpreter.stack.pop().unwrap();
-			assert_eq!(res, test.expected);
-		}
-	}
-
-	#[test]
-	fn test_logical_shift_right() {
-		let mut interpreter = Interpreter::default();
-
-		struct TestCase {
-			value: U256,
-			shift: U256,
-			expected: U256,
-		}
-
-		uint! {
-			let test_cases = [
-				TestCase {
-					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
-					shift: 0x00_U256,
-					expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
-				},
-				TestCase {
-					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
-					shift: 0x01_U256,
-					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
-				},
-				TestCase {
-					value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
-					shift: 0x01_U256,
-					expected: 0x4000000000000000000000000000000000000000000000000000000000000000_U256,
-				},
-				TestCase {
-					value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
-					shift: 0xff_U256,
-					expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
-				},
-				TestCase {
-					value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
-					shift: 0x0100_U256,
-					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
-				},
-				TestCase {
-					value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
-					shift: 0x0101_U256,
-					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
-				},
-				TestCase {
-					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-					shift: 0x00_U256,
-					expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-				},
-				TestCase {
-					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-					shift: 0x01_U256,
-					expected: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-				},
-				TestCase {
-					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-					shift: 0xff_U256,
-					expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
-				},
-				TestCase {
-					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-					shift: 0x0100_U256,
-					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
-				},
-				TestCase {
-					value: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
-					shift: 0x01_U256,
-					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
-				},
-			];
-		}
-
-		for test in test_cases {
-			push!(interpreter, test.value);
-			push!(interpreter, test.shift);
-			let context =
-				InstructionContext { host: &mut DummyHost, interpreter: &mut interpreter };
-			shr(context);
-			let res = interpreter.stack.pop().unwrap();
-			assert_eq!(res, test.expected);
-		}
-	}
-
-	#[test]
-	fn test_arithmetic_shift_right() {
-		let mut interpreter = Interpreter::default();
-
-		struct TestCase {
-			value: U256,
-			shift: U256,
-			expected: U256,
-		}
-
-		uint! {
-		let test_cases = [
-			TestCase {
-				value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
-				shift: 0x00_U256,
-				expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
-			},
-			TestCase {
-				value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
-				shift: 0x01_U256,
-				expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
-			},
-			TestCase {
-				value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
-				shift: 0x01_U256,
-				expected: 0xc000000000000000000000000000000000000000000000000000000000000000_U256,
-			},
-			TestCase {
-				value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
-				shift: 0xff_U256,
-				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-			},
-			TestCase {
-				value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
-				shift: 0x0100_U256,
-				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-			},
-			TestCase {
-				value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
-				shift: 0x0101_U256,
-				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-			},
-			TestCase {
-				value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-				shift: 0x00_U256,
-				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-			},
-			TestCase {
-				value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-				shift: 0x01_U256,
-				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-			},
-			TestCase {
-				value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-				shift: 0xff_U256,
-				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-			},
-			TestCase {
-				value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-				shift: 0x0100_U256,
-				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-			},
-			TestCase {
-				value: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
-				shift: 0x01_U256,
-				expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
-			},
-			TestCase {
-				value: 0x4000000000000000000000000000000000000000000000000000000000000000_U256,
-				shift: 0xfe_U256,
-				expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
-			},
-			TestCase {
-				value: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-				shift: 0xf8_U256,
-				expected: 0x000000000000000000000000000000000000000000000000000000000000007f_U256,
-			},
-			TestCase {
-				value: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-				shift: 0xfe_U256,
-				expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
-			},
-			TestCase {
-				value: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-				shift: 0xff_U256,
-				expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
-			},
-			TestCase {
-				value: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-				shift: 0x0100_U256,
-				expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
-			},
-		];
-			}
-
-		for test in test_cases {
-			push!(interpreter, test.value);
-			push!(interpreter, test.shift);
-			let context =
-				InstructionContext { host: &mut DummyHost, interpreter: &mut interpreter };
-			sar(context);
-			let res = interpreter.stack.pop().unwrap();
-			assert_eq!(res, test.expected);
-		}
-	}
-
-	#[test]
-	fn test_byte() {
-		struct TestCase {
-			input: U256,
-			index: usize,
-			expected: U256,
-		}
-
-		let mut interpreter = Interpreter::default();
-
-		let input_value = U256::from(0x1234567890abcdef1234567890abcdef_u128);
-		let test_cases = (0..32)
-			.map(|i| {
-				let byte_pos = 31 - i;
-
-				let shift_amount = U256::from(byte_pos * 8);
-				let byte_value = (input_value >> shift_amount) & U256::from(0xFF);
-				TestCase { input: input_value, index: i, expected: byte_value }
-			})
-			.collect::<Vec<_>>();
-
-		for test in test_cases.iter() {
-			push!(interpreter, test.input);
-			push!(interpreter, U256::from(test.index));
-			let context =
-				InstructionContext { host: &mut DummyHost, interpreter: &mut interpreter };
-			byte(context);
-			let res = interpreter.stack.pop().unwrap();
-			assert_eq!(res, test.expected, "Failed at index: {}", test.index);
-		}
-	}
-
-	#[test]
-	fn test_clz() {
-		let mut interpreter = Interpreter::default();
-		interpreter.set_spec_id(SpecId::OSAKA);
-
-		struct TestCase {
-			value: U256,
-			expected: U256,
-		}
-
-		uint! {
-			let test_cases = [
-				TestCase { value: 0x0_U256, expected: 256_U256 },
-				TestCase { value: 0x1_U256, expected: 255_U256 },
-				TestCase { value: 0x2_U256, expected: 254_U256 },
-				TestCase { value: 0x3_U256, expected: 254_U256 },
-				TestCase { value: 0x4_U256, expected: 253_U256 },
-				TestCase { value: 0x7_U256, expected: 253_U256 },
-				TestCase { value: 0x8_U256, expected: 252_U256 },
-				TestCase { value: 0xff_U256, expected: 248_U256 },
-				TestCase { value: 0x100_U256, expected: 247_U256 },
-				TestCase { value: 0xffff_U256, expected: 240_U256 },
-				TestCase {
-					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256, // U256::MAX
-					expected: 0_U256,
-				},
-				TestCase {
-					value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256, // 1 << 255
-					expected: 0_U256,
-				},
-				TestCase { // Smallest value with 1 leading zero
-					value: 0x4000000000000000000000000000000000000000000000000000000000000000_U256, // 1 << 254
-					expected: 1_U256,
-				},
-				TestCase { // Value just below 1 << 255
-					value: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-					expected: 1_U256,
-				},
-			];
-		}
-
-		for test in test_cases {
-			push!(interpreter, test.value);
-			let context =
-				InstructionContext { host: &mut DummyHost, interpreter: &mut interpreter };
-			clz(context);
-			let res = interpreter.stack.pop().unwrap();
-			assert_eq!(
-				res, test.expected,
-				"CLZ for value {:#x} failed. Expected: {}, Got: {}",
-				test.value, test.expected, res
-			);
-		}
-	}
-}
+// #[cfg(test)]
+// mod tests {
+// 	use super::{byte, clz, sar, shl, shr};
+// 	use revm::{
+// 		interpreter::{host::DummyHost, InstructionContext, Interpreter},
+// 		primitives::{hardfork::SpecId, uint, U256},
+// 	};
+//
+// 	#[test]
+// 	fn test_shift_left() {
+// 		let mut interpreter = Interpreter::default();
+//
+// 		struct TestCase {
+// 			value: U256,
+// 			shift: U256,
+// 			expected: U256,
+// 		}
+//
+// 		uint! {
+// 			let test_cases = [
+// 				TestCase {
+// 					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+// 					shift: 0x00_U256,
+// 					expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+// 				},
+// 				TestCase {
+// 					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+// 					shift: 0x01_U256,
+// 					expected: 0x0000000000000000000000000000000000000000000000000000000000000002_U256,
+// 				},
+// 				TestCase {
+// 					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+// 					shift: 0xff_U256,
+// 					expected: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
+// 				},
+// 				TestCase {
+// 					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+// 					shift: 0x0100_U256,
+// 					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+// 				},
+// 				TestCase {
+// 					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+// 					shift: 0x0101_U256,
+// 					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+// 				},
+// 				TestCase {
+// 					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+// 					shift: 0x00_U256,
+// 					expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+// 				},
+// 				TestCase {
+// 					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+// 					shift: 0x01_U256,
+// 					expected: 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe_U256,
+// 				},
+// 				TestCase {
+// 					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+// 					shift: 0xff_U256,
+// 					expected: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
+// 				},
+// 				TestCase {
+// 					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+// 					shift: 0x0100_U256,
+// 					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+// 				},
+// 				TestCase {
+// 					value: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+// 					shift: 0x01_U256,
+// 					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+// 				},
+// 				TestCase {
+// 					value: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+// 					shift: 0x01_U256,
+// 					expected: 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe_U256,
+// 				},
+// 			];
+// 		}
+//
+// 		for test in test_cases {
+// 			push!(interpreter, test.value);
+// 			push!(interpreter, test.shift);
+// 			let context =
+// 				InstructionContext { host: &mut DummyHost, interpreter: &mut interpreter };
+// 			shl(context);
+// 			let res = interpreter.stack.pop().unwrap();
+// 			assert_eq!(res, test.expected);
+// 		}
+// 	}
+//
+// 	#[test]
+// 	fn test_logical_shift_right() {
+// 		let mut interpreter = Interpreter::default();
+//
+// 		struct TestCase {
+// 			value: U256,
+// 			shift: U256,
+// 			expected: U256,
+// 		}
+//
+// 		uint! {
+// 			let test_cases = [
+// 				TestCase {
+// 					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+// 					shift: 0x00_U256,
+// 					expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+// 				},
+// 				TestCase {
+// 					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+// 					shift: 0x01_U256,
+// 					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+// 				},
+// 				TestCase {
+// 					value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
+// 					shift: 0x01_U256,
+// 					expected: 0x4000000000000000000000000000000000000000000000000000000000000000_U256,
+// 				},
+// 				TestCase {
+// 					value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
+// 					shift: 0xff_U256,
+// 					expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+// 				},
+// 				TestCase {
+// 					value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
+// 					shift: 0x0100_U256,
+// 					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+// 				},
+// 				TestCase {
+// 					value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
+// 					shift: 0x0101_U256,
+// 					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+// 				},
+// 				TestCase {
+// 					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+// 					shift: 0x00_U256,
+// 					expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+// 				},
+// 				TestCase {
+// 					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+// 					shift: 0x01_U256,
+// 					expected: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+// 				},
+// 				TestCase {
+// 					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+// 					shift: 0xff_U256,
+// 					expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+// 				},
+// 				TestCase {
+// 					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+// 					shift: 0x0100_U256,
+// 					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+// 				},
+// 				TestCase {
+// 					value: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+// 					shift: 0x01_U256,
+// 					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+// 				},
+// 			];
+// 		}
+//
+// 		for test in test_cases {
+// 			push!(interpreter, test.value);
+// 			push!(interpreter, test.shift);
+// 			let context =
+// 				InstructionContext { host: &mut DummyHost, interpreter: &mut interpreter };
+// 			shr(context);
+// 			let res = interpreter.stack.pop().unwrap();
+// 			assert_eq!(res, test.expected);
+// 		}
+// 	}
+//
+// 	#[test]
+// 	fn test_arithmetic_shift_right() {
+// 		let mut interpreter = Interpreter::default();
+//
+// 		struct TestCase {
+// 			value: U256,
+// 			shift: U256,
+// 			expected: U256,
+// 		}
+//
+// 		uint! {
+// 		let test_cases = [
+// 			TestCase {
+// 				value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+// 				shift: 0x00_U256,
+// 				expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+// 			},
+// 			TestCase {
+// 				value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+// 				shift: 0x01_U256,
+// 				expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+// 			},
+// 			TestCase {
+// 				value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
+// 				shift: 0x01_U256,
+// 				expected: 0xc000000000000000000000000000000000000000000000000000000000000000_U256,
+// 			},
+// 			TestCase {
+// 				value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
+// 				shift: 0xff_U256,
+// 				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+// 			},
+// 			TestCase {
+// 				value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
+// 				shift: 0x0100_U256,
+// 				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+// 			},
+// 			TestCase {
+// 				value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
+// 				shift: 0x0101_U256,
+// 				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+// 			},
+// 			TestCase {
+// 				value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+// 				shift: 0x00_U256,
+// 				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+// 			},
+// 			TestCase {
+// 				value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+// 				shift: 0x01_U256,
+// 				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+// 			},
+// 			TestCase {
+// 				value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+// 				shift: 0xff_U256,
+// 				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+// 			},
+// 			TestCase {
+// 				value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+// 				shift: 0x0100_U256,
+// 				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+// 			},
+// 			TestCase {
+// 				value: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+// 				shift: 0x01_U256,
+// 				expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+// 			},
+// 			TestCase {
+// 				value: 0x4000000000000000000000000000000000000000000000000000000000000000_U256,
+// 				shift: 0xfe_U256,
+// 				expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+// 			},
+// 			TestCase {
+// 				value: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+// 				shift: 0xf8_U256,
+// 				expected: 0x000000000000000000000000000000000000000000000000000000000000007f_U256,
+// 			},
+// 			TestCase {
+// 				value: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+// 				shift: 0xfe_U256,
+// 				expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+// 			},
+// 			TestCase {
+// 				value: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+// 				shift: 0xff_U256,
+// 				expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+// 			},
+// 			TestCase {
+// 				value: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+// 				shift: 0x0100_U256,
+// 				expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+// 			},
+// 		];
+// 			}
+//
+// 		for test in test_cases {
+// 			push!(interpreter, test.value);
+// 			push!(interpreter, test.shift);
+// 			let context =
+// 				InstructionContext { host: &mut DummyHost, interpreter: &mut interpreter };
+// 			sar(context);
+// 			let res = interpreter.stack.pop().unwrap();
+// 			assert_eq!(res, test.expected);
+// 		}
+// 	}
+//
+// 	#[test]
+// 	fn test_byte() {
+// 		struct TestCase {
+// 			input: U256,
+// 			index: usize,
+// 			expected: U256,
+// 		}
+//
+// 		let mut interpreter = Interpreter::default();
+//
+// 		let input_value = U256::from(0x1234567890abcdef1234567890abcdef_u128);
+// 		let test_cases = (0..32)
+// 			.map(|i| {
+// 				let byte_pos = 31 - i;
+//
+// 				let shift_amount = U256::from(byte_pos * 8);
+// 				let byte_value = (input_value >> shift_amount) & U256::from(0xFF);
+// 				TestCase { input: input_value, index: i, expected: byte_value }
+// 			})
+// 			.collect::<Vec<_>>();
+//
+// 		for test in test_cases.iter() {
+// 			push!(interpreter, test.input);
+// 			push!(interpreter, U256::from(test.index));
+// 			let context =
+// 				InstructionContext { host: &mut DummyHost, interpreter: &mut interpreter };
+// 			byte(context);
+// 			let res = interpreter.stack.pop().unwrap();
+// 			assert_eq!(res, test.expected, "Failed at index: {}", test.index);
+// 		}
+// 	}
+//
+// 	#[test]
+// 	fn test_clz() {
+// 		let mut interpreter = Interpreter::default();
+// 		interpreter.set_spec_id(SpecId::OSAKA);
+//
+// 		struct TestCase {
+// 			value: U256,
+// 			expected: U256,
+// 		}
+//
+// 		uint! {
+// 			let test_cases = [
+// 				TestCase { value: 0x0_U256, expected: 256_U256 },
+// 				TestCase { value: 0x1_U256, expected: 255_U256 },
+// 				TestCase { value: 0x2_U256, expected: 254_U256 },
+// 				TestCase { value: 0x3_U256, expected: 254_U256 },
+// 				TestCase { value: 0x4_U256, expected: 253_U256 },
+// 				TestCase { value: 0x7_U256, expected: 253_U256 },
+// 				TestCase { value: 0x8_U256, expected: 252_U256 },
+// 				TestCase { value: 0xff_U256, expected: 248_U256 },
+// 				TestCase { value: 0x100_U256, expected: 247_U256 },
+// 				TestCase { value: 0xffff_U256, expected: 240_U256 },
+// 				TestCase {
+// 					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256, // U256::MAX
+// 					expected: 0_U256,
+// 				},
+// 				TestCase {
+// 					value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256, // 1 << 255
+// 					expected: 0_U256,
+// 				},
+// 				TestCase { // Smallest value with 1 leading zero
+// 					value: 0x4000000000000000000000000000000000000000000000000000000000000000_U256, // 1 << 254
+// 					expected: 1_U256,
+// 				},
+// 				TestCase { // Value just below 1 << 255
+// 					value: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+// 					expected: 1_U256,
+// 				},
+// 			];
+// 		}
+//
+// 		for test in test_cases {
+// 			push!(interpreter, test.value);
+// 			let context =
+// 				InstructionContext { host: &mut DummyHost, interpreter: &mut interpreter };
+// 			clz(context);
+// 			let res = interpreter.stack.pop().unwrap();
+// 			assert_eq!(
+// 				res, test.expected,
+// 				"CLZ for value {:#x} failed. Expected: {}, Got: {}",
+// 				test.value, test.expected, res
+// 			);
+// 		}
+// 	}
+// }

From 70d07b9b26bda0e812cd98c5e4154be9b4d202f2 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Tue, 22 Jul 2025 20:33:25 +0000
Subject: [PATCH 075/186] Add AllowEVMBytecode config

---
 .../assets/asset-hub-westend/src/lib.rs       |   1 +
 .../runtimes/testing/penpal/src/lib.rs        |   1 +
 substrate/bin/node/runtime/src/lib.rs         |   1 +
 substrate/frame/revive/src/exec.rs            |   7 +-
 substrate/frame/revive/src/exec/mock_ext.rs   | 253 ++++++
 substrate/frame/revive/src/lib.rs             |  18 +-
 substrate/frame/revive/src/vm/evm.rs          |   2 +
 .../revive/src/vm/evm/instructions/bitwise.rs | 753 +++++++++---------
 substrate/frame/revive/src/vm/mod.rs          |   6 +-
 9 files changed, 671 insertions(+), 371 deletions(-)
 create mode 100644 substrate/frame/revive/src/exec/mock_ext.rs

diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
index 2bb504237839..521062eff840 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
@@ -1182,6 +1182,7 @@ impl pallet_revive::Config for Runtime {
 	type RuntimeMemory = ConstU32<{ 128 * 1024 * 1024 }>;
 	type PVFMemory = ConstU32<{ 512 * 1024 * 1024 }>;
 	type UnsafeUnstableInterface = ConstBool<false>;
+	type AllowEVMBytecode = ConstBool<false>;
 	type UploadOrigin = EnsureSigned<Self::AccountId>;
 	type InstantiateOrigin = EnsureSigned<Self::AccountId>;
 	type RuntimeHoldReason = RuntimeHoldReason;
diff --git a/cumulus/parachains/runtimes/testing/penpal/src/lib.rs b/cumulus/parachains/runtimes/testing/penpal/src/lib.rs
index ff2f538bb361..ce485a96ba2d 100644
--- a/cumulus/parachains/runtimes/testing/penpal/src/lib.rs
+++ b/cumulus/parachains/runtimes/testing/penpal/src/lib.rs
@@ -853,6 +853,7 @@ impl pallet_revive::Config for Runtime {
 	type RuntimeMemory = ConstU32<{ 128 * 1024 * 1024 }>;
 	type PVFMemory = ConstU32<{ 512 * 1024 * 1024 }>;
 	type UnsafeUnstableInterface = ConstBool<true>;
+	type AllowEVMBytecode = ConstBool<true>;
 	type UploadOrigin = EnsureSigned<Self::AccountId>;
 	type InstantiateOrigin = EnsureSigned<Self::AccountId>;
 	type RuntimeHoldReason = RuntimeHoldReason;
diff --git a/substrate/bin/node/runtime/src/lib.rs b/substrate/bin/node/runtime/src/lib.rs
index 4ea04b736c02..0efa26a76f62 100644
--- a/substrate/bin/node/runtime/src/lib.rs
+++ b/substrate/bin/node/runtime/src/lib.rs
@@ -1450,6 +1450,7 @@ impl pallet_contracts::Config for Runtime {
 	type MaxCodeLen = ConstU32<{ 123 * 1024 }>;
 	type MaxStorageKeyLen = ConstU32<128>;
 	type UnsafeUnstableInterface = ConstBool<false>;
+	type AllowEVMBytecode = ConstBool<true>;
 	type UploadOrigin = EnsureSigned<Self::AccountId>;
 	type InstantiateOrigin = EnsureSigned<Self::AccountId>;
 	type MaxDebugBufferLen = ConstU32<{ 2 * 1024 * 1024 }>;
diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index 9f2f724056e0..f2bf5a5af506 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -60,6 +60,9 @@ use sp_runtime::{
 #[cfg(test)]
 mod tests;
 
+#[cfg(test)]
+pub mod mock_ext;
+
 pub type AccountIdOf<T> = <T as frame_system::Config>::AccountId;
 pub type MomentOf<T> = <<T as Config>::Time as Time>::Moment;
 pub type ExecResult = Result<ExecReturnValue, ExecError>;
@@ -2100,6 +2103,8 @@ mod sealing {
 	use super::*;
 
 	pub trait Sealed {}
-
 	impl<'a, T: Config, E> Sealed for Stack<'a, T, E> {}
+
+	#[cfg(test)]
+	impl<T: Config> sealing::Sealed for mock_ext::MockExt<T> {}
 }
diff --git a/substrate/frame/revive/src/exec/mock_ext.rs b/substrate/frame/revive/src/exec/mock_ext.rs
new file mode 100644
index 000000000000..71efb3191c88
--- /dev/null
+++ b/substrate/frame/revive/src/exec/mock_ext.rs
@@ -0,0 +1,253 @@
+#![cfg(test)]
+
+use crate::{
+	exec::{AccountIdOf, ExecError, Ext, Key, Origin, PrecompileExt, PrecompileWithInfoExt},
+	gas::GasMeter,
+	precompiles::Diff,
+	storage::{ContractInfo, WriteOutcome},
+	transient_storage::TransientStorage,
+	Config, ExecReturnValue, ImmutableData,
+};
+use alloc::vec::Vec;
+use core::marker::PhantomData;
+use frame_support::{dispatch::DispatchResult, weights::Weight};
+use sp_core::{H160, H256, U256};
+use sp_runtime::DispatchError;
+
+/// Mock implementation of the Ext trait that panics for all methods
+pub struct MockExt<T: Config> {
+	_phantom: PhantomData<T>,
+}
+
+impl<T: Config> MockExt<T> {
+	pub fn new() -> Self {
+		Self { _phantom: PhantomData }
+	}
+}
+
+impl<T: Config> PrecompileExt for MockExt<T> {
+	type T = T;
+
+	fn call(
+		&mut self,
+		_gas_limit: Weight,
+		_deposit_limit: U256,
+		_to: &H160,
+		_value: U256,
+		_input_data: Vec<u8>,
+		_allows_reentry: bool,
+		_read_only: bool,
+	) -> Result<(), ExecError> {
+		panic!("MockExt::call")
+	}
+
+	fn get_transient_storage(&self, _key: &Key) -> Option<Vec<u8>> {
+		panic!("MockExt::get_transient_storage")
+	}
+
+	fn get_transient_storage_size(&self, _key: &Key) -> Option<u32> {
+		panic!("MockExt::get_transient_storage_size")
+	}
+
+	fn set_transient_storage(
+		&mut self,
+		_key: &Key,
+		_value: Option<Vec<u8>>,
+		_take_old: bool,
+	) -> Result<WriteOutcome, DispatchError> {
+		panic!("MockExt::set_transient_storage")
+	}
+
+	fn caller(&self) -> Origin<Self::T> {
+		panic!("MockExt::caller")
+	}
+
+	fn origin(&self) -> &Origin<Self::T> {
+		panic!("MockExt::origin")
+	}
+
+	fn to_account_id(&self, _address: &H160) -> AccountIdOf<Self::T> {
+		panic!("MockExt::to_account_id")
+	}
+
+	fn code_hash(&self, _address: &H160) -> H256 {
+		panic!("MockExt::code_hash")
+	}
+
+	fn code_size(&self, _address: &H160) -> u64 {
+		panic!("MockExt::code_size")
+	}
+
+	fn caller_is_origin(&self) -> bool {
+		panic!("MockExt::caller_is_origin")
+	}
+
+	fn caller_is_root(&self) -> bool {
+		panic!("MockExt::caller_is_root")
+	}
+
+	fn account_id(&self) -> &AccountIdOf<Self::T> {
+		panic!("MockExt::account_id")
+	}
+
+	fn balance(&self) -> U256 {
+		panic!("MockExt::balance")
+	}
+
+	fn balance_of(&self, _address: &H160) -> U256 {
+		panic!("MockExt::balance_of")
+	}
+
+	fn value_transferred(&self) -> U256 {
+		panic!("MockExt::value_transferred")
+	}
+
+	fn now(&self) -> U256 {
+		panic!("MockExt::now")
+	}
+
+	fn minimum_balance(&self) -> U256 {
+		panic!("MockExt::minimum_balance")
+	}
+
+	fn deposit_event(&mut self, _topics: Vec<H256>, _data: Vec<u8>) {
+		panic!("MockExt::deposit_event")
+	}
+
+	fn block_number(&self) -> U256 {
+		panic!("MockExt::block_number")
+	}
+
+	fn block_hash(&self, _block_number: U256) -> Option<H256> {
+		panic!("MockExt::block_hash")
+	}
+
+	fn block_author(&self) -> Option<H160> {
+		panic!("MockExt::block_author")
+	}
+
+	fn max_value_size(&self) -> u32 {
+		panic!("MockExt::max_value_size")
+	}
+
+	fn get_weight_price(&self, _weight: Weight) -> U256 {
+		panic!("MockExt::get_weight_price")
+	}
+
+	fn gas_meter(&self) -> &GasMeter<Self::T> {
+		panic!("MockExt::gas_meter")
+	}
+
+	fn gas_meter_mut(&mut self) -> &mut GasMeter<Self::T> {
+		panic!("MockExt::gas_meter_mut")
+	}
+
+	fn ecdsa_recover(
+		&self,
+		_signature: &[u8; 65],
+		_message_hash: &[u8; 32],
+	) -> Result<[u8; 33], ()> {
+		panic!("MockExt::ecdsa_recover")
+	}
+
+	fn sr25519_verify(&self, _signature: &[u8; 64], _message: &[u8], _pub_key: &[u8; 32]) -> bool {
+		panic!("MockExt::sr25519_verify")
+	}
+
+	fn ecdsa_to_eth_address(&self, _pk: &[u8; 33]) -> Result<[u8; 20], ()> {
+		panic!("MockExt::ecdsa_to_eth_address")
+	}
+
+	#[cfg(any(test, feature = "runtime-benchmarks"))]
+	fn contract_info(&mut self) -> &mut ContractInfo<Self::T> {
+		panic!("MockExt::contract_info")
+	}
+
+	#[cfg(any(feature = "runtime-benchmarks", test))]
+	fn transient_storage(&mut self) -> &mut TransientStorage<Self::T> {
+		panic!("MockExt::transient_storage")
+	}
+
+	fn is_read_only(&self) -> bool {
+		panic!("MockExt::is_read_only")
+	}
+
+	fn last_frame_output(&self) -> &ExecReturnValue {
+		panic!("MockExt::last_frame_output")
+	}
+
+	fn last_frame_output_mut(&mut self) -> &mut ExecReturnValue {
+		panic!("MockExt::last_frame_output_mut")
+	}
+}
+
+impl<T: Config> PrecompileWithInfoExt for MockExt<T> {
+	fn get_storage(&mut self, _key: &Key) -> Option<Vec<u8>> {
+		panic!("MockExt::get_storage")
+	}
+
+	fn get_storage_size(&mut self, _key: &Key) -> Option<u32> {
+		panic!("MockExt::get_storage_size")
+	}
+
+	fn set_storage(
+		&mut self,
+		_key: &Key,
+		_value: Option<Vec<u8>>,
+		_take_old: bool,
+	) -> Result<WriteOutcome, DispatchError> {
+		panic!("MockExt::set_storage")
+	}
+
+	fn charge_storage(&mut self, _diff: &Diff) {
+		panic!("MockExt::charge_storage")
+	}
+
+	fn instantiate(
+		&mut self,
+		_gas_limit: Weight,
+		_deposit_limit: U256,
+		_code: H256,
+		_value: U256,
+		_input_data: Vec<u8>,
+		_salt: Option<&[u8; 32]>,
+	) -> Result<H160, ExecError> {
+		panic!("MockExt::instantiate")
+	}
+}
+
+impl<T: Config> Ext for MockExt<T> {
+	fn delegate_call(
+		&mut self,
+		_gas_limit: Weight,
+		_deposit_limit: U256,
+		_address: H160,
+		_input_data: Vec<u8>,
+	) -> Result<(), ExecError> {
+		panic!("MockExt::delegate_call")
+	}
+
+	fn terminate(&mut self, _beneficiary: &H160) -> DispatchResult {
+		panic!("MockExt::terminate")
+	}
+
+	fn own_code_hash(&mut self) -> &H256 {
+		panic!("MockExt::own_code_hash")
+	}
+
+	fn set_code_hash(&mut self, _hash: H256) -> DispatchResult {
+		panic!("MockExt::set_code_hash")
+	}
+
+	fn immutable_data_len(&mut self) -> u32 {
+		panic!("MockExt::immutable_data_len")
+	}
+
+	fn get_immutable_data(&mut self) -> Result<ImmutableData, DispatchError> {
+		panic!("MockExt::get_immutable_data")
+	}
+
+	fn set_immutable_data(&mut self, _data: ImmutableData) -> Result<(), DispatchError> {
+		panic!("MockExt::set_immutable_data")
+	}
+}
diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index 619a345cd2d7..34b3775cd301 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -226,6 +226,10 @@ pub mod pallet {
 		#[pallet::constant]
 		type UnsafeUnstableInterface: Get<bool>;
 
+		/// Allow EVM bytecode to be uploaded and instantiated.
+		#[pallet::constant]
+		type AllowEVMBytecode: Get<bool>;
+
 		/// Origin allowed to upload code.
 		///
 		/// By default, it is safe to set this to `EnsureSigned`, allowing anyone to upload contract
@@ -337,6 +341,7 @@ pub mod pallet {
 			type DepositPerItem = DepositPerItem;
 			type Time = Self;
 			type UnsafeUnstableInterface = ConstBool<true>;
+			type AllowEVMBytecode = ConstBool<true>;
 			type UploadOrigin = EnsureSigned<Self::AccountId>;
 			type InstantiateOrigin = EnsureSigned<Self::AccountId>;
 			type WeightInfo = ();
@@ -1173,11 +1178,14 @@ where
 					storage_deposit_limit.saturating_reduce(upload_deposit);
 					(executable, upload_deposit)
 				},
-				Code::Upload(code) => {
-					let origin = T::UploadOrigin::ensure_origin(origin)?;
-					let executable = ContractBlob::from_evm_code(code, origin)?;
-					(executable, Default::default())
-				},
+				Code::Upload(code) =>
+					if T::AllowEVMBytecode::get() {
+						let origin = T::UploadOrigin::ensure_origin(origin)?;
+						let executable = ContractBlob::from_evm_code(code, origin)?;
+						(executable, Default::default())
+					} else {
+						return Err(<Error<T>>::CodeRejected.into())
+					},
 				Code::Existing(code_hash) =>
 					(ContractBlob::from_storage(code_hash, &mut gas_meter)?, Default::default()),
 			};
diff --git a/substrate/frame/revive/src/vm/evm.rs b/substrate/frame/revive/src/vm/evm.rs
index a7f71cff6e50..ad6a63b6bcb0 100644
--- a/substrate/frame/revive/src/vm/evm.rs
+++ b/substrate/frame/revive/src/vm/evm.rs
@@ -97,6 +97,7 @@ pub struct EVMInterpreter<'a, E: Ext> {
 	_phantom: core::marker::PhantomData<&'a E>,
 }
 
+
 impl<'a, E: Ext> InterpreterTypes for EVMInterpreter<'a, E> {
 	type Stack = Stack;
 	type Memory = SharedMemory;
@@ -116,6 +117,7 @@ impl<'a, E: Ext> InterpreterTypes for EVMInterpreter<'a, E> {
 /// In our implementation of the instruction table, Everything except the call input data will be
 /// accessed through the `InterpreterTypes::Extend` associated type, our implementation will panic
 /// if any of those methods are called.
+#[derive(Debug, Clone, Default)]
 pub struct EVMInputs(CallInput);
 
 impl EVMInputs {
diff --git a/substrate/frame/revive/src/vm/evm/instructions/bitwise.rs b/substrate/frame/revive/src/vm/evm/instructions/bitwise.rs
index 377117985ee3..d19bd9c9e4c7 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/bitwise.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/bitwise.rs
@@ -164,366 +164,393 @@ pub fn sar<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	};
 }
 
-// #[cfg(test)]
-// mod tests {
-// 	use super::{byte, clz, sar, shl, shr};
-// 	use revm::{
-// 		interpreter::{host::DummyHost, InstructionContext, Interpreter},
-// 		primitives::{hardfork::SpecId, uint, U256},
-// 	};
-//
-// 	#[test]
-// 	fn test_shift_left() {
-// 		let mut interpreter = Interpreter::default();
-//
-// 		struct TestCase {
-// 			value: U256,
-// 			shift: U256,
-// 			expected: U256,
-// 		}
-//
-// 		uint! {
-// 			let test_cases = [
-// 				TestCase {
-// 					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
-// 					shift: 0x00_U256,
-// 					expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
-// 				},
-// 				TestCase {
-// 					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
-// 					shift: 0x01_U256,
-// 					expected: 0x0000000000000000000000000000000000000000000000000000000000000002_U256,
-// 				},
-// 				TestCase {
-// 					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
-// 					shift: 0xff_U256,
-// 					expected: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
-// 				},
-// 				TestCase {
-// 					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
-// 					shift: 0x0100_U256,
-// 					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
-// 				},
-// 				TestCase {
-// 					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
-// 					shift: 0x0101_U256,
-// 					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
-// 				},
-// 				TestCase {
-// 					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-// 					shift: 0x00_U256,
-// 					expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-// 				},
-// 				TestCase {
-// 					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-// 					shift: 0x01_U256,
-// 					expected: 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe_U256,
-// 				},
-// 				TestCase {
-// 					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-// 					shift: 0xff_U256,
-// 					expected: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
-// 				},
-// 				TestCase {
-// 					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-// 					shift: 0x0100_U256,
-// 					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
-// 				},
-// 				TestCase {
-// 					value: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
-// 					shift: 0x01_U256,
-// 					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
-// 				},
-// 				TestCase {
-// 					value: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-// 					shift: 0x01_U256,
-// 					expected: 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe_U256,
-// 				},
-// 			];
-// 		}
-//
-// 		for test in test_cases {
-// 			push!(interpreter, test.value);
-// 			push!(interpreter, test.shift);
-// 			let context =
-// 				InstructionContext { host: &mut DummyHost, interpreter: &mut interpreter };
-// 			shl(context);
-// 			let res = interpreter.stack.pop().unwrap();
-// 			assert_eq!(res, test.expected);
-// 		}
-// 	}
-//
-// 	#[test]
-// 	fn test_logical_shift_right() {
-// 		let mut interpreter = Interpreter::default();
-//
-// 		struct TestCase {
-// 			value: U256,
-// 			shift: U256,
-// 			expected: U256,
-// 		}
-//
-// 		uint! {
-// 			let test_cases = [
-// 				TestCase {
-// 					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
-// 					shift: 0x00_U256,
-// 					expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
-// 				},
-// 				TestCase {
-// 					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
-// 					shift: 0x01_U256,
-// 					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
-// 				},
-// 				TestCase {
-// 					value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
-// 					shift: 0x01_U256,
-// 					expected: 0x4000000000000000000000000000000000000000000000000000000000000000_U256,
-// 				},
-// 				TestCase {
-// 					value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
-// 					shift: 0xff_U256,
-// 					expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
-// 				},
-// 				TestCase {
-// 					value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
-// 					shift: 0x0100_U256,
-// 					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
-// 				},
-// 				TestCase {
-// 					value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
-// 					shift: 0x0101_U256,
-// 					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
-// 				},
-// 				TestCase {
-// 					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-// 					shift: 0x00_U256,
-// 					expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-// 				},
-// 				TestCase {
-// 					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-// 					shift: 0x01_U256,
-// 					expected: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-// 				},
-// 				TestCase {
-// 					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-// 					shift: 0xff_U256,
-// 					expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
-// 				},
-// 				TestCase {
-// 					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-// 					shift: 0x0100_U256,
-// 					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
-// 				},
-// 				TestCase {
-// 					value: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
-// 					shift: 0x01_U256,
-// 					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
-// 				},
-// 			];
-// 		}
-//
-// 		for test in test_cases {
-// 			push!(interpreter, test.value);
-// 			push!(interpreter, test.shift);
-// 			let context =
-// 				InstructionContext { host: &mut DummyHost, interpreter: &mut interpreter };
-// 			shr(context);
-// 			let res = interpreter.stack.pop().unwrap();
-// 			assert_eq!(res, test.expected);
-// 		}
-// 	}
-//
-// 	#[test]
-// 	fn test_arithmetic_shift_right() {
-// 		let mut interpreter = Interpreter::default();
-//
-// 		struct TestCase {
-// 			value: U256,
-// 			shift: U256,
-// 			expected: U256,
-// 		}
-//
-// 		uint! {
-// 		let test_cases = [
-// 			TestCase {
-// 				value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
-// 				shift: 0x00_U256,
-// 				expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
-// 			},
-// 			TestCase {
-// 				value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
-// 				shift: 0x01_U256,
-// 				expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
-// 			},
-// 			TestCase {
-// 				value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
-// 				shift: 0x01_U256,
-// 				expected: 0xc000000000000000000000000000000000000000000000000000000000000000_U256,
-// 			},
-// 			TestCase {
-// 				value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
-// 				shift: 0xff_U256,
-// 				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-// 			},
-// 			TestCase {
-// 				value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
-// 				shift: 0x0100_U256,
-// 				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-// 			},
-// 			TestCase {
-// 				value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
-// 				shift: 0x0101_U256,
-// 				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-// 			},
-// 			TestCase {
-// 				value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-// 				shift: 0x00_U256,
-// 				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-// 			},
-// 			TestCase {
-// 				value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-// 				shift: 0x01_U256,
-// 				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-// 			},
-// 			TestCase {
-// 				value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-// 				shift: 0xff_U256,
-// 				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-// 			},
-// 			TestCase {
-// 				value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-// 				shift: 0x0100_U256,
-// 				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-// 			},
-// 			TestCase {
-// 				value: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
-// 				shift: 0x01_U256,
-// 				expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
-// 			},
-// 			TestCase {
-// 				value: 0x4000000000000000000000000000000000000000000000000000000000000000_U256,
-// 				shift: 0xfe_U256,
-// 				expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
-// 			},
-// 			TestCase {
-// 				value: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-// 				shift: 0xf8_U256,
-// 				expected: 0x000000000000000000000000000000000000000000000000000000000000007f_U256,
-// 			},
-// 			TestCase {
-// 				value: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-// 				shift: 0xfe_U256,
-// 				expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
-// 			},
-// 			TestCase {
-// 				value: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-// 				shift: 0xff_U256,
-// 				expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
-// 			},
-// 			TestCase {
-// 				value: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-// 				shift: 0x0100_U256,
-// 				expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
-// 			},
-// 		];
-// 			}
-//
-// 		for test in test_cases {
-// 			push!(interpreter, test.value);
-// 			push!(interpreter, test.shift);
-// 			let context =
-// 				InstructionContext { host: &mut DummyHost, interpreter: &mut interpreter };
-// 			sar(context);
-// 			let res = interpreter.stack.pop().unwrap();
-// 			assert_eq!(res, test.expected);
-// 		}
-// 	}
-//
-// 	#[test]
-// 	fn test_byte() {
-// 		struct TestCase {
-// 			input: U256,
-// 			index: usize,
-// 			expected: U256,
-// 		}
-//
-// 		let mut interpreter = Interpreter::default();
-//
-// 		let input_value = U256::from(0x1234567890abcdef1234567890abcdef_u128);
-// 		let test_cases = (0..32)
-// 			.map(|i| {
-// 				let byte_pos = 31 - i;
-//
-// 				let shift_amount = U256::from(byte_pos * 8);
-// 				let byte_value = (input_value >> shift_amount) & U256::from(0xFF);
-// 				TestCase { input: input_value, index: i, expected: byte_value }
-// 			})
-// 			.collect::<Vec<_>>();
-//
-// 		for test in test_cases.iter() {
-// 			push!(interpreter, test.input);
-// 			push!(interpreter, U256::from(test.index));
-// 			let context =
-// 				InstructionContext { host: &mut DummyHost, interpreter: &mut interpreter };
-// 			byte(context);
-// 			let res = interpreter.stack.pop().unwrap();
-// 			assert_eq!(res, test.expected, "Failed at index: {}", test.index);
-// 		}
-// 	}
-//
-// 	#[test]
-// 	fn test_clz() {
-// 		let mut interpreter = Interpreter::default();
-// 		interpreter.set_spec_id(SpecId::OSAKA);
-//
-// 		struct TestCase {
-// 			value: U256,
-// 			expected: U256,
-// 		}
-//
-// 		uint! {
-// 			let test_cases = [
-// 				TestCase { value: 0x0_U256, expected: 256_U256 },
-// 				TestCase { value: 0x1_U256, expected: 255_U256 },
-// 				TestCase { value: 0x2_U256, expected: 254_U256 },
-// 				TestCase { value: 0x3_U256, expected: 254_U256 },
-// 				TestCase { value: 0x4_U256, expected: 253_U256 },
-// 				TestCase { value: 0x7_U256, expected: 253_U256 },
-// 				TestCase { value: 0x8_U256, expected: 252_U256 },
-// 				TestCase { value: 0xff_U256, expected: 248_U256 },
-// 				TestCase { value: 0x100_U256, expected: 247_U256 },
-// 				TestCase { value: 0xffff_U256, expected: 240_U256 },
-// 				TestCase {
-// 					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256, // U256::MAX
-// 					expected: 0_U256,
-// 				},
-// 				TestCase {
-// 					value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256, // 1 << 255
-// 					expected: 0_U256,
-// 				},
-// 				TestCase { // Smallest value with 1 leading zero
-// 					value: 0x4000000000000000000000000000000000000000000000000000000000000000_U256, // 1 << 254
-// 					expected: 1_U256,
-// 				},
-// 				TestCase { // Value just below 1 << 255
-// 					value: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
-// 					expected: 1_U256,
-// 				},
-// 			];
-// 		}
-//
-// 		for test in test_cases {
-// 			push!(interpreter, test.value);
-// 			let context =
-// 				InstructionContext { host: &mut DummyHost, interpreter: &mut interpreter };
-// 			clz(context);
-// 			let res = interpreter.stack.pop().unwrap();
-// 			assert_eq!(
-// 				res, test.expected,
-// 				"CLZ for value {:#x} failed. Expected: {}, Got: {}",
-// 				test.value, test.expected, res
-// 			);
-// 		}
-// 	}
-// }
+#[cfg(test)]
+mod tests {
+	use super::{byte, clz, sar, shl, shr};
+	use revm::{
+		interpreter::{host::DummyHost, InstructionContext},
+		primitives::{hardfork::SpecId, uint, U256},
+	};
+
+	pub fn test_interpreter() -> revm::interpreter::Interpreter<
+		crate::vm::evm::EVMInterpreter<'static, crate::exec::mock_ext::MockExt<crate::tests::Test>>,
+	> {
+		use crate::tests::Test;
+		use revm::{
+			interpreter::{
+				interpreter::{RuntimeFlags, SharedMemory},
+				Interpreter, Stack,
+			},
+			primitives::hardfork::SpecId,
+		};
+
+		let mock_ext = Box::leak(Box::new(crate::exec::mock_ext::MockExt::<Test>::new()));
+
+		Interpreter {
+			// TODO clean up once we move to use our own gas meter
+			gas: revm::interpreter::Gas::new(30_000_000),
+			bytecode: Default::default(),
+			stack: Stack::new(),
+			return_data: Default::default(),
+			memory: SharedMemory::new(),
+			input: crate::vm::evm::EVMInputs::default(),
+			runtime_flag: RuntimeFlags { is_static: false, spec_id: SpecId::default() },
+			extend: mock_ext,
+		}
+	}
+
+	#[test]
+	fn test_shift_left() {
+		let mut interpreter = test_interpreter();
+
+		struct TestCase {
+			value: U256,
+			shift: U256,
+			expected: U256,
+		}
+
+		uint! {
+			let test_cases = [
+				TestCase {
+					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+					shift: 0x00_U256,
+					expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+				},
+				TestCase {
+					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+					shift: 0x01_U256,
+					expected: 0x0000000000000000000000000000000000000000000000000000000000000002_U256,
+				},
+				TestCase {
+					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+					shift: 0xff_U256,
+					expected: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
+				},
+				TestCase {
+					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+					shift: 0x0100_U256,
+					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+				},
+				TestCase {
+					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+					shift: 0x0101_U256,
+					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+				},
+				TestCase {
+					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+					shift: 0x00_U256,
+					expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+				},
+				TestCase {
+					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+					shift: 0x01_U256,
+					expected: 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe_U256,
+				},
+				TestCase {
+					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+					shift: 0xff_U256,
+					expected: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
+				},
+				TestCase {
+					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+					shift: 0x0100_U256,
+					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+				},
+				TestCase {
+					value: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+					shift: 0x01_U256,
+					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+				},
+				TestCase {
+					value: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+					shift: 0x01_U256,
+					expected: 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe_U256,
+				},
+			];
+		}
+
+		for test in test_cases {
+			push!(interpreter, test.value);
+			push!(interpreter, test.shift);
+			let context =
+				InstructionContext { host: &mut DummyHost, interpreter: &mut interpreter };
+			shl(context);
+			let res = interpreter.stack.pop().unwrap();
+			assert_eq!(res, test.expected);
+		}
+	}
+
+	#[test]
+	fn test_logical_shift_right() {
+		let mut interpreter = test_interpreter();
+
+		struct TestCase {
+			value: U256,
+			shift: U256,
+			expected: U256,
+		}
+
+		uint! {
+			let test_cases = [
+				TestCase {
+					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+					shift: 0x00_U256,
+					expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+				},
+				TestCase {
+					value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+					shift: 0x01_U256,
+					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+				},
+				TestCase {
+					value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
+					shift: 0x01_U256,
+					expected: 0x4000000000000000000000000000000000000000000000000000000000000000_U256,
+				},
+				TestCase {
+					value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
+					shift: 0xff_U256,
+					expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+				},
+				TestCase {
+					value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
+					shift: 0x0100_U256,
+					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+				},
+				TestCase {
+					value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
+					shift: 0x0101_U256,
+					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+				},
+				TestCase {
+					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+					shift: 0x00_U256,
+					expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+				},
+				TestCase {
+					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+					shift: 0x01_U256,
+					expected: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+				},
+				TestCase {
+					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+					shift: 0xff_U256,
+					expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+				},
+				TestCase {
+					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+					shift: 0x0100_U256,
+					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+				},
+				TestCase {
+					value: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+					shift: 0x01_U256,
+					expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+				},
+			];
+		}
+
+		for test in test_cases {
+			push!(interpreter, test.value);
+			push!(interpreter, test.shift);
+			let context =
+				InstructionContext { host: &mut DummyHost, interpreter: &mut interpreter };
+			shr(context);
+			let res = interpreter.stack.pop().unwrap();
+			assert_eq!(res, test.expected);
+		}
+	}
+
+	#[test]
+	fn test_arithmetic_shift_right() {
+		let mut interpreter = test_interpreter();
+
+		struct TestCase {
+			value: U256,
+			shift: U256,
+			expected: U256,
+		}
+
+		uint! {
+		let test_cases = [
+			TestCase {
+				value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+				shift: 0x00_U256,
+				expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+			},
+			TestCase {
+				value: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+				shift: 0x01_U256,
+				expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+			},
+			TestCase {
+				value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
+				shift: 0x01_U256,
+				expected: 0xc000000000000000000000000000000000000000000000000000000000000000_U256,
+			},
+			TestCase {
+				value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
+				shift: 0xff_U256,
+				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+			},
+			TestCase {
+				value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
+				shift: 0x0100_U256,
+				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+			},
+			TestCase {
+				value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256,
+				shift: 0x0101_U256,
+				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+			},
+			TestCase {
+				value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+				shift: 0x00_U256,
+				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+			},
+			TestCase {
+				value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+				shift: 0x01_U256,
+				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+			},
+			TestCase {
+				value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+				shift: 0xff_U256,
+				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+			},
+			TestCase {
+				value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+				shift: 0x0100_U256,
+				expected: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+			},
+			TestCase {
+				value: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+				shift: 0x01_U256,
+				expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+			},
+			TestCase {
+				value: 0x4000000000000000000000000000000000000000000000000000000000000000_U256,
+				shift: 0xfe_U256,
+				expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+			},
+			TestCase {
+				value: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+				shift: 0xf8_U256,
+				expected: 0x000000000000000000000000000000000000000000000000000000000000007f_U256,
+			},
+			TestCase {
+				value: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+				shift: 0xfe_U256,
+				expected: 0x0000000000000000000000000000000000000000000000000000000000000001_U256,
+			},
+			TestCase {
+				value: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+				shift: 0xff_U256,
+				expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+			},
+			TestCase {
+				value: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+				shift: 0x0100_U256,
+				expected: 0x0000000000000000000000000000000000000000000000000000000000000000_U256,
+			},
+		];
+			}
+
+		for test in test_cases {
+			push!(interpreter, test.value);
+			push!(interpreter, test.shift);
+			let context =
+				InstructionContext { host: &mut DummyHost, interpreter: &mut interpreter };
+			sar(context);
+			let res = interpreter.stack.pop().unwrap();
+			assert_eq!(res, test.expected);
+		}
+	}
+
+	#[test]
+	fn test_byte() {
+		struct TestCase {
+			input: U256,
+			index: usize,
+			expected: U256,
+		}
+
+		let mut interpreter = test_interpreter();
+
+		let input_value = U256::from(0x1234567890abcdef1234567890abcdef_u128);
+		let test_cases = (0..32)
+			.map(|i| {
+				let byte_pos = 31 - i;
+
+				let shift_amount = U256::from(byte_pos * 8);
+				let byte_value = (input_value >> shift_amount) & U256::from(0xFF);
+				TestCase { input: input_value, index: i, expected: byte_value }
+			})
+			.collect::<Vec<_>>();
+
+		for test in test_cases.iter() {
+			push!(interpreter, test.input);
+			push!(interpreter, U256::from(test.index));
+			let context =
+				InstructionContext { host: &mut DummyHost, interpreter: &mut interpreter };
+			byte(context);
+			let res = interpreter.stack.pop().unwrap();
+			assert_eq!(res, test.expected, "Failed at index: {}", test.index);
+		}
+	}
+
+	#[test]
+	fn test_clz() {
+		let mut interpreter = test_interpreter();
+		interpreter.runtime_flag.spec_id = SpecId::OSAKA;
+
+		struct TestCase {
+			value: U256,
+			expected: U256,
+		}
+
+		uint! {
+			let test_cases = [
+				TestCase { value: 0x0_U256, expected: 256_U256 },
+				TestCase { value: 0x1_U256, expected: 255_U256 },
+				TestCase { value: 0x2_U256, expected: 254_U256 },
+				TestCase { value: 0x3_U256, expected: 254_U256 },
+				TestCase { value: 0x4_U256, expected: 253_U256 },
+				TestCase { value: 0x7_U256, expected: 253_U256 },
+				TestCase { value: 0x8_U256, expected: 252_U256 },
+				TestCase { value: 0xff_U256, expected: 248_U256 },
+				TestCase { value: 0x100_U256, expected: 247_U256 },
+				TestCase { value: 0xffff_U256, expected: 240_U256 },
+				TestCase {
+					value: 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256, // U256::MAX
+					expected: 0_U256,
+				},
+				TestCase {
+					value: 0x8000000000000000000000000000000000000000000000000000000000000000_U256, // 1 << 255
+					expected: 0_U256,
+				},
+				TestCase { // Smallest value with 1 leading zero
+					value: 0x4000000000000000000000000000000000000000000000000000000000000000_U256, // 1 << 254
+					expected: 1_U256,
+				},
+				TestCase { // Value just below 1 << 255
+					value: 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff_U256,
+					expected: 1_U256,
+				},
+			];
+		}
+
+		for test in test_cases {
+			push!(interpreter, test.value);
+			let context =
+				InstructionContext { host: &mut DummyHost, interpreter: &mut interpreter };
+			clz(context);
+			let res = interpreter.stack.pop().unwrap();
+			assert_eq!(
+				res, test.expected,
+				"CLZ for value {:#x} failed. Expected: {}, Got: {}",
+				test.value, test.expected, res
+			);
+		}
+	}
+}
diff --git a/substrate/frame/revive/src/vm/mod.rs b/substrate/frame/revive/src/vm/mod.rs
index 0a33e89948bb..6bf9ae67a0dc 100644
--- a/substrate/frame/revive/src/vm/mod.rs
+++ b/substrate/frame/revive/src/vm/mod.rs
@@ -38,7 +38,7 @@ use frame_support::{
 	ensure,
 	traits::{fungible::MutateHold, tokens::Precision::BestEffort},
 };
-use sp_core::{H256, U256};
+use sp_core::{Get, H256, U256};
 use sp_runtime::DispatchError;
 
 /// Validated Vm module ready for execution.
@@ -276,12 +276,14 @@ where
 			let prepared_call =
 				self.prepare_call(pvm::Runtime::new(ext, input_data), function, 0)?;
 			prepared_call.call()
-		} else {
+		} else if T::AllowEVMBytecode::get() {
 			use crate::vm::evm::EVMInputs;
 			use revm::bytecode::Bytecode;
 			let inputs = EVMInputs::new(input_data);
 			let bytecode = Bytecode::new_raw(self.code.into_inner().into());
 			evm::call(bytecode, ext, inputs)
+		} else {
+			Err(Error::<T>::CodeRejected.into())
 		}
 	}
 

From 364201c0dbdd8301f3d49c2222957493fe8148df Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Wed, 23 Jul 2025 09:09:29 +0000
Subject: [PATCH 076/186] wip

---
 substrate/frame/revive/src/exec/mock_ext.rs   | 11 ++--
 substrate/frame/revive/src/vm/evm.rs          |  1 -
 .../src/vm/evm/instructions/arithmetic.rs     | 20 +++----
 .../revive/src/vm/evm/instructions/bitwise.rs | 30 +++++------
 .../src/vm/evm/instructions/block_info.rs     | 16 +++---
 .../src/vm/evm/instructions/contract.rs       | 14 ++---
 .../evm/instructions/contract/call_helpers.rs | 15 +++---
 .../revive/src/vm/evm/instructions/control.rs | 14 ++---
 .../revive/src/vm/evm/instructions/host.rs    | 28 +++++-----
 .../revive/src/vm/evm/instructions/macros.rs  | 53 ++++++++++++++++---
 .../revive/src/vm/evm/instructions/memory.rs  |  8 +--
 .../revive/src/vm/evm/instructions/mod.rs     | 28 +++++-----
 .../revive/src/vm/evm/instructions/stack.rs   | 10 ++--
 .../revive/src/vm/evm/instructions/system.rs  | 24 ++++-----
 .../revive/src/vm/evm/instructions/tx_info.rs |  6 +--
 .../frame/revive/src/vm/runtime_costs.rs      |  3 ++
 substrate/frame/revive/src/weights.rs         |  3 ++
 17 files changed, 162 insertions(+), 122 deletions(-)

diff --git a/substrate/frame/revive/src/exec/mock_ext.rs b/substrate/frame/revive/src/exec/mock_ext.rs
index 71efb3191c88..c4ba3c4824f7 100644
--- a/substrate/frame/revive/src/exec/mock_ext.rs
+++ b/substrate/frame/revive/src/exec/mock_ext.rs
@@ -16,12 +16,13 @@ use sp_runtime::DispatchError;
 
 /// Mock implementation of the Ext trait that panics for all methods
 pub struct MockExt<T: Config> {
+	gas_meter: GasMeter<T>,
 	_phantom: PhantomData<T>,
 }
 
 impl<T: Config> MockExt<T> {
 	pub fn new() -> Self {
-		Self { _phantom: PhantomData }
+		Self { gas_meter: GasMeter::new(Weight::MAX), _phantom: PhantomData }
 	}
 }
 
@@ -135,11 +136,11 @@ impl<T: Config> PrecompileExt for MockExt<T> {
 	}
 
 	fn gas_meter(&self) -> &GasMeter<Self::T> {
-		panic!("MockExt::gas_meter")
+		&self.gas_meter
 	}
 
 	fn gas_meter_mut(&mut self) -> &mut GasMeter<Self::T> {
-		panic!("MockExt::gas_meter_mut")
+		&mut self.gas_meter
 	}
 
 	fn ecdsa_recover(
@@ -199,9 +200,7 @@ impl<T: Config> PrecompileWithInfoExt for MockExt<T> {
 		panic!("MockExt::set_storage")
 	}
 
-	fn charge_storage(&mut self, _diff: &Diff) {
-		panic!("MockExt::charge_storage")
-	}
+	fn charge_storage(&mut self, _diff: &Diff) {}
 
 	fn instantiate(
 		&mut self,
diff --git a/substrate/frame/revive/src/vm/evm.rs b/substrate/frame/revive/src/vm/evm.rs
index ad6a63b6bcb0..d08e8fd79e8a 100644
--- a/substrate/frame/revive/src/vm/evm.rs
+++ b/substrate/frame/revive/src/vm/evm.rs
@@ -97,7 +97,6 @@ pub struct EVMInterpreter<'a, E: Ext> {
 	_phantom: core::marker::PhantomData<&'a E>,
 }
 
-
 impl<'a, E: Ext> InterpreterTypes for EVMInterpreter<'a, E> {
 	type Stack = Stack;
 	type Memory = SharedMemory;
diff --git a/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs b/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs
index 48a75c9c2637..89bd52d8b2c1 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs
@@ -13,28 +13,28 @@ use revm::{
 
 /// Implements the ADD instruction - adds two values from stack.
 pub fn add<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::VERYLOW);
+	gas_legacy!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([op1], op2, context.interpreter);
 	*op2 = op1.wrapping_add(*op2);
 }
 
 /// Implements the MUL instruction - multiplies two values from stack.
 pub fn mul<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::LOW);
+	gas_legacy!(context.interpreter, revm_gas::LOW);
 	popn_top!([op1], op2, context.interpreter);
 	*op2 = op1.wrapping_mul(*op2);
 }
 
 /// Implements the SUB instruction - subtracts two values from stack.
 pub fn sub<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::VERYLOW);
+	gas_legacy!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([op1], op2, context.interpreter);
 	*op2 = op1.wrapping_sub(*op2);
 }
 
 /// Implements the DIV instruction - divides two values from stack.
 pub fn div<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::LOW);
+	gas_legacy!(context.interpreter, revm_gas::LOW);
 	popn_top!([op1], op2, context.interpreter);
 	if !op2.is_zero() {
 		*op2 = op1.wrapping_div(*op2);
@@ -45,7 +45,7 @@ pub fn div<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Performs signed division of two values from stack.
 pub fn sdiv<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::LOW);
+	gas_legacy!(context.interpreter, revm_gas::LOW);
 	popn_top!([op1], op2, context.interpreter);
 	*op2 = i256_div(op1, *op2);
 }
@@ -54,7 +54,7 @@ pub fn sdiv<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Pops two values from stack and pushes the remainder of their division.
 pub fn rem<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::LOW);
+	gas_legacy!(context.interpreter, revm_gas::LOW);
 	popn_top!([op1], op2, context.interpreter);
 	if !op2.is_zero() {
 		*op2 = op1.wrapping_rem(*op2);
@@ -65,7 +65,7 @@ pub fn rem<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Performs signed modulo of two values from stack.
 pub fn smod<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::LOW);
+	gas_legacy!(context.interpreter, revm_gas::LOW);
 	popn_top!([op1], op2, context.interpreter);
 	*op2 = i256_mod(op1, *op2)
 }
@@ -74,7 +74,7 @@ pub fn smod<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Pops three values from stack and pushes (a + b) % n.
 pub fn addmod<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::MID);
+	gas_legacy!(context.interpreter, revm_gas::MID);
 	popn_top!([op1, op2], op3, context.interpreter);
 	*op3 = op1.add_mod(op2, *op3)
 }
@@ -83,7 +83,7 @@ pub fn addmod<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Pops three values from stack and pushes (a * b) % n.
 pub fn mulmod<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::MID);
+	gas_legacy!(context.interpreter, revm_gas::MID);
 	popn_top!([op1, op2], op3, context.interpreter);
 	*op3 = op1.mul_mod(op2, *op3)
 }
@@ -126,7 +126,7 @@ pub fn exp<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 /// Similarly, if `b == 0` then the yellow paper says the output should start with all zeros,
 /// then end with bits from `b`; this is equal to `y & mask` where `&` is bitwise `AND`.
 pub fn signextend<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::LOW);
+	gas_legacy!(context.interpreter, revm_gas::LOW);
 	popn_top!([ext], x, context.interpreter);
 	// For 31 we also don't need to do anything.
 	if ext < U256::from(31) {
diff --git a/substrate/frame/revive/src/vm/evm/instructions/bitwise.rs b/substrate/frame/revive/src/vm/evm/instructions/bitwise.rs
index d19bd9c9e4c7..534b6987eac8 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/bitwise.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/bitwise.rs
@@ -11,14 +11,14 @@ use revm::{
 
 /// Implements the LT instruction - less than comparison.
 pub fn lt<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::VERYLOW);
+	gas_legacy!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([op1], op2, context.interpreter);
 	*op2 = U256::from(op1 < *op2);
 }
 
 /// Implements the GT instruction - greater than comparison.
 pub fn gt<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::VERYLOW);
+	gas_legacy!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([op1], op2, context.interpreter);
 
 	*op2 = U256::from(op1 > *op2);
@@ -27,7 +27,7 @@ pub fn gt<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 /// Implements the CLZ instruction - count leading zeros.
 pub fn clz<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	check!(context.interpreter, OSAKA);
-	gas!(context.interpreter, revm_gas::VERYLOW);
+	gas_legacy!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([], op1, context.interpreter);
 
 	let leading_zeros = op1.leading_zeros();
@@ -38,7 +38,7 @@ pub fn clz<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Signed less than comparison of two values from stack.
 pub fn slt<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::VERYLOW);
+	gas_legacy!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([op1], op2, context.interpreter);
 
 	*op2 = U256::from(i256_cmp(&op1, op2) == Ordering::Less);
@@ -48,7 +48,7 @@ pub fn slt<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Signed greater than comparison of two values from stack.
 pub fn sgt<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::VERYLOW);
+	gas_legacy!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([op1], op2, context.interpreter);
 
 	*op2 = U256::from(i256_cmp(&op1, op2) == Ordering::Greater);
@@ -58,7 +58,7 @@ pub fn sgt<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Equality comparison of two values from stack.
 pub fn eq<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::VERYLOW);
+	gas_legacy!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([op1], op2, context.interpreter);
 
 	*op2 = U256::from(op1 == *op2);
@@ -68,7 +68,7 @@ pub fn eq<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Checks if the top stack value is zero.
 pub fn iszero<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::VERYLOW);
+	gas_legacy!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([], op1, context.interpreter);
 	*op1 = U256::from(op1.is_zero());
 }
@@ -77,7 +77,7 @@ pub fn iszero<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Bitwise AND of two values from stack.
 pub fn bitand<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::VERYLOW);
+	gas_legacy!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([op1], op2, context.interpreter);
 	*op2 = op1 & *op2;
 }
@@ -86,7 +86,7 @@ pub fn bitand<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Bitwise OR of two values from stack.
 pub fn bitor<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::VERYLOW);
+	gas_legacy!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([op1], op2, context.interpreter);
 
 	*op2 = op1 | *op2;
@@ -96,7 +96,7 @@ pub fn bitor<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Bitwise XOR of two values from stack.
 pub fn bitxor<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::VERYLOW);
+	gas_legacy!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([op1], op2, context.interpreter);
 
 	*op2 = op1 ^ *op2;
@@ -106,7 +106,7 @@ pub fn bitxor<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Bitwise NOT (negation) of the top stack value.
 pub fn not<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::VERYLOW);
+	gas_legacy!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([], op1, context.interpreter);
 
 	*op1 = !*op1;
@@ -116,7 +116,7 @@ pub fn not<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Extracts a single byte from a word at a given index.
 pub fn byte<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::VERYLOW);
+	gas_legacy!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([op1], op2, context.interpreter);
 
 	let o1 = as_usize_saturated!(op1);
@@ -131,7 +131,7 @@ pub fn byte<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 /// EIP-145: Bitwise shifting instructions in EVM
 pub fn shl<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	check!(context.interpreter, CONSTANTINOPLE);
-	gas!(context.interpreter, revm_gas::VERYLOW);
+	gas_legacy!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([op1], op2, context.interpreter);
 
 	let shift = as_usize_saturated!(op1);
@@ -141,7 +141,7 @@ pub fn shl<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 /// EIP-145: Bitwise shifting instructions in EVM
 pub fn shr<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	check!(context.interpreter, CONSTANTINOPLE);
-	gas!(context.interpreter, revm_gas::VERYLOW);
+	gas_legacy!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([op1], op2, context.interpreter);
 
 	let shift = as_usize_saturated!(op1);
@@ -151,7 +151,7 @@ pub fn shr<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 /// EIP-145: Bitwise shifting instructions in EVM
 pub fn sar<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	check!(context.interpreter, CONSTANTINOPLE);
-	gas!(context.interpreter, revm_gas::VERYLOW);
+	gas_legacy!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([op1], op2, context.interpreter);
 
 	let shift = as_usize_saturated!(op1);
diff --git a/substrate/frame/revive/src/vm/evm/instructions/block_info.rs b/substrate/frame/revive/src/vm/evm/instructions/block_info.rs
index 2677e6c6c7e2..e6a90e36cee0 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/block_info.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/block_info.rs
@@ -8,7 +8,7 @@ use revm::{
 /// EIP-1344: ChainID opcode
 pub fn chainid<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	check!(context.interpreter, ISTANBUL);
-	gas!(context.interpreter, revm_gas::BASE);
+	gas_legacy!(context.interpreter, revm_gas::BASE);
 	push!(context.interpreter, context.host.chain_id());
 }
 
@@ -16,7 +16,7 @@ pub fn chainid<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Pushes the current block's beneficiary address onto the stack.
 pub fn coinbase<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::BASE);
+	gas_legacy!(context.interpreter, revm_gas::BASE);
 	push!(context.interpreter, context.host.beneficiary().into_word().into());
 }
 
@@ -24,7 +24,7 @@ pub fn coinbase<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Pushes the current block's timestamp onto the stack.
 pub fn timestamp<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::BASE);
+	gas_legacy!(context.interpreter, revm_gas::BASE);
 	push!(context.interpreter, context.host.timestamp());
 }
 
@@ -32,7 +32,7 @@ pub fn timestamp<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Pushes the current block number onto the stack.
 pub fn block_number<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas_new!(context.interpreter, RuntimeCosts::BlockNumber);
+	gas!(context.interpreter, RuntimeCosts::BlockNumber);
 	let block_number = context.interpreter.extend.block_number();
 	push!(context.interpreter, U256::from_limbs(block_number.0));
 }
@@ -41,7 +41,7 @@ pub fn block_number<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Pushes the block difficulty (pre-merge) or prevrandao (post-merge) onto the stack.
 pub fn difficulty<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::BASE);
+	gas_legacy!(context.interpreter, revm_gas::BASE);
 	if context.interpreter.runtime_flag.spec_id().is_enabled_in(MERGE) {
 		// Unwrap is safe as this fields is checked in validation handler.
 		push!(context.interpreter, context.host.prevrandao().unwrap());
@@ -54,20 +54,20 @@ pub fn difficulty<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Pushes the current block's gas limit onto the stack.
 pub fn gaslimit<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::BASE);
+	gas_legacy!(context.interpreter, revm_gas::BASE);
 	push!(context.interpreter, context.host.gas_limit());
 }
 
 /// EIP-3198: BASEFEE opcode
 pub fn basefee<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	check!(context.interpreter, LONDON);
-	gas!(context.interpreter, revm_gas::BASE);
+	gas_legacy!(context.interpreter, revm_gas::BASE);
 	push!(context.interpreter, context.host.basefee());
 }
 
 /// EIP-7516: BLOBBASEFEE opcode
 pub fn blob_basefee<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	check!(context.interpreter, CANCUN);
-	gas!(context.interpreter, revm_gas::BASE);
+	gas_legacy!(context.interpreter, revm_gas::BASE);
 	push!(context.interpreter, context.host.blob_gasprice());
 }
diff --git a/substrate/frame/revive/src/vm/evm/instructions/contract.rs b/substrate/frame/revive/src/vm/evm/instructions/contract.rs
index c2ae178387f1..8b3a772cb306 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/contract.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/contract.rs
@@ -42,7 +42,7 @@ pub fn create<'ext, const IS_CREATE2: bool, E: Ext>(context: Context<'_, 'ext, E
 				context.interpreter.halt(InstructionResult::CreateInitCodeSizeLimit);
 				return;
 			}
-			gas!(context.interpreter, revm_gas::initcode_cost(len));
+			gas_legacy!(context.interpreter, revm_gas::initcode_cost(len));
 		}
 
 		let code_offset = as_usize_or_fail!(context.interpreter, code_offset);
@@ -58,7 +58,7 @@ pub fn create<'ext, const IS_CREATE2: bool, E: Ext>(context: Context<'_, 'ext, E
 		gas_or_fail!(context.interpreter, revm_gas::create2_cost(len));
 		CreateScheme::Create2 { salt }
 	} else {
-		gas!(context.interpreter, revm_gas::CREATE);
+		gas_legacy!(context.interpreter, revm_gas::CREATE);
 		CreateScheme::Create
 	};
 
@@ -69,7 +69,7 @@ pub fn create<'ext, const IS_CREATE2: bool, E: Ext>(context: Context<'_, 'ext, E
 		// Take remaining gas and deduce l64 part of it.
 		gas_limit -= gas_limit / 64
 	}
-	gas!(context.interpreter, gas_limit);
+	gas_legacy!(context.interpreter, gas_limit);
 
 	// Call host to interact with target contract
 	context
@@ -115,7 +115,7 @@ pub fn call<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 		return;
 	};
 
-	gas!(context.interpreter, gas_limit);
+	gas_legacy!(context.interpreter, gas_limit);
 
 	// Add call stipend if there is value to be transferred.
 	if has_transfer {
@@ -167,7 +167,7 @@ pub fn call_code<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 		return;
 	};
 
-	gas!(context.interpreter, gas_limit);
+	gas_legacy!(context.interpreter, gas_limit);
 
 	// Add call stipend if there is value to be transferred.
 	if !value.is_zero() {
@@ -217,7 +217,7 @@ pub fn delegate_call<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 		return;
 	};
 
-	gas!(context.interpreter, gas_limit);
+	gas_legacy!(context.interpreter, gas_limit);
 
 	// Call host to interact with target contract
 	context
@@ -260,7 +260,7 @@ pub fn static_call<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	let Some(gas_limit) = calc_call_gas(context.interpreter, load, false, local_gas_limit) else {
 		return;
 	};
-	gas!(context.interpreter, gas_limit);
+	gas_legacy!(context.interpreter, gas_limit);
 
 	// Call host to interact with target contract
 	context
diff --git a/substrate/frame/revive/src/vm/evm/instructions/contract/call_helpers.rs b/substrate/frame/revive/src/vm/evm/instructions/contract/call_helpers.rs
index c22b5a188d07..782e9b9211fd 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/contract/call_helpers.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/contract/call_helpers.rs
@@ -1,3 +1,4 @@
+use crate::vm::Ext;
 use core::{cmp::min, ops::Range};
 use revm::{
 	context_interface::{context::StateLoad, journaled_state::AccountLoad},
@@ -11,8 +12,8 @@ use revm::{
 
 /// Gets memory input and output ranges for call instructions.
 #[inline]
-pub fn get_memory_input_and_out_ranges(
-	interpreter: &mut Interpreter<impl InterpreterTypes>,
+pub fn get_memory_input_and_out_ranges<'a, E: Ext>(
+	interpreter: &mut Interpreter<crate::vm::evm::EVMInterpreter<'a, E>>,
 ) -> Option<(Range<usize>, Range<usize>)> {
 	popn!([in_offset, in_len, out_offset, out_len], interpreter, None);
 
@@ -30,8 +31,8 @@ pub fn get_memory_input_and_out_ranges(
 /// Resize memory and return range of memory.
 /// If `len` is 0 dont touch memory and return `usize::MAX` as offset and 0 as length.
 #[inline]
-pub fn resize_memory(
-	interpreter: &mut Interpreter<impl InterpreterTypes>,
+pub fn resize_memory<'a, E: Ext>(
+	interpreter: &mut Interpreter<crate::vm::evm::EVMInterpreter<'a, E>>,
 	offset: U256,
 	len: U256,
 ) -> Option<Range<usize>> {
@@ -48,15 +49,15 @@ pub fn resize_memory(
 
 /// Calculates gas cost and limit for call instructions.
 #[inline]
-pub fn calc_call_gas(
-	interpreter: &mut Interpreter<impl InterpreterTypes>,
+pub fn calc_call_gas<'a, E: Ext>(
+	interpreter: &mut Interpreter<crate::vm::evm::EVMInterpreter<'a, E>>,
 	account_load: StateLoad<AccountLoad>,
 	has_transfer: bool,
 	local_gas_limit: u64,
 ) -> Option<u64> {
 	let call_cost =
 		revm_gas::call_cost(interpreter.runtime_flag.spec_id(), has_transfer, account_load);
-	gas!(interpreter, call_cost, None);
+	gas_legacy!(interpreter, call_cost, None);
 
 	// EIP-150: Gas cost changes for IO-heavy operations
 	let gas_limit = if interpreter.runtime_flag.spec_id().is_enabled_in(TANGERINE) {
diff --git a/substrate/frame/revive/src/vm/evm/instructions/control.rs b/substrate/frame/revive/src/vm/evm/instructions/control.rs
index 7ab3148d8ad6..62f47c811cb2 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/control.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/control.rs
@@ -14,7 +14,7 @@ use revm::{
 ///
 /// Unconditional jump to a valid destination.
 pub fn jump<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::MID);
+	gas_legacy!(context.interpreter, revm_gas::MID);
 	let Some([target]) = <_ as StackTr>::popn(&mut context.interpreter.stack) else {
 		context.interpreter.halt(InstructionResult::StackUnderflow);
 		return;
@@ -26,7 +26,7 @@ pub fn jump<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Conditional jump to a valid destination if condition is true.
 pub fn jumpi<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::HIGH);
+	gas_legacy!(context.interpreter, revm_gas::HIGH);
 	let Some([target, cond]) = <_ as StackTr>::popn(&mut context.interpreter.stack) else {
 		context.interpreter.halt(InstructionResult::StackUnderflow);
 		return;
@@ -58,14 +58,14 @@ fn jump_inner(
 ///
 /// Marks a valid destination for jump operations.
 pub fn jumpdest<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::JUMPDEST);
+	gas_legacy!(context.interpreter, revm_gas::JUMPDEST);
 }
 
 /// Implements the PC instruction.
 ///
 /// Pushes the current program counter onto the stack.
 pub fn pc<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::BASE);
+	gas_legacy!(context.interpreter, revm_gas::BASE);
 	// - 1 because we have already advanced the instruction pointer in `Interpreter::step`
 	push!(context.interpreter, U256::from(context.interpreter.bytecode.pc() - 1));
 }
@@ -74,12 +74,12 @@ pub fn pc<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 /// Internal helper function for return operations.
 ///
 /// Handles memory data retrieval and sets the return action.
-fn return_inner(
-	interpreter: &mut Interpreter<impl revm::interpreter::interpreter_types::InterpreterTypes>,
+fn return_inner<'a, E: Ext>(
+	interpreter: &mut Interpreter<crate::vm::evm::EVMInterpreter<'a, E>>,
 	instruction_result: InstructionResult,
 ) {
 	// Zero gas cost
-	// gas!(interpreter, revm_gas::ZERO)
+	// gas_legacy!(interpreter, revm_gas::ZERO)
 	let Some([offset, len]) = <_ as StackTr>::popn(&mut interpreter.stack) else {
 		interpreter.halt(InstructionResult::StackUnderflow);
 		return;
diff --git a/substrate/frame/revive/src/vm/evm/instructions/host.rs b/substrate/frame/revive/src/vm/evm/instructions/host.rs
index 48060f7d0f41..3ff5efd3dbeb 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/host.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/host.rs
@@ -25,7 +25,7 @@ pub fn balance<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 		return;
 	};
 	let spec_id = context.interpreter.runtime_flag.spec_id();
-	gas!(
+	gas_legacy!(
 		context.interpreter,
 		if spec_id.is_enabled_in(BERLIN) {
 			warm_cold_cost(balance.is_cold)
@@ -44,7 +44,7 @@ pub fn balance<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 /// EIP-1884: Repricing for trie-size-dependent opcodes
 pub fn selfbalance<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	check!(context.interpreter, ISTANBUL);
-	gas!(context.interpreter, gas::LOW);
+	gas_legacy!(context.interpreter, gas::LOW);
 
 	let Some(balance) = context.host.balance(context.interpreter.input.target_address()) else {
 		context.interpreter.halt(InstructionResult::FatalExternalError);
@@ -65,11 +65,11 @@ pub fn extcodesize<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	};
 	let spec_id = context.interpreter.runtime_flag.spec_id();
 	if spec_id.is_enabled_in(BERLIN) {
-		gas!(context.interpreter, warm_cold_cost(code.is_cold));
+		gas_legacy!(context.interpreter, warm_cold_cost(code.is_cold));
 	} else if spec_id.is_enabled_in(TANGERINE) {
-		gas!(context.interpreter, 700);
+		gas_legacy!(context.interpreter, 700);
 	} else {
-		gas!(context.interpreter, 20);
+		gas_legacy!(context.interpreter, 20);
 	}
 
 	*top = U256::from(code.len());
@@ -86,11 +86,11 @@ pub fn extcodehash<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	};
 	let spec_id = context.interpreter.runtime_flag.spec_id();
 	if spec_id.is_enabled_in(BERLIN) {
-		gas!(context.interpreter, warm_cold_cost(code_hash.is_cold));
+		gas_legacy!(context.interpreter, warm_cold_cost(code_hash.is_cold));
 	} else if spec_id.is_enabled_in(ISTANBUL) {
-		gas!(context.interpreter, 700);
+		gas_legacy!(context.interpreter, 700);
 	} else {
-		gas!(context.interpreter, 400);
+		gas_legacy!(context.interpreter, 400);
 	}
 	*top = code_hash.into_u256();
 }
@@ -126,7 +126,7 @@ pub fn extcodecopy<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Gets the hash of one of the 256 most recent complete blocks.
 pub fn blockhash<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, gas::BLOCKHASH);
+	gas_legacy!(context.interpreter, gas::BLOCKHASH);
 	popn_top!([], number, context.interpreter);
 
 	let requested_number = *number;
@@ -167,7 +167,7 @@ pub fn sload<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 		return;
 	};
 
-	gas!(
+	gas_legacy!(
 		context.interpreter,
 		gas::sload_cost(context.interpreter.runtime_flag.spec_id(), value.is_cold)
 	);
@@ -196,7 +196,7 @@ pub fn sstore<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 		context.interpreter.halt(InstructionResult::ReentrancySentryOOG);
 		return;
 	}
-	gas!(
+	gas_legacy!(
 		context.interpreter,
 		gas::sstore_cost(
 			context.interpreter.runtime_flag.spec_id(),
@@ -216,7 +216,7 @@ pub fn sstore<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 pub fn tstore<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	check!(context.interpreter, CANCUN);
 	require_non_staticcall!(context.interpreter);
-	gas!(context.interpreter, gas::WARM_STORAGE_READ_COST);
+	gas_legacy!(context.interpreter, gas::WARM_STORAGE_READ_COST);
 
 	popn!([index, value], context.interpreter);
 
@@ -227,7 +227,7 @@ pub fn tstore<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 /// Load value from transient storage
 pub fn tload<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	check!(context.interpreter, CANCUN);
-	gas!(context.interpreter, gas::WARM_STORAGE_READ_COST);
+	gas_legacy!(context.interpreter, gas::WARM_STORAGE_READ_COST);
 
 	popn_top!([], index, context.interpreter);
 
@@ -289,7 +289,7 @@ pub fn selfdestruct<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 		context.interpreter.gas.record_refund(gas::SELFDESTRUCT)
 	}
 
-	gas!(
+	gas_legacy!(
 		context.interpreter,
 		gas::selfdestruct_cost(context.interpreter.runtime_flag.spec_id(), res)
 	);
diff --git a/substrate/frame/revive/src/vm/evm/instructions/macros.rs b/substrate/frame/revive/src/vm/evm/instructions/macros.rs
index efb98a51e6f8..d68dc99782b4 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/macros.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/macros.rs
@@ -62,12 +62,17 @@ macro_rules! check {
 
 /// Records a `gas` cost and fails the instruction if it would exceed the available gas.
 #[macro_export]
-macro_rules! gas {
+macro_rules! gas_legacy {
 	($interpreter:expr, $gas:expr) => {
-		gas!($interpreter, $gas, ())
+		gas_legacy!($interpreter, $gas, ())
 	};
 	($interpreter:expr, $gas:expr, $ret:expr) => {
-		if !$interpreter.gas.record_cost($gas) {
+		if $interpreter
+			.extend
+			.gas_meter_mut()
+			.charge($crate::RuntimeCosts::EVMGas($gas))
+			.is_err()
+		{
 			$interpreter.halt(revm::interpreter::InstructionResult::OutOfGas);
 			return $ret;
 		}
@@ -75,9 +80,9 @@ macro_rules! gas {
 }
 
 #[macro_export]
-macro_rules! gas_new {
+macro_rules! gas {
 	($interpreter:expr, $gas:expr) => {
-		gas_new!($interpreter, $gas, ())
+		gas!($interpreter, $gas, ())
 	};
 	($interpreter:expr, $gas:expr, $ret:expr) => {
 		if $interpreter.extend.gas_meter_mut().charge($gas).is_err() {
@@ -87,7 +92,7 @@ macro_rules! gas_new {
 	};
 }
 
-/// Same as [`gas!`], but with `gas` as an option.
+/// Same as [`gas_legacy!`], but with `gas` as an option.
 #[macro_export]
 macro_rules! gas_or_fail {
 	($interpreter:expr, $gas:expr) => {
@@ -95,7 +100,7 @@ macro_rules! gas_or_fail {
 	};
 	($interpreter:expr, $gas:expr, $ret:expr) => {
 		match $gas {
-			Some(gas_used) => gas!($interpreter, gas_used, $ret),
+			Some(gas_used) => gas_legacy!($interpreter, gas_used, $ret),
 			None => {
 				$interpreter.halt(revm::interpreter::InstructionResult::OutOfGas);
 				return $ret;
@@ -104,6 +109,37 @@ macro_rules! gas_or_fail {
 	};
 }
 
+use crate::{
+	vm::{
+		evm::{EVMInterpreter, Gas},
+		Ext,
+	},
+	RuntimeCosts,
+};
+use revm::interpreter::{gas::MemoryExtensionResult, Interpreter};
+
+/// Adapted from
+/// https://docs.rs/revm/latest/revm/interpreter/struct.Gas.html#method.record_memory_expansion
+pub fn record_memory_expansion<'a, E: Ext>(
+	interpreter: &mut Interpreter<EVMInterpreter<'a, E>>,
+	new_len: usize,
+) -> MemoryExtensionResult {
+	let Some(additional_cost) = interpreter.gas.memory_mut().record_new_len(new_len) else {
+		return MemoryExtensionResult::Same;
+	};
+
+	if interpreter
+		.extend
+		.gas_meter_mut()
+		.charge(RuntimeCosts::EVMGas(additional_cost))
+		.is_err()
+	{
+		return MemoryExtensionResult::OutOfGas;
+	}
+
+	MemoryExtensionResult::Extended
+}
+
 /// Resizes the interpreterreter memory if necessary. Fails the instruction if the memory or gas
 /// limit is exceeded.
 #[macro_export]
@@ -113,7 +149,8 @@ macro_rules! resize_memory {
 	};
 	($interpreter:expr, $offset:expr, $len:expr, $ret:expr) => {
 		let words_num = revm::interpreter::num_words($offset.saturating_add($len));
-		match $interpreter.gas.record_memory_expansion(words_num) {
+		match crate::vm::evm::instructions::macros::record_memory_expansion($interpreter, words_num)
+		{
 			revm::interpreter::gas::MemoryExtensionResult::Extended => {
 				$interpreter.memory.resize(words_num * 32);
 			},
diff --git a/substrate/frame/revive/src/vm/evm/instructions/memory.rs b/substrate/frame/revive/src/vm/evm/instructions/memory.rs
index d184bf95f7f5..4d5e3bea1754 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/memory.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/memory.rs
@@ -13,7 +13,7 @@ use revm::{
 ///
 /// Loads a 32-byte word from memory.
 pub fn mload<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::VERYLOW);
+	gas_legacy!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([], top, context.interpreter);
 	let offset = as_usize_or_fail!(context.interpreter, top);
 	resize_memory!(context.interpreter, offset, 32);
@@ -25,7 +25,7 @@ pub fn mload<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Stores a 32-byte word to memory.
 pub fn mstore<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::VERYLOW);
+	gas_legacy!(context.interpreter, revm_gas::VERYLOW);
 	popn!([offset, value], context.interpreter);
 	let offset = as_usize_or_fail!(context.interpreter, offset);
 	resize_memory!(context.interpreter, offset, 32);
@@ -36,7 +36,7 @@ pub fn mstore<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Stores a single byte to memory.
 pub fn mstore8<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::VERYLOW);
+	gas_legacy!(context.interpreter, revm_gas::VERYLOW);
 	popn!([offset, value], context.interpreter);
 	let offset = as_usize_or_fail!(context.interpreter, offset);
 	resize_memory!(context.interpreter, offset, 1);
@@ -47,7 +47,7 @@ pub fn mstore8<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Gets the size of active memory in bytes.
 pub fn msize<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::BASE);
+	gas_legacy!(context.interpreter, revm_gas::BASE);
 	push!(context.interpreter, U256::from(context.interpreter.memory.size()));
 }
 
diff --git a/substrate/frame/revive/src/vm/evm/instructions/mod.rs b/substrate/frame/revive/src/vm/evm/instructions/mod.rs
index e06e5973eb5f..e4be01bda542 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/mod.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/mod.rs
@@ -6,35 +6,35 @@ use crate::vm::{
 };
 use revm::interpreter::{Instruction, InstructionContext};
 
-pub type Context<'ctx, 'ext, E> =
+type Context<'ctx, 'ext, E> =
 	InstructionContext<'ctx, crate::vm::evm::DummyHost, crate::vm::evm::EVMInterpreter<'ext, E>>;
 
 #[macro_use]
-pub mod macros;
+mod macros;
 /// Arithmetic operations (ADD, SUB, MUL, DIV, etc.).
-pub mod arithmetic;
+mod arithmetic;
 /// Bitwise operations (AND, OR, XOR, NOT, etc.).
-pub mod bitwise;
+mod bitwise;
 /// Block information instructions (COINBASE, TIMESTAMP, etc.).
-pub mod block_info;
+mod block_info;
 /// Contract operations (CALL, CREATE, DELEGATECALL, etc.).
-pub mod contract;
+mod contract;
 /// Control flow instructions (JUMP, JUMPI, REVERT, etc.).
-pub mod control;
+mod control;
 /// Host environment interactions (SLOAD, SSTORE, LOG, etc.).
-pub mod host;
+mod host;
 /// Signed 256-bit integer operations.
-pub mod i256;
+mod i256;
 /// Memory operations (MLOAD, MSTORE, MSIZE, etc.).
-pub mod memory;
+mod memory;
 /// Stack operations (PUSH, POP, DUP, SWAP, etc.).
-pub mod stack;
+mod stack;
 /// System information instructions (ADDRESS, CALLER, etc.).
-pub mod system;
+mod system;
 /// Transaction information instructions (ORIGIN, GASPRICE, etc.).
-pub mod tx_info;
+mod tx_info;
 /// Utility functions and helpers for instruction implementation.
-pub mod utility;
+mod utility;
 
 /// Returns the instruction table for the given spec.
 pub const fn instruction_table<'a, E: Ext>() -> [Instruction<EVMInterpreter<'a, E>, DummyHost>; 256]
diff --git a/substrate/frame/revive/src/vm/evm/instructions/stack.rs b/substrate/frame/revive/src/vm/evm/instructions/stack.rs
index b606647e9865..c892a93ba6f5 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/stack.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/stack.rs
@@ -13,7 +13,7 @@ use revm::{
 ///
 /// Removes the top item from the stack.
 pub fn pop<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::BASE);
+	gas_legacy!(context.interpreter, revm_gas::BASE);
 	// Can ignore return. as relative N jump is safe operation.
 	popn!([_i], context.interpreter);
 }
@@ -23,7 +23,7 @@ pub fn pop<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 /// Introduce a new instruction which pushes the constant value 0 onto the stack.
 pub fn push0<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	check!(context.interpreter, SHANGHAI);
-	gas!(context.interpreter, revm_gas::BASE);
+	gas_legacy!(context.interpreter, revm_gas::BASE);
 	push!(context.interpreter, U256::ZERO);
 }
 
@@ -31,7 +31,7 @@ pub fn push0<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Pushes N bytes from bytecode onto the stack as a 32-byte value.
 pub fn push<'ext, const N: usize, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::VERYLOW);
+	gas_legacy!(context.interpreter, revm_gas::VERYLOW);
 	push!(context.interpreter, U256::ZERO);
 	popn_top!([], top, context.interpreter);
 
@@ -46,7 +46,7 @@ pub fn push<'ext, const N: usize, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Duplicates the Nth stack item to the top of the stack.
 pub fn dup<'ext, const N: usize, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::VERYLOW);
+	gas_legacy!(context.interpreter, revm_gas::VERYLOW);
 	if !context.interpreter.stack.dup(N) {
 		context.interpreter.halt(InstructionResult::StackOverflow);
 	}
@@ -56,7 +56,7 @@ pub fn dup<'ext, const N: usize, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Swaps the top stack item with the Nth stack item.
 pub fn swap<'ext, const N: usize, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::VERYLOW);
+	gas_legacy!(context.interpreter, revm_gas::VERYLOW);
 	assert!(N != 0);
 	if !context.interpreter.stack.exchange(0, N) {
 		context.interpreter.halt(InstructionResult::StackOverflow);
diff --git a/substrate/frame/revive/src/vm/evm/instructions/system.rs b/substrate/frame/revive/src/vm/evm/instructions/system.rs
index 071726348a6e..b04368917066 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/system.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/system.rs
@@ -4,9 +4,7 @@ use core::ptr;
 use revm::{
 	interpreter::{
 		gas as revm_gas,
-		interpreter_types::{
-			InputsTr, InterpreterTypes, LegacyBytecode, MemoryTr, ReturnData, RuntimeFlag, StackTr,
-		},
+		interpreter_types::{InputsTr, LegacyBytecode, MemoryTr, ReturnData, RuntimeFlag, StackTr},
 		CallInput, InstructionResult, Interpreter,
 	},
 	primitives::{B256, KECCAK_EMPTY, U256},
@@ -33,7 +31,7 @@ pub fn keccak256<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Pushes the current contract's address onto the stack.
 pub fn address<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::BASE);
+	gas_legacy!(context.interpreter, revm_gas::BASE);
 	push!(context.interpreter, context.interpreter.input.target_address().into_word().into());
 }
 
@@ -41,7 +39,7 @@ pub fn address<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Pushes the caller's address onto the stack.
 pub fn caller<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::BASE);
+	gas_legacy!(context.interpreter, revm_gas::BASE);
 	push!(context.interpreter, context.interpreter.input.caller_address().into_word().into());
 }
 
@@ -49,7 +47,7 @@ pub fn caller<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Pushes the size of running contract's bytecode onto the stack.
 pub fn codesize<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::BASE);
+	gas_legacy!(context.interpreter, revm_gas::BASE);
 	push!(context.interpreter, U256::from(context.interpreter.bytecode.bytecode_len()));
 }
 
@@ -77,7 +75,7 @@ pub fn codecopy<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Loads 32 bytes of input data from the specified offset.
 pub fn calldataload<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::VERYLOW);
+	gas_legacy!(context.interpreter, revm_gas::VERYLOW);
 	//pop_top!(interpreter, offset_ptr);
 	popn_top!([], offset_ptr, context.interpreter);
 	let mut word = B256::ZERO;
@@ -116,7 +114,7 @@ pub fn calldataload<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Pushes the size of input data onto the stack.
 pub fn calldatasize<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::BASE);
+	gas_legacy!(context.interpreter, revm_gas::BASE);
 	push!(context.interpreter, U256::from(context.interpreter.input.input().len()));
 }
 
@@ -124,7 +122,7 @@ pub fn calldatasize<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Pushes the value sent with the current call onto the stack.
 pub fn callvalue<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::BASE);
+	gas_legacy!(context.interpreter, revm_gas::BASE);
 	push!(context.interpreter, context.interpreter.input.call_value());
 }
 
@@ -160,7 +158,7 @@ pub fn calldatacopy<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 /// EIP-211: New opcodes: RETURNDATASIZE and RETURNDATACOPY
 pub fn returndatasize<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	check!(context.interpreter, BYZANTIUM);
-	gas!(context.interpreter, revm_gas::BASE);
+	gas_legacy!(context.interpreter, revm_gas::BASE);
 	push!(context.interpreter, U256::from(context.interpreter.return_data.buffer().len()));
 }
 
@@ -196,15 +194,15 @@ pub fn returndatacopy<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Pushes the amount of remaining gas onto the stack.
 pub fn gas<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::BASE);
+	gas_legacy!(context.interpreter, revm_gas::BASE);
 	push!(context.interpreter, U256::from(context.interpreter.gas.remaining()));
 }
 
 /// Common logic for copying data from a source buffer to the EVM's memory.
 ///
 /// Handles memory expansion and gas calculation for data copy operations.
-pub fn memory_resize(
-	interpreter: &mut Interpreter<impl InterpreterTypes>,
+pub fn memory_resize<'a, E: Ext>(
+	interpreter: &mut Interpreter<crate::vm::evm::EVMInterpreter<'a, E>>,
 	memory_offset: U256,
 	len: usize,
 ) -> Option<usize> {
diff --git a/substrate/frame/revive/src/vm/evm/instructions/tx_info.rs b/substrate/frame/revive/src/vm/evm/instructions/tx_info.rs
index 25a183e53d0c..f4a8e82318be 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/tx_info.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/tx_info.rs
@@ -14,7 +14,7 @@ use crate::vm::Ext;
 ///
 /// Gets the gas price of the originating transaction.
 pub fn gasprice<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::BASE);
+	gas_legacy!(context.interpreter, revm_gas::BASE);
 	push!(context.interpreter, U256::from(context.host.effective_gas_price()));
 }
 
@@ -22,7 +22,7 @@ pub fn gasprice<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Gets the execution origination address.
 pub fn origin<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, revm_gas::BASE);
+	gas_legacy!(context.interpreter, revm_gas::BASE);
 	push!(context.interpreter, context.host.caller().into_word().into());
 }
 
@@ -31,7 +31,7 @@ pub fn origin<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 /// EIP-4844: Shard Blob Transactions - gets the hash of a transaction blob.
 pub fn blob_hash<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	check!(context.interpreter, CANCUN);
-	gas!(context.interpreter, revm_gas::VERYLOW);
+	gas_legacy!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([], index, context.interpreter);
 	let i = as_usize_saturated!(index);
 	*index = context.host.blob_hash(i).unwrap_or_default();
diff --git a/substrate/frame/revive/src/vm/runtime_costs.rs b/substrate/frame/revive/src/vm/runtime_costs.rs
index 4627f5bde03c..a0a3e0935fad 100644
--- a/substrate/frame/revive/src/vm/runtime_costs.rs
+++ b/substrate/frame/revive/src/vm/runtime_costs.rs
@@ -4,6 +4,8 @@ use frame_support::weights::Weight;
 #[cfg_attr(test, derive(Debug, PartialEq, Eq))]
 #[derive(Copy, Clone)]
 pub enum RuntimeCosts {
+	/// cost of an EVM gas unit.
+	EVMGas(u64),
 	/// Base Weight of calling a host function.
 	HostFn,
 	/// Weight charged for copying data from the sandbox.
@@ -195,6 +197,7 @@ impl<T: Config> Token<T> for RuntimeCosts {
 	fn weight(&self) -> Weight {
 		use self::RuntimeCosts::*;
 		match *self {
+			EVMGas(n) => T::WeightInfo::evm_gas(n),
 			HostFn => cost_args!(noop_host_fn, 1),
 			CopyToContract(len) => T::WeightInfo::seal_copy_to_contract(len),
 			CopyFromContract(len) => T::WeightInfo::seal_return(len),
diff --git a/substrate/frame/revive/src/weights.rs b/substrate/frame/revive/src/weights.rs
index b85b5f00faa2..59688fb66cc1 100644
--- a/substrate/frame/revive/src/weights.rs
+++ b/substrate/frame/revive/src/weights.rs
@@ -71,6 +71,9 @@ use core::marker::PhantomData;
 
 /// Weight functions needed for `pallet_revive`.
 pub trait WeightInfo {
+	fn evm_gas(n: u64) -> Weight {
+		Self::instr(n as u32)
+	}
 	fn on_process_deletion_queue_batch() -> Weight;
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight;
 	fn call_with_code_per_byte(c: u32, ) -> Weight;

From a2edcbe6e6fedc5859f9155cfd29f96f52020da8 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Wed, 23 Jul 2025 10:00:28 +0000
Subject: [PATCH 077/186] fix compile error

---
 .../evm/instructions/contract/call_helpers.rs |  4 +--
 .../revive/src/vm/evm/instructions/control.rs |  2 +-
 .../revive/src/vm/evm/instructions/macros.rs  | 29 +++++++------------
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/substrate/frame/revive/src/vm/evm/instructions/contract/call_helpers.rs b/substrate/frame/revive/src/vm/evm/instructions/contract/call_helpers.rs
index 782e9b9211fd..dba0fc4d8dbc 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/contract/call_helpers.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/contract/call_helpers.rs
@@ -4,7 +4,7 @@ use revm::{
 	context_interface::{context::StateLoad, journaled_state::AccountLoad},
 	interpreter::{
 		gas as revm_gas,
-		interpreter_types::{InterpreterTypes, MemoryTr, RuntimeFlag, StackTr},
+		interpreter_types::{MemoryTr, RuntimeFlag, StackTr},
 		Interpreter,
 	},
 	primitives::{hardfork::SpecId::*, U256},
@@ -20,7 +20,7 @@ pub fn get_memory_input_and_out_ranges<'a, E: Ext>(
 	let mut in_range = resize_memory(interpreter, in_offset, in_len)?;
 
 	if !in_range.is_empty() {
-		let offset = interpreter.memory.local_memory_offset();
+		let offset = <_ as MemoryTr>::local_memory_offset(&interpreter.memory);
 		in_range = in_range.start.saturating_add(offset)..in_range.end.saturating_add(offset);
 	}
 
diff --git a/substrate/frame/revive/src/vm/evm/instructions/control.rs b/substrate/frame/revive/src/vm/evm/instructions/control.rs
index 62f47c811cb2..5728e9cd63f1 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/control.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/control.rs
@@ -4,7 +4,7 @@ use revm::{
 	interpreter::{
 		gas as revm_gas,
 		interpreter_action::InterpreterAction,
-		interpreter_types::{Jumps, LoopControl, MemoryTr, RuntimeFlag, StackTr},
+		interpreter_types::{Jumps, LoopControl, RuntimeFlag, StackTr},
 		InstructionResult, Interpreter,
 	},
 	primitives::{Bytes, U256},
diff --git a/substrate/frame/revive/src/vm/evm/instructions/macros.rs b/substrate/frame/revive/src/vm/evm/instructions/macros.rs
index d68dc99782b4..d6853abce1e0 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/macros.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/macros.rs
@@ -109,31 +109,21 @@ macro_rules! gas_or_fail {
 	};
 }
 
-use crate::{
-	vm::{
-		evm::{EVMInterpreter, Gas},
-		Ext,
-	},
-	RuntimeCosts,
-};
-use revm::interpreter::{gas::MemoryExtensionResult, Interpreter};
+use crate::{vm::Ext, RuntimeCosts};
+use revm::interpreter::gas::{MemoryExtensionResult, MemoryGas};
 
 /// Adapted from
 /// https://docs.rs/revm/latest/revm/interpreter/struct.Gas.html#method.record_memory_expansion
 pub fn record_memory_expansion<'a, E: Ext>(
-	interpreter: &mut Interpreter<EVMInterpreter<'a, E>>,
+	memory: &mut MemoryGas,
+	ext: &mut E,
 	new_len: usize,
 ) -> MemoryExtensionResult {
-	let Some(additional_cost) = interpreter.gas.memory_mut().record_new_len(new_len) else {
+	let Some(additional_cost) = memory.record_new_len(new_len) else {
 		return MemoryExtensionResult::Same;
 	};
 
-	if interpreter
-		.extend
-		.gas_meter_mut()
-		.charge(RuntimeCosts::EVMGas(additional_cost))
-		.is_err()
-	{
+	if ext.gas_meter_mut().charge(RuntimeCosts::EVMGas(additional_cost)).is_err() {
 		return MemoryExtensionResult::OutOfGas;
 	}
 
@@ -149,8 +139,11 @@ macro_rules! resize_memory {
 	};
 	($interpreter:expr, $offset:expr, $len:expr, $ret:expr) => {
 		let words_num = revm::interpreter::num_words($offset.saturating_add($len));
-		match crate::vm::evm::instructions::macros::record_memory_expansion($interpreter, words_num)
-		{
+		match crate::vm::evm::instructions::macros::record_memory_expansion(
+			$interpreter.gas.memory_mut(),
+			$interpreter.extend,
+			words_num,
+		) {
 			revm::interpreter::gas::MemoryExtensionResult::Extended => {
 				$interpreter.memory.resize(words_num * 32);
 			},

From 97c00f42aaff1977c861c6291d6eb6eecb7f1162 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Wed, 23 Jul 2025 10:40:43 +0000
Subject: [PATCH 078/186] fixes

---
 .../frame/revive/src/vm/runtime_costs.rs      | 29 ++++++++++---------
 substrate/frame/revive/src/weights.rs         |  3 --
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/substrate/frame/revive/src/vm/runtime_costs.rs b/substrate/frame/revive/src/vm/runtime_costs.rs
index a0a3e0935fad..ab61a3e7964a 100644
--- a/substrate/frame/revive/src/vm/runtime_costs.rs
+++ b/substrate/frame/revive/src/vm/runtime_costs.rs
@@ -1,5 +1,16 @@
 use crate::{gas::Token, weights::WeightInfo, Config};
-use frame_support::weights::Weight;
+use frame_support::weights::{constants::WEIGHT_REF_TIME_PER_SECOND, Weight};
+
+/// Current approximation of the gas/s consumption considering
+/// EVM execution over compiled WASM (on 4.4Ghz CPU).
+/// Given the 2000ms Weight, from which 75% only are used for transactions,
+/// the total EVM execution gas limit is: GAS_PER_SECOND * 2 * 0.75 ~= 60_000_000.
+const GAS_PER_SECOND: u64 = 40_000_000;
+
+/// Approximate ratio of the amount of Weight per Gas.
+/// u64 works for approximations because Weight is a very small unit compared to
+/// gas.
+const WEIGHT_PER_GAS: u64 = WEIGHT_REF_TIME_PER_SECOND / GAS_PER_SECOND;
 
 #[cfg_attr(test, derive(Debug, PartialEq, Eq))]
 #[derive(Copy, Clone)]
@@ -197,7 +208,6 @@ impl<T: Config> Token<T> for RuntimeCosts {
 	fn weight(&self) -> Weight {
 		use self::RuntimeCosts::*;
 		match *self {
-			EVMGas(n) => T::WeightInfo::evm_gas(n),
 			HostFn => cost_args!(noop_host_fn, 1),
 			CopyToContract(len) => T::WeightInfo::seal_copy_to_contract(len),
 			CopyFromContract(len) => T::WeightInfo::seal_return(len),
@@ -283,18 +293,9 @@ impl<T: Config> Token<T> for RuntimeCosts {
 			Bn128Pairing(len) => T::WeightInfo::bn128_pairing(len),
 			Identity(len) => T::WeightInfo::identity(len),
 			Blake2F(rounds) => T::WeightInfo::blake2f(rounds),
-			Modexp(gas) => {
-				use frame_support::weights::constants::WEIGHT_REF_TIME_PER_SECOND;
-				/// Current approximation of the gas/s consumption considering
-				/// EVM execution over compiled WASM (on 4.4Ghz CPU).
-				/// Given the 2000ms Weight, from which 75% only are used for transactions,
-				/// the total EVM execution gas limit is: GAS_PER_SECOND * 2 * 0.75 ~= 60_000_000.
-				const GAS_PER_SECOND: u64 = 40_000_000;
-
-				/// Approximate ratio of the amount of Weight per Gas.
-				/// u64 works for approximations because Weight is a very small unit compared to
-				/// gas.
-				const WEIGHT_PER_GAS: u64 = WEIGHT_REF_TIME_PER_SECOND / GAS_PER_SECOND;
+			Modexp(gas) => Weight::from_parts(gas.saturating_mul(WEIGHT_PER_GAS), 0),
+			EVMGas(gas) => {
+				// TODO replace this by a proper benchmark value
 				Weight::from_parts(gas.saturating_mul(WEIGHT_PER_GAS), 0)
 			},
 		}
diff --git a/substrate/frame/revive/src/weights.rs b/substrate/frame/revive/src/weights.rs
index 59688fb66cc1..b85b5f00faa2 100644
--- a/substrate/frame/revive/src/weights.rs
+++ b/substrate/frame/revive/src/weights.rs
@@ -71,9 +71,6 @@ use core::marker::PhantomData;
 
 /// Weight functions needed for `pallet_revive`.
 pub trait WeightInfo {
-	fn evm_gas(n: u64) -> Weight {
-		Self::instr(n as u32)
-	}
 	fn on_process_deletion_queue_batch() -> Weight;
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight;
 	fn call_with_code_per_byte(c: u32, ) -> Weight;

From 6edb4a14c81331d84acf3dd113278bfaca960fea Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Wed, 23 Jul 2025 10:43:57 +0000
Subject: [PATCH 079/186] use 0 value

---
 substrate/frame/revive/src/vm/evm.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/substrate/frame/revive/src/vm/evm.rs b/substrate/frame/revive/src/vm/evm.rs
index d08e8fd79e8a..3213a2b3c459 100644
--- a/substrate/frame/revive/src/vm/evm.rs
+++ b/substrate/frame/revive/src/vm/evm.rs
@@ -49,7 +49,7 @@ where
 /// Calls the EVM interpreter with the provided bytecode and inputs.
 pub fn call<'a, E: Ext>(bytecode: Bytecode, ext: &'a mut E, inputs: EVMInputs) -> ExecResult {
 	let mut interpreter: Interpreter<EVMInterpreter<'a, E>> = Interpreter {
-		gas: Gas::new(30_000_000), // TODO clean up
+		gas: Gas::default(),
 		bytecode: ExtBytecode::new(bytecode),
 		stack: Stack::new(),
 		return_data: Default::default(),

From 053c5488591b71c76ed2e9d452a5d2c47b774dc7 Mon Sep 17 00:00:00 2001
From: xermicus <cyrill@parity.io>
Date: Thu, 24 Jul 2025 13:57:27 +0200
Subject: [PATCH 080/186] [pallet-revive] revm tests scaffolding (#9290)

- Refactors VM specific tests into dedicated modules.
- Adds the shared VM tests.
- Adds the `solidity-fixtures` crate
- Helper script (`bash fixturs-solidity/build_fixtures.sh`) to
build fixtures.
- Fixtures are checked in for now and to be update manually. Is a KISS
solution. Can be changed to be more complex if it is deemed worth,
  but need to make sure it works for people without Solidity compilers
  and regardless whether the crate is used within the workspace or not.

---------

Signed-off-by: Cyrill Leutwiler <bigcyrill@hotmail.com>
Signed-off-by: xermicus <cyrill@parity.io>
---
 .gitignore                                    |    2 +
 Cargo.lock                                    | 5347 +++++++++--------
 Cargo.toml                                    |    2 +
 substrate/frame/revive/Cargo.toml             |    1 +
 .../frame/revive/fixtures-solidity/Cargo.toml |   21 +
 .../frame/revive/fixtures-solidity/README.md  |    3 +
 .../fixtures-solidity/build_fixtures.sh       |    9 +
 .../contracts/AddressPredictor.sol            |   33 +
 .../fixtures-solidity/contracts/Crypto.sol    |    9 +
 .../fixtures-solidity/contracts/Flipper.sol   |   10 +
 .../contracts/Playground.sol}                 |    0
 .../contracts/build/AddressPredictor.bin      |    1 +
 .../build/AddressPredictor.bin-runtime        |    1 +
 .../AddressPredictor.sol:AddressPredictor.pvm |  Bin 0 -> 9884 bytes
 .../build/AddressPredictor.sol:Predicted.pvm  |  Bin 0 -> 2032 bytes
 .../contracts/build/Crypto.sol:TestSha3.pvm   |  Bin 0 -> 2474 bytes
 .../contracts/build/Flipper.bin               |    1 +
 .../contracts/build/Flipper.bin-runtime       |    1 +
 .../contracts/build/Flipper.sol:Flipper.pvm   |  Bin 0 -> 1680 bytes
 .../contracts/build/Playground.bin            |    1 +
 .../contracts/build/Playground.bin-runtime    |    1 +
 .../build/Playground.sol:Playground.pvm       |  Bin 0 -> 2384 bytes
 .../contracts/build/Predicted.bin             |    1 +
 .../contracts/build/Predicted.bin-runtime     |    1 +
 .../contracts/build/TestSha3.bin              |    1 +
 .../contracts/build/TestSha3.bin-runtime      |    1 +
 .../revive/fixtures-solidity/src/contracts.rs |   61 +
 .../frame/revive/fixtures-solidity/src/lib.rs |   20 +
 substrate/frame/revive/src/tests.rs           | 4737 +--------------
 substrate/frame/revive/src/tests/common.rs    |  137 +
 substrate/frame/revive/src/tests/evm.rs       |   57 +
 substrate/frame/revive/src/tests/pvm.rs       | 4693 +++++++++++++++
 32 files changed, 8089 insertions(+), 7063 deletions(-)
 create mode 100644 substrate/frame/revive/fixtures-solidity/Cargo.toml
 create mode 100644 substrate/frame/revive/fixtures-solidity/README.md
 create mode 100755 substrate/frame/revive/fixtures-solidity/build_fixtures.sh
 create mode 100644 substrate/frame/revive/fixtures-solidity/contracts/AddressPredictor.sol
 create mode 100644 substrate/frame/revive/fixtures-solidity/contracts/Crypto.sol
 create mode 100644 substrate/frame/revive/fixtures-solidity/contracts/Flipper.sol
 rename substrate/frame/revive/{src/tests/playground.sol => fixtures-solidity/contracts/Playground.sol} (100%)
 create mode 100644 substrate/frame/revive/fixtures-solidity/contracts/build/AddressPredictor.bin
 create mode 100644 substrate/frame/revive/fixtures-solidity/contracts/build/AddressPredictor.bin-runtime
 create mode 100644 substrate/frame/revive/fixtures-solidity/contracts/build/AddressPredictor.sol:AddressPredictor.pvm
 create mode 100644 substrate/frame/revive/fixtures-solidity/contracts/build/AddressPredictor.sol:Predicted.pvm
 create mode 100644 substrate/frame/revive/fixtures-solidity/contracts/build/Crypto.sol:TestSha3.pvm
 create mode 100644 substrate/frame/revive/fixtures-solidity/contracts/build/Flipper.bin
 create mode 100644 substrate/frame/revive/fixtures-solidity/contracts/build/Flipper.bin-runtime
 create mode 100644 substrate/frame/revive/fixtures-solidity/contracts/build/Flipper.sol:Flipper.pvm
 create mode 100644 substrate/frame/revive/fixtures-solidity/contracts/build/Playground.bin
 create mode 100644 substrate/frame/revive/fixtures-solidity/contracts/build/Playground.bin-runtime
 create mode 100644 substrate/frame/revive/fixtures-solidity/contracts/build/Playground.sol:Playground.pvm
 create mode 100644 substrate/frame/revive/fixtures-solidity/contracts/build/Predicted.bin
 create mode 100644 substrate/frame/revive/fixtures-solidity/contracts/build/Predicted.bin-runtime
 create mode 100644 substrate/frame/revive/fixtures-solidity/contracts/build/TestSha3.bin
 create mode 100644 substrate/frame/revive/fixtures-solidity/contracts/build/TestSha3.bin-runtime
 create mode 100644 substrate/frame/revive/fixtures-solidity/src/contracts.rs
 create mode 100644 substrate/frame/revive/fixtures-solidity/src/lib.rs
 create mode 100644 substrate/frame/revive/src/tests/common.rs
 create mode 100644 substrate/frame/revive/src/tests/evm.rs
 create mode 100644 substrate/frame/revive/src/tests/pvm.rs

diff --git a/.gitignore b/.gitignore
index 4fe0701fde68..04e297838544 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,8 @@
 .wasm-binaries
 *.adoc
 *.bin
+!substrate/frame/revive/fixtures-solidity/contracts/build/
+!substrate/frame/revive/fixtures-solidity/contracts/build/*.bin
 *.iml
 *.orig
 *.rej
diff --git a/Cargo.lock b/Cargo.lock
index a93cf77d3cc2..748f69b0ac56 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -23,18 +23,18 @@ dependencies = [
 
 [[package]]
 name = "addr2line"
-version = "0.21.0"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
- "gimli 0.28.0",
+ "gimli 0.31.1",
 ]
 
 [[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
 [[package]]
 name = "adler32"
@@ -54,9 +54,9 @@ dependencies = [
 
 [[package]]
 name = "aes"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2"
+checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
 dependencies = [
  "cfg-if",
  "cipher 0.4.4",
@@ -74,42 +74,42 @@ dependencies = [
  "cipher 0.4.4",
  "ctr",
  "ghash",
- "subtle 2.5.0",
+ "subtle 2.6.1",
 ]
 
 [[package]]
 name = "ahash"
-version = "0.8.11"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
 dependencies = [
  "cfg-if",
- "getrandom 0.2.10",
+ "getrandom 0.3.3",
  "once_cell",
  "version_check",
- "zerocopy 0.7.32",
+ "zerocopy",
 ]
 
 [[package]]
 name = "aho-corasick"
-version = "1.0.4"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "allocator-api2"
-version = "0.2.16"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
 name = "alloy-core"
-version = "1.2.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad31216895d27d307369daa1393f5850b50bbbd372478a9fa951c095c210627e"
+checksum = "d47400608fc869727ad81dba058d55f97b29ad8b5c5256d9598523df8f356ab6"
 dependencies = [
  "alloy-dyn-abi",
  "alloy-json-abi",
@@ -120,9 +120,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-dyn-abi"
-version = "1.2.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b95b3deca680efc7e9cba781f1a1db352fa1ea50e6384a514944dcf4419e652"
+checksum = "d9e8a436f0aad7df8bb47f144095fba61202265d9f5f09a70b0e3227881a668e"
 dependencies = [
  "alloy-json-abi",
  "alloy-primitives",
@@ -131,7 +131,7 @@ dependencies = [
  "itoa",
  "serde",
  "serde_json",
- "winnow 0.7.10",
+ "winnow 0.7.12",
 ]
 
 [[package]]
@@ -173,9 +173,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-eips"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f562a81278a3ed83290e68361f2d1c75d018ae3b8589a314faf9303883e18ec9"
+checksum = "5937e2d544e9b71000942d875cbc57965b32859a666ea543cc57aae5a06d602d"
 dependencies = [
  "alloy-eip2124",
  "alloy-eip2930",
@@ -193,9 +193,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-json-abi"
-version = "1.2.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15516116086325c157c18261d768a20677f0f699348000ed391d4ad0dcb82530"
+checksum = "459f98c6843f208856f338bfb25e65325467f7aff35dfeb0484d0a76e059134b"
 dependencies = [
  "alloy-primitives",
  "alloy-sol-type-parser",
@@ -205,9 +205,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-primitives"
-version = "1.2.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6177ed26655d4e84e00b65cb494d4e0b8830e7cae7ef5d63087d445a2600fb55"
+checksum = "3cfebde8c581a5d37b678d0a48a32decb51efd7a63a08ce2517ddec26db705c8"
 dependencies = [
  "alloy-rlp",
  "bytes",
@@ -215,14 +215,14 @@ dependencies = [
  "const-hex",
  "derive_more 2.0.1",
  "foldhash",
- "hashbrown 0.15.3",
- "indexmap 2.9.0",
+ "hashbrown 0.15.4",
+ "indexmap 2.10.0",
  "itoa",
  "k256",
  "keccak-asm",
  "paste",
  "proptest",
- "rand 0.9.0",
+ "rand 0.9.2",
  "ruint",
  "rustc-hash 2.1.1",
  "serde",
@@ -237,7 +237,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f70d83b765fdc080dbcd4f4db70d8d23fe4761f2f02ebfa9146b833900634b4"
 dependencies = [
  "alloy-rlp-derive",
- "arrayvec 0.7.4",
+ "arrayvec 0.7.6",
  "bytes",
 ]
 
@@ -249,14 +249,14 @@ checksum = "64b728d511962dda67c1bc7ea7c03736ec275ed2cf4c35d9585298ac9ccf3b73"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "alloy-serde"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae699248d02ade9db493bbdae61822277dc14ae0f82a5a4153203b60e34422a6"
+checksum = "1e1722bc30feef87cc0fa824e43c9013f9639cc6c037be7be28a31361c788be2"
 dependencies = [
  "alloy-primitives",
  "serde",
@@ -265,41 +265,41 @@ dependencies = [
 
 [[package]]
 name = "alloy-sol-macro"
-version = "1.2.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a14f21d053aea4c6630687c2f4ad614bed4c81e14737a9b904798b24f30ea849"
+checksum = "aedac07a10d4c2027817a43cc1f038313fc53c7ac866f7363239971fd01f9f18"
 dependencies = [
  "alloy-sol-macro-expander",
  "alloy-sol-macro-input",
  "proc-macro-error2",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "alloy-sol-macro-expander"
-version = "1.2.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34d99282e7c9ef14eb62727981a985a01869e586d1dec729d3bb33679094c100"
+checksum = "24f9a598f010f048d8b8226492b6401104f5a5c1273c2869b72af29b48bb4ba9"
 dependencies = [
  "alloy-sol-macro-input",
  "const-hex",
  "heck 0.5.0",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "proc-macro-error2",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
  "syn-solidity",
  "tiny-keccak",
 ]
 
 [[package]]
 name = "alloy-sol-macro-input"
-version = "1.2.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eda029f955b78e493360ee1d7bd11e1ab9f2a220a5715449babc79d6d0a01105"
+checksum = "f494adf9d60e49aa6ce26dfd42c7417aa6d4343cf2ae621f20e4d92a5ad07d85"
 dependencies = [
  "const-hex",
  "dunce",
@@ -307,25 +307,25 @@ dependencies = [
  "macro-string",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
  "syn-solidity",
 ]
 
 [[package]]
 name = "alloy-sol-type-parser"
-version = "1.2.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10db1bd7baa35bc8d4a1b07efbf734e73e5ba09f2580fb8cee3483a36087ceb2"
+checksum = "52db32fbd35a9c0c0e538b58b81ebbae08a51be029e7ad60e08b60481c2ec6c3"
 dependencies = [
  "serde",
- "winnow 0.7.10",
+ "winnow 0.7.12",
 ]
 
 [[package]]
 name = "alloy-sol-types"
-version = "1.2.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58377025a47d8b8426b3e4846a251f2c1991033b27f517aade368146f6ab1dfe"
+checksum = "a285b46e3e0c177887028278f04cc8262b76fd3b8e0e20e93cea0a58c35f5ac5"
 dependencies = [
  "alloy-json-abi",
  "alloy-primitives",
@@ -362,57 +362,59 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
 [[package]]
 name = "anstream"
-version = "0.6.11"
+version = "0.6.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5"
+checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933"
 dependencies = [
  "anstyle",
  "anstyle-parse",
  "anstyle-query",
  "anstyle-wincon",
  "colorchoice",
+ "is_terminal_polyfill",
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle"
-version = "1.0.6"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
+checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.1"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
+checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.0.0"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.1"
+version = "3.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628"
+checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882"
 dependencies = [
  "anstyle",
- "windows-sys 0.48.0",
+ "once_cell_polyfill",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.86"
+version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
 
 [[package]]
 name = "approx"
@@ -434,14 +436,14 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "arbitrary"
-version = "1.3.2"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
+checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
 dependencies = [
  "derive_arbitrary",
 ]
@@ -575,7 +577,7 @@ dependencies = [
  "ark-std 0.5.0",
  "educe",
  "fnv",
- "hashbrown 0.15.3",
+ "hashbrown 0.15.4",
  "itertools 0.13.0",
  "num-bigint",
  "num-integer",
@@ -680,7 +682,7 @@ dependencies = [
  "num-bigint",
  "num-traits",
  "paste",
- "rustc_version 0.4.0",
+ "rustc_version 0.4.1",
  "zeroize",
 ]
 
@@ -694,7 +696,7 @@ dependencies = [
  "ark-ff-macros 0.5.0",
  "ark-serialize 0.5.0",
  "ark-std 0.5.0",
- "arrayvec 0.7.4",
+ "arrayvec 0.7.6",
  "digest 0.10.7",
  "educe",
  "itertools 0.13.0",
@@ -732,7 +734,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62945a2f7e6de02a31fe400aa489f0e0f5b2502e69f95f853adb82a96c7a6b60"
 dependencies = [
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -770,7 +772,7 @@ dependencies = [
  "num-traits",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -811,7 +813,7 @@ dependencies = [
  "ark-std 0.5.0",
  "educe",
  "fnv",
- "hashbrown 0.15.3",
+ "hashbrown 0.15.4",
  "rayon",
 ]
 
@@ -900,7 +902,7 @@ checksum = "3f4d068aaf107ebcd7dfb52bc748f8030e0fc930ac8e360146ca54c1203088f7"
 dependencies = [
  "ark-serialize-derive 0.5.0",
  "ark-std 0.5.0",
- "arrayvec 0.7.4",
+ "arrayvec 0.7.6",
  "digest 0.10.7",
  "num-bigint",
  "rayon",
@@ -925,7 +927,7 @@ checksum = "213888f660fddcca0d257e88e54ac05bca01885f258ccdf695bafd77031bb69d"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -996,24 +998,25 @@ dependencies = [
 
 [[package]]
 name = "array-bytes"
-version = "6.2.2"
+version = "6.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f840fb7195bcfc5e17ea40c26e5ce6d5b9ce5d584466e17703209657e459ae0"
+checksum = "5d5dde061bd34119e902bbb2d9b90c5692635cf59fb91d582c2b68043f1b8293"
 
 [[package]]
 name = "array-bytes"
-version = "9.1.2"
+version = "9.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4449507daf4f07a8c8309e122d32a53d15c9f33e77eaf01c839fea42ccd4d673"
+checksum = "27d55334c98d756b32dcceb60248647ab34f027690f87f9a362fd292676ee927"
 dependencies = [
  "smallvec",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
 name = "arrayref"
-version = "0.3.7"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
 
 [[package]]
 name = "arrayvec"
@@ -1026,36 +1029,36 @@ dependencies = [
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "asn1-rs"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ad1373757efa0f70ec53939aabc7152e1591cb485208052993070ac8d2429d"
+checksum = "5493c3bedbacf7fd7382c6346bbd66687d12bbaad3a89a2d2c303ee6cf20b048"
 dependencies = [
- "asn1-rs-derive 0.5.0",
+ "asn1-rs-derive 0.5.1",
  "asn1-rs-impl",
  "displaydoc",
- "nom",
+ "nom 7.1.3",
  "num-traits",
  "rusticata-macros",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "time",
 ]
 
 [[package]]
 name = "asn1-rs"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "607495ec7113b178fbba7a6166a27f99e774359ef4823adbefd756b5b81d7970"
+checksum = "56624a96882bb8c26d61312ae18cb45868e5a9992ea73c58e45c3101e56a1e60"
 dependencies = [
  "asn1-rs-derive 0.6.0",
  "asn1-rs-impl",
  "displaydoc",
- "nom",
+ "nom 7.1.3",
  "num-traits",
  "rusticata-macros",
  "thiserror 2.0.12",
@@ -1064,14 +1067,14 @@ dependencies = [
 
 [[package]]
 name = "asn1-rs-derive"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7378575ff571966e99a744addeff0bff98b8ada0dedf1956d59e634db95eaac1"
+checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
- "synstructure 0.13.1",
+ "syn 2.0.104",
+ "synstructure 0.13.2",
 ]
 
 [[package]]
@@ -1082,8 +1085,8 @@ checksum = "3109e49b1e4909e9db6515a30c633684d68cdeaa252f215214cb4fa1a5bfee2c"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
- "synstructure 0.13.1",
+ "syn 2.0.104",
+ "synstructure 0.13.2",
 ]
 
 [[package]]
@@ -1094,18 +1097,19 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "assert_cmd"
-version = "2.0.14"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed72493ac66d5804837f480ab3766c72bdfab91a65e565fc54fa9e42db0073a8"
+checksum = "2bd389a4b2970a01282ee455294913c0a43724daedcd1a24c3eb0ec1c1320b66"
 dependencies = [
  "anstyle",
  "bstr",
  "doc-comment",
+ "libc",
  "predicates",
  "predicates-core",
  "predicates-tree",
@@ -1497,12 +1501,11 @@ dependencies = [
 
 [[package]]
 name = "async-channel"
-version = "2.3.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f2776ead772134d55b62dd45e59a79e21612d85d0af729b8b7d3967d601a62a"
+checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2"
 dependencies = [
  "concurrent-queue",
- "event-listener 5.3.1",
  "event-listener-strategy",
  "futures-core",
  "pin-project-lite",
@@ -1510,15 +1513,15 @@ dependencies = [
 
 [[package]]
 name = "async-executor"
-version = "1.5.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb"
+checksum = "bb812ffb58524bdd10860d7d974e2f01cc0950c2438a74ee5ec2e2280c6c4ffa"
 dependencies = [
- "async-lock 2.8.0",
  "async-task",
  "concurrent-queue",
- "fastrand 1.9.0",
- "futures-lite 1.13.0",
+ "fastrand 2.3.0",
+ "futures-lite 2.6.0",
+ "pin-project-lite",
  "slab",
 ]
 
@@ -1536,27 +1539,27 @@ dependencies = [
 
 [[package]]
 name = "async-fs"
-version = "2.1.2"
+version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a"
+checksum = "09f7e37c0ed80b2a977691c47dae8625cfb21e205827106c64f7c588766b2e50"
 dependencies = [
  "async-lock 3.4.0",
  "blocking",
- "futures-lite 2.3.0",
+ "futures-lite 2.6.0",
 ]
 
 [[package]]
 name = "async-global-executor"
-version = "2.3.1"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776"
+checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
 dependencies = [
- "async-channel 1.9.0",
+ "async-channel 2.5.0",
  "async-executor",
- "async-io 1.13.0",
- "async-lock 2.8.0",
+ "async-io 2.5.0",
+ "async-lock 3.4.0",
  "blocking",
- "futures-lite 1.13.0",
+ "futures-lite 2.6.0",
  "once_cell",
 ]
 
@@ -1574,29 +1577,28 @@ dependencies = [
  "log",
  "parking",
  "polling 2.8.0",
- "rustix 0.37.23",
+ "rustix 0.37.28",
  "slab",
- "socket2 0.4.9",
+ "socket2 0.4.10",
  "waker-fn",
 ]
 
 [[package]]
 name = "async-io"
-version = "2.3.3"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964"
+checksum = "19634d6336019ef220f09fd31168ce5c184b295cbf80345437cc36094ef223ca"
 dependencies = [
  "async-lock 3.4.0",
  "cfg-if",
  "concurrent-queue",
  "futures-io",
- "futures-lite 2.3.0",
+ "futures-lite 2.6.0",
  "parking",
- "polling 3.4.0",
- "rustix 0.38.42",
+ "polling 3.9.0",
+ "rustix 1.0.8",
  "slab",
- "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -1614,19 +1616,18 @@ version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
 dependencies = [
- "event-listener 5.3.1",
+ "event-listener 5.4.0",
  "event-listener-strategy",
  "pin-project-lite",
 ]
 
 [[package]]
 name = "async-net"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4051e67316bc7eff608fe723df5d32ed639946adcd69e07df41fd42a7b411f1f"
+checksum = "0434b1ed18ce1cf5769b8ac540e33f01fa9471058b5e89da9e06f3c882a8c12f"
 dependencies = [
  "async-io 1.13.0",
- "autocfg",
  "blocking",
  "futures-lite 1.13.0",
 ]
@@ -1637,83 +1638,81 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7"
 dependencies = [
- "async-io 2.3.3",
+ "async-io 2.5.0",
  "blocking",
- "futures-lite 2.3.0",
+ "futures-lite 2.6.0",
 ]
 
 [[package]]
 name = "async-process"
-version = "1.7.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9"
+checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88"
 dependencies = [
  "async-io 1.13.0",
  "async-lock 2.8.0",
- "autocfg",
+ "async-signal",
  "blocking",
  "cfg-if",
- "event-listener 2.5.3",
+ "event-listener 3.1.0",
  "futures-lite 1.13.0",
- "rustix 0.37.23",
- "signal-hook",
+ "rustix 0.38.44",
  "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "async-process"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb"
+checksum = "65daa13722ad51e6ab1a1b9c01299142bc75135b337923cfa10e79bbbd669f00"
 dependencies = [
- "async-channel 2.3.0",
- "async-io 2.3.3",
+ "async-channel 2.5.0",
+ "async-io 2.5.0",
  "async-lock 3.4.0",
  "async-signal",
  "async-task",
  "blocking",
  "cfg-if",
- "event-listener 5.3.1",
- "futures-lite 2.3.0",
- "rustix 0.38.42",
- "tracing",
+ "event-listener 5.4.0",
+ "futures-lite 2.6.0",
+ "rustix 1.0.8",
 ]
 
 [[package]]
 name = "async-signal"
-version = "0.2.9"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32"
+checksum = "f567af260ef69e1d52c2b560ce0ea230763e6fbb9214a85d768760a920e3e3c1"
 dependencies = [
- "async-io 2.3.3",
+ "async-io 2.5.0",
  "async-lock 3.4.0",
  "atomic-waker",
  "cfg-if",
  "futures-core",
  "futures-io",
- "rustix 0.38.42",
+ "rustix 1.0.8",
  "signal-hook-registry",
  "slab",
- "windows-sys 0.52.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
 name = "async-std"
-version = "1.12.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d"
+checksum = "730294c1c08c2e0f85759590518f6333f0d5a0a766a27d519c1b244c3dfd8a24"
 dependencies = [
  "async-attributes",
  "async-channel 1.9.0",
  "async-global-executor",
- "async-io 1.13.0",
- "async-lock 2.8.0",
+ "async-io 2.5.0",
+ "async-lock 3.4.0",
  "crossbeam-utils",
  "futures-channel",
  "futures-core",
  "futures-io",
- "futures-lite 1.13.0",
- "gloo-timers",
+ "futures-lite 2.6.0",
+ "gloo-timers 0.3.0",
  "kv-log-macro",
  "log",
  "memchr",
@@ -1726,9 +1725,9 @@ dependencies = [
 
 [[package]]
 name = "async-stream"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
 dependencies = [
  "async-stream-impl",
  "futures-core",
@@ -1737,13 +1736,13 @@ dependencies = [
 
 [[package]]
 name = "async-stream-impl"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -1760,7 +1759,7 @@ checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -1806,9 +1805,9 @@ checksum = "a8ab6b55fe97976e46f91ddbed8d147d966475dc29b2032757ba47e02376fbc3"
 
 [[package]]
 name = "atomic-waker"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "attohttpc"
@@ -1816,7 +1815,7 @@ version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d9a9bf8b79a749ee0b911b91b671cc2b6c670bdbc7e3dfd537576ddc94bb2a2"
 dependencies = [
- "http 0.2.9",
+ "http 0.2.12",
  "log",
  "url",
 ]
@@ -1839,14 +1838,14 @@ checksum = "ffdcb70bdbc4d478427380519163274ac86e52916e10f0a8889adf0f96d3fee7"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "average"
@@ -1871,24 +1870,24 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1"
 dependencies = [
- "getrandom 0.2.10",
+ "getrandom 0.2.16",
  "instant",
  "rand 0.8.5",
 ]
 
 [[package]]
 name = "backtrace"
-version = "0.3.71"
+version = "0.3.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
+checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
 dependencies = [
- "addr2line 0.21.0",
- "cc",
+ "addr2line 0.24.2",
  "cfg-if",
  "libc",
  "miniz_oxide",
- "object 0.32.2",
+ "object 0.36.7",
  "rustc-demangle",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -1929,15 +1928,15 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "base64ct"
-version = "1.6.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
+checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba"
 
 [[package]]
 name = "binary-merkle-tree"
 version = "13.0.0"
 dependencies = [
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "hash-db",
  "log",
  "parity-scale-codec",
@@ -1972,30 +1971,31 @@ dependencies = [
  "regex",
  "rustc-hash 1.1.0",
  "shlex",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "bip32"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa13fae8b6255872fd86f7faf4b41168661d7d78609f7bfe6771b85c6739a15b"
+checksum = "db40d3dfbeab4e031d78c844642fa0caa0b0db11ce1607ac9d2986dff1405c69"
 dependencies = [
  "bs58",
  "hmac 0.12.1",
  "k256",
  "rand_core 0.6.4",
  "ripemd",
+ "secp256k1 0.27.0",
  "sha2 0.10.9",
- "subtle 2.5.0",
+ "subtle 2.6.1",
  "zeroize",
 ]
 
 [[package]]
 name = "bip39"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33415e24172c1b7d6066f6d999545375ab8e1d95421d6784bdfff9496f292387"
+checksum = "43d193de1f7487df1914d3a568b772458861d33f9c54249612cc2893d6915054"
 dependencies = [
  "bitcoin_hashes 0.13.0",
  "serde",
@@ -2036,7 +2036,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1930a4dabfebb8d7d9992db18ebe3ae2876f0a305fab206fd168df931ede293b"
 dependencies = [
  "bitcoin-internals",
- "hex-conservative 0.1.1",
+ "hex-conservative 0.1.2",
 ]
 
 [[package]]
@@ -2110,37 +2110,37 @@ dependencies = [
 
 [[package]]
 name = "blake2b_simd"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780"
+checksum = "06e903a20b159e944f91ec8499fe1e55651480c541ea0a584f5d967c49ad9d99"
 dependencies = [
  "arrayref",
- "arrayvec 0.7.4",
- "constant_time_eq 0.3.0",
+ "arrayvec 0.7.6",
+ "constant_time_eq 0.3.1",
 ]
 
 [[package]]
 name = "blake2s_simd"
-version = "1.0.1"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6637f448b9e61dfadbdcbae9a885fadee1f3eaffb1f8d3c1965d3ade8bdfd44f"
+checksum = "e90f7deecfac93095eb874a40febd69427776e24e1bd7f87f33ac62d6f0174df"
 dependencies = [
  "arrayref",
- "arrayvec 0.7.4",
- "constant_time_eq 0.2.6",
+ "arrayvec 0.7.6",
+ "constant_time_eq 0.3.1",
 ]
 
 [[package]]
 name = "blake3"
-version = "1.5.4"
+version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7"
+checksum = "3888aaa89e4b2a40fca9848e400f6a658a5a3978de7be858e209cafa8be9a4a0"
 dependencies = [
  "arrayref",
- "arrayvec 0.7.4",
+ "arrayvec 0.7.6",
  "cc",
  "cfg-if",
- "constant_time_eq 0.3.0",
+ "constant_time_eq 0.3.1",
 ]
 
 [[package]]
@@ -2163,17 +2163,15 @@ dependencies = [
 
 [[package]]
 name = "blocking"
-version = "1.3.1"
+version = "1.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65"
+checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21"
 dependencies = [
- "async-channel 1.9.0",
- "async-lock 2.8.0",
+ "async-channel 2.5.0",
  "async-task",
- "atomic-waker",
- "fastrand 1.9.0",
- "futures-lite 1.13.0",
- "log",
+ "futures-io",
+ "futures-lite 2.6.0",
+ "piper",
 ]
 
 [[package]]
@@ -2202,9 +2200,9 @@ dependencies = [
 
 [[package]]
 name = "bounded-collections"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32ed0a820ed50891d36358e997d27741a6142e382242df40ff01c89bcdcc7a2b"
+checksum = "64ad8a0bed7827f0b07a5d23cec2e58cc02038a99e4ca81616cb2bb2025f804d"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -2222,7 +2220,7 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "scale-info",
- "schemars",
+ "schemars 1.0.4",
  "serde",
 ]
 
@@ -2232,7 +2230,7 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68534a48cbf63a4b1323c433cf21238c9ec23711e0df13b08c33e5c2082663ce"
 dependencies = [
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -2950,12 +2948,12 @@ dependencies = [
 
 [[package]]
 name = "bstr"
-version = "1.6.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05"
+checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4"
 dependencies = [
  "memchr",
- "regex-automata 0.3.6",
+ "regex-automata 0.4.9",
  "serde",
 ]
 
@@ -2970,9 +2968,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.13.0"
+version = "3.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 
 [[package]]
 name = "byte-slice-cast"
@@ -2988,9 +2986,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
 
 [[package]]
 name = "bytemuck"
-version = "1.13.1"
+version = "1.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
+checksum = "5c76a5792e44e4abe34d3abf15636779261d45a7450612059293d1d2cfc63422"
 
 [[package]]
 name = "byteorder"
@@ -3009,12 +3007,11 @@ dependencies = [
 
 [[package]]
 name = "bzip2-sys"
-version = "0.1.11+1.0.8"
+version = "0.1.13+1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc"
+checksum = "225bff33b2141874fe80d71e07d6eec4f85c5c216453dd96388240f96e1acc14"
 dependencies = [
  "cc",
- "libc",
  "pkg-config",
 ]
 
@@ -3045,18 +3042,18 @@ dependencies = [
 
 [[package]]
 name = "camino"
-version = "1.1.6"
+version = "1.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c"
+checksum = "0da45bc31171d8d6960122e222a67740df867c1dd53b4d51caa297084c185cab"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "cargo-platform"
-version = "0.1.3"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479"
+checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea"
 dependencies = [
  "serde",
 ]
@@ -3069,10 +3066,10 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a"
 dependencies = [
  "camino",
  "cargo-platform",
- "semver 1.0.18",
+ "semver 1.0.26",
  "serde",
  "serde_json",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -3110,23 +3107,23 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
 dependencies = [
- "nom",
+ "nom 7.1.3",
 ]
 
 [[package]]
 name = "cfg-expr"
-version = "0.15.5"
+version = "0.15.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3"
+checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
 dependencies = [
  "smallvec",
 ]
 
 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
 
 [[package]]
 name = "cfg_aliases"
@@ -3197,9 +3194,9 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.40"
+version = "0.4.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c"
+checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -3212,9 +3209,9 @@ dependencies = [
 
 [[package]]
 name = "ciborium"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926"
+checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
 dependencies = [
  "ciborium-io",
  "ciborium-ll",
@@ -3223,15 +3220,15 @@ dependencies = [
 
 [[package]]
 name = "ciborium-io"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656"
+checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
 
 [[package]]
 name = "ciborium-ll"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b"
+checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
 dependencies = [
  "ciborium-io",
  "half",
@@ -3258,7 +3255,7 @@ checksum = "3147d8272e8fa0ccd29ce51194dd98f79ddfb8191ba9e3409884e751798acf3a"
 dependencies = [
  "core2",
  "multibase",
- "multihash 0.19.1",
+ "multihash 0.19.3",
  "unsigned-varint 0.8.0",
 ]
 
@@ -3284,9 +3281,9 @@ dependencies = [
 
 [[package]]
 name = "clang-sys"
-version = "1.6.1"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
 dependencies = [
  "glob",
  "libc",
@@ -3295,9 +3292,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.13"
+version = "4.5.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc"
+checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -3305,9 +3302,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.13"
+version = "4.5.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99"
+checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d"
 dependencies = [
  "anstream",
  "anstyle",
@@ -3318,39 +3315,39 @@ dependencies = [
 
 [[package]]
 name = "clap_complete"
-version = "4.5.13"
+version = "4.5.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa3c596da3cf0983427b0df0dba359df9182c13bd5b519b585a482b0c351f4e8"
+checksum = "a5abde44486daf70c5be8b8f8f1b66c49f86236edf6fa2abadb4d961c4c6229a"
 dependencies = [
  "clap",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.5.13"
+version = "4.5.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
+checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.7.0"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
+checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
 
 [[package]]
 name = "cmd_lib"
-version = "1.9.5"
+version = "1.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "371c15a3c178d0117091bd84414545309ca979555b1aad573ef591ad58818d41"
+checksum = "1af0f9b65935ff457da75535a6b6ff117ac858f03f71191188b3b696f90aec5a"
 dependencies = [
  "cmd_lib_macros",
- "env_logger 0.10.1",
+ "env_logger 0.10.2",
  "faccess",
  "lazy_static",
  "log",
@@ -3359,36 +3356,36 @@ dependencies = [
 
 [[package]]
 name = "cmd_lib_macros"
-version = "1.9.5"
+version = "1.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb844bd05be34d91eb67101329aeba9d3337094c04fd8507d821db7ebb488eaf"
+checksum = "1e69eee115667ccda8b9ed7010bcf13356ad45269fc92aa78534890b42809a64"
 dependencies = [
  "proc-macro-error2",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "coarsetime"
-version = "0.1.23"
+version = "0.1.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a90d114103adbc625300f346d4d09dfb4ab1c4a8df6868435dd903392ecf4354"
+checksum = "91849686042de1b41cd81490edc83afbcb0abe5a9b6f2c4114f23ce8cca1bcf4"
 dependencies = [
  "libc",
- "once_cell",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasix",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "codespan-reporting"
-version = "0.11.1"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
+checksum = "fe6d2e5af09e8c8ad56c969f2157a3d4238cebc7c55f0a517728c38f7b200f81"
 dependencies = [
+ "serde",
  "termcolor",
- "unicode-width 0.1.10",
+ "unicode-width",
 ]
 
 [[package]]
@@ -3511,9 +3508,9 @@ dependencies = [
 
 [[package]]
 name = "color-eyre"
-version = "0.6.3"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5"
+checksum = "e5920befb47832a6d61ee3a3a846565cfa39b331331e68a3b1d1116630f2f26d"
 dependencies = [
  "backtrace",
  "eyre",
@@ -3524,47 +3521,46 @@ dependencies = [
 
 [[package]]
 name = "color-print"
-version = "0.3.4"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2a5e6504ed8648554968650feecea00557a3476bc040d0ffc33080e66b646d0"
+checksum = "3aa954171903797d5623e047d9ab69d91b493657917bdfb8c2c80ecaf9cdb6f4"
 dependencies = [
  "color-print-proc-macro",
 ]
 
 [[package]]
 name = "color-print-proc-macro"
-version = "0.3.4"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d51beaa537d73d2d1ff34ee70bc095f170420ab2ec5d687ecd3ec2b0d092514b"
+checksum = "692186b5ebe54007e45a59aea47ece9eb4108e141326c304cdc91699a7118a22"
 dependencies = [
- "nom",
+ "nom 7.1.3",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 1.0.109",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "colorchoice"
-version = "1.0.0"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
 
 [[package]]
 name = "colored"
-version = "2.0.4"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6"
+checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
- "is-terminal",
  "lazy_static",
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "combine"
-version = "4.6.6"
+version = "4.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
+checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
 dependencies = [
  "bytes",
  "memchr",
@@ -3577,7 +3573,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a65ebfec4fb190b6f90e944a817d60499ee0744e582530e2c9900a22e591d9a"
 dependencies = [
  "unicode-segmentation",
- "unicode-width 0.2.0",
+ "unicode-width",
 ]
 
 [[package]]
@@ -3597,22 +3593,22 @@ dependencies = [
 
 [[package]]
 name = "console"
-version = "0.15.8"
+version = "0.15.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
+checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8"
 dependencies = [
  "encode_unicode",
- "lazy_static",
  "libc",
- "unicode-width 0.1.10",
- "windows-sys 0.52.0",
+ "once_cell",
+ "unicode-width",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "const-hex"
-version = "1.14.0"
+version = "1.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b0485bab839b018a8f1723fc5391819fea5f8f0f32288ef8a735fd096b6160c"
+checksum = "83e22e0ed40b96a48d3db274f72fd365bd78f67af39b6bbd47e8a15e1c6207ff"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -3623,29 +3619,27 @@ dependencies = [
 
 [[package]]
 name = "const-oid"
-version = "0.9.5"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f"
+checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
 
 [[package]]
 name = "const-random"
-version = "0.1.15"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e"
+checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
 dependencies = [
  "const-random-macro",
- "proc-macro-hack",
 ]
 
 [[package]]
 name = "const-random-macro"
-version = "0.1.15"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb"
+checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
 dependencies = [
- "getrandom 0.2.10",
+ "getrandom 0.2.16",
  "once_cell",
- "proc-macro-hack",
  "tiny-keccak",
 ]
 
@@ -3666,7 +3660,7 @@ checksum = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "unicode-xid 0.2.4",
+ "unicode-xid 0.2.6",
 ]
 
 [[package]]
@@ -3677,21 +3671,24 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
 
 [[package]]
 name = "constant_time_eq"
-version = "0.2.6"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6"
+checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
 
 [[package]]
-name = "constant_time_eq"
-version = "0.3.0"
+name = "convert_case"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
+checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
 
 [[package]]
 name = "convert_case"
-version = "0.4.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
+checksum = "bb402b8d4c85569410425650ce3eddc7d698ed96d39a73f941b08fb63082f1e7"
+dependencies = [
+ "unicode-segmentation",
+]
 
 [[package]]
 name = "core-foundation"
@@ -3703,11 +3700,21 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "core-foundation"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "core2"
@@ -3926,9 +3933,9 @@ dependencies = [
 
 [[package]]
 name = "cpp_demangle"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e8227005286ec39567949b33df9896bcadfa6051bccca2488129f108ca23119"
+checksum = "96e58d342ad113c2b878f16d5d034c03be492ae460cdbc02b7f0f2284d310c7d"
 dependencies = [
  "cfg-if",
 ]
@@ -3945,9 +3952,9 @@ dependencies = [
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.9"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
 dependencies = [
  "libc",
 ]
@@ -4046,15 +4053,15 @@ dependencies = [
  "itertools 0.10.5",
  "log",
  "smallvec",
- "wasmparser",
+ "wasmparser 0.102.0",
  "wasmtime-types",
 ]
 
 [[package]]
 name = "crc"
-version = "3.2.1"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636"
+checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675"
 dependencies = [
  "crc-catalog",
 ]
@@ -4067,9 +4074,9 @@ checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
 
 [[package]]
 name = "crc32fast"
-version = "1.3.2"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
 dependencies = [
  "cfg-if",
 ]
@@ -4129,58 +4136,53 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.3"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
 dependencies = [
- "cfg-if",
  "crossbeam-epoch",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.15"
+version = "0.9.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
 dependencies = [
- "autocfg",
- "cfg-if",
  "crossbeam-utils",
- "memoffset 0.9.0",
- "scopeguard",
 ]
 
 [[package]]
 name = "crossbeam-queue"
-version = "0.3.11"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
+checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
 dependencies = [
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.20"
+version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "crunchy"
-version = "0.2.2"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
 
 [[package]]
 name = "crypto-bigint"
-version = "0.5.2"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15"
+checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
 dependencies = [
  "generic-array 0.14.7",
  "rand_core 0.6.4",
- "subtle 2.5.0",
+ "subtle 2.6.1",
  "zeroize",
 ]
 
@@ -4212,7 +4214,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
 dependencies = [
  "generic-array 0.14.7",
- "subtle 2.5.0",
+ "subtle 2.6.1",
 ]
 
 [[package]]
@@ -4226,7 +4228,7 @@ dependencies = [
  "generic-array 0.14.7",
  "poly1305",
  "salsa20",
- "subtle 2.5.0",
+ "subtle 2.6.1",
  "zeroize",
 ]
 
@@ -4241,11 +4243,11 @@ dependencies = [
 
 [[package]]
 name = "ctrlc"
-version = "3.4.5"
+version = "3.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3"
+checksum = "46f93780a459b7d656ef7f071fe699c4d3d2cb201c4b24d085b6ddc505276e73"
 dependencies = [
- "nix 0.29.0",
+ "nix 0.30.1",
  "windows-sys 0.59.0",
 ]
 
@@ -4253,7 +4255,7 @@ dependencies = [
 name = "cumulus-client-bootnodes"
 version = "0.1.0"
 dependencies = [
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "async-channel 1.9.0",
  "cumulus-primitives-core",
  "cumulus-relay-chain-interface",
@@ -4302,7 +4304,7 @@ dependencies = [
  "cumulus-test-runtime",
  "futures",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-test-helpers",
@@ -4335,7 +4337,7 @@ dependencies = [
  "cumulus-test-relay-sproof-builder",
  "futures",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
@@ -4417,7 +4419,7 @@ dependencies = [
  "sp-inherents",
  "sp-runtime",
  "sp-state-machine",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -4429,7 +4431,7 @@ dependencies = [
  "cumulus-primitives-core",
  "cumulus-relay-chain-interface",
  "futures",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "sc-consensus",
  "sp-api",
  "sp-block-builder",
@@ -4454,7 +4456,7 @@ dependencies = [
  "futures",
  "futures-timer",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-parachain-primitives",
@@ -4626,7 +4628,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "futures",
- "hashbrown 0.15.3",
+ "hashbrown 0.15.4",
  "hex-literal",
  "impl-trait-for-tuples",
  "log",
@@ -4661,10 +4663,10 @@ dependencies = [
 name = "cumulus-pallet-parachain-system-proc-macro"
 version = "0.6.0"
 dependencies = [
- "proc-macro-crate 3.1.0",
+ "proc-macro-crate 3.3.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -4782,7 +4784,7 @@ dependencies = [
  "sp-io",
  "sp-maybe-compressed-blob",
  "tracing",
- "tracing-subscriber 0.3.18",
+ "tracing-subscriber 0.3.19",
 ]
 
 [[package]]
@@ -4924,14 +4926,14 @@ dependencies = [
  "sp-blockchain",
  "sp-state-machine",
  "sp-version",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "cumulus-relay-chain-minimal-node"
 version = "0.7.0"
 dependencies = [
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "async-channel 1.9.0",
  "async-trait",
  "cumulus-client-bootnodes",
@@ -4996,7 +4998,7 @@ dependencies = [
  "sp-storage 19.0.0",
  "sp-version",
  "substrate-prometheus-endpoint",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-util",
  "tracing",
@@ -5203,7 +5205,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "cumulus-zombienet-sdk-helpers",
- "env_logger 0.11.3",
+ "env_logger 0.11.8",
  "futures",
  "log",
  "polkadot-primitives",
@@ -5220,24 +5222,24 @@ dependencies = [
 
 [[package]]
 name = "curl"
-version = "0.4.46"
+version = "0.4.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e2161dd6eba090ff1594084e95fd67aeccf04382ffea77999ea94ed42ec67b6"
+checksum = "9e2d5c8f48d9c0c23250e52b55e82a6ab4fdba6650c931f5a0a57a43abda812b"
 dependencies = [
  "curl-sys",
  "libc",
  "openssl-probe",
  "openssl-sys",
  "schannel",
- "socket2 0.5.9",
- "windows-sys 0.52.0",
+ "socket2 0.5.10",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "curl-sys"
-version = "0.4.72+curl-8.6.0"
+version = "0.4.82+curl-8.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29cbdc8314c447d11e8fd156dcdd031d9e02a7a976163e396b548c03153bc9ea"
+checksum = "c4d63638b5ec65f1a4ae945287b3fd035be4554bbaf211901159c9a2a74fb5be"
 dependencies = [
  "cc",
  "libc",
@@ -5246,7 +5248,7 @@ dependencies = [
  "openssl-sys",
  "pkg-config",
  "vcpkg",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -5260,20 +5262,20 @@ dependencies = [
  "curve25519-dalek-derive",
  "digest 0.10.7",
  "fiat-crypto",
- "rustc_version 0.4.0",
- "subtle 2.5.0",
+ "rustc_version 0.4.1",
+ "subtle 2.6.1",
  "zeroize",
 ]
 
 [[package]]
 name = "curve25519-dalek-derive"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
+checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -5291,53 +5293,71 @@ dependencies = [
 
 [[package]]
 name = "cxx"
-version = "1.0.106"
+version = "1.0.161"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28403c86fc49e3401fdf45499ba37fad6493d9329449d6449d7f0e10f4654d28"
+checksum = "a3523cc02ad831111491dd64b27ad999f1ae189986728e477604e61b81f828df"
 dependencies = [
  "cc",
+ "cxxbridge-cmd",
  "cxxbridge-flags",
  "cxxbridge-macro",
+ "foldhash",
  "link-cplusplus",
 ]
 
 [[package]]
 name = "cxx-build"
-version = "1.0.106"
+version = "1.0.161"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78da94fef01786dc3e0c76eafcd187abcaa9972c78e05ff4041e24fdf059c285"
+checksum = "212b754247a6f07b10fa626628c157593f0abf640a3dd04cce2760eca970f909"
 dependencies = [
  "cc",
  "codespan-reporting",
- "once_cell",
+ "indexmap 2.10.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "scratch",
- "syn 2.0.98",
+ "syn 2.0.104",
+]
+
+[[package]]
+name = "cxxbridge-cmd"
+version = "1.0.161"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f426a20413ec2e742520ba6837c9324b55ffac24ead47491a6e29f933c5b135a"
+dependencies = [
+ "clap",
+ "codespan-reporting",
+ "indexmap 2.10.0",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.106"
+version = "1.0.161"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2a6f5e1dfb4b34292ad4ea1facbfdaa1824705b231610087b00b17008641809"
+checksum = "a258b6069020b4e5da6415df94a50ee4f586a6c38b037a180e940a43d06a070d"
 
 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.106"
+version = "1.0.161"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50c49547d73ba8dcfd4ad7325d64c6d5391ff4224d498fc39a6f3f49825a530d"
+checksum = "e8dec184b52be5008d6eaf7e62fc1802caf1ad1227d11b3b7df2c409c7ffc3f4"
 dependencies = [
+ "indexmap 2.10.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "rustversion",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "darling"
-version = "0.20.10"
+version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
+checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -5345,53 +5365,53 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.20.10"
+version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
+checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
 dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "strsim",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "darling_macro"
-version = "0.20.10"
+version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
+checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
 dependencies = [
  "darling_core",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "dashmap"
-version = "5.5.1"
+version = "5.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edd72493923899c6f10c641bdbdeddc7183d6396641d99c1a0d1597f37f92e28"
+checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
 dependencies = [
  "cfg-if",
  "hashbrown 0.14.5",
  "lock_api",
  "once_cell",
- "parking_lot_core 0.9.8",
+ "parking_lot_core 0.9.11",
 ]
 
 [[package]]
 name = "data-encoding"
-version = "2.6.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
+checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
 
 [[package]]
 name = "data-encoding-macro"
-version = "0.1.13"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c904b33cc60130e1aeea4956ab803d08a3f4a0ca82d64ed757afac3891f2bb99"
+checksum = "47ce6c96ea0102f01122a185683611bd5ac8d99e62bc59dd12e6bda344ee673d"
 dependencies = [
  "data-encoding",
  "data-encoding-macro-internal",
@@ -5399,12 +5419,12 @@ dependencies = [
 
 [[package]]
 name = "data-encoding-macro-internal"
-version = "0.1.11"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fdf3fce3ce863539ec1d7fd1b6dcc3c645663376b43ed376bbf887733e4f772"
+checksum = "8d162beedaa69905488a8da94f5ac3edb4dd4788b732fadb7bd120b2625c1976"
 dependencies = [
  "data-encoding",
- "syn 1.0.109",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -5418,9 +5438,9 @@ dependencies = [
 
 [[package]]
 name = "der"
-version = "0.7.8"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c"
+checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
 dependencies = [
  "const-oid",
  "pem-rfc7468",
@@ -5433,9 +5453,9 @@ version = "9.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553"
 dependencies = [
- "asn1-rs 0.6.1",
+ "asn1-rs 0.6.2",
  "displaydoc",
- "nom",
+ "nom 7.1.3",
  "num-bigint",
  "num-traits",
  "rusticata-macros",
@@ -5447,9 +5467,9 @@ version = "10.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07da5016415d5a3c4dd39b11ed26f915f52fc4e0dc197d87908bc916e51bc1a6"
 dependencies = [
- "asn1-rs 0.7.0",
+ "asn1-rs 0.7.1",
  "displaydoc",
- "nom",
+ "nom 7.1.3",
  "num-bigint",
  "num-traits",
  "rusticata-macros",
@@ -5457,9 +5477,9 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.3.11"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
 dependencies = [
  "powerfmt",
 ]
@@ -5483,7 +5503,7 @@ checksum = "d65d7ce8132b7c0e54497a4d9a55a1c2a0912a0d786cf894472ba818fba45762"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -5494,31 +5514,31 @@ checksum = "510c292c8cf384b1a340b816a9a6cf2599eb8f566a44949024af88418000c50b"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "derive_arbitrary"
-version = "1.3.2"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
+checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "derive_more"
-version = "0.99.17"
+version = "0.99.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
+checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f"
 dependencies = [
- "convert_case",
+ "convert_case 0.4.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "rustc_version 0.4.0",
- "syn 1.0.109",
+ "rustc_version 0.4.1",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -5547,8 +5567,8 @@ checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
- "unicode-xid 0.2.4",
+ "syn 2.0.104",
+ "unicode-xid 0.2.6",
 ]
 
 [[package]]
@@ -5557,10 +5577,11 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
 dependencies = [
+ "convert_case 0.7.1",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
- "unicode-xid 0.2.4",
+ "syn 2.0.104",
+ "unicode-xid 0.2.6",
 ]
 
 [[package]]
@@ -5602,7 +5623,7 @@ dependencies = [
  "block-buffer 0.10.4",
  "const-oid",
  "crypto-common",
- "subtle 2.5.0",
+ "subtle 2.6.1",
 ]
 
 [[package]]
@@ -5658,28 +5679,30 @@ dependencies = [
 
 [[package]]
 name = "displaydoc"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "dissimilar"
-version = "1.0.7"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632"
+checksum = "8975ffdaa0ef3661bfe02dbdcc06c9f829dfafe6a3c474de366a8d5e44276921"
 
 [[package]]
 name = "dlmalloc"
-version = "0.2.4"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "203540e710bfadb90e5e29930baf5d10270cec1f43ab34f46f78b147b2de715a"
+checksum = "d01597dde41c0b9da50d5f8c219023d63d8f27f39a27095070fd191fddc83891"
 dependencies = [
+ "cfg-if",
  "libc",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -5709,9 +5732,9 @@ dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "regex",
- "syn 2.0.98",
+ "syn 2.0.104",
  "termcolor",
- "toml 0.8.19",
+ "toml 0.8.23",
  "walkdir",
 ]
 
@@ -5729,9 +5752,9 @@ checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1"
 
 [[package]]
 name = "downcast-rs"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
+checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
 
 [[package]]
 name = "drawille"
@@ -5745,21 +5768,21 @@ dependencies = [
 
 [[package]]
 name = "dtoa"
-version = "1.0.9"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653"
+checksum = "d6add3b8cff394282be81f3fc1a0605db594ed69890078ca6e2cab1c408bcf04"
 
 [[package]]
 name = "dunce"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
+checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
 
 [[package]]
 name = "dyn-clonable"
-version = "0.9.0"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e9232f0e607a262ceb9bd5141a3dfb3e4db6994b31989bbfd845878cba59fd4"
+checksum = "a36efbb9bfd58e1723780aa04b61aba95ace6a05d9ffabfdb0b43672552f0805"
 dependencies = [
  "dyn-clonable-impl",
  "dyn-clone",
@@ -5767,20 +5790,20 @@ dependencies = [
 
 [[package]]
 name = "dyn-clonable-impl"
-version = "0.9.0"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "558e40ea573c374cf53507fd240b7ee2f5477df7cfebdb97323ec61c719399c5"
+checksum = "7e8671d54058979a37a26f3511fbf8d198ba1aa35ffb202c42587d918d77213a"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 1.0.109",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "dyn-clone"
-version = "1.0.17"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
+checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005"
 
 [[package]]
 name = "easy-cast"
@@ -5793,9 +5816,9 @@ dependencies = [
 
 [[package]]
 name = "ecdsa"
-version = "0.16.8"
+version = "0.16.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4"
+checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
 dependencies = [
  "der",
  "digest 0.10.7",
@@ -5808,9 +5831,9 @@ dependencies = [
 
 [[package]]
 name = "ed25519"
-version = "2.2.2"
+version = "2.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d"
+checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
 dependencies = [
  "pkcs8",
  "signature",
@@ -5818,16 +5841,16 @@ dependencies = [
 
 [[package]]
 name = "ed25519-dalek"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
+checksum = "70e796c081cee67dc755e1a36a0a172b897fab85fc3f6bc48307991f64e4eca9"
 dependencies = [
  "curve25519-dalek",
  "ed25519",
  "rand_core 0.6.4",
  "serde",
  "sha2 0.10.9",
- "subtle 2.5.0",
+ "subtle 2.6.1",
  "zeroize",
 ]
 
@@ -5855,7 +5878,7 @@ dependencies = [
  "enum-ordinalize",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -5883,7 +5906,7 @@ dependencies = [
  "rand_core 0.6.4",
  "sec1",
  "serdect",
- "subtle 2.5.0",
+ "subtle 2.6.1",
  "zeroize",
 ]
 
@@ -5931,29 +5954,29 @@ dependencies = [
 
 [[package]]
 name = "encode_unicode"
-version = "0.3.6"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
+checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.33"
+version = "0.8.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "enum-as-inner"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a"
+checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc"
 dependencies = [
- "heck 0.4.1",
+ "heck 0.5.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -5973,45 +5996,45 @@ checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "enumflags2"
-version = "0.7.11"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba2f4b465f5318854c6f8dd686ede6c0a9dc67d4b1ac241cf0eb51521a309147"
+checksum = "1027f7680c853e056ebcec683615fb6fbbc07dbaa13b4d5d9442b146ded4ecef"
 dependencies = [
  "enumflags2_derive",
 ]
 
 [[package]]
 name = "enumflags2_derive"
-version = "0.7.11"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc4caf64a58d7a6d65ab00639b046ff54399a39f5f2554728895ace4b297cd79"
+checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "enumn"
-version = "0.1.13"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fd000fd6988e73bbe993ea3db9b1aa64906ab88766d654973924340c8cddb42"
+checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "env_filter"
-version = "0.1.0"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea"
+checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
 dependencies = [
  "log",
  "regex",
@@ -6029,9 +6052,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.10.1"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece"
+checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
 dependencies = [
  "humantime",
  "is-terminal",
@@ -6042,14 +6065,14 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.11.3"
+version = "0.11.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9"
+checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f"
 dependencies = [
  "anstream",
  "anstyle",
  "env_filter",
- "humantime",
+ "jiff",
  "log",
 ]
 
@@ -6061,9 +6084,9 @@ checksum = "e48c92028aaa870e83d51c64e5d4e0b6981b360c522198c23959f219a4e1b15b"
 
 [[package]]
 name = "equivalent"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "equivocation-detector"
@@ -6081,11 +6104,12 @@ dependencies = [
 
 [[package]]
 name = "erased-serde"
-version = "0.4.4"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b73807008a3c7f171cc40312f37d95ef0396e048b5848d775f54b1a4dd4a0d3"
+checksum = "e004d887f51fcb9fef17317a2f3525c887d8aa3f4f50fed920816a688284a5b7"
 dependencies = [
  "serde",
+ "typeid",
 ]
 
 [[package]]
@@ -6100,12 +6124,12 @@ dependencies = [
 
 [[package]]
 name = "errno"
-version = "0.3.10"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
+checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -6175,9 +6199,20 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
 [[package]]
 name = "event-listener"
-version = "5.3.1"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener"
+version = "5.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
+checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae"
 dependencies = [
  "concurrent-queue",
  "parking",
@@ -6186,11 +6221,11 @@ dependencies = [
 
 [[package]]
 name = "event-listener-strategy"
-version = "0.5.2"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
+checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
 dependencies = [
- "event-listener 5.3.1",
+ "event-listener 5.4.0",
  "pin-project-lite",
 ]
 
@@ -6215,14 +6250,14 @@ dependencies = [
  "prettyplease",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "eyre"
-version = "0.6.8"
+version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb"
+checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"
 dependencies = [
  "indenter",
  "once_cell",
@@ -6258,7 +6293,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e24cb5a94bcae1e5408b0effca5cd7172ea3c5755049c5f3af4cd283a165298"
 dependencies = [
  "bit-set",
- "regex-automata 0.4.8",
+ "regex-automata 0.4.9",
  "regex-syntax 0.8.5",
 ]
 
@@ -6283,7 +6318,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "139834ddba373bbdd213dffe02c8d110508dcf1726c2be27e8d1f7d7e1856418"
 dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec 0.7.6",
  "auto_impl",
  "bytes",
 ]
@@ -6294,7 +6329,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce8dba4714ef14b8274c371879b175aa55b16b30f269663f19d576f380018dc4"
 dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec 0.7.6",
  "auto_impl",
  "bytes",
 ]
@@ -6306,7 +6341,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec6f82451ff7f0568c6181287189126d492b5654e30a788add08027b6363d019"
 dependencies = [
  "fatality-proc-macro",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -6316,11 +6351,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eb42427514b063d97ce21d5199f36c0c307d981434a6be32582bc79fe5bd2303"
 dependencies = [
  "expander",
- "indexmap 2.9.0",
- "proc-macro-crate 3.1.0",
+ "indexmap 2.10.0",
+ "proc-macro-crate 3.3.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -6330,7 +6365,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e182f7dbc2ef73d9ef67351c5fbbea084729c48362d3ce9dd44c28e32e277fe5"
 dependencies = [
  "libc",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -6351,19 +6386,19 @@ dependencies = [
 
 [[package]]
 name = "ff"
-version = "0.13.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
+checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393"
 dependencies = [
  "rand_core 0.6.4",
- "subtle 2.5.0",
+ "subtle 2.6.1",
 ]
 
 [[package]]
 name = "fiat-crypto"
-version = "0.2.5"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7"
+checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
 
 [[package]]
 name = "file-guard"
@@ -6381,20 +6416,20 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84f2e425d9790201ba4af4630191feac6dcc98765b118d4d18e91d23c2353866"
 dependencies = [
- "env_logger 0.10.1",
+ "env_logger 0.10.2",
  "log",
 ]
 
 [[package]]
 name = "filetime"
-version = "0.2.22"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0"
+checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.3.5",
- "windows-sys 0.48.0",
+ "libredox",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -6409,7 +6444,7 @@ dependencies = [
  "log",
  "num-traits",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "rand 0.8.5",
  "scale-info",
 ]
@@ -6425,7 +6460,7 @@ dependencies = [
  "futures",
  "log",
  "num-traits",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "relay-utils",
 ]
 
@@ -6469,11 +6504,17 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
+[[package]]
+name = "fixedbitset"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
+
 [[package]]
 name = "flate2"
-version = "1.0.27"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
+checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -6546,7 +6587,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8835f84f38484cc86f110a805655697908257fb9a7af005234060891557198e9"
 dependencies = [
  "nonempty",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -6561,15 +6602,15 @@ dependencies = [
 
 [[package]]
 name = "fragile"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
+checksum = "28dd6caf6059519a65843af8fe2a3ae298b14b80179855aeb4adc2c1934ee619"
 
 [[package]]
 name = "frame-benchmarking"
 version = "28.0.0"
 dependencies = [
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "frame-support",
  "frame-support-procedural",
  "frame-system",
@@ -6599,7 +6640,7 @@ name = "frame-benchmarking-cli"
 version = "32.0.0"
 dependencies = [
  "Inflector",
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "chrono",
  "clap",
  "comfy-table",
@@ -6654,7 +6695,7 @@ dependencies = [
  "substrate-test-runtime",
  "subxt 0.41.0",
  "subxt-signer 0.41.0",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "thousands",
  "westend-runtime",
 ]
@@ -6692,7 +6733,21 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7cb8796f93fa038f979a014234d632e9688a120e745f936e2635123c77537f7"
 dependencies = [
- "frame-metadata 20.0.0",
+ "frame-metadata 21.0.0",
+ "parity-scale-codec",
+ "scale-decode 0.16.0",
+ "scale-info",
+ "scale-type-resolver",
+ "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "frame-decode"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e56c0e51972d7b26ff76966c4d0f2307030df9daa5ce0885149ece1ab7ca5ad"
+dependencies = [
+ "frame-metadata 23.0.0",
  "parity-scale-codec",
  "scale-decode 0.16.0",
  "scale-info",
@@ -6707,12 +6762,12 @@ dependencies = [
  "frame-election-provider-support",
  "frame-support",
  "parity-scale-codec",
- "proc-macro-crate 3.1.0",
+ "proc-macro-crate 3.3.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "scale-info",
  "sp-arithmetic",
- "syn 2.0.98",
+ "syn 2.0.104",
  "trybuild",
 ]
 
@@ -6752,7 +6807,7 @@ name = "frame-executive"
 version = "28.0.0"
 dependencies = [
  "aquamarine",
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "frame-support",
  "frame-system",
  "frame-try-runtime",
@@ -6794,6 +6849,17 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "frame-metadata"
+version = "21.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20dfd1d7eae1d94e32e869e2fb272d81f52dd8db57820a373adb83ea24d7d862"
+dependencies = [
+ "cfg-if",
+ "parity-scale-codec",
+ "scale-info",
+]
+
 [[package]]
 name = "frame-metadata"
 version = "23.0.0"
@@ -6810,7 +6876,7 @@ dependencies = [
 name = "frame-metadata-hash-extension"
 version = "0.1.0"
 dependencies = [
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "const-hex",
  "docify",
  "frame-metadata 23.0.0",
@@ -6843,7 +6909,7 @@ dependencies = [
  "sp-runtime",
  "sp-statement-store",
  "tempfile",
- "tracing-subscriber 0.3.18",
+ "tracing-subscriber 0.3.19",
 ]
 
 [[package]]
@@ -6887,7 +6953,7 @@ version = "28.0.0"
 dependencies = [
  "Inflector",
  "aquamarine",
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "binary-merkle-tree",
  "bitflags 1.3.2",
  "docify",
@@ -6952,7 +7018,7 @@ dependencies = [
  "sp-io",
  "sp-metadata-ir",
  "sp-runtime",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -6960,10 +7026,10 @@ name = "frame-support-procedural-tools"
 version = "10.0.0"
 dependencies = [
  "frame-support-procedural-tools-derive",
- "proc-macro-crate 3.1.0",
+ "proc-macro-crate 3.3.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -6972,7 +7038,7 @@ version = "11.0.0"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -7094,9 +7160,12 @@ dependencies = [
 
 [[package]]
 name = "fs-err"
-version = "2.9.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541"
+checksum = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41"
+dependencies = [
+ "autocfg",
+]
 
 [[package]]
 name = "fs2"
@@ -7114,7 +7183,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "29f9df8a11882c4e3335eb2d18a0137c505d9ca927470b0cac9c6f0ae07d28f7"
 dependencies = [
- "rustix 0.38.42",
+ "rustix 0.38.44",
  "windows-sys 0.48.0",
 ]
 
@@ -7191,7 +7260,7 @@ checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f"
 dependencies = [
  "futures-core",
  "lock_api",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
 ]
 
 [[package]]
@@ -7217,9 +7286,9 @@ dependencies = [
 
 [[package]]
 name = "futures-lite"
-version = "2.3.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
+checksum = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532"
 dependencies = [
  "fastrand 2.3.0",
  "futures-core",
@@ -7236,7 +7305,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -7246,7 +7315,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8f2f12607f92c69b12ed746fabf9ca4f5c482cba46679c1a75b874ed7c26adb"
 dependencies = [
  "futures-io",
- "rustls 0.23.18",
+ "rustls 0.23.29",
  "rustls-pki-types",
 ]
 
@@ -7268,7 +7337,7 @@ version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
 dependencies = [
- "gloo-timers",
+ "gloo-timers 0.2.6",
  "send_wrapper",
 ]
 
@@ -7314,15 +7383,16 @@ dependencies = [
 
 [[package]]
 name = "generator"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc6bd114ceda131d3b1d665eba35788690ad37f5916457286b32ab6fd3c438dd"
+checksum = "d18470a76cb7f8ff746cf1f7470914f900252ec36bbc40b569d74b1258446827"
 dependencies = [
+ "cc",
  "cfg-if",
  "libc",
  "log",
  "rustversion",
- "windows 0.58.0",
+ "windows 0.61.3",
 ]
 
 [[package]]
@@ -7357,25 +7427,29 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.10"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi 0.11.1+wasi-snapshot-preview1",
+ "wasm-bindgen",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.3.1"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
- "wasi 0.13.3+wasi-0.2.2",
- "windows-targets 0.52.6",
+ "r-efi",
+ "wasi 0.14.2+wasi-0.2.4",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -7390,11 +7464,11 @@ dependencies = [
 
 [[package]]
 name = "ghash"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40"
+checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1"
 dependencies = [
- "opaque-debug 0.3.0",
+ "opaque-debug 0.3.1",
  "polyval",
 ]
 
@@ -7409,12 +7483,6 @@ dependencies = [
  "stable_deref_trait",
 ]
 
-[[package]]
-name = "gimli"
-version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
-
 [[package]]
 name = "gimli"
 version = "0.31.1"
@@ -7427,9 +7495,9 @@ dependencies = [
 
 [[package]]
 name = "git2"
-version = "0.20.0"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fda788993cc341f69012feba8bf45c0ba4f3291fcc08e214b4d5a7332d88aff"
+checksum = "2deb07a133b1520dc1a5690e9bd08950108873d7ed5de38dcc74d3b5ebffa110"
 dependencies = [
  "bitflags 2.9.1",
  "libc",
@@ -7440,9 +7508,9 @@ dependencies = [
 
 [[package]]
 name = "glob"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
 
 [[package]]
 name = "glob-match"
@@ -7460,12 +7528,12 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "gloo-utils",
- "http 1.1.0",
+ "http 1.3.1",
  "js-sys",
  "pin-project",
  "serde",
  "serde_json",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
@@ -7483,6 +7551,18 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "gloo-timers"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "gloo-utils"
 version = "0.2.0"
@@ -7574,9 +7654,9 @@ dependencies = [
 
 [[package]]
 name = "governor"
-version = "0.6.0"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "821239e5672ff23e2a7060901fa622950bbd80b649cdaadd78d1c1767ed14eb4"
+checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b"
 dependencies = [
  "cfg-if",
  "dashmap",
@@ -7584,10 +7664,12 @@ dependencies = [
  "futures-timer",
  "no-std-compat",
  "nonzero_ext",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
+ "portable-atomic",
  "quanta",
  "rand 0.8.5",
  "smallvec",
+ "spinning_top",
 ]
 
 [[package]]
@@ -7598,22 +7680,22 @@ checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
 dependencies = [
  "ff",
  "rand_core 0.6.4",
- "subtle 2.5.0",
+ "subtle 2.6.1",
 ]
 
 [[package]]
 name = "h2"
-version = "0.3.26"
+version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
+checksum = "0beca50380b1fc32983fc1cb4587bfa4bb9e78fc259aad4a0032d2080309222d"
 dependencies = [
  "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
  "futures-util",
- "http 0.2.9",
- "indexmap 2.9.0",
+ "http 0.2.12",
+ "indexmap 2.10.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -7622,17 +7704,17 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.5"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
+checksum = "17da50a276f1e01e0ba6c029e47b7100754904ee8a278f886546e98575380785"
 dependencies = [
  "atomic-waker",
  "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
- "http 1.1.0",
- "indexmap 2.9.0",
+ "http 1.3.1",
+ "indexmap 2.10.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -7641,22 +7723,26 @@ dependencies = [
 
 [[package]]
 name = "half"
-version = "1.8.2"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
+checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9"
+dependencies = [
+ "cfg-if",
+ "crunchy",
+]
 
 [[package]]
 name = "handlebars"
-version = "5.1.0"
+version = "5.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab283476b99e66691dee3f1640fea91487a8d81f50fb5ecc75538f8f8879a1e4"
+checksum = "d08485b96a0e6393e9e4d1b8d48cf74ad6c063cd905eb33f42c1ce3f0377539b"
 dependencies = [
  "log",
  "pest",
  "pest_derive",
  "serde",
  "serde_json",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -7702,9 +7788,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.15.3"
+version = "0.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3"
+checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
 dependencies = [
  "allocator-api2",
  "equivalent",
@@ -7723,11 +7809,11 @@ dependencies = [
 
 [[package]]
 name = "hashlink"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af"
+checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
 dependencies = [
- "hashbrown 0.14.5",
+ "hashbrown 0.15.4",
 ]
 
 [[package]]
@@ -7748,6 +7834,12 @@ version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
+[[package]]
+name = "hermit-abi"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
+
 [[package]]
 name = "hex"
 version = "0.4.3"
@@ -7759,9 +7851,9 @@ dependencies = [
 
 [[package]]
 name = "hex-conservative"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30ed443af458ccb6d81c1e7e661545f94d3176752fb1df2f543b902a1e0f51e2"
+checksum = "212ab92002354b4819390025006c897e8140934349e8635c9b077f47b4dcbd20"
 
 [[package]]
 name = "hex-conservative"
@@ -7769,7 +7861,7 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5313b072ce3c597065a808dbf612c4c8e8590bdbf8b579508bf7a762c5eae6cd"
 dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec 0.7.6",
 ]
 
 [[package]]
@@ -7780,9 +7872,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "hickory-proto"
-version = "0.24.1"
+version = "0.24.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512"
+checksum = "92652067c9ce6f66ce53cc38d1169daa36e6e7eb7dd3b63b5103bd9d97117248"
 dependencies = [
  "async-trait",
  "cfg-if",
@@ -7791,12 +7883,12 @@ dependencies = [
  "futures-channel",
  "futures-io",
  "futures-util",
- "idna 0.4.0",
+ "idna",
  "ipnet",
  "once_cell",
  "rand 0.8.5",
- "socket2 0.5.9",
- "thiserror 1.0.65",
+ "socket2 0.5.10",
+ "thiserror 1.0.69",
  "tinyvec",
  "tokio",
  "tracing",
@@ -7816,11 +7908,11 @@ dependencies = [
  "futures-channel",
  "futures-io",
  "futures-util",
- "idna 1.0.3",
+ "idna",
  "ipnet",
  "once_cell",
- "rand 0.9.0",
- "ring 0.17.8",
+ "rand 0.9.2",
+ "ring 0.17.14",
  "thiserror 2.0.12",
  "tinyvec",
  "tokio",
@@ -7830,21 +7922,21 @@ dependencies = [
 
 [[package]]
 name = "hickory-resolver"
-version = "0.24.2"
+version = "0.24.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a2e2aba9c389ce5267d31cf1e4dace82390ae276b0b364ea55630b1fa1b44b4"
+checksum = "cbb117a1ca520e111743ab2f6688eddee69db4e0ea242545a604dce8a66fd22e"
 dependencies = [
  "cfg-if",
  "futures-util",
- "hickory-proto 0.24.1",
+ "hickory-proto 0.24.4",
  "ipconfig",
  "lru-cache",
  "once_cell",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "rand 0.8.5",
  "resolv-conf",
  "smallvec",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
  "tracing",
 ]
@@ -7861,8 +7953,8 @@ dependencies = [
  "ipconfig",
  "moka",
  "once_cell",
- "parking_lot 0.12.3",
- "rand 0.9.0",
+ "parking_lot 0.12.4",
+ "rand 0.9.2",
  "resolv-conf",
  "smallvec",
  "thiserror 2.0.12",
@@ -7911,41 +8003,31 @@ dependencies = [
 
 [[package]]
 name = "home"
-version = "0.5.9"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "honggfuzz"
-version = "0.5.55"
+version = "0.5.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "848e9c511092e0daa0a35a63e8e6e475a3e8f870741448b9f6028d69b142f18e"
+checksum = "fc563d4f41b17364d5c48ded509f2bcf1c3f6ae9c7f203055b4a5c325072d57e"
 dependencies = [
  "arbitrary",
  "lazy_static",
- "memmap2 0.5.10",
- "rustc_version 0.4.0",
-]
-
-[[package]]
-name = "hostname"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867"
-dependencies = [
- "libc",
- "match_cfg",
- "winapi",
+ "memmap2 0.9.7",
+ "rustc_version 0.4.1",
+ "semver 1.0.26",
 ]
 
 [[package]]
 name = "http"
-version = "0.2.9"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
 dependencies = [
  "bytes",
  "fnv",
@@ -7954,9 +8036,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.1.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
 dependencies = [
  "bytes",
  "fnv",
@@ -7965,35 +8047,35 @@ dependencies = [
 
 [[package]]
 name = "http-body"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
+checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
 dependencies = [
  "bytes",
- "http 0.2.9",
+ "http 0.2.12",
  "pin-project-lite",
 ]
 
 [[package]]
 name = "http-body"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
 dependencies = [
  "bytes",
- "http 1.1.0",
+ "http 1.3.1",
 ]
 
 [[package]]
 name = "http-body-util"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
 dependencies = [
  "bytes",
- "futures-util",
- "http 1.1.0",
- "http-body 1.0.0",
+ "futures-core",
+ "http 1.3.1",
+ "http-body 1.0.1",
  "pin-project-lite",
 ]
 
@@ -8005,9 +8087,9 @@ checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f"
 
 [[package]]
 name = "httparse"
-version = "1.10.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
 
 [[package]]
 name = "httpdate"
@@ -8017,9 +8099,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "humantime"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f"
 
 [[package]]
 name = "humantime-serde"
@@ -8033,22 +8115,22 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "0.14.29"
+version = "0.14.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33"
+checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2 0.3.26",
- "http 0.2.9",
- "http-body 0.4.5",
+ "h2 0.3.27",
+ "http 0.2.12",
+ "http-body 0.4.6",
  "httparse",
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.5.9",
+ "socket2 0.5.10",
  "tokio",
  "tower-service",
  "tracing",
@@ -8064,9 +8146,9 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "h2 0.4.5",
- "http 1.1.0",
- "http-body 1.0.0",
+ "h2 0.4.11",
+ "http 1.3.1",
+ "http-body 1.0.1",
  "httparse",
  "httpdate",
  "itoa",
@@ -8083,10 +8165,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
 dependencies = [
  "futures-util",
- "http 0.2.9",
- "hyper 0.14.29",
+ "http 0.2.12",
+ "hyper 0.14.32",
  "log",
- "rustls 0.21.7",
+ "rustls 0.21.12",
  "rustls-native-certs 0.6.3",
  "tokio",
  "tokio-rustls 0.24.1",
@@ -8094,22 +8176,21 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.3"
+version = "0.27.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
+checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
 dependencies = [
- "futures-util",
- "http 1.1.0",
+ "http 1.3.1",
  "hyper 1.6.0",
  "hyper-util",
  "log",
- "rustls 0.23.18",
- "rustls-native-certs 0.8.0",
+ "rustls 0.23.29",
+ "rustls-native-certs 0.8.1",
  "rustls-pki-types",
  "tokio",
- "tokio-rustls 0.26.0",
+ "tokio-rustls 0.26.2",
  "tower-service",
- "webpki-roots 0.26.3",
+ "webpki-roots 1.0.2",
 ]
 
 [[package]]
@@ -8118,7 +8199,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
 dependencies = [
- "hyper 0.14.29",
+ "hyper 0.14.32",
  "pin-project-lite",
  "tokio",
  "tokio-io-timeout",
@@ -8142,35 +8223,43 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.10"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
+checksum = "7f66d5bd4c6f02bf0542fad85d626775bab9258cf795a4256dcaf3161114d1df"
 dependencies = [
+ "base64 0.22.1",
  "bytes",
  "futures-channel",
+ "futures-core",
  "futures-util",
- "http 1.1.0",
- "http-body 1.0.0",
+ "http 1.3.1",
+ "http-body 1.0.1",
  "hyper 1.6.0",
+ "ipnet",
+ "libc",
+ "percent-encoding",
  "pin-project-lite",
- "socket2 0.5.9",
+ "socket2 0.5.10",
+ "system-configuration",
  "tokio",
  "tower-service",
  "tracing",
+ "windows-registry",
 ]
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.57"
+version = "0.1.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
+checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "iana-time-zone-haiku",
  "js-sys",
+ "log",
  "wasm-bindgen",
- "windows 0.48.0",
+ "windows-core 0.61.2",
 ]
 
 [[package]]
@@ -8184,21 +8273,22 @@ dependencies = [
 
 [[package]]
 name = "icu_collections"
-version = "1.5.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
 dependencies = [
  "displaydoc",
+ "potential_utf",
  "yoke",
  "zerofrom",
  "zerovec",
 ]
 
 [[package]]
-name = "icu_locid"
-version = "1.5.0"
+name = "icu_locale_core"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
 dependencies = [
  "displaydoc",
  "litemap",
@@ -8207,31 +8297,11 @@ dependencies = [
  "zerovec",
 ]
 
-[[package]]
-name = "icu_locid_transform"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_locid_transform_data",
- "icu_provider",
- "tinystr",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid_transform_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
-
 [[package]]
 name = "icu_normalizer"
-version = "1.5.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
 dependencies = [
  "displaydoc",
  "icu_collections",
@@ -8239,83 +8309,60 @@ dependencies = [
  "icu_properties",
  "icu_provider",
  "smallvec",
- "utf16_iter",
- "utf8_iter",
- "write16",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_normalizer_data"
-version = "1.5.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
 
 [[package]]
 name = "icu_properties"
-version = "1.5.1"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
 dependencies = [
  "displaydoc",
  "icu_collections",
- "icu_locid_transform",
+ "icu_locale_core",
  "icu_properties_data",
  "icu_provider",
- "tinystr",
+ "potential_utf",
+ "zerotrie",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_properties_data"
-version = "1.5.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
 
 [[package]]
 name = "icu_provider"
-version = "1.5.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
 dependencies = [
  "displaydoc",
- "icu_locid",
- "icu_provider_macros",
+ "icu_locale_core",
  "stable_deref_trait",
  "tinystr",
  "writeable",
  "yoke",
  "zerofrom",
+ "zerotrie",
  "zerovec",
 ]
 
-[[package]]
-name = "icu_provider_macros"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
-dependencies = [
- "proc-macro2 1.0.95",
- "quote 1.0.40",
- "syn 2.0.98",
-]
-
 [[package]]
 name = "ident_case"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
-[[package]]
-name = "idna"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
 [[package]]
 name = "idna"
 version = "1.0.3"
@@ -8329,9 +8376,9 @@ dependencies = [
 
 [[package]]
 name = "idna_adapter"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
 dependencies = [
  "icu_normalizer",
  "icu_properties",
@@ -8349,21 +8396,25 @@ dependencies = [
 
 [[package]]
 name = "if-watch"
-version = "3.2.0"
+version = "3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6b0422c86d7ce0e97169cc42e04ae643caf278874a7a3c87b8150a220dc7e1e"
+checksum = "cdf9d64cfcf380606e64f9a0bcf493616b65331199f984151a6fa11a7b3cde38"
 dependencies = [
- "async-io 2.3.3",
- "core-foundation",
+ "async-io 2.5.0",
+ "core-foundation 0.9.4",
  "fnv",
  "futures",
  "if-addrs",
  "ipnet",
  "log",
+ "netlink-packet-core",
+ "netlink-packet-route",
+ "netlink-proto",
+ "netlink-sys",
  "rtnetlink",
- "system-configuration 0.5.1",
+ "system-configuration",
  "tokio",
- "windows 0.51.1",
+ "windows 0.53.0",
 ]
 
 [[package]]
@@ -8376,8 +8427,8 @@ dependencies = [
  "attohttpc",
  "bytes",
  "futures",
- "http 0.2.9",
- "hyper 0.14.29",
+ "http 0.2.12",
+ "hyper 0.14.32",
  "log",
  "rand 0.8.5",
  "tokio",
@@ -8440,23 +8491,23 @@ checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "include_dir"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e"
+checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd"
 dependencies = [
  "include_dir_macros",
 ]
 
 [[package]]
 name = "include_dir_macros"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f"
+checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
@@ -8481,12 +8532,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.9.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
+checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.3",
+ "hashbrown 0.15.4",
  "serde",
 ]
 
@@ -8498,22 +8549,22 @@ checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590"
 
 [[package]]
 name = "indicatif"
-version = "0.17.7"
+version = "0.17.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25"
+checksum = "183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235"
 dependencies = [
  "console",
- "instant",
  "number_prefix",
  "portable-atomic",
- "unicode-width 0.1.10",
+ "unicode-width",
+ "web-time",
 ]
 
 [[package]]
 name = "inout"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
+checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
 dependencies = [
  "generic-array 0.14.7",
 ]
@@ -8542,11 +8593,22 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.3.9",
  "libc",
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "io-uring"
+version = "0.7.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4"
+dependencies = [
+ "bitflags 2.9.1",
+ "cfg-if",
+ "libc",
+]
+
 [[package]]
 name = "ip_network"
 version = "0.4.1"
@@ -8559,7 +8621,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
 dependencies = [
- "socket2 0.5.9",
+ "socket2 0.5.10",
  "widestring",
  "windows-sys 0.48.0",
  "winreg",
@@ -8567,30 +8629,46 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.8.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
+checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
 [[package]]
-name = "is-terminal"
-version = "0.4.9"
+name = "iri-string"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
+checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2"
 dependencies = [
- "hermit-abi",
- "rustix 0.38.42",
- "windows-sys 0.48.0",
-]
+ "memchr",
+ "serde",
+]
+
+[[package]]
+name = "is-terminal"
+version = "0.4.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
+dependencies = [
+ "hermit-abi 0.5.2",
+ "libc",
+ "windows-sys 0.59.0",
+]
 
 [[package]]
 name = "is_executable"
-version = "1.0.1"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa9acdc6d67b75e626ad644734e8bc6df893d9cd2a834129065d3dd6158ea9c8"
+checksum = "d4a1b5bad6f9072935961dfbf1cced2f3d129963d091b6f69f007fe04e758ae2"
 dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
 [[package]]
 name = "isahc"
 version = "1.7.2"
@@ -8605,7 +8683,7 @@ dependencies = [
  "encoding_rs",
  "event-listener 2.5.3",
  "futures-lite 1.13.0",
- "http 0.2.9",
+ "http 0.2.12",
  "log",
  "mime",
  "once_cell",
@@ -8654,11 +8732,20 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
-version = "1.0.9"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "jam-codec"
@@ -8666,7 +8753,7 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d72f2fb8cfd27f6c52ea7d0528df594f7f2ed006feac153e9393ec567aafea98"
 dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec 0.7.6",
  "bitvec",
  "byte-slice-cast",
  "const_format",
@@ -8682,24 +8769,50 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09985146f40378e13af626964ac9c206d9d9b67c40c70805898d9954f709bcf5"
 dependencies = [
- "proc-macro-crate 3.1.0",
+ "proc-macro-crate 3.3.0",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.104",
+]
+
+[[package]]
+name = "jiff"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49"
+dependencies = [
+ "jiff-static",
+ "log",
+ "portable-atomic",
+ "portable-atomic-util",
+ "serde",
+]
+
+[[package]]
+name = "jiff-static"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4"
+dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "jni"
-version = "0.19.0"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec"
+checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
 dependencies = [
  "cesu8",
+ "cfg-if",
  "combine",
  "jni-sys",
  "log",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "walkdir",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
@@ -8710,19 +8823,21 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
 [[package]]
 name = "jobserver"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
+checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a"
 dependencies = [
+ "getrandom 0.3.3",
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.72"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
 dependencies = [
+ "once_cell",
  "wasm-bindgen",
 ]
 
@@ -8734,7 +8849,7 @@ checksum = "ec9ad60d674508f3ca8f380a928cfe7b096bc729c4e2dbfe3852bc45da3ab30b"
 dependencies = [
  "serde",
  "serde_json",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -8747,7 +8862,7 @@ dependencies = [
  "pest_derive",
  "regex",
  "serde_json",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -8763,9 +8878,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee"
-version = "0.24.8"
+version = "0.24.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "834af00800e962dee8f7bfc0f60601de215e73e78e5497d733a2919da837d3c8"
+checksum = "37b26c20e2178756451cfeb0661fb74c47dd5988cb7e3939de7e9241fd604d42"
 dependencies = [
  "jsonrpsee-client-transport",
  "jsonrpsee-core",
@@ -8781,24 +8896,24 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-client-transport"
-version = "0.24.7"
+version = "0.24.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "548125b159ba1314104f5bb5f38519e03a41862786aa3925cf349aae9cdd546e"
+checksum = "bacb85abf4117092455e1573625e21b8f8ef4dec8aff13361140b2dc266cdff2"
 dependencies = [
  "base64 0.22.1",
  "futures-channel",
  "futures-util",
  "gloo-net",
- "http 1.1.0",
+ "http 1.3.1",
  "jsonrpsee-core",
  "pin-project",
- "rustls 0.23.18",
+ "rustls 0.23.29",
  "rustls-pki-types",
  "rustls-platform-verifier",
- "soketto 0.8.0",
- "thiserror 1.0.65",
+ "soketto 0.8.1",
+ "thiserror 1.0.69",
  "tokio",
- "tokio-rustls 0.26.0",
+ "tokio-rustls 0.26.2",
  "tokio-util",
  "tracing",
  "url",
@@ -8806,25 +8921,25 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-core"
-version = "0.24.7"
+version = "0.24.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2882f6f8acb9fdaec7cefc4fd607119a9bd709831df7d7672a1d3b644628280"
+checksum = "456196007ca3a14db478346f58c7238028d55ee15c1df15115596e411ff27925"
 dependencies = [
  "async-trait",
  "bytes",
  "futures-timer",
  "futures-util",
- "http 1.1.0",
- "http-body 1.0.0",
+ "http 1.3.1",
+ "http-body 1.0.1",
  "http-body-util",
  "jsonrpsee-types",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "pin-project",
  "rand 0.8.5",
  "rustc-hash 2.1.1",
  "serde",
  "serde_json",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-stream",
  "tracing",
@@ -8833,51 +8948,51 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-http-client"
-version = "0.24.7"
+version = "0.24.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3638bc4617f96675973253b3a45006933bde93c2fd8a6170b33c777cc389e5b"
+checksum = "c872b6c9961a4ccc543e321bb5b89f6b2d2c7fe8b61906918273a3333c95400c"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
- "http-body 1.0.0",
+ "http-body 1.0.1",
  "hyper 1.6.0",
- "hyper-rustls 0.27.3",
+ "hyper-rustls 0.27.7",
  "hyper-util",
  "jsonrpsee-core",
  "jsonrpsee-types",
- "rustls 0.23.18",
+ "rustls 0.23.29",
  "rustls-platform-verifier",
  "serde",
  "serde_json",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
- "tower",
+ "tower 0.4.13",
  "tracing",
  "url",
 ]
 
 [[package]]
 name = "jsonrpsee-proc-macros"
-version = "0.24.7"
+version = "0.24.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06c01ae0007548e73412c08e2285ffe5d723195bf268bce67b1b77c3bb2a14d"
+checksum = "5e65763c942dfc9358146571911b0cd1c361c2d63e2d2305622d40d36376ca80"
 dependencies = [
  "heck 0.5.0",
- "proc-macro-crate 3.1.0",
+ "proc-macro-crate 3.3.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "jsonrpsee-server"
-version = "0.24.7"
+version = "0.24.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82ad8ddc14be1d4290cd68046e7d1d37acd408efed6d3ca08aefcc3ad6da069c"
+checksum = "55e363146da18e50ad2b51a0a7925fc423137a0b1371af8235b1c231a0647328"
 dependencies = [
  "futures-util",
- "http 1.1.0",
- "http-body 1.0.0",
+ "http 1.3.1",
+ "http-body 1.0.1",
  "http-body-util",
  "hyper 1.6.0",
  "hyper-util",
@@ -8887,32 +9002,32 @@ dependencies = [
  "route-recognizer",
  "serde",
  "serde_json",
- "soketto 0.8.0",
- "thiserror 1.0.65",
+ "soketto 0.8.1",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-stream",
  "tokio-util",
- "tower",
+ "tower 0.4.13",
  "tracing",
 ]
 
 [[package]]
 name = "jsonrpsee-types"
-version = "0.24.7"
+version = "0.24.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a178c60086f24cc35bb82f57c651d0d25d99c4742b4d335de04e97fa1f08a8a1"
+checksum = "08a8e70baf945b6b5752fc8eb38c918a48f1234daf11355e07106d963f860089"
 dependencies = [
- "http 1.1.0",
+ "http 1.3.1",
  "serde",
  "serde_json",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "jsonrpsee-wasm-client"
-version = "0.24.7"
+version = "0.24.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a01cd500915d24ab28ca17527e23901ef1be6d659a2322451e1045532516c25"
+checksum = "e6558a9586cad43019dafd0b6311d0938f46efc116b34b28c74778bc11a2edf6"
 dependencies = [
  "jsonrpsee-client-transport",
  "jsonrpsee-core",
@@ -8921,11 +9036,11 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-ws-client"
-version = "0.24.7"
+version = "0.24.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fe322e0896d0955a3ebdd5bf813571c53fea29edd713bc315b76620b327e86d"
+checksum = "01b3323d890aa384f12148e8d2a1fd18eb66e9e7e825f9de4fa53bcc19b93eef"
 dependencies = [
- "http 1.1.0",
+ "http 1.3.1",
  "jsonrpsee-client-transport",
  "jsonrpsee-core",
  "jsonrpsee-types",
@@ -8962,9 +9077,9 @@ dependencies = [
 
 [[package]]
 name = "keccak"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940"
+checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654"
 dependencies = [
  "cpufeatures",
 ]
@@ -9010,7 +9125,7 @@ checksum = "c33070833c9ee02266356de0c43f723152bd38bd96ddf52c82b3af10c9138b28"
 name = "kitchensink-runtime"
 version = "3.0.0-dev"
 dependencies = [
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "log",
  "node-primitives",
  "pallet-example-mbm",
@@ -9049,9 +9164,9 @@ dependencies = [
  "either",
  "futures",
  "home",
- "http 0.2.9",
- "http-body 0.4.5",
- "hyper 0.14.29",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "hyper 0.14.32",
  "hyper-rustls 0.24.2",
  "hyper-timeout",
  "jsonpath-rust",
@@ -9060,17 +9175,17 @@ dependencies = [
  "pem",
  "pin-project",
  "rand 0.8.5",
- "rustls 0.21.7",
- "rustls-pemfile 1.0.3",
+ "rustls 0.21.12",
+ "rustls-pemfile",
  "secrecy 0.8.0",
  "serde",
  "serde_json",
  "serde_yaml",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-tungstenite 0.20.1",
  "tokio-util",
- "tower",
+ "tower 0.4.13",
  "tower-http 0.4.4",
  "tracing",
 ]
@@ -9083,13 +9198,13 @@ checksum = "b5bba93d054786eba7994d03ce522f368ef7d48c88a1826faa28478d85fb63ae"
 dependencies = [
  "chrono",
  "form_urlencoded",
- "http 0.2.9",
+ "http 0.2.12",
  "json-patch",
  "k8s-openapi",
  "once_cell",
  "serde",
  "serde_json",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -9107,12 +9222,12 @@ dependencies = [
  "json-patch",
  "k8s-openapi",
  "kube-client",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "pin-project",
  "serde",
  "serde_json",
  "smallvec",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-util",
  "tracing",
@@ -9143,7 +9258,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf7a85fe66f9ff9cd74e169fdd2c94c6e1e74c412c99a73b4df3200b5d3760b2"
 dependencies = [
  "kvdb",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
 ]
 
 [[package]]
@@ -9154,7 +9269,7 @@ checksum = "b644c70b92285f66bfc2032922a79000ea30af7bc2ab31902992a5dcb9b434f6"
 dependencies = [
  "kvdb",
  "num_cpus",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "regex",
  "rocksdb",
  "smallvec",
@@ -9171,13 +9286,13 @@ dependencies = [
 
 [[package]]
 name = "landlock"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1530c5b973eeed4ac216af7e24baf5737645a6272e361f1fb95710678b67d9cc"
+checksum = "9baa9eeb6e315942429397e617a190f4fdc696ef1ee0342939d641029cbb4ea7"
 dependencies = [
  "enumflags2",
  "libc",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -9196,16 +9311,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
-name = "leb128"
-version = "0.2.5"
+name = "leb128fmt"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
+checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
 
 [[package]]
 name = "libc"
-version = "0.2.172"
+version = "0.2.174"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
+checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
 
 [[package]]
 name = "libflate"
@@ -9229,20 +9344,19 @@ dependencies = [
 
 [[package]]
 name = "libfuzzer-sys"
-version = "0.4.7"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7"
+checksum = "5037190e1f70cbeef565bd267599242926f724d3b8a9f510fd7e0b540cfa4404"
 dependencies = [
  "arbitrary",
  "cc",
- "once_cell",
 ]
 
 [[package]]
 name = "libgit2-sys"
-version = "0.18.0+1.9.0"
+version = "0.18.2+1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1a117465e7e1597e8febea8bb0c410f1c7fb93b1e1cddf34363f8390367ffec"
+checksum = "1c42fe03df2bd3c53a3a9c7317ad91d80c81cd1fb0caec8d7cc4cd2bfa10c222"
 dependencies = [
  "cc",
  "libc",
@@ -9252,25 +9366,25 @@ dependencies = [
 
 [[package]]
 name = "libloading"
-version = "0.7.4"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
+checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
 dependencies = [
  "cfg-if",
- "winapi",
+ "windows-targets 0.53.2",
 ]
 
 [[package]]
 name = "libm"
-version = "0.2.8"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
 
 [[package]]
 name = "libnghttp2-sys"
-version = "0.1.9+1.58.0"
+version = "0.1.11+1.64.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b57e858af2798e167e709b9d969325b6d8e9d50232fcbc494d7d54f976854a64"
+checksum = "1b6c24e48a7167cffa7119da39d577fa482e66c688a4aac016bee862e1a713c4"
 dependencies = [
  "cc",
  "libc",
@@ -9286,7 +9400,7 @@ dependencies = [
  "either",
  "futures",
  "futures-timer",
- "getrandom 0.2.10",
+ "getrandom 0.2.16",
  "libp2p-allow-block-list",
  "libp2p-connection-limits",
  "libp2p-core",
@@ -9305,10 +9419,10 @@ dependencies = [
  "libp2p-upnp",
  "libp2p-websocket",
  "libp2p-yamux",
- "multiaddr 0.18.1",
+ "multiaddr 0.18.2",
  "pin-project",
  "rw-stream-sink",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -9346,17 +9460,17 @@ dependencies = [
  "futures",
  "futures-timer",
  "libp2p-identity",
- "multiaddr 0.18.1",
- "multihash 0.19.1",
+ "multiaddr 0.18.2",
+ "multihash 0.19.3",
  "multistream-select",
  "once_cell",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "pin-project",
  "quick-protobuf",
  "rand 0.8.5",
  "rw-stream-sink",
  "smallvec",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tracing",
  "unsigned-varint 0.8.0",
  "void",
@@ -9371,10 +9485,10 @@ checksum = "97f37f30d5c7275db282ecd86e54f29dd2176bd3ac656f06abf43bedb21eb8bd"
 dependencies = [
  "async-trait",
  "futures",
- "hickory-resolver 0.24.2",
+ "hickory-resolver 0.24.4",
  "libp2p-core",
  "libp2p-identity",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "smallvec",
  "tracing",
 ]
@@ -9393,29 +9507,29 @@ dependencies = [
  "libp2p-core",
  "libp2p-identity",
  "libp2p-swarm",
- "lru 0.12.3",
+ "lru 0.12.5",
  "quick-protobuf",
  "quick-protobuf-codec",
  "smallvec",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tracing",
  "void",
 ]
 
 [[package]]
 name = "libp2p-identity"
-version = "0.2.9"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55cca1eb2bc1fd29f099f3daaab7effd01e1a54b7c577d0ed082521034d912e8"
+checksum = "3104e13b51e4711ff5738caa1fb54467c8604c2e94d607e27745bcf709068774"
 dependencies = [
  "bs58",
  "ed25519-dalek",
  "hkdf",
- "multihash 0.19.1",
+ "multihash 0.19.3",
  "quick-protobuf",
  "rand 0.8.5",
  "sha2 0.10.9",
- "thiserror 1.0.65",
+ "thiserror 2.0.12",
  "tracing",
  "zeroize",
 ]
@@ -9426,7 +9540,7 @@ version = "0.46.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ced237d0bd84bbebb7c2cad4c073160dacb4fe40534963c32ed6d4c6bb7702a3"
 dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec 0.7.6",
  "asynchronous-codec 0.7.0",
  "bytes",
  "either",
@@ -9442,7 +9556,7 @@ dependencies = [
  "rand 0.8.5",
  "sha2 0.10.9",
  "smallvec",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tracing",
  "uint 0.9.5",
  "void",
@@ -9457,14 +9571,14 @@ checksum = "14b8546b6644032565eb29046b42744aee1e9f261ed99671b2c93fb140dba417"
 dependencies = [
  "data-encoding",
  "futures",
- "hickory-proto 0.24.1",
+ "hickory-proto 0.24.4",
  "if-watch",
  "libp2p-core",
  "libp2p-identity",
  "libp2p-swarm",
  "rand 0.8.5",
  "smallvec",
- "socket2 0.5.9",
+ "socket2 0.5.10",
  "tokio",
  "tracing",
  "void",
@@ -9500,15 +9614,15 @@ dependencies = [
  "futures",
  "libp2p-core",
  "libp2p-identity",
- "multiaddr 0.18.1",
- "multihash 0.19.1",
+ "multiaddr 0.18.2",
+ "multihash 0.19.3",
  "once_cell",
  "quick-protobuf",
  "rand 0.8.5",
  "sha2 0.10.9",
  "snow",
  "static_assertions",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tracing",
  "x25519-dalek",
  "zeroize",
@@ -9545,13 +9659,13 @@ dependencies = [
  "libp2p-core",
  "libp2p-identity",
  "libp2p-tls",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "quinn",
  "rand 0.8.5",
- "ring 0.17.8",
- "rustls 0.23.18",
- "socket2 0.5.9",
- "thiserror 1.0.65",
+ "ring 0.17.14",
+ "rustls 0.23.29",
+ "socket2 0.5.10",
+ "thiserror 1.0.69",
  "tokio",
  "tracing",
 ]
@@ -9589,7 +9703,7 @@ dependencies = [
  "libp2p-core",
  "libp2p-identity",
  "libp2p-swarm-derive",
- "lru 0.12.3",
+ "lru 0.12.5",
  "multistream-select",
  "once_cell",
  "rand 0.8.5",
@@ -9609,7 +9723,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -9624,7 +9738,7 @@ dependencies = [
  "libc",
  "libp2p-core",
  "libp2p-identity",
- "socket2 0.5.9",
+ "socket2 0.5.10",
  "tokio",
  "tracing",
 ]
@@ -9640,10 +9754,10 @@ dependencies = [
  "libp2p-core",
  "libp2p-identity",
  "rcgen",
- "ring 0.17.8",
- "rustls 0.23.18",
- "rustls-webpki 0.101.4",
- "thiserror 1.0.65",
+ "ring 0.17.14",
+ "rustls 0.23.29",
+ "rustls-webpki 0.101.7",
+ "thiserror 1.0.69",
  "x509-parser 0.16.0",
  "yasna",
 ]
@@ -9675,14 +9789,14 @@ dependencies = [
  "futures-rustls",
  "libp2p-core",
  "libp2p-identity",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "pin-project-lite",
  "rw-stream-sink",
- "soketto 0.8.0",
- "thiserror 1.0.65",
+ "soketto 0.8.1",
+ "thiserror 1.0.69",
  "tracing",
  "url",
- "webpki-roots 0.25.2",
+ "webpki-roots 0.25.4",
 ]
 
 [[package]]
@@ -9694,12 +9808,23 @@ dependencies = [
  "either",
  "futures",
  "libp2p-core",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tracing",
  "yamux 0.12.1",
  "yamux 0.13.5",
 ]
 
+[[package]]
+name = "libredox"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4488594b9328dee448adb906d8b126d9b7deb7cf5c22161ee591610bb1be83c0"
+dependencies = [
+ "bitflags 2.9.1",
+ "libc",
+ "redox_syscall 0.5.15",
+]
+
 [[package]]
 name = "librocksdb-sys"
 version = "0.11.0+8.1.1"
@@ -9717,12 +9842,12 @@ dependencies = [
 
 [[package]]
 name = "libsecp256k1"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95b09eff1b35ed3b33b877ced3a691fc7a481919c7e29c53c906226fcf55e2a1"
+checksum = "e79019718125edc905a079a70cfa5f3820bc76139fc91d6f9abc27ea2a887139"
 dependencies = [
  "arrayref",
- "base64 0.13.1",
+ "base64 0.22.1",
  "digest 0.9.0",
  "hmac-drbg",
  "libsecp256k1-core",
@@ -9742,7 +9867,7 @@ checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451"
 dependencies = [
  "crunchy",
  "digest 0.9.0",
- "subtle 2.5.0",
+ "subtle 2.6.1",
 ]
 
 [[package]]
@@ -9776,9 +9901,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.12"
+version = "1.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b"
+checksum = "8b70e7a7df205e92a1a4cd9aaae7898dac0aa555503cc0a649494d0d60e7651d"
 dependencies = [
  "cc",
  "libc",
@@ -9788,9 +9913,9 @@ dependencies = [
 
 [[package]]
 name = "link-cplusplus"
-version = "1.0.9"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d240c6f7e1ba3a28b0249f774e6a9dd0175054b52dfbb61b16eb8505c3785c9"
+checksum = "4a6f6da007f968f9def0d65a05b187e2960183de70c160204ecfccf0ee330212"
 dependencies = [
  "cc",
 ]
@@ -9803,18 +9928,18 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
 [[package]]
 name = "linked_hash_set"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47186c6da4d81ca383c7c47c1bfc80f4b95f4720514d860a5407aaf4233f9588"
+checksum = "bae85b5be22d9843c80e5fc80e9b64c8a3b1f98f867c709956eca3efff4e92e2"
 dependencies = [
  "linked-hash-map",
 ]
 
 [[package]]
 name = "linregress"
-version = "0.5.2"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4de0b5f52a9f84544d268f5fabb71b38962d6aa3c6600b8bcd27d44ccf9c9c45"
+checksum = "a9eda9dcf4f2a99787827661f312ac3219292549c2ee992bf9a6248ffb066bf7"
 dependencies = [
  "nalgebra",
 ]
@@ -9833,9 +9958,15 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.14"
+version = "0.4.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
 
 [[package]]
 name = "lioness"
@@ -9869,9 +10000,9 @@ dependencies = [
 
 [[package]]
 name = "litemap"
-version = "0.7.4"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
 
 [[package]]
 name = "litep2p"
@@ -9887,13 +10018,13 @@ dependencies = [
  "futures",
  "futures-timer",
  "hickory-resolver 0.25.2",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "libc",
  "mockall",
  "multiaddr 0.17.1",
  "multihash 0.17.0",
  "network-interface",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "pin-project",
  "prost 0.13.5",
  "prost-build",
@@ -9903,7 +10034,7 @@ dependencies = [
  "simple-dns",
  "smallvec",
  "snow",
- "socket2 0.5.9",
+ "socket2 0.5.10",
  "thiserror 2.0.12",
  "tokio",
  "tokio-stream",
@@ -9922,9 +10053,9 @@ dependencies = [
 
 [[package]]
 name = "lock_api"
-version = "0.4.10"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
+checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -9932,9 +10063,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 dependencies = [
  "serde",
  "value-bag",
@@ -9950,22 +10081,22 @@ dependencies = [
  "generator",
  "scoped-tls",
  "tracing",
- "tracing-subscriber 0.3.18",
+ "tracing-subscriber 0.3.19",
 ]
 
 [[package]]
 name = "lru"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eedb2bdbad7e0634f83989bf596f497b070130daaa398ab22d84c39e266deec5"
+checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21"
 
 [[package]]
 name = "lru"
-version = "0.12.3"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc"
+checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
 dependencies = [
- "hashbrown 0.14.5",
+ "hashbrown 0.15.4",
 ]
 
 [[package]]
@@ -9977,21 +10108,26 @@ dependencies = [
  "linked-hash-map",
 ]
 
+[[package]]
+name = "lru-slab"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
+
 [[package]]
 name = "lz4"
-version = "1.24.0"
+version = "1.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e9e2dd86df36ce760a60f6ff6ad526f7ba1f14ba0356f8254fb6905e6494df1"
+checksum = "a20b523e860d03443e98350ceaac5e71c6ba89aea7d960769ec3ce37f4de5af4"
 dependencies = [
- "libc",
  "lz4-sys",
 ]
 
 [[package]]
 name = "lz4-sys"
-version = "1.9.4"
+version = "1.11.1+lz4-1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900"
+checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6"
 dependencies = [
  "cc",
  "libc",
@@ -10006,15 +10142,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "mach2"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "macro-string"
 version = "0.1.4"
@@ -10023,7 +10150,7 @@ checksum = "1b27834086c65ec3f9387b096d66e99f221cf081c2b738042aa252bcd41204e3"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -10035,7 +10162,7 @@ dependencies = [
  "macro_magic_core",
  "macro_magic_macros",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -10049,7 +10176,7 @@ dependencies = [
  "macro_magic_core_macros",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -10060,7 +10187,7 @@ checksum = "b02abfe41815b5bd98dbd4260173db2c116dda171dc0fe7838cb206333b83308"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -10071,7 +10198,7 @@ checksum = "73ea28ee64b88876bf45277ed9a5817c1817df061a74f2b988971a12570e5869"
 dependencies = [
  "macro_magic_core",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -10080,12 +10207,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
 
-[[package]]
-name = "match_cfg"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
-
 [[package]]
 name = "matchers"
 version = "0.1.0"
@@ -10097,9 +10218,9 @@ dependencies = [
 
 [[package]]
 name = "matrixmultiply"
-version = "0.3.7"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "090126dc04f95dc0d1c1c91f61bdd474b3930ca064c1edc8a849da2c6cbe1e77"
+checksum = "a06de3016e9fae57a36fd14dba131fccf49f74b40b7fbdb472f96e361ec71a08"
 dependencies = [
  "autocfg",
  "rawpointer",
@@ -10117,17 +10238,17 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.4"
+version = "2.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
 
 [[package]]
 name = "memfd"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffc89ccdc6e10d6907450f753537ebc5c5d3460d2e4e62ea74bd571db62c0f9e"
+checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64"
 dependencies = [
- "rustix 0.37.23",
+ "rustix 0.38.44",
 ]
 
 [[package]]
@@ -10141,9 +10262,9 @@ dependencies = [
 
 [[package]]
 name = "memmap2"
-version = "0.9.3"
+version = "0.9.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45fd3a57831bf88bc63f8cebc0cf956116276e97fef3966103e96416209f7c92"
+checksum = "483758ad303d734cec05e5c12b41d7e93e6a6390c5e9dae6bdeb7c1259012d28"
 dependencies = [
  "libc",
 ]
@@ -10157,15 +10278,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "memoffset"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "memory-db"
 version = "0.34.0"
@@ -10174,7 +10286,7 @@ checksum = "7e300c54e3239a86f9c61cc63ab0f03862eb40b1c6e065dc6fd6ceaeff6da93d"
 dependencies = [
  "foldhash",
  "hash-db",
- "hashbrown 0.15.3",
+ "hashbrown 0.15.4",
 ]
 
 [[package]]
@@ -10183,7 +10295,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b3e3e3f549d27d2dc054372f320ddf68045a833fab490563ff70d4cf1b9d91ea"
 dependencies = [
- "array-bytes 9.1.2",
+ "array-bytes 9.3.0",
  "blake3",
  "frame-metadata 23.0.0",
  "parity-scale-codec",
@@ -10215,7 +10327,7 @@ dependencies = [
  "hex",
  "log",
  "num-traits",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "relay-utils",
  "sp-arithmetic",
  "sp-core 28.0.0",
@@ -10259,23 +10371,22 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.1"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
 dependencies = [
- "adler",
+ "adler2",
 ]
 
 [[package]]
 name = "mio"
-version = "1.0.2"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
 dependencies = [
- "hermit-abi",
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.52.0",
+ "wasi 0.11.1+wasi-snapshot-preview1",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -10285,7 +10396,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "daa3eb39495d8e2e2947a1d862852c90cc6a4a8845f8b41c8829cb9fcc047f4a"
 dependencies = [
  "arrayref",
- "arrayvec 0.7.4",
+ "arrayvec 0.7.6",
  "bitflags 1.3.2",
  "blake2 0.10.6",
  "c2-chacha",
@@ -10294,12 +10405,12 @@ dependencies = [
  "hashlink 0.8.4",
  "lioness",
  "log",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "rand_distr",
- "subtle 2.5.0",
- "thiserror 1.0.65",
+ "subtle 2.6.1",
+ "thiserror 1.0.69",
  "zeroize",
 ]
 
@@ -10310,7 +10421,7 @@ dependencies = [
  "futures",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "sc-block-builder",
  "sc-client-api",
  "sc-offchain",
@@ -10364,7 +10475,7 @@ dependencies = [
  "cfg-if",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -10377,12 +10488,12 @@ dependencies = [
  "crossbeam-epoch",
  "crossbeam-utils",
  "loom",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "portable-atomic",
- "rustc_version 0.4.0",
+ "rustc_version 0.4.1",
  "smallvec",
  "tagptr",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "uuid",
 ]
 
@@ -10413,20 +10524,20 @@ dependencies = [
 
 [[package]]
 name = "multiaddr"
-version = "0.18.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b852bc02a2da5feed68cd14fa50d0774b92790a5bdbfa932a813926c8472070"
+checksum = "fe6351f60b488e04c1d21bc69e56b89cb3f5e8f5d22557d6e8031bdfd79b6961"
 dependencies = [
  "arrayref",
  "byteorder",
  "data-encoding",
  "libp2p-identity",
  "multibase",
- "multihash 0.19.1",
+ "multihash 0.19.3",
  "percent-encoding",
  "serde",
  "static_assertions",
- "unsigned-varint 0.7.2",
+ "unsigned-varint 0.8.0",
  "url",
 ]
 
@@ -10460,21 +10571,21 @@ dependencies = [
 
 [[package]]
 name = "multihash"
-version = "0.19.1"
+version = "0.19.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "076d548d76a0e2a0d4ab471d0b1c36c577786dfc4471242035d97a12a735c492"
+checksum = "6b430e7953c29dd6a09afc29ff0bb69c6e306329ee6794700aee27b76a1aea8d"
 dependencies = [
  "core2",
- "unsigned-varint 0.7.2",
+ "unsigned-varint 0.8.0",
 ]
 
 [[package]]
 name = "multihash-derive"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc076939022111618a5026d3be019fd8b366e76314538ff9a1b59ffbcbf98bcd"
+checksum = "1d6d4752e6230d8ef7adf7bd5d8c4b1f6561c1014c5ba9a37445ccefe18aa1db"
 dependencies = [
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate 1.1.3",
  "proc-macro-error",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
@@ -10484,9 +10595,9 @@ dependencies = [
 
 [[package]]
 name = "multimap"
-version = "0.8.3"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
+checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084"
 
 [[package]]
 name = "multistream-select"
@@ -10504,13 +10615,12 @@ dependencies = [
 
 [[package]]
 name = "nalgebra"
-version = "0.32.3"
+version = "0.33.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "307ed9b18cc2423f29e83f84fd23a8e73628727990181f18641a8b5dc2ab1caa"
+checksum = "26aecdf64b707efd1310e3544d709c5c0ac61c13756046aaaba41be5c4f66a3b"
 dependencies = [
  "approx",
  "matrixmultiply",
- "nalgebra-macros",
  "num-complex",
  "num-rational",
  "num-traits",
@@ -10518,17 +10628,6 @@ dependencies = [
  "typenum",
 ]
 
-[[package]]
-name = "nalgebra-macros"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998"
-dependencies = [
- "proc-macro2 1.0.95",
- "quote 1.0.40",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "names"
 version = "0.14.0"
@@ -10546,9 +10645,9 @@ checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
 
 [[package]]
 name = "native-tls"
-version = "0.2.12"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
+checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
 dependencies = [
  "libc",
  "log",
@@ -10556,28 +10655,27 @@ dependencies = [
  "openssl-probe",
  "openssl-sys",
  "schannel",
- "security-framework",
+ "security-framework 2.11.1",
  "security-framework-sys",
  "tempfile",
 ]
 
 [[package]]
 name = "netlink-packet-core"
-version = "0.4.2"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "345b8ab5bd4e71a2986663e88c56856699d060e78e152e6e9d7966fcd5491297"
+checksum = "72724faf704479d67b388da142b186f916188505e7e0b26719019c525882eda4"
 dependencies = [
  "anyhow",
  "byteorder",
- "libc",
  "netlink-packet-utils",
 ]
 
 [[package]]
 name = "netlink-packet-route"
-version = "0.12.0"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9ea4302b9759a7a88242299225ea3688e63c85ea136371bb6cf94fd674efaab"
+checksum = "053998cea5a306971f88580d0829e90f270f940befd7cf928da179d4187a5a66"
 dependencies = [
  "anyhow",
  "bitflags 1.3.2",
@@ -10596,29 +10694,28 @@ dependencies = [
  "anyhow",
  "byteorder",
  "paste",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "netlink-proto"
-version = "0.10.0"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65b4b14489ab424703c092062176d52ba55485a89c076b4f9db05092b7223aa6"
+checksum = "72452e012c2f8d612410d89eea01e2d9b56205274abb35d53f60200b2ec41d60"
 dependencies = [
  "bytes",
  "futures",
  "log",
  "netlink-packet-core",
  "netlink-sys",
- "thiserror 1.0.65",
- "tokio",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
 name = "netlink-sys"
-version = "0.8.5"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411"
+checksum = "16c903aa70590cb93691bf97a767c8d1d6122d2cc9070433deb3bbf36ce8bd23"
 dependencies = [
  "bytes",
  "futures",
@@ -10629,21 +10726,21 @@ dependencies = [
 
 [[package]]
 name = "network-interface"
-version = "2.0.1"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3329f515506e4a2de3aa6e07027a6758e22e0f0e8eaf64fa47261cec2282602"
+checksum = "862f41f1276e7148fb597fc55ed8666423bebe045199a1298c3515a73ec5cdd9"
 dependencies = [
  "cc",
  "libc",
- "thiserror 1.0.65",
+ "thiserror 2.0.12",
  "winapi",
 ]
 
 [[package]]
 name = "nix"
-version = "0.24.3"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
+checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
 dependencies = [
  "bitflags 1.3.2",
  "cfg-if",
@@ -10673,6 +10770,18 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "nix"
+version = "0.30.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
+dependencies = [
+ "bitflags 2.9.1",
+ "cfg-if",
+ "cfg_aliases 0.2.1",
+ "libc",
+]
+
 [[package]]
 name = "no-std-compat"
 version = "0.4.1"
@@ -10689,10 +10798,10 @@ checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65"
 name = "node-bench"
 version = "0.9.0-dev"
 dependencies = [
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "async-trait",
  "clap",
- "derive_more 0.99.17",
+ "derive_more 0.99.20",
  "fs_extra",
  "futures",
  "hash-db",
@@ -10844,6 +10953,15 @@ dependencies = [
  "minimal-lexical",
 ]
 
+[[package]]
+name = "nom"
+version = "8.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "nonempty"
 version = "0.7.0"
@@ -10877,9 +10995,9 @@ dependencies = [
 
 [[package]]
 name = "num"
-version = "0.4.1"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af"
+checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
 dependencies = [
  "num-bigint",
  "num-complex",
@@ -10891,11 +11009,10 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.4"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
- "autocfg",
  "num-integer",
  "num-traits",
 ]
@@ -10919,9 +11036,9 @@ dependencies = [
 
 [[package]]
 name = "num-complex"
-version = "0.4.4"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214"
+checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
 dependencies = [
  "num-traits",
 ]
@@ -10940,7 +11057,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -10949,7 +11066,7 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3"
 dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec 0.7.6",
  "itoa",
 ]
 
@@ -10964,9 +11081,9 @@ dependencies = [
 
 [[package]]
 name = "num-iter"
-version = "0.1.43"
+version = "0.1.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
+checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
 dependencies = [
  "autocfg",
  "num-integer",
@@ -10975,11 +11092,10 @@ dependencies = [
 
 [[package]]
 name = "num-rational"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
+checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
 dependencies = [
- "autocfg",
  "num-bigint",
  "num-integer",
  "num-traits",
@@ -10997,11 +11113,11 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.5.2",
  "libc",
 ]
 
@@ -11021,10 +11137,10 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d"
 dependencies = [
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate 3.3.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -11056,29 +11172,20 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.32.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "object"
-version = "0.36.1"
+version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "oid-registry"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c958dd45046245b9c3c2547369bb634eb461670b2e7e0de552905801a648d1d"
+checksum = "a8d8034d9489cdaf79228eb9f6a3b8d7bb32ba00d6645ebd48eef4077ceb5bd9"
 dependencies = [
- "asn1-rs 0.6.1",
+ "asn1-rs 0.6.2",
 ]
 
 [[package]]
@@ -11087,7 +11194,7 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "12f40cff3dde1b6087cc5d5f5d4d65712f34016a03ed60e9c08dcc392736b5b7"
 dependencies = [
- "asn1-rs 0.7.0",
+ "asn1-rs 0.7.1",
 ]
 
 [[package]]
@@ -11100,11 +11207,17 @@ dependencies = [
  "portable-atomic",
 ]
 
+[[package]]
+name = "once_cell_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
+
 [[package]]
 name = "oorandom"
-version = "11.1.3"
+version = "11.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
+checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
 
 [[package]]
 name = "opaque-debug"
@@ -11114,15 +11227,15 @@ checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
 
 [[package]]
 name = "opaque-debug"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
+checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "openssl"
-version = "0.10.72"
+version = "0.10.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da"
+checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
 dependencies = [
  "bitflags 2.9.1",
  "cfg-if",
@@ -11141,20 +11254,20 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.107"
+version = "0.9.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8288979acd84749c744a9014b4382d42b8f7b2592847b5afb2ed29e5d16ede07"
+checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
 dependencies = [
  "cc",
  "libc",
@@ -11181,7 +11294,7 @@ dependencies = [
  "orchestra-proc-macro",
  "pin-project",
  "prioritized-metered-channel",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tracing",
 ]
 
@@ -11192,10 +11305,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43dfaf083aef571385fccfdc3a2f8ede8d0a1863160455d4f2b014d8f7d04a3f"
 dependencies = [
  "expander",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "itertools 0.11.0",
- "petgraph",
- "proc-macro-crate 3.1.0",
+ "petgraph 0.6.5",
+ "proc-macro-crate 3.3.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "syn 1.0.109",
@@ -11212,9 +11325,9 @@ dependencies = [
 
 [[package]]
 name = "os_pipe"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982"
+checksum = "db335f4760b14ead6290116f2427bf33a14d4f0617d49f78a246de10c1831224"
 dependencies = [
  "libc",
  "windows-sys 0.59.0",
@@ -11228,9 +11341,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
 [[package]]
 name = "owo-colors"
-version = "3.5.0"
+version = "4.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
+checksum = "48dd4f4a2c8405440fd0462561f0e5806bd0f77e86f51c761481bdd4018b545e"
 
 [[package]]
 name = "p256"
@@ -11294,7 +11407,7 @@ dependencies = [
 name = "pallet-alliance"
 version = "27.0.0"
 dependencies = [
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -11649,7 +11762,7 @@ dependencies = [
 name = "pallet-beefy-mmr"
 version = "28.0.0"
 dependencies = [
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "binary-merkle-tree",
  "frame-benchmarking",
  "frame-support",
@@ -11902,7 +12015,7 @@ dependencies = [
 name = "pallet-contracts"
 version = "27.0.0"
 dependencies = [
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "assert_matches",
  "environmental",
  "frame-benchmarking",
@@ -11948,8 +12061,8 @@ dependencies = [
  "parity-wasm",
  "sp-runtime",
  "tempfile",
- "toml 0.8.19",
- "twox-hash",
+ "toml 0.8.23",
+ "twox-hash 1.6.3",
 ]
 
 [[package]]
@@ -11989,7 +12102,7 @@ version = "18.0.0"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -12141,7 +12254,7 @@ dependencies = [
  "pallet-staking",
  "pallet-timestamp",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "scale-info",
  "sp-core 28.0.0",
  "sp-io",
@@ -12162,7 +12275,7 @@ dependencies = [
  "log",
  "pallet-balances",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "rand 0.8.5",
  "scale-info",
  "sp-arithmetic",
@@ -12187,7 +12300,7 @@ dependencies = [
  "log",
  "pallet-balances",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "rand 0.8.5",
  "scale-info",
  "sp-arithmetic",
@@ -13047,9 +13160,9 @@ name = "pallet-revive"
 version = "0.1.0"
 dependencies = [
  "alloy-core",
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "assert_matches",
- "derive_more 0.99.17",
+ "derive_more 0.99.20",
  "environmental",
  "ethereum-standards",
  "ethereum-types",
@@ -13066,6 +13179,7 @@ dependencies = [
  "pallet-balances",
  "pallet-proxy",
  "pallet-revive-fixtures",
+ "pallet-revive-fixtures-solidity",
  "pallet-revive-proc-macro",
  "pallet-revive-uapi",
  "pallet-timestamp",
@@ -13105,7 +13219,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "clap",
- "env_logger 0.11.3",
+ "env_logger 0.11.8",
  "futures",
  "git2",
  "hex",
@@ -13133,7 +13247,7 @@ dependencies = [
  "substrate-prometheus-endpoint",
  "subxt 0.41.0",
  "subxt-signer 0.41.0",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
 ]
 
@@ -13147,7 +13261,15 @@ dependencies = [
  "polkavm-linker",
  "sp-core 28.0.0",
  "sp-io",
- "toml 0.8.19",
+ "toml 0.8.23",
+]
+
+[[package]]
+name = "pallet-revive-fixtures-solidity"
+version = "0.1.0"
+dependencies = [
+ "alloy-core",
+ "anyhow",
 ]
 
 [[package]]
@@ -13156,7 +13278,7 @@ version = "0.1.0"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -13230,7 +13352,7 @@ dependencies = [
 name = "pallet-sassafras"
 version = "0.3.5-dev"
 dependencies = [
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -13690,11 +13812,11 @@ dependencies = [
 name = "pallet-staking-reward-curve"
 version = "11.0.0"
 dependencies = [
- "proc-macro-crate 3.1.0",
+ "proc-macro-crate 3.3.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "sp-runtime",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -13865,7 +13987,7 @@ dependencies = [
 name = "pallet-transaction-storage"
 version = "27.0.0"
 dependencies = [
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -14216,9 +14338,9 @@ checksum = "16b56e3a2420138bdb970f84dfb9c774aea80fa0e7371549eedec0d80c209c67"
 
 [[package]]
 name = "parity-db"
-version = "0.4.12"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59e9ab494af9e6e813c72170f0d3c1de1500990d62c97cc05cc7576f91aa402f"
+checksum = "592a28a24b09c9dc20ac8afaa6839abc417c720afe42c12e1e4a9d6aa2508d2e"
 dependencies = [
  "blake2 0.10.6",
  "crc32fast",
@@ -14228,10 +14350,11 @@ dependencies = [
  "log",
  "lz4",
  "memmap2 0.5.10",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "rand 0.8.5",
  "siphasher 0.3.11",
  "snap",
+ "winapi",
 ]
 
 [[package]]
@@ -14240,7 +14363,7 @@ version = "3.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "799781ae679d79a948e13d4824a40970bfa500058d245760dd857301059810fa"
 dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec 0.7.6",
  "bitvec",
  "byte-slice-cast",
  "bytes",
@@ -14257,10 +14380,10 @@ version = "3.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34b4653168b563151153c9e4c08ebed57fb8262bebfa79711552fa983c623e7a"
 dependencies = [
- "proc-macro-crate 3.1.0",
+ "proc-macro-crate 3.3.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -14288,12 +14411,12 @@ dependencies = [
 
 [[package]]
 name = "parking_lot"
-version = "0.12.3"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
 dependencies = [
  "lock_api",
- "parking_lot_core 0.9.8",
+ "parking_lot_core 0.9.11",
 ]
 
 [[package]]
@@ -14312,15 +14435,15 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.8"
+version = "0.9.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
+checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.3.5",
+ "redox_syscall 0.5.15",
  "smallvec",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -14337,7 +14460,7 @@ checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166"
 dependencies = [
  "base64ct",
  "rand_core 0.6.4",
- "subtle 2.5.0",
+ "subtle 2.6.1",
 ]
 
 [[package]]
@@ -14365,9 +14488,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
 
 [[package]]
 name = "pem"
-version = "3.0.4"
+version = "3.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae"
+checksum = "38af38e8470ac9dee3ce1bae1af9c1671fffc44ddfd8bd1d0a3445bf349a8ef3"
 dependencies = [
  "base64 0.22.1",
  "serde",
@@ -14672,19 +14795,20 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pest"
-version = "2.7.2"
+version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1acb4a4365a13f749a93f1a094a7805e5cfa0955373a9de860d962eaa3a5fe5a"
+checksum = "1db05f56d34358a8b1066f67cbb203ee3e7ed2ba674a6263a1d5ec6db2204323"
 dependencies = [
- "thiserror 1.0.65",
+ "memchr",
+ "thiserror 2.0.12",
  "ucd-trie",
 ]
 
 [[package]]
 name = "pest_derive"
-version = "2.7.2"
+version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "666d00490d4ac815001da55838c500eafb0320019bbaa44444137c48b443a853"
+checksum = "bb056d9e8ea77922845ec74a1c4e8fb17e7c218cc4fc11a15c5d25e189aa40bc"
 dependencies = [
  "pest",
  "pest_generator",
@@ -14692,36 +14816,45 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.7.2"
+version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68ca01446f50dbda87c1786af8770d535423fa8a53aec03b8f4e3d7eb10e0929"
+checksum = "87e404e638f781eb3202dc82db6760c8ae8a1eeef7fb3fa8264b2ef280504966"
 dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.7.2"
+version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56af0a30af74d0445c0bf6d9d051c979b516a1a5af790d251daee76005420a48"
+checksum = "edd1101f170f5903fde0914f899bb503d9ff5271d7ba76bbb70bea63690cc0d5"
 dependencies = [
- "once_cell",
  "pest",
  "sha2 0.10.9",
 ]
 
 [[package]]
 name = "petgraph"
-version = "0.6.4"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
+dependencies = [
+ "fixedbitset 0.4.2",
+ "indexmap 2.10.0",
+]
+
+[[package]]
+name = "petgraph"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
+checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772"
 dependencies = [
- "fixedbitset",
- "indexmap 2.9.0",
+ "fixedbitset 0.5.7",
+ "indexmap 2.10.0",
 ]
 
 [[package]]
@@ -14754,7 +14887,7 @@ dependencies = [
  "phf_shared",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -14783,14 +14916,14 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
 [[package]]
 name = "pin-utils"
@@ -14798,6 +14931,17 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
+[[package]]
+name = "piper"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
+dependencies = [
+ "atomic-waker",
+ "fastrand 2.3.0",
+ "futures-io",
+]
+
 [[package]]
 name = "pkcs1"
 version = "0.7.5"
@@ -14821,15 +14965,15 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.27"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
 [[package]]
 name = "plotters"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45"
+checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
 dependencies = [
  "num-traits",
  "plotters-backend",
@@ -14840,15 +14984,15 @@ dependencies = [
 
 [[package]]
 name = "plotters-backend"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609"
+checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
 
 [[package]]
 name = "plotters-svg"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab"
+checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670"
 dependencies = [
  "plotters-backend",
 ]
@@ -14894,7 +15038,7 @@ dependencies = [
  "rand_chacha 0.3.1",
  "rand_core 0.6.4",
  "sc-keystore",
- "schnorrkel 0.11.4",
+ "schnorrkel 0.11.5",
  "sp-application-crypto",
  "sp-authority-discovery",
  "sp-core 28.0.0",
@@ -14953,7 +15097,7 @@ dependencies = [
  "sp-keyring",
  "sp-keystore",
  "sp-tracing 16.0.0",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tracing-gum",
 ]
 
@@ -14983,7 +15127,7 @@ dependencies = [
  "sp-core 28.0.0",
  "sp-keyring",
  "sp-tracing 16.0.0",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
  "tracing-gum",
 ]
@@ -15020,7 +15164,7 @@ dependencies = [
  "sp-keyring",
  "sp-runtime",
  "substrate-build-script-utils",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -15050,7 +15194,7 @@ dependencies = [
  "sp-keystore",
  "sp-runtime",
  "sp-tracing 16.0.0",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-util",
  "tracing-gum",
@@ -15076,7 +15220,7 @@ dependencies = [
  "fatality",
  "futures",
  "futures-timer",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "parity-scale-codec",
  "polkadot-node-network-protocol",
  "polkadot-node-primitives",
@@ -15091,7 +15235,7 @@ dependencies = [
  "sp-keyring",
  "sp-keystore",
  "sp-tracing 16.0.0",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tracing-gum",
 ]
 
@@ -15107,7 +15251,7 @@ dependencies = [
  "reed-solomon-novelpoly",
  "sp-core 28.0.0",
  "sp-trie",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -15118,7 +15262,7 @@ dependencies = [
  "async-trait",
  "futures",
  "futures-timer",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "polkadot-node-network-protocol",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-test-helpers",
@@ -15151,7 +15295,7 @@ dependencies = [
  "futures",
  "futures-timer",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "polkadot-node-metrics",
  "polkadot-node-network-protocol",
  "polkadot-node-subsystem",
@@ -15164,7 +15308,7 @@ dependencies = [
  "sp-consensus",
  "sp-core 28.0.0",
  "sp-keyring",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tracing-gum",
 ]
 
@@ -15186,7 +15330,7 @@ dependencies = [
  "schnellru",
  "sp-core 28.0.0",
  "sp-keyring",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tracing-gum",
 ]
 
@@ -15197,14 +15341,14 @@ dependencies = [
  "assert_matches",
  "async-trait",
  "bitvec",
- "derive_more 0.99.17",
+ "derive_more 0.99.20",
  "futures",
  "futures-timer",
  "itertools 0.11.0",
  "kvdb-memorydb",
  "merlin",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-test-helpers",
@@ -15218,7 +15362,7 @@ dependencies = [
  "rand_core 0.6.4",
  "sc-keystore",
  "schnellru",
- "schnorrkel 0.11.4",
+ "schnorrkel 0.11.5",
  "sp-application-crypto",
  "sp-consensus",
  "sp-consensus-babe",
@@ -15228,7 +15372,7 @@ dependencies = [
  "sp-keystore",
  "sp-runtime",
  "sp-tracing 16.0.0",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tracing-gum",
 ]
 
@@ -15254,7 +15398,7 @@ dependencies = [
  "rand 0.8.5",
  "rand_core 0.6.4",
  "sc-keystore",
- "schnorrkel 0.11.4",
+ "schnorrkel 0.11.5",
  "sp-consensus",
  "sp-consensus-babe",
  "sp-core 28.0.0",
@@ -15273,7 +15417,7 @@ dependencies = [
  "futures-timer",
  "kvdb-memorydb",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "polkadot-erasure-coding",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
@@ -15285,7 +15429,7 @@ dependencies = [
  "sp-core 28.0.0",
  "sp-keyring",
  "sp-tracing 16.0.0",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tracing-gum",
 ]
 
@@ -15313,7 +15457,7 @@ dependencies = [
  "sp-keyring",
  "sp-keystore",
  "sp-tracing 16.0.0",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tracing-gum",
 ]
 
@@ -15328,7 +15472,7 @@ dependencies = [
  "polkadot-primitives",
  "polkadot-primitives-test-helpers",
  "sp-keystore",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tracing-gum",
  "wasm-timer",
 ]
@@ -15390,14 +15534,14 @@ dependencies = [
  "futures-timer",
  "kvdb-memorydb",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-test-helpers",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
  "sp-core 28.0.0",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tracing-gum",
 ]
 
@@ -15425,7 +15569,7 @@ dependencies = [
  "sp-keyring",
  "sp-keystore",
  "sp-tracing 16.0.0",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tracing-gum",
 ]
 
@@ -15441,7 +15585,7 @@ dependencies = [
  "polkadot-primitives",
  "sp-blockchain",
  "sp-inherents",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tracing-gum",
 ]
 
@@ -15461,7 +15605,7 @@ dependencies = [
  "rstest",
  "sp-core 28.0.0",
  "sp-tracing 16.0.0",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tracing-gum",
 ]
 
@@ -15481,7 +15625,7 @@ dependencies = [
  "polkadot-primitives-test-helpers",
  "sp-application-crypto",
  "sp-keystore",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tracing-gum",
 ]
 
@@ -15490,7 +15634,7 @@ name = "polkadot-node-core-pvf"
 version = "7.0.0"
 dependencies = [
  "always-assert",
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "assert_matches",
  "criterion",
  "futures",
@@ -15522,7 +15666,7 @@ dependencies = [
  "tempfile",
  "test-parachain-adder",
  "test-parachain-halt",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
  "tracing-gum",
 ]
@@ -15571,7 +15715,7 @@ dependencies = [
  "sp-io",
  "sp-tracing 16.0.0",
  "tempfile",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tracing-gum",
 ]
 
@@ -15662,7 +15806,7 @@ dependencies = [
  "async-channel 1.9.0",
  "async-trait",
  "bitvec",
- "derive_more 0.99.17",
+ "derive_more 0.99.20",
  "fatality",
  "futures",
  "hex",
@@ -15676,7 +15820,7 @@ dependencies = [
  "sc-network-types",
  "sp-runtime",
  "strum 0.26.3",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tracing-gum",
 ]
 
@@ -15692,14 +15836,14 @@ dependencies = [
  "polkadot-parachain-primitives",
  "polkadot-primitives",
  "sc-keystore",
- "schnorrkel 0.11.4",
+ "schnorrkel 0.11.5",
  "serde",
  "sp-application-crypto",
  "sp-consensus-babe",
  "sp-consensus-slots",
  "sp-keystore",
  "sp-maybe-compressed-blob",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "zstd 0.12.4",
 ]
 
@@ -15717,7 +15861,7 @@ version = "1.0.0"
 dependencies = [
  "async-trait",
  "futures",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "polkadot-erasure-coding",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
@@ -15737,7 +15881,7 @@ name = "polkadot-node-subsystem-types"
 version = "7.0.0"
 dependencies = [
  "async-trait",
- "derive_more 0.99.17",
+ "derive_more 0.99.20",
  "fatality",
  "futures",
  "orchestra",
@@ -15756,7 +15900,7 @@ dependencies = [
  "sp-consensus-babe",
  "sp-runtime",
  "substrate-prometheus-endpoint",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -15771,7 +15915,7 @@ dependencies = [
  "kvdb-shared-tests",
  "parity-db",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "polkadot-erasure-coding",
  "polkadot-node-metrics",
  "polkadot-node-network-protocol",
@@ -15789,7 +15933,7 @@ dependencies = [
  "sp-core 28.0.0",
  "sp-keystore",
  "tempfile",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tracing-gum",
 ]
 
@@ -15959,7 +16103,7 @@ name = "polkadot-parachain-primitives"
 version = "6.0.0"
 dependencies = [
  "bounded-collections 0.3.2",
- "derive_more 0.99.17",
+ "derive_more 0.99.20",
  "parity-scale-codec",
  "polkadot-core-primitives",
  "scale-info",
@@ -15994,7 +16138,7 @@ dependencies = [
  "sp-runtime",
  "sp-staking",
  "sp-std 14.0.0",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -16733,7 +16877,7 @@ dependencies = [
  "pallet-transaction-payment-rpc-runtime-api",
  "parity-db",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "polkadot-approval-distribution",
  "polkadot-availability-bitfield-distribution",
  "polkadot-availability-distribution",
@@ -16821,7 +16965,7 @@ dependencies = [
  "staging-xcm",
  "substrate-prometheus-endpoint",
  "tempfile",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tracing-gum",
  "westend-runtime",
  "westend-runtime-constants",
@@ -16857,7 +17001,7 @@ dependencies = [
  "sp-keyring",
  "sp-keystore",
  "sp-tracing 16.0.0",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tracing-gum",
 ]
 
@@ -17102,7 +17246,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "cumulus-zombienet-sdk-helpers",
- "env_logger 0.11.3",
+ "env_logger 0.11.8",
  "log",
  "parity-scale-codec",
  "polkadot-primitives",
@@ -17143,9 +17287,9 @@ dependencies = [
 
 [[package]]
 name = "polkavm-common"
-version = "0.9.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d9428a5cfcc85c5d7b9fc4b6a18c4b802d0173d768182a51cc7751640f08b92"
+checksum = "31ff33982a807d8567645d4784b9b5d7ab87bcb494f534a57cadd9012688e102"
 
 [[package]]
 name = "polkavm-common"
@@ -17160,11 +17304,11 @@ dependencies = [
 
 [[package]]
 name = "polkavm-derive"
-version = "0.9.1"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae8c4bea6f3e11cd89bb18bcdddac10bd9a24015399bd1c485ad68a985a19606"
+checksum = "c2eb703f3b6404c13228402e98a5eae063fd16b8f58afe334073ec105ee4117e"
 dependencies = [
- "polkavm-derive-impl-macro 0.9.0",
+ "polkavm-derive-impl-macro 0.18.0",
 ]
 
 [[package]]
@@ -17178,14 +17322,14 @@ dependencies = [
 
 [[package]]
 name = "polkavm-derive-impl"
-version = "0.9.0"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c4fdfc49717fb9a196e74a5d28e0bc764eb394a2c803eb11133a31ac996c60c"
+checksum = "2f2116a92e6e96220a398930f4c8a6cda1264206f3e2034fc9982bfd93f261f7"
 dependencies = [
- "polkavm-common 0.9.0",
+ "polkavm-common 0.18.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -17197,17 +17341,17 @@ dependencies = [
  "polkavm-common 0.26.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "polkavm-derive-impl-macro"
-version = "0.9.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ba81f7b5faac81e528eb6158a6f3c9e0bb1008e0ffa19653bc8dea925ecb429"
+checksum = "48c16669ddc7433e34c1007d31080b80901e3e8e523cb9d4b441c3910cf9294b"
 dependencies = [
- "polkavm-derive-impl 0.9.0",
- "syn 2.0.98",
+ "polkavm-derive-impl 0.18.1",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -17217,7 +17361,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "581d34cafec741dc5ffafbb341933c205b6457f3d76257a9d99fb56687219c91"
 dependencies = [
  "polkavm-derive-impl 0.26.0",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -17230,7 +17374,7 @@ dependencies = [
  "gimli 0.31.1",
  "hashbrown 0.14.5",
  "log",
- "object 0.36.1",
+ "object 0.36.7",
  "polkavm-common 0.26.0",
  "regalloc2 0.9.3",
  "rustc-demangle",
@@ -17260,16 +17404,16 @@ dependencies = [
 
 [[package]]
 name = "polling"
-version = "3.4.0"
+version = "3.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30054e72317ab98eddd8561db0f6524df3367636884b7b21b703e4b280a84a14"
+checksum = "8ee9b2fa7a4517d2c91ff5bc6c297a427a96749d15f98fcdbb22c05571a4d4b7"
 dependencies = [
  "cfg-if",
  "concurrent-queue",
+ "hermit-abi 0.5.2",
  "pin-project-lite",
- "rustix 0.38.42",
- "tracing",
- "windows-sys 0.52.0",
+ "rustix 1.0.8",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -17279,27 +17423,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf"
 dependencies = [
  "cpufeatures",
- "opaque-debug 0.3.0",
+ "opaque-debug 0.3.1",
  "universal-hash",
 ]
 
 [[package]]
 name = "polyval"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb"
+checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25"
 dependencies = [
  "cfg-if",
  "cpufeatures",
- "opaque-debug 0.3.0",
+ "opaque-debug 0.3.1",
  "universal-hash",
 ]
 
 [[package]]
 name = "portable-atomic"
-version = "1.11.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
+checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
+
+[[package]]
+name = "portable-atomic-util"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
+dependencies = [
+ "portable-atomic",
+]
 
 [[package]]
 name = "portpicker"
@@ -17310,6 +17463,15 @@ dependencies = [
  "rand 0.8.5",
 ]
 
+[[package]]
+name = "potential_utf"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585"
+dependencies = [
+ "zerovec",
+]
+
 [[package]]
 name = "powerfmt"
 version = "0.2.0"
@@ -17329,7 +17491,7 @@ dependencies = [
  "log",
  "nix 0.27.1",
  "once_cell",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "smallvec",
  "symbolic-demangle",
  "tempfile",
@@ -17338,33 +17500,35 @@ dependencies = [
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
 
 [[package]]
 name = "predicates"
-version = "3.0.3"
+version = "3.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9"
+checksum = "a5d19ee57562043d37e82899fade9a22ebab7be9cef5026b07fda9cdd4293573"
 dependencies = [
  "anstyle",
  "difflib",
- "itertools 0.10.5",
  "predicates-core",
 ]
 
 [[package]]
 name = "predicates-core"
-version = "1.0.6"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174"
+checksum = "727e462b119fe9c93fd0eb1429a5f7647394014cf3c04ab2c0350eeb09095ffa"
 
 [[package]]
 name = "predicates-tree"
-version = "1.0.9"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf"
+checksum = "72dd2d6d381dfb73a193c7fca536518d7caee39fc8503f74e7dc0be0531b425c"
 dependencies = [
  "predicates-core",
  "termtree",
@@ -17372,9 +17536,9 @@ dependencies = [
 
 [[package]]
 name = "pretty_assertions"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66"
+checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
 dependencies = [
  "diff",
  "yansi",
@@ -17382,12 +17546,12 @@ dependencies = [
 
 [[package]]
 name = "prettyplease"
-version = "0.2.12"
+version = "0.2.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62"
+checksum = "061c1221631e079b26479d25bbf2275bfe5917ae8419cd7e34f13bfc2aa7539a"
 dependencies = [
  "proc-macro2 1.0.95",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -17433,31 +17597,31 @@ checksum = "a172e6cc603231f2cf004232eabcecccc0da53ba576ab286ef7baa0cfc7927ad"
 dependencies = [
  "coarsetime",
  "crossbeam-queue",
- "derive_more 0.99.17",
+ "derive_more 0.99.20",
  "futures",
  "futures-timer",
  "nanorand",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tracing",
 ]
 
 [[package]]
 name = "proc-macro-crate"
-version = "1.3.1"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a"
 dependencies = [
- "once_cell",
- "toml_edit 0.19.15",
+ "thiserror 1.0.69",
+ "toml 0.5.11",
 ]
 
 [[package]]
 name = "proc-macro-crate"
-version = "3.1.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35"
 dependencies = [
- "toml_edit 0.21.0",
+ "toml_edit 0.22.27",
 ]
 
 [[package]]
@@ -17503,24 +17667,18 @@ dependencies = [
  "proc-macro-error-attr2",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.20+deprecated"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
-
 [[package]]
 name = "proc-macro-warning"
-version = "1.0.0"
+version = "1.84.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b698b0b09d40e9b7c1a47b132d66a8b54bcd20583d9b6d06e4535e383b4405c"
+checksum = "75eea531cfcd120e0851a3f8aed42c4841f78c889eefafd96339c72677ae42c3"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -17553,7 +17711,7 @@ dependencies = [
  "hex",
  "lazy_static",
  "procfs-core",
- "rustix 0.38.42",
+ "rustix 0.38.44",
 ]
 
 [[package]]
@@ -17569,16 +17727,16 @@ dependencies = [
 
 [[package]]
 name = "prometheus"
-version = "0.13.3"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c"
+checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1"
 dependencies = [
  "cfg-if",
  "fnv",
  "lazy_static",
  "memchr",
- "parking_lot 0.12.3",
- "thiserror 1.0.65",
+ "parking_lot 0.12.4",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -17589,7 +17747,7 @@ checksum = "504ee9ff529add891127c4827eb481bd69dc0ebc72e9a682e187db4caa60c3ca"
 dependencies = [
  "dtoa",
  "itoa",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "prometheus-client-derive-encode",
 ]
 
@@ -17601,34 +17759,34 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "prometheus-parse"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c2aa5feb83bf4b2c8919eaf563f51dbab41183de73ba2353c0e03cd7b6bd892"
+checksum = "811031bea65e5a401fb2e1f37d802cca6601e204ac463809a3189352d13b78a5"
 dependencies = [
  "chrono",
- "itertools 0.10.5",
+ "itertools 0.12.1",
  "once_cell",
  "regex",
 ]
 
 [[package]]
 name = "proptest"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14cae93065090804185d3b75f0bf93b8eeda30c7a9b4a33d3bdb3988d6229e50"
+checksum = "6fcdab19deb5195a31cf7726a210015ff1496ba1464fd42cb4f537b8b01b471f"
 dependencies = [
  "bit-set",
  "bit-vec",
  "bitflags 2.9.1",
  "lazy_static",
  "num-traits",
- "rand 0.8.5",
- "rand_chacha 0.3.1",
+ "rand 0.9.2",
+ "rand_chacha 0.9.0",
  "rand_xorshift",
  "regex-syntax 0.8.5",
  "rusty-fork",
@@ -17668,22 +17826,21 @@ dependencies = [
 
 [[package]]
 name = "prost-build"
-version = "0.13.2"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8650aabb6c35b860610e9cff5dc1af886c9e25073b7b1712a68972af4281302"
+checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf"
 dependencies = [
- "bytes",
- "heck 0.4.1",
- "itertools 0.13.0",
+ "heck 0.5.0",
+ "itertools 0.14.0",
  "log",
  "multimap",
  "once_cell",
- "petgraph",
+ "petgraph 0.7.1",
  "prettyplease",
  "prost 0.13.5",
  "prost-types",
  "regex",
- "syn 2.0.98",
+ "syn 2.0.104",
  "tempfile",
 ]
 
@@ -17710,7 +17867,7 @@ dependencies = [
  "itertools 0.12.1",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -17720,26 +17877,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
 dependencies = [
  "anyhow",
- "itertools 0.13.0",
+ "itertools 0.14.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "prost-types"
-version = "0.13.2"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60caa6738c7369b940c3d49246a8d1749323674c65cb13010134f5c9bad5b519"
+checksum = "52c2c1bf36ddb1a1c396b3601a3cec27c2462e45f07c386894ec3ccf5332bd16"
 dependencies = [
  "prost 0.13.5",
 ]
 
 [[package]]
 name = "psm"
-version = "0.1.21"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874"
+checksum = "6e944464ec8536cd1beb0bbfd96987eb5e3b72f2ecdafdc5c769a37f1fa2ae1f"
 dependencies = [
  "cc",
 ]
@@ -17757,35 +17914,33 @@ dependencies = [
  "prost 0.11.9",
  "reqwest",
  "serde_json",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "url",
  "winapi",
 ]
 
 [[package]]
 name = "pyroscope_pprofrs"
-version = "0.2.8"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614a25777053da6bdca9d84a67892490b5a57590248dbdee3d7bf0716252af70"
+checksum = "50da7a8950c542357de489aa9ee628f46322b1beaac1f4fa3313bcdebe85b4ea"
 dependencies = [
  "log",
  "pprof2",
  "pyroscope",
- "thiserror 1.0.65",
 ]
 
 [[package]]
 name = "quanta"
-version = "0.11.1"
+version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a17e662a7a8291a865152364c20c7abc5e60486ab2001e8ec10b24862de0b9ab"
+checksum = "f3ab5a9d756f0d97bdc89019bd2e4ea098cf9cde50ee7564dde6b81ccc8f06c7"
 dependencies = [
  "crossbeam-utils",
  "libc",
- "mach2",
  "once_cell",
  "raw-cpuid",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi 0.11.1+wasi-snapshot-preview1",
  "web-sys",
  "winapi",
 ]
@@ -17814,7 +17969,7 @@ dependencies = [
  "asynchronous-codec 0.7.0",
  "bytes",
  "quick-protobuf",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "unsigned-varint 0.8.0",
 ]
 
@@ -17826,7 +17981,7 @@ checksum = "5253a3a0d56548d5b0be25414171dc780cc6870727746d05bd2bde352eee96c5"
 dependencies = [
  "ahash",
  "hashbrown 0.13.2",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
 ]
 
 [[package]]
@@ -17842,51 +17997,58 @@ dependencies = [
 
 [[package]]
 name = "quinn"
-version = "0.11.5"
+version = "0.11.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684"
+checksum = "626214629cda6781b6dc1d316ba307189c85ba657213ce642d9c77670f8202c8"
 dependencies = [
  "bytes",
+ "cfg_aliases 0.2.1",
  "futures-io",
  "pin-project-lite",
  "quinn-proto",
  "quinn-udp",
  "rustc-hash 2.1.1",
- "rustls 0.23.18",
- "socket2 0.5.9",
- "thiserror 1.0.65",
+ "rustls 0.23.29",
+ "socket2 0.5.10",
+ "thiserror 2.0.12",
  "tokio",
  "tracing",
+ "web-time",
 ]
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.8"
+version = "0.11.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6"
+checksum = "49df843a9161c85bb8aae55f101bc0bac8bcafd637a620d9122fd7e0b2f7422e"
 dependencies = [
  "bytes",
- "rand 0.8.5",
- "ring 0.17.8",
+ "getrandom 0.3.3",
+ "lru-slab",
+ "rand 0.9.2",
+ "ring 0.17.14",
  "rustc-hash 2.1.1",
- "rustls 0.23.18",
+ "rustls 0.23.29",
+ "rustls-pki-types",
  "slab",
- "thiserror 1.0.65",
+ "thiserror 2.0.12",
  "tinyvec",
  "tracing",
+ "web-time",
 ]
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.4"
+version = "0.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285"
+checksum = "fcebb1209ee276352ef14ff8732e24cc2b02bbac986cd74a4c81bcb2f9881970"
 dependencies = [
+ "cfg_aliases 0.2.1",
  "libc",
  "once_cell",
- "socket2 0.5.9",
+ "socket2 0.5.10",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -17907,6 +18069,12 @@ dependencies = [
  "proc-macro2 1.0.95",
 ]
 
+[[package]]
+name = "r-efi"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
 [[package]]
 name = "radium"
 version = "0.7.0"
@@ -17926,14 +18094,13 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.9.0"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
+checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
 dependencies = [
  "rand_chacha 0.9.0",
- "rand_core 0.9.1",
+ "rand_core 0.9.3",
  "serde",
- "zerocopy 0.8.20",
 ]
 
 [[package]]
@@ -17953,7 +18120,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
 dependencies = [
  "ppv-lite86",
- "rand_core 0.9.1",
+ "rand_core 0.9.3",
 ]
 
 [[package]]
@@ -17962,18 +18129,17 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.10",
+ "getrandom 0.2.16",
 ]
 
 [[package]]
 name = "rand_core"
-version = "0.9.1"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a88e0da7a2c97baa202165137c158d0a2e824ac465d13d81046727b34cb247d3"
+checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
 dependencies = [
- "getrandom 0.3.1",
+ "getrandom 0.3.3",
  "serde",
- "zerocopy 0.8.20",
 ]
 
 [[package]]
@@ -17997,20 +18163,20 @@ dependencies = [
 
 [[package]]
 name = "rand_xorshift"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
+checksum = "513962919efc330f829edb2535844d1b912b0fbe2ca165d613e4e8788bb05a5a"
 dependencies = [
- "rand_core 0.6.4",
+ "rand_core 0.9.3",
 ]
 
 [[package]]
 name = "raw-cpuid"
-version = "10.7.0"
+version = "11.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332"
+checksum = "c6df7ab838ed27997ba19a4664507e6f82b41fe6e20be42929332156e5e85146"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.9.1",
 ]
 
 [[package]]
@@ -18082,31 +18248,22 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.5.8"
+version = "0.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
+checksum = "7e8af0dde094006011e6a740d4879319439489813bd0bcdc7d821beaeeff48ec"
 dependencies = [
  "bitflags 2.9.1",
 ]
 
 [[package]]
 name = "redox_users"
-version = "0.4.3"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
- "getrandom 0.2.10",
- "redox_syscall 0.2.16",
- "thiserror 1.0.65",
+ "getrandom 0.2.16",
+ "libredox",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -18115,30 +18272,30 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87413ebb313323d431e85d0afc5a68222aaed972843537cbfe5f061cf1b4bcab"
 dependencies = [
- "derive_more 0.99.17",
+ "derive_more 0.99.20",
  "fs-err",
  "static_init",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "ref-cast"
-version = "1.0.23"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931"
+checksum = "4a0ae411dbe946a674d89546582cea4ba2bb8defac896622d6496f14c23ba5cf"
 dependencies = [
  "ref-cast-impl",
 ]
 
 [[package]]
 name = "ref-cast-impl"
-version = "1.0.23"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6"
+checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -18174,7 +18331,7 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.8",
+ "regex-automata 0.4.9",
  "regex-syntax 0.8.5",
 ]
 
@@ -18189,15 +18346,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69"
-
-[[package]]
-name = "regex-automata"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -18218,9 +18369,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "relative-path"
-version = "1.9.2"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc"
+checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2"
 
 [[package]]
 name = "relay-substrate-client"
@@ -18258,7 +18409,7 @@ dependencies = [
  "sp-trie",
  "sp-version",
  "staging-xcm",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
 ]
 
@@ -18276,13 +18427,13 @@ dependencies = [
  "jsonpath_lib",
  "log",
  "num-traits",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "serde_json",
  "sp-runtime",
  "sp-tracing 16.0.0",
  "substrate-prometheus-endpoint",
  "sysinfo",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "time",
  "tokio",
 ]
@@ -18304,9 +18455,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.12.9"
+version = "0.12.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
+checksum = "cbc931937e6ca3a06e3b6c0aa7841849b160a90351d6ab467a8b9b9959767531"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -18314,52 +18465,45 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2 0.4.5",
- "http 1.1.0",
- "http-body 1.0.0",
+ "h2 0.4.11",
+ "http 1.3.1",
+ "http-body 1.0.1",
  "http-body-util",
  "hyper 1.6.0",
- "hyper-rustls 0.27.3",
+ "hyper-rustls 0.27.7",
  "hyper-tls",
  "hyper-util",
- "ipnet",
  "js-sys",
  "log",
  "mime",
  "native-tls",
- "once_cell",
  "percent-encoding",
  "pin-project-lite",
  "quinn",
- "rustls 0.23.18",
- "rustls-pemfile 2.0.0",
+ "rustls 0.23.29",
  "rustls-pki-types",
  "serde",
  "serde_json",
  "serde_urlencoded",
  "sync_wrapper",
- "system-configuration 0.6.1",
  "tokio",
  "tokio-native-tls",
- "tokio-rustls 0.26.0",
+ "tokio-rustls 0.26.2",
+ "tower 0.5.2",
+ "tower-http 0.6.6",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "webpki-roots 0.26.3",
- "windows-registry",
+ "webpki-roots 1.0.2",
 ]
 
 [[package]]
 name = "resolv-conf"
-version = "0.7.0"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00"
-dependencies = [
- "hostname",
- "quick-error",
-]
+checksum = "95325155c684b1c89f7765e30bc1c42e4a6da51ca513615660cb8a62ef9a88e3"
 
 [[package]]
 name = "revive-dev-node"
@@ -18378,7 +18522,7 @@ dependencies = [
 name = "revive-dev-runtime"
 version = "0.0.0"
 dependencies = [
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "parity-scale-codec",
  "polkadot-sdk 0.1.0",
  "scale-info",
@@ -18581,7 +18725,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
 dependencies = [
  "hmac 0.12.1",
- "subtle 2.5.0",
+ "subtle 2.6.1",
 ]
 
 [[package]]
@@ -18601,15 +18745,14 @@ dependencies = [
 
 [[package]]
 name = "ring"
-version = "0.17.8"
+version = "0.17.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom 0.2.10",
+ "getrandom 0.2.16",
  "libc",
- "spin 0.9.8",
  "untrusted 0.9.0",
  "windows-sys 0.52.0",
 ]
@@ -18878,20 +19021,20 @@ checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746"
 
 [[package]]
 name = "rpassword"
-version = "7.2.0"
+version = "7.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322"
+checksum = "66d4c8b64f049c6721ec8ccec37ddfc3d641c4a7fca57e8f2a89de509c73df39"
 dependencies = [
  "libc",
  "rtoolbox",
- "winapi",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "rsa"
-version = "0.9.5"
+version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af6c4b23d99685a1408194da11270ef8e9809aff951cc70ec9b17350b087e474"
+checksum = "78928ac1ed176a5ca1d17e578a1825f3d81ca54cf41053a592584b020cfd691b"
 dependencies = [
  "const-oid",
  "digest 0.10.7",
@@ -18903,7 +19046,7 @@ dependencies = [
  "rand_core 0.6.4",
  "signature",
  "spki",
- "subtle 2.5.0",
+ "subtle 2.6.1",
  "zeroize",
 ]
 
@@ -18916,7 +19059,7 @@ dependencies = [
  "futures",
  "futures-timer",
  "rstest_macros",
- "rustc_version 0.4.0",
+ "rustc_version 0.4.1",
 ]
 
 [[package]]
@@ -18931,34 +19074,37 @@ dependencies = [
  "quote 1.0.40",
  "regex",
  "relative-path",
- "rustc_version 0.4.0",
- "syn 2.0.98",
+ "rustc_version 0.4.1",
+ "syn 2.0.104",
  "unicode-ident",
 ]
 
 [[package]]
 name = "rtnetlink"
-version = "0.10.1"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "322c53fd76a18698f1c27381d58091de3a043d356aa5bd0d510608b565f469a0"
+checksum = "7a552eb82d19f38c3beed3f786bd23aa434ceb9ac43ab44419ca6d67a7e186c0"
 dependencies = [
  "futures",
  "log",
+ "netlink-packet-core",
  "netlink-packet-route",
+ "netlink-packet-utils",
  "netlink-proto",
- "nix 0.24.3",
- "thiserror 1.0.65",
+ "netlink-sys",
+ "nix 0.26.4",
+ "thiserror 1.0.69",
  "tokio",
 ]
 
 [[package]]
 name = "rtoolbox"
-version = "0.0.1"
+version = "0.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a"
+checksum = "a7cc970b249fbe527d6e02e0a227762c9108b2f49d81094fe357ffc6d14d7f6f"
 dependencies = [
  "libc",
- "winapi",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -18992,7 +19138,7 @@ dependencies = [
  "primitive-types 0.12.2",
  "proptest",
  "rand 0.8.5",
- "rand 0.9.0",
+ "rand 0.9.2",
  "rlp 0.5.2",
  "ruint-macro",
  "serde",
@@ -19008,9 +19154,9 @@ checksum = "48fd7bd8a6377e15ad9d42a8ec25371b94ddc67abe7c8b9127bec79bebaaae18"
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.23"
+version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f"
 
 [[package]]
 name = "rustc-hash"
@@ -19050,11 +19196,11 @@ dependencies = [
 
 [[package]]
 name = "rustc_version"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
 dependencies = [
- "semver 1.0.18",
+ "semver 1.0.26",
 ]
 
 [[package]]
@@ -19063,14 +19209,14 @@ version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632"
 dependencies = [
- "nom",
+ "nom 7.1.3",
 ]
 
 [[package]]
 name = "rustix"
-version = "0.36.15"
+version = "0.36.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c37f1bd5ef1b5422177b7646cba67430579cfe2ace80f284fee876bca52ad941"
+checksum = "305efbd14fde4139eb501df5f136994bb520b033fa9fbdce287507dc23b8c7ed"
 dependencies = [
  "bitflags 1.3.2",
  "errno",
@@ -19082,9 +19228,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.37.23"
+version = "0.37.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06"
+checksum = "519165d378b97752ca44bbe15047d5d3409e875f39327546b42ac81d7e18c1b6"
 dependencies = [
  "bitflags 1.3.2",
  "errno",
@@ -19096,41 +19242,54 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.42"
+version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85"
+checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
  "bitflags 2.9.1",
  "errno",
  "libc",
- "linux-raw-sys 0.4.14",
- "windows-sys 0.52.0",
+ "linux-raw-sys 0.4.15",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "rustix"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
+dependencies = [
+ "bitflags 2.9.1",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.9.4",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.21.7"
+version = "0.21.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8"
+checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
 dependencies = [
  "log",
- "ring 0.16.20",
- "rustls-webpki 0.101.4",
+ "ring 0.17.14",
+ "rustls-webpki 0.101.7",
  "sct",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.23.18"
+version = "0.23.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c9cc1d47e243d655ace55ed38201c19ae02c148ae56412ab8750e8f0166ab7f"
+checksum = "2491382039b29b9b11ff08b76ff6c97cf287671dbb74f0be44bda389fffe9bd1"
 dependencies = [
  "log",
  "once_cell",
- "ring 0.17.8",
+ "ring 0.17.14",
  "rustls-pki-types",
- "rustls-webpki 0.102.8",
- "subtle 2.5.0",
+ "rustls-webpki 0.103.4",
+ "subtle 2.6.1",
  "zeroize",
 ]
 
@@ -19141,115 +19300,95 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
 dependencies = [
  "openssl-probe",
- "rustls-pemfile 1.0.3",
- "schannel",
- "security-framework",
-]
-
-[[package]]
-name = "rustls-native-certs"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792"
-dependencies = [
- "openssl-probe",
- "rustls-pemfile 2.0.0",
- "rustls-pki-types",
+ "rustls-pemfile",
  "schannel",
- "security-framework",
+ "security-framework 2.11.1",
 ]
 
 [[package]]
 name = "rustls-native-certs"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a"
+checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3"
 dependencies = [
  "openssl-probe",
- "rustls-pemfile 2.0.0",
  "rustls-pki-types",
  "schannel",
- "security-framework",
+ "security-framework 3.2.0",
 ]
 
 [[package]]
 name = "rustls-pemfile"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
+checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
 dependencies = [
  "base64 0.21.7",
 ]
 
 [[package]]
-name = "rustls-pemfile"
-version = "2.0.0"
+name = "rustls-pki-types"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35e4980fa29e4c4b212ffb3db068a564cbf560e51d3944b7c88bd8bf5bec64f4"
+checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
 dependencies = [
- "base64 0.21.7",
- "rustls-pki-types",
+ "web-time",
+ "zeroize",
 ]
 
-[[package]]
-name = "rustls-pki-types"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
-
 [[package]]
 name = "rustls-platform-verifier"
-version = "0.3.1"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5f0d26fa1ce3c790f9590868f0109289a044acb954525f933e2aa3b871c157d"
+checksum = "19787cda76408ec5404443dc8b31795c87cd8fec49762dc75fa727740d34acc1"
 dependencies = [
- "core-foundation",
+ "core-foundation 0.10.1",
  "core-foundation-sys",
  "jni",
  "log",
  "once_cell",
- "rustls 0.23.18",
- "rustls-native-certs 0.7.0",
+ "rustls 0.23.29",
+ "rustls-native-certs 0.8.1",
  "rustls-platform-verifier-android",
- "rustls-webpki 0.102.8",
- "security-framework",
+ "rustls-webpki 0.103.4",
+ "security-framework 3.2.0",
  "security-framework-sys",
- "webpki-roots 0.26.3",
- "winapi",
+ "webpki-root-certs 0.26.11",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "rustls-platform-verifier-android"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84e217e7fdc8466b5b35d30f8c0a30febd29173df4a3a0c2115d306b9c4117ad"
+checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
 
 [[package]]
 name = "rustls-webpki"
-version = "0.101.4"
+version = "0.101.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d"
+checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
 dependencies = [
- "ring 0.16.20",
- "untrusted 0.7.1",
+ "ring 0.17.14",
+ "untrusted 0.9.0",
 ]
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.8"
+version = "0.103.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
+checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc"
 dependencies = [
- "ring 0.17.8",
+ "ring 0.17.14",
  "rustls-pki-types",
  "untrusted 0.9.0",
 ]
 
 [[package]]
 name = "rustversion"
-version = "1.0.17"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
+checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
 
 [[package]]
 name = "rusty-fork"
@@ -19271,7 +19410,7 @@ checksum = "ac3ffab8f9715a0d455df4bbb9d21e91135aab3cd3ca187af0cd0c3c3f868fdc"
 dependencies = [
  "byteorder",
  "thiserror-core",
- "twox-hash",
+ "twox-hash 1.6.3",
 ]
 
 [[package]]
@@ -19281,9 +19420,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5174a470eeb535a721ae9fdd6e291c2411a906b96592182d05217591d5c5cf7b"
 dependencies = [
  "byteorder",
- "derive_more 0.99.17",
+ "derive_more 0.99.20",
 ]
 
+[[package]]
+name = "ruzstd"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3640bec8aad418d7d03c72ea2de10d5c646a598f9883c7babc160d91e3c1b26c"
+
 [[package]]
 name = "rw-stream-sink"
 version = "0.4.0"
@@ -19297,9 +19442,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.15"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
 [[package]]
 name = "safe-mix"
@@ -19312,9 +19457,9 @@ dependencies = [
 
 [[package]]
 name = "safe_arch"
-version = "0.7.1"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354"
+checksum = "96b02de82ddbe1b636e6170c21be622223aea188ef2e139be0a5b219ec215323"
 dependencies = [
  "bytemuck",
 ]
@@ -19344,7 +19489,7 @@ dependencies = [
  "log",
  "sp-core 28.0.0",
  "sp-wasm-interface 20.0.0",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -19379,7 +19524,7 @@ dependencies = [
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
  "tempfile",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
 ]
 
@@ -19390,7 +19535,7 @@ dependencies = [
  "futures",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "sc-block-builder",
  "sc-client-api",
  "sc-proposer-metrics",
@@ -19427,10 +19572,10 @@ dependencies = [
 name = "sc-chain-spec"
 version = "28.0.0"
 dependencies = [
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "clap",
  "docify",
- "memmap2 0.9.3",
+ "memmap2 0.9.7",
  "parity-scale-codec",
  "pretty_assertions",
  "regex",
@@ -19459,17 +19604,17 @@ dependencies = [
 name = "sc-chain-spec-derive"
 version = "11.0.0"
 dependencies = [
- "proc-macro-crate 3.1.0",
+ "proc-macro-crate 3.3.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "sc-cli"
 version = "0.36.0"
 dependencies = [
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "chrono",
  "clap",
  "fdlimit",
@@ -19505,7 +19650,7 @@ dependencies = [
  "sp-tracing 16.0.0",
  "sp-version",
  "tempfile",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
 ]
 
@@ -19517,7 +19662,7 @@ dependencies = [
  "futures",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "sc-executor",
  "sc-transaction-pool-api",
  "sc-utils",
@@ -19539,7 +19684,7 @@ dependencies = [
 name = "sc-client-db"
 version = "0.35.0"
 dependencies = [
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "criterion",
  "hash-db",
  "kitchensink-runtime",
@@ -19550,7 +19695,7 @@ dependencies = [
  "log",
  "parity-db",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "rand 0.8.5",
  "sc-client-api",
  "sc-state-db",
@@ -19577,7 +19722,7 @@ dependencies = [
  "futures",
  "log",
  "mockall",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "sc-client-api",
  "sc-network-types",
  "sc-utils",
@@ -19589,7 +19734,7 @@ dependencies = [
  "sp-state-machine",
  "sp-test-primitives",
  "substrate-prometheus-endpoint",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -19600,7 +19745,7 @@ dependencies = [
  "futures",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "sc-block-builder",
  "sc-client-api",
  "sc-consensus",
@@ -19626,7 +19771,7 @@ dependencies = [
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
  "tempfile",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
 ]
 
@@ -19642,7 +19787,7 @@ dependencies = [
  "num-rational",
  "num-traits",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "sc-block-builder",
  "sc-client-api",
  "sc-consensus",
@@ -19668,7 +19813,7 @@ dependencies = [
  "sp-tracing 16.0.0",
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
 ]
 
@@ -19694,7 +19839,7 @@ dependencies = [
  "sp-keystore",
  "sp-runtime",
  "substrate-test-runtime-client",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
 ]
 
@@ -19702,13 +19847,13 @@ dependencies = [
 name = "sc-consensus-beefy"
 version = "13.0.0"
 dependencies = [
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "async-channel 1.9.0",
  "async-trait",
  "futures",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "sc-block-builder",
  "sc-client-api",
  "sc-consensus",
@@ -19732,7 +19877,7 @@ dependencies = [
  "sp-tracing 16.0.0",
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
  "wasm-timer",
 ]
@@ -19745,7 +19890,7 @@ dependencies = [
  "jsonrpsee",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "sc-consensus-beefy",
  "sc-rpc",
  "serde",
@@ -19754,7 +19899,7 @@ dependencies = [
  "sp-core 28.0.0",
  "sp-runtime",
  "substrate-test-runtime-client",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
 ]
 
@@ -19775,7 +19920,7 @@ name = "sc-consensus-grandpa"
 version = "0.19.0"
 dependencies = [
  "ahash",
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "assert_matches",
  "async-trait",
  "dyn-clone",
@@ -19785,7 +19930,7 @@ dependencies = [
  "futures-timer",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "rand 0.8.5",
  "sc-block-builder",
  "sc-chain-spec",
@@ -19815,7 +19960,7 @@ dependencies = [
  "sp-tracing 16.0.0",
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
 ]
 
@@ -19839,7 +19984,7 @@ dependencies = [
  "sp-keyring",
  "sp-runtime",
  "substrate-test-runtime-client",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
 ]
 
@@ -19877,7 +20022,7 @@ dependencies = [
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
  "substrate-test-runtime-transaction-pool",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
 ]
 
@@ -19890,7 +20035,7 @@ dependencies = [
  "futures-timer",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "sc-client-api",
  "sc-consensus",
  "sp-api",
@@ -19902,7 +20047,7 @@ dependencies = [
  "sp-inherents",
  "sp-runtime",
  "substrate-prometheus-endpoint",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -19932,12 +20077,12 @@ dependencies = [
 name = "sc-executor"
 version = "0.32.0"
 dependencies = [
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "assert_matches",
  "criterion",
  "num_cpus",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "paste",
  "sc-executor-common",
  "sc-executor-polkavm",
@@ -19962,7 +20107,7 @@ dependencies = [
  "substrate-test-runtime",
  "tempfile",
  "tracing",
- "tracing-subscriber 0.3.18",
+ "tracing-subscriber 0.3.19",
  "wat",
 ]
 
@@ -19974,7 +20119,7 @@ dependencies = [
  "sc-allocator",
  "sp-maybe-compressed-blob",
  "sp-wasm-interface 20.0.0",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "wasm-instrument",
 ]
 
@@ -19996,9 +20141,9 @@ dependencies = [
  "cargo_metadata",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "paste",
- "rustix 0.36.15",
+ "rustix 0.36.17",
  "sc-allocator",
  "sc-executor-common",
  "sc-runtime-test",
@@ -20029,22 +20174,22 @@ dependencies = [
 name = "sc-keystore"
 version = "25.0.0"
 dependencies = [
- "array-bytes 6.2.2",
- "parking_lot 0.12.3",
+ "array-bytes 6.2.3",
+ "parking_lot 0.12.4",
  "serde_json",
  "sp-application-crypto",
  "sp-core 28.0.0",
  "sp-keystore",
  "tempfile",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "sc-mixnet"
 version = "0.4.0"
 dependencies = [
- "array-bytes 6.2.2",
- "arrayvec 0.7.4",
+ "array-bytes 6.2.3",
+ "arrayvec 0.7.6",
  "blake2 0.10.6",
  "bytes",
  "futures",
@@ -20052,7 +20197,7 @@ dependencies = [
  "log",
  "mixnet",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "sc-client-api",
  "sc-network",
  "sc-network-types",
@@ -20063,14 +20208,14 @@ dependencies = [
  "sp-keystore",
  "sp-mixnet",
  "sp-runtime",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "sc-network"
 version = "0.34.0"
 dependencies = [
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "assert_matches",
  "async-channel 1.9.0",
  "async-trait",
@@ -20090,7 +20235,7 @@ dependencies = [
  "mockall",
  "multistream-select",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "partial_sort",
  "pin-project",
  "prost 0.12.6",
@@ -20116,7 +20261,7 @@ dependencies = [
  "substrate-test-runtime",
  "substrate-test-runtime-client",
  "tempfile",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-stream",
  "tokio-util",
@@ -20162,7 +20307,7 @@ dependencies = [
 name = "sc-network-light"
 version = "0.33.0"
 dependencies = [
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "async-channel 1.9.0",
  "futures",
  "log",
@@ -20175,14 +20320,14 @@ dependencies = [
  "sp-blockchain",
  "sp-core 28.0.0",
  "sp-runtime",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "sc-network-statement"
 version = "0.16.0"
 dependencies = [
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "async-channel 1.9.0",
  "futures",
  "log",
@@ -20201,7 +20346,7 @@ dependencies = [
 name = "sc-network-sync"
 version = "0.33.0"
 dependencies = [
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "async-channel 1.9.0",
  "async-trait",
  "fork-tree",
@@ -20231,7 +20376,7 @@ dependencies = [
  "sp-tracing 16.0.0",
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-stream",
 ]
@@ -20246,7 +20391,7 @@ dependencies = [
  "futures-timer",
  "libp2p",
  "log",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "rand 0.8.5",
  "sc-block-builder",
  "sc-client-api",
@@ -20272,7 +20417,7 @@ dependencies = [
 name = "sc-network-transactions"
 version = "0.33.0"
 dependencies = [
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "futures",
  "log",
  "parity-scale-codec",
@@ -20297,13 +20442,13 @@ dependencies = [
  "libp2p-kad",
  "litep2p",
  "log",
- "multiaddr 0.18.1",
- "multihash 0.19.1",
+ "multiaddr 0.18.2",
+ "multihash 0.19.3",
  "quickcheck",
  "rand 0.8.5",
  "serde",
  "serde_with",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "zeroize",
 ]
 
@@ -20318,14 +20463,14 @@ dependencies = [
  "futures-timer",
  "http-body-util",
  "hyper 1.6.0",
- "hyper-rustls 0.27.3",
+ "hyper-rustls 0.27.7",
  "hyper-util",
  "num_cpus",
  "once_cell",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "rand 0.8.5",
- "rustls 0.23.18",
+ "rustls 0.23.29",
  "sc-block-builder",
  "sc-client-api",
  "sc-client-db",
@@ -20365,7 +20510,7 @@ dependencies = [
  "jsonrpsee",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "pretty_assertions",
  "sc-block-builder",
  "sc-chain-spec",
@@ -20410,7 +20555,7 @@ dependencies = [
  "sp-rpc",
  "sp-runtime",
  "sp-version",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -20421,7 +20566,7 @@ dependencies = [
  "forwarded-header-value",
  "futures",
  "governor",
- "http 1.1.0",
+ "http 1.3.1",
  "http-body-util",
  "hyper 1.6.0",
  "ip_network",
@@ -20432,7 +20577,7 @@ dependencies = [
  "serde_json",
  "substrate-prometheus-endpoint",
  "tokio",
- "tower",
+ "tower 0.4.13",
  "tower-http 0.5.2",
 ]
 
@@ -20440,7 +20585,7 @@ dependencies = [
 name = "sc-rpc-spec-v2"
 version = "0.34.0"
 dependencies = [
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "assert_matches",
  "async-trait",
  "futures",
@@ -20450,7 +20595,7 @@ dependencies = [
  "jsonrpsee",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "pretty_assertions",
  "rand 0.8.5",
  "sc-block-builder",
@@ -20477,7 +20622,7 @@ dependencies = [
  "substrate-test-runtime",
  "substrate-test-runtime-client",
  "substrate-test-runtime-transaction-pool",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-stream",
 ]
@@ -20509,7 +20654,7 @@ dependencies = [
  "sp-version",
  "sp-wasm-interface 20.0.0",
  "subxt 0.41.0",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -20524,7 +20669,7 @@ dependencies = [
  "jsonrpsee",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "pin-project",
  "rand 0.8.5",
  "sc-chain-spec",
@@ -20571,7 +20716,7 @@ dependencies = [
  "substrate-test-runtime",
  "substrate-test-runtime-client",
  "tempfile",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
  "tracing",
  "tracing-futures",
@@ -20581,13 +20726,13 @@ dependencies = [
 name = "sc-service-test"
 version = "2.0.0"
 dependencies = [
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "async-channel 1.9.0",
  "fdlimit",
  "futures",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "sc-block-builder",
  "sc-client-api",
  "sc-client-db",
@@ -20618,7 +20763,7 @@ version = "0.30.0"
 dependencies = [
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "sp-core 28.0.0",
 ]
 
@@ -20628,7 +20773,7 @@ version = "10.0.0"
 dependencies = [
  "log",
  "parity-db",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "sc-client-api",
  "sc-keystore",
  "sp-api",
@@ -20650,7 +20795,7 @@ dependencies = [
  "fs4",
  "log",
  "sp-core 28.0.0",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
 ]
 
@@ -20669,14 +20814,14 @@ dependencies = [
  "serde_json",
  "sp-blockchain",
  "sp-runtime",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "sc-sysinfo"
 version = "27.0.0"
 dependencies = [
- "derive_more 0.99.17",
+ "derive_more 0.99.20",
  "futures",
  "libc",
  "log",
@@ -20700,13 +20845,13 @@ dependencies = [
  "futures",
  "libp2p",
  "log",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "pin-project",
  "rand 0.8.5",
  "sc-utils",
  "serde",
  "serde_json",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "wasm-timer",
 ]
 
@@ -20721,7 +20866,7 @@ dependencies = [
  "libc",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "regex",
  "rustc-hash 1.1.0",
  "sc-client-api",
@@ -20733,20 +20878,20 @@ dependencies = [
  "sp-rpc",
  "sp-runtime",
  "sp-tracing 16.0.0",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tracing",
  "tracing-log",
- "tracing-subscriber 0.3.18",
+ "tracing-subscriber 0.3.19",
 ]
 
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "11.0.0"
 dependencies = [
- "proc-macro-crate 3.1.0",
+ "proc-macro-crate 3.3.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -20759,14 +20904,14 @@ dependencies = [
  "chrono",
  "criterion",
  "cumulus-zombienet-sdk-helpers",
- "env_logger 0.11.3",
+ "env_logger 0.11.8",
  "futures",
  "futures-timer",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "itertools 0.11.0",
  "linked-hash-map",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "rstest",
  "sc-block-builder",
  "sc-client-api",
@@ -20787,11 +20932,11 @@ dependencies = [
  "substrate-test-runtime-client",
  "substrate-test-runtime-transaction-pool",
  "substrate-txtesttool",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-stream",
  "tracing",
- "tracing-subscriber 0.3.18",
+ "tracing-subscriber 0.3.19",
  "zombienet-configuration",
  "zombienet-sdk",
 ]
@@ -20802,7 +20947,7 @@ version = "28.0.0"
 dependencies = [
  "async-trait",
  "futures",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "log",
  "parity-scale-codec",
  "serde",
@@ -20810,7 +20955,7 @@ dependencies = [
  "sp-blockchain",
  "sp-core 28.0.0",
  "sp-runtime",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -20821,7 +20966,7 @@ dependencies = [
  "futures",
  "futures-timer",
  "log",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "prometheus",
  "sp-arithmetic",
  "tokio-test",
@@ -20890,7 +21035,7 @@ dependencies = [
  "darling",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -20902,7 +21047,7 @@ dependencies = [
  "darling",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -20942,10 +21087,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "102fbc6236de6c53906c0b262f12c7aa69c2bdc604862c12728f5f4d370bc137"
 dependencies = [
  "darling",
- "proc-macro-crate 3.1.0",
+ "proc-macro-crate 3.3.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -20955,10 +21100,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78a3993a13b4eafa89350604672c8757b7ea84c7c5947d4b3691e3169c96379b"
 dependencies = [
  "darling",
- "proc-macro-crate 3.1.0",
+ "proc-macro-crate 3.3.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -20981,10 +21126,10 @@ version = "2.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c6630024bf739e2179b91fb424b28898baf819414262c5d376677dbff1fe7ebf"
 dependencies = [
- "proc-macro-crate 3.1.0",
+ "proc-macro-crate 3.3.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -21006,8 +21151,8 @@ dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "scale-info",
- "syn 2.0.98",
- "thiserror 1.0.65",
+ "syn 2.0.104",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -21019,7 +21164,7 @@ dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "scale-info",
- "syn 2.0.98",
+ "syn 2.0.104",
  "thiserror 2.0.12",
 ]
 
@@ -21064,42 +21209,67 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.22"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "schemars"
+version = "0.8.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fbf2ae1b8bc8e02df939598064d22402220cd5bbcca1c76f7d6a310974d5615"
+dependencies = [
+ "dyn-clone",
+ "schemars_derive 0.8.22",
+ "serde",
+ "serde_json",
 ]
 
 [[package]]
 name = "schemars"
-version = "0.8.13"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "763f8cd0d4c71ed8389c90cb8100cba87e763bd01a8e614d4f0af97bcd50a161"
+checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0"
 dependencies = [
  "dyn-clone",
- "schemars_derive",
+ "ref-cast",
+ "schemars_derive 1.0.4",
  "serde",
  "serde_json",
 ]
 
 [[package]]
 name = "schemars_derive"
-version = "0.8.13"
+version = "0.8.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0f696e21e10fa546b7ffb1c9672c6de8fbc7a81acf59524386d8639bf12737"
+checksum = "32e265784ad618884abaea0600a9adf15393368d840e0222d101a072f3f7534d"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "serde_derive_internals",
- "syn 1.0.109",
+ "syn 2.0.104",
+]
+
+[[package]]
+name = "schemars_derive"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33d020396d1d138dc19f1165df7545479dcd58d93810dc5d646a16e55abefa80"
+dependencies = [
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "serde_derive_internals",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "schnellru"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9a8ef13a93c54d20580de1e5c413e624e53121d42fc7e2c11d10ef7f8b02367"
+checksum = "356285bbf17bea63d9e52e96bd18f039672ac92b55b8cb997d6162a2a37d1649"
 dependencies = [
  "ahash",
  "cfg-if",
@@ -21113,7 +21283,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "844b7645371e6ecdf61ff246ba1958c29e802881a749ae3fb1993675d210d28d"
 dependencies = [
  "arrayref",
- "arrayvec 0.7.4",
+ "arrayvec 0.7.6",
  "curve25519-dalek-ng",
  "merlin",
  "rand_core 0.6.4",
@@ -21125,20 +21295,20 @@ dependencies = [
 
 [[package]]
 name = "schnorrkel"
-version = "0.11.4"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de18f6d8ba0aad7045f5feae07ec29899c1112584a38509a84ad7b04451eaa0"
+checksum = "6e9fcb6c2e176e86ec703e22560d99d65a5ee9056ae45a08e13e84ebf796296f"
 dependencies = [
  "aead",
  "arrayref",
- "arrayvec 0.7.4",
+ "arrayvec 0.7.6",
  "curve25519-dalek",
  "getrandom_or_panic",
  "merlin",
  "rand_core 0.6.4",
  "serde_bytes",
  "sha2 0.10.9",
- "subtle 2.5.0",
+ "subtle 2.6.1",
  "zeroize",
 ]
 
@@ -21156,9 +21326,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "scratch"
-version = "1.0.7"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152"
+checksum = "9f6280af86e5f559536da57a45ebc84948833b3bee313a7dd25232e09c878a52"
 
 [[package]]
 name = "scrypt"
@@ -21174,12 +21344,12 @@ dependencies = [
 
 [[package]]
 name = "sct"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
+checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
 dependencies = [
- "ring 0.16.20",
- "untrusted 0.7.1",
+ "ring 0.17.14",
+ "untrusted 0.9.0",
 ]
 
 [[package]]
@@ -21193,7 +21363,7 @@ dependencies = [
  "generic-array 0.14.7",
  "pkcs8",
  "serdect",
- "subtle 2.5.0",
+ "subtle 2.6.1",
  "zeroize",
 ]
 
@@ -21206,6 +21376,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "secp256k1"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25996b82292a7a57ed3508f052cfff8640d38d32018784acd714758b43da9c8f"
+dependencies = [
+ "secp256k1-sys 0.8.2",
+]
+
 [[package]]
 name = "secp256k1"
 version = "0.28.2"
@@ -21233,10 +21412,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c3c81b43dc2d8877c216a3fccf76677ee1ebccd429566d3e67447290d0c42b2"
 dependencies = [
  "bitcoin_hashes 0.14.0",
- "rand 0.9.0",
+ "rand 0.9.2",
  "secp256k1-sys 0.11.0",
 ]
 
+[[package]]
+name = "secp256k1-sys"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4473013577ec77b4ee3668179ef1186df3146e2cf2d927bd200974c6fe60fd99"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "secp256k1-sys"
 version = "0.9.2"
@@ -21285,33 +21473,45 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.11.0"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
  "bitflags 2.9.1",
- "core-foundation",
+ "core-foundation 0.9.4",
  "core-foundation-sys",
  "libc",
- "num-bigint",
  "security-framework-sys",
 ]
 
 [[package]]
-name = "security-framework-sys"
-version = "2.11.0"
+name = "security-framework"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7"
+checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316"
 dependencies = [
+ "bitflags 2.9.1",
+ "core-foundation 0.10.1",
  "core-foundation-sys",
  "libc",
+ "security-framework-sys",
 ]
 
 [[package]]
-name = "semver"
-version = "0.6.0"
+name = "security-framework-sys"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a3186ec9e65071a2095434b1f5bb24838d4e8e130f584c790f6033c79943537"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "semver"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a3186ec9e65071a2095434b1f5bb24838d4e8e130f584c790f6033c79943537"
 dependencies = [
  "semver-parser 0.7.0",
 ]
@@ -21331,14 +21531,14 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
 dependencies = [
- "semver-parser 0.10.2",
+ "semver-parser 0.10.3",
 ]
 
 [[package]]
 name = "semver"
-version = "1.0.18"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
+checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
 dependencies = [
  "serde",
 ]
@@ -21351,9 +21551,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "semver-parser"
-version = "0.10.2"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
+checksum = "9900206b54a3527fdc7b8a938bffd94a568bac4f4aa8113b209df75a09c0dec2"
 dependencies = [
  "pest",
 ]
@@ -21394,9 +21594,9 @@ dependencies = [
 
 [[package]]
 name = "serde_bytes"
-version = "0.11.12"
+version = "0.11.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff"
+checksum = "8437fd221bde2d4ca316d61b90e337e9e702b3820b87d63caa9ba6c02bd06d96"
 dependencies = [
  "serde",
 ]
@@ -21409,18 +21609,18 @@ checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "serde_derive_internals"
-version = "0.26.0"
+version = "0.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
+checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 1.0.109",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -21434,11 +21634,11 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.132"
+version = "1.0.141"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
+checksum = "30b9eff21ebe718216c6ec64e1d9ac57087aad11efc64e32002bce4a0d4c03d3"
 dependencies = [
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "itoa",
  "memchr",
  "ryu",
@@ -21447,9 +21647,18 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.7"
+version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83"
 dependencies = [
  "serde",
 ]
@@ -21468,9 +21677,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.12.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa"
+checksum = "f2c45cd61fefa9db6f254525d46e392b852e0e61d9a1fd36e5bd183450a556d5"
 dependencies = [
  "base64 0.22.1",
  "chrono",
@@ -21484,14 +21693,14 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.12.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
+checksum = "de90945e6565ce0d9a25098082ed4ee4002e047cb59892c318d66821e14bb30f"
 dependencies = [
  "darling",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -21500,7 +21709,7 @@ version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "itoa",
  "ryu",
  "serde",
@@ -21527,7 +21736,7 @@ dependencies = [
  "cfg-if",
  "cpufeatures",
  "digest 0.9.0",
- "opaque-debug 0.3.0",
+ "opaque-debug 0.3.1",
 ]
 
 [[package]]
@@ -21551,7 +21760,7 @@ dependencies = [
  "cfg-if",
  "cpufeatures",
  "digest 0.9.0",
- "opaque-debug 0.3.0",
+ "opaque-debug 0.3.1",
 ]
 
 [[package]]
@@ -21587,9 +21796,9 @@ dependencies = [
 
 [[package]]
 name = "sharded-slab"
-version = "0.1.4"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
 dependencies = [
  "lazy_static",
 ]
@@ -21600,30 +21809,20 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
-[[package]]
-name = "signal-hook"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
-dependencies = [
- "libc",
- "signal-hook-registry",
-]
-
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.1"
+version = "1.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "signature"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
 dependencies = [
  "digest 0.10.7",
  "rand_core 0.6.4",
@@ -21631,9 +21830,9 @@ dependencies = [
 
 [[package]]
 name = "simba"
-version = "0.8.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "061507c94fc6ab4ba1c9a0305018408e312e17c041eb63bef8aa726fa33aceae"
+checksum = "b3a386a501cd104797982c15ae17aafe8b9261315b5d07e3ec803f2ea26be0fa"
 dependencies = [
  "approx",
  "num-complex",
@@ -21671,12 +21870,9 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
 
 [[package]]
 name = "slab"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
+checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d"
 
 [[package]]
 name = "slice-group-by"
@@ -21696,9 +21892,9 @@ dependencies = [
 
 [[package]]
 name = "slotmap"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342"
+checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a"
 dependencies = [
  "version_check",
 ]
@@ -21716,9 +21912,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.15.0"
+version = "1.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 dependencies = [
  "serde",
 ]
@@ -21734,8 +21930,8 @@ dependencies = [
  "async-fs 1.6.0",
  "async-io 1.13.0",
  "async-lock 2.8.0",
- "async-net 1.7.0",
- "async-process 1.7.0",
+ "async-net 1.8.0",
+ "async-process 1.8.1",
  "blocking",
  "futures-lite 1.13.0",
 ]
@@ -21746,15 +21942,15 @@ version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a33bd3e260892199c3ccfc487c88b2da2265080acb316cd920da72fdfd7c599f"
 dependencies = [
- "async-channel 2.3.0",
+ "async-channel 2.5.0",
  "async-executor",
- "async-fs 2.1.2",
- "async-io 2.3.3",
+ "async-fs 2.1.3",
+ "async-io 2.5.0",
  "async-lock 3.4.0",
  "async-net 2.0.0",
- "async-process 2.3.0",
+ "async-process 2.4.0",
  "blocking",
- "futures-lite 2.3.0",
+ "futures-lite 2.6.0",
 ]
 
 [[package]]
@@ -21763,7 +21959,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0bb30cf57b7b5f6109ce17c3164445e2d6f270af2cb48f6e4d31c2967c9a9f5"
 dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec 0.7.6",
  "async-lock 2.8.0",
  "atomic-take",
  "base64 0.21.7",
@@ -21772,7 +21968,7 @@ dependencies = [
  "bs58",
  "chacha20",
  "crossbeam-queue",
- "derive_more 0.99.17",
+ "derive_more 0.99.20",
  "ed25519-zebra",
  "either",
  "event-listener 2.5.3",
@@ -21786,7 +21982,7 @@ dependencies = [
  "libsecp256k1",
  "merlin",
  "no-std-net",
- "nom",
+ "nom 7.1.3",
  "num-bigint",
  "num-rational",
  "num-traits",
@@ -21805,7 +22001,7 @@ dependencies = [
  "slab",
  "smallvec",
  "soketto 0.7.1",
- "twox-hash",
+ "twox-hash 1.6.3",
  "wasmi 0.31.2",
  "x25519-dalek",
  "zeroize",
@@ -21817,7 +22013,7 @@ version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "966e72d77a3b2171bb7461d0cb91f43670c63558c62d7cf42809cae6c8b6b818"
 dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec 0.7.6",
  "async-lock 3.4.0",
  "atomic-take",
  "base64 0.22.1",
@@ -21826,12 +22022,12 @@ dependencies = [
  "bs58",
  "chacha20",
  "crossbeam-queue",
- "derive_more 0.99.17",
+ "derive_more 0.99.20",
  "ed25519-zebra",
  "either",
- "event-listener 5.3.1",
+ "event-listener 5.4.0",
  "fnv",
- "futures-lite 2.3.0",
+ "futures-lite 2.6.0",
  "futures-util",
  "hashbrown 0.14.5",
  "hex",
@@ -21840,7 +22036,7 @@ dependencies = [
  "libm",
  "libsecp256k1",
  "merlin",
- "nom",
+ "nom 7.1.3",
  "num-bigint",
  "num-rational",
  "num-traits",
@@ -21850,7 +22046,7 @@ dependencies = [
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "ruzstd 0.6.0",
- "schnorrkel 0.11.4",
+ "schnorrkel 0.11.5",
  "serde",
  "serde_json",
  "sha2 0.10.9",
@@ -21858,13 +22054,67 @@ dependencies = [
  "siphasher 1.0.1",
  "slab",
  "smallvec",
- "soketto 0.8.0",
- "twox-hash",
+ "soketto 0.8.1",
+ "twox-hash 1.6.3",
  "wasmi 0.32.3",
  "x25519-dalek",
  "zeroize",
 ]
 
+[[package]]
+name = "smoldot"
+version = "0.19.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e16e5723359f0048bf64bfdfba64e5732a56847d42c4fd3fe56f18280c813413"
+dependencies = [
+ "arrayvec 0.7.6",
+ "async-lock 3.4.0",
+ "atomic-take",
+ "base64 0.22.1",
+ "bip39",
+ "blake2-rfc",
+ "bs58",
+ "chacha20",
+ "crossbeam-queue",
+ "derive_more 2.0.1",
+ "ed25519-zebra",
+ "either",
+ "event-listener 5.4.0",
+ "fnv",
+ "futures-lite 2.6.0",
+ "futures-util",
+ "hashbrown 0.15.4",
+ "hex",
+ "hmac 0.12.1",
+ "itertools 0.14.0",
+ "libm",
+ "libsecp256k1",
+ "merlin",
+ "nom 8.0.0",
+ "num-bigint",
+ "num-rational",
+ "num-traits",
+ "pbkdf2",
+ "pin-project",
+ "poly1305",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
+ "ruzstd 0.8.1",
+ "schnorrkel 0.11.5",
+ "serde",
+ "serde_json",
+ "sha2 0.10.9",
+ "sha3",
+ "siphasher 1.0.1",
+ "slab",
+ "smallvec",
+ "soketto 0.8.1",
+ "twox-hash 2.1.1",
+ "wasmi 0.40.0",
+ "x25519-dalek",
+ "zeroize",
+]
+
 [[package]]
 name = "smoldot-light"
 version = "0.9.0"
@@ -21875,7 +22125,7 @@ dependencies = [
  "async-lock 2.8.0",
  "base64 0.21.7",
  "blake2-rfc",
- "derive_more 0.99.17",
+ "derive_more 0.99.20",
  "either",
  "event-listener 2.5.3",
  "fnv",
@@ -21886,9 +22136,9 @@ dependencies = [
  "hex",
  "itertools 0.11.0",
  "log",
- "lru 0.11.0",
+ "lru 0.11.1",
  "no-std-net",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "pin-project",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
@@ -21907,24 +22157,24 @@ version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a33b06891f687909632ce6a4e3fd7677b24df930365af3d0bcb078310129f3f"
 dependencies = [
- "async-channel 2.3.0",
+ "async-channel 2.5.0",
  "async-lock 3.4.0",
  "base64 0.22.1",
  "blake2-rfc",
  "bs58",
- "derive_more 0.99.17",
+ "derive_more 0.99.20",
  "either",
- "event-listener 5.3.1",
+ "event-listener 5.4.0",
  "fnv",
  "futures-channel",
- "futures-lite 2.3.0",
+ "futures-lite 2.6.0",
  "futures-util",
  "hashbrown 0.14.5",
  "hex",
  "itertools 0.13.0",
  "log",
- "lru 0.12.3",
- "parking_lot 0.12.3",
+ "lru 0.12.5",
+ "parking_lot 0.12.4",
  "pin-project",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
@@ -21937,11 +22187,47 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "smoldot-light"
+version = "0.17.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bba9e591716567d704a8252feeb2f1261a286e1e2cbdd4e49e9197c34a14e2"
+dependencies = [
+ "async-channel 2.5.0",
+ "async-lock 3.4.0",
+ "base64 0.22.1",
+ "blake2-rfc",
+ "bs58",
+ "derive_more 2.0.1",
+ "either",
+ "event-listener 5.4.0",
+ "fnv",
+ "futures-channel",
+ "futures-lite 2.6.0",
+ "futures-util",
+ "hashbrown 0.15.4",
+ "hex",
+ "itertools 0.14.0",
+ "log",
+ "lru 0.12.5",
+ "parking_lot 0.12.4",
+ "pin-project",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
+ "serde",
+ "serde_json",
+ "siphasher 1.0.1",
+ "slab",
+ "smol 2.0.2",
+ "smoldot 0.19.4",
+ "zeroize",
+]
+
 [[package]]
 name = "snap"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831"
+checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b"
 
 [[package]]
 name = "snow"
@@ -21954,10 +22240,10 @@ dependencies = [
  "chacha20poly1305",
  "curve25519-dalek",
  "rand_core 0.6.4",
- "ring 0.17.8",
- "rustc_version 0.4.0",
+ "ring 0.17.14",
+ "rustc_version 0.4.1",
  "sha2 0.10.9",
- "subtle 2.5.0",
+ "subtle 2.6.1",
 ]
 
 [[package]]
@@ -22062,7 +22348,7 @@ dependencies = [
 name = "snowbridge-merkle-tree"
 version = "0.2.0"
 dependencies = [
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "hex",
  "hex-literal",
  "parity-scale-codec",
@@ -22491,9 +22777,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
+checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
 dependencies = [
  "libc",
  "winapi",
@@ -22501,9 +22787,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.9"
+version = "0.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef"
+checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -22526,14 +22812,14 @@ dependencies = [
 
 [[package]]
 name = "soketto"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37468c595637c10857701c990f93a40ce0e357cedb0953d1c26c8d8027f9bb53"
+checksum = "2e859df029d160cb88608f5d7df7fb4753fd20fdfb4de5644f3d8b8440841721"
 dependencies = [
  "base64 0.22.1",
  "bytes",
  "futures",
- "http 1.1.0",
+ "http 1.3.1",
  "httparse",
  "log",
  "rand 0.8.5",
@@ -22640,7 +22926,7 @@ dependencies = [
  "sp-test-primitives",
  "sp-trie",
  "sp-version",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -22651,10 +22937,10 @@ dependencies = [
  "assert_matches",
  "blake2 0.10.6",
  "expander",
- "proc-macro-crate 3.1.0",
+ "proc-macro-crate 3.3.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -22758,7 +23044,7 @@ version = "28.0.0"
 dependencies = [
  "futures",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "schnellru",
  "sp-api",
  "sp-consensus",
@@ -22766,7 +23052,7 @@ dependencies = [
  "sp-database",
  "sp-runtime",
  "sp-state-machine",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tracing",
 ]
 
@@ -22780,7 +23066,7 @@ dependencies = [
  "sp-inherents",
  "sp-runtime",
  "sp-state-machine",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -22819,7 +23105,7 @@ dependencies = [
 name = "sp-consensus-beefy"
 version = "13.0.0"
 dependencies = [
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "parity-scale-codec",
  "scale-info",
  "serde",
@@ -22891,7 +23177,7 @@ name = "sp-core"
 version = "28.0.0"
 dependencies = [
  "ark-vrf",
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "bitflags 1.3.2",
  "blake2 0.10.6",
  "bounded-collections 0.3.2",
@@ -22910,13 +23196,13 @@ dependencies = [
  "merlin",
  "parity-bip39",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "paste",
  "primitive-types 0.13.1",
  "rand 0.8.5",
  "regex",
  "scale-info",
- "schnorrkel 0.11.4",
+ "schnorrkel 0.11.5",
  "secp256k1 0.28.2",
  "secrecy 0.8.0",
  "serde",
@@ -22929,7 +23215,7 @@ dependencies = [
  "sp-storage 19.0.0",
  "ss58-registry",
  "substrate-bip39 0.4.7",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tracing",
  "w3f-bls",
  "zeroize",
@@ -22937,14 +23223,15 @@ dependencies = [
 
 [[package]]
 name = "sp-core"
-version = "35.0.0"
+version = "36.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4532774405a712a366a98080cbb4daa28c38ddff0ec595902ad6ee6a78a809f8"
+checksum = "1cdbb58c21e6b27f2aadf3ff0c8b20a8ead13b9dfe63f46717fd59334517f3b4"
 dependencies = [
- "array-bytes 6.2.2",
+ "ark-vrf",
+ "array-bytes 6.2.3",
  "bitflags 1.3.2",
  "blake2 0.10.6",
- "bounded-collections 0.2.3",
+ "bounded-collections 0.2.4",
  "bs58",
  "dyn-clonable",
  "ed25519-zebra",
@@ -22959,24 +23246,24 @@ dependencies = [
  "merlin",
  "parity-bip39",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "paste",
  "primitive-types 0.13.1",
  "rand 0.8.5",
  "scale-info",
- "schnorrkel 0.11.4",
+ "schnorrkel 0.11.5",
  "secp256k1 0.28.2",
  "secrecy 0.8.0",
  "serde",
  "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "sp-debug-derive 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "sp-externalities 0.30.0",
- "sp-runtime-interface 29.0.0",
+ "sp-runtime-interface 29.0.1",
  "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "sp-storage 22.0.0",
  "ss58-registry",
  "substrate-bip39 0.6.0",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tracing",
  "w3f-bls",
  "zeroize",
@@ -23035,7 +23322,7 @@ dependencies = [
  "sha2 0.10.9",
  "sha3",
  "sp-crypto-hashing-proc-macro",
- "twox-hash",
+ "twox-hash 1.6.3",
 ]
 
 [[package]]
@@ -23049,7 +23336,7 @@ dependencies = [
  "digest 0.10.7",
  "sha2 0.10.9",
  "sha3",
- "twox-hash",
+ "twox-hash 1.6.3",
 ]
 
 [[package]]
@@ -23058,7 +23345,7 @@ version = "0.1.0"
 dependencies = [
  "quote 1.0.40",
  "sp-crypto-hashing 0.1.0",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -23066,7 +23353,7 @@ name = "sp-database"
 version = "10.0.0"
 dependencies = [
  "kvdb",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
 ]
 
 [[package]]
@@ -23075,7 +23362,7 @@ version = "14.0.0"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -23086,7 +23373,7 @@ checksum = "48d09fa0a5f7299fb81ee25ae3853d26200f7a348148aed6de76be905c007dbe"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -23130,7 +23417,7 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -23172,7 +23459,7 @@ name = "sp-keystore"
 version = "0.34.0"
 dependencies = [
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "sp-core 28.0.0",
  "sp-externalities 0.25.0",
 ]
@@ -23181,7 +23468,7 @@ dependencies = [
 name = "sp-maybe-compressed-blob"
 version = "11.0.0"
 dependencies = [
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "zstd 0.12.4",
 ]
 
@@ -23208,7 +23495,7 @@ dependencies = [
 name = "sp-mmr-primitives"
 version = "26.0.0"
 dependencies = [
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "log",
  "parity-scale-codec",
  "polkadot-ckb-merkle-mountain-range",
@@ -23218,7 +23505,7 @@ dependencies = [
  "sp-core 28.0.0",
  "sp-debug-derive 14.0.0",
  "sp-runtime",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -23330,20 +23617,20 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime-interface"
-version = "29.0.0"
+version = "29.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51e83d940449837a8b2a01b4d877dd22d896fd14d3d3ade875787982da994a33"
+checksum = "e99db36a7aff44c335f5d5b36c182a3e0cac61de2fefbe2eeac6af5fb13f63bf"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
  "parity-scale-codec",
- "polkavm-derive 0.9.1",
+ "polkavm-derive 0.18.0",
  "primitive-types 0.13.1",
  "sp-externalities 0.30.0",
  "sp-runtime-interface-proc-macro 18.0.0",
  "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "sp-storage 22.0.0",
- "sp-tracing 17.0.1",
+ "sp-tracing 17.1.0",
  "sp-wasm-interface 21.0.1",
  "static_assertions",
 ]
@@ -23354,10 +23641,10 @@ version = "17.0.0"
 dependencies = [
  "Inflector",
  "expander",
- "proc-macro-crate 3.1.0",
+ "proc-macro-crate 3.3.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -23368,10 +23655,10 @@ checksum = "0195f32c628fee3ce1dfbbf2e7e52a30ea85f3589da9fe62a8b816d70fc06294"
 dependencies = [
  "Inflector",
  "expander",
- "proc-macro-crate 3.1.0",
+ "proc-macro-crate 3.3.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -23441,12 +23728,12 @@ name = "sp-state-machine"
 version = "0.35.0"
 dependencies = [
  "arbitrary",
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "assert_matches",
  "hash-db",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "pretty_assertions",
  "rand 0.8.5",
  "smallvec",
@@ -23455,7 +23742,7 @@ dependencies = [
  "sp-panic-handler",
  "sp-runtime",
  "sp-trie",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tracing",
  "trie-db",
 ]
@@ -23479,7 +23766,7 @@ dependencies = [
  "sp-externalities 0.25.0",
  "sp-runtime",
  "sp-runtime-interface 24.0.0",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "x25519-dalek",
 ]
 
@@ -23537,7 +23824,7 @@ dependencies = [
  "parity-scale-codec",
  "sp-inherents",
  "sp-runtime",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -23548,19 +23835,19 @@ dependencies = [
  "regex",
  "tracing",
  "tracing-core",
- "tracing-subscriber 0.3.18",
+ "tracing-subscriber 0.3.19",
 ]
 
 [[package]]
 name = "sp-tracing"
-version = "17.0.1"
+version = "17.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf641a1d17268c8fcfdb8e0fa51a79c2d4222f4cfda5f3944dbdbc384dced8d5"
+checksum = "6147a5b8c98b9ed4bf99dc033fab97a468b4645515460974c8784daeb7c35433"
 dependencies = [
  "parity-scale-codec",
  "tracing",
  "tracing-core",
- "tracing-subscriber 0.3.18",
+ "tracing-subscriber 0.3.19",
 ]
 
 [[package]]
@@ -23589,15 +23876,15 @@ name = "sp-trie"
 version = "29.0.0"
 dependencies = [
  "ahash",
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "criterion",
  "foldhash",
  "hash-db",
- "hashbrown 0.15.3",
+ "hashbrown 0.15.4",
  "memory-db",
  "nohash-hasher",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "rand 0.8.5",
  "scale-info",
  "schnellru",
@@ -23605,7 +23892,7 @@ dependencies = [
  "sp-externalities 0.25.0",
  "sp-runtime",
  "substrate-prometheus-endpoint",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tracing",
  "trie-bench",
  "trie-db",
@@ -23626,7 +23913,7 @@ dependencies = [
  "sp-runtime",
  "sp-std 14.0.0",
  "sp-version-proc-macro",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -23638,7 +23925,7 @@ dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "sp-version",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -23671,7 +23958,7 @@ dependencies = [
  "bounded-collections 0.3.2",
  "parity-scale-codec",
  "scale-info",
- "schemars",
+ "schemars 0.8.22",
  "serde",
  "smallvec",
  "sp-arithmetic",
@@ -23705,30 +23992,29 @@ dependencies = [
 ]
 
 [[package]]
-name = "spki"
-version = "0.7.2"
+name = "spinning_top"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
+checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300"
 dependencies = [
- "base64ct",
- "der",
+ "lock_api",
 ]
 
 [[package]]
-name = "sqlformat"
-version = "0.2.6"
+name = "spki"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bba3a93db0cc4f7bdece8bb09e77e2e785c20bfebf79eb8340ed80708048790"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
 dependencies = [
- "nom",
- "unicode_categories",
+ "base64ct",
+ "der",
 ]
 
 [[package]]
 name = "sqlx"
-version = "0.8.2"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93334716a037193fac19df402f8571269c84a00852f6a7066b5d2616dcd64d3e"
+checksum = "1fefb893899429669dcdd979aff487bd78f4064e5e7907e4269081e0ef7d97dc"
 dependencies = [
  "sqlx-core",
  "sqlx-macros",
@@ -23739,37 +24025,32 @@ dependencies = [
 
 [[package]]
 name = "sqlx-core"
-version = "0.8.2"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d8060b456358185f7d50c55d9b5066ad956956fddec42ee2e8567134a8936e"
+checksum = "ee6798b1838b6a0f69c007c133b8df5866302197e404e8b6ee8ed3e3a5e68dc6"
 dependencies = [
- "atoi",
- "byteorder",
+ "base64 0.22.1",
  "bytes",
  "crc",
  "crossbeam-queue",
  "either",
- "event-listener 5.3.1",
- "futures-channel",
+ "event-listener 5.4.0",
  "futures-core",
  "futures-intrusive",
  "futures-io",
  "futures-util",
- "hashbrown 0.14.5",
- "hashlink 0.9.1",
- "hex",
- "indexmap 2.9.0",
+ "hashbrown 0.15.4",
+ "hashlink 0.10.0",
+ "indexmap 2.10.0",
  "log",
  "memchr",
  "once_cell",
- "paste",
  "percent-encoding",
  "serde",
  "serde_json",
  "sha2 0.10.9",
  "smallvec",
- "sqlformat",
- "thiserror 1.0.65",
+ "thiserror 2.0.12",
  "tokio",
  "tokio-stream",
  "tracing",
@@ -23778,22 +24059,22 @@ dependencies = [
 
 [[package]]
 name = "sqlx-macros"
-version = "0.8.2"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cac0692bcc9de3b073e8d747391827297e075c7710ff6276d9f7a1f3d58c6657"
+checksum = "a2d452988ccaacfbf5e0bdbc348fb91d7c8af5bee192173ac3636b5fb6e6715d"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "sqlx-core",
  "sqlx-macros-core",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "sqlx-macros-core"
-version = "0.8.2"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1804e8a7c7865599c9c79be146dc8a9fd8cc86935fa641d3ea58e5f0688abaa5"
+checksum = "19a9c1841124ac5a61741f96e1d9e2ec77424bf323962dd894bdb93f37d5219b"
 dependencies = [
  "dotenvy",
  "either",
@@ -23809,17 +24090,16 @@ dependencies = [
  "sqlx-mysql",
  "sqlx-postgres",
  "sqlx-sqlite",
- "syn 2.0.98",
- "tempfile",
+ "syn 2.0.104",
  "tokio",
  "url",
 ]
 
 [[package]]
 name = "sqlx-mysql"
-version = "0.8.2"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64bb4714269afa44aef2755150a0fc19d756fb580a67db8885608cf02f47d06a"
+checksum = "aa003f0038df784eb8fecbbac13affe3da23b45194bd57dba231c8f48199c526"
 dependencies = [
  "atoi",
  "base64 0.22.1",
@@ -23852,16 +24132,16 @@ dependencies = [
  "smallvec",
  "sqlx-core",
  "stringprep",
- "thiserror 1.0.65",
+ "thiserror 2.0.12",
  "tracing",
  "whoami",
 ]
 
 [[package]]
 name = "sqlx-postgres"
-version = "0.8.2"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fa91a732d854c5d7726349bb4bb879bb9478993ceb764247660aee25f67c2f8"
+checksum = "db58fcd5a53cf07c184b154801ff91347e4c30d17a3562a635ff028ad5deda46"
 dependencies = [
  "atoi",
  "base64 0.22.1",
@@ -23872,7 +24152,6 @@ dependencies = [
  "etcetera",
  "futures-channel",
  "futures-core",
- "futures-io",
  "futures-util",
  "hex",
  "hkdf",
@@ -23890,16 +24169,16 @@ dependencies = [
  "smallvec",
  "sqlx-core",
  "stringprep",
- "thiserror 1.0.65",
+ "thiserror 2.0.12",
  "tracing",
  "whoami",
 ]
 
 [[package]]
 name = "sqlx-sqlite"
-version = "0.8.2"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5b2cf34a45953bfd3daaf3db0f7a7878ab9b7a6b91b422d24a7a9e4c857b680"
+checksum = "c2d12fe70b2c1b4401038055f90f151b78208de1f9f89a7dbfd41587a10c3eea"
 dependencies = [
  "atoi",
  "flume",
@@ -23914,15 +24193,16 @@ dependencies = [
  "serde",
  "serde_urlencoded",
  "sqlx-core",
+ "thiserror 2.0.12",
  "tracing",
  "url",
 ]
 
 [[package]]
 name = "ss58-registry"
-version = "1.43.0"
+version = "1.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e6915280e2d0db8911e5032a5c275571af6bdded2916abd691a659be25d3439"
+checksum = "19409f13998e55816d1c728395af0b52ec066206341d939e22e7766df9b494b8"
 dependencies = [
  "Inflector",
  "num-format",
@@ -23930,7 +24210,7 @@ dependencies = [
  "quote 1.0.40",
  "serde",
  "serde_json",
- "unicode-xid 0.2.4",
+ "unicode-xid 0.2.6",
 ]
 
 [[package]]
@@ -23981,7 +24261,7 @@ dependencies = [
 name = "staging-node-cli"
 version = "3.0.0-dev"
 dependencies = [
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "assert_cmd",
  "clap",
  "clap_complete",
@@ -24003,7 +24283,7 @@ dependencies = [
  "scale-info",
  "serde",
  "serde_json",
- "soketto 0.8.0",
+ "soketto 0.8.1",
  "sp-keyring",
  "staging-node-inspect",
  "substrate-cli-test-utils",
@@ -24028,7 +24308,7 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-statement-store",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -24051,7 +24331,7 @@ version = "2.0.0"
 name = "staging-xcm"
 version = "7.0.1"
 dependencies = [
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "bounded-collections 0.3.2",
  "derive-where",
  "environmental",
@@ -24060,7 +24340,7 @@ dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
  "scale-info",
- "schemars",
+ "schemars 0.8.22",
  "serde",
  "sp-io",
  "sp-runtime",
@@ -24129,24 +24409,24 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "static_init"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a2a1c578e98c1c16fc3b8ec1328f7659a500737d7a0c6d625e73e830ff9c1f6"
+checksum = "8bae1df58c5fea7502e8e352ec26b5579f6178e1fdb311e088580c980dee25ed"
 dependencies = [
  "bitflags 1.3.2",
- "cfg_aliases 0.1.1",
+ "cfg_aliases 0.2.1",
  "libc",
- "parking_lot 0.11.2",
- "parking_lot_core 0.8.6",
+ "parking_lot 0.12.4",
+ "parking_lot_core 0.9.11",
  "static_init_macro",
  "winapi",
 ]
 
 [[package]]
 name = "static_init_macro"
-version = "1.0.2"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70a2595fc3aa78f2d0e45dd425b22282dd863273761cc77780914b2cf3003acf"
+checksum = "1389c88ddd739ec6d3f8f83343764a0e944cd23cfbf126a9796a714b0b6edd6f"
 dependencies = [
  "cfg_aliases 0.1.1",
  "memchr",
@@ -24224,7 +24504,7 @@ dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "rustversion",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -24243,7 +24523,7 @@ dependencies = [
  "parity-bip39",
  "pbkdf2",
  "rustc-hex",
- "schnorrkel 0.11.4",
+ "schnorrkel 0.11.5",
  "sha2 0.10.9",
  "zeroize",
 ]
@@ -24256,7 +24536,7 @@ checksum = "ca58ffd742f693dc13d69bdbb2e642ae239e0053f6aab3b104252892f856700a"
 dependencies = [
  "hmac 0.12.1",
  "pbkdf2",
- "schnorrkel 0.11.4",
+ "schnorrkel 0.11.5",
  "sha2 0.10.9",
  "zeroize",
 ]
@@ -24345,7 +24625,7 @@ dependencies = [
  "hyper-util",
  "log",
  "prometheus",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
 ]
 
@@ -24388,7 +24668,7 @@ dependencies = [
  "sp-runtime",
  "sp-trie",
  "strum 0.26.3",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -24425,7 +24705,7 @@ dependencies = [
 name = "substrate-test-client"
 version = "2.0.1"
 dependencies = [
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "async-trait",
  "futures",
  "parity-scale-codec",
@@ -24449,7 +24729,7 @@ dependencies = [
 name = "substrate-test-runtime"
 version = "2.0.0"
 dependencies = [
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "frame-executive",
  "frame-metadata-hash-extension",
  "frame-support",
@@ -24525,13 +24805,13 @@ dependencies = [
  "futures",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "sc-transaction-pool",
  "sc-transaction-pool-api",
  "sp-blockchain",
  "sp-runtime",
  "substrate-test-runtime-client",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -24555,13 +24835,13 @@ dependencies = [
  "hex",
  "jsonrpsee",
  "parity-scale-codec",
- "parking_lot 0.12.3",
- "rand 0.9.0",
+ "parking_lot 0.12.4",
+ "rand 0.9.2",
  "serde",
  "serde_json",
  "subxt 0.41.0",
  "subxt-core 0.41.0",
- "subxt-rpcs",
+ "subxt-rpcs 0.41.0",
  "subxt-signer 0.41.0",
  "termplot",
  "thiserror 2.0.12",
@@ -24569,14 +24849,14 @@ dependencies = [
  "tokio",
  "tokio-util",
  "tracing",
- "tracing-subscriber 0.3.18",
+ "tracing-subscriber 0.3.19",
 ]
 
 [[package]]
 name = "substrate-wasm-builder"
 version = "17.0.0"
 dependencies = [
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "build-helper",
  "cargo_metadata",
  "console",
@@ -24596,7 +24876,7 @@ dependencies = [
  "sp-version",
  "strum 0.26.3",
  "tempfile",
- "toml 0.8.19",
+ "toml 0.8.23",
  "walkdir",
  "wasm-opt",
 ]
@@ -24609,9 +24889,9 @@ checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
 
 [[package]]
 name = "subtle"
-version = "2.5.0"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "subtle-ng"
@@ -24632,7 +24912,6 @@ dependencies = [
  "futures",
  "hex",
  "impl-serde",
- "jsonrpsee",
  "parity-scale-codec",
  "polkadot-sdk 0.7.0",
  "primitive-types 0.13.1",
@@ -24643,16 +24922,12 @@ dependencies = [
  "scale-value 0.17.0",
  "serde",
  "serde_json",
- "subxt-core 0.38.0",
- "subxt-lightclient 0.38.0",
- "subxt-macro 0.38.0",
- "subxt-metadata 0.38.0",
- "thiserror 1.0.65",
- "tokio",
- "tokio-util",
+ "subxt-core 0.38.1",
+ "subxt-macro 0.38.1",
+ "subxt-metadata 0.38.1",
+ "thiserror 1.0.69",
  "tracing",
  "url",
- "wasm-bindgen-futures",
  "web-time",
 ]
 
@@ -24683,7 +24958,44 @@ dependencies = [
  "subxt-lightclient 0.41.0",
  "subxt-macro 0.41.0",
  "subxt-metadata 0.41.0",
- "subxt-rpcs",
+ "subxt-rpcs 0.41.0",
+ "thiserror 2.0.12",
+ "tokio",
+ "tokio-util",
+ "tracing",
+ "url",
+ "wasm-bindgen-futures",
+ "web-time",
+]
+
+[[package]]
+name = "subxt"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c7533d39317bed01100b37158740dcec27c0e1933f3bca19bdf12110f242248"
+dependencies = [
+ "async-trait",
+ "derive-where",
+ "either",
+ "frame-metadata 23.0.0",
+ "futures",
+ "hex",
+ "jsonrpsee",
+ "parity-scale-codec",
+ "primitive-types 0.13.1",
+ "scale-bits 0.7.0",
+ "scale-decode 0.16.0",
+ "scale-encode 0.10.0",
+ "scale-info",
+ "scale-value 0.18.0",
+ "serde",
+ "serde_json",
+ "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "subxt-core 0.42.1",
+ "subxt-lightclient 0.42.1",
+ "subxt-macro 0.42.1",
+ "subxt-metadata 0.42.1",
+ "subxt-rpcs 0.42.1",
  "thiserror 2.0.12",
  "tokio",
  "tokio-util",
@@ -24695,9 +25007,9 @@ dependencies = [
 
 [[package]]
 name = "subxt-codegen"
-version = "0.38.0"
+version = "0.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cfcfb7d9589f3df0ac87c4988661cf3fb370761fcb19f2fd33104cc59daf22a"
+checksum = "6550ef451c77db6e3bc7c56fb6fe1dca9398a2c8fc774b127f6a396a769b9c5b"
 dependencies = [
  "heck 0.5.0",
  "parity-scale-codec",
@@ -24705,9 +25017,9 @@ dependencies = [
  "quote 1.0.40",
  "scale-info",
  "scale-typegen 0.9.0",
- "subxt-metadata 0.38.0",
- "syn 2.0.98",
- "thiserror 1.0.65",
+ "subxt-metadata 0.38.1",
+ "syn 2.0.104",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -24723,15 +25035,32 @@ dependencies = [
  "scale-info",
  "scale-typegen 0.11.1",
  "subxt-metadata 0.41.0",
- "syn 2.0.98",
+ "syn 2.0.104",
+ "thiserror 2.0.12",
+]
+
+[[package]]
+name = "subxt-codegen"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ded0fa15fa78c58b91e2a1c6bcef8a2bc68fe165d00e1dfb9787069351511c"
+dependencies = [
+ "heck 0.5.0",
+ "parity-scale-codec",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "scale-info",
+ "scale-typegen 0.11.1",
+ "subxt-metadata 0.42.1",
+ "syn 2.0.104",
  "thiserror 2.0.12",
 ]
 
 [[package]]
 name = "subxt-core"
-version = "0.38.0"
+version = "0.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ea28114366780d23684bd55ab879cd04c9d4cbba3b727a3854a3eca6bf29a1a"
+checksum = "cb7a1bc6c9c1724971636a66e3225a7253cdb35bb6efb81524a6c71c04f08c59"
 dependencies = [
  "base58",
  "blake2 0.10.6",
@@ -24752,7 +25081,7 @@ dependencies = [
  "scale-value 0.17.0",
  "serde",
  "serde_json",
- "subxt-metadata 0.38.0",
+ "subxt-metadata 0.38.1",
  "tracing",
 ]
 
@@ -24786,18 +25115,48 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "subxt-core"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26c3574b60050e57cf23edf6521263b06e98a880073df330813bb04242633083"
+dependencies = [
+ "base58",
+ "blake2 0.10.6",
+ "derive-where",
+ "frame-decode 0.8.3",
+ "frame-metadata 23.0.0",
+ "hashbrown 0.14.5",
+ "hex",
+ "impl-serde",
+ "keccak-hash",
+ "parity-scale-codec",
+ "primitive-types 0.13.1",
+ "scale-bits 0.7.0",
+ "scale-decode 0.16.0",
+ "scale-encode 0.10.0",
+ "scale-info",
+ "scale-value 0.18.0",
+ "serde",
+ "serde_json",
+ "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "subxt-metadata 0.42.1",
+ "thiserror 2.0.12",
+ "tracing",
+]
+
 [[package]]
 name = "subxt-lightclient"
-version = "0.38.0"
+version = "0.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534d4b725183a9fa09ce0e0f135674473297fdd97dee4d683f41117f365ae997"
+checksum = "ce07c2515b2e63b85ec3043fe4461b287af0615d4832c2fe6e81ba780b906bc0"
 dependencies = [
  "futures",
  "futures-util",
  "serde",
  "serde_json",
  "smoldot-light 0.16.2",
- "thiserror 1.0.65",
+ "thiserror 2.0.12",
  "tokio",
  "tokio-stream",
  "tracing",
@@ -24805,15 +25164,15 @@ dependencies = [
 
 [[package]]
 name = "subxt-lightclient"
-version = "0.41.0"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce07c2515b2e63b85ec3043fe4461b287af0615d4832c2fe6e81ba780b906bc0"
+checksum = "7c546d42ca103c0a6a3434cadf4ca500d2a49e60af0842b0fdee6fbfa97aa02f"
 dependencies = [
  "futures",
  "futures-util",
  "serde",
  "serde_json",
- "smoldot-light 0.16.2",
+ "smoldot-light 0.17.2",
  "thiserror 2.0.12",
  "tokio",
  "tokio-stream",
@@ -24822,18 +25181,18 @@ dependencies = [
 
 [[package]]
 name = "subxt-macro"
-version = "0.38.0"
+version = "0.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "228db9a5c95a6d8dc6152b4d6cdcbabc4f60821dd3f482a4f8791e022b7caadb"
+checksum = "7819c5e09aae0319981ee853869f2fcd1fac4db8babd0d004c17161297aadc05"
 dependencies = [
  "darling",
  "parity-scale-codec",
  "proc-macro-error2",
  "quote 1.0.40",
  "scale-typegen 0.9.0",
- "subxt-codegen 0.38.0",
- "subxt-utils-fetchmetadata 0.38.0",
- "syn 2.0.98",
+ "subxt-codegen 0.38.1",
+ "subxt-utils-fetchmetadata 0.38.1",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -24849,14 +25208,31 @@ dependencies = [
  "scale-typegen 0.11.1",
  "subxt-codegen 0.41.0",
  "subxt-utils-fetchmetadata 0.41.0",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
-name = "subxt-metadata"
-version = "0.38.0"
+name = "subxt-macro"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d91d253492eb17c65bdb41e538d6a31508563757bd34ad6014cb03536cf31757"
+dependencies = [
+ "darling",
+ "parity-scale-codec",
+ "proc-macro-error2",
+ "quote 1.0.40",
+ "scale-typegen 0.11.1",
+ "subxt-codegen 0.42.1",
+ "subxt-metadata 0.42.1",
+ "subxt-utils-fetchmetadata 0.42.1",
+ "syn 2.0.104",
+]
+
+[[package]]
+name = "subxt-metadata"
+version = "0.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee13e6862eda035557d9a2871955306aff540d2b89c06e0a62a1136a700aed28"
+checksum = "aacd4e7484fef58deaa2dcb32d94753a864b208a668c0dd0c28be1d8abeeadb2"
 dependencies = [
  "frame-decode 0.5.1",
  "frame-metadata 17.0.0",
@@ -24881,6 +25257,21 @@ dependencies = [
  "thiserror 2.0.12",
 ]
 
+[[package]]
+name = "subxt-metadata"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "243990ca4e0cdb74ef7458f1d5070a1bd5144d744cc146f23a32ab56d23e1db7"
+dependencies = [
+ "frame-decode 0.8.3",
+ "frame-metadata 23.0.0",
+ "hashbrown 0.14.5",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thiserror 2.0.12",
+]
+
 [[package]]
 name = "subxt-rpcs"
 version = "0.41.0"
@@ -24907,51 +25298,76 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "subxt-rpcs"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55313e3652f5360b5ed878bfe1d62fe181ecb8c130c81278ab89d1580f89a7ed"
+dependencies = [
+ "derive-where",
+ "frame-metadata 23.0.0",
+ "futures",
+ "hex",
+ "impl-serde",
+ "jsonrpsee",
+ "parity-scale-codec",
+ "primitive-types 0.13.1",
+ "serde",
+ "serde_json",
+ "subxt-core 0.42.1",
+ "subxt-lightclient 0.42.1",
+ "thiserror 2.0.12",
+ "tokio-util",
+ "tracing",
+ "url",
+]
+
 [[package]]
 name = "subxt-signer"
-version = "0.38.0"
+version = "0.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e7a336d6a1f86f126100a4a717be58352de4c8214300c4f7807f974494efdb9"
+checksum = "4a2370298a210ed1df26152db7209a85e0ed8cfbce035309c3b37f7b61755377"
 dependencies = [
  "base64 0.22.1",
+ "bip32",
  "bip39",
  "cfg-if",
  "crypto_secretbox",
  "hex",
  "hmac 0.12.1",
+ "keccak-hash",
  "parity-scale-codec",
  "pbkdf2",
- "polkadot-sdk 0.7.0",
  "regex",
- "schnorrkel 0.11.4",
+ "schnorrkel 0.11.5",
  "scrypt",
  "secp256k1 0.30.0",
  "secrecy 0.10.3",
  "serde",
  "serde_json",
  "sha2 0.10.9",
- "subxt-core 0.38.0",
+ "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "subxt-core 0.41.0",
+ "thiserror 2.0.12",
  "zeroize",
 ]
 
 [[package]]
 name = "subxt-signer"
-version = "0.41.0"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a2370298a210ed1df26152db7209a85e0ed8cfbce035309c3b37f7b61755377"
+checksum = "b58aeda7bebddedbef69ac55ae592fb9eef499927b50d42c43862d1664b5e5b3"
 dependencies = [
  "base64 0.22.1",
- "bip32",
  "bip39",
  "cfg-if",
  "crypto_secretbox",
  "hex",
  "hmac 0.12.1",
- "keccak-hash",
  "parity-scale-codec",
  "pbkdf2",
  "regex",
- "schnorrkel 0.11.4",
+ "schnorrkel 0.11.5",
  "scrypt",
  "secp256k1 0.30.0",
  "secrecy 0.10.3",
@@ -24959,20 +25375,20 @@ dependencies = [
  "serde_json",
  "sha2 0.10.9",
  "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "subxt-core 0.41.0",
+ "subxt-core 0.42.1",
  "thiserror 2.0.12",
  "zeroize",
 ]
 
 [[package]]
 name = "subxt-utils-fetchmetadata"
-version = "0.38.0"
+version = "0.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3082b17a86e3c3fe45d858d94d68f6b5247caace193dad6201688f24db8ba9bb"
+checksum = "a3c53bc3eeaacc143a2f29ace4082edd2edaccab37b69ad20befba9fb00fdb3d"
 dependencies = [
  "hex",
  "parity-scale-codec",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -24986,17 +25402,28 @@ dependencies = [
  "thiserror 2.0.12",
 ]
 
+[[package]]
+name = "subxt-utils-fetchmetadata"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62d3a6e9cb2fd2db8bf3cb0d03da691ac949259e620c9eb8f25764b2711805ca"
+dependencies = [
+ "hex",
+ "parity-scale-codec",
+ "thiserror 2.0.12",
+]
+
 [[package]]
 name = "sval"
-version = "2.6.1"
+version = "2.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b031320a434d3e9477ccf9b5756d57d4272937b8d22cb88af80b7633a1b78b1"
+checksum = "7cc9739f56c5d0c44a5ed45473ec868af02eb896af8c05f616673a31e1d1bb09"
 
 [[package]]
 name = "sval_buffer"
-version = "2.6.1"
+version = "2.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bf7e9412af26b342f3f2cc5cc4122b0105e9d16eb76046cd14ed10106cf6028"
+checksum = "f39b07436a8c271b34dad5070c634d1d3d76d6776e938ee97b4a66a5e8003d0b"
 dependencies = [
  "sval",
  "sval_ref",
@@ -25004,18 +25431,18 @@ dependencies = [
 
 [[package]]
 name = "sval_dynamic"
-version = "2.6.1"
+version = "2.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0ef628e8a77a46ed3338db8d1b08af77495123cc229453084e47cd716d403cf"
+checksum = "ffcb072d857431bf885580dacecf05ed987bac931230736739a79051dbf3499b"
 dependencies = [
  "sval",
 ]
 
 [[package]]
 name = "sval_fmt"
-version = "2.6.1"
+version = "2.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dc09e9364c2045ab5fa38f7b04d077b3359d30c4c2b3ec4bae67a358bd64326"
+checksum = "3f214f427ad94a553e5ca5514c95c6be84667cbc5568cce957f03f3477d03d5c"
 dependencies = [
  "itoa",
  "ryu",
@@ -25024,55 +25451,65 @@ dependencies = [
 
 [[package]]
 name = "sval_json"
-version = "2.6.1"
+version = "2.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ada6f627e38cbb8860283649509d87bc4a5771141daa41c78fd31f2b9485888d"
+checksum = "389ed34b32e638dec9a99c8ac92d0aa1220d40041026b625474c2b6a4d6f4feb"
 dependencies = [
  "itoa",
  "ryu",
  "sval",
 ]
 
+[[package]]
+name = "sval_nested"
+version = "2.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14bae8fcb2f24fee2c42c1f19037707f7c9a29a0cda936d2188d48a961c4bb2a"
+dependencies = [
+ "sval",
+ "sval_buffer",
+ "sval_ref",
+]
+
 [[package]]
 name = "sval_ref"
-version = "2.6.1"
+version = "2.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "703ca1942a984bd0d9b5a4c0a65ab8b4b794038d080af4eb303c71bc6bf22d7c"
+checksum = "2a4eaea3821d3046dcba81d4b8489421da42961889902342691fb7eab491d79e"
 dependencies = [
  "sval",
 ]
 
 [[package]]
 name = "sval_serde"
-version = "2.6.1"
+version = "2.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830926cd0581f7c3e5d51efae4d35c6b6fc4db583842652891ba2f1bed8db046"
+checksum = "172dd4aa8cb3b45c8ac8f3b4111d644cd26938b0643ede8f93070812b87fb339"
 dependencies = [
  "serde",
  "sval",
- "sval_buffer",
- "sval_fmt",
+ "sval_nested",
 ]
 
 [[package]]
 name = "symbolic-common"
-version = "12.14.1"
+version = "12.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66135c8273581acaab470356f808a1c74a707fe7ec24728af019d7247e089e71"
+checksum = "9c5199e46f23c77c611aa2a383b2f72721dfee4fb2bf85979eea1e0f26ba6e35"
 dependencies = [
  "debugid",
- "memmap2 0.9.3",
+ "memmap2 0.9.7",
  "stable_deref_trait",
  "uuid",
 ]
 
 [[package]]
 name = "symbolic-demangle"
-version = "12.14.1"
+version = "12.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42bcacd080282a72e795864660b148392af7babd75691d5ae9a3b77e29c98c77"
+checksum = "fa3c03956e32254f74e461a330b9522a2689686d80481708fb2014780d8d3959"
 dependencies = [
- "cpp_demangle 0.4.3",
+ "cpp_demangle 0.4.4",
  "rustc-demangle",
  "symbolic-common",
 ]
@@ -25101,9 +25538,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.98"
+version = "2.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1"
+checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
@@ -25112,21 +25549,21 @@ dependencies = [
 
 [[package]]
 name = "syn-solidity"
-version = "1.2.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9ac494e7266fcdd2ad80bf4375d55d27a117ea5c866c26d0e97fe5b3caeeb75"
+checksum = "a7a985ff4ffd7373e10e0fb048110fb11a162e5a4c47f92ddb8787a6f766b769"
 dependencies = [
  "paste",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "sync_wrapper"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
 dependencies = [
  "futures-core",
 ]
@@ -25140,25 +25577,25 @@ dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "syn 1.0.109",
- "unicode-xid 0.2.4",
+ "unicode-xid 0.2.6",
 ]
 
 [[package]]
 name = "synstructure"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "sysinfo"
-version = "0.30.5"
+version = "0.30.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fb4f3438c8f6389c864e61221cbc97e9bca98b4daf39a5beb7bea660f528bb2"
+checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3"
 dependencies = [
  "cfg-if",
  "core-foundation-sys",
@@ -25169,17 +25606,6 @@ dependencies = [
  "windows 0.52.0",
 ]
 
-[[package]]
-name = "system-configuration"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "system-configuration-sys 0.5.0",
-]
-
 [[package]]
 name = "system-configuration"
 version = "0.6.1"
@@ -25187,18 +25613,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
  "bitflags 2.9.1",
- "core-foundation",
- "system-configuration-sys 0.6.0",
-]
-
-[[package]]
-name = "system-configuration-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
-dependencies = [
- "core-foundation-sys",
- "libc",
+ "core-foundation 0.9.4",
+ "system-configuration-sys",
 ]
 
 [[package]]
@@ -25225,9 +25641,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "tar"
-version = "0.4.40"
+version = "0.4.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb"
+checksum = "1d863878d212c87a19c1a610eb53bb01fe12951c0501cf5a0d65f724914a667a"
 dependencies = [
  "filetime",
  "libc",
@@ -25236,27 +25652,27 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.11"
+version = "0.12.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a"
+checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "target-triple"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42a4d50cdb458045afc8131fd91b64904da29548bcb63c7236e0844936c13078"
+checksum = "1ac9aa371f599d22256307c24a9d748c041e548cbf599f35d890f9d365361790"
 
 [[package]]
 name = "tempfile"
-version = "3.14.0"
+version = "3.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
+checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
 dependencies = [
- "cfg-if",
  "fastrand 2.3.0",
+ "getrandom 0.3.3",
  "once_cell",
- "rustix 0.38.42",
- "windows-sys 0.52.0",
+ "rustix 1.0.8",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -25264,28 +25680,28 @@ name = "template-zombienet-tests"
 version = "0.0.0"
 dependencies = [
  "anyhow",
- "env_logger 0.11.3",
+ "env_logger 0.11.8",
  "tokio",
  "zombienet-sdk",
 ]
 
 [[package]]
 name = "termcolor"
-version = "1.2.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
 dependencies = [
  "winapi-util",
 ]
 
 [[package]]
 name = "terminal_size"
-version = "0.3.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
+checksum = "45c6481c4829e4cc63825e62c49186a34538b7b2750b73b266581ffb612fb5ed"
 dependencies = [
- "rustix 0.38.42",
- "windows-sys 0.48.0",
+ "rustix 1.0.8",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -25299,30 +25715,30 @@ dependencies = [
 
 [[package]]
 name = "termtree"
-version = "0.4.1"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
+checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683"
 
 [[package]]
 name = "test-log"
-version = "0.2.16"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dffced63c2b5c7be278154d76b479f9f9920ed34e7574201407f0b14e2bbb93"
+checksum = "1e33b98a582ea0be1168eba097538ee8dd4bbe0f2b01b22ac92ea30054e5be7b"
 dependencies = [
- "env_logger 0.11.3",
+ "env_logger 0.11.8",
  "test-log-macros",
- "tracing-subscriber 0.3.18",
+ "tracing-subscriber 0.3.19",
 ]
 
 [[package]]
 name = "test-log-macros"
-version = "0.2.16"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5"
+checksum = "451b374529930d7601b1eef8d32bc79ae870b6079b069401709c2a8bf9e75f36"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -25437,11 +25853,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.65"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
- "thiserror-impl 1.0.65",
+ "thiserror-impl 1.0.69",
 ]
 
 [[package]]
@@ -25455,33 +25871,33 @@ dependencies = [
 
 [[package]]
 name = "thiserror-core"
-version = "1.0.38"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d97345f6437bb2004cd58819d8a9ef8e36cdd7661c2abc4bbde0a7c40d9f497"
+checksum = "c001ee18b7e5e3f62cbf58c7fe220119e68d902bb7443179c0c8aef30090e999"
 dependencies = [
  "thiserror-core-impl",
 ]
 
 [[package]]
 name = "thiserror-core-impl"
-version = "1.0.38"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10ac1c5050e43014d16b2f94d0d2ce79e65ffdd8b38d8048f9c8f6a8a6da62ac"
+checksum = "e4c60d69f36615a077cc7663b9cb8e42275722d23e58a7fa3d2c7f2915d09d04"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 1.0.109",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.65"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -25492,7 +25908,7 @@ checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -25503,12 +25919,11 @@ checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820"
 
 [[package]]
 name = "thread_local"
-version = "1.1.7"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
 dependencies = [
  "cfg-if",
- "once_cell",
 ]
 
 [[package]]
@@ -25553,9 +25968,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.36"
+version = "0.3.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
 dependencies = [
  "deranged",
  "itoa",
@@ -25570,15 +25985,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.2"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
 
 [[package]]
 name = "time-macros"
-version = "0.2.18"
+version = "0.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
 dependencies = [
  "num-conv",
  "time-core",
@@ -25595,9 +26010,9 @@ dependencies = [
 
 [[package]]
 name = "tinystr"
-version = "0.7.6"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
 dependencies = [
  "displaydoc",
  "zerovec",
@@ -25615,9 +26030,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.6.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -25630,27 +26045,29 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.45.0"
+version = "1.46.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2513ca694ef9ede0fb23fe71a4ee4107cb102b9dc1930f6d0fd77aae068ae165"
+checksum = "0cc3a2344dafbe23a245241fe8b09735b521110d30fcefbbd5feb1797ca35d17"
 dependencies = [
  "backtrace",
  "bytes",
+ "io-uring",
  "libc",
  "mio",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.5.9",
+ "slab",
+ "socket2 0.5.10",
  "tokio-macros",
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "tokio-io-timeout"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf"
+checksum = "0bd86198d9ee903fedd2f9a2e72014287c0d9167e4ae43b5853007205dda1b76"
 dependencies = [
  "pin-project-lite",
  "tokio",
@@ -25664,7 +26081,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -25694,26 +26111,25 @@ version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
 dependencies = [
- "rustls 0.21.7",
+ "rustls 0.21.12",
  "tokio",
 ]
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.0"
+version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
 dependencies = [
- "rustls 0.23.18",
- "rustls-pki-types",
+ "rustls 0.23.29",
  "tokio",
 ]
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.16"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -25754,11 +26170,11 @@ checksum = "7a9daff607c6d2bf6c16fd681ccb7eecc83e4e2cdc1ca067ffaadfca5de7f084"
 dependencies = [
  "futures-util",
  "log",
- "rustls 0.23.18",
- "rustls-native-certs 0.8.0",
+ "rustls 0.23.29",
+ "rustls-native-certs 0.8.1",
  "rustls-pki-types",
  "tokio",
- "tokio-rustls 0.26.0",
+ "tokio-rustls 0.26.2",
  "tungstenite 0.26.2",
 ]
 
@@ -25788,21 +26204,45 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.19"
+version = "0.8.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
+dependencies = [
+ "serde",
+ "serde_spanned 0.6.9",
+ "toml_datetime 0.6.11",
+ "toml_edit 0.22.27",
+]
+
+[[package]]
+name = "toml"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed0aee96c12fa71097902e0bb061a5e1ebd766a6636bb605ba401c45c1650eac"
+dependencies = [
+ "indexmap 2.10.0",
+ "serde",
+ "serde_spanned 1.0.0",
+ "toml_datetime 0.7.0",
+ "toml_parser",
+ "toml_writer",
+ "winnow 0.7.12",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
 dependencies = [
  "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit 0.22.22",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.8"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+checksum = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3"
 dependencies = [
  "serde",
 ]
@@ -25813,35 +26253,46 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.9.0",
- "toml_datetime",
- "winnow 0.5.15",
+ "indexmap 2.10.0",
+ "toml_datetime 0.6.11",
+ "winnow 0.5.40",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.21.0"
+version = "0.22.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03"
+checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
 dependencies = [
- "indexmap 2.9.0",
- "toml_datetime",
- "winnow 0.5.15",
+ "indexmap 2.10.0",
+ "serde",
+ "serde_spanned 0.6.9",
+ "toml_datetime 0.6.11",
+ "toml_write",
+ "winnow 0.7.12",
 ]
 
 [[package]]
-name = "toml_edit"
-version = "0.22.22"
+name = "toml_parser"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
+checksum = "97200572db069e74c512a14117b296ba0a80a30123fbbb5aa1f4a348f639ca30"
 dependencies = [
- "indexmap 2.9.0",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow 0.6.18",
+ "winnow 0.7.12",
 ]
 
+[[package]]
+name = "toml_write"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
+
+[[package]]
+name = "toml_writer"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcc842091f2def52017664b53082ecbbeb5c7731092bad69d2c63050401dfd64"
+
 [[package]]
 name = "tower"
 version = "0.4.13"
@@ -25859,6 +26310,21 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "tower"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "sync_wrapper",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+]
+
 [[package]]
 name = "tower-http"
 version = "0.4.4"
@@ -25870,8 +26336,8 @@ dependencies = [
  "bytes",
  "futures-core",
  "futures-util",
- "http 0.2.9",
- "http-body 0.4.5",
+ "http 0.2.12",
+ "http-body 0.4.6",
  "http-range-header",
  "mime",
  "pin-project-lite",
@@ -25888,31 +26354,49 @@ checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5"
 dependencies = [
  "bitflags 2.9.1",
  "bytes",
- "http 1.1.0",
- "http-body 1.0.0",
+ "http 1.3.1",
+ "http-body 1.0.1",
  "http-body-util",
  "pin-project-lite",
  "tower-layer",
  "tower-service",
 ]
 
+[[package]]
+name = "tower-http"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
+dependencies = [
+ "bitflags 2.9.1",
+ "bytes",
+ "futures-util",
+ "http 1.3.1",
+ "http-body 1.0.1",
+ "iri-string",
+ "pin-project-lite",
+ "tower 0.5.2",
+ "tower-layer",
+ "tower-service",
+]
+
 [[package]]
 name = "tower-layer"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
 
 [[package]]
 name = "tower-service"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "log",
  "pin-project-lite",
@@ -25922,20 +26406,20 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.27"
+version = "0.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
 dependencies = [
  "once_cell",
  "valuable",
@@ -25967,10 +26451,10 @@ version = "5.0.0"
 dependencies = [
  "assert_matches",
  "expander",
- "proc-macro-crate 3.1.0",
+ "proc-macro-crate 3.3.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -25995,15 +26479,15 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
 dependencies = [
  "chrono",
  "matchers",
  "nu-ansi-term",
  "once_cell",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "regex",
  "sharded-slab",
  "smallvec",
@@ -26063,15 +26547,15 @@ dependencies = [
 
 [[package]]
 name = "try-lock"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "trybuild"
-version = "1.0.103"
+version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b812699e0c4f813b872b373a4471717d9eb550da14b311058a4d9cf4173cbca6"
+checksum = "65af40ad689f2527aebbd37a0a816aea88ff5f774ceabe99de5be02f2f91dae2"
 dependencies = [
  "dissimilar",
  "glob",
@@ -26080,7 +26564,7 @@ dependencies = [
  "serde_json",
  "target-triple",
  "termcolor",
- "toml 0.8.19",
+ "toml 0.9.2",
 ]
 
 [[package]]
@@ -26098,12 +26582,12 @@ dependencies = [
  "byteorder",
  "bytes",
  "data-encoding",
- "http 0.2.9",
+ "http 0.2.12",
  "httparse",
  "log",
  "rand 0.8.5",
  "sha1",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "url",
  "utf-8",
 ]
@@ -26116,11 +26600,11 @@ checksum = "4793cb5e56680ecbb1d843515b23b6de9a75eb04b66643e256a396d43be33c13"
 dependencies = [
  "bytes",
  "data-encoding",
- "http 1.1.0",
+ "http 1.3.1",
  "httparse",
  "log",
- "rand 0.9.0",
- "rustls 0.23.18",
+ "rand 0.9.2",
+ "rustls 0.23.29",
  "rustls-pki-types",
  "sha1",
  "thiserror 2.0.12",
@@ -26146,17 +26630,29 @@ dependencies = [
  "static_assertions",
 ]
 
+[[package]]
+name = "twox-hash"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b907da542cbced5261bd3256de1b3a1bf340a3d37f93425a07362a1d687de56"
+
+[[package]]
+name = "typeid"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c"
+
 [[package]]
 name = "typenum"
-version = "1.16.0"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
+checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
 
 [[package]]
 name = "ucd-trie"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
+checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
 
 [[package]]
 name = "uint"
@@ -26190,15 +26686,15 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.13"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
+checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.11"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 
 [[package]]
 name = "unicode-normalization"
@@ -26217,21 +26713,15 @@ checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0"
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.10"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 
 [[package]]
 name = "unicode-width"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
+checksum = "4a1a07cc7db3810833284e8d372ccdc6da29741639ecc70c9ec107df0fa6154c"
 
 [[package]]
 name = "unicode-xid"
@@ -26241,15 +26731,9 @@ checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
-
-[[package]]
-name = "unicode_categories"
-version = "0.1.1"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "universal-hash"
@@ -26258,7 +26742,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
 dependencies = [
  "crypto-common",
- "subtle 2.5.0",
+ "subtle 2.6.1",
 ]
 
 [[package]]
@@ -26308,7 +26792,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
- "idna 1.0.3",
+ "idna",
  "percent-encoding",
  "serde",
 ]
@@ -26319,12 +26803,6 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
-[[package]]
-name = "utf16_iter"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
-
 [[package]]
 name = "utf8_iter"
 version = "1.0.4"
@@ -26333,30 +26811,32 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
 
 [[package]]
 name = "utf8parse"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.4.1"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
+checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d"
 dependencies = [
- "getrandom 0.2.10",
+ "getrandom 0.3.3",
+ "js-sys",
+ "wasm-bindgen",
 ]
 
 [[package]]
 name = "valuable"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
 
 [[package]]
 name = "value-bag"
-version = "1.8.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fec26a25bd6fca441cdd0f769fd7f891bae119f996de31f86a5eddccef54c1d"
+checksum = "943ce29a8a743eb10d6082545d861b24f9d1b160b7d741e0f2cdf726bec909c5"
 dependencies = [
  "value-bag-serde1",
  "value-bag-sval2",
@@ -26364,9 +26844,9 @@ dependencies = [
 
 [[package]]
 name = "value-bag-serde1"
-version = "1.8.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ead5b693d906686203f19a49e88c477fb8c15798b68cf72f60b4b5521b4ad891"
+checksum = "35540706617d373b118d550d41f5dfe0b78a0c195dc13c6815e92e2638432306"
 dependencies = [
  "erased-serde",
  "serde",
@@ -26375,9 +26855,9 @@ dependencies = [
 
 [[package]]
 name = "value-bag-sval2"
-version = "1.8.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b9d0f4a816370c3a0d7d82d603b62198af17675b12fe5e91de6b47ceb505882"
+checksum = "6fe7e140a2658cc16f7ee7a86e413e803fc8f9b5127adc8755c19f9fefa63a52"
 dependencies = [
  "sval",
  "sval_buffer",
@@ -26413,9 +26893,9 @@ dependencies = [
 
 [[package]]
 name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "void"
@@ -26496,18 +26976,18 @@ dependencies = [
 
 [[package]]
 name = "wait-timeout"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
+checksum = "09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "waker-fn"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
+checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7"
 
 [[package]]
 name = "walkdir"
@@ -26530,15 +27010,15 @@ dependencies = [
 
 [[package]]
 name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasi"
-version = "0.13.3+wasi-0.2.2"
+version = "0.14.2+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
 dependencies = [
  "wit-bindgen-rt",
 ]
@@ -26549,14 +27029,24 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
 
+[[package]]
+name = "wasix"
+version = "0.12.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1fbb4ef9bbca0c1170e0b00dd28abc9e3b68669821600cad1caaed606583c6d"
+dependencies = [
+ "wasi 0.11.1+wasi-snapshot-preview1",
+]
+
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.95"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
 dependencies = [
  "cfg-if",
  "once_cell",
+ "rustversion",
  "serde",
  "serde_json",
  "wasm-bindgen-macro",
@@ -26564,36 +27054,36 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.95"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
 dependencies = [
  "bumpalo",
  "log",
- "once_cell",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.45"
+version = "0.4.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b"
+checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
 dependencies = [
  "cfg-if",
  "js-sys",
+ "once_cell",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.95"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
 dependencies = [
  "quote 1.0.40",
  "wasm-bindgen-macro-support",
@@ -26601,30 +27091,34 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.95"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.95"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
 
 [[package]]
 name = "wasm-encoder"
-version = "0.31.1"
+version = "0.235.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41763f20eafed1399fff1afb466496d3a959f58241436cfdc17e3f5ca954de16"
+checksum = "b3bc393c395cb621367ff02d854179882b9a351b4e0c93d1397e6090b53a5c2a"
 dependencies = [
- "leb128",
+ "leb128fmt",
+ "wasmparser 0.235.0",
 ]
 
 [[package]]
@@ -26638,16 +27132,16 @@ dependencies = [
 
 [[package]]
 name = "wasm-opt"
-version = "0.116.0"
+version = "0.116.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc942673e7684671f0c5708fc18993569d184265fd5223bb51fc8e5b9b6cfd52"
+checksum = "2fd87a4c135535ffed86123b6fb0f0a5a0bc89e50416c942c5f0662c645f679c"
 dependencies = [
  "anyhow",
  "libc",
  "strum 0.24.1",
  "strum_macros 0.24.3",
  "tempfile",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "wasm-opt-cxx-sys",
  "wasm-opt-sys",
 ]
@@ -26710,17 +27204,33 @@ version = "0.32.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "50386c99b9c32bd2ed71a55b6dd4040af2580530fae8bdb9a6576571a80d0cca"
 dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec 0.7.6",
  "multi-stash",
  "num-derive",
  "num-traits",
  "smallvec",
  "spin 0.9.8",
- "wasmi_collections",
+ "wasmi_collections 0.32.3",
  "wasmi_core 0.32.3",
  "wasmparser-nostd",
 ]
 
+[[package]]
+name = "wasmi"
+version = "0.40.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a19af97fcb96045dd1d6b4d23e2b4abdbbe81723dbc5c9f016eb52145b320063"
+dependencies = [
+ "arrayvec 0.7.6",
+ "multi-stash",
+ "smallvec",
+ "spin 0.9.8",
+ "wasmi_collections 0.40.0",
+ "wasmi_core 0.40.0",
+ "wasmi_ir",
+ "wasmparser 0.221.3",
+]
+
 [[package]]
 name = "wasmi_arena"
 version = "0.4.1"
@@ -26738,6 +27248,12 @@ dependencies = [
  "string-interner",
 ]
 
+[[package]]
+name = "wasmi_collections"
+version = "0.40.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e80d6b275b1c922021939d561574bf376613493ae2b61c6963b15db0e8813562"
+
 [[package]]
 name = "wasmi_core"
 version = "0.13.0"
@@ -26762,6 +27278,25 @@ dependencies = [
  "paste",
 ]
 
+[[package]]
+name = "wasmi_core"
+version = "0.40.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a8c51482cc32d31c2c7ff211cd2bedd73c5bd057ba16a2ed0110e7a96097c33"
+dependencies = [
+ "downcast-rs",
+ "libm",
+]
+
+[[package]]
+name = "wasmi_ir"
+version = "0.40.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e431a14c186db59212a88516788bd68ed51f87aa1e08d1df742522867b5289a"
+dependencies = [
+ "wasmi_core 0.40.0",
+]
+
 [[package]]
 name = "wasmparser"
 version = "0.102.0"
@@ -26772,6 +27307,26 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "wasmparser"
+version = "0.221.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d06bfa36ab3ac2be0dee563380147a5b81ba10dd8885d7fbbc9eb574be67d185"
+dependencies = [
+ "bitflags 2.9.1",
+]
+
+[[package]]
+name = "wasmparser"
+version = "0.235.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "161296c618fa2d63f6ed5fffd1112937e803cb9ec71b32b01a76321555660917"
+dependencies = [
+ "bitflags 2.9.1",
+ "indexmap 2.10.0",
+ "semver 1.0.26",
+]
+
 [[package]]
 name = "wasmparser-nostd"
 version = "0.100.2"
@@ -26800,7 +27355,7 @@ dependencies = [
  "rayon",
  "serde",
  "target-lexicon",
- "wasmparser",
+ "wasmparser 0.102.0",
  "wasmtime-cache",
  "wasmtime-cranelift",
  "wasmtime-environ",
@@ -26830,7 +27385,7 @@ dependencies = [
  "directories-next",
  "file-per-thread-logger",
  "log",
- "rustix 0.36.15",
+ "rustix 0.36.17",
  "serde",
  "sha2 0.10.9",
  "toml 0.5.11",
@@ -26854,8 +27409,8 @@ dependencies = [
  "log",
  "object 0.30.4",
  "target-lexicon",
- "thiserror 1.0.65",
- "wasmparser",
+ "thiserror 1.0.69",
+ "wasmparser 0.102.0",
  "wasmtime-cranelift-shared",
  "wasmtime-environ",
 ]
@@ -26889,8 +27444,8 @@ dependencies = [
  "object 0.30.4",
  "serde",
  "target-lexicon",
- "thiserror 1.0.65",
- "wasmparser",
+ "thiserror 1.0.69",
+ "wasmparser 0.102.0",
  "wasmtime-types",
 ]
 
@@ -26926,7 +27481,7 @@ checksum = "6e0554b84c15a27d76281d06838aed94e13a77d7bf604bbbaf548aa20eb93846"
 dependencies = [
  "object 0.30.4",
  "once_cell",
- "rustix 0.36.15",
+ "rustix 0.36.17",
 ]
 
 [[package]]
@@ -26954,10 +27509,10 @@ dependencies = [
  "log",
  "mach",
  "memfd",
- "memoffset 0.8.0",
+ "memoffset",
  "paste",
  "rand 0.8.5",
- "rustix 0.36.15",
+ "rustix 0.36.17",
  "wasmtime-asm-macros",
  "wasmtime-environ",
  "wasmtime-jit-debug",
@@ -26972,36 +27527,37 @@ checksum = "a4f6fffd2a1011887d57f07654dd112791e872e3ff4a2e626aee8059ee17f06f"
 dependencies = [
  "cranelift-entity",
  "serde",
- "thiserror 1.0.65",
- "wasmparser",
+ "thiserror 1.0.69",
+ "wasmparser 0.102.0",
 ]
 
 [[package]]
 name = "wast"
-version = "63.0.0"
+version = "235.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2560471f60a48b77fccefaf40796fda61c97ce1e790b59dfcec9dc3995c9f63a"
+checksum = "1eda4293f626c99021bb3a6fbe4fbbe90c0e31a5ace89b5f620af8925de72e13"
 dependencies = [
- "leb128",
+ "bumpalo",
+ "leb128fmt",
  "memchr",
- "unicode-width 0.1.10",
+ "unicode-width",
  "wasm-encoder",
 ]
 
 [[package]]
 name = "wat"
-version = "1.0.70"
+version = "1.235.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bdc306c2c4c2f2bf2ba69e083731d0d2a77437fc6a350a19db139636e7e416c"
+checksum = "e777e0327115793cb96ab220b98f85327ec3d11f34ec9e8d723264522ef206aa"
 dependencies = [
  "wast",
 ]
 
 [[package]]
 name = "web-sys"
-version = "0.3.64"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
+checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -27017,17 +27573,35 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "webpki-root-certs"
+version = "0.26.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75c7f0ef91146ebfb530314f5f1d24528d7f0767efbfd31dce919275413e393e"
+dependencies = [
+ "webpki-root-certs 1.0.2",
+]
+
+[[package]]
+name = "webpki-root-certs"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e4ffd8df1c57e87c325000a3d6ef93db75279dc3a231125aac571650f22b12a"
+dependencies = [
+ "rustls-pki-types",
+]
+
 [[package]]
 name = "webpki-roots"
-version = "0.25.2"
+version = "0.25.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc"
+checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.3"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd"
+checksum = "7e8983c3ab33d6fb807cfcdad2491c4ea8cbc8ed839181c7dfd9c67c83e261b2"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -27191,19 +27765,19 @@ dependencies = [
 
 [[package]]
 name = "whoami"
-version = "1.5.2"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d"
+checksum = "6994d13118ab492c3c80c1f81928718159254c53c472bf9ce36f8dae4add02a7"
 dependencies = [
- "redox_syscall 0.5.8",
+ "redox_syscall 0.5.15",
  "wasite",
 ]
 
 [[package]]
 name = "wide"
-version = "0.7.11"
+version = "0.7.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa469ffa65ef7e0ba0f164183697b89b854253fd31aeb92358b7b6155177d62f"
+checksum = "0ce5da8ecb62bcd8ec8b7ea19f69a51275e91299be594ea5cc6ef7819e16cd03"
 dependencies = [
  "bytemuck",
  "safe_arch",
@@ -27211,9 +27785,9 @@ dependencies = [
 
 [[package]]
 name = "widestring"
-version = "1.0.2"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8"
+checksum = "dd7cf3379ca1aac9eea11fba24fd7e315d621f8dfe35c8d7d2be8b793726e07d"
 
 [[package]]
 name = "winapi"
@@ -27233,11 +27807,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.5"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "winapi",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -27248,130 +27822,163 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows"
-version = "0.48.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
 dependencies = [
- "windows-targets 0.48.5",
+ "windows-core 0.52.0",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows"
-version = "0.51.1"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9"
+checksum = "efc5cf48f83140dcaab716eeaea345f9e93d0018fb81162753a3f76c3397b538"
 dependencies = [
- "windows-core 0.51.1",
- "windows-targets 0.48.5",
+ "windows-core 0.53.0",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows"
-version = "0.52.0"
+version = "0.61.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
+checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893"
 dependencies = [
- "windows-core 0.52.0",
- "windows-targets 0.52.6",
+ "windows-collections",
+ "windows-core 0.61.2",
+ "windows-future",
+ "windows-link",
+ "windows-numerics",
 ]
 
 [[package]]
-name = "windows"
-version = "0.58.0"
+name = "windows-collections"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6"
+checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8"
 dependencies = [
- "windows-core 0.58.0",
- "windows-targets 0.52.6",
+ "windows-core 0.61.2",
 ]
 
 [[package]]
 name = "windows-core"
-version = "0.51.1"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows-core"
-version = "0.52.0"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+checksum = "9dcc5b895a6377f1ab9fa55acedab1fd5ac0db66ad1e6c7f47e28a22e446a5dd"
 dependencies = [
+ "windows-result 0.1.2",
  "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows-core"
-version = "0.58.0"
+version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
+checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
 dependencies = [
  "windows-implement",
  "windows-interface",
- "windows-result",
+ "windows-link",
+ "windows-result 0.3.4",
  "windows-strings",
- "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-future"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
+dependencies = [
+ "windows-core 0.61.2",
+ "windows-link",
+ "windows-threading",
 ]
 
 [[package]]
 name = "windows-implement"
-version = "0.58.0"
+version = "0.60.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
+checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "windows-interface"
-version = "0.58.0"
+version = "0.59.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
+checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "windows-link"
-version = "0.1.0"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3"
+checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
 
 [[package]]
-name = "windows-registry"
+name = "windows-numerics"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
+checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
 dependencies = [
- "windows-result",
+ "windows-core 0.61.2",
+ "windows-link",
+]
+
+[[package]]
+name = "windows-registry"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e"
+dependencies = [
+ "windows-link",
+ "windows-result 0.3.4",
  "windows-strings",
- "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows-result"
-version = "0.2.0"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
 dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-result"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
+dependencies = [
+ "windows-link",
+]
+
 [[package]]
 name = "windows-strings"
-version = "0.1.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
 dependencies = [
- "windows-result",
- "windows-targets 0.52.6",
+ "windows-link",
 ]
 
 [[package]]
@@ -27410,6 +28017,15 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.2",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.42.2"
@@ -27449,13 +28065,38 @@ dependencies = [
  "windows_aarch64_gnullvm 0.52.6",
  "windows_aarch64_msvc 0.52.6",
  "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm",
+ "windows_i686_gnullvm 0.52.6",
  "windows_i686_msvc 0.52.6",
  "windows_x86_64_gnu 0.52.6",
  "windows_x86_64_gnullvm 0.52.6",
  "windows_x86_64_msvc 0.52.6",
 ]
 
+[[package]]
+name = "windows-targets"
+version = "0.53.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef"
+dependencies = [
+ "windows_aarch64_gnullvm 0.53.0",
+ "windows_aarch64_msvc 0.53.0",
+ "windows_i686_gnu 0.53.0",
+ "windows_i686_gnullvm 0.53.0",
+ "windows_i686_msvc 0.53.0",
+ "windows_x86_64_gnu 0.53.0",
+ "windows_x86_64_gnullvm 0.53.0",
+ "windows_x86_64_msvc 0.53.0",
+]
+
+[[package]]
+name = "windows-threading"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6"
+dependencies = [
+ "windows-link",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.42.2"
@@ -27474,6 +28115,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.42.2"
@@ -27492,6 +28139,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.42.2"
@@ -27510,12 +28163,24 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.42.2"
@@ -27534,6 +28199,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.42.2"
@@ -27552,6 +28223,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.2"
@@ -27570,6 +28247,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.42.2"
@@ -27589,28 +28272,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
-name = "winnow"
-version = "0.5.15"
+name = "windows_x86_64_msvc"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc"
-dependencies = [
- "memchr",
-]
+checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
 
 [[package]]
 name = "winnow"
-version = "0.6.18"
+version = "0.5.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "winnow"
-version = "0.7.10"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06928c8748d81b05c9be96aad92e1b6ff01833332f281e8cfca3be4b35fc9ec"
+checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95"
 dependencies = [
  "memchr",
 ]
@@ -27627,24 +28307,18 @@ dependencies = [
 
 [[package]]
 name = "wit-bindgen-rt"
-version = "0.33.0"
+version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
+checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
 dependencies = [
  "bitflags 2.9.1",
 ]
 
-[[package]]
-name = "write16"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
-
 [[package]]
 name = "writeable"
-version = "0.5.5"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
 
 [[package]]
 name = "wyz"
@@ -27673,14 +28347,14 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69"
 dependencies = [
- "asn1-rs 0.6.1",
+ "asn1-rs 0.6.2",
  "data-encoding",
  "der-parser 9.0.0",
  "lazy_static",
- "nom",
- "oid-registry 0.7.0",
+ "nom 7.1.3",
+ "oid-registry 0.7.1",
  "rusticata-macros",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -27690,11 +28364,11 @@ version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4569f339c0c402346d4a75a9e39cf8dad310e287eef1ff56d4c68e5067f53460"
 dependencies = [
- "asn1-rs 0.7.0",
+ "asn1-rs 0.7.1",
  "data-encoding",
  "der-parser 10.0.0",
  "lazy_static",
- "nom",
+ "nom 7.1.3",
  "oid-registry 0.8.1",
  "rusticata-macros",
  "thiserror 2.0.12",
@@ -27703,11 +28377,12 @@ dependencies = [
 
 [[package]]
 name = "xattr"
-version = "1.0.1"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985"
+checksum = "af3a19837351dc82ba89f8a125e22a3c475f05aba604acc023d62b2739ae2909"
 dependencies = [
  "libc",
+ "rustix 1.0.8",
 ]
 
 [[package]]
@@ -27736,7 +28411,7 @@ dependencies = [
 name = "xcm-emulator"
 version = "0.5.0"
 dependencies = [
- "array-bytes 6.2.2",
+ "array-bytes 6.2.3",
  "cumulus-pallet-parachain-system",
  "cumulus-primitives-core",
  "cumulus-primitives-parachain-inherent",
@@ -27798,7 +28473,7 @@ dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "staging-xcm",
- "syn 2.0.98",
+ "syn 2.0.104",
  "trybuild",
 ]
 
@@ -27899,9 +28574,9 @@ dependencies = [
 
 [[package]]
 name = "xml-rs"
-version = "0.8.20"
+version = "0.8.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193"
+checksum = "6fd8403733700263c6eb89f192880191f1b83e332f7a20371ddcf421c4a337c7"
 
 [[package]]
 name = "xmltree"
@@ -27921,7 +28596,7 @@ dependencies = [
  "futures",
  "log",
  "nohash-hasher",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "pin-project",
  "rand 0.8.5",
  "static_assertions",
@@ -27936,18 +28611,18 @@ dependencies = [
  "futures",
  "log",
  "nohash-hasher",
- "parking_lot 0.12.3",
+ "parking_lot 0.12.4",
  "pin-project",
- "rand 0.9.0",
+ "rand 0.9.2",
  "static_assertions",
  "web-time",
 ]
 
 [[package]]
 name = "yansi"
-version = "0.5.1"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
+checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
 
 [[package]]
 name = "yap"
@@ -28027,9 +28702,9 @@ dependencies = [
 
 [[package]]
 name = "yoke"
-version = "0.7.5"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
 dependencies = [
  "serde",
  "stable_deref_trait",
@@ -28039,75 +28714,55 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.7.5"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
- "synstructure 0.13.1",
-]
-
-[[package]]
-name = "zerocopy"
-version = "0.7.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
-dependencies = [
- "zerocopy-derive 0.7.32",
+ "syn 2.0.104",
+ "synstructure 0.13.2",
 ]
 
 [[package]]
 name = "zerocopy"
-version = "0.8.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dde3bb8c68a8f3f1ed4ac9221aad6b10cece3e60a8e2ea54a6a2dec806d0084c"
-dependencies = [
- "zerocopy-derive 0.8.20",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.7.32"
+version = "0.8.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f"
 dependencies = [
- "proc-macro2 1.0.95",
- "quote 1.0.40",
- "syn 2.0.98",
+ "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.20"
+version = "0.8.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eea57037071898bf96a6da35fd626f4f27e9cee3ead2a6c703cf09d472b2e700"
+checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
 name = "zerofrom"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
 dependencies = [
  "zerofrom-derive",
 ]
 
 [[package]]
 name = "zerofrom-derive"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
- "synstructure 0.13.1",
+ "syn 2.0.104",
+ "synstructure 0.13.2",
 ]
 
 [[package]]
@@ -28127,14 +28782,25 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
+]
+
+[[package]]
+name = "zerotrie"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
 ]
 
 [[package]]
 name = "zerovec"
-version = "0.10.4"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428"
 dependencies = [
  "yoke",
  "zerofrom",
@@ -28143,13 +28809,13 @@ dependencies = [
 
 [[package]]
 name = "zerovec-derive"
-version = "0.10.3"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.98",
+ "syn 2.0.104",
 ]
 
 [[package]]
@@ -28160,7 +28826,7 @@ dependencies = [
  "parity-scale-codec",
  "serde",
  "serde_json",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-tungstenite 0.26.2",
  "tracing-gum",
@@ -28168,20 +28834,20 @@ dependencies = [
 
 [[package]]
 name = "zombienet-configuration"
-version = "0.3.10"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44219ccb5c89d60525839c9f2737da2e7f13526b9ca09c60fd8f6c48f611a925"
+checksum = "91b3e4a27386bf4b9a8505ab5bea5b9a645d060cf487c6f3ab1b2cbcd155f811"
 dependencies = [
  "anyhow",
  "lazy_static",
- "multiaddr 0.18.1",
+ "multiaddr 0.18.2",
  "regex",
  "reqwest",
  "serde",
  "serde_json",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
- "toml 0.8.19",
+ "toml 0.8.23",
  "tracing",
  "url",
  "zombienet-support",
@@ -28189,9 +28855,9 @@ dependencies = [
 
 [[package]]
 name = "zombienet-orchestrator"
-version = "0.3.8"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d7e28aafee53c025762afbc77ebb31b34ef81066bd967ed569508fc42057934"
+checksum = "5128b73a563a3a4721a08d4c0e270b51f419ed707adda942a192b0d176b3ce0a"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -28201,17 +28867,17 @@ dependencies = [
  "hex",
  "libp2p",
  "libsecp256k1",
- "multiaddr 0.18.1",
+ "multiaddr 0.18.2",
  "rand 0.8.5",
  "regex",
  "reqwest",
  "serde",
  "serde_json",
  "sha2 0.10.9",
- "sp-core 35.0.0",
- "subxt 0.38.1",
- "subxt-signer 0.38.0",
- "thiserror 1.0.65",
+ "sp-core 36.1.0",
+ "subxt 0.42.1",
+ "subxt-signer 0.42.1",
+ "thiserror 1.0.69",
  "tokio",
  "tracing",
  "uuid",
@@ -28223,20 +28889,20 @@ dependencies = [
 
 [[package]]
 name = "zombienet-prom-metrics-parser"
-version = "0.3.10"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43cb4c30b1d238ca070ae045b20f303abeb19260f1d9c9101e076937085bf2eb"
+checksum = "27e44ecde6df3904428120b7d6f93607dba2f2c7c84a72c0a4e429a3c8472c52"
 dependencies = [
  "pest",
  "pest_derive",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "zombienet-provider"
-version = "0.3.10"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1728bafa74be9955e2369fe967b31c2b0656141229019c98f4e2fd5be25dc611"
+checksum = "0f862f2e3992ddd3f6cfa546b4b439da921289ed8cb43ae0864223ffc824851b"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -28253,7 +28919,7 @@ dependencies = [
  "serde_yaml",
  "sha2 0.10.9",
  "tar",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-util",
  "tracing",
@@ -28265,15 +28931,15 @@ dependencies = [
 
 [[package]]
 name = "zombienet-sdk"
-version = "0.3.8"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91beaacd1c1e824d34b1ff8322834f0762cb5e38e3272611f43d8c1225e6b80c"
+checksum = "271384076250ca99a4ac3b7e06fa13dd0ba9b797f57803e0d86892621a66b357"
 dependencies = [
  "async-trait",
  "futures",
  "lazy_static",
- "subxt 0.38.1",
- "subxt-signer 0.38.0",
+ "subxt 0.42.1",
+ "subxt-signer 0.42.1",
  "tokio",
  "zombienet-configuration",
  "zombienet-orchestrator",
@@ -28283,9 +28949,9 @@ dependencies = [
 
 [[package]]
 name = "zombienet-support"
-version = "0.3.10"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9ea1ac6e8056820408ab85870bd0130e734c933ae3aefbf0641075cb1041643"
+checksum = "392ada4c7efb178102a3bded0ce88dee83731ffd4fa1518d9bbf658f83a66268"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -28296,7 +28962,7 @@ dependencies = [
  "regex",
  "reqwest",
  "serde_json",
- "thiserror 1.0.65",
+ "thiserror 1.0.69",
  "tokio",
  "tracing",
  "uuid",
@@ -28342,11 +29008,10 @@ dependencies = [
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.8+zstd.1.5.5"
+version = "2.0.15+zstd.1.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c"
+checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237"
 dependencies = [
  "cc",
- "libc",
  "pkg-config",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 7c06628f3faa..b3d6c82c8140 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -422,6 +422,7 @@ members = [
 	"substrate/frame/revive/dev-node/node",
 	"substrate/frame/revive/dev-node/runtime",
 	"substrate/frame/revive/fixtures",
+	"substrate/frame/revive/fixtures-solidity",
 	"substrate/frame/revive/proc-macro",
 	"substrate/frame/revive/rpc",
 	"substrate/frame/revive/uapi",
@@ -1030,6 +1031,7 @@ pallet-remark = { default-features = false, path = "substrate/frame/remark" }
 pallet-revive = { path = "substrate/frame/revive", default-features = false }
 pallet-revive-eth-rpc = { path = "substrate/frame/revive/rpc", default-features = false }
 pallet-revive-fixtures = { path = "substrate/frame/revive/fixtures", default-features = false }
+pallet-revive-fixtures-solidity = { path = "substrate/frame/revive/fixtures-solidity", default-features = false }
 pallet-revive-proc-macro = { path = "substrate/frame/revive/proc-macro", default-features = false }
 pallet-revive-uapi = { path = "substrate/frame/revive/uapi", default-features = false }
 pallet-root-offences = { default-features = false, path = "substrate/frame/root-offences" }
diff --git a/substrate/frame/revive/Cargo.toml b/substrate/frame/revive/Cargo.toml
index ed2be60ebf19..24cd62bb37dc 100644
--- a/substrate/frame/revive/Cargo.toml
+++ b/substrate/frame/revive/Cargo.toml
@@ -66,6 +66,7 @@ assert_matches = { workspace = true }
 pretty_assertions = { workspace = true }
 secp256k1 = { workspace = true, features = ["recovery"] }
 serde_json = { workspace = true }
+pallet-revive-fixtures-solidity = { workspace = true }
 
 # Polkadot SDK Dependencies
 pallet-balances = { workspace = true, default-features = true }
diff --git a/substrate/frame/revive/fixtures-solidity/Cargo.toml b/substrate/frame/revive/fixtures-solidity/Cargo.toml
new file mode 100644
index 000000000000..eb5a6c0dc5f7
--- /dev/null
+++ b/substrate/frame/revive/fixtures-solidity/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "pallet-revive-fixtures-solidity"
+version = "0.1.0"
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+description = "Solidity contract fixtures for testing and benchmarking"
+homepage.workspace = true
+repository.workspace = true
+rust-version = "1.84"
+
+[package.metadata.polkadot-sdk]
+exclude-from-umbrella = true
+
+[lints]
+workspace = true
+
+[dependencies]
+alloy-core = { workspace = true, features = ["sol-types"] }
+anyhow = { workspace = true, default-features = true, optional = true }
+
diff --git a/substrate/frame/revive/fixtures-solidity/README.md b/substrate/frame/revive/fixtures-solidity/README.md
new file mode 100644
index 000000000000..f117d9fbe883
--- /dev/null
+++ b/substrate/frame/revive/fixtures-solidity/README.md
@@ -0,0 +1,3 @@
+# Pallet revive Solidity fixtures
+
+To build the fixtures: `bash build_fixtures.sh`
diff --git a/substrate/frame/revive/fixtures-solidity/build_fixtures.sh b/substrate/frame/revive/fixtures-solidity/build_fixtures.sh
new file mode 100755
index 000000000000..eb66f61728c1
--- /dev/null
+++ b/substrate/frame/revive/fixtures-solidity/build_fixtures.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -eo pipefail
+
+[ -d fixtures-solidity ] && cd fixtures-solidity
+
+solc --overwrite --optimize --bin --bin-runtime -o contracts/build contracts/*.sol
+resolc --overwrite -Oz --bin -o contracts/build contracts/*.sol
+
diff --git a/substrate/frame/revive/fixtures-solidity/contracts/AddressPredictor.sol b/substrate/frame/revive/fixtures-solidity/contracts/AddressPredictor.sol
new file mode 100644
index 000000000000..0bc8ae5a387f
--- /dev/null
+++ b/substrate/frame/revive/fixtures-solidity/contracts/AddressPredictor.sol
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.28;
+
+contract Predicted {
+    uint public salt;
+
+    constructor(uint _salt) {
+        salt = _salt;
+    }
+}
+
+contract AddressPredictor {
+    constructor(uint _salt, bytes memory _bytecode) payable {
+        address deployed = address(new Predicted{salt: bytes32(_salt)}(_salt));
+        address predicted = predictAddress(_salt, _bytecode);
+        assert(deployed == predicted);
+    }
+
+    function predictAddress(
+        uint _foo,
+        bytes memory _bytecode
+    ) public view returns (address predicted) {
+        bytes32 addr = keccak256(
+            abi.encodePacked(
+                bytes1(0xff),
+                address(this),
+                bytes32(_foo),
+                keccak256(abi.encodePacked(_bytecode, abi.encode(_foo)))
+            )
+        );
+        predicted = address(uint160(uint(addr)));
+    }
+}
diff --git a/substrate/frame/revive/fixtures-solidity/contracts/Crypto.sol b/substrate/frame/revive/fixtures-solidity/contracts/Crypto.sol
new file mode 100644
index 000000000000..ddacd354c5fa
--- /dev/null
+++ b/substrate/frame/revive/fixtures-solidity/contracts/Crypto.sol
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.24;
+
+contract TestSha3 {
+    function test(string memory _pre) external payable returns (bytes32) {
+        return keccak256(bytes(_pre));
+    }
+}
diff --git a/substrate/frame/revive/fixtures-solidity/contracts/Flipper.sol b/substrate/frame/revive/fixtures-solidity/contracts/Flipper.sol
new file mode 100644
index 000000000000..2eff39a5a6e3
--- /dev/null
+++ b/substrate/frame/revive/fixtures-solidity/contracts/Flipper.sol
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8;
+
+contract Flipper {
+    bool public coin;
+
+    fallback() external {
+        coin = !coin;
+    }
+}
diff --git a/substrate/frame/revive/src/tests/playground.sol b/substrate/frame/revive/fixtures-solidity/contracts/Playground.sol
similarity index 100%
rename from substrate/frame/revive/src/tests/playground.sol
rename to substrate/frame/revive/fixtures-solidity/contracts/Playground.sol
diff --git a/substrate/frame/revive/fixtures-solidity/contracts/build/AddressPredictor.bin b/substrate/frame/revive/fixtures-solidity/contracts/build/AddressPredictor.bin
new file mode 100644
index 000000000000..3e100d3f31cd
--- /dev/null
+++ b/substrate/frame/revive/fixtures-solidity/contracts/build/AddressPredictor.bin
@@ -0,0 +1 @@
+60806040526040516105a53803806105a58339810160408190526100229161017d565b5f825f1b836040516100339061015d565b9081526020018190604051809103905ff5905080158015610056573d5f5f3e3d5ffd5b5090505f6100648484610090565b9050806001600160a01b0316826001600160a01b03161461008757610087610238565b5050505061027f565b5f5f60ff60f81b30855f1b85876040516020016100af91815260200190565b60408051601f19818403018152908290526100cd9291602001610263565b6040516020818303038152906040528051906020012060405160200161013d94939291907fff0000000000000000000000000000000000000000000000000000000000000094909416845260609290921b6001600160601b03191660018401526015830152603582015260550190565b60408051601f198184030181529190528051602090910120949350505050565b60c9806104dc83390190565b634e487b7160e01b5f52604160045260245ffd5b5f5f6040838503121561018e575f5ffd5b825160208401519092506001600160401b038111156101ab575f5ffd5b8301601f810185136101bb575f5ffd5b80516001600160401b038111156101d4576101d4610169565b604051601f8201601f19908116603f011681016001600160401b038111828210171561020257610202610169565b604052818152828201602001871015610219575f5ffd5b8160208401602083015e5f602083830101528093505050509250929050565b634e487b7160e01b5f52600160045260245ffd5b5f81518060208401855e5f93019283525090919050565b5f610277610271838661024c565b8461024c565b949350505050565b6102508061028c5f395ff3fe608060405234801561000f575f5ffd5b5060043610610029575f3560e01c806360a951641461002d575b5f5ffd5b61004061003b36600461012a565b61005c565b6040516001600160a01b03909116815260200160405180910390f35b5f5f60ff60f81b30855f1b858760405160200161007b91815260200190565b60408051601f198184030181529082905261009992916020016101fe565b604051602081830303815290604052805190602001206040516020016100f694939291906001600160f81b031994909416845260609290921b6bffffffffffffffffffffffff191660018401526015830152603582015260550190565b60408051601f198184030181529190528051602090910120949350505050565b634e487b7160e01b5f52604160045260245ffd5b5f5f6040838503121561013b575f5ffd5b82359150602083013567ffffffffffffffff811115610158575f5ffd5b8301601f81018513610168575f5ffd5b803567ffffffffffffffff81111561018257610182610116565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156101b1576101b1610116565b6040528181528282016020018710156101c8575f5ffd5b816020840160208301375f602083830101528093505050509250929050565b5f81518060208401855e5f93019283525090919050565b5f61021261020c83866101e7565b846101e7565b94935050505056fea2646970667358221220d1734e5ce3953d95d7088243a9aff363ffc36b18a42bf743316ba9e55cd7ee6364736f6c634300081e00336080604052348015600e575f5ffd5b5060405160c938038060c9833981016040819052602991602f565b5f556045565b5f60208284031215603e575f5ffd5b5051919050565b60798060505f395ff3fe6080604052348015600e575f5ffd5b50600436106026575f3560e01c8063bfa0b13314602a575b5f5ffd5b60315f5481565b60405190815260200160405180910390f3fea264697066735822122074304a8f21daf30f5425303562aeb0b8549e984f4c26bb099d49eda806391eff64736f6c634300081e0033
\ No newline at end of file
diff --git a/substrate/frame/revive/fixtures-solidity/contracts/build/AddressPredictor.bin-runtime b/substrate/frame/revive/fixtures-solidity/contracts/build/AddressPredictor.bin-runtime
new file mode 100644
index 000000000000..ef6a8758ad25
--- /dev/null
+++ b/substrate/frame/revive/fixtures-solidity/contracts/build/AddressPredictor.bin-runtime
@@ -0,0 +1 @@
+608060405234801561000f575f5ffd5b5060043610610029575f3560e01c806360a951641461002d575b5f5ffd5b61004061003b36600461012a565b61005c565b6040516001600160a01b03909116815260200160405180910390f35b5f5f60ff60f81b30855f1b858760405160200161007b91815260200190565b60408051601f198184030181529082905261009992916020016101fe565b604051602081830303815290604052805190602001206040516020016100f694939291906001600160f81b031994909416845260609290921b6bffffffffffffffffffffffff191660018401526015830152603582015260550190565b60408051601f198184030181529190528051602090910120949350505050565b634e487b7160e01b5f52604160045260245ffd5b5f5f6040838503121561013b575f5ffd5b82359150602083013567ffffffffffffffff811115610158575f5ffd5b8301601f81018513610168575f5ffd5b803567ffffffffffffffff81111561018257610182610116565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156101b1576101b1610116565b6040528181528282016020018710156101c8575f5ffd5b816020840160208301375f602083830101528093505050509250929050565b5f81518060208401855e5f93019283525090919050565b5f61021261020c83866101e7565b846101e7565b94935050505056fea2646970667358221220d1734e5ce3953d95d7088243a9aff363ffc36b18a42bf743316ba9e55cd7ee6364736f6c634300081e0033
\ No newline at end of file
diff --git a/substrate/frame/revive/fixtures-solidity/contracts/build/AddressPredictor.sol:AddressPredictor.pvm b/substrate/frame/revive/fixtures-solidity/contracts/build/AddressPredictor.sol:AddressPredictor.pvm
new file mode 100644
index 0000000000000000000000000000000000000000..404e2a509e9e267810f17ec6a8c556275d873ab8
GIT binary patch
literal 9884
zcmaia3v?UTdFI7~oEZR?1`sJi4_hM?l0duZVMRNkoVbA)r~&9S88V8^G~1ezpaOiv
zWb`nHyx1J*k}(0w;gVcpF`{%5TDD72)Jb*RY(z?G4x8rGL&?p0Lv+uCN*l(n$dA-=
z;>2>IHTSy%GLjp&OZ)l)Gxznszwg58Lw`odsqMu2vkBzyRWe7?4rTK{d^4AP^W%T_
z_K$D=_O0*yXx&GQhd*QNdw2U&u?^o3`kK!<)Bot^a|E<Xv_C-mW3({ZgJ@quYe#zw
zErYf%9zS&O@ZkgdIyxSS?>n;ZkprDwJ-5Dfbnc7a`gXXr_h540;p8Lj2M-+B*Z#=P
z`##$G=;0&#9zD{!@5sSJ2ag;*^ysZsZvW0_9zM9Q<B`(C!v~K%()#5uA3d^ff5$;<
z#$)?BjvjpE$f13Y9{#I?hYlT#mwD~qJmBPef3v+jez2>fv#0!-{$Be;>Lhu|MjT;>
z=D6T^&T-A*b!MEGoqtmHOxe@r-!A`N`6q=3g|~%IiVuo+N>4~Xkp4w#a1FS==lX#w
z;Qnv!Z@AC88$1ttPIwBQ?|AC(kk&M=`HMA=tvSBNSQB0Q@Y(}wJJ)8{=GK09?d7$<
zU0W}w<*&={%MW?mz2Eo#)cb(%OTKUTF8SW@+1K5%?tI0|6?)~XmA|Y!y#D<9U$1vm
z?XCK|svlJSOI5Ew<A2`&WB(ieLmU2RWB11XjTblm{l+&o9@unvQ+m_aH%)Jv+4SnB
zUv8@2{FTk;Hh*_>ar3p!|F(Jko%h_Cx^w(a*IiY2ZM*Buy8>H2zNLN3ku4XuoEdmD
zKd9(ulsr}Ri;8j5J%7QKKWQ7k_^oN>TLT|!ls;?pNbz1<>Ub_=%bm4p)A7sGr``#D
zv{AbE!{2Ofls5K_FWZcQJ9RO4V%eDVXjl5qEH_ElcamLVh}av&W4>BJC62ysmlQhU
z%XzO;S)`TmZ2V}gsKoQCY~N&0X|_~Ps@I;Pj(kQe>SF$koWJNVUT_r)VydSs)$2^r
z@>EL5pAd^vQvRZxf8Jlb;x5ig`4dVpYftq^sa`QfU8$7&_s67q??_QkDzzr1t<9ei
zv26Z%IiK+t4H4_-GfGi+q%?1;S58r1Dz%QE0ndN8%Z!-ntxVC1RBC;yr|Q-UC;Y{E
ziJym`!IjcBq<Z`*x-pg7v?9grEA-r%qMK8xyHed-_z7`xoT1xad`>9lg?zVC91uFY
zI}4q=I`5``?x$arX|qTlX0pgCb6$BT$$3pGE40#2*UKzRH;61N(hcluGJD()O{%hU
zfpjK2zsNRro?)BB&WjrLYrV48BWjv{sZL96(J$3#sk`(`AuV;Meo4_%oApb6EwxF%
zBx|XS`bANr8}#WqjaKQ?H5y&7Plq&GsZT2!t<b0a8eOMP%Nq6RXGE>ntB==dy=(RH
z8m)JYJ|5C~@6g8;t=FTEV_UaAE^ECm{e-CXNP4zT>k;&9jn-4HXG2;~nVwa&9;cr5
zYdsD<i!<8w4324Ivcf9;Y`vWGhIW$UJ#v%u$A%{MWw!KZmL94j#I~(g3KIJ+7yk3D
zLFoYzy{%TPA@;s*V?fwRpr(?8^&hpl9JU7p1wL3NsB(FvmWVlT__w(#;-p<OgdROd
z=wk(vtDJN8dza$tW7~CSZ2K@;+L<P`LO7R9<4eX_O9n}Zy`S?=yobr<w5ypORq12V
zTxCo7%FMd**!CK<5SmiHGFvHEW!Gok-^I^B6Eg%x)_auL_8Vof?bp$+q4_aEMibEp
zCgu{PJeOQ5qpdhy>r$C2d%8B(3TeWUGeniwy!C!xH~&~GxokH6;q(6R_#L^#Tv@G{
z#sK;BO_ngrXrhZHUO<;*2?JdV!w8ya&Lt)=Z~_B;JvZ5bnKBkXSH@ZkWyO2#nY?Xm
zN2BniJ6QWfS?>H6^So$eJ?1IbV#Z}OxXcF8sN-?L+RhPkQW$$~Y@kti;EoC*y}Z1P
zGC)i!jOF<f!W}eTM-PN)Yn1M<q3vql43{hoX)5eDAz~Tp(FyAvCX8mtP=2UzH80ZE
zG@)%;aa^G71u`^yRg;>epL-alapmO_EjW2tmDkVxmhIQd=zgrw(N#t}u*!jC89k68
zEZ$N^;}e#yasyk;0TH4RLl^rqw*Ky=T#sV*2!`e|2i=R^?%4J^s9C{E&1Jb(Qbtdy
z^gt8~gv;o7D3=JA<&t=NvPPBtZ~9q+uZulfGo+Z6SlciuPV!WxBYl)ofG#$P9uG^N
zBe^VOX$_f((4;b!p?Jh?m21N;1(qxj3N<D*T99)|D1%Er<yYm6TW+!zjU9ls_p1y-
z8#@GZhsfelOOBXiWTl0e%Z#}f3vSj{XShV;xZ5na%;O^K2pga97?)i}LCp0|5VKb>
zdSE?iv0E}`C399le6V(9;gV=xakGw)dDeCHxQlhbn5V=cx~RDq=0zl-tJKxx`d2qg
zK-MIL)WiyDX~n|u3}T*y@EI~THI{9Z?sQiOEvx1~B#eEUC2P1_l)2*<xWq+K;72d+
zau?4FI+C2*oxiBybCd9*t8Y^2yJv#XcDQ;Xs>+*vH)#TLmz1T-ciC^oHHIgx-1U`D
zy=U2AKh$!_ZXOa@J1oxaJ8S7>)@9CGdf^U{)C|MY&2g7$KsS&jktRmU!ygyK;*40~
zS{2GX?HU^&8*Fr`uD%^SJQ4KQ(XKfWi0GG`svP**ZxCZn%K?L*e2?unoiL`86<#20
z${=iVjtt#Bbo}bw?xFEaYUyjw+pdm#iXqq4X-|{qNmp^eRjhWS?x6Y>k6S9Z04@JS
z%JnLghf}Z1m~zwh8Lr*MGh80psuTE+5rPX9$o(QA_FOwM*USvL-z5_J{i2NjNPeW2
z3((&T5?OM>NoS$Y#4yygeF5r%CfjuQsl;u;5LOTz&a0zdt<*iZ>=*I2nIhM*WD8AZ
z&?RYd7{cR8YZuM|`9oiO53)0B<-6N|lk+Y0S1-j!VjKLi4RUOQ7?X1Amil+$5leP;
z4q}PUC$L;+hP5|$UZf}eRF~-~k&fs5OGxGMV==!!=9goBF($^JpgcBiy;#N@G;uj5
zE?2l$&Gf@(C0?ns5>KPuN`;H3oG@Ck*Y(4{74pw3#gwO3SgsY9Yu(E(MAZyQ=Vhj|
z6Czg$L?du-o@P*RS5ivJqJQ}1cUfF>A~88xs*BMUrX`D4q+%3agF=B++$1~+Kh+8C
zK<u{65SL(MZBQu!8=6E4u)O?M8YmOvJvd~Oa8u~Z^SyXD#dW@vD*w^l@8$eA`m;+E
z-pe(1j`Zq%-F-Tedby1y3gnoT<IfI!SHMPb&06VMfv>?;rOGweZuDu#AYiRvt0g;K
zqAmBVVm@2SZC1q3OXj>_d|D`uI*OA*@v!B2C7dyd;5#VLq)Ou&mx-Y)w8FFUux|^^
zM_D3C^J*>`cCthl%{SBi;rNbK!BzR*-gmjMt6>V2^0)?MgK-A1v`au@McCA!h2TXB
zdc~>m!>jT~A9xo5=0Jd<T|--PU{{UD5}ibjg?1-pggl)Txit`g4u(LWQ>t8-T!#>J
zSRr`-rC%W!9PIoYVY4P-GYG*8FOVEncnl$lpcEMz0t%6ltV4EO?B-!lk#gHYW&uu6
zV{jip&?F`tEXfPvCz8M7)@H35+=JVMwIN=REB?KJ)#W&vgHep_!6*%Np%)`{t8VcM
z2Glyql|ox5$VzF*LosicS>A+|RrybLyh{_%NtAD-%3=SzJk!C8__z8mzQeN~-WZzQ
zWGG^F&=C+gPyanGv&Twv$q-M6hGwNX)HGfKYPbe@mMfKk9g4ZbW6ZnEacS}SQWbC;
z$N+ga&ndJG$Af&w-CzUUGgpi_gPgDj&_suMhS4$(qyqG52Tf?I9O?ZPYB7|??fIv*
z@4$8rHmR|xE>=jg=@z7Nn)E|!#gih62Vw(7_ID7sNqF6f(vZ;NGZd*wm7{n5nkHcK
zaB0DYHNWPXkh#@W`7@vUC5AFMsX^VaDT78?(vOO6Xr6^rA}?<PC`T|uLNO)<BQKgz
z*`!r;SX<PXl3-_Jhr~UhcwDf&7%Owwp0`W{)8FR1pM|eBLsS(l3bDiJ!w&B1s{C1I
zS*0xm<FaHOYpub=73U}=Q||p9q)!!~ikSV5cp5dDXWfNq(VUjzXBYc$))3o2LFP}3
zCLAWAnWybMMYBZBe6PUTG~;g9{G^MUW?r|?UlHf);Kc<p?}YOLR}3rx)ELJlaIJ+|
z2QPSd4<wWc+2#ku+}+E@wA-9^8G|mkmje*QLECE}2tK#fIpV;<>P4uO7l|8oE1x8;
zqlYsjuA%3JcnN(CH>wqoAuAs1O7Vz=@U~Uu;n?(}wFpN$q*dj;ANd6)*x4jPakU~&
z&k@!4kl}3--m`Oq&k$~LuE^$l-r>ofr$0O#>FYiQ$@)&XpgDxpfFD|612RVf14!Ia
zHb4_$gsI(%{6GKR+ki}VHULLBj^SBkq9>pj)KP3<fgT`9s9#@6gR}#XW!{QS<GjFq
zt~ic*ETC%eVtgwlHre6sXc@G$y@FqU@V{j^KhV2wX-k#=OX?T3LJgFYsO#&lC4cF%
zKzMFotLkfcN(TOeIqOv4{#RurC_A0i=uB5^dy74nY(b$;s&f3}zu<D_2JTaRfAtm2
zSi}m=Tz#~F7-*pd<b)(G@B|E9chRY4RZf<#O!|WAYx@KyJ%dT%&MZqtQDWOvFur!J
z^J1<8t6Wj&<q$P$V01g3uT$lY`M0ga#>1VvE`kO5`@@{~b2bnXh%cjwI5I&`>|fxs
zRryi&c5J(e5ig(_XmhrsCC|Bmn#DcpI(qIw*KE1Ok}a2<v+)`X7GqQ8t}`Gh6PB`6
z`OyD;3)-=<^Dy8Hjx!4*Ucl+{LUB+kf-nM~3|O3)=gnCXpXTVTvs>4YAv2`&M1GtD
z7+wnj1~^LX%y1Zv>W%|oHZQDJ#hsx*tg3uu=IvFNLm9SQZo+aooKPn$FQ;`6JK+ca
z=IeBx;2C9M3c-rlMTXRof@jDAj>kiMC&UYbbcR*=v3uWw<!o%SnH5wv6=l<5)u%12
zX%xC_q(n<IyhKYbF|_sHefNIwI~01IpeCX%k&^d)g+@P%h=WFNpwO#wFS!m2V89D#
zb7Xg|fC4#(&jv(Hz4X>D&W0cIf6}Ws@F8ri9}=z3)>k@55K!TR`-ZY8)!00Qrr2)Z
zSh2y$ZG7Xe4!i}&zyKMI*h(7{d=_o0k|u2*zVlG&00Rgs49%dWKd^op>+5`dg^?ZD
zK*NYGv=$p4Lb4WoPGW<8BK>Xy-|eD(1XvHuKeTN*ej$FI0*}>-s`5B_{w;*2$Qg3z
zzy6#%FMpgN|MRUrtyZvXk$b<kM9OtyvGdPYIV)YcswI#_4i)2H;S0Fz@aJKY?%oV1
zs{jBeB;GjHGClB`bo<a)l|NP`$Ew7bfIBYagSKJt0hty2Y)WKjc$@)%amSgJxKAGI
z-dpvl^B-7(@8)zNmtrQ*f5>^re_<>C)$#mSbNhyTbdVpe6~q6#pN-25mG*uiGh-Xm
z8pQ(=JH_`&cjt^hFb&B#X{YTi=Ckg_6K+%o+LlBuq6fN+T@o&#OidWuF_v$HURL+e
zAim-3>!uyee3y2OUGTG6nOzcxCWrK^lgO{b01p|CZHAtst?E@B!u>{MGr(6R+6|WV
zA5iXQR9FqI3oVJ(;!Gn$gq^f43jEyyv*UBS>ZBcMqAE|2BhXof6KCK<pdf5K36O(1
zlOcX9!r>(l8=X>AWr+OrO_tQy{xmKEnvH(J{IrL)w;1<G#=NvpqK9Weo0AL-(Kzcd
zuDH#!#Ju9bH3Da}{E^3HJmtvs25)E2C1qM1+HL%;1L$Jt^3}`2(D=~D7w>l$cS%=I
zLjE}TDA@80ia0cLdIbXVt436rNep;a==*e#dsiO}sw1G0n3Q3%<>&lD2T2G@#g)!2
zIt@`^9F|Ozu>n+B&Z;{t3eeX*ftdG0c`}*^l@avBsVbx7CvPD2S{PXwBl_!X|B{0p
zxZz;&YmoA~BX^Ht-Xj=CL^FCDOZXU|+J~0J<#G-MT2bxtbI7N4G!LAe2-7^Ec5)85
zC`$7tc#($a0|=pUm<QJ|CENWE()0#{6)l?1V*)}KpOcCgRvD;Kx_JfK%;WNF22kr9
zS^*$q0{w&oCe_KBH{dV$+J%-xYvFtWTO@RB4>w2*qsO)hpwvVfb6ZM;p*8JLm2q;P
zfLvYD$0?F|4OIuEA<Sl**-VsOP%Xm1XD3$)1C~y<+(sC>Xq##ghGvT}@M|mu>v8A&
z2Km@)d~XzKR4$gxfH9;$lrfwyvlv599qX-Os9`izEI{WT-2HOybk@Vk>vQmtAy5Py
z2NadIb<y?^=d7wSL4NZ(;2ifDzKg1yCa=A|!Wa10r%ClSkT(8ql`yohMCkVjg9<)p
ze1I=BuilE>;tRNlux^cT3BhlTIFtlmD4t#62}oz0=y8tlQv_*<pA*N0Kf*XNng|;Z
z^c*7b!~HdR@HO}(k{bZMQXr0N(1o4#+yHC3j{CoBU{Fh>cv2`9JRtBoG%;zFey)$N
zf`Y;#t+*ud({`C!Yn&l(yhaluCkEE{v*hY)TpK9Te2Z_9O+T}Y0e{1lmpR~Kts$0_
zIcX@^7e+;MR9YNFZRf7(M@BSGdQ4o3O=DaaF39+G5@<u##hvx^?>p=3fYKUwak@VP
zxlLfC7tjpgr8)F-94z7(=g8+RqqM8V^AbDI!djY(j@8v>e&_n9EFxuU0KXZsP-i#m
zq{X1b<7WPn-5doI=rS+4kc8*mNM>Ee1=svp5AD$AM{z@hL3QGM6ocS<(8at4Or(<>
zTLNn|1}&B_<uIo>OW^Wm3by$t#N63sp8Bp>EMfnI9bgF+;vCM8&uueyRe6@=e+Kme
zhy(TVAnQWUgDz>IU|c7oZ-$)cRD>Y97FgSk2*fIQ*_y=Ru+X>3w-J_M7(b~h-yy=Q
z2tYeK-;B^>vr#q^=8&(j3i(QQ=aBDltcW<U%sWGF{!9&AAk$@>At2mtF@!FwLMC~I
zY(ZRF3_-a>CSI{zj0ajB>j|+`O>RKpi@_I+DXV;OdH@ffm$)I#c^Ac9B3z-Eckvst
zL5mucJiP!<e-}ukgo!yGu8=qsz#pgqf%g2cxT-4OCHr4pp$5$;(PR$koEwF6gTVL5
z=bTOA-vAsmtAX!>&Os42I(q{bcO3O`w7g`a7p}o^{*i2awKVTOHDHh`%<INNoRZmS
zVGf3_qXp#QWSD|$l~8t+PMMf`nf&CH($p`gf#=DO9ZljVFtvpfg(N2mUAKsWjb51`
z^m2hv1N135VWaaiSmFod)GItwTd9n*1)kqf&_0Cf{uBq-p_vl815Lu`v<+;5yZ;Mh
z?<?Tac%-65(ZZZAa3{jgJSC^H;1!$-c)A4&2wPyBwzdHC{g6;RRV)RnN|F52OI&;g
z2vDeDQz163sDb}O+8s^8mpHjpS8fv&ll-q&)W9P7s^d0iL2z(91)(^h97YN!7JOHJ
zOpdOs>t_X-!?kHO@UNu8(I`AaO87lAveIW)`eQ47PYHV-Dxq-$x|sU_Y@dUqCWr0H
z5{bQx`i2qb&?Z)JJFnpdDC$LW&&#X8-CaVrA3*3p?4_MP2;_m|x!}VD1;pY&phekE
z3rTclaK(n;xrP&5hiR9PK$i#y$h>O3OfJ5Jp9{GOROMAN@iIWMgxXR|t`UBZ=<Qmj
zGR#zoxL>d3Du+qG_j>#g%d#UPdqQM~bK_ggabkF+{xeH-od~>SKIJxIE~KV~@p5xq
zSZo*AJ$`fE!ycDeKxP^LBJmg<9<!s|_(OglgI8u=!bOyk6#0F;?in(MdafE$@i}qm
zudimyo5~+%e$ng`7aAn9p?py<$FCp@mn8F&dr@~U?BI-S@o{&PyN0e)>BeSS)xv+S
z^Q&|-^33bxM=$0YyOtTmU=V{r4DT@6Nn+k`%v%@p*4)N&{57;H%B}P!dFsWOHx%<K
zF|TYf99&O({i^bBWbnoRpMjvg>m>B}OMId0<QRJR@Gpq=QqFsh%28Sw&Q+?=BRj+n
zi;T*w+s~fB@3(A_tB3mibfb)4bm?YVRYx~Ls!*;<iTkNfQI&T{*ZaA~b4-phEaO#o
zB8}lUI6&Az$(-Up&T)*0GHni8KZ)=QzDYL^SnFaBJh@b`ciOFaxKz9~5BG;F^9tlY
zp2w5)@zo@~%FB1!SwUn|$Ii%|na&fPXZZhDa7Ni_U**|gQ5MhE!LxVTW23=su?O$o
z_K~Tv&%|O|>$gocMe*!E{de!S>Su!0)v-cDtl`6ljs|y&(x+ORHu|!eOw_wO5b(wV
zdm_W)*3nERqXYtx{?mV&5l5mypEnSw4q&^HLDDo5%!*!bE_yl=2}byz4==plY&23I
z362J{nc$wtNHDN<B+6gJMkChlO{0;BJrmhOs`rdUM}xkR;fxxH1ii7*=x8JuBU8~x
zq(6#%8~BspNHh=&dIR;?$s6#E1Y<#8HrgMFHZ(OgRBwY=dzvD_H0H%dpN?ju*e($B
zdA<KT6C90X1B1hn#(xf--WI4Ixwmu%UlvPL2O>C3AW+|*5wnreOb92&k@*23EZ+sv
z1Y&_$q(4}n9mX;6*%AWpaDK?!&mWEk8@!|9w)y}T<pXduA65ti_^WKBA-HWM2rWSf
z2*MYw;4iUIrUK^-)K~0@o<0qA`XsN{5|r-|2&6OO)>opL{%F7#*osHd`e3A?de3My
z6U7m^A|eqeD3cMrSOw>(*wzqe^kqZ!zRLSX_YT4kk@{dP^W<LqQ_P6UY1!-Z);pg(
z_w<u{z20zSYakd9z5Vt4^X^DAA_qiiDpY8w*t;zv#`b<an2w$f{&TcxG*j=(;e4Z!
zXGVh6gO<dVv4+;sy@4j*HZEgEgg`74fydmYrpD2+2A^f!J<dJ%rlBSL?GD1ZtR+S;
z-d7z6Sl{u6L6DUZFb;GH70WR$Dz<<=vx;|jR)GTX&9VY|t_E+!3B6&&Xk<8|2CUVs
zL2xVn+Ok5_S}-`mT{4FGI0!ewNHh{;QMt5%I2epI1T%O)6670ry|zeDtR8ZX!1)6i
zr*&YQf2?T`O1In)P72Yv*W(bogR$Wz=WYZ@V0W-Ovvup%C)J2kZscn37at$3-#4|#
zSGgw=@djDby#e3U(<{fsUbjBW-t4GzxB_Poy`F8A)zRT#bu2bI7Tgvcg<EmGtaOm1
M`U_3I$};l*00NHg4gdfE

literal 0
HcmV?d00001

diff --git a/substrate/frame/revive/fixtures-solidity/contracts/build/AddressPredictor.sol:Predicted.pvm b/substrate/frame/revive/fixtures-solidity/contracts/build/AddressPredictor.sol:Predicted.pvm
new file mode 100644
index 0000000000000000000000000000000000000000..b6d99e60cd34745ba7bdd10902b172b1939af6f0
GIT binary patch
literal 2032
zcmaJ>T})%g6`pGw?%3>-F~Rm=$Z|m@y(F#ba2wS;q;V*bxGN<x?v|2D6}Yi$o3got
zpLpz<2WLzddlRWEi(6m(QYvi~u%)PdOA1oAFYQ+4t$v79MdC41U-F*SZqH>&cBNLe
zd^~54XU^aEok=adfzX#Ky7(w6`b!+$Lseh(*VwfTf{cN@0P-?O5+n`sGmy74>+37o
z%ywqwZEK_aWVdc*vQKtf#Y!%p+g{n)wl*{Q+*U5LzOtFy-r0O-3#`SPH+Qx(KVQ#X
zIC3qQ=ibY#@8njtH#6^S{UW!ynalPCJ-1Y!>-W}Re>S(VZk7A@UIOFXi)c%^<FP$q
z@1*xt@8{kxyx;M?=3DaBeV_Jy-Z$7E?w`dNc^2`E&rsvYTPp?n^eLYm{E`#QL)k`l
z$G}>)l_H)|k6?-@i;72ZZ>x@b4sLZw>xB0H6zCmcQSK8JpWyvMsI3FsJNCCuNb8LD
z{xQ(|)ZaSLdJT^#`$Yu{9uQ*Szt4!uRl%<aF(}wGtqumatuxZ9)82gy{#$je=XeDR
ziV6{YNQh_M9KilfluxjzgajWJA}q?0Cms%H@9%y$A2)}9U?ZYT1&<0bdRfKO9?H)N
zJ|@I9Q5ttMgv=p_67Bs>?X}caN$c&YR>?ZDW~~?aPbq(k@MX+@A_<luJ4j}b9sG<F
zjfW@?6WQP+ST-;pk-sAH7KKixi0_}sDp+sHsMV39*g9dHvI=2k%$ReUU}D@kjWco0
zIn|kX&N<bX7;{c36Qj;4VIu0BV8%zBZi4ZM(~UD8cDg#_A*ZV`KJ0WU<Ig%>!uXKW
z!K@N=+6h*9#%ae{WzcEsta8<9Ypim`X+zinr%hNT;2dC9_B)LPE2~Z;&dU8xLucha
zr=hX3&uLIr_Bsv7(c{!1O+^w-hNuh^JE+f~56UF%f9XEMwfgvO{d_5bkTPZXeaJH#
zfS-?V`(MGZDh4LVQ!CxyQ)dvg=`q1}ca(rfc?Cwyv)HGmNWVWt@Lv@>n0&;^Cy0ms
zfOz-_*`a%AH+Y^6o6kGQeEtqd9i)nC`6>#iip<|Zvfv<DtRuNrMZnG8M=D^IR==yv
zy54!70(wqKvrFT<rE{BA(PvEMg;ky}?3Z|c!%&lUVbu(?6bby`p`lj6Ax)7hu}8HM
zXof$az;c6*{~Ou)q=Bm_MF#)%Ko*m7Z9)DrCD)hj$T_&qzH3IP86jo_o2pIEp(ok*
z`G=H$K=^IU8wP^D9dfeFLn%A73T4SnS;3MMS)#HAe32g#S*O;vbz*g_Z&}hhvkt5T
zk0f|B&PR1VtZ_>D2;pOx57nqviyHn%#(-w1fqr}OP?BW{u7j(<#=K_WWQq*UJdkS%
zS%}M`F7sNi9q8@3BjLbET#goA#AE0&Ms-6~^zT2VzX;t+k>QbtwUU9M6Z+X#G7of4
zk#OI`8Z%VGZy*}*>48fH09*wC9RTnS09XeA4=(`>Gc&wlhF7cT>y8&vBzpG1xJ2m!
ztsg~vg~#3Gd6IqC4I5AZWl}AT0gS^J@2~O4!#{WTUVZA^Q;mm*3}~@N<VQpvQF)AI
z=NnQis?m$$bbPTWHMd|W%LftY`=zCbci{2=UwjRpNvTPRNwJAt@X?qZta2E#&;}0|
z>`?Whw)f;7l?@_qV_Anc;sC&_bGpo<DL%5mBS|xuFoSV3sGC7;LD6b7S&M45Q5QQk
z;FXbtq;WZ-%cuso>+XHNMtPC&0_J&pu__6Zp$!QEgH<#GTu;jUf-I!u+A?2D@IsvD
zb(gnxLE}YuX|9#Nnsp~{N&hXns(C>>M2exhQwZ!g{4QVM)i;o)Z$kT1M7s%#k|LA2
z2eQjYsqA7ts>v<^(#Z}5_Q~JKHs(>;COnGeflI;}&&1r+aeBdQ#{Td3#?<uhW7E^-
z(RK6s|32D`y@vfiET*GF6O)ta`T6fnPMW(hGd69`#rEG^0QGu0-E6|%>~z4z^l@z3
z@5Y?jpPT+&d$@C>I6r?k7V}R`G;h2ylx*(bZO5ie{o60UuEU+?{PpyY-N<P(ZQqSG
VK#fi8-Xq7&xjD0WcR!|}{{TKckVgOj

literal 0
HcmV?d00001

diff --git a/substrate/frame/revive/fixtures-solidity/contracts/build/Crypto.sol:TestSha3.pvm b/substrate/frame/revive/fixtures-solidity/contracts/build/Crypto.sol:TestSha3.pvm
new file mode 100644
index 0000000000000000000000000000000000000000..da49081909a63ea44c8752f3c10fc2bed7edd29e
GIT binary patch
literal 2474
zcmaJ?Z%iBK8NWLW_uiSNuPHVMq=_MhI9Wfq@j97RRoxb;KK4h47iI3G2?+LV1Fe$~
z=Cj|E=DsGg9VP@GHy^ap5~&#kS5q~qDkOZ!G-<gd`7o_F$$}3<n>4lCmwwrw&?wns
z!<KfdcJkxrz4y=W`MuA-Q_g&YVb%qv@vuDeOCNKK$=PzVe0}B+$YGF^AOj$SAZI|v
z$EK!6qGK1wM#fX;GLPS;Qe)A_Z_~+aEHO5n7@3TXkB?1`oO<pn)3LFskqfblGZ)^N
zj$Ir{zW(~m#j&$fu?E=p$EIdtBNs1>y)pg0*o6zRXtRSWEZXXT1*0VzJ2#cev=smD
z;tKb^#7wgboX*|k`kJ0?`jPE@+i3Gz^ZU&oHy>+RY`Na@*A~Rj@HyV#ukZs1G2Ae6
zHu-rU)09t(&0f@`J3b*85ofd%o$(`gw4z|Ho6}TQ%V=3nBTbbevJ6yN$CaCsbwjk)
zkd|rIvNnyhXc}KxM%HzqauZkXN!DGvwJB7V-ByXyGJ=*x8WA<k{=a*)>=PPk)wDyJ
z`ebDt0c_<St`sH9M1Wr@x-FwgQyp3sYotxno~m<z`TtniKw8$Rk#<dUX_=142+NZ7
z8==mp&Oy}FPAwy8q)XGf4{q^Ugv`?#Ijm_%wDi$BLtqXZ(vo$Xw<>%k?Y0VhDxF$O
z4Wv$z??~h|Od^PUn_@(rx&xnLbVrR~H*reDg=vX&B3eSElU~B~hZ1;F!L|>XR3h~n
z?MkiFZj`#I5=qTsHG@>u*b1oHQDe)eYDbJMuc|$5Y`InKu(2hnTDP%<RjtdoiB!^Q
zR0AsMFseS4xQwb-B~GL2R!O^2l~nSSQN=20GuDxsbr>rFHT$Ho;#0GSj1{k%eZp9A
ztJzj#1<cxw6|81OV;QL#!6*gP3~!WtYNo{~dDTp_QF5ypn^BU~Op{Rpj+{{hnk>a`
z>XfJp>kjWJW-f!n!n3A|^2MXG#oaRjhGF~sf{oz@MELvpW#I(`n)M^haQU=Z;7>8&
zru_t)onb|eeF4ge8*b(m+#)C#U4`W<1V@Nd(Ve5Sj$PRy$qp>DImXWiqcBDa7MCB&
zj)3g&$qujVaOXSRVhc+<d{he1PA~0(Y(ds45Aho2UHi6+exCIUe&&#9^FBXNCv`^p
zL94q7204cH^9_Dr1NjBf`|$%mUmq*DwdYY@_45ZOS=|wQNbm+robR#3wZ`hsTP$#l
zy8QK9khn5X*Wc=}{f*N*c4yPOBp!*L&!_!JWLX-I<kE*BkJ=G53g-0hKfPZq+~sIo
zc{6>w<Jg`5K4Pn%Nk-_8CAxy?Tgdt<U)*4q)M4~9j=l}Ya%tT>Rx<_jEsjh|wO`n`
zm+fZNPA1&7szAoQ=70c6TvPd_<4cucUj3{AGUdygHYj<pF%hBfO0<gUbu@o_eq-l0
zvhH&8l^ri1=D)^~sQ{S_lCzku>4l>t5vdgrNrp@V%@$d>qMmuNmf<0^v&Qaxrg%Ab
zX`S84h+%Pp(@Qy~RzhY$tYz)nMZ4T@uq2sd$wU!c9@G;soLpcPjLio$9?&NkmaM8Y
z9we*hXgow#6ZJUgiP5?r$n{YLxBc`19SzWEkdBAwSs%F6JkHmSBRVOW&kJTr_;6FK
zZQ8fj>~z9y4k2^SURx7ubBIoP&DK`)j%cnSJ?p7uc{9^mdt2B}3k^@2;HXWzxq)h{
z{QRArJN*30{M`0sJ7m(%9QdIX;uNu7<*g<JX=Ok&2sPSL0oGdB{BaM72WcXbFF+Fb
z`74Zq+yDF^pQZ_gCW9i|&W}EN^r#+o*aQ)wiO^DkCh$^Wn7_>cgM9i5BlkyGxnBVZ
zv3ep1ItadTz5A&icS8x~091<Y>5~jgKM2qpKDz0p8*b=L)|y~J5krq#ZS<)MkUC#y
z0nt)$*LNT2((Y_&mn4<wVm|#Q&|DUq>eLDni3ex_*U3Xv;~@(CBYGSv0tFR(_#gKh
z)^1321Jg}JKd@Frt59#Kbz=vO84aU{3{(r0koPYK`i}>C`#}E=F1G+u1j#Y&jZf%#
z68a{j07K#i)V6|;{Ay2jsj};w>>7Q^&)XpGvMZrrcXjWeU|)1J3O2ZJE55Hr<^JCS
zstI!IbI7*<xz<4LP43D48?fO$kSokSc-`M?;8M@mzZf1h;Mx3s=kSQOeRH3m7Hup|
z1X6P}5lj_nGL%||YD%q>iGMOA`3d;{BS_y}hD?IQAr}3AxDQ_fNF@b(f4v8-MR5Ch
zfad+oN$*E{bvK;+6DWxLGdp{<O1hyi5$SeAd6I4~U6)9gkN$+NAkqb0fpj6dERjxp
zitBl~?|L{Smp%XYce?MyHP49?^4gF*^u=4to|lmDN;2Hl)+3h(heG8q1K?7)hkL~u
zygGEOxA)TQ!aEaXruULZ@0Y_%4HTz5G*Lbs?v?AthuRiBj>Y0as66NajDHgvDu?A>
zcr7oXK7Qey_ENEk96gQYw({wda(O9K^z_MPsSO?nJJ?<hwY_Y+stnrja1oVI4^<*z
Y?=#O`Tk7rY?GdgGi302nmu<|y0Pu-DIRF3v

literal 0
HcmV?d00001

diff --git a/substrate/frame/revive/fixtures-solidity/contracts/build/Flipper.bin b/substrate/frame/revive/fixtures-solidity/contracts/build/Flipper.bin
new file mode 100644
index 000000000000..2dad634d8c19
--- /dev/null
+++ b/substrate/frame/revive/fixtures-solidity/contracts/build/Flipper.bin
@@ -0,0 +1 @@
+6080604052348015600e575f5ffd5b50609080601a5f395ff3fe6080604052348015600e575f5ffd5b50600436106026575f3560e01c806311df999514603b575b5f805460ff81161560ff199091168117909155005b5f5460469060ff1681565b604051901515815260200160405180910390f3fea2646970667358221220acfdaab369877aef238280e95c5594c8a6efd7c7e328d7796f567e176c66179964736f6c634300081e0033
\ No newline at end of file
diff --git a/substrate/frame/revive/fixtures-solidity/contracts/build/Flipper.bin-runtime b/substrate/frame/revive/fixtures-solidity/contracts/build/Flipper.bin-runtime
new file mode 100644
index 000000000000..0f3c4ccaa974
--- /dev/null
+++ b/substrate/frame/revive/fixtures-solidity/contracts/build/Flipper.bin-runtime
@@ -0,0 +1 @@
+6080604052348015600e575f5ffd5b50600436106026575f3560e01c806311df999514603b575b5f805460ff81161560ff199091168117909155005b5f5460469060ff1681565b604051901515815260200160405180910390f3fea2646970667358221220acfdaab369877aef238280e95c5594c8a6efd7c7e328d7796f567e176c66179964736f6c634300081e0033
\ No newline at end of file
diff --git a/substrate/frame/revive/fixtures-solidity/contracts/build/Flipper.sol:Flipper.pvm b/substrate/frame/revive/fixtures-solidity/contracts/build/Flipper.sol:Flipper.pvm
new file mode 100644
index 0000000000000000000000000000000000000000..c38199a1f33c5d8702866b18bc239167e8d0e2c7
GIT binary patch
literal 1680
zcmZuwO>7%Q6rNpgvST+bvu<opoX~D7r)+vaCI-n7suWoj%2Wbv3`FGsiK&g_l6F%k
zsmGoO+_BTxY1LL%7dGZVDkW+fO9*b28mZ+(4+sgA16&{{&fIAUvrbA&Rm*SZ_r33X
z?|oyAy$!&PPSE~ID)>GM9)Pk^z7E};1H$@*9T)b7uwh|IVIK-RlbV_uPp4*6<7cet
z;?vcXl}bNd&E!g%Y-V<RX4cB5vYDAoYHB>6nVrj@pAoycbLZw}Qy))d+JW4iy?Yl^
zQ*)W|*?j8!%qN+AK9lay<mz3;ja$9nna)g4S;fwUpZ)Rz90I>dze|dIUM|Vs$<XtT
zr{v+DSCtVZr(963Dfg8hlpzR#JPJROV`>z5Dg|GMF)G{IuMFudfLRdnI_rVF4p|Rh
zK>RX}LES|1m}E^_AMmiX!F!=~k1|Y4h!!EG&Ssp>A9gmQbpDXDY0&wXolTw2_c@!G
z&i6W-h|Y(ddyujorxm9x<g}uc1)Y{bS-@%Olyy5TOxZ!Fg(&ko8<3VXrx~ZEmz-vl
zmJT>ggO>I?O`VpyoTh-?=QI&5`J81)i(aQ5r$yDNM`^LssT;J|;na0nRGd1dMUPV#
z9A&2_Xi6OEJb-x+*_ts3Y^}@$USOI9C+$EPRJHB&MZSo69q}c|YgWNpwl=I9!>3u;
zWIZD+G)%NO(V|2%h^CK7dIb+x!g{4Q=G}>@J`WGYIgaukgNJqDU32}}S<G^XO+uEn
zN6Q>h9+>6=P%DE$aHWWn-q#*dSg9SZ*0#su07(5YuL9&DpZI*U<UIk!D8(QGa;5Na
zQ5^(=_g@S_7O2iiK3O`U0@2J4)kKQdM4h+9@d`tyS-`Xd6Cx#|VWJ@-l|f7$PK!A-
z5e)wGY$BDA?o%ZmigFy^CBNmst=sC>qB^Pucd=_RRf>6Ipv$KiZw|Sn#_;D|x<^dP
zK#HktegXr=ygp;)aZGjRCh{HGsnD3Z=PB9R@D4+F0SkN!Sa2QKfd}of2gxx9kYhK5
zl|h@SJy{lu8Zgm;oQNiJWLZ4qj_-z)ydB!E7PeUyr7u(pG3b*do<-$C-<JiwyZuz{
z<v+C6B6;Q>31JdKBm{{nTmW)2K8yHm#Md#u1Np`?IS=d=+)dgzC_RaS(-)qL;%`U6
zFOGtqR?hednEvk1Bs)7{qTteFo}J*iNq%;ke@d%#2h?g(wE%Xu7Q1$_{s&~^ZJ~|y
zC3Xd~CB($Dycz@exi<4WFG0=_FJN8~PnTasyoRk=>z<JCD;BqY6k?3CP@ILMtk+=O
zI>VUtAl3(&zk>Bj*wyepUC6l89$n$+G#3ieCI&?t-QJ2)xJ?X;_WSlGqUQKgVJzec
z{dc7;5%<oYroZnxu(QJ^I`q|}`Rwqu0tv=RFv_w5q73XwodgXN=~w^W6_fEb*xy#u
z$`dtFp#!hWM-kBAsNoYbFwxNtF-RtgJbuJmtQYeZWW73XA(0f{z#=>T1#dzY=1s)H
zkT1JQ4$4nzNH8WC5ex|&l#e9($*EKRjbx({Ausr^M(Q_LH{7GO#_DlG{QZO@|K(p+
zUymdj;_OBwC%lZcgmQVkp0M9Kd2$K*wL~Ivrx__n2FMyoHlTn=<{CF6w<3`Ui8OAm
qu15OBe&fCO`$;32B+2#U+CX9;;7>M267bTIWdA}{L>&;!lHgxH{Ps@(

literal 0
HcmV?d00001

diff --git a/substrate/frame/revive/fixtures-solidity/contracts/build/Playground.bin b/substrate/frame/revive/fixtures-solidity/contracts/build/Playground.bin
new file mode 100644
index 000000000000..22750c11a8e8
--- /dev/null
+++ b/substrate/frame/revive/fixtures-solidity/contracts/build/Playground.bin
@@ -0,0 +1 @@
+6080604052348015600e575f5ffd5b506101038061001c5f395ff3fe6080604052348015600e575f5ffd5b50600436106030575f3560e01c806336ef737d146034578063c6c2ea17146048575b5f5ffd5b435b60405190815260200160405180910390f35b603660533660046083565b5f60018211605f575090565b606a605360028460ad565b6075605360018560ad565b607d919060bd565b92915050565b5f602082840312156092575f5ffd5b5035919050565b634e487b7160e01b5f52601160045260245ffd5b81810381811115607d57607d6099565b80820180821115607d57607d609956fea26469706673582212203fd715060905f8d06df815f1b4a422d113edcdd391994968c0d389535338c08564736f6c634300081e0033
\ No newline at end of file
diff --git a/substrate/frame/revive/fixtures-solidity/contracts/build/Playground.bin-runtime b/substrate/frame/revive/fixtures-solidity/contracts/build/Playground.bin-runtime
new file mode 100644
index 000000000000..8bd8c5ccffa4
--- /dev/null
+++ b/substrate/frame/revive/fixtures-solidity/contracts/build/Playground.bin-runtime
@@ -0,0 +1 @@
+6080604052348015600e575f5ffd5b50600436106030575f3560e01c806336ef737d146034578063c6c2ea17146048575b5f5ffd5b435b60405190815260200160405180910390f35b603660533660046083565b5f60018211605f575090565b606a605360028460ad565b6075605360018560ad565b607d919060bd565b92915050565b5f602082840312156092575f5ffd5b5035919050565b634e487b7160e01b5f52601160045260245ffd5b81810381811115607d57607d6099565b80820180821115607d57607d609956fea26469706673582212203fd715060905f8d06df815f1b4a422d113edcdd391994968c0d389535338c08564736f6c634300081e0033
\ No newline at end of file
diff --git a/substrate/frame/revive/fixtures-solidity/contracts/build/Playground.sol:Playground.pvm b/substrate/frame/revive/fixtures-solidity/contracts/build/Playground.sol:Playground.pvm
new file mode 100644
index 0000000000000000000000000000000000000000..d8a67c7948d7aa1fef4322c5cb1d5738e08d38f7
GIT binary patch
literal 2384
zcmaJ?T}&I<6}~ezp6h{4?hwojhD`<v(FC<!7fXpz8<l1wttV1f1L>yON-cqy8d4Hx
zA;e?fTZLRhu#+}TX{H{~N}J8*2XM8@Bi-<jR#j`XD>YjDU<Fk|ecHAUjoO!LHw!&B
z$!7bbwS0W;xj*N8_nhxsTgSeQkmX0!k07DngwO*t>7BeNRc7iyf*=OSevog090eI1
zO`QBu|Cx!?gF|B{2S!KxV*}>~`cEd#rk-1)iGkR2YkVX<G(I#i+CMgQZer}r_|Uoj
zk<+Iq&J7HX4pmQ|9~hk&>OVI&aAy36Lt|q@u^L63F}xKIGcWmKLuW@5DPQ)jMsems
z0DWIbix<S(BJs3%j(XCbpL+h``HJ@k-rsru=-plOr<!ixUwne}l5{}o#u$mc7<s}{
z2zfF|xyJaX$ZUb7SXyM%lh5Lki}On)e_t!TCzlp5OVzNnmr);MQhpAX7XA7AB>#a{
zdcU^xYkz)DFXcp*^0PE%RA#L9fA_HT3yjt=wu9L_^Gg`q=070$tX3*w@So4>CD+4j
zg{29j^^EPRV1W70qAX*U4lvrlSR+fR&ppg(rB#0gPX&X_>?W4d7!5Mk{PY%|_mFy#
z(H6#bv*ex%LO>1}l3M8xQYkOxlX_`JN+c5tiS9%v{hmf&C-gX`-{l1JfTNHu<S1oI
zbQ;iTBjGvPgn16rCO%F0B`u6~i+I;iVmR?S4<?p)Gfv#Msb;5%ox-;5u0(9M$6X28
zY`42&*z84jMYmatyQ0~w*<B$v3%d8QO`F_8#HOlS2-&pJEf_WpxCPy&4Q@fR=`OcG
zY+COwVLPq3^AS6})1435=^gI8VW(ek=XE<>=gvdeT6dn<Y1y5_cFOPOB6do0b0ItB
zb908Bs&R9=o$|Ul%}#mT9AFgPEWi{v(Ro1Qjl@xmE_5YD`utxj+BlQlGnL&q7C}hp
z2>ZQA?3Ur@-OK)i7_<<^1c{ksaYpJwkfz6!U>ca35M+;V5V}U}t&uF^^IHVpgykEQ
z9H#-x37nWxHcUk`6=DjLC@l5FV2mvy&uyAY#8g72Vwj4aQFYlTa5coW2yZfY5ZHoC
zcO|G-uhh65I~$gSus@7;$X??c-4#&Bv<r2*2L_W!2uoFb5Cez(vS4gJ2}>2jB6a#!
z#tutQj|z^0wkY`*qJhVVHhzSh01^OXtkK+CM&{m!An+DcpgO}3z$hY%kiUHzu3VDF
zweE^Os(RZ5N8Ol8ZqPW1y^%>mR8%jE0*{l6$(FuX)W81r_a7pwzG2-{x!5Vf?-IVC
z@kPv+KD%0<^k>B5+QsB|)GuwIXa2Npe_mPSr{Dm;i}?cKOBy}pB078x(Rda)@f*k)
zo<wwH65ur+hq%kIpz-)UP=v=9Kw%EMXxxdP2;-hG(w<c<mWxdQnPd4d5)EOK$8A1*
zmX8ecQzxKHN|*g5pc8c4OtoY3P=P+w_sWmQ|GqzD)d%G-xKOV&Sgn<@T{2_mwuP%o
z$ZS_o_5xZO@8NMw<55T$ja$wzm>P{AkKLuGG>f#Pp8!IbvdHd%Pct?YUJpyvlaQ`s
zs;73_^Sl3%H2J?17NNr-8aFCTaE5g{0u8L|Pqw*ZyoJ;%d2T?hE8MXskum>#_%la&
zxJij2(10$`Mon-6At1_QensOs!ZZ95zPfz%&GqHFtAp8yIGq*N2jRt$*MEg$>0aC+
zWb?u*m8fbs2R5nNQ$7G=tr&-2TskRblR`O#SFhBrrlf2{SiOXuxh>k{gtzFfhlpxr
zMAZr>9wSEsyZIwTgHemLo!;Uq7N{EGDgqVau!E{PSAo$gfi)+&wHC+axSt2LN0<Fv
zE9U&=9OglzxPYk!#ApIms4n=v2fnW%-qb^zt^tkO74W@`xONZm`Xb`Z4-hA$DEWAU
zUW|Im8C<;NTRZPBpO+rF5^o6=-^WE8oJ%|yDc%&z%eZL3Ol^5pT6+(d3-Y5GdF@ST
zVsY&RF8k`rFH7q`k=8q5f3#0(r|-}^m@X1p(45|fn;de@A=kW;Yb7LfA+vQ7nTl;H
zXB(=2%x}=>tB!V-s#z$RMfSe-v8fE3$_Z1kl(6J=G|N<uTf{i{@zdwwo3+&n_dI>Q
zw)xjCd*L-eoyONcsd(w!4@$7em%sW6FVJR<7cgzsd4bSoqtbQ35dS5g$27?22@PUC
zr_m<TB|ak_bblC|s%EOhRIw>#l3il!p^gr7w*8B~ea@}xv$t-wzunof@Bi;RGV5(^
zue)uIM5o%#`hBhDhv3jUGL7qcJLK1bin6aQdKmj#O=qw0w%IouZ8dLSZ*OaBJKXkj
z!|c0V4evYji(Bpf=|cmH0O<O)sXKRY$07ub9>N#Nw9(c!d;N$x+qR9M0}i*==MK-d
l?=xYj!0PAj08=-kVzgm4T7Ss<ve_{`1*`kaBYkEk`Zv?{`y&7V

literal 0
HcmV?d00001

diff --git a/substrate/frame/revive/fixtures-solidity/contracts/build/Predicted.bin b/substrate/frame/revive/fixtures-solidity/contracts/build/Predicted.bin
new file mode 100644
index 000000000000..1ad2dae4e454
--- /dev/null
+++ b/substrate/frame/revive/fixtures-solidity/contracts/build/Predicted.bin
@@ -0,0 +1 @@
+6080604052348015600e575f5ffd5b5060405160c938038060c9833981016040819052602991602f565b5f556045565b5f60208284031215603e575f5ffd5b5051919050565b60798060505f395ff3fe6080604052348015600e575f5ffd5b50600436106026575f3560e01c8063bfa0b13314602a575b5f5ffd5b60315f5481565b60405190815260200160405180910390f3fea264697066735822122074304a8f21daf30f5425303562aeb0b8549e984f4c26bb099d49eda806391eff64736f6c634300081e0033
\ No newline at end of file
diff --git a/substrate/frame/revive/fixtures-solidity/contracts/build/Predicted.bin-runtime b/substrate/frame/revive/fixtures-solidity/contracts/build/Predicted.bin-runtime
new file mode 100644
index 000000000000..2d8f4086596b
--- /dev/null
+++ b/substrate/frame/revive/fixtures-solidity/contracts/build/Predicted.bin-runtime
@@ -0,0 +1 @@
+6080604052348015600e575f5ffd5b50600436106026575f3560e01c8063bfa0b13314602a575b5f5ffd5b60315f5481565b60405190815260200160405180910390f3fea264697066735822122074304a8f21daf30f5425303562aeb0b8549e984f4c26bb099d49eda806391eff64736f6c634300081e0033
\ No newline at end of file
diff --git a/substrate/frame/revive/fixtures-solidity/contracts/build/TestSha3.bin b/substrate/frame/revive/fixtures-solidity/contracts/build/TestSha3.bin
new file mode 100644
index 000000000000..4748eba15f8d
--- /dev/null
+++ b/substrate/frame/revive/fixtures-solidity/contracts/build/TestSha3.bin
@@ -0,0 +1 @@
+6080604052348015600e575f5ffd5b506101498061001c5f395ff3fe60806040526004361061001d575f3560e01c8063f9fbd55414610021575b5f5ffd5b61003a61002f366004610060565b805160209091012090565b60405190815260200160405180910390f35b634e487b7160e01b5f52604160045260245ffd5b5f60208284031215610070575f5ffd5b813567ffffffffffffffff811115610086575f5ffd5b8201601f81018413610096575f5ffd5b803567ffffffffffffffff8111156100b0576100b061004c565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156100df576100df61004c565b6040528181528282016020018610156100f6575f5ffd5b816020840160208301375f9181016020019190915294935050505056fea26469706673582212204ff62fd022e10e28becbcbecfb131cee70966744cf97bf993d83015c84f6fafd64736f6c634300081e0033
\ No newline at end of file
diff --git a/substrate/frame/revive/fixtures-solidity/contracts/build/TestSha3.bin-runtime b/substrate/frame/revive/fixtures-solidity/contracts/build/TestSha3.bin-runtime
new file mode 100644
index 000000000000..c53b73724c31
--- /dev/null
+++ b/substrate/frame/revive/fixtures-solidity/contracts/build/TestSha3.bin-runtime
@@ -0,0 +1 @@
+60806040526004361061001d575f3560e01c8063f9fbd55414610021575b5f5ffd5b61003a61002f366004610060565b805160209091012090565b60405190815260200160405180910390f35b634e487b7160e01b5f52604160045260245ffd5b5f60208284031215610070575f5ffd5b813567ffffffffffffffff811115610086575f5ffd5b8201601f81018413610096575f5ffd5b803567ffffffffffffffff8111156100b0576100b061004c565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156100df576100df61004c565b6040528181528282016020018610156100f6575f5ffd5b816020840160208301375f9181016020019190915294935050505056fea26469706673582212204ff62fd022e10e28becbcbecfb131cee70966744cf97bf993d83015c84f6fafd64736f6c634300081e0033
\ No newline at end of file
diff --git a/substrate/frame/revive/fixtures-solidity/src/contracts.rs b/substrate/frame/revive/fixtures-solidity/src/contracts.rs
new file mode 100644
index 000000000000..084741bc0430
--- /dev/null
+++ b/substrate/frame/revive/fixtures-solidity/src/contracts.rs
@@ -0,0 +1,61 @@
+// 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.
+
+//! The pallet-revive Solidity fixtures contract implementation.
+
+use alloy_core::hex::decode;
+
+alloy_core::sol!("contracts/Playground.sol");
+pub fn playground_bin() -> Vec<u8> {
+	decode(include_str!("../contracts/build/Playground.bin")).unwrap()
+}
+pub fn playground_pvm() -> Vec<u8> {
+	include_bytes!("../contracts/build/Playground.sol:Playground.pvm").into()
+}
+
+alloy_core::sol!("contracts/Crypto.sol");
+pub fn crypto_bin() -> Vec<u8> {
+	decode(include_str!("../contracts/build/TestSha3.bin")).unwrap()
+}
+pub fn crypto_pvm() -> Vec<u8> {
+	include_bytes!("../contracts/build/Crypto.sol:TestSha3.pvm").into()
+}
+
+alloy_core::sol!("contracts/AddressPredictor.sol");
+pub fn address_predictor_bin() -> Vec<u8> {
+	decode(include_str!("../contracts/build/AddressPredictor.bin")).unwrap()
+}
+pub fn address_predictor_pvm() -> Vec<u8> {
+	include_bytes!("../contracts/build/AddressPredictor.sol:AddressPredictor.pvm").into()
+}
+pub fn predicted_bin() -> Vec<u8> {
+	decode(include_str!("../contracts/build/Predicted.bin")).unwrap()
+}
+pub fn predicted_bin_runtime() -> Vec<u8> {
+	decode(include_str!("../contracts/build/AddressPredictor.bin-runtime")).unwrap()
+}
+pub fn predicted_pvm() -> Vec<u8> {
+	include_bytes!("../contracts/build/AddressPredictor.sol:Predicted.pvm").into()
+}
+
+alloy_core::sol!("contracts/Flipper.sol");
+pub fn flipper_bin() -> Vec<u8> {
+	decode(include_str!("../contracts/build/Flipper.bin")).unwrap()
+}
+pub fn flipper_pvm() -> Vec<u8> {
+	include_bytes!("../contracts/build/Flipper.sol:Flipper.pvm").into()
+}
diff --git a/substrate/frame/revive/fixtures-solidity/src/lib.rs b/substrate/frame/revive/fixtures-solidity/src/lib.rs
new file mode 100644
index 000000000000..e13525d26895
--- /dev/null
+++ b/substrate/frame/revive/fixtures-solidity/src/lib.rs
@@ -0,0 +1,20 @@
+// 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.
+
+//! The pallet-revive Solidity fixtures libray.
+
+pub mod contracts;
diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index ef1d0af7b0bd..2d8d348e14c7 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -15,51 +15,28 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+mod common;
+mod evm;
 mod pallet_dummy;
 mod precompiles;
+mod pvm;
 
-use self::test_utils::{ensure_stored, expected_deposit};
 use crate::{
-	self as pallet_revive,
-	address::{create1, create2, AddressMapper},
-	evm::{runtime::GAS_PRICE, CallTrace, CallTracer, CallType, GenericTransaction},
-	exec::Key,
-	limits,
-	storage::DeletionQueueManager,
-	test_utils::{builder::Contract, *},
-	tests::test_utils::{get_contract, get_contract_checked},
-	tracing::trace,
-	weights::WeightInfo,
-	AccountId32Mapper, AccountInfo, AccountInfoOf, BalanceOf, BalanceWithDust, BumpNonce, Code,
-	CodeInfoOf, Config, ContractInfo, DeletionQueueCounter, DepositLimit, Error, EthTransactError,
-	HoldReason, Origin, Pallet, PristineCode, H160,
+	self as pallet_revive, test_utils::*, AccountId32Mapper, BalanceOf, BalanceWithDust,
+	CodeInfoOf, Config, Origin, Pallet,
 };
-use assert_matches::assert_matches;
-use codec::Encode;
 use frame_support::{
-	assert_err, assert_err_ignore_postinfo, assert_noop, assert_ok, derive_impl,
+	assert_ok, derive_impl,
 	pallet_prelude::EnsureOrigin,
 	parameter_types,
-	storage::child,
-	traits::{
-		fungible::{BalancedHold, Inspect, Mutate, MutateHold},
-		tokens::Preservation,
-		ConstU32, ConstU64, FindAuthor, OnIdle, OnInitialize, StorageVersion,
-	},
-	weights::{constants::WEIGHT_REF_TIME_PER_SECOND, FixedFee, IdentityFee, Weight, WeightMeter},
+	traits::{ConstU32, ConstU64, FindAuthor, StorageVersion},
+	weights::{constants::WEIGHT_REF_TIME_PER_SECOND, FixedFee, IdentityFee, Weight},
 };
-use frame_system::{EventRecord, Phase};
-use pallet_revive_fixtures::compile_module;
-use pallet_revive_uapi::{ReturnErrorCode as RuntimeReturnCode, ReturnFlags};
 use pallet_transaction_payment::{ConstFeeMultiplier, Multiplier};
-use pretty_assertions::{assert_eq, assert_ne};
-use sp_core::{Get, U256};
-use sp_io::hashing::blake2_256;
 use sp_keystore::{testing::MemoryKeystore, KeystoreExt};
 use sp_runtime::{
-	testing::H256,
-	traits::{BlakeTwo256, Convert, IdentityLookup, One, Zero},
-	AccountId32, BuildStorage, DispatchError, Perbill, TokenError,
+	traits::{BlakeTwo256, Convert, IdentityLookup, One},
+	AccountId32, BuildStorage, Perbill,
 };
 
 type Block = frame_system::mocking::MockBlock<Test>;
@@ -78,12 +55,14 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[macro_export]
 macro_rules! assert_return_code {
 	( $x:expr , $y:expr $(,)? ) => {{
 		assert_eq!(u32::from_le_bytes($x.data[..].try_into().unwrap()), $y as u32);
 	}};
 }
 
+#[macro_export]
 macro_rules! assert_refcount {
 	( $code_hash:expr , $should:expr $(,)? ) => {{
 		let is = crate::CodeInfoOf::<Test>::get($code_hash).map(|m| m.refcount()).unwrap();
@@ -160,8 +139,8 @@ pub mod test_utils {
 		let code_info_len = CodeInfo::<Test>::max_encoded_len() as u64;
 		// Calculate deposit to be reserved.
 		// We add 2 storage items: one for code, other for code_info
-		DepositPerByte::get().saturating_mul(code_len as u64 + code_info_len) +
-			DepositPerItem::get().saturating_mul(2)
+		DepositPerByte::get().saturating_mul(code_len as u64 + code_info_len)
+			+ DepositPerItem::get().saturating_mul(2)
 	}
 	pub fn ensure_stored(code_hash: sp_core::H256) -> usize {
 		// Assert that code_info is stored
@@ -194,7 +173,7 @@ pub mod test_utils {
 	}
 }
 
-mod builder {
+pub(crate) mod builder {
 	use super::Test;
 	use crate::{
 		test_utils::{builder::*, ALICE},
@@ -457,4689 +436,3 @@ impl Default for Origin<Test> {
 		Self::Signed(ALICE)
 	}
 }
-
-#[test]
-fn transfer_with_dust_works() {
-	struct TestCase {
-		description: &'static str,
-		from_balance: BalanceWithDust<u64>,
-		to_balance: BalanceWithDust<u64>,
-		amount: BalanceWithDust<u64>,
-		expected_from_balance: BalanceWithDust<u64>,
-		expected_to_balance: BalanceWithDust<u64>,
-		total_issuance_diff: i64,
-	}
-
-	let plank: u32 = <Test as Config>::NativeToEthRatio::get();
-
-	let test_cases = vec![
-		TestCase {
-			description: "without dust",
-			from_balance: BalanceWithDust::new_unchecked::<Test>(100, 0),
-			to_balance: BalanceWithDust::new_unchecked::<Test>(0, 0),
-			amount: BalanceWithDust::new_unchecked::<Test>(1, 0),
-			expected_from_balance: BalanceWithDust::new_unchecked::<Test>(99, 0),
-			expected_to_balance: BalanceWithDust::new_unchecked::<Test>(1, 0),
-			total_issuance_diff: 0,
-		},
-		TestCase {
-			description: "with dust",
-			from_balance: BalanceWithDust::new_unchecked::<Test>(100, 0),
-			to_balance: BalanceWithDust::new_unchecked::<Test>(0, 0),
-			amount: BalanceWithDust::new_unchecked::<Test>(1, 10),
-			expected_from_balance: BalanceWithDust::new_unchecked::<Test>(98, plank - 10),
-			expected_to_balance: BalanceWithDust::new_unchecked::<Test>(1, 10),
-			total_issuance_diff: 1,
-		},
-		TestCase {
-			description: "just dust",
-			from_balance: BalanceWithDust::new_unchecked::<Test>(100, 0),
-			to_balance: BalanceWithDust::new_unchecked::<Test>(0, 0),
-			amount: BalanceWithDust::new_unchecked::<Test>(0, 10),
-			expected_from_balance: BalanceWithDust::new_unchecked::<Test>(99, plank - 10),
-			expected_to_balance: BalanceWithDust::new_unchecked::<Test>(0, 10),
-			total_issuance_diff: 1,
-		},
-		TestCase {
-			description: "with existing dust",
-			from_balance: BalanceWithDust::new_unchecked::<Test>(100, 5),
-			to_balance: BalanceWithDust::new_unchecked::<Test>(0, plank - 5),
-			amount: BalanceWithDust::new_unchecked::<Test>(1, 10),
-			expected_from_balance: BalanceWithDust::new_unchecked::<Test>(98, plank - 5),
-			expected_to_balance: BalanceWithDust::new_unchecked::<Test>(2, 5),
-			total_issuance_diff: 0,
-		},
-		TestCase {
-			description: "with enough existing dust",
-			from_balance: BalanceWithDust::new_unchecked::<Test>(100, 10),
-			to_balance: BalanceWithDust::new_unchecked::<Test>(0, plank - 10),
-			amount: BalanceWithDust::new_unchecked::<Test>(1, 10),
-			expected_from_balance: BalanceWithDust::new_unchecked::<Test>(99, 0),
-			expected_to_balance: BalanceWithDust::new_unchecked::<Test>(2, 0),
-			total_issuance_diff: -1,
-		},
-	];
-
-	for TestCase {
-		description,
-		from_balance,
-		to_balance,
-		amount,
-		expected_from_balance,
-		expected_to_balance,
-		total_issuance_diff,
-	} in test_cases.into_iter()
-	{
-		ExtBuilder::default().build().execute_with(|| {
-			test_utils::set_balance_with_dust(&ALICE_ADDR, from_balance);
-			test_utils::set_balance_with_dust(&BOB_ADDR, to_balance);
-
-			let total_issuance = <Test as Config>::Currency::total_issuance();
-			let evm_value = Pallet::<Test>::convert_native_to_evm(amount);
-
-			let (value, dust) = amount.deconstruct();
-			assert_eq!(Pallet::<Test>::has_dust(evm_value), !dust.is_zero());
-			assert_eq!(Pallet::<Test>::has_balance(evm_value), !value.is_zero());
-
-			let result =
-				builder::bare_call(BOB_ADDR).evm_value(evm_value).build_and_unwrap_result();
-			assert_eq!(result, Default::default(), "{description} tx failed");
-
-			assert_eq!(
-				Pallet::<Test>::evm_balance(&ALICE_ADDR),
-				Pallet::<Test>::convert_native_to_evm(expected_from_balance),
-				"{description}: invalid from balance"
-			);
-
-			assert_eq!(
-				Pallet::<Test>::evm_balance(&BOB_ADDR),
-				Pallet::<Test>::convert_native_to_evm(expected_to_balance),
-				"{description}: invalid to balance"
-			);
-
-			assert_eq!(
-				total_issuance as i64 - total_issuance_diff,
-				<Test as Config>::Currency::total_issuance() as i64,
-				"{description}: total issuance should match"
-			);
-		});
-	}
-}
-
-#[test]
-fn eth_call_transfer_with_dust_works() {
-	let (binary, _) = compile_module("dummy").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
-
-		let balance =
-			Pallet::<Test>::convert_native_to_evm(BalanceWithDust::new_unchecked::<Test>(100, 10));
-		assert_ok!(builder::eth_call(addr).value(balance).build());
-
-		assert_eq!(Pallet::<Test>::evm_balance(&addr), balance);
-	});
-}
-
-#[test]
-fn contract_call_transfer_with_dust_works() {
-	let (binary_caller, _code_hash_caller) = compile_module("call_with_value").unwrap();
-	let (binary_callee, _code_hash_callee) = compile_module("dummy").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let Contract { addr: addr_caller, .. } =
-			builder::bare_instantiate(Code::Upload(binary_caller))
-				.native_value(200)
-				.build_and_unwrap_contract();
-		let Contract { addr: addr_callee, .. } =
-			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
-
-		let balance =
-			Pallet::<Test>::convert_native_to_evm(BalanceWithDust::new_unchecked::<Test>(100, 10));
-		assert_ok!(builder::call(addr_caller).data((balance, addr_callee).encode()).build());
-
-		assert_eq!(Pallet::<Test>::evm_balance(&addr_callee), balance);
-	});
-}
-
-#[test]
-fn instantiate_and_call_and_deposit_event() {
-	let (binary, code_hash) = compile_module("event_and_return_on_deploy").unwrap();
-
-	ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let min_balance = Contracts::min_balance();
-		let value = 100;
-
-		// We determine the storage deposit limit after uploading because it depends on ALICEs
-		// free balance which is changed by uploading a module.
-		assert_ok!(Contracts::upload_code(
-			RuntimeOrigin::signed(ALICE),
-			binary,
-			deposit_limit::<Test>(),
-		));
-
-		// Drop previous events
-		initialize_block(2);
-
-		// Check at the end to get hash on error easily
-		let Contract { addr, account_id } = builder::bare_instantiate(Code::Existing(code_hash))
-			.native_value(value)
-			.build_and_unwrap_contract();
-		assert!(AccountInfoOf::<Test>::contains_key(&addr));
-
-		let hold_balance = test_utils::contract_base_deposit(&addr);
-
-		assert_eq!(
-			System::events(),
-			vec![
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::System(frame_system::Event::NewAccount {
-						account: account_id.clone()
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::Endowed {
-						account: account_id.clone(),
-						free_balance: min_balance,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
-						from: ALICE,
-						to: account_id.clone(),
-						amount: min_balance,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
-						from: ALICE,
-						to: account_id.clone(),
-						amount: value,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Contracts(crate::Event::ContractEmitted {
-						contract: addr,
-						data: vec![1, 2, 3, 4],
-						topics: vec![H256::repeat_byte(42)],
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Contracts(crate::Event::Instantiated {
-						deployer: ALICE_ADDR,
-						contract: addr
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::TransferAndHold {
-						reason: <Test as Config>::RuntimeHoldReason::Contracts(
-							HoldReason::StorageDepositReserve,
-						),
-						source: ALICE,
-						dest: account_id.clone(),
-						transferred: hold_balance,
-					}),
-					topics: vec![],
-				},
-			]
-		);
-	});
-}
-
-#[test]
-fn create1_address_from_extrinsic() {
-	let (binary, code_hash) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		assert_ok!(Contracts::upload_code(
-			RuntimeOrigin::signed(ALICE),
-			binary.clone(),
-			deposit_limit::<Test>(),
-		));
-
-		assert_eq!(System::account_nonce(&ALICE), 0);
-		System::inc_account_nonce(&ALICE);
-
-		for nonce in 1..3 {
-			let Contract { addr, .. } = builder::bare_instantiate(Code::Existing(code_hash))
-				.salt(None)
-				.build_and_unwrap_contract();
-			assert!(AccountInfoOf::<Test>::contains_key(&addr));
-			assert_eq!(
-				addr,
-				create1(&<Test as Config>::AddressMapper::to_address(&ALICE), nonce - 1)
-			);
-		}
-		assert_eq!(System::account_nonce(&ALICE), 3);
-
-		for nonce in 3..6 {
-			let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary.clone()))
-				.salt(None)
-				.build_and_unwrap_contract();
-			assert!(AccountInfoOf::<Test>::contains_key(&addr));
-			assert_eq!(
-				addr,
-				create1(&<Test as Config>::AddressMapper::to_address(&ALICE), nonce - 1)
-			);
-		}
-		assert_eq!(System::account_nonce(&ALICE), 6);
-	});
-}
-
-#[test]
-fn deposit_event_max_value_limit() {
-	let (binary, _code_hash) = compile_module("event_size").unwrap();
-
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		// Create
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.native_value(30_000)
-			.build_and_unwrap_contract();
-
-		// Call contract with allowed storage value.
-		assert_ok!(builder::call(addr)
-			.gas_limit(GAS_LIMIT.set_ref_time(GAS_LIMIT.ref_time() * 2)) // we are copying a huge buffer,
-			.data(limits::PAYLOAD_BYTES.encode())
-			.build());
-
-		// Call contract with too large a storage value.
-		assert_err_ignore_postinfo!(
-			builder::call(addr).data((limits::PAYLOAD_BYTES + 1).encode()).build(),
-			Error::<Test>::ValueTooLarge,
-		);
-	});
-}
-
-// Fail out of fuel (ref_time weight) in the engine.
-#[test]
-fn run_out_of_fuel_engine() {
-	let (binary, _code_hash) = compile_module("run_out_of_gas").unwrap();
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let min_balance = Contracts::min_balance();
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.native_value(100 * min_balance)
-			.build_and_unwrap_contract();
-
-		// Call the contract with a fixed gas limit. It must run out of gas because it just
-		// loops forever.
-		assert_err_ignore_postinfo!(
-			builder::call(addr)
-				.gas_limit(Weight::from_parts(10_000_000_000, u64::MAX))
-				.build(),
-			Error::<Test>::OutOfGas,
-		);
-	});
-}
-
-// Fail out of fuel (ref_time weight) in the host.
-#[test]
-fn run_out_of_fuel_host() {
-	use crate::precompiles::Precompile;
-	use alloy_core::sol_types::SolInterface;
-	use precompiles::{INoInfo, NoInfo};
-
-	let precompile_addr = H160(NoInfo::<Test>::MATCHER.base_address());
-	let input = INoInfo::INoInfoCalls::consumeMaxGas(INoInfo::consumeMaxGasCall {}).abi_encode();
-
-	ExtBuilder::default().build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-		let result = builder::bare_call(precompile_addr).data(input).build().result;
-		assert_err!(result, <Error<Test>>::OutOfGas);
-	});
-}
-
-#[test]
-fn gas_syncs_work() {
-	let (code, _code_hash) = compile_module("caller_is_origin_n").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let contract = builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		let result = builder::bare_call(contract.addr).data(0u32.encode()).build();
-		assert_ok!(result.result);
-		let engine_consumed_noop = result.gas_consumed.ref_time();
-
-		let result = builder::bare_call(contract.addr).data(1u32.encode()).build();
-		assert_ok!(result.result);
-		let gas_consumed_once = result.gas_consumed.ref_time();
-		let host_consumed_once = <Test as Config>::WeightInfo::seal_caller_is_origin().ref_time();
-		let engine_consumed_once = gas_consumed_once - host_consumed_once - engine_consumed_noop;
-
-		let result = builder::bare_call(contract.addr).data(2u32.encode()).build();
-		assert_ok!(result.result);
-		let gas_consumed_twice = result.gas_consumed.ref_time();
-		let host_consumed_twice = host_consumed_once * 2;
-		let engine_consumed_twice = gas_consumed_twice - host_consumed_twice - engine_consumed_noop;
-
-		// Second contract just repeats first contract's instructions twice.
-		// If runtime syncs gas with the engine properly, this should pass.
-		assert_eq!(engine_consumed_twice, engine_consumed_once * 2);
-	});
-}
-
-/// Check that contracts with the same account id have different trie ids.
-/// Check the `Nonce` storage item for more information.
-#[test]
-fn instantiate_unique_trie_id() {
-	let (binary, code_hash) = compile_module("self_destruct").unwrap();
-
-	ExtBuilder::default().existential_deposit(500).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		Contracts::upload_code(RuntimeOrigin::signed(ALICE), binary, deposit_limit::<Test>())
-			.unwrap();
-
-		// Instantiate the contract and store its trie id for later comparison.
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Existing(code_hash)).build_and_unwrap_contract();
-		let trie_id = get_contract(&addr).trie_id;
-
-		// Try to instantiate it again without termination should yield an error.
-		assert_err_ignore_postinfo!(
-			builder::instantiate(code_hash).build(),
-			<Error<Test>>::DuplicateContract,
-		);
-
-		// Terminate the contract.
-		assert_ok!(builder::call(addr).build());
-
-		// Re-Instantiate after termination.
-		assert_ok!(builder::instantiate(code_hash).build());
-
-		// Trie ids shouldn't match or we might have a collision
-		assert_ne!(trie_id, get_contract(&addr).trie_id);
-	});
-}
-
-#[test]
-fn storage_work() {
-	let (code, _code_hash) = compile_module("storage").unwrap();
-
-	ExtBuilder::default().build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let min_balance = Contracts::min_balance();
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-			.native_value(min_balance * 100)
-			.build_and_unwrap_contract();
-
-		builder::bare_call(addr).build_and_unwrap_result();
-	});
-}
-
-#[test]
-fn storage_max_value_limit() {
-	let (binary, _code_hash) = compile_module("storage_size").unwrap();
-
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		// Create
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.native_value(30_000)
-			.build_and_unwrap_contract();
-		get_contract(&addr);
-
-		// Call contract with allowed storage value.
-		assert_ok!(builder::call(addr)
-			.gas_limit(GAS_LIMIT.set_ref_time(GAS_LIMIT.ref_time() * 2)) // we are copying a huge buffer
-			.data(limits::PAYLOAD_BYTES.encode())
-			.build());
-
-		// Call contract with too large a storage value.
-		assert_err_ignore_postinfo!(
-			builder::call(addr).data((limits::PAYLOAD_BYTES + 1).encode()).build(),
-			Error::<Test>::ValueTooLarge,
-		);
-	});
-}
-
-#[test]
-fn clear_storage_on_zero_value() {
-	let (code, _code_hash) = compile_module("clear_storage_on_zero_value").unwrap();
-
-	ExtBuilder::default().build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let min_balance = Contracts::min_balance();
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-			.native_value(min_balance * 100)
-			.build_and_unwrap_contract();
-
-		builder::bare_call(addr).build_and_unwrap_result();
-	});
-}
-
-#[test]
-fn transient_storage_work() {
-	let (code, _code_hash) = compile_module("transient_storage").unwrap();
-
-	ExtBuilder::default().build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let min_balance = Contracts::min_balance();
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-			.native_value(min_balance * 100)
-			.build_and_unwrap_contract();
-
-		builder::bare_call(addr).build_and_unwrap_result();
-	});
-}
-
-#[test]
-fn transient_storage_limit_in_call() {
-	let (binary_caller, _code_hash_caller) =
-		compile_module("create_transient_storage_and_call").unwrap();
-	let (binary_callee, _code_hash_callee) = compile_module("set_transient_storage").unwrap();
-	ExtBuilder::default().build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Create both contracts: Constructors do nothing.
-		let Contract { addr: addr_caller, .. } =
-			builder::bare_instantiate(Code::Upload(binary_caller)).build_and_unwrap_contract();
-		let Contract { addr: addr_callee, .. } =
-			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
-
-		// Call contracts with storage values within the limit.
-		// Caller and Callee contracts each set a transient storage value of size 100.
-		assert_ok!(builder::call(addr_caller)
-			.data((100u32, 100u32, &addr_callee).encode())
-			.build(),);
-
-		// Call a contract with a storage value that is too large.
-		// Limit exceeded in the caller contract.
-		assert_err_ignore_postinfo!(
-			builder::call(addr_caller)
-				.data((4u32 * 1024u32, 200u32, &addr_callee).encode())
-				.build(),
-			<Error<Test>>::OutOfTransientStorage,
-		);
-
-		// Call a contract with a storage value that is too large.
-		// Limit exceeded in the callee contract.
-		assert_err_ignore_postinfo!(
-			builder::call(addr_caller)
-				.data((50u32, 4 * 1024u32, &addr_callee).encode())
-				.build(),
-			<Error<Test>>::ContractTrapped
-		);
-	});
-}
-
-#[test]
-fn deploy_and_call_other_contract() {
-	let (caller_binary, _caller_code_hash) = compile_module("caller_contract").unwrap();
-	let (callee_binary, callee_code_hash) = compile_module("return_with_data").unwrap();
-	let code_load_weight = crate::vm::code_load_weight(callee_binary.len() as u32);
-
-	ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
-		let min_balance = Contracts::min_balance();
-
-		// Create
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let Contract { addr: caller_addr, account_id: caller_account } =
-			builder::bare_instantiate(Code::Upload(caller_binary))
-				.native_value(100_000)
-				.build_and_unwrap_contract();
-
-		let callee_addr = create2(
-			&caller_addr,
-			&callee_binary,
-			&[0, 1, 34, 51, 68, 85, 102, 119], // hard coded in binary
-			&[0u8; 32],
-		);
-		let callee_account = <Test as Config>::AddressMapper::to_account_id(&callee_addr);
-
-		Contracts::upload_code(
-			RuntimeOrigin::signed(ALICE),
-			callee_binary,
-			deposit_limit::<Test>(),
-		)
-		.unwrap();
-
-		// Drop previous events
-		initialize_block(2);
-
-		// Call BOB contract, which attempts to instantiate and call the callee contract and
-		// makes various assertions on the results from those calls.
-		assert_ok!(builder::call(caller_addr)
-			.data(
-				(callee_code_hash, code_load_weight.ref_time(), code_load_weight.proof_size())
-					.encode()
-			)
-			.build());
-
-		assert_eq!(
-			System::events(),
-			vec![
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::System(frame_system::Event::NewAccount {
-						account: callee_account.clone()
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::Endowed {
-						account: callee_account.clone(),
-						free_balance: min_balance,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
-						from: ALICE,
-						to: callee_account.clone(),
-						amount: min_balance,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
-						from: caller_account.clone(),
-						to: callee_account.clone(),
-						amount: 32768 // hardcoded in binary
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
-						from: caller_account.clone(),
-						to: callee_account.clone(),
-						amount: 32768,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::TransferAndHold {
-						reason: <Test as Config>::RuntimeHoldReason::Contracts(
-							HoldReason::StorageDepositReserve,
-						),
-						source: ALICE,
-						dest: callee_account.clone(),
-						transferred: 555,
-					}),
-					topics: vec![],
-				},
-			]
-		);
-	});
-}
-
-#[test]
-fn delegate_call() {
-	let (caller_binary, _caller_code_hash) = compile_module("delegate_call").unwrap();
-	let (callee_binary, _callee_code_hash) = compile_module("delegate_call_lib").unwrap();
-
-	ExtBuilder::default().existential_deposit(500).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Instantiate the 'caller'
-		let Contract { addr: caller_addr, .. } =
-			builder::bare_instantiate(Code::Upload(caller_binary))
-				.native_value(300_000)
-				.build_and_unwrap_contract();
-
-		// Instantiate the 'callee'
-		let Contract { addr: callee_addr, .. } =
-			builder::bare_instantiate(Code::Upload(callee_binary))
-				.native_value(100_000)
-				.build_and_unwrap_contract();
-
-		assert_ok!(builder::call(caller_addr)
-			.value(1337)
-			.data((callee_addr, u64::MAX, u64::MAX).encode())
-			.build());
-	});
-}
-
-#[test]
-fn delegate_call_non_existant_is_noop() {
-	let (caller_binary, _caller_code_hash) = compile_module("delegate_call_simple").unwrap();
-
-	ExtBuilder::default().existential_deposit(500).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Instantiate the 'caller'
-		let Contract { addr: caller_addr, .. } =
-			builder::bare_instantiate(Code::Upload(caller_binary))
-				.native_value(300_000)
-				.build_and_unwrap_contract();
-
-		assert_ok!(builder::call(caller_addr)
-			.value(1337)
-			.data((BOB_ADDR, u64::MAX, u64::MAX).encode())
-			.build());
-
-		assert_eq!(test_utils::get_balance(&BOB_FALLBACK), 0);
-	});
-}
-
-#[test]
-fn delegate_call_with_weight_limit() {
-	let (caller_binary, _caller_code_hash) = compile_module("delegate_call").unwrap();
-	let (callee_binary, _callee_code_hash) = compile_module("delegate_call_lib").unwrap();
-
-	ExtBuilder::default().existential_deposit(500).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Instantiate the 'caller'
-		let Contract { addr: caller_addr, .. } =
-			builder::bare_instantiate(Code::Upload(caller_binary))
-				.native_value(300_000)
-				.build_and_unwrap_contract();
-
-		// Instantiate the 'callee'
-		let Contract { addr: callee_addr, .. } =
-			builder::bare_instantiate(Code::Upload(callee_binary))
-				.native_value(100_000)
-				.build_and_unwrap_contract();
-
-		// fails, not enough weight
-		assert_err!(
-			builder::bare_call(caller_addr)
-				.native_value(1337)
-				.data((callee_addr, 100u64, 100u64).encode())
-				.build()
-				.result,
-			Error::<Test>::ContractTrapped,
-		);
-
-		assert_ok!(builder::call(caller_addr)
-			.value(1337)
-			.data((callee_addr, 500_000_000u64, 100_000u64).encode())
-			.build());
-	});
-}
-
-#[test]
-fn delegate_call_with_deposit_limit() {
-	let (caller_binary, _caller_code_hash) = compile_module("delegate_call_deposit_limit").unwrap();
-	let (callee_binary, _callee_code_hash) = compile_module("delegate_call_lib").unwrap();
-
-	ExtBuilder::default().existential_deposit(500).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Instantiate the 'caller'
-		let Contract { addr: caller_addr, .. } =
-			builder::bare_instantiate(Code::Upload(caller_binary))
-				.native_value(300_000)
-				.build_and_unwrap_contract();
-
-		// Instantiate the 'callee'
-		let Contract { addr: callee_addr, .. } =
-			builder::bare_instantiate(Code::Upload(callee_binary))
-				.native_value(100_000)
-				.build_and_unwrap_contract();
-
-		// Delegate call will write 1 storage and deposit of 2 (1 item) + 32 (bytes) is required.
-		// + 32 + 16 for blake2_128concat
-		// Fails, not enough deposit
-		let ret = builder::bare_call(caller_addr)
-			.native_value(1337)
-			.data((callee_addr, 81u64).encode())
-			.build_and_unwrap_result();
-		assert_return_code!(ret, RuntimeReturnCode::OutOfResources);
-
-		assert_ok!(builder::call(caller_addr)
-			.value(1337)
-			.data((callee_addr, 82u64).encode())
-			.build());
-	});
-}
-
-#[test]
-fn transfer_expendable_cannot_kill_account() {
-	let (binary, _code_hash) = compile_module("dummy").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Instantiate the BOB contract.
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.native_value(1_000)
-			.build_and_unwrap_contract();
-
-		// Check that the BOB contract has been instantiated.
-		get_contract(&addr);
-
-		let account = <Test as Config>::AddressMapper::to_account_id(&addr);
-		let total_balance = <Test as Config>::Currency::total_balance(&account);
-
-		assert_eq!(
-			test_utils::get_balance_on_hold(&HoldReason::StorageDepositReserve.into(), &account),
-			test_utils::contract_base_deposit(&addr)
-		);
-
-		// Some or the total balance is held, so it can't be transferred.
-		assert_err!(
-			<<Test as Config>::Currency as Mutate<AccountId32>>::transfer(
-				&account,
-				&ALICE,
-				total_balance,
-				Preservation::Expendable,
-			),
-			TokenError::FundsUnavailable,
-		);
-
-		assert_eq!(<Test as Config>::Currency::total_balance(&account), total_balance);
-	});
-}
-
-#[test]
-fn cannot_self_destruct_through_draining() {
-	let (binary, _code_hash) = compile_module("drain").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let value = 1_000;
-		let min_balance = Contracts::min_balance();
-
-		// Instantiate the BOB contract.
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.native_value(value)
-			.build_and_unwrap_contract();
-		let account = <Test as Config>::AddressMapper::to_account_id(&addr);
-
-		// Check that the BOB contract has been instantiated.
-		get_contract(&addr);
-
-		// Call BOB which makes it send all funds to the zero address
-		// The contract code asserts that the transfer fails with the correct error code
-		assert_ok!(builder::call(addr).build());
-
-		// Make sure the account wasn't remove by sending all free balance away.
-		assert_eq!(
-			<Test as Config>::Currency::total_balance(&account),
-			value + test_utils::contract_base_deposit(&addr) + min_balance,
-		);
-	});
-}
-
-#[test]
-fn cannot_self_destruct_through_storage_refund_after_price_change() {
-	let (binary, _code_hash) = compile_module("store_call").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let min_balance = Contracts::min_balance();
-
-		// Instantiate the BOB contract.
-		let contract = builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
-		let info_deposit = test_utils::contract_base_deposit(&contract.addr);
-
-		// Check that the contract has been instantiated and has the minimum balance
-		assert_eq!(get_contract(&contract.addr).total_deposit(), info_deposit);
-		assert_eq!(get_contract(&contract.addr).extra_deposit(), 0);
-		assert_eq!(
-			<Test as Config>::Currency::total_balance(&contract.account_id),
-			info_deposit + min_balance
-		);
-
-		// Create 100 (16 + 32 bytes for key for blake128 concat) bytes of storage with a
-		// price of per byte and a single storage item of price 2
-		assert_ok!(builder::call(contract.addr).data(100u32.to_le_bytes().to_vec()).build());
-		assert_eq!(get_contract(&contract.addr).total_deposit(), info_deposit + 100 + 16 + 32 + 2);
-
-		// Increase the byte price and trigger a refund. This should not have any influence
-		// because the removal is pro rata and exactly those 100 bytes should have been
-		// removed as we didn't delete the key.
-		DEPOSIT_PER_BYTE.with(|c| *c.borrow_mut() = 500);
-		assert_ok!(builder::call(contract.addr).data(0u32.to_le_bytes().to_vec()).build());
-
-		// Make sure the account wasn't removed by the refund
-		assert_eq!(
-			<Test as Config>::Currency::total_balance(&contract.account_id),
-			get_contract(&contract.addr).total_deposit() + min_balance,
-		);
-		// + 1 because due to fixed point arithmetic we can sometimes refund
-		// one unit to little
-		assert_eq!(get_contract(&contract.addr).extra_deposit(), 16 + 32 + 2 + 1);
-	});
-}
-
-#[test]
-fn cannot_self_destruct_while_live() {
-	let (binary, _code_hash) = compile_module("self_destruct").unwrap();
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Instantiate the BOB contract.
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.native_value(100_000)
-			.build_and_unwrap_contract();
-
-		// Check that the BOB contract has been instantiated.
-		get_contract(&addr);
-
-		// Call BOB with input data, forcing it make a recursive call to itself to
-		// self-destruct, resulting in a trap.
-		assert_err_ignore_postinfo!(
-			builder::call(addr).data(vec![0]).build(),
-			Error::<Test>::ContractTrapped,
-		);
-
-		// Check that BOB is still there.
-		get_contract(&addr);
-	});
-}
-
-#[test]
-fn self_destruct_works() {
-	let (binary, code_hash) = compile_module("self_destruct").unwrap();
-	ExtBuilder::default().existential_deposit(1_000).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let _ = <Test as Config>::Currency::set_balance(&DJANGO_FALLBACK, 1_000_000);
-		let min_balance = Contracts::min_balance();
-
-		// Instantiate the BOB contract.
-		let contract = builder::bare_instantiate(Code::Upload(binary))
-			.native_value(100_000)
-			.build_and_unwrap_contract();
-
-		let hold_balance = test_utils::contract_base_deposit(&contract.addr);
-
-		// Check that the BOB contract has been instantiated.
-		let _ = get_contract(&contract.addr);
-
-		// Drop all previous events
-		initialize_block(2);
-
-		// Call BOB without input data which triggers termination.
-		assert_matches!(builder::call(contract.addr).build(), Ok(_));
-
-		// Check that code is still there but refcount dropped to zero.
-		assert_refcount!(&code_hash, 0);
-
-		// Check that account is gone
-		assert!(get_contract_checked(&contract.addr).is_none());
-		assert_eq!(<Test as Config>::Currency::total_balance(&contract.account_id), 0);
-
-		// Check that the beneficiary (django) got remaining balance.
-		assert_eq!(
-			<Test as Config>::Currency::free_balance(DJANGO_FALLBACK),
-			1_000_000 + 100_000 + min_balance
-		);
-
-		// Check that the Alice is missing Django's benefit. Within ALICE's total balance
-		// there's also the code upload deposit held.
-		assert_eq!(
-			<Test as Config>::Currency::total_balance(&ALICE),
-			1_000_000 - (100_000 + min_balance)
-		);
-
-		pretty_assertions::assert_eq!(
-			System::events(),
-			vec![
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::TransferOnHold {
-						reason: <Test as Config>::RuntimeHoldReason::Contracts(
-							HoldReason::StorageDepositReserve,
-						),
-						source: contract.account_id.clone(),
-						dest: ALICE,
-						amount: hold_balance,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::System(frame_system::Event::KilledAccount {
-						account: contract.account_id.clone()
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
-						from: contract.account_id.clone(),
-						to: DJANGO_FALLBACK,
-						amount: 100_000 + min_balance,
-					}),
-					topics: vec![],
-				},
-			],
-		);
-	});
-}
-
-// This tests that one contract cannot prevent another from self-destructing by sending it
-// additional funds after it has been drained.
-#[test]
-fn destroy_contract_and_transfer_funds() {
-	let (callee_binary, callee_code_hash) = compile_module("self_destruct").unwrap();
-	let (caller_binary, _caller_code_hash) = compile_module("destroy_and_transfer").unwrap();
-
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		// Create code hash for bob to instantiate
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		Contracts::upload_code(
-			RuntimeOrigin::signed(ALICE),
-			callee_binary.clone(),
-			deposit_limit::<Test>(),
-		)
-		.unwrap();
-
-		// This deploys the BOB contract, which in turn deploys the CHARLIE contract during
-		// construction.
-		let Contract { addr: addr_bob, .. } =
-			builder::bare_instantiate(Code::Upload(caller_binary))
-				.native_value(200_000)
-				.data(callee_code_hash.as_ref().to_vec())
-				.build_and_unwrap_contract();
-
-		// Check that the CHARLIE contract has been instantiated.
-		let salt = [47; 32]; // hard coded in fixture.
-		let addr_charlie = create2(&addr_bob, &callee_binary, &[], &salt);
-		get_contract(&addr_charlie);
-
-		// Call BOB, which calls CHARLIE, forcing CHARLIE to self-destruct.
-		assert_ok!(builder::call(addr_bob).data(addr_charlie.encode()).build());
-
-		// Check that CHARLIE has moved on to the great beyond (ie. died).
-		assert!(get_contract_checked(&addr_charlie).is_none());
-	});
-}
-
-#[test]
-fn cannot_self_destruct_in_constructor() {
-	let (binary, _) = compile_module("self_destructing_constructor").unwrap();
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Fail to instantiate the BOB because the constructor calls seal_terminate.
-		assert_err_ignore_postinfo!(
-			builder::instantiate_with_code(binary).value(100_000).build(),
-			Error::<Test>::TerminatedInConstructor,
-		);
-	});
-}
-
-#[test]
-fn crypto_hashes() {
-	let (binary, _code_hash) = compile_module("crypto_hashes").unwrap();
-
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Instantiate the CRYPTO_HASHES contract.
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.native_value(100_000)
-			.build_and_unwrap_contract();
-		// Perform the call.
-		let input = b"_DEAD_BEEF";
-		use sp_io::hashing::*;
-		// Wraps a hash function into a more dynamic form usable for testing.
-		macro_rules! dyn_hash_fn {
-			($name:ident) => {
-				Box::new(|input| $name(input).as_ref().to_vec().into_boxed_slice())
-			};
-		}
-		// All hash functions and their associated output byte lengths.
-		let test_cases: &[(u8, Box<dyn Fn(&[u8]) -> Box<[u8]>>, usize)] = &[
-			(2, dyn_hash_fn!(keccak_256), 32),
-			(3, dyn_hash_fn!(blake2_256), 32),
-			(4, dyn_hash_fn!(blake2_128), 16),
-		];
-		// Test the given hash functions for the input: "_DEAD_BEEF"
-		for (n, hash_fn, expected_size) in test_cases.iter() {
-			let mut params = vec![*n];
-			params.extend_from_slice(input);
-			let result = builder::bare_call(addr).data(params).build_and_unwrap_result();
-			assert!(!result.did_revert());
-			let expected = hash_fn(input.as_ref());
-			assert_eq!(&result.data[..*expected_size], &*expected);
-		}
-	})
-}
-
-#[test]
-fn transfer_return_code() {
-	let (binary, _code_hash) = compile_module("transfer_return_code").unwrap();
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let min_balance = Contracts::min_balance();
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
-
-		let contract = builder::bare_instantiate(Code::Upload(binary))
-			.native_value(min_balance * 100)
-			.build_and_unwrap_contract();
-
-		// Contract has only the minimal balance so any transfer will fail.
-		<Test as Config>::Currency::set_balance(&contract.account_id, min_balance);
-		let result = builder::bare_call(contract.addr).build_and_unwrap_result();
-		assert_return_code!(result, RuntimeReturnCode::TransferFailed);
-	});
-}
-
-#[test]
-fn call_return_code() {
-	use test_utils::u256_bytes;
-
-	let (caller_code, _caller_hash) = compile_module("call_return_code").unwrap();
-	let (callee_code, _callee_hash) = compile_module("ok_trap_revert").unwrap();
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let min_balance = Contracts::min_balance();
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
-		let _ = <Test as Config>::Currency::set_balance(&CHARLIE, 1000 * min_balance);
-
-		let bob = builder::bare_instantiate(Code::Upload(caller_code))
-			.native_value(min_balance * 100)
-			.build_and_unwrap_contract();
-
-		// BOB cannot pay the ed which is needed to pull DJANGO into existence
-		// this does trap the caller instead of returning an error code
-		// reasoning is that this error state does not exist on eth where
-		// ed does not exist. We hide this fact from the contract.
-		let result = builder::bare_call(bob.addr)
-			.data((DJANGO_ADDR, u256_bytes(1)).encode())
-			.origin(RuntimeOrigin::signed(BOB))
-			.build();
-		assert_err!(result.result, <Error<Test>>::StorageDepositNotEnoughFunds);
-
-		// Contract calls into Django which is no valid contract
-		// This will be a balance transfer into a new account
-		// with more than the contract has which will make the transfer fail
-		let value = Pallet::<Test>::convert_native_to_evm(min_balance * 200);
-		let result = builder::bare_call(bob.addr)
-			.data(
-				AsRef::<[u8]>::as_ref(&DJANGO_ADDR)
-					.iter()
-					.chain(&value.to_little_endian())
-					.cloned()
-					.collect(),
-			)
-			.build_and_unwrap_result();
-		assert_return_code!(result, RuntimeReturnCode::TransferFailed);
-
-		// Sending below the minimum balance should result in success.
-		// The ED is charged from the call origin.
-		let alice_before = test_utils::get_balance(&ALICE_FALLBACK);
-		assert_eq!(test_utils::get_balance(&DJANGO_FALLBACK), 0);
-
-		let value = Pallet::<Test>::convert_native_to_evm(1u64);
-		let result = builder::bare_call(bob.addr)
-			.data(
-				AsRef::<[u8]>::as_ref(&DJANGO_ADDR)
-					.iter()
-					.chain(&value.to_little_endian())
-					.cloned()
-					.collect(),
-			)
-			.build_and_unwrap_result();
-		assert_return_code!(result, RuntimeReturnCode::Success);
-		assert_eq!(test_utils::get_balance(&DJANGO_FALLBACK), min_balance + 1);
-		assert_eq!(test_utils::get_balance(&ALICE_FALLBACK), alice_before - min_balance);
-
-		let django = builder::bare_instantiate(Code::Upload(callee_code))
-			.origin(RuntimeOrigin::signed(CHARLIE))
-			.native_value(min_balance * 100)
-			.build_and_unwrap_contract();
-
-		// Sending more than the contract has will make the transfer fail.
-		let value = Pallet::<Test>::convert_native_to_evm(min_balance * 300);
-		let result = builder::bare_call(bob.addr)
-			.data(
-				AsRef::<[u8]>::as_ref(&django.addr)
-					.iter()
-					.chain(&value.to_little_endian())
-					.chain(&0u32.to_le_bytes())
-					.cloned()
-					.collect(),
-			)
-			.build_and_unwrap_result();
-		assert_return_code!(result, RuntimeReturnCode::TransferFailed);
-
-		// Contract has enough balance but callee reverts because "1" is passed.
-		<Test as Config>::Currency::set_balance(&bob.account_id, min_balance + 1000);
-		let value = Pallet::<Test>::convert_native_to_evm(5u64);
-		let result = builder::bare_call(bob.addr)
-			.data(
-				AsRef::<[u8]>::as_ref(&django.addr)
-					.iter()
-					.chain(&value.to_little_endian())
-					.chain(&1u32.to_le_bytes())
-					.cloned()
-					.collect(),
-			)
-			.build_and_unwrap_result();
-		assert_return_code!(result, RuntimeReturnCode::CalleeReverted);
-
-		// Contract has enough balance but callee traps because "2" is passed.
-		let result = builder::bare_call(bob.addr)
-			.data(
-				AsRef::<[u8]>::as_ref(&django.addr)
-					.iter()
-					.chain(&value.to_little_endian())
-					.chain(&2u32.to_le_bytes())
-					.cloned()
-					.collect(),
-			)
-			.build_and_unwrap_result();
-		assert_return_code!(result, RuntimeReturnCode::CalleeTrapped);
-	});
-}
-
-#[test]
-fn instantiate_return_code() {
-	let (caller_code, _caller_hash) = compile_module("instantiate_return_code").unwrap();
-	let (callee_code, callee_hash) = compile_module("ok_trap_revert").unwrap();
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let min_balance = Contracts::min_balance();
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
-		let _ = <Test as Config>::Currency::set_balance(&CHARLIE, 1000 * min_balance);
-		let callee_hash = callee_hash.as_ref().to_vec();
-
-		assert_ok!(builder::instantiate_with_code(callee_code).value(min_balance * 100).build());
-
-		let contract = builder::bare_instantiate(Code::Upload(caller_code))
-			.native_value(min_balance * 100)
-			.build_and_unwrap_contract();
-
-		// bob cannot pay the ED to create the contract as he has no money
-		// this traps the caller rather than returning an error
-		let result = builder::bare_call(contract.addr)
-			.data(callee_hash.iter().chain(&0u32.to_le_bytes()).cloned().collect())
-			.origin(RuntimeOrigin::signed(BOB))
-			.build();
-		assert_err!(result.result, <Error<Test>>::StorageDepositNotEnoughFunds);
-
-		// Contract has only the minimal balance so any transfer will fail.
-		<Test as Config>::Currency::set_balance(&contract.account_id, min_balance);
-		let result = builder::bare_call(contract.addr)
-			.data(callee_hash.iter().chain(&0u32.to_le_bytes()).cloned().collect())
-			.build_and_unwrap_result();
-		assert_return_code!(result, RuntimeReturnCode::TransferFailed);
-
-		// Contract has enough balance but the passed code hash is invalid
-		<Test as Config>::Currency::set_balance(&contract.account_id, min_balance + 10_000);
-		let result = builder::bare_call(contract.addr).data(vec![0; 36]).build();
-		assert_err!(result.result, <Error<Test>>::CodeNotFound);
-
-		// Contract has enough balance but callee reverts because "1" is passed.
-		let result = builder::bare_call(contract.addr)
-			.data(callee_hash.iter().chain(&1u32.to_le_bytes()).cloned().collect())
-			.build_and_unwrap_result();
-		assert_return_code!(result, RuntimeReturnCode::CalleeReverted);
-
-		// Contract has enough balance but callee traps because "2" is passed.
-		let result = builder::bare_call(contract.addr)
-			.data(callee_hash.iter().chain(&2u32.to_le_bytes()).cloned().collect())
-			.build_and_unwrap_result();
-		assert_return_code!(result, RuntimeReturnCode::CalleeTrapped);
-
-		// Contract instantiation succeeds
-		let result = builder::bare_call(contract.addr)
-			.data(callee_hash.iter().chain(&0u32.to_le_bytes()).cloned().collect())
-			.build_and_unwrap_result();
-		assert_return_code!(result, 0);
-
-		// Contract instantiation fails because the same salt is being used again.
-		let result = builder::bare_call(contract.addr)
-			.data(callee_hash.iter().chain(&0u32.to_le_bytes()).cloned().collect())
-			.build_and_unwrap_result();
-		assert_return_code!(result, RuntimeReturnCode::DuplicateContractAddress);
-	});
-}
-
-#[test]
-fn lazy_removal_works() {
-	let (code, _hash) = compile_module("self_destruct").unwrap();
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let min_balance = Contracts::min_balance();
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
-
-		let contract = builder::bare_instantiate(Code::Upload(code))
-			.native_value(min_balance * 100)
-			.build_and_unwrap_contract();
-
-		let info = get_contract(&contract.addr);
-		let trie = &info.child_trie_info();
-
-		// Put value into the contracts child trie
-		child::put(trie, &[99], &42);
-
-		// Terminate the contract
-		assert_ok!(builder::call(contract.addr).build());
-
-		// Contract info should be gone
-		assert!(!<AccountInfoOf::<Test>>::contains_key(&contract.addr));
-
-		// But value should be still there as the lazy removal did not run, yet.
-		assert_matches!(child::get(trie, &[99]), Some(42));
-
-		// Run the lazy removal
-		Contracts::on_idle(System::block_number(), Weight::MAX);
-
-		// Value should be gone now
-		assert_matches!(child::get::<i32>(trie, &[99]), None);
-	});
-}
-
-#[test]
-fn lazy_batch_removal_works() {
-	let (code, _hash) = compile_module("self_destruct").unwrap();
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let min_balance = Contracts::min_balance();
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
-		let mut tries: Vec<child::ChildInfo> = vec![];
-
-		for i in 0..3u8 {
-			let contract = builder::bare_instantiate(Code::Upload(code.clone()))
-				.native_value(min_balance * 100)
-				.salt(Some([i; 32]))
-				.build_and_unwrap_contract();
-
-			let info = get_contract(&contract.addr);
-			let trie = &info.child_trie_info();
-
-			// Put value into the contracts child trie
-			child::put(trie, &[99], &42);
-
-			// Terminate the contract. Contract info should be gone, but value should be still
-			// there as the lazy removal did not run, yet.
-			assert_ok!(builder::call(contract.addr).build());
-
-			assert!(!<AccountInfoOf::<Test>>::contains_key(&contract.addr));
-			assert_matches!(child::get(trie, &[99]), Some(42));
-
-			tries.push(trie.clone())
-		}
-
-		// Run single lazy removal
-		Contracts::on_idle(System::block_number(), Weight::MAX);
-
-		// The single lazy removal should have removed all queued tries
-		for trie in tries.iter() {
-			assert_matches!(child::get::<i32>(trie, &[99]), None);
-		}
-	});
-}
-
-#[test]
-fn ref_time_left_api_works() {
-	let (code, _) = compile_module("ref_time_left").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Create fixture: Constructor calls ref_time_left twice and asserts it to decrease
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		// Call the contract: It echoes back the ref_time returned by the ref_time_left API.
-		let received = builder::bare_call(addr).build_and_unwrap_result();
-		assert_eq!(received.flags, ReturnFlags::empty());
-
-		let returned_value = u64::from_le_bytes(received.data[..8].try_into().unwrap());
-		assert!(returned_value > 0);
-		assert!(returned_value < GAS_LIMIT.ref_time());
-	});
-}
-
-#[test]
-fn lazy_removal_partial_remove_works() {
-	let (code, _hash) = compile_module("self_destruct").unwrap();
-
-	// We create a contract with some extra keys above the weight limit
-	let extra_keys = 7u32;
-	let mut meter = WeightMeter::with_limit(Weight::from_parts(5_000_000_000, 100 * 1024));
-	let (weight_per_key, max_keys) = ContractInfo::<Test>::deletion_budget(&meter);
-	let vals: Vec<_> = (0..max_keys + extra_keys)
-		.map(|i| (blake2_256(&i.encode()), (i as u32), (i as u32).encode()))
-		.collect();
-
-	let mut ext = ExtBuilder::default().existential_deposit(50).build();
-
-	let trie = ext.execute_with(|| {
-		let min_balance = Contracts::min_balance();
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
-
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-			.native_value(min_balance * 100)
-			.build_and_unwrap_contract();
-
-		let info = get_contract(&addr);
-
-		// Put value into the contracts child trie
-		for val in &vals {
-			info.write(&Key::Fix(val.0), Some(val.2.clone()), None, false).unwrap();
-		}
-		AccountInfo::<Test>::insert_contract(&addr, info.clone());
-
-		// Terminate the contract
-		assert_ok!(builder::call(addr).build());
-
-		// Contract info should be gone
-		assert!(!<AccountInfoOf::<Test>>::contains_key(&addr));
-
-		let trie = info.child_trie_info();
-
-		// But value should be still there as the lazy removal did not run, yet.
-		for val in &vals {
-			assert_eq!(child::get::<u32>(&trie, &blake2_256(&val.0)), Some(val.1));
-		}
-
-		trie.clone()
-	});
-
-	// The lazy removal limit only applies to the backend but not to the overlay.
-	// This commits all keys from the overlay to the backend.
-	ext.commit_all().unwrap();
-
-	ext.execute_with(|| {
-		// Run the lazy removal
-		ContractInfo::<Test>::process_deletion_queue_batch(&mut meter);
-
-		// Weight should be exhausted because we could not even delete all keys
-		assert!(!meter.can_consume(weight_per_key));
-
-		let mut num_deleted = 0u32;
-		let mut num_remaining = 0u32;
-
-		for val in &vals {
-			match child::get::<u32>(&trie, &blake2_256(&val.0)) {
-				None => num_deleted += 1,
-				Some(x) if x == val.1 => num_remaining += 1,
-				Some(_) => panic!("Unexpected value in contract storage"),
-			}
-		}
-
-		// All but one key is removed
-		assert_eq!(num_deleted + num_remaining, vals.len() as u32);
-		assert_eq!(num_deleted, max_keys);
-		assert_eq!(num_remaining, extra_keys);
-	});
-}
-
-#[test]
-fn lazy_removal_does_no_run_on_low_remaining_weight() {
-	let (code, _hash) = compile_module("self_destruct").unwrap();
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let min_balance = Contracts::min_balance();
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
-
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-			.native_value(min_balance * 100)
-			.build_and_unwrap_contract();
-
-		let info = get_contract(&addr);
-		let trie = &info.child_trie_info();
-
-		// Put value into the contracts child trie
-		child::put(trie, &[99], &42);
-
-		// Terminate the contract
-		assert_ok!(builder::call(addr).build());
-
-		// Contract info should be gone
-		assert!(!<AccountInfoOf::<Test>>::contains_key(&addr));
-
-		// But value should be still there as the lazy removal did not run, yet.
-		assert_matches!(child::get(trie, &[99]), Some(42));
-
-		// Assign a remaining weight which is too low for a successful deletion of the contract
-		let low_remaining_weight =
-			<<Test as Config>::WeightInfo as WeightInfo>::on_process_deletion_queue_batch();
-
-		// Run the lazy removal
-		Contracts::on_idle(System::block_number(), low_remaining_weight);
-
-		// Value should still be there, since remaining weight was too low for removal
-		assert_matches!(child::get::<i32>(trie, &[99]), Some(42));
-
-		// Run the lazy removal while deletion_queue is not full
-		Contracts::on_initialize(System::block_number());
-
-		// Value should still be there, since deletion_queue was not full
-		assert_matches!(child::get::<i32>(trie, &[99]), Some(42));
-
-		// Run on_idle with max remaining weight, this should remove the value
-		Contracts::on_idle(System::block_number(), Weight::MAX);
-
-		// Value should be gone
-		assert_matches!(child::get::<i32>(trie, &[99]), None);
-	});
-}
-
-#[test]
-fn lazy_removal_does_not_use_all_weight() {
-	let (code, _hash) = compile_module("self_destruct").unwrap();
-
-	let mut meter = WeightMeter::with_limit(Weight::from_parts(5_000_000_000, 100 * 1024));
-	let mut ext = ExtBuilder::default().existential_deposit(50).build();
-
-	let (trie, vals, weight_per_key) = ext.execute_with(|| {
-		let min_balance = Contracts::min_balance();
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
-
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-			.native_value(min_balance * 100)
-			.build_and_unwrap_contract();
-
-		let info = get_contract(&addr);
-		let (weight_per_key, max_keys) = ContractInfo::<Test>::deletion_budget(&meter);
-		assert!(max_keys > 0);
-
-		// We create a contract with one less storage item than we can remove within the limit
-		let vals: Vec<_> = (0..max_keys - 1)
-			.map(|i| (blake2_256(&i.encode()), (i as u32), (i as u32).encode()))
-			.collect();
-
-		// Put value into the contracts child trie
-		for val in &vals {
-			info.write(&Key::Fix(val.0), Some(val.2.clone()), None, false).unwrap();
-		}
-		AccountInfo::<Test>::insert_contract(&addr, info.clone());
-
-		// Terminate the contract
-		assert_ok!(builder::call(addr).build());
-
-		// Contract info should be gone
-		assert!(!<AccountInfoOf::<Test>>::contains_key(&addr));
-
-		let trie = info.child_trie_info();
-
-		// But value should be still there as the lazy removal did not run, yet.
-		for val in &vals {
-			assert_eq!(child::get::<u32>(&trie, &blake2_256(&val.0)), Some(val.1));
-		}
-
-		(trie, vals, weight_per_key)
-	});
-
-	// The lazy removal limit only applies to the backend but not to the overlay.
-	// This commits all keys from the overlay to the backend.
-	ext.commit_all().unwrap();
-
-	ext.execute_with(|| {
-		// Run the lazy removal
-		ContractInfo::<Test>::process_deletion_queue_batch(&mut meter);
-		let base_weight =
-			<<Test as Config>::WeightInfo as WeightInfo>::on_process_deletion_queue_batch();
-		assert_eq!(meter.consumed(), weight_per_key.mul(vals.len() as _) + base_weight);
-
-		// All the keys are removed
-		for val in vals {
-			assert_eq!(child::get::<u32>(&trie, &blake2_256(&val.0)), None);
-		}
-	});
-}
-
-#[test]
-fn deletion_queue_ring_buffer_overflow() {
-	let (code, _hash) = compile_module("self_destruct").unwrap();
-	let mut ext = ExtBuilder::default().existential_deposit(50).build();
-
-	// setup the deletion queue with custom counters
-	ext.execute_with(|| {
-		let queue = DeletionQueueManager::from_test_values(u32::MAX - 1, u32::MAX - 1);
-		<DeletionQueueCounter<Test>>::set(queue);
-	});
-
-	// commit the changes to the storage
-	ext.commit_all().unwrap();
-
-	ext.execute_with(|| {
-		let min_balance = Contracts::min_balance();
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
-		let mut tries: Vec<child::ChildInfo> = vec![];
-
-		// add 3 contracts to the deletion queue
-		for i in 0..3u8 {
-			let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code.clone()))
-				.native_value(min_balance * 100)
-				.salt(Some([i; 32]))
-				.build_and_unwrap_contract();
-
-			let info = get_contract(&addr);
-			let trie = &info.child_trie_info();
-
-			// Put value into the contracts child trie
-			child::put(trie, &[99], &42);
-
-			// Terminate the contract. Contract info should be gone, but value should be still
-			// there as the lazy removal did not run, yet.
-			assert_ok!(builder::call(addr).build());
-
-			assert!(!<AccountInfoOf::<Test>>::contains_key(&addr));
-			assert_matches!(child::get(trie, &[99]), Some(42));
-
-			tries.push(trie.clone())
-		}
-
-		// Run single lazy removal
-		Contracts::on_idle(System::block_number(), Weight::MAX);
-
-		// The single lazy removal should have removed all queued tries
-		for trie in tries.iter() {
-			assert_matches!(child::get::<i32>(trie, &[99]), None);
-		}
-
-		// insert and delete counter values should go from u32::MAX - 1 to 1
-		assert_eq!(<DeletionQueueCounter<Test>>::get().as_test_tuple(), (1, 1));
-	})
-}
-#[test]
-fn refcounter() {
-	let (binary, code_hash) = compile_module("self_destruct").unwrap();
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let min_balance = Contracts::min_balance();
-
-		// Create two contracts with the same code and check that they do in fact share it.
-		let Contract { addr: addr0, .. } = builder::bare_instantiate(Code::Upload(binary.clone()))
-			.native_value(min_balance * 100)
-			.salt(Some([0; 32]))
-			.build_and_unwrap_contract();
-		let Contract { addr: addr1, .. } = builder::bare_instantiate(Code::Upload(binary.clone()))
-			.native_value(min_balance * 100)
-			.salt(Some([1; 32]))
-			.build_and_unwrap_contract();
-		assert_refcount!(code_hash, 2);
-
-		// Sharing should also work with the usual instantiate call
-		let Contract { addr: addr2, .. } = builder::bare_instantiate(Code::Existing(code_hash))
-			.native_value(min_balance * 100)
-			.salt(Some([2; 32]))
-			.build_and_unwrap_contract();
-		assert_refcount!(code_hash, 3);
-
-		// Terminating one contract should decrement the refcount
-		assert_ok!(builder::call(addr0).build());
-		assert_refcount!(code_hash, 2);
-
-		// remove another one
-		assert_ok!(builder::call(addr1).build());
-		assert_refcount!(code_hash, 1);
-
-		// Pristine code should still be there
-		PristineCode::<Test>::get(code_hash).unwrap();
-
-		// remove the last contract
-		assert_ok!(builder::call(addr2).build());
-		assert_refcount!(code_hash, 0);
-
-		// refcount is `0` but code should still exists because it needs to be removed manually
-		assert!(crate::PristineCode::<Test>::contains_key(&code_hash));
-	});
-}
-
-#[test]
-fn gas_estimation_for_subcalls() {
-	let (caller_code, _caller_hash) = compile_module("call_with_limit").unwrap();
-	let (dummy_code, _callee_hash) = compile_module("dummy").unwrap();
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let min_balance = Contracts::min_balance();
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 2_000 * min_balance);
-
-		let Contract { addr: addr_caller, .. } =
-			builder::bare_instantiate(Code::Upload(caller_code))
-				.native_value(min_balance * 100)
-				.build_and_unwrap_contract();
-
-		let Contract { addr: addr_dummy, .. } = builder::bare_instantiate(Code::Upload(dummy_code))
-			.native_value(min_balance * 100)
-			.build_and_unwrap_contract();
-
-		// Run the test for all of those weight limits for the subcall
-		let weights = [
-			Weight::MAX,
-			GAS_LIMIT,
-			GAS_LIMIT * 2,
-			GAS_LIMIT / 5,
-			Weight::from_parts(u64::MAX, GAS_LIMIT.proof_size()),
-			Weight::from_parts(GAS_LIMIT.ref_time(), u64::MAX),
-		];
-
-		let (sub_addr, sub_input) = (addr_dummy.as_ref(), vec![]);
-
-		for weight in weights {
-			let input: Vec<u8> = sub_addr
-				.iter()
-				.cloned()
-				.chain(weight.ref_time().to_le_bytes())
-				.chain(weight.proof_size().to_le_bytes())
-				.chain(sub_input.clone())
-				.collect();
-
-			// Call in order to determine the gas that is required for this call
-			let result_orig = builder::bare_call(addr_caller).data(input.clone()).build();
-			assert_ok!(&result_orig.result);
-			assert_eq!(result_orig.gas_required, result_orig.gas_consumed);
-
-			// Make the same call using the estimated gas. Should succeed.
-			let result = builder::bare_call(addr_caller)
-				.gas_limit(result_orig.gas_required)
-				.storage_deposit_limit(result_orig.storage_deposit.charge_or_zero().into())
-				.data(input.clone())
-				.build();
-			assert_ok!(&result.result);
-
-			// Check that it fails with too little ref_time
-			let result = builder::bare_call(addr_caller)
-				.gas_limit(result_orig.gas_required.sub_ref_time(1))
-				.storage_deposit_limit(result_orig.storage_deposit.charge_or_zero().into())
-				.data(input.clone())
-				.build();
-			assert_err!(result.result, <Error<Test>>::OutOfGas);
-
-			// Check that it fails with too little proof_size
-			let result = builder::bare_call(addr_caller)
-				.gas_limit(result_orig.gas_required.sub_proof_size(1))
-				.storage_deposit_limit(result_orig.storage_deposit.charge_or_zero().into())
-				.data(input.clone())
-				.build();
-			assert_err!(result.result, <Error<Test>>::OutOfGas);
-		}
-	});
-}
-
-#[test]
-fn call_runtime_reentrancy_guarded() {
-	use crate::precompiles::Precompile;
-	use alloy_core::sol_types::SolInterface;
-	use precompiles::{INoInfo, NoInfo};
-
-	let precompile_addr = H160(NoInfo::<Test>::MATCHER.base_address());
-
-	let (callee_code, _callee_hash) = compile_module("dummy").unwrap();
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let min_balance = Contracts::min_balance();
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
-		let _ = <Test as Config>::Currency::set_balance(&CHARLIE, 1000 * min_balance);
-
-		let Contract { addr: addr_callee, .. } =
-			builder::bare_instantiate(Code::Upload(callee_code))
-				.native_value(min_balance * 100)
-				.salt(Some([1; 32]))
-				.build_and_unwrap_contract();
-
-		// Call pallet_revive call() dispatchable
-		let call = RuntimeCall::Contracts(crate::Call::call {
-			dest: addr_callee,
-			value: 0,
-			gas_limit: GAS_LIMIT / 3,
-			storage_deposit_limit: deposit_limit::<Test>(),
-			data: vec![],
-		})
-		.encode();
-
-		// Call runtime to re-enter back to contracts engine by
-		// calling dummy contract
-		let result = builder::bare_call(precompile_addr)
-			.data(
-				INoInfo::INoInfoCalls::callRuntime(INoInfo::callRuntimeCall { call: call.into() })
-					.abi_encode(),
-			)
-			.build();
-		// Call to runtime should fail because of the re-entrancy guard
-		assert_err!(result.result, <Error<Test>>::ReenteredPallet);
-	});
-}
-
-#[test]
-fn sr25519_verify() {
-	let (binary, _code_hash) = compile_module("sr25519_verify").unwrap();
-
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Instantiate the sr25519_verify contract.
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.native_value(100_000)
-			.build_and_unwrap_contract();
-
-		let call_with = |message: &[u8; 11]| {
-			// Alice's signature for "hello world"
-			#[rustfmt::skip]
-			let signature: [u8; 64] = [
-				184, 49, 74, 238, 78, 165, 102, 252, 22, 92, 156, 176, 124, 118, 168, 116, 247,
-				99, 0, 94, 2, 45, 9, 170, 73, 222, 182, 74, 60, 32, 75, 64, 98, 174, 69, 55, 83,
-				85, 180, 98, 208, 75, 231, 57, 205, 62, 4, 105, 26, 136, 172, 17, 123, 99, 90, 255,
-				228, 54, 115, 63, 30, 207, 205, 131,
-			];
-
-			// Alice's public key
-			#[rustfmt::skip]
-			let public_key: [u8; 32] = [
-				212, 53, 147, 199, 21, 253, 211, 28, 97, 20, 26, 189, 4, 169, 159, 214, 130, 44,
-				133, 88, 133, 76, 205, 227, 154, 86, 132, 231, 165, 109, 162, 125,
-			];
-
-			let mut params = vec![];
-			params.extend_from_slice(&signature);
-			params.extend_from_slice(&public_key);
-			params.extend_from_slice(message);
-
-			builder::bare_call(addr).data(params).build_and_unwrap_result()
-		};
-
-		// verification should succeed for "hello world"
-		assert_return_code!(call_with(&b"hello world"), RuntimeReturnCode::Success);
-
-		// verification should fail for other messages
-		assert_return_code!(call_with(&b"hello worlD"), RuntimeReturnCode::Sr25519VerifyFailed);
-	});
-}
-
-#[test]
-fn upload_code_works() {
-	let (binary, code_hash) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Drop previous events
-		initialize_block(2);
-
-		assert!(!PristineCode::<Test>::contains_key(&code_hash));
-		assert_ok!(Contracts::upload_code(RuntimeOrigin::signed(ALICE), binary, 1_000,));
-		// Ensure the contract was stored and get expected deposit amount to be reserved.
-		expected_deposit(ensure_stored(code_hash));
-	});
-}
-
-#[test]
-fn upload_code_limit_too_low() {
-	let (binary, _code_hash) = compile_module("dummy").unwrap();
-	let deposit_expected = expected_deposit(binary.len());
-	let deposit_insufficient = deposit_expected.saturating_sub(1);
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Drop previous events
-		initialize_block(2);
-
-		assert_noop!(
-			Contracts::upload_code(RuntimeOrigin::signed(ALICE), binary, deposit_insufficient,),
-			<Error<Test>>::StorageDepositLimitExhausted,
-		);
-
-		assert_eq!(System::events(), vec![]);
-	});
-}
-
-#[test]
-fn upload_code_not_enough_balance() {
-	let (binary, _code_hash) = compile_module("dummy").unwrap();
-	let deposit_expected = expected_deposit(binary.len());
-	let deposit_insufficient = deposit_expected.saturating_sub(1);
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, deposit_insufficient);
-
-		// Drop previous events
-		initialize_block(2);
-
-		assert_noop!(
-			Contracts::upload_code(RuntimeOrigin::signed(ALICE), binary, 1_000,),
-			<Error<Test>>::StorageDepositNotEnoughFunds,
-		);
-
-		assert_eq!(System::events(), vec![]);
-	});
-}
-
-#[test]
-fn remove_code_works() {
-	let (binary, code_hash) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Drop previous events
-		initialize_block(2);
-
-		assert_ok!(Contracts::upload_code(RuntimeOrigin::signed(ALICE), binary, 1_000,));
-		// Ensure the contract was stored and get expected deposit amount to be reserved.
-		expected_deposit(ensure_stored(code_hash));
-		assert_ok!(Contracts::remove_code(RuntimeOrigin::signed(ALICE), code_hash));
-	});
-}
-
-#[test]
-fn remove_code_wrong_origin() {
-	let (binary, code_hash) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Drop previous events
-		initialize_block(2);
-
-		assert_ok!(Contracts::upload_code(RuntimeOrigin::signed(ALICE), binary, 1_000,));
-		// Ensure the contract was stored and get expected deposit amount to be reserved.
-		expected_deposit(ensure_stored(code_hash));
-
-		assert_noop!(
-			Contracts::remove_code(RuntimeOrigin::signed(BOB), code_hash),
-			sp_runtime::traits::BadOrigin,
-		);
-	});
-}
-
-#[test]
-fn remove_code_in_use() {
-	let (binary, code_hash) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		assert_ok!(builder::instantiate_with_code(binary).build());
-
-		// Drop previous events
-		initialize_block(2);
-
-		assert_noop!(
-			Contracts::remove_code(RuntimeOrigin::signed(ALICE), code_hash),
-			<Error<Test>>::CodeInUse,
-		);
-
-		assert_eq!(System::events(), vec![]);
-	});
-}
-
-#[test]
-fn remove_code_not_found() {
-	let (_binary, code_hash) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Drop previous events
-		initialize_block(2);
-
-		assert_noop!(
-			Contracts::remove_code(RuntimeOrigin::signed(ALICE), code_hash),
-			<Error<Test>>::CodeNotFound,
-		);
-
-		assert_eq!(System::events(), vec![]);
-	});
-}
-
-#[test]
-fn instantiate_with_zero_balance_works() {
-	let (binary, code_hash) = compile_module("dummy").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let min_balance = Contracts::min_balance();
-
-		// Drop previous events
-		initialize_block(2);
-
-		// Instantiate the BOB contract.
-		let Contract { addr, account_id } =
-			builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
-
-		// Ensure the contract was stored and get expected deposit amount to be reserved.
-		expected_deposit(ensure_stored(code_hash));
-
-		// Make sure the account exists even though no free balance was send
-		assert_eq!(<Test as Config>::Currency::free_balance(&account_id), min_balance);
-		assert_eq!(
-			<Test as Config>::Currency::total_balance(&account_id),
-			min_balance + test_utils::contract_base_deposit(&addr)
-		);
-
-		assert_eq!(
-			System::events(),
-			vec![
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::Held {
-						reason: <Test as Config>::RuntimeHoldReason::Contracts(
-							HoldReason::CodeUploadDepositReserve,
-						),
-						who: ALICE,
-						amount: 776,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::System(frame_system::Event::NewAccount {
-						account: account_id.clone(),
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::Endowed {
-						account: account_id.clone(),
-						free_balance: min_balance,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
-						from: ALICE,
-						to: account_id.clone(),
-						amount: min_balance,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Contracts(crate::Event::Instantiated {
-						deployer: ALICE_ADDR,
-						contract: addr,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::TransferAndHold {
-						reason: <Test as Config>::RuntimeHoldReason::Contracts(
-							HoldReason::StorageDepositReserve,
-						),
-						source: ALICE,
-						dest: account_id,
-						transferred: 336,
-					}),
-					topics: vec![],
-				},
-			]
-		);
-	});
-}
-
-#[test]
-fn instantiate_with_below_existential_deposit_works() {
-	let (binary, code_hash) = compile_module("dummy").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let min_balance = Contracts::min_balance();
-		let value = 50;
-
-		// Drop previous events
-		initialize_block(2);
-
-		// Instantiate the BOB contract.
-		let Contract { addr, account_id } = builder::bare_instantiate(Code::Upload(binary))
-			.native_value(value)
-			.build_and_unwrap_contract();
-
-		// Ensure the contract was stored and get expected deposit amount to be reserved.
-		expected_deposit(ensure_stored(code_hash));
-		// Make sure the account exists even though not enough free balance was send
-		assert_eq!(<Test as Config>::Currency::free_balance(&account_id), min_balance + value);
-		assert_eq!(
-			<Test as Config>::Currency::total_balance(&account_id),
-			min_balance + value + test_utils::contract_base_deposit(&addr)
-		);
-
-		assert_eq!(
-			System::events(),
-			vec![
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::Held {
-						reason: <Test as Config>::RuntimeHoldReason::Contracts(
-							HoldReason::CodeUploadDepositReserve,
-						),
-						who: ALICE,
-						amount: 776,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::System(frame_system::Event::NewAccount {
-						account: account_id.clone()
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::Endowed {
-						account: account_id.clone(),
-						free_balance: min_balance,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
-						from: ALICE,
-						to: account_id.clone(),
-						amount: min_balance,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
-						from: ALICE,
-						to: account_id.clone(),
-						amount: 50,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Contracts(crate::Event::Instantiated {
-						deployer: ALICE_ADDR,
-						contract: addr,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::TransferAndHold {
-						reason: <Test as Config>::RuntimeHoldReason::Contracts(
-							HoldReason::StorageDepositReserve,
-						),
-						source: ALICE,
-						dest: account_id.clone(),
-						transferred: 336,
-					}),
-					topics: vec![],
-				},
-			]
-		);
-	});
-}
-
-#[test]
-fn storage_deposit_works() {
-	let (binary, _code_hash) = compile_module("multi_store").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		let Contract { addr, account_id } =
-			builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
-
-		let mut deposit = test_utils::contract_base_deposit(&addr);
-
-		// Drop previous events
-		initialize_block(2);
-
-		// Create storage
-		assert_ok!(builder::call(addr).value(42).data((50u32, 20u32).encode()).build());
-		// 4 is for creating 2 storage items
-		// 48 is for each of the keys
-		let charged0 = 4 + 50 + 20 + 48 + 48;
-		deposit += charged0;
-		assert_eq!(get_contract(&addr).total_deposit(), deposit);
-
-		// Add more storage (but also remove some)
-		assert_ok!(builder::call(addr).data((100u32, 10u32).encode()).build());
-		let charged1 = 50 - 10;
-		deposit += charged1;
-		assert_eq!(get_contract(&addr).total_deposit(), deposit);
-
-		// Remove more storage (but also add some)
-		assert_ok!(builder::call(addr).data((10u32, 20u32).encode()).build());
-		// -1 for numeric instability
-		let refunded0 = 90 - 10 - 1;
-		deposit -= refunded0;
-		assert_eq!(get_contract(&addr).total_deposit(), deposit);
-
-		assert_eq!(
-			System::events(),
-			vec![
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
-						from: ALICE,
-						to: account_id.clone(),
-						amount: 42,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::TransferAndHold {
-						reason: <Test as Config>::RuntimeHoldReason::Contracts(
-							HoldReason::StorageDepositReserve,
-						),
-						source: ALICE,
-						dest: account_id.clone(),
-						transferred: charged0,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::TransferAndHold {
-						reason: <Test as Config>::RuntimeHoldReason::Contracts(
-							HoldReason::StorageDepositReserve,
-						),
-						source: ALICE,
-						dest: account_id.clone(),
-						transferred: charged1,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::TransferOnHold {
-						reason: <Test as Config>::RuntimeHoldReason::Contracts(
-							HoldReason::StorageDepositReserve,
-						),
-						source: account_id.clone(),
-						dest: ALICE,
-						amount: refunded0,
-					}),
-					topics: vec![],
-				},
-			]
-		);
-	});
-}
-
-#[test]
-fn storage_deposit_callee_works() {
-	let (binary_caller, _code_hash_caller) = compile_module("call").unwrap();
-	let (binary_callee, _code_hash_callee) = compile_module("store_call").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Create both contracts: Constructors do nothing.
-		let Contract { addr: addr_caller, .. } =
-			builder::bare_instantiate(Code::Upload(binary_caller)).build_and_unwrap_contract();
-		let Contract { addr: addr_callee, .. } =
-			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
-
-		assert_ok!(builder::call(addr_caller).data((100u32, &addr_callee).encode()).build());
-
-		let callee = get_contract(&addr_callee);
-		let deposit = DepositPerByte::get() * 100 + DepositPerItem::get() * 1 + 48;
-
-		assert_eq!(Pallet::<Test>::evm_balance(&addr_caller), U256::zero());
-		assert_eq!(
-			callee.total_deposit(),
-			deposit + test_utils::contract_base_deposit(&addr_callee)
-		);
-	});
-}
-
-#[test]
-fn set_code_extrinsic() {
-	let (binary, code_hash) = compile_module("dummy").unwrap();
-	let (new_binary, new_code_hash) = compile_module("crypto_hashes").unwrap();
-
-	assert_ne!(code_hash, new_code_hash);
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
-
-		assert_ok!(Contracts::upload_code(
-			RuntimeOrigin::signed(ALICE),
-			new_binary,
-			deposit_limit::<Test>(),
-		));
-
-		// Drop previous events
-		initialize_block(2);
-
-		assert_eq!(get_contract(&addr).code_hash, code_hash);
-		assert_refcount!(&code_hash, 1);
-		assert_refcount!(&new_code_hash, 0);
-
-		// only root can execute this extrinsic
-		assert_noop!(
-			Contracts::set_code(RuntimeOrigin::signed(ALICE), addr, new_code_hash),
-			sp_runtime::traits::BadOrigin,
-		);
-		assert_eq!(get_contract(&addr).code_hash, code_hash);
-		assert_refcount!(&code_hash, 1);
-		assert_refcount!(&new_code_hash, 0);
-		assert_eq!(System::events(), vec![]);
-
-		// contract must exist
-		assert_noop!(
-			Contracts::set_code(RuntimeOrigin::root(), BOB_ADDR, new_code_hash),
-			<Error<Test>>::ContractNotFound,
-		);
-		assert_eq!(get_contract(&addr).code_hash, code_hash);
-		assert_refcount!(&code_hash, 1);
-		assert_refcount!(&new_code_hash, 0);
-		assert_eq!(System::events(), vec![]);
-
-		// new code hash must exist
-		assert_noop!(
-			Contracts::set_code(RuntimeOrigin::root(), addr, Default::default()),
-			<Error<Test>>::CodeNotFound,
-		);
-		assert_eq!(get_contract(&addr).code_hash, code_hash);
-		assert_refcount!(&code_hash, 1);
-		assert_refcount!(&new_code_hash, 0);
-		assert_eq!(System::events(), vec![]);
-
-		// successful call
-		assert_ok!(Contracts::set_code(RuntimeOrigin::root(), addr, new_code_hash));
-		assert_eq!(get_contract(&addr).code_hash, new_code_hash);
-		assert_refcount!(&code_hash, 0);
-		assert_refcount!(&new_code_hash, 1);
-	});
-}
-
-#[test]
-fn slash_cannot_kill_account() {
-	let (binary, _code_hash) = compile_module("dummy").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let value = 700;
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let min_balance = Contracts::min_balance();
-
-		let Contract { addr, account_id } = builder::bare_instantiate(Code::Upload(binary))
-			.native_value(value)
-			.build_and_unwrap_contract();
-
-		// Drop previous events
-		initialize_block(2);
-
-		let info_deposit = test_utils::contract_base_deposit(&addr);
-
-		assert_eq!(
-			test_utils::get_balance_on_hold(&HoldReason::StorageDepositReserve.into(), &account_id),
-			info_deposit
-		);
-
-		assert_eq!(
-			<Test as Config>::Currency::total_balance(&account_id),
-			info_deposit + value + min_balance
-		);
-
-		// Try to destroy the account of the contract by slashing the total balance.
-		// The account does not get destroyed because slashing only affects the balance held
-		// under certain `reason`. Slashing can for example happen if the contract takes part
-		// in staking.
-		let _ = <Test as Config>::Currency::slash(
-			&HoldReason::StorageDepositReserve.into(),
-			&account_id,
-			<Test as Config>::Currency::total_balance(&account_id),
-		);
-
-		// Slashing only removed the balance held.
-		assert_eq!(<Test as Config>::Currency::total_balance(&account_id), value + min_balance);
-	});
-}
-
-#[test]
-fn contract_reverted() {
-	let (binary, code_hash) = compile_module("return_with_data").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let flags = ReturnFlags::REVERT;
-		let buffer = [4u8, 8, 15, 16, 23, 42];
-		let input = (flags.bits(), buffer).encode();
-
-		// We just upload the code for later use
-		assert_ok!(Contracts::upload_code(
-			RuntimeOrigin::signed(ALICE),
-			binary.clone(),
-			deposit_limit::<Test>(),
-		));
-
-		// Calling extrinsic: revert leads to an error
-		assert_err_ignore_postinfo!(
-			builder::instantiate(code_hash).data(input.clone()).build(),
-			<Error<Test>>::ContractReverted,
-		);
-
-		// Calling extrinsic: revert leads to an error
-		assert_err_ignore_postinfo!(
-			builder::instantiate_with_code(binary).data(input.clone()).build(),
-			<Error<Test>>::ContractReverted,
-		);
-
-		// Calling directly: revert leads to success but the flags indicate the error
-		// This is just a different way of transporting the error that allows the read out
-		// the `data` which is only there on success. Obviously, the contract isn't
-		// instantiated.
-		let result = builder::bare_instantiate(Code::Existing(code_hash))
-			.data(input.clone())
-			.build_and_unwrap_result();
-		assert_eq!(result.result.flags, flags);
-		assert_eq!(result.result.data, buffer);
-		assert!(!<AccountInfoOf<Test>>::contains_key(result.addr));
-
-		// Pass empty flags and therefore successfully instantiate the contract for later use.
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Existing(code_hash))
-			.data(ReturnFlags::empty().bits().encode())
-			.build_and_unwrap_contract();
-
-		// Calling extrinsic: revert leads to an error
-		assert_err_ignore_postinfo!(
-			builder::call(addr).data(input.clone()).build(),
-			<Error<Test>>::ContractReverted,
-		);
-
-		// Calling directly: revert leads to success but the flags indicate the error
-		let result = builder::bare_call(addr).data(input).build_and_unwrap_result();
-		assert_eq!(result.flags, flags);
-		assert_eq!(result.data, buffer);
-	});
-}
-
-#[test]
-fn set_code_hash() {
-	let (binary, _) = compile_module("set_code_hash").unwrap();
-	let (new_binary, new_code_hash) = compile_module("new_set_code_hash_contract").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Instantiate the 'caller'
-		let Contract { addr: contract_addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.native_value(300_000)
-			.build_and_unwrap_contract();
-		// upload new code
-		assert_ok!(Contracts::upload_code(
-			RuntimeOrigin::signed(ALICE),
-			new_binary.clone(),
-			deposit_limit::<Test>(),
-		));
-
-		System::reset_events();
-
-		// First call sets new code_hash and returns 1
-		let result = builder::bare_call(contract_addr)
-			.data(new_code_hash.as_ref().to_vec())
-			.build_and_unwrap_result();
-		assert_return_code!(result, 1);
-
-		// Second calls new contract code that returns 2
-		let result = builder::bare_call(contract_addr).build_and_unwrap_result();
-		assert_return_code!(result, 2);
-	});
-}
-
-#[test]
-fn storage_deposit_limit_is_enforced() {
-	let (binary, _code_hash) = compile_module("store_call").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let min_balance = Contracts::min_balance();
-
-		// Setting insufficient storage_deposit should fail.
-		assert_err!(
-			builder::bare_instantiate(Code::Upload(binary.clone()))
-				// expected deposit is 2 * ed + 3 for the call
-				.storage_deposit_limit((2 * min_balance + 3 - 1).into())
-				.build()
-				.result,
-			<Error<Test>>::StorageDepositLimitExhausted,
-		);
-
-		// Instantiate the BOB contract.
-		let Contract { addr, account_id } =
-			builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
-
-		let info_deposit = test_utils::contract_base_deposit(&addr);
-		// Check that the BOB contract has been instantiated and has the minimum balance
-		assert_eq!(get_contract(&addr).total_deposit(), info_deposit);
-		assert_eq!(
-			<Test as Config>::Currency::total_balance(&account_id),
-			info_deposit + min_balance
-		);
-
-		// Create 1 byte of storage with a price of per byte,
-		// setting insufficient deposit limit, as it requires 3 Balance:
-		// 2 for the item added + 1 (value) + 48 (key)
-		assert_err_ignore_postinfo!(
-			builder::call(addr)
-				.storage_deposit_limit(50)
-				.data(1u32.to_le_bytes().to_vec())
-				.build(),
-			<Error<Test>>::StorageDepositLimitExhausted,
-		);
-
-		// now with enough limit
-		assert_ok!(builder::call(addr)
-			.storage_deposit_limit(51)
-			.data(1u32.to_le_bytes().to_vec())
-			.build());
-
-		// Use 4 more bytes of the storage for the same item, which requires 4 Balance.
-		// Should fail as DefaultDepositLimit is 3 and hence isn't enough.
-		assert_err_ignore_postinfo!(
-			builder::call(addr)
-				.storage_deposit_limit(3)
-				.data(5u32.to_le_bytes().to_vec())
-				.build(),
-			<Error<Test>>::StorageDepositLimitExhausted,
-		);
-	});
-}
-
-#[test]
-fn deposit_limit_in_nested_calls() {
-	let (binary_caller, _code_hash_caller) = compile_module("create_storage_and_call").unwrap();
-	let (binary_callee, _code_hash_callee) = compile_module("store_call").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Create both contracts: Constructors do nothing.
-		let Contract { addr: addr_caller, .. } =
-			builder::bare_instantiate(Code::Upload(binary_caller)).build_and_unwrap_contract();
-		let Contract { addr: addr_callee, .. } =
-			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
-
-		// Create 100 bytes of storage with a price of per byte
-		// This is 100 Balance + 2 Balance for the item
-		// 48 for the key
-		assert_ok!(builder::call(addr_callee)
-			.storage_deposit_limit(102 + 48)
-			.data(100u32.to_le_bytes().to_vec())
-			.build());
-
-		// We do not remove any storage but add a storage item of 12 bytes in the caller
-		// contract. This would cost 12 + 2 + 72 = 86 Balance.
-		// The nested call doesn't get a special limit, which is set by passing `u64::MAX` to it.
-		// This should fail as the specified parent's limit is less than the cost: 13 <
-		// 14.
-		assert_err_ignore_postinfo!(
-			builder::call(addr_caller)
-				.storage_deposit_limit(85)
-				.data((100u32, &addr_callee, U256::MAX).encode())
-				.build(),
-			<Error<Test>>::StorageDepositLimitExhausted,
-		);
-
-		// Now we specify the parent's limit high enough to cover the caller's storage
-		// additions. However, we use a single byte more in the callee, hence the storage
-		// deposit should be 87 Balance.
-		// The nested call doesn't get a special limit, which is set by passing `u64::MAX` to it.
-		// This should fail as the specified parent's limit is less than the cost: 86 < 87
-		assert_err_ignore_postinfo!(
-			builder::call(addr_caller)
-				.storage_deposit_limit(86)
-				.data((101u32, &addr_callee, &U256::MAX).encode())
-				.build(),
-			<Error<Test>>::StorageDepositLimitExhausted,
-		);
-
-		// The parents storage deposit limit doesn't matter as the sub calls limit
-		// is enforced eagerly. However, we set a special deposit limit of 1 Balance for the
-		// nested call. This should fail as callee adds up 2 bytes to the storage, meaning
-		// that the nested call should have a deposit limit of at least 2 Balance. The
-		// sub-call should be rolled back, which is covered by the next test case.
-		let ret = builder::bare_call(addr_caller)
-			.storage_deposit_limit(DepositLimit::Balance(u64::MAX))
-			.data((102u32, &addr_callee, U256::from(1u64)).encode())
-			.build_and_unwrap_result();
-		assert_return_code!(ret, RuntimeReturnCode::OutOfResources);
-
-		// Refund in the callee contract but not enough to cover the Balance required by the
-		// caller. Note that if previous sub-call wouldn't roll back, this call would pass
-		// making the test case fail. We don't set a special limit for the nested call here.
-		assert_err_ignore_postinfo!(
-			builder::call(addr_caller)
-				.storage_deposit_limit(0)
-				.data((87u32, &addr_callee, &U256::MAX.to_little_endian()).encode())
-				.build(),
-			<Error<Test>>::StorageDepositLimitExhausted,
-		);
-
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 511);
-
-		// Require more than the sender's balance.
-		// Limit the sub call to little balance so it should fail in there
-		let ret = builder::bare_call(addr_caller)
-			.data((416, &addr_callee, U256::from(1u64)).encode())
-			.build_and_unwrap_result();
-		assert_return_code!(ret, RuntimeReturnCode::OutOfResources);
-
-		// Free up enough storage in the callee so that the caller can create a new item
-		// We set the special deposit limit of 1 Balance for the nested call, which isn't
-		// enforced as callee frees up storage. This should pass.
-		assert_ok!(builder::call(addr_caller)
-			.storage_deposit_limit(1)
-			.data((0u32, &addr_callee, U256::from(1u64)).encode())
-			.build());
-	});
-}
-
-#[test]
-fn deposit_limit_in_nested_instantiate() {
-	let (binary_caller, _code_hash_caller) =
-		compile_module("create_storage_and_instantiate").unwrap();
-	let (binary_callee, code_hash_callee) = compile_module("store_deploy").unwrap();
-	const ED: u64 = 5;
-	ExtBuilder::default().existential_deposit(ED).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let _ = <Test as Config>::Currency::set_balance(&BOB, 1_000_000);
-		// Create caller contract
-		let Contract { addr: addr_caller, account_id: caller_id } =
-			builder::bare_instantiate(Code::Upload(binary_caller))
-				.native_value(10_000) // this balance is later passed to the deployed contract
-				.build_and_unwrap_contract();
-		// Deploy a contract to get its occupied storage size
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary_callee))
-			.data(vec![0, 0, 0, 0])
-			.build_and_unwrap_contract();
-
-		// This is the deposit we expect to be charged just for instantiatiting the callee.
-		//
-		// - callee_info_len + 2 for storing the new contract info
-		// - the deposit for depending on a code hash
-		// - ED for deployed contract account
-		// - 2 for the storage item of 0 bytes being created in the callee constructor
-		// - 48 for the key
-		let callee_min_deposit = {
-			let callee_info_len =
-				AccountInfo::<Test>::load_contract(&addr).unwrap().encoded_size() as u64;
-			let code_deposit = test_utils::lockup_deposit(&code_hash_callee);
-			callee_info_len + code_deposit + 2 + ED + 2 + 48
-		};
-
-		// The parent just stores an item of the passed size so at least
-		// we need to pay for the item itself.
-		let caller_min_deposit = callee_min_deposit + 2 + 48;
-
-		// Fail in callee.
-		//
-		// We still fail in the sub call because we enforce limits on return from a contract.
-		// Sub calls return first to they are checked first.
-		let ret = builder::bare_call(addr_caller)
-			.origin(RuntimeOrigin::signed(BOB))
-			.storage_deposit_limit(DepositLimit::Balance(0))
-			.data((&code_hash_callee, 100u32, &U256::MAX.to_little_endian()).encode())
-			.build_and_unwrap_result();
-		assert_return_code!(ret, RuntimeReturnCode::OutOfResources);
-		// The charges made on instantiation should be rolled back.
-		assert_eq!(<Test as Config>::Currency::free_balance(&BOB), 1_000_000);
-
-		// Fail in the caller.
-		//
-		// For that we need to supply enough storage deposit so that the sub call
-		// succeeds but the parent call runs out of storage.
-		let ret = builder::bare_call(addr_caller)
-			.origin(RuntimeOrigin::signed(BOB))
-			.storage_deposit_limit(DepositLimit::Balance(callee_min_deposit))
-			.data((&code_hash_callee, 0u32, &U256::MAX.to_little_endian()).encode())
-			.build();
-		assert_err!(ret.result, <Error<Test>>::StorageDepositLimitExhausted);
-		// The charges made on the instantiation should be rolled back.
-		assert_eq!(<Test as Config>::Currency::free_balance(&BOB), 1_000_000);
-
-		// Fail in the callee with bytes.
-		//
-		// Same as above but stores one byte in both caller and callee.
-		let ret = builder::bare_call(addr_caller)
-			.origin(RuntimeOrigin::signed(BOB))
-			.storage_deposit_limit(DepositLimit::Balance(caller_min_deposit + 1))
-			.data((&code_hash_callee, 1u32, U256::from(callee_min_deposit)).encode())
-			.build_and_unwrap_result();
-		assert_return_code!(ret, RuntimeReturnCode::OutOfResources);
-		// The charges made on the instantiation should be rolled back.
-		assert_eq!(<Test as Config>::Currency::free_balance(&BOB), 1_000_000);
-
-		// Fail in the caller with bytes.
-		//
-		// Same as above but stores one byte in both caller and callee.
-		let ret = builder::bare_call(addr_caller)
-			.origin(RuntimeOrigin::signed(BOB))
-			.storage_deposit_limit(DepositLimit::Balance(callee_min_deposit + 1))
-			.data((&code_hash_callee, 1u32, U256::from(callee_min_deposit + 1)).encode())
-			.build();
-		assert_err!(ret.result, <Error<Test>>::StorageDepositLimitExhausted);
-		// The charges made on the instantiation should be rolled back.
-		assert_eq!(<Test as Config>::Currency::free_balance(&BOB), 1_000_000);
-
-		// Set enough deposit limit for the child instantiate. This should succeed.
-		let result = builder::bare_call(addr_caller)
-			.origin(RuntimeOrigin::signed(BOB))
-			.storage_deposit_limit((caller_min_deposit + 2).into())
-			.data((&code_hash_callee, 1u32, U256::from(callee_min_deposit + 1)).encode())
-			.build();
-
-		let returned = result.result.unwrap();
-		assert!(!returned.did_revert());
-
-		// All balance of the caller except ED has been transferred to the callee.
-		// No deposit has been taken from it.
-		assert_eq!(<Test as Config>::Currency::free_balance(&caller_id), ED);
-		// Get address of the deployed contract.
-		let addr_callee = H160::from_slice(&returned.data[0..20]);
-		let callee_account_id = <Test as Config>::AddressMapper::to_account_id(&addr_callee);
-		// 10_000 should be sent to callee from the caller contract, plus ED to be sent from the
-		// origin.
-		assert_eq!(<Test as Config>::Currency::free_balance(&callee_account_id), 10_000 + ED);
-		// The origin should be charged with what the outer call consumed
-		assert_eq!(
-			<Test as Config>::Currency::free_balance(&BOB),
-			1_000_000 - (caller_min_deposit + 2),
-		);
-		assert_eq!(result.storage_deposit.charge_or_zero(), (caller_min_deposit + 2))
-	});
-}
-
-#[test]
-fn deposit_limit_honors_liquidity_restrictions() {
-	let (binary, _code_hash) = compile_module("store_call").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let bobs_balance = 1_000;
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let _ = <Test as Config>::Currency::set_balance(&BOB, bobs_balance);
-		let min_balance = Contracts::min_balance();
-
-		// Instantiate the BOB contract.
-		let Contract { addr, account_id } =
-			builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
-
-		let info_deposit = test_utils::contract_base_deposit(&addr);
-		// Check that the contract has been instantiated and has the minimum balance
-		assert_eq!(get_contract(&addr).total_deposit(), info_deposit);
-		assert_eq!(
-			<Test as Config>::Currency::total_balance(&account_id),
-			info_deposit + min_balance
-		);
-
-		// check that the hold is honored
-		<Test as Config>::Currency::hold(
-			&HoldReason::CodeUploadDepositReserve.into(),
-			&BOB,
-			bobs_balance - min_balance,
-		)
-		.unwrap();
-		assert_err_ignore_postinfo!(
-			builder::call(addr)
-				.origin(RuntimeOrigin::signed(BOB))
-				.storage_deposit_limit(10_000)
-				.data(100u32.to_le_bytes().to_vec())
-				.build(),
-			<Error<Test>>::StorageDepositNotEnoughFunds,
-		);
-		assert_eq!(<Test as Config>::Currency::free_balance(&BOB), min_balance);
-	});
-}
-
-#[test]
-fn deposit_limit_honors_existential_deposit() {
-	let (binary, _code_hash) = compile_module("store_call").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let _ = <Test as Config>::Currency::set_balance(&BOB, 300);
-		let min_balance = Contracts::min_balance();
-
-		// Instantiate the BOB contract.
-		let Contract { addr, account_id } =
-			builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
-
-		let info_deposit = test_utils::contract_base_deposit(&addr);
-
-		// Check that the contract has been instantiated and has the minimum balance
-		assert_eq!(get_contract(&addr).total_deposit(), info_deposit);
-		assert_eq!(
-			<Test as Config>::Currency::total_balance(&account_id),
-			min_balance + info_deposit
-		);
-
-		// check that the deposit can't bring the account below the existential deposit
-		assert_err_ignore_postinfo!(
-			builder::call(addr)
-				.origin(RuntimeOrigin::signed(BOB))
-				.storage_deposit_limit(10_000)
-				.data(100u32.to_le_bytes().to_vec())
-				.build(),
-			<Error<Test>>::StorageDepositNotEnoughFunds,
-		);
-		assert_eq!(<Test as Config>::Currency::free_balance(&BOB), 300);
-	});
-}
-
-#[test]
-fn native_dependency_deposit_works() {
-	let (binary, code_hash) = compile_module("set_code_hash").unwrap();
-	let (dummy_binary, dummy_code_hash) = compile_module("dummy").unwrap();
-
-	// Test with both existing and uploaded code
-	for code in [Code::Upload(binary.clone()), Code::Existing(code_hash)] {
-		ExtBuilder::default().build().execute_with(|| {
-			let _ = Balances::set_balance(&ALICE, 1_000_000);
-			let lockup_deposit_percent = CodeHashLockupDepositPercent::get();
-
-			// Upload the dummy contract,
-			Contracts::upload_code(
-				RuntimeOrigin::signed(ALICE),
-				dummy_binary.clone(),
-				deposit_limit::<Test>(),
-			)
-			.unwrap();
-
-			// Upload `set_code_hash` contracts if using Code::Existing.
-			let add_upload_deposit = match code {
-				Code::Existing(_) => {
-					Contracts::upload_code(
-						RuntimeOrigin::signed(ALICE),
-						binary.clone(),
-						deposit_limit::<Test>(),
-					)
-					.unwrap();
-					false
-				},
-				Code::Upload(_) => true,
-			};
-
-			// Instantiate the set_code_hash contract.
-			let res = builder::bare_instantiate(code).build();
-
-			let addr = res.result.unwrap().addr;
-			let account_id = <Test as Config>::AddressMapper::to_account_id(&addr);
-			let base_deposit = test_utils::contract_base_deposit(&addr);
-			let upload_deposit = test_utils::get_code_deposit(&code_hash);
-			let extra_deposit = add_upload_deposit.then(|| upload_deposit).unwrap_or_default();
-
-			assert_eq!(
-				res.storage_deposit.charge_or_zero(),
-				extra_deposit + base_deposit + Contracts::min_balance()
-			);
-
-			// call set_code_hash
-			builder::bare_call(addr)
-				.data(dummy_code_hash.encode())
-				.build_and_unwrap_result();
-
-			// Check updated storage_deposit due to code size changes
-			let deposit_diff = lockup_deposit_percent
-				.mul_ceil(test_utils::get_code_deposit(&code_hash)) -
-				lockup_deposit_percent.mul_ceil(test_utils::get_code_deposit(&dummy_code_hash));
-			let new_base_deposit = test_utils::contract_base_deposit(&addr);
-			assert_ne!(deposit_diff, 0);
-			assert_eq!(base_deposit - new_base_deposit, deposit_diff);
-
-			assert_eq!(
-				test_utils::get_balance_on_hold(
-					&HoldReason::StorageDepositReserve.into(),
-					&account_id
-				),
-				new_base_deposit
-			);
-		});
-	}
-}
-
-#[test]
-fn block_hash_works() {
-	let (code, _) = compile_module("block_hash").unwrap();
-
-	ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		// The genesis config sets to the block number to 1
-		let block_hash = [1; 32];
-		frame_system::BlockHash::<Test>::insert(
-			&crate::BlockNumberFor::<Test>::from(0u32),
-			<Test as frame_system::Config>::Hash::from(&block_hash),
-		);
-		assert_ok!(builder::call(addr)
-			.data((U256::zero(), H256::from(block_hash)).encode())
-			.build());
-
-		// A block number out of range returns the zero value
-		assert_ok!(builder::call(addr).data((U256::from(1), H256::zero()).encode()).build());
-	});
-}
-
-#[test]
-fn block_author_works() {
-	let (code, _) = compile_module("block_author").unwrap();
-
-	ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		// The fixture asserts the input to match the find_author API method output.
-		assert_ok!(builder::call(addr).data(EVE_ADDR.encode()).build());
-	});
-}
-
-#[test]
-fn root_cannot_upload_code() {
-	let (binary, _) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().build().execute_with(|| {
-		assert_noop!(
-			Contracts::upload_code(RuntimeOrigin::root(), binary, deposit_limit::<Test>()),
-			DispatchError::BadOrigin,
-		);
-	});
-}
-
-#[test]
-fn root_cannot_remove_code() {
-	let (_, code_hash) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().build().execute_with(|| {
-		assert_noop!(
-			Contracts::remove_code(RuntimeOrigin::root(), code_hash),
-			DispatchError::BadOrigin,
-		);
-	});
-}
-
-#[test]
-fn signed_cannot_set_code() {
-	let (_, code_hash) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().build().execute_with(|| {
-		assert_noop!(
-			Contracts::set_code(RuntimeOrigin::signed(ALICE), BOB_ADDR, code_hash),
-			DispatchError::BadOrigin,
-		);
-	});
-}
-
-#[test]
-fn none_cannot_call_code() {
-	ExtBuilder::default().build().execute_with(|| {
-		assert_err_ignore_postinfo!(
-			builder::call(BOB_ADDR).origin(RuntimeOrigin::none()).build(),
-			DispatchError::BadOrigin,
-		);
-	});
-}
-
-#[test]
-fn root_can_call() {
-	let (binary, _) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
-
-		// Call the contract.
-		assert_ok!(builder::call(addr).origin(RuntimeOrigin::root()).build());
-	});
-}
-
-#[test]
-fn root_cannot_instantiate_with_code() {
-	let (binary, _) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().build().execute_with(|| {
-		assert_err_ignore_postinfo!(
-			builder::instantiate_with_code(binary).origin(RuntimeOrigin::root()).build(),
-			DispatchError::BadOrigin
-		);
-	});
-}
-
-#[test]
-fn root_cannot_instantiate() {
-	let (_, code_hash) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().build().execute_with(|| {
-		assert_err_ignore_postinfo!(
-			builder::instantiate(code_hash).origin(RuntimeOrigin::root()).build(),
-			DispatchError::BadOrigin
-		);
-	});
-}
-
-#[test]
-fn only_upload_origin_can_upload() {
-	let (binary, _) = compile_module("dummy").unwrap();
-	UploadAccount::set(Some(ALICE));
-	ExtBuilder::default().build().execute_with(|| {
-		let _ = Balances::set_balance(&ALICE, 1_000_000);
-		let _ = Balances::set_balance(&BOB, 1_000_000);
-
-		assert_err!(
-			Contracts::upload_code(RuntimeOrigin::root(), binary.clone(), deposit_limit::<Test>(),),
-			DispatchError::BadOrigin
-		);
-
-		assert_err!(
-			Contracts::upload_code(
-				RuntimeOrigin::signed(BOB),
-				binary.clone(),
-				deposit_limit::<Test>(),
-			),
-			DispatchError::BadOrigin
-		);
-
-		// Only alice is allowed to upload contract code.
-		assert_ok!(Contracts::upload_code(
-			RuntimeOrigin::signed(ALICE),
-			binary.clone(),
-			deposit_limit::<Test>(),
-		));
-	});
-}
-
-#[test]
-fn only_instantiation_origin_can_instantiate() {
-	let (code, code_hash) = compile_module("dummy").unwrap();
-	InstantiateAccount::set(Some(ALICE));
-	ExtBuilder::default().build().execute_with(|| {
-		let _ = Balances::set_balance(&ALICE, 1_000_000);
-		let _ = Balances::set_balance(&BOB, 1_000_000);
-
-		assert_err_ignore_postinfo!(
-			builder::instantiate_with_code(code.clone())
-				.origin(RuntimeOrigin::root())
-				.build(),
-			DispatchError::BadOrigin
-		);
-
-		assert_err_ignore_postinfo!(
-			builder::instantiate_with_code(code.clone())
-				.origin(RuntimeOrigin::signed(BOB))
-				.build(),
-			DispatchError::BadOrigin
-		);
-
-		// Only Alice can instantiate
-		assert_ok!(builder::instantiate_with_code(code).build());
-
-		// Bob cannot instantiate with either `instantiate_with_code` or `instantiate`.
-		assert_err_ignore_postinfo!(
-			builder::instantiate(code_hash).origin(RuntimeOrigin::signed(BOB)).build(),
-			DispatchError::BadOrigin
-		);
-	});
-}
-
-#[test]
-fn balance_of_api() {
-	let (binary, _code_hash) = compile_module("balance_of").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = Balances::set_balance(&ALICE, 1_000_000);
-		let _ = Balances::set_balance(&ALICE_FALLBACK, 1_000_000);
-
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(binary.to_vec())).build_and_unwrap_contract();
-
-		// The fixture asserts a non-zero returned free balance of the account;
-		// The ALICE_FALLBACK account is endowed;
-		// Hence we should not revert
-		assert_ok!(builder::call(addr).data(ALICE_ADDR.0.to_vec()).build());
-
-		// The fixture asserts a non-zero returned free balance of the account;
-		// The ETH_BOB account is not endowed;
-		// Hence we should revert
-		assert_err_ignore_postinfo!(
-			builder::call(addr).data(BOB_ADDR.0.to_vec()).build(),
-			<Error<Test>>::ContractTrapped
-		);
-	});
-}
-
-#[test]
-fn balance_api_returns_free_balance() {
-	let (binary, _code_hash) = compile_module("balance").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Instantiate the BOB contract without any extra balance.
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(binary.to_vec())).build_and_unwrap_contract();
-
-		let value = 0;
-		// Call BOB which makes it call the balance runtime API.
-		// The contract code asserts that the returned balance is 0.
-		assert_ok!(builder::call(addr).value(value).build());
-
-		let value = 1;
-		// Calling with value will trap the contract.
-		assert_err_ignore_postinfo!(
-			builder::call(addr).value(value).build(),
-			<Error<Test>>::ContractTrapped
-		);
-	});
-}
-
-#[test]
-fn gas_consumed_is_linear_for_nested_calls() {
-	let (code, _code_hash) = compile_module("recurse").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		let [gas_0, gas_1, gas_2, gas_max] = {
-			[0u32, 1u32, 2u32, limits::CALL_STACK_DEPTH]
-				.iter()
-				.map(|i| {
-					let result = builder::bare_call(addr).data(i.encode()).build();
-					assert_ok!(result.result);
-					result.gas_consumed
-				})
-				.collect::<Vec<_>>()
-				.try_into()
-				.unwrap()
-		};
-
-		let gas_per_recursion = gas_2.checked_sub(&gas_1).unwrap();
-		assert_eq!(gas_max, gas_0 + gas_per_recursion * limits::CALL_STACK_DEPTH as u64);
-	});
-}
-
-#[test]
-fn read_only_call_cannot_store() {
-	let (binary_caller, _code_hash_caller) = compile_module("read_only_call").unwrap();
-	let (binary_callee, _code_hash_callee) = compile_module("store_call").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Create both contracts: Constructors do nothing.
-		let Contract { addr: addr_caller, .. } =
-			builder::bare_instantiate(Code::Upload(binary_caller)).build_and_unwrap_contract();
-		let Contract { addr: addr_callee, .. } =
-			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
-
-		// Read-only call fails when modifying storage.
-		assert_err_ignore_postinfo!(
-			builder::call(addr_caller).data((&addr_callee, 100u32).encode()).build(),
-			<Error<Test>>::ContractTrapped
-		);
-	});
-}
-
-#[test]
-fn read_only_call_cannot_transfer() {
-	let (binary_caller, _code_hash_caller) = compile_module("call_with_flags_and_value").unwrap();
-	let (binary_callee, _code_hash_callee) = compile_module("dummy").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Create both contracts: Constructors do nothing.
-		let Contract { addr: addr_caller, .. } =
-			builder::bare_instantiate(Code::Upload(binary_caller)).build_and_unwrap_contract();
-		let Contract { addr: addr_callee, .. } =
-			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
-
-		// Read-only call fails when a non-zero value is set.
-		assert_err_ignore_postinfo!(
-			builder::call(addr_caller)
-				.data(
-					(addr_callee, pallet_revive_uapi::CallFlags::READ_ONLY.bits(), 100u64).encode()
-				)
-				.build(),
-			<Error<Test>>::StateChangeDenied
-		);
-	});
-}
-
-#[test]
-fn read_only_subsequent_call_cannot_store() {
-	let (binary_read_only_caller, _code_hash_caller) = compile_module("read_only_call").unwrap();
-	let (binary_caller, _code_hash_caller) = compile_module("call_with_flags_and_value").unwrap();
-	let (binary_callee, _code_hash_callee) = compile_module("store_call").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Create contracts: Constructors do nothing.
-		let Contract { addr: addr_caller, .. } =
-			builder::bare_instantiate(Code::Upload(binary_read_only_caller))
-				.build_and_unwrap_contract();
-		let Contract { addr: addr_subsequent_caller, .. } =
-			builder::bare_instantiate(Code::Upload(binary_caller)).build_and_unwrap_contract();
-		let Contract { addr: addr_callee, .. } =
-			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
-
-		// Subsequent call input.
-		let input = (&addr_callee, pallet_revive_uapi::CallFlags::empty().bits(), 0u64, 100u32);
-
-		// Read-only call fails when modifying storage.
-		assert_err_ignore_postinfo!(
-			builder::call(addr_caller)
-				.data((&addr_subsequent_caller, input).encode())
-				.build(),
-			<Error<Test>>::ContractTrapped
-		);
-	});
-}
-
-#[test]
-fn read_only_call_works() {
-	let (binary_caller, _code_hash_caller) = compile_module("read_only_call").unwrap();
-	let (binary_callee, _code_hash_callee) = compile_module("dummy").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Create both contracts: Constructors do nothing.
-		let Contract { addr: addr_caller, .. } =
-			builder::bare_instantiate(Code::Upload(binary_caller)).build_and_unwrap_contract();
-		let Contract { addr: addr_callee, .. } =
-			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
-
-		assert_ok!(builder::call(addr_caller).data(addr_callee.encode()).build());
-	});
-}
-
-#[test]
-fn create1_with_value_works() {
-	let (code, code_hash) = compile_module("create1_with_value").unwrap();
-	let value = 42;
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Create the contract: Constructor does nothing.
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		// Call the contract: Deploys itself using create1 and the expected value
-		assert_ok!(builder::call(addr).value(value).data(code_hash.encode()).build());
-
-		// We should see the expected balance at the expected account
-		let address = crate::address::create1(&addr, 1);
-		let account_id = <Test as Config>::AddressMapper::to_account_id(&address);
-		let usable_balance = <Test as Config>::Currency::usable_balance(&account_id);
-		assert_eq!(usable_balance, value);
-	});
-}
-
-#[test]
-fn gas_price_api_works() {
-	let (code, _) = compile_module("gas_price").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Create fixture: Constructor does nothing
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		// Call the contract: It echoes back the value returned by the gas price API.
-		let received = builder::bare_call(addr).build_and_unwrap_result();
-		assert_eq!(received.flags, ReturnFlags::empty());
-		assert_eq!(u64::from_le_bytes(received.data[..].try_into().unwrap()), u64::from(GAS_PRICE));
-	});
-}
-
-#[test]
-fn base_fee_api_works() {
-	let (code, _) = compile_module("base_fee").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Create fixture: Constructor does nothing
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		// Call the contract: It echoes back the value returned by the base fee API.
-		let received = builder::bare_call(addr).build_and_unwrap_result();
-		assert_eq!(received.flags, ReturnFlags::empty());
-		assert_eq!(U256::from_little_endian(received.data[..].try_into().unwrap()), U256::zero());
-	});
-}
-
-#[test]
-fn call_data_size_api_works() {
-	let (code, _) = compile_module("call_data_size").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Create fixture: Constructor does nothing
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		// Call the contract: It echoes back the value returned by the call data size API.
-		let received = builder::bare_call(addr).build_and_unwrap_result();
-		assert_eq!(received.flags, ReturnFlags::empty());
-		assert_eq!(u64::from_le_bytes(received.data.try_into().unwrap()), 0);
-
-		let received = builder::bare_call(addr).data(vec![1; 256]).build_and_unwrap_result();
-		assert_eq!(received.flags, ReturnFlags::empty());
-		assert_eq!(u64::from_le_bytes(received.data.try_into().unwrap()), 256);
-	});
-}
-
-#[test]
-fn call_data_copy_api_works() {
-	let (code, _) = compile_module("call_data_copy").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Create fixture: Constructor does nothing
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		// Call fixture: Expects an input of [255; 32] and executes tests.
-		assert_ok!(builder::call(addr).data(vec![255; 32]).build());
-	});
-}
-
-#[test]
-fn static_data_limit_is_enforced() {
-	let (oom_rw_trailing, _) = compile_module("oom_rw_trailing").unwrap();
-	let (oom_rw_included, _) = compile_module("oom_rw_included").unwrap();
-	let (oom_ro, _) = compile_module("oom_ro").unwrap();
-
-	ExtBuilder::default().build().execute_with(|| {
-		let _ = Balances::set_balance(&ALICE, 1_000_000);
-
-		assert_err!(
-			Contracts::upload_code(
-				RuntimeOrigin::signed(ALICE),
-				oom_rw_trailing,
-				deposit_limit::<Test>(),
-			),
-			<Error<Test>>::StaticMemoryTooLarge
-		);
-
-		assert_err!(
-			Contracts::upload_code(
-				RuntimeOrigin::signed(ALICE),
-				oom_rw_included,
-				deposit_limit::<Test>(),
-			),
-			<Error<Test>>::BlobTooLarge
-		);
-
-		assert_err!(
-			Contracts::upload_code(RuntimeOrigin::signed(ALICE), oom_ro, deposit_limit::<Test>(),),
-			<Error<Test>>::BlobTooLarge
-		);
-	});
-}
-
-#[test]
-fn call_diverging_out_len_works() {
-	let (code, _) = compile_module("call_diverging_out_len").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Create the contract: Constructor does nothing
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		// Call the contract: It will issue calls and deploys, asserting on
-		// correct output if the supplied output length was smaller than
-		// than what the callee returned.
-		assert_ok!(builder::call(addr).build());
-	});
-}
-
-#[test]
-fn chain_id_works() {
-	let (code, _) = compile_module("chain_id").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		let chain_id = U256::from(<Test as Config>::ChainId::get());
-		let received = builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_result();
-		assert_eq!(received.result.data, chain_id.encode());
-	});
-}
-
-#[test]
-fn call_data_load_api_works() {
-	let (code, _) = compile_module("call_data_load").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Create fixture: Constructor does nothing
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		// Call the contract: It reads a byte for the offset and then returns
-		// what call data load returned using this byte as the offset.
-		let input = (3u8, U256::max_value(), U256::max_value()).encode();
-		let received = builder::bare_call(addr).data(input).build().result.unwrap();
-		assert_eq!(received.flags, ReturnFlags::empty());
-		assert_eq!(U256::from_little_endian(&received.data), U256::max_value());
-
-		// Edge case
-		let input = (2u8, U256::from(255).to_big_endian()).encode();
-		let received = builder::bare_call(addr).data(input).build().result.unwrap();
-		assert_eq!(received.flags, ReturnFlags::empty());
-		assert_eq!(U256::from_little_endian(&received.data), U256::from(65280));
-
-		// Edge case
-		let received = builder::bare_call(addr).data(vec![1]).build().result.unwrap();
-		assert_eq!(received.flags, ReturnFlags::empty());
-		assert_eq!(U256::from_little_endian(&received.data), U256::zero());
-
-		// OOB case
-		let input = (42u8).encode();
-		let received = builder::bare_call(addr).data(input).build().result.unwrap();
-		assert_eq!(received.flags, ReturnFlags::empty());
-		assert_eq!(U256::from_little_endian(&received.data), U256::zero());
-
-		// No calldata should return the zero value
-		let received = builder::bare_call(addr).build().result.unwrap();
-		assert_eq!(received.flags, ReturnFlags::empty());
-		assert_eq!(U256::from_little_endian(&received.data), U256::zero());
-	});
-}
-
-#[test]
-fn return_data_api_works() {
-	let (code_return_data_api, _) = compile_module("return_data_api").unwrap();
-	let (code_return_with_data, hash_return_with_data) =
-		compile_module("return_with_data").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Upload the io echoing fixture for later use
-		assert_ok!(Contracts::upload_code(
-			RuntimeOrigin::signed(ALICE),
-			code_return_with_data,
-			deposit_limit::<Test>(),
-		));
-
-		// Create fixture: Constructor does nothing
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code_return_data_api))
-			.build_and_unwrap_contract();
-
-		// Call the contract: It will issue calls and deploys, asserting on
-		assert_ok!(builder::call(addr)
-			.value(10 * 1024)
-			.data(hash_return_with_data.encode())
-			.build());
-	});
-}
-
-#[test]
-fn immutable_data_works() {
-	let (code, _) = compile_module("immutable_data").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		let data = [0xfe; 8];
-
-		// Create fixture: Constructor sets the immtuable data
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-			.data(data.to_vec())
-			.build_and_unwrap_contract();
-
-		let contract = test_utils::get_contract(&addr);
-		let account = <Test as Config>::AddressMapper::to_account_id(&addr);
-		let actual_deposit =
-			test_utils::get_balance_on_hold(&HoldReason::StorageDepositReserve.into(), &account);
-
-		assert_eq!(contract.immutable_data_len(), data.len() as u32);
-
-		// Storing immmutable data charges storage deposit; verify it explicitly.
-		assert_eq!(actual_deposit, test_utils::contract_base_deposit(&addr));
-
-		// make sure it is also recorded in the base deposit
-		assert_eq!(
-			test_utils::get_balance_on_hold(&HoldReason::StorageDepositReserve.into(), &account),
-			contract.storage_base_deposit(),
-		);
-
-		// Call the contract: Asserts the input to equal the immutable data
-		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
-		);
-	});
-}
-
-#[test]
-fn origin_api_works() {
-	let (code, _) = compile_module("origin").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Create fixture: Constructor does nothing
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		// Call the contract: Asserts the origin API to work as expected
-		assert_ok!(builder::call(addr).build());
-	});
-}
-
-#[test]
-fn to_account_id_works() {
-	let (code_hash_code, _) = compile_module("to_account_id").unwrap();
-
-	ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let _ = <Test as Config>::Currency::set_balance(&EVE, 1_000_000);
-
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code_hash_code)).build_and_unwrap_contract();
-
-		// mapped account
-		<Pallet<Test>>::map_account(RuntimeOrigin::signed(EVE)).unwrap();
-		let expected_mapped_account_id = &<Test as Config>::AddressMapper::to_account_id(&EVE_ADDR);
-		assert_ne!(
-			expected_mapped_account_id.encode()[20..32],
-			[0xEE; 12],
-			"fallback suffix found where none should be"
-		);
-		assert_ok!(builder::call(addr)
-			.data((EVE_ADDR, expected_mapped_account_id).encode())
-			.build());
-
-		// fallback for unmapped accounts
-		let expected_fallback_account_id =
-			&<Test as Config>::AddressMapper::to_account_id(&BOB_ADDR);
-		assert_eq!(
-			expected_fallback_account_id.encode()[20..32],
-			[0xEE; 12],
-			"no fallback suffix found where one should be"
-		);
-		assert_ok!(builder::call(addr)
-			.data((BOB_ADDR, expected_fallback_account_id).encode())
-			.build());
-	});
-}
-
-#[test]
-fn code_hash_works() {
-	use crate::precompiles::{Precompile, EVM_REVERT};
-	use precompiles::NoInfo;
-
-	let builtin_precompile = H160(NoInfo::<Test>::MATCHER.base_address());
-	let primitive_precompile = H160::from_low_u64_be(1);
-
-	let (code_hash_code, self_code_hash) = compile_module("code_hash").unwrap();
-	let (dummy_code, code_hash) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code_hash_code)).build_and_unwrap_contract();
-		let Contract { addr: dummy_addr, .. } =
-			builder::bare_instantiate(Code::Upload(dummy_code)).build_and_unwrap_contract();
-
-		// code hash of dummy contract
-		assert_ok!(builder::call(addr).data((dummy_addr, code_hash).encode()).build());
-		// code hash of itself
-		assert_ok!(builder::call(addr).data((addr, self_code_hash).encode()).build());
-		// code hash of primitive pre-compile (exist but have no bytecode)
-		assert_ok!(builder::call(addr)
-			.data((primitive_precompile, crate::exec::EMPTY_CODE_HASH).encode())
-			.build());
-		// code hash of normal pre-compile (do have a bytecode)
-		assert_ok!(builder::call(addr)
-			.data((builtin_precompile, sp_io::hashing::keccak_256(&EVM_REVERT)).encode())
-			.build());
-
-		// EOA doesn't exists
-		assert_err!(
-			builder::bare_call(addr)
-				.data((BOB_ADDR, crate::exec::EMPTY_CODE_HASH).encode())
-				.build()
-				.result,
-			Error::<Test>::ContractTrapped
-		);
-		// non-existing will return zero
-		assert_ok!(builder::call(addr).data((BOB_ADDR, H256::zero()).encode()).build());
-
-		// create EOA
-		let _ = <Test as Config>::Currency::set_balance(
-			&<Test as Config>::AddressMapper::to_account_id(&BOB_ADDR),
-			1_000_000,
-		);
-
-		// EOA returns empty code hash
-		assert_ok!(builder::call(addr)
-			.data((BOB_ADDR, crate::exec::EMPTY_CODE_HASH).encode())
-			.build());
-	});
-}
-
-#[test]
-fn code_size_works() {
-	let (tester_code, _) = compile_module("extcodesize").unwrap();
-	let tester_code_len = tester_code.len() as u64;
-
-	let (dummy_code, _) = compile_module("dummy").unwrap();
-	let dummy_code_len = dummy_code.len() as u64;
-
-	ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		let Contract { addr: tester_addr, .. } =
-			builder::bare_instantiate(Code::Upload(tester_code)).build_and_unwrap_contract();
-		let Contract { addr: dummy_addr, .. } =
-			builder::bare_instantiate(Code::Upload(dummy_code)).build_and_unwrap_contract();
-
-		// code size of another contract address
-		assert_ok!(builder::call(tester_addr).data((dummy_addr, dummy_code_len).encode()).build());
-
-		// code size of own contract address
-		assert_ok!(builder::call(tester_addr)
-			.data((tester_addr, tester_code_len).encode())
-			.build());
-
-		// code size of non contract accounts
-		assert_ok!(builder::call(tester_addr).data(([8u8; 20], 0u64).encode()).build());
-	});
-}
-
-#[test]
-fn origin_must_be_mapped() {
-	let (code, hash) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		<Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		<Test as Config>::Currency::set_balance(&EVE, 1_000_000);
-
-		let eve = RuntimeOrigin::signed(EVE);
-
-		// alice can instantiate as she doesn't need a mapping
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		// without a mapping eve can neither call nor instantiate
-		assert_err!(
-			builder::bare_call(addr).origin(eve.clone()).build().result,
-			<Error<Test>>::AccountUnmapped
-		);
-		assert_err!(
-			builder::bare_instantiate(Code::Existing(hash))
-				.origin(eve.clone())
-				.build()
-				.result,
-			<Error<Test>>::AccountUnmapped
-		);
-
-		// after mapping eve is usable as an origin
-		<Pallet<Test>>::map_account(eve.clone()).unwrap();
-		assert_ok!(builder::bare_call(addr).origin(eve.clone()).build().result);
-		assert_ok!(builder::bare_instantiate(Code::Existing(hash)).origin(eve).build().result);
-	});
-}
-
-#[test]
-fn mapped_address_works() {
-	let (code, _) = compile_module("terminate_and_send_to_argument").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		<Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// without a mapping everything will be send to the fallback account
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code.clone())).build_and_unwrap_contract();
-		assert_eq!(<Test as Config>::Currency::total_balance(&EVE_FALLBACK), 0);
-		builder::bare_call(addr).data(EVE_ADDR.encode()).build_and_unwrap_result();
-		assert_eq!(<Test as Config>::Currency::total_balance(&EVE_FALLBACK), 100);
-
-		// after mapping it will be sent to the real eve account
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-		// need some balance to pay for the map deposit
-		<Test as Config>::Currency::set_balance(&EVE, 1_000);
-		<Pallet<Test>>::map_account(RuntimeOrigin::signed(EVE)).unwrap();
-		builder::bare_call(addr).data(EVE_ADDR.encode()).build_and_unwrap_result();
-		assert_eq!(<Test as Config>::Currency::total_balance(&EVE_FALLBACK), 100);
-		assert_eq!(<Test as Config>::Currency::total_balance(&EVE), 1_100);
-	});
-}
-
-#[test]
-fn recovery_works() {
-	let (code, _) = compile_module("terminate_and_send_to_argument").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		<Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// eve puts her AccountId20 as argument to terminate but forgot to register
-		// her AccountId32 first so now the funds are trapped in her fallback account
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code.clone())).build_and_unwrap_contract();
-		assert_eq!(<Test as Config>::Currency::total_balance(&EVE), 0);
-		assert_eq!(<Test as Config>::Currency::total_balance(&EVE_FALLBACK), 0);
-		builder::bare_call(addr).data(EVE_ADDR.encode()).build_and_unwrap_result();
-		assert_eq!(<Test as Config>::Currency::total_balance(&EVE_FALLBACK), 100);
-		assert_eq!(<Test as Config>::Currency::total_balance(&EVE), 0);
-
-		let call = RuntimeCall::Balances(pallet_balances::Call::transfer_all {
-			dest: EVE,
-			keep_alive: false,
-		});
-
-		// she now uses the recovery function to move all funds from the fallback
-		// account to her real account
-		<Pallet<Test>>::dispatch_as_fallback_account(RuntimeOrigin::signed(EVE), Box::new(call))
-			.unwrap();
-		assert_eq!(<Test as Config>::Currency::total_balance(&EVE_FALLBACK), 0);
-		assert_eq!(<Test as Config>::Currency::total_balance(&EVE), 100);
-	});
-}
-
-#[test]
-fn skip_transfer_works() {
-	let (code_caller, _) = compile_module("call").unwrap();
-	let (code, _) = compile_module("store_call").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		<Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		<Test as Config>::Currency::set_balance(&BOB, 0);
-
-		// when gas is some (transfers enabled): bob has no money: fail
-		assert_err!(
-			Pallet::<Test>::dry_run_eth_transact(
-				GenericTransaction {
-					from: Some(BOB_ADDR),
-					input: code.clone().into(),
-					gas: Some(1u32.into()),
-					..Default::default()
-				},
-				Weight::MAX,
-				|_, _| 0u64,
-			),
-			EthTransactError::Message(format!(
-				"insufficient funds for gas * price + value: address {BOB_ADDR:?} have 0 (supplied gas 1)"
-			))
-		);
-
-		// no gas specified (all transfers are skipped): even without money bob can deploy
-		assert_ok!(Pallet::<Test>::dry_run_eth_transact(
-			GenericTransaction {
-				from: Some(BOB_ADDR),
-				input: code.clone().into(),
-				..Default::default()
-			},
-			Weight::MAX,
-			|_, _| 0u64,
-		));
-
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		let Contract { addr: caller_addr, .. } =
-			builder::bare_instantiate(Code::Upload(code_caller)).build_and_unwrap_contract();
-
-		// call directly: fails with enabled transfers
-		assert_err!(
-			Pallet::<Test>::dry_run_eth_transact(
-				GenericTransaction {
-					from: Some(BOB_ADDR),
-					to: Some(addr),
-					input: 0u32.encode().into(),
-					gas: Some(1u32.into()),
-					..Default::default()
-				},
-				Weight::MAX,
-				|_, _| 0u64,
-			),
-			EthTransactError::Message(format!(
-				"insufficient funds for gas * price + value: address {BOB_ADDR:?} have 0 (supplied gas 1)"
-			))
-		);
-
-		// fails to call through other contract
-		// we didn't roll back the storage changes done by the previous
-		// call. So the item already exists. We simply increase the size of
-		// the storage item to incur some deposits (which bob can't pay).
-		assert!(Pallet::<Test>::dry_run_eth_transact(
-			GenericTransaction {
-				from: Some(BOB_ADDR),
-				to: Some(caller_addr),
-				input: (1u32, &addr).encode().into(),
-				gas: Some(1u32.into()),
-				..Default::default()
-			},
-			Weight::MAX,
-			|_, _| 0u64,
-		)
-		.is_err(),);
-
-		// works when no gas is specified (skip transfer)
-		assert_ok!(Pallet::<Test>::dry_run_eth_transact(
-			GenericTransaction {
-				from: Some(BOB_ADDR),
-				to: Some(addr),
-				input: 2u32.encode().into(),
-				..Default::default()
-			},
-			Weight::MAX,
-			|_, _| 0u64,
-		));
-
-		// call through contract works when transfers are skipped
-		assert_ok!(Pallet::<Test>::dry_run_eth_transact(
-			GenericTransaction {
-				from: Some(BOB_ADDR),
-				to: Some(caller_addr),
-				input: (3u32, &addr).encode().into(),
-				..Default::default()
-			},
-			Weight::MAX,
-			|_, _| 0u64,
-		));
-
-		// works with transfers enabled if we don't incur a storage cost
-		// we shrink the item so its actually a refund
-		assert_ok!(Pallet::<Test>::dry_run_eth_transact(
-			GenericTransaction {
-				from: Some(BOB_ADDR),
-				to: Some(caller_addr),
-				input: (2u32, &addr).encode().into(),
-				gas: Some(1u32.into()),
-				..Default::default()
-			},
-			Weight::MAX,
-			|_, _| 0u64,
-		));
-
-		// fails when trying to increase the storage item size
-		assert!(Pallet::<Test>::dry_run_eth_transact(
-			GenericTransaction {
-				from: Some(BOB_ADDR),
-				to: Some(caller_addr),
-				input: (3u32, &addr).encode().into(),
-				gas: Some(1u32.into()),
-				..Default::default()
-			},
-			Weight::MAX,
-			|_, _| 0u64,
-		)
-		.is_err());
-	});
-}
-
-#[test]
-fn gas_limit_api_works() {
-	let (code, _) = compile_module("gas_limit").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Create fixture: Constructor does nothing
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		// Call the contract: It echoes back the value returned by the gas limit API.
-		let received = builder::bare_call(addr).build_and_unwrap_result();
-		assert_eq!(received.flags, ReturnFlags::empty());
-		assert_eq!(
-			u64::from_le_bytes(received.data[..].try_into().unwrap()),
-			<Test as frame_system::Config>::BlockWeights::get().max_block.ref_time()
-		);
-	});
-}
-
-#[test]
-fn unknown_syscall_rejected() {
-	let (code, _) = compile_module("unknown_syscall").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		<Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		assert_err!(
-			builder::bare_instantiate(Code::Upload(code)).build().result,
-			<Error<Test>>::CodeRejected,
-		)
-	});
-}
-
-#[test]
-fn unstable_interface_rejected() {
-	let (code, _) = compile_module("unstable_interface").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		<Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		Test::set_unstable_interface(false);
-		assert_err!(
-			builder::bare_instantiate(Code::Upload(code.clone())).build().result,
-			<Error<Test>>::CodeRejected,
-		);
-
-		Test::set_unstable_interface(true);
-		assert_ok!(builder::bare_instantiate(Code::Upload(code)).build().result);
-	});
-}
-
-#[test]
-fn tracing_works_for_transfers() {
-	ExtBuilder::default().build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000);
-		let mut tracer = CallTracer::new(Default::default(), |_| U256::zero());
-		trace(&mut tracer, || {
-			builder::bare_call(BOB_ADDR).evm_value(10.into()).build_and_unwrap_result();
-		});
-
-		let trace = tracer.collect_trace();
-		assert_eq!(
-			trace,
-			Some(CallTrace {
-				from: ALICE_ADDR,
-				to: BOB_ADDR,
-				value: Some(U256::from(10)),
-				call_type: CallType::Call,
-				..Default::default()
-			})
-		)
-	});
-}
-
-#[test]
-fn call_tracing_works() {
-	use crate::evm::*;
-	use CallType::*;
-	let (code, _code_hash) = compile_module("tracing").unwrap();
-	let (binary_callee, _) = compile_module("tracing_callee").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000);
-
-		let Contract { addr: addr_callee, .. } =
-			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
-
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).evm_value(10_000_000.into()).build_and_unwrap_contract();
-
-
-		let tracer_configs = vec![
-			 CallTracerConfig{ with_logs: false, only_top_call: false},
-			 CallTracerConfig{ with_logs: false, only_top_call: false},
-			 CallTracerConfig{ with_logs: false, only_top_call: true},
-		];
-
-		// Verify that the first trace report the same weight reported by bare_call
-		// TODO: fix tracing ( https://github.com/paritytech/polkadot-sdk/issues/8362 )
-		/*
-		let mut tracer = CallTracer::new(false, |w| w);
-		let gas_used = trace(&mut tracer, || {
-			builder::bare_call(addr).data((3u32, addr_callee).encode()).build().gas_consumed
-		});
-		let trace = tracer.collect_trace().unwrap();
-		assert_eq!(&trace.gas_used, &gas_used);
-		*/
-
-		// Discarding gas usage, check that traces reported are correct
-		for config in tracer_configs {
-			let logs = if config.with_logs {
-				vec![
-					CallLog {
-						address: addr,
-						topics: Default::default(),
-						data: b"before".to_vec().into(),
-						position: 0,
-					},
-					CallLog {
-						address: addr,
-						topics: Default::default(),
-						data: b"after".to_vec().into(),
-						position: 1,
-					},
-				]
-			} else {
-				vec![]
-			};
-
-			let calls = if config.only_top_call {
-				vec![]
-			} else {
-				vec![
-						CallTrace {
-							from: addr,
-							to: addr_callee,
-							input: 2u32.encode().into(),
-							output: hex_literal::hex!(
-										"08c379a00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001a546869732066756e6374696f6e20616c77617973206661696c73000000000000"
-									).to_vec().into(),
-							revert_reason: Some("revert: This function always fails".to_string()),
-							error: Some("execution reverted".to_string()),
-							call_type: Call,
-							value: Some(U256::from(0)),
-							..Default::default()
-						},
-						CallTrace {
-							from: addr,
-							to: addr,
-							input: (2u32, addr_callee).encode().into(),
-							call_type: Call,
-							logs: logs.clone(),
-							value: Some(U256::from(0)),
-							calls: vec![
-								CallTrace {
-									from: addr,
-									to: addr_callee,
-									input: 1u32.encode().into(),
-									output: Default::default(),
-									error: Some("ContractTrapped".to_string()),
-									call_type: Call,
-									value: Some(U256::from(0)),
-									..Default::default()
-								},
-								CallTrace {
-									from: addr,
-									to: addr,
-									input: (1u32, addr_callee).encode().into(),
-									call_type: Call,
-									logs: logs.clone(),
-									value: Some(U256::from(0)),
-									calls: vec![
-										CallTrace {
-											from: addr,
-											to: addr_callee,
-											input: 0u32.encode().into(),
-											output: 0u32.to_le_bytes().to_vec().into(),
-											call_type: Call,
-											value: Some(U256::from(0)),
-											..Default::default()
-										},
-										CallTrace {
-											from: addr,
-											to: addr,
-											input: (0u32, addr_callee).encode().into(),
-											call_type: Call,
-											value: Some(U256::from(0)),
-											calls: vec![
-												CallTrace {
-													from: addr,
-													to: BOB_ADDR,
-													value: Some(U256::from(100)),
-													call_type: CallType::Call,
-													..Default::default()
-												}
-											],
-											..Default::default()
-										},
-									],
-									..Default::default()
-								},
-							],
-							..Default::default()
-						},
-					]
-			};
-
-			let mut tracer = CallTracer::new(config, |_| U256::zero());
-			trace(&mut tracer, || {
-				builder::bare_call(addr).data((3u32, addr_callee).encode()).build()
-			});
-
-			let trace = tracer.collect_trace();
-			let expected_trace = CallTrace {
-					from: ALICE_ADDR,
-					to: addr,
-					input: (3u32, addr_callee).encode().into(),
-					call_type: Call,
-					logs: logs.clone(),
-					value: Some(U256::from(0)),
-					calls: calls,
-					..Default::default()
-				};
-
-			assert_eq!(
-				trace,
-				expected_trace.into(),
-			);
-		}
-	});
-}
-
-#[test]
-fn create_call_tracing_works() {
-	use crate::evm::*;
-	let (code, code_hash) = compile_module("create2_with_value").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000);
-
-		let mut tracer = CallTracer::new(Default::default(), |_| U256::zero());
-
-		let Contract { addr, .. } = trace(&mut tracer, || {
-			builder::bare_instantiate(Code::Upload(code.clone()))
-				.evm_value(100.into())
-				.salt(None)
-				.build_and_unwrap_contract()
-		});
-
-		let call_trace = tracer.collect_trace().unwrap();
-		assert_eq!(
-			call_trace,
-			CallTrace {
-				from: ALICE_ADDR,
-				to: addr,
-				value: Some(100.into()),
-				input: Bytes(code.clone()),
-				call_type: CallType::Create,
-				..Default::default()
-			}
-		);
-
-		let mut tracer = CallTracer::new(Default::default(), |_| U256::zero());
-		let data = b"garbage";
-		let input = (code_hash, data).encode();
-		trace(&mut tracer, || {
-			assert_ok!(builder::call(addr).data(input.clone()).build());
-		});
-
-		let call_trace = tracer.collect_trace().unwrap();
-		let child_addr = crate::address::create2(&addr, &code, data, &[1u8; 32]);
-
-		assert_eq!(
-			call_trace,
-			CallTrace {
-				from: ALICE_ADDR,
-				to: addr,
-				value: Some(0.into()),
-				input: input.clone().into(),
-				calls: vec![CallTrace {
-					from: addr,
-					input: input.clone().into(),
-					to: child_addr,
-					value: Some(0.into()),
-					call_type: CallType::Create2,
-					..Default::default()
-				},],
-				..Default::default()
-			}
-		);
-	});
-}
-
-#[test]
-fn prestate_tracing_works() {
-	use crate::evm::*;
-	use alloc::collections::BTreeMap;
-
-	let (dummy_code, _) = compile_module("dummy").unwrap();
-	let (code, _) = compile_module("tracing").unwrap();
-	let (callee_code, _) = compile_module("tracing_callee").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000);
-
-		let Contract { addr: addr_callee, .. } =
-			builder::bare_instantiate(Code::Upload(callee_code.clone()))
-				.build_and_unwrap_contract();
-
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code.clone()))
-			.native_value(10)
-			.build_and_unwrap_contract();
-
-		// redact balance so that tests are resilient to weight changes
-		let alice_redacted_balance = Some(U256::from(1));
-
-		let test_cases: Vec<(Box<dyn FnOnce()>, _, _)> = vec![
-			(
-				Box::new(|| {
-					builder::bare_call(addr)
-						.data((3u32, addr_callee).encode())
-						.build_and_unwrap_result();
-				}),
-				PrestateTracerConfig {
-					diff_mode: false,
-					disable_storage: false,
-					disable_code: false,
-				},
-				PrestateTrace::Prestate(BTreeMap::from([
-					(
-						ALICE_ADDR,
-						PrestateTraceInfo {
-							balance: alice_redacted_balance,
-							nonce: Some(2),
-							..Default::default()
-						},
-					),
-					(
-						BOB_ADDR,
-						PrestateTraceInfo { balance: Some(U256::from(0u64)), ..Default::default() },
-					),
-					(
-						addr_callee,
-						PrestateTraceInfo {
-							balance: Some(U256::from(0u64)),
-							code: Some(Bytes(callee_code.clone())),
-							nonce: Some(1),
-							..Default::default()
-						},
-					),
-					(
-						addr,
-						PrestateTraceInfo {
-							balance: Some(U256::from(10_000_000u64)),
-							code: Some(Bytes(code.clone())),
-							nonce: Some(1),
-							..Default::default()
-						},
-					),
-				])),
-			),
-			(
-				Box::new(|| {
-					builder::bare_call(addr)
-						.data((3u32, addr_callee).encode())
-						.build_and_unwrap_result();
-				}),
-				PrestateTracerConfig {
-					diff_mode: true,
-					disable_storage: false,
-					disable_code: false,
-				},
-				PrestateTrace::DiffMode {
-					pre: BTreeMap::from([
-						(
-							BOB_ADDR,
-							PrestateTraceInfo {
-								balance: Some(U256::from(100u64)),
-								..Default::default()
-							},
-						),
-						(
-							addr,
-							PrestateTraceInfo {
-								balance: Some(U256::from(9_999_900u64)),
-								code: Some(Bytes(code.clone())),
-								nonce: Some(1),
-								..Default::default()
-							},
-						),
-					]),
-					post: BTreeMap::from([
-						(
-							BOB_ADDR,
-							PrestateTraceInfo {
-								balance: Some(U256::from(200u64)),
-								..Default::default()
-							},
-						),
-						(
-							addr,
-							PrestateTraceInfo {
-								balance: Some(U256::from(9_999_800u64)),
-								..Default::default()
-							},
-						),
-					]),
-				},
-			),
-			(
-				Box::new(|| {
-					builder::bare_instantiate(Code::Upload(dummy_code.clone()))
-						.salt(None)
-						.build_and_unwrap_result();
-				}),
-				PrestateTracerConfig {
-					diff_mode: true,
-					disable_storage: false,
-					disable_code: false,
-				},
-				PrestateTrace::DiffMode {
-					pre: BTreeMap::from([(
-						ALICE_ADDR,
-						PrestateTraceInfo {
-							balance: alice_redacted_balance,
-							nonce: Some(2),
-							..Default::default()
-						},
-					)]),
-					post: BTreeMap::from([
-						(
-							ALICE_ADDR,
-							PrestateTraceInfo {
-								balance: alice_redacted_balance,
-								nonce: Some(3),
-								..Default::default()
-							},
-						),
-						(
-							create1(&ALICE_ADDR, 1),
-							PrestateTraceInfo {
-								code: Some(dummy_code.clone().into()),
-								balance: Some(U256::from(0)),
-								nonce: Some(1),
-								..Default::default()
-							},
-						),
-					]),
-				},
-			),
-		];
-
-		for (exec_call, config, expected_trace) in test_cases.into_iter() {
-			let mut tracer = PrestateTracer::<Test>::new(config);
-			trace(&mut tracer, || {
-				exec_call();
-			});
-
-			let mut trace = tracer.collect_trace();
-
-			// redact alice balance
-			match trace {
-				PrestateTrace::DiffMode { ref mut pre, ref mut post } => {
-					pre.get_mut(&ALICE_ADDR).map(|info| {
-						info.balance = alice_redacted_balance;
-					});
-					post.get_mut(&ALICE_ADDR).map(|info| {
-						info.balance = alice_redacted_balance;
-					});
-				},
-				PrestateTrace::Prestate(ref mut pre) => {
-					pre.get_mut(&ALICE_ADDR).map(|info| {
-						info.balance = alice_redacted_balance;
-					});
-				},
-			}
-
-			assert_eq!(trace, expected_trace);
-		}
-	});
-}
-
-#[test]
-fn unknown_precompiles_revert() {
-	let (code, _code_hash) = compile_module("read_only_call").unwrap();
-
-	ExtBuilder::default().build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		let cases: Vec<(H160, Box<dyn FnOnce(_)>)> = vec![(
-			H160::from_low_u64_be(0x0a),
-			Box::new(|result| {
-				assert_err!(result, <Error<Test>>::UnsupportedPrecompileAddress);
-			}),
-		)];
-
-		for (callee_addr, assert_result) in cases {
-			let result =
-				builder::bare_call(addr).data((callee_addr, [0u8; 0]).encode()).build().result;
-			assert_result(result);
-		}
-	});
-}
-
-#[test]
-fn pure_precompile_works() {
-	use hex_literal::hex;
-
-	let cases = vec![
-		(
-			"ECRecover",
-			H160::from_low_u64_be(1),
-			hex!("18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c000000000000000000000000000000000000000000000000000000000000001c73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549").to_vec(),
-			hex!("000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b").to_vec(),
-		),
-		(
-			"Sha256",
-			H160::from_low_u64_be(2),
-			hex!("ec07171c4f0f0e2b").to_vec(),
-			hex!("d0591ea667763c69a5f5a3bae657368ea63318b2c9c8349cccaf507e3cbd7c7a").to_vec(),
-		),
-		(
-			"Ripemd160",
-			H160::from_low_u64_be(3),
-			hex!("ec07171c4f0f0e2b").to_vec(),
-			hex!("000000000000000000000000a9c5ebaf7589fd8acfd542c3a008956de84fbeb7").to_vec(),
-		),
-		(
-			"Identity",
-			H160::from_low_u64_be(4),
-			[42u8; 128].to_vec(),
-			[42u8; 128].to_vec(),
-		),
-		(
-			"Modexp",
-			H160::from_low_u64_be(5),
-			hex!("00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f").to_vec(),
-			hex!("0000000000000000000000000000000000000000000000000000000000000001").to_vec(),
-		),
-		(
-			"Bn128Add",
-			H160::from_low_u64_be(6),
-			hex!("18b18acfb4c2c30276db5411368e7185b311dd124691610c5d3b74034e093dc9063c909c4720840cb5134cb9f59fa749755796819658d32efc0d288198f3726607c2b7f58a84bd6145f00c9c2bc0bb1a187f20ff2c92963a88019e7c6a014eed06614e20c147e940f2d70da3f74c9a17df361706a4485c742bd6788478fa17d7").to_vec(),
-			hex!("2243525c5efd4b9c3d3c45ac0ca3fe4dd85e830a4ce6b65fa1eeaee202839703301d1d33be6da8e509df21cc35964723180eed7532537db9ae5e7d48f195c915").to_vec(),
-		),
-		(
-			"Bn128Mul",
-			H160::from_low_u64_be(7),
-			hex!("2bd3e6d0f3b142924f5ca7b49ce5b9d54c4703d7ae5648e61d02268b1a0a9fb721611ce0a6af85915e2f1d70300909ce2e49dfad4a4619c8390cae66cefdb20400000000000000000000000000000000000000000000000011138ce750fa15c2").to_vec(),
-			hex!("070a8d6a982153cae4be29d434e8faef8a47b274a053f5a4ee2a6c9c13c31e5c031b8ce914eba3a9ffb989f9cdd5b0f01943074bf4f0f315690ec3cec6981afc").to_vec(),
-		),
-		(
-			"Bn128Pairing",
-			H160::from_low_u64_be(8),
-			hex!("1c76476f4def4bb94541d57ebba1193381ffa7aa76ada664dd31c16024c43f593034dd2920f673e204fee2811c678745fc819b55d3e9d294e45c9b03a76aef41209dd15ebff5d46c4bd888e51a93cf99a7329636c63514396b4a452003a35bf704bf11ca01483bfa8b34b43561848d28905960114c8ac04049af4b6315a416782bb8324af6cfc93537a2ad1a445cfd0ca2a71acd7ac41fadbf933c2a51be344d120a2a4cf30c1bf9845f20c6fe39e07ea2cce61f0c9bb048165fe5e4de877550111e129f1cf1097710d41c4ac70fcdfa5ba2023c6ff1cbeac322de49d1b6df7c2032c61a830e3c17286de9462bf242fca2883585b93870a73853face6a6bf411198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa").to_vec(),
-			hex!("0000000000000000000000000000000000000000000000000000000000000001").to_vec(),
-		),
-		(
-			"Blake2F",
-			H160::from_low_u64_be(9),
-			hex!("0000000048c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b61626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000001").to_vec(),
-			hex!("08c9bcf367e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d282e6ad7f520e511f6c3e2b8c68059b9442be0454267ce079217e1319cde05b").to_vec(),
-		),
-	];
-
-	for (description, precompile_addr, input, output) in cases {
-		let (code, _code_hash) = compile_module("call_and_return").unwrap();
-		ExtBuilder::default().build().execute_with(|| {
-			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-			let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-				.native_value(1_000)
-				.build_and_unwrap_contract();
-
-			let result = builder::bare_call(addr)
-				.data(
-					(&precompile_addr, 100u64)
-						.encode()
-						.into_iter()
-						.chain(input)
-						.collect::<Vec<_>>(),
-				)
-				.build_and_unwrap_result();
-
-			assert_eq!(
-				Pallet::<Test>::evm_balance(&precompile_addr),
-				U256::from(100),
-				"{description}: unexpected balance"
-			);
-			assert_eq!(
-				alloy_core::hex::encode(result.data),
-				alloy_core::hex::encode(output),
-				"{description} Unexpected output for precompile: {precompile_addr:?}",
-			);
-			assert_eq!(result.flags, ReturnFlags::empty());
-		});
-	}
-}
-
-#[test]
-fn precompiles_work() {
-	use crate::precompiles::Precompile;
-	use alloy_core::sol_types::{Panic, PanicKind, Revert, SolError, SolInterface, SolValue};
-	use precompiles::{INoInfo, NoInfo};
-
-	let precompile_addr = H160(NoInfo::<Test>::MATCHER.base_address());
-
-	let cases = vec![
-		(
-			INoInfo::INoInfoCalls::identity(INoInfo::identityCall { number: 42u64.into() })
-				.abi_encode(),
-			42u64.abi_encode(),
-			RuntimeReturnCode::Success,
-		),
-		(
-			INoInfo::INoInfoCalls::reverts(INoInfo::revertsCall { error: "panic".to_string() })
-				.abi_encode(),
-			Revert::from("panic").abi_encode(),
-			RuntimeReturnCode::CalleeReverted,
-		),
-		(
-			INoInfo::INoInfoCalls::panics(INoInfo::panicsCall {}).abi_encode(),
-			Panic::from(PanicKind::Assert).abi_encode(),
-			RuntimeReturnCode::CalleeReverted,
-		),
-		(
-			INoInfo::INoInfoCalls::errors(INoInfo::errorsCall {}).abi_encode(),
-			Vec::new(),
-			RuntimeReturnCode::CalleeTrapped,
-		),
-		// passing non decodeable input reverts with solidity panic
-		(
-			b"invalid".to_vec(),
-			Panic::from(PanicKind::ResourceError).abi_encode(),
-			RuntimeReturnCode::CalleeReverted,
-		),
-	];
-
-	for (input, output, error_code) in cases {
-		let (code, _code_hash) = compile_module("call_and_returncode").unwrap();
-		ExtBuilder::default().build().execute_with(|| {
-			let id = <Test as Config>::AddressMapper::to_account_id(&precompile_addr);
-			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-			let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-				.native_value(1000)
-				.build_and_unwrap_contract();
-
-			let result = builder::bare_call(addr)
-				.data(
-					(&precompile_addr, 0u64).encode().into_iter().chain(input).collect::<Vec<_>>(),
-				)
-				.build_and_unwrap_result();
-
-			// no account or contract info should be created for a NoInfo pre-compile
-			assert!(test_utils::get_contract_checked(&precompile_addr).is_none());
-			assert!(!System::account_exists(&id));
-			assert_eq!(Pallet::<Test>::evm_balance(&precompile_addr), U256::zero());
-
-			assert_eq!(result.flags, ReturnFlags::empty());
-			assert_eq!(u32::from_le_bytes(result.data[..4].try_into().unwrap()), error_code as u32);
-			assert_eq!(
-				&result.data[4..],
-				&output,
-				"Unexpected output for precompile: {precompile_addr:?}",
-			);
-		});
-	}
-}
-
-#[test]
-fn precompiles_with_info_creates_contract() {
-	use crate::precompiles::Precompile;
-	use alloy_core::sol_types::SolInterface;
-	use precompiles::{IWithInfo, WithInfo};
-
-	let precompile_addr = H160(WithInfo::<Test>::MATCHER.base_address());
-
-	let cases = vec![(
-		IWithInfo::IWithInfoCalls::dummy(IWithInfo::dummyCall {}).abi_encode(),
-		Vec::<u8>::new(),
-		RuntimeReturnCode::Success,
-	)];
-
-	for (input, output, error_code) in cases {
-		let (code, _code_hash) = compile_module("call_and_returncode").unwrap();
-		ExtBuilder::default().build().execute_with(|| {
-			let id = <Test as Config>::AddressMapper::to_account_id(&precompile_addr);
-			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-			let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-				.native_value(1000)
-				.build_and_unwrap_contract();
-
-			let result = builder::bare_call(addr)
-				.data(
-					(&precompile_addr, 0u64).encode().into_iter().chain(input).collect::<Vec<_>>(),
-				)
-				.build_and_unwrap_result();
-
-			// a pre-compile with contract info should create an account on first call
-			assert!(test_utils::get_contract_checked(&precompile_addr).is_some());
-			assert!(System::account_exists(&id));
-			assert_eq!(Pallet::<Test>::evm_balance(&precompile_addr), U256::from(0));
-
-			assert_eq!(result.flags, ReturnFlags::empty());
-			assert_eq!(u32::from_le_bytes(result.data[..4].try_into().unwrap()), error_code as u32);
-			assert_eq!(
-				&result.data[4..],
-				&output,
-				"Unexpected output for precompile: {precompile_addr:?}",
-			);
-		});
-	}
-}
-
-#[test]
-fn bump_nonce_once_works() {
-	let (code, hash) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		frame_system::Account::<Test>::mutate(&ALICE, |account| account.nonce = 1);
-
-		let _ = <Test as Config>::Currency::set_balance(&BOB, 1_000_000);
-		frame_system::Account::<Test>::mutate(&BOB, |account| account.nonce = 1);
-
-		builder::bare_instantiate(Code::Upload(code.clone()))
-			.origin(RuntimeOrigin::signed(ALICE))
-			.bump_nonce(BumpNonce::Yes)
-			.salt(None)
-			.build_and_unwrap_result();
-		assert_eq!(System::account_nonce(&ALICE), 2);
-
-		// instantiate again is ok
-		let result = builder::bare_instantiate(Code::Existing(hash))
-			.origin(RuntimeOrigin::signed(ALICE))
-			.bump_nonce(BumpNonce::Yes)
-			.salt(None)
-			.build()
-			.result;
-		assert!(result.is_ok());
-
-		builder::bare_instantiate(Code::Upload(code.clone()))
-			.origin(RuntimeOrigin::signed(BOB))
-			.bump_nonce(BumpNonce::No)
-			.salt(None)
-			.build_and_unwrap_result();
-		assert_eq!(System::account_nonce(&BOB), 1);
-
-		// instantiate again should fail
-		let err = builder::bare_instantiate(Code::Upload(code))
-			.origin(RuntimeOrigin::signed(BOB))
-			.bump_nonce(BumpNonce::No)
-			.salt(None)
-			.build()
-			.result
-			.unwrap_err();
-
-		assert_eq!(err, <Error<Test>>::DuplicateContract.into());
-	});
-}
-
-#[test]
-fn code_size_for_precompiles_works() {
-	use crate::precompiles::Precompile;
-	use precompiles::NoInfo;
-
-	let builtin_precompile = H160(NoInfo::<Test>::MATCHER.base_address());
-	let primitive_precompile = H160::from_low_u64_be(1);
-
-	let (code, _code_hash) = compile_module("extcodesize").unwrap();
-	ExtBuilder::default().build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-			.native_value(1000)
-			.build_and_unwrap_contract();
-
-		// the primitive pre-compiles return 0 code size on eth
-		builder::bare_call(addr)
-			.data((&primitive_precompile, 0u64).encode())
-			.build_and_unwrap_result();
-
-		// other precompiles should return the minimal evm revert code
-		builder::bare_call(addr)
-			.data((&builtin_precompile, 5u64).encode())
-			.build_and_unwrap_result();
-	});
-}
-
-alloy_core::sol!("src/tests/playground.sol");
-
-#[test]
-fn basic_evm_flow_works() {
-	use alloy_core::{hex, primitives, sol_types::SolInterface};
-	let code = hex::decode(include_str!("tests/Playground.bin")).unwrap();
-
-	ExtBuilder::default().build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code.clone())).build_and_unwrap_contract();
-
-		// check the code exists
-		let contract = test_utils::get_contract_checked(&addr).unwrap();
-		ensure_stored(contract.code_hash);
-
-		let result = builder::bare_call(addr)
-			.data(
-				Playground::PlaygroundCalls::fib(Playground::fibCall {
-					n: primitives::U256::from(10u64),
-				})
-				.abi_encode(),
-			)
-			.build_and_unwrap_result();
-		assert_eq!(U256::from(55u32), U256::from_big_endian(&result.data));
-	});
-}
-
-#[test]
-fn basic_evm_host_interaction_works() {
-	use alloy_core::{hex, sol_types::SolInterface};
-	let code = hex::decode(include_str!("tests/Playground.bin")).unwrap();
-
-	ExtBuilder::default().build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code.clone())).build_and_unwrap_contract();
-
-		System::set_block_number(42);
-
-		let result = builder::bare_call(addr)
-			.data(Playground::PlaygroundCalls::bn(Playground::bnCall {}).abi_encode())
-			.build_and_unwrap_result();
-		assert_eq!(U256::from(42u32), U256::from_big_endian(&result.data));
-	});
-}
diff --git a/substrate/frame/revive/src/tests/common.rs b/substrate/frame/revive/src/tests/common.rs
new file mode 100644
index 000000000000..638037b4bc92
--- /dev/null
+++ b/substrate/frame/revive/src/tests/common.rs
@@ -0,0 +1,137 @@
+// 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.
+
+//! The pallet-revive shared VM integration test suite.
+
+use crate::{
+	test_utils::{builder::Contract, *},
+	tests::{builder, ExtBuilder, System, Test},
+	Code, Config,
+};
+
+use alloy_core::{
+	primitives::{Bytes, U256},
+	sol_types::{SolConstructor, SolInterface},
+};
+use frame_support::traits::fungible::Mutate;
+use pallet_revive_fixtures_solidity::contracts::*;
+use pretty_assertions::assert_eq;
+use sp_io::hashing::keccak_256;
+
+/// Tests that the blocknumber opcode works as expected.
+#[test]
+fn block_number_works() {
+	for code in [playground_bin(), playground_pvm()] {
+		ExtBuilder::default().build().execute_with(|| {
+			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+			let Contract { addr, .. } =
+				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+			System::set_block_number(42);
+
+			let result = builder::bare_call(addr)
+				.data(Playground::PlaygroundCalls::bn(Playground::bnCall {}).abi_encode())
+				.build_and_unwrap_result();
+			assert_eq!(
+				U256::from(42u32),
+				U256::from_be_bytes::<32>(result.data.try_into().unwrap())
+			);
+		});
+	}
+}
+
+/// Tests that the sha3 keccak256 cryptographic opcode works as expected.
+#[test]
+fn keccak_256_works() {
+	for code in [crypto_bin(), crypto_pvm()] {
+		ExtBuilder::default().build().execute_with(|| {
+			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+			let Contract { addr, .. } =
+				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+			let pre = "revive".to_string();
+			let expected = keccak_256(pre.as_bytes());
+
+			let result = builder::bare_call(addr)
+				.data(TestSha3::TestSha3Calls::test(TestSha3::testCall { _pre: pre }).abi_encode())
+				.build_and_unwrap_result();
+
+			assert_eq!(&expected, result.data.as_slice());
+		});
+	}
+}
+
+/// Tests that the create2 opcode works as expected.
+#[test]
+fn predictable_addresses() {
+	let bytecodes = [
+		(address_predictor_pvm(), predicted_pvm()),
+		(address_predictor_bin(), predicted_bin_runtime()),
+	];
+
+	// TODO: Remove `take(1)` to activate the EVM test.
+	for (code, target) in bytecodes.into_iter().take(1) {
+		ExtBuilder::default().build().execute_with(|| {
+			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+
+			// Publishing the target bytecode pre-image first is necessary on PVM.
+			builder::bare_instantiate(Code::Upload(target.clone()))
+				.data(vec![0; 32])
+				.build_and_unwrap_contract();
+
+			let Contract { .. } = builder::bare_instantiate(Code::Upload(code))
+				.data(
+					AddressPredictor::constructorCall::new((U256::from(123), Bytes::from(target)))
+						.abi_encode(),
+				)
+				.build_and_unwrap_contract();
+		});
+	}
+}
+
+/// Tests that the sstore and sload storage opcodes work as expected.
+#[test]
+fn flipper() {
+	// TODO: Remove `take(1)` to activate the EVM test.
+	for code in [flipper_pvm(), flipper_bin()].into_iter().take(1) {
+		ExtBuilder::default().build().execute_with(|| {
+			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+			let Contract { addr, .. } =
+				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+			let result = builder::bare_call(addr)
+				.data(Flipper::FlipperCalls::coin(Flipper::coinCall {}).abi_encode())
+				.build_and_unwrap_result();
+			assert_eq!(U256::ZERO, U256::from_be_bytes::<32>(result.data.try_into().unwrap()));
+
+			// Should be false
+			let result = builder::bare_call(addr)
+				.data(Flipper::FlipperCalls::coin(Flipper::coinCall {}).abi_encode())
+				.build_and_unwrap_result();
+			assert_eq!(U256::ZERO, U256::from_be_bytes::<32>(result.data.try_into().unwrap()));
+
+			// Flip the coin
+			builder::bare_call(addr).build_and_unwrap_result();
+
+			// Should be true
+			let result = builder::bare_call(addr)
+				.data(Flipper::FlipperCalls::coin(Flipper::coinCall {}).abi_encode())
+				.build_and_unwrap_result();
+			assert_eq!(U256::ONE, U256::from_be_bytes::<32>(result.data.try_into().unwrap()));
+		});
+	}
+}
diff --git a/substrate/frame/revive/src/tests/evm.rs b/substrate/frame/revive/src/tests/evm.rs
new file mode 100644
index 000000000000..620fbaf3a20d
--- /dev/null
+++ b/substrate/frame/revive/src/tests/evm.rs
@@ -0,0 +1,57 @@
+// 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.
+
+//! The pallet-revive EVM specifc integration test suite.
+
+use crate::{
+	test_utils::{builder::Contract, *},
+	tests::{
+		builder,
+		test_utils::{ensure_stored, get_contract_checked},
+		ExtBuilder, Test,
+	},
+	Code, Config,
+};
+
+use alloy_core::{primitives::U256, sol_types::SolInterface};
+use frame_support::traits::fungible::Mutate;
+use pallet_revive_fixtures_solidity::contracts::*;
+use pretty_assertions::assert_eq;
+
+/// Tests that the EVM can calculate a fibonacci number.
+#[test]
+fn basic_evm_flow_works() {
+	let code = playground_bin();
+
+	ExtBuilder::default().build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code.clone())).build_and_unwrap_contract();
+
+		// check the code exists
+		let contract = get_contract_checked(&addr).unwrap();
+		ensure_stored(contract.code_hash);
+
+		let result = builder::bare_call(addr)
+			.data(
+				Playground::PlaygroundCalls::fib(Playground::fibCall { n: U256::from(10u64) })
+					.abi_encode(),
+			)
+			.build_and_unwrap_result();
+		assert_eq!(U256::from(55u32), U256::from_be_bytes::<32>(result.data.try_into().unwrap()));
+	});
+}
diff --git a/substrate/frame/revive/src/tests/pvm.rs b/substrate/frame/revive/src/tests/pvm.rs
new file mode 100644
index 000000000000..00e2515031c6
--- /dev/null
+++ b/substrate/frame/revive/src/tests/pvm.rs
@@ -0,0 +1,4693 @@
+// 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.
+
+//! The pallet-revive PVM specific integration test suite.
+
+use crate::{
+	address::{create1, create2, AddressMapper},
+	assert_refcount, assert_return_code,
+	evm::{runtime::GAS_PRICE, CallTrace, CallTracer, CallType, GenericTransaction},
+	exec::Key,
+	limits,
+	storage::DeletionQueueManager,
+	test_utils::{builder::Contract, *},
+	tests::{
+		builder, initialize_block,
+		test_utils::{
+			contract_base_deposit, ensure_stored, expected_deposit, get_balance,
+			get_balance_on_hold, get_code_deposit, get_contract, get_contract_checked,
+			lockup_deposit, set_balance_with_dust, u256_bytes,
+		},
+		Balances, CodeHashLockupDepositPercent, Contracts, DepositPerByte, DepositPerItem,
+		ExtBuilder, InstantiateAccount, RuntimeCall, RuntimeEvent, RuntimeOrigin, System, Test,
+		UploadAccount, DEPOSIT_PER_BYTE,
+	},
+	tracing::trace,
+	weights::WeightInfo,
+	AccountInfo, AccountInfoOf, BalanceWithDust, BumpNonce, Code, Config, ContractInfo,
+	DeletionQueueCounter, DepositLimit, Error, EthTransactError, HoldReason, Pallet, PristineCode,
+	H160,
+};
+use assert_matches::assert_matches;
+use codec::Encode;
+use frame_support::{
+	assert_err, assert_err_ignore_postinfo, assert_noop, assert_ok,
+	storage::child,
+	traits::{
+		fungible::{BalancedHold, Inspect, Mutate, MutateHold},
+		tokens::Preservation,
+		OnIdle, OnInitialize,
+	},
+	weights::{Weight, WeightMeter},
+};
+use frame_system::{EventRecord, Phase};
+use pallet_revive_fixtures::compile_module;
+use pallet_revive_uapi::{ReturnErrorCode as RuntimeReturnCode, ReturnFlags};
+use pretty_assertions::{assert_eq, assert_ne};
+use sp_core::{Get, U256};
+use sp_io::hashing::blake2_256;
+use sp_runtime::{testing::H256, traits::Zero, AccountId32, DispatchError, TokenError};
+
+#[test]
+fn transfer_with_dust_works() {
+	struct TestCase {
+		description: &'static str,
+		from_balance: BalanceWithDust<u64>,
+		to_balance: BalanceWithDust<u64>,
+		amount: BalanceWithDust<u64>,
+		expected_from_balance: BalanceWithDust<u64>,
+		expected_to_balance: BalanceWithDust<u64>,
+		total_issuance_diff: i64,
+	}
+
+	let plank: u32 = <Test as Config>::NativeToEthRatio::get();
+
+	let test_cases = vec![
+		TestCase {
+			description: "without dust",
+			from_balance: BalanceWithDust::new_unchecked::<Test>(100, 0),
+			to_balance: BalanceWithDust::new_unchecked::<Test>(0, 0),
+			amount: BalanceWithDust::new_unchecked::<Test>(1, 0),
+			expected_from_balance: BalanceWithDust::new_unchecked::<Test>(99, 0),
+			expected_to_balance: BalanceWithDust::new_unchecked::<Test>(1, 0),
+			total_issuance_diff: 0,
+		},
+		TestCase {
+			description: "with dust",
+			from_balance: BalanceWithDust::new_unchecked::<Test>(100, 0),
+			to_balance: BalanceWithDust::new_unchecked::<Test>(0, 0),
+			amount: BalanceWithDust::new_unchecked::<Test>(1, 10),
+			expected_from_balance: BalanceWithDust::new_unchecked::<Test>(98, plank - 10),
+			expected_to_balance: BalanceWithDust::new_unchecked::<Test>(1, 10),
+			total_issuance_diff: 1,
+		},
+		TestCase {
+			description: "just dust",
+			from_balance: BalanceWithDust::new_unchecked::<Test>(100, 0),
+			to_balance: BalanceWithDust::new_unchecked::<Test>(0, 0),
+			amount: BalanceWithDust::new_unchecked::<Test>(0, 10),
+			expected_from_balance: BalanceWithDust::new_unchecked::<Test>(99, plank - 10),
+			expected_to_balance: BalanceWithDust::new_unchecked::<Test>(0, 10),
+			total_issuance_diff: 1,
+		},
+		TestCase {
+			description: "with existing dust",
+			from_balance: BalanceWithDust::new_unchecked::<Test>(100, 5),
+			to_balance: BalanceWithDust::new_unchecked::<Test>(0, plank - 5),
+			amount: BalanceWithDust::new_unchecked::<Test>(1, 10),
+			expected_from_balance: BalanceWithDust::new_unchecked::<Test>(98, plank - 5),
+			expected_to_balance: BalanceWithDust::new_unchecked::<Test>(2, 5),
+			total_issuance_diff: 0,
+		},
+		TestCase {
+			description: "with enough existing dust",
+			from_balance: BalanceWithDust::new_unchecked::<Test>(100, 10),
+			to_balance: BalanceWithDust::new_unchecked::<Test>(0, plank - 10),
+			amount: BalanceWithDust::new_unchecked::<Test>(1, 10),
+			expected_from_balance: BalanceWithDust::new_unchecked::<Test>(99, 0),
+			expected_to_balance: BalanceWithDust::new_unchecked::<Test>(2, 0),
+			total_issuance_diff: -1,
+		},
+	];
+
+	for TestCase {
+		description,
+		from_balance,
+		to_balance,
+		amount,
+		expected_from_balance,
+		expected_to_balance,
+		total_issuance_diff,
+	} in test_cases.into_iter()
+	{
+		ExtBuilder::default().build().execute_with(|| {
+			set_balance_with_dust(&ALICE_ADDR, from_balance);
+			set_balance_with_dust(&BOB_ADDR, to_balance);
+
+			let total_issuance = <Test as Config>::Currency::total_issuance();
+			let evm_value = Pallet::<Test>::convert_native_to_evm(amount);
+
+			let (value, dust) = amount.deconstruct();
+			assert_eq!(Pallet::<Test>::has_dust(evm_value), !dust.is_zero());
+			assert_eq!(Pallet::<Test>::has_balance(evm_value), !value.is_zero());
+
+			let result =
+				builder::bare_call(BOB_ADDR).evm_value(evm_value).build_and_unwrap_result();
+			assert_eq!(result, Default::default(), "{description} tx failed");
+
+			assert_eq!(
+				Pallet::<Test>::evm_balance(&ALICE_ADDR),
+				Pallet::<Test>::convert_native_to_evm(expected_from_balance),
+				"{description}: invalid from balance"
+			);
+
+			assert_eq!(
+				Pallet::<Test>::evm_balance(&BOB_ADDR),
+				Pallet::<Test>::convert_native_to_evm(expected_to_balance),
+				"{description}: invalid to balance"
+			);
+
+			assert_eq!(
+				total_issuance as i64 - total_issuance_diff,
+				<Test as Config>::Currency::total_issuance() as i64,
+				"{description}: total issuance should match"
+			);
+		});
+	}
+}
+
+#[test]
+fn eth_call_transfer_with_dust_works() {
+	let (binary, _) = compile_module("dummy").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
+
+		let balance =
+			Pallet::<Test>::convert_native_to_evm(BalanceWithDust::new_unchecked::<Test>(100, 10));
+		assert_ok!(builder::eth_call(addr).value(balance).build());
+
+		assert_eq!(Pallet::<Test>::evm_balance(&addr), balance);
+	});
+}
+
+#[test]
+fn contract_call_transfer_with_dust_works() {
+	let (binary_caller, _code_hash_caller) = compile_module("call_with_value").unwrap();
+	let (binary_callee, _code_hash_callee) = compile_module("dummy").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let Contract { addr: addr_caller, .. } =
+			builder::bare_instantiate(Code::Upload(binary_caller))
+				.native_value(200)
+				.build_and_unwrap_contract();
+		let Contract { addr: addr_callee, .. } =
+			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
+
+		let balance =
+			Pallet::<Test>::convert_native_to_evm(BalanceWithDust::new_unchecked::<Test>(100, 10));
+		assert_ok!(builder::call(addr_caller).data((balance, addr_callee).encode()).build());
+
+		assert_eq!(Pallet::<Test>::evm_balance(&addr_callee), balance);
+	});
+}
+
+#[test]
+fn instantiate_and_call_and_deposit_event() {
+	let (binary, code_hash) = compile_module("event_and_return_on_deploy").unwrap();
+
+	ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let min_balance = Contracts::min_balance();
+		let value = 100;
+
+		// We determine the storage deposit limit after uploading because it depends on ALICEs
+		// free balance which is changed by uploading a module.
+		assert_ok!(Contracts::upload_code(
+			RuntimeOrigin::signed(ALICE),
+			binary,
+			deposit_limit::<Test>(),
+		));
+
+		// Drop previous events
+		initialize_block(2);
+
+		// Check at the end to get hash on error easily
+		let Contract { addr, account_id } = builder::bare_instantiate(Code::Existing(code_hash))
+			.native_value(value)
+			.build_and_unwrap_contract();
+		assert!(AccountInfoOf::<Test>::contains_key(&addr));
+
+		let hold_balance = contract_base_deposit(&addr);
+
+		assert_eq!(
+			System::events(),
+			vec![
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::System(frame_system::Event::NewAccount {
+						account: account_id.clone()
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::Endowed {
+						account: account_id.clone(),
+						free_balance: min_balance,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
+						from: ALICE,
+						to: account_id.clone(),
+						amount: min_balance,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
+						from: ALICE,
+						to: account_id.clone(),
+						amount: value,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Contracts(crate::Event::ContractEmitted {
+						contract: addr,
+						data: vec![1, 2, 3, 4],
+						topics: vec![H256::repeat_byte(42)],
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Contracts(crate::Event::Instantiated {
+						deployer: ALICE_ADDR,
+						contract: addr
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::TransferAndHold {
+						reason: <Test as Config>::RuntimeHoldReason::Contracts(
+							HoldReason::StorageDepositReserve,
+						),
+						source: ALICE,
+						dest: account_id.clone(),
+						transferred: hold_balance,
+					}),
+					topics: vec![],
+				},
+			]
+		);
+	});
+}
+
+#[test]
+fn create1_address_from_extrinsic() {
+	let (binary, code_hash) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		assert_ok!(Contracts::upload_code(
+			RuntimeOrigin::signed(ALICE),
+			binary.clone(),
+			deposit_limit::<Test>(),
+		));
+
+		assert_eq!(System::account_nonce(&ALICE), 0);
+		System::inc_account_nonce(&ALICE);
+
+		for nonce in 1..3 {
+			let Contract { addr, .. } = builder::bare_instantiate(Code::Existing(code_hash))
+				.salt(None)
+				.build_and_unwrap_contract();
+			assert!(AccountInfoOf::<Test>::contains_key(&addr));
+			assert_eq!(
+				addr,
+				create1(&<Test as Config>::AddressMapper::to_address(&ALICE), nonce - 1)
+			);
+		}
+		assert_eq!(System::account_nonce(&ALICE), 3);
+
+		for nonce in 3..6 {
+			let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary.clone()))
+				.salt(None)
+				.build_and_unwrap_contract();
+			assert!(AccountInfoOf::<Test>::contains_key(&addr));
+			assert_eq!(
+				addr,
+				create1(&<Test as Config>::AddressMapper::to_address(&ALICE), nonce - 1)
+			);
+		}
+		assert_eq!(System::account_nonce(&ALICE), 6);
+	});
+}
+
+#[test]
+fn deposit_event_max_value_limit() {
+	let (binary, _code_hash) = compile_module("event_size").unwrap();
+
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		// Create
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
+			.native_value(30_000)
+			.build_and_unwrap_contract();
+
+		// Call contract with allowed storage value.
+		assert_ok!(builder::call(addr)
+			.gas_limit(GAS_LIMIT.set_ref_time(GAS_LIMIT.ref_time() * 2)) // we are copying a huge buffer,
+			.data(limits::PAYLOAD_BYTES.encode())
+			.build());
+
+		// Call contract with too large a storage value.
+		assert_err_ignore_postinfo!(
+			builder::call(addr).data((limits::PAYLOAD_BYTES + 1).encode()).build(),
+			Error::<Test>::ValueTooLarge,
+		);
+	});
+}
+
+// Fail out of fuel (ref_time weight) in the engine.
+#[test]
+fn run_out_of_fuel_engine() {
+	let (binary, _code_hash) = compile_module("run_out_of_gas").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let min_balance = Contracts::min_balance();
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
+			.native_value(100 * min_balance)
+			.build_and_unwrap_contract();
+
+		// Call the contract with a fixed gas limit. It must run out of gas because it just
+		// loops forever.
+		assert_err_ignore_postinfo!(
+			builder::call(addr)
+				.gas_limit(Weight::from_parts(10_000_000_000, u64::MAX))
+				.build(),
+			Error::<Test>::OutOfGas,
+		);
+	});
+}
+
+// Fail out of fuel (ref_time weight) in the host.
+#[test]
+fn run_out_of_fuel_host() {
+	use crate::precompiles::Precompile;
+	use crate::tests::precompiles::{INoInfo, NoInfo};
+	use alloy_core::sol_types::SolInterface;
+
+	let precompile_addr = H160(NoInfo::<Test>::MATCHER.base_address());
+	let input = INoInfo::INoInfoCalls::consumeMaxGas(INoInfo::consumeMaxGasCall {}).abi_encode();
+
+	ExtBuilder::default().build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+		let result = builder::bare_call(precompile_addr).data(input).build().result;
+		assert_err!(result, <Error<Test>>::OutOfGas);
+	});
+}
+
+#[test]
+fn gas_syncs_work() {
+	let (code, _code_hash) = compile_module("caller_is_origin_n").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let contract = builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		let result = builder::bare_call(contract.addr).data(0u32.encode()).build();
+		assert_ok!(result.result);
+		let engine_consumed_noop = result.gas_consumed.ref_time();
+
+		let result = builder::bare_call(contract.addr).data(1u32.encode()).build();
+		assert_ok!(result.result);
+		let gas_consumed_once = result.gas_consumed.ref_time();
+		let host_consumed_once = <Test as Config>::WeightInfo::seal_caller_is_origin().ref_time();
+		let engine_consumed_once = gas_consumed_once - host_consumed_once - engine_consumed_noop;
+
+		let result = builder::bare_call(contract.addr).data(2u32.encode()).build();
+		assert_ok!(result.result);
+		let gas_consumed_twice = result.gas_consumed.ref_time();
+		let host_consumed_twice = host_consumed_once * 2;
+		let engine_consumed_twice = gas_consumed_twice - host_consumed_twice - engine_consumed_noop;
+
+		// Second contract just repeats first contract's instructions twice.
+		// If runtime syncs gas with the engine properly, this should pass.
+		assert_eq!(engine_consumed_twice, engine_consumed_once * 2);
+	});
+}
+
+/// Check that contracts with the same account id have different trie ids.
+/// Check the `Nonce` storage item for more information.
+#[test]
+fn instantiate_unique_trie_id() {
+	let (binary, code_hash) = compile_module("self_destruct").unwrap();
+
+	ExtBuilder::default().existential_deposit(500).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		Contracts::upload_code(RuntimeOrigin::signed(ALICE), binary, deposit_limit::<Test>())
+			.unwrap();
+
+		// Instantiate the contract and store its trie id for later comparison.
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Existing(code_hash)).build_and_unwrap_contract();
+		let trie_id = get_contract(&addr).trie_id;
+
+		// Try to instantiate it again without termination should yield an error.
+		assert_err_ignore_postinfo!(
+			builder::instantiate(code_hash).build(),
+			<Error<Test>>::DuplicateContract,
+		);
+
+		// Terminate the contract.
+		assert_ok!(builder::call(addr).build());
+
+		// Re-Instantiate after termination.
+		assert_ok!(builder::instantiate(code_hash).build());
+
+		// Trie ids shouldn't match or we might have a collision
+		assert_ne!(trie_id, get_contract(&addr).trie_id);
+	});
+}
+
+#[test]
+fn storage_work() {
+	let (code, _code_hash) = compile_module("storage").unwrap();
+
+	ExtBuilder::default().build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let min_balance = Contracts::min_balance();
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
+			.native_value(min_balance * 100)
+			.build_and_unwrap_contract();
+
+		builder::bare_call(addr).build_and_unwrap_result();
+	});
+}
+
+#[test]
+fn storage_max_value_limit() {
+	let (binary, _code_hash) = compile_module("storage_size").unwrap();
+
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		// Create
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
+			.native_value(30_000)
+			.build_and_unwrap_contract();
+		get_contract(&addr);
+
+		// Call contract with allowed storage value.
+		assert_ok!(builder::call(addr)
+			.gas_limit(GAS_LIMIT.set_ref_time(GAS_LIMIT.ref_time() * 2)) // we are copying a huge buffer
+			.data(limits::PAYLOAD_BYTES.encode())
+			.build());
+
+		// Call contract with too large a storage value.
+		assert_err_ignore_postinfo!(
+			builder::call(addr).data((limits::PAYLOAD_BYTES + 1).encode()).build(),
+			Error::<Test>::ValueTooLarge,
+		);
+	});
+}
+
+#[test]
+fn clear_storage_on_zero_value() {
+	let (code, _code_hash) = compile_module("clear_storage_on_zero_value").unwrap();
+
+	ExtBuilder::default().build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let min_balance = Contracts::min_balance();
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
+			.native_value(min_balance * 100)
+			.build_and_unwrap_contract();
+
+		builder::bare_call(addr).build_and_unwrap_result();
+	});
+}
+
+#[test]
+fn transient_storage_work() {
+	let (code, _code_hash) = compile_module("transient_storage").unwrap();
+
+	ExtBuilder::default().build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let min_balance = Contracts::min_balance();
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
+			.native_value(min_balance * 100)
+			.build_and_unwrap_contract();
+
+		builder::bare_call(addr).build_and_unwrap_result();
+	});
+}
+
+#[test]
+fn transient_storage_limit_in_call() {
+	let (binary_caller, _code_hash_caller) =
+		compile_module("create_transient_storage_and_call").unwrap();
+	let (binary_callee, _code_hash_callee) = compile_module("set_transient_storage").unwrap();
+	ExtBuilder::default().build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create both contracts: Constructors do nothing.
+		let Contract { addr: addr_caller, .. } =
+			builder::bare_instantiate(Code::Upload(binary_caller)).build_and_unwrap_contract();
+		let Contract { addr: addr_callee, .. } =
+			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
+
+		// Call contracts with storage values within the limit.
+		// Caller and Callee contracts each set a transient storage value of size 100.
+		assert_ok!(builder::call(addr_caller)
+			.data((100u32, 100u32, &addr_callee).encode())
+			.build(),);
+
+		// Call a contract with a storage value that is too large.
+		// Limit exceeded in the caller contract.
+		assert_err_ignore_postinfo!(
+			builder::call(addr_caller)
+				.data((4u32 * 1024u32, 200u32, &addr_callee).encode())
+				.build(),
+			<Error<Test>>::OutOfTransientStorage,
+		);
+
+		// Call a contract with a storage value that is too large.
+		// Limit exceeded in the callee contract.
+		assert_err_ignore_postinfo!(
+			builder::call(addr_caller)
+				.data((50u32, 4 * 1024u32, &addr_callee).encode())
+				.build(),
+			<Error<Test>>::ContractTrapped
+		);
+	});
+}
+
+#[test]
+fn deploy_and_call_other_contract() {
+	let (caller_binary, _caller_code_hash) = compile_module("caller_contract").unwrap();
+	let (callee_binary, callee_code_hash) = compile_module("return_with_data").unwrap();
+	let code_load_weight = crate::vm::code_load_weight(callee_binary.len() as u32);
+
+	ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
+		let min_balance = Contracts::min_balance();
+
+		// Create
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let Contract { addr: caller_addr, account_id: caller_account } =
+			builder::bare_instantiate(Code::Upload(caller_binary))
+				.native_value(100_000)
+				.build_and_unwrap_contract();
+
+		let callee_addr = create2(
+			&caller_addr,
+			&callee_binary,
+			&[0, 1, 34, 51, 68, 85, 102, 119], // hard coded in binary
+			&[0u8; 32],
+		);
+		let callee_account = <Test as Config>::AddressMapper::to_account_id(&callee_addr);
+
+		Contracts::upload_code(
+			RuntimeOrigin::signed(ALICE),
+			callee_binary,
+			deposit_limit::<Test>(),
+		)
+		.unwrap();
+
+		// Drop previous events
+		initialize_block(2);
+
+		// Call BOB contract, which attempts to instantiate and call the callee contract and
+		// makes various assertions on the results from those calls.
+		assert_ok!(builder::call(caller_addr)
+			.data(
+				(callee_code_hash, code_load_weight.ref_time(), code_load_weight.proof_size())
+					.encode()
+			)
+			.build());
+
+		assert_eq!(
+			System::events(),
+			vec![
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::System(frame_system::Event::NewAccount {
+						account: callee_account.clone()
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::Endowed {
+						account: callee_account.clone(),
+						free_balance: min_balance,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
+						from: ALICE,
+						to: callee_account.clone(),
+						amount: min_balance,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
+						from: caller_account.clone(),
+						to: callee_account.clone(),
+						amount: 32768 // hardcoded in binary
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
+						from: caller_account.clone(),
+						to: callee_account.clone(),
+						amount: 32768,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::TransferAndHold {
+						reason: <Test as Config>::RuntimeHoldReason::Contracts(
+							HoldReason::StorageDepositReserve,
+						),
+						source: ALICE,
+						dest: callee_account.clone(),
+						transferred: 555,
+					}),
+					topics: vec![],
+				},
+			]
+		);
+	});
+}
+
+#[test]
+fn delegate_call() {
+	let (caller_binary, _caller_code_hash) = compile_module("delegate_call").unwrap();
+	let (callee_binary, _callee_code_hash) = compile_module("delegate_call_lib").unwrap();
+
+	ExtBuilder::default().existential_deposit(500).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Instantiate the 'caller'
+		let Contract { addr: caller_addr, .. } =
+			builder::bare_instantiate(Code::Upload(caller_binary))
+				.native_value(300_000)
+				.build_and_unwrap_contract();
+
+		// Instantiate the 'callee'
+		let Contract { addr: callee_addr, .. } =
+			builder::bare_instantiate(Code::Upload(callee_binary))
+				.native_value(100_000)
+				.build_and_unwrap_contract();
+
+		assert_ok!(builder::call(caller_addr)
+			.value(1337)
+			.data((callee_addr, u64::MAX, u64::MAX).encode())
+			.build());
+	});
+}
+
+#[test]
+fn delegate_call_non_existant_is_noop() {
+	let (caller_binary, _caller_code_hash) = compile_module("delegate_call_simple").unwrap();
+
+	ExtBuilder::default().existential_deposit(500).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Instantiate the 'caller'
+		let Contract { addr: caller_addr, .. } =
+			builder::bare_instantiate(Code::Upload(caller_binary))
+				.native_value(300_000)
+				.build_and_unwrap_contract();
+
+		assert_ok!(builder::call(caller_addr)
+			.value(1337)
+			.data((BOB_ADDR, u64::MAX, u64::MAX).encode())
+			.build());
+
+		assert_eq!(get_balance(&BOB_FALLBACK), 0);
+	});
+}
+
+#[test]
+fn delegate_call_with_weight_limit() {
+	let (caller_binary, _caller_code_hash) = compile_module("delegate_call").unwrap();
+	let (callee_binary, _callee_code_hash) = compile_module("delegate_call_lib").unwrap();
+
+	ExtBuilder::default().existential_deposit(500).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Instantiate the 'caller'
+		let Contract { addr: caller_addr, .. } =
+			builder::bare_instantiate(Code::Upload(caller_binary))
+				.native_value(300_000)
+				.build_and_unwrap_contract();
+
+		// Instantiate the 'callee'
+		let Contract { addr: callee_addr, .. } =
+			builder::bare_instantiate(Code::Upload(callee_binary))
+				.native_value(100_000)
+				.build_and_unwrap_contract();
+
+		// fails, not enough weight
+		assert_err!(
+			builder::bare_call(caller_addr)
+				.native_value(1337)
+				.data((callee_addr, 100u64, 100u64).encode())
+				.build()
+				.result,
+			Error::<Test>::ContractTrapped,
+		);
+
+		assert_ok!(builder::call(caller_addr)
+			.value(1337)
+			.data((callee_addr, 500_000_000u64, 100_000u64).encode())
+			.build());
+	});
+}
+
+#[test]
+fn delegate_call_with_deposit_limit() {
+	let (caller_binary, _caller_code_hash) = compile_module("delegate_call_deposit_limit").unwrap();
+	let (callee_binary, _callee_code_hash) = compile_module("delegate_call_lib").unwrap();
+
+	ExtBuilder::default().existential_deposit(500).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Instantiate the 'caller'
+		let Contract { addr: caller_addr, .. } =
+			builder::bare_instantiate(Code::Upload(caller_binary))
+				.native_value(300_000)
+				.build_and_unwrap_contract();
+
+		// Instantiate the 'callee'
+		let Contract { addr: callee_addr, .. } =
+			builder::bare_instantiate(Code::Upload(callee_binary))
+				.native_value(100_000)
+				.build_and_unwrap_contract();
+
+		// Delegate call will write 1 storage and deposit of 2 (1 item) + 32 (bytes) is required.
+		// + 32 + 16 for blake2_128concat
+		// Fails, not enough deposit
+		let ret = builder::bare_call(caller_addr)
+			.native_value(1337)
+			.data((callee_addr, 81u64).encode())
+			.build_and_unwrap_result();
+		assert_return_code!(ret, RuntimeReturnCode::OutOfResources);
+
+		assert_ok!(builder::call(caller_addr)
+			.value(1337)
+			.data((callee_addr, 82u64).encode())
+			.build());
+	});
+}
+
+#[test]
+fn transfer_expendable_cannot_kill_account() {
+	let (binary, _code_hash) = compile_module("dummy").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Instantiate the BOB contract.
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
+			.native_value(1_000)
+			.build_and_unwrap_contract();
+
+		// Check that the BOB contract has been instantiated.
+		get_contract(&addr);
+
+		let account = <Test as Config>::AddressMapper::to_account_id(&addr);
+		let total_balance = <Test as Config>::Currency::total_balance(&account);
+
+		assert_eq!(
+			get_balance_on_hold(&HoldReason::StorageDepositReserve.into(), &account),
+			contract_base_deposit(&addr)
+		);
+
+		// Some or the total balance is held, so it can't be transferred.
+		assert_err!(
+			<<Test as Config>::Currency as Mutate<AccountId32>>::transfer(
+				&account,
+				&ALICE,
+				total_balance,
+				Preservation::Expendable,
+			),
+			TokenError::FundsUnavailable,
+		);
+
+		assert_eq!(<Test as Config>::Currency::total_balance(&account), total_balance);
+	});
+}
+
+#[test]
+fn cannot_self_destruct_through_draining() {
+	let (binary, _code_hash) = compile_module("drain").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let value = 1_000;
+		let min_balance = Contracts::min_balance();
+
+		// Instantiate the BOB contract.
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
+			.native_value(value)
+			.build_and_unwrap_contract();
+		let account = <Test as Config>::AddressMapper::to_account_id(&addr);
+
+		// Check that the BOB contract has been instantiated.
+		get_contract(&addr);
+
+		// Call BOB which makes it send all funds to the zero address
+		// The contract code asserts that the transfer fails with the correct error code
+		assert_ok!(builder::call(addr).build());
+
+		// Make sure the account wasn't remove by sending all free balance away.
+		assert_eq!(
+			<Test as Config>::Currency::total_balance(&account),
+			value + contract_base_deposit(&addr) + min_balance,
+		);
+	});
+}
+
+#[test]
+fn cannot_self_destruct_through_storage_refund_after_price_change() {
+	let (binary, _code_hash) = compile_module("store_call").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let min_balance = Contracts::min_balance();
+
+		// Instantiate the BOB contract.
+		let contract = builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
+		let info_deposit = contract_base_deposit(&contract.addr);
+
+		// Check that the contract has been instantiated and has the minimum balance
+		assert_eq!(get_contract(&contract.addr).total_deposit(), info_deposit);
+		assert_eq!(get_contract(&contract.addr).extra_deposit(), 0);
+		assert_eq!(
+			<Test as Config>::Currency::total_balance(&contract.account_id),
+			info_deposit + min_balance
+		);
+
+		// Create 100 (16 + 32 bytes for key for blake128 concat) bytes of storage with a
+		// price of per byte and a single storage item of price 2
+		assert_ok!(builder::call(contract.addr).data(100u32.to_le_bytes().to_vec()).build());
+		assert_eq!(get_contract(&contract.addr).total_deposit(), info_deposit + 100 + 16 + 32 + 2);
+
+		// Increase the byte price and trigger a refund. This should not have any influence
+		// because the removal is pro rata and exactly those 100 bytes should have been
+		// removed as we didn't delete the key.
+		DEPOSIT_PER_BYTE.with(|c| *c.borrow_mut() = 500);
+		assert_ok!(builder::call(contract.addr).data(0u32.to_le_bytes().to_vec()).build());
+
+		// Make sure the account wasn't removed by the refund
+		assert_eq!(
+			<Test as Config>::Currency::total_balance(&contract.account_id),
+			get_contract(&contract.addr).total_deposit() + min_balance,
+		);
+		// + 1 because due to fixed point arithmetic we can sometimes refund
+		// one unit to little
+		assert_eq!(get_contract(&contract.addr).extra_deposit(), 16 + 32 + 2 + 1);
+	});
+}
+
+#[test]
+fn cannot_self_destruct_while_live() {
+	let (binary, _code_hash) = compile_module("self_destruct").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Instantiate the BOB contract.
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
+			.native_value(100_000)
+			.build_and_unwrap_contract();
+
+		// Check that the BOB contract has been instantiated.
+		get_contract(&addr);
+
+		// Call BOB with input data, forcing it make a recursive call to itself to
+		// self-destruct, resulting in a trap.
+		assert_err_ignore_postinfo!(
+			builder::call(addr).data(vec![0]).build(),
+			Error::<Test>::ContractTrapped,
+		);
+
+		// Check that BOB is still there.
+		get_contract(&addr);
+	});
+}
+
+#[test]
+fn self_destruct_works() {
+	let (binary, code_hash) = compile_module("self_destruct").unwrap();
+	ExtBuilder::default().existential_deposit(1_000).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let _ = <Test as Config>::Currency::set_balance(&DJANGO_FALLBACK, 1_000_000);
+		let min_balance = Contracts::min_balance();
+
+		// Instantiate the BOB contract.
+		let contract = builder::bare_instantiate(Code::Upload(binary))
+			.native_value(100_000)
+			.build_and_unwrap_contract();
+
+		let hold_balance = contract_base_deposit(&contract.addr);
+
+		// Check that the BOB contract has been instantiated.
+		let _ = get_contract(&contract.addr);
+
+		// Drop all previous events
+		initialize_block(2);
+
+		// Call BOB without input data which triggers termination.
+		assert_matches!(builder::call(contract.addr).build(), Ok(_));
+
+		// Check that code is still there but refcount dropped to zero.
+		assert_refcount!(&code_hash, 0);
+
+		// Check that account is gone
+		assert!(get_contract_checked(&contract.addr).is_none());
+		assert_eq!(<Test as Config>::Currency::total_balance(&contract.account_id), 0);
+
+		// Check that the beneficiary (django) got remaining balance.
+		assert_eq!(
+			<Test as Config>::Currency::free_balance(DJANGO_FALLBACK),
+			1_000_000 + 100_000 + min_balance
+		);
+
+		// Check that the Alice is missing Django's benefit. Within ALICE's total balance
+		// there's also the code upload deposit held.
+		assert_eq!(
+			<Test as Config>::Currency::total_balance(&ALICE),
+			1_000_000 - (100_000 + min_balance)
+		);
+
+		pretty_assertions::assert_eq!(
+			System::events(),
+			vec![
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::TransferOnHold {
+						reason: <Test as Config>::RuntimeHoldReason::Contracts(
+							HoldReason::StorageDepositReserve,
+						),
+						source: contract.account_id.clone(),
+						dest: ALICE,
+						amount: hold_balance,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::System(frame_system::Event::KilledAccount {
+						account: contract.account_id.clone()
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
+						from: contract.account_id.clone(),
+						to: DJANGO_FALLBACK,
+						amount: 100_000 + min_balance,
+					}),
+					topics: vec![],
+				},
+			],
+		);
+	});
+}
+
+// This tests that one contract cannot prevent another from self-destructing by sending it
+// additional funds after it has been drained.
+#[test]
+fn destroy_contract_and_transfer_funds() {
+	let (callee_binary, callee_code_hash) = compile_module("self_destruct").unwrap();
+	let (caller_binary, _caller_code_hash) = compile_module("destroy_and_transfer").unwrap();
+
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		// Create code hash for bob to instantiate
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		Contracts::upload_code(
+			RuntimeOrigin::signed(ALICE),
+			callee_binary.clone(),
+			deposit_limit::<Test>(),
+		)
+		.unwrap();
+
+		// This deploys the BOB contract, which in turn deploys the CHARLIE contract during
+		// construction.
+		let Contract { addr: addr_bob, .. } =
+			builder::bare_instantiate(Code::Upload(caller_binary))
+				.native_value(200_000)
+				.data(callee_code_hash.as_ref().to_vec())
+				.build_and_unwrap_contract();
+
+		// Check that the CHARLIE contract has been instantiated.
+		let salt = [47; 32]; // hard coded in fixture.
+		let addr_charlie = create2(&addr_bob, &callee_binary, &[], &salt);
+		get_contract(&addr_charlie);
+
+		// Call BOB, which calls CHARLIE, forcing CHARLIE to self-destruct.
+		assert_ok!(builder::call(addr_bob).data(addr_charlie.encode()).build());
+
+		// Check that CHARLIE has moved on to the great beyond (ie. died).
+		assert!(get_contract_checked(&addr_charlie).is_none());
+	});
+}
+
+#[test]
+fn cannot_self_destruct_in_constructor() {
+	let (binary, _) = compile_module("self_destructing_constructor").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Fail to instantiate the BOB because the constructor calls seal_terminate.
+		assert_err_ignore_postinfo!(
+			builder::instantiate_with_code(binary).value(100_000).build(),
+			Error::<Test>::TerminatedInConstructor,
+		);
+	});
+}
+
+#[test]
+fn crypto_hashes() {
+	let (binary, _code_hash) = compile_module("crypto_hashes").unwrap();
+
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Instantiate the CRYPTO_HASHES contract.
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
+			.native_value(100_000)
+			.build_and_unwrap_contract();
+		// Perform the call.
+		let input = b"_DEAD_BEEF";
+		use sp_io::hashing::*;
+		// Wraps a hash function into a more dynamic form usable for testing.
+		macro_rules! dyn_hash_fn {
+			($name:ident) => {
+				Box::new(|input| $name(input).as_ref().to_vec().into_boxed_slice())
+			};
+		}
+		// All hash functions and their associated output byte lengths.
+		let test_cases: &[(u8, Box<dyn Fn(&[u8]) -> Box<[u8]>>, usize)] = &[
+			(2, dyn_hash_fn!(keccak_256), 32),
+			(3, dyn_hash_fn!(blake2_256), 32),
+			(4, dyn_hash_fn!(blake2_128), 16),
+		];
+		// Test the given hash functions for the input: "_DEAD_BEEF"
+		for (n, hash_fn, expected_size) in test_cases.iter() {
+			let mut params = vec![*n];
+			params.extend_from_slice(input);
+			let result = builder::bare_call(addr).data(params).build_and_unwrap_result();
+			assert!(!result.did_revert());
+			let expected = hash_fn(input.as_ref());
+			assert_eq!(&result.data[..*expected_size], &*expected);
+		}
+	})
+}
+
+#[test]
+fn transfer_return_code() {
+	let (binary, _code_hash) = compile_module("transfer_return_code").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let min_balance = Contracts::min_balance();
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
+
+		let contract = builder::bare_instantiate(Code::Upload(binary))
+			.native_value(min_balance * 100)
+			.build_and_unwrap_contract();
+
+		// Contract has only the minimal balance so any transfer will fail.
+		<Test as Config>::Currency::set_balance(&contract.account_id, min_balance);
+		let result = builder::bare_call(contract.addr).build_and_unwrap_result();
+		assert_return_code!(result, RuntimeReturnCode::TransferFailed);
+	});
+}
+
+#[test]
+fn call_return_code() {
+	let (caller_code, _caller_hash) = compile_module("call_return_code").unwrap();
+	let (callee_code, _callee_hash) = compile_module("ok_trap_revert").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let min_balance = Contracts::min_balance();
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
+		let _ = <Test as Config>::Currency::set_balance(&CHARLIE, 1000 * min_balance);
+
+		let bob = builder::bare_instantiate(Code::Upload(caller_code))
+			.native_value(min_balance * 100)
+			.build_and_unwrap_contract();
+
+		// BOB cannot pay the ed which is needed to pull DJANGO into existence
+		// this does trap the caller instead of returning an error code
+		// reasoning is that this error state does not exist on eth where
+		// ed does not exist. We hide this fact from the contract.
+		let result = builder::bare_call(bob.addr)
+			.data((DJANGO_ADDR, u256_bytes(1)).encode())
+			.origin(RuntimeOrigin::signed(BOB))
+			.build();
+		assert_err!(result.result, <Error<Test>>::StorageDepositNotEnoughFunds);
+
+		// Contract calls into Django which is no valid contract
+		// This will be a balance transfer into a new account
+		// with more than the contract has which will make the transfer fail
+		let value = Pallet::<Test>::convert_native_to_evm(min_balance * 200);
+		let result = builder::bare_call(bob.addr)
+			.data(
+				AsRef::<[u8]>::as_ref(&DJANGO_ADDR)
+					.iter()
+					.chain(&value.to_little_endian())
+					.cloned()
+					.collect(),
+			)
+			.build_and_unwrap_result();
+		assert_return_code!(result, RuntimeReturnCode::TransferFailed);
+
+		// Sending below the minimum balance should result in success.
+		// The ED is charged from the call origin.
+		let alice_before = get_balance(&ALICE_FALLBACK);
+		assert_eq!(get_balance(&DJANGO_FALLBACK), 0);
+
+		let value = Pallet::<Test>::convert_native_to_evm(1u64);
+		let result = builder::bare_call(bob.addr)
+			.data(
+				AsRef::<[u8]>::as_ref(&DJANGO_ADDR)
+					.iter()
+					.chain(&value.to_little_endian())
+					.cloned()
+					.collect(),
+			)
+			.build_and_unwrap_result();
+		assert_return_code!(result, RuntimeReturnCode::Success);
+		assert_eq!(get_balance(&DJANGO_FALLBACK), min_balance + 1);
+		assert_eq!(get_balance(&ALICE_FALLBACK), alice_before - min_balance);
+
+		let django = builder::bare_instantiate(Code::Upload(callee_code))
+			.origin(RuntimeOrigin::signed(CHARLIE))
+			.native_value(min_balance * 100)
+			.build_and_unwrap_contract();
+
+		// Sending more than the contract has will make the transfer fail.
+		let value = Pallet::<Test>::convert_native_to_evm(min_balance * 300);
+		let result = builder::bare_call(bob.addr)
+			.data(
+				AsRef::<[u8]>::as_ref(&django.addr)
+					.iter()
+					.chain(&value.to_little_endian())
+					.chain(&0u32.to_le_bytes())
+					.cloned()
+					.collect(),
+			)
+			.build_and_unwrap_result();
+		assert_return_code!(result, RuntimeReturnCode::TransferFailed);
+
+		// Contract has enough balance but callee reverts because "1" is passed.
+		<Test as Config>::Currency::set_balance(&bob.account_id, min_balance + 1000);
+		let value = Pallet::<Test>::convert_native_to_evm(5u64);
+		let result = builder::bare_call(bob.addr)
+			.data(
+				AsRef::<[u8]>::as_ref(&django.addr)
+					.iter()
+					.chain(&value.to_little_endian())
+					.chain(&1u32.to_le_bytes())
+					.cloned()
+					.collect(),
+			)
+			.build_and_unwrap_result();
+		assert_return_code!(result, RuntimeReturnCode::CalleeReverted);
+
+		// Contract has enough balance but callee traps because "2" is passed.
+		let result = builder::bare_call(bob.addr)
+			.data(
+				AsRef::<[u8]>::as_ref(&django.addr)
+					.iter()
+					.chain(&value.to_little_endian())
+					.chain(&2u32.to_le_bytes())
+					.cloned()
+					.collect(),
+			)
+			.build_and_unwrap_result();
+		assert_return_code!(result, RuntimeReturnCode::CalleeTrapped);
+	});
+}
+
+#[test]
+fn instantiate_return_code() {
+	let (caller_code, _caller_hash) = compile_module("instantiate_return_code").unwrap();
+	let (callee_code, callee_hash) = compile_module("ok_trap_revert").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let min_balance = Contracts::min_balance();
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
+		let _ = <Test as Config>::Currency::set_balance(&CHARLIE, 1000 * min_balance);
+		let callee_hash = callee_hash.as_ref().to_vec();
+
+		assert_ok!(builder::instantiate_with_code(callee_code).value(min_balance * 100).build());
+
+		let contract = builder::bare_instantiate(Code::Upload(caller_code))
+			.native_value(min_balance * 100)
+			.build_and_unwrap_contract();
+
+		// bob cannot pay the ED to create the contract as he has no money
+		// this traps the caller rather than returning an error
+		let result = builder::bare_call(contract.addr)
+			.data(callee_hash.iter().chain(&0u32.to_le_bytes()).cloned().collect())
+			.origin(RuntimeOrigin::signed(BOB))
+			.build();
+		assert_err!(result.result, <Error<Test>>::StorageDepositNotEnoughFunds);
+
+		// Contract has only the minimal balance so any transfer will fail.
+		<Test as Config>::Currency::set_balance(&contract.account_id, min_balance);
+		let result = builder::bare_call(contract.addr)
+			.data(callee_hash.iter().chain(&0u32.to_le_bytes()).cloned().collect())
+			.build_and_unwrap_result();
+		assert_return_code!(result, RuntimeReturnCode::TransferFailed);
+
+		// Contract has enough balance but the passed code hash is invalid
+		<Test as Config>::Currency::set_balance(&contract.account_id, min_balance + 10_000);
+		let result = builder::bare_call(contract.addr).data(vec![0; 36]).build();
+		assert_err!(result.result, <Error<Test>>::CodeNotFound);
+
+		// Contract has enough balance but callee reverts because "1" is passed.
+		let result = builder::bare_call(contract.addr)
+			.data(callee_hash.iter().chain(&1u32.to_le_bytes()).cloned().collect())
+			.build_and_unwrap_result();
+		assert_return_code!(result, RuntimeReturnCode::CalleeReverted);
+
+		// Contract has enough balance but callee traps because "2" is passed.
+		let result = builder::bare_call(contract.addr)
+			.data(callee_hash.iter().chain(&2u32.to_le_bytes()).cloned().collect())
+			.build_and_unwrap_result();
+		assert_return_code!(result, RuntimeReturnCode::CalleeTrapped);
+
+		// Contract instantiation succeeds
+		let result = builder::bare_call(contract.addr)
+			.data(callee_hash.iter().chain(&0u32.to_le_bytes()).cloned().collect())
+			.build_and_unwrap_result();
+		assert_return_code!(result, 0);
+
+		// Contract instantiation fails because the same salt is being used again.
+		let result = builder::bare_call(contract.addr)
+			.data(callee_hash.iter().chain(&0u32.to_le_bytes()).cloned().collect())
+			.build_and_unwrap_result();
+		assert_return_code!(result, RuntimeReturnCode::DuplicateContractAddress);
+	});
+}
+
+#[test]
+fn lazy_removal_works() {
+	let (code, _hash) = compile_module("self_destruct").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let min_balance = Contracts::min_balance();
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
+
+		let contract = builder::bare_instantiate(Code::Upload(code))
+			.native_value(min_balance * 100)
+			.build_and_unwrap_contract();
+
+		let info = get_contract(&contract.addr);
+		let trie = &info.child_trie_info();
+
+		// Put value into the contracts child trie
+		child::put(trie, &[99], &42);
+
+		// Terminate the contract
+		assert_ok!(builder::call(contract.addr).build());
+
+		// Contract info should be gone
+		assert!(!<AccountInfoOf::<Test>>::contains_key(&contract.addr));
+
+		// But value should be still there as the lazy removal did not run, yet.
+		assert_matches!(child::get(trie, &[99]), Some(42));
+
+		// Run the lazy removal
+		Contracts::on_idle(System::block_number(), Weight::MAX);
+
+		// Value should be gone now
+		assert_matches!(child::get::<i32>(trie, &[99]), None);
+	});
+}
+
+#[test]
+fn lazy_batch_removal_works() {
+	let (code, _hash) = compile_module("self_destruct").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let min_balance = Contracts::min_balance();
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
+		let mut tries: Vec<child::ChildInfo> = vec![];
+
+		for i in 0..3u8 {
+			let contract = builder::bare_instantiate(Code::Upload(code.clone()))
+				.native_value(min_balance * 100)
+				.salt(Some([i; 32]))
+				.build_and_unwrap_contract();
+
+			let info = get_contract(&contract.addr);
+			let trie = &info.child_trie_info();
+
+			// Put value into the contracts child trie
+			child::put(trie, &[99], &42);
+
+			// Terminate the contract. Contract info should be gone, but value should be still
+			// there as the lazy removal did not run, yet.
+			assert_ok!(builder::call(contract.addr).build());
+
+			assert!(!<AccountInfoOf::<Test>>::contains_key(&contract.addr));
+			assert_matches!(child::get(trie, &[99]), Some(42));
+
+			tries.push(trie.clone())
+		}
+
+		// Run single lazy removal
+		Contracts::on_idle(System::block_number(), Weight::MAX);
+
+		// The single lazy removal should have removed all queued tries
+		for trie in tries.iter() {
+			assert_matches!(child::get::<i32>(trie, &[99]), None);
+		}
+	});
+}
+
+#[test]
+fn ref_time_left_api_works() {
+	let (code, _) = compile_module("ref_time_left").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create fixture: Constructor calls ref_time_left twice and asserts it to decrease
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		// Call the contract: It echoes back the ref_time returned by the ref_time_left API.
+		let received = builder::bare_call(addr).build_and_unwrap_result();
+		assert_eq!(received.flags, ReturnFlags::empty());
+
+		let returned_value = u64::from_le_bytes(received.data[..8].try_into().unwrap());
+		assert!(returned_value > 0);
+		assert!(returned_value < GAS_LIMIT.ref_time());
+	});
+}
+
+#[test]
+fn lazy_removal_partial_remove_works() {
+	let (code, _hash) = compile_module("self_destruct").unwrap();
+
+	// We create a contract with some extra keys above the weight limit
+	let extra_keys = 7u32;
+	let mut meter = WeightMeter::with_limit(Weight::from_parts(5_000_000_000, 100 * 1024));
+	let (weight_per_key, max_keys) = ContractInfo::<Test>::deletion_budget(&meter);
+	let vals: Vec<_> = (0..max_keys + extra_keys)
+		.map(|i| (blake2_256(&i.encode()), (i as u32), (i as u32).encode()))
+		.collect();
+
+	let mut ext = ExtBuilder::default().existential_deposit(50).build();
+
+	let trie = ext.execute_with(|| {
+		let min_balance = Contracts::min_balance();
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
+
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
+			.native_value(min_balance * 100)
+			.build_and_unwrap_contract();
+
+		let info = get_contract(&addr);
+
+		// Put value into the contracts child trie
+		for val in &vals {
+			info.write(&Key::Fix(val.0), Some(val.2.clone()), None, false).unwrap();
+		}
+		AccountInfo::<Test>::insert_contract(&addr, info.clone());
+
+		// Terminate the contract
+		assert_ok!(builder::call(addr).build());
+
+		// Contract info should be gone
+		assert!(!<AccountInfoOf::<Test>>::contains_key(&addr));
+
+		let trie = info.child_trie_info();
+
+		// But value should be still there as the lazy removal did not run, yet.
+		for val in &vals {
+			assert_eq!(child::get::<u32>(&trie, &blake2_256(&val.0)), Some(val.1));
+		}
+
+		trie.clone()
+	});
+
+	// The lazy removal limit only applies to the backend but not to the overlay.
+	// This commits all keys from the overlay to the backend.
+	ext.commit_all().unwrap();
+
+	ext.execute_with(|| {
+		// Run the lazy removal
+		ContractInfo::<Test>::process_deletion_queue_batch(&mut meter);
+
+		// Weight should be exhausted because we could not even delete all keys
+		assert!(!meter.can_consume(weight_per_key));
+
+		let mut num_deleted = 0u32;
+		let mut num_remaining = 0u32;
+
+		for val in &vals {
+			match child::get::<u32>(&trie, &blake2_256(&val.0)) {
+				None => num_deleted += 1,
+				Some(x) if x == val.1 => num_remaining += 1,
+				Some(_) => panic!("Unexpected value in contract storage"),
+			}
+		}
+
+		// All but one key is removed
+		assert_eq!(num_deleted + num_remaining, vals.len() as u32);
+		assert_eq!(num_deleted, max_keys);
+		assert_eq!(num_remaining, extra_keys);
+	});
+}
+
+#[test]
+fn lazy_removal_does_no_run_on_low_remaining_weight() {
+	let (code, _hash) = compile_module("self_destruct").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let min_balance = Contracts::min_balance();
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
+
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
+			.native_value(min_balance * 100)
+			.build_and_unwrap_contract();
+
+		let info = get_contract(&addr);
+		let trie = &info.child_trie_info();
+
+		// Put value into the contracts child trie
+		child::put(trie, &[99], &42);
+
+		// Terminate the contract
+		assert_ok!(builder::call(addr).build());
+
+		// Contract info should be gone
+		assert!(!<AccountInfoOf::<Test>>::contains_key(&addr));
+
+		// But value should be still there as the lazy removal did not run, yet.
+		assert_matches!(child::get(trie, &[99]), Some(42));
+
+		// Assign a remaining weight which is too low for a successful deletion of the contract
+		let low_remaining_weight =
+			<<Test as Config>::WeightInfo as WeightInfo>::on_process_deletion_queue_batch();
+
+		// Run the lazy removal
+		Contracts::on_idle(System::block_number(), low_remaining_weight);
+
+		// Value should still be there, since remaining weight was too low for removal
+		assert_matches!(child::get::<i32>(trie, &[99]), Some(42));
+
+		// Run the lazy removal while deletion_queue is not full
+		Contracts::on_initialize(System::block_number());
+
+		// Value should still be there, since deletion_queue was not full
+		assert_matches!(child::get::<i32>(trie, &[99]), Some(42));
+
+		// Run on_idle with max remaining weight, this should remove the value
+		Contracts::on_idle(System::block_number(), Weight::MAX);
+
+		// Value should be gone
+		assert_matches!(child::get::<i32>(trie, &[99]), None);
+	});
+}
+
+#[test]
+fn lazy_removal_does_not_use_all_weight() {
+	let (code, _hash) = compile_module("self_destruct").unwrap();
+
+	let mut meter = WeightMeter::with_limit(Weight::from_parts(5_000_000_000, 100 * 1024));
+	let mut ext = ExtBuilder::default().existential_deposit(50).build();
+
+	let (trie, vals, weight_per_key) = ext.execute_with(|| {
+		let min_balance = Contracts::min_balance();
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
+
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
+			.native_value(min_balance * 100)
+			.build_and_unwrap_contract();
+
+		let info = get_contract(&addr);
+		let (weight_per_key, max_keys) = ContractInfo::<Test>::deletion_budget(&meter);
+		assert!(max_keys > 0);
+
+		// We create a contract with one less storage item than we can remove within the limit
+		let vals: Vec<_> = (0..max_keys - 1)
+			.map(|i| (blake2_256(&i.encode()), (i as u32), (i as u32).encode()))
+			.collect();
+
+		// Put value into the contracts child trie
+		for val in &vals {
+			info.write(&Key::Fix(val.0), Some(val.2.clone()), None, false).unwrap();
+		}
+		AccountInfo::<Test>::insert_contract(&addr, info.clone());
+
+		// Terminate the contract
+		assert_ok!(builder::call(addr).build());
+
+		// Contract info should be gone
+		assert!(!<AccountInfoOf::<Test>>::contains_key(&addr));
+
+		let trie = info.child_trie_info();
+
+		// But value should be still there as the lazy removal did not run, yet.
+		for val in &vals {
+			assert_eq!(child::get::<u32>(&trie, &blake2_256(&val.0)), Some(val.1));
+		}
+
+		(trie, vals, weight_per_key)
+	});
+
+	// The lazy removal limit only applies to the backend but not to the overlay.
+	// This commits all keys from the overlay to the backend.
+	ext.commit_all().unwrap();
+
+	ext.execute_with(|| {
+		// Run the lazy removal
+		ContractInfo::<Test>::process_deletion_queue_batch(&mut meter);
+		let base_weight =
+			<<Test as Config>::WeightInfo as WeightInfo>::on_process_deletion_queue_batch();
+		assert_eq!(meter.consumed(), weight_per_key.mul(vals.len() as _) + base_weight);
+
+		// All the keys are removed
+		for val in vals {
+			assert_eq!(child::get::<u32>(&trie, &blake2_256(&val.0)), None);
+		}
+	});
+}
+
+#[test]
+fn deletion_queue_ring_buffer_overflow() {
+	let (code, _hash) = compile_module("self_destruct").unwrap();
+	let mut ext = ExtBuilder::default().existential_deposit(50).build();
+
+	// setup the deletion queue with custom counters
+	ext.execute_with(|| {
+		let queue = DeletionQueueManager::from_test_values(u32::MAX - 1, u32::MAX - 1);
+		<DeletionQueueCounter<Test>>::set(queue);
+	});
+
+	// commit the changes to the storage
+	ext.commit_all().unwrap();
+
+	ext.execute_with(|| {
+		let min_balance = Contracts::min_balance();
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
+		let mut tries: Vec<child::ChildInfo> = vec![];
+
+		// add 3 contracts to the deletion queue
+		for i in 0..3u8 {
+			let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code.clone()))
+				.native_value(min_balance * 100)
+				.salt(Some([i; 32]))
+				.build_and_unwrap_contract();
+
+			let info = get_contract(&addr);
+			let trie = &info.child_trie_info();
+
+			// Put value into the contracts child trie
+			child::put(trie, &[99], &42);
+
+			// Terminate the contract. Contract info should be gone, but value should be still
+			// there as the lazy removal did not run, yet.
+			assert_ok!(builder::call(addr).build());
+
+			assert!(!<AccountInfoOf::<Test>>::contains_key(&addr));
+			assert_matches!(child::get(trie, &[99]), Some(42));
+
+			tries.push(trie.clone())
+		}
+
+		// Run single lazy removal
+		Contracts::on_idle(System::block_number(), Weight::MAX);
+
+		// The single lazy removal should have removed all queued tries
+		for trie in tries.iter() {
+			assert_matches!(child::get::<i32>(trie, &[99]), None);
+		}
+
+		// insert and delete counter values should go from u32::MAX - 1 to 1
+		assert_eq!(<DeletionQueueCounter<Test>>::get().as_test_tuple(), (1, 1));
+	})
+}
+#[test]
+fn refcounter() {
+	let (binary, code_hash) = compile_module("self_destruct").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let min_balance = Contracts::min_balance();
+
+		// Create two contracts with the same code and check that they do in fact share it.
+		let Contract { addr: addr0, .. } = builder::bare_instantiate(Code::Upload(binary.clone()))
+			.native_value(min_balance * 100)
+			.salt(Some([0; 32]))
+			.build_and_unwrap_contract();
+		let Contract { addr: addr1, .. } = builder::bare_instantiate(Code::Upload(binary.clone()))
+			.native_value(min_balance * 100)
+			.salt(Some([1; 32]))
+			.build_and_unwrap_contract();
+		assert_refcount!(code_hash, 2);
+
+		// Sharing should also work with the usual instantiate call
+		let Contract { addr: addr2, .. } = builder::bare_instantiate(Code::Existing(code_hash))
+			.native_value(min_balance * 100)
+			.salt(Some([2; 32]))
+			.build_and_unwrap_contract();
+		assert_refcount!(code_hash, 3);
+
+		// Terminating one contract should decrement the refcount
+		assert_ok!(builder::call(addr0).build());
+		assert_refcount!(code_hash, 2);
+
+		// remove another one
+		assert_ok!(builder::call(addr1).build());
+		assert_refcount!(code_hash, 1);
+
+		// Pristine code should still be there
+		PristineCode::<Test>::get(code_hash).unwrap();
+
+		// remove the last contract
+		assert_ok!(builder::call(addr2).build());
+		assert_refcount!(code_hash, 0);
+
+		// refcount is `0` but code should still exists because it needs to be removed manually
+		assert!(crate::PristineCode::<Test>::contains_key(&code_hash));
+	});
+}
+
+#[test]
+fn gas_estimation_for_subcalls() {
+	let (caller_code, _caller_hash) = compile_module("call_with_limit").unwrap();
+	let (dummy_code, _callee_hash) = compile_module("dummy").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let min_balance = Contracts::min_balance();
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 2_000 * min_balance);
+
+		let Contract { addr: addr_caller, .. } =
+			builder::bare_instantiate(Code::Upload(caller_code))
+				.native_value(min_balance * 100)
+				.build_and_unwrap_contract();
+
+		let Contract { addr: addr_dummy, .. } = builder::bare_instantiate(Code::Upload(dummy_code))
+			.native_value(min_balance * 100)
+			.build_and_unwrap_contract();
+
+		// Run the test for all of those weight limits for the subcall
+		let weights = [
+			Weight::MAX,
+			GAS_LIMIT,
+			GAS_LIMIT * 2,
+			GAS_LIMIT / 5,
+			Weight::from_parts(u64::MAX, GAS_LIMIT.proof_size()),
+			Weight::from_parts(GAS_LIMIT.ref_time(), u64::MAX),
+		];
+
+		let (sub_addr, sub_input) = (addr_dummy.as_ref(), vec![]);
+
+		for weight in weights {
+			let input: Vec<u8> = sub_addr
+				.iter()
+				.cloned()
+				.chain(weight.ref_time().to_le_bytes())
+				.chain(weight.proof_size().to_le_bytes())
+				.chain(sub_input.clone())
+				.collect();
+
+			// Call in order to determine the gas that is required for this call
+			let result_orig = builder::bare_call(addr_caller).data(input.clone()).build();
+			assert_ok!(&result_orig.result);
+			assert_eq!(result_orig.gas_required, result_orig.gas_consumed);
+
+			// Make the same call using the estimated gas. Should succeed.
+			let result = builder::bare_call(addr_caller)
+				.gas_limit(result_orig.gas_required)
+				.storage_deposit_limit(result_orig.storage_deposit.charge_or_zero().into())
+				.data(input.clone())
+				.build();
+			assert_ok!(&result.result);
+
+			// Check that it fails with too little ref_time
+			let result = builder::bare_call(addr_caller)
+				.gas_limit(result_orig.gas_required.sub_ref_time(1))
+				.storage_deposit_limit(result_orig.storage_deposit.charge_or_zero().into())
+				.data(input.clone())
+				.build();
+			assert_err!(result.result, <Error<Test>>::OutOfGas);
+
+			// Check that it fails with too little proof_size
+			let result = builder::bare_call(addr_caller)
+				.gas_limit(result_orig.gas_required.sub_proof_size(1))
+				.storage_deposit_limit(result_orig.storage_deposit.charge_or_zero().into())
+				.data(input.clone())
+				.build();
+			assert_err!(result.result, <Error<Test>>::OutOfGas);
+		}
+	});
+}
+
+#[test]
+fn call_runtime_reentrancy_guarded() {
+	use super::precompiles::{INoInfo, NoInfo};
+	use crate::precompiles::Precompile;
+	use alloy_core::sol_types::SolInterface;
+
+	let precompile_addr = H160(NoInfo::<Test>::MATCHER.base_address());
+
+	let (callee_code, _callee_hash) = compile_module("dummy").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let min_balance = Contracts::min_balance();
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
+		let _ = <Test as Config>::Currency::set_balance(&CHARLIE, 1000 * min_balance);
+
+		let Contract { addr: addr_callee, .. } =
+			builder::bare_instantiate(Code::Upload(callee_code))
+				.native_value(min_balance * 100)
+				.salt(Some([1; 32]))
+				.build_and_unwrap_contract();
+
+		// Call pallet_revive call() dispatchable
+		let call = RuntimeCall::Contracts(crate::Call::call {
+			dest: addr_callee,
+			value: 0,
+			gas_limit: GAS_LIMIT / 3,
+			storage_deposit_limit: deposit_limit::<Test>(),
+			data: vec![],
+		})
+		.encode();
+
+		// Call runtime to re-enter back to contracts engine by
+		// calling dummy contract
+		let result = builder::bare_call(precompile_addr)
+			.data(
+				INoInfo::INoInfoCalls::callRuntime(INoInfo::callRuntimeCall { call: call.into() })
+					.abi_encode(),
+			)
+			.build();
+		// Call to runtime should fail because of the re-entrancy guard
+		assert_err!(result.result, <Error<Test>>::ReenteredPallet);
+	});
+}
+
+#[test]
+fn sr25519_verify() {
+	let (binary, _code_hash) = compile_module("sr25519_verify").unwrap();
+
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Instantiate the sr25519_verify contract.
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
+			.native_value(100_000)
+			.build_and_unwrap_contract();
+
+		let call_with = |message: &[u8; 11]| {
+			// Alice's signature for "hello world"
+			#[rustfmt::skip]
+			let signature: [u8; 64] = [
+				184, 49, 74, 238, 78, 165, 102, 252, 22, 92, 156, 176, 124, 118, 168, 116, 247,
+				99, 0, 94, 2, 45, 9, 170, 73, 222, 182, 74, 60, 32, 75, 64, 98, 174, 69, 55, 83,
+				85, 180, 98, 208, 75, 231, 57, 205, 62, 4, 105, 26, 136, 172, 17, 123, 99, 90, 255,
+				228, 54, 115, 63, 30, 207, 205, 131,
+			];
+
+			// Alice's public key
+			#[rustfmt::skip]
+			let public_key: [u8; 32] = [
+				212, 53, 147, 199, 21, 253, 211, 28, 97, 20, 26, 189, 4, 169, 159, 214, 130, 44,
+				133, 88, 133, 76, 205, 227, 154, 86, 132, 231, 165, 109, 162, 125,
+			];
+
+			let mut params = vec![];
+			params.extend_from_slice(&signature);
+			params.extend_from_slice(&public_key);
+			params.extend_from_slice(message);
+
+			builder::bare_call(addr).data(params).build_and_unwrap_result()
+		};
+
+		// verification should succeed for "hello world"
+		assert_return_code!(call_with(&b"hello world"), RuntimeReturnCode::Success);
+
+		// verification should fail for other messages
+		assert_return_code!(call_with(&b"hello worlD"), RuntimeReturnCode::Sr25519VerifyFailed);
+	});
+}
+
+#[test]
+fn upload_code_works() {
+	let (binary, code_hash) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Drop previous events
+		initialize_block(2);
+
+		assert!(!PristineCode::<Test>::contains_key(&code_hash));
+		assert_ok!(Contracts::upload_code(RuntimeOrigin::signed(ALICE), binary, 1_000,));
+		// Ensure the contract was stored and get expected deposit amount to be reserved.
+		expected_deposit(ensure_stored(code_hash));
+	});
+}
+
+#[test]
+fn upload_code_limit_too_low() {
+	let (binary, _code_hash) = compile_module("dummy").unwrap();
+	let deposit_expected = expected_deposit(binary.len());
+	let deposit_insufficient = deposit_expected.saturating_sub(1);
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Drop previous events
+		initialize_block(2);
+
+		assert_noop!(
+			Contracts::upload_code(RuntimeOrigin::signed(ALICE), binary, deposit_insufficient,),
+			<Error<Test>>::StorageDepositLimitExhausted,
+		);
+
+		assert_eq!(System::events(), vec![]);
+	});
+}
+
+#[test]
+fn upload_code_not_enough_balance() {
+	let (binary, _code_hash) = compile_module("dummy").unwrap();
+	let deposit_expected = expected_deposit(binary.len());
+	let deposit_insufficient = deposit_expected.saturating_sub(1);
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, deposit_insufficient);
+
+		// Drop previous events
+		initialize_block(2);
+
+		assert_noop!(
+			Contracts::upload_code(RuntimeOrigin::signed(ALICE), binary, 1_000,),
+			<Error<Test>>::StorageDepositNotEnoughFunds,
+		);
+
+		assert_eq!(System::events(), vec![]);
+	});
+}
+
+#[test]
+fn remove_code_works() {
+	let (binary, code_hash) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Drop previous events
+		initialize_block(2);
+
+		assert_ok!(Contracts::upload_code(RuntimeOrigin::signed(ALICE), binary, 1_000,));
+		// Ensure the contract was stored and get expected deposit amount to be reserved.
+		expected_deposit(ensure_stored(code_hash));
+		assert_ok!(Contracts::remove_code(RuntimeOrigin::signed(ALICE), code_hash));
+	});
+}
+
+#[test]
+fn remove_code_wrong_origin() {
+	let (binary, code_hash) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Drop previous events
+		initialize_block(2);
+
+		assert_ok!(Contracts::upload_code(RuntimeOrigin::signed(ALICE), binary, 1_000,));
+		// Ensure the contract was stored and get expected deposit amount to be reserved.
+		expected_deposit(ensure_stored(code_hash));
+
+		assert_noop!(
+			Contracts::remove_code(RuntimeOrigin::signed(BOB), code_hash),
+			sp_runtime::traits::BadOrigin,
+		);
+	});
+}
+
+#[test]
+fn remove_code_in_use() {
+	let (binary, code_hash) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		assert_ok!(builder::instantiate_with_code(binary).build());
+
+		// Drop previous events
+		initialize_block(2);
+
+		assert_noop!(
+			Contracts::remove_code(RuntimeOrigin::signed(ALICE), code_hash),
+			<Error<Test>>::CodeInUse,
+		);
+
+		assert_eq!(System::events(), vec![]);
+	});
+}
+
+#[test]
+fn remove_code_not_found() {
+	let (_binary, code_hash) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Drop previous events
+		initialize_block(2);
+
+		assert_noop!(
+			Contracts::remove_code(RuntimeOrigin::signed(ALICE), code_hash),
+			<Error<Test>>::CodeNotFound,
+		);
+
+		assert_eq!(System::events(), vec![]);
+	});
+}
+
+#[test]
+fn instantiate_with_zero_balance_works() {
+	let (binary, code_hash) = compile_module("dummy").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let min_balance = Contracts::min_balance();
+
+		// Drop previous events
+		initialize_block(2);
+
+		// Instantiate the BOB contract.
+		let Contract { addr, account_id } =
+			builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
+
+		// Ensure the contract was stored and get expected deposit amount to be reserved.
+		expected_deposit(ensure_stored(code_hash));
+
+		// Make sure the account exists even though no free balance was send
+		assert_eq!(<Test as Config>::Currency::free_balance(&account_id), min_balance);
+		assert_eq!(
+			<Test as Config>::Currency::total_balance(&account_id),
+			min_balance + contract_base_deposit(&addr)
+		);
+
+		assert_eq!(
+			System::events(),
+			vec![
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::Held {
+						reason: <Test as Config>::RuntimeHoldReason::Contracts(
+							HoldReason::CodeUploadDepositReserve,
+						),
+						who: ALICE,
+						amount: 776,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::System(frame_system::Event::NewAccount {
+						account: account_id.clone(),
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::Endowed {
+						account: account_id.clone(),
+						free_balance: min_balance,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
+						from: ALICE,
+						to: account_id.clone(),
+						amount: min_balance,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Contracts(crate::Event::Instantiated {
+						deployer: ALICE_ADDR,
+						contract: addr,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::TransferAndHold {
+						reason: <Test as Config>::RuntimeHoldReason::Contracts(
+							HoldReason::StorageDepositReserve,
+						),
+						source: ALICE,
+						dest: account_id,
+						transferred: 336,
+					}),
+					topics: vec![],
+				},
+			]
+		);
+	});
+}
+
+#[test]
+fn instantiate_with_below_existential_deposit_works() {
+	let (binary, code_hash) = compile_module("dummy").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let min_balance = Contracts::min_balance();
+		let value = 50;
+
+		// Drop previous events
+		initialize_block(2);
+
+		// Instantiate the BOB contract.
+		let Contract { addr, account_id } = builder::bare_instantiate(Code::Upload(binary))
+			.native_value(value)
+			.build_and_unwrap_contract();
+
+		// Ensure the contract was stored and get expected deposit amount to be reserved.
+		expected_deposit(ensure_stored(code_hash));
+		// Make sure the account exists even though not enough free balance was send
+		assert_eq!(<Test as Config>::Currency::free_balance(&account_id), min_balance + value);
+		assert_eq!(
+			<Test as Config>::Currency::total_balance(&account_id),
+			min_balance + value + contract_base_deposit(&addr)
+		);
+
+		assert_eq!(
+			System::events(),
+			vec![
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::Held {
+						reason: <Test as Config>::RuntimeHoldReason::Contracts(
+							HoldReason::CodeUploadDepositReserve,
+						),
+						who: ALICE,
+						amount: 776,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::System(frame_system::Event::NewAccount {
+						account: account_id.clone()
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::Endowed {
+						account: account_id.clone(),
+						free_balance: min_balance,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
+						from: ALICE,
+						to: account_id.clone(),
+						amount: min_balance,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
+						from: ALICE,
+						to: account_id.clone(),
+						amount: 50,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Contracts(crate::Event::Instantiated {
+						deployer: ALICE_ADDR,
+						contract: addr,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::TransferAndHold {
+						reason: <Test as Config>::RuntimeHoldReason::Contracts(
+							HoldReason::StorageDepositReserve,
+						),
+						source: ALICE,
+						dest: account_id.clone(),
+						transferred: 336,
+					}),
+					topics: vec![],
+				},
+			]
+		);
+	});
+}
+
+#[test]
+fn storage_deposit_works() {
+	let (binary, _code_hash) = compile_module("multi_store").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		let Contract { addr, account_id } =
+			builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
+
+		let mut deposit = contract_base_deposit(&addr);
+
+		// Drop previous events
+		initialize_block(2);
+
+		// Create storage
+		assert_ok!(builder::call(addr).value(42).data((50u32, 20u32).encode()).build());
+		// 4 is for creating 2 storage items
+		// 48 is for each of the keys
+		let charged0 = 4 + 50 + 20 + 48 + 48;
+		deposit += charged0;
+		assert_eq!(get_contract(&addr).total_deposit(), deposit);
+
+		// Add more storage (but also remove some)
+		assert_ok!(builder::call(addr).data((100u32, 10u32).encode()).build());
+		let charged1 = 50 - 10;
+		deposit += charged1;
+		assert_eq!(get_contract(&addr).total_deposit(), deposit);
+
+		// Remove more storage (but also add some)
+		assert_ok!(builder::call(addr).data((10u32, 20u32).encode()).build());
+		// -1 for numeric instability
+		let refunded0 = 90 - 10 - 1;
+		deposit -= refunded0;
+		assert_eq!(get_contract(&addr).total_deposit(), deposit);
+
+		assert_eq!(
+			System::events(),
+			vec![
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
+						from: ALICE,
+						to: account_id.clone(),
+						amount: 42,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::TransferAndHold {
+						reason: <Test as Config>::RuntimeHoldReason::Contracts(
+							HoldReason::StorageDepositReserve,
+						),
+						source: ALICE,
+						dest: account_id.clone(),
+						transferred: charged0,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::TransferAndHold {
+						reason: <Test as Config>::RuntimeHoldReason::Contracts(
+							HoldReason::StorageDepositReserve,
+						),
+						source: ALICE,
+						dest: account_id.clone(),
+						transferred: charged1,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::TransferOnHold {
+						reason: <Test as Config>::RuntimeHoldReason::Contracts(
+							HoldReason::StorageDepositReserve,
+						),
+						source: account_id.clone(),
+						dest: ALICE,
+						amount: refunded0,
+					}),
+					topics: vec![],
+				},
+			]
+		);
+	});
+}
+
+#[test]
+fn storage_deposit_callee_works() {
+	let (binary_caller, _code_hash_caller) = compile_module("call").unwrap();
+	let (binary_callee, _code_hash_callee) = compile_module("store_call").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create both contracts: Constructors do nothing.
+		let Contract { addr: addr_caller, .. } =
+			builder::bare_instantiate(Code::Upload(binary_caller)).build_and_unwrap_contract();
+		let Contract { addr: addr_callee, .. } =
+			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
+
+		assert_ok!(builder::call(addr_caller).data((100u32, &addr_callee).encode()).build());
+
+		let callee = get_contract(&addr_callee);
+		let deposit = DepositPerByte::get() * 100 + DepositPerItem::get() * 1 + 48;
+
+		assert_eq!(Pallet::<Test>::evm_balance(&addr_caller), U256::zero());
+		assert_eq!(callee.total_deposit(), deposit + contract_base_deposit(&addr_callee));
+	});
+}
+
+#[test]
+fn set_code_extrinsic() {
+	let (binary, code_hash) = compile_module("dummy").unwrap();
+	let (new_binary, new_code_hash) = compile_module("crypto_hashes").unwrap();
+
+	assert_ne!(code_hash, new_code_hash);
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
+
+		assert_ok!(Contracts::upload_code(
+			RuntimeOrigin::signed(ALICE),
+			new_binary,
+			deposit_limit::<Test>(),
+		));
+
+		// Drop previous events
+		initialize_block(2);
+
+		assert_eq!(get_contract(&addr).code_hash, code_hash);
+		assert_refcount!(&code_hash, 1);
+		assert_refcount!(&new_code_hash, 0);
+
+		// only root can execute this extrinsic
+		assert_noop!(
+			Contracts::set_code(RuntimeOrigin::signed(ALICE), addr, new_code_hash),
+			sp_runtime::traits::BadOrigin,
+		);
+		assert_eq!(get_contract(&addr).code_hash, code_hash);
+		assert_refcount!(&code_hash, 1);
+		assert_refcount!(&new_code_hash, 0);
+		assert_eq!(System::events(), vec![]);
+
+		// contract must exist
+		assert_noop!(
+			Contracts::set_code(RuntimeOrigin::root(), BOB_ADDR, new_code_hash),
+			<Error<Test>>::ContractNotFound,
+		);
+		assert_eq!(get_contract(&addr).code_hash, code_hash);
+		assert_refcount!(&code_hash, 1);
+		assert_refcount!(&new_code_hash, 0);
+		assert_eq!(System::events(), vec![]);
+
+		// new code hash must exist
+		assert_noop!(
+			Contracts::set_code(RuntimeOrigin::root(), addr, Default::default()),
+			<Error<Test>>::CodeNotFound,
+		);
+		assert_eq!(get_contract(&addr).code_hash, code_hash);
+		assert_refcount!(&code_hash, 1);
+		assert_refcount!(&new_code_hash, 0);
+		assert_eq!(System::events(), vec![]);
+
+		// successful call
+		assert_ok!(Contracts::set_code(RuntimeOrigin::root(), addr, new_code_hash));
+		assert_eq!(get_contract(&addr).code_hash, new_code_hash);
+		assert_refcount!(&code_hash, 0);
+		assert_refcount!(&new_code_hash, 1);
+	});
+}
+
+#[test]
+fn slash_cannot_kill_account() {
+	let (binary, _code_hash) = compile_module("dummy").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let value = 700;
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let min_balance = Contracts::min_balance();
+
+		let Contract { addr, account_id } = builder::bare_instantiate(Code::Upload(binary))
+			.native_value(value)
+			.build_and_unwrap_contract();
+
+		// Drop previous events
+		initialize_block(2);
+
+		let info_deposit = contract_base_deposit(&addr);
+
+		assert_eq!(
+			get_balance_on_hold(&HoldReason::StorageDepositReserve.into(), &account_id),
+			info_deposit
+		);
+
+		assert_eq!(
+			<Test as Config>::Currency::total_balance(&account_id),
+			info_deposit + value + min_balance
+		);
+
+		// Try to destroy the account of the contract by slashing the total balance.
+		// The account does not get destroyed because slashing only affects the balance held
+		// under certain `reason`. Slashing can for example happen if the contract takes part
+		// in staking.
+		let _ = <Test as Config>::Currency::slash(
+			&HoldReason::StorageDepositReserve.into(),
+			&account_id,
+			<Test as Config>::Currency::total_balance(&account_id),
+		);
+
+		// Slashing only removed the balance held.
+		assert_eq!(<Test as Config>::Currency::total_balance(&account_id), value + min_balance);
+	});
+}
+
+#[test]
+fn contract_reverted() {
+	let (binary, code_hash) = compile_module("return_with_data").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let flags = ReturnFlags::REVERT;
+		let buffer = [4u8, 8, 15, 16, 23, 42];
+		let input = (flags.bits(), buffer).encode();
+
+		// We just upload the code for later use
+		assert_ok!(Contracts::upload_code(
+			RuntimeOrigin::signed(ALICE),
+			binary.clone(),
+			deposit_limit::<Test>(),
+		));
+
+		// Calling extrinsic: revert leads to an error
+		assert_err_ignore_postinfo!(
+			builder::instantiate(code_hash).data(input.clone()).build(),
+			<Error<Test>>::ContractReverted,
+		);
+
+		// Calling extrinsic: revert leads to an error
+		assert_err_ignore_postinfo!(
+			builder::instantiate_with_code(binary).data(input.clone()).build(),
+			<Error<Test>>::ContractReverted,
+		);
+
+		// Calling directly: revert leads to success but the flags indicate the error
+		// This is just a different way of transporting the error that allows the read out
+		// the `data` which is only there on success. Obviously, the contract isn't
+		// instantiated.
+		let result = builder::bare_instantiate(Code::Existing(code_hash))
+			.data(input.clone())
+			.build_and_unwrap_result();
+		assert_eq!(result.result.flags, flags);
+		assert_eq!(result.result.data, buffer);
+		assert!(!<AccountInfoOf<Test>>::contains_key(result.addr));
+
+		// Pass empty flags and therefore successfully instantiate the contract for later use.
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Existing(code_hash))
+			.data(ReturnFlags::empty().bits().encode())
+			.build_and_unwrap_contract();
+
+		// Calling extrinsic: revert leads to an error
+		assert_err_ignore_postinfo!(
+			builder::call(addr).data(input.clone()).build(),
+			<Error<Test>>::ContractReverted,
+		);
+
+		// Calling directly: revert leads to success but the flags indicate the error
+		let result = builder::bare_call(addr).data(input).build_and_unwrap_result();
+		assert_eq!(result.flags, flags);
+		assert_eq!(result.data, buffer);
+	});
+}
+
+#[test]
+fn set_code_hash() {
+	let (binary, _) = compile_module("set_code_hash").unwrap();
+	let (new_binary, new_code_hash) = compile_module("new_set_code_hash_contract").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Instantiate the 'caller'
+		let Contract { addr: contract_addr, .. } = builder::bare_instantiate(Code::Upload(binary))
+			.native_value(300_000)
+			.build_and_unwrap_contract();
+		// upload new code
+		assert_ok!(Contracts::upload_code(
+			RuntimeOrigin::signed(ALICE),
+			new_binary.clone(),
+			deposit_limit::<Test>(),
+		));
+
+		System::reset_events();
+
+		// First call sets new code_hash and returns 1
+		let result = builder::bare_call(contract_addr)
+			.data(new_code_hash.as_ref().to_vec())
+			.build_and_unwrap_result();
+		assert_return_code!(result, 1);
+
+		// Second calls new contract code that returns 2
+		let result = builder::bare_call(contract_addr).build_and_unwrap_result();
+		assert_return_code!(result, 2);
+	});
+}
+
+#[test]
+fn storage_deposit_limit_is_enforced() {
+	let (binary, _code_hash) = compile_module("store_call").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let min_balance = Contracts::min_balance();
+
+		// Setting insufficient storage_deposit should fail.
+		assert_err!(
+			builder::bare_instantiate(Code::Upload(binary.clone()))
+				// expected deposit is 2 * ed + 3 for the call
+				.storage_deposit_limit((2 * min_balance + 3 - 1).into())
+				.build()
+				.result,
+			<Error<Test>>::StorageDepositLimitExhausted,
+		);
+
+		// Instantiate the BOB contract.
+		let Contract { addr, account_id } =
+			builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
+
+		let info_deposit = contract_base_deposit(&addr);
+		// Check that the BOB contract has been instantiated and has the minimum balance
+		assert_eq!(get_contract(&addr).total_deposit(), info_deposit);
+		assert_eq!(
+			<Test as Config>::Currency::total_balance(&account_id),
+			info_deposit + min_balance
+		);
+
+		// Create 1 byte of storage with a price of per byte,
+		// setting insufficient deposit limit, as it requires 3 Balance:
+		// 2 for the item added + 1 (value) + 48 (key)
+		assert_err_ignore_postinfo!(
+			builder::call(addr)
+				.storage_deposit_limit(50)
+				.data(1u32.to_le_bytes().to_vec())
+				.build(),
+			<Error<Test>>::StorageDepositLimitExhausted,
+		);
+
+		// now with enough limit
+		assert_ok!(builder::call(addr)
+			.storage_deposit_limit(51)
+			.data(1u32.to_le_bytes().to_vec())
+			.build());
+
+		// Use 4 more bytes of the storage for the same item, which requires 4 Balance.
+		// Should fail as DefaultDepositLimit is 3 and hence isn't enough.
+		assert_err_ignore_postinfo!(
+			builder::call(addr)
+				.storage_deposit_limit(3)
+				.data(5u32.to_le_bytes().to_vec())
+				.build(),
+			<Error<Test>>::StorageDepositLimitExhausted,
+		);
+	});
+}
+
+#[test]
+fn deposit_limit_in_nested_calls() {
+	let (binary_caller, _code_hash_caller) = compile_module("create_storage_and_call").unwrap();
+	let (binary_callee, _code_hash_callee) = compile_module("store_call").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create both contracts: Constructors do nothing.
+		let Contract { addr: addr_caller, .. } =
+			builder::bare_instantiate(Code::Upload(binary_caller)).build_and_unwrap_contract();
+		let Contract { addr: addr_callee, .. } =
+			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
+
+		// Create 100 bytes of storage with a price of per byte
+		// This is 100 Balance + 2 Balance for the item
+		// 48 for the key
+		assert_ok!(builder::call(addr_callee)
+			.storage_deposit_limit(102 + 48)
+			.data(100u32.to_le_bytes().to_vec())
+			.build());
+
+		// We do not remove any storage but add a storage item of 12 bytes in the caller
+		// contract. This would cost 12 + 2 + 72 = 86 Balance.
+		// The nested call doesn't get a special limit, which is set by passing `u64::MAX` to it.
+		// This should fail as the specified parent's limit is less than the cost: 13 <
+		// 14.
+		assert_err_ignore_postinfo!(
+			builder::call(addr_caller)
+				.storage_deposit_limit(85)
+				.data((100u32, &addr_callee, U256::MAX).encode())
+				.build(),
+			<Error<Test>>::StorageDepositLimitExhausted,
+		);
+
+		// Now we specify the parent's limit high enough to cover the caller's storage
+		// additions. However, we use a single byte more in the callee, hence the storage
+		// deposit should be 87 Balance.
+		// The nested call doesn't get a special limit, which is set by passing `u64::MAX` to it.
+		// This should fail as the specified parent's limit is less than the cost: 86 < 87
+		assert_err_ignore_postinfo!(
+			builder::call(addr_caller)
+				.storage_deposit_limit(86)
+				.data((101u32, &addr_callee, &U256::MAX).encode())
+				.build(),
+			<Error<Test>>::StorageDepositLimitExhausted,
+		);
+
+		// The parents storage deposit limit doesn't matter as the sub calls limit
+		// is enforced eagerly. However, we set a special deposit limit of 1 Balance for the
+		// nested call. This should fail as callee adds up 2 bytes to the storage, meaning
+		// that the nested call should have a deposit limit of at least 2 Balance. The
+		// sub-call should be rolled back, which is covered by the next test case.
+		let ret = builder::bare_call(addr_caller)
+			.storage_deposit_limit(DepositLimit::Balance(u64::MAX))
+			.data((102u32, &addr_callee, U256::from(1u64)).encode())
+			.build_and_unwrap_result();
+		assert_return_code!(ret, RuntimeReturnCode::OutOfResources);
+
+		// Refund in the callee contract but not enough to cover the Balance required by the
+		// caller. Note that if previous sub-call wouldn't roll back, this call would pass
+		// making the test case fail. We don't set a special limit for the nested call here.
+		assert_err_ignore_postinfo!(
+			builder::call(addr_caller)
+				.storage_deposit_limit(0)
+				.data((87u32, &addr_callee, &U256::MAX.to_little_endian()).encode())
+				.build(),
+			<Error<Test>>::StorageDepositLimitExhausted,
+		);
+
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 511);
+
+		// Require more than the sender's balance.
+		// Limit the sub call to little balance so it should fail in there
+		let ret = builder::bare_call(addr_caller)
+			.data((416, &addr_callee, U256::from(1u64)).encode())
+			.build_and_unwrap_result();
+		assert_return_code!(ret, RuntimeReturnCode::OutOfResources);
+
+		// Free up enough storage in the callee so that the caller can create a new item
+		// We set the special deposit limit of 1 Balance for the nested call, which isn't
+		// enforced as callee frees up storage. This should pass.
+		assert_ok!(builder::call(addr_caller)
+			.storage_deposit_limit(1)
+			.data((0u32, &addr_callee, U256::from(1u64)).encode())
+			.build());
+	});
+}
+
+#[test]
+fn deposit_limit_in_nested_instantiate() {
+	let (binary_caller, _code_hash_caller) =
+		compile_module("create_storage_and_instantiate").unwrap();
+	let (binary_callee, code_hash_callee) = compile_module("store_deploy").unwrap();
+	const ED: u64 = 5;
+	ExtBuilder::default().existential_deposit(ED).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let _ = <Test as Config>::Currency::set_balance(&BOB, 1_000_000);
+		// Create caller contract
+		let Contract { addr: addr_caller, account_id: caller_id } =
+			builder::bare_instantiate(Code::Upload(binary_caller))
+				.native_value(10_000) // this balance is later passed to the deployed contract
+				.build_and_unwrap_contract();
+		// Deploy a contract to get its occupied storage size
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary_callee))
+			.data(vec![0, 0, 0, 0])
+			.build_and_unwrap_contract();
+
+		// This is the deposit we expect to be charged just for instantiatiting the callee.
+		//
+		// - callee_info_len + 2 for storing the new contract info
+		// - the deposit for depending on a code hash
+		// - ED for deployed contract account
+		// - 2 for the storage item of 0 bytes being created in the callee constructor
+		// - 48 for the key
+		let callee_min_deposit = {
+			let callee_info_len =
+				AccountInfo::<Test>::load_contract(&addr).unwrap().encoded_size() as u64;
+			let code_deposit = lockup_deposit(&code_hash_callee);
+			callee_info_len + code_deposit + 2 + ED + 2 + 48
+		};
+
+		// The parent just stores an item of the passed size so at least
+		// we need to pay for the item itself.
+		let caller_min_deposit = callee_min_deposit + 2 + 48;
+
+		// Fail in callee.
+		//
+		// We still fail in the sub call because we enforce limits on return from a contract.
+		// Sub calls return first to they are checked first.
+		let ret = builder::bare_call(addr_caller)
+			.origin(RuntimeOrigin::signed(BOB))
+			.storage_deposit_limit(DepositLimit::Balance(0))
+			.data((&code_hash_callee, 100u32, &U256::MAX.to_little_endian()).encode())
+			.build_and_unwrap_result();
+		assert_return_code!(ret, RuntimeReturnCode::OutOfResources);
+		// The charges made on instantiation should be rolled back.
+		assert_eq!(<Test as Config>::Currency::free_balance(&BOB), 1_000_000);
+
+		// Fail in the caller.
+		//
+		// For that we need to supply enough storage deposit so that the sub call
+		// succeeds but the parent call runs out of storage.
+		let ret = builder::bare_call(addr_caller)
+			.origin(RuntimeOrigin::signed(BOB))
+			.storage_deposit_limit(DepositLimit::Balance(callee_min_deposit))
+			.data((&code_hash_callee, 0u32, &U256::MAX.to_little_endian()).encode())
+			.build();
+		assert_err!(ret.result, <Error<Test>>::StorageDepositLimitExhausted);
+		// The charges made on the instantiation should be rolled back.
+		assert_eq!(<Test as Config>::Currency::free_balance(&BOB), 1_000_000);
+
+		// Fail in the callee with bytes.
+		//
+		// Same as above but stores one byte in both caller and callee.
+		let ret = builder::bare_call(addr_caller)
+			.origin(RuntimeOrigin::signed(BOB))
+			.storage_deposit_limit(DepositLimit::Balance(caller_min_deposit + 1))
+			.data((&code_hash_callee, 1u32, U256::from(callee_min_deposit)).encode())
+			.build_and_unwrap_result();
+		assert_return_code!(ret, RuntimeReturnCode::OutOfResources);
+		// The charges made on the instantiation should be rolled back.
+		assert_eq!(<Test as Config>::Currency::free_balance(&BOB), 1_000_000);
+
+		// Fail in the caller with bytes.
+		//
+		// Same as above but stores one byte in both caller and callee.
+		let ret = builder::bare_call(addr_caller)
+			.origin(RuntimeOrigin::signed(BOB))
+			.storage_deposit_limit(DepositLimit::Balance(callee_min_deposit + 1))
+			.data((&code_hash_callee, 1u32, U256::from(callee_min_deposit + 1)).encode())
+			.build();
+		assert_err!(ret.result, <Error<Test>>::StorageDepositLimitExhausted);
+		// The charges made on the instantiation should be rolled back.
+		assert_eq!(<Test as Config>::Currency::free_balance(&BOB), 1_000_000);
+
+		// Set enough deposit limit for the child instantiate. This should succeed.
+		let result = builder::bare_call(addr_caller)
+			.origin(RuntimeOrigin::signed(BOB))
+			.storage_deposit_limit((caller_min_deposit + 2).into())
+			.data((&code_hash_callee, 1u32, U256::from(callee_min_deposit + 1)).encode())
+			.build();
+
+		let returned = result.result.unwrap();
+		assert!(!returned.did_revert());
+
+		// All balance of the caller except ED has been transferred to the callee.
+		// No deposit has been taken from it.
+		assert_eq!(<Test as Config>::Currency::free_balance(&caller_id), ED);
+		// Get address of the deployed contract.
+		let addr_callee = H160::from_slice(&returned.data[0..20]);
+		let callee_account_id = <Test as Config>::AddressMapper::to_account_id(&addr_callee);
+		// 10_000 should be sent to callee from the caller contract, plus ED to be sent from the
+		// origin.
+		assert_eq!(<Test as Config>::Currency::free_balance(&callee_account_id), 10_000 + ED);
+		// The origin should be charged with what the outer call consumed
+		assert_eq!(
+			<Test as Config>::Currency::free_balance(&BOB),
+			1_000_000 - (caller_min_deposit + 2),
+		);
+		assert_eq!(result.storage_deposit.charge_or_zero(), (caller_min_deposit + 2))
+	});
+}
+
+#[test]
+fn deposit_limit_honors_liquidity_restrictions() {
+	let (binary, _code_hash) = compile_module("store_call").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let bobs_balance = 1_000;
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let _ = <Test as Config>::Currency::set_balance(&BOB, bobs_balance);
+		let min_balance = Contracts::min_balance();
+
+		// Instantiate the BOB contract.
+		let Contract { addr, account_id } =
+			builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
+
+		let info_deposit = contract_base_deposit(&addr);
+		// Check that the contract has been instantiated and has the minimum balance
+		assert_eq!(get_contract(&addr).total_deposit(), info_deposit);
+		assert_eq!(
+			<Test as Config>::Currency::total_balance(&account_id),
+			info_deposit + min_balance
+		);
+
+		// check that the hold is honored
+		<Test as Config>::Currency::hold(
+			&HoldReason::CodeUploadDepositReserve.into(),
+			&BOB,
+			bobs_balance - min_balance,
+		)
+		.unwrap();
+		assert_err_ignore_postinfo!(
+			builder::call(addr)
+				.origin(RuntimeOrigin::signed(BOB))
+				.storage_deposit_limit(10_000)
+				.data(100u32.to_le_bytes().to_vec())
+				.build(),
+			<Error<Test>>::StorageDepositNotEnoughFunds,
+		);
+		assert_eq!(<Test as Config>::Currency::free_balance(&BOB), min_balance);
+	});
+}
+
+#[test]
+fn deposit_limit_honors_existential_deposit() {
+	let (binary, _code_hash) = compile_module("store_call").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let _ = <Test as Config>::Currency::set_balance(&BOB, 300);
+		let min_balance = Contracts::min_balance();
+
+		// Instantiate the BOB contract.
+		let Contract { addr, account_id } =
+			builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
+
+		let info_deposit = contract_base_deposit(&addr);
+
+		// Check that the contract has been instantiated and has the minimum balance
+		assert_eq!(get_contract(&addr).total_deposit(), info_deposit);
+		assert_eq!(
+			<Test as Config>::Currency::total_balance(&account_id),
+			min_balance + info_deposit
+		);
+
+		// check that the deposit can't bring the account below the existential deposit
+		assert_err_ignore_postinfo!(
+			builder::call(addr)
+				.origin(RuntimeOrigin::signed(BOB))
+				.storage_deposit_limit(10_000)
+				.data(100u32.to_le_bytes().to_vec())
+				.build(),
+			<Error<Test>>::StorageDepositNotEnoughFunds,
+		);
+		assert_eq!(<Test as Config>::Currency::free_balance(&BOB), 300);
+	});
+}
+
+#[test]
+fn native_dependency_deposit_works() {
+	let (binary, code_hash) = compile_module("set_code_hash").unwrap();
+	let (dummy_binary, dummy_code_hash) = compile_module("dummy").unwrap();
+
+	// Test with both existing and uploaded code
+	for code in [Code::Upload(binary.clone()), Code::Existing(code_hash)] {
+		ExtBuilder::default().build().execute_with(|| {
+			let _ = Balances::set_balance(&ALICE, 1_000_000);
+			let lockup_deposit_percent = CodeHashLockupDepositPercent::get();
+
+			// Upload the dummy contract,
+			Contracts::upload_code(
+				RuntimeOrigin::signed(ALICE),
+				dummy_binary.clone(),
+				deposit_limit::<Test>(),
+			)
+			.unwrap();
+
+			// Upload `set_code_hash` contracts if using Code::Existing.
+			let add_upload_deposit = match code {
+				Code::Existing(_) => {
+					Contracts::upload_code(
+						RuntimeOrigin::signed(ALICE),
+						binary.clone(),
+						deposit_limit::<Test>(),
+					)
+					.unwrap();
+					false
+				},
+				Code::Upload(_) => true,
+			};
+
+			// Instantiate the set_code_hash contract.
+			let res = builder::bare_instantiate(code).build();
+
+			let addr = res.result.unwrap().addr;
+			let account_id = <Test as Config>::AddressMapper::to_account_id(&addr);
+			let base_deposit = contract_base_deposit(&addr);
+			let upload_deposit = get_code_deposit(&code_hash);
+			let extra_deposit = add_upload_deposit.then(|| upload_deposit).unwrap_or_default();
+
+			assert_eq!(
+				res.storage_deposit.charge_or_zero(),
+				extra_deposit + base_deposit + Contracts::min_balance()
+			);
+
+			// call set_code_hash
+			builder::bare_call(addr)
+				.data(dummy_code_hash.encode())
+				.build_and_unwrap_result();
+
+			// Check updated storage_deposit due to code size changes
+			let deposit_diff = lockup_deposit_percent.mul_ceil(get_code_deposit(&code_hash))
+				- lockup_deposit_percent.mul_ceil(get_code_deposit(&dummy_code_hash));
+			let new_base_deposit = contract_base_deposit(&addr);
+			assert_ne!(deposit_diff, 0);
+			assert_eq!(base_deposit - new_base_deposit, deposit_diff);
+
+			assert_eq!(
+				get_balance_on_hold(&HoldReason::StorageDepositReserve.into(), &account_id),
+				new_base_deposit
+			);
+		});
+	}
+}
+
+#[test]
+fn block_hash_works() {
+	let (code, _) = compile_module("block_hash").unwrap();
+
+	ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		// The genesis config sets to the block number to 1
+		let block_hash = [1; 32];
+		frame_system::BlockHash::<Test>::insert(
+			&crate::BlockNumberFor::<Test>::from(0u32),
+			<Test as frame_system::Config>::Hash::from(&block_hash),
+		);
+		assert_ok!(builder::call(addr)
+			.data((U256::zero(), H256::from(block_hash)).encode())
+			.build());
+
+		// A block number out of range returns the zero value
+		assert_ok!(builder::call(addr).data((U256::from(1), H256::zero()).encode()).build());
+	});
+}
+
+#[test]
+fn block_author_works() {
+	let (code, _) = compile_module("block_author").unwrap();
+
+	ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		// The fixture asserts the input to match the find_author API method output.
+		assert_ok!(builder::call(addr).data(EVE_ADDR.encode()).build());
+	});
+}
+
+#[test]
+fn root_cannot_upload_code() {
+	let (binary, _) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().build().execute_with(|| {
+		assert_noop!(
+			Contracts::upload_code(RuntimeOrigin::root(), binary, deposit_limit::<Test>()),
+			DispatchError::BadOrigin,
+		);
+	});
+}
+
+#[test]
+fn root_cannot_remove_code() {
+	let (_, code_hash) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().build().execute_with(|| {
+		assert_noop!(
+			Contracts::remove_code(RuntimeOrigin::root(), code_hash),
+			DispatchError::BadOrigin,
+		);
+	});
+}
+
+#[test]
+fn signed_cannot_set_code() {
+	let (_, code_hash) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().build().execute_with(|| {
+		assert_noop!(
+			Contracts::set_code(RuntimeOrigin::signed(ALICE), BOB_ADDR, code_hash),
+			DispatchError::BadOrigin,
+		);
+	});
+}
+
+#[test]
+fn none_cannot_call_code() {
+	ExtBuilder::default().build().execute_with(|| {
+		assert_err_ignore_postinfo!(
+			builder::call(BOB_ADDR).origin(RuntimeOrigin::none()).build(),
+			DispatchError::BadOrigin,
+		);
+	});
+}
+
+#[test]
+fn root_can_call() {
+	let (binary, _) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
+
+		// Call the contract.
+		assert_ok!(builder::call(addr).origin(RuntimeOrigin::root()).build());
+	});
+}
+
+#[test]
+fn root_cannot_instantiate_with_code() {
+	let (binary, _) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().build().execute_with(|| {
+		assert_err_ignore_postinfo!(
+			builder::instantiate_with_code(binary).origin(RuntimeOrigin::root()).build(),
+			DispatchError::BadOrigin
+		);
+	});
+}
+
+#[test]
+fn root_cannot_instantiate() {
+	let (_, code_hash) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().build().execute_with(|| {
+		assert_err_ignore_postinfo!(
+			builder::instantiate(code_hash).origin(RuntimeOrigin::root()).build(),
+			DispatchError::BadOrigin
+		);
+	});
+}
+
+#[test]
+fn only_upload_origin_can_upload() {
+	let (binary, _) = compile_module("dummy").unwrap();
+	UploadAccount::set(Some(ALICE));
+	ExtBuilder::default().build().execute_with(|| {
+		let _ = Balances::set_balance(&ALICE, 1_000_000);
+		let _ = Balances::set_balance(&BOB, 1_000_000);
+
+		assert_err!(
+			Contracts::upload_code(RuntimeOrigin::root(), binary.clone(), deposit_limit::<Test>(),),
+			DispatchError::BadOrigin
+		);
+
+		assert_err!(
+			Contracts::upload_code(
+				RuntimeOrigin::signed(BOB),
+				binary.clone(),
+				deposit_limit::<Test>(),
+			),
+			DispatchError::BadOrigin
+		);
+
+		// Only alice is allowed to upload contract code.
+		assert_ok!(Contracts::upload_code(
+			RuntimeOrigin::signed(ALICE),
+			binary.clone(),
+			deposit_limit::<Test>(),
+		));
+	});
+}
+
+#[test]
+fn only_instantiation_origin_can_instantiate() {
+	let (code, code_hash) = compile_module("dummy").unwrap();
+	InstantiateAccount::set(Some(ALICE));
+	ExtBuilder::default().build().execute_with(|| {
+		let _ = Balances::set_balance(&ALICE, 1_000_000);
+		let _ = Balances::set_balance(&BOB, 1_000_000);
+
+		assert_err_ignore_postinfo!(
+			builder::instantiate_with_code(code.clone())
+				.origin(RuntimeOrigin::root())
+				.build(),
+			DispatchError::BadOrigin
+		);
+
+		assert_err_ignore_postinfo!(
+			builder::instantiate_with_code(code.clone())
+				.origin(RuntimeOrigin::signed(BOB))
+				.build(),
+			DispatchError::BadOrigin
+		);
+
+		// Only Alice can instantiate
+		assert_ok!(builder::instantiate_with_code(code).build());
+
+		// Bob cannot instantiate with either `instantiate_with_code` or `instantiate`.
+		assert_err_ignore_postinfo!(
+			builder::instantiate(code_hash).origin(RuntimeOrigin::signed(BOB)).build(),
+			DispatchError::BadOrigin
+		);
+	});
+}
+
+#[test]
+fn balance_of_api() {
+	let (binary, _code_hash) = compile_module("balance_of").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = Balances::set_balance(&ALICE, 1_000_000);
+		let _ = Balances::set_balance(&ALICE_FALLBACK, 1_000_000);
+
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(binary.to_vec())).build_and_unwrap_contract();
+
+		// The fixture asserts a non-zero returned free balance of the account;
+		// The ALICE_FALLBACK account is endowed;
+		// Hence we should not revert
+		assert_ok!(builder::call(addr).data(ALICE_ADDR.0.to_vec()).build());
+
+		// The fixture asserts a non-zero returned free balance of the account;
+		// The ETH_BOB account is not endowed;
+		// Hence we should revert
+		assert_err_ignore_postinfo!(
+			builder::call(addr).data(BOB_ADDR.0.to_vec()).build(),
+			<Error<Test>>::ContractTrapped
+		);
+	});
+}
+
+#[test]
+fn balance_api_returns_free_balance() {
+	let (binary, _code_hash) = compile_module("balance").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Instantiate the BOB contract without any extra balance.
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(binary.to_vec())).build_and_unwrap_contract();
+
+		let value = 0;
+		// Call BOB which makes it call the balance runtime API.
+		// The contract code asserts that the returned balance is 0.
+		assert_ok!(builder::call(addr).value(value).build());
+
+		let value = 1;
+		// Calling with value will trap the contract.
+		assert_err_ignore_postinfo!(
+			builder::call(addr).value(value).build(),
+			<Error<Test>>::ContractTrapped
+		);
+	});
+}
+
+#[test]
+fn gas_consumed_is_linear_for_nested_calls() {
+	let (code, _code_hash) = compile_module("recurse").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		let [gas_0, gas_1, gas_2, gas_max] = {
+			[0u32, 1u32, 2u32, limits::CALL_STACK_DEPTH]
+				.iter()
+				.map(|i| {
+					let result = builder::bare_call(addr).data(i.encode()).build();
+					assert_ok!(result.result);
+					result.gas_consumed
+				})
+				.collect::<Vec<_>>()
+				.try_into()
+				.unwrap()
+		};
+
+		let gas_per_recursion = gas_2.checked_sub(&gas_1).unwrap();
+		assert_eq!(gas_max, gas_0 + gas_per_recursion * limits::CALL_STACK_DEPTH as u64);
+	});
+}
+
+#[test]
+fn read_only_call_cannot_store() {
+	let (binary_caller, _code_hash_caller) = compile_module("read_only_call").unwrap();
+	let (binary_callee, _code_hash_callee) = compile_module("store_call").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create both contracts: Constructors do nothing.
+		let Contract { addr: addr_caller, .. } =
+			builder::bare_instantiate(Code::Upload(binary_caller)).build_and_unwrap_contract();
+		let Contract { addr: addr_callee, .. } =
+			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
+
+		// Read-only call fails when modifying storage.
+		assert_err_ignore_postinfo!(
+			builder::call(addr_caller).data((&addr_callee, 100u32).encode()).build(),
+			<Error<Test>>::ContractTrapped
+		);
+	});
+}
+
+#[test]
+fn read_only_call_cannot_transfer() {
+	let (binary_caller, _code_hash_caller) = compile_module("call_with_flags_and_value").unwrap();
+	let (binary_callee, _code_hash_callee) = compile_module("dummy").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create both contracts: Constructors do nothing.
+		let Contract { addr: addr_caller, .. } =
+			builder::bare_instantiate(Code::Upload(binary_caller)).build_and_unwrap_contract();
+		let Contract { addr: addr_callee, .. } =
+			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
+
+		// Read-only call fails when a non-zero value is set.
+		assert_err_ignore_postinfo!(
+			builder::call(addr_caller)
+				.data(
+					(addr_callee, pallet_revive_uapi::CallFlags::READ_ONLY.bits(), 100u64).encode()
+				)
+				.build(),
+			<Error<Test>>::StateChangeDenied
+		);
+	});
+}
+
+#[test]
+fn read_only_subsequent_call_cannot_store() {
+	let (binary_read_only_caller, _code_hash_caller) = compile_module("read_only_call").unwrap();
+	let (binary_caller, _code_hash_caller) = compile_module("call_with_flags_and_value").unwrap();
+	let (binary_callee, _code_hash_callee) = compile_module("store_call").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create contracts: Constructors do nothing.
+		let Contract { addr: addr_caller, .. } =
+			builder::bare_instantiate(Code::Upload(binary_read_only_caller))
+				.build_and_unwrap_contract();
+		let Contract { addr: addr_subsequent_caller, .. } =
+			builder::bare_instantiate(Code::Upload(binary_caller)).build_and_unwrap_contract();
+		let Contract { addr: addr_callee, .. } =
+			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
+
+		// Subsequent call input.
+		let input = (&addr_callee, pallet_revive_uapi::CallFlags::empty().bits(), 0u64, 100u32);
+
+		// Read-only call fails when modifying storage.
+		assert_err_ignore_postinfo!(
+			builder::call(addr_caller)
+				.data((&addr_subsequent_caller, input).encode())
+				.build(),
+			<Error<Test>>::ContractTrapped
+		);
+	});
+}
+
+#[test]
+fn read_only_call_works() {
+	let (binary_caller, _code_hash_caller) = compile_module("read_only_call").unwrap();
+	let (binary_callee, _code_hash_callee) = compile_module("dummy").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create both contracts: Constructors do nothing.
+		let Contract { addr: addr_caller, .. } =
+			builder::bare_instantiate(Code::Upload(binary_caller)).build_and_unwrap_contract();
+		let Contract { addr: addr_callee, .. } =
+			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
+
+		assert_ok!(builder::call(addr_caller).data(addr_callee.encode()).build());
+	});
+}
+
+#[test]
+fn create1_with_value_works() {
+	let (code, code_hash) = compile_module("create1_with_value").unwrap();
+	let value = 42;
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create the contract: Constructor does nothing.
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		// Call the contract: Deploys itself using create1 and the expected value
+		assert_ok!(builder::call(addr).value(value).data(code_hash.encode()).build());
+
+		// We should see the expected balance at the expected account
+		let address = crate::address::create1(&addr, 1);
+		let account_id = <Test as Config>::AddressMapper::to_account_id(&address);
+		let usable_balance = <Test as Config>::Currency::usable_balance(&account_id);
+		assert_eq!(usable_balance, value);
+	});
+}
+
+#[test]
+fn gas_price_api_works() {
+	let (code, _) = compile_module("gas_price").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create fixture: Constructor does nothing
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		// Call the contract: It echoes back the value returned by the gas price API.
+		let received = builder::bare_call(addr).build_and_unwrap_result();
+		assert_eq!(received.flags, ReturnFlags::empty());
+		assert_eq!(u64::from_le_bytes(received.data[..].try_into().unwrap()), u64::from(GAS_PRICE));
+	});
+}
+
+#[test]
+fn base_fee_api_works() {
+	let (code, _) = compile_module("base_fee").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create fixture: Constructor does nothing
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		// Call the contract: It echoes back the value returned by the base fee API.
+		let received = builder::bare_call(addr).build_and_unwrap_result();
+		assert_eq!(received.flags, ReturnFlags::empty());
+		assert_eq!(U256::from_little_endian(received.data[..].try_into().unwrap()), U256::zero());
+	});
+}
+
+#[test]
+fn call_data_size_api_works() {
+	let (code, _) = compile_module("call_data_size").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create fixture: Constructor does nothing
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		// Call the contract: It echoes back the value returned by the call data size API.
+		let received = builder::bare_call(addr).build_and_unwrap_result();
+		assert_eq!(received.flags, ReturnFlags::empty());
+		assert_eq!(u64::from_le_bytes(received.data.try_into().unwrap()), 0);
+
+		let received = builder::bare_call(addr).data(vec![1; 256]).build_and_unwrap_result();
+		assert_eq!(received.flags, ReturnFlags::empty());
+		assert_eq!(u64::from_le_bytes(received.data.try_into().unwrap()), 256);
+	});
+}
+
+#[test]
+fn call_data_copy_api_works() {
+	let (code, _) = compile_module("call_data_copy").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create fixture: Constructor does nothing
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		// Call fixture: Expects an input of [255; 32] and executes tests.
+		assert_ok!(builder::call(addr).data(vec![255; 32]).build());
+	});
+}
+
+#[test]
+fn static_data_limit_is_enforced() {
+	let (oom_rw_trailing, _) = compile_module("oom_rw_trailing").unwrap();
+	let (oom_rw_included, _) = compile_module("oom_rw_included").unwrap();
+	let (oom_ro, _) = compile_module("oom_ro").unwrap();
+
+	ExtBuilder::default().build().execute_with(|| {
+		let _ = Balances::set_balance(&ALICE, 1_000_000);
+
+		assert_err!(
+			Contracts::upload_code(
+				RuntimeOrigin::signed(ALICE),
+				oom_rw_trailing,
+				deposit_limit::<Test>(),
+			),
+			<Error<Test>>::StaticMemoryTooLarge
+		);
+
+		assert_err!(
+			Contracts::upload_code(
+				RuntimeOrigin::signed(ALICE),
+				oom_rw_included,
+				deposit_limit::<Test>(),
+			),
+			<Error<Test>>::BlobTooLarge
+		);
+
+		assert_err!(
+			Contracts::upload_code(RuntimeOrigin::signed(ALICE), oom_ro, deposit_limit::<Test>(),),
+			<Error<Test>>::BlobTooLarge
+		);
+	});
+}
+
+#[test]
+fn call_diverging_out_len_works() {
+	let (code, _) = compile_module("call_diverging_out_len").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create the contract: Constructor does nothing
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		// Call the contract: It will issue calls and deploys, asserting on
+		// correct output if the supplied output length was smaller than
+		// than what the callee returned.
+		assert_ok!(builder::call(addr).build());
+	});
+}
+
+#[test]
+fn chain_id_works() {
+	let (code, _) = compile_module("chain_id").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		let chain_id = U256::from(<Test as Config>::ChainId::get());
+		let received = builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_result();
+		assert_eq!(received.result.data, chain_id.encode());
+	});
+}
+
+#[test]
+fn call_data_load_api_works() {
+	let (code, _) = compile_module("call_data_load").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create fixture: Constructor does nothing
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		// Call the contract: It reads a byte for the offset and then returns
+		// what call data load returned using this byte as the offset.
+		let input = (3u8, U256::max_value(), U256::max_value()).encode();
+		let received = builder::bare_call(addr).data(input).build().result.unwrap();
+		assert_eq!(received.flags, ReturnFlags::empty());
+		assert_eq!(U256::from_little_endian(&received.data), U256::max_value());
+
+		// Edge case
+		let input = (2u8, U256::from(255).to_big_endian()).encode();
+		let received = builder::bare_call(addr).data(input).build().result.unwrap();
+		assert_eq!(received.flags, ReturnFlags::empty());
+		assert_eq!(U256::from_little_endian(&received.data), U256::from(65280));
+
+		// Edge case
+		let received = builder::bare_call(addr).data(vec![1]).build().result.unwrap();
+		assert_eq!(received.flags, ReturnFlags::empty());
+		assert_eq!(U256::from_little_endian(&received.data), U256::zero());
+
+		// OOB case
+		let input = (42u8).encode();
+		let received = builder::bare_call(addr).data(input).build().result.unwrap();
+		assert_eq!(received.flags, ReturnFlags::empty());
+		assert_eq!(U256::from_little_endian(&received.data), U256::zero());
+
+		// No calldata should return the zero value
+		let received = builder::bare_call(addr).build().result.unwrap();
+		assert_eq!(received.flags, ReturnFlags::empty());
+		assert_eq!(U256::from_little_endian(&received.data), U256::zero());
+	});
+}
+
+#[test]
+fn return_data_api_works() {
+	let (code_return_data_api, _) = compile_module("return_data_api").unwrap();
+	let (code_return_with_data, hash_return_with_data) =
+		compile_module("return_with_data").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Upload the io echoing fixture for later use
+		assert_ok!(Contracts::upload_code(
+			RuntimeOrigin::signed(ALICE),
+			code_return_with_data,
+			deposit_limit::<Test>(),
+		));
+
+		// Create fixture: Constructor does nothing
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code_return_data_api))
+			.build_and_unwrap_contract();
+
+		// Call the contract: It will issue calls and deploys, asserting on
+		assert_ok!(builder::call(addr)
+			.value(10 * 1024)
+			.data(hash_return_with_data.encode())
+			.build());
+	});
+}
+
+#[test]
+fn immutable_data_works() {
+	let (code, _) = compile_module("immutable_data").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		let data = [0xfe; 8];
+
+		// Create fixture: Constructor sets the immtuable data
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
+			.data(data.to_vec())
+			.build_and_unwrap_contract();
+
+		let contract = get_contract(&addr);
+		let account = <Test as Config>::AddressMapper::to_account_id(&addr);
+		let actual_deposit =
+			get_balance_on_hold(&HoldReason::StorageDepositReserve.into(), &account);
+
+		assert_eq!(contract.immutable_data_len(), data.len() as u32);
+
+		// Storing immmutable data charges storage deposit; verify it explicitly.
+		assert_eq!(actual_deposit, contract_base_deposit(&addr));
+
+		// make sure it is also recorded in the base deposit
+		assert_eq!(
+			get_balance_on_hold(&HoldReason::StorageDepositReserve.into(), &account),
+			contract.storage_base_deposit(),
+		);
+
+		// Call the contract: Asserts the input to equal the immutable data
+		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
+		);
+	});
+}
+
+#[test]
+fn origin_api_works() {
+	let (code, _) = compile_module("origin").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create fixture: Constructor does nothing
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		// Call the contract: Asserts the origin API to work as expected
+		assert_ok!(builder::call(addr).build());
+	});
+}
+
+#[test]
+fn to_account_id_works() {
+	let (code_hash_code, _) = compile_module("to_account_id").unwrap();
+
+	ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let _ = <Test as Config>::Currency::set_balance(&EVE, 1_000_000);
+
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code_hash_code)).build_and_unwrap_contract();
+
+		// mapped account
+		<Pallet<Test>>::map_account(RuntimeOrigin::signed(EVE)).unwrap();
+		let expected_mapped_account_id = &<Test as Config>::AddressMapper::to_account_id(&EVE_ADDR);
+		assert_ne!(
+			expected_mapped_account_id.encode()[20..32],
+			[0xEE; 12],
+			"fallback suffix found where none should be"
+		);
+		assert_ok!(builder::call(addr)
+			.data((EVE_ADDR, expected_mapped_account_id).encode())
+			.build());
+
+		// fallback for unmapped accounts
+		let expected_fallback_account_id =
+			&<Test as Config>::AddressMapper::to_account_id(&BOB_ADDR);
+		assert_eq!(
+			expected_fallback_account_id.encode()[20..32],
+			[0xEE; 12],
+			"no fallback suffix found where one should be"
+		);
+		assert_ok!(builder::call(addr)
+			.data((BOB_ADDR, expected_fallback_account_id).encode())
+			.build());
+	});
+}
+
+#[test]
+fn code_hash_works() {
+	use super::precompiles::NoInfo;
+	use crate::precompiles::{Precompile, EVM_REVERT};
+
+	let builtin_precompile = H160(NoInfo::<Test>::MATCHER.base_address());
+	let primitive_precompile = H160::from_low_u64_be(1);
+
+	let (code_hash_code, self_code_hash) = compile_module("code_hash").unwrap();
+	let (dummy_code, code_hash) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code_hash_code)).build_and_unwrap_contract();
+		let Contract { addr: dummy_addr, .. } =
+			builder::bare_instantiate(Code::Upload(dummy_code)).build_and_unwrap_contract();
+
+		// code hash of dummy contract
+		assert_ok!(builder::call(addr).data((dummy_addr, code_hash).encode()).build());
+		// code hash of itself
+		assert_ok!(builder::call(addr).data((addr, self_code_hash).encode()).build());
+		// code hash of primitive pre-compile (exist but have no bytecode)
+		assert_ok!(builder::call(addr)
+			.data((primitive_precompile, crate::exec::EMPTY_CODE_HASH).encode())
+			.build());
+		// code hash of normal pre-compile (do have a bytecode)
+		assert_ok!(builder::call(addr)
+			.data((builtin_precompile, sp_io::hashing::keccak_256(&EVM_REVERT)).encode())
+			.build());
+
+		// EOA doesn't exists
+		assert_err!(
+			builder::bare_call(addr)
+				.data((BOB_ADDR, crate::exec::EMPTY_CODE_HASH).encode())
+				.build()
+				.result,
+			Error::<Test>::ContractTrapped
+		);
+		// non-existing will return zero
+		assert_ok!(builder::call(addr).data((BOB_ADDR, H256::zero()).encode()).build());
+
+		// create EOA
+		let _ = <Test as Config>::Currency::set_balance(
+			&<Test as Config>::AddressMapper::to_account_id(&BOB_ADDR),
+			1_000_000,
+		);
+
+		// EOA returns empty code hash
+		assert_ok!(builder::call(addr)
+			.data((BOB_ADDR, crate::exec::EMPTY_CODE_HASH).encode())
+			.build());
+	});
+}
+
+#[test]
+fn code_size_works() {
+	let (tester_code, _) = compile_module("extcodesize").unwrap();
+	let tester_code_len = tester_code.len() as u64;
+
+	let (dummy_code, _) = compile_module("dummy").unwrap();
+	let dummy_code_len = dummy_code.len() as u64;
+
+	ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		let Contract { addr: tester_addr, .. } =
+			builder::bare_instantiate(Code::Upload(tester_code)).build_and_unwrap_contract();
+		let Contract { addr: dummy_addr, .. } =
+			builder::bare_instantiate(Code::Upload(dummy_code)).build_and_unwrap_contract();
+
+		// code size of another contract address
+		assert_ok!(builder::call(tester_addr).data((dummy_addr, dummy_code_len).encode()).build());
+
+		// code size of own contract address
+		assert_ok!(builder::call(tester_addr)
+			.data((tester_addr, tester_code_len).encode())
+			.build());
+
+		// code size of non contract accounts
+		assert_ok!(builder::call(tester_addr).data(([8u8; 20], 0u64).encode()).build());
+	});
+}
+
+#[test]
+fn origin_must_be_mapped() {
+	let (code, hash) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		<Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		<Test as Config>::Currency::set_balance(&EVE, 1_000_000);
+
+		let eve = RuntimeOrigin::signed(EVE);
+
+		// alice can instantiate as she doesn't need a mapping
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		// without a mapping eve can neither call nor instantiate
+		assert_err!(
+			builder::bare_call(addr).origin(eve.clone()).build().result,
+			<Error<Test>>::AccountUnmapped
+		);
+		assert_err!(
+			builder::bare_instantiate(Code::Existing(hash))
+				.origin(eve.clone())
+				.build()
+				.result,
+			<Error<Test>>::AccountUnmapped
+		);
+
+		// after mapping eve is usable as an origin
+		<Pallet<Test>>::map_account(eve.clone()).unwrap();
+		assert_ok!(builder::bare_call(addr).origin(eve.clone()).build().result);
+		assert_ok!(builder::bare_instantiate(Code::Existing(hash)).origin(eve).build().result);
+	});
+}
+
+#[test]
+fn mapped_address_works() {
+	let (code, _) = compile_module("terminate_and_send_to_argument").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		<Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// without a mapping everything will be send to the fallback account
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code.clone())).build_and_unwrap_contract();
+		assert_eq!(<Test as Config>::Currency::total_balance(&EVE_FALLBACK), 0);
+		builder::bare_call(addr).data(EVE_ADDR.encode()).build_and_unwrap_result();
+		assert_eq!(<Test as Config>::Currency::total_balance(&EVE_FALLBACK), 100);
+
+		// after mapping it will be sent to the real eve account
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+		// need some balance to pay for the map deposit
+		<Test as Config>::Currency::set_balance(&EVE, 1_000);
+		<Pallet<Test>>::map_account(RuntimeOrigin::signed(EVE)).unwrap();
+		builder::bare_call(addr).data(EVE_ADDR.encode()).build_and_unwrap_result();
+		assert_eq!(<Test as Config>::Currency::total_balance(&EVE_FALLBACK), 100);
+		assert_eq!(<Test as Config>::Currency::total_balance(&EVE), 1_100);
+	});
+}
+
+#[test]
+fn recovery_works() {
+	let (code, _) = compile_module("terminate_and_send_to_argument").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		<Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// eve puts her AccountId20 as argument to terminate but forgot to register
+		// her AccountId32 first so now the funds are trapped in her fallback account
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code.clone())).build_and_unwrap_contract();
+		assert_eq!(<Test as Config>::Currency::total_balance(&EVE), 0);
+		assert_eq!(<Test as Config>::Currency::total_balance(&EVE_FALLBACK), 0);
+		builder::bare_call(addr).data(EVE_ADDR.encode()).build_and_unwrap_result();
+		assert_eq!(<Test as Config>::Currency::total_balance(&EVE_FALLBACK), 100);
+		assert_eq!(<Test as Config>::Currency::total_balance(&EVE), 0);
+
+		let call = RuntimeCall::Balances(pallet_balances::Call::transfer_all {
+			dest: EVE,
+			keep_alive: false,
+		});
+
+		// she now uses the recovery function to move all funds from the fallback
+		// account to her real account
+		<Pallet<Test>>::dispatch_as_fallback_account(RuntimeOrigin::signed(EVE), Box::new(call))
+			.unwrap();
+		assert_eq!(<Test as Config>::Currency::total_balance(&EVE_FALLBACK), 0);
+		assert_eq!(<Test as Config>::Currency::total_balance(&EVE), 100);
+	});
+}
+
+#[test]
+fn skip_transfer_works() {
+	let (code_caller, _) = compile_module("call").unwrap();
+	let (code, _) = compile_module("store_call").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		<Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		<Test as Config>::Currency::set_balance(&BOB, 0);
+
+		// when gas is some (transfers enabled): bob has no money: fail
+		assert_err!(
+			Pallet::<Test>::dry_run_eth_transact(
+				GenericTransaction {
+					from: Some(BOB_ADDR),
+					input: code.clone().into(),
+					gas: Some(1u32.into()),
+					..Default::default()
+				},
+				Weight::MAX,
+				|_, _| 0u64,
+			),
+			EthTransactError::Message(format!(
+				"insufficient funds for gas * price + value: address {BOB_ADDR:?} have 0 (supplied gas 1)"
+			))
+		);
+
+		// no gas specified (all transfers are skipped): even without money bob can deploy
+		assert_ok!(Pallet::<Test>::dry_run_eth_transact(
+			GenericTransaction {
+				from: Some(BOB_ADDR),
+				input: code.clone().into(),
+				..Default::default()
+			},
+			Weight::MAX,
+			|_, _| 0u64,
+		));
+
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		let Contract { addr: caller_addr, .. } =
+			builder::bare_instantiate(Code::Upload(code_caller)).build_and_unwrap_contract();
+
+		// call directly: fails with enabled transfers
+		assert_err!(
+			Pallet::<Test>::dry_run_eth_transact(
+				GenericTransaction {
+					from: Some(BOB_ADDR),
+					to: Some(addr),
+					input: 0u32.encode().into(),
+					gas: Some(1u32.into()),
+					..Default::default()
+				},
+				Weight::MAX,
+				|_, _| 0u64,
+			),
+			EthTransactError::Message(format!(
+				"insufficient funds for gas * price + value: address {BOB_ADDR:?} have 0 (supplied gas 1)"
+			))
+		);
+
+		// fails to call through other contract
+		// we didn't roll back the storage changes done by the previous
+		// call. So the item already exists. We simply increase the size of
+		// the storage item to incur some deposits (which bob can't pay).
+		assert!(Pallet::<Test>::dry_run_eth_transact(
+			GenericTransaction {
+				from: Some(BOB_ADDR),
+				to: Some(caller_addr),
+				input: (1u32, &addr).encode().into(),
+				gas: Some(1u32.into()),
+				..Default::default()
+			},
+			Weight::MAX,
+			|_, _| 0u64,
+		)
+		.is_err(),);
+
+		// works when no gas is specified (skip transfer)
+		assert_ok!(Pallet::<Test>::dry_run_eth_transact(
+			GenericTransaction {
+				from: Some(BOB_ADDR),
+				to: Some(addr),
+				input: 2u32.encode().into(),
+				..Default::default()
+			},
+			Weight::MAX,
+			|_, _| 0u64,
+		));
+
+		// call through contract works when transfers are skipped
+		assert_ok!(Pallet::<Test>::dry_run_eth_transact(
+			GenericTransaction {
+				from: Some(BOB_ADDR),
+				to: Some(caller_addr),
+				input: (3u32, &addr).encode().into(),
+				..Default::default()
+			},
+			Weight::MAX,
+			|_, _| 0u64,
+		));
+
+		// works with transfers enabled if we don't incur a storage cost
+		// we shrink the item so its actually a refund
+		assert_ok!(Pallet::<Test>::dry_run_eth_transact(
+			GenericTransaction {
+				from: Some(BOB_ADDR),
+				to: Some(caller_addr),
+				input: (2u32, &addr).encode().into(),
+				gas: Some(1u32.into()),
+				..Default::default()
+			},
+			Weight::MAX,
+			|_, _| 0u64,
+		));
+
+		// fails when trying to increase the storage item size
+		assert!(Pallet::<Test>::dry_run_eth_transact(
+			GenericTransaction {
+				from: Some(BOB_ADDR),
+				to: Some(caller_addr),
+				input: (3u32, &addr).encode().into(),
+				gas: Some(1u32.into()),
+				..Default::default()
+			},
+			Weight::MAX,
+			|_, _| 0u64,
+		)
+		.is_err());
+	});
+}
+
+#[test]
+fn gas_limit_api_works() {
+	let (code, _) = compile_module("gas_limit").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create fixture: Constructor does nothing
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		// Call the contract: It echoes back the value returned by the gas limit API.
+		let received = builder::bare_call(addr).build_and_unwrap_result();
+		assert_eq!(received.flags, ReturnFlags::empty());
+		assert_eq!(
+			u64::from_le_bytes(received.data[..].try_into().unwrap()),
+			<Test as frame_system::Config>::BlockWeights::get().max_block.ref_time()
+		);
+	});
+}
+
+#[test]
+fn unknown_syscall_rejected() {
+	let (code, _) = compile_module("unknown_syscall").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		<Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		assert_err!(
+			builder::bare_instantiate(Code::Upload(code)).build().result,
+			<Error<Test>>::CodeRejected,
+		)
+	});
+}
+
+#[test]
+fn unstable_interface_rejected() {
+	let (code, _) = compile_module("unstable_interface").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		<Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		Test::set_unstable_interface(false);
+		assert_err!(
+			builder::bare_instantiate(Code::Upload(code.clone())).build().result,
+			<Error<Test>>::CodeRejected,
+		);
+
+		Test::set_unstable_interface(true);
+		assert_ok!(builder::bare_instantiate(Code::Upload(code)).build().result);
+	});
+}
+
+#[test]
+fn tracing_works_for_transfers() {
+	ExtBuilder::default().build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000);
+		let mut tracer = CallTracer::new(Default::default(), |_| U256::zero());
+		trace(&mut tracer, || {
+			builder::bare_call(BOB_ADDR).evm_value(10.into()).build_and_unwrap_result();
+		});
+
+		let trace = tracer.collect_trace();
+		assert_eq!(
+			trace,
+			Some(CallTrace {
+				from: ALICE_ADDR,
+				to: BOB_ADDR,
+				value: Some(U256::from(10)),
+				call_type: CallType::Call,
+				..Default::default()
+			})
+		)
+	});
+}
+
+#[test]
+fn call_tracing_works() {
+	use crate::evm::*;
+	use CallType::*;
+	let (code, _code_hash) = compile_module("tracing").unwrap();
+	let (binary_callee, _) = compile_module("tracing_callee").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000);
+
+		let Contract { addr: addr_callee, .. } =
+			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
+
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).evm_value(10_000_000.into()).build_and_unwrap_contract();
+
+
+		let tracer_configs = vec![
+			 CallTracerConfig{ with_logs: false, only_top_call: false},
+			 CallTracerConfig{ with_logs: false, only_top_call: false},
+			 CallTracerConfig{ with_logs: false, only_top_call: true},
+		];
+
+		// Verify that the first trace report the same weight reported by bare_call
+		// TODO: fix tracing ( https://github.com/paritytech/polkadot-sdk/issues/8362 )
+		/*
+		let mut tracer = CallTracer::new(false, |w| w);
+		let gas_used = trace(&mut tracer, || {
+			builder::bare_call(addr).data((3u32, addr_callee).encode()).build().gas_consumed
+		});
+		let trace = tracer.collect_trace().unwrap();
+		assert_eq!(&trace.gas_used, &gas_used);
+		*/
+
+		// Discarding gas usage, check that traces reported are correct
+		for config in tracer_configs {
+			let logs = if config.with_logs {
+				vec![
+					CallLog {
+						address: addr,
+						topics: Default::default(),
+						data: b"before".to_vec().into(),
+						position: 0,
+					},
+					CallLog {
+						address: addr,
+						topics: Default::default(),
+						data: b"after".to_vec().into(),
+						position: 1,
+					},
+				]
+			} else {
+				vec![]
+			};
+
+			let calls = if config.only_top_call {
+				vec![]
+			} else {
+				vec![
+						CallTrace {
+							from: addr,
+							to: addr_callee,
+							input: 2u32.encode().into(),
+							output: hex_literal::hex!(
+										"08c379a00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001a546869732066756e6374696f6e20616c77617973206661696c73000000000000"
+									).to_vec().into(),
+							revert_reason: Some("revert: This function always fails".to_string()),
+							error: Some("execution reverted".to_string()),
+							call_type: Call,
+							value: Some(U256::from(0)),
+							..Default::default()
+						},
+						CallTrace {
+							from: addr,
+							to: addr,
+							input: (2u32, addr_callee).encode().into(),
+							call_type: Call,
+							logs: logs.clone(),
+							value: Some(U256::from(0)),
+							calls: vec![
+								CallTrace {
+									from: addr,
+									to: addr_callee,
+									input: 1u32.encode().into(),
+									output: Default::default(),
+									error: Some("ContractTrapped".to_string()),
+									call_type: Call,
+									value: Some(U256::from(0)),
+									..Default::default()
+								},
+								CallTrace {
+									from: addr,
+									to: addr,
+									input: (1u32, addr_callee).encode().into(),
+									call_type: Call,
+									logs: logs.clone(),
+									value: Some(U256::from(0)),
+									calls: vec![
+										CallTrace {
+											from: addr,
+											to: addr_callee,
+											input: 0u32.encode().into(),
+											output: 0u32.to_le_bytes().to_vec().into(),
+											call_type: Call,
+											value: Some(U256::from(0)),
+											..Default::default()
+										},
+										CallTrace {
+											from: addr,
+											to: addr,
+											input: (0u32, addr_callee).encode().into(),
+											call_type: Call,
+											value: Some(U256::from(0)),
+											calls: vec![
+												CallTrace {
+													from: addr,
+													to: BOB_ADDR,
+													value: Some(U256::from(100)),
+													call_type: CallType::Call,
+													..Default::default()
+												}
+											],
+											..Default::default()
+										},
+									],
+									..Default::default()
+								},
+							],
+							..Default::default()
+						},
+					]
+			};
+
+			let mut tracer = CallTracer::new(config, |_| U256::zero());
+			trace(&mut tracer, || {
+				builder::bare_call(addr).data((3u32, addr_callee).encode()).build()
+			});
+
+			let trace = tracer.collect_trace();
+			let expected_trace = CallTrace {
+					from: ALICE_ADDR,
+					to: addr,
+					input: (3u32, addr_callee).encode().into(),
+					call_type: Call,
+					logs: logs.clone(),
+					value: Some(U256::from(0)),
+					calls: calls,
+					..Default::default()
+				};
+
+			assert_eq!(
+				trace,
+				expected_trace.into(),
+			);
+		}
+	});
+}
+
+#[test]
+fn create_call_tracing_works() {
+	use crate::evm::*;
+	let (code, code_hash) = compile_module("create2_with_value").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000);
+
+		let mut tracer = CallTracer::new(Default::default(), |_| U256::zero());
+
+		let Contract { addr, .. } = trace(&mut tracer, || {
+			builder::bare_instantiate(Code::Upload(code.clone()))
+				.evm_value(100.into())
+				.salt(None)
+				.build_and_unwrap_contract()
+		});
+
+		let call_trace = tracer.collect_trace().unwrap();
+		assert_eq!(
+			call_trace,
+			CallTrace {
+				from: ALICE_ADDR,
+				to: addr,
+				value: Some(100.into()),
+				input: Bytes(code.clone()),
+				call_type: CallType::Create,
+				..Default::default()
+			}
+		);
+
+		let mut tracer = CallTracer::new(Default::default(), |_| U256::zero());
+		let data = b"garbage";
+		let input = (code_hash, data).encode();
+		trace(&mut tracer, || {
+			assert_ok!(builder::call(addr).data(input.clone()).build());
+		});
+
+		let call_trace = tracer.collect_trace().unwrap();
+		let child_addr = crate::address::create2(&addr, &code, data, &[1u8; 32]);
+
+		assert_eq!(
+			call_trace,
+			CallTrace {
+				from: ALICE_ADDR,
+				to: addr,
+				value: Some(0.into()),
+				input: input.clone().into(),
+				calls: vec![CallTrace {
+					from: addr,
+					input: input.clone().into(),
+					to: child_addr,
+					value: Some(0.into()),
+					call_type: CallType::Create2,
+					..Default::default()
+				},],
+				..Default::default()
+			}
+		);
+	});
+}
+
+#[test]
+fn prestate_tracing_works() {
+	use crate::evm::*;
+	use alloc::collections::BTreeMap;
+
+	let (dummy_code, _) = compile_module("dummy").unwrap();
+	let (code, _) = compile_module("tracing").unwrap();
+	let (callee_code, _) = compile_module("tracing_callee").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000);
+
+		let Contract { addr: addr_callee, .. } =
+			builder::bare_instantiate(Code::Upload(callee_code.clone()))
+				.build_and_unwrap_contract();
+
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code.clone()))
+			.native_value(10)
+			.build_and_unwrap_contract();
+
+		// redact balance so that tests are resilient to weight changes
+		let alice_redacted_balance = Some(U256::from(1));
+
+		let test_cases: Vec<(Box<dyn FnOnce()>, _, _)> = vec![
+			(
+				Box::new(|| {
+					builder::bare_call(addr)
+						.data((3u32, addr_callee).encode())
+						.build_and_unwrap_result();
+				}),
+				PrestateTracerConfig {
+					diff_mode: false,
+					disable_storage: false,
+					disable_code: false,
+				},
+				PrestateTrace::Prestate(BTreeMap::from([
+					(
+						ALICE_ADDR,
+						PrestateTraceInfo {
+							balance: alice_redacted_balance,
+							nonce: Some(2),
+							..Default::default()
+						},
+					),
+					(
+						BOB_ADDR,
+						PrestateTraceInfo { balance: Some(U256::from(0u64)), ..Default::default() },
+					),
+					(
+						addr_callee,
+						PrestateTraceInfo {
+							balance: Some(U256::from(0u64)),
+							code: Some(Bytes(callee_code.clone())),
+							nonce: Some(1),
+							..Default::default()
+						},
+					),
+					(
+						addr,
+						PrestateTraceInfo {
+							balance: Some(U256::from(10_000_000u64)),
+							code: Some(Bytes(code.clone())),
+							nonce: Some(1),
+							..Default::default()
+						},
+					),
+				])),
+			),
+			(
+				Box::new(|| {
+					builder::bare_call(addr)
+						.data((3u32, addr_callee).encode())
+						.build_and_unwrap_result();
+				}),
+				PrestateTracerConfig {
+					diff_mode: true,
+					disable_storage: false,
+					disable_code: false,
+				},
+				PrestateTrace::DiffMode {
+					pre: BTreeMap::from([
+						(
+							BOB_ADDR,
+							PrestateTraceInfo {
+								balance: Some(U256::from(100u64)),
+								..Default::default()
+							},
+						),
+						(
+							addr,
+							PrestateTraceInfo {
+								balance: Some(U256::from(9_999_900u64)),
+								code: Some(Bytes(code.clone())),
+								nonce: Some(1),
+								..Default::default()
+							},
+						),
+					]),
+					post: BTreeMap::from([
+						(
+							BOB_ADDR,
+							PrestateTraceInfo {
+								balance: Some(U256::from(200u64)),
+								..Default::default()
+							},
+						),
+						(
+							addr,
+							PrestateTraceInfo {
+								balance: Some(U256::from(9_999_800u64)),
+								..Default::default()
+							},
+						),
+					]),
+				},
+			),
+			(
+				Box::new(|| {
+					builder::bare_instantiate(Code::Upload(dummy_code.clone()))
+						.salt(None)
+						.build_and_unwrap_result();
+				}),
+				PrestateTracerConfig {
+					diff_mode: true,
+					disable_storage: false,
+					disable_code: false,
+				},
+				PrestateTrace::DiffMode {
+					pre: BTreeMap::from([(
+						ALICE_ADDR,
+						PrestateTraceInfo {
+							balance: alice_redacted_balance,
+							nonce: Some(2),
+							..Default::default()
+						},
+					)]),
+					post: BTreeMap::from([
+						(
+							ALICE_ADDR,
+							PrestateTraceInfo {
+								balance: alice_redacted_balance,
+								nonce: Some(3),
+								..Default::default()
+							},
+						),
+						(
+							create1(&ALICE_ADDR, 1),
+							PrestateTraceInfo {
+								code: Some(dummy_code.clone().into()),
+								balance: Some(U256::from(0)),
+								nonce: Some(1),
+								..Default::default()
+							},
+						),
+					]),
+				},
+			),
+		];
+
+		for (exec_call, config, expected_trace) in test_cases.into_iter() {
+			let mut tracer = PrestateTracer::<Test>::new(config);
+			trace(&mut tracer, || {
+				exec_call();
+			});
+
+			let mut trace = tracer.collect_trace();
+
+			// redact alice balance
+			match trace {
+				PrestateTrace::DiffMode { ref mut pre, ref mut post } => {
+					pre.get_mut(&ALICE_ADDR).map(|info| {
+						info.balance = alice_redacted_balance;
+					});
+					post.get_mut(&ALICE_ADDR).map(|info| {
+						info.balance = alice_redacted_balance;
+					});
+				},
+				PrestateTrace::Prestate(ref mut pre) => {
+					pre.get_mut(&ALICE_ADDR).map(|info| {
+						info.balance = alice_redacted_balance;
+					});
+				},
+			}
+
+			assert_eq!(trace, expected_trace);
+		}
+	});
+}
+
+#[test]
+fn unknown_precompiles_revert() {
+	let (code, _code_hash) = compile_module("read_only_call").unwrap();
+
+	ExtBuilder::default().build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		let cases: Vec<(H160, Box<dyn FnOnce(_)>)> = vec![(
+			H160::from_low_u64_be(0x0a),
+			Box::new(|result| {
+				assert_err!(result, <Error<Test>>::UnsupportedPrecompileAddress);
+			}),
+		)];
+
+		for (callee_addr, assert_result) in cases {
+			let result =
+				builder::bare_call(addr).data((callee_addr, [0u8; 0]).encode()).build().result;
+			assert_result(result);
+		}
+	});
+}
+
+#[test]
+fn pure_precompile_works() {
+	use hex_literal::hex;
+
+	let cases = vec![
+		(
+			"ECRecover",
+			H160::from_low_u64_be(1),
+			hex!("18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c000000000000000000000000000000000000000000000000000000000000001c73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549").to_vec(),
+			hex!("000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b").to_vec(),
+		),
+		(
+			"Sha256",
+			H160::from_low_u64_be(2),
+			hex!("ec07171c4f0f0e2b").to_vec(),
+			hex!("d0591ea667763c69a5f5a3bae657368ea63318b2c9c8349cccaf507e3cbd7c7a").to_vec(),
+		),
+		(
+			"Ripemd160",
+			H160::from_low_u64_be(3),
+			hex!("ec07171c4f0f0e2b").to_vec(),
+			hex!("000000000000000000000000a9c5ebaf7589fd8acfd542c3a008956de84fbeb7").to_vec(),
+		),
+		(
+			"Identity",
+			H160::from_low_u64_be(4),
+			[42u8; 128].to_vec(),
+			[42u8; 128].to_vec(),
+		),
+		(
+			"Modexp",
+			H160::from_low_u64_be(5),
+			hex!("00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f").to_vec(),
+			hex!("0000000000000000000000000000000000000000000000000000000000000001").to_vec(),
+		),
+		(
+			"Bn128Add",
+			H160::from_low_u64_be(6),
+			hex!("18b18acfb4c2c30276db5411368e7185b311dd124691610c5d3b74034e093dc9063c909c4720840cb5134cb9f59fa749755796819658d32efc0d288198f3726607c2b7f58a84bd6145f00c9c2bc0bb1a187f20ff2c92963a88019e7c6a014eed06614e20c147e940f2d70da3f74c9a17df361706a4485c742bd6788478fa17d7").to_vec(),
+			hex!("2243525c5efd4b9c3d3c45ac0ca3fe4dd85e830a4ce6b65fa1eeaee202839703301d1d33be6da8e509df21cc35964723180eed7532537db9ae5e7d48f195c915").to_vec(),
+		),
+		(
+			"Bn128Mul",
+			H160::from_low_u64_be(7),
+			hex!("2bd3e6d0f3b142924f5ca7b49ce5b9d54c4703d7ae5648e61d02268b1a0a9fb721611ce0a6af85915e2f1d70300909ce2e49dfad4a4619c8390cae66cefdb20400000000000000000000000000000000000000000000000011138ce750fa15c2").to_vec(),
+			hex!("070a8d6a982153cae4be29d434e8faef8a47b274a053f5a4ee2a6c9c13c31e5c031b8ce914eba3a9ffb989f9cdd5b0f01943074bf4f0f315690ec3cec6981afc").to_vec(),
+		),
+		(
+			"Bn128Pairing",
+			H160::from_low_u64_be(8),
+			hex!("1c76476f4def4bb94541d57ebba1193381ffa7aa76ada664dd31c16024c43f593034dd2920f673e204fee2811c678745fc819b55d3e9d294e45c9b03a76aef41209dd15ebff5d46c4bd888e51a93cf99a7329636c63514396b4a452003a35bf704bf11ca01483bfa8b34b43561848d28905960114c8ac04049af4b6315a416782bb8324af6cfc93537a2ad1a445cfd0ca2a71acd7ac41fadbf933c2a51be344d120a2a4cf30c1bf9845f20c6fe39e07ea2cce61f0c9bb048165fe5e4de877550111e129f1cf1097710d41c4ac70fcdfa5ba2023c6ff1cbeac322de49d1b6df7c2032c61a830e3c17286de9462bf242fca2883585b93870a73853face6a6bf411198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa").to_vec(),
+			hex!("0000000000000000000000000000000000000000000000000000000000000001").to_vec(),
+		),
+		(
+			"Blake2F",
+			H160::from_low_u64_be(9),
+			hex!("0000000048c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b61626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000001").to_vec(),
+			hex!("08c9bcf367e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d282e6ad7f520e511f6c3e2b8c68059b9442be0454267ce079217e1319cde05b").to_vec(),
+		),
+	];
+
+	for (description, precompile_addr, input, output) in cases {
+		let (code, _code_hash) = compile_module("call_and_return").unwrap();
+		ExtBuilder::default().build().execute_with(|| {
+			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+			let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
+				.native_value(1_000)
+				.build_and_unwrap_contract();
+
+			let result = builder::bare_call(addr)
+				.data(
+					(&precompile_addr, 100u64)
+						.encode()
+						.into_iter()
+						.chain(input)
+						.collect::<Vec<_>>(),
+				)
+				.build_and_unwrap_result();
+
+			assert_eq!(
+				Pallet::<Test>::evm_balance(&precompile_addr),
+				U256::from(100),
+				"{description}: unexpected balance"
+			);
+			assert_eq!(
+				alloy_core::hex::encode(result.data),
+				alloy_core::hex::encode(output),
+				"{description} Unexpected output for precompile: {precompile_addr:?}",
+			);
+			assert_eq!(result.flags, ReturnFlags::empty());
+		});
+	}
+}
+
+#[test]
+fn precompiles_work() {
+	use super::precompiles::{INoInfo, NoInfo};
+	use crate::precompiles::Precompile;
+	use alloy_core::sol_types::{Panic, PanicKind, Revert, SolError, SolInterface, SolValue};
+
+	let precompile_addr = H160(NoInfo::<Test>::MATCHER.base_address());
+
+	let cases = vec![
+		(
+			INoInfo::INoInfoCalls::identity(INoInfo::identityCall { number: 42u64.into() })
+				.abi_encode(),
+			42u64.abi_encode(),
+			RuntimeReturnCode::Success,
+		),
+		(
+			INoInfo::INoInfoCalls::reverts(INoInfo::revertsCall { error: "panic".to_string() })
+				.abi_encode(),
+			Revert::from("panic").abi_encode(),
+			RuntimeReturnCode::CalleeReverted,
+		),
+		(
+			INoInfo::INoInfoCalls::panics(INoInfo::panicsCall {}).abi_encode(),
+			Panic::from(PanicKind::Assert).abi_encode(),
+			RuntimeReturnCode::CalleeReverted,
+		),
+		(
+			INoInfo::INoInfoCalls::errors(INoInfo::errorsCall {}).abi_encode(),
+			Vec::new(),
+			RuntimeReturnCode::CalleeTrapped,
+		),
+		// passing non decodeable input reverts with solidity panic
+		(
+			b"invalid".to_vec(),
+			Panic::from(PanicKind::ResourceError).abi_encode(),
+			RuntimeReturnCode::CalleeReverted,
+		),
+	];
+
+	for (input, output, error_code) in cases {
+		let (code, _code_hash) = compile_module("call_and_returncode").unwrap();
+		ExtBuilder::default().build().execute_with(|| {
+			let id = <Test as Config>::AddressMapper::to_account_id(&precompile_addr);
+			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+			let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
+				.native_value(1000)
+				.build_and_unwrap_contract();
+
+			let result = builder::bare_call(addr)
+				.data(
+					(&precompile_addr, 0u64).encode().into_iter().chain(input).collect::<Vec<_>>(),
+				)
+				.build_and_unwrap_result();
+
+			// no account or contract info should be created for a NoInfo pre-compile
+			assert!(get_contract_checked(&precompile_addr).is_none());
+			assert!(!System::account_exists(&id));
+			assert_eq!(Pallet::<Test>::evm_balance(&precompile_addr), U256::zero());
+
+			assert_eq!(result.flags, ReturnFlags::empty());
+			assert_eq!(u32::from_le_bytes(result.data[..4].try_into().unwrap()), error_code as u32);
+			assert_eq!(
+				&result.data[4..],
+				&output,
+				"Unexpected output for precompile: {precompile_addr:?}",
+			);
+		});
+	}
+}
+
+#[test]
+fn precompiles_with_info_creates_contract() {
+	use super::precompiles::{IWithInfo, WithInfo};
+	use crate::precompiles::Precompile;
+	use alloy_core::sol_types::SolInterface;
+
+	let precompile_addr = H160(WithInfo::<Test>::MATCHER.base_address());
+
+	let cases = vec![(
+		IWithInfo::IWithInfoCalls::dummy(IWithInfo::dummyCall {}).abi_encode(),
+		Vec::<u8>::new(),
+		RuntimeReturnCode::Success,
+	)];
+
+	for (input, output, error_code) in cases {
+		let (code, _code_hash) = compile_module("call_and_returncode").unwrap();
+		ExtBuilder::default().build().execute_with(|| {
+			let id = <Test as Config>::AddressMapper::to_account_id(&precompile_addr);
+			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+			let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
+				.native_value(1000)
+				.build_and_unwrap_contract();
+
+			let result = builder::bare_call(addr)
+				.data(
+					(&precompile_addr, 0u64).encode().into_iter().chain(input).collect::<Vec<_>>(),
+				)
+				.build_and_unwrap_result();
+
+			// a pre-compile with contract info should create an account on first call
+			assert!(get_contract_checked(&precompile_addr).is_some());
+			assert!(System::account_exists(&id));
+			assert_eq!(Pallet::<Test>::evm_balance(&precompile_addr), U256::from(0));
+
+			assert_eq!(result.flags, ReturnFlags::empty());
+			assert_eq!(u32::from_le_bytes(result.data[..4].try_into().unwrap()), error_code as u32);
+			assert_eq!(
+				&result.data[4..],
+				&output,
+				"Unexpected output for precompile: {precompile_addr:?}",
+			);
+		});
+	}
+}
+
+#[test]
+fn bump_nonce_once_works() {
+	let (code, hash) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		frame_system::Account::<Test>::mutate(&ALICE, |account| account.nonce = 1);
+
+		let _ = <Test as Config>::Currency::set_balance(&BOB, 1_000_000);
+		frame_system::Account::<Test>::mutate(&BOB, |account| account.nonce = 1);
+
+		builder::bare_instantiate(Code::Upload(code.clone()))
+			.origin(RuntimeOrigin::signed(ALICE))
+			.bump_nonce(BumpNonce::Yes)
+			.salt(None)
+			.build_and_unwrap_result();
+		assert_eq!(System::account_nonce(&ALICE), 2);
+
+		// instantiate again is ok
+		let result = builder::bare_instantiate(Code::Existing(hash))
+			.origin(RuntimeOrigin::signed(ALICE))
+			.bump_nonce(BumpNonce::Yes)
+			.salt(None)
+			.build()
+			.result;
+		assert!(result.is_ok());
+
+		builder::bare_instantiate(Code::Upload(code.clone()))
+			.origin(RuntimeOrigin::signed(BOB))
+			.bump_nonce(BumpNonce::No)
+			.salt(None)
+			.build_and_unwrap_result();
+		assert_eq!(System::account_nonce(&BOB), 1);
+
+		// instantiate again should fail
+		let err = builder::bare_instantiate(Code::Upload(code))
+			.origin(RuntimeOrigin::signed(BOB))
+			.bump_nonce(BumpNonce::No)
+			.salt(None)
+			.build()
+			.result
+			.unwrap_err();
+
+		assert_eq!(err, <Error<Test>>::DuplicateContract.into());
+	});
+}
+
+#[test]
+fn code_size_for_precompiles_works() {
+	use super::precompiles::NoInfo;
+	use crate::precompiles::Precompile;
+
+	let builtin_precompile = H160(NoInfo::<Test>::MATCHER.base_address());
+	let primitive_precompile = H160::from_low_u64_be(1);
+
+	let (code, _code_hash) = compile_module("extcodesize").unwrap();
+	ExtBuilder::default().build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
+			.native_value(1000)
+			.build_and_unwrap_contract();
+
+		// the primitive pre-compiles return 0 code size on eth
+		builder::bare_call(addr)
+			.data((&primitive_precompile, 0u64).encode())
+			.build_and_unwrap_result();
+
+		// other precompiles should return the minimal evm revert code
+		builder::bare_call(addr)
+			.data((&builtin_precompile, 5u64).encode())
+			.build_and_unwrap_result();
+	});
+}

From b45b1a2f88d979d0f12b01ab1a09b968742b8641 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Thu, 24 Jul 2025 21:03:10 +0000
Subject: [PATCH 081/186] move back fixture to fixtures folder and generate
 them from build.rs

disabled AddressPredictor for now
---
 Cargo.lock                                    |  11 +-
 Cargo.toml                                    |   2 -
 .../assets/asset-hub-westend/tests/tests.rs   |  25 ++-
 substrate/frame/revive/Cargo.toml             |   1 -
 .../frame/revive/fixtures-solidity/Cargo.toml |  21 --
 .../frame/revive/fixtures-solidity/README.md  |   3 -
 .../fixtures-solidity/build_fixtures.sh       |   9 -
 .../fixtures-solidity/contracts/Crypto.sol    |   9 -
 .../contracts/build/AddressPredictor.bin      |   1 -
 .../build/AddressPredictor.bin-runtime        |   1 -
 .../AddressPredictor.sol:AddressPredictor.pvm | Bin 9884 -> 0 bytes
 .../build/AddressPredictor.sol:Predicted.pvm  | Bin 2032 -> 0 bytes
 .../contracts/build/Crypto.sol:TestSha3.pvm   | Bin 2474 -> 0 bytes
 .../contracts/build/Flipper.bin               |   1 -
 .../contracts/build/Flipper.bin-runtime       |   1 -
 .../contracts/build/Flipper.sol:Flipper.pvm   | Bin 1680 -> 0 bytes
 .../contracts/build/Playground.bin            |   1 -
 .../contracts/build/Playground.bin-runtime    |   1 -
 .../build/Playground.sol:Playground.pvm       | Bin 2384 -> 0 bytes
 .../contracts/build/Predicted.bin             |   1 -
 .../contracts/build/Predicted.bin-runtime     |   1 -
 .../contracts/build/TestSha3.bin              |   1 -
 .../contracts/build/TestSha3.bin-runtime      |   1 -
 .../revive/fixtures-solidity/src/contracts.rs |  61 -----
 .../frame/revive/fixtures-solidity/src/lib.rs |  20 --
 substrate/frame/revive/fixtures/Cargo.toml    |   4 +-
 substrate/frame/revive/fixtures/build.rs      | 212 ++++++++++++++++--
 .../contracts/AddressPredictor.sol            |   2 +-
 .../contracts/BlockInfo.sol}                  |   4 +-
 .../revive/fixtures/contracts/Fibonacci.sol   |  11 +
 .../contracts/Flipper.sol                     |   0
 .../revive/fixtures/contracts/System.sol      |   9 +
 .../revive/fixtures/contracts/dummy.polkavm   | Bin 1726 -> 0 bytes
 .../frame/revive/fixtures/contracts/dummy.sol |  14 --
 .../revive/fixtures/contracts/fake_erc20.sol  |  54 -----
 .../{contracts => erc20}/erc20.polkavm        | Bin
 .../fixtures/{contracts => erc20}/erc20.sol   |   0
 .../expensive_erc20.polkavm                   | Bin
 .../{contracts => erc20}/expensive_erc20.sol  |   0
 .../{contracts => erc20}/fake_erc20.polkavm   | Bin
 substrate/frame/revive/fixtures/src/lib.rs    |  36 ++-
 substrate/frame/revive/src/impl_fungibles.rs  |  11 +-
 substrate/frame/revive/src/tests.rs           |   7 +-
 .../frame/revive/src/tests/block_info.rs      |  57 +++++
 substrate/frame/revive/src/tests/evm.rs       |  50 ++++-
 .../revive/src/tests/{common.rs => system.rs} |  60 ++---
 46 files changed, 407 insertions(+), 296 deletions(-)
 delete mode 100644 substrate/frame/revive/fixtures-solidity/Cargo.toml
 delete mode 100644 substrate/frame/revive/fixtures-solidity/README.md
 delete mode 100755 substrate/frame/revive/fixtures-solidity/build_fixtures.sh
 delete mode 100644 substrate/frame/revive/fixtures-solidity/contracts/Crypto.sol
 delete mode 100644 substrate/frame/revive/fixtures-solidity/contracts/build/AddressPredictor.bin
 delete mode 100644 substrate/frame/revive/fixtures-solidity/contracts/build/AddressPredictor.bin-runtime
 delete mode 100644 substrate/frame/revive/fixtures-solidity/contracts/build/AddressPredictor.sol:AddressPredictor.pvm
 delete mode 100644 substrate/frame/revive/fixtures-solidity/contracts/build/AddressPredictor.sol:Predicted.pvm
 delete mode 100644 substrate/frame/revive/fixtures-solidity/contracts/build/Crypto.sol:TestSha3.pvm
 delete mode 100644 substrate/frame/revive/fixtures-solidity/contracts/build/Flipper.bin
 delete mode 100644 substrate/frame/revive/fixtures-solidity/contracts/build/Flipper.bin-runtime
 delete mode 100644 substrate/frame/revive/fixtures-solidity/contracts/build/Flipper.sol:Flipper.pvm
 delete mode 100644 substrate/frame/revive/fixtures-solidity/contracts/build/Playground.bin
 delete mode 100644 substrate/frame/revive/fixtures-solidity/contracts/build/Playground.bin-runtime
 delete mode 100644 substrate/frame/revive/fixtures-solidity/contracts/build/Playground.sol:Playground.pvm
 delete mode 100644 substrate/frame/revive/fixtures-solidity/contracts/build/Predicted.bin
 delete mode 100644 substrate/frame/revive/fixtures-solidity/contracts/build/Predicted.bin-runtime
 delete mode 100644 substrate/frame/revive/fixtures-solidity/contracts/build/TestSha3.bin
 delete mode 100644 substrate/frame/revive/fixtures-solidity/contracts/build/TestSha3.bin-runtime
 delete mode 100644 substrate/frame/revive/fixtures-solidity/src/contracts.rs
 delete mode 100644 substrate/frame/revive/fixtures-solidity/src/lib.rs
 rename substrate/frame/revive/{fixtures-solidity => fixtures}/contracts/AddressPredictor.sol (97%)
 rename substrate/frame/revive/{fixtures-solidity/contracts/Playground.sol => fixtures/contracts/BlockInfo.sol} (76%)
 create mode 100644 substrate/frame/revive/fixtures/contracts/Fibonacci.sol
 rename substrate/frame/revive/{fixtures-solidity => fixtures}/contracts/Flipper.sol (100%)
 create mode 100644 substrate/frame/revive/fixtures/contracts/System.sol
 delete mode 100644 substrate/frame/revive/fixtures/contracts/dummy.polkavm
 delete mode 100644 substrate/frame/revive/fixtures/contracts/dummy.sol
 delete mode 100644 substrate/frame/revive/fixtures/contracts/fake_erc20.sol
 rename substrate/frame/revive/fixtures/{contracts => erc20}/erc20.polkavm (100%)
 rename substrate/frame/revive/fixtures/{contracts => erc20}/erc20.sol (100%)
 rename substrate/frame/revive/fixtures/{contracts => erc20}/expensive_erc20.polkavm (100%)
 rename substrate/frame/revive/fixtures/{contracts => erc20}/expensive_erc20.sol (100%)
 rename substrate/frame/revive/fixtures/{contracts => erc20}/fake_erc20.polkavm (100%)
 create mode 100644 substrate/frame/revive/src/tests/block_info.rs
 rename substrate/frame/revive/src/tests/{common.rs => system.rs} (75%)

diff --git a/Cargo.lock b/Cargo.lock
index 748f69b0ac56..ae58b3e01a6d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -13179,7 +13179,6 @@ dependencies = [
  "pallet-balances",
  "pallet-proxy",
  "pallet-revive-fixtures",
- "pallet-revive-fixtures-solidity",
  "pallet-revive-proc-macro",
  "pallet-revive-uapi",
  "pallet-timestamp",
@@ -13255,8 +13254,10 @@ dependencies = [
 name = "pallet-revive-fixtures"
 version = "0.1.0"
 dependencies = [
+ "alloy-core",
  "anyhow",
  "cargo_metadata",
+ "hex",
  "pallet-revive-uapi",
  "polkavm-linker",
  "sp-core 28.0.0",
@@ -13264,14 +13265,6 @@ dependencies = [
  "toml 0.8.23",
 ]
 
-[[package]]
-name = "pallet-revive-fixtures-solidity"
-version = "0.1.0"
-dependencies = [
- "alloy-core",
- "anyhow",
-]
-
 [[package]]
 name = "pallet-revive-proc-macro"
 version = "0.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index b3d6c82c8140..7c06628f3faa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -422,7 +422,6 @@ members = [
 	"substrate/frame/revive/dev-node/node",
 	"substrate/frame/revive/dev-node/runtime",
 	"substrate/frame/revive/fixtures",
-	"substrate/frame/revive/fixtures-solidity",
 	"substrate/frame/revive/proc-macro",
 	"substrate/frame/revive/rpc",
 	"substrate/frame/revive/uapi",
@@ -1031,7 +1030,6 @@ pallet-remark = { default-features = false, path = "substrate/frame/remark" }
 pallet-revive = { path = "substrate/frame/revive", default-features = false }
 pallet-revive-eth-rpc = { path = "substrate/frame/revive/rpc", default-features = false }
 pallet-revive-fixtures = { path = "substrate/frame/revive/fixtures", default-features = false }
-pallet-revive-fixtures-solidity = { path = "substrate/frame/revive/fixtures-solidity", default-features = false }
 pallet-revive-proc-macro = { path = "substrate/frame/revive/proc-macro", default-features = false }
 pallet-revive-uapi = { path = "substrate/frame/revive/uapi", default-features = false }
 pallet-root-offences = { default-features = false, path = "substrate/frame/root-offences" }
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs
index f60b8cb027a7..05e5e7191941 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs
@@ -76,6 +76,16 @@ const ALICE: [u8; 32] = [1u8; 32];
 const BOB: [u8; 32] = [2u8; 32];
 const SOME_ASSET_ADMIN: [u8; 32] = [5u8; 32];
 
+const ERC20_PVM: &[u8] =
+	include_bytes!("../../../../../../substrate/frame/revive/fixtures/erc20/erc20.polkavm");
+
+const FAKE_ERC20_PVM: &[u8] =
+	include_bytes!("../../../../../../substrate/frame/revive/fixtures/erc20/fake_erc20.polkavm");
+
+const EXPENSIVE_ERC20_PVM: &[u8] = include_bytes!(
+	"../../../../../../substrate/frame/revive/fixtures/erc20/expensive_erc20.polkavm"
+);
+
 parameter_types! {
 	pub Governance: GovernanceOrigin<RuntimeOrigin> = GovernanceOrigin::Origin(RuntimeOrigin::root());
 }
@@ -1501,10 +1511,7 @@ fn withdraw_and_deposit_erc20s() {
 		assert_ok!(Revive::map_account(RuntimeOrigin::signed(sender.clone())));
 		assert_ok!(Revive::map_account(RuntimeOrigin::signed(beneficiary.clone())));
 
-		let code = include_bytes!(
-			"../../../../../../substrate/frame/revive/fixtures/contracts/erc20.polkavm"
-		)
-		.to_vec();
+		let code = ERC20_PVM.to_vec();
 
 		let initial_amount_u256 = U256::from(1_000_000_000_000u128);
 		let constructor_data = sol_data::Uint::<256>::abi_encode(&initial_amount_u256);
@@ -1663,10 +1670,7 @@ fn smart_contract_does_not_return_bool_fails() {
 		assert_ok!(Revive::map_account(RuntimeOrigin::signed(beneficiary.clone())));
 
 		// This contract implements the ERC20 interface for `transfer` except it returns a uint256.
-		let code = include_bytes!(
-			"../../../../../../substrate/frame/revive/fixtures/contracts/fake_erc20.polkavm"
-		)
-		.to_vec();
+		let code = FAKE_ERC20_PVM.to_vec();
 
 		let initial_amount_u256 = U256::from(1_000_000_000_000u128);
 		let constructor_data = sol_data::Uint::<256>::abi_encode(&initial_amount_u256);
@@ -1719,10 +1723,7 @@ fn expensive_erc20_runs_out_of_gas() {
 		assert_ok!(Revive::map_account(RuntimeOrigin::signed(beneficiary.clone())));
 
 		// This contract does a lot more storage writes in `transfer`.
-		let code = include_bytes!(
-			"../../../../../../substrate/frame/revive/fixtures/contracts/expensive_erc20.polkavm"
-		)
-		.to_vec();
+		let code = EXPENSIVE_ERC20_PVM.to_vec();
 
 		let initial_amount_u256 = U256::from(1_000_000_000_000u128);
 		let constructor_data = sol_data::Uint::<256>::abi_encode(&initial_amount_u256);
diff --git a/substrate/frame/revive/Cargo.toml b/substrate/frame/revive/Cargo.toml
index 24cd62bb37dc..ed2be60ebf19 100644
--- a/substrate/frame/revive/Cargo.toml
+++ b/substrate/frame/revive/Cargo.toml
@@ -66,7 +66,6 @@ assert_matches = { workspace = true }
 pretty_assertions = { workspace = true }
 secp256k1 = { workspace = true, features = ["recovery"] }
 serde_json = { workspace = true }
-pallet-revive-fixtures-solidity = { workspace = true }
 
 # Polkadot SDK Dependencies
 pallet-balances = { workspace = true, default-features = true }
diff --git a/substrate/frame/revive/fixtures-solidity/Cargo.toml b/substrate/frame/revive/fixtures-solidity/Cargo.toml
deleted file mode 100644
index eb5a6c0dc5f7..000000000000
--- a/substrate/frame/revive/fixtures-solidity/Cargo.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-[package]
-name = "pallet-revive-fixtures-solidity"
-version = "0.1.0"
-authors.workspace = true
-edition.workspace = true
-license.workspace = true
-description = "Solidity contract fixtures for testing and benchmarking"
-homepage.workspace = true
-repository.workspace = true
-rust-version = "1.84"
-
-[package.metadata.polkadot-sdk]
-exclude-from-umbrella = true
-
-[lints]
-workspace = true
-
-[dependencies]
-alloy-core = { workspace = true, features = ["sol-types"] }
-anyhow = { workspace = true, default-features = true, optional = true }
-
diff --git a/substrate/frame/revive/fixtures-solidity/README.md b/substrate/frame/revive/fixtures-solidity/README.md
deleted file mode 100644
index f117d9fbe883..000000000000
--- a/substrate/frame/revive/fixtures-solidity/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Pallet revive Solidity fixtures
-
-To build the fixtures: `bash build_fixtures.sh`
diff --git a/substrate/frame/revive/fixtures-solidity/build_fixtures.sh b/substrate/frame/revive/fixtures-solidity/build_fixtures.sh
deleted file mode 100755
index eb66f61728c1..000000000000
--- a/substrate/frame/revive/fixtures-solidity/build_fixtures.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -eo pipefail
-
-[ -d fixtures-solidity ] && cd fixtures-solidity
-
-solc --overwrite --optimize --bin --bin-runtime -o contracts/build contracts/*.sol
-resolc --overwrite -Oz --bin -o contracts/build contracts/*.sol
-
diff --git a/substrate/frame/revive/fixtures-solidity/contracts/Crypto.sol b/substrate/frame/revive/fixtures-solidity/contracts/Crypto.sol
deleted file mode 100644
index ddacd354c5fa..000000000000
--- a/substrate/frame/revive/fixtures-solidity/contracts/Crypto.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8.24;
-
-contract TestSha3 {
-    function test(string memory _pre) external payable returns (bytes32) {
-        return keccak256(bytes(_pre));
-    }
-}
diff --git a/substrate/frame/revive/fixtures-solidity/contracts/build/AddressPredictor.bin b/substrate/frame/revive/fixtures-solidity/contracts/build/AddressPredictor.bin
deleted file mode 100644
index 3e100d3f31cd..000000000000
--- a/substrate/frame/revive/fixtures-solidity/contracts/build/AddressPredictor.bin
+++ /dev/null
@@ -1 +0,0 @@
-60806040526040516105a53803806105a58339810160408190526100229161017d565b5f825f1b836040516100339061015d565b9081526020018190604051809103905ff5905080158015610056573d5f5f3e3d5ffd5b5090505f6100648484610090565b9050806001600160a01b0316826001600160a01b03161461008757610087610238565b5050505061027f565b5f5f60ff60f81b30855f1b85876040516020016100af91815260200190565b60408051601f19818403018152908290526100cd9291602001610263565b6040516020818303038152906040528051906020012060405160200161013d94939291907fff0000000000000000000000000000000000000000000000000000000000000094909416845260609290921b6001600160601b03191660018401526015830152603582015260550190565b60408051601f198184030181529190528051602090910120949350505050565b60c9806104dc83390190565b634e487b7160e01b5f52604160045260245ffd5b5f5f6040838503121561018e575f5ffd5b825160208401519092506001600160401b038111156101ab575f5ffd5b8301601f810185136101bb575f5ffd5b80516001600160401b038111156101d4576101d4610169565b604051601f8201601f19908116603f011681016001600160401b038111828210171561020257610202610169565b604052818152828201602001871015610219575f5ffd5b8160208401602083015e5f602083830101528093505050509250929050565b634e487b7160e01b5f52600160045260245ffd5b5f81518060208401855e5f93019283525090919050565b5f610277610271838661024c565b8461024c565b949350505050565b6102508061028c5f395ff3fe608060405234801561000f575f5ffd5b5060043610610029575f3560e01c806360a951641461002d575b5f5ffd5b61004061003b36600461012a565b61005c565b6040516001600160a01b03909116815260200160405180910390f35b5f5f60ff60f81b30855f1b858760405160200161007b91815260200190565b60408051601f198184030181529082905261009992916020016101fe565b604051602081830303815290604052805190602001206040516020016100f694939291906001600160f81b031994909416845260609290921b6bffffffffffffffffffffffff191660018401526015830152603582015260550190565b60408051601f198184030181529190528051602090910120949350505050565b634e487b7160e01b5f52604160045260245ffd5b5f5f6040838503121561013b575f5ffd5b82359150602083013567ffffffffffffffff811115610158575f5ffd5b8301601f81018513610168575f5ffd5b803567ffffffffffffffff81111561018257610182610116565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156101b1576101b1610116565b6040528181528282016020018710156101c8575f5ffd5b816020840160208301375f602083830101528093505050509250929050565b5f81518060208401855e5f93019283525090919050565b5f61021261020c83866101e7565b846101e7565b94935050505056fea2646970667358221220d1734e5ce3953d95d7088243a9aff363ffc36b18a42bf743316ba9e55cd7ee6364736f6c634300081e00336080604052348015600e575f5ffd5b5060405160c938038060c9833981016040819052602991602f565b5f556045565b5f60208284031215603e575f5ffd5b5051919050565b60798060505f395ff3fe6080604052348015600e575f5ffd5b50600436106026575f3560e01c8063bfa0b13314602a575b5f5ffd5b60315f5481565b60405190815260200160405180910390f3fea264697066735822122074304a8f21daf30f5425303562aeb0b8549e984f4c26bb099d49eda806391eff64736f6c634300081e0033
\ No newline at end of file
diff --git a/substrate/frame/revive/fixtures-solidity/contracts/build/AddressPredictor.bin-runtime b/substrate/frame/revive/fixtures-solidity/contracts/build/AddressPredictor.bin-runtime
deleted file mode 100644
index ef6a8758ad25..000000000000
--- a/substrate/frame/revive/fixtures-solidity/contracts/build/AddressPredictor.bin-runtime
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561000f575f5ffd5b5060043610610029575f3560e01c806360a951641461002d575b5f5ffd5b61004061003b36600461012a565b61005c565b6040516001600160a01b03909116815260200160405180910390f35b5f5f60ff60f81b30855f1b858760405160200161007b91815260200190565b60408051601f198184030181529082905261009992916020016101fe565b604051602081830303815290604052805190602001206040516020016100f694939291906001600160f81b031994909416845260609290921b6bffffffffffffffffffffffff191660018401526015830152603582015260550190565b60408051601f198184030181529190528051602090910120949350505050565b634e487b7160e01b5f52604160045260245ffd5b5f5f6040838503121561013b575f5ffd5b82359150602083013567ffffffffffffffff811115610158575f5ffd5b8301601f81018513610168575f5ffd5b803567ffffffffffffffff81111561018257610182610116565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156101b1576101b1610116565b6040528181528282016020018710156101c8575f5ffd5b816020840160208301375f602083830101528093505050509250929050565b5f81518060208401855e5f93019283525090919050565b5f61021261020c83866101e7565b846101e7565b94935050505056fea2646970667358221220d1734e5ce3953d95d7088243a9aff363ffc36b18a42bf743316ba9e55cd7ee6364736f6c634300081e0033
\ No newline at end of file
diff --git a/substrate/frame/revive/fixtures-solidity/contracts/build/AddressPredictor.sol:AddressPredictor.pvm b/substrate/frame/revive/fixtures-solidity/contracts/build/AddressPredictor.sol:AddressPredictor.pvm
deleted file mode 100644
index 404e2a509e9e267810f17ec6a8c556275d873ab8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9884
zcmaia3v?UTdFI7~oEZR?1`sJi4_hM?l0duZVMRNkoVbA)r~&9S88V8^G~1ezpaOiv
zWb`nHyx1J*k}(0w;gVcpF`{%5TDD72)Jb*RY(z?G4x8rGL&?p0Lv+uCN*l(n$dA-=
z;>2>IHTSy%GLjp&OZ)l)Gxznszwg58Lw`odsqMu2vkBzyRWe7?4rTK{d^4AP^W%T_
z_K$D=_O0*yXx&GQhd*QNdw2U&u?^o3`kK!<)Bot^a|E<Xv_C-mW3({ZgJ@quYe#zw
zErYf%9zS&O@ZkgdIyxSS?>n;ZkprDwJ-5Dfbnc7a`gXXr_h540;p8Lj2M-+B*Z#=P
z`##$G=;0&#9zD{!@5sSJ2ag;*^ysZsZvW0_9zM9Q<B`(C!v~K%()#5uA3d^ff5$;<
z#$)?BjvjpE$f13Y9{#I?hYlT#mwD~qJmBPef3v+jez2>fv#0!-{$Be;>Lhu|MjT;>
z=D6T^&T-A*b!MEGoqtmHOxe@r-!A`N`6q=3g|~%IiVuo+N>4~Xkp4w#a1FS==lX#w
z;Qnv!Z@AC88$1ttPIwBQ?|AC(kk&M=`HMA=tvSBNSQB0Q@Y(}wJJ)8{=GK09?d7$<
zU0W}w<*&={%MW?mz2Eo#)cb(%OTKUTF8SW@+1K5%?tI0|6?)~XmA|Y!y#D<9U$1vm
z?XCK|svlJSOI5Ew<A2`&WB(ieLmU2RWB11XjTblm{l+&o9@unvQ+m_aH%)Jv+4SnB
zUv8@2{FTk;Hh*_>ar3p!|F(Jko%h_Cx^w(a*IiY2ZM*Buy8>H2zNLN3ku4XuoEdmD
zKd9(ulsr}Ri;8j5J%7QKKWQ7k_^oN>TLT|!ls;?pNbz1<>Ub_=%bm4p)A7sGr``#D
zv{AbE!{2Ofls5K_FWZcQJ9RO4V%eDVXjl5qEH_ElcamLVh}av&W4>BJC62ysmlQhU
z%XzO;S)`TmZ2V}gsKoQCY~N&0X|_~Ps@I;Pj(kQe>SF$koWJNVUT_r)VydSs)$2^r
z@>EL5pAd^vQvRZxf8Jlb;x5ig`4dVpYftq^sa`QfU8$7&_s67q??_QkDzzr1t<9ei
zv26Z%IiK+t4H4_-GfGi+q%?1;S58r1Dz%QE0ndN8%Z!-ntxVC1RBC;yr|Q-UC;Y{E
ziJym`!IjcBq<Z`*x-pg7v?9grEA-r%qMK8xyHed-_z7`xoT1xad`>9lg?zVC91uFY
zI}4q=I`5``?x$arX|qTlX0pgCb6$BT$$3pGE40#2*UKzRH;61N(hcluGJD()O{%hU
zfpjK2zsNRro?)BB&WjrLYrV48BWjv{sZL96(J$3#sk`(`AuV;Meo4_%oApb6EwxF%
zBx|XS`bANr8}#WqjaKQ?H5y&7Plq&GsZT2!t<b0a8eOMP%Nq6RXGE>ntB==dy=(RH
z8m)JYJ|5C~@6g8;t=FTEV_UaAE^ECm{e-CXNP4zT>k;&9jn-4HXG2;~nVwa&9;cr5
zYdsD<i!<8w4324Ivcf9;Y`vWGhIW$UJ#v%u$A%{MWw!KZmL94j#I~(g3KIJ+7yk3D
zLFoYzy{%TPA@;s*V?fwRpr(?8^&hpl9JU7p1wL3NsB(FvmWVlT__w(#;-p<OgdROd
z=wk(vtDJN8dza$tW7~CSZ2K@;+L<P`LO7R9<4eX_O9n}Zy`S?=yobr<w5ypORq12V
zTxCo7%FMd**!CK<5SmiHGFvHEW!Gok-^I^B6Eg%x)_auL_8Vof?bp$+q4_aEMibEp
zCgu{PJeOQ5qpdhy>r$C2d%8B(3TeWUGeniwy!C!xH~&~GxokH6;q(6R_#L^#Tv@G{
z#sK;BO_ngrXrhZHUO<;*2?JdV!w8ya&Lt)=Z~_B;JvZ5bnKBkXSH@ZkWyO2#nY?Xm
zN2BniJ6QWfS?>H6^So$eJ?1IbV#Z}OxXcF8sN-?L+RhPkQW$$~Y@kti;EoC*y}Z1P
zGC)i!jOF<f!W}eTM-PN)Yn1M<q3vql43{hoX)5eDAz~Tp(FyAvCX8mtP=2UzH80ZE
zG@)%;aa^G71u`^yRg;>epL-alapmO_EjW2tmDkVxmhIQd=zgrw(N#t}u*!jC89k68
zEZ$N^;}e#yasyk;0TH4RLl^rqw*Ky=T#sV*2!`e|2i=R^?%4J^s9C{E&1Jb(Qbtdy
z^gt8~gv;o7D3=JA<&t=NvPPBtZ~9q+uZulfGo+Z6SlciuPV!WxBYl)ofG#$P9uG^N
zBe^VOX$_f((4;b!p?Jh?m21N;1(qxj3N<D*T99)|D1%Er<yYm6TW+!zjU9ls_p1y-
z8#@GZhsfelOOBXiWTl0e%Z#}f3vSj{XShV;xZ5na%;O^K2pga97?)i}LCp0|5VKb>
zdSE?iv0E}`C399le6V(9;gV=xakGw)dDeCHxQlhbn5V=cx~RDq=0zl-tJKxx`d2qg
zK-MIL)WiyDX~n|u3}T*y@EI~THI{9Z?sQiOEvx1~B#eEUC2P1_l)2*<xWq+K;72d+
zau?4FI+C2*oxiBybCd9*t8Y^2yJv#XcDQ;Xs>+*vH)#TLmz1T-ciC^oHHIgx-1U`D
zy=U2AKh$!_ZXOa@J1oxaJ8S7>)@9CGdf^U{)C|MY&2g7$KsS&jktRmU!ygyK;*40~
zS{2GX?HU^&8*Fr`uD%^SJQ4KQ(XKfWi0GG`svP**ZxCZn%K?L*e2?unoiL`86<#20
z${=iVjtt#Bbo}bw?xFEaYUyjw+pdm#iXqq4X-|{qNmp^eRjhWS?x6Y>k6S9Z04@JS
z%JnLghf}Z1m~zwh8Lr*MGh80psuTE+5rPX9$o(QA_FOwM*USvL-z5_J{i2NjNPeW2
z3((&T5?OM>NoS$Y#4yygeF5r%CfjuQsl;u;5LOTz&a0zdt<*iZ>=*I2nIhM*WD8AZ
z&?RYd7{cR8YZuM|`9oiO53)0B<-6N|lk+Y0S1-j!VjKLi4RUOQ7?X1Amil+$5leP;
z4q}PUC$L;+hP5|$UZf}eRF~-~k&fs5OGxGMV==!!=9goBF($^JpgcBiy;#N@G;uj5
zE?2l$&Gf@(C0?ns5>KPuN`;H3oG@Ck*Y(4{74pw3#gwO3SgsY9Yu(E(MAZyQ=Vhj|
z6Czg$L?du-o@P*RS5ivJqJQ}1cUfF>A~88xs*BMUrX`D4q+%3agF=B++$1~+Kh+8C
zK<u{65SL(MZBQu!8=6E4u)O?M8YmOvJvd~Oa8u~Z^SyXD#dW@vD*w^l@8$eA`m;+E
z-pe(1j`Zq%-F-Tedby1y3gnoT<IfI!SHMPb&06VMfv>?;rOGweZuDu#AYiRvt0g;K
zqAmBVVm@2SZC1q3OXj>_d|D`uI*OA*@v!B2C7dyd;5#VLq)Ou&mx-Y)w8FFUux|^^
zM_D3C^J*>`cCthl%{SBi;rNbK!BzR*-gmjMt6>V2^0)?MgK-A1v`au@McCA!h2TXB
zdc~>m!>jT~A9xo5=0Jd<T|--PU{{UD5}ibjg?1-pggl)Txit`g4u(LWQ>t8-T!#>J
zSRr`-rC%W!9PIoYVY4P-GYG*8FOVEncnl$lpcEMz0t%6ltV4EO?B-!lk#gHYW&uu6
zV{jip&?F`tEXfPvCz8M7)@H35+=JVMwIN=REB?KJ)#W&vgHep_!6*%Np%)`{t8VcM
z2Glyql|ox5$VzF*LosicS>A+|RrybLyh{_%NtAD-%3=SzJk!C8__z8mzQeN~-WZzQ
zWGG^F&=C+gPyanGv&Twv$q-M6hGwNX)HGfKYPbe@mMfKk9g4ZbW6ZnEacS}SQWbC;
z$N+ga&ndJG$Af&w-CzUUGgpi_gPgDj&_suMhS4$(qyqG52Tf?I9O?ZPYB7|??fIv*
z@4$8rHmR|xE>=jg=@z7Nn)E|!#gih62Vw(7_ID7sNqF6f(vZ;NGZd*wm7{n5nkHcK
zaB0DYHNWPXkh#@W`7@vUC5AFMsX^VaDT78?(vOO6Xr6^rA}?<PC`T|uLNO)<BQKgz
z*`!r;SX<PXl3-_Jhr~UhcwDf&7%Owwp0`W{)8FR1pM|eBLsS(l3bDiJ!w&B1s{C1I
zS*0xm<FaHOYpub=73U}=Q||p9q)!!~ikSV5cp5dDXWfNq(VUjzXBYc$))3o2LFP}3
zCLAWAnWybMMYBZBe6PUTG~;g9{G^MUW?r|?UlHf);Kc<p?}YOLR}3rx)ELJlaIJ+|
z2QPSd4<wWc+2#ku+}+E@wA-9^8G|mkmje*QLECE}2tK#fIpV;<>P4uO7l|8oE1x8;
zqlYsjuA%3JcnN(CH>wqoAuAs1O7Vz=@U~Uu;n?(}wFpN$q*dj;ANd6)*x4jPakU~&
z&k@!4kl}3--m`Oq&k$~LuE^$l-r>ofr$0O#>FYiQ$@)&XpgDxpfFD|612RVf14!Ia
zHb4_$gsI(%{6GKR+ki}VHULLBj^SBkq9>pj)KP3<fgT`9s9#@6gR}#XW!{QS<GjFq
zt~ic*ETC%eVtgwlHre6sXc@G$y@FqU@V{j^KhV2wX-k#=OX?T3LJgFYsO#&lC4cF%
zKzMFotLkfcN(TOeIqOv4{#RurC_A0i=uB5^dy74nY(b$;s&f3}zu<D_2JTaRfAtm2
zSi}m=Tz#~F7-*pd<b)(G@B|E9chRY4RZf<#O!|WAYx@KyJ%dT%&MZqtQDWOvFur!J
z^J1<8t6Wj&<q$P$V01g3uT$lY`M0ga#>1VvE`kO5`@@{~b2bnXh%cjwI5I&`>|fxs
zRryi&c5J(e5ig(_XmhrsCC|Bmn#DcpI(qIw*KE1Ok}a2<v+)`X7GqQ8t}`Gh6PB`6
z`OyD;3)-=<^Dy8Hjx!4*Ucl+{LUB+kf-nM~3|O3)=gnCXpXTVTvs>4YAv2`&M1GtD
z7+wnj1~^LX%y1Zv>W%|oHZQDJ#hsx*tg3uu=IvFNLm9SQZo+aooKPn$FQ;`6JK+ca
z=IeBx;2C9M3c-rlMTXRof@jDAj>kiMC&UYbbcR*=v3uWw<!o%SnH5wv6=l<5)u%12
zX%xC_q(n<IyhKYbF|_sHefNIwI~01IpeCX%k&^d)g+@P%h=WFNpwO#wFS!m2V89D#
zb7Xg|fC4#(&jv(Hz4X>D&W0cIf6}Ws@F8ri9}=z3)>k@55K!TR`-ZY8)!00Qrr2)Z
zSh2y$ZG7Xe4!i}&zyKMI*h(7{d=_o0k|u2*zVlG&00Rgs49%dWKd^op>+5`dg^?ZD
zK*NYGv=$p4Lb4WoPGW<8BK>Xy-|eD(1XvHuKeTN*ej$FI0*}>-s`5B_{w;*2$Qg3z
zzy6#%FMpgN|MRUrtyZvXk$b<kM9OtyvGdPYIV)YcswI#_4i)2H;S0Fz@aJKY?%oV1
zs{jBeB;GjHGClB`bo<a)l|NP`$Ew7bfIBYagSKJt0hty2Y)WKjc$@)%amSgJxKAGI
z-dpvl^B-7(@8)zNmtrQ*f5>^re_<>C)$#mSbNhyTbdVpe6~q6#pN-25mG*uiGh-Xm
z8pQ(=JH_`&cjt^hFb&B#X{YTi=Ckg_6K+%o+LlBuq6fN+T@o&#OidWuF_v$HURL+e
zAim-3>!uyee3y2OUGTG6nOzcxCWrK^lgO{b01p|CZHAtst?E@B!u>{MGr(6R+6|WV
zA5iXQR9FqI3oVJ(;!Gn$gq^f43jEyyv*UBS>ZBcMqAE|2BhXof6KCK<pdf5K36O(1
zlOcX9!r>(l8=X>AWr+OrO_tQy{xmKEnvH(J{IrL)w;1<G#=NvpqK9Weo0AL-(Kzcd
zuDH#!#Ju9bH3Da}{E^3HJmtvs25)E2C1qM1+HL%;1L$Jt^3}`2(D=~D7w>l$cS%=I
zLjE}TDA@80ia0cLdIbXVt436rNep;a==*e#dsiO}sw1G0n3Q3%<>&lD2T2G@#g)!2
zIt@`^9F|Ozu>n+B&Z;{t3eeX*ftdG0c`}*^l@avBsVbx7CvPD2S{PXwBl_!X|B{0p
zxZz;&YmoA~BX^Ht-Xj=CL^FCDOZXU|+J~0J<#G-MT2bxtbI7N4G!LAe2-7^Ec5)85
zC`$7tc#($a0|=pUm<QJ|CENWE()0#{6)l?1V*)}KpOcCgRvD;Kx_JfK%;WNF22kr9
zS^*$q0{w&oCe_KBH{dV$+J%-xYvFtWTO@RB4>w2*qsO)hpwvVfb6ZM;p*8JLm2q;P
zfLvYD$0?F|4OIuEA<Sl**-VsOP%Xm1XD3$)1C~y<+(sC>Xq##ghGvT}@M|mu>v8A&
z2Km@)d~XzKR4$gxfH9;$lrfwyvlv599qX-Os9`izEI{WT-2HOybk@Vk>vQmtAy5Py
z2NadIb<y?^=d7wSL4NZ(;2ifDzKg1yCa=A|!Wa10r%ClSkT(8ql`yohMCkVjg9<)p
ze1I=BuilE>;tRNlux^cT3BhlTIFtlmD4t#62}oz0=y8tlQv_*<pA*N0Kf*XNng|;Z
z^c*7b!~HdR@HO}(k{bZMQXr0N(1o4#+yHC3j{CoBU{Fh>cv2`9JRtBoG%;zFey)$N
zf`Y;#t+*ud({`C!Yn&l(yhaluCkEE{v*hY)TpK9Te2Z_9O+T}Y0e{1lmpR~Kts$0_
zIcX@^7e+;MR9YNFZRf7(M@BSGdQ4o3O=DaaF39+G5@<u##hvx^?>p=3fYKUwak@VP
zxlLfC7tjpgr8)F-94z7(=g8+RqqM8V^AbDI!djY(j@8v>e&_n9EFxuU0KXZsP-i#m
zq{X1b<7WPn-5doI=rS+4kc8*mNM>Ee1=svp5AD$AM{z@hL3QGM6ocS<(8at4Or(<>
zTLNn|1}&B_<uIo>OW^Wm3by$t#N63sp8Bp>EMfnI9bgF+;vCM8&uueyRe6@=e+Kme
zhy(TVAnQWUgDz>IU|c7oZ-$)cRD>Y97FgSk2*fIQ*_y=Ru+X>3w-J_M7(b~h-yy=Q
z2tYeK-;B^>vr#q^=8&(j3i(QQ=aBDltcW<U%sWGF{!9&AAk$@>At2mtF@!FwLMC~I
zY(ZRF3_-a>CSI{zj0ajB>j|+`O>RKpi@_I+DXV;OdH@ffm$)I#c^Ac9B3z-Eckvst
zL5mucJiP!<e-}ukgo!yGu8=qsz#pgqf%g2cxT-4OCHr4pp$5$;(PR$koEwF6gTVL5
z=bTOA-vAsmtAX!>&Os42I(q{bcO3O`w7g`a7p}o^{*i2awKVTOHDHh`%<INNoRZmS
zVGf3_qXp#QWSD|$l~8t+PMMf`nf&CH($p`gf#=DO9ZljVFtvpfg(N2mUAKsWjb51`
z^m2hv1N135VWaaiSmFod)GItwTd9n*1)kqf&_0Cf{uBq-p_vl815Lu`v<+;5yZ;Mh
z?<?Tac%-65(ZZZAa3{jgJSC^H;1!$-c)A4&2wPyBwzdHC{g6;RRV)RnN|F52OI&;g
z2vDeDQz163sDb}O+8s^8mpHjpS8fv&ll-q&)W9P7s^d0iL2z(91)(^h97YN!7JOHJ
zOpdOs>t_X-!?kHO@UNu8(I`AaO87lAveIW)`eQ47PYHV-Dxq-$x|sU_Y@dUqCWr0H
z5{bQx`i2qb&?Z)JJFnpdDC$LW&&#X8-CaVrA3*3p?4_MP2;_m|x!}VD1;pY&phekE
z3rTclaK(n;xrP&5hiR9PK$i#y$h>O3OfJ5Jp9{GOROMAN@iIWMgxXR|t`UBZ=<Qmj
zGR#zoxL>d3Du+qG_j>#g%d#UPdqQM~bK_ggabkF+{xeH-od~>SKIJxIE~KV~@p5xq
zSZo*AJ$`fE!ycDeKxP^LBJmg<9<!s|_(OglgI8u=!bOyk6#0F;?in(MdafE$@i}qm
zudimyo5~+%e$ng`7aAn9p?py<$FCp@mn8F&dr@~U?BI-S@o{&PyN0e)>BeSS)xv+S
z^Q&|-^33bxM=$0YyOtTmU=V{r4DT@6Nn+k`%v%@p*4)N&{57;H%B}P!dFsWOHx%<K
zF|TYf99&O({i^bBWbnoRpMjvg>m>B}OMId0<QRJR@Gpq=QqFsh%28Sw&Q+?=BRj+n
zi;T*w+s~fB@3(A_tB3mibfb)4bm?YVRYx~Ls!*;<iTkNfQI&T{*ZaA~b4-phEaO#o
zB8}lUI6&Az$(-Up&T)*0GHni8KZ)=QzDYL^SnFaBJh@b`ciOFaxKz9~5BG;F^9tlY
zp2w5)@zo@~%FB1!SwUn|$Ii%|na&fPXZZhDa7Ni_U**|gQ5MhE!LxVTW23=su?O$o
z_K~Tv&%|O|>$gocMe*!E{de!S>Su!0)v-cDtl`6ljs|y&(x+ORHu|!eOw_wO5b(wV
zdm_W)*3nERqXYtx{?mV&5l5mypEnSw4q&^HLDDo5%!*!bE_yl=2}byz4==plY&23I
z362J{nc$wtNHDN<B+6gJMkChlO{0;BJrmhOs`rdUM}xkR;fxxH1ii7*=x8JuBU8~x
zq(6#%8~BspNHh=&dIR;?$s6#E1Y<#8HrgMFHZ(OgRBwY=dzvD_H0H%dpN?ju*e($B
zdA<KT6C90X1B1hn#(xf--WI4Ixwmu%UlvPL2O>C3AW+|*5wnreOb92&k@*23EZ+sv
z1Y&_$q(4}n9mX;6*%AWpaDK?!&mWEk8@!|9w)y}T<pXduA65ti_^WKBA-HWM2rWSf
z2*MYw;4iUIrUK^-)K~0@o<0qA`XsN{5|r-|2&6OO)>opL{%F7#*osHd`e3A?de3My
z6U7m^A|eqeD3cMrSOw>(*wzqe^kqZ!zRLSX_YT4kk@{dP^W<LqQ_P6UY1!-Z);pg(
z_w<u{z20zSYakd9z5Vt4^X^DAA_qiiDpY8w*t;zv#`b<an2w$f{&TcxG*j=(;e4Z!
zXGVh6gO<dVv4+;sy@4j*HZEgEgg`74fydmYrpD2+2A^f!J<dJ%rlBSL?GD1ZtR+S;
z-d7z6Sl{u6L6DUZFb;GH70WR$Dz<<=vx;|jR)GTX&9VY|t_E+!3B6&&Xk<8|2CUVs
zL2xVn+Ok5_S}-`mT{4FGI0!ewNHh{;QMt5%I2epI1T%O)6670ry|zeDtR8ZX!1)6i
zr*&YQf2?T`O1In)P72Yv*W(bogR$Wz=WYZ@V0W-Ovvup%C)J2kZscn37at$3-#4|#
zSGgw=@djDby#e3U(<{fsUbjBW-t4GzxB_Poy`F8A)zRT#bu2bI7Tgvcg<EmGtaOm1
M`U_3I$};l*00NHg4gdfE

diff --git a/substrate/frame/revive/fixtures-solidity/contracts/build/AddressPredictor.sol:Predicted.pvm b/substrate/frame/revive/fixtures-solidity/contracts/build/AddressPredictor.sol:Predicted.pvm
deleted file mode 100644
index b6d99e60cd34745ba7bdd10902b172b1939af6f0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2032
zcmaJ>T})%g6`pGw?%3>-F~Rm=$Z|m@y(F#ba2wS;q;V*bxGN<x?v|2D6}Yi$o3got
zpLpz<2WLzddlRWEi(6m(QYvi~u%)PdOA1oAFYQ+4t$v79MdC41U-F*SZqH>&cBNLe
zd^~54XU^aEok=adfzX#Ky7(w6`b!+$Lseh(*VwfTf{cN@0P-?O5+n`sGmy74>+37o
z%ywqwZEK_aWVdc*vQKtf#Y!%p+g{n)wl*{Q+*U5LzOtFy-r0O-3#`SPH+Qx(KVQ#X
zIC3qQ=ibY#@8njtH#6^S{UW!ynalPCJ-1Y!>-W}Re>S(VZk7A@UIOFXi)c%^<FP$q
z@1*xt@8{kxyx;M?=3DaBeV_Jy-Z$7E?w`dNc^2`E&rsvYTPp?n^eLYm{E`#QL)k`l
z$G}>)l_H)|k6?-@i;72ZZ>x@b4sLZw>xB0H6zCmcQSK8JpWyvMsI3FsJNCCuNb8LD
z{xQ(|)ZaSLdJT^#`$Yu{9uQ*Szt4!uRl%<aF(}wGtqumatuxZ9)82gy{#$je=XeDR
ziV6{YNQh_M9KilfluxjzgajWJA}q?0Cms%H@9%y$A2)}9U?ZYT1&<0bdRfKO9?H)N
zJ|@I9Q5ttMgv=p_67Bs>?X}caN$c&YR>?ZDW~~?aPbq(k@MX+@A_<luJ4j}b9sG<F
zjfW@?6WQP+ST-;pk-sAH7KKixi0_}sDp+sHsMV39*g9dHvI=2k%$ReUU}D@kjWco0
zIn|kX&N<bX7;{c36Qj;4VIu0BV8%zBZi4ZM(~UD8cDg#_A*ZV`KJ0WU<Ig%>!uXKW
z!K@N=+6h*9#%ae{WzcEsta8<9Ypim`X+zinr%hNT;2dC9_B)LPE2~Z;&dU8xLucha
zr=hX3&uLIr_Bsv7(c{!1O+^w-hNuh^JE+f~56UF%f9XEMwfgvO{d_5bkTPZXeaJH#
zfS-?V`(MGZDh4LVQ!CxyQ)dvg=`q1}ca(rfc?Cwyv)HGmNWVWt@Lv@>n0&;^Cy0ms
zfOz-_*`a%AH+Y^6o6kGQeEtqd9i)nC`6>#iip<|Zvfv<DtRuNrMZnG8M=D^IR==yv
zy54!70(wqKvrFT<rE{BA(PvEMg;ky}?3Z|c!%&lUVbu(?6bby`p`lj6Ax)7hu}8HM
zXof$az;c6*{~Ou)q=Bm_MF#)%Ko*m7Z9)DrCD)hj$T_&qzH3IP86jo_o2pIEp(ok*
z`G=H$K=^IU8wP^D9dfeFLn%A73T4SnS;3MMS)#HAe32g#S*O;vbz*g_Z&}hhvkt5T
zk0f|B&PR1VtZ_>D2;pOx57nqviyHn%#(-w1fqr}OP?BW{u7j(<#=K_WWQq*UJdkS%
zS%}M`F7sNi9q8@3BjLbET#goA#AE0&Ms-6~^zT2VzX;t+k>QbtwUU9M6Z+X#G7of4
zk#OI`8Z%VGZy*}*>48fH09*wC9RTnS09XeA4=(`>Gc&wlhF7cT>y8&vBzpG1xJ2m!
ztsg~vg~#3Gd6IqC4I5AZWl}AT0gS^J@2~O4!#{WTUVZA^Q;mm*3}~@N<VQpvQF)AI
z=NnQis?m$$bbPTWHMd|W%LftY`=zCbci{2=UwjRpNvTPRNwJAt@X?qZta2E#&;}0|
z>`?Whw)f;7l?@_qV_Anc;sC&_bGpo<DL%5mBS|xuFoSV3sGC7;LD6b7S&M45Q5QQk
z;FXbtq;WZ-%cuso>+XHNMtPC&0_J&pu__6Zp$!QEgH<#GTu;jUf-I!u+A?2D@IsvD
zb(gnxLE}YuX|9#Nnsp~{N&hXns(C>>M2exhQwZ!g{4QVM)i;o)Z$kT1M7s%#k|LA2
z2eQjYsqA7ts>v<^(#Z}5_Q~JKHs(>;COnGeflI;}&&1r+aeBdQ#{Td3#?<uhW7E^-
z(RK6s|32D`y@vfiET*GF6O)ta`T6fnPMW(hGd69`#rEG^0QGu0-E6|%>~z4z^l@z3
z@5Y?jpPT+&d$@C>I6r?k7V}R`G;h2ylx*(bZO5ie{o60UuEU+?{PpyY-N<P(ZQqSG
VK#fi8-Xq7&xjD0WcR!|}{{TKckVgOj

diff --git a/substrate/frame/revive/fixtures-solidity/contracts/build/Crypto.sol:TestSha3.pvm b/substrate/frame/revive/fixtures-solidity/contracts/build/Crypto.sol:TestSha3.pvm
deleted file mode 100644
index da49081909a63ea44c8752f3c10fc2bed7edd29e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2474
zcmaJ?Z%iBK8NWLW_uiSNuPHVMq=_MhI9Wfq@j97RRoxb;KK4h47iI3G2?+LV1Fe$~
z=Cj|E=DsGg9VP@GHy^ap5~&#kS5q~qDkOZ!G-<gd`7o_F$$}3<n>4lCmwwrw&?wns
z!<KfdcJkxrz4y=W`MuA-Q_g&YVb%qv@vuDeOCNKK$=PzVe0}B+$YGF^AOj$SAZI|v
z$EK!6qGK1wM#fX;GLPS;Qe)A_Z_~+aEHO5n7@3TXkB?1`oO<pn)3LFskqfblGZ)^N
zj$Ir{zW(~m#j&$fu?E=p$EIdtBNs1>y)pg0*o6zRXtRSWEZXXT1*0VzJ2#cev=smD
z;tKb^#7wgboX*|k`kJ0?`jPE@+i3Gz^ZU&oHy>+RY`Na@*A~Rj@HyV#ukZs1G2Ae6
zHu-rU)09t(&0f@`J3b*85ofd%o$(`gw4z|Ho6}TQ%V=3nBTbbevJ6yN$CaCsbwjk)
zkd|rIvNnyhXc}KxM%HzqauZkXN!DGvwJB7V-ByXyGJ=*x8WA<k{=a*)>=PPk)wDyJ
z`ebDt0c_<St`sH9M1Wr@x-FwgQyp3sYotxno~m<z`TtniKw8$Rk#<dUX_=142+NZ7
z8==mp&Oy}FPAwy8q)XGf4{q^Ugv`?#Ijm_%wDi$BLtqXZ(vo$Xw<>%k?Y0VhDxF$O
z4Wv$z??~h|Od^PUn_@(rx&xnLbVrR~H*reDg=vX&B3eSElU~B~hZ1;F!L|>XR3h~n
z?MkiFZj`#I5=qTsHG@>u*b1oHQDe)eYDbJMuc|$5Y`InKu(2hnTDP%<RjtdoiB!^Q
zR0AsMFseS4xQwb-B~GL2R!O^2l~nSSQN=20GuDxsbr>rFHT$Ho;#0GSj1{k%eZp9A
ztJzj#1<cxw6|81OV;QL#!6*gP3~!WtYNo{~dDTp_QF5ypn^BU~Op{Rpj+{{hnk>a`
z>XfJp>kjWJW-f!n!n3A|^2MXG#oaRjhGF~sf{oz@MELvpW#I(`n)M^haQU=Z;7>8&
zru_t)onb|eeF4ge8*b(m+#)C#U4`W<1V@Nd(Ve5Sj$PRy$qp>DImXWiqcBDa7MCB&
zj)3g&$qujVaOXSRVhc+<d{he1PA~0(Y(ds45Aho2UHi6+exCIUe&&#9^FBXNCv`^p
zL94q7204cH^9_Dr1NjBf`|$%mUmq*DwdYY@_45ZOS=|wQNbm+robR#3wZ`hsTP$#l
zy8QK9khn5X*Wc=}{f*N*c4yPOBp!*L&!_!JWLX-I<kE*BkJ=G53g-0hKfPZq+~sIo
zc{6>w<Jg`5K4Pn%Nk-_8CAxy?Tgdt<U)*4q)M4~9j=l}Ya%tT>Rx<_jEsjh|wO`n`
zm+fZNPA1&7szAoQ=70c6TvPd_<4cucUj3{AGUdygHYj<pF%hBfO0<gUbu@o_eq-l0
zvhH&8l^ri1=D)^~sQ{S_lCzku>4l>t5vdgrNrp@V%@$d>qMmuNmf<0^v&Qaxrg%Ab
zX`S84h+%Pp(@Qy~RzhY$tYz)nMZ4T@uq2sd$wU!c9@G;soLpcPjLio$9?&NkmaM8Y
z9we*hXgow#6ZJUgiP5?r$n{YLxBc`19SzWEkdBAwSs%F6JkHmSBRVOW&kJTr_;6FK
zZQ8fj>~z9y4k2^SURx7ubBIoP&DK`)j%cnSJ?p7uc{9^mdt2B}3k^@2;HXWzxq)h{
z{QRArJN*30{M`0sJ7m(%9QdIX;uNu7<*g<JX=Ok&2sPSL0oGdB{BaM72WcXbFF+Fb
z`74Zq+yDF^pQZ_gCW9i|&W}EN^r#+o*aQ)wiO^DkCh$^Wn7_>cgM9i5BlkyGxnBVZ
zv3ep1ItadTz5A&icS8x~091<Y>5~jgKM2qpKDz0p8*b=L)|y~J5krq#ZS<)MkUC#y
z0nt)$*LNT2((Y_&mn4<wVm|#Q&|DUq>eLDni3ex_*U3Xv;~@(CBYGSv0tFR(_#gKh
z)^1321Jg}JKd@Frt59#Kbz=vO84aU{3{(r0koPYK`i}>C`#}E=F1G+u1j#Y&jZf%#
z68a{j07K#i)V6|;{Ay2jsj};w>>7Q^&)XpGvMZrrcXjWeU|)1J3O2ZJE55Hr<^JCS
zstI!IbI7*<xz<4LP43D48?fO$kSokSc-`M?;8M@mzZf1h;Mx3s=kSQOeRH3m7Hup|
z1X6P}5lj_nGL%||YD%q>iGMOA`3d;{BS_y}hD?IQAr}3AxDQ_fNF@b(f4v8-MR5Ch
zfad+oN$*E{bvK;+6DWxLGdp{<O1hyi5$SeAd6I4~U6)9gkN$+NAkqb0fpj6dERjxp
zitBl~?|L{Smp%XYce?MyHP49?^4gF*^u=4to|lmDN;2Hl)+3h(heG8q1K?7)hkL~u
zygGEOxA)TQ!aEaXruULZ@0Y_%4HTz5G*Lbs?v?AthuRiBj>Y0as66NajDHgvDu?A>
zcr7oXK7Qey_ENEk96gQYw({wda(O9K^z_MPsSO?nJJ?<hwY_Y+stnrja1oVI4^<*z
Y?=#O`Tk7rY?GdgGi302nmu<|y0Pu-DIRF3v

diff --git a/substrate/frame/revive/fixtures-solidity/contracts/build/Flipper.bin b/substrate/frame/revive/fixtures-solidity/contracts/build/Flipper.bin
deleted file mode 100644
index 2dad634d8c19..000000000000
--- a/substrate/frame/revive/fixtures-solidity/contracts/build/Flipper.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052348015600e575f5ffd5b50609080601a5f395ff3fe6080604052348015600e575f5ffd5b50600436106026575f3560e01c806311df999514603b575b5f805460ff81161560ff199091168117909155005b5f5460469060ff1681565b604051901515815260200160405180910390f3fea2646970667358221220acfdaab369877aef238280e95c5594c8a6efd7c7e328d7796f567e176c66179964736f6c634300081e0033
\ No newline at end of file
diff --git a/substrate/frame/revive/fixtures-solidity/contracts/build/Flipper.bin-runtime b/substrate/frame/revive/fixtures-solidity/contracts/build/Flipper.bin-runtime
deleted file mode 100644
index 0f3c4ccaa974..000000000000
--- a/substrate/frame/revive/fixtures-solidity/contracts/build/Flipper.bin-runtime
+++ /dev/null
@@ -1 +0,0 @@
-6080604052348015600e575f5ffd5b50600436106026575f3560e01c806311df999514603b575b5f805460ff81161560ff199091168117909155005b5f5460469060ff1681565b604051901515815260200160405180910390f3fea2646970667358221220acfdaab369877aef238280e95c5594c8a6efd7c7e328d7796f567e176c66179964736f6c634300081e0033
\ No newline at end of file
diff --git a/substrate/frame/revive/fixtures-solidity/contracts/build/Flipper.sol:Flipper.pvm b/substrate/frame/revive/fixtures-solidity/contracts/build/Flipper.sol:Flipper.pvm
deleted file mode 100644
index c38199a1f33c5d8702866b18bc239167e8d0e2c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1680
zcmZuwO>7%Q6rNpgvST+bvu<opoX~D7r)+vaCI-n7suWoj%2Wbv3`FGsiK&g_l6F%k
zsmGoO+_BTxY1LL%7dGZVDkW+fO9*b28mZ+(4+sgA16&{{&fIAUvrbA&Rm*SZ_r33X
z?|oyAy$!&PPSE~ID)>GM9)Pk^z7E};1H$@*9T)b7uwh|IVIK-RlbV_uPp4*6<7cet
z;?vcXl}bNd&E!g%Y-V<RX4cB5vYDAoYHB>6nVrj@pAoycbLZw}Qy))d+JW4iy?Yl^
zQ*)W|*?j8!%qN+AK9lay<mz3;ja$9nna)g4S;fwUpZ)Rz90I>dze|dIUM|Vs$<XtT
zr{v+DSCtVZr(963Dfg8hlpzR#JPJROV`>z5Dg|GMF)G{IuMFudfLRdnI_rVF4p|Rh
zK>RX}LES|1m}E^_AMmiX!F!=~k1|Y4h!!EG&Ssp>A9gmQbpDXDY0&wXolTw2_c@!G
z&i6W-h|Y(ddyujorxm9x<g}uc1)Y{bS-@%Olyy5TOxZ!Fg(&ko8<3VXrx~ZEmz-vl
zmJT>ggO>I?O`VpyoTh-?=QI&5`J81)i(aQ5r$yDNM`^LssT;J|;na0nRGd1dMUPV#
z9A&2_Xi6OEJb-x+*_ts3Y^}@$USOI9C+$EPRJHB&MZSo69q}c|YgWNpwl=I9!>3u;
zWIZD+G)%NO(V|2%h^CK7dIb+x!g{4Q=G}>@J`WGYIgaukgNJqDU32}}S<G^XO+uEn
zN6Q>h9+>6=P%DE$aHWWn-q#*dSg9SZ*0#su07(5YuL9&DpZI*U<UIk!D8(QGa;5Na
zQ5^(=_g@S_7O2iiK3O`U0@2J4)kKQdM4h+9@d`tyS-`Xd6Cx#|VWJ@-l|f7$PK!A-
z5e)wGY$BDA?o%ZmigFy^CBNmst=sC>qB^Pucd=_RRf>6Ipv$KiZw|Sn#_;D|x<^dP
zK#HktegXr=ygp;)aZGjRCh{HGsnD3Z=PB9R@D4+F0SkN!Sa2QKfd}of2gxx9kYhK5
zl|h@SJy{lu8Zgm;oQNiJWLZ4qj_-z)ydB!E7PeUyr7u(pG3b*do<-$C-<JiwyZuz{
z<v+C6B6;Q>31JdKBm{{nTmW)2K8yHm#Md#u1Np`?IS=d=+)dgzC_RaS(-)qL;%`U6
zFOGtqR?hednEvk1Bs)7{qTteFo}J*iNq%;ke@d%#2h?g(wE%Xu7Q1$_{s&~^ZJ~|y
zC3Xd~CB($Dycz@exi<4WFG0=_FJN8~PnTasyoRk=>z<JCD;BqY6k?3CP@ILMtk+=O
zI>VUtAl3(&zk>Bj*wyepUC6l89$n$+G#3ieCI&?t-QJ2)xJ?X;_WSlGqUQKgVJzec
z{dc7;5%<oYroZnxu(QJ^I`q|}`Rwqu0tv=RFv_w5q73XwodgXN=~w^W6_fEb*xy#u
z$`dtFp#!hWM-kBAsNoYbFwxNtF-RtgJbuJmtQYeZWW73XA(0f{z#=>T1#dzY=1s)H
zkT1JQ4$4nzNH8WC5ex|&l#e9($*EKRjbx({Ausr^M(Q_LH{7GO#_DlG{QZO@|K(p+
zUymdj;_OBwC%lZcgmQVkp0M9Kd2$K*wL~Ivrx__n2FMyoHlTn=<{CF6w<3`Ui8OAm
qu15OBe&fCO`$;32B+2#U+CX9;;7>M267bTIWdA}{L>&;!lHgxH{Ps@(

diff --git a/substrate/frame/revive/fixtures-solidity/contracts/build/Playground.bin b/substrate/frame/revive/fixtures-solidity/contracts/build/Playground.bin
deleted file mode 100644
index 22750c11a8e8..000000000000
--- a/substrate/frame/revive/fixtures-solidity/contracts/build/Playground.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052348015600e575f5ffd5b506101038061001c5f395ff3fe6080604052348015600e575f5ffd5b50600436106030575f3560e01c806336ef737d146034578063c6c2ea17146048575b5f5ffd5b435b60405190815260200160405180910390f35b603660533660046083565b5f60018211605f575090565b606a605360028460ad565b6075605360018560ad565b607d919060bd565b92915050565b5f602082840312156092575f5ffd5b5035919050565b634e487b7160e01b5f52601160045260245ffd5b81810381811115607d57607d6099565b80820180821115607d57607d609956fea26469706673582212203fd715060905f8d06df815f1b4a422d113edcdd391994968c0d389535338c08564736f6c634300081e0033
\ No newline at end of file
diff --git a/substrate/frame/revive/fixtures-solidity/contracts/build/Playground.bin-runtime b/substrate/frame/revive/fixtures-solidity/contracts/build/Playground.bin-runtime
deleted file mode 100644
index 8bd8c5ccffa4..000000000000
--- a/substrate/frame/revive/fixtures-solidity/contracts/build/Playground.bin-runtime
+++ /dev/null
@@ -1 +0,0 @@
-6080604052348015600e575f5ffd5b50600436106030575f3560e01c806336ef737d146034578063c6c2ea17146048575b5f5ffd5b435b60405190815260200160405180910390f35b603660533660046083565b5f60018211605f575090565b606a605360028460ad565b6075605360018560ad565b607d919060bd565b92915050565b5f602082840312156092575f5ffd5b5035919050565b634e487b7160e01b5f52601160045260245ffd5b81810381811115607d57607d6099565b80820180821115607d57607d609956fea26469706673582212203fd715060905f8d06df815f1b4a422d113edcdd391994968c0d389535338c08564736f6c634300081e0033
\ No newline at end of file
diff --git a/substrate/frame/revive/fixtures-solidity/contracts/build/Playground.sol:Playground.pvm b/substrate/frame/revive/fixtures-solidity/contracts/build/Playground.sol:Playground.pvm
deleted file mode 100644
index d8a67c7948d7aa1fef4322c5cb1d5738e08d38f7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2384
zcmaJ?T}&I<6}~ezp6h{4?hwojhD`<v(FC<!7fXpz8<l1wttV1f1L>yON-cqy8d4Hx
zA;e?fTZLRhu#+}TX{H{~N}J8*2XM8@Bi-<jR#j`XD>YjDU<Fk|ecHAUjoO!LHw!&B
z$!7bbwS0W;xj*N8_nhxsTgSeQkmX0!k07DngwO*t>7BeNRc7iyf*=OSevog090eI1
zO`QBu|Cx!?gF|B{2S!KxV*}>~`cEd#rk-1)iGkR2YkVX<G(I#i+CMgQZer}r_|Uoj
zk<+Iq&J7HX4pmQ|9~hk&>OVI&aAy36Lt|q@u^L63F}xKIGcWmKLuW@5DPQ)jMsems
z0DWIbix<S(BJs3%j(XCbpL+h``HJ@k-rsru=-plOr<!ixUwne}l5{}o#u$mc7<s}{
z2zfF|xyJaX$ZUb7SXyM%lh5Lki}On)e_t!TCzlp5OVzNnmr);MQhpAX7XA7AB>#a{
zdcU^xYkz)DFXcp*^0PE%RA#L9fA_HT3yjt=wu9L_^Gg`q=070$tX3*w@So4>CD+4j
zg{29j^^EPRV1W70qAX*U4lvrlSR+fR&ppg(rB#0gPX&X_>?W4d7!5Mk{PY%|_mFy#
z(H6#bv*ex%LO>1}l3M8xQYkOxlX_`JN+c5tiS9%v{hmf&C-gX`-{l1JfTNHu<S1oI
zbQ;iTBjGvPgn16rCO%F0B`u6~i+I;iVmR?S4<?p)Gfv#Msb;5%ox-;5u0(9M$6X28
zY`42&*z84jMYmatyQ0~w*<B$v3%d8QO`F_8#HOlS2-&pJEf_WpxCPy&4Q@fR=`OcG
zY+COwVLPq3^AS6})1435=^gI8VW(ek=XE<>=gvdeT6dn<Y1y5_cFOPOB6do0b0ItB
zb908Bs&R9=o$|Ul%}#mT9AFgPEWi{v(Ro1Qjl@xmE_5YD`utxj+BlQlGnL&q7C}hp
z2>ZQA?3Ur@-OK)i7_<<^1c{ksaYpJwkfz6!U>ca35M+;V5V}U}t&uF^^IHVpgykEQ
z9H#-x37nWxHcUk`6=DjLC@l5FV2mvy&uyAY#8g72Vwj4aQFYlTa5coW2yZfY5ZHoC
zcO|G-uhh65I~$gSus@7;$X??c-4#&Bv<r2*2L_W!2uoFb5Cez(vS4gJ2}>2jB6a#!
z#tutQj|z^0wkY`*qJhVVHhzSh01^OXtkK+CM&{m!An+DcpgO}3z$hY%kiUHzu3VDF
zweE^Os(RZ5N8Ol8ZqPW1y^%>mR8%jE0*{l6$(FuX)W81r_a7pwzG2-{x!5Vf?-IVC
z@kPv+KD%0<^k>B5+QsB|)GuwIXa2Npe_mPSr{Dm;i}?cKOBy}pB078x(Rda)@f*k)
zo<wwH65ur+hq%kIpz-)UP=v=9Kw%EMXxxdP2;-hG(w<c<mWxdQnPd4d5)EOK$8A1*
zmX8ecQzxKHN|*g5pc8c4OtoY3P=P+w_sWmQ|GqzD)d%G-xKOV&Sgn<@T{2_mwuP%o
z$ZS_o_5xZO@8NMw<55T$ja$wzm>P{AkKLuGG>f#Pp8!IbvdHd%Pct?YUJpyvlaQ`s
zs;73_^Sl3%H2J?17NNr-8aFCTaE5g{0u8L|Pqw*ZyoJ;%d2T?hE8MXskum>#_%la&
zxJij2(10$`Mon-6At1_QensOs!ZZ95zPfz%&GqHFtAp8yIGq*N2jRt$*MEg$>0aC+
zWb?u*m8fbs2R5nNQ$7G=tr&-2TskRblR`O#SFhBrrlf2{SiOXuxh>k{gtzFfhlpxr
zMAZr>9wSEsyZIwTgHemLo!;Uq7N{EGDgqVau!E{PSAo$gfi)+&wHC+axSt2LN0<Fv
zE9U&=9OglzxPYk!#ApIms4n=v2fnW%-qb^zt^tkO74W@`xONZm`Xb`Z4-hA$DEWAU
zUW|Im8C<;NTRZPBpO+rF5^o6=-^WE8oJ%|yDc%&z%eZL3Ol^5pT6+(d3-Y5GdF@ST
zVsY&RF8k`rFH7q`k=8q5f3#0(r|-}^m@X1p(45|fn;de@A=kW;Yb7LfA+vQ7nTl;H
zXB(=2%x}=>tB!V-s#z$RMfSe-v8fE3$_Z1kl(6J=G|N<uTf{i{@zdwwo3+&n_dI>Q
zw)xjCd*L-eoyONcsd(w!4@$7em%sW6FVJR<7cgzsd4bSoqtbQ35dS5g$27?22@PUC
zr_m<TB|ak_bblC|s%EOhRIw>#l3il!p^gr7w*8B~ea@}xv$t-wzunof@Bi;RGV5(^
zue)uIM5o%#`hBhDhv3jUGL7qcJLK1bin6aQdKmj#O=qw0w%IouZ8dLSZ*OaBJKXkj
z!|c0V4evYji(Bpf=|cmH0O<O)sXKRY$07ub9>N#Nw9(c!d;N$x+qR9M0}i*==MK-d
l?=xYj!0PAj08=-kVzgm4T7Ss<ve_{`1*`kaBYkEk`Zv?{`y&7V

diff --git a/substrate/frame/revive/fixtures-solidity/contracts/build/Predicted.bin b/substrate/frame/revive/fixtures-solidity/contracts/build/Predicted.bin
deleted file mode 100644
index 1ad2dae4e454..000000000000
--- a/substrate/frame/revive/fixtures-solidity/contracts/build/Predicted.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052348015600e575f5ffd5b5060405160c938038060c9833981016040819052602991602f565b5f556045565b5f60208284031215603e575f5ffd5b5051919050565b60798060505f395ff3fe6080604052348015600e575f5ffd5b50600436106026575f3560e01c8063bfa0b13314602a575b5f5ffd5b60315f5481565b60405190815260200160405180910390f3fea264697066735822122074304a8f21daf30f5425303562aeb0b8549e984f4c26bb099d49eda806391eff64736f6c634300081e0033
\ No newline at end of file
diff --git a/substrate/frame/revive/fixtures-solidity/contracts/build/Predicted.bin-runtime b/substrate/frame/revive/fixtures-solidity/contracts/build/Predicted.bin-runtime
deleted file mode 100644
index 2d8f4086596b..000000000000
--- a/substrate/frame/revive/fixtures-solidity/contracts/build/Predicted.bin-runtime
+++ /dev/null
@@ -1 +0,0 @@
-6080604052348015600e575f5ffd5b50600436106026575f3560e01c8063bfa0b13314602a575b5f5ffd5b60315f5481565b60405190815260200160405180910390f3fea264697066735822122074304a8f21daf30f5425303562aeb0b8549e984f4c26bb099d49eda806391eff64736f6c634300081e0033
\ No newline at end of file
diff --git a/substrate/frame/revive/fixtures-solidity/contracts/build/TestSha3.bin b/substrate/frame/revive/fixtures-solidity/contracts/build/TestSha3.bin
deleted file mode 100644
index 4748eba15f8d..000000000000
--- a/substrate/frame/revive/fixtures-solidity/contracts/build/TestSha3.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052348015600e575f5ffd5b506101498061001c5f395ff3fe60806040526004361061001d575f3560e01c8063f9fbd55414610021575b5f5ffd5b61003a61002f366004610060565b805160209091012090565b60405190815260200160405180910390f35b634e487b7160e01b5f52604160045260245ffd5b5f60208284031215610070575f5ffd5b813567ffffffffffffffff811115610086575f5ffd5b8201601f81018413610096575f5ffd5b803567ffffffffffffffff8111156100b0576100b061004c565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156100df576100df61004c565b6040528181528282016020018610156100f6575f5ffd5b816020840160208301375f9181016020019190915294935050505056fea26469706673582212204ff62fd022e10e28becbcbecfb131cee70966744cf97bf993d83015c84f6fafd64736f6c634300081e0033
\ No newline at end of file
diff --git a/substrate/frame/revive/fixtures-solidity/contracts/build/TestSha3.bin-runtime b/substrate/frame/revive/fixtures-solidity/contracts/build/TestSha3.bin-runtime
deleted file mode 100644
index c53b73724c31..000000000000
--- a/substrate/frame/revive/fixtures-solidity/contracts/build/TestSha3.bin-runtime
+++ /dev/null
@@ -1 +0,0 @@
-60806040526004361061001d575f3560e01c8063f9fbd55414610021575b5f5ffd5b61003a61002f366004610060565b805160209091012090565b60405190815260200160405180910390f35b634e487b7160e01b5f52604160045260245ffd5b5f60208284031215610070575f5ffd5b813567ffffffffffffffff811115610086575f5ffd5b8201601f81018413610096575f5ffd5b803567ffffffffffffffff8111156100b0576100b061004c565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156100df576100df61004c565b6040528181528282016020018610156100f6575f5ffd5b816020840160208301375f9181016020019190915294935050505056fea26469706673582212204ff62fd022e10e28becbcbecfb131cee70966744cf97bf993d83015c84f6fafd64736f6c634300081e0033
\ No newline at end of file
diff --git a/substrate/frame/revive/fixtures-solidity/src/contracts.rs b/substrate/frame/revive/fixtures-solidity/src/contracts.rs
deleted file mode 100644
index 084741bc0430..000000000000
--- a/substrate/frame/revive/fixtures-solidity/src/contracts.rs
+++ /dev/null
@@ -1,61 +0,0 @@
-// 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.
-
-//! The pallet-revive Solidity fixtures contract implementation.
-
-use alloy_core::hex::decode;
-
-alloy_core::sol!("contracts/Playground.sol");
-pub fn playground_bin() -> Vec<u8> {
-	decode(include_str!("../contracts/build/Playground.bin")).unwrap()
-}
-pub fn playground_pvm() -> Vec<u8> {
-	include_bytes!("../contracts/build/Playground.sol:Playground.pvm").into()
-}
-
-alloy_core::sol!("contracts/Crypto.sol");
-pub fn crypto_bin() -> Vec<u8> {
-	decode(include_str!("../contracts/build/TestSha3.bin")).unwrap()
-}
-pub fn crypto_pvm() -> Vec<u8> {
-	include_bytes!("../contracts/build/Crypto.sol:TestSha3.pvm").into()
-}
-
-alloy_core::sol!("contracts/AddressPredictor.sol");
-pub fn address_predictor_bin() -> Vec<u8> {
-	decode(include_str!("../contracts/build/AddressPredictor.bin")).unwrap()
-}
-pub fn address_predictor_pvm() -> Vec<u8> {
-	include_bytes!("../contracts/build/AddressPredictor.sol:AddressPredictor.pvm").into()
-}
-pub fn predicted_bin() -> Vec<u8> {
-	decode(include_str!("../contracts/build/Predicted.bin")).unwrap()
-}
-pub fn predicted_bin_runtime() -> Vec<u8> {
-	decode(include_str!("../contracts/build/AddressPredictor.bin-runtime")).unwrap()
-}
-pub fn predicted_pvm() -> Vec<u8> {
-	include_bytes!("../contracts/build/AddressPredictor.sol:Predicted.pvm").into()
-}
-
-alloy_core::sol!("contracts/Flipper.sol");
-pub fn flipper_bin() -> Vec<u8> {
-	decode(include_str!("../contracts/build/Flipper.bin")).unwrap()
-}
-pub fn flipper_pvm() -> Vec<u8> {
-	include_bytes!("../contracts/build/Flipper.sol:Flipper.pvm").into()
-}
diff --git a/substrate/frame/revive/fixtures-solidity/src/lib.rs b/substrate/frame/revive/fixtures-solidity/src/lib.rs
deleted file mode 100644
index e13525d26895..000000000000
--- a/substrate/frame/revive/fixtures-solidity/src/lib.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// 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.
-
-//! The pallet-revive Solidity fixtures libray.
-
-pub mod contracts;
diff --git a/substrate/frame/revive/fixtures/Cargo.toml b/substrate/frame/revive/fixtures/Cargo.toml
index a5f8d48e41e1..b2b1c6725abf 100644
--- a/substrate/frame/revive/fixtures/Cargo.toml
+++ b/substrate/frame/revive/fixtures/Cargo.toml
@@ -16,6 +16,7 @@ exclude-from-umbrella = true
 workspace = true
 
 [dependencies]
+alloy-core = { workspace = true, default-features = true, features = ["sol-types"], optional = true }
 anyhow = { workspace = true, default-features = true, optional = true }
 sp-core = { workspace = true, default-features = true, optional = true }
 sp-io = { workspace = true, default-features = true, optional = true }
@@ -23,6 +24,7 @@ sp-io = { workspace = true, default-features = true, optional = true }
 [build-dependencies]
 anyhow = { workspace = true, default-features = true }
 cargo_metadata = { workspace = true }
+hex = { workspace = true, features = ["alloc"] }
 pallet-revive-uapi = { workspace = true }
 polkavm-linker = { version = "0.26.0" }
 toml = { workspace = true }
@@ -30,4 +32,4 @@ toml = { workspace = true }
 [features]
 default = ["std"]
 # only when std is enabled all fixtures are available
-std = ["anyhow", "sp-core", "sp-io"]
+std = ["alloy-core", "anyhow", "sp-core", "sp-io"]
diff --git a/substrate/frame/revive/fixtures/build.rs b/substrate/frame/revive/fixtures/build.rs
index ce9215a165d2..465759f4a494 100644
--- a/substrate/frame/revive/fixtures/build.rs
+++ b/substrate/frame/revive/fixtures/build.rs
@@ -30,15 +30,24 @@ const OVERRIDE_STRIP_ENV_VAR: &str = "PALLET_REVIVE_FIXTURES_STRIP";
 const OVERRIDE_OPTIMIZE_ENV_VAR: &str = "PALLET_REVIVE_FIXTURES_OPTIMIZE";
 
 /// A contract entry.
+#[derive(Clone)]
 struct Entry {
 	/// The path to the contract source file.
 	path: PathBuf,
+	/// The type of the contract (rust or solidity).
+	contract_type: ContractType,
+}
+
+#[derive(Clone, Copy)]
+enum ContractType {
+	Rust,
+	Solidity,
 }
 
 impl Entry {
 	/// Create a new contract entry from the given path.
-	fn new(path: PathBuf) -> Self {
-		Self { path }
+	fn new(path: PathBuf, contract_type: ContractType) -> Self {
+		Self { path, contract_type }
 	}
 
 	/// Return the path to the contract source file.
@@ -57,7 +66,10 @@ impl Entry {
 
 	/// Return the name of the polkavm file.
 	fn out_filename(&self) -> String {
-		format!("{}.polkavm", self.name())
+		match self.contract_type {
+			ContractType::Rust => format!("{}.polkavm", self.name()),
+			ContractType::Solidity => format!("{}.resolc.polkavm", self.name()),
+		}
 	}
 }
 
@@ -67,16 +79,18 @@ fn collect_entries(contracts_dir: &Path) -> Vec<Entry> {
 		.expect("src dir exists; qed")
 		.filter_map(|file| {
 			let path = file.expect("file exists; qed").path();
-			if path.extension().map_or(true, |ext| ext != "rs") {
-				return None
-			}
+			let extension = path.extension();
 
-			Some(Entry::new(path))
+			match extension.and_then(|ext| ext.to_str()) {
+				Some("rs") => Some(Entry::new(path, ContractType::Rust)),
+				Some("sol") => Some(Entry::new(path, ContractType::Solidity)),
+				_ => None,
+			}
 		})
 		.collect::<Vec<_>>()
 }
 
-/// Create a `Cargo.toml` to compile the given contract entries.
+/// Create a `Cargo.toml` to compile the given Rust contract entries.
 fn create_cargo_toml<'a>(
 	fixtures_dir: &Path,
 	entries: impl Iterator<Item = &'a Entry>,
@@ -192,15 +206,134 @@ fn post_process(input_path: &Path, output_path: &Path) -> Result<()> {
 	Ok(())
 }
 
-/// Write the compiled contracts to the given output directory.
+/// Compile Solidity contracts using both solc and resolc.
+fn compile_solidity_contracts(
+	contracts_dir: &Path,
+	out_dir: &Path,
+	entries: &[Entry],
+) -> Result<()> {
+	let solidity_entries: Vec<_> = entries
+		.iter()
+		.filter(|entry| matches!(entry.contract_type, ContractType::Solidity))
+		.collect();
+
+	if solidity_entries.is_empty() {
+		return Ok(());
+	}
+
+	// Compile with solc for EVM bytecode
+	let mut solc_command = Command::new("solc");
+	solc_command
+		.current_dir(contracts_dir)
+		.args(["--overwrite", "--optimize", "--bin", "--bin-runtime", "-o"])
+		.arg(out_dir);
+
+	for entry in &solidity_entries {
+		solc_command.arg(entry.path());
+	}
+
+	let solc_output = solc_command
+		.output()
+		.with_context(|| "Failed to execute solc. Make sure solc is installed.")?;
+
+	if !solc_output.status.success() {
+		let stderr = String::from_utf8_lossy(&solc_output.stderr);
+		bail!("solc compilation failed: {}", stderr);
+	}
+
+	// Compile with resolc for PVM bytecode
+	let mut resolc_command = Command::new("resolc");
+	resolc_command
+		.current_dir(contracts_dir)
+		.args(["--overwrite", "-Oz", "--bin", "-o"])
+		.arg(out_dir);
+
+	for entry in &solidity_entries {
+		resolc_command.arg(entry.path());
+	}
+
+	let resolc_output = resolc_command
+		.output()
+		.with_context(|| "Failed to execute resolc. Make sure resolc is installed.")?;
+
+	if !resolc_output.status.success() {
+		let stderr = String::from_utf8_lossy(&resolc_output.stderr);
+		bail!("resolc compilation failed: {}", stderr);
+	}
+
+	// Copy and rename the compiled files - handle multiple contracts per .sol file
+	// First, collect only the original .bin and .pvm files (not the ones we create)
+	let mut bin_files = Vec::new();
+	let mut pvm_files = Vec::new();
+
+	for entry in fs::read_dir(&out_dir)? {
+		let path = entry?.path();
+		if let Some(file_name) = path.file_name().and_then(|n| n.to_str()) {
+			// Only process original solc .bin files (not our generated .sol.bin files)
+			if file_name.ends_with(".bin") &&
+				!file_name.contains(".sol.") &&
+				!file_name.contains(".resolc.")
+			{
+				bin_files.push((path.clone(), file_name.to_string()));
+			}
+			// Only process original .pvm files (not our generated .resolc.polkavm files)
+			else if file_name.ends_with(".pvm") && file_name.contains(":") {
+				pvm_files.push((path.clone(), file_name.to_string()));
+			}
+		}
+	}
+
+	// Copy all .bin files to ContractName.sol.bin format with hex decoding
+	for (bin_path, file_name) in bin_files {
+		let contract_name = file_name.strip_suffix(".bin").unwrap();
+		let evm_out_path = out_dir.join(format!("{}.sol.bin", contract_name));
+
+		// Read hex-encoded content and decode it
+		let hex_content = fs::read_to_string(&bin_path)
+			.with_context(|| format!("Failed to read solc output for {contract_name}"))?;
+		let hex_content = hex_content.trim();
+
+		// Remove 0x prefix if present
+		let hex_content = hex_content.strip_prefix("0x").unwrap_or(hex_content);
+
+		// Decode hex to binary
+		let binary_content = hex::decode(hex_content)
+			.map_err(|e| anyhow::anyhow!("Failed to decode hex for {contract_name}: {e}"))?;
+
+		fs::write(&evm_out_path, binary_content)
+			.with_context(|| format!("Failed to write solc output for {contract_name}"))?;
+	}
+
+	// Copy all .pvm files to ContractName.resolc.polkavm format (already binary, no hex decoding
+	// needed)
+	for (pvm_path, file_name) in pvm_files {
+		// Extract contract name from filename like "AddressPredictor.sol:Predicted.pvm"
+		if let Some(colon_pos) = file_name.find(':') {
+			if let Some(contract_name) = file_name[(colon_pos + 1)..].strip_suffix(".pvm") {
+				let resolc_out_path = out_dir.join(format!("{}.resolc.polkavm", contract_name));
+
+				// .pvm files are already binary, just copy them
+				fs::copy(&pvm_path, &resolc_out_path).with_context(|| {
+					format!("Failed to copy resolc output for {}", contract_name)
+				})?;
+			}
+		}
+	}
+
+	Ok(())
+}
+
+/// Write the compiled Rust contracts to the given output directory.
 fn write_output(build_dir: &Path, out_dir: &Path, entries: Vec<Entry>) -> Result<()> {
 	for entry in entries {
-		post_process(
-			&build_dir
-				.join("target/riscv64emac-unknown-none-polkavm/release")
-				.join(entry.name()),
-			&out_dir.join(entry.out_filename()),
-		)?;
+		if matches!(entry.contract_type, ContractType::Rust) {
+			post_process(
+				&build_dir
+					.join("target/riscv64emac-unknown-none-polkavm/release")
+					.join(entry.name()),
+				&out_dir.join(entry.out_filename()),
+			)?;
+		}
 	}
 
 	Ok(())
@@ -263,25 +396,48 @@ fn create_out_dir() -> Result<PathBuf> {
 			.context(format!("Failed to create output directory: {})", out_dir.display(),))?;
 	}
 
-	// write the location of the out dir so it can be found later
+	Ok(out_dir)
+}
+
+/// Generate the fixture_location.rs file with macros and sol! definitions.
+fn generate_fixture_location(temp_dir: &Path, out_dir: &Path, entries: &[Entry]) -> Result<()> {
 	let mut file = fs::File::create(temp_dir.join("fixture_location.rs"))
 		.context("Failed to create fixture_location.rs")?;
+
 	write!(
 		file,
 		r#"
 			#[allow(dead_code)]
 			const FIXTURE_DIR: &str = "{0}";
+
+			#[macro_export]
 			macro_rules! fixture {{
 				($name: literal) => {{
 					include_bytes!(concat!("{0}", "/", $name, ".polkavm"))
 				}};
 			}}
+
+			#[macro_export]
+			macro_rules! fixture_resolc {{
+				($name: literal) => {{
+					include_bytes!(concat!("{0}", "/", $name, ".resolc.polkavm"))
+				}};
+			}}
 		"#,
 		out_dir.display()
 	)
 	.context("Failed to write to fixture_location.rs")?;
 
-	Ok(out_dir)
+	// Generate sol! macros for Solidity contracts
+	writeln!(file, "#[cfg(feature = \"std\")]")
+		.context("Failed to write cfg to fixture_location.rs")?;
+	for entry in entries.iter().filter(|e| matches!(e.contract_type, ContractType::Solidity)) {
+		let relative_path = format!("contracts/{}", entry.path().split('/').last().unwrap());
+		writeln!(file, r#"alloy_core::sol!("{}");"#, relative_path)
+			.context("Failed to write sol! macro to fixture_location.rs")?;
+	}
+
+	Ok(())
 }
 
 pub fn main() -> Result<()> {
@@ -308,9 +464,25 @@ pub fn main() -> Result<()> {
 		return Ok(())
 	}
 
-	create_cargo_toml(&fixtures_dir, entries.iter(), &build_dir)?;
-	invoke_build(&build_dir)?;
-	write_output(&build_dir, &out_dir, entries)?;
+	let temp_dir: PathBuf =
+		env::var("OUT_DIR").context("Failed to fetch `OUT_DIR` env variable")?.into();
+
+	// Compile Rust contracts
+	let rust_entries: Vec<_> = entries
+		.iter()
+		.filter(|e| matches!(e.contract_type, ContractType::Rust))
+		.collect();
+	if !rust_entries.is_empty() {
+		create_cargo_toml(&fixtures_dir, rust_entries.into_iter(), &build_dir)?;
+		invoke_build(&build_dir)?;
+		write_output(&build_dir, &out_dir, entries.clone())?;
+	}
+
+	// Compile Solidity contracts
+	compile_solidity_contracts(&contracts_dir, &out_dir, &entries)?;
+
+	// Generate fixture_location.rs with sol! macros
+	generate_fixture_location(&temp_dir, &out_dir, &entries)?;
 
 	Ok(())
 }
diff --git a/substrate/frame/revive/fixtures-solidity/contracts/AddressPredictor.sol b/substrate/frame/revive/fixtures/contracts/AddressPredictor.sol
similarity index 97%
rename from substrate/frame/revive/fixtures-solidity/contracts/AddressPredictor.sol
rename to substrate/frame/revive/fixtures/contracts/AddressPredictor.sol
index 0bc8ae5a387f..59b76c4a04b1 100644
--- a/substrate/frame/revive/fixtures-solidity/contracts/AddressPredictor.sol
+++ b/substrate/frame/revive/fixtures/contracts/AddressPredictor.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.28;
+pragma solidity ^0.8.20;
 
 contract Predicted {
     uint public salt;
diff --git a/substrate/frame/revive/fixtures-solidity/contracts/Playground.sol b/substrate/frame/revive/fixtures/contracts/BlockInfo.sol
similarity index 76%
rename from substrate/frame/revive/fixtures-solidity/contracts/Playground.sol
rename to substrate/frame/revive/fixtures/contracts/BlockInfo.sol
index 4d0663c515a5..4ca4df54a6fe 100644
--- a/substrate/frame/revive/fixtures-solidity/contracts/Playground.sol
+++ b/substrate/frame/revive/fixtures/contracts/BlockInfo.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-contract Playground {
+contract BlockInfo {
     function fib(uint n) public pure returns (uint) {
         if (n <= 1) {
             return n;
@@ -9,7 +9,7 @@ contract Playground {
         return fib(n - 1) + fib(n - 2);
     }
 
-	function bn() public view returns (uint) {
+	function blockNumber() public view returns (uint) {
 		return block.number;
 	}
 }
diff --git a/substrate/frame/revive/fixtures/contracts/Fibonacci.sol b/substrate/frame/revive/fixtures/contracts/Fibonacci.sol
new file mode 100644
index 000000000000..edd852e00142
--- /dev/null
+++ b/substrate/frame/revive/fixtures/contracts/Fibonacci.sol
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+contract Fibonacci {
+    function fib(uint n) public pure returns (uint) {
+        if (n <= 1) {
+            return n;
+        }
+        return fib(n - 1) + fib(n - 2);
+    }
+}
diff --git a/substrate/frame/revive/fixtures-solidity/contracts/Flipper.sol b/substrate/frame/revive/fixtures/contracts/Flipper.sol
similarity index 100%
rename from substrate/frame/revive/fixtures-solidity/contracts/Flipper.sol
rename to substrate/frame/revive/fixtures/contracts/Flipper.sol
diff --git a/substrate/frame/revive/fixtures/contracts/System.sol b/substrate/frame/revive/fixtures/contracts/System.sol
new file mode 100644
index 000000000000..07c105843c35
--- /dev/null
+++ b/substrate/frame/revive/fixtures/contracts/System.sol
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.20;
+
+contract System {
+    function keccak256(string memory _pre) external payable returns (bytes32) {
+        return keccak256(bytes(_pre));
+    }
+}
diff --git a/substrate/frame/revive/fixtures/contracts/dummy.polkavm b/substrate/frame/revive/fixtures/contracts/dummy.polkavm
deleted file mode 100644
index d970e700ce564485c496e1b5254d2f8d434db72d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1726
zcmb_bO>7fK7@hS`c5FhJHL+*ogs@NtIaR4#R<x!Sl7-NarK;q(38jZBak1+k1(xQA
zj6FVtu~Td~lv-M8$SJK-K@th|ScwRMs#cshRH?+Fhp3lUm8v4Oswya<;{-@0da63w
zr`>ro-}lXX-%j$xTL9c_0~<q8!EFR?frMw~W7uLkBzh!XlsG7nkVr|qCvhr0Ha3z;
zPo_ss*=I{zvoSlJ*_urh%Gq3Ya%5uC9#7}86WR3G$ar>gYW&QEWDBQHPfe!ZAIoke
zYB5jtolB2RWk)8*(`P0=$c~R^GhWR#yVujoJKNuu$(|jvOKr1{C3zqLqRM{dm~v0~
zMG3fiT}NDByYIStJvTjGujcLdzT&-9LMh)HrcVLNbz$D2uv*_;tFH~mB@sR32f%gx
zV&Je8>@pz&t~(dh17Pb506TBL%ft2(?}qjb%5+*rv;-*?D{)%cEmmT*(koV?w6aUA
z7_`zOR&-kF7AuHW!r}&`tV=A%DZ^qpMp;NKM=1-6WrMO#v8+?JQ!FFO0%8f$vL@!@
zw7f&i#b~)h%tdK=yO=X*xn0c3vfIQQqGi9h0%^%78gW`uMI%N_ZK4sSC9h~0wB!*D
zotE69A<yU%b$LvMBZCKZ9zu>5Jpdf-K0}ZNYg3Bfr5sj0z%}SqlgQ&sqP9Qe@-2qq
zEEscwiJG=%stFSsNd#}M6TEu{5Zp`fE`oaq?j|@)a2LTk!I<C>!9jvM3EoL?fMAVa
zMDPxRI|$xRa67@<2=)`~BN!5_65K|xmtYUUZh~C|D@3(4-BK(KS{kZizp8MIxUTaq
z$iu4wu3lAFFQ|iR$W%?3ME?EjRcfk=>GOLOQ=O3=OQLpty*h0|$ti~*l)~V4Q$@gC
zo%Va5ZR+^#Q7h8)nE=UHM_XHGNLN@8DJ%pPCuk^Act+OQlpgr%(f=&nZ9?h#Q`s!9
zAKIKhvE*&tlU1s@TT+r=QO@VS2ZP6M-_5)nR8q%wz534Rn~H<iYSU{hhcX{pShp~;
zFtk*uQkqso{3_ztbiN4r(lg&us;2OqetvogzW`<OHJRMwm(&{I`JVtU+y}h)CtyVZ
zSm82Y`8r^^8DQ=EQsN7VYrx6P11I0&=79-19c`YWlPs8Ip#dj2DlOxjS0TTIcwOfe
zotF?VLq2VPV_&hC>}k7Z->~EMOAPBQj93?BA=VRTdW>~PS*KCet6{_RJvO%)rs{8V
z2Io0C$%9EQvumUBLT+?D^x9vWy=yh@KbX+I;lT;)#+&){A0KZ0MONsf6-rvNU~bgO
zC#+Dy1mWjpX3p^oI&UC;5%Rj!)lyey`cqZd(&CmDv$UwC83S5kQ(3h;(GsWn-5kfc
z9^+k69yVljy%o=jIx8TShb;G;a9$YYxjfIG<weShah8v<T-3=MtYDa+$I<RFWU!#l
zLWnn{tGoeO7oSD^BYpE$$X%}J`hzEvB<lVBft2iPx$Kc903-VALsQ;=<7fF&l4$P_
z4}mq%G$OUmZ-@IWs~P#1CzT2Z_E^o@<$o;pFIvZ&{?Ey$uSZs+LxrP97b3N1%e94C
zWKYrKiS%0st>c0IqZjKNW1t!7vr@yu&E`VHi7X!ZF4DKSPZs^`$l^xX=8&@xX*7qL
WLw)^LYU3<@eV;@E$DPiA3;Yc>C+^??

diff --git a/substrate/frame/revive/fixtures/contracts/dummy.sol b/substrate/frame/revive/fixtures/contracts/dummy.sol
deleted file mode 100644
index e64031b0e021..000000000000
--- a/substrate/frame/revive/fixtures/contracts/dummy.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.2 <0.9.0;
-
-contract Simple {
-    uint256 number;
-
-    function store(uint256 num) public {
-        number = num;
-    }
-
-    function retrieve() public view returns (uint256) {
-        return number;
-    }
-}
\ No newline at end of file
diff --git a/substrate/frame/revive/fixtures/contracts/fake_erc20.sol b/substrate/frame/revive/fixtures/contracts/fake_erc20.sol
deleted file mode 100644
index 1c6d0aca5c8c..000000000000
--- a/substrate/frame/revive/fixtures/contracts/fake_erc20.sol
+++ /dev/null
@@ -1,54 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
-
-contract MyToken {
-    mapping(address account => uint256) private _balances;
-
-    uint256 private _totalSupply;
-
-    constructor(uint256 total) {
-        // We mint `total` tokens to the creator of this contract, as
-        // a sort of genesis.
-        _mint(msg.sender, total);
-    }
-
-    function transfer(address to, uint256 value) public virtual returns (uint256) {
-        address owner = msg.sender;
-        _transfer(owner, to, value);
-        return 1243657816489523;
-    }
-
-    function _transfer(address from, address to, uint256 value) internal {
-        _update(from, to, value);
-    }
-
-    function _update(address from, address to, uint256 value) internal virtual {
-        if (from == address(0)) {
-            // Overflow check required: The rest of the code assumes that totalSupply never overflows
-            _totalSupply += value;
-        } else {
-            uint256 fromBalance = _balances[from];
-            unchecked {
-                // Overflow not possible: value <= fromBalance <= totalSupply.
-                _balances[from] = fromBalance - value;
-            }
-        }
-
-        if (to == address(0)) {
-            unchecked {
-                // Overflow not possible: value <= totalSupply or value <= fromBalance <= totalSupply.
-                _totalSupply -= value;
-            }
-        } else {
-            unchecked {
-                // Overflow not possible: balance + value is at most totalSupply, which we know fits into a uint256.
-                _balances[to] += value;
-            }
-        }
-    }
-
-    function _mint(address account, uint256 value) internal {
-        _update(address(0), account, value);
-    }
-}
-
diff --git a/substrate/frame/revive/fixtures/contracts/erc20.polkavm b/substrate/frame/revive/fixtures/erc20/erc20.polkavm
similarity index 100%
rename from substrate/frame/revive/fixtures/contracts/erc20.polkavm
rename to substrate/frame/revive/fixtures/erc20/erc20.polkavm
diff --git a/substrate/frame/revive/fixtures/contracts/erc20.sol b/substrate/frame/revive/fixtures/erc20/erc20.sol
similarity index 100%
rename from substrate/frame/revive/fixtures/contracts/erc20.sol
rename to substrate/frame/revive/fixtures/erc20/erc20.sol
diff --git a/substrate/frame/revive/fixtures/contracts/expensive_erc20.polkavm b/substrate/frame/revive/fixtures/erc20/expensive_erc20.polkavm
similarity index 100%
rename from substrate/frame/revive/fixtures/contracts/expensive_erc20.polkavm
rename to substrate/frame/revive/fixtures/erc20/expensive_erc20.polkavm
diff --git a/substrate/frame/revive/fixtures/contracts/expensive_erc20.sol b/substrate/frame/revive/fixtures/erc20/expensive_erc20.sol
similarity index 100%
rename from substrate/frame/revive/fixtures/contracts/expensive_erc20.sol
rename to substrate/frame/revive/fixtures/erc20/expensive_erc20.sol
diff --git a/substrate/frame/revive/fixtures/contracts/fake_erc20.polkavm b/substrate/frame/revive/fixtures/erc20/fake_erc20.polkavm
similarity index 100%
rename from substrate/frame/revive/fixtures/contracts/fake_erc20.polkavm
rename to substrate/frame/revive/fixtures/erc20/fake_erc20.polkavm
diff --git a/substrate/frame/revive/fixtures/src/lib.rs b/substrate/frame/revive/fixtures/src/lib.rs
index 8d6a8236cd74..7b398e1ccccf 100644
--- a/substrate/frame/revive/fixtures/src/lib.rs
+++ b/substrate/frame/revive/fixtures/src/lib.rs
@@ -22,16 +22,46 @@ extern crate alloc;
 // generated file that tells us where to find the fixtures
 include!(concat!(env!("OUT_DIR"), "/fixture_location.rs"));
 
-/// Load a given polkavm module and returns a polkavm binary contents along with its hash.
+/// Enum for different fixture types
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum FixtureType {
+	/// Polkavm (compiled Rust contracts)
+	Rust,
+	/// Resolc (compiled Solidity contracts to Polkavm)
+	Resolc,
+	/// Solc (compiled Solidity contracts to EVM bytecode)
+	Solc,
+}
+
+impl FixtureType {
+	fn file_extension(&self) -> &'static str {
+		match self {
+			Self::Rust => ".polkavm",
+			Self::Resolc => ".resolc.polkavm",
+			Self::Solc => ".sol.bin",
+		}
+	}
+}
+
+/// Load a fixture module with the specified type and return binary contents along with its hash.
 #[cfg(feature = "std")]
-pub fn compile_module(fixture_name: &str) -> anyhow::Result<(Vec<u8>, sp_core::H256)> {
+pub fn compile_module_with_type(
+	fixture_name: &str,
+	fixture_type: FixtureType,
+) -> anyhow::Result<(Vec<u8>, sp_core::H256)> {
 	let out_dir: std::path::PathBuf = FIXTURE_DIR.into();
-	let fixture_path = out_dir.join(format!("{fixture_name}.polkavm"));
+	let fixture_path = out_dir.join(format!("{fixture_name}{}", fixture_type.file_extension()));
 	let binary = std::fs::read(fixture_path)?;
 	let code_hash = sp_io::hashing::keccak_256(&binary);
 	Ok((binary, sp_core::H256(code_hash)))
 }
 
+/// Load a given polkavm module and returns a polkavm binary contents along with its hash.
+#[cfg(feature = "std")]
+pub fn compile_module(fixture_name: &str) -> anyhow::Result<(Vec<u8>, sp_core::H256)> {
+	compile_module_with_type(fixture_name, FixtureType::Rust)
+}
+
 /// Fixtures used in runtime benchmarks.
 ///
 /// We explicitly include those fixtures into the binary to make them
diff --git a/substrate/frame/revive/src/impl_fungibles.rs b/substrate/frame/revive/src/impl_fungibles.rs
index 55c42a509109..404690c6765b 100644
--- a/substrate/frame/revive/src/impl_fungibles.rs
+++ b/substrate/frame/revive/src/impl_fungibles.rs
@@ -302,13 +302,14 @@ mod tests {
 		AccountInfoOf, Code,
 	};
 	use frame_support::assert_ok;
+	const ERC20_PVM_CODE: &[u8] = include_bytes!("../fixtures/erc20/erc20.polkavm");
 
 	#[test]
 	fn call_erc20_contract() {
 		ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
 			let _ =
 				<<Test as Config>::Currency as fungible::Mutate<_>>::set_balance(&ALICE, 1_000_000);
-			let code = include_bytes!("../fixtures/contracts/erc20.polkavm").to_vec();
+			let code = ERC20_PVM_CODE.to_vec();
 			let amount = EU256::from(1000);
 			let constructor_data = sol_data::Uint::<256>::abi_encode(&amount);
 			let Contract { addr, .. } = BareInstantiateBuilder::<Test>::bare_instantiate(
@@ -333,7 +334,7 @@ mod tests {
 		ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
 			let _ =
 				<<Test as Config>::Currency as fungible::Mutate<_>>::set_balance(&ALICE, 1_000_000);
-			let code = include_bytes!("../fixtures/contracts/erc20.polkavm").to_vec();
+			let code = ERC20_PVM_CODE.to_vec();
 			let amount = 1000;
 			let constructor_data = sol_data::Uint::<256>::abi_encode(&EU256::from(amount));
 			let Contract { addr, .. } = BareInstantiateBuilder::<Test>::bare_instantiate(
@@ -353,7 +354,7 @@ mod tests {
 		ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
 			let _ =
 				<<Test as Config>::Currency as fungible::Mutate<_>>::set_balance(&ALICE, 1_000_000);
-			let code = include_bytes!("../fixtures/contracts/erc20.polkavm").to_vec();
+			let code = ERC20_PVM_CODE.to_vec();
 			let amount = 1000;
 			let constructor_data = sol_data::Uint::<256>::abi_encode(&EU256::from(amount));
 			let Contract { addr, .. } = BareInstantiateBuilder::<Test>::bare_instantiate(
@@ -371,7 +372,7 @@ mod tests {
 		ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
 			let _ =
 				<<Test as Config>::Currency as fungible::Mutate<_>>::set_balance(&ALICE, 1_000_000);
-			let code = include_bytes!("../fixtures/contracts/erc20.polkavm").to_vec();
+			let code = ERC20_PVM_CODE.to_vec();
 			let amount = 1000;
 			let constructor_data = sol_data::Uint::<256>::abi_encode(&(EU256::from(amount * 2)));
 			let Contract { addr, .. } = BareInstantiateBuilder::<Test>::bare_instantiate(
@@ -407,7 +408,7 @@ mod tests {
 				&checking_account,
 				1_000_000,
 			);
-			let code = include_bytes!("../fixtures/contracts/erc20.polkavm").to_vec();
+			let code = ERC20_PVM_CODE.to_vec();
 			let amount = 1000;
 			let constructor_data = sol_data::Uint::<256>::abi_encode(&EU256::from(amount));
 			// We're instantiating the contract with the `CheckingAccount` so it has `amount` in it.
diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index 2d8d348e14c7..9be96347d518 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -15,11 +15,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-mod common;
+mod block_info;
 mod evm;
 mod pallet_dummy;
 mod precompiles;
 mod pvm;
+mod system;
 
 use crate::{
 	self as pallet_revive, test_utils::*, AccountId32Mapper, BalanceOf, BalanceWithDust,
@@ -139,8 +140,8 @@ pub mod test_utils {
 		let code_info_len = CodeInfo::<Test>::max_encoded_len() as u64;
 		// Calculate deposit to be reserved.
 		// We add 2 storage items: one for code, other for code_info
-		DepositPerByte::get().saturating_mul(code_len as u64 + code_info_len)
-			+ DepositPerItem::get().saturating_mul(2)
+		DepositPerByte::get().saturating_mul(code_len as u64 + code_info_len) +
+			DepositPerItem::get().saturating_mul(2)
 	}
 	pub fn ensure_stored(code_hash: sp_core::H256) -> usize {
 		// Assert that code_info is stored
diff --git a/substrate/frame/revive/src/tests/block_info.rs b/substrate/frame/revive/src/tests/block_info.rs
new file mode 100644
index 000000000000..40ef71d1ce22
--- /dev/null
+++ b/substrate/frame/revive/src/tests/block_info.rs
@@ -0,0 +1,57 @@
+// 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.
+
+//! The pallet-revive shared VM integration test suite.
+
+use crate::{
+	test_utils::{builder::Contract, ALICE},
+	tests::{builder, ExtBuilder, System, Test},
+	Code, Config,
+};
+
+use alloy_core::{primitives::U256, sol_types::SolInterface};
+use frame_support::traits::fungible::Mutate;
+use pallet_revive_fixtures::{compile_module_with_type, BlockInfo, FixtureType};
+use pretty_assertions::assert_eq;
+
+/// Tests that the blocknumber opcode works as expected.
+#[test]
+fn block_number_works() {
+	for (code, _) in [
+		compile_module_with_type("BlockInfo", FixtureType::Solc).unwrap(),
+		compile_module_with_type("BlockInfo", FixtureType::Resolc).unwrap(),
+	] {
+		ExtBuilder::default().build().execute_with(|| {
+			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+			let Contract { addr, .. } =
+				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+			System::set_block_number(42);
+
+			let result = builder::bare_call(addr)
+				.data(
+					BlockInfo::BlockInfoCalls::blockNumber(BlockInfo::blockNumberCall {})
+						.abi_encode(),
+				)
+				.build_and_unwrap_result();
+			assert_eq!(
+				U256::from(42u32),
+				U256::from_be_bytes::<32>(result.data.try_into().unwrap())
+			);
+		});
+	}
+}
diff --git a/substrate/frame/revive/src/tests/evm.rs b/substrate/frame/revive/src/tests/evm.rs
index 620fbaf3a20d..72413ca0c314 100644
--- a/substrate/frame/revive/src/tests/evm.rs
+++ b/substrate/frame/revive/src/tests/evm.rs
@@ -15,10 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! The pallet-revive EVM specifc integration test suite.
+//! The pallet-revive EVM specific integration test suite.
 
 use crate::{
-	test_utils::{builder::Contract, *},
+	test_utils::{builder::Contract, ALICE},
 	tests::{
 		builder,
 		test_utils::{ensure_stored, get_contract_checked},
@@ -26,16 +26,15 @@ use crate::{
 	},
 	Code, Config,
 };
-
 use alloy_core::{primitives::U256, sol_types::SolInterface};
 use frame_support::traits::fungible::Mutate;
-use pallet_revive_fixtures_solidity::contracts::*;
+use pallet_revive_fixtures::{compile_module_with_type, Fibonacci, FixtureType, Flipper};
 use pretty_assertions::assert_eq;
 
 /// Tests that the EVM can calculate a fibonacci number.
 #[test]
 fn basic_evm_flow_works() {
-	let code = playground_bin();
+	let (code, _) = compile_module_with_type("Fibonacci", FixtureType::Solc).unwrap();
 
 	ExtBuilder::default().build().execute_with(|| {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
@@ -48,10 +47,49 @@ fn basic_evm_flow_works() {
 
 		let result = builder::bare_call(addr)
 			.data(
-				Playground::PlaygroundCalls::fib(Playground::fibCall { n: U256::from(10u64) })
+				Fibonacci::FibonacciCalls::fib(Fibonacci::fibCall { n: U256::from(10u64) })
 					.abi_encode(),
 			)
 			.build_and_unwrap_result();
 		assert_eq!(U256::from(55u32), U256::from_be_bytes::<32>(result.data.try_into().unwrap()));
 	});
 }
+
+/// Tests that the sstore and sload storage opcodes work as expected.
+#[test]
+fn flipper() {
+	// TODO: Remove `take(1)` to activate the EVM test.
+	for (code, _) in [
+		compile_module_with_type("Flipper", FixtureType::Resolc).unwrap(),
+		compile_module_with_type("Flipper", FixtureType::Solc).unwrap(),
+	]
+	.into_iter()
+	.take(1)
+	{
+		ExtBuilder::default().build().execute_with(|| {
+			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+			let Contract { addr, .. } =
+				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+			let result = builder::bare_call(addr)
+				.data(Flipper::FlipperCalls::coin(Flipper::coinCall {}).abi_encode())
+				.build_and_unwrap_result();
+			assert_eq!(U256::ZERO, U256::from_be_bytes::<32>(result.data.try_into().unwrap()));
+
+			// Should be false
+			let result = builder::bare_call(addr)
+				.data(Flipper::FlipperCalls::coin(Flipper::coinCall {}).abi_encode())
+				.build_and_unwrap_result();
+			assert_eq!(U256::ZERO, U256::from_be_bytes::<32>(result.data.try_into().unwrap()));
+
+			// Flip the coin
+			builder::bare_call(addr).build_and_unwrap_result();
+
+			// Should be true
+			let result = builder::bare_call(addr)
+				.data(Flipper::FlipperCalls::coin(Flipper::coinCall {}).abi_encode())
+				.build_and_unwrap_result();
+			assert_eq!(U256::ONE, U256::from_be_bytes::<32>(result.data.try_into().unwrap()));
+		});
+	}
+}
diff --git a/substrate/frame/revive/src/tests/common.rs b/substrate/frame/revive/src/tests/system.rs
similarity index 75%
rename from substrate/frame/revive/src/tests/common.rs
rename to substrate/frame/revive/src/tests/system.rs
index 638037b4bc92..e7f4d345fb76 100644
--- a/substrate/frame/revive/src/tests/common.rs
+++ b/substrate/frame/revive/src/tests/system.rs
@@ -18,8 +18,8 @@
 //! The pallet-revive shared VM integration test suite.
 
 use crate::{
-	test_utils::{builder::Contract, *},
-	tests::{builder, ExtBuilder, System, Test},
+	test_utils::{builder::Contract, ALICE},
+	tests::{builder, ExtBuilder, Test},
 	Code, Config,
 };
 
@@ -28,36 +28,19 @@ use alloy_core::{
 	sol_types::{SolConstructor, SolInterface},
 };
 use frame_support::traits::fungible::Mutate;
-use pallet_revive_fixtures_solidity::contracts::*;
+use pallet_revive_fixtures::{
+	compile_module_with_type, AddressPredictor, FixtureType, Flipper, System as SystemFixture,
+};
 use pretty_assertions::assert_eq;
 use sp_io::hashing::keccak_256;
 
-/// Tests that the blocknumber opcode works as expected.
-#[test]
-fn block_number_works() {
-	for code in [playground_bin(), playground_pvm()] {
-		ExtBuilder::default().build().execute_with(|| {
-			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-			let Contract { addr, .. } =
-				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-			System::set_block_number(42);
-
-			let result = builder::bare_call(addr)
-				.data(Playground::PlaygroundCalls::bn(Playground::bnCall {}).abi_encode())
-				.build_and_unwrap_result();
-			assert_eq!(
-				U256::from(42u32),
-				U256::from_be_bytes::<32>(result.data.try_into().unwrap())
-			);
-		});
-	}
-}
-
 /// Tests that the sha3 keccak256 cryptographic opcode works as expected.
 #[test]
 fn keccak_256_works() {
-	for code in [crypto_bin(), crypto_pvm()] {
+	for (code, _) in [
+		// compile_module_with_type("System", FixtureType::Solc).unwrap(),
+		compile_module_with_type("System", FixtureType::Resolc).unwrap(),
+	] {
 		ExtBuilder::default().build().execute_with(|| {
 			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
 			let Contract { addr, .. } =
@@ -67,7 +50,12 @@ fn keccak_256_works() {
 			let expected = keccak_256(pre.as_bytes());
 
 			let result = builder::bare_call(addr)
-				.data(TestSha3::TestSha3Calls::test(TestSha3::testCall { _pre: pre }).abi_encode())
+				.data(
+					SystemFixture::SystemCalls::keccak256(SystemFixture::keccak256Call {
+						_pre: pre,
+					})
+					.abi_encode(),
+				)
 				.build_and_unwrap_result();
 
 			assert_eq!(&expected, result.data.as_slice());
@@ -79,8 +67,14 @@ fn keccak_256_works() {
 #[test]
 fn predictable_addresses() {
 	let bytecodes = [
-		(address_predictor_pvm(), predicted_pvm()),
-		(address_predictor_bin(), predicted_bin_runtime()),
+		(
+			compile_module_with_type("AddressPredictor", FixtureType::Resolc).unwrap().0,
+			compile_module_with_type("Predicted", FixtureType::Resolc).unwrap().0,
+		),
+		(
+			compile_module_with_type("AddressPredictor", FixtureType::Solc).unwrap().0,
+			compile_module_with_type("Predicted", FixtureType::Solc).unwrap().0,
+		),
 	];
 
 	// TODO: Remove `take(1)` to activate the EVM test.
@@ -107,7 +101,13 @@ fn predictable_addresses() {
 #[test]
 fn flipper() {
 	// TODO: Remove `take(1)` to activate the EVM test.
-	for code in [flipper_pvm(), flipper_bin()].into_iter().take(1) {
+	for (code, _) in [
+		compile_module_with_type("Flipper", FixtureType::Resolc).unwrap(),
+		compile_module_with_type("Flipper", FixtureType::Solc).unwrap(),
+	]
+	.into_iter()
+	.take(1)
+	{
 		ExtBuilder::default().build().execute_with(|| {
 			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
 			let Contract { addr, .. } =

From 27b62f7cde98f779acb12d37db69d6733d570700 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Thu, 24 Jul 2025 21:18:54 +0000
Subject: [PATCH 082/186] add skeleton for fixtures

---
 .../revive/fixtures/contracts/BlockInfo.sol   |  28 +++++
 .../frame/revive/fixtures/contracts/Host.sol  | 104 ++++++++++++++++++
 .../revive/fixtures/contracts/System.sol      |  72 +++++++++++-
 .../fixtures/contracts/TransactionInfo.sol    |  16 +++
 4 files changed, 218 insertions(+), 2 deletions(-)
 create mode 100644 substrate/frame/revive/fixtures/contracts/Host.sol
 create mode 100644 substrate/frame/revive/fixtures/contracts/TransactionInfo.sol

diff --git a/substrate/frame/revive/fixtures/contracts/BlockInfo.sol b/substrate/frame/revive/fixtures/contracts/BlockInfo.sol
index 4ca4df54a6fe..93a994bd84ff 100644
--- a/substrate/frame/revive/fixtures/contracts/BlockInfo.sol
+++ b/substrate/frame/revive/fixtures/contracts/BlockInfo.sol
@@ -12,4 +12,32 @@ contract BlockInfo {
 	function blockNumber() public view returns (uint) {
 		return block.number;
 	}
+
+	function coinbase() public view returns (address) {
+		return block.coinbase;
+	}
+
+	function timestamp() public view returns (uint) {
+		return block.timestamp;
+	}
+
+	function difficulty() public view returns (uint) {
+		return block.difficulty;
+	}
+
+	function gaslimit() public view returns (uint) {
+		return block.gaslimit;
+	}
+
+	function chainid() public view returns (uint) {
+		return block.chainid;
+	}
+
+	function basefee() public view returns (uint) {
+		return block.basefee;
+	}
+
+	function blobBasefee() public view returns (uint) {
+		return block.blobbasefee;
+	}
 }
diff --git a/substrate/frame/revive/fixtures/contracts/Host.sol b/substrate/frame/revive/fixtures/contracts/Host.sol
new file mode 100644
index 000000000000..7efaa6caea46
--- /dev/null
+++ b/substrate/frame/revive/fixtures/contracts/Host.sol
@@ -0,0 +1,104 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+contract Host {
+    function balance(address account) public view returns (uint256) {
+        return account.balance;
+    }
+
+    function extcodesize(address account) public view returns (uint256) {
+        uint256 size;
+        assembly {
+            size := extcodesize(account)
+        }
+        return size;
+    }
+
+    function extcodecopy(address account, uint256 destOffset, uint256 offset, uint256 size) public view returns (bytes memory) {
+        bytes memory code = new bytes(size);
+        assembly {
+            extcodecopy(account, add(code, 0x20), offset, size)
+        }
+        return code;
+    }
+
+    function extcodehash(address account) public view returns (bytes32) {
+        bytes32 hash;
+        assembly {
+            hash := extcodehash(account)
+        }
+        return hash;
+    }
+
+    function blockhash(uint256 blockNumber) public view returns (bytes32) {
+        return blockhash(blockNumber);
+    }
+
+    function sload(uint256 slot) public view returns (uint256) {
+        uint256 value;
+        assembly {
+            value := sload(slot)
+        }
+        return value;
+    }
+
+    function sstore(uint256 slot, uint256 value) public returns (uint256) {
+        assembly {
+            sstore(slot, value)
+        }
+        return value;
+    }
+
+    function tload(uint256 slot) public view returns (uint256) {
+        uint256 value;
+        assembly {
+            value := tload(slot)
+        }
+        return value;
+    }
+
+    function tstore(uint256 slot, uint256 value) public returns (uint256) {
+        assembly {
+            tstore(slot, value)
+        }
+        return value;
+    }
+
+    function log0(bytes32 data) public {
+        assembly {
+            log0(data, 0x20)
+        }
+    }
+
+    function log1(bytes32 data, bytes32 topic1) public {
+        assembly {
+            log1(data, 0x20, topic1)
+        }
+    }
+
+    function log2(bytes32 data, bytes32 topic1, bytes32 topic2) public {
+        assembly {
+            log2(data, 0x20, topic1, topic2)
+        }
+    }
+
+    function log3(bytes32 data, bytes32 topic1, bytes32 topic2, bytes32 topic3) public {
+        assembly {
+            log3(data, 0x20, topic1, topic2, topic3)
+        }
+    }
+
+    function log4(bytes32 data, bytes32 topic1, bytes32 topic2, bytes32 topic3, bytes32 topic4) public {
+        assembly {
+            log4(data, 0x20, topic1, topic2, topic3, topic4)
+        }
+    }
+
+    function selfdestruct(address payable recipient) public {
+        selfdestruct(recipient);
+    }
+
+    function selfbalance() public view returns (uint256) {
+        return address(this).balance;
+    }
+}
\ No newline at end of file
diff --git a/substrate/frame/revive/fixtures/contracts/System.sol b/substrate/frame/revive/fixtures/contracts/System.sol
index 07c105843c35..0b3e81f4f559 100644
--- a/substrate/frame/revive/fixtures/contracts/System.sol
+++ b/substrate/frame/revive/fixtures/contracts/System.sol
@@ -3,7 +3,75 @@
 pragma solidity ^0.8.20;
 
 contract System {
-    function keccak256(string memory _pre) external payable returns (bytes32) {
-        return keccak256(bytes(_pre));
+    function keccak256Hash(bytes memory data) public pure returns (bytes32) {
+        return keccak256(data);
+    }
+
+    function addressFunc() public view returns (address) {
+        return address(this);
+    }
+
+    function caller() public view returns (address) {
+        return msg.sender;
+    }
+
+    function callvalue() public payable returns (uint256) {
+        return msg.value;
+    }
+
+    function calldataload(uint256 offset) public pure returns (bytes32) {
+        bytes32 data;
+        assembly {
+            data := calldataload(offset)
+        }
+        return data;
+    }
+
+    function calldatasize() public pure returns (uint256) {
+        return msg.data.length;
+    }
+
+    function calldatacopy(uint256 destOffset, uint256 offset, uint256 size) public pure returns (bytes memory) {
+        bytes memory data = new bytes(size);
+        assembly {
+            calldatacopy(add(data, 0x20), offset, size)
+        }
+        return data;
+    }
+
+    function codesize() public pure returns (uint256) {
+        uint256 size;
+        assembly {
+            size := codesize()
+        }
+        return size;
+    }
+
+    function codecopy(uint256 destOffset, uint256 offset, uint256 size) public pure returns (bytes memory) {
+        bytes memory code = new bytes(size);
+        assembly {
+            codecopy(add(code, 0x20), offset, size)
+        }
+        return code;
+    }
+
+    function returndatasize() public pure returns (uint256) {
+        uint256 size;
+        assembly {
+            size := returndatasize()
+        }
+        return size;
+    }
+
+    function returndatacopy(uint256 destOffset, uint256 offset, uint256 size) public pure returns (bytes memory) {
+        bytes memory data = new bytes(size);
+        assembly {
+            returndatacopy(add(data, 0x20), offset, size)
+        }
+        return data;
+    }
+
+    function gas() public view returns (uint256) {
+        return gasleft();
     }
 }
diff --git a/substrate/frame/revive/fixtures/contracts/TransactionInfo.sol b/substrate/frame/revive/fixtures/contracts/TransactionInfo.sol
new file mode 100644
index 000000000000..e92cfe3aa88d
--- /dev/null
+++ b/substrate/frame/revive/fixtures/contracts/TransactionInfo.sol
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+contract TransactionInfo {
+    function origin() public view returns (address) {
+        return tx.origin;
+    }
+
+    function gasprice() public view returns (uint256) {
+        return tx.gasprice;
+    }
+
+    function blobhash(uint256 index) public view returns (bytes32) {
+        return blobhash(index);
+    }
+}
\ No newline at end of file

From acf0e6efcbbc508aff08e5ab4dba1b3a650fc26b Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 25 Jul 2025 04:04:43 +0000
Subject: [PATCH 083/186] wip

---
 .../revive/fixtures/contracts/Arithmetic.sol  |  77 ++++++++++
 .../revive/fixtures/contracts/Bitwise.sol     | 108 ++++++++++++++
 .../revive/fixtures/contracts/ControlFlow.sol |  83 +++++++++++
 .../revive/fixtures/contracts/Memory.sol      |  61 ++++++++
 .../frame/revive/fixtures/contracts/Stack.sol | 133 ++++++++++++++++++
 5 files changed, 462 insertions(+)
 create mode 100644 substrate/frame/revive/fixtures/contracts/Arithmetic.sol
 create mode 100644 substrate/frame/revive/fixtures/contracts/Bitwise.sol
 create mode 100644 substrate/frame/revive/fixtures/contracts/ControlFlow.sol
 create mode 100644 substrate/frame/revive/fixtures/contracts/Memory.sol
 create mode 100644 substrate/frame/revive/fixtures/contracts/Stack.sol

diff --git a/substrate/frame/revive/fixtures/contracts/Arithmetic.sol b/substrate/frame/revive/fixtures/contracts/Arithmetic.sol
new file mode 100644
index 000000000000..a74d905139e0
--- /dev/null
+++ b/substrate/frame/revive/fixtures/contracts/Arithmetic.sol
@@ -0,0 +1,77 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+contract Arithmetic {
+    function test_add() public pure {
+        assert(5 + 3 == 8);
+        assert(0 + 0 == 0);
+        assert(type(uint256).max - 1 + 1 == type(uint256).max);
+    }
+
+    function test_mul() public pure {
+        assert(5 * 3 == 15);
+        assert(0 * 100 == 0);
+        assert(1 * 42 == 42);
+    }
+
+    function test_sub() public pure {
+        assert(10 - 3 == 7);
+        assert(5 - 5 == 0);
+        assert(type(uint256).max - 1 == type(uint256).max - 1);
+    }
+
+    function test_div() public pure {
+        assert(15 / 3 == 5);
+        assert(10 / 2 == 5);
+        assert(7 / 2 == 3);
+    }
+
+    function test_sdiv() public pure {
+        assert(int256(15) / int256(3) == int256(5));
+        assert(int256(-15) / int256(3) == int256(-5));
+        assert(int256(-15) / int256(-3) == int256(5));
+    }
+
+    function test_rem() public pure {
+        assert(10 % 3 == 1);
+        assert(15 % 5 == 0);
+        assert(7 % 2 == 1);
+    }
+
+    function test_smod() public pure {
+        assert(int256(10) % int256(3) == int256(1));
+        assert(int256(-10) % int256(3) == int256(-1));
+        assert(int256(10) % int256(-3) == int256(1));
+    }
+
+    function test_addmod() public pure {
+        assert(addmod(5, 3, 7) == 1);
+        assert(addmod(10, 15, 20) == 5);
+        assert(addmod(0, 0, 5) == 0);
+    }
+
+    function test_mulmod() public pure {
+        assert(mulmod(5, 3, 7) == 1);
+        assert(mulmod(10, 15, 100) == 50);
+        assert(mulmod(0, 100, 7) == 0);
+    }
+
+    function test_exp() public pure {
+        assert(2 ** 3 == 8);
+        assert(5 ** 2 == 25);
+        assert(10 ** 0 == 1);
+    }
+
+    function test_signextend() public pure {
+        uint256 result;
+        assembly {
+            result := signextend(0, 0xff)
+        }
+        assert(result == type(uint256).max);
+        
+        assembly {
+            result := signextend(0, 0x7f)
+        }
+        assert(result == 0x7f);
+    }
+}
\ No newline at end of file
diff --git a/substrate/frame/revive/fixtures/contracts/Bitwise.sol b/substrate/frame/revive/fixtures/contracts/Bitwise.sol
new file mode 100644
index 000000000000..9b9b166db83d
--- /dev/null
+++ b/substrate/frame/revive/fixtures/contracts/Bitwise.sol
@@ -0,0 +1,108 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+contract Bitwise {
+    function test_lt() public pure {
+        assert(5 < 10 == true);
+        assert(10 < 5 == false);
+        assert(5 < 5 == false);
+    }
+
+    function test_gt() public pure {
+        assert(10 > 5 == true);
+        assert(5 > 10 == false);
+        assert(5 > 5 == false);
+    }
+
+    function test_slt() public pure {
+        assert(int256(-5) < int256(5) == true);
+        assert(int256(5) < int256(-5) == false);
+        assert(int256(5) < int256(5) == false);
+    }
+
+    function test_sgt() public pure {
+        assert(int256(5) > int256(-5) == true);
+        assert(int256(-5) > int256(5) == false);
+        assert(int256(5) > int256(5) == false);
+    }
+
+    function test_eq() public pure {
+        assert((5 == 5) == true);
+        assert((5 == 10) == false);
+        assert((0 == 0) == true);
+    }
+
+    function test_iszero() public pure {
+        assert((0 == 0) == true);
+        assert((5 == 0) == false);
+        assert((type(uint256).max == 0) == false);
+    }
+
+    function test_bitand() public pure {
+        assert((0xF0 & 0x0F) == 0x00);
+        assert((0xFF & 0xFF) == 0xFF);
+        assert((0xAA & 0x55) == 0x00);
+    }
+
+    function test_bitor() public pure {
+        assert((0xF0 | 0x0F) == 0xFF);
+        assert((0x00 | 0xFF) == 0xFF);
+        assert((0xAA | 0x55) == 0xFF);
+    }
+
+    function test_bitxor() public pure {
+        assert((0xF0 ^ 0x0F) == 0xFF);
+        assert((0xFF ^ 0xFF) == 0x00);
+        assert((0xAA ^ 0x55) == 0xFF);
+    }
+
+    function test_not() public pure {
+        assert(~uint256(0) == type(uint256).max);
+        assert(~type(uint256).max == 0);
+        assert(~uint256(0xF0) == type(uint256).max - 0xF0);
+    }
+
+    function test_byte() public pure {
+        uint256 result;
+        assembly {
+            result := byte(0, 0x1234567890abcdef)
+        }
+        assert(result == 0x12);
+        
+        assembly {
+            result := byte(1, 0x1234567890abcdef)
+        }
+        assert(result == 0x34);
+    }
+
+    function test_shl() public pure {
+        assert((1 << 1) == 2);
+        assert((1 << 8) == 256);
+        assert((0xFF << 8) == 0xFF00);
+    }
+
+    function test_shr() public pure {
+        assert((256 >> 1) == 128);
+        assert((256 >> 8) == 1);
+        assert((0xFF00 >> 8) == 0xFF);
+    }
+
+    function test_sar() public pure {
+        assert((int256(256) >> 1) == int256(128));
+        assert((int256(-256) >> 1) == int256(-128));
+        assert((int256(-1) >> 8) == int256(-1));
+    }
+
+    function test_clz() public pure {
+        uint256 result;
+        assembly {
+            result := clz(1)
+        }
+        assert(result == 255);
+        
+        assembly {
+            result := clz(0x8000000000000000000000000000000000000000000000000000000000000000)
+        }
+        assert(result == 0);
+    }
+}
\ No newline at end of file
diff --git a/substrate/frame/revive/fixtures/contracts/ControlFlow.sol b/substrate/frame/revive/fixtures/contracts/ControlFlow.sol
new file mode 100644
index 000000000000..83be7a54ba8c
--- /dev/null
+++ b/substrate/frame/revive/fixtures/contracts/ControlFlow.sol
@@ -0,0 +1,83 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+contract ControlFlow {
+    function test_jump() public pure {
+        uint256 result;
+        assembly {
+            let target := jumpdest_label
+            jump(target)
+            result := 0
+            jumpdest_label:
+            result := 1
+        }
+        assert(result == 1);
+    }
+
+    function test_jumpi() public pure {
+        uint256 result1;
+        uint256 result2;
+        
+        assembly {
+            let target := jumpdest_label1
+            jumpi(target, 1)
+            result1 := 0
+            jump(end1)
+            jumpdest_label1:
+            result1 := 1
+            end1:
+        }
+        assert(result1 == 1);
+        
+        assembly {
+            let target := jumpdest_label2
+            jumpi(target, 0)
+            result2 := 0
+            jump(end2)
+            jumpdest_label2:
+            result2 := 1
+            end2:
+        }
+        assert(result2 == 0);
+    }
+
+    function test_jumpdest() public pure {
+        uint256 result;
+        assembly {
+            jumpdest
+            result := 1
+        }
+        assert(result == 1);
+    }
+
+    function test_pc() public pure {
+        uint256 pc1;
+        uint256 pc2;
+        assembly {
+            pc1 := pc()
+            pc2 := pc()
+        }
+        assert(pc2 > pc1);
+    }
+
+    function test_ret() public pure {
+        bytes memory data = hex"deadbeef";
+        bytes memory result;
+        
+        bool success;
+        assembly {
+            let ptr := mload(0x40)
+            mstore(ptr, 0x04)
+            mstore(add(ptr, 0x20), 0xdeadbeef00000000000000000000000000000000000000000000000000000000)
+            success := call(gas(), address(), 0, ptr, 0x24, 0, 0)
+        }
+        
+        assert(data.length == 4);
+        assert(data[0] == 0xde);
+    }
+
+    function test_basic_execution() public pure {
+        uint256 value = 42;
+        assert(value == 42);
+    }
+}
\ No newline at end of file
diff --git a/substrate/frame/revive/fixtures/contracts/Memory.sol b/substrate/frame/revive/fixtures/contracts/Memory.sol
new file mode 100644
index 000000000000..906d057953c9
--- /dev/null
+++ b/substrate/frame/revive/fixtures/contracts/Memory.sol
@@ -0,0 +1,61 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+contract Memory {
+    function test_mload_mstore() public pure {
+        uint256 stored;
+        uint256 loaded;
+        assembly {
+            mstore(0x80, 0xdeadbeefcafebabe)
+            loaded := mload(0x80)
+        }
+        assert(loaded == 0xdeadbeefcafebabe);
+    }
+
+    function test_mstore8() public pure {
+        uint256 result;
+        assembly {
+            mstore(0x80, 0)
+            mstore8(0x80, 0xab)
+            result := mload(0x80)
+        }
+        assert(result == 0xab00000000000000000000000000000000000000000000000000000000000000);
+    }
+
+    function test_msize() public pure {
+        uint256 size1;
+        uint256 size2;
+        assembly {
+            size1 := msize()
+            mstore(0x100, 0xdeadbeef)
+            size2 := msize()
+        }
+        assert(size2 >= size1);
+        assert(size2 >= 0x120);
+    }
+
+    function test_mcopy() public pure {
+        uint256 src_data;
+        uint256 dest_data;
+        assembly {
+            mstore(0x80, 0xdeadbeefcafebabe)
+            mcopy(0xa0, 0x80, 0x20)
+            src_data := mload(0x80)
+            dest_data := mload(0xa0)
+        }
+        assert(src_data == dest_data);
+        assert(dest_data == 0xdeadbeefcafebabe);
+    }
+
+    function test_memory_expansion() public pure {
+        uint256 size_before;
+        uint256 size_after;
+        assembly {
+            size_before := msize()
+            mstore(0x200, 0x42)
+            size_after := msize()
+        }
+        assert(size_after > size_before);
+        assert(size_after >= 0x220);
+    }
+}
\ No newline at end of file
diff --git a/substrate/frame/revive/fixtures/contracts/Stack.sol b/substrate/frame/revive/fixtures/contracts/Stack.sol
new file mode 100644
index 000000000000..13f17678fffb
--- /dev/null
+++ b/substrate/frame/revive/fixtures/contracts/Stack.sol
@@ -0,0 +1,133 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+contract Stack {
+    function test_pop() public pure {
+        uint256 result;
+        assembly {
+            let a := 42
+            let b := 99
+            pop(b)
+            result := a
+        }
+        assert(result == 42);
+    }
+
+    function test_push0() public pure {
+        uint256 result;
+        assembly {
+            result := 0
+        }
+        assert(result == 0);
+    }
+
+    function test_push() public pure {
+        uint256 value = 123;
+        assert(value == 123);
+    }
+
+    function test_dup1() public pure {
+        uint256 val1;
+        uint256 val2;
+        assembly {
+            let a := 42
+            dup1
+            val2 := pop()
+            val1 := pop()
+        }
+        assert(val1 == 42);
+        assert(val2 == 42);
+    }
+
+    function test_dup2() public pure {
+        uint256 val1;
+        uint256 val2;
+        uint256 val3;
+        assembly {
+            let a := 42
+            let b := 99
+            dup2
+            val3 := pop()
+            val2 := pop()
+            val1 := pop()
+        }
+        assert(val1 == 42);
+        assert(val2 == 99);
+        assert(val3 == 42);
+    }
+
+    function test_dup3() public pure {
+        uint256 val1;
+        uint256 val2;
+        uint256 val3;
+        uint256 val4;
+        assembly {
+            let a := 42
+            let b := 99
+            let c := 123
+            dup3
+            val4 := pop()
+            val3 := pop()
+            val2 := pop()
+            val1 := pop()
+        }
+        assert(val1 == 42);
+        assert(val2 == 99);
+        assert(val3 == 123);
+        assert(val4 == 42);
+    }
+
+    function test_swap1() public pure {
+        uint256 val1;
+        uint256 val2;
+        assembly {
+            let a := 42
+            let b := 99
+            swap1
+            val2 := pop()
+            val1 := pop()
+        }
+        assert(val1 == 99);
+        assert(val2 == 42);
+    }
+
+    function test_swap2() public pure {
+        uint256 val1;
+        uint256 val2;
+        uint256 val3;
+        assembly {
+            let a := 42
+            let b := 99
+            let c := 123
+            swap2
+            val3 := pop()
+            val2 := pop() 
+            val1 := pop()
+        }
+        assert(val1 == 123);
+        assert(val2 == 99);
+        assert(val3 == 42);
+    }
+
+    function test_swap3() public pure {
+        uint256 val1;
+        uint256 val2;
+        uint256 val3;
+        uint256 val4;
+        assembly {
+            let a := 42
+            let b := 99
+            let c := 123
+            let d := 456
+            swap3
+            val4 := pop()
+            val3 := pop()
+            val2 := pop()
+            val1 := pop()
+        }
+        assert(val1 == 456);
+        assert(val2 == 99);
+        assert(val3 == 123);
+        assert(val4 == 42);
+    }
+}
\ No newline at end of file

From f47d7b589f5ff666971124d55b5a5fb91211fdfa Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 25 Jul 2025 09:37:53 +0200
Subject: [PATCH 084/186] fixes

---
 .../revive/fixtures/contracts/Arithmetic.sol  |  77 ----------
 .../revive/fixtures/contracts/Bitwise.sol     | 108 --------------
 .../revive/fixtures/contracts/BlockInfo.sol   |  10 --
 .../revive/fixtures/contracts/ControlFlow.sol |  83 -----------
 .../frame/revive/fixtures/contracts/Host.sol  |   5 +-
 .../revive/fixtures/contracts/Memory.sol      |  61 --------
 .../frame/revive/fixtures/contracts/Stack.sol | 133 ------------------
 .../revive/fixtures/contracts/System.sol      |   7 +-
 .../frame/revive/src/tests/block_info.rs      |   6 +-
 substrate/frame/revive/src/tests/evm.rs       |   9 +-
 substrate/frame/revive/src/tests/system.rs    |  98 ++-----------
 11 files changed, 18 insertions(+), 579 deletions(-)
 delete mode 100644 substrate/frame/revive/fixtures/contracts/Arithmetic.sol
 delete mode 100644 substrate/frame/revive/fixtures/contracts/Bitwise.sol
 delete mode 100644 substrate/frame/revive/fixtures/contracts/ControlFlow.sol
 delete mode 100644 substrate/frame/revive/fixtures/contracts/Memory.sol
 delete mode 100644 substrate/frame/revive/fixtures/contracts/Stack.sol

diff --git a/substrate/frame/revive/fixtures/contracts/Arithmetic.sol b/substrate/frame/revive/fixtures/contracts/Arithmetic.sol
deleted file mode 100644
index a74d905139e0..000000000000
--- a/substrate/frame/revive/fixtures/contracts/Arithmetic.sol
+++ /dev/null
@@ -1,77 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-contract Arithmetic {
-    function test_add() public pure {
-        assert(5 + 3 == 8);
-        assert(0 + 0 == 0);
-        assert(type(uint256).max - 1 + 1 == type(uint256).max);
-    }
-
-    function test_mul() public pure {
-        assert(5 * 3 == 15);
-        assert(0 * 100 == 0);
-        assert(1 * 42 == 42);
-    }
-
-    function test_sub() public pure {
-        assert(10 - 3 == 7);
-        assert(5 - 5 == 0);
-        assert(type(uint256).max - 1 == type(uint256).max - 1);
-    }
-
-    function test_div() public pure {
-        assert(15 / 3 == 5);
-        assert(10 / 2 == 5);
-        assert(7 / 2 == 3);
-    }
-
-    function test_sdiv() public pure {
-        assert(int256(15) / int256(3) == int256(5));
-        assert(int256(-15) / int256(3) == int256(-5));
-        assert(int256(-15) / int256(-3) == int256(5));
-    }
-
-    function test_rem() public pure {
-        assert(10 % 3 == 1);
-        assert(15 % 5 == 0);
-        assert(7 % 2 == 1);
-    }
-
-    function test_smod() public pure {
-        assert(int256(10) % int256(3) == int256(1));
-        assert(int256(-10) % int256(3) == int256(-1));
-        assert(int256(10) % int256(-3) == int256(1));
-    }
-
-    function test_addmod() public pure {
-        assert(addmod(5, 3, 7) == 1);
-        assert(addmod(10, 15, 20) == 5);
-        assert(addmod(0, 0, 5) == 0);
-    }
-
-    function test_mulmod() public pure {
-        assert(mulmod(5, 3, 7) == 1);
-        assert(mulmod(10, 15, 100) == 50);
-        assert(mulmod(0, 100, 7) == 0);
-    }
-
-    function test_exp() public pure {
-        assert(2 ** 3 == 8);
-        assert(5 ** 2 == 25);
-        assert(10 ** 0 == 1);
-    }
-
-    function test_signextend() public pure {
-        uint256 result;
-        assembly {
-            result := signextend(0, 0xff)
-        }
-        assert(result == type(uint256).max);
-        
-        assembly {
-            result := signextend(0, 0x7f)
-        }
-        assert(result == 0x7f);
-    }
-}
\ No newline at end of file
diff --git a/substrate/frame/revive/fixtures/contracts/Bitwise.sol b/substrate/frame/revive/fixtures/contracts/Bitwise.sol
deleted file mode 100644
index 9b9b166db83d..000000000000
--- a/substrate/frame/revive/fixtures/contracts/Bitwise.sol
+++ /dev/null
@@ -1,108 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-contract Bitwise {
-    function test_lt() public pure {
-        assert(5 < 10 == true);
-        assert(10 < 5 == false);
-        assert(5 < 5 == false);
-    }
-
-    function test_gt() public pure {
-        assert(10 > 5 == true);
-        assert(5 > 10 == false);
-        assert(5 > 5 == false);
-    }
-
-    function test_slt() public pure {
-        assert(int256(-5) < int256(5) == true);
-        assert(int256(5) < int256(-5) == false);
-        assert(int256(5) < int256(5) == false);
-    }
-
-    function test_sgt() public pure {
-        assert(int256(5) > int256(-5) == true);
-        assert(int256(-5) > int256(5) == false);
-        assert(int256(5) > int256(5) == false);
-    }
-
-    function test_eq() public pure {
-        assert((5 == 5) == true);
-        assert((5 == 10) == false);
-        assert((0 == 0) == true);
-    }
-
-    function test_iszero() public pure {
-        assert((0 == 0) == true);
-        assert((5 == 0) == false);
-        assert((type(uint256).max == 0) == false);
-    }
-
-    function test_bitand() public pure {
-        assert((0xF0 & 0x0F) == 0x00);
-        assert((0xFF & 0xFF) == 0xFF);
-        assert((0xAA & 0x55) == 0x00);
-    }
-
-    function test_bitor() public pure {
-        assert((0xF0 | 0x0F) == 0xFF);
-        assert((0x00 | 0xFF) == 0xFF);
-        assert((0xAA | 0x55) == 0xFF);
-    }
-
-    function test_bitxor() public pure {
-        assert((0xF0 ^ 0x0F) == 0xFF);
-        assert((0xFF ^ 0xFF) == 0x00);
-        assert((0xAA ^ 0x55) == 0xFF);
-    }
-
-    function test_not() public pure {
-        assert(~uint256(0) == type(uint256).max);
-        assert(~type(uint256).max == 0);
-        assert(~uint256(0xF0) == type(uint256).max - 0xF0);
-    }
-
-    function test_byte() public pure {
-        uint256 result;
-        assembly {
-            result := byte(0, 0x1234567890abcdef)
-        }
-        assert(result == 0x12);
-        
-        assembly {
-            result := byte(1, 0x1234567890abcdef)
-        }
-        assert(result == 0x34);
-    }
-
-    function test_shl() public pure {
-        assert((1 << 1) == 2);
-        assert((1 << 8) == 256);
-        assert((0xFF << 8) == 0xFF00);
-    }
-
-    function test_shr() public pure {
-        assert((256 >> 1) == 128);
-        assert((256 >> 8) == 1);
-        assert((0xFF00 >> 8) == 0xFF);
-    }
-
-    function test_sar() public pure {
-        assert((int256(256) >> 1) == int256(128));
-        assert((int256(-256) >> 1) == int256(-128));
-        assert((int256(-1) >> 8) == int256(-1));
-    }
-
-    function test_clz() public pure {
-        uint256 result;
-        assembly {
-            result := clz(1)
-        }
-        assert(result == 255);
-        
-        assembly {
-            result := clz(0x8000000000000000000000000000000000000000000000000000000000000000)
-        }
-        assert(result == 0);
-    }
-}
\ No newline at end of file
diff --git a/substrate/frame/revive/fixtures/contracts/BlockInfo.sol b/substrate/frame/revive/fixtures/contracts/BlockInfo.sol
index 93a994bd84ff..f934b1c62ce0 100644
--- a/substrate/frame/revive/fixtures/contracts/BlockInfo.sol
+++ b/substrate/frame/revive/fixtures/contracts/BlockInfo.sol
@@ -2,12 +2,6 @@
 pragma solidity ^0.8.0;
 
 contract BlockInfo {
-    function fib(uint n) public pure returns (uint) {
-        if (n <= 1) {
-            return n;
-        }
-        return fib(n - 1) + fib(n - 2);
-    }
 
 	function blockNumber() public view returns (uint) {
 		return block.number;
@@ -36,8 +30,4 @@ contract BlockInfo {
 	function basefee() public view returns (uint) {
 		return block.basefee;
 	}
-
-	function blobBasefee() public view returns (uint) {
-		return block.blobbasefee;
-	}
 }
diff --git a/substrate/frame/revive/fixtures/contracts/ControlFlow.sol b/substrate/frame/revive/fixtures/contracts/ControlFlow.sol
deleted file mode 100644
index 83be7a54ba8c..000000000000
--- a/substrate/frame/revive/fixtures/contracts/ControlFlow.sol
+++ /dev/null
@@ -1,83 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-contract ControlFlow {
-    function test_jump() public pure {
-        uint256 result;
-        assembly {
-            let target := jumpdest_label
-            jump(target)
-            result := 0
-            jumpdest_label:
-            result := 1
-        }
-        assert(result == 1);
-    }
-
-    function test_jumpi() public pure {
-        uint256 result1;
-        uint256 result2;
-        
-        assembly {
-            let target := jumpdest_label1
-            jumpi(target, 1)
-            result1 := 0
-            jump(end1)
-            jumpdest_label1:
-            result1 := 1
-            end1:
-        }
-        assert(result1 == 1);
-        
-        assembly {
-            let target := jumpdest_label2
-            jumpi(target, 0)
-            result2 := 0
-            jump(end2)
-            jumpdest_label2:
-            result2 := 1
-            end2:
-        }
-        assert(result2 == 0);
-    }
-
-    function test_jumpdest() public pure {
-        uint256 result;
-        assembly {
-            jumpdest
-            result := 1
-        }
-        assert(result == 1);
-    }
-
-    function test_pc() public pure {
-        uint256 pc1;
-        uint256 pc2;
-        assembly {
-            pc1 := pc()
-            pc2 := pc()
-        }
-        assert(pc2 > pc1);
-    }
-
-    function test_ret() public pure {
-        bytes memory data = hex"deadbeef";
-        bytes memory result;
-        
-        bool success;
-        assembly {
-            let ptr := mload(0x40)
-            mstore(ptr, 0x04)
-            mstore(add(ptr, 0x20), 0xdeadbeef00000000000000000000000000000000000000000000000000000000)
-            success := call(gas(), address(), 0, ptr, 0x24, 0, 0)
-        }
-        
-        assert(data.length == 4);
-        assert(data[0] == 0xde);
-    }
-
-    function test_basic_execution() public pure {
-        uint256 value = 42;
-        assert(value == 42);
-    }
-}
\ No newline at end of file
diff --git a/substrate/frame/revive/fixtures/contracts/Host.sol b/substrate/frame/revive/fixtures/contracts/Host.sol
index 7efaa6caea46..203a23ba4a9f 100644
--- a/substrate/frame/revive/fixtures/contracts/Host.sol
+++ b/substrate/frame/revive/fixtures/contracts/Host.sol
@@ -14,11 +14,8 @@ contract Host {
         return size;
     }
 
-    function extcodecopy(address account, uint256 destOffset, uint256 offset, uint256 size) public view returns (bytes memory) {
+    function extcodecopy(address /* account */, uint256 /* destOffset */, uint256 /* offset */, uint256 size) public pure returns (bytes memory) {
         bytes memory code = new bytes(size);
-        assembly {
-            extcodecopy(account, add(code, 0x20), offset, size)
-        }
         return code;
     }
 
diff --git a/substrate/frame/revive/fixtures/contracts/Memory.sol b/substrate/frame/revive/fixtures/contracts/Memory.sol
deleted file mode 100644
index 906d057953c9..000000000000
--- a/substrate/frame/revive/fixtures/contracts/Memory.sol
+++ /dev/null
@@ -1,61 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-contract Memory {
-    function test_mload_mstore() public pure {
-        uint256 stored;
-        uint256 loaded;
-        assembly {
-            mstore(0x80, 0xdeadbeefcafebabe)
-            loaded := mload(0x80)
-        }
-        assert(loaded == 0xdeadbeefcafebabe);
-    }
-
-    function test_mstore8() public pure {
-        uint256 result;
-        assembly {
-            mstore(0x80, 0)
-            mstore8(0x80, 0xab)
-            result := mload(0x80)
-        }
-        assert(result == 0xab00000000000000000000000000000000000000000000000000000000000000);
-    }
-
-    function test_msize() public pure {
-        uint256 size1;
-        uint256 size2;
-        assembly {
-            size1 := msize()
-            mstore(0x100, 0xdeadbeef)
-            size2 := msize()
-        }
-        assert(size2 >= size1);
-        assert(size2 >= 0x120);
-    }
-
-    function test_mcopy() public pure {
-        uint256 src_data;
-        uint256 dest_data;
-        assembly {
-            mstore(0x80, 0xdeadbeefcafebabe)
-            mcopy(0xa0, 0x80, 0x20)
-            src_data := mload(0x80)
-            dest_data := mload(0xa0)
-        }
-        assert(src_data == dest_data);
-        assert(dest_data == 0xdeadbeefcafebabe);
-    }
-
-    function test_memory_expansion() public pure {
-        uint256 size_before;
-        uint256 size_after;
-        assembly {
-            size_before := msize()
-            mstore(0x200, 0x42)
-            size_after := msize()
-        }
-        assert(size_after > size_before);
-        assert(size_after >= 0x220);
-    }
-}
\ No newline at end of file
diff --git a/substrate/frame/revive/fixtures/contracts/Stack.sol b/substrate/frame/revive/fixtures/contracts/Stack.sol
deleted file mode 100644
index 13f17678fffb..000000000000
--- a/substrate/frame/revive/fixtures/contracts/Stack.sol
+++ /dev/null
@@ -1,133 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-contract Stack {
-    function test_pop() public pure {
-        uint256 result;
-        assembly {
-            let a := 42
-            let b := 99
-            pop(b)
-            result := a
-        }
-        assert(result == 42);
-    }
-
-    function test_push0() public pure {
-        uint256 result;
-        assembly {
-            result := 0
-        }
-        assert(result == 0);
-    }
-
-    function test_push() public pure {
-        uint256 value = 123;
-        assert(value == 123);
-    }
-
-    function test_dup1() public pure {
-        uint256 val1;
-        uint256 val2;
-        assembly {
-            let a := 42
-            dup1
-            val2 := pop()
-            val1 := pop()
-        }
-        assert(val1 == 42);
-        assert(val2 == 42);
-    }
-
-    function test_dup2() public pure {
-        uint256 val1;
-        uint256 val2;
-        uint256 val3;
-        assembly {
-            let a := 42
-            let b := 99
-            dup2
-            val3 := pop()
-            val2 := pop()
-            val1 := pop()
-        }
-        assert(val1 == 42);
-        assert(val2 == 99);
-        assert(val3 == 42);
-    }
-
-    function test_dup3() public pure {
-        uint256 val1;
-        uint256 val2;
-        uint256 val3;
-        uint256 val4;
-        assembly {
-            let a := 42
-            let b := 99
-            let c := 123
-            dup3
-            val4 := pop()
-            val3 := pop()
-            val2 := pop()
-            val1 := pop()
-        }
-        assert(val1 == 42);
-        assert(val2 == 99);
-        assert(val3 == 123);
-        assert(val4 == 42);
-    }
-
-    function test_swap1() public pure {
-        uint256 val1;
-        uint256 val2;
-        assembly {
-            let a := 42
-            let b := 99
-            swap1
-            val2 := pop()
-            val1 := pop()
-        }
-        assert(val1 == 99);
-        assert(val2 == 42);
-    }
-
-    function test_swap2() public pure {
-        uint256 val1;
-        uint256 val2;
-        uint256 val3;
-        assembly {
-            let a := 42
-            let b := 99
-            let c := 123
-            swap2
-            val3 := pop()
-            val2 := pop() 
-            val1 := pop()
-        }
-        assert(val1 == 123);
-        assert(val2 == 99);
-        assert(val3 == 42);
-    }
-
-    function test_swap3() public pure {
-        uint256 val1;
-        uint256 val2;
-        uint256 val3;
-        uint256 val4;
-        assembly {
-            let a := 42
-            let b := 99
-            let c := 123
-            let d := 456
-            swap3
-            val4 := pop()
-            val3 := pop()
-            val2 := pop()
-            val1 := pop()
-        }
-        assert(val1 == 456);
-        assert(val2 == 99);
-        assert(val3 == 123);
-        assert(val4 == 42);
-    }
-}
\ No newline at end of file
diff --git a/substrate/frame/revive/fixtures/contracts/System.sol b/substrate/frame/revive/fixtures/contracts/System.sol
index 0b3e81f4f559..068e673577bf 100644
--- a/substrate/frame/revive/fixtures/contracts/System.sol
+++ b/substrate/frame/revive/fixtures/contracts/System.sol
@@ -3,7 +3,7 @@
 pragma solidity ^0.8.20;
 
 contract System {
-    function keccak256Hash(bytes memory data) public pure returns (bytes32) {
+    function keccak256Func(bytes memory data) public pure returns (bytes32) {
         return keccak256(data);
     }
 
@@ -47,11 +47,8 @@ contract System {
         return size;
     }
 
-    function codecopy(uint256 destOffset, uint256 offset, uint256 size) public pure returns (bytes memory) {
+    function codecopy(uint256 /* destOffset */, uint256 /* offset */, uint256 size) public pure returns (bytes memory) {
         bytes memory code = new bytes(size);
-        assembly {
-            codecopy(add(code, 0x20), offset, size)
-        }
         return code;
     }
 
diff --git a/substrate/frame/revive/src/tests/block_info.rs b/substrate/frame/revive/src/tests/block_info.rs
index 40ef71d1ce22..e8ea76c30c9b 100644
--- a/substrate/frame/revive/src/tests/block_info.rs
+++ b/substrate/frame/revive/src/tests/block_info.rs
@@ -31,10 +31,8 @@ use pretty_assertions::assert_eq;
 /// Tests that the blocknumber opcode works as expected.
 #[test]
 fn block_number_works() {
-	for (code, _) in [
-		compile_module_with_type("BlockInfo", FixtureType::Solc).unwrap(),
-		compile_module_with_type("BlockInfo", FixtureType::Resolc).unwrap(),
-	] {
+	for fixture_type in [FixtureType::Solc, FixtureType::Resolc] {
+		let (code, _) = compile_module_with_type("BlockInfo", fixture_type).unwrap();
 		ExtBuilder::default().build().execute_with(|| {
 			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
 			let Contract { addr, .. } =
diff --git a/substrate/frame/revive/src/tests/evm.rs b/substrate/frame/revive/src/tests/evm.rs
index 72413ca0c314..f13406ef2a4b 100644
--- a/substrate/frame/revive/src/tests/evm.rs
+++ b/substrate/frame/revive/src/tests/evm.rs
@@ -59,13 +59,8 @@ fn basic_evm_flow_works() {
 #[test]
 fn flipper() {
 	// TODO: Remove `take(1)` to activate the EVM test.
-	for (code, _) in [
-		compile_module_with_type("Flipper", FixtureType::Resolc).unwrap(),
-		compile_module_with_type("Flipper", FixtureType::Solc).unwrap(),
-	]
-	.into_iter()
-	.take(1)
-	{
+	for fixture_type in [FixtureType::Resolc, FixtureType::Solc].into_iter().take(1) {
+		let (code, _) = compile_module_with_type("Flipper", fixture_type).unwrap();
 		ExtBuilder::default().build().execute_with(|| {
 			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
 			let Contract { addr, .. } =
diff --git a/substrate/frame/revive/src/tests/system.rs b/substrate/frame/revive/src/tests/system.rs
index e7f4d345fb76..213c704a7f88 100644
--- a/substrate/frame/revive/src/tests/system.rs
+++ b/substrate/frame/revive/src/tests/system.rs
@@ -23,36 +23,33 @@ use crate::{
 	Code, Config,
 };
 
-use alloy_core::{
-	primitives::{Bytes, U256},
-	sol_types::{SolConstructor, SolInterface},
-};
+use alloy_core::sol_types::SolInterface;
 use frame_support::traits::fungible::Mutate;
-use pallet_revive_fixtures::{
-	compile_module_with_type, AddressPredictor, FixtureType, Flipper, System as SystemFixture,
-};
+use pallet_revive_fixtures::{compile_module_with_type, FixtureType, System as SystemFixture};
 use pretty_assertions::assert_eq;
+use revm::primitives::Bytes;
 use sp_io::hashing::keccak_256;
 
 /// Tests that the sha3 keccak256 cryptographic opcode works as expected.
 #[test]
 fn keccak_256_works() {
-	for (code, _) in [
-		// compile_module_with_type("System", FixtureType::Solc).unwrap(),
-		compile_module_with_type("System", FixtureType::Resolc).unwrap(),
+	for fixture_type in [
+		FixtureType::Resolc,
+		// FixtureType::Solc, TODO uncomment once implemented
 	] {
+		let (code, _) = compile_module_with_type("System", fixture_type).unwrap();
 		ExtBuilder::default().build().execute_with(|| {
 			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
 			let Contract { addr, .. } =
 				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
 
-			let pre = "revive".to_string();
-			let expected = keccak_256(pre.as_bytes());
+			let pre = b"revive";
+			let expected = keccak_256(pre);
 
 			let result = builder::bare_call(addr)
 				.data(
-					SystemFixture::SystemCalls::keccak256(SystemFixture::keccak256Call {
-						_pre: pre,
+					SystemFixture::SystemCalls::keccak256Func(SystemFixture::keccak256FuncCall {
+						data: Bytes::from(pre),
 					})
 					.abi_encode(),
 				)
@@ -62,76 +59,3 @@ fn keccak_256_works() {
 		});
 	}
 }
-
-/// Tests that the create2 opcode works as expected.
-#[test]
-fn predictable_addresses() {
-	let bytecodes = [
-		(
-			compile_module_with_type("AddressPredictor", FixtureType::Resolc).unwrap().0,
-			compile_module_with_type("Predicted", FixtureType::Resolc).unwrap().0,
-		),
-		(
-			compile_module_with_type("AddressPredictor", FixtureType::Solc).unwrap().0,
-			compile_module_with_type("Predicted", FixtureType::Solc).unwrap().0,
-		),
-	];
-
-	// TODO: Remove `take(1)` to activate the EVM test.
-	for (code, target) in bytecodes.into_iter().take(1) {
-		ExtBuilder::default().build().execute_with(|| {
-			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-
-			// Publishing the target bytecode pre-image first is necessary on PVM.
-			builder::bare_instantiate(Code::Upload(target.clone()))
-				.data(vec![0; 32])
-				.build_and_unwrap_contract();
-
-			let Contract { .. } = builder::bare_instantiate(Code::Upload(code))
-				.data(
-					AddressPredictor::constructorCall::new((U256::from(123), Bytes::from(target)))
-						.abi_encode(),
-				)
-				.build_and_unwrap_contract();
-		});
-	}
-}
-
-/// Tests that the sstore and sload storage opcodes work as expected.
-#[test]
-fn flipper() {
-	// TODO: Remove `take(1)` to activate the EVM test.
-	for (code, _) in [
-		compile_module_with_type("Flipper", FixtureType::Resolc).unwrap(),
-		compile_module_with_type("Flipper", FixtureType::Solc).unwrap(),
-	]
-	.into_iter()
-	.take(1)
-	{
-		ExtBuilder::default().build().execute_with(|| {
-			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-			let Contract { addr, .. } =
-				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-			let result = builder::bare_call(addr)
-				.data(Flipper::FlipperCalls::coin(Flipper::coinCall {}).abi_encode())
-				.build_and_unwrap_result();
-			assert_eq!(U256::ZERO, U256::from_be_bytes::<32>(result.data.try_into().unwrap()));
-
-			// Should be false
-			let result = builder::bare_call(addr)
-				.data(Flipper::FlipperCalls::coin(Flipper::coinCall {}).abi_encode())
-				.build_and_unwrap_result();
-			assert_eq!(U256::ZERO, U256::from_be_bytes::<32>(result.data.try_into().unwrap()));
-
-			// Flip the coin
-			builder::bare_call(addr).build_and_unwrap_result();
-
-			// Should be true
-			let result = builder::bare_call(addr)
-				.data(Flipper::FlipperCalls::coin(Flipper::coinCall {}).abi_encode())
-				.build_and_unwrap_result();
-			assert_eq!(U256::ONE, U256::from_be_bytes::<32>(result.data.try_into().unwrap()));
-		});
-	}
-}

From 31c05959ecfbb1e94f3eb29f9880ffb8cb136ee7 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 25 Jul 2025 14:42:22 +0200
Subject: [PATCH 085/186] update build.rs

---
 Cargo.lock                                 |   1 +
 substrate/frame/revive/fixtures/Cargo.toml |   1 +
 substrate/frame/revive/fixtures/build.rs   | 235 ++++++++++++---------
 3 files changed, 141 insertions(+), 96 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ae58b3e01a6d..f228b981cff6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -13260,6 +13260,7 @@ dependencies = [
  "hex",
  "pallet-revive-uapi",
  "polkavm-linker",
+ "serde_json",
  "sp-core 28.0.0",
  "sp-io",
  "toml 0.8.23",
diff --git a/substrate/frame/revive/fixtures/Cargo.toml b/substrate/frame/revive/fixtures/Cargo.toml
index b2b1c6725abf..34503a18d61c 100644
--- a/substrate/frame/revive/fixtures/Cargo.toml
+++ b/substrate/frame/revive/fixtures/Cargo.toml
@@ -27,6 +27,7 @@ cargo_metadata = { workspace = true }
 hex = { workspace = true, features = ["alloc"] }
 pallet-revive-uapi = { workspace = true }
 polkavm-linker = { version = "0.26.0" }
+serde_json = { workspace = true }
 toml = { workspace = true }
 
 [features]
diff --git a/substrate/frame/revive/fixtures/build.rs b/substrate/frame/revive/fixtures/build.rs
index 465759f4a494..51bb12aaf35f 100644
--- a/substrate/frame/revive/fixtures/build.rs
+++ b/substrate/frame/revive/fixtures/build.rs
@@ -206,6 +206,106 @@ fn post_process(input_path: &Path, output_path: &Path) -> Result<()> {
 	Ok(())
 }
 
+/// Compile a Solidity contract using standard JSON interface.
+fn compile_with_standard_json(
+	compiler: &str,
+	contracts_dir: &Path,
+	solidity_entries: &[&Entry],
+	output_selection: serde_json::Value,
+) -> Result<serde_json::Value> {
+	// Create standard JSON input
+	let mut input_json = serde_json::json!({
+		"language": "Solidity",
+		"sources": {},
+		"settings": {
+			"optimizer": {
+				"enabled": true,
+				"runs": 200
+			},
+			"outputSelection": output_selection
+		}
+	});
+
+	// Add all Solidity files to the input
+	for entry in solidity_entries {
+		let source_code = fs::read_to_string(entry.path())
+			.with_context(|| format!("Failed to read Solidity source: {}", entry.path()))?;
+		
+		let file_key = entry.path().split('/').last().unwrap_or(entry.name());
+		input_json["sources"][file_key] = serde_json::json!({
+			"content": source_code
+		});
+	}
+
+	// Compile using --standard-json
+	let compiler_output = Command::new(compiler)
+		.current_dir(contracts_dir)
+		.arg("--standard-json")
+		.stdin(std::process::Stdio::piped())
+		.stdout(std::process::Stdio::piped())
+		.stderr(std::process::Stdio::piped())
+		.spawn()
+		.with_context(|| format!("Failed to execute {}. Make sure {} is installed.", compiler, compiler))?;
+
+	let mut stdin = compiler_output.stdin.as_ref().unwrap();
+	stdin.write_all(input_json.to_string().as_bytes())
+		.with_context(|| format!("Failed to write to {} stdin", compiler))?;
+	let _ = stdin;
+
+	let compiler_result = compiler_output.wait_with_output()
+		.with_context(|| format!("Failed to wait for {} output", compiler))?;
+
+	if !compiler_result.status.success() {
+		let stderr = String::from_utf8_lossy(&compiler_result.stderr);
+		bail!("{} compilation failed: {}", compiler, stderr);
+	}
+
+	// Parse JSON output
+	let compiler_json: serde_json::Value = serde_json::from_slice(&compiler_result.stdout)
+		.with_context(|| format!("Failed to parse {} JSON output", compiler))?;
+
+	Ok(compiler_json)
+}
+
+/// Extract bytecode from compiler JSON output and write binary files.
+fn extract_and_write_bytecode(
+	compiler_json: &serde_json::Value,
+	out_dir: &Path,
+	bytecode_path: &[&str],
+	file_suffix: &str,
+	compiler_name: &str,
+) -> Result<()> {
+	if let Some(contracts) = compiler_json["contracts"].as_object() {
+		for (_file_key, file_contracts) in contracts {
+			if let Some(contract_map) = file_contracts.as_object() {
+				for (contract_name, contract_data) in contract_map {
+					// Navigate through the JSON path to find the bytecode
+					let mut current = contract_data;
+					for path_segment in bytecode_path {
+						if let Some(next) = current.get(path_segment) {
+							current = next;
+						} else {
+							// Skip if path doesn't exist (e.g., contract has no bytecode)
+							continue;
+						}
+					}
+
+					if let Some(bytecode_obj) = current.as_str() {
+						let bytecode_hex = bytecode_obj.strip_prefix("0x").unwrap_or(bytecode_obj);
+						let binary_content = hex::decode(bytecode_hex)
+							.map_err(|e| anyhow::anyhow!("Failed to decode hex for {contract_name}: {e}"))?;
+						
+						let out_path = out_dir.join(format!("{}{}", contract_name, file_suffix));
+						fs::write(&out_path, binary_content)
+							.with_context(|| format!("Failed to write {} output for {contract_name}", compiler_name))?;
+					}
+				}
+			}
+		}
+	}
+	Ok(())
+}
+
 /// Compile Solidity contracts using both solc and resolc.
 fn compile_solidity_contracts(
 	contracts_dir: &Path,
@@ -222,103 +322,46 @@ fn compile_solidity_contracts(
 	}
 
 	// Compile with solc for EVM bytecode
-	let mut solc_command = Command::new("solc");
-	solc_command
-		.current_dir(contracts_dir)
-		.args(["--overwrite", "--optimize", "--bin", "--bin-runtime", "-o"])
-		.arg(out_dir);
-
-	for entry in &solidity_entries {
-		solc_command.arg(entry.path());
-	}
-
-	let solc_output = solc_command
-		.output()
-		.with_context(|| "Failed to execute solc. Make sure solc is installed.")?;
+	let solc_json = compile_with_standard_json(
+		"solc",
+		contracts_dir,
+		&solidity_entries,
+		serde_json::json!({
+			"*": {
+				"*": ["evm.bytecode.object"]
+			}
+		})
+	)?;
 
-	if !solc_output.status.success() {
-		let stderr = String::from_utf8_lossy(&solc_output.stderr);
-		bail!("solc compilation failed: {}", stderr);
-	}
+	// Extract and write EVM bytecode from solc JSON output
+	extract_and_write_bytecode(
+		&solc_json,
+		out_dir,
+		&["evm", "bytecode", "object"],
+		".sol.bin",
+		"solc"
+	)?;
 
 	// Compile with resolc for PVM bytecode
-	let mut resolc_command = Command::new("resolc");
-	resolc_command
-		.current_dir(contracts_dir)
-		.args(["--overwrite", "-Oz", "--bin", "-o"])
-		.arg(out_dir);
-
-	for entry in &solidity_entries {
-		resolc_command.arg(entry.path());
-	}
-
-	let resolc_output = resolc_command
-		.output()
-		.with_context(|| "Failed to execute resolc. Make sure resolc is installed.")?;
-
-	if !resolc_output.status.success() {
-		let stderr = String::from_utf8_lossy(&resolc_output.stderr);
-		bail!("resolc compilation failed: {}", stderr);
-	}
-
-	// Copy and rename the compiled files - handle multiple contracts per .sol file
-	// First, collect only the original .bin and .pvm files (not the ones we create)
-	let mut bin_files = Vec::new();
-	let mut pvm_files = Vec::new();
-
-	for entry in fs::read_dir(&out_dir)? {
-		let path = entry?.path();
-		if let Some(file_name) = path.file_name().and_then(|n| n.to_str()) {
-			// Only process original solc .bin files (not our generated .sol.bin files)
-			if file_name.ends_with(".bin") &&
-				!file_name.contains(".sol.") &&
-				!file_name.contains(".resolc.")
-			{
-				bin_files.push((path.clone(), file_name.to_string()));
-			}
-			// Only process original .pvm files (not our generated .resolc.polkavm files)
-			else if file_name.ends_with(".pvm") && file_name.contains(":") {
-				pvm_files.push((path.clone(), file_name.to_string()));
+	let resolc_json = compile_with_standard_json(
+		"resolc",
+		contracts_dir,
+		&solidity_entries,
+		serde_json::json!({
+			"*": {
+				"*": ["evm.bytecode"]
 			}
-		}
-	}
-
-	// Copy all .bin files to ContractName.sol.bin format with hex decoding
-	for (bin_path, file_name) in bin_files {
-		let contract_name = file_name.strip_suffix(".bin").unwrap();
-		let evm_out_path = out_dir.join(format!("{}.sol.bin", contract_name));
-
-		// Read hex-encoded content and decode it
-		let hex_content = fs::read_to_string(&bin_path)
-			.with_context(|| format!("Failed to read solc output for {contract_name}"))?;
-		let hex_content = hex_content.trim();
-
-		// Remove 0x prefix if present
-		let hex_content = hex_content.strip_prefix("0x").unwrap_or(hex_content);
-
-		// Decode hex to binary
-		let binary_content = hex::decode(hex_content)
-			.map_err(|e| anyhow::anyhow!("Failed to decode hex for {contract_name}: {e}"))?;
-
-		fs::write(&evm_out_path, binary_content)
-			.with_context(|| format!("Failed to write solc output for {contract_name}"))?;
-	}
+		})
+	)?;
 
-	// Copy all .pvm files to ContractName.resolc.polkavm format (already binary, no hex decoding
-	// needed)
-	for (pvm_path, file_name) in pvm_files {
-		// Extract contract name from filename like "AddressPredictor.sol:Predicted.pvm"
-		if let Some(colon_pos) = file_name.find(':') {
-			if let Some(contract_name) = file_name[(colon_pos + 1)..].strip_suffix(".pvm") {
-				let resolc_out_path = out_dir.join(format!("{}.resolc.polkavm", contract_name));
-
-				// .pvm files are already binary, just copy them
-				fs::copy(&pvm_path, &resolc_out_path).with_context(|| {
-					format!("Failed to copy resolc output for {}", contract_name)
-				})?;
-			}
-		}
-	}
+	// Extract and write PVM bytecode from resolc JSON output
+	extract_and_write_bytecode(
+		&resolc_json,
+		out_dir,
+		&["evm", "bytecode", "object"],
+		".resolc.polkavm",
+		"resolc"
+	)?;
 
 	Ok(())
 }
@@ -344,7 +387,7 @@ fn create_out_dir() -> Result<PathBuf> {
 	let temp_dir: PathBuf =
 		env::var("OUT_DIR").context("Failed to fetch `OUT_DIR` env variable")?.into();
 
-	// this is set in case the user has overriden the target directory
+	// this is set in case the user has overridden the target directory
 	let out_dir = if let Ok(path) = env::var("CARGO_TARGET_DIR") {
 		let path = PathBuf::from(path);
 
@@ -464,9 +507,6 @@ pub fn main() -> Result<()> {
 		return Ok(())
 	}
 
-	let temp_dir: PathBuf =
-		env::var("OUT_DIR").context("Failed to fetch `OUT_DIR` env variable")?.into();
-
 	// Compile Rust contracts
 	let rust_entries: Vec<_> = entries
 		.iter()
@@ -481,6 +521,9 @@ pub fn main() -> Result<()> {
 	// Compile Solidity contracts
 	compile_solidity_contracts(&contracts_dir, &out_dir, &entries)?;
 
+	let temp_dir: PathBuf =
+		env::var("OUT_DIR").context("Failed to fetch `OUT_DIR` env variable")?.into();
+
 	// Generate fixture_location.rs with sol! macros
 	generate_fixture_location(&temp_dir, &out_dir, &entries)?;
 

From 3a0756999a1df61c3be3937c902298ff6f2af770 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 25 Jul 2025 17:13:28 +0200
Subject: [PATCH 086/186] nit

---
 substrate/frame/revive/fixtures/build.rs      | 86 +++++++------------
 substrate/frame/revive/src/tests.rs           |  4 +-
 substrate/frame/revive/src/tests/sol.rs       |  3 +
 .../revive/src/tests/{ => sol}/block_info.rs  |  0
 .../revive/src/tests/{evm.rs => sol/misc.rs}  |  6 +-
 .../revive/src/tests/{ => sol}/system.rs      |  1 -
 6 files changed, 37 insertions(+), 63 deletions(-)
 create mode 100644 substrate/frame/revive/src/tests/sol.rs
 rename substrate/frame/revive/src/tests/{ => sol}/block_info.rs (100%)
 rename substrate/frame/revive/src/tests/{evm.rs => sol/misc.rs} (95%)
 rename substrate/frame/revive/src/tests/{ => sol}/system.rs (96%)

diff --git a/substrate/frame/revive/fixtures/build.rs b/substrate/frame/revive/fixtures/build.rs
index 51bb12aaf35f..08bdcd05d79a 100644
--- a/substrate/frame/revive/fixtures/build.rs
+++ b/substrate/frame/revive/fixtures/build.rs
@@ -64,7 +64,7 @@ impl Entry {
 			.expect("name is valid unicode; qed")
 	}
 
-	/// Return the name of the polkavm file.
+	/// Return the name of the bytecode file.
 	fn out_filename(&self) -> String {
 		match self.contract_type {
 			ContractType::Rust => format!("{}.polkavm", self.name()),
@@ -211,9 +211,7 @@ fn compile_with_standard_json(
 	compiler: &str,
 	contracts_dir: &Path,
 	solidity_entries: &[&Entry],
-	output_selection: serde_json::Value,
 ) -> Result<serde_json::Value> {
-	// Create standard JSON input
 	let mut input_json = serde_json::json!({
 		"language": "Solidity",
 		"sources": {},
@@ -222,7 +220,14 @@ fn compile_with_standard_json(
 				"enabled": true,
 				"runs": 200
 			},
-			"outputSelection": output_selection
+			"outputSelection":
+
+		serde_json::json!({
+			"*": {
+				"*": ["evm.bytecode"]
+			}
+		}),
+
 		}
 	});
 
@@ -230,14 +235,13 @@ fn compile_with_standard_json(
 	for entry in solidity_entries {
 		let source_code = fs::read_to_string(entry.path())
 			.with_context(|| format!("Failed to read Solidity source: {}", entry.path()))?;
-		
+
 		let file_key = entry.path().split('/').last().unwrap_or(entry.name());
 		input_json["sources"][file_key] = serde_json::json!({
 			"content": source_code
 		});
 	}
 
-	// Compile using --standard-json
 	let compiler_output = Command::new(compiler)
 		.current_dir(contracts_dir)
 		.arg("--standard-json")
@@ -245,14 +249,18 @@ fn compile_with_standard_json(
 		.stdout(std::process::Stdio::piped())
 		.stderr(std::process::Stdio::piped())
 		.spawn()
-		.with_context(|| format!("Failed to execute {}. Make sure {} is installed.", compiler, compiler))?;
+		.with_context(|| {
+			format!("Failed to execute {}. Make sure {} is installed.", compiler, compiler)
+		})?;
 
 	let mut stdin = compiler_output.stdin.as_ref().unwrap();
-	stdin.write_all(input_json.to_string().as_bytes())
+	stdin
+		.write_all(input_json.to_string().as_bytes())
 		.with_context(|| format!("Failed to write to {} stdin", compiler))?;
 	let _ = stdin;
 
-	let compiler_result = compiler_output.wait_with_output()
+	let compiler_result = compiler_output
+		.wait_with_output()
 		.with_context(|| format!("Failed to wait for {} output", compiler))?;
 
 	if !compiler_result.status.success() {
@@ -271,9 +279,7 @@ fn compile_with_standard_json(
 fn extract_and_write_bytecode(
 	compiler_json: &serde_json::Value,
 	out_dir: &Path,
-	bytecode_path: &[&str],
 	file_suffix: &str,
-	compiler_name: &str,
 ) -> Result<()> {
 	if let Some(contracts) = compiler_json["contracts"].as_object() {
 		for (_file_key, file_contracts) in contracts {
@@ -281,7 +287,7 @@ fn extract_and_write_bytecode(
 				for (contract_name, contract_data) in contract_map {
 					// Navigate through the JSON path to find the bytecode
 					let mut current = contract_data;
-					for path_segment in bytecode_path {
+					for path_segment in ["evm", "bytecode", "object"] {
 						if let Some(next) = current.get(path_segment) {
 							current = next;
 						} else {
@@ -292,12 +298,14 @@ fn extract_and_write_bytecode(
 
 					if let Some(bytecode_obj) = current.as_str() {
 						let bytecode_hex = bytecode_obj.strip_prefix("0x").unwrap_or(bytecode_obj);
-						let binary_content = hex::decode(bytecode_hex)
-							.map_err(|e| anyhow::anyhow!("Failed to decode hex for {contract_name}: {e}"))?;
-						
+						let binary_content = hex::decode(bytecode_hex).map_err(|e| {
+							anyhow::anyhow!("Failed to decode hex for {contract_name}: {e}")
+						})?;
+
 						let out_path = out_dir.join(format!("{}{}", contract_name, file_suffix));
-						fs::write(&out_path, binary_content)
-							.with_context(|| format!("Failed to write {} output for {contract_name}", compiler_name))?;
+						fs::write(&out_path, binary_content).with_context(|| {
+							format!("Failed to write {out_path:?} for {contract_name}")
+						})?;
 					}
 				}
 			}
@@ -322,46 +330,12 @@ fn compile_solidity_contracts(
 	}
 
 	// Compile with solc for EVM bytecode
-	let solc_json = compile_with_standard_json(
-		"solc",
-		contracts_dir,
-		&solidity_entries,
-		serde_json::json!({
-			"*": {
-				"*": ["evm.bytecode.object"]
-			}
-		})
-	)?;
-
-	// Extract and write EVM bytecode from solc JSON output
-	extract_and_write_bytecode(
-		&solc_json,
-		out_dir,
-		&["evm", "bytecode", "object"],
-		".sol.bin",
-		"solc"
-	)?;
+	let json = compile_with_standard_json("solc", contracts_dir, &solidity_entries)?;
+	extract_and_write_bytecode(&json, out_dir, ".sol.bin")?;
 
 	// Compile with resolc for PVM bytecode
-	let resolc_json = compile_with_standard_json(
-		"resolc",
-		contracts_dir,
-		&solidity_entries,
-		serde_json::json!({
-			"*": {
-				"*": ["evm.bytecode"]
-			}
-		})
-	)?;
-
-	// Extract and write PVM bytecode from resolc JSON output
-	extract_and_write_bytecode(
-		&resolc_json,
-		out_dir,
-		&["evm", "bytecode", "object"],
-		".resolc.polkavm",
-		"resolc"
-	)?;
+	let json = compile_with_standard_json("resolc", contracts_dir, &solidity_entries)?;
+	extract_and_write_bytecode(&json, out_dir, ".resolc.polkavm")?;
 
 	Ok(())
 }
@@ -472,8 +446,6 @@ fn generate_fixture_location(temp_dir: &Path, out_dir: &Path, entries: &[Entry])
 	.context("Failed to write to fixture_location.rs")?;
 
 	// Generate sol! macros for Solidity contracts
-	writeln!(file, "#[cfg(feature = \"std\")]")
-		.context("Failed to write cfg to fixture_location.rs")?;
 	for entry in entries.iter().filter(|e| matches!(e.contract_type, ContractType::Solidity)) {
 		let relative_path = format!("contracts/{}", entry.path().split('/').last().unwrap());
 		writeln!(file, r#"alloy_core::sol!("{}");"#, relative_path)
diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index 9be96347d518..c2fb227a4dfe 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -15,12 +15,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-mod block_info;
-mod evm;
 mod pallet_dummy;
 mod precompiles;
 mod pvm;
-mod system;
+mod sol;
 
 use crate::{
 	self as pallet_revive, test_utils::*, AccountId32Mapper, BalanceOf, BalanceWithDust,
diff --git a/substrate/frame/revive/src/tests/sol.rs b/substrate/frame/revive/src/tests/sol.rs
new file mode 100644
index 000000000000..3d0568510314
--- /dev/null
+++ b/substrate/frame/revive/src/tests/sol.rs
@@ -0,0 +1,3 @@
+mod block_info;
+mod misc;
+mod system;
diff --git a/substrate/frame/revive/src/tests/block_info.rs b/substrate/frame/revive/src/tests/sol/block_info.rs
similarity index 100%
rename from substrate/frame/revive/src/tests/block_info.rs
rename to substrate/frame/revive/src/tests/sol/block_info.rs
diff --git a/substrate/frame/revive/src/tests/evm.rs b/substrate/frame/revive/src/tests/sol/misc.rs
similarity index 95%
rename from substrate/frame/revive/src/tests/evm.rs
rename to substrate/frame/revive/src/tests/sol/misc.rs
index f13406ef2a4b..90b62c80c8cf 100644
--- a/substrate/frame/revive/src/tests/evm.rs
+++ b/substrate/frame/revive/src/tests/sol/misc.rs
@@ -58,8 +58,10 @@ fn basic_evm_flow_works() {
 /// Tests that the sstore and sload storage opcodes work as expected.
 #[test]
 fn flipper() {
-	// TODO: Remove `take(1)` to activate the EVM test.
-	for fixture_type in [FixtureType::Resolc, FixtureType::Solc].into_iter().take(1) {
+	for fixture_type in [
+		FixtureType::Resolc,
+		// FixtureType::Solc, TODO uncomment once implemented
+	] {
 		let (code, _) = compile_module_with_type("Flipper", fixture_type).unwrap();
 		ExtBuilder::default().build().execute_with(|| {
 			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
diff --git a/substrate/frame/revive/src/tests/system.rs b/substrate/frame/revive/src/tests/sol/system.rs
similarity index 96%
rename from substrate/frame/revive/src/tests/system.rs
rename to substrate/frame/revive/src/tests/sol/system.rs
index 213c704a7f88..115612db3be6 100644
--- a/substrate/frame/revive/src/tests/system.rs
+++ b/substrate/frame/revive/src/tests/sol/system.rs
@@ -30,7 +30,6 @@ use pretty_assertions::assert_eq;
 use revm::primitives::Bytes;
 use sp_io::hashing::keccak_256;
 
-/// Tests that the sha3 keccak256 cryptographic opcode works as expected.
 #[test]
 fn keccak_256_works() {
 	for fixture_type in [

From 9adf741f349350a62ec3ab6ebdc6a3b12e8d5e64 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Sat, 26 Jul 2025 21:18:47 +0000
Subject: [PATCH 087/186] fixes

---
 .gitignore                                                 | 2 --
 substrate/bin/node/runtime/src/lib.rs                      | 2 +-
 substrate/frame/revive/src/vm/evm.rs                       | 1 +
 substrate/frame/revive/src/vm/evm/instructions/contract.rs | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 04e297838544..4fe0701fde68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,8 +10,6 @@
 .wasm-binaries
 *.adoc
 *.bin
-!substrate/frame/revive/fixtures-solidity/contracts/build/
-!substrate/frame/revive/fixtures-solidity/contracts/build/*.bin
 *.iml
 *.orig
 *.rej
diff --git a/substrate/bin/node/runtime/src/lib.rs b/substrate/bin/node/runtime/src/lib.rs
index 0efa26a76f62..f03eebeeecc3 100644
--- a/substrate/bin/node/runtime/src/lib.rs
+++ b/substrate/bin/node/runtime/src/lib.rs
@@ -1450,7 +1450,6 @@ impl pallet_contracts::Config for Runtime {
 	type MaxCodeLen = ConstU32<{ 123 * 1024 }>;
 	type MaxStorageKeyLen = ConstU32<128>;
 	type UnsafeUnstableInterface = ConstBool<false>;
-	type AllowEVMBytecode = ConstBool<true>;
 	type UploadOrigin = EnsureSigned<Self::AccountId>;
 	type InstantiateOrigin = EnsureSigned<Self::AccountId>;
 	type MaxDebugBufferLen = ConstU32<{ 2 * 1024 * 1024 }>;
@@ -1491,6 +1490,7 @@ impl pallet_revive::Config for Runtime {
 	type NativeToEthRatio = ConstU32<1_000_000>; // 10^(18 - 12) Eth is 10^18, Native is 10^12.
 	type EthGasEncoder = ();
 	type FindAuthor = <Runtime as pallet_authorship::Config>::FindAuthor;
+	type AllowEVMBytecode = ConstBool<true>;
 }
 
 impl pallet_sudo::Config for Runtime {
diff --git a/substrate/frame/revive/src/vm/evm.rs b/substrate/frame/revive/src/vm/evm.rs
index 3213a2b3c459..71efa851f717 100644
--- a/substrate/frame/revive/src/vm/evm.rs
+++ b/substrate/frame/revive/src/vm/evm.rs
@@ -5,6 +5,7 @@ use crate::{
 	AccountIdOf, BalanceOf, CodeInfo, CodeVec, Config, ContractBlob, DispatchError, Error,
 	ExecReturnValue, H256, LOG_TARGET, U256,
 };
+use alloc::vec::Vec;
 use instructions::instruction_table;
 use pallet_revive_uapi::ReturnFlags;
 use revm::{
diff --git a/substrate/frame/revive/src/vm/evm/instructions/contract.rs b/substrate/frame/revive/src/vm/evm/instructions/contract.rs
index 8b3a772cb306..5281449c34da 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/contract.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/contract.rs
@@ -17,7 +17,7 @@ use revm::{
 	},
 	primitives::{hardfork::SpecId, Address, Bytes, B256, U256},
 };
-use std::boxed::Box;
+use alloc::boxed::Box;
 
 /// Implements the CREATE/CREATE2 instruction.
 ///

From b1dbf5da433030fd3d4dc20a3bfc9895998690fb Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Sat, 26 Jul 2025 21:47:22 +0000
Subject: [PATCH 088/186] add missing headers

---
 substrate/frame/revive/src/exec/mock_ext.rs     | 17 +++++++++++++++++
 substrate/frame/revive/src/tests/sol.rs         | 17 +++++++++++++++++
 substrate/frame/revive/src/vm/evm.rs            | 17 +++++++++++++++++
 .../src/vm/evm/instructions/arithmetic.rs       | 17 +++++++++++++++++
 .../revive/src/vm/evm/instructions/bitwise.rs   | 17 +++++++++++++++++
 .../src/vm/evm/instructions/block_info.rs       | 17 +++++++++++++++++
 .../revive/src/vm/evm/instructions/contract.rs  | 17 +++++++++++++++++
 .../evm/instructions/contract/call_helpers.rs   | 17 +++++++++++++++++
 .../revive/src/vm/evm/instructions/control.rs   | 17 +++++++++++++++++
 .../revive/src/vm/evm/instructions/host.rs      | 17 +++++++++++++++++
 .../revive/src/vm/evm/instructions/i256.rs      | 17 +++++++++++++++++
 .../revive/src/vm/evm/instructions/macros.rs    | 17 +++++++++++++++++
 .../revive/src/vm/evm/instructions/memory.rs    | 17 +++++++++++++++++
 .../frame/revive/src/vm/evm/instructions/mod.rs | 17 +++++++++++++++++
 .../revive/src/vm/evm/instructions/stack.rs     | 17 +++++++++++++++++
 .../revive/src/vm/evm/instructions/system.rs    | 17 +++++++++++++++++
 .../revive/src/vm/evm/instructions/tx_info.rs   | 17 +++++++++++++++++
 .../revive/src/vm/evm/instructions/utility.rs   | 17 +++++++++++++++++
 substrate/frame/revive/src/vm/pvm/env.rs        | 17 +++++++++++++++++
 substrate/frame/revive/src/vm/runtime_costs.rs  | 17 +++++++++++++++++
 20 files changed, 340 insertions(+)

diff --git a/substrate/frame/revive/src/exec/mock_ext.rs b/substrate/frame/revive/src/exec/mock_ext.rs
index c4ba3c4824f7..ff774aa7c045 100644
--- a/substrate/frame/revive/src/exec/mock_ext.rs
+++ b/substrate/frame/revive/src/exec/mock_ext.rs
@@ -1,3 +1,20 @@
+// 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.
+
 #![cfg(test)]
 
 use crate::{
diff --git a/substrate/frame/revive/src/tests/sol.rs b/substrate/frame/revive/src/tests/sol.rs
index 3d0568510314..15b52ebc4a82 100644
--- a/substrate/frame/revive/src/tests/sol.rs
+++ b/substrate/frame/revive/src/tests/sol.rs
@@ -1,3 +1,20 @@
+// 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.
+
 mod block_info;
 mod misc;
 mod system;
diff --git a/substrate/frame/revive/src/vm/evm.rs b/substrate/frame/revive/src/vm/evm.rs
index 71efa851f717..7d71d069c665 100644
--- a/substrate/frame/revive/src/vm/evm.rs
+++ b/substrate/frame/revive/src/vm/evm.rs
@@ -1,3 +1,20 @@
+// 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.
+
 mod instructions;
 
 use crate::{
diff --git a/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs b/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs
index 89bd52d8b2c1..6aa47e2bae86 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use super::{
 	i256::{i256_div, i256_mod},
 	Context,
diff --git a/substrate/frame/revive/src/vm/evm/instructions/bitwise.rs b/substrate/frame/revive/src/vm/evm/instructions/bitwise.rs
index 534b6987eac8..b7325146d868 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/bitwise.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/bitwise.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use super::{i256::i256_cmp, Context};
 use crate::vm::Ext;
 use core::cmp::Ordering;
diff --git a/substrate/frame/revive/src/vm/evm/instructions/block_info.rs b/substrate/frame/revive/src/vm/evm/instructions/block_info.rs
index e6a90e36cee0..375de2f6f9c2 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/block_info.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/block_info.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use super::Context;
 use crate::{vm::Ext, RuntimeCosts};
 use revm::{
diff --git a/substrate/frame/revive/src/vm/evm/instructions/contract.rs b/substrate/frame/revive/src/vm/evm/instructions/contract.rs
index 5281449c34da..1336b86f65b2 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/contract.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/contract.rs
@@ -1,3 +1,20 @@
+// 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.
+
 mod call_helpers;
 
 pub use call_helpers::{calc_call_gas, get_memory_input_and_out_ranges};
diff --git a/substrate/frame/revive/src/vm/evm/instructions/contract/call_helpers.rs b/substrate/frame/revive/src/vm/evm/instructions/contract/call_helpers.rs
index dba0fc4d8dbc..e60886ff5365 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/contract/call_helpers.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/contract/call_helpers.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use crate::vm::Ext;
 use core::{cmp::min, ops::Range};
 use revm::{
diff --git a/substrate/frame/revive/src/vm/evm/instructions/control.rs b/substrate/frame/revive/src/vm/evm/instructions/control.rs
index 5728e9cd63f1..22415d02827c 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/control.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/control.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use super::Context;
 use crate::vm::Ext;
 use revm::{
diff --git a/substrate/frame/revive/src/vm/evm/instructions/host.rs b/substrate/frame/revive/src/vm/evm/instructions/host.rs
index 3ff5efd3dbeb..0ff40c29f2cb 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/host.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/host.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use super::{
 	utility::{IntoAddress, IntoU256},
 	Context,
diff --git a/substrate/frame/revive/src/vm/evm/instructions/i256.rs b/substrate/frame/revive/src/vm/evm/instructions/i256.rs
index 8f14ec0f871f..44f1b35a101b 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/i256.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/i256.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use core::cmp::Ordering;
 use revm::primitives::U256;
 
diff --git a/substrate/frame/revive/src/vm/evm/instructions/macros.rs b/substrate/frame/revive/src/vm/evm/instructions/macros.rs
index d6853abce1e0..1d6efefe442f 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/macros.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/macros.rs
@@ -1,3 +1,20 @@
+// 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.
+
 //! Utility macros to help implementing opcode instruction functions.
 
 /// `const` Option `?`.
diff --git a/substrate/frame/revive/src/vm/evm/instructions/memory.rs b/substrate/frame/revive/src/vm/evm/instructions/memory.rs
index 4d5e3bea1754..d767e3fe9dff 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/memory.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/memory.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use super::Context;
 use crate::vm::Ext;
 use core::cmp::max;
diff --git a/substrate/frame/revive/src/vm/evm/instructions/mod.rs b/substrate/frame/revive/src/vm/evm/instructions/mod.rs
index e4be01bda542..826c1febd474 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/mod.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/mod.rs
@@ -1,3 +1,20 @@
+// 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.
+
 //! EVM opcode implementations.
 
 use crate::vm::{
diff --git a/substrate/frame/revive/src/vm/evm/instructions/stack.rs b/substrate/frame/revive/src/vm/evm/instructions/stack.rs
index c892a93ba6f5..a632b853d534 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/stack.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/stack.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use super::{utility::cast_slice_to_u256, Context};
 use crate::vm::Ext;
 use revm::{
diff --git a/substrate/frame/revive/src/vm/evm/instructions/system.rs b/substrate/frame/revive/src/vm/evm/instructions/system.rs
index b04368917066..3ff91600f62f 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/system.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/system.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use super::Context;
 use crate::vm::Ext;
 use core::ptr;
diff --git a/substrate/frame/revive/src/vm/evm/instructions/tx_info.rs b/substrate/frame/revive/src/vm/evm/instructions/tx_info.rs
index f4a8e82318be..1b7d1196be60 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/tx_info.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/tx_info.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use revm::{
 	interpreter::{
 		gas as revm_gas,
diff --git a/substrate/frame/revive/src/vm/evm/instructions/utility.rs b/substrate/frame/revive/src/vm/evm/instructions/utility.rs
index 4c82c1c98c48..62f77674cf4e 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/utility.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/utility.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use revm::primitives::{Address, B256, U256};
 
 /// Pushes an arbitrary length slice of bytes onto the stack, padding the last word with zeros
diff --git a/substrate/frame/revive/src/vm/pvm/env.rs b/substrate/frame/revive/src/vm/pvm/env.rs
index 74da5b996444..ac340b660e34 100644
--- a/substrate/frame/revive/src/vm/pvm/env.rs
+++ b/substrate/frame/revive/src/vm/pvm/env.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use super::*;
 
 use crate::{
diff --git a/substrate/frame/revive/src/vm/runtime_costs.rs b/substrate/frame/revive/src/vm/runtime_costs.rs
index ab61a3e7964a..d730c72579e2 100644
--- a/substrate/frame/revive/src/vm/runtime_costs.rs
+++ b/substrate/frame/revive/src/vm/runtime_costs.rs
@@ -1,3 +1,20 @@
+// 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.
+
 use crate::{gas::Token, weights::WeightInfo, Config};
 use frame_support::weights::{constants::WEIGHT_REF_TIME_PER_SECOND, Weight};
 

From 91e59e56e2ed1cc97979bdb1c7727738dab9b2fc Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Sun, 27 Jul 2025 09:00:54 +0000
Subject: [PATCH 089/186] add test allow_evm_bytecode_config_works

---
 .../frame/revive/fixtures/contracts/Dummy.sol |  5 ++
 substrate/frame/revive/src/tests.rs           |  6 +++
 substrate/frame/revive/src/tests/pvm.rs       | 49 +++++++++++++++++--
 3 files changed, 56 insertions(+), 4 deletions(-)
 create mode 100644 substrate/frame/revive/fixtures/contracts/Dummy.sol

diff --git a/substrate/frame/revive/fixtures/contracts/Dummy.sol b/substrate/frame/revive/fixtures/contracts/Dummy.sol
new file mode 100644
index 000000000000..f702a52c7f3d
--- /dev/null
+++ b/substrate/frame/revive/fixtures/contracts/Dummy.sol
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8;
+
+contract Dummy {
+}
diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index c2fb227a4dfe..df40c0f4e2f8 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -213,6 +213,10 @@ impl Test {
 	pub fn set_unstable_interface(unstable_interface: bool) {
 		UNSTABLE_INTERFACE.with(|v| *v.borrow_mut() = unstable_interface);
 	}
+
+	pub fn set_allow_evm_bytecode(allow_evm_bytecode: bool) {
+		ALLOW_E_V_M_BYTECODE.with(|v| *v.borrow_mut() = allow_evm_bytecode);
+	}
 }
 
 parameter_types! {
@@ -321,6 +325,7 @@ where
 }
 parameter_types! {
 	pub static UnstableInterface: bool = true;
+	pub static AllowEVMBytecode: bool = true;
 	pub CheckingAccount: AccountId32 = BOB.clone();
 }
 
@@ -341,6 +346,7 @@ impl Config for Test {
 	type DepositPerByte = DepositPerByte;
 	type DepositPerItem = DepositPerItem;
 	type UnsafeUnstableInterface = UnstableInterface;
+	type AllowEVMBytecode = AllowEVMBytecode;
 	type UploadOrigin = EnsureAccount<Self, UploadAccount>;
 	type InstantiateOrigin = EnsureAccount<Self, InstantiateAccount>;
 	type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent;
diff --git a/substrate/frame/revive/src/tests/pvm.rs b/substrate/frame/revive/src/tests/pvm.rs
index 00e2515031c6..3fa00d66d43b 100644
--- a/substrate/frame/revive/src/tests/pvm.rs
+++ b/substrate/frame/revive/src/tests/pvm.rs
@@ -398,8 +398,10 @@ fn run_out_of_fuel_engine() {
 // Fail out of fuel (ref_time weight) in the host.
 #[test]
 fn run_out_of_fuel_host() {
-	use crate::precompiles::Precompile;
-	use crate::tests::precompiles::{INoInfo, NoInfo};
+	use crate::{
+		precompiles::Precompile,
+		tests::precompiles::{INoInfo, NoInfo},
+	};
 	use alloy_core::sol_types::SolInterface;
 
 	let precompile_addr = H160(NoInfo::<Test>::MATCHER.base_address());
@@ -2859,8 +2861,8 @@ fn native_dependency_deposit_works() {
 				.build_and_unwrap_result();
 
 			// Check updated storage_deposit due to code size changes
-			let deposit_diff = lockup_deposit_percent.mul_ceil(get_code_deposit(&code_hash))
-				- lockup_deposit_percent.mul_ceil(get_code_deposit(&dummy_code_hash));
+			let deposit_diff = lockup_deposit_percent.mul_ceil(get_code_deposit(&code_hash)) -
+				lockup_deposit_percent.mul_ceil(get_code_deposit(&dummy_code_hash));
 			let new_base_deposit = contract_base_deposit(&addr);
 			assert_ne!(deposit_diff, 0);
 			assert_eq!(base_deposit - new_base_deposit, deposit_diff);
@@ -4691,3 +4693,42 @@ fn code_size_for_precompiles_works() {
 			.build_and_unwrap_result();
 	});
 }
+
+#[test]
+fn allow_evm_bytecode_config_works() {
+	use frame_support::assert_err;
+	use pallet_revive_fixtures::{compile_module_with_type, FixtureType};
+
+	let (evm_bytecode, _) = compile_module_with_type("Dummy", FixtureType::Solc).unwrap();
+
+	ExtBuilder::default().build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		/// Upload code should always fail with EVM bytecode
+		assert_err!(
+			Contracts::upload_code(
+				RuntimeOrigin::signed(ALICE),
+				evm_bytecode.clone(),
+				deposit_limit::<Test>(),
+			),
+			crate::Error::<Test>::CodeRejected
+		);
+
+		// Try to instantiate with EVM bytecode - should succeed when AllowEVMBytecode is true
+		let contract = builder::bare_instantiate(Code::Upload(evm_bytecode.clone()))
+			.build_and_unwrap_contract();
+		
+		// Call the contract - should succeed when AllowEVMBytecode is true
+		let call_result = builder::bare_call(contract.addr).build().result;
+		assert!(call_result.is_ok(), "Contract call should succeed when AllowEVMBytecode is true");
+
+		// Try to instantiate with EVM bytecode - should fail when AllowEVMBytecode is false
+		Test::set_allow_evm_bytecode(false);
+		let result = builder::bare_instantiate(Code::Upload(evm_bytecode.clone())).build().result;
+		assert_err!(result, crate::Error::<Test>::CodeRejected);
+		
+		// Call the existing contract - should fail when AllowEVMBytecode is false
+		let call_result = builder::bare_call(contract.addr).build().result;
+		assert_err!(call_result, crate::Error::<Test>::CodeRejected);
+	});
+}

From da7473d49dc965f09e1dbb5d4e4d8a93dc388b00 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Sun, 27 Jul 2025 12:21:09 +0200
Subject: [PATCH 090/186] fix lock

---
 Cargo.lock | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index e860fdee231c..1195888409ac 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -26161,6 +26161,18 @@ name = "tokio-tungstenite"
 version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a9daff607c6d2bf6c16fd681ccb7eecc83e4e2cdc1ca067ffaadfca5de7f084"
+dependencies = [
+ "futures-util",
+ "log",
+ "tokio",
+ "tungstenite 0.26.2",
+]
+
+[[package]]
+name = "tokio-tungstenite"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "489a59b6730eda1b0171fcfda8b121f4bee2b35cba8645ca35c5f7ba3eb736c1"
 dependencies = [
  "futures-util",
  "log",
@@ -26169,7 +26181,7 @@ dependencies = [
  "rustls-pki-types",
  "tokio",
  "tokio-rustls 0.26.2",
- "tungstenite 0.26.2",
+ "tungstenite 0.27.0",
 ]
 
 [[package]]
@@ -26591,6 +26603,23 @@ name = "tungstenite"
 version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4793cb5e56680ecbb1d843515b23b6de9a75eb04b66643e256a396d43be33c13"
+dependencies = [
+ "bytes",
+ "data-encoding",
+ "http 1.3.1",
+ "httparse",
+ "log",
+ "rand 0.9.2",
+ "sha1",
+ "thiserror 2.0.12",
+ "utf-8",
+]
+
+[[package]]
+name = "tungstenite"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eadc29d668c91fcc564941132e17b28a7ceb2f3ebf0b9dae3e03fd7a6748eb0d"
 dependencies = [
  "bytes",
  "data-encoding",

From df8d71d67b3923b63f21463405c075d844b4752f Mon Sep 17 00:00:00 2001
From: "cmd[bot]" <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 27 Jul 2025 12:11:55 +0000
Subject: [PATCH 091/186] Update from github-actions[bot] running command 'fmt'

---
 substrate/frame/revive/Cargo.toml                          | 2 +-
 substrate/frame/revive/src/tests/pvm.rs                    | 4 ++--
 substrate/frame/revive/src/vm/evm/instructions/contract.rs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/substrate/frame/revive/Cargo.toml b/substrate/frame/revive/Cargo.toml
index ed2be60ebf19..2725e8e2492b 100644
--- a/substrate/frame/revive/Cargo.toml
+++ b/substrate/frame/revive/Cargo.toml
@@ -99,6 +99,7 @@ std = [
 	"polkavm-common/std",
 	"polkavm/std",
 	"rand?/std",
+	"revm/std",
 	"ripemd/std",
 	"rlp/std",
 	"scale-info/std",
@@ -115,7 +116,6 @@ std = [
 	"sp-keystore/std",
 	"sp-runtime/std",
 	"subxt-signer",
-	"revm/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
diff --git a/substrate/frame/revive/src/tests/pvm.rs b/substrate/frame/revive/src/tests/pvm.rs
index 3fa00d66d43b..927a853a4b4e 100644
--- a/substrate/frame/revive/src/tests/pvm.rs
+++ b/substrate/frame/revive/src/tests/pvm.rs
@@ -4717,7 +4717,7 @@ fn allow_evm_bytecode_config_works() {
 		// Try to instantiate with EVM bytecode - should succeed when AllowEVMBytecode is true
 		let contract = builder::bare_instantiate(Code::Upload(evm_bytecode.clone()))
 			.build_and_unwrap_contract();
-		
+
 		// Call the contract - should succeed when AllowEVMBytecode is true
 		let call_result = builder::bare_call(contract.addr).build().result;
 		assert!(call_result.is_ok(), "Contract call should succeed when AllowEVMBytecode is true");
@@ -4726,7 +4726,7 @@ fn allow_evm_bytecode_config_works() {
 		Test::set_allow_evm_bytecode(false);
 		let result = builder::bare_instantiate(Code::Upload(evm_bytecode.clone())).build().result;
 		assert_err!(result, crate::Error::<Test>::CodeRejected);
-		
+
 		// Call the existing contract - should fail when AllowEVMBytecode is false
 		let call_result = builder::bare_call(contract.addr).build().result;
 		assert_err!(call_result, crate::Error::<Test>::CodeRejected);
diff --git a/substrate/frame/revive/src/vm/evm/instructions/contract.rs b/substrate/frame/revive/src/vm/evm/instructions/contract.rs
index 1336b86f65b2..1cf67725db88 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/contract.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/contract.rs
@@ -21,6 +21,7 @@ pub use call_helpers::{calc_call_gas, get_memory_input_and_out_ranges};
 
 use super::{utility::IntoAddress, Context};
 use crate::vm::Ext;
+use alloc::boxed::Box;
 use revm::{
 	context_interface::CreateScheme,
 	interpreter::{
@@ -34,7 +35,6 @@ use revm::{
 	},
 	primitives::{hardfork::SpecId, Address, Bytes, B256, U256},
 };
-use alloc::boxed::Box;
 
 /// Implements the CREATE/CREATE2 instruction.
 ///

From 359b1813e5f335303dc975e7cd9ec839bcaf4043 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Sun, 27 Jul 2025 21:22:44 +0000
Subject: [PATCH 092/186] fixes

---
 Cargo.lock                              | 5366 ++++++++++-------------
 substrate/frame/revive/src/tests/pvm.rs |    2 +-
 2 files changed, 2356 insertions(+), 3012 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1195888409ac..4a52334ade1b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -23,18 +23,18 @@ dependencies = [
 
 [[package]]
 name = "addr2line"
-version = "0.24.2"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
 dependencies = [
- "gimli 0.31.1",
+ "gimli 0.28.0",
 ]
 
 [[package]]
-name = "adler2"
-version = "2.0.1"
+name = "adler"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "adler32"
@@ -54,9 +54,9 @@ dependencies = [
 
 [[package]]
 name = "aes"
-version = "0.8.4"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
+checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2"
 dependencies = [
  "cfg-if",
  "cipher 0.4.4",
@@ -74,42 +74,42 @@ dependencies = [
  "cipher 0.4.4",
  "ctr",
  "ghash",
- "subtle 2.6.1",
+ "subtle 2.5.0",
 ]
 
 [[package]]
 name = "ahash"
-version = "0.8.12"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
- "getrandom 0.3.3",
+ "getrandom 0.2.10",
  "once_cell",
  "version_check",
- "zerocopy",
+ "zerocopy 0.7.32",
 ]
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "allocator-api2"
-version = "0.2.21"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
+checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
 
 [[package]]
 name = "alloy-core"
-version = "1.3.0"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d47400608fc869727ad81dba058d55f97b29ad8b5c5256d9598523df8f356ab6"
+checksum = "a3c5a28f166629752f2e7246b813cdea3243cca59aab2d4264b1fd68392c10eb"
 dependencies = [
  "alloy-dyn-abi",
  "alloy-json-abi",
@@ -120,9 +120,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-dyn-abi"
-version = "1.3.0"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9e8a436f0aad7df8bb47f144095fba61202265d9f5f09a70b0e3227881a668e"
+checksum = "18cc14d832bc3331ca22a1c7819de1ede99f58f61a7d123952af7dde8de124a6"
 dependencies = [
  "alloy-json-abi",
  "alloy-primitives",
@@ -131,7 +131,7 @@ dependencies = [
  "itoa",
  "serde",
  "serde_json",
- "winnow 0.7.12",
+ "winnow 0.7.10",
 ]
 
 [[package]]
@@ -193,9 +193,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-json-abi"
-version = "1.3.0"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "459f98c6843f208856f338bfb25e65325467f7aff35dfeb0484d0a76e059134b"
+checksum = "3ccaa79753d7bf15f06399ea76922afbfaf8d18bebed9e8fc452984b4a90dcc9"
 dependencies = [
  "alloy-primitives",
  "alloy-sol-type-parser",
@@ -215,14 +215,14 @@ dependencies = [
  "const-hex",
  "derive_more 2.0.1",
  "foldhash",
- "hashbrown 0.15.4",
- "indexmap 2.10.0",
+ "hashbrown 0.15.3",
+ "indexmap 2.9.0",
  "itoa",
  "k256",
  "keccak-asm",
  "paste",
  "proptest",
- "rand 0.9.2",
+ "rand 0.9.0",
  "ruint",
  "rustc-hash 2.1.1",
  "serde",
@@ -237,7 +237,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f70d83b765fdc080dbcd4f4db70d8d23fe4761f2f02ebfa9146b833900634b4"
 dependencies = [
  "alloy-rlp-derive",
- "arrayvec 0.7.6",
+ "arrayvec 0.7.4",
  "bytes",
 ]
 
@@ -249,7 +249,7 @@ checksum = "64b728d511962dda67c1bc7ea7c03736ec275ed2cf4c35d9585298ac9ccf3b73"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -265,41 +265,41 @@ dependencies = [
 
 [[package]]
 name = "alloy-sol-macro"
-version = "1.3.0"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aedac07a10d4c2027817a43cc1f038313fc53c7ac866f7363239971fd01f9f18"
+checksum = "8612e0658964d616344f199ab251a49d48113992d81b92dab93ed855faa66383"
 dependencies = [
  "alloy-sol-macro-expander",
  "alloy-sol-macro-input",
  "proc-macro-error2",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "alloy-sol-macro-expander"
-version = "1.3.0"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24f9a598f010f048d8b8226492b6401104f5a5c1273c2869b72af29b48bb4ba9"
+checksum = "7a384edac7283bc4c010a355fb648082860c04b826bb7a814c45263c8f304c74"
 dependencies = [
  "alloy-sol-macro-input",
  "const-hex",
  "heck 0.5.0",
- "indexmap 2.10.0",
+ "indexmap 2.9.0",
  "proc-macro-error2",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
  "syn-solidity",
  "tiny-keccak",
 ]
 
 [[package]]
 name = "alloy-sol-macro-input"
-version = "1.3.0"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f494adf9d60e49aa6ce26dfd42c7417aa6d4343cf2ae621f20e4d92a5ad07d85"
+checksum = "0dd588c2d516da7deb421b8c166dc60b7ae31bca5beea29ab6621fcfa53d6ca5"
 dependencies = [
  "const-hex",
  "dunce",
@@ -307,25 +307,25 @@ dependencies = [
  "macro-string",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
  "syn-solidity",
 ]
 
 [[package]]
 name = "alloy-sol-type-parser"
-version = "1.3.0"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52db32fbd35a9c0c0e538b58b81ebbae08a51be029e7ad60e08b60481c2ec6c3"
+checksum = "e86ddeb70792c7ceaad23e57d52250107ebbb86733e52f4a25d8dc1abc931837"
 dependencies = [
  "serde",
- "winnow 0.7.12",
+ "winnow 0.7.10",
 ]
 
 [[package]]
 name = "alloy-sol-types"
-version = "1.3.0"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a285b46e3e0c177887028278f04cc8262b76fd3b8e0e20e93cea0a58c35f5ac5"
+checksum = "584cb97bfc5746cb9dcc4def77da11694b5d6d7339be91b7480a6a68dc129387"
 dependencies = [
  "alloy-json-abi",
  "alloy-primitives",
@@ -362,59 +362,57 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
 [[package]]
 name = "anstream"
-version = "0.6.19"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933"
+checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5"
 dependencies = [
  "anstyle",
  "anstyle-parse",
  "anstyle-query",
  "anstyle-wincon",
  "colorchoice",
- "is_terminal_polyfill",
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle"
-version = "1.0.11"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
+checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.7"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
+checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.3"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9"
+checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.9"
+version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882"
+checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628"
 dependencies = [
  "anstyle",
- "once_cell_polyfill",
- "windows-sys 0.59.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.98"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
+checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
 
 [[package]]
 name = "approx"
@@ -436,14 +434,14 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "arbitrary"
-version = "1.4.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
+checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
 dependencies = [
  "derive_arbitrary",
 ]
@@ -577,7 +575,7 @@ dependencies = [
  "ark-std 0.5.0",
  "educe",
  "fnv",
- "hashbrown 0.15.4",
+ "hashbrown 0.15.3",
  "itertools 0.13.0",
  "num-bigint",
  "num-integer",
@@ -682,7 +680,7 @@ dependencies = [
  "num-bigint",
  "num-traits",
  "paste",
- "rustc_version 0.4.1",
+ "rustc_version 0.4.0",
  "zeroize",
 ]
 
@@ -696,7 +694,7 @@ dependencies = [
  "ark-ff-macros 0.5.0",
  "ark-serialize 0.5.0",
  "ark-std 0.5.0",
- "arrayvec 0.7.6",
+ "arrayvec 0.7.4",
  "digest 0.10.7",
  "educe",
  "itertools 0.13.0",
@@ -734,7 +732,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62945a2f7e6de02a31fe400aa489f0e0f5b2502e69f95f853adb82a96c7a6b60"
 dependencies = [
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -772,7 +770,7 @@ dependencies = [
  "num-traits",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -813,7 +811,7 @@ dependencies = [
  "ark-std 0.5.0",
  "educe",
  "fnv",
- "hashbrown 0.15.4",
+ "hashbrown 0.15.3",
  "rayon",
 ]
 
@@ -902,7 +900,7 @@ checksum = "3f4d068aaf107ebcd7dfb52bc748f8030e0fc930ac8e360146ca54c1203088f7"
 dependencies = [
  "ark-serialize-derive 0.5.0",
  "ark-std 0.5.0",
- "arrayvec 0.7.6",
+ "arrayvec 0.7.4",
  "digest 0.10.7",
  "num-bigint",
  "rayon",
@@ -927,7 +925,7 @@ checksum = "213888f660fddcca0d257e88e54ac05bca01885f258ccdf695bafd77031bb69d"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -998,25 +996,24 @@ dependencies = [
 
 [[package]]
 name = "array-bytes"
-version = "6.2.3"
+version = "6.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d5dde061bd34119e902bbb2d9b90c5692635cf59fb91d582c2b68043f1b8293"
+checksum = "6f840fb7195bcfc5e17ea40c26e5ce6d5b9ce5d584466e17703209657e459ae0"
 
 [[package]]
 name = "array-bytes"
-version = "9.3.0"
+version = "9.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27d55334c98d756b32dcceb60248647ab34f027690f87f9a362fd292676ee927"
+checksum = "4449507daf4f07a8c8309e122d32a53d15c9f33e77eaf01c839fea42ccd4d673"
 dependencies = [
  "smallvec",
- "thiserror 2.0.12",
 ]
 
 [[package]]
 name = "arrayref"
-version = "0.3.9"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
+checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
 
 [[package]]
 name = "arrayvec"
@@ -1029,36 +1026,36 @@ dependencies = [
 
 [[package]]
 name = "arrayvec"
-version = "0.7.6"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "asn1-rs"
-version = "0.6.2"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5493c3bedbacf7fd7382c6346bbd66687d12bbaad3a89a2d2c303ee6cf20b048"
+checksum = "22ad1373757efa0f70ec53939aabc7152e1591cb485208052993070ac8d2429d"
 dependencies = [
- "asn1-rs-derive 0.5.1",
+ "asn1-rs-derive 0.5.0",
  "asn1-rs-impl",
  "displaydoc",
- "nom 7.1.3",
+ "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "time",
 ]
 
 [[package]]
 name = "asn1-rs"
-version = "0.7.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56624a96882bb8c26d61312ae18cb45868e5a9992ea73c58e45c3101e56a1e60"
+checksum = "607495ec7113b178fbba7a6166a27f99e774359ef4823adbefd756b5b81d7970"
 dependencies = [
  "asn1-rs-derive 0.6.0",
  "asn1-rs-impl",
  "displaydoc",
- "nom 7.1.3",
+ "nom",
  "num-traits",
  "rusticata-macros",
  "thiserror 2.0.12",
@@ -1067,14 +1064,14 @@ dependencies = [
 
 [[package]]
 name = "asn1-rs-derive"
-version = "0.5.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
+checksum = "7378575ff571966e99a744addeff0bff98b8ada0dedf1956d59e634db95eaac1"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
- "synstructure 0.13.2",
+ "syn 2.0.98",
+ "synstructure 0.13.1",
 ]
 
 [[package]]
@@ -1085,8 +1082,8 @@ checksum = "3109e49b1e4909e9db6515a30c633684d68cdeaa252f215214cb4fa1a5bfee2c"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
- "synstructure 0.13.2",
+ "syn 2.0.98",
+ "synstructure 0.13.1",
 ]
 
 [[package]]
@@ -1097,19 +1094,18 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "assert_cmd"
-version = "2.0.17"
+version = "2.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bd389a4b2970a01282ee455294913c0a43724daedcd1a24c3eb0ec1c1320b66"
+checksum = "ed72493ac66d5804837f480ab3766c72bdfab91a65e565fc54fa9e42db0073a8"
 dependencies = [
  "anstyle",
  "bstr",
  "doc-comment",
- "libc",
  "predicates",
  "predicates-core",
  "predicates-tree",
@@ -1501,11 +1497,12 @@ dependencies = [
 
 [[package]]
 name = "async-channel"
-version = "2.5.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2"
+checksum = "9f2776ead772134d55b62dd45e59a79e21612d85d0af729b8b7d3967d601a62a"
 dependencies = [
  "concurrent-queue",
+ "event-listener 5.3.1",
  "event-listener-strategy",
  "futures-core",
  "pin-project-lite",
@@ -1513,15 +1510,15 @@ dependencies = [
 
 [[package]]
 name = "async-executor"
-version = "1.13.2"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb812ffb58524bdd10860d7d974e2f01cc0950c2438a74ee5ec2e2280c6c4ffa"
+checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb"
 dependencies = [
+ "async-lock 2.8.0",
  "async-task",
  "concurrent-queue",
- "fastrand 2.3.0",
- "futures-lite 2.6.0",
- "pin-project-lite",
+ "fastrand 1.9.0",
+ "futures-lite 1.13.0",
  "slab",
 ]
 
@@ -1539,27 +1536,27 @@ dependencies = [
 
 [[package]]
 name = "async-fs"
-version = "2.1.3"
+version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09f7e37c0ed80b2a977691c47dae8625cfb21e205827106c64f7c588766b2e50"
+checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a"
 dependencies = [
  "async-lock 3.4.0",
  "blocking",
- "futures-lite 2.6.0",
+ "futures-lite 2.3.0",
 ]
 
 [[package]]
 name = "async-global-executor"
-version = "2.4.1"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
+checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776"
 dependencies = [
- "async-channel 2.5.0",
+ "async-channel 1.9.0",
  "async-executor",
- "async-io 2.5.0",
- "async-lock 3.4.0",
+ "async-io 1.13.0",
+ "async-lock 2.8.0",
  "blocking",
- "futures-lite 2.6.0",
+ "futures-lite 1.13.0",
  "once_cell",
 ]
 
@@ -1577,28 +1574,29 @@ dependencies = [
  "log",
  "parking",
  "polling 2.8.0",
- "rustix 0.37.28",
+ "rustix 0.37.23",
  "slab",
- "socket2 0.4.10",
+ "socket2 0.4.9",
  "waker-fn",
 ]
 
 [[package]]
 name = "async-io"
-version = "2.5.0"
+version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19634d6336019ef220f09fd31168ce5c184b295cbf80345437cc36094ef223ca"
+checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964"
 dependencies = [
  "async-lock 3.4.0",
  "cfg-if",
  "concurrent-queue",
  "futures-io",
- "futures-lite 2.6.0",
+ "futures-lite 2.3.0",
  "parking",
- "polling 3.9.0",
- "rustix 1.0.8",
+ "polling 3.4.0",
+ "rustix 0.38.42",
  "slab",
- "windows-sys 0.60.2",
+ "tracing",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1616,18 +1614,19 @@ version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
 dependencies = [
- "event-listener 5.4.0",
+ "event-listener 5.3.1",
  "event-listener-strategy",
  "pin-project-lite",
 ]
 
 [[package]]
 name = "async-net"
-version = "1.8.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0434b1ed18ce1cf5769b8ac540e33f01fa9471058b5e89da9e06f3c882a8c12f"
+checksum = "4051e67316bc7eff608fe723df5d32ed639946adcd69e07df41fd42a7b411f1f"
 dependencies = [
  "async-io 1.13.0",
+ "autocfg",
  "blocking",
  "futures-lite 1.13.0",
 ]
@@ -1638,81 +1637,83 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7"
 dependencies = [
- "async-io 2.5.0",
+ "async-io 2.3.3",
  "blocking",
- "futures-lite 2.6.0",
+ "futures-lite 2.3.0",
 ]
 
 [[package]]
 name = "async-process"
-version = "1.8.1"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88"
+checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9"
 dependencies = [
  "async-io 1.13.0",
  "async-lock 2.8.0",
- "async-signal",
+ "autocfg",
  "blocking",
  "cfg-if",
- "event-listener 3.1.0",
+ "event-listener 2.5.3",
  "futures-lite 1.13.0",
- "rustix 0.38.44",
+ "rustix 0.37.23",
+ "signal-hook",
  "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "async-process"
-version = "2.4.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65daa13722ad51e6ab1a1b9c01299142bc75135b337923cfa10e79bbbd669f00"
+checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb"
 dependencies = [
- "async-channel 2.5.0",
- "async-io 2.5.0",
+ "async-channel 2.3.0",
+ "async-io 2.3.3",
  "async-lock 3.4.0",
  "async-signal",
  "async-task",
  "blocking",
  "cfg-if",
- "event-listener 5.4.0",
- "futures-lite 2.6.0",
- "rustix 1.0.8",
+ "event-listener 5.3.1",
+ "futures-lite 2.3.0",
+ "rustix 0.38.42",
+ "tracing",
 ]
 
 [[package]]
 name = "async-signal"
-version = "0.2.12"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f567af260ef69e1d52c2b560ce0ea230763e6fbb9214a85d768760a920e3e3c1"
+checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32"
 dependencies = [
- "async-io 2.5.0",
+ "async-io 2.3.3",
  "async-lock 3.4.0",
  "atomic-waker",
  "cfg-if",
  "futures-core",
  "futures-io",
- "rustix 1.0.8",
+ "rustix 0.38.42",
  "signal-hook-registry",
  "slab",
- "windows-sys 0.60.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "async-std"
-version = "1.13.1"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "730294c1c08c2e0f85759590518f6333f0d5a0a766a27d519c1b244c3dfd8a24"
+checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d"
 dependencies = [
  "async-attributes",
  "async-channel 1.9.0",
  "async-global-executor",
- "async-io 2.5.0",
- "async-lock 3.4.0",
+ "async-io 1.13.0",
+ "async-lock 2.8.0",
  "crossbeam-utils",
  "futures-channel",
  "futures-core",
  "futures-io",
- "futures-lite 2.6.0",
- "gloo-timers 0.3.0",
+ "futures-lite 1.13.0",
+ "gloo-timers",
  "kv-log-macro",
  "log",
  "memchr",
@@ -1725,9 +1726,9 @@ dependencies = [
 
 [[package]]
 name = "async-stream"
-version = "0.3.6"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
+checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
 dependencies = [
  "async-stream-impl",
  "futures-core",
@@ -1736,13 +1737,13 @@ dependencies = [
 
 [[package]]
 name = "async-stream-impl"
-version = "0.3.6"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
+checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -1759,7 +1760,7 @@ checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -1805,9 +1806,9 @@ checksum = "a8ab6b55fe97976e46f91ddbed8d147d966475dc29b2032757ba47e02376fbc3"
 
 [[package]]
 name = "atomic-waker"
-version = "1.1.2"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3"
 
 [[package]]
 name = "attohttpc"
@@ -1815,7 +1816,7 @@ version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d9a9bf8b79a749ee0b911b91b671cc2b6c670bdbc7e3dfd537576ddc94bb2a2"
 dependencies = [
- "http 0.2.12",
+ "http 0.2.9",
  "log",
  "url",
 ]
@@ -1838,14 +1839,14 @@ checksum = "ffdcb70bdbc4d478427380519163274ac86e52916e10f0a8889adf0f96d3fee7"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "autocfg"
-version = "1.5.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "average"
@@ -1870,24 +1871,24 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1"
 dependencies = [
- "getrandom 0.2.16",
+ "getrandom 0.2.10",
  "instant",
  "rand 0.8.5",
 ]
 
 [[package]]
 name = "backtrace"
-version = "0.3.75"
+version = "0.3.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
+checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
 dependencies = [
- "addr2line 0.24.2",
+ "addr2line 0.21.0",
+ "cc",
  "cfg-if",
  "libc",
  "miniz_oxide",
- "object 0.36.7",
+ "object 0.32.2",
  "rustc-demangle",
- "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -1928,15 +1929,15 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "base64ct"
-version = "1.8.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba"
+checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
 [[package]]
 name = "binary-merkle-tree"
 version = "13.0.0"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "hash-db",
  "log",
  "parity-scale-codec",
@@ -1971,31 +1972,30 @@ dependencies = [
  "regex",
  "rustc-hash 1.1.0",
  "shlex",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "bip32"
-version = "0.5.3"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db40d3dfbeab4e031d78c844642fa0caa0b0db11ce1607ac9d2986dff1405c69"
+checksum = "aa13fae8b6255872fd86f7faf4b41168661d7d78609f7bfe6771b85c6739a15b"
 dependencies = [
  "bs58",
  "hmac 0.12.1",
  "k256",
  "rand_core 0.6.4",
  "ripemd",
- "secp256k1 0.27.0",
  "sha2 0.10.9",
- "subtle 2.6.1",
+ "subtle 2.5.0",
  "zeroize",
 ]
 
 [[package]]
 name = "bip39"
-version = "2.2.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43d193de1f7487df1914d3a568b772458861d33f9c54249612cc2893d6915054"
+checksum = "33415e24172c1b7d6066f6d999545375ab8e1d95421d6784bdfff9496f292387"
 dependencies = [
  "bitcoin_hashes 0.13.0",
  "serde",
@@ -2036,7 +2036,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1930a4dabfebb8d7d9992db18ebe3ae2876f0a305fab206fd168df931ede293b"
 dependencies = [
  "bitcoin-internals",
- "hex-conservative 0.1.2",
+ "hex-conservative 0.1.1",
 ]
 
 [[package]]
@@ -2110,37 +2110,37 @@ dependencies = [
 
 [[package]]
 name = "blake2b_simd"
-version = "1.0.3"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06e903a20b159e944f91ec8499fe1e55651480c541ea0a584f5d967c49ad9d99"
+checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780"
 dependencies = [
  "arrayref",
- "arrayvec 0.7.6",
- "constant_time_eq 0.3.1",
+ "arrayvec 0.7.4",
+ "constant_time_eq 0.3.0",
 ]
 
 [[package]]
 name = "blake2s_simd"
-version = "1.0.3"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e90f7deecfac93095eb874a40febd69427776e24e1bd7f87f33ac62d6f0174df"
+checksum = "6637f448b9e61dfadbdcbae9a885fadee1f3eaffb1f8d3c1965d3ade8bdfd44f"
 dependencies = [
  "arrayref",
- "arrayvec 0.7.6",
- "constant_time_eq 0.3.1",
+ "arrayvec 0.7.4",
+ "constant_time_eq 0.2.6",
 ]
 
 [[package]]
 name = "blake3"
-version = "1.8.2"
+version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3888aaa89e4b2a40fca9848e400f6a658a5a3978de7be858e209cafa8be9a4a0"
+checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7"
 dependencies = [
  "arrayref",
- "arrayvec 0.7.6",
+ "arrayvec 0.7.4",
  "cc",
  "cfg-if",
- "constant_time_eq 0.3.1",
+ "constant_time_eq 0.3.0",
 ]
 
 [[package]]
@@ -2163,15 +2163,17 @@ dependencies = [
 
 [[package]]
 name = "blocking"
-version = "1.6.2"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21"
+checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65"
 dependencies = [
- "async-channel 2.5.0",
+ "async-channel 1.9.0",
+ "async-lock 2.8.0",
  "async-task",
- "futures-io",
- "futures-lite 2.6.0",
- "piper",
+ "atomic-waker",
+ "fastrand 1.9.0",
+ "futures-lite 1.13.0",
+ "log",
 ]
 
 [[package]]
@@ -2200,9 +2202,9 @@ dependencies = [
 
 [[package]]
 name = "bounded-collections"
-version = "0.2.4"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64ad8a0bed7827f0b07a5d23cec2e58cc02038a99e4ca81616cb2bb2025f804d"
+checksum = "32ed0a820ed50891d36358e997d27741a6142e382242df40ff01c89bcdcc7a2b"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -2220,7 +2222,7 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "scale-info",
- "schemars 1.0.4",
+ "schemars",
  "serde",
 ]
 
@@ -2230,7 +2232,7 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68534a48cbf63a4b1323c433cf21238c9ec23711e0df13b08c33e5c2082663ce"
 dependencies = [
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -2948,12 +2950,12 @@ dependencies = [
 
 [[package]]
 name = "bstr"
-version = "1.12.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4"
+checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05"
 dependencies = [
  "memchr",
- "regex-automata 0.4.9",
+ "regex-automata 0.3.6",
  "serde",
 ]
 
@@ -2968,9 +2970,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.19.0"
+version = "3.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
 
 [[package]]
 name = "byte-slice-cast"
@@ -2986,9 +2988,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
 
 [[package]]
 name = "bytemuck"
-version = "1.23.1"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c76a5792e44e4abe34d3abf15636779261d45a7450612059293d1d2cfc63422"
+checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
 
 [[package]]
 name = "byteorder"
@@ -3007,11 +3009,12 @@ dependencies = [
 
 [[package]]
 name = "bzip2-sys"
-version = "0.1.13+1.0.8"
+version = "0.1.11+1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225bff33b2141874fe80d71e07d6eec4f85c5c216453dd96388240f96e1acc14"
+checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc"
 dependencies = [
  "cc",
+ "libc",
  "pkg-config",
 ]
 
@@ -3042,18 +3045,18 @@ dependencies = [
 
 [[package]]
 name = "camino"
-version = "1.1.10"
+version = "1.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0da45bc31171d8d6960122e222a67740df867c1dd53b4d51caa297084c185cab"
+checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "cargo-platform"
-version = "0.1.9"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea"
+checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479"
 dependencies = [
  "serde",
 ]
@@ -3066,10 +3069,10 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a"
 dependencies = [
  "camino",
  "cargo-platform",
- "semver 1.0.26",
+ "semver 1.0.18",
  "serde",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -3107,23 +3110,23 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
 dependencies = [
- "nom 7.1.3",
+ "nom",
 ]
 
 [[package]]
 name = "cfg-expr"
-version = "0.15.8"
+version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
+checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3"
 dependencies = [
  "smallvec",
 ]
 
 [[package]]
 name = "cfg-if"
-version = "1.0.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "cfg_aliases"
@@ -3194,9 +3197,9 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.41"
+version = "0.4.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
+checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -3209,9 +3212,9 @@ dependencies = [
 
 [[package]]
 name = "ciborium"
-version = "0.2.2"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
+checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926"
 dependencies = [
  "ciborium-io",
  "ciborium-ll",
@@ -3220,15 +3223,15 @@ dependencies = [
 
 [[package]]
 name = "ciborium-io"
-version = "0.2.2"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
+checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656"
 
 [[package]]
 name = "ciborium-ll"
-version = "0.2.2"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
+checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b"
 dependencies = [
  "ciborium-io",
  "half",
@@ -3255,7 +3258,7 @@ checksum = "3147d8272e8fa0ccd29ce51194dd98f79ddfb8191ba9e3409884e751798acf3a"
 dependencies = [
  "core2",
  "multibase",
- "multihash 0.19.3",
+ "multihash 0.19.1",
  "unsigned-varint 0.8.0",
 ]
 
@@ -3281,9 +3284,9 @@ dependencies = [
 
 [[package]]
 name = "clang-sys"
-version = "1.8.1"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
+checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f"
 dependencies = [
  "glob",
  "libc",
@@ -3292,9 +3295,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.41"
+version = "4.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9"
+checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -3302,9 +3305,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.41"
+version = "4.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d"
+checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99"
 dependencies = [
  "anstream",
  "anstyle",
@@ -3315,39 +3318,39 @@ dependencies = [
 
 [[package]]
 name = "clap_complete"
-version = "4.5.55"
+version = "4.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5abde44486daf70c5be8b8f8f1b66c49f86236edf6fa2abadb4d961c4c6229a"
+checksum = "aa3c596da3cf0983427b0df0dba359df9182c13bd5b519b585a482b0c351f4e8"
 dependencies = [
  "clap",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.5.41"
+version = "4.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491"
+checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.7.5"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
+checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
 
 [[package]]
 name = "cmd_lib"
-version = "1.9.6"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1af0f9b65935ff457da75535a6b6ff117ac858f03f71191188b3b696f90aec5a"
+checksum = "371c15a3c178d0117091bd84414545309ca979555b1aad573ef591ad58818d41"
 dependencies = [
  "cmd_lib_macros",
- "env_logger 0.10.2",
+ "env_logger 0.10.1",
  "faccess",
  "lazy_static",
  "log",
@@ -3356,36 +3359,36 @@ dependencies = [
 
 [[package]]
 name = "cmd_lib_macros"
-version = "1.9.6"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e69eee115667ccda8b9ed7010bcf13356ad45269fc92aa78534890b42809a64"
+checksum = "cb844bd05be34d91eb67101329aeba9d3337094c04fd8507d821db7ebb488eaf"
 dependencies = [
  "proc-macro-error2",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "coarsetime"
-version = "0.1.36"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91849686042de1b41cd81490edc83afbcb0abe5a9b6f2c4114f23ce8cca1bcf4"
+checksum = "a90d114103adbc625300f346d4d09dfb4ab1c4a8df6868435dd903392ecf4354"
 dependencies = [
  "libc",
- "wasix",
+ "once_cell",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "codespan-reporting"
-version = "0.12.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe6d2e5af09e8c8ad56c969f2157a3d4238cebc7c55f0a517728c38f7b200f81"
+checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
 dependencies = [
- "serde",
  "termcolor",
- "unicode-width",
+ "unicode-width 0.1.10",
 ]
 
 [[package]]
@@ -3508,9 +3511,9 @@ dependencies = [
 
 [[package]]
 name = "color-eyre"
-version = "0.6.5"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5920befb47832a6d61ee3a3a846565cfa39b331331e68a3b1d1116630f2f26d"
+checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5"
 dependencies = [
  "backtrace",
  "eyre",
@@ -3521,46 +3524,47 @@ dependencies = [
 
 [[package]]
 name = "color-print"
-version = "0.3.7"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3aa954171903797d5623e047d9ab69d91b493657917bdfb8c2c80ecaf9cdb6f4"
+checksum = "f2a5e6504ed8648554968650feecea00557a3476bc040d0ffc33080e66b646d0"
 dependencies = [
  "color-print-proc-macro",
 ]
 
 [[package]]
 name = "color-print-proc-macro"
-version = "0.3.7"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "692186b5ebe54007e45a59aea47ece9eb4108e141326c304cdc91699a7118a22"
+checksum = "d51beaa537d73d2d1ff34ee70bc095f170420ab2ec5d687ecd3ec2b0d092514b"
 dependencies = [
- "nom 7.1.3",
+ "nom",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "colorchoice"
-version = "1.0.4"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
 [[package]]
 name = "colored"
-version = "2.2.0"
+version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
+checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6"
 dependencies = [
+ "is-terminal",
  "lazy_static",
- "windows-sys 0.59.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "combine"
-version = "4.6.7"
+version = "4.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
+checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
 dependencies = [
  "bytes",
  "memchr",
@@ -3573,7 +3577,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a65ebfec4fb190b6f90e944a817d60499ee0744e582530e2c9900a22e591d9a"
 dependencies = [
  "unicode-segmentation",
- "unicode-width",
+ "unicode-width 0.2.0",
 ]
 
 [[package]]
@@ -3593,22 +3597,22 @@ dependencies = [
 
 [[package]]
 name = "console"
-version = "0.15.11"
+version = "0.15.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8"
+checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
 dependencies = [
  "encode_unicode",
+ "lazy_static",
  "libc",
- "once_cell",
- "unicode-width",
- "windows-sys 0.59.0",
+ "unicode-width 0.1.10",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "const-hex"
-version = "1.14.1"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83e22e0ed40b96a48d3db274f72fd365bd78f67af39b6bbd47e8a15e1c6207ff"
+checksum = "4b0485bab839b018a8f1723fc5391819fea5f8f0f32288ef8a735fd096b6160c"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -3619,27 +3623,29 @@ dependencies = [
 
 [[package]]
 name = "const-oid"
-version = "0.9.6"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
+checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f"
 
 [[package]]
 name = "const-random"
-version = "0.1.18"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
+checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e"
 dependencies = [
  "const-random-macro",
+ "proc-macro-hack",
 ]
 
 [[package]]
 name = "const-random-macro"
-version = "0.1.16"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
+checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb"
 dependencies = [
- "getrandom 0.2.16",
+ "getrandom 0.2.10",
  "once_cell",
+ "proc-macro-hack",
  "tiny-keccak",
 ]
 
@@ -3660,7 +3666,7 @@ checksum = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "unicode-xid 0.2.6",
+ "unicode-xid 0.2.4",
 ]
 
 [[package]]
@@ -3671,24 +3677,21 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
 
 [[package]]
 name = "constant_time_eq"
-version = "0.3.1"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
+checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6"
 
 [[package]]
-name = "convert_case"
-version = "0.4.0"
+name = "constant_time_eq"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
+checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
 
 [[package]]
 name = "convert_case"
-version = "0.7.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb402b8d4c85569410425650ce3eddc7d698ed96d39a73f941b08fb63082f1e7"
-dependencies = [
- "unicode-segmentation",
-]
+checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
 
 [[package]]
 name = "core-foundation"
@@ -3700,21 +3703,11 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "core-foundation"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.7"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
 
 [[package]]
 name = "core2"
@@ -3933,9 +3926,9 @@ dependencies = [
 
 [[package]]
 name = "cpp_demangle"
-version = "0.4.4"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96e58d342ad113c2b878f16d5d034c03be492ae460cdbc02b7f0f2284d310c7d"
+checksum = "7e8227005286ec39567949b33df9896bcadfa6051bccca2488129f108ca23119"
 dependencies = [
  "cfg-if",
 ]
@@ -3952,9 +3945,9 @@ dependencies = [
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.17"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
 dependencies = [
  "libc",
 ]
@@ -4053,15 +4046,15 @@ dependencies = [
  "itertools 0.10.5",
  "log",
  "smallvec",
- "wasmparser 0.102.0",
+ "wasmparser",
  "wasmtime-types",
 ]
 
 [[package]]
 name = "crc"
-version = "3.3.0"
+version = "3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675"
+checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636"
 dependencies = [
  "crc-catalog",
 ]
@@ -4074,9 +4067,9 @@ checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
 
 [[package]]
 name = "crc32fast"
-version = "1.5.0"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
+checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
 dependencies = [
  "cfg-if",
 ]
@@ -4136,53 +4129,58 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.6"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
+checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
 dependencies = [
+ "cfg-if",
  "crossbeam-epoch",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.18"
+version = "0.9.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
 dependencies = [
+ "autocfg",
+ "cfg-if",
  "crossbeam-utils",
+ "memoffset 0.9.0",
+ "scopeguard",
 ]
 
 [[package]]
 name = "crossbeam-queue"
-version = "0.3.12"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
+checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
 dependencies = [
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.21"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
 [[package]]
 name = "crunchy"
-version = "0.2.4"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 
 [[package]]
 name = "crypto-bigint"
-version = "0.5.5"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
+checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15"
 dependencies = [
  "generic-array 0.14.7",
  "rand_core 0.6.4",
- "subtle 2.6.1",
+ "subtle 2.5.0",
  "zeroize",
 ]
 
@@ -4214,7 +4212,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
 dependencies = [
  "generic-array 0.14.7",
- "subtle 2.6.1",
+ "subtle 2.5.0",
 ]
 
 [[package]]
@@ -4228,7 +4226,7 @@ dependencies = [
  "generic-array 0.14.7",
  "poly1305",
  "salsa20",
- "subtle 2.6.1",
+ "subtle 2.5.0",
  "zeroize",
 ]
 
@@ -4243,11 +4241,11 @@ dependencies = [
 
 [[package]]
 name = "ctrlc"
-version = "3.4.7"
+version = "3.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46f93780a459b7d656ef7f071fe699c4d3d2cb201c4b24d085b6ddc505276e73"
+checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3"
 dependencies = [
- "nix 0.30.1",
+ "nix 0.29.0",
  "windows-sys 0.59.0",
 ]
 
@@ -4255,7 +4253,7 @@ dependencies = [
 name = "cumulus-client-bootnodes"
 version = "0.1.0"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "async-channel 1.9.0",
  "cumulus-primitives-core",
  "cumulus-relay-chain-interface",
@@ -4304,7 +4302,7 @@ dependencies = [
  "cumulus-test-runtime",
  "futures",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-test-helpers",
@@ -4337,7 +4335,7 @@ dependencies = [
  "cumulus-test-relay-sproof-builder",
  "futures",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
@@ -4419,7 +4417,7 @@ dependencies = [
  "sp-inherents",
  "sp-runtime",
  "sp-state-machine",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -4431,7 +4429,7 @@ dependencies = [
  "cumulus-primitives-core",
  "cumulus-relay-chain-interface",
  "futures",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "sc-consensus",
  "sp-api",
  "sp-block-builder",
@@ -4456,7 +4454,7 @@ dependencies = [
  "futures",
  "futures-timer",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-parachain-primitives",
@@ -4628,7 +4626,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "futures",
- "hashbrown 0.15.4",
+ "hashbrown 0.15.3",
  "hex-literal",
  "impl-trait-for-tuples",
  "log",
@@ -4663,10 +4661,10 @@ dependencies = [
 name = "cumulus-pallet-parachain-system-proc-macro"
 version = "0.6.0"
 dependencies = [
- "proc-macro-crate 3.3.0",
+ "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -4784,7 +4782,7 @@ dependencies = [
  "sp-io",
  "sp-maybe-compressed-blob",
  "tracing",
- "tracing-subscriber 0.3.19",
+ "tracing-subscriber 0.3.18",
 ]
 
 [[package]]
@@ -4926,14 +4924,14 @@ dependencies = [
  "sp-blockchain",
  "sp-state-machine",
  "sp-version",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
 name = "cumulus-relay-chain-minimal-node"
 version = "0.7.0"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "async-channel 1.9.0",
  "async-trait",
  "cumulus-client-bootnodes",
@@ -4998,7 +4996,7 @@ dependencies = [
  "sp-storage 19.0.0",
  "sp-version",
  "substrate-prometheus-endpoint",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tokio",
  "tokio-util",
  "tracing",
@@ -5205,7 +5203,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "cumulus-zombienet-sdk-helpers",
- "env_logger 0.11.8",
+ "env_logger 0.11.3",
  "futures",
  "log",
  "polkadot-primitives",
@@ -5222,24 +5220,24 @@ dependencies = [
 
 [[package]]
 name = "curl"
-version = "0.4.48"
+version = "0.4.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e2d5c8f48d9c0c23250e52b55e82a6ab4fdba6650c931f5a0a57a43abda812b"
+checksum = "1e2161dd6eba090ff1594084e95fd67aeccf04382ffea77999ea94ed42ec67b6"
 dependencies = [
  "curl-sys",
  "libc",
  "openssl-probe",
  "openssl-sys",
  "schannel",
- "socket2 0.5.10",
- "windows-sys 0.59.0",
+ "socket2 0.5.9",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "curl-sys"
-version = "0.4.82+curl-8.14.1"
+version = "0.4.72+curl-8.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4d63638b5ec65f1a4ae945287b3fd035be4554bbaf211901159c9a2a74fb5be"
+checksum = "29cbdc8314c447d11e8fd156dcdd031d9e02a7a976163e396b548c03153bc9ea"
 dependencies = [
  "cc",
  "libc",
@@ -5248,7 +5246,7 @@ dependencies = [
  "openssl-sys",
  "pkg-config",
  "vcpkg",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -5262,20 +5260,20 @@ dependencies = [
  "curve25519-dalek-derive",
  "digest 0.10.7",
  "fiat-crypto",
- "rustc_version 0.4.1",
- "subtle 2.6.1",
+ "rustc_version 0.4.0",
+ "subtle 2.5.0",
  "zeroize",
 ]
 
 [[package]]
 name = "curve25519-dalek-derive"
-version = "0.1.1"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
+checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -5293,71 +5291,53 @@ dependencies = [
 
 [[package]]
 name = "cxx"
-version = "1.0.161"
+version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3523cc02ad831111491dd64b27ad999f1ae189986728e477604e61b81f828df"
+checksum = "28403c86fc49e3401fdf45499ba37fad6493d9329449d6449d7f0e10f4654d28"
 dependencies = [
  "cc",
- "cxxbridge-cmd",
  "cxxbridge-flags",
  "cxxbridge-macro",
- "foldhash",
  "link-cplusplus",
 ]
 
 [[package]]
 name = "cxx-build"
-version = "1.0.161"
+version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "212b754247a6f07b10fa626628c157593f0abf640a3dd04cce2760eca970f909"
+checksum = "78da94fef01786dc3e0c76eafcd187abcaa9972c78e05ff4041e24fdf059c285"
 dependencies = [
  "cc",
  "codespan-reporting",
- "indexmap 2.10.0",
+ "once_cell",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "scratch",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "cxxbridge-cmd"
-version = "1.0.161"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f426a20413ec2e742520ba6837c9324b55ffac24ead47491a6e29f933c5b135a"
-dependencies = [
- "clap",
- "codespan-reporting",
- "indexmap 2.10.0",
- "proc-macro2 1.0.95",
- "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.161"
+version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258b6069020b4e5da6415df94a50ee4f586a6c38b037a180e940a43d06a070d"
+checksum = "e2a6f5e1dfb4b34292ad4ea1facbfdaa1824705b231610087b00b17008641809"
 
 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.161"
+version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8dec184b52be5008d6eaf7e62fc1802caf1ad1227d11b3b7df2c409c7ffc3f4"
+checksum = "50c49547d73ba8dcfd4ad7325d64c6d5391ff4224d498fc39a6f3f49825a530d"
 dependencies = [
- "indexmap 2.10.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "rustversion",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "darling"
-version = "0.20.11"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
+checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -5365,53 +5345,53 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.20.11"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
+checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
 dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "strsim",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "darling_macro"
-version = "0.20.11"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
+checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "dashmap"
-version = "5.5.3"
+version = "5.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
+checksum = "edd72493923899c6f10c641bdbdeddc7183d6396641d99c1a0d1597f37f92e28"
 dependencies = [
  "cfg-if",
  "hashbrown 0.14.5",
  "lock_api",
  "once_cell",
- "parking_lot_core 0.9.11",
+ "parking_lot_core 0.9.8",
 ]
 
 [[package]]
 name = "data-encoding"
-version = "2.9.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
+checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
 
 [[package]]
 name = "data-encoding-macro"
-version = "0.1.18"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47ce6c96ea0102f01122a185683611bd5ac8d99e62bc59dd12e6bda344ee673d"
+checksum = "c904b33cc60130e1aeea4956ab803d08a3f4a0ca82d64ed757afac3891f2bb99"
 dependencies = [
  "data-encoding",
  "data-encoding-macro-internal",
@@ -5419,12 +5399,12 @@ dependencies = [
 
 [[package]]
 name = "data-encoding-macro-internal"
-version = "0.1.16"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d162beedaa69905488a8da94f5ac3edb4dd4788b732fadb7bd120b2625c1976"
+checksum = "8fdf3fce3ce863539ec1d7fd1b6dcc3c645663376b43ed376bbf887733e4f772"
 dependencies = [
  "data-encoding",
- "syn 2.0.104",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -5438,9 +5418,9 @@ dependencies = [
 
 [[package]]
 name = "der"
-version = "0.7.10"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
+checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c"
 dependencies = [
  "const-oid",
  "pem-rfc7468",
@@ -5453,9 +5433,9 @@ version = "9.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553"
 dependencies = [
- "asn1-rs 0.6.2",
+ "asn1-rs 0.6.1",
  "displaydoc",
- "nom 7.1.3",
+ "nom",
  "num-bigint",
  "num-traits",
  "rusticata-macros",
@@ -5467,9 +5447,9 @@ version = "10.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07da5016415d5a3c4dd39b11ed26f915f52fc4e0dc197d87908bc916e51bc1a6"
 dependencies = [
- "asn1-rs 0.7.1",
+ "asn1-rs 0.7.0",
  "displaydoc",
- "nom 7.1.3",
+ "nom",
  "num-bigint",
  "num-traits",
  "rusticata-macros",
@@ -5477,9 +5457,9 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.4.0"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
 dependencies = [
  "powerfmt",
 ]
@@ -5503,7 +5483,7 @@ checksum = "d65d7ce8132b7c0e54497a4d9a55a1c2a0912a0d786cf894472ba818fba45762"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -5514,31 +5494,31 @@ checksum = "510c292c8cf384b1a340b816a9a6cf2599eb8f566a44949024af88418000c50b"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "derive_arbitrary"
-version = "1.4.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800"
+checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "derive_more"
-version = "0.99.20"
+version = "0.99.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f"
+checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
 dependencies = [
- "convert_case 0.4.0",
+ "convert_case",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "rustc_version 0.4.1",
- "syn 2.0.104",
+ "rustc_version 0.4.0",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -5567,8 +5547,8 @@ checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
- "unicode-xid 0.2.6",
+ "syn 2.0.98",
+ "unicode-xid 0.2.4",
 ]
 
 [[package]]
@@ -5577,11 +5557,10 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
 dependencies = [
- "convert_case 0.7.1",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
- "unicode-xid 0.2.6",
+ "syn 2.0.98",
+ "unicode-xid 0.2.4",
 ]
 
 [[package]]
@@ -5623,7 +5602,7 @@ dependencies = [
  "block-buffer 0.10.4",
  "const-oid",
  "crypto-common",
- "subtle 2.6.1",
+ "subtle 2.5.0",
 ]
 
 [[package]]
@@ -5679,30 +5658,28 @@ dependencies = [
 
 [[package]]
 name = "displaydoc"
-version = "0.2.5"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "dissimilar"
-version = "1.0.10"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8975ffdaa0ef3661bfe02dbdcc06c9f829dfafe6a3c474de366a8d5e44276921"
+checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632"
 
 [[package]]
 name = "dlmalloc"
-version = "0.2.9"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d01597dde41c0b9da50d5f8c219023d63d8f27f39a27095070fd191fddc83891"
+checksum = "203540e710bfadb90e5e29930baf5d10270cec1f43ab34f46f78b147b2de715a"
 dependencies = [
- "cfg-if",
  "libc",
- "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -5732,9 +5709,9 @@ dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "regex",
- "syn 2.0.104",
+ "syn 2.0.98",
  "termcolor",
- "toml 0.8.23",
+ "toml 0.8.19",
  "walkdir",
 ]
 
@@ -5752,9 +5729,9 @@ checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1"
 
 [[package]]
 name = "downcast-rs"
-version = "1.2.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
+checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
 
 [[package]]
 name = "drawille"
@@ -5768,21 +5745,21 @@ dependencies = [
 
 [[package]]
 name = "dtoa"
-version = "1.0.10"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6add3b8cff394282be81f3fc1a0605db594ed69890078ca6e2cab1c408bcf04"
+checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653"
 
 [[package]]
 name = "dunce"
-version = "1.0.5"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
+checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
 
 [[package]]
 name = "dyn-clonable"
-version = "0.9.2"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a36efbb9bfd58e1723780aa04b61aba95ace6a05d9ffabfdb0b43672552f0805"
+checksum = "4e9232f0e607a262ceb9bd5141a3dfb3e4db6994b31989bbfd845878cba59fd4"
 dependencies = [
  "dyn-clonable-impl",
  "dyn-clone",
@@ -5790,20 +5767,20 @@ dependencies = [
 
 [[package]]
 name = "dyn-clonable-impl"
-version = "0.9.2"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e8671d54058979a37a26f3511fbf8d198ba1aa35ffb202c42587d918d77213a"
+checksum = "558e40ea573c374cf53507fd240b7ee2f5477df7cfebdb97323ec61c719399c5"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "dyn-clone"
-version = "1.0.19"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005"
+checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 
 [[package]]
 name = "easy-cast"
@@ -5816,9 +5793,9 @@ dependencies = [
 
 [[package]]
 name = "ecdsa"
-version = "0.16.9"
+version = "0.16.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
+checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4"
 dependencies = [
  "der",
  "digest 0.10.7",
@@ -5831,9 +5808,9 @@ dependencies = [
 
 [[package]]
 name = "ed25519"
-version = "2.2.3"
+version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
+checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d"
 dependencies = [
  "pkcs8",
  "signature",
@@ -5841,16 +5818,16 @@ dependencies = [
 
 [[package]]
 name = "ed25519-dalek"
-version = "2.2.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70e796c081cee67dc755e1a36a0a172b897fab85fc3f6bc48307991f64e4eca9"
+checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
 dependencies = [
  "curve25519-dalek",
  "ed25519",
  "rand_core 0.6.4",
  "serde",
  "sha2 0.10.9",
- "subtle 2.6.1",
+ "subtle 2.5.0",
  "zeroize",
 ]
 
@@ -5878,7 +5855,7 @@ dependencies = [
  "enum-ordinalize",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -5906,7 +5883,7 @@ dependencies = [
  "rand_core 0.6.4",
  "sec1",
  "serdect",
- "subtle 2.6.1",
+ "subtle 2.5.0",
  "zeroize",
 ]
 
@@ -5954,29 +5931,29 @@ dependencies = [
 
 [[package]]
 name = "encode_unicode"
-version = "1.0.0"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
+checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.35"
+version = "0.8.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
+checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "enum-as-inner"
-version = "0.6.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc"
+checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a"
 dependencies = [
- "heck 0.5.0",
+ "heck 0.4.1",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -5996,45 +5973,45 @@ checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "enumflags2"
-version = "0.7.12"
+version = "0.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1027f7680c853e056ebcec683615fb6fbbc07dbaa13b4d5d9442b146ded4ecef"
+checksum = "ba2f4b465f5318854c6f8dd686ede6c0a9dc67d4b1ac241cf0eb51521a309147"
 dependencies = [
  "enumflags2_derive",
 ]
 
 [[package]]
 name = "enumflags2_derive"
-version = "0.7.12"
+version = "0.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827"
+checksum = "fc4caf64a58d7a6d65ab00639b046ff54399a39f5f2554728895ace4b297cd79"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "enumn"
-version = "0.1.14"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38"
+checksum = "6fd000fd6988e73bbe993ea3db9b1aa64906ab88766d654973924340c8cddb42"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "env_filter"
-version = "0.1.3"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
+checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea"
 dependencies = [
  "log",
  "regex",
@@ -6052,9 +6029,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.10.2"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
+checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece"
 dependencies = [
  "humantime",
  "is-terminal",
@@ -6065,14 +6042,14 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.11.8"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f"
+checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9"
 dependencies = [
  "anstream",
  "anstyle",
  "env_filter",
- "jiff",
+ "humantime",
  "log",
 ]
 
@@ -6084,9 +6061,9 @@ checksum = "e48c92028aaa870e83d51c64e5d4e0b6981b360c522198c23959f219a4e1b15b"
 
 [[package]]
 name = "equivalent"
-version = "1.0.2"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "equivocation-detector"
@@ -6104,12 +6081,11 @@ dependencies = [
 
 [[package]]
 name = "erased-serde"
-version = "0.4.6"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e004d887f51fcb9fef17317a2f3525c887d8aa3f4f50fed920816a688284a5b7"
+checksum = "2b73807008a3c7f171cc40312f37d95ef0396e048b5848d775f54b1a4dd4a0d3"
 dependencies = [
  "serde",
- "typeid",
 ]
 
 [[package]]
@@ -6124,12 +6100,12 @@ dependencies = [
 
 [[package]]
 name = "errno"
-version = "0.3.13"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -6199,20 +6175,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
 [[package]]
 name = "event-listener"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2"
-dependencies = [
- "concurrent-queue",
- "parking",
- "pin-project-lite",
-]
-
-[[package]]
-name = "event-listener"
-version = "5.4.0"
+version = "5.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae"
+checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
 dependencies = [
  "concurrent-queue",
  "parking",
@@ -6221,11 +6186,11 @@ dependencies = [
 
 [[package]]
 name = "event-listener-strategy"
-version = "0.5.4"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
+checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
 dependencies = [
- "event-listener 5.4.0",
+ "event-listener 5.3.1",
  "pin-project-lite",
 ]
 
@@ -6250,14 +6215,14 @@ dependencies = [
  "prettyplease",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "eyre"
-version = "0.6.12"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"
+checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb"
 dependencies = [
  "indenter",
  "once_cell",
@@ -6293,7 +6258,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e24cb5a94bcae1e5408b0effca5cd7172ea3c5755049c5f3af4cd283a165298"
 dependencies = [
  "bit-set",
- "regex-automata 0.4.9",
+ "regex-automata 0.4.8",
  "regex-syntax 0.8.5",
 ]
 
@@ -6318,7 +6283,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "139834ddba373bbdd213dffe02c8d110508dcf1726c2be27e8d1f7d7e1856418"
 dependencies = [
- "arrayvec 0.7.6",
+ "arrayvec 0.7.4",
  "auto_impl",
  "bytes",
 ]
@@ -6329,7 +6294,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce8dba4714ef14b8274c371879b175aa55b16b30f269663f19d576f380018dc4"
 dependencies = [
- "arrayvec 0.7.6",
+ "arrayvec 0.7.4",
  "auto_impl",
  "bytes",
 ]
@@ -6341,7 +6306,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec6f82451ff7f0568c6181287189126d492b5654e30a788add08027b6363d019"
 dependencies = [
  "fatality-proc-macro",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -6351,11 +6316,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eb42427514b063d97ce21d5199f36c0c307d981434a6be32582bc79fe5bd2303"
 dependencies = [
  "expander",
- "indexmap 2.10.0",
- "proc-macro-crate 3.3.0",
+ "indexmap 2.9.0",
+ "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -6365,7 +6330,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e182f7dbc2ef73d9ef67351c5fbbea084729c48362d3ce9dd44c28e32e277fe5"
 dependencies = [
  "libc",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -6386,19 +6351,19 @@ dependencies = [
 
 [[package]]
 name = "ff"
-version = "0.13.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
 dependencies = [
  "rand_core 0.6.4",
- "subtle 2.6.1",
+ "subtle 2.5.0",
 ]
 
 [[package]]
 name = "fiat-crypto"
-version = "0.2.9"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
+checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7"
 
 [[package]]
 name = "file-guard"
@@ -6416,20 +6381,20 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84f2e425d9790201ba4af4630191feac6dcc98765b118d4d18e91d23c2353866"
 dependencies = [
- "env_logger 0.10.2",
+ "env_logger 0.10.1",
  "log",
 ]
 
 [[package]]
 name = "filetime"
-version = "0.2.25"
+version = "0.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
+checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0"
 dependencies = [
  "cfg-if",
  "libc",
- "libredox",
- "windows-sys 0.59.0",
+ "redox_syscall 0.3.5",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -6444,7 +6409,7 @@ dependencies = [
  "log",
  "num-traits",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "rand 0.8.5",
  "scale-info",
 ]
@@ -6460,7 +6425,7 @@ dependencies = [
  "futures",
  "log",
  "num-traits",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "relay-utils",
 ]
 
@@ -6504,17 +6469,11 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
-[[package]]
-name = "fixedbitset"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
-
 [[package]]
 name = "flate2"
-version = "1.1.2"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d"
+checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -6587,7 +6546,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8835f84f38484cc86f110a805655697908257fb9a7af005234060891557198e9"
 dependencies = [
  "nonempty",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -6602,15 +6561,15 @@ dependencies = [
 
 [[package]]
 name = "fragile"
-version = "2.0.1"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28dd6caf6059519a65843af8fe2a3ae298b14b80179855aeb4adc2c1934ee619"
+checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
 
 [[package]]
 name = "frame-benchmarking"
 version = "28.0.0"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "frame-support",
  "frame-support-procedural",
  "frame-system",
@@ -6640,7 +6599,7 @@ name = "frame-benchmarking-cli"
 version = "32.0.0"
 dependencies = [
  "Inflector",
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "chrono",
  "clap",
  "comfy-table",
@@ -6695,7 +6654,7 @@ dependencies = [
  "substrate-test-runtime",
  "subxt 0.41.0",
  "subxt-signer 0.41.0",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "thousands",
  "westend-runtime",
 ]
@@ -6733,21 +6692,7 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7cb8796f93fa038f979a014234d632e9688a120e745f936e2635123c77537f7"
 dependencies = [
- "frame-metadata 21.0.0",
- "parity-scale-codec",
- "scale-decode 0.16.0",
- "scale-info",
- "scale-type-resolver",
- "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "frame-decode"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e56c0e51972d7b26ff76966c4d0f2307030df9daa5ce0885149ece1ab7ca5ad"
-dependencies = [
- "frame-metadata 23.0.0",
+ "frame-metadata 20.0.0",
  "parity-scale-codec",
  "scale-decode 0.16.0",
  "scale-info",
@@ -6762,12 +6707,12 @@ dependencies = [
  "frame-election-provider-support",
  "frame-support",
  "parity-scale-codec",
- "proc-macro-crate 3.3.0",
+ "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "scale-info",
  "sp-arithmetic",
- "syn 2.0.104",
+ "syn 2.0.98",
  "trybuild",
 ]
 
@@ -6807,7 +6752,7 @@ name = "frame-executive"
 version = "28.0.0"
 dependencies = [
  "aquamarine",
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "frame-support",
  "frame-system",
  "frame-try-runtime",
@@ -6849,17 +6794,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "frame-metadata"
-version = "21.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20dfd1d7eae1d94e32e869e2fb272d81f52dd8db57820a373adb83ea24d7d862"
-dependencies = [
- "cfg-if",
- "parity-scale-codec",
- "scale-info",
-]
-
 [[package]]
 name = "frame-metadata"
 version = "23.0.0"
@@ -6876,7 +6810,7 @@ dependencies = [
 name = "frame-metadata-hash-extension"
 version = "0.1.0"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "const-hex",
  "docify",
  "frame-metadata 23.0.0",
@@ -6909,7 +6843,7 @@ dependencies = [
  "sp-runtime",
  "sp-statement-store",
  "tempfile",
- "tracing-subscriber 0.3.19",
+ "tracing-subscriber 0.3.18",
 ]
 
 [[package]]
@@ -6953,7 +6887,7 @@ version = "28.0.0"
 dependencies = [
  "Inflector",
  "aquamarine",
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "binary-merkle-tree",
  "bitflags 1.3.2",
  "docify",
@@ -7018,7 +6952,7 @@ dependencies = [
  "sp-io",
  "sp-metadata-ir",
  "sp-runtime",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -7026,10 +6960,10 @@ name = "frame-support-procedural-tools"
 version = "10.0.0"
 dependencies = [
  "frame-support-procedural-tools-derive",
- "proc-macro-crate 3.3.0",
+ "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -7038,7 +6972,7 @@ version = "11.0.0"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -7160,12 +7094,9 @@ dependencies = [
 
 [[package]]
 name = "fs-err"
-version = "2.11.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41"
-dependencies = [
- "autocfg",
-]
+checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541"
 
 [[package]]
 name = "fs2"
@@ -7183,7 +7114,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "29f9df8a11882c4e3335eb2d18a0137c505d9ca927470b0cac9c6f0ae07d28f7"
 dependencies = [
- "rustix 0.38.44",
+ "rustix 0.38.42",
  "windows-sys 0.48.0",
 ]
 
@@ -7260,7 +7191,7 @@ checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f"
 dependencies = [
  "futures-core",
  "lock_api",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
 ]
 
 [[package]]
@@ -7286,9 +7217,9 @@ dependencies = [
 
 [[package]]
 name = "futures-lite"
-version = "2.6.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532"
+checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
 dependencies = [
  "fastrand 2.3.0",
  "futures-core",
@@ -7305,7 +7236,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -7315,7 +7246,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8f2f12607f92c69b12ed746fabf9ca4f5c482cba46679c1a75b874ed7c26adb"
 dependencies = [
  "futures-io",
- "rustls 0.23.29",
+ "rustls 0.23.18",
  "rustls-pki-types",
 ]
 
@@ -7337,7 +7268,7 @@ version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
 dependencies = [
- "gloo-timers 0.2.6",
+ "gloo-timers",
  "send_wrapper",
 ]
 
@@ -7383,16 +7314,15 @@ dependencies = [
 
 [[package]]
 name = "generator"
-version = "0.8.5"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d18470a76cb7f8ff746cf1f7470914f900252ec36bbc40b569d74b1258446827"
+checksum = "cc6bd114ceda131d3b1d665eba35788690ad37f5916457286b32ab6fd3c438dd"
 dependencies = [
- "cc",
  "cfg-if",
  "libc",
  "log",
  "rustversion",
- "windows 0.61.3",
+ "windows 0.58.0",
 ]
 
 [[package]]
@@ -7427,29 +7357,25 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.16"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
+checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
 dependencies = [
  "cfg-if",
- "js-sys",
  "libc",
- "wasi 0.11.1+wasi-snapshot-preview1",
- "wasm-bindgen",
+ "wasi 0.11.0+wasi-snapshot-preview1",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.3.3"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
 dependencies = [
  "cfg-if",
- "js-sys",
  "libc",
- "r-efi",
- "wasi 0.14.2+wasi-0.2.4",
- "wasm-bindgen",
+ "wasi 0.13.3+wasi-0.2.2",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -7464,11 +7390,11 @@ dependencies = [
 
 [[package]]
 name = "ghash"
-version = "0.5.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1"
+checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40"
 dependencies = [
- "opaque-debug 0.3.1",
+ "opaque-debug 0.3.0",
  "polyval",
 ]
 
@@ -7483,6 +7409,12 @@ dependencies = [
  "stable_deref_trait",
 ]
 
+[[package]]
+name = "gimli"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
+
 [[package]]
 name = "gimli"
 version = "0.31.1"
@@ -7495,9 +7427,9 @@ dependencies = [
 
 [[package]]
 name = "git2"
-version = "0.20.2"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2deb07a133b1520dc1a5690e9bd08950108873d7ed5de38dcc74d3b5ebffa110"
+checksum = "3fda788993cc341f69012feba8bf45c0ba4f3291fcc08e214b4d5a7332d88aff"
 dependencies = [
  "bitflags 2.9.1",
  "libc",
@@ -7508,9 +7440,9 @@ dependencies = [
 
 [[package]]
 name = "glob"
-version = "0.3.2"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "glob-match"
@@ -7528,12 +7460,12 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "gloo-utils",
- "http 1.3.1",
+ "http 1.1.0",
  "js-sys",
  "pin-project",
  "serde",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
@@ -7551,18 +7483,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "gloo-timers"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
-dependencies = [
- "futures-channel",
- "futures-core",
- "js-sys",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "gloo-utils"
 version = "0.2.0"
@@ -7654,9 +7574,9 @@ dependencies = [
 
 [[package]]
 name = "governor"
-version = "0.6.3"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b"
+checksum = "821239e5672ff23e2a7060901fa622950bbd80b649cdaadd78d1c1767ed14eb4"
 dependencies = [
  "cfg-if",
  "dashmap",
@@ -7664,12 +7584,10 @@ dependencies = [
  "futures-timer",
  "no-std-compat",
  "nonzero_ext",
- "parking_lot 0.12.4",
- "portable-atomic",
+ "parking_lot 0.12.3",
  "quanta",
  "rand 0.8.5",
  "smallvec",
- "spinning_top",
 ]
 
 [[package]]
@@ -7680,22 +7598,22 @@ checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
 dependencies = [
  "ff",
  "rand_core 0.6.4",
- "subtle 2.6.1",
+ "subtle 2.5.0",
 ]
 
 [[package]]
 name = "h2"
-version = "0.3.27"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0beca50380b1fc32983fc1cb4587bfa4bb9e78fc259aad4a0032d2080309222d"
+checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
 dependencies = [
  "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
  "futures-util",
- "http 0.2.12",
- "indexmap 2.10.0",
+ "http 0.2.9",
+ "indexmap 2.9.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -7704,17 +7622,17 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.11"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17da50a276f1e01e0ba6c029e47b7100754904ee8a278f886546e98575380785"
+checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
 dependencies = [
  "atomic-waker",
  "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
- "http 1.3.1",
- "indexmap 2.10.0",
+ "http 1.1.0",
+ "indexmap 2.9.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -7723,26 +7641,22 @@ dependencies = [
 
 [[package]]
 name = "half"
-version = "2.6.0"
+version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9"
-dependencies = [
- "cfg-if",
- "crunchy",
-]
+checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
 
 [[package]]
 name = "handlebars"
-version = "5.1.2"
+version = "5.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d08485b96a0e6393e9e4d1b8d48cf74ad6c063cd905eb33f42c1ce3f0377539b"
+checksum = "ab283476b99e66691dee3f1640fea91487a8d81f50fb5ecc75538f8f8879a1e4"
 dependencies = [
  "log",
  "pest",
  "pest_derive",
  "serde",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -7788,9 +7702,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.15.4"
+version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
+checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3"
 dependencies = [
  "allocator-api2",
  "equivalent",
@@ -7809,11 +7723,11 @@ dependencies = [
 
 [[package]]
 name = "hashlink"
-version = "0.10.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
+checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af"
 dependencies = [
- "hashbrown 0.15.4",
+ "hashbrown 0.14.5",
 ]
 
 [[package]]
@@ -7834,12 +7748,6 @@ version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
-[[package]]
-name = "hermit-abi"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
-
 [[package]]
 name = "hex"
 version = "0.4.3"
@@ -7851,9 +7759,9 @@ dependencies = [
 
 [[package]]
 name = "hex-conservative"
-version = "0.1.2"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "212ab92002354b4819390025006c897e8140934349e8635c9b077f47b4dcbd20"
+checksum = "30ed443af458ccb6d81c1e7e661545f94d3176752fb1df2f543b902a1e0f51e2"
 
 [[package]]
 name = "hex-conservative"
@@ -7861,7 +7769,7 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5313b072ce3c597065a808dbf612c4c8e8590bdbf8b579508bf7a762c5eae6cd"
 dependencies = [
- "arrayvec 0.7.6",
+ "arrayvec 0.7.4",
 ]
 
 [[package]]
@@ -7872,9 +7780,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "hickory-proto"
-version = "0.24.4"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92652067c9ce6f66ce53cc38d1169daa36e6e7eb7dd3b63b5103bd9d97117248"
+checksum = "07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512"
 dependencies = [
  "async-trait",
  "cfg-if",
@@ -7883,12 +7791,12 @@ dependencies = [
  "futures-channel",
  "futures-io",
  "futures-util",
- "idna",
+ "idna 0.4.0",
  "ipnet",
  "once_cell",
  "rand 0.8.5",
- "socket2 0.5.10",
- "thiserror 1.0.69",
+ "socket2 0.5.9",
+ "thiserror 1.0.65",
  "tinyvec",
  "tokio",
  "tracing",
@@ -7908,11 +7816,11 @@ dependencies = [
  "futures-channel",
  "futures-io",
  "futures-util",
- "idna",
+ "idna 1.0.3",
  "ipnet",
  "once_cell",
- "rand 0.9.2",
- "ring 0.17.14",
+ "rand 0.9.0",
+ "ring 0.17.8",
  "thiserror 2.0.12",
  "tinyvec",
  "tokio",
@@ -7922,21 +7830,21 @@ dependencies = [
 
 [[package]]
 name = "hickory-resolver"
-version = "0.24.4"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbb117a1ca520e111743ab2f6688eddee69db4e0ea242545a604dce8a66fd22e"
+checksum = "0a2e2aba9c389ce5267d31cf1e4dace82390ae276b0b364ea55630b1fa1b44b4"
 dependencies = [
  "cfg-if",
  "futures-util",
- "hickory-proto 0.24.4",
+ "hickory-proto 0.24.1",
  "ipconfig",
  "lru-cache",
  "once_cell",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "rand 0.8.5",
  "resolv-conf",
  "smallvec",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tokio",
  "tracing",
 ]
@@ -7953,8 +7861,8 @@ dependencies = [
  "ipconfig",
  "moka",
  "once_cell",
- "parking_lot 0.12.4",
- "rand 0.9.2",
+ "parking_lot 0.12.3",
+ "rand 0.9.0",
  "resolv-conf",
  "smallvec",
  "thiserror 2.0.12",
@@ -8003,31 +7911,41 @@ dependencies = [
 
 [[package]]
 name = "home"
-version = "0.5.11"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "honggfuzz"
-version = "0.5.57"
+version = "0.5.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc563d4f41b17364d5c48ded509f2bcf1c3f6ae9c7f203055b4a5c325072d57e"
+checksum = "848e9c511092e0daa0a35a63e8e6e475a3e8f870741448b9f6028d69b142f18e"
 dependencies = [
  "arbitrary",
  "lazy_static",
- "memmap2 0.9.7",
- "rustc_version 0.4.1",
- "semver 1.0.26",
+ "memmap2 0.5.10",
+ "rustc_version 0.4.0",
+]
+
+[[package]]
+name = "hostname"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867"
+dependencies = [
+ "libc",
+ "match_cfg",
+ "winapi",
 ]
 
 [[package]]
 name = "http"
-version = "0.2.12"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
+checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
 dependencies = [
  "bytes",
  "fnv",
@@ -8036,9 +7954,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.3.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
+checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
 dependencies = [
  "bytes",
  "fnv",
@@ -8047,35 +7965,35 @@ dependencies = [
 
 [[package]]
 name = "http-body"
-version = "0.4.6"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
+checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
 dependencies = [
  "bytes",
- "http 0.2.12",
+ "http 0.2.9",
  "pin-project-lite",
 ]
 
 [[package]]
 name = "http-body"
-version = "1.0.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
 dependencies = [
  "bytes",
- "http 1.3.1",
+ "http 1.1.0",
 ]
 
 [[package]]
 name = "http-body-util"
-version = "0.1.3"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
 dependencies = [
  "bytes",
- "futures-core",
- "http 1.3.1",
- "http-body 1.0.1",
+ "futures-util",
+ "http 1.1.0",
+ "http-body 1.0.0",
  "pin-project-lite",
 ]
 
@@ -8087,9 +8005,9 @@ checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f"
 
 [[package]]
 name = "httparse"
-version = "1.10.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
+checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a"
 
 [[package]]
 name = "httpdate"
@@ -8099,9 +8017,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "humantime"
-version = "2.2.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "humantime-serde"
@@ -8115,22 +8033,22 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "0.14.32"
+version = "0.14.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7"
+checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2 0.3.27",
- "http 0.2.12",
- "http-body 0.4.6",
+ "h2 0.3.26",
+ "http 0.2.9",
+ "http-body 0.4.5",
  "httparse",
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.5.10",
+ "socket2 0.5.9",
  "tokio",
  "tower-service",
  "tracing",
@@ -8146,9 +8064,9 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "h2 0.4.11",
- "http 1.3.1",
- "http-body 1.0.1",
+ "h2 0.4.5",
+ "http 1.1.0",
+ "http-body 1.0.0",
  "httparse",
  "httpdate",
  "itoa",
@@ -8165,10 +8083,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
 dependencies = [
  "futures-util",
- "http 0.2.12",
- "hyper 0.14.32",
+ "http 0.2.9",
+ "hyper 0.14.29",
  "log",
- "rustls 0.21.12",
+ "rustls 0.21.7",
  "rustls-native-certs 0.6.3",
  "tokio",
  "tokio-rustls 0.24.1",
@@ -8176,21 +8094,22 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.7"
+version = "0.27.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
+checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
 dependencies = [
- "http 1.3.1",
+ "futures-util",
+ "http 1.1.0",
  "hyper 1.6.0",
  "hyper-util",
  "log",
- "rustls 0.23.29",
- "rustls-native-certs 0.8.1",
+ "rustls 0.23.18",
+ "rustls-native-certs 0.8.0",
  "rustls-pki-types",
  "tokio",
- "tokio-rustls 0.26.2",
+ "tokio-rustls 0.26.0",
  "tower-service",
- "webpki-roots 1.0.2",
+ "webpki-roots 0.26.3",
 ]
 
 [[package]]
@@ -8199,7 +8118,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
 dependencies = [
- "hyper 0.14.32",
+ "hyper 0.14.29",
  "pin-project-lite",
  "tokio",
  "tokio-io-timeout",
@@ -8223,43 +8142,35 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.15"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f66d5bd4c6f02bf0542fad85d626775bab9258cf795a4256dcaf3161114d1df"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
 dependencies = [
- "base64 0.22.1",
  "bytes",
  "futures-channel",
- "futures-core",
  "futures-util",
- "http 1.3.1",
- "http-body 1.0.1",
+ "http 1.1.0",
+ "http-body 1.0.0",
  "hyper 1.6.0",
- "ipnet",
- "libc",
- "percent-encoding",
  "pin-project-lite",
- "socket2 0.5.10",
- "system-configuration",
+ "socket2 0.5.9",
  "tokio",
  "tower-service",
  "tracing",
- "windows-registry",
 ]
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.63"
+version = "0.1.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
+checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "iana-time-zone-haiku",
  "js-sys",
- "log",
  "wasm-bindgen",
- "windows-core 0.61.2",
+ "windows 0.48.0",
 ]
 
 [[package]]
@@ -8273,22 +8184,21 @@ dependencies = [
 
 [[package]]
 name = "icu_collections"
-version = "2.0.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
 dependencies = [
  "displaydoc",
- "potential_utf",
  "yoke",
  "zerofrom",
  "zerovec",
 ]
 
 [[package]]
-name = "icu_locale_core"
-version = "2.0.0"
+name = "icu_locid"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
 dependencies = [
  "displaydoc",
  "litemap",
@@ -8297,11 +8207,31 @@ dependencies = [
  "zerovec",
 ]
 
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
 [[package]]
 name = "icu_normalizer"
-version = "2.0.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
 dependencies = [
  "displaydoc",
  "icu_collections",
@@ -8309,60 +8239,83 @@ dependencies = [
  "icu_properties",
  "icu_provider",
  "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_normalizer_data"
-version = "2.0.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
 
 [[package]]
 name = "icu_properties"
-version = "2.0.1"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
 dependencies = [
  "displaydoc",
  "icu_collections",
- "icu_locale_core",
+ "icu_locid_transform",
  "icu_properties_data",
  "icu_provider",
- "potential_utf",
- "zerotrie",
+ "tinystr",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_properties_data"
-version = "2.0.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
 
 [[package]]
 name = "icu_provider"
-version = "2.0.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
 dependencies = [
  "displaydoc",
- "icu_locale_core",
+ "icu_locid",
+ "icu_provider_macros",
  "stable_deref_trait",
  "tinystr",
  "writeable",
  "yoke",
  "zerofrom",
- "zerotrie",
  "zerovec",
 ]
 
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "ident_case"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
+[[package]]
+name = "idna"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
 [[package]]
 name = "idna"
 version = "1.0.3"
@@ -8376,9 +8329,9 @@ dependencies = [
 
 [[package]]
 name = "idna_adapter"
-version = "1.2.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
 dependencies = [
  "icu_normalizer",
  "icu_properties",
@@ -8396,25 +8349,21 @@ dependencies = [
 
 [[package]]
 name = "if-watch"
-version = "3.2.1"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdf9d64cfcf380606e64f9a0bcf493616b65331199f984151a6fa11a7b3cde38"
+checksum = "d6b0422c86d7ce0e97169cc42e04ae643caf278874a7a3c87b8150a220dc7e1e"
 dependencies = [
- "async-io 2.5.0",
- "core-foundation 0.9.4",
+ "async-io 2.3.3",
+ "core-foundation",
  "fnv",
  "futures",
  "if-addrs",
  "ipnet",
  "log",
- "netlink-packet-core",
- "netlink-packet-route",
- "netlink-proto",
- "netlink-sys",
  "rtnetlink",
- "system-configuration",
+ "system-configuration 0.5.1",
  "tokio",
- "windows 0.53.0",
+ "windows 0.51.1",
 ]
 
 [[package]]
@@ -8427,8 +8376,8 @@ dependencies = [
  "attohttpc",
  "bytes",
  "futures",
- "http 0.2.12",
- "hyper 0.14.32",
+ "http 0.2.9",
+ "hyper 0.14.29",
  "log",
  "rand 0.8.5",
  "tokio",
@@ -8491,23 +8440,23 @@ checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "include_dir"
-version = "0.7.4"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd"
+checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e"
 dependencies = [
  "include_dir_macros",
 ]
 
 [[package]]
 name = "include_dir_macros"
-version = "0.7.4"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75"
+checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
@@ -8532,12 +8481,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.10.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
+checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.4",
+ "hashbrown 0.15.3",
  "serde",
 ]
 
@@ -8549,22 +8498,22 @@ checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590"
 
 [[package]]
 name = "indicatif"
-version = "0.17.11"
+version = "0.17.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235"
+checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25"
 dependencies = [
  "console",
+ "instant",
  "number_prefix",
  "portable-atomic",
- "unicode-width",
- "web-time",
+ "unicode-width 0.1.10",
 ]
 
 [[package]]
 name = "inout"
-version = "0.1.4"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
+checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
 dependencies = [
  "generic-array 0.14.7",
 ]
@@ -8593,22 +8542,11 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
 dependencies = [
- "hermit-abi 0.3.9",
+ "hermit-abi",
  "libc",
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "io-uring"
-version = "0.7.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4"
-dependencies = [
- "bitflags 2.9.1",
- "cfg-if",
- "libc",
-]
-
 [[package]]
 name = "ip_network"
 version = "0.4.1"
@@ -8621,7 +8559,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
 dependencies = [
- "socket2 0.5.10",
+ "socket2 0.5.9",
  "widestring",
  "windows-sys 0.48.0",
  "winreg",
@@ -8629,46 +8567,30 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.11.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
+checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
 
 [[package]]
-name = "iri-string"
-version = "0.7.8"
+name = "is-terminal"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2"
+checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
- "memchr",
- "serde",
+ "hermit-abi",
+ "rustix 0.38.42",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
-name = "is-terminal"
-version = "0.4.16"
+name = "is_executable"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
-dependencies = [
- "hermit-abi 0.5.2",
- "libc",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "is_executable"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4a1b5bad6f9072935961dfbf1cced2f3d129963d091b6f69f007fe04e758ae2"
+checksum = "fa9acdc6d67b75e626ad644734e8bc6df893d9cd2a834129065d3dd6158ea9c8"
 dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "is_terminal_polyfill"
-version = "1.70.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
-
 [[package]]
 name = "isahc"
 version = "1.7.2"
@@ -8683,7 +8605,7 @@ dependencies = [
  "encoding_rs",
  "event-listener 2.5.3",
  "futures-lite 1.13.0",
- "http 0.2.12",
+ "http 0.2.9",
  "log",
  "mime",
  "once_cell",
@@ -8732,20 +8654,11 @@ dependencies = [
  "either",
 ]
 
-[[package]]
-name = "itertools"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itoa"
-version = "1.0.15"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 
 [[package]]
 name = "jam-codec"
@@ -8753,7 +8666,7 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d72f2fb8cfd27f6c52ea7d0528df594f7f2ed006feac153e9393ec567aafea98"
 dependencies = [
- "arrayvec 0.7.6",
+ "arrayvec 0.7.4",
  "bitvec",
  "byte-slice-cast",
  "const_format",
@@ -8769,50 +8682,24 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09985146f40378e13af626964ac9c206d9d9b67c40c70805898d9954f709bcf5"
 dependencies = [
- "proc-macro-crate 3.3.0",
- "proc-macro2 1.0.95",
- "quote 1.0.40",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "jiff"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49"
-dependencies = [
- "jiff-static",
- "log",
- "portable-atomic",
- "portable-atomic-util",
- "serde",
-]
-
-[[package]]
-name = "jiff-static"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4"
-dependencies = [
+ "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "jni"
-version = "0.21.1"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
+checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec"
 dependencies = [
  "cesu8",
- "cfg-if",
  "combine",
  "jni-sys",
  "log",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "walkdir",
- "windows-sys 0.45.0",
 ]
 
 [[package]]
@@ -8823,21 +8710,19 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
 [[package]]
 name = "jobserver"
-version = "0.1.33"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a"
+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
 dependencies = [
- "getrandom 0.3.3",
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.77"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
 dependencies = [
- "once_cell",
  "wasm-bindgen",
 ]
 
@@ -8849,7 +8734,7 @@ checksum = "ec9ad60d674508f3ca8f380a928cfe7b096bc729c4e2dbfe3852bc45da3ab30b"
 dependencies = [
  "serde",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -8862,7 +8747,7 @@ dependencies = [
  "pest_derive",
  "regex",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -8878,9 +8763,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee"
-version = "0.24.9"
+version = "0.24.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37b26c20e2178756451cfeb0661fb74c47dd5988cb7e3939de7e9241fd604d42"
+checksum = "834af00800e962dee8f7bfc0f60601de215e73e78e5497d733a2919da837d3c8"
 dependencies = [
  "jsonrpsee-client-transport",
  "jsonrpsee-core",
@@ -8896,24 +8781,24 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-client-transport"
-version = "0.24.9"
+version = "0.24.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bacb85abf4117092455e1573625e21b8f8ef4dec8aff13361140b2dc266cdff2"
+checksum = "548125b159ba1314104f5bb5f38519e03a41862786aa3925cf349aae9cdd546e"
 dependencies = [
  "base64 0.22.1",
  "futures-channel",
  "futures-util",
  "gloo-net",
- "http 1.3.1",
+ "http 1.1.0",
  "jsonrpsee-core",
  "pin-project",
- "rustls 0.23.29",
+ "rustls 0.23.18",
  "rustls-pki-types",
  "rustls-platform-verifier",
- "soketto 0.8.1",
- "thiserror 1.0.69",
+ "soketto 0.8.0",
+ "thiserror 1.0.65",
  "tokio",
- "tokio-rustls 0.26.2",
+ "tokio-rustls 0.26.0",
  "tokio-util",
  "tracing",
  "url",
@@ -8921,25 +8806,25 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-core"
-version = "0.24.9"
+version = "0.24.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456196007ca3a14db478346f58c7238028d55ee15c1df15115596e411ff27925"
+checksum = "f2882f6f8acb9fdaec7cefc4fd607119a9bd709831df7d7672a1d3b644628280"
 dependencies = [
  "async-trait",
  "bytes",
  "futures-timer",
  "futures-util",
- "http 1.3.1",
- "http-body 1.0.1",
+ "http 1.1.0",
+ "http-body 1.0.0",
  "http-body-util",
  "jsonrpsee-types",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "pin-project",
  "rand 0.8.5",
  "rustc-hash 2.1.1",
  "serde",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tokio",
  "tokio-stream",
  "tracing",
@@ -8948,51 +8833,51 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-http-client"
-version = "0.24.9"
+version = "0.24.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c872b6c9961a4ccc543e321bb5b89f6b2d2c7fe8b61906918273a3333c95400c"
+checksum = "b3638bc4617f96675973253b3a45006933bde93c2fd8a6170b33c777cc389e5b"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
- "http-body 1.0.1",
+ "http-body 1.0.0",
  "hyper 1.6.0",
- "hyper-rustls 0.27.7",
+ "hyper-rustls 0.27.3",
  "hyper-util",
  "jsonrpsee-core",
  "jsonrpsee-types",
- "rustls 0.23.29",
+ "rustls 0.23.18",
  "rustls-platform-verifier",
  "serde",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tokio",
- "tower 0.4.13",
+ "tower",
  "tracing",
  "url",
 ]
 
 [[package]]
 name = "jsonrpsee-proc-macros"
-version = "0.24.9"
+version = "0.24.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e65763c942dfc9358146571911b0cd1c361c2d63e2d2305622d40d36376ca80"
+checksum = "c06c01ae0007548e73412c08e2285ffe5d723195bf268bce67b1b77c3bb2a14d"
 dependencies = [
  "heck 0.5.0",
- "proc-macro-crate 3.3.0",
+ "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "jsonrpsee-server"
-version = "0.24.9"
+version = "0.24.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55e363146da18e50ad2b51a0a7925fc423137a0b1371af8235b1c231a0647328"
+checksum = "82ad8ddc14be1d4290cd68046e7d1d37acd408efed6d3ca08aefcc3ad6da069c"
 dependencies = [
  "futures-util",
- "http 1.3.1",
- "http-body 1.0.1",
+ "http 1.1.0",
+ "http-body 1.0.0",
  "http-body-util",
  "hyper 1.6.0",
  "hyper-util",
@@ -9002,32 +8887,32 @@ dependencies = [
  "route-recognizer",
  "serde",
  "serde_json",
- "soketto 0.8.1",
- "thiserror 1.0.69",
+ "soketto 0.8.0",
+ "thiserror 1.0.65",
  "tokio",
  "tokio-stream",
  "tokio-util",
- "tower 0.4.13",
+ "tower",
  "tracing",
 ]
 
 [[package]]
 name = "jsonrpsee-types"
-version = "0.24.9"
+version = "0.24.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08a8e70baf945b6b5752fc8eb38c918a48f1234daf11355e07106d963f860089"
+checksum = "a178c60086f24cc35bb82f57c651d0d25d99c4742b4d335de04e97fa1f08a8a1"
 dependencies = [
- "http 1.3.1",
+ "http 1.1.0",
  "serde",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
 name = "jsonrpsee-wasm-client"
-version = "0.24.9"
+version = "0.24.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6558a9586cad43019dafd0b6311d0938f46efc116b34b28c74778bc11a2edf6"
+checksum = "1a01cd500915d24ab28ca17527e23901ef1be6d659a2322451e1045532516c25"
 dependencies = [
  "jsonrpsee-client-transport",
  "jsonrpsee-core",
@@ -9036,11 +8921,11 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-ws-client"
-version = "0.24.9"
+version = "0.24.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01b3323d890aa384f12148e8d2a1fd18eb66e9e7e825f9de4fa53bcc19b93eef"
+checksum = "0fe322e0896d0955a3ebdd5bf813571c53fea29edd713bc315b76620b327e86d"
 dependencies = [
- "http 1.3.1",
+ "http 1.1.0",
  "jsonrpsee-client-transport",
  "jsonrpsee-core",
  "jsonrpsee-types",
@@ -9077,9 +8962,9 @@ dependencies = [
 
 [[package]]
 name = "keccak"
-version = "0.1.5"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654"
+checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940"
 dependencies = [
  "cpufeatures",
 ]
@@ -9125,7 +9010,7 @@ checksum = "c33070833c9ee02266356de0c43f723152bd38bd96ddf52c82b3af10c9138b28"
 name = "kitchensink-runtime"
 version = "3.0.0-dev"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "log",
  "node-primitives",
  "pallet-example-mbm",
@@ -9164,9 +9049,9 @@ dependencies = [
  "either",
  "futures",
  "home",
- "http 0.2.12",
- "http-body 0.4.6",
- "hyper 0.14.32",
+ "http 0.2.9",
+ "http-body 0.4.5",
+ "hyper 0.14.29",
  "hyper-rustls 0.24.2",
  "hyper-timeout",
  "jsonpath-rust",
@@ -9175,17 +9060,17 @@ dependencies = [
  "pem",
  "pin-project",
  "rand 0.8.5",
- "rustls 0.21.12",
- "rustls-pemfile",
+ "rustls 0.21.7",
+ "rustls-pemfile 1.0.3",
  "secrecy 0.8.0",
  "serde",
  "serde_json",
  "serde_yaml",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tokio",
  "tokio-tungstenite 0.20.1",
  "tokio-util",
- "tower 0.4.13",
+ "tower",
  "tower-http 0.4.4",
  "tracing",
 ]
@@ -9198,13 +9083,13 @@ checksum = "b5bba93d054786eba7994d03ce522f368ef7d48c88a1826faa28478d85fb63ae"
 dependencies = [
  "chrono",
  "form_urlencoded",
- "http 0.2.12",
+ "http 0.2.9",
  "json-patch",
  "k8s-openapi",
  "once_cell",
  "serde",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -9222,12 +9107,12 @@ dependencies = [
  "json-patch",
  "k8s-openapi",
  "kube-client",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "pin-project",
  "serde",
  "serde_json",
  "smallvec",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tokio",
  "tokio-util",
  "tracing",
@@ -9258,7 +9143,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf7a85fe66f9ff9cd74e169fdd2c94c6e1e74c412c99a73b4df3200b5d3760b2"
 dependencies = [
  "kvdb",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
 ]
 
 [[package]]
@@ -9269,7 +9154,7 @@ checksum = "b644c70b92285f66bfc2032922a79000ea30af7bc2ab31902992a5dcb9b434f6"
 dependencies = [
  "kvdb",
  "num_cpus",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "regex",
  "rocksdb",
  "smallvec",
@@ -9286,13 +9171,13 @@ dependencies = [
 
 [[package]]
 name = "landlock"
-version = "0.3.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9baa9eeb6e315942429397e617a190f4fdc696ef1ee0342939d641029cbb4ea7"
+checksum = "1530c5b973eeed4ac216af7e24baf5737645a6272e361f1fb95710678b67d9cc"
 dependencies = [
  "enumflags2",
  "libc",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -9311,16 +9196,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
-name = "leb128fmt"
-version = "0.1.0"
+name = "leb128"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
+checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
 
 [[package]]
 name = "libc"
-version = "0.2.174"
+version = "0.2.172"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
+checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
 
 [[package]]
 name = "libflate"
@@ -9344,19 +9229,20 @@ dependencies = [
 
 [[package]]
 name = "libfuzzer-sys"
-version = "0.4.10"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5037190e1f70cbeef565bd267599242926f724d3b8a9f510fd7e0b540cfa4404"
+checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7"
 dependencies = [
  "arbitrary",
  "cc",
+ "once_cell",
 ]
 
 [[package]]
 name = "libgit2-sys"
-version = "0.18.2+1.9.1"
+version = "0.18.0+1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c42fe03df2bd3c53a3a9c7317ad91d80c81cd1fb0caec8d7cc4cd2bfa10c222"
+checksum = "e1a117465e7e1597e8febea8bb0c410f1c7fb93b1e1cddf34363f8390367ffec"
 dependencies = [
  "cc",
  "libc",
@@ -9366,25 +9252,25 @@ dependencies = [
 
 [[package]]
 name = "libloading"
-version = "0.8.8"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
+checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
 dependencies = [
  "cfg-if",
- "windows-targets 0.53.2",
+ "winapi",
 ]
 
 [[package]]
 name = "libm"
-version = "0.2.15"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
+checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
 
 [[package]]
 name = "libnghttp2-sys"
-version = "0.1.11+1.64.0"
+version = "0.1.9+1.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b6c24e48a7167cffa7119da39d577fa482e66c688a4aac016bee862e1a713c4"
+checksum = "b57e858af2798e167e709b9d969325b6d8e9d50232fcbc494d7d54f976854a64"
 dependencies = [
  "cc",
  "libc",
@@ -9400,7 +9286,7 @@ dependencies = [
  "either",
  "futures",
  "futures-timer",
- "getrandom 0.2.16",
+ "getrandom 0.2.10",
  "libp2p-allow-block-list",
  "libp2p-connection-limits",
  "libp2p-core",
@@ -9419,10 +9305,10 @@ dependencies = [
  "libp2p-upnp",
  "libp2p-websocket",
  "libp2p-yamux",
- "multiaddr 0.18.2",
+ "multiaddr 0.18.1",
  "pin-project",
  "rw-stream-sink",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -9460,17 +9346,17 @@ dependencies = [
  "futures",
  "futures-timer",
  "libp2p-identity",
- "multiaddr 0.18.2",
- "multihash 0.19.3",
+ "multiaddr 0.18.1",
+ "multihash 0.19.1",
  "multistream-select",
  "once_cell",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "pin-project",
  "quick-protobuf",
  "rand 0.8.5",
  "rw-stream-sink",
  "smallvec",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tracing",
  "unsigned-varint 0.8.0",
  "void",
@@ -9485,10 +9371,10 @@ checksum = "97f37f30d5c7275db282ecd86e54f29dd2176bd3ac656f06abf43bedb21eb8bd"
 dependencies = [
  "async-trait",
  "futures",
- "hickory-resolver 0.24.4",
+ "hickory-resolver 0.24.2",
  "libp2p-core",
  "libp2p-identity",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "smallvec",
  "tracing",
 ]
@@ -9507,29 +9393,29 @@ dependencies = [
  "libp2p-core",
  "libp2p-identity",
  "libp2p-swarm",
- "lru 0.12.5",
+ "lru 0.12.3",
  "quick-protobuf",
  "quick-protobuf-codec",
  "smallvec",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tracing",
  "void",
 ]
 
 [[package]]
 name = "libp2p-identity"
-version = "0.2.12"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3104e13b51e4711ff5738caa1fb54467c8604c2e94d607e27745bcf709068774"
+checksum = "55cca1eb2bc1fd29f099f3daaab7effd01e1a54b7c577d0ed082521034d912e8"
 dependencies = [
  "bs58",
  "ed25519-dalek",
  "hkdf",
- "multihash 0.19.3",
+ "multihash 0.19.1",
  "quick-protobuf",
  "rand 0.8.5",
  "sha2 0.10.9",
- "thiserror 2.0.12",
+ "thiserror 1.0.65",
  "tracing",
  "zeroize",
 ]
@@ -9540,7 +9426,7 @@ version = "0.46.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ced237d0bd84bbebb7c2cad4c073160dacb4fe40534963c32ed6d4c6bb7702a3"
 dependencies = [
- "arrayvec 0.7.6",
+ "arrayvec 0.7.4",
  "asynchronous-codec 0.7.0",
  "bytes",
  "either",
@@ -9556,7 +9442,7 @@ dependencies = [
  "rand 0.8.5",
  "sha2 0.10.9",
  "smallvec",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tracing",
  "uint 0.9.5",
  "void",
@@ -9571,14 +9457,14 @@ checksum = "14b8546b6644032565eb29046b42744aee1e9f261ed99671b2c93fb140dba417"
 dependencies = [
  "data-encoding",
  "futures",
- "hickory-proto 0.24.4",
+ "hickory-proto 0.24.1",
  "if-watch",
  "libp2p-core",
  "libp2p-identity",
  "libp2p-swarm",
  "rand 0.8.5",
  "smallvec",
- "socket2 0.5.10",
+ "socket2 0.5.9",
  "tokio",
  "tracing",
  "void",
@@ -9614,15 +9500,15 @@ dependencies = [
  "futures",
  "libp2p-core",
  "libp2p-identity",
- "multiaddr 0.18.2",
- "multihash 0.19.3",
+ "multiaddr 0.18.1",
+ "multihash 0.19.1",
  "once_cell",
  "quick-protobuf",
  "rand 0.8.5",
  "sha2 0.10.9",
  "snow",
  "static_assertions",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tracing",
  "x25519-dalek",
  "zeroize",
@@ -9659,13 +9545,13 @@ dependencies = [
  "libp2p-core",
  "libp2p-identity",
  "libp2p-tls",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "quinn",
  "rand 0.8.5",
- "ring 0.17.14",
- "rustls 0.23.29",
- "socket2 0.5.10",
- "thiserror 1.0.69",
+ "ring 0.17.8",
+ "rustls 0.23.18",
+ "socket2 0.5.9",
+ "thiserror 1.0.65",
  "tokio",
  "tracing",
 ]
@@ -9703,7 +9589,7 @@ dependencies = [
  "libp2p-core",
  "libp2p-identity",
  "libp2p-swarm-derive",
- "lru 0.12.5",
+ "lru 0.12.3",
  "multistream-select",
  "once_cell",
  "rand 0.8.5",
@@ -9723,7 +9609,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -9738,7 +9624,7 @@ dependencies = [
  "libc",
  "libp2p-core",
  "libp2p-identity",
- "socket2 0.5.10",
+ "socket2 0.5.9",
  "tokio",
  "tracing",
 ]
@@ -9754,10 +9640,10 @@ dependencies = [
  "libp2p-core",
  "libp2p-identity",
  "rcgen",
- "ring 0.17.14",
- "rustls 0.23.29",
- "rustls-webpki 0.101.7",
- "thiserror 1.0.69",
+ "ring 0.17.8",
+ "rustls 0.23.18",
+ "rustls-webpki 0.101.4",
+ "thiserror 1.0.65",
  "x509-parser 0.16.0",
  "yasna",
 ]
@@ -9789,14 +9675,14 @@ dependencies = [
  "futures-rustls",
  "libp2p-core",
  "libp2p-identity",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "pin-project-lite",
  "rw-stream-sink",
- "soketto 0.8.1",
- "thiserror 1.0.69",
+ "soketto 0.8.0",
+ "thiserror 1.0.65",
  "tracing",
  "url",
- "webpki-roots 0.25.4",
+ "webpki-roots 0.25.2",
 ]
 
 [[package]]
@@ -9808,23 +9694,12 @@ dependencies = [
  "either",
  "futures",
  "libp2p-core",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tracing",
  "yamux 0.12.1",
  "yamux 0.13.5",
 ]
 
-[[package]]
-name = "libredox"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4488594b9328dee448adb906d8b126d9b7deb7cf5c22161ee591610bb1be83c0"
-dependencies = [
- "bitflags 2.9.1",
- "libc",
- "redox_syscall 0.5.15",
-]
-
 [[package]]
 name = "librocksdb-sys"
 version = "0.11.0+8.1.1"
@@ -9842,12 +9717,12 @@ dependencies = [
 
 [[package]]
 name = "libsecp256k1"
-version = "0.7.2"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e79019718125edc905a079a70cfa5f3820bc76139fc91d6f9abc27ea2a887139"
+checksum = "95b09eff1b35ed3b33b877ced3a691fc7a481919c7e29c53c906226fcf55e2a1"
 dependencies = [
  "arrayref",
- "base64 0.22.1",
+ "base64 0.13.1",
  "digest 0.9.0",
  "hmac-drbg",
  "libsecp256k1-core",
@@ -9867,7 +9742,7 @@ checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451"
 dependencies = [
  "crunchy",
  "digest 0.9.0",
- "subtle 2.6.1",
+ "subtle 2.5.0",
 ]
 
 [[package]]
@@ -9901,9 +9776,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.22"
+version = "1.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b70e7a7df205e92a1a4cd9aaae7898dac0aa555503cc0a649494d0d60e7651d"
+checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b"
 dependencies = [
  "cc",
  "libc",
@@ -9913,9 +9788,9 @@ dependencies = [
 
 [[package]]
 name = "link-cplusplus"
-version = "1.0.10"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a6f6da007f968f9def0d65a05b187e2960183de70c160204ecfccf0ee330212"
+checksum = "9d240c6f7e1ba3a28b0249f774e6a9dd0175054b52dfbb61b16eb8505c3785c9"
 dependencies = [
  "cc",
 ]
@@ -9928,18 +9803,18 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
 [[package]]
 name = "linked_hash_set"
-version = "0.1.5"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bae85b5be22d9843c80e5fc80e9b64c8a3b1f98f867c709956eca3efff4e92e2"
+checksum = "47186c6da4d81ca383c7c47c1bfc80f4b95f4720514d860a5407aaf4233f9588"
 dependencies = [
  "linked-hash-map",
 ]
 
 [[package]]
 name = "linregress"
-version = "0.5.4"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9eda9dcf4f2a99787827661f312ac3219292549c2ee992bf9a6248ffb066bf7"
+checksum = "4de0b5f52a9f84544d268f5fabb71b38962d6aa3c6600b8bcd27d44ccf9c9c45"
 dependencies = [
  "nalgebra",
 ]
@@ -9958,15 +9833,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.9.4"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
 [[package]]
 name = "lioness"
@@ -10000,9 +9869,9 @@ dependencies = [
 
 [[package]]
 name = "litemap"
-version = "0.8.0"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
 
 [[package]]
 name = "litep2p"
@@ -10018,13 +9887,13 @@ dependencies = [
  "futures",
  "futures-timer",
  "hickory-resolver 0.25.2",
- "indexmap 2.10.0",
+ "indexmap 2.9.0",
  "libc",
  "mockall",
  "multiaddr 0.17.1",
  "multihash 0.17.0",
  "network-interface",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "pin-project",
  "prost 0.13.5",
  "prost-build",
@@ -10034,7 +9903,7 @@ dependencies = [
  "simple-dns",
  "smallvec",
  "snow",
- "socket2 0.5.10",
+ "socket2 0.5.9",
  "thiserror 2.0.12",
  "tokio",
  "tokio-stream",
@@ -10053,9 +9922,9 @@ dependencies = [
 
 [[package]]
 name = "lock_api"
-version = "0.4.13"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
+checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -10063,9 +9932,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.27"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 dependencies = [
  "serde",
  "value-bag",
@@ -10081,22 +9950,22 @@ dependencies = [
  "generator",
  "scoped-tls",
  "tracing",
- "tracing-subscriber 0.3.19",
+ "tracing-subscriber 0.3.18",
 ]
 
 [[package]]
 name = "lru"
-version = "0.11.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21"
+checksum = "eedb2bdbad7e0634f83989bf596f497b070130daaa398ab22d84c39e266deec5"
 
 [[package]]
 name = "lru"
-version = "0.12.5"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
+checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc"
 dependencies = [
- "hashbrown 0.15.4",
+ "hashbrown 0.14.5",
 ]
 
 [[package]]
@@ -10108,26 +9977,21 @@ dependencies = [
  "linked-hash-map",
 ]
 
-[[package]]
-name = "lru-slab"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
-
 [[package]]
 name = "lz4"
-version = "1.28.1"
+version = "1.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a20b523e860d03443e98350ceaac5e71c6ba89aea7d960769ec3ce37f4de5af4"
+checksum = "7e9e2dd86df36ce760a60f6ff6ad526f7ba1f14ba0356f8254fb6905e6494df1"
 dependencies = [
+ "libc",
  "lz4-sys",
 ]
 
 [[package]]
 name = "lz4-sys"
-version = "1.11.1+lz4-1.10.0"
+version = "1.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6"
+checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900"
 dependencies = [
  "cc",
  "libc",
@@ -10142,6 +10006,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "mach2"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "macro-string"
 version = "0.1.4"
@@ -10150,7 +10023,7 @@ checksum = "1b27834086c65ec3f9387b096d66e99f221cf081c2b738042aa252bcd41204e3"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -10162,7 +10035,7 @@ dependencies = [
  "macro_magic_core",
  "macro_magic_macros",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -10176,7 +10049,7 @@ dependencies = [
  "macro_magic_core_macros",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -10187,7 +10060,7 @@ checksum = "b02abfe41815b5bd98dbd4260173db2c116dda171dc0fe7838cb206333b83308"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -10198,7 +10071,7 @@ checksum = "73ea28ee64b88876bf45277ed9a5817c1817df061a74f2b988971a12570e5869"
 dependencies = [
  "macro_magic_core",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -10207,6 +10080,12 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
 
+[[package]]
+name = "match_cfg"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
+
 [[package]]
 name = "matchers"
 version = "0.1.0"
@@ -10218,9 +10097,9 @@ dependencies = [
 
 [[package]]
 name = "matrixmultiply"
-version = "0.3.10"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06de3016e9fae57a36fd14dba131fccf49f74b40b7fbdb472f96e361ec71a08"
+checksum = "090126dc04f95dc0d1c1c91f61bdd474b3930ca064c1edc8a849da2c6cbe1e77"
 dependencies = [
  "autocfg",
  "rawpointer",
@@ -10238,17 +10117,17 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.5"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memfd"
-version = "0.6.4"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64"
+checksum = "ffc89ccdc6e10d6907450f753537ebc5c5d3460d2e4e62ea74bd571db62c0f9e"
 dependencies = [
- "rustix 0.38.44",
+ "rustix 0.37.23",
 ]
 
 [[package]]
@@ -10262,9 +10141,9 @@ dependencies = [
 
 [[package]]
 name = "memmap2"
-version = "0.9.7"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "483758ad303d734cec05e5c12b41d7e93e6a6390c5e9dae6bdeb7c1259012d28"
+checksum = "45fd3a57831bf88bc63f8cebc0cf956116276e97fef3966103e96416209f7c92"
 dependencies = [
  "libc",
 ]
@@ -10278,6 +10157,15 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "memoffset"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "memory-db"
 version = "0.34.0"
@@ -10286,7 +10174,7 @@ checksum = "7e300c54e3239a86f9c61cc63ab0f03862eb40b1c6e065dc6fd6ceaeff6da93d"
 dependencies = [
  "foldhash",
  "hash-db",
- "hashbrown 0.15.4",
+ "hashbrown 0.15.3",
 ]
 
 [[package]]
@@ -10295,7 +10183,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b3e3e3f549d27d2dc054372f320ddf68045a833fab490563ff70d4cf1b9d91ea"
 dependencies = [
- "array-bytes 9.3.0",
+ "array-bytes 9.1.2",
  "blake3",
  "frame-metadata 23.0.0",
  "parity-scale-codec",
@@ -10327,7 +10215,7 @@ dependencies = [
  "hex",
  "log",
  "num-traits",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "relay-utils",
  "sp-arithmetic",
  "sp-core 28.0.0",
@@ -10371,22 +10259,23 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.9"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
 dependencies = [
- "adler2",
+ "adler",
 ]
 
 [[package]]
 name = "mio"
-version = "1.0.4"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
+checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
 dependencies = [
+ "hermit-abi",
  "libc",
- "wasi 0.11.1+wasi-snapshot-preview1",
- "windows-sys 0.59.0",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -10396,7 +10285,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "daa3eb39495d8e2e2947a1d862852c90cc6a4a8845f8b41c8829cb9fcc047f4a"
 dependencies = [
  "arrayref",
- "arrayvec 0.7.6",
+ "arrayvec 0.7.4",
  "bitflags 1.3.2",
  "blake2 0.10.6",
  "c2-chacha",
@@ -10405,12 +10294,12 @@ dependencies = [
  "hashlink 0.8.4",
  "lioness",
  "log",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "rand_distr",
- "subtle 2.6.1",
- "thiserror 1.0.69",
+ "subtle 2.5.0",
+ "thiserror 1.0.65",
  "zeroize",
 ]
 
@@ -10421,7 +10310,7 @@ dependencies = [
  "futures",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "sc-block-builder",
  "sc-client-api",
  "sc-offchain",
@@ -10475,7 +10364,7 @@ dependencies = [
  "cfg-if",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -10488,12 +10377,12 @@ dependencies = [
  "crossbeam-epoch",
  "crossbeam-utils",
  "loom",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "portable-atomic",
- "rustc_version 0.4.1",
+ "rustc_version 0.4.0",
  "smallvec",
  "tagptr",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "uuid",
 ]
 
@@ -10524,20 +10413,20 @@ dependencies = [
 
 [[package]]
 name = "multiaddr"
-version = "0.18.2"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe6351f60b488e04c1d21bc69e56b89cb3f5e8f5d22557d6e8031bdfd79b6961"
+checksum = "8b852bc02a2da5feed68cd14fa50d0774b92790a5bdbfa932a813926c8472070"
 dependencies = [
  "arrayref",
  "byteorder",
  "data-encoding",
  "libp2p-identity",
  "multibase",
- "multihash 0.19.3",
+ "multihash 0.19.1",
  "percent-encoding",
  "serde",
  "static_assertions",
- "unsigned-varint 0.8.0",
+ "unsigned-varint 0.7.2",
  "url",
 ]
 
@@ -10571,21 +10460,21 @@ dependencies = [
 
 [[package]]
 name = "multihash"
-version = "0.19.3"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b430e7953c29dd6a09afc29ff0bb69c6e306329ee6794700aee27b76a1aea8d"
+checksum = "076d548d76a0e2a0d4ab471d0b1c36c577786dfc4471242035d97a12a735c492"
 dependencies = [
  "core2",
- "unsigned-varint 0.8.0",
+ "unsigned-varint 0.7.2",
 ]
 
 [[package]]
 name = "multihash-derive"
-version = "0.8.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d6d4752e6230d8ef7adf7bd5d8c4b1f6561c1014c5ba9a37445ccefe18aa1db"
+checksum = "fc076939022111618a5026d3be019fd8b366e76314538ff9a1b59ffbcbf98bcd"
 dependencies = [
- "proc-macro-crate 1.1.3",
+ "proc-macro-crate 1.3.1",
  "proc-macro-error",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
@@ -10595,9 +10484,9 @@ dependencies = [
 
 [[package]]
 name = "multimap"
-version = "0.10.1"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084"
+checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
 
 [[package]]
 name = "multistream-select"
@@ -10615,12 +10504,13 @@ dependencies = [
 
 [[package]]
 name = "nalgebra"
-version = "0.33.2"
+version = "0.32.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26aecdf64b707efd1310e3544d709c5c0ac61c13756046aaaba41be5c4f66a3b"
+checksum = "307ed9b18cc2423f29e83f84fd23a8e73628727990181f18641a8b5dc2ab1caa"
 dependencies = [
  "approx",
  "matrixmultiply",
+ "nalgebra-macros",
  "num-complex",
  "num-rational",
  "num-traits",
@@ -10628,6 +10518,17 @@ dependencies = [
  "typenum",
 ]
 
+[[package]]
+name = "nalgebra-macros"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998"
+dependencies = [
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "names"
 version = "0.14.0"
@@ -10645,9 +10546,9 @@ checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
 
 [[package]]
 name = "native-tls"
-version = "0.2.14"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
+checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
 dependencies = [
  "libc",
  "log",
@@ -10655,27 +10556,28 @@ dependencies = [
  "openssl-probe",
  "openssl-sys",
  "schannel",
- "security-framework 2.11.1",
+ "security-framework",
  "security-framework-sys",
  "tempfile",
 ]
 
 [[package]]
 name = "netlink-packet-core"
-version = "0.7.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72724faf704479d67b388da142b186f916188505e7e0b26719019c525882eda4"
+checksum = "345b8ab5bd4e71a2986663e88c56856699d060e78e152e6e9d7966fcd5491297"
 dependencies = [
  "anyhow",
  "byteorder",
+ "libc",
  "netlink-packet-utils",
 ]
 
 [[package]]
 name = "netlink-packet-route"
-version = "0.17.1"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "053998cea5a306971f88580d0829e90f270f940befd7cf928da179d4187a5a66"
+checksum = "d9ea4302b9759a7a88242299225ea3688e63c85ea136371bb6cf94fd674efaab"
 dependencies = [
  "anyhow",
  "bitflags 1.3.2",
@@ -10694,28 +10596,29 @@ dependencies = [
  "anyhow",
  "byteorder",
  "paste",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
 name = "netlink-proto"
-version = "0.11.5"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72452e012c2f8d612410d89eea01e2d9b56205274abb35d53f60200b2ec41d60"
+checksum = "65b4b14489ab424703c092062176d52ba55485a89c076b4f9db05092b7223aa6"
 dependencies = [
  "bytes",
  "futures",
  "log",
  "netlink-packet-core",
  "netlink-sys",
- "thiserror 2.0.12",
+ "thiserror 1.0.65",
+ "tokio",
 ]
 
 [[package]]
 name = "netlink-sys"
-version = "0.8.7"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16c903aa70590cb93691bf97a767c8d1d6122d2cc9070433deb3bbf36ce8bd23"
+checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411"
 dependencies = [
  "bytes",
  "futures",
@@ -10726,21 +10629,21 @@ dependencies = [
 
 [[package]]
 name = "network-interface"
-version = "2.0.2"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "862f41f1276e7148fb597fc55ed8666423bebe045199a1298c3515a73ec5cdd9"
+checksum = "c3329f515506e4a2de3aa6e07027a6758e22e0f0e8eaf64fa47261cec2282602"
 dependencies = [
  "cc",
  "libc",
- "thiserror 2.0.12",
+ "thiserror 1.0.65",
  "winapi",
 ]
 
 [[package]]
 name = "nix"
-version = "0.26.4"
+version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
+checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
 dependencies = [
  "bitflags 1.3.2",
  "cfg-if",
@@ -10770,18 +10673,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "nix"
-version = "0.30.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
-dependencies = [
- "bitflags 2.9.1",
- "cfg-if",
- "cfg_aliases 0.2.1",
- "libc",
-]
-
 [[package]]
 name = "no-std-compat"
 version = "0.4.1"
@@ -10798,10 +10689,10 @@ checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65"
 name = "node-bench"
 version = "0.9.0-dev"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "async-trait",
  "clap",
- "derive_more 0.99.20",
+ "derive_more 0.99.17",
  "fs_extra",
  "futures",
  "hash-db",
@@ -10953,15 +10844,6 @@ dependencies = [
  "minimal-lexical",
 ]
 
-[[package]]
-name = "nom"
-version = "8.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "nonempty"
 version = "0.7.0"
@@ -10995,9 +10877,9 @@ dependencies = [
 
 [[package]]
 name = "num"
-version = "0.4.3"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
+checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af"
 dependencies = [
  "num-bigint",
  "num-complex",
@@ -11009,10 +10891,11 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.6"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
 dependencies = [
+ "autocfg",
  "num-integer",
  "num-traits",
 ]
@@ -11036,9 +10919,9 @@ dependencies = [
 
 [[package]]
 name = "num-complex"
-version = "0.4.6"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
+checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214"
 dependencies = [
  "num-traits",
 ]
@@ -11057,7 +10940,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -11066,7 +10949,7 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3"
 dependencies = [
- "arrayvec 0.7.6",
+ "arrayvec 0.7.4",
  "itoa",
 ]
 
@@ -11081,9 +10964,9 @@ dependencies = [
 
 [[package]]
 name = "num-iter"
-version = "0.1.45"
+version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
+checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
 dependencies = [
  "autocfg",
  "num-integer",
@@ -11092,10 +10975,11 @@ dependencies = [
 
 [[package]]
 name = "num-rational"
-version = "0.4.2"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
+checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
 dependencies = [
+ "autocfg",
  "num-bigint",
  "num-integer",
  "num-traits",
@@ -11113,11 +10997,11 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.17.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.5.2",
+ "hermit-abi",
  "libc",
 ]
 
@@ -11137,10 +11021,10 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d"
 dependencies = [
- "proc-macro-crate 3.3.0",
+ "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -11172,20 +11056,29 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.7"
+version = "0.32.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "object"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
+checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "oid-registry"
-version = "0.7.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8d8034d9489cdaf79228eb9f6a3b8d7bb32ba00d6645ebd48eef4077ceb5bd9"
+checksum = "1c958dd45046245b9c3c2547369bb634eb461670b2e7e0de552905801a648d1d"
 dependencies = [
- "asn1-rs 0.6.2",
+ "asn1-rs 0.6.1",
 ]
 
 [[package]]
@@ -11194,7 +11087,7 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "12f40cff3dde1b6087cc5d5f5d4d65712f34016a03ed60e9c08dcc392736b5b7"
 dependencies = [
- "asn1-rs 0.7.1",
+ "asn1-rs 0.7.0",
 ]
 
 [[package]]
@@ -11207,17 +11100,11 @@ dependencies = [
  "portable-atomic",
 ]
 
-[[package]]
-name = "once_cell_polyfill"
-version = "1.70.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
-
 [[package]]
 name = "oorandom"
-version = "11.1.5"
+version = "11.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
+checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
 
 [[package]]
 name = "opaque-debug"
@@ -11227,15 +11114,15 @@ checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
 
 [[package]]
 name = "opaque-debug"
-version = "0.3.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
+checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "openssl"
-version = "0.10.73"
+version = "0.10.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
+checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da"
 dependencies = [
  "bitflags 2.9.1",
  "cfg-if",
@@ -11254,20 +11141,20 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.6"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.109"
+version = "0.9.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
+checksum = "8288979acd84749c744a9014b4382d42b8f7b2592847b5afb2ed29e5d16ede07"
 dependencies = [
  "cc",
  "libc",
@@ -11294,7 +11181,7 @@ dependencies = [
  "orchestra-proc-macro",
  "pin-project",
  "prioritized-metered-channel",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tracing",
 ]
 
@@ -11305,10 +11192,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43dfaf083aef571385fccfdc3a2f8ede8d0a1863160455d4f2b014d8f7d04a3f"
 dependencies = [
  "expander",
- "indexmap 2.10.0",
+ "indexmap 2.9.0",
  "itertools 0.11.0",
- "petgraph 0.6.5",
- "proc-macro-crate 3.3.0",
+ "petgraph",
+ "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "syn 1.0.109",
@@ -11325,9 +11212,9 @@ dependencies = [
 
 [[package]]
 name = "os_pipe"
-version = "1.2.2"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db335f4760b14ead6290116f2427bf33a14d4f0617d49f78a246de10c1831224"
+checksum = "5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982"
 dependencies = [
  "libc",
  "windows-sys 0.59.0",
@@ -11341,9 +11228,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
 [[package]]
 name = "owo-colors"
-version = "4.2.2"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48dd4f4a2c8405440fd0462561f0e5806bd0f77e86f51c761481bdd4018b545e"
+checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
 
 [[package]]
 name = "p256"
@@ -11407,7 +11294,7 @@ dependencies = [
 name = "pallet-alliance"
 version = "27.0.0"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -11762,7 +11649,7 @@ dependencies = [
 name = "pallet-beefy-mmr"
 version = "28.0.0"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "binary-merkle-tree",
  "frame-benchmarking",
  "frame-support",
@@ -12015,7 +11902,7 @@ dependencies = [
 name = "pallet-contracts"
 version = "27.0.0"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "assert_matches",
  "environmental",
  "frame-benchmarking",
@@ -12061,8 +11948,8 @@ dependencies = [
  "parity-wasm",
  "sp-runtime",
  "tempfile",
- "toml 0.8.23",
- "twox-hash 1.6.3",
+ "toml 0.8.19",
+ "twox-hash",
 ]
 
 [[package]]
@@ -12102,7 +11989,7 @@ version = "18.0.0"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -12254,7 +12141,7 @@ dependencies = [
  "pallet-staking",
  "pallet-timestamp",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "scale-info",
  "sp-core 28.0.0",
  "sp-io",
@@ -12275,7 +12162,7 @@ dependencies = [
  "log",
  "pallet-balances",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "rand 0.8.5",
  "scale-info",
  "sp-arithmetic",
@@ -12300,7 +12187,7 @@ dependencies = [
  "log",
  "pallet-balances",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "rand 0.8.5",
  "scale-info",
  "sp-arithmetic",
@@ -13160,9 +13047,9 @@ name = "pallet-revive"
 version = "0.1.0"
 dependencies = [
  "alloy-core",
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "assert_matches",
- "derive_more 0.99.20",
+ "derive_more 0.99.17",
  "environmental",
  "ethereum-standards",
  "ethereum-types",
@@ -13218,7 +13105,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "clap",
- "env_logger 0.11.8",
+ "env_logger 0.11.3",
  "futures",
  "git2",
  "hex",
@@ -13246,7 +13133,7 @@ dependencies = [
  "substrate-prometheus-endpoint",
  "subxt 0.41.0",
  "subxt-signer 0.41.0",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tokio",
 ]
 
@@ -13263,7 +13150,7 @@ dependencies = [
  "serde_json",
  "sp-core 28.0.0",
  "sp-io",
- "toml 0.8.23",
+ "toml 0.8.19",
 ]
 
 [[package]]
@@ -13272,7 +13159,7 @@ version = "0.1.0"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -13346,7 +13233,7 @@ dependencies = [
 name = "pallet-sassafras"
 version = "0.3.5-dev"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -13806,11 +13693,11 @@ dependencies = [
 name = "pallet-staking-reward-curve"
 version = "11.0.0"
 dependencies = [
- "proc-macro-crate 3.3.0",
+ "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "sp-runtime",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -13981,7 +13868,7 @@ dependencies = [
 name = "pallet-transaction-storage"
 version = "27.0.0"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -14332,9 +14219,9 @@ checksum = "16b56e3a2420138bdb970f84dfb9c774aea80fa0e7371549eedec0d80c209c67"
 
 [[package]]
 name = "parity-db"
-version = "0.4.13"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "592a28a24b09c9dc20ac8afaa6839abc417c720afe42c12e1e4a9d6aa2508d2e"
+checksum = "59e9ab494af9e6e813c72170f0d3c1de1500990d62c97cc05cc7576f91aa402f"
 dependencies = [
  "blake2 0.10.6",
  "crc32fast",
@@ -14344,11 +14231,10 @@ dependencies = [
  "log",
  "lz4",
  "memmap2 0.5.10",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "rand 0.8.5",
  "siphasher 0.3.11",
  "snap",
- "winapi",
 ]
 
 [[package]]
@@ -14357,7 +14243,7 @@ version = "3.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "799781ae679d79a948e13d4824a40970bfa500058d245760dd857301059810fa"
 dependencies = [
- "arrayvec 0.7.6",
+ "arrayvec 0.7.4",
  "bitvec",
  "byte-slice-cast",
  "bytes",
@@ -14374,10 +14260,10 @@ version = "3.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34b4653168b563151153c9e4c08ebed57fb8262bebfa79711552fa983c623e7a"
 dependencies = [
- "proc-macro-crate 3.3.0",
+ "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -14405,12 +14291,12 @@ dependencies = [
 
 [[package]]
 name = "parking_lot"
-version = "0.12.4"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
 dependencies = [
  "lock_api",
- "parking_lot_core 0.9.11",
+ "parking_lot_core 0.9.8",
 ]
 
 [[package]]
@@ -14429,15 +14315,15 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.11"
+version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
+checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.5.15",
+ "redox_syscall 0.3.5",
  "smallvec",
- "windows-targets 0.52.6",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -14454,7 +14340,7 @@ checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166"
 dependencies = [
  "base64ct",
  "rand_core 0.6.4",
- "subtle 2.6.1",
+ "subtle 2.5.0",
 ]
 
 [[package]]
@@ -14482,9 +14368,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
 
 [[package]]
 name = "pem"
-version = "3.0.5"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38af38e8470ac9dee3ce1bae1af9c1671fffc44ddfd8bd1d0a3445bf349a8ef3"
+checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae"
 dependencies = [
  "base64 0.22.1",
  "serde",
@@ -14789,20 +14675,19 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pest"
-version = "2.8.1"
+version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1db05f56d34358a8b1066f67cbb203ee3e7ed2ba674a6263a1d5ec6db2204323"
+checksum = "1acb4a4365a13f749a93f1a094a7805e5cfa0955373a9de860d962eaa3a5fe5a"
 dependencies = [
- "memchr",
- "thiserror 2.0.12",
+ "thiserror 1.0.65",
  "ucd-trie",
 ]
 
 [[package]]
 name = "pest_derive"
-version = "2.8.1"
+version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb056d9e8ea77922845ec74a1c4e8fb17e7c218cc4fc11a15c5d25e189aa40bc"
+checksum = "666d00490d4ac815001da55838c500eafb0320019bbaa44444137c48b443a853"
 dependencies = [
  "pest",
  "pest_generator",
@@ -14810,45 +14695,36 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.8.1"
+version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87e404e638f781eb3202dc82db6760c8ae8a1eeef7fb3fa8264b2ef280504966"
+checksum = "68ca01446f50dbda87c1786af8770d535423fa8a53aec03b8f4e3d7eb10e0929"
 dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.8.1"
+version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edd1101f170f5903fde0914f899bb503d9ff5271d7ba76bbb70bea63690cc0d5"
+checksum = "56af0a30af74d0445c0bf6d9d051c979b516a1a5af790d251daee76005420a48"
 dependencies = [
+ "once_cell",
  "pest",
  "sha2 0.10.9",
 ]
 
 [[package]]
 name = "petgraph"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
-dependencies = [
- "fixedbitset 0.4.2",
- "indexmap 2.10.0",
-]
-
-[[package]]
-name = "petgraph"
-version = "0.7.1"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772"
+checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
 dependencies = [
- "fixedbitset 0.5.7",
- "indexmap 2.10.0",
+ "fixedbitset",
+ "indexmap 2.9.0",
 ]
 
 [[package]]
@@ -14881,7 +14757,7 @@ dependencies = [
  "phf_shared",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -14910,14 +14786,14 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.16"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
 
 [[package]]
 name = "pin-utils"
@@ -14925,17 +14801,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
-[[package]]
-name = "piper"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
-dependencies = [
- "atomic-waker",
- "fastrand 2.3.0",
- "futures-io",
-]
-
 [[package]]
 name = "pkcs1"
 version = "0.7.5"
@@ -14959,15 +14824,15 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.32"
+version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
 
 [[package]]
 name = "plotters"
-version = "0.3.7"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
+checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45"
 dependencies = [
  "num-traits",
  "plotters-backend",
@@ -14978,15 +14843,15 @@ dependencies = [
 
 [[package]]
 name = "plotters-backend"
-version = "0.3.7"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
+checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609"
 
 [[package]]
 name = "plotters-svg"
-version = "0.3.7"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670"
+checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab"
 dependencies = [
  "plotters-backend",
 ]
@@ -15032,7 +14897,7 @@ dependencies = [
  "rand_chacha 0.3.1",
  "rand_core 0.6.4",
  "sc-keystore",
- "schnorrkel 0.11.5",
+ "schnorrkel 0.11.4",
  "sp-application-crypto",
  "sp-authority-discovery",
  "sp-core 28.0.0",
@@ -15091,7 +14956,7 @@ dependencies = [
  "sp-keyring",
  "sp-keystore",
  "sp-tracing 16.0.0",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tracing-gum",
 ]
 
@@ -15121,7 +14986,7 @@ dependencies = [
  "sp-core 28.0.0",
  "sp-keyring",
  "sp-tracing 16.0.0",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tokio",
  "tracing-gum",
 ]
@@ -15158,7 +15023,7 @@ dependencies = [
  "sp-keyring",
  "sp-runtime",
  "substrate-build-script-utils",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -15188,7 +15053,7 @@ dependencies = [
  "sp-keystore",
  "sp-runtime",
  "sp-tracing 16.0.0",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tokio",
  "tokio-util",
  "tracing-gum",
@@ -15214,7 +15079,7 @@ dependencies = [
  "fatality",
  "futures",
  "futures-timer",
- "indexmap 2.10.0",
+ "indexmap 2.9.0",
  "parity-scale-codec",
  "polkadot-node-network-protocol",
  "polkadot-node-primitives",
@@ -15229,7 +15094,7 @@ dependencies = [
  "sp-keyring",
  "sp-keystore",
  "sp-tracing 16.0.0",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tracing-gum",
 ]
 
@@ -15245,7 +15110,7 @@ dependencies = [
  "reed-solomon-novelpoly",
  "sp-core 28.0.0",
  "sp-trie",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -15256,7 +15121,7 @@ dependencies = [
  "async-trait",
  "futures",
  "futures-timer",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "polkadot-node-network-protocol",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-test-helpers",
@@ -15289,7 +15154,7 @@ dependencies = [
  "futures",
  "futures-timer",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "polkadot-node-metrics",
  "polkadot-node-network-protocol",
  "polkadot-node-subsystem",
@@ -15302,7 +15167,7 @@ dependencies = [
  "sp-consensus",
  "sp-core 28.0.0",
  "sp-keyring",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tracing-gum",
 ]
 
@@ -15324,7 +15189,7 @@ dependencies = [
  "schnellru",
  "sp-core 28.0.0",
  "sp-keyring",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tracing-gum",
 ]
 
@@ -15335,14 +15200,14 @@ dependencies = [
  "assert_matches",
  "async-trait",
  "bitvec",
- "derive_more 0.99.20",
+ "derive_more 0.99.17",
  "futures",
  "futures-timer",
  "itertools 0.11.0",
  "kvdb-memorydb",
  "merlin",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-test-helpers",
@@ -15356,7 +15221,7 @@ dependencies = [
  "rand_core 0.6.4",
  "sc-keystore",
  "schnellru",
- "schnorrkel 0.11.5",
+ "schnorrkel 0.11.4",
  "sp-application-crypto",
  "sp-consensus",
  "sp-consensus-babe",
@@ -15366,7 +15231,7 @@ dependencies = [
  "sp-keystore",
  "sp-runtime",
  "sp-tracing 16.0.0",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tracing-gum",
 ]
 
@@ -15392,7 +15257,7 @@ dependencies = [
  "rand 0.8.5",
  "rand_core 0.6.4",
  "sc-keystore",
- "schnorrkel 0.11.5",
+ "schnorrkel 0.11.4",
  "sp-consensus",
  "sp-consensus-babe",
  "sp-core 28.0.0",
@@ -15411,7 +15276,7 @@ dependencies = [
  "futures-timer",
  "kvdb-memorydb",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "polkadot-erasure-coding",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
@@ -15423,7 +15288,7 @@ dependencies = [
  "sp-core 28.0.0",
  "sp-keyring",
  "sp-tracing 16.0.0",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tracing-gum",
 ]
 
@@ -15451,7 +15316,7 @@ dependencies = [
  "sp-keyring",
  "sp-keystore",
  "sp-tracing 16.0.0",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tracing-gum",
 ]
 
@@ -15466,7 +15331,7 @@ dependencies = [
  "polkadot-primitives",
  "polkadot-primitives-test-helpers",
  "sp-keystore",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tracing-gum",
  "wasm-timer",
 ]
@@ -15528,14 +15393,14 @@ dependencies = [
  "futures-timer",
  "kvdb-memorydb",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-test-helpers",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
  "sp-core 28.0.0",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tracing-gum",
 ]
 
@@ -15563,7 +15428,7 @@ dependencies = [
  "sp-keyring",
  "sp-keystore",
  "sp-tracing 16.0.0",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tracing-gum",
 ]
 
@@ -15579,7 +15444,7 @@ dependencies = [
  "polkadot-primitives",
  "sp-blockchain",
  "sp-inherents",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tracing-gum",
 ]
 
@@ -15599,7 +15464,7 @@ dependencies = [
  "rstest",
  "sp-core 28.0.0",
  "sp-tracing 16.0.0",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tracing-gum",
 ]
 
@@ -15619,7 +15484,7 @@ dependencies = [
  "polkadot-primitives-test-helpers",
  "sp-application-crypto",
  "sp-keystore",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tracing-gum",
 ]
 
@@ -15628,7 +15493,7 @@ name = "polkadot-node-core-pvf"
 version = "7.0.0"
 dependencies = [
  "always-assert",
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "assert_matches",
  "criterion",
  "futures",
@@ -15660,7 +15525,7 @@ dependencies = [
  "tempfile",
  "test-parachain-adder",
  "test-parachain-halt",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tokio",
  "tracing-gum",
 ]
@@ -15709,7 +15574,7 @@ dependencies = [
  "sp-io",
  "sp-tracing 16.0.0",
  "tempfile",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tracing-gum",
 ]
 
@@ -15800,7 +15665,7 @@ dependencies = [
  "async-channel 1.9.0",
  "async-trait",
  "bitvec",
- "derive_more 0.99.20",
+ "derive_more 0.99.17",
  "fatality",
  "futures",
  "hex",
@@ -15814,7 +15679,7 @@ dependencies = [
  "sc-network-types",
  "sp-runtime",
  "strum 0.26.3",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tracing-gum",
 ]
 
@@ -15830,14 +15695,14 @@ dependencies = [
  "polkadot-parachain-primitives",
  "polkadot-primitives",
  "sc-keystore",
- "schnorrkel 0.11.5",
+ "schnorrkel 0.11.4",
  "serde",
  "sp-application-crypto",
  "sp-consensus-babe",
  "sp-consensus-slots",
  "sp-keystore",
  "sp-maybe-compressed-blob",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "zstd 0.12.4",
 ]
 
@@ -15855,7 +15720,7 @@ version = "1.0.0"
 dependencies = [
  "async-trait",
  "futures",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "polkadot-erasure-coding",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
@@ -15875,7 +15740,7 @@ name = "polkadot-node-subsystem-types"
 version = "7.0.0"
 dependencies = [
  "async-trait",
- "derive_more 0.99.20",
+ "derive_more 0.99.17",
  "fatality",
  "futures",
  "orchestra",
@@ -15894,7 +15759,7 @@ dependencies = [
  "sp-consensus-babe",
  "sp-runtime",
  "substrate-prometheus-endpoint",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -15909,7 +15774,7 @@ dependencies = [
  "kvdb-shared-tests",
  "parity-db",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "polkadot-erasure-coding",
  "polkadot-node-metrics",
  "polkadot-node-network-protocol",
@@ -15927,7 +15792,7 @@ dependencies = [
  "sp-core 28.0.0",
  "sp-keystore",
  "tempfile",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tracing-gum",
 ]
 
@@ -16097,7 +15962,7 @@ name = "polkadot-parachain-primitives"
 version = "6.0.0"
 dependencies = [
  "bounded-collections 0.3.2",
- "derive_more 0.99.20",
+ "derive_more 0.99.17",
  "parity-scale-codec",
  "polkadot-core-primitives",
  "scale-info",
@@ -16132,7 +15997,7 @@ dependencies = [
  "sp-runtime",
  "sp-staking",
  "sp-std 14.0.0",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -16871,7 +16736,7 @@ dependencies = [
  "pallet-transaction-payment-rpc-runtime-api",
  "parity-db",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "polkadot-approval-distribution",
  "polkadot-availability-bitfield-distribution",
  "polkadot-availability-distribution",
@@ -16959,7 +16824,7 @@ dependencies = [
  "staging-xcm",
  "substrate-prometheus-endpoint",
  "tempfile",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tracing-gum",
  "westend-runtime",
  "westend-runtime-constants",
@@ -16995,7 +16860,7 @@ dependencies = [
  "sp-keyring",
  "sp-keystore",
  "sp-tracing 16.0.0",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tracing-gum",
 ]
 
@@ -17240,7 +17105,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "cumulus-zombienet-sdk-helpers",
- "env_logger 0.11.8",
+ "env_logger 0.11.3",
  "log",
  "parity-scale-codec",
  "polkadot-primitives",
@@ -17281,9 +17146,9 @@ dependencies = [
 
 [[package]]
 name = "polkavm-common"
-version = "0.18.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31ff33982a807d8567645d4784b9b5d7ab87bcb494f534a57cadd9012688e102"
+checksum = "1d9428a5cfcc85c5d7b9fc4b6a18c4b802d0173d768182a51cc7751640f08b92"
 
 [[package]]
 name = "polkavm-common"
@@ -17298,11 +17163,11 @@ dependencies = [
 
 [[package]]
 name = "polkavm-derive"
-version = "0.18.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2eb703f3b6404c13228402e98a5eae063fd16b8f58afe334073ec105ee4117e"
+checksum = "ae8c4bea6f3e11cd89bb18bcdddac10bd9a24015399bd1c485ad68a985a19606"
 dependencies = [
- "polkavm-derive-impl-macro 0.18.0",
+ "polkavm-derive-impl-macro 0.9.0",
 ]
 
 [[package]]
@@ -17316,14 +17181,14 @@ dependencies = [
 
 [[package]]
 name = "polkavm-derive-impl"
-version = "0.18.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f2116a92e6e96220a398930f4c8a6cda1264206f3e2034fc9982bfd93f261f7"
+checksum = "5c4fdfc49717fb9a196e74a5d28e0bc764eb394a2c803eb11133a31ac996c60c"
 dependencies = [
- "polkavm-common 0.18.0",
+ "polkavm-common 0.9.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -17335,17 +17200,17 @@ dependencies = [
  "polkavm-common 0.26.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "polkavm-derive-impl-macro"
-version = "0.18.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48c16669ddc7433e34c1007d31080b80901e3e8e523cb9d4b441c3910cf9294b"
+checksum = "8ba81f7b5faac81e528eb6158a6f3c9e0bb1008e0ffa19653bc8dea925ecb429"
 dependencies = [
- "polkavm-derive-impl 0.18.1",
- "syn 2.0.104",
+ "polkavm-derive-impl 0.9.0",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -17355,7 +17220,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "581d34cafec741dc5ffafbb341933c205b6457f3d76257a9d99fb56687219c91"
 dependencies = [
  "polkavm-derive-impl 0.26.0",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -17368,7 +17233,7 @@ dependencies = [
  "gimli 0.31.1",
  "hashbrown 0.14.5",
  "log",
- "object 0.36.7",
+ "object 0.36.1",
  "polkavm-common 0.26.0",
  "regalloc2 0.9.3",
  "rustc-demangle",
@@ -17398,16 +17263,16 @@ dependencies = [
 
 [[package]]
 name = "polling"
-version = "3.9.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ee9b2fa7a4517d2c91ff5bc6c297a427a96749d15f98fcdbb22c05571a4d4b7"
+checksum = "30054e72317ab98eddd8561db0f6524df3367636884b7b21b703e4b280a84a14"
 dependencies = [
  "cfg-if",
  "concurrent-queue",
- "hermit-abi 0.5.2",
  "pin-project-lite",
- "rustix 1.0.8",
- "windows-sys 0.60.2",
+ "rustix 0.38.42",
+ "tracing",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -17417,55 +17282,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf"
 dependencies = [
  "cpufeatures",
- "opaque-debug 0.3.1",
+ "opaque-debug 0.3.0",
  "universal-hash",
 ]
 
 [[package]]
 name = "polyval"
-version = "0.6.2"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25"
+checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb"
 dependencies = [
  "cfg-if",
  "cpufeatures",
- "opaque-debug 0.3.1",
+ "opaque-debug 0.3.0",
  "universal-hash",
 ]
 
 [[package]]
 name = "portable-atomic"
-version = "1.11.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
+checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
 
 [[package]]
-name = "portable-atomic-util"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
-dependencies = [
- "portable-atomic",
-]
-
-[[package]]
-name = "portpicker"
-version = "0.1.1"
+name = "portpicker"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be97d76faf1bfab666e1375477b23fde79eccf0276e9b63b92a39d676a889ba9"
 dependencies = [
  "rand 0.8.5",
 ]
 
-[[package]]
-name = "potential_utf"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585"
-dependencies = [
- "zerovec",
-]
-
 [[package]]
 name = "powerfmt"
 version = "0.2.0"
@@ -17485,7 +17332,7 @@ dependencies = [
  "log",
  "nix 0.27.1",
  "once_cell",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "smallvec",
  "symbolic-demangle",
  "tempfile",
@@ -17494,35 +17341,33 @@ dependencies = [
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.21"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
-dependencies = [
- "zerocopy",
-]
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "predicates"
-version = "3.1.3"
+version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5d19ee57562043d37e82899fade9a22ebab7be9cef5026b07fda9cdd4293573"
+checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9"
 dependencies = [
  "anstyle",
  "difflib",
+ "itertools 0.10.5",
  "predicates-core",
 ]
 
 [[package]]
 name = "predicates-core"
-version = "1.0.9"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "727e462b119fe9c93fd0eb1429a5f7647394014cf3c04ab2c0350eeb09095ffa"
+checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174"
 
 [[package]]
 name = "predicates-tree"
-version = "1.0.12"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72dd2d6d381dfb73a193c7fca536518d7caee39fc8503f74e7dc0be0531b425c"
+checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf"
 dependencies = [
  "predicates-core",
  "termtree",
@@ -17530,9 +17375,9 @@ dependencies = [
 
 [[package]]
 name = "pretty_assertions"
-version = "1.4.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
+checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66"
 dependencies = [
  "diff",
  "yansi",
@@ -17540,12 +17385,12 @@ dependencies = [
 
 [[package]]
 name = "prettyplease"
-version = "0.2.35"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "061c1221631e079b26479d25bbf2275bfe5917ae8419cd7e34f13bfc2aa7539a"
+checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62"
 dependencies = [
  "proc-macro2 1.0.95",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -17591,31 +17436,31 @@ checksum = "a172e6cc603231f2cf004232eabcecccc0da53ba576ab286ef7baa0cfc7927ad"
 dependencies = [
  "coarsetime",
  "crossbeam-queue",
- "derive_more 0.99.20",
+ "derive_more 0.99.17",
  "futures",
  "futures-timer",
  "nanorand",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tracing",
 ]
 
 [[package]]
 name = "proc-macro-crate"
-version = "1.1.3"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
 dependencies = [
- "thiserror 1.0.69",
- "toml 0.5.11",
+ "once_cell",
+ "toml_edit 0.19.15",
 ]
 
 [[package]]
 name = "proc-macro-crate"
-version = "3.3.0"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
 dependencies = [
- "toml_edit 0.22.27",
+ "toml_edit 0.21.0",
 ]
 
 [[package]]
@@ -17661,18 +17506,24 @@ dependencies = [
  "proc-macro-error-attr2",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
+[[package]]
+name = "proc-macro-hack"
+version = "0.5.20+deprecated"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
+
 [[package]]
 name = "proc-macro-warning"
-version = "1.84.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75eea531cfcd120e0851a3f8aed42c4841f78c889eefafd96339c72677ae42c3"
+checksum = "9b698b0b09d40e9b7c1a47b132d66a8b54bcd20583d9b6d06e4535e383b4405c"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -17705,7 +17556,7 @@ dependencies = [
  "hex",
  "lazy_static",
  "procfs-core",
- "rustix 0.38.44",
+ "rustix 0.38.42",
 ]
 
 [[package]]
@@ -17721,16 +17572,16 @@ dependencies = [
 
 [[package]]
 name = "prometheus"
-version = "0.13.4"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1"
+checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c"
 dependencies = [
  "cfg-if",
  "fnv",
  "lazy_static",
  "memchr",
- "parking_lot 0.12.4",
- "thiserror 1.0.69",
+ "parking_lot 0.12.3",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -17741,7 +17592,7 @@ checksum = "504ee9ff529add891127c4827eb481bd69dc0ebc72e9a682e187db4caa60c3ca"
 dependencies = [
  "dtoa",
  "itoa",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "prometheus-client-derive-encode",
 ]
 
@@ -17753,34 +17604,34 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "prometheus-parse"
-version = "0.2.5"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "811031bea65e5a401fb2e1f37d802cca6601e204ac463809a3189352d13b78a5"
+checksum = "0c2aa5feb83bf4b2c8919eaf563f51dbab41183de73ba2353c0e03cd7b6bd892"
 dependencies = [
  "chrono",
- "itertools 0.12.1",
+ "itertools 0.10.5",
  "once_cell",
  "regex",
 ]
 
 [[package]]
 name = "proptest"
-version = "1.7.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fcdab19deb5195a31cf7726a210015ff1496ba1464fd42cb4f537b8b01b471f"
+checksum = "14cae93065090804185d3b75f0bf93b8eeda30c7a9b4a33d3bdb3988d6229e50"
 dependencies = [
  "bit-set",
  "bit-vec",
  "bitflags 2.9.1",
  "lazy_static",
  "num-traits",
- "rand 0.9.2",
- "rand_chacha 0.9.0",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
  "rand_xorshift",
  "regex-syntax 0.8.5",
  "rusty-fork",
@@ -17820,21 +17671,22 @@ dependencies = [
 
 [[package]]
 name = "prost-build"
-version = "0.13.5"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf"
+checksum = "f8650aabb6c35b860610e9cff5dc1af886c9e25073b7b1712a68972af4281302"
 dependencies = [
+ "bytes",
  "heck 0.5.0",
- "itertools 0.14.0",
+ "itertools 0.13.0",
  "log",
  "multimap",
  "once_cell",
- "petgraph 0.7.1",
+ "petgraph",
  "prettyplease",
  "prost 0.13.5",
  "prost-types",
  "regex",
- "syn 2.0.104",
+ "syn 2.0.98",
  "tempfile",
 ]
 
@@ -17861,7 +17713,7 @@ dependencies = [
  "itertools 0.12.1",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -17871,26 +17723,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
 dependencies = [
  "anyhow",
- "itertools 0.14.0",
+ "itertools 0.13.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "prost-types"
-version = "0.13.5"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52c2c1bf36ddb1a1c396b3601a3cec27c2462e45f07c386894ec3ccf5332bd16"
+checksum = "60caa6738c7369b940c3d49246a8d1749323674c65cb13010134f5c9bad5b519"
 dependencies = [
  "prost 0.13.5",
 ]
 
 [[package]]
 name = "psm"
-version = "0.1.26"
+version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e944464ec8536cd1beb0bbfd96987eb5e3b72f2ecdafdc5c769a37f1fa2ae1f"
+checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874"
 dependencies = [
  "cc",
 ]
@@ -17908,33 +17760,35 @@ dependencies = [
  "prost 0.11.9",
  "reqwest",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "url",
  "winapi",
 ]
 
 [[package]]
 name = "pyroscope_pprofrs"
-version = "0.2.10"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50da7a8950c542357de489aa9ee628f46322b1beaac1f4fa3313bcdebe85b4ea"
+checksum = "614a25777053da6bdca9d84a67892490b5a57590248dbdee3d7bf0716252af70"
 dependencies = [
  "log",
  "pprof2",
  "pyroscope",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
 name = "quanta"
-version = "0.12.6"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3ab5a9d756f0d97bdc89019bd2e4ea098cf9cde50ee7564dde6b81ccc8f06c7"
+checksum = "a17e662a7a8291a865152364c20c7abc5e60486ab2001e8ec10b24862de0b9ab"
 dependencies = [
  "crossbeam-utils",
  "libc",
+ "mach2",
  "once_cell",
  "raw-cpuid",
- "wasi 0.11.1+wasi-snapshot-preview1",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "web-sys",
  "winapi",
 ]
@@ -17963,7 +17817,7 @@ dependencies = [
  "asynchronous-codec 0.7.0",
  "bytes",
  "quick-protobuf",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "unsigned-varint 0.8.0",
 ]
 
@@ -17975,7 +17829,7 @@ checksum = "5253a3a0d56548d5b0be25414171dc780cc6870727746d05bd2bde352eee96c5"
 dependencies = [
  "ahash",
  "hashbrown 0.13.2",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
 ]
 
 [[package]]
@@ -17991,58 +17845,51 @@ dependencies = [
 
 [[package]]
 name = "quinn"
-version = "0.11.8"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "626214629cda6781b6dc1d316ba307189c85ba657213ce642d9c77670f8202c8"
+checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684"
 dependencies = [
  "bytes",
- "cfg_aliases 0.2.1",
  "futures-io",
  "pin-project-lite",
  "quinn-proto",
  "quinn-udp",
  "rustc-hash 2.1.1",
- "rustls 0.23.29",
- "socket2 0.5.10",
- "thiserror 2.0.12",
+ "rustls 0.23.18",
+ "socket2 0.5.9",
+ "thiserror 1.0.65",
  "tokio",
  "tracing",
- "web-time",
 ]
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.12"
+version = "0.11.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49df843a9161c85bb8aae55f101bc0bac8bcafd637a620d9122fd7e0b2f7422e"
+checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6"
 dependencies = [
  "bytes",
- "getrandom 0.3.3",
- "lru-slab",
- "rand 0.9.2",
- "ring 0.17.14",
+ "rand 0.8.5",
+ "ring 0.17.8",
  "rustc-hash 2.1.1",
- "rustls 0.23.29",
- "rustls-pki-types",
+ "rustls 0.23.18",
  "slab",
- "thiserror 2.0.12",
+ "thiserror 1.0.65",
  "tinyvec",
  "tracing",
- "web-time",
 ]
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.13"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcebb1209ee276352ef14ff8732e24cc2b02bbac986cd74a4c81bcb2f9881970"
+checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285"
 dependencies = [
- "cfg_aliases 0.2.1",
  "libc",
  "once_cell",
- "socket2 0.5.10",
+ "socket2 0.5.9",
  "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -18063,12 +17910,6 @@ dependencies = [
  "proc-macro2 1.0.95",
 ]
 
-[[package]]
-name = "r-efi"
-version = "5.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
-
 [[package]]
 name = "radium"
 version = "0.7.0"
@@ -18088,13 +17929,14 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.9.2"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
 dependencies = [
  "rand_chacha 0.9.0",
- "rand_core 0.9.3",
+ "rand_core 0.9.1",
  "serde",
+ "zerocopy 0.8.20",
 ]
 
 [[package]]
@@ -18114,7 +17956,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
 dependencies = [
  "ppv-lite86",
- "rand_core 0.9.3",
+ "rand_core 0.9.1",
 ]
 
 [[package]]
@@ -18123,17 +17965,18 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.16",
+ "getrandom 0.2.10",
 ]
 
 [[package]]
 name = "rand_core"
-version = "0.9.3"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+checksum = "a88e0da7a2c97baa202165137c158d0a2e824ac465d13d81046727b34cb247d3"
 dependencies = [
- "getrandom 0.3.3",
+ "getrandom 0.3.1",
  "serde",
+ "zerocopy 0.8.20",
 ]
 
 [[package]]
@@ -18157,20 +18000,20 @@ dependencies = [
 
 [[package]]
 name = "rand_xorshift"
-version = "0.4.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "513962919efc330f829edb2535844d1b912b0fbe2ca165d613e4e8788bb05a5a"
+checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
 dependencies = [
- "rand_core 0.9.3",
+ "rand_core 0.6.4",
 ]
 
 [[package]]
 name = "raw-cpuid"
-version = "11.5.0"
+version = "10.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6df7ab838ed27997ba19a4664507e6f82b41fe6e20be42929332156e5e85146"
+checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
@@ -18242,22 +18085,31 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.15"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e8af0dde094006011e6a740d4879319439489813bd0bcdc7d821beaeeff48ec"
+checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
  "bitflags 2.9.1",
 ]
 
 [[package]]
 name = "redox_users"
-version = "0.4.6"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
+checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
 dependencies = [
- "getrandom 0.2.16",
- "libredox",
- "thiserror 1.0.69",
+ "getrandom 0.2.10",
+ "redox_syscall 0.2.16",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -18266,30 +18118,30 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87413ebb313323d431e85d0afc5a68222aaed972843537cbfe5f061cf1b4bcab"
 dependencies = [
- "derive_more 0.99.20",
+ "derive_more 0.99.17",
  "fs-err",
  "static_init",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
 name = "ref-cast"
-version = "1.0.24"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a0ae411dbe946a674d89546582cea4ba2bb8defac896622d6496f14c23ba5cf"
+checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931"
 dependencies = [
  "ref-cast-impl",
 ]
 
 [[package]]
 name = "ref-cast-impl"
-version = "1.0.24"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7"
+checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -18325,7 +18177,7 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.9",
+ "regex-automata 0.4.8",
  "regex-syntax 0.8.5",
 ]
 
@@ -18340,9 +18192,15 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.9"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69"
+
+[[package]]
+name = "regex-automata"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -18363,9 +18221,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "relative-path"
-version = "1.9.3"
+version = "1.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2"
+checksum = "e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc"
 
 [[package]]
 name = "relay-substrate-client"
@@ -18403,7 +18261,7 @@ dependencies = [
  "sp-trie",
  "sp-version",
  "staging-xcm",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tokio",
 ]
 
@@ -18421,13 +18279,13 @@ dependencies = [
  "jsonpath_lib",
  "log",
  "num-traits",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "serde_json",
  "sp-runtime",
  "sp-tracing 16.0.0",
  "substrate-prometheus-endpoint",
  "sysinfo",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "time",
  "tokio",
 ]
@@ -18449,9 +18307,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.12.22"
+version = "0.12.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbc931937e6ca3a06e3b6c0aa7841849b160a90351d6ab467a8b9b9959767531"
+checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -18459,45 +18317,52 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2 0.4.11",
- "http 1.3.1",
- "http-body 1.0.1",
+ "h2 0.4.5",
+ "http 1.1.0",
+ "http-body 1.0.0",
  "http-body-util",
  "hyper 1.6.0",
- "hyper-rustls 0.27.7",
+ "hyper-rustls 0.27.3",
  "hyper-tls",
  "hyper-util",
+ "ipnet",
  "js-sys",
  "log",
  "mime",
  "native-tls",
+ "once_cell",
  "percent-encoding",
  "pin-project-lite",
  "quinn",
- "rustls 0.23.29",
+ "rustls 0.23.18",
+ "rustls-pemfile 2.0.0",
  "rustls-pki-types",
  "serde",
  "serde_json",
  "serde_urlencoded",
  "sync_wrapper",
+ "system-configuration 0.6.1",
  "tokio",
  "tokio-native-tls",
- "tokio-rustls 0.26.2",
- "tower 0.5.2",
- "tower-http 0.6.6",
+ "tokio-rustls 0.26.0",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "webpki-roots 1.0.2",
+ "webpki-roots 0.26.3",
+ "windows-registry",
 ]
 
 [[package]]
 name = "resolv-conf"
-version = "0.7.4"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95325155c684b1c89f7765e30bc1c42e4a6da51ca513615660cb8a62ef9a88e3"
+checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00"
+dependencies = [
+ "hostname",
+ "quick-error",
+]
 
 [[package]]
 name = "revive-dev-node"
@@ -18516,7 +18381,7 @@ dependencies = [
 name = "revive-dev-runtime"
 version = "0.0.0"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "parity-scale-codec",
  "polkadot-sdk 0.1.0",
  "scale-info",
@@ -18525,9 +18390,9 @@ dependencies = [
 
 [[package]]
 name = "revm"
-version = "27.0.3"
+version = "27.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70a84455f03d3480d4ed2e7271c15f2ec95b758e86d57cb8d258a8ff1c22e9a4"
+checksum = "5e6bf82101a1ad8a2b637363a37aef27f88b4efc8a6e24c72bf5f64923dc5532"
 dependencies = [
  "revm-bytecode",
  "revm-context",
@@ -18544,9 +18409,9 @@ dependencies = [
 
 [[package]]
 name = "revm-bytecode"
-version = "6.0.1"
+version = "6.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a685758a4f375ae9392b571014b9779cfa63f0d8eb91afb4626ddd958b23615"
+checksum = "6922f7f4fbc15ca61ea459711ff75281cc875648c797088c34e4e064de8b8a7c"
 dependencies = [
  "bitvec",
  "once_cell",
@@ -18557,9 +18422,9 @@ dependencies = [
 
 [[package]]
 name = "revm-context"
-version = "8.0.3"
+version = "8.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a990abf66b47895ca3e915d5f3652bb7c6a4cff6e5351fdf0fc2795171fd411c"
+checksum = "9cd508416a35a4d8a9feaf5ccd06ac6d6661cd31ee2dc0252f9f7316455d71f9"
 dependencies = [
  "cfg-if",
  "derive-where",
@@ -18573,9 +18438,9 @@ dependencies = [
 
 [[package]]
 name = "revm-context-interface"
-version = "8.0.1"
+version = "9.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a303a93102fceccec628265efd550ce49f2817b38ac3a492c53f7d524f18a1ca"
+checksum = "dc90302642d21c8f93e0876e201f3c5f7913c4fcb66fb465b0fd7b707dfe1c79"
 dependencies = [
  "alloy-eip2930",
  "alloy-eip7702",
@@ -18589,9 +18454,9 @@ dependencies = [
 
 [[package]]
 name = "revm-database"
-version = "7.0.1"
+version = "7.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7db360729b61cc347f9c2f12adb9b5e14413aea58778cf9a3b7676c6a4afa115"
+checksum = "c61495e01f01c343dd90e5cb41f406c7081a360e3506acf1be0fc7880bfb04eb"
 dependencies = [
  "alloy-eips",
  "revm-bytecode",
@@ -18603,9 +18468,9 @@ dependencies = [
 
 [[package]]
 name = "revm-database-interface"
-version = "7.0.1"
+version = "7.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8500194cad0b9b1f0567d72370795fd1a5e0de9ec719b1607fa1566a23f039a"
+checksum = "c20628d6cd62961a05f981230746c16854f903762d01937f13244716530bf98f"
 dependencies = [
  "auto_impl",
  "either",
@@ -18616,9 +18481,9 @@ dependencies = [
 
 [[package]]
 name = "revm-handler"
-version = "8.0.3"
+version = "8.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03c35a17a38203976f97109e20eccf6732447ce6c9c42973bae42732b2e957ff"
+checksum = "1529c8050e663be64010e80ec92bf480315d21b1f2dbf65540028653a621b27d"
 dependencies = [
  "auto_impl",
  "derive-where",
@@ -18635,9 +18500,9 @@ dependencies = [
 
 [[package]]
 name = "revm-inspector"
-version = "8.0.3"
+version = "8.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e69abf6a076741bd5cd87b7d6c1b48be2821acc58932f284572323e81a8d4179"
+checksum = "f78db140e332489094ef314eaeb0bd1849d6d01172c113ab0eb6ea8ab9372926"
 dependencies = [
  "auto_impl",
  "either",
@@ -18653,9 +18518,9 @@ dependencies = [
 
 [[package]]
 name = "revm-interpreter"
-version = "23.0.2"
+version = "24.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d95c4a9a1662d10b689b66b536ddc2eb1e89f5debfcabc1a2d7b8417a2fa47cd"
+checksum = "ff9d7d9d71e8a33740b277b602165b6e3d25fff091ba3d7b5a8d373bf55f28a7"
 dependencies = [
  "revm-bytecode",
  "revm-context-interface",
@@ -18665,9 +18530,9 @@ dependencies = [
 
 [[package]]
 name = "revm-precompile"
-version = "24.0.1"
+version = "25.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b68d54a4733ac36bd29ee645c3c2e5e782fb63f199088d49e2c48c64a9fedc15"
+checksum = "4cee3f336b83621294b4cfe84d817e3eef6f3d0fce00951973364cc7f860424d"
 dependencies = [
  "ark-bls12-381 0.5.0",
  "ark-bn254",
@@ -18691,9 +18556,9 @@ dependencies = [
 
 [[package]]
 name = "revm-primitives"
-version = "20.0.0"
+version = "20.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52cdf897b3418f2ee05bcade64985e5faed2dbaa349b2b5f27d3d6bfd10fff2a"
+checksum = "66145d3dc61c0d6403f27fc0d18e0363bb3b7787e67970a05c71070092896599"
 dependencies = [
  "alloy-primitives",
  "num_enum",
@@ -18702,9 +18567,9 @@ dependencies = [
 
 [[package]]
 name = "revm-state"
-version = "7.0.1"
+version = "7.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "106fec5c634420118c7d07a6c37110186ae7f23025ceac3a5dbe182eea548363"
+checksum = "7cc830a0fd2600b91e371598e3d123480cd7bb473dd6def425a51213aa6c6d57"
 dependencies = [
  "bitflags 2.9.1",
  "revm-bytecode",
@@ -18719,7 +18584,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
 dependencies = [
  "hmac 0.12.1",
- "subtle 2.6.1",
+ "subtle 2.5.0",
 ]
 
 [[package]]
@@ -18739,14 +18604,15 @@ dependencies = [
 
 [[package]]
 name = "ring"
-version = "0.17.14"
+version = "0.17.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
+checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom 0.2.16",
+ "getrandom 0.2.10",
  "libc",
+ "spin 0.9.8",
  "untrusted 0.9.0",
  "windows-sys 0.52.0",
 ]
@@ -19015,20 +18881,20 @@ checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746"
 
 [[package]]
 name = "rpassword"
-version = "7.4.0"
+version = "7.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66d4c8b64f049c6721ec8ccec37ddfc3d641c4a7fca57e8f2a89de509c73df39"
+checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322"
 dependencies = [
  "libc",
  "rtoolbox",
- "windows-sys 0.59.0",
+ "winapi",
 ]
 
 [[package]]
 name = "rsa"
-version = "0.9.8"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78928ac1ed176a5ca1d17e578a1825f3d81ca54cf41053a592584b020cfd691b"
+checksum = "af6c4b23d99685a1408194da11270ef8e9809aff951cc70ec9b17350b087e474"
 dependencies = [
  "const-oid",
  "digest 0.10.7",
@@ -19040,7 +18906,7 @@ dependencies = [
  "rand_core 0.6.4",
  "signature",
  "spki",
- "subtle 2.6.1",
+ "subtle 2.5.0",
  "zeroize",
 ]
 
@@ -19053,7 +18919,7 @@ dependencies = [
  "futures",
  "futures-timer",
  "rstest_macros",
- "rustc_version 0.4.1",
+ "rustc_version 0.4.0",
 ]
 
 [[package]]
@@ -19068,37 +18934,34 @@ dependencies = [
  "quote 1.0.40",
  "regex",
  "relative-path",
- "rustc_version 0.4.1",
- "syn 2.0.104",
+ "rustc_version 0.4.0",
+ "syn 2.0.98",
  "unicode-ident",
 ]
 
 [[package]]
 name = "rtnetlink"
-version = "0.13.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a552eb82d19f38c3beed3f786bd23aa434ceb9ac43ab44419ca6d67a7e186c0"
+checksum = "322c53fd76a18698f1c27381d58091de3a043d356aa5bd0d510608b565f469a0"
 dependencies = [
  "futures",
  "log",
- "netlink-packet-core",
  "netlink-packet-route",
- "netlink-packet-utils",
  "netlink-proto",
- "netlink-sys",
- "nix 0.26.4",
- "thiserror 1.0.69",
+ "nix 0.24.3",
+ "thiserror 1.0.65",
  "tokio",
 ]
 
 [[package]]
 name = "rtoolbox"
-version = "0.0.3"
+version = "0.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7cc970b249fbe527d6e02e0a227762c9108b2f49d81094fe357ffc6d14d7f6f"
+checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "winapi",
 ]
 
 [[package]]
@@ -19132,7 +18995,7 @@ dependencies = [
  "primitive-types 0.12.2",
  "proptest",
  "rand 0.8.5",
- "rand 0.9.2",
+ "rand 0.9.0",
  "rlp 0.5.2",
  "ruint-macro",
  "serde",
@@ -19148,9 +19011,9 @@ checksum = "48fd7bd8a6377e15ad9d42a8ec25371b94ddc67abe7c8b9127bec79bebaaae18"
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.25"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
 [[package]]
 name = "rustc-hash"
@@ -19190,11 +19053,11 @@ dependencies = [
 
 [[package]]
 name = "rustc_version"
-version = "0.4.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
 dependencies = [
- "semver 1.0.26",
+ "semver 1.0.18",
 ]
 
 [[package]]
@@ -19203,14 +19066,14 @@ version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632"
 dependencies = [
- "nom 7.1.3",
+ "nom",
 ]
 
 [[package]]
 name = "rustix"
-version = "0.36.17"
+version = "0.36.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "305efbd14fde4139eb501df5f136994bb520b033fa9fbdce287507dc23b8c7ed"
+checksum = "c37f1bd5ef1b5422177b7646cba67430579cfe2ace80f284fee876bca52ad941"
 dependencies = [
  "bitflags 1.3.2",
  "errno",
@@ -19222,9 +19085,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.37.28"
+version = "0.37.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "519165d378b97752ca44bbe15047d5d3409e875f39327546b42ac81d7e18c1b6"
+checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06"
 dependencies = [
  "bitflags 1.3.2",
  "errno",
@@ -19236,54 +19099,41 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.44"
+version = "0.38.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
+checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85"
 dependencies = [
  "bitflags 2.9.1",
  "errno",
  "libc",
- "linux-raw-sys 0.4.15",
+ "linux-raw-sys 0.4.14",
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "rustix"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
-dependencies = [
- "bitflags 2.9.1",
- "errno",
- "libc",
- "linux-raw-sys 0.9.4",
- "windows-sys 0.60.2",
-]
-
 [[package]]
 name = "rustls"
-version = "0.21.12"
+version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
+checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8"
 dependencies = [
  "log",
- "ring 0.17.14",
- "rustls-webpki 0.101.7",
+ "ring 0.16.20",
+ "rustls-webpki 0.101.4",
  "sct",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.23.29"
+version = "0.23.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2491382039b29b9b11ff08b76ff6c97cf287671dbb74f0be44bda389fffe9bd1"
+checksum = "9c9cc1d47e243d655ace55ed38201c19ae02c148ae56412ab8750e8f0166ab7f"
 dependencies = [
  "log",
  "once_cell",
- "ring 0.17.14",
+ "ring 0.17.8",
  "rustls-pki-types",
- "rustls-webpki 0.103.4",
- "subtle 2.6.1",
+ "rustls-webpki 0.102.8",
+ "subtle 2.5.0",
  "zeroize",
 ]
 
@@ -19294,95 +19144,115 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
 dependencies = [
  "openssl-probe",
- "rustls-pemfile",
+ "rustls-pemfile 1.0.3",
  "schannel",
- "security-framework 2.11.1",
+ "security-framework",
 ]
 
 [[package]]
 name = "rustls-native-certs"
-version = "0.8.1"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792"
+dependencies = [
+ "openssl-probe",
+ "rustls-pemfile 2.0.0",
+ "rustls-pki-types",
+ "schannel",
+ "security-framework",
+]
+
+[[package]]
+name = "rustls-native-certs"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3"
+checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a"
 dependencies = [
  "openssl-probe",
+ "rustls-pemfile 2.0.0",
  "rustls-pki-types",
  "schannel",
- "security-framework 3.2.0",
+ "security-framework",
 ]
 
 [[package]]
 name = "rustls-pemfile"
-version = "1.0.4"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
+checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
 dependencies = [
  "base64 0.21.7",
 ]
 
 [[package]]
-name = "rustls-pki-types"
-version = "1.12.0"
+name = "rustls-pemfile"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
+checksum = "35e4980fa29e4c4b212ffb3db068a564cbf560e51d3944b7c88bd8bf5bec64f4"
 dependencies = [
- "web-time",
- "zeroize",
+ "base64 0.21.7",
+ "rustls-pki-types",
 ]
 
+[[package]]
+name = "rustls-pki-types"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
+
 [[package]]
 name = "rustls-platform-verifier"
-version = "0.5.3"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19787cda76408ec5404443dc8b31795c87cd8fec49762dc75fa727740d34acc1"
+checksum = "b5f0d26fa1ce3c790f9590868f0109289a044acb954525f933e2aa3b871c157d"
 dependencies = [
- "core-foundation 0.10.1",
+ "core-foundation",
  "core-foundation-sys",
  "jni",
  "log",
  "once_cell",
- "rustls 0.23.29",
- "rustls-native-certs 0.8.1",
+ "rustls 0.23.18",
+ "rustls-native-certs 0.7.0",
  "rustls-platform-verifier-android",
- "rustls-webpki 0.103.4",
- "security-framework 3.2.0",
+ "rustls-webpki 0.102.8",
+ "security-framework",
  "security-framework-sys",
- "webpki-root-certs 0.26.11",
- "windows-sys 0.59.0",
+ "webpki-roots 0.26.3",
+ "winapi",
 ]
 
 [[package]]
 name = "rustls-platform-verifier-android"
-version = "0.1.1"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
+checksum = "84e217e7fdc8466b5b35d30f8c0a30febd29173df4a3a0c2115d306b9c4117ad"
 
 [[package]]
 name = "rustls-webpki"
-version = "0.101.7"
+version = "0.101.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
+checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d"
 dependencies = [
- "ring 0.17.14",
- "untrusted 0.9.0",
+ "ring 0.16.20",
+ "untrusted 0.7.1",
 ]
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.4"
+version = "0.102.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
 dependencies = [
- "ring 0.17.14",
+ "ring 0.17.8",
  "rustls-pki-types",
  "untrusted 0.9.0",
 ]
 
 [[package]]
 name = "rustversion"
-version = "1.0.21"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
+checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
 
 [[package]]
 name = "rusty-fork"
@@ -19404,7 +19274,7 @@ checksum = "ac3ffab8f9715a0d455df4bbb9d21e91135aab3cd3ca187af0cd0c3c3f868fdc"
 dependencies = [
  "byteorder",
  "thiserror-core",
- "twox-hash 1.6.3",
+ "twox-hash",
 ]
 
 [[package]]
@@ -19414,15 +19284,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5174a470eeb535a721ae9fdd6e291c2411a906b96592182d05217591d5c5cf7b"
 dependencies = [
  "byteorder",
- "derive_more 0.99.20",
+ "derive_more 0.99.17",
 ]
 
-[[package]]
-name = "ruzstd"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3640bec8aad418d7d03c72ea2de10d5c646a598f9883c7babc160d91e3c1b26c"
-
 [[package]]
 name = "rw-stream-sink"
 version = "0.4.0"
@@ -19436,9 +19300,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.20"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
 
 [[package]]
 name = "safe-mix"
@@ -19451,9 +19315,9 @@ dependencies = [
 
 [[package]]
 name = "safe_arch"
-version = "0.7.4"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96b02de82ddbe1b636e6170c21be622223aea188ef2e139be0a5b219ec215323"
+checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354"
 dependencies = [
  "bytemuck",
 ]
@@ -19483,7 +19347,7 @@ dependencies = [
  "log",
  "sp-core 28.0.0",
  "sp-wasm-interface 20.0.0",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -19518,7 +19382,7 @@ dependencies = [
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
  "tempfile",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tokio",
 ]
 
@@ -19529,7 +19393,7 @@ dependencies = [
  "futures",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "sc-block-builder",
  "sc-client-api",
  "sc-proposer-metrics",
@@ -19566,10 +19430,10 @@ dependencies = [
 name = "sc-chain-spec"
 version = "28.0.0"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "clap",
  "docify",
- "memmap2 0.9.7",
+ "memmap2 0.9.3",
  "parity-scale-codec",
  "pretty_assertions",
  "regex",
@@ -19598,17 +19462,17 @@ dependencies = [
 name = "sc-chain-spec-derive"
 version = "11.0.0"
 dependencies = [
- "proc-macro-crate 3.3.0",
+ "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "sc-cli"
 version = "0.36.0"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "chrono",
  "clap",
  "fdlimit",
@@ -19644,7 +19508,7 @@ dependencies = [
  "sp-tracing 16.0.0",
  "sp-version",
  "tempfile",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tokio",
 ]
 
@@ -19656,7 +19520,7 @@ dependencies = [
  "futures",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "sc-executor",
  "sc-transaction-pool-api",
  "sc-utils",
@@ -19678,7 +19542,7 @@ dependencies = [
 name = "sc-client-db"
 version = "0.35.0"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "criterion",
  "hash-db",
  "kitchensink-runtime",
@@ -19689,7 +19553,7 @@ dependencies = [
  "log",
  "parity-db",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "rand 0.8.5",
  "sc-client-api",
  "sc-state-db",
@@ -19716,7 +19580,7 @@ dependencies = [
  "futures",
  "log",
  "mockall",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "sc-client-api",
  "sc-network-types",
  "sc-utils",
@@ -19728,7 +19592,7 @@ dependencies = [
  "sp-state-machine",
  "sp-test-primitives",
  "substrate-prometheus-endpoint",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -19739,7 +19603,7 @@ dependencies = [
  "futures",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "sc-block-builder",
  "sc-client-api",
  "sc-consensus",
@@ -19765,7 +19629,7 @@ dependencies = [
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
  "tempfile",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tokio",
 ]
 
@@ -19781,7 +19645,7 @@ dependencies = [
  "num-rational",
  "num-traits",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "sc-block-builder",
  "sc-client-api",
  "sc-consensus",
@@ -19807,7 +19671,7 @@ dependencies = [
  "sp-tracing 16.0.0",
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tokio",
 ]
 
@@ -19833,7 +19697,7 @@ dependencies = [
  "sp-keystore",
  "sp-runtime",
  "substrate-test-runtime-client",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tokio",
 ]
 
@@ -19841,13 +19705,13 @@ dependencies = [
 name = "sc-consensus-beefy"
 version = "13.0.0"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "async-channel 1.9.0",
  "async-trait",
  "futures",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "sc-block-builder",
  "sc-client-api",
  "sc-consensus",
@@ -19871,7 +19735,7 @@ dependencies = [
  "sp-tracing 16.0.0",
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tokio",
  "wasm-timer",
 ]
@@ -19884,7 +19748,7 @@ dependencies = [
  "jsonrpsee",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "sc-consensus-beefy",
  "sc-rpc",
  "serde",
@@ -19893,7 +19757,7 @@ dependencies = [
  "sp-core 28.0.0",
  "sp-runtime",
  "substrate-test-runtime-client",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tokio",
 ]
 
@@ -19914,7 +19778,7 @@ name = "sc-consensus-grandpa"
 version = "0.19.0"
 dependencies = [
  "ahash",
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "assert_matches",
  "async-trait",
  "dyn-clone",
@@ -19924,7 +19788,7 @@ dependencies = [
  "futures-timer",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "rand 0.8.5",
  "sc-block-builder",
  "sc-chain-spec",
@@ -19954,7 +19818,7 @@ dependencies = [
  "sp-tracing 16.0.0",
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tokio",
 ]
 
@@ -19978,7 +19842,7 @@ dependencies = [
  "sp-keyring",
  "sp-runtime",
  "substrate-test-runtime-client",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tokio",
 ]
 
@@ -20016,7 +19880,7 @@ dependencies = [
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
  "substrate-test-runtime-transaction-pool",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tokio",
 ]
 
@@ -20029,7 +19893,7 @@ dependencies = [
  "futures-timer",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "sc-client-api",
  "sc-consensus",
  "sp-api",
@@ -20041,7 +19905,7 @@ dependencies = [
  "sp-inherents",
  "sp-runtime",
  "substrate-prometheus-endpoint",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -20071,12 +19935,12 @@ dependencies = [
 name = "sc-executor"
 version = "0.32.0"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "assert_matches",
  "criterion",
  "num_cpus",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "paste",
  "sc-executor-common",
  "sc-executor-polkavm",
@@ -20101,7 +19965,7 @@ dependencies = [
  "substrate-test-runtime",
  "tempfile",
  "tracing",
- "tracing-subscriber 0.3.19",
+ "tracing-subscriber 0.3.18",
  "wat",
 ]
 
@@ -20113,7 +19977,7 @@ dependencies = [
  "sc-allocator",
  "sp-maybe-compressed-blob",
  "sp-wasm-interface 20.0.0",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "wasm-instrument",
 ]
 
@@ -20135,9 +19999,9 @@ dependencies = [
  "cargo_metadata",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "paste",
- "rustix 0.36.17",
+ "rustix 0.36.15",
  "sc-allocator",
  "sc-executor-common",
  "sc-runtime-test",
@@ -20168,22 +20032,22 @@ dependencies = [
 name = "sc-keystore"
 version = "25.0.0"
 dependencies = [
- "array-bytes 6.2.3",
- "parking_lot 0.12.4",
+ "array-bytes 6.2.2",
+ "parking_lot 0.12.3",
  "serde_json",
  "sp-application-crypto",
  "sp-core 28.0.0",
  "sp-keystore",
  "tempfile",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
 name = "sc-mixnet"
 version = "0.4.0"
 dependencies = [
- "array-bytes 6.2.3",
- "arrayvec 0.7.6",
+ "array-bytes 6.2.2",
+ "arrayvec 0.7.4",
  "blake2 0.10.6",
  "bytes",
  "futures",
@@ -20191,7 +20055,7 @@ dependencies = [
  "log",
  "mixnet",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "sc-client-api",
  "sc-network",
  "sc-network-types",
@@ -20202,14 +20066,14 @@ dependencies = [
  "sp-keystore",
  "sp-mixnet",
  "sp-runtime",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
 name = "sc-network"
 version = "0.34.0"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "assert_matches",
  "async-channel 1.9.0",
  "async-trait",
@@ -20229,7 +20093,7 @@ dependencies = [
  "mockall",
  "multistream-select",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "partial_sort",
  "pin-project",
  "prost 0.12.6",
@@ -20255,7 +20119,7 @@ dependencies = [
  "substrate-test-runtime",
  "substrate-test-runtime-client",
  "tempfile",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tokio",
  "tokio-stream",
  "tokio-util",
@@ -20301,7 +20165,7 @@ dependencies = [
 name = "sc-network-light"
 version = "0.33.0"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "async-channel 1.9.0",
  "futures",
  "log",
@@ -20314,14 +20178,14 @@ dependencies = [
  "sp-blockchain",
  "sp-core 28.0.0",
  "sp-runtime",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
 name = "sc-network-statement"
 version = "0.16.0"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "async-channel 1.9.0",
  "futures",
  "log",
@@ -20340,7 +20204,7 @@ dependencies = [
 name = "sc-network-sync"
 version = "0.33.0"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "async-channel 1.9.0",
  "async-trait",
  "fork-tree",
@@ -20370,7 +20234,7 @@ dependencies = [
  "sp-tracing 16.0.0",
  "substrate-prometheus-endpoint",
  "substrate-test-runtime-client",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tokio",
  "tokio-stream",
 ]
@@ -20385,7 +20249,7 @@ dependencies = [
  "futures-timer",
  "libp2p",
  "log",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "rand 0.8.5",
  "sc-block-builder",
  "sc-client-api",
@@ -20411,7 +20275,7 @@ dependencies = [
 name = "sc-network-transactions"
 version = "0.33.0"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "futures",
  "log",
  "parity-scale-codec",
@@ -20436,13 +20300,13 @@ dependencies = [
  "libp2p-kad",
  "litep2p",
  "log",
- "multiaddr 0.18.2",
- "multihash 0.19.3",
+ "multiaddr 0.18.1",
+ "multihash 0.19.1",
  "quickcheck",
  "rand 0.8.5",
  "serde",
  "serde_with",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "zeroize",
 ]
 
@@ -20457,14 +20321,14 @@ dependencies = [
  "futures-timer",
  "http-body-util",
  "hyper 1.6.0",
- "hyper-rustls 0.27.7",
+ "hyper-rustls 0.27.3",
  "hyper-util",
  "num_cpus",
  "once_cell",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "rand 0.8.5",
- "rustls 0.23.29",
+ "rustls 0.23.18",
  "sc-block-builder",
  "sc-client-api",
  "sc-client-db",
@@ -20504,7 +20368,7 @@ dependencies = [
  "jsonrpsee",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "pretty_assertions",
  "sc-block-builder",
  "sc-chain-spec",
@@ -20549,7 +20413,7 @@ dependencies = [
  "sp-rpc",
  "sp-runtime",
  "sp-version",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -20560,7 +20424,7 @@ dependencies = [
  "forwarded-header-value",
  "futures",
  "governor",
- "http 1.3.1",
+ "http 1.1.0",
  "http-body-util",
  "hyper 1.6.0",
  "ip_network",
@@ -20571,7 +20435,7 @@ dependencies = [
  "serde_json",
  "substrate-prometheus-endpoint",
  "tokio",
- "tower 0.4.13",
+ "tower",
  "tower-http 0.5.2",
 ]
 
@@ -20579,7 +20443,7 @@ dependencies = [
 name = "sc-rpc-spec-v2"
 version = "0.34.0"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "assert_matches",
  "async-trait",
  "futures",
@@ -20589,7 +20453,7 @@ dependencies = [
  "jsonrpsee",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "pretty_assertions",
  "rand 0.8.5",
  "sc-block-builder",
@@ -20616,7 +20480,7 @@ dependencies = [
  "substrate-test-runtime",
  "substrate-test-runtime-client",
  "substrate-test-runtime-transaction-pool",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tokio",
  "tokio-stream",
 ]
@@ -20648,7 +20512,7 @@ dependencies = [
  "sp-version",
  "sp-wasm-interface 20.0.0",
  "subxt 0.41.0",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -20663,7 +20527,7 @@ dependencies = [
  "jsonrpsee",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "pin-project",
  "rand 0.8.5",
  "sc-chain-spec",
@@ -20710,7 +20574,7 @@ dependencies = [
  "substrate-test-runtime",
  "substrate-test-runtime-client",
  "tempfile",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tokio",
  "tracing",
  "tracing-futures",
@@ -20720,13 +20584,13 @@ dependencies = [
 name = "sc-service-test"
 version = "2.0.0"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "async-channel 1.9.0",
  "fdlimit",
  "futures",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "sc-block-builder",
  "sc-client-api",
  "sc-client-db",
@@ -20757,7 +20621,7 @@ version = "0.30.0"
 dependencies = [
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "sp-core 28.0.0",
 ]
 
@@ -20767,7 +20631,7 @@ version = "10.0.0"
 dependencies = [
  "log",
  "parity-db",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "sc-client-api",
  "sc-keystore",
  "sp-api",
@@ -20789,7 +20653,7 @@ dependencies = [
  "fs4",
  "log",
  "sp-core 28.0.0",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tokio",
 ]
 
@@ -20808,14 +20672,14 @@ dependencies = [
  "serde_json",
  "sp-blockchain",
  "sp-runtime",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
 name = "sc-sysinfo"
 version = "27.0.0"
 dependencies = [
- "derive_more 0.99.20",
+ "derive_more 0.99.17",
  "futures",
  "libc",
  "log",
@@ -20839,13 +20703,13 @@ dependencies = [
  "futures",
  "libp2p",
  "log",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "pin-project",
  "rand 0.8.5",
  "sc-utils",
  "serde",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "wasm-timer",
 ]
 
@@ -20860,7 +20724,7 @@ dependencies = [
  "libc",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "regex",
  "rustc-hash 1.1.0",
  "sc-client-api",
@@ -20872,20 +20736,20 @@ dependencies = [
  "sp-rpc",
  "sp-runtime",
  "sp-tracing 16.0.0",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tracing",
  "tracing-log",
- "tracing-subscriber 0.3.19",
+ "tracing-subscriber 0.3.18",
 ]
 
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "11.0.0"
 dependencies = [
- "proc-macro-crate 3.3.0",
+ "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -20898,14 +20762,14 @@ dependencies = [
  "chrono",
  "criterion",
  "cumulus-zombienet-sdk-helpers",
- "env_logger 0.11.8",
+ "env_logger 0.11.3",
  "futures",
  "futures-timer",
- "indexmap 2.10.0",
+ "indexmap 2.9.0",
  "itertools 0.11.0",
  "linked-hash-map",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "rstest",
  "sc-block-builder",
  "sc-client-api",
@@ -20926,11 +20790,11 @@ dependencies = [
  "substrate-test-runtime-client",
  "substrate-test-runtime-transaction-pool",
  "substrate-txtesttool",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tokio",
  "tokio-stream",
  "tracing",
- "tracing-subscriber 0.3.19",
+ "tracing-subscriber 0.3.18",
  "zombienet-configuration",
  "zombienet-sdk",
 ]
@@ -20941,7 +20805,7 @@ version = "28.0.0"
 dependencies = [
  "async-trait",
  "futures",
- "indexmap 2.10.0",
+ "indexmap 2.9.0",
  "log",
  "parity-scale-codec",
  "serde",
@@ -20949,7 +20813,7 @@ dependencies = [
  "sp-blockchain",
  "sp-core 28.0.0",
  "sp-runtime",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -20960,7 +20824,7 @@ dependencies = [
  "futures",
  "futures-timer",
  "log",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "prometheus",
  "sp-arithmetic",
  "tokio-test",
@@ -21029,7 +20893,7 @@ dependencies = [
  "darling",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -21041,7 +20905,7 @@ dependencies = [
  "darling",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -21081,10 +20945,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "102fbc6236de6c53906c0b262f12c7aa69c2bdc604862c12728f5f4d370bc137"
 dependencies = [
  "darling",
- "proc-macro-crate 3.3.0",
+ "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -21094,10 +20958,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78a3993a13b4eafa89350604672c8757b7ea84c7c5947d4b3691e3169c96379b"
 dependencies = [
  "darling",
- "proc-macro-crate 3.3.0",
+ "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -21120,10 +20984,10 @@ version = "2.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c6630024bf739e2179b91fb424b28898baf819414262c5d376677dbff1fe7ebf"
 dependencies = [
- "proc-macro-crate 3.3.0",
+ "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -21145,8 +21009,8 @@ dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "scale-info",
- "syn 2.0.104",
- "thiserror 1.0.69",
+ "syn 2.0.98",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -21158,7 +21022,7 @@ dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "scale-info",
- "syn 2.0.104",
+ "syn 2.0.98",
  "thiserror 2.0.12",
 ]
 
@@ -21203,67 +21067,42 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
-dependencies = [
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "schemars"
-version = "0.8.22"
+version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fbf2ae1b8bc8e02df939598064d22402220cd5bbcca1c76f7d6a310974d5615"
+checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
 dependencies = [
- "dyn-clone",
- "schemars_derive 0.8.22",
- "serde",
- "serde_json",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "schemars"
-version = "1.0.4"
+version = "0.8.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0"
+checksum = "763f8cd0d4c71ed8389c90cb8100cba87e763bd01a8e614d4f0af97bcd50a161"
 dependencies = [
  "dyn-clone",
- "ref-cast",
- "schemars_derive 1.0.4",
+ "schemars_derive",
  "serde",
  "serde_json",
 ]
 
 [[package]]
 name = "schemars_derive"
-version = "0.8.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32e265784ad618884abaea0600a9adf15393368d840e0222d101a072f3f7534d"
-dependencies = [
- "proc-macro2 1.0.95",
- "quote 1.0.40",
- "serde_derive_internals",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "schemars_derive"
-version = "1.0.4"
+version = "0.8.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33d020396d1d138dc19f1165df7545479dcd58d93810dc5d646a16e55abefa80"
+checksum = "ec0f696e21e10fa546b7ffb1c9672c6de8fbc7a81acf59524386d8639bf12737"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "serde_derive_internals",
- "syn 2.0.104",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "schnellru"
-version = "0.2.4"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "356285bbf17bea63d9e52e96bd18f039672ac92b55b8cb997d6162a2a37d1649"
+checksum = "c9a8ef13a93c54d20580de1e5c413e624e53121d42fc7e2c11d10ef7f8b02367"
 dependencies = [
  "ahash",
  "cfg-if",
@@ -21277,7 +21116,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "844b7645371e6ecdf61ff246ba1958c29e802881a749ae3fb1993675d210d28d"
 dependencies = [
  "arrayref",
- "arrayvec 0.7.6",
+ "arrayvec 0.7.4",
  "curve25519-dalek-ng",
  "merlin",
  "rand_core 0.6.4",
@@ -21289,20 +21128,20 @@ dependencies = [
 
 [[package]]
 name = "schnorrkel"
-version = "0.11.5"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e9fcb6c2e176e86ec703e22560d99d65a5ee9056ae45a08e13e84ebf796296f"
+checksum = "8de18f6d8ba0aad7045f5feae07ec29899c1112584a38509a84ad7b04451eaa0"
 dependencies = [
  "aead",
  "arrayref",
- "arrayvec 0.7.6",
+ "arrayvec 0.7.4",
  "curve25519-dalek",
  "getrandom_or_panic",
  "merlin",
  "rand_core 0.6.4",
  "serde_bytes",
  "sha2 0.10.9",
- "subtle 2.6.1",
+ "subtle 2.5.0",
  "zeroize",
 ]
 
@@ -21320,9 +21159,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "scratch"
-version = "1.0.8"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f6280af86e5f559536da57a45ebc84948833b3bee313a7dd25232e09c878a52"
+checksum = "a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152"
 
 [[package]]
 name = "scrypt"
@@ -21338,12 +21177,12 @@ dependencies = [
 
 [[package]]
 name = "sct"
-version = "0.7.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
+checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
 dependencies = [
- "ring 0.17.14",
- "untrusted 0.9.0",
+ "ring 0.16.20",
+ "untrusted 0.7.1",
 ]
 
 [[package]]
@@ -21357,7 +21196,7 @@ dependencies = [
  "generic-array 0.14.7",
  "pkcs8",
  "serdect",
- "subtle 2.6.1",
+ "subtle 2.5.0",
  "zeroize",
 ]
 
@@ -21370,15 +21209,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "secp256k1"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25996b82292a7a57ed3508f052cfff8640d38d32018784acd714758b43da9c8f"
-dependencies = [
- "secp256k1-sys 0.8.2",
-]
-
 [[package]]
 name = "secp256k1"
 version = "0.28.2"
@@ -21406,19 +21236,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c3c81b43dc2d8877c216a3fccf76677ee1ebccd429566d3e67447290d0c42b2"
 dependencies = [
  "bitcoin_hashes 0.14.0",
- "rand 0.9.2",
+ "rand 0.9.0",
  "secp256k1-sys 0.11.0",
 ]
 
-[[package]]
-name = "secp256k1-sys"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4473013577ec77b4ee3668179ef1186df3146e2cf2d927bd200974c6fe60fd99"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "secp256k1-sys"
 version = "0.9.2"
@@ -21467,35 +21288,23 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
-dependencies = [
- "bitflags 2.9.1",
- "core-foundation 0.9.4",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework"
-version = "3.2.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316"
+checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
 dependencies = [
  "bitflags 2.9.1",
- "core-foundation 0.10.1",
+ "core-foundation",
  "core-foundation-sys",
  "libc",
+ "num-bigint",
  "security-framework-sys",
 ]
 
 [[package]]
 name = "security-framework-sys"
-version = "2.14.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
+checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -21525,14 +21334,14 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
 dependencies = [
- "semver-parser 0.10.3",
+ "semver-parser 0.10.2",
 ]
 
 [[package]]
 name = "semver"
-version = "1.0.26"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
+checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
 dependencies = [
  "serde",
 ]
@@ -21545,9 +21354,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "semver-parser"
-version = "0.10.3"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9900206b54a3527fdc7b8a938bffd94a568bac4f4aa8113b209df75a09c0dec2"
+checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
 dependencies = [
  "pest",
 ]
@@ -21588,9 +21397,9 @@ dependencies = [
 
 [[package]]
 name = "serde_bytes"
-version = "0.11.17"
+version = "0.11.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8437fd221bde2d4ca316d61b90e337e9e702b3820b87d63caa9ba6c02bd06d96"
+checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff"
 dependencies = [
  "serde",
 ]
@@ -21603,18 +21412,18 @@ checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "serde_derive_internals"
-version = "0.29.1"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
+checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -21628,11 +21437,11 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.141"
+version = "1.0.132"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30b9eff21ebe718216c6ec64e1d9ac57087aad11efc64e32002bce4a0d4c03d3"
+checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
 dependencies = [
- "indexmap 2.10.0",
+ "indexmap 2.9.0",
  "itoa",
  "memchr",
  "ryu",
@@ -21641,18 +21450,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serde_spanned"
-version = "1.0.0"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83"
+checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
 dependencies = [
  "serde",
 ]
@@ -21671,9 +21471,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.14.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2c45cd61fefa9db6f254525d46e392b852e0e61d9a1fd36e5bd183450a556d5"
+checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa"
 dependencies = [
  "base64 0.22.1",
  "chrono",
@@ -21687,14 +21487,14 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.14.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de90945e6565ce0d9a25098082ed4ee4002e047cb59892c318d66821e14bb30f"
+checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
 dependencies = [
  "darling",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -21703,7 +21503,7 @@ version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap 2.10.0",
+ "indexmap 2.9.0",
  "itoa",
  "ryu",
  "serde",
@@ -21730,7 +21530,7 @@ dependencies = [
  "cfg-if",
  "cpufeatures",
  "digest 0.9.0",
- "opaque-debug 0.3.1",
+ "opaque-debug 0.3.0",
 ]
 
 [[package]]
@@ -21754,7 +21554,7 @@ dependencies = [
  "cfg-if",
  "cpufeatures",
  "digest 0.9.0",
- "opaque-debug 0.3.1",
+ "opaque-debug 0.3.0",
 ]
 
 [[package]]
@@ -21790,9 +21590,9 @@ dependencies = [
 
 [[package]]
 name = "sharded-slab"
-version = "0.1.7"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
 dependencies = [
  "lazy_static",
 ]
@@ -21803,20 +21603,30 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
+[[package]]
+name = "signal-hook"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
+dependencies = [
+ "libc",
+ "signal-hook-registry",
+]
+
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.5"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410"
+checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "signature"
-version = "2.2.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
+checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500"
 dependencies = [
  "digest 0.10.7",
  "rand_core 0.6.4",
@@ -21824,9 +21634,9 @@ dependencies = [
 
 [[package]]
 name = "simba"
-version = "0.9.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3a386a501cd104797982c15ae17aafe8b9261315b5d07e3ec803f2ea26be0fa"
+checksum = "061507c94fc6ab4ba1c9a0305018408e312e17c041eb63bef8aa726fa33aceae"
 dependencies = [
  "approx",
  "num-complex",
@@ -21864,9 +21674,12 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
 
 [[package]]
 name = "slab"
-version = "0.4.10"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
 
 [[package]]
 name = "slice-group-by"
@@ -21886,9 +21699,9 @@ dependencies = [
 
 [[package]]
 name = "slotmap"
-version = "1.0.7"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a"
+checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342"
 dependencies = [
  "version_check",
 ]
@@ -21906,9 +21719,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.15.1"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
 dependencies = [
  "serde",
 ]
@@ -21924,8 +21737,8 @@ dependencies = [
  "async-fs 1.6.0",
  "async-io 1.13.0",
  "async-lock 2.8.0",
- "async-net 1.8.0",
- "async-process 1.8.1",
+ "async-net 1.7.0",
+ "async-process 1.7.0",
  "blocking",
  "futures-lite 1.13.0",
 ]
@@ -21936,15 +21749,15 @@ version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a33bd3e260892199c3ccfc487c88b2da2265080acb316cd920da72fdfd7c599f"
 dependencies = [
- "async-channel 2.5.0",
+ "async-channel 2.3.0",
  "async-executor",
- "async-fs 2.1.3",
- "async-io 2.5.0",
+ "async-fs 2.1.2",
+ "async-io 2.3.3",
  "async-lock 3.4.0",
  "async-net 2.0.0",
- "async-process 2.4.0",
+ "async-process 2.3.0",
  "blocking",
- "futures-lite 2.6.0",
+ "futures-lite 2.3.0",
 ]
 
 [[package]]
@@ -21953,7 +21766,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0bb30cf57b7b5f6109ce17c3164445e2d6f270af2cb48f6e4d31c2967c9a9f5"
 dependencies = [
- "arrayvec 0.7.6",
+ "arrayvec 0.7.4",
  "async-lock 2.8.0",
  "atomic-take",
  "base64 0.21.7",
@@ -21962,7 +21775,7 @@ dependencies = [
  "bs58",
  "chacha20",
  "crossbeam-queue",
- "derive_more 0.99.20",
+ "derive_more 0.99.17",
  "ed25519-zebra",
  "either",
  "event-listener 2.5.3",
@@ -21976,7 +21789,7 @@ dependencies = [
  "libsecp256k1",
  "merlin",
  "no-std-net",
- "nom 7.1.3",
+ "nom",
  "num-bigint",
  "num-rational",
  "num-traits",
@@ -21995,7 +21808,7 @@ dependencies = [
  "slab",
  "smallvec",
  "soketto 0.7.1",
- "twox-hash 1.6.3",
+ "twox-hash",
  "wasmi 0.31.2",
  "x25519-dalek",
  "zeroize",
@@ -22007,7 +21820,7 @@ version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "966e72d77a3b2171bb7461d0cb91f43670c63558c62d7cf42809cae6c8b6b818"
 dependencies = [
- "arrayvec 0.7.6",
+ "arrayvec 0.7.4",
  "async-lock 3.4.0",
  "atomic-take",
  "base64 0.22.1",
@@ -22016,12 +21829,12 @@ dependencies = [
  "bs58",
  "chacha20",
  "crossbeam-queue",
- "derive_more 0.99.20",
+ "derive_more 0.99.17",
  "ed25519-zebra",
  "either",
- "event-listener 5.4.0",
+ "event-listener 5.3.1",
  "fnv",
- "futures-lite 2.6.0",
+ "futures-lite 2.3.0",
  "futures-util",
  "hashbrown 0.14.5",
  "hex",
@@ -22030,7 +21843,7 @@ dependencies = [
  "libm",
  "libsecp256k1",
  "merlin",
- "nom 7.1.3",
+ "nom",
  "num-bigint",
  "num-rational",
  "num-traits",
@@ -22040,7 +21853,7 @@ dependencies = [
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "ruzstd 0.6.0",
- "schnorrkel 0.11.5",
+ "schnorrkel 0.11.4",
  "serde",
  "serde_json",
  "sha2 0.10.9",
@@ -22048,67 +21861,13 @@ dependencies = [
  "siphasher 1.0.1",
  "slab",
  "smallvec",
- "soketto 0.8.1",
- "twox-hash 1.6.3",
+ "soketto 0.8.0",
+ "twox-hash",
  "wasmi 0.32.3",
  "x25519-dalek",
  "zeroize",
 ]
 
-[[package]]
-name = "smoldot"
-version = "0.19.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e16e5723359f0048bf64bfdfba64e5732a56847d42c4fd3fe56f18280c813413"
-dependencies = [
- "arrayvec 0.7.6",
- "async-lock 3.4.0",
- "atomic-take",
- "base64 0.22.1",
- "bip39",
- "blake2-rfc",
- "bs58",
- "chacha20",
- "crossbeam-queue",
- "derive_more 2.0.1",
- "ed25519-zebra",
- "either",
- "event-listener 5.4.0",
- "fnv",
- "futures-lite 2.6.0",
- "futures-util",
- "hashbrown 0.15.4",
- "hex",
- "hmac 0.12.1",
- "itertools 0.14.0",
- "libm",
- "libsecp256k1",
- "merlin",
- "nom 8.0.0",
- "num-bigint",
- "num-rational",
- "num-traits",
- "pbkdf2",
- "pin-project",
- "poly1305",
- "rand 0.8.5",
- "rand_chacha 0.3.1",
- "ruzstd 0.8.1",
- "schnorrkel 0.11.5",
- "serde",
- "serde_json",
- "sha2 0.10.9",
- "sha3",
- "siphasher 1.0.1",
- "slab",
- "smallvec",
- "soketto 0.8.1",
- "twox-hash 2.1.1",
- "wasmi 0.40.0",
- "x25519-dalek",
- "zeroize",
-]
-
 [[package]]
 name = "smoldot-light"
 version = "0.9.0"
@@ -22119,7 +21878,7 @@ dependencies = [
  "async-lock 2.8.0",
  "base64 0.21.7",
  "blake2-rfc",
- "derive_more 0.99.20",
+ "derive_more 0.99.17",
  "either",
  "event-listener 2.5.3",
  "fnv",
@@ -22130,9 +21889,9 @@ dependencies = [
  "hex",
  "itertools 0.11.0",
  "log",
- "lru 0.11.1",
+ "lru 0.11.0",
  "no-std-net",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "pin-project",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
@@ -22151,24 +21910,24 @@ version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a33b06891f687909632ce6a4e3fd7677b24df930365af3d0bcb078310129f3f"
 dependencies = [
- "async-channel 2.5.0",
+ "async-channel 2.3.0",
  "async-lock 3.4.0",
  "base64 0.22.1",
  "blake2-rfc",
  "bs58",
- "derive_more 0.99.20",
+ "derive_more 0.99.17",
  "either",
- "event-listener 5.4.0",
+ "event-listener 5.3.1",
  "fnv",
  "futures-channel",
- "futures-lite 2.6.0",
+ "futures-lite 2.3.0",
  "futures-util",
  "hashbrown 0.14.5",
  "hex",
  "itertools 0.13.0",
  "log",
- "lru 0.12.5",
- "parking_lot 0.12.4",
+ "lru 0.12.3",
+ "parking_lot 0.12.3",
  "pin-project",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
@@ -22181,47 +21940,11 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "smoldot-light"
-version = "0.17.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bba9e591716567d704a8252feeb2f1261a286e1e2cbdd4e49e9197c34a14e2"
-dependencies = [
- "async-channel 2.5.0",
- "async-lock 3.4.0",
- "base64 0.22.1",
- "blake2-rfc",
- "bs58",
- "derive_more 2.0.1",
- "either",
- "event-listener 5.4.0",
- "fnv",
- "futures-channel",
- "futures-lite 2.6.0",
- "futures-util",
- "hashbrown 0.15.4",
- "hex",
- "itertools 0.14.0",
- "log",
- "lru 0.12.5",
- "parking_lot 0.12.4",
- "pin-project",
- "rand 0.8.5",
- "rand_chacha 0.3.1",
- "serde",
- "serde_json",
- "siphasher 1.0.1",
- "slab",
- "smol 2.0.2",
- "smoldot 0.19.4",
- "zeroize",
-]
-
 [[package]]
 name = "snap"
-version = "1.1.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b"
+checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831"
 
 [[package]]
 name = "snow"
@@ -22234,10 +21957,10 @@ dependencies = [
  "chacha20poly1305",
  "curve25519-dalek",
  "rand_core 0.6.4",
- "ring 0.17.14",
- "rustc_version 0.4.1",
+ "ring 0.17.8",
+ "rustc_version 0.4.0",
  "sha2 0.10.9",
- "subtle 2.6.1",
+ "subtle 2.5.0",
 ]
 
 [[package]]
@@ -22342,7 +22065,7 @@ dependencies = [
 name = "snowbridge-merkle-tree"
 version = "0.2.0"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "hex",
  "hex-literal",
  "parity-scale-codec",
@@ -22771,9 +22494,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.4.10"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
+checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
 dependencies = [
  "libc",
  "winapi",
@@ -22781,9 +22504,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.10"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
+checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -22806,14 +22529,14 @@ dependencies = [
 
 [[package]]
 name = "soketto"
-version = "0.8.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e859df029d160cb88608f5d7df7fb4753fd20fdfb4de5644f3d8b8440841721"
+checksum = "37468c595637c10857701c990f93a40ce0e357cedb0953d1c26c8d8027f9bb53"
 dependencies = [
  "base64 0.22.1",
  "bytes",
  "futures",
- "http 1.3.1",
+ "http 1.1.0",
  "httparse",
  "log",
  "rand 0.8.5",
@@ -22920,7 +22643,7 @@ dependencies = [
  "sp-test-primitives",
  "sp-trie",
  "sp-version",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -22931,10 +22654,10 @@ dependencies = [
  "assert_matches",
  "blake2 0.10.6",
  "expander",
- "proc-macro-crate 3.3.0",
+ "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -23038,7 +22761,7 @@ version = "28.0.0"
 dependencies = [
  "futures",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "schnellru",
  "sp-api",
  "sp-consensus",
@@ -23046,7 +22769,7 @@ dependencies = [
  "sp-database",
  "sp-runtime",
  "sp-state-machine",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tracing",
 ]
 
@@ -23060,7 +22783,7 @@ dependencies = [
  "sp-inherents",
  "sp-runtime",
  "sp-state-machine",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -23099,7 +22822,7 @@ dependencies = [
 name = "sp-consensus-beefy"
 version = "13.0.0"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "parity-scale-codec",
  "scale-info",
  "serde",
@@ -23171,7 +22894,7 @@ name = "sp-core"
 version = "28.0.0"
 dependencies = [
  "ark-vrf",
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "bitflags 1.3.2",
  "blake2 0.10.6",
  "bounded-collections 0.3.2",
@@ -23190,13 +22913,13 @@ dependencies = [
  "merlin",
  "parity-bip39",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "paste",
  "primitive-types 0.13.1",
  "rand 0.8.5",
  "regex",
  "scale-info",
- "schnorrkel 0.11.5",
+ "schnorrkel 0.11.4",
  "secp256k1 0.28.2",
  "secrecy 0.8.0",
  "serde",
@@ -23209,7 +22932,7 @@ dependencies = [
  "sp-storage 19.0.0",
  "ss58-registry",
  "substrate-bip39 0.4.7",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tracing",
  "w3f-bls",
  "zeroize",
@@ -23217,15 +22940,14 @@ dependencies = [
 
 [[package]]
 name = "sp-core"
-version = "36.1.0"
+version = "35.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cdbb58c21e6b27f2aadf3ff0c8b20a8ead13b9dfe63f46717fd59334517f3b4"
+checksum = "4532774405a712a366a98080cbb4daa28c38ddff0ec595902ad6ee6a78a809f8"
 dependencies = [
- "ark-vrf",
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "bitflags 1.3.2",
  "blake2 0.10.6",
- "bounded-collections 0.2.4",
+ "bounded-collections 0.2.3",
  "bs58",
  "dyn-clonable",
  "ed25519-zebra",
@@ -23240,24 +22962,24 @@ dependencies = [
  "merlin",
  "parity-bip39",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "paste",
  "primitive-types 0.13.1",
  "rand 0.8.5",
  "scale-info",
- "schnorrkel 0.11.5",
+ "schnorrkel 0.11.4",
  "secp256k1 0.28.2",
  "secrecy 0.8.0",
  "serde",
  "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "sp-debug-derive 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "sp-externalities 0.30.0",
- "sp-runtime-interface 29.0.1",
+ "sp-runtime-interface 29.0.0",
  "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "sp-storage 22.0.0",
  "ss58-registry",
  "substrate-bip39 0.6.0",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tracing",
  "w3f-bls",
  "zeroize",
@@ -23316,7 +23038,7 @@ dependencies = [
  "sha2 0.10.9",
  "sha3",
  "sp-crypto-hashing-proc-macro",
- "twox-hash 1.6.3",
+ "twox-hash",
 ]
 
 [[package]]
@@ -23330,7 +23052,7 @@ dependencies = [
  "digest 0.10.7",
  "sha2 0.10.9",
  "sha3",
- "twox-hash 1.6.3",
+ "twox-hash",
 ]
 
 [[package]]
@@ -23339,7 +23061,7 @@ version = "0.1.0"
 dependencies = [
  "quote 1.0.40",
  "sp-crypto-hashing 0.1.0",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -23347,7 +23069,7 @@ name = "sp-database"
 version = "10.0.0"
 dependencies = [
  "kvdb",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
 ]
 
 [[package]]
@@ -23356,7 +23078,7 @@ version = "14.0.0"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -23367,7 +23089,7 @@ checksum = "48d09fa0a5f7299fb81ee25ae3853d26200f7a348148aed6de76be905c007dbe"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -23411,7 +23133,7 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -23453,7 +23175,7 @@ name = "sp-keystore"
 version = "0.34.0"
 dependencies = [
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "sp-core 28.0.0",
  "sp-externalities 0.25.0",
 ]
@@ -23462,7 +23184,7 @@ dependencies = [
 name = "sp-maybe-compressed-blob"
 version = "11.0.0"
 dependencies = [
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "zstd 0.12.4",
 ]
 
@@ -23489,7 +23211,7 @@ dependencies = [
 name = "sp-mmr-primitives"
 version = "26.0.0"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "log",
  "parity-scale-codec",
  "polkadot-ckb-merkle-mountain-range",
@@ -23499,7 +23221,7 @@ dependencies = [
  "sp-core 28.0.0",
  "sp-debug-derive 14.0.0",
  "sp-runtime",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -23611,20 +23333,20 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime-interface"
-version = "29.0.1"
+version = "29.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e99db36a7aff44c335f5d5b36c182a3e0cac61de2fefbe2eeac6af5fb13f63bf"
+checksum = "51e83d940449837a8b2a01b4d877dd22d896fd14d3d3ade875787982da994a33"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
  "parity-scale-codec",
- "polkavm-derive 0.18.0",
+ "polkavm-derive 0.9.1",
  "primitive-types 0.13.1",
  "sp-externalities 0.30.0",
  "sp-runtime-interface-proc-macro 18.0.0",
  "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "sp-storage 22.0.0",
- "sp-tracing 17.1.0",
+ "sp-tracing 17.0.1",
  "sp-wasm-interface 21.0.1",
  "static_assertions",
 ]
@@ -23635,10 +23357,10 @@ version = "17.0.0"
 dependencies = [
  "Inflector",
  "expander",
- "proc-macro-crate 3.3.0",
+ "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -23649,10 +23371,10 @@ checksum = "0195f32c628fee3ce1dfbbf2e7e52a30ea85f3589da9fe62a8b816d70fc06294"
 dependencies = [
  "Inflector",
  "expander",
- "proc-macro-crate 3.3.0",
+ "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -23722,12 +23444,12 @@ name = "sp-state-machine"
 version = "0.35.0"
 dependencies = [
  "arbitrary",
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "assert_matches",
  "hash-db",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "pretty_assertions",
  "rand 0.8.5",
  "smallvec",
@@ -23736,7 +23458,7 @@ dependencies = [
  "sp-panic-handler",
  "sp-runtime",
  "sp-trie",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tracing",
  "trie-db",
 ]
@@ -23760,7 +23482,7 @@ dependencies = [
  "sp-externalities 0.25.0",
  "sp-runtime",
  "sp-runtime-interface 24.0.0",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "x25519-dalek",
 ]
 
@@ -23818,7 +23540,7 @@ dependencies = [
  "parity-scale-codec",
  "sp-inherents",
  "sp-runtime",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -23829,19 +23551,19 @@ dependencies = [
  "regex",
  "tracing",
  "tracing-core",
- "tracing-subscriber 0.3.19",
+ "tracing-subscriber 0.3.18",
 ]
 
 [[package]]
 name = "sp-tracing"
-version = "17.1.0"
+version = "17.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6147a5b8c98b9ed4bf99dc033fab97a468b4645515460974c8784daeb7c35433"
+checksum = "cf641a1d17268c8fcfdb8e0fa51a79c2d4222f4cfda5f3944dbdbc384dced8d5"
 dependencies = [
  "parity-scale-codec",
  "tracing",
  "tracing-core",
- "tracing-subscriber 0.3.19",
+ "tracing-subscriber 0.3.18",
 ]
 
 [[package]]
@@ -23870,15 +23592,15 @@ name = "sp-trie"
 version = "29.0.0"
 dependencies = [
  "ahash",
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "criterion",
  "foldhash",
  "hash-db",
- "hashbrown 0.15.4",
+ "hashbrown 0.15.3",
  "memory-db",
  "nohash-hasher",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "rand 0.8.5",
  "scale-info",
  "schnellru",
@@ -23886,7 +23608,7 @@ dependencies = [
  "sp-externalities 0.25.0",
  "sp-runtime",
  "substrate-prometheus-endpoint",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tracing",
  "trie-bench",
  "trie-db",
@@ -23907,7 +23629,7 @@ dependencies = [
  "sp-runtime",
  "sp-std 14.0.0",
  "sp-version-proc-macro",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -23919,7 +23641,7 @@ dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "sp-version",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -23952,7 +23674,7 @@ dependencies = [
  "bounded-collections 0.3.2",
  "parity-scale-codec",
  "scale-info",
- "schemars 0.8.22",
+ "schemars",
  "serde",
  "smallvec",
  "sp-arithmetic",
@@ -23986,29 +23708,30 @@ dependencies = [
 ]
 
 [[package]]
-name = "spinning_top"
-version = "0.3.0"
+name = "spki"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300"
+checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
 dependencies = [
- "lock_api",
+ "base64ct",
+ "der",
 ]
 
 [[package]]
-name = "spki"
-version = "0.7.3"
+name = "sqlformat"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
+checksum = "7bba3a93db0cc4f7bdece8bb09e77e2e785c20bfebf79eb8340ed80708048790"
 dependencies = [
- "base64ct",
- "der",
+ "nom",
+ "unicode_categories",
 ]
 
 [[package]]
 name = "sqlx"
-version = "0.8.6"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fefb893899429669dcdd979aff487bd78f4064e5e7907e4269081e0ef7d97dc"
+checksum = "93334716a037193fac19df402f8571269c84a00852f6a7066b5d2616dcd64d3e"
 dependencies = [
  "sqlx-core",
  "sqlx-macros",
@@ -24019,32 +23742,37 @@ dependencies = [
 
 [[package]]
 name = "sqlx-core"
-version = "0.8.6"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee6798b1838b6a0f69c007c133b8df5866302197e404e8b6ee8ed3e3a5e68dc6"
+checksum = "d4d8060b456358185f7d50c55d9b5066ad956956fddec42ee2e8567134a8936e"
 dependencies = [
- "base64 0.22.1",
+ "atoi",
+ "byteorder",
  "bytes",
  "crc",
  "crossbeam-queue",
  "either",
- "event-listener 5.4.0",
+ "event-listener 5.3.1",
+ "futures-channel",
  "futures-core",
  "futures-intrusive",
  "futures-io",
  "futures-util",
- "hashbrown 0.15.4",
- "hashlink 0.10.0",
- "indexmap 2.10.0",
+ "hashbrown 0.14.5",
+ "hashlink 0.9.1",
+ "hex",
+ "indexmap 2.9.0",
  "log",
  "memchr",
  "once_cell",
+ "paste",
  "percent-encoding",
  "serde",
  "serde_json",
  "sha2 0.10.9",
  "smallvec",
- "thiserror 2.0.12",
+ "sqlformat",
+ "thiserror 1.0.65",
  "tokio",
  "tokio-stream",
  "tracing",
@@ -24053,22 +23781,22 @@ dependencies = [
 
 [[package]]
 name = "sqlx-macros"
-version = "0.8.6"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2d452988ccaacfbf5e0bdbc348fb91d7c8af5bee192173ac3636b5fb6e6715d"
+checksum = "cac0692bcc9de3b073e8d747391827297e075c7710ff6276d9f7a1f3d58c6657"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "sqlx-core",
  "sqlx-macros-core",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "sqlx-macros-core"
-version = "0.8.6"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19a9c1841124ac5a61741f96e1d9e2ec77424bf323962dd894bdb93f37d5219b"
+checksum = "1804e8a7c7865599c9c79be146dc8a9fd8cc86935fa641d3ea58e5f0688abaa5"
 dependencies = [
  "dotenvy",
  "either",
@@ -24084,16 +23812,17 @@ dependencies = [
  "sqlx-mysql",
  "sqlx-postgres",
  "sqlx-sqlite",
- "syn 2.0.104",
+ "syn 2.0.98",
+ "tempfile",
  "tokio",
  "url",
 ]
 
 [[package]]
 name = "sqlx-mysql"
-version = "0.8.6"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa003f0038df784eb8fecbbac13affe3da23b45194bd57dba231c8f48199c526"
+checksum = "64bb4714269afa44aef2755150a0fc19d756fb580a67db8885608cf02f47d06a"
 dependencies = [
  "atoi",
  "base64 0.22.1",
@@ -24126,16 +23855,16 @@ dependencies = [
  "smallvec",
  "sqlx-core",
  "stringprep",
- "thiserror 2.0.12",
+ "thiserror 1.0.65",
  "tracing",
  "whoami",
 ]
 
 [[package]]
 name = "sqlx-postgres"
-version = "0.8.6"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db58fcd5a53cf07c184b154801ff91347e4c30d17a3562a635ff028ad5deda46"
+checksum = "6fa91a732d854c5d7726349bb4bb879bb9478993ceb764247660aee25f67c2f8"
 dependencies = [
  "atoi",
  "base64 0.22.1",
@@ -24146,6 +23875,7 @@ dependencies = [
  "etcetera",
  "futures-channel",
  "futures-core",
+ "futures-io",
  "futures-util",
  "hex",
  "hkdf",
@@ -24163,16 +23893,16 @@ dependencies = [
  "smallvec",
  "sqlx-core",
  "stringprep",
- "thiserror 2.0.12",
+ "thiserror 1.0.65",
  "tracing",
  "whoami",
 ]
 
 [[package]]
 name = "sqlx-sqlite"
-version = "0.8.6"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2d12fe70b2c1b4401038055f90f151b78208de1f9f89a7dbfd41587a10c3eea"
+checksum = "d5b2cf34a45953bfd3daaf3db0f7a7878ab9b7a6b91b422d24a7a9e4c857b680"
 dependencies = [
  "atoi",
  "flume",
@@ -24187,16 +23917,15 @@ dependencies = [
  "serde",
  "serde_urlencoded",
  "sqlx-core",
- "thiserror 2.0.12",
  "tracing",
  "url",
 ]
 
 [[package]]
 name = "ss58-registry"
-version = "1.51.0"
+version = "1.43.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19409f13998e55816d1c728395af0b52ec066206341d939e22e7766df9b494b8"
+checksum = "5e6915280e2d0db8911e5032a5c275571af6bdded2916abd691a659be25d3439"
 dependencies = [
  "Inflector",
  "num-format",
@@ -24204,7 +23933,7 @@ dependencies = [
  "quote 1.0.40",
  "serde",
  "serde_json",
- "unicode-xid 0.2.6",
+ "unicode-xid 0.2.4",
 ]
 
 [[package]]
@@ -24255,7 +23984,7 @@ dependencies = [
 name = "staging-node-cli"
 version = "3.0.0-dev"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "assert_cmd",
  "clap",
  "clap_complete",
@@ -24277,7 +24006,7 @@ dependencies = [
  "scale-info",
  "serde",
  "serde_json",
- "soketto 0.8.1",
+ "soketto 0.8.0",
  "sp-keyring",
  "staging-node-inspect",
  "substrate-cli-test-utils",
@@ -24302,7 +24031,7 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-statement-store",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -24325,7 +24054,7 @@ version = "2.0.0"
 name = "staging-xcm"
 version = "7.0.1"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "bounded-collections 0.3.2",
  "derive-where",
  "environmental",
@@ -24334,7 +24063,7 @@ dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
  "scale-info",
- "schemars 0.8.22",
+ "schemars",
  "serde",
  "sp-io",
  "sp-runtime",
@@ -24403,24 +24132,24 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "static_init"
-version = "1.0.4"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bae1df58c5fea7502e8e352ec26b5579f6178e1fdb311e088580c980dee25ed"
+checksum = "8a2a1c578e98c1c16fc3b8ec1328f7659a500737d7a0c6d625e73e830ff9c1f6"
 dependencies = [
  "bitflags 1.3.2",
- "cfg_aliases 0.2.1",
+ "cfg_aliases 0.1.1",
  "libc",
- "parking_lot 0.12.4",
- "parking_lot_core 0.9.11",
+ "parking_lot 0.11.2",
+ "parking_lot_core 0.8.6",
  "static_init_macro",
  "winapi",
 ]
 
 [[package]]
 name = "static_init_macro"
-version = "1.0.4"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1389c88ddd739ec6d3f8f83343764a0e944cd23cfbf126a9796a714b0b6edd6f"
+checksum = "70a2595fc3aa78f2d0e45dd425b22282dd863273761cc77780914b2cf3003acf"
 dependencies = [
  "cfg_aliases 0.1.1",
  "memchr",
@@ -24498,7 +24227,7 @@ dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "rustversion",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -24517,7 +24246,7 @@ dependencies = [
  "parity-bip39",
  "pbkdf2",
  "rustc-hex",
- "schnorrkel 0.11.5",
+ "schnorrkel 0.11.4",
  "sha2 0.10.9",
  "zeroize",
 ]
@@ -24530,7 +24259,7 @@ checksum = "ca58ffd742f693dc13d69bdbb2e642ae239e0053f6aab3b104252892f856700a"
 dependencies = [
  "hmac 0.12.1",
  "pbkdf2",
- "schnorrkel 0.11.5",
+ "schnorrkel 0.11.4",
  "sha2 0.10.9",
  "zeroize",
 ]
@@ -24619,7 +24348,7 @@ dependencies = [
  "hyper-util",
  "log",
  "prometheus",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tokio",
 ]
 
@@ -24662,7 +24391,7 @@ dependencies = [
  "sp-runtime",
  "sp-trie",
  "strum 0.26.3",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -24699,7 +24428,7 @@ dependencies = [
 name = "substrate-test-client"
 version = "2.0.1"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "async-trait",
  "futures",
  "parity-scale-codec",
@@ -24723,7 +24452,7 @@ dependencies = [
 name = "substrate-test-runtime"
 version = "2.0.0"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "frame-executive",
  "frame-metadata-hash-extension",
  "frame-support",
@@ -24799,13 +24528,13 @@ dependencies = [
  "futures",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "sc-transaction-pool",
  "sc-transaction-pool-api",
  "sp-blockchain",
  "sp-runtime",
  "substrate-test-runtime-client",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -24829,13 +24558,13 @@ dependencies = [
  "hex",
  "jsonrpsee",
  "parity-scale-codec",
- "parking_lot 0.12.4",
- "rand 0.9.2",
+ "parking_lot 0.12.3",
+ "rand 0.9.0",
  "serde",
  "serde_json",
  "subxt 0.41.0",
  "subxt-core 0.41.0",
- "subxt-rpcs 0.41.0",
+ "subxt-rpcs",
  "subxt-signer 0.41.0",
  "termplot",
  "thiserror 2.0.12",
@@ -24843,14 +24572,14 @@ dependencies = [
  "tokio",
  "tokio-util",
  "tracing",
- "tracing-subscriber 0.3.19",
+ "tracing-subscriber 0.3.18",
 ]
 
 [[package]]
 name = "substrate-wasm-builder"
 version = "17.0.0"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "build-helper",
  "cargo_metadata",
  "console",
@@ -24870,7 +24599,7 @@ dependencies = [
  "sp-version",
  "strum 0.26.3",
  "tempfile",
- "toml 0.8.23",
+ "toml 0.8.19",
  "walkdir",
  "wasm-opt",
 ]
@@ -24883,9 +24612,9 @@ checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
 
 [[package]]
 name = "subtle"
-version = "2.6.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
 
 [[package]]
 name = "subtle-ng"
@@ -24906,6 +24635,7 @@ dependencies = [
  "futures",
  "hex",
  "impl-serde",
+ "jsonrpsee",
  "parity-scale-codec",
  "polkadot-sdk 0.7.0",
  "primitive-types 0.13.1",
@@ -24916,12 +24646,16 @@ dependencies = [
  "scale-value 0.17.0",
  "serde",
  "serde_json",
- "subxt-core 0.38.1",
- "subxt-macro 0.38.1",
- "subxt-metadata 0.38.1",
- "thiserror 1.0.69",
+ "subxt-core 0.38.0",
+ "subxt-lightclient 0.38.0",
+ "subxt-macro 0.38.0",
+ "subxt-metadata 0.38.0",
+ "thiserror 1.0.65",
+ "tokio",
+ "tokio-util",
  "tracing",
  "url",
+ "wasm-bindgen-futures",
  "web-time",
 ]
 
@@ -24952,44 +24686,7 @@ dependencies = [
  "subxt-lightclient 0.41.0",
  "subxt-macro 0.41.0",
  "subxt-metadata 0.41.0",
- "subxt-rpcs 0.41.0",
- "thiserror 2.0.12",
- "tokio",
- "tokio-util",
- "tracing",
- "url",
- "wasm-bindgen-futures",
- "web-time",
-]
-
-[[package]]
-name = "subxt"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c7533d39317bed01100b37158740dcec27c0e1933f3bca19bdf12110f242248"
-dependencies = [
- "async-trait",
- "derive-where",
- "either",
- "frame-metadata 23.0.0",
- "futures",
- "hex",
- "jsonrpsee",
- "parity-scale-codec",
- "primitive-types 0.13.1",
- "scale-bits 0.7.0",
- "scale-decode 0.16.0",
- "scale-encode 0.10.0",
- "scale-info",
- "scale-value 0.18.0",
- "serde",
- "serde_json",
- "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "subxt-core 0.42.1",
- "subxt-lightclient 0.42.1",
- "subxt-macro 0.42.1",
- "subxt-metadata 0.42.1",
- "subxt-rpcs 0.42.1",
+ "subxt-rpcs",
  "thiserror 2.0.12",
  "tokio",
  "tokio-util",
@@ -25001,9 +24698,9 @@ dependencies = [
 
 [[package]]
 name = "subxt-codegen"
-version = "0.38.1"
+version = "0.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6550ef451c77db6e3bc7c56fb6fe1dca9398a2c8fc774b127f6a396a769b9c5b"
+checksum = "3cfcfb7d9589f3df0ac87c4988661cf3fb370761fcb19f2fd33104cc59daf22a"
 dependencies = [
  "heck 0.5.0",
  "parity-scale-codec",
@@ -25011,9 +24708,9 @@ dependencies = [
  "quote 1.0.40",
  "scale-info",
  "scale-typegen 0.9.0",
- "subxt-metadata 0.38.1",
- "syn 2.0.104",
- "thiserror 1.0.69",
+ "subxt-metadata 0.38.0",
+ "syn 2.0.98",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -25029,32 +24726,15 @@ dependencies = [
  "scale-info",
  "scale-typegen 0.11.1",
  "subxt-metadata 0.41.0",
- "syn 2.0.104",
- "thiserror 2.0.12",
-]
-
-[[package]]
-name = "subxt-codegen"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ded0fa15fa78c58b91e2a1c6bcef8a2bc68fe165d00e1dfb9787069351511c"
-dependencies = [
- "heck 0.5.0",
- "parity-scale-codec",
- "proc-macro2 1.0.95",
- "quote 1.0.40",
- "scale-info",
- "scale-typegen 0.11.1",
- "subxt-metadata 0.42.1",
- "syn 2.0.104",
+ "syn 2.0.98",
  "thiserror 2.0.12",
 ]
 
 [[package]]
 name = "subxt-core"
-version = "0.38.1"
+version = "0.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7a1bc6c9c1724971636a66e3225a7253cdb35bb6efb81524a6c71c04f08c59"
+checksum = "7ea28114366780d23684bd55ab879cd04c9d4cbba3b727a3854a3eca6bf29a1a"
 dependencies = [
  "base58",
  "blake2 0.10.6",
@@ -25075,7 +24755,7 @@ dependencies = [
  "scale-value 0.17.0",
  "serde",
  "serde_json",
- "subxt-metadata 0.38.1",
+ "subxt-metadata 0.38.0",
  "tracing",
 ]
 
@@ -25109,48 +24789,18 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "subxt-core"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26c3574b60050e57cf23edf6521263b06e98a880073df330813bb04242633083"
-dependencies = [
- "base58",
- "blake2 0.10.6",
- "derive-where",
- "frame-decode 0.8.3",
- "frame-metadata 23.0.0",
- "hashbrown 0.14.5",
- "hex",
- "impl-serde",
- "keccak-hash",
- "parity-scale-codec",
- "primitive-types 0.13.1",
- "scale-bits 0.7.0",
- "scale-decode 0.16.0",
- "scale-encode 0.10.0",
- "scale-info",
- "scale-value 0.18.0",
- "serde",
- "serde_json",
- "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "subxt-metadata 0.42.1",
- "thiserror 2.0.12",
- "tracing",
-]
-
 [[package]]
 name = "subxt-lightclient"
-version = "0.41.0"
+version = "0.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce07c2515b2e63b85ec3043fe4461b287af0615d4832c2fe6e81ba780b906bc0"
+checksum = "534d4b725183a9fa09ce0e0f135674473297fdd97dee4d683f41117f365ae997"
 dependencies = [
  "futures",
  "futures-util",
  "serde",
  "serde_json",
  "smoldot-light 0.16.2",
- "thiserror 2.0.12",
+ "thiserror 1.0.65",
  "tokio",
  "tokio-stream",
  "tracing",
@@ -25158,15 +24808,15 @@ dependencies = [
 
 [[package]]
 name = "subxt-lightclient"
-version = "0.42.1"
+version = "0.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c546d42ca103c0a6a3434cadf4ca500d2a49e60af0842b0fdee6fbfa97aa02f"
+checksum = "ce07c2515b2e63b85ec3043fe4461b287af0615d4832c2fe6e81ba780b906bc0"
 dependencies = [
  "futures",
  "futures-util",
  "serde",
  "serde_json",
- "smoldot-light 0.17.2",
+ "smoldot-light 0.16.2",
  "thiserror 2.0.12",
  "tokio",
  "tokio-stream",
@@ -25175,18 +24825,18 @@ dependencies = [
 
 [[package]]
 name = "subxt-macro"
-version = "0.38.1"
+version = "0.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7819c5e09aae0319981ee853869f2fcd1fac4db8babd0d004c17161297aadc05"
+checksum = "228db9a5c95a6d8dc6152b4d6cdcbabc4f60821dd3f482a4f8791e022b7caadb"
 dependencies = [
  "darling",
  "parity-scale-codec",
  "proc-macro-error2",
  "quote 1.0.40",
  "scale-typegen 0.9.0",
- "subxt-codegen 0.38.1",
- "subxt-utils-fetchmetadata 0.38.1",
- "syn 2.0.104",
+ "subxt-codegen 0.38.0",
+ "subxt-utils-fetchmetadata 0.38.0",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -25202,31 +24852,14 @@ dependencies = [
  "scale-typegen 0.11.1",
  "subxt-codegen 0.41.0",
  "subxt-utils-fetchmetadata 0.41.0",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "subxt-macro"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d91d253492eb17c65bdb41e538d6a31508563757bd34ad6014cb03536cf31757"
-dependencies = [
- "darling",
- "parity-scale-codec",
- "proc-macro-error2",
- "quote 1.0.40",
- "scale-typegen 0.11.1",
- "subxt-codegen 0.42.1",
- "subxt-metadata 0.42.1",
- "subxt-utils-fetchmetadata 0.42.1",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "subxt-metadata"
-version = "0.38.1"
+version = "0.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aacd4e7484fef58deaa2dcb32d94753a864b208a668c0dd0c28be1d8abeeadb2"
+checksum = "ee13e6862eda035557d9a2871955306aff540d2b89c06e0a62a1136a700aed28"
 dependencies = [
  "frame-decode 0.5.1",
  "frame-metadata 17.0.0",
@@ -25251,21 +24884,6 @@ dependencies = [
  "thiserror 2.0.12",
 ]
 
-[[package]]
-name = "subxt-metadata"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243990ca4e0cdb74ef7458f1d5070a1bd5144d744cc146f23a32ab56d23e1db7"
-dependencies = [
- "frame-decode 0.8.3",
- "frame-metadata 23.0.0",
- "hashbrown 0.14.5",
- "parity-scale-codec",
- "scale-info",
- "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "thiserror 2.0.12",
-]
-
 [[package]]
 name = "subxt-rpcs"
 version = "0.41.0"
@@ -25292,76 +24910,51 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "subxt-rpcs"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55313e3652f5360b5ed878bfe1d62fe181ecb8c130c81278ab89d1580f89a7ed"
-dependencies = [
- "derive-where",
- "frame-metadata 23.0.0",
- "futures",
- "hex",
- "impl-serde",
- "jsonrpsee",
- "parity-scale-codec",
- "primitive-types 0.13.1",
- "serde",
- "serde_json",
- "subxt-core 0.42.1",
- "subxt-lightclient 0.42.1",
- "thiserror 2.0.12",
- "tokio-util",
- "tracing",
- "url",
-]
-
 [[package]]
 name = "subxt-signer"
-version = "0.41.0"
+version = "0.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a2370298a210ed1df26152db7209a85e0ed8cfbce035309c3b37f7b61755377"
+checksum = "1e7a336d6a1f86f126100a4a717be58352de4c8214300c4f7807f974494efdb9"
 dependencies = [
  "base64 0.22.1",
- "bip32",
  "bip39",
  "cfg-if",
  "crypto_secretbox",
  "hex",
  "hmac 0.12.1",
- "keccak-hash",
  "parity-scale-codec",
  "pbkdf2",
+ "polkadot-sdk 0.7.0",
  "regex",
- "schnorrkel 0.11.5",
+ "schnorrkel 0.11.4",
  "scrypt",
  "secp256k1 0.30.0",
  "secrecy 0.10.3",
  "serde",
  "serde_json",
  "sha2 0.10.9",
- "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "subxt-core 0.41.0",
- "thiserror 2.0.12",
+ "subxt-core 0.38.0",
  "zeroize",
 ]
 
 [[package]]
 name = "subxt-signer"
-version = "0.42.1"
+version = "0.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b58aeda7bebddedbef69ac55ae592fb9eef499927b50d42c43862d1664b5e5b3"
+checksum = "4a2370298a210ed1df26152db7209a85e0ed8cfbce035309c3b37f7b61755377"
 dependencies = [
  "base64 0.22.1",
+ "bip32",
  "bip39",
  "cfg-if",
  "crypto_secretbox",
  "hex",
  "hmac 0.12.1",
+ "keccak-hash",
  "parity-scale-codec",
  "pbkdf2",
  "regex",
- "schnorrkel 0.11.5",
+ "schnorrkel 0.11.4",
  "scrypt",
  "secp256k1 0.30.0",
  "secrecy 0.10.3",
@@ -25369,20 +24962,20 @@ dependencies = [
  "serde_json",
  "sha2 0.10.9",
  "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "subxt-core 0.42.1",
+ "subxt-core 0.41.0",
  "thiserror 2.0.12",
  "zeroize",
 ]
 
 [[package]]
 name = "subxt-utils-fetchmetadata"
-version = "0.38.1"
+version = "0.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3c53bc3eeaacc143a2f29ace4082edd2edaccab37b69ad20befba9fb00fdb3d"
+checksum = "3082b17a86e3c3fe45d858d94d68f6b5247caace193dad6201688f24db8ba9bb"
 dependencies = [
  "hex",
  "parity-scale-codec",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
@@ -25396,28 +24989,17 @@ dependencies = [
  "thiserror 2.0.12",
 ]
 
-[[package]]
-name = "subxt-utils-fetchmetadata"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62d3a6e9cb2fd2db8bf3cb0d03da691ac949259e620c9eb8f25764b2711805ca"
-dependencies = [
- "hex",
- "parity-scale-codec",
- "thiserror 2.0.12",
-]
-
 [[package]]
 name = "sval"
-version = "2.14.1"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cc9739f56c5d0c44a5ed45473ec868af02eb896af8c05f616673a31e1d1bb09"
+checksum = "8b031320a434d3e9477ccf9b5756d57d4272937b8d22cb88af80b7633a1b78b1"
 
 [[package]]
 name = "sval_buffer"
-version = "2.14.1"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f39b07436a8c271b34dad5070c634d1d3d76d6776e938ee97b4a66a5e8003d0b"
+checksum = "6bf7e9412af26b342f3f2cc5cc4122b0105e9d16eb76046cd14ed10106cf6028"
 dependencies = [
  "sval",
  "sval_ref",
@@ -25425,18 +25007,18 @@ dependencies = [
 
 [[package]]
 name = "sval_dynamic"
-version = "2.14.1"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffcb072d857431bf885580dacecf05ed987bac931230736739a79051dbf3499b"
+checksum = "a0ef628e8a77a46ed3338db8d1b08af77495123cc229453084e47cd716d403cf"
 dependencies = [
  "sval",
 ]
 
 [[package]]
 name = "sval_fmt"
-version = "2.14.1"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f214f427ad94a553e5ca5514c95c6be84667cbc5568cce957f03f3477d03d5c"
+checksum = "7dc09e9364c2045ab5fa38f7b04d077b3359d30c4c2b3ec4bae67a358bd64326"
 dependencies = [
  "itoa",
  "ryu",
@@ -25445,65 +25027,55 @@ dependencies = [
 
 [[package]]
 name = "sval_json"
-version = "2.14.1"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "389ed34b32e638dec9a99c8ac92d0aa1220d40041026b625474c2b6a4d6f4feb"
+checksum = "ada6f627e38cbb8860283649509d87bc4a5771141daa41c78fd31f2b9485888d"
 dependencies = [
  "itoa",
  "ryu",
  "sval",
 ]
 
-[[package]]
-name = "sval_nested"
-version = "2.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14bae8fcb2f24fee2c42c1f19037707f7c9a29a0cda936d2188d48a961c4bb2a"
-dependencies = [
- "sval",
- "sval_buffer",
- "sval_ref",
-]
-
 [[package]]
 name = "sval_ref"
-version = "2.14.1"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a4eaea3821d3046dcba81d4b8489421da42961889902342691fb7eab491d79e"
+checksum = "703ca1942a984bd0d9b5a4c0a65ab8b4b794038d080af4eb303c71bc6bf22d7c"
 dependencies = [
  "sval",
 ]
 
 [[package]]
 name = "sval_serde"
-version = "2.14.1"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "172dd4aa8cb3b45c8ac8f3b4111d644cd26938b0643ede8f93070812b87fb339"
+checksum = "830926cd0581f7c3e5d51efae4d35c6b6fc4db583842652891ba2f1bed8db046"
 dependencies = [
  "serde",
  "sval",
- "sval_nested",
+ "sval_buffer",
+ "sval_fmt",
 ]
 
 [[package]]
 name = "symbolic-common"
-version = "12.16.0"
+version = "12.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c5199e46f23c77c611aa2a383b2f72721dfee4fb2bf85979eea1e0f26ba6e35"
+checksum = "66135c8273581acaab470356f808a1c74a707fe7ec24728af019d7247e089e71"
 dependencies = [
  "debugid",
- "memmap2 0.9.7",
+ "memmap2 0.9.3",
  "stable_deref_trait",
  "uuid",
 ]
 
 [[package]]
 name = "symbolic-demangle"
-version = "12.16.0"
+version = "12.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa3c03956e32254f74e461a330b9522a2689686d80481708fb2014780d8d3959"
+checksum = "42bcacd080282a72e795864660b148392af7babd75691d5ae9a3b77e29c98c77"
 dependencies = [
- "cpp_demangle 0.4.4",
+ "cpp_demangle 0.4.3",
  "rustc-demangle",
  "symbolic-common",
 ]
@@ -25532,9 +25104,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.104"
+version = "2.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
+checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
@@ -25543,21 +25115,21 @@ dependencies = [
 
 [[package]]
 name = "syn-solidity"
-version = "1.3.0"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a985ff4ffd7373e10e0fb048110fb11a162e5a4c47f92ddb8787a6f766b769"
+checksum = "1b5d879005cc1b5ba4e18665be9e9501d9da3a9b95f625497c4cb7ee082b532e"
 dependencies = [
  "paste",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "sync_wrapper"
-version = "1.0.2"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
+checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
 dependencies = [
  "futures-core",
 ]
@@ -25571,25 +25143,25 @@ dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "syn 1.0.109",
- "unicode-xid 0.2.6",
+ "unicode-xid 0.2.4",
 ]
 
 [[package]]
 name = "synstructure"
-version = "0.13.2"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "sysinfo"
-version = "0.30.13"
+version = "0.30.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3"
+checksum = "1fb4f3438c8f6389c864e61221cbc97e9bca98b4daf39a5beb7bea660f528bb2"
 dependencies = [
  "cfg-if",
  "core-foundation-sys",
@@ -25600,6 +25172,17 @@ dependencies = [
  "windows 0.52.0",
 ]
 
+[[package]]
+name = "system-configuration"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "system-configuration-sys 0.5.0",
+]
+
 [[package]]
 name = "system-configuration"
 version = "0.6.1"
@@ -25607,8 +25190,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
  "bitflags 2.9.1",
- "core-foundation 0.9.4",
- "system-configuration-sys",
+ "core-foundation",
+ "system-configuration-sys 0.6.0",
+]
+
+[[package]]
+name = "system-configuration-sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
 ]
 
 [[package]]
@@ -25635,9 +25228,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "tar"
-version = "0.4.44"
+version = "0.4.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d863878d212c87a19c1a610eb53bb01fe12951c0501cf5a0d65f724914a667a"
+checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb"
 dependencies = [
  "filetime",
  "libc",
@@ -25646,26 +25239,26 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.16"
+version = "0.12.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
+checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a"
 
 [[package]]
 name = "target-triple"
-version = "0.1.4"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ac9aa371f599d22256307c24a9d748c041e548cbf599f35d890f9d365361790"
+checksum = "42a4d50cdb458045afc8131fd91b64904da29548bcb63c7236e0844936c13078"
 
 [[package]]
 name = "tempfile"
-version = "3.20.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
+checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
 dependencies = [
+ "cfg-if",
  "fastrand 2.3.0",
- "getrandom 0.3.3",
  "once_cell",
- "rustix 1.0.8",
+ "rustix 0.38.42",
  "windows-sys 0.59.0",
 ]
 
@@ -25674,28 +25267,28 @@ name = "template-zombienet-tests"
 version = "0.0.0"
 dependencies = [
  "anyhow",
- "env_logger 0.11.8",
+ "env_logger 0.11.3",
  "tokio",
  "zombienet-sdk",
 ]
 
 [[package]]
 name = "termcolor"
-version = "1.4.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
 dependencies = [
  "winapi-util",
 ]
 
 [[package]]
 name = "terminal_size"
-version = "0.4.2"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45c6481c4829e4cc63825e62c49186a34538b7b2750b73b266581ffb612fb5ed"
+checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
 dependencies = [
- "rustix 1.0.8",
- "windows-sys 0.59.0",
+ "rustix 0.38.42",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -25709,30 +25302,30 @@ dependencies = [
 
 [[package]]
 name = "termtree"
-version = "0.5.1"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683"
+checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 
 [[package]]
 name = "test-log"
-version = "0.2.18"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e33b98a582ea0be1168eba097538ee8dd4bbe0f2b01b22ac92ea30054e5be7b"
+checksum = "3dffced63c2b5c7be278154d76b479f9f9920ed34e7574201407f0b14e2bbb93"
 dependencies = [
- "env_logger 0.11.8",
+ "env_logger 0.11.3",
  "test-log-macros",
- "tracing-subscriber 0.3.19",
+ "tracing-subscriber 0.3.18",
 ]
 
 [[package]]
 name = "test-log-macros"
-version = "0.2.18"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "451b374529930d7601b1eef8d32bc79ae870b6079b069401709c2a8bf9e75f36"
+checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -25847,11 +25440,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.69"
+version = "1.0.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5"
 dependencies = [
- "thiserror-impl 1.0.69",
+ "thiserror-impl 1.0.65",
 ]
 
 [[package]]
@@ -25865,33 +25458,33 @@ dependencies = [
 
 [[package]]
 name = "thiserror-core"
-version = "1.0.50"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c001ee18b7e5e3f62cbf58c7fe220119e68d902bb7443179c0c8aef30090e999"
+checksum = "0d97345f6437bb2004cd58819d8a9ef8e36cdd7661c2abc4bbde0a7c40d9f497"
 dependencies = [
  "thiserror-core-impl",
 ]
 
 [[package]]
 name = "thiserror-core-impl"
-version = "1.0.50"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4c60d69f36615a077cc7663b9cb8e42275722d23e58a7fa3d2c7f2915d09d04"
+checksum = "10ac1c5050e43014d16b2f94d0d2ce79e65ffdd8b38d8048f9c8f6a8a6da62ac"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.69"
+version = "1.0.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -25902,7 +25495,7 @@ checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -25913,11 +25506,12 @@ checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820"
 
 [[package]]
 name = "thread_local"
-version = "1.1.9"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
 dependencies = [
  "cfg-if",
+ "once_cell",
 ]
 
 [[package]]
@@ -25962,9 +25556,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.41"
+version = "0.3.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
 dependencies = [
  "deranged",
  "itoa",
@@ -25979,15 +25573,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.4"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.22"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
 dependencies = [
  "num-conv",
  "time-core",
@@ -26004,9 +25598,9 @@ dependencies = [
 
 [[package]]
 name = "tinystr"
-version = "0.8.1"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
 dependencies = [
  "displaydoc",
  "zerovec",
@@ -26024,9 +25618,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.9.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -26039,29 +25633,27 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.46.1"
+version = "1.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cc3a2344dafbe23a245241fe8b09735b521110d30fcefbbd5feb1797ca35d17"
+checksum = "2513ca694ef9ede0fb23fe71a4ee4107cb102b9dc1930f6d0fd77aae068ae165"
 dependencies = [
  "backtrace",
  "bytes",
- "io-uring",
  "libc",
  "mio",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "pin-project-lite",
  "signal-hook-registry",
- "slab",
- "socket2 0.5.10",
+ "socket2 0.5.9",
  "tokio-macros",
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "tokio-io-timeout"
-version = "1.2.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bd86198d9ee903fedd2f9a2e72014287c0d9167e4ae43b5853007205dda1b76"
+checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf"
 dependencies = [
  "pin-project-lite",
  "tokio",
@@ -26075,7 +25667,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -26105,25 +25697,26 @@ version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
 dependencies = [
- "rustls 0.21.12",
+ "rustls 0.21.7",
  "tokio",
 ]
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.2"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
+checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
 dependencies = [
- "rustls 0.23.29",
+ "rustls 0.23.18",
+ "rustls-pki-types",
  "tokio",
 ]
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.17"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
+checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -26176,11 +25769,11 @@ checksum = "489a59b6730eda1b0171fcfda8b121f4bee2b35cba8645ca35c5f7ba3eb736c1"
 dependencies = [
  "futures-util",
  "log",
- "rustls 0.23.29",
- "rustls-native-certs 0.8.1",
+ "rustls 0.23.18",
+ "rustls-native-certs 0.8.0",
  "rustls-pki-types",
  "tokio",
- "tokio-rustls 0.26.2",
+ "tokio-rustls 0.26.0",
  "tungstenite 0.27.0",
 ]
 
@@ -26210,45 +25803,21 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
-dependencies = [
- "serde",
- "serde_spanned 0.6.9",
- "toml_datetime 0.6.11",
- "toml_edit 0.22.27",
-]
-
-[[package]]
-name = "toml"
-version = "0.9.2"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed0aee96c12fa71097902e0bb061a5e1ebd766a6636bb605ba401c45c1650eac"
+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
 dependencies = [
- "indexmap 2.10.0",
  "serde",
- "serde_spanned 1.0.0",
- "toml_datetime 0.7.0",
- "toml_parser",
- "toml_writer",
- "winnow 0.7.12",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit 0.22.22",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.11"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
 dependencies = [
  "serde",
 ]
@@ -26259,46 +25828,35 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.10.0",
- "toml_datetime 0.6.11",
- "winnow 0.5.40",
+ "indexmap 2.9.0",
+ "toml_datetime",
+ "winnow 0.5.15",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.27"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
+checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03"
 dependencies = [
- "indexmap 2.10.0",
- "serde",
- "serde_spanned 0.6.9",
- "toml_datetime 0.6.11",
- "toml_write",
- "winnow 0.7.12",
+ "indexmap 2.9.0",
+ "toml_datetime",
+ "winnow 0.5.15",
 ]
 
 [[package]]
-name = "toml_parser"
-version = "1.0.1"
+name = "toml_edit"
+version = "0.22.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97200572db069e74c512a14117b296ba0a80a30123fbbb5aa1f4a348f639ca30"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
- "winnow 0.7.12",
+ "indexmap 2.9.0",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow 0.6.18",
 ]
 
-[[package]]
-name = "toml_write"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
-
-[[package]]
-name = "toml_writer"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcc842091f2def52017664b53082ecbbeb5c7731092bad69d2c63050401dfd64"
-
 [[package]]
 name = "tower"
 version = "0.4.13"
@@ -26316,21 +25874,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "tower"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
-dependencies = [
- "futures-core",
- "futures-util",
- "pin-project-lite",
- "sync_wrapper",
- "tokio",
- "tower-layer",
- "tower-service",
-]
-
 [[package]]
 name = "tower-http"
 version = "0.4.4"
@@ -26342,8 +25885,8 @@ dependencies = [
  "bytes",
  "futures-core",
  "futures-util",
- "http 0.2.12",
- "http-body 0.4.6",
+ "http 0.2.9",
+ "http-body 0.4.5",
  "http-range-header",
  "mime",
  "pin-project-lite",
@@ -26360,49 +25903,31 @@ checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5"
 dependencies = [
  "bitflags 2.9.1",
  "bytes",
- "http 1.3.1",
- "http-body 1.0.1",
+ "http 1.1.0",
+ "http-body 1.0.0",
  "http-body-util",
  "pin-project-lite",
  "tower-layer",
  "tower-service",
 ]
 
-[[package]]
-name = "tower-http"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
-dependencies = [
- "bitflags 2.9.1",
- "bytes",
- "futures-util",
- "http 1.3.1",
- "http-body 1.0.1",
- "iri-string",
- "pin-project-lite",
- "tower 0.5.2",
- "tower-layer",
- "tower-service",
-]
-
 [[package]]
 name = "tower-layer"
-version = "0.3.3"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
+checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
 
 [[package]]
 name = "tower-service"
-version = "0.3.3"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
 
 [[package]]
 name = "tracing"
-version = "0.1.41"
+version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
  "log",
  "pin-project-lite",
@@ -26412,20 +25937,20 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.30"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.34"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
 dependencies = [
  "once_cell",
  "valuable",
@@ -26457,10 +25982,10 @@ version = "5.0.0"
 dependencies = [
  "assert_matches",
  "expander",
- "proc-macro-crate 3.3.0",
+ "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -26485,15 +26010,15 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.19"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
 dependencies = [
  "chrono",
  "matchers",
  "nu-ansi-term",
  "once_cell",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "regex",
  "sharded-slab",
  "smallvec",
@@ -26553,15 +26078,15 @@ dependencies = [
 
 [[package]]
 name = "try-lock"
-version = "0.2.5"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 
 [[package]]
 name = "trybuild"
-version = "1.0.106"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65af40ad689f2527aebbd37a0a816aea88ff5f774ceabe99de5be02f2f91dae2"
+checksum = "b812699e0c4f813b872b373a4471717d9eb550da14b311058a4d9cf4173cbca6"
 dependencies = [
  "dissimilar",
  "glob",
@@ -26570,7 +26095,7 @@ dependencies = [
  "serde_json",
  "target-triple",
  "termcolor",
- "toml 0.9.2",
+ "toml 0.8.19",
 ]
 
 [[package]]
@@ -26588,12 +26113,12 @@ dependencies = [
  "byteorder",
  "bytes",
  "data-encoding",
- "http 0.2.12",
+ "http 0.2.9",
  "httparse",
  "log",
  "rand 0.8.5",
  "sha1",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "url",
  "utf-8",
 ]
@@ -26606,10 +26131,10 @@ checksum = "4793cb5e56680ecbb1d843515b23b6de9a75eb04b66643e256a396d43be33c13"
 dependencies = [
  "bytes",
  "data-encoding",
- "http 1.3.1",
+ "http 1.1.0",
  "httparse",
  "log",
- "rand 0.9.2",
+ "rand 0.9.0",
  "sha1",
  "thiserror 2.0.12",
  "utf-8",
@@ -26623,11 +26148,11 @@ checksum = "eadc29d668c91fcc564941132e17b28a7ceb2f3ebf0b9dae3e03fd7a6748eb0d"
 dependencies = [
  "bytes",
  "data-encoding",
- "http 1.3.1",
+ "http 1.1.0",
  "httparse",
  "log",
- "rand 0.9.2",
- "rustls 0.23.29",
+ "rand 0.9.0",
+ "rustls 0.23.18",
  "rustls-pki-types",
  "sha1",
  "thiserror 2.0.12",
@@ -26653,29 +26178,17 @@ dependencies = [
  "static_assertions",
 ]
 
-[[package]]
-name = "twox-hash"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b907da542cbced5261bd3256de1b3a1bf340a3d37f93425a07362a1d687de56"
-
-[[package]]
-name = "typeid"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c"
-
 [[package]]
 name = "typenum"
-version = "1.18.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
+checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 
 [[package]]
 name = "ucd-trie"
-version = "0.1.7"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
+checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
 
 [[package]]
 name = "uint"
@@ -26709,15 +26222,15 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.18"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.18"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
 
 [[package]]
 name = "unicode-normalization"
@@ -26736,15 +26249,21 @@ checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0"
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.12.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
 
 [[package]]
 name = "unicode-width"
-version = "0.2.1"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a1a07cc7db3810833284e8d372ccdc6da29741639ecc70c9ec107df0fa6154c"
+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+
+[[package]]
+name = "unicode-width"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
 
 [[package]]
 name = "unicode-xid"
@@ -26754,9 +26273,15 @@ checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.6"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
+
+[[package]]
+name = "unicode_categories"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
 
 [[package]]
 name = "universal-hash"
@@ -26765,7 +26290,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
 dependencies = [
  "crypto-common",
- "subtle 2.6.1",
+ "subtle 2.5.0",
 ]
 
 [[package]]
@@ -26815,7 +26340,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
- "idna",
+ "idna 1.0.3",
  "percent-encoding",
  "serde",
 ]
@@ -26826,6 +26351,12 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
 [[package]]
 name = "utf8_iter"
 version = "1.0.4"
@@ -26834,32 +26365,30 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
 
 [[package]]
 name = "utf8parse"
-version = "0.2.2"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "uuid"
-version = "1.17.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d"
+checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
 dependencies = [
- "getrandom 0.3.3",
- "js-sys",
- "wasm-bindgen",
+ "getrandom 0.2.10",
 ]
 
 [[package]]
 name = "valuable"
-version = "0.1.1"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
 [[package]]
 name = "value-bag"
-version = "1.11.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "943ce29a8a743eb10d6082545d861b24f9d1b160b7d741e0f2cdf726bec909c5"
+checksum = "8fec26a25bd6fca441cdd0f769fd7f891bae119f996de31f86a5eddccef54c1d"
 dependencies = [
  "value-bag-serde1",
  "value-bag-sval2",
@@ -26867,9 +26396,9 @@ dependencies = [
 
 [[package]]
 name = "value-bag-serde1"
-version = "1.11.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35540706617d373b118d550d41f5dfe0b78a0c195dc13c6815e92e2638432306"
+checksum = "ead5b693d906686203f19a49e88c477fb8c15798b68cf72f60b4b5521b4ad891"
 dependencies = [
  "erased-serde",
  "serde",
@@ -26878,9 +26407,9 @@ dependencies = [
 
 [[package]]
 name = "value-bag-sval2"
-version = "1.11.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fe7e140a2658cc16f7ee7a86e413e803fc8f9b5127adc8755c19f9fefa63a52"
+checksum = "3b9d0f4a816370c3a0d7d82d603b62198af17675b12fe5e91de6b47ceb505882"
 dependencies = [
  "sval",
  "sval_buffer",
@@ -26916,9 +26445,9 @@ dependencies = [
 
 [[package]]
 name = "version_check"
-version = "0.9.5"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "void"
@@ -26999,18 +26528,18 @@ dependencies = [
 
 [[package]]
 name = "wait-timeout"
-version = "0.2.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11"
+checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "waker-fn"
-version = "1.2.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7"
+checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
 
 [[package]]
 name = "walkdir"
@@ -27033,15 +26562,15 @@ dependencies = [
 
 [[package]]
 name = "wasi"
-version = "0.11.1+wasi-snapshot-preview1"
+version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasi"
-version = "0.14.2+wasi-0.2.4"
+version = "0.13.3+wasi-0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
 dependencies = [
  "wit-bindgen-rt",
 ]
@@ -27052,24 +26581,14 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
 
-[[package]]
-name = "wasix"
-version = "0.12.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1fbb4ef9bbca0c1170e0b00dd28abc9e3b68669821600cad1caaed606583c6d"
-dependencies = [
- "wasi 0.11.1+wasi-snapshot-preview1",
-]
-
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.100"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
 dependencies = [
  "cfg-if",
  "once_cell",
- "rustversion",
  "serde",
  "serde_json",
  "wasm-bindgen-macro",
@@ -27077,36 +26596,36 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.100"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
 dependencies = [
  "bumpalo",
  "log",
+ "once_cell",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.50"
+version = "0.4.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
+checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b"
 dependencies = [
  "cfg-if",
  "js-sys",
- "once_cell",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.100"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
 dependencies = [
  "quote 1.0.40",
  "wasm-bindgen-macro-support",
@@ -27114,34 +26633,30 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.100"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.100"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
-dependencies = [
- "unicode-ident",
-]
+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
 
 [[package]]
 name = "wasm-encoder"
-version = "0.235.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3bc393c395cb621367ff02d854179882b9a351b4e0c93d1397e6090b53a5c2a"
+checksum = "41763f20eafed1399fff1afb466496d3a959f58241436cfdc17e3f5ca954de16"
 dependencies = [
- "leb128fmt",
- "wasmparser 0.235.0",
+ "leb128",
 ]
 
 [[package]]
@@ -27155,16 +26670,16 @@ dependencies = [
 
 [[package]]
 name = "wasm-opt"
-version = "0.116.1"
+version = "0.116.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fd87a4c135535ffed86123b6fb0f0a5a0bc89e50416c942c5f0662c645f679c"
+checksum = "fc942673e7684671f0c5708fc18993569d184265fd5223bb51fc8e5b9b6cfd52"
 dependencies = [
  "anyhow",
  "libc",
  "strum 0.24.1",
  "strum_macros 0.24.3",
  "tempfile",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "wasm-opt-cxx-sys",
  "wasm-opt-sys",
 ]
@@ -27227,33 +26742,17 @@ version = "0.32.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "50386c99b9c32bd2ed71a55b6dd4040af2580530fae8bdb9a6576571a80d0cca"
 dependencies = [
- "arrayvec 0.7.6",
+ "arrayvec 0.7.4",
  "multi-stash",
  "num-derive",
  "num-traits",
  "smallvec",
  "spin 0.9.8",
- "wasmi_collections 0.32.3",
+ "wasmi_collections",
  "wasmi_core 0.32.3",
  "wasmparser-nostd",
 ]
 
-[[package]]
-name = "wasmi"
-version = "0.40.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a19af97fcb96045dd1d6b4d23e2b4abdbbe81723dbc5c9f016eb52145b320063"
-dependencies = [
- "arrayvec 0.7.6",
- "multi-stash",
- "smallvec",
- "spin 0.9.8",
- "wasmi_collections 0.40.0",
- "wasmi_core 0.40.0",
- "wasmi_ir",
- "wasmparser 0.221.3",
-]
-
 [[package]]
 name = "wasmi_arena"
 version = "0.4.1"
@@ -27271,12 +26770,6 @@ dependencies = [
  "string-interner",
 ]
 
-[[package]]
-name = "wasmi_collections"
-version = "0.40.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e80d6b275b1c922021939d561574bf376613493ae2b61c6963b15db0e8813562"
-
 [[package]]
 name = "wasmi_core"
 version = "0.13.0"
@@ -27301,25 +26794,6 @@ dependencies = [
  "paste",
 ]
 
-[[package]]
-name = "wasmi_core"
-version = "0.40.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a8c51482cc32d31c2c7ff211cd2bedd73c5bd057ba16a2ed0110e7a96097c33"
-dependencies = [
- "downcast-rs",
- "libm",
-]
-
-[[package]]
-name = "wasmi_ir"
-version = "0.40.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e431a14c186db59212a88516788bd68ed51f87aa1e08d1df742522867b5289a"
-dependencies = [
- "wasmi_core 0.40.0",
-]
-
 [[package]]
 name = "wasmparser"
 version = "0.102.0"
@@ -27330,26 +26804,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "wasmparser"
-version = "0.221.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d06bfa36ab3ac2be0dee563380147a5b81ba10dd8885d7fbbc9eb574be67d185"
-dependencies = [
- "bitflags 2.9.1",
-]
-
-[[package]]
-name = "wasmparser"
-version = "0.235.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "161296c618fa2d63f6ed5fffd1112937e803cb9ec71b32b01a76321555660917"
-dependencies = [
- "bitflags 2.9.1",
- "indexmap 2.10.0",
- "semver 1.0.26",
-]
-
 [[package]]
 name = "wasmparser-nostd"
 version = "0.100.2"
@@ -27378,7 +26832,7 @@ dependencies = [
  "rayon",
  "serde",
  "target-lexicon",
- "wasmparser 0.102.0",
+ "wasmparser",
  "wasmtime-cache",
  "wasmtime-cranelift",
  "wasmtime-environ",
@@ -27408,7 +26862,7 @@ dependencies = [
  "directories-next",
  "file-per-thread-logger",
  "log",
- "rustix 0.36.17",
+ "rustix 0.36.15",
  "serde",
  "sha2 0.10.9",
  "toml 0.5.11",
@@ -27432,8 +26886,8 @@ dependencies = [
  "log",
  "object 0.30.4",
  "target-lexicon",
- "thiserror 1.0.69",
- "wasmparser 0.102.0",
+ "thiserror 1.0.65",
+ "wasmparser",
  "wasmtime-cranelift-shared",
  "wasmtime-environ",
 ]
@@ -27467,8 +26921,8 @@ dependencies = [
  "object 0.30.4",
  "serde",
  "target-lexicon",
- "thiserror 1.0.69",
- "wasmparser 0.102.0",
+ "thiserror 1.0.65",
+ "wasmparser",
  "wasmtime-types",
 ]
 
@@ -27504,7 +26958,7 @@ checksum = "6e0554b84c15a27d76281d06838aed94e13a77d7bf604bbbaf548aa20eb93846"
 dependencies = [
  "object 0.30.4",
  "once_cell",
- "rustix 0.36.17",
+ "rustix 0.36.15",
 ]
 
 [[package]]
@@ -27532,10 +26986,10 @@ dependencies = [
  "log",
  "mach",
  "memfd",
- "memoffset",
+ "memoffset 0.8.0",
  "paste",
  "rand 0.8.5",
- "rustix 0.36.17",
+ "rustix 0.36.15",
  "wasmtime-asm-macros",
  "wasmtime-environ",
  "wasmtime-jit-debug",
@@ -27550,37 +27004,36 @@ checksum = "a4f6fffd2a1011887d57f07654dd112791e872e3ff4a2e626aee8059ee17f06f"
 dependencies = [
  "cranelift-entity",
  "serde",
- "thiserror 1.0.69",
- "wasmparser 0.102.0",
+ "thiserror 1.0.65",
+ "wasmparser",
 ]
 
 [[package]]
 name = "wast"
-version = "235.0.0"
+version = "63.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1eda4293f626c99021bb3a6fbe4fbbe90c0e31a5ace89b5f620af8925de72e13"
+checksum = "2560471f60a48b77fccefaf40796fda61c97ce1e790b59dfcec9dc3995c9f63a"
 dependencies = [
- "bumpalo",
- "leb128fmt",
+ "leb128",
  "memchr",
- "unicode-width",
+ "unicode-width 0.1.10",
  "wasm-encoder",
 ]
 
 [[package]]
 name = "wat"
-version = "1.235.0"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e777e0327115793cb96ab220b98f85327ec3d11f34ec9e8d723264522ef206aa"
+checksum = "3bdc306c2c4c2f2bf2ba69e083731d0d2a77437fc6a350a19db139636e7e416c"
 dependencies = [
  "wast",
 ]
 
 [[package]]
 name = "web-sys"
-version = "0.3.77"
+version = "0.3.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -27596,35 +27049,17 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "webpki-root-certs"
-version = "0.26.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75c7f0ef91146ebfb530314f5f1d24528d7f0767efbfd31dce919275413e393e"
-dependencies = [
- "webpki-root-certs 1.0.2",
-]
-
-[[package]]
-name = "webpki-root-certs"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4ffd8df1c57e87c325000a3d6ef93db75279dc3a231125aac571650f22b12a"
-dependencies = [
- "rustls-pki-types",
-]
-
 [[package]]
 name = "webpki-roots"
-version = "0.25.4"
+version = "0.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
+checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc"
 
 [[package]]
 name = "webpki-roots"
-version = "1.0.2"
+version = "0.26.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e8983c3ab33d6fb807cfcdad2491c4ea8cbc8ed839181c7dfd9c67c83e261b2"
+checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -27788,19 +27223,19 @@ dependencies = [
 
 [[package]]
 name = "whoami"
-version = "1.6.0"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6994d13118ab492c3c80c1f81928718159254c53c472bf9ce36f8dae4add02a7"
+checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d"
 dependencies = [
- "redox_syscall 0.5.15",
+ "redox_syscall 0.5.8",
  "wasite",
 ]
 
 [[package]]
 name = "wide"
-version = "0.7.33"
+version = "0.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce5da8ecb62bcd8ec8b7ea19f69a51275e91299be594ea5cc6ef7819e16cd03"
+checksum = "aa469ffa65ef7e0ba0f164183697b89b854253fd31aeb92358b7b6155177d62f"
 dependencies = [
  "bytemuck",
  "safe_arch",
@@ -27808,9 +27243,9 @@ dependencies = [
 
 [[package]]
 name = "widestring"
-version = "1.2.0"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7cf3379ca1aac9eea11fba24fd7e315d621f8dfe35c8d7d2be8b793726e07d"
+checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8"
 
 [[package]]
 name = "winapi"
@@ -27830,11 +27265,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.9"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
 dependencies = [
- "windows-sys 0.59.0",
+ "winapi",
 ]
 
 [[package]]
@@ -27845,163 +27280,130 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows"
-version = "0.52.0"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
 dependencies = [
- "windows-core 0.52.0",
- "windows-targets 0.52.6",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
 name = "windows"
-version = "0.53.0"
+version = "0.51.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efc5cf48f83140dcaab716eeaea345f9e93d0018fb81162753a3f76c3397b538"
+checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9"
 dependencies = [
- "windows-core 0.53.0",
- "windows-targets 0.52.6",
+ "windows-core 0.51.1",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
 name = "windows"
-version = "0.61.3"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893"
+checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
 dependencies = [
- "windows-collections",
- "windows-core 0.61.2",
- "windows-future",
- "windows-link",
- "windows-numerics",
+ "windows-core 0.52.0",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
-name = "windows-collections"
-version = "0.2.0"
+name = "windows"
+version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8"
+checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6"
 dependencies = [
- "windows-core 0.61.2",
+ "windows-core 0.58.0",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows-core"
-version = "0.52.0"
+version = "0.51.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
 dependencies = [
- "windows-targets 0.52.6",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
 name = "windows-core"
-version = "0.53.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dcc5b895a6377f1ab9fa55acedab1fd5ac0db66ad1e6c7f47e28a22e446a5dd"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-result 0.1.2",
  "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows-core"
-version = "0.61.2"
+version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
+checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
 dependencies = [
  "windows-implement",
  "windows-interface",
- "windows-link",
- "windows-result 0.3.4",
+ "windows-result",
  "windows-strings",
-]
-
-[[package]]
-name = "windows-future"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
-dependencies = [
- "windows-core 0.61.2",
- "windows-link",
- "windows-threading",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows-implement"
-version = "0.60.0"
+version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
+checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "windows-interface"
-version = "0.59.1"
+version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
+checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "windows-link"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
-
-[[package]]
-name = "windows-numerics"
-version = "0.2.0"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
-dependencies = [
- "windows-core 0.61.2",
- "windows-link",
-]
+checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3"
 
 [[package]]
 name = "windows-registry"
-version = "0.5.3"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e"
+checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
 dependencies = [
- "windows-link",
- "windows-result 0.3.4",
+ "windows-result",
  "windows-strings",
-]
-
-[[package]]
-name = "windows-result"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
-dependencies = [
  "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows-result"
-version = "0.3.4"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
 dependencies = [
- "windows-link",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows-strings"
-version = "0.4.2"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
 dependencies = [
- "windows-link",
+ "windows-result",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -28040,15 +27442,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.60.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
-dependencies = [
- "windows-targets 0.53.2",
-]
-
 [[package]]
 name = "windows-targets"
 version = "0.42.2"
@@ -28088,38 +27481,13 @@ dependencies = [
  "windows_aarch64_gnullvm 0.52.6",
  "windows_aarch64_msvc 0.52.6",
  "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm 0.52.6",
+ "windows_i686_gnullvm",
  "windows_i686_msvc 0.52.6",
  "windows_x86_64_gnu 0.52.6",
  "windows_x86_64_gnullvm 0.52.6",
  "windows_x86_64_msvc 0.52.6",
 ]
 
-[[package]]
-name = "windows-targets"
-version = "0.53.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef"
-dependencies = [
- "windows_aarch64_gnullvm 0.53.0",
- "windows_aarch64_msvc 0.53.0",
- "windows_i686_gnu 0.53.0",
- "windows_i686_gnullvm 0.53.0",
- "windows_i686_msvc 0.53.0",
- "windows_x86_64_gnu 0.53.0",
- "windows_x86_64_gnullvm 0.53.0",
- "windows_x86_64_msvc 0.53.0",
-]
-
-[[package]]
-name = "windows-threading"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6"
-dependencies = [
- "windows-link",
-]
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.42.2"
@@ -28138,12 +27506,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.42.2"
@@ -28162,12 +27524,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.42.2"
@@ -28186,24 +27542,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
-
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.42.2"
@@ -28222,12 +27566,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.42.2"
@@ -28246,12 +27584,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.2"
@@ -28270,12 +27602,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.42.2"
@@ -28295,25 +27621,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
-name = "windows_x86_64_msvc"
-version = "0.53.0"
+name = "winnow"
+version = "0.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc"
+dependencies = [
+ "memchr",
+]
 
 [[package]]
 name = "winnow"
-version = "0.5.40"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "winnow"
-version = "0.7.12"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95"
+checksum = "c06928c8748d81b05c9be96aad92e1b6ff01833332f281e8cfca3be4b35fc9ec"
 dependencies = [
  "memchr",
 ]
@@ -28330,18 +27659,24 @@ dependencies = [
 
 [[package]]
 name = "wit-bindgen-rt"
-version = "0.39.0"
+version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
 dependencies = [
  "bitflags 2.9.1",
 ]
 
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
 [[package]]
 name = "writeable"
-version = "0.6.1"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
 
 [[package]]
 name = "wyz"
@@ -28370,14 +27705,14 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69"
 dependencies = [
- "asn1-rs 0.6.2",
+ "asn1-rs 0.6.1",
  "data-encoding",
  "der-parser 9.0.0",
  "lazy_static",
- "nom 7.1.3",
- "oid-registry 0.7.1",
+ "nom",
+ "oid-registry 0.7.0",
  "rusticata-macros",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "time",
 ]
 
@@ -28387,11 +27722,11 @@ version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4569f339c0c402346d4a75a9e39cf8dad310e287eef1ff56d4c68e5067f53460"
 dependencies = [
- "asn1-rs 0.7.1",
+ "asn1-rs 0.7.0",
  "data-encoding",
  "der-parser 10.0.0",
  "lazy_static",
- "nom 7.1.3",
+ "nom",
  "oid-registry 0.8.1",
  "rusticata-macros",
  "thiserror 2.0.12",
@@ -28400,12 +27735,11 @@ dependencies = [
 
 [[package]]
 name = "xattr"
-version = "1.5.1"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af3a19837351dc82ba89f8a125e22a3c475f05aba604acc023d62b2739ae2909"
+checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985"
 dependencies = [
  "libc",
- "rustix 1.0.8",
 ]
 
 [[package]]
@@ -28434,7 +27768,7 @@ dependencies = [
 name = "xcm-emulator"
 version = "0.5.0"
 dependencies = [
- "array-bytes 6.2.3",
+ "array-bytes 6.2.2",
  "cumulus-pallet-parachain-system",
  "cumulus-primitives-core",
  "cumulus-primitives-parachain-inherent",
@@ -28496,7 +27830,7 @@ dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "staging-xcm",
- "syn 2.0.104",
+ "syn 2.0.98",
  "trybuild",
 ]
 
@@ -28597,9 +27931,9 @@ dependencies = [
 
 [[package]]
 name = "xml-rs"
-version = "0.8.27"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fd8403733700263c6eb89f192880191f1b83e332f7a20371ddcf421c4a337c7"
+checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193"
 
 [[package]]
 name = "xmltree"
@@ -28619,7 +27953,7 @@ dependencies = [
  "futures",
  "log",
  "nohash-hasher",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "pin-project",
  "rand 0.8.5",
  "static_assertions",
@@ -28634,18 +27968,18 @@ dependencies = [
  "futures",
  "log",
  "nohash-hasher",
- "parking_lot 0.12.4",
+ "parking_lot 0.12.3",
  "pin-project",
- "rand 0.9.2",
+ "rand 0.9.0",
  "static_assertions",
  "web-time",
 ]
 
 [[package]]
 name = "yansi"
-version = "1.0.1"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
+checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
 
 [[package]]
 name = "yap"
@@ -28725,9 +28059,9 @@ dependencies = [
 
 [[package]]
 name = "yoke"
-version = "0.8.0"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
 dependencies = [
  "serde",
  "stable_deref_trait",
@@ -28737,55 +28071,75 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.8.0"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
- "synstructure 0.13.2",
+ "syn 2.0.98",
+ "synstructure 0.13.1",
 ]
 
 [[package]]
 name = "zerocopy"
-version = "0.8.26"
+version = "0.7.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f"
+checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
 dependencies = [
- "zerocopy-derive",
+ "zerocopy-derive 0.7.32",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dde3bb8c68a8f3f1ed4ac9221aad6b10cece3e60a8e2ea54a6a2dec806d0084c"
+dependencies = [
+ "zerocopy-derive 0.8.20",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.26"
+version = "0.7.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
+checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eea57037071898bf96a6da35fd626f4f27e9cee3ead2a6c703cf09d472b2e700"
+dependencies = [
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "zerofrom"
-version = "0.1.6"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
 dependencies = [
  "zerofrom-derive",
 ]
 
 [[package]]
 name = "zerofrom-derive"
-version = "0.1.6"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
- "synstructure 0.13.2",
+ "syn 2.0.98",
+ "synstructure 0.13.1",
 ]
 
 [[package]]
@@ -28805,25 +28159,14 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "zerotrie"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
-dependencies = [
- "displaydoc",
- "yoke",
- "zerofrom",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "zerovec"
-version = "0.11.2"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
 dependencies = [
  "yoke",
  "zerofrom",
@@ -28832,13 +28175,13 @@ dependencies = [
 
 [[package]]
 name = "zerovec-derive"
-version = "0.11.1"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 2.0.104",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -28849,7 +28192,7 @@ dependencies = [
  "parity-scale-codec",
  "serde",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tokio",
  "tokio-tungstenite 0.26.2",
  "tracing-gum",
@@ -28857,20 +28200,20 @@ dependencies = [
 
 [[package]]
 name = "zombienet-configuration"
-version = "0.3.11"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91b3e4a27386bf4b9a8505ab5bea5b9a645d060cf487c6f3ab1b2cbcd155f811"
+checksum = "c3a6f9764e5f322f1aa44e1a75258adbabbe1b530974252a66e81331cfe805d5"
 dependencies = [
  "anyhow",
  "lazy_static",
- "multiaddr 0.18.2",
+ "multiaddr 0.18.1",
  "regex",
  "reqwest",
  "serde",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tokio",
- "toml 0.8.23",
+ "toml 0.8.19",
  "tracing",
  "url",
  "zombienet-support",
@@ -28878,9 +28221,9 @@ dependencies = [
 
 [[package]]
 name = "zombienet-orchestrator"
-version = "0.3.11"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5128b73a563a3a4721a08d4c0e270b51f419ed707adda942a192b0d176b3ce0a"
+checksum = "0d7e28aafee53c025762afbc77ebb31b34ef81066bd967ed569508fc42057934"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -28890,17 +28233,17 @@ dependencies = [
  "hex",
  "libp2p",
  "libsecp256k1",
- "multiaddr 0.18.2",
+ "multiaddr 0.18.1",
  "rand 0.8.5",
  "regex",
  "reqwest",
  "serde",
  "serde_json",
  "sha2 0.10.9",
- "sp-core 36.1.0",
- "subxt 0.42.1",
- "subxt-signer 0.42.1",
- "thiserror 1.0.69",
+ "sp-core 35.0.0",
+ "subxt 0.38.1",
+ "subxt-signer 0.38.0",
+ "thiserror 1.0.65",
  "tokio",
  "tracing",
  "uuid",
@@ -28912,20 +28255,20 @@ dependencies = [
 
 [[package]]
 name = "zombienet-prom-metrics-parser"
-version = "0.3.11"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27e44ecde6df3904428120b7d6f93607dba2f2c7c84a72c0a4e429a3c8472c52"
+checksum = "9a481e65f290606b358a2c9e79d8f945142a7414f38670113fff3453ac1604bc"
 dependencies = [
  "pest",
  "pest_derive",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
 ]
 
 [[package]]
 name = "zombienet-provider"
-version = "0.3.11"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f862f2e3992ddd3f6cfa546b4b439da921289ed8cb43ae0864223ffc824851b"
+checksum = "51b67d77160754d0681d289a123d11f2a0b23869a222536af046618c94bbb872"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -28942,7 +28285,7 @@ dependencies = [
  "serde_yaml",
  "sha2 0.10.9",
  "tar",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tokio",
  "tokio-util",
  "tracing",
@@ -28954,15 +28297,15 @@ dependencies = [
 
 [[package]]
 name = "zombienet-sdk"
-version = "0.3.11"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271384076250ca99a4ac3b7e06fa13dd0ba9b797f57803e0d86892621a66b357"
+checksum = "91beaacd1c1e824d34b1ff8322834f0762cb5e38e3272611f43d8c1225e6b80c"
 dependencies = [
  "async-trait",
  "futures",
  "lazy_static",
- "subxt 0.42.1",
- "subxt-signer 0.42.1",
+ "subxt 0.38.1",
+ "subxt-signer 0.38.0",
  "tokio",
  "zombienet-configuration",
  "zombienet-orchestrator",
@@ -28972,9 +28315,9 @@ dependencies = [
 
 [[package]]
 name = "zombienet-support"
-version = "0.3.11"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "392ada4c7efb178102a3bded0ce88dee83731ffd4fa1518d9bbf658f83a66268"
+checksum = "c5ff14369c69535857b0a6889f7968032c37d51a43bdd3441a4b0bf060648943"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -28985,7 +28328,7 @@ dependencies = [
  "regex",
  "reqwest",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 1.0.65",
  "tokio",
  "tracing",
  "uuid",
@@ -29031,10 +28374,11 @@ dependencies = [
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.15+zstd.1.5.7"
+version = "2.0.8+zstd.1.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237"
+checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c"
 dependencies = [
  "cc",
+ "libc",
  "pkg-config",
 ]
diff --git a/substrate/frame/revive/src/tests/pvm.rs b/substrate/frame/revive/src/tests/pvm.rs
index 927a853a4b4e..c93195f3208e 100644
--- a/substrate/frame/revive/src/tests/pvm.rs
+++ b/substrate/frame/revive/src/tests/pvm.rs
@@ -4704,7 +4704,7 @@ fn allow_evm_bytecode_config_works() {
 	ExtBuilder::default().build().execute_with(|| {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
 
-		/// Upload code should always fail with EVM bytecode
+		// Upload code should always fail with EVM bytecode
 		assert_err!(
 			Contracts::upload_code(
 				RuntimeOrigin::signed(ALICE),

From 58b922044c41f5ada449ddae7173569de4e7259e Mon Sep 17 00:00:00 2001
From: 0xRVE <robertvaneerdewijk@gmail.com>
Date: Wed, 30 Jul 2025 09:12:11 +0200
Subject: [PATCH 093/186] Rve/revm arithmetic instructions WIP (#9361)

add arithmetic instructions
---
 .../revive/fixtures/contracts/Arithmetic.sol  |  62 ++
 substrate/frame/revive/src/tests/sol.rs       |   1 +
 .../frame/revive/src/tests/sol/arithmetic.rs  | 686 ++++++++++++++++++
 .../frame/revive/src/tests/sol/block_info.rs  |  40 +-
 .../src/vm/evm/instructions/arithmetic.rs     |   4 +-
 .../src/vm/evm/instructions/block_info.rs     |  10 +-
 6 files changed, 797 insertions(+), 6 deletions(-)
 create mode 100644 substrate/frame/revive/fixtures/contracts/Arithmetic.sol
 create mode 100644 substrate/frame/revive/src/tests/sol/arithmetic.rs

diff --git a/substrate/frame/revive/fixtures/contracts/Arithmetic.sol b/substrate/frame/revive/fixtures/contracts/Arithmetic.sol
new file mode 100644
index 000000000000..7d9345ced2df
--- /dev/null
+++ b/substrate/frame/revive/fixtures/contracts/Arithmetic.sol
@@ -0,0 +1,62 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+contract Arithmetic {
+
+	function add(uint a, uint b) public view returns (uint) {
+		return a + b;
+	}
+
+    function mul(uint a, uint b) public view returns (uint) {
+		return a * b;
+	}
+
+    function sub(uint a, uint b) public view returns (uint) {
+		return a - b;
+	}
+
+    function div(uint a, uint b) public view returns (uint) {
+		return a / b;
+	}
+
+    function sdiv(int a, int b) public view returns (int) {
+		return a / b;
+	}
+
+    function rem(uint a, uint b) public view returns (uint) {
+		return a % b;
+	}
+
+    function smod(int a, int b) public view returns (int) {
+		return a % b;
+	}
+
+    // MOD instruction - unsigned modulo (alternative name to avoid Rust keyword conflict)
+    function umod(uint a, uint b) public view returns (uint) {
+		return a % b;
+	}
+
+    // ADDMOD instruction: (a + b) % n
+    function addmod(uint a, uint b, uint n) public view returns (uint) {
+		return (a + b) % n;
+	}
+
+    // MULMOD instruction: (a * b) % n  
+    function mulmod(uint a, uint b, uint n) public view returns (uint) {
+		return (a * b) % n;
+	}
+
+    // EXP instruction: a ** b (exponentiation)
+    function exp(uint a, uint b) public view returns (uint) {
+		return a ** b;
+	}
+
+    // SIGNEXTEND instruction: sign-extend value from (i+1)*8 bits to 256 bits
+    function signextend(uint i, uint x) public pure returns (uint) {
+        assembly {
+            x := signextend(i, x)
+        }
+        return x;
+    }
+
+}
diff --git a/substrate/frame/revive/src/tests/sol.rs b/substrate/frame/revive/src/tests/sol.rs
index 15b52ebc4a82..421d31b28498 100644
--- a/substrate/frame/revive/src/tests/sol.rs
+++ b/substrate/frame/revive/src/tests/sol.rs
@@ -15,6 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+mod arithmetic;
 mod block_info;
 mod misc;
 mod system;
diff --git a/substrate/frame/revive/src/tests/sol/arithmetic.rs b/substrate/frame/revive/src/tests/sol/arithmetic.rs
new file mode 100644
index 000000000000..53f0011dd7c9
--- /dev/null
+++ b/substrate/frame/revive/src/tests/sol/arithmetic.rs
@@ -0,0 +1,686 @@
+// 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.
+
+//! The pallet-revive shared VM integration test suite.
+
+use crate::{
+	test_utils::{builder::Contract, ALICE},
+	tests::{builder, ExtBuilder, Test},
+	Code, Config,
+};
+
+use alloy_core::{primitives::U256, primitives::I256, sol_types::SolInterface};
+use frame_support::traits::fungible::Mutate;
+use pallet_revive_fixtures::{compile_module_with_type, Arithmetic, FixtureType};
+use pretty_assertions::assert_eq;
+
+#[test]
+fn add_works() {
+	for fixture_type in [FixtureType::Solc, FixtureType::Resolc] {
+		let (code, _) = compile_module_with_type("Arithmetic", fixture_type).unwrap();
+		ExtBuilder::default().build().execute_with(|| {
+			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+			let Contract { addr, .. } =
+				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+            {            
+                let result = builder::bare_call(addr)
+                    .data(
+                        Arithmetic::ArithmeticCalls::add(Arithmetic::addCall { a: U256::from(20u32), b: U256::from(22u32) })
+                            .abi_encode(),
+                    )
+                    .build_and_unwrap_result();
+                assert_eq!(
+                    U256::from(42u32),
+                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
+                    "ADD(20, 22) should equal 42 for {:?}", fixture_type
+                );
+            }
+
+            {
+                // Test large numbers but not MAX overflow
+                let large_a = U256::from(u64::MAX);
+                let large_b = U256::from(1000u32);
+                let expected = large_a + large_b;
+                let result = builder::bare_call(addr)
+                    .data(
+                        Arithmetic::ArithmeticCalls::add(Arithmetic::addCall { a: large_a, b: large_b })
+                            .abi_encode(),
+                    )
+                    .build_and_unwrap_result();
+                assert_eq!(
+                    expected,
+                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
+                    "ADD({}, {}) should equal {} for {:?}", large_a, large_b, expected, fixture_type
+                );
+            }
+		});
+	}
+}
+
+#[test]
+fn mul_works() {
+	for fixture_type in [FixtureType::Solc, FixtureType::Resolc] {
+		let (code, _) = compile_module_with_type("Arithmetic", fixture_type).unwrap();
+		ExtBuilder::default().build().execute_with(|| {
+			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+			let Contract { addr, .. } =
+				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+            {
+                let result = builder::bare_call(addr)
+                    .data(
+                        Arithmetic::ArithmeticCalls::mul(Arithmetic::mulCall { a: U256::from(20u32), b: U256::from(22u32) })
+                            .abi_encode(),
+                    )
+                    .build_and_unwrap_result();
+                assert_eq!(
+                    U256::from(440u32),
+                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
+                    "MUL(20, 22) should equal 440 for {:?}", fixture_type
+                );
+            }
+
+            {
+                // Test large numbers but not MAX overflow
+                let large_a = U256::from(u64::MAX);
+                let large_b = U256::from(1000u32);
+                let expected = large_a * large_b;
+                let result = builder::bare_call(addr)
+                    .data(
+                        Arithmetic::ArithmeticCalls::mul(Arithmetic::mulCall { a: large_a, b: large_b })
+                            .abi_encode(),
+                    )
+                    .build_and_unwrap_result();
+                assert_eq!(
+                    expected,
+                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
+                    "MUL({}, {}) should equal {} for {:?}", large_a, large_b, expected, fixture_type
+                );
+            }
+		});
+	}
+}
+
+#[test]
+fn sub_works() {
+	for fixture_type in [FixtureType::Solc, FixtureType::Resolc] {
+		let (code, _) = compile_module_with_type("Arithmetic", fixture_type).unwrap();
+		ExtBuilder::default().build().execute_with(|| {
+			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+			let Contract { addr, .. } =
+				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+            {
+                let result = builder::bare_call(addr)
+                    .data(
+                        Arithmetic::ArithmeticCalls::sub(Arithmetic::subCall { a: U256::from(20u32), b: U256::from(18u32) })
+                            .abi_encode(),
+                    )
+                    .build_and_unwrap_result();
+                assert_eq!(
+                    U256::from(2u32),
+                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
+                    "SUB(20, 18) should equal 2 for {:?}", fixture_type
+                );
+            }
+
+            {
+                // Test large numbers but not MAX overflow
+                let large_a = U256::from(u64::MAX);
+                let large_b = U256::from(1000u32);
+                let expected = large_a - large_b;
+                let result = builder::bare_call(addr)
+                    .data(
+                        Arithmetic::ArithmeticCalls::sub(Arithmetic::subCall { a: large_a, b: large_b })
+                            .abi_encode(),
+                    )
+                    .build_and_unwrap_result();
+                assert_eq!(
+                    expected,
+                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
+                    "SUB({}, {}) should equal {} for {:?}", large_a, large_b, expected, fixture_type
+                );
+            }
+		});
+	}
+}
+
+#[test]
+fn div_works() {
+	for fixture_type in [FixtureType::Solc, FixtureType::Resolc] {
+		let (code, _) = compile_module_with_type("Arithmetic", fixture_type).unwrap();
+		ExtBuilder::default().build().execute_with(|| {
+			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+			let Contract { addr, .. } =
+				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+            {
+                let result = builder::bare_call(addr)
+                    .data(
+                        Arithmetic::ArithmeticCalls::div(Arithmetic::divCall { a: U256::from(20u32), b: U256::from(5u32) })
+                            .abi_encode(),
+                    )
+                    .build_and_unwrap_result();
+                assert_eq!(
+                    U256::from(4u32),
+                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
+                    "DIV(20, 5) should equal 4 for {:?}", fixture_type
+                );
+            }
+
+            {
+                // Test large numbers but not MAX overflow
+                let large_a = U256::from(u64::MAX);
+                let large_b = U256::from(1000u32);
+                let expected = large_a / large_b;
+                let result = builder::bare_call(addr)
+                    .data(
+                        Arithmetic::ArithmeticCalls::div(Arithmetic::divCall { a: large_a, b: large_b })
+                            .abi_encode(),
+                    )
+                    .build_and_unwrap_result();
+                assert_eq!(
+                    expected,
+                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
+                    "DIV({}, {}) should equal {} for {:?}", large_a, large_b, expected, fixture_type
+                );
+            }
+		});
+	}
+}
+
+#[test]
+fn sdiv_works() {
+	for fixture_type in [FixtureType::Solc, FixtureType::Resolc] {
+		let (code, _) = compile_module_with_type("Arithmetic", fixture_type).unwrap();
+		ExtBuilder::default().build().execute_with(|| {
+			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+			let Contract { addr, .. } =
+				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+            {
+                let result = builder::bare_call(addr)
+                    .data(
+                        Arithmetic::ArithmeticCalls::sdiv(Arithmetic::sdivCall { a: I256::from_raw(U256::from(20u32)), b: I256::from_raw(U256::from(5u32)) })
+                            .abi_encode(),
+                    )
+                    .build_and_unwrap_result();
+                assert_eq!(
+                    I256::from_raw(U256::from(4u32)),
+                    I256::from_be_bytes::<32>(result.data.try_into().unwrap()),
+                    "SDIV(20, 5) should equal 4 for {:?}", fixture_type
+                );
+            }
+
+            {
+                // Test large numbers but not MAX overflow
+                let large_a = I256::from_raw(U256::from(i64::MAX as u64));
+                let large_b = -I256::from_raw(U256::from(1000u32));
+                let expected = large_a / large_b;
+                let result = builder::bare_call(addr)
+                    .data(
+                        Arithmetic::ArithmeticCalls::sdiv(Arithmetic::sdivCall { a: large_a, b: large_b })
+                            .abi_encode(),
+                    )
+                    .build_and_unwrap_result();
+                assert_eq!(
+                    expected,
+                    I256::from_be_bytes::<32>(result.data.try_into().unwrap()),
+                    "SDIV({}, {}) should equal {} for {:?}", large_a, large_b, expected, fixture_type
+                );
+            }
+		});
+	}
+}
+
+#[test]
+fn rem_works() {
+	for fixture_type in [FixtureType::Solc, FixtureType::Resolc] {
+		let (code, _) = compile_module_with_type("Arithmetic", fixture_type).unwrap();
+		ExtBuilder::default().build().execute_with(|| {
+			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+			let Contract { addr, .. } =
+				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+            {
+                let result = builder::bare_call(addr)
+                    .data(
+                        Arithmetic::ArithmeticCalls::rem(Arithmetic::remCall { a: U256::from(20u32), b: U256::from(5u32) })
+                            .abi_encode(),
+                    )
+                    .build_and_unwrap_result();
+                assert_eq!(
+                    U256::from(0u32),
+                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
+                    "REM(20, 5) should equal 0 for {:?}", fixture_type
+                );
+            }
+
+            {
+                // Test with remainder: 23 % 5 = 3
+                let result = builder::bare_call(addr)
+                    .data(
+                        Arithmetic::ArithmeticCalls::rem(Arithmetic::remCall { a: U256::from(23u32), b: U256::from(5u32) })
+                            .abi_encode(),
+                    )
+                    .build_and_unwrap_result();
+                assert_eq!(
+                    U256::from(3u32),
+                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
+                    "REM(23, 5) should equal 3 for {:?}", fixture_type
+                );
+            }
+
+            {
+                // Test large numbers with positive divisor
+                let large_a = U256::from(i64::MAX as u64);
+                let large_b = U256::from(1000u32);
+                let expected = large_a % large_b;
+                let result = builder::bare_call(addr)
+                    .data(
+                        Arithmetic::ArithmeticCalls::rem(Arithmetic::remCall { a: large_a, b: large_b })
+                            .abi_encode(),
+                    )
+                    .build_and_unwrap_result();
+                assert_eq!(
+                    expected,
+                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
+                    "REM({}, {}) should equal {} for {:?}", large_a, large_b, expected, fixture_type
+                );
+            }
+		});
+	}
+}
+
+#[test]
+fn smod_works() {
+	for fixture_type in [FixtureType::Solc, FixtureType::Resolc] {
+		let (code, _) = compile_module_with_type("Arithmetic", fixture_type).unwrap();
+		ExtBuilder::default().build().execute_with(|| {
+			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+			let Contract { addr, .. } =
+				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+            {
+                let result = builder::bare_call(addr)
+                    .data(
+                        Arithmetic::ArithmeticCalls::smod(Arithmetic::smodCall { a: I256::from_raw(U256::from(20u32)), b: I256::from_raw(U256::from(5u32)) })
+                            .abi_encode(),
+                    )
+                    .build_and_unwrap_result();
+                assert_eq!(
+                    I256::from_raw(U256::from(0u32)),
+                    I256::from_be_bytes::<32>(result.data.try_into().unwrap()),
+                    "SMOD(20, 5) should equal 0 for {:?}", fixture_type
+                );
+            }
+
+            {
+                // Test with remainder: 23 % 5 = 3
+                let result = builder::bare_call(addr)
+                    .data(
+                        Arithmetic::ArithmeticCalls::smod(Arithmetic::smodCall { a: I256::from_raw(U256::from(23u32)), b: I256::from_raw(U256::from(5u32)) })
+                            .abi_encode(),
+                    )
+                    .build_and_unwrap_result();
+                assert_eq!(
+                    I256::from_raw(U256::from(3u32)),
+                    I256::from_be_bytes::<32>(result.data.try_into().unwrap()),
+                    "SMOD(23, 5) should equal 3 for {:?}", fixture_type
+                );
+            }
+
+            {
+                // Test large numbers with positive divisor
+                let large_a = I256::from_raw(U256::from(i64::MAX as u64));
+                let large_b = I256::from_raw(U256::from(1000u32));
+                let expected = large_a % large_b;
+                let result = builder::bare_call(addr)
+                    .data(
+                        Arithmetic::ArithmeticCalls::smod(Arithmetic::smodCall { a: large_a, b: large_b })
+                            .abi_encode(),
+                    )
+                    .build_and_unwrap_result();
+                assert_eq!(
+                    expected,
+                    I256::from_be_bytes::<32>(result.data.try_into().unwrap()),
+                    "SMOD({}, {}) should equal {} for {:?}", large_a, large_b, expected, fixture_type
+                );
+            }
+
+            {
+                // Test negative numbers: -23 % 5 should equal -3 in most implementations
+                // We need to use two's complement representation for negative numbers
+                let neg_23 = I256::from_raw(U256::MAX - U256::from(22u32)); // -23 in two's complement
+                let pos_5 = I256::from_raw(U256::from(5u32));
+                let result = builder::bare_call(addr)
+                    .data(
+                        Arithmetic::ArithmeticCalls::smod(Arithmetic::smodCall { a: neg_23, b: pos_5 })
+                            .abi_encode(),
+                    )
+                    .build_and_unwrap_result();
+                let neg_3 = I256::from_raw(U256::MAX - U256::from(2u32)); // -3 in two's complement
+                assert_eq!(
+                    neg_3,
+                    I256::from_be_bytes::<32>(result.data.try_into().unwrap()),
+                    "REM(-23, 5) should equal -3 for {:?}", fixture_type
+                );
+            }
+		});
+	}
+}
+
+#[test]
+fn umod_works() {
+	for fixture_type in [FixtureType::Solc, FixtureType::Resolc] {
+		let (code, _) = compile_module_with_type("Arithmetic", fixture_type).unwrap();
+		ExtBuilder::default().build().execute_with(|| {
+			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+			let Contract { addr, .. } =
+				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+            {
+                let result = builder::bare_call(addr)
+                    .data(
+                        Arithmetic::ArithmeticCalls::umod(Arithmetic::umodCall { a: U256::from(23u32), b: U256::from(5u32) })
+                            .abi_encode(),
+                    )
+                    .build_and_unwrap_result();
+                assert_eq!(
+                    U256::from(3u32),
+                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
+                    "UMOD(23, 5) should equal 3 for {:?}", fixture_type
+                );
+            }
+		});
+	}
+}
+
+#[test]
+fn addmod_works() {
+	for fixture_type in [FixtureType::Solc, FixtureType::Resolc] {
+		let (code, _) = compile_module_with_type("Arithmetic", fixture_type).unwrap();
+		ExtBuilder::default().build().execute_with(|| {
+			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+			let Contract { addr, .. } =
+				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+            {
+                // Test ADDMOD: (10 + 15) % 7 = 25 % 7 = 4
+                let result = builder::bare_call(addr)
+                    .data(
+                        Arithmetic::ArithmeticCalls::addmod(Arithmetic::addmodCall { 
+                            a: U256::from(10u32), 
+                            b: U256::from(15u32), 
+                            n: U256::from(7u32) 
+                        })
+                            .abi_encode(),
+                    )
+                    .build_and_unwrap_result();
+                assert_eq!(
+                    U256::from(4u32),
+                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
+                    "ADDMOD(10, 15, 7) should equal 4 for {:?}", fixture_type
+                );
+            }
+		});
+	}
+}
+
+#[test]
+fn mulmod_works() {
+	for fixture_type in [FixtureType::Solc, FixtureType::Resolc] {
+		let (code, _) = compile_module_with_type("Arithmetic", fixture_type).unwrap();
+		ExtBuilder::default().build().execute_with(|| {
+			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+			let Contract { addr, .. } =
+				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+            {
+                // Test MULMOD: (6 * 7) % 10 = 42 % 10 = 2
+                let result = builder::bare_call(addr)
+                    .data(
+                        Arithmetic::ArithmeticCalls::mulmod(Arithmetic::mulmodCall { 
+                            a: U256::from(6u32), 
+                            b: U256::from(7u32), 
+                            n: U256::from(10u32) 
+                        })
+                            .abi_encode(),
+                    )
+                    .build_and_unwrap_result();
+                assert_eq!(
+                    U256::from(2u32),
+                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
+                    "MULMOD(6, 7, 10) should equal 2 for {:?}", fixture_type
+                );
+            }
+		});
+	}
+}
+
+#[test]
+fn exp_works() {
+	for fixture_type in [FixtureType::Solc, FixtureType::Resolc] {
+		let (code, _) = compile_module_with_type("Arithmetic", fixture_type).unwrap();
+		ExtBuilder::default().build().execute_with(|| {
+			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+			let Contract { addr, .. } =
+				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+            {
+                // Test EXP: 2 ** 3 = 8
+                let result = builder::bare_call(addr)
+                    .data(
+                        Arithmetic::ArithmeticCalls::exp(Arithmetic::expCall { 
+                            a: U256::from(2u32), 
+                            b: U256::from(3u32)
+                        })
+                            .abi_encode(),
+                    )
+                    .build_and_unwrap_result();
+                assert_eq!(
+                    U256::from(8u32),
+                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
+                    "EXP(2, 3) should equal 8 for {:?}", fixture_type
+                );
+            }
+
+            {
+                // Test EXP: 5 ** 2 = 25
+                let result = builder::bare_call(addr)
+                    .data(
+                        Arithmetic::ArithmeticCalls::exp(Arithmetic::expCall { 
+                            a: U256::from(5u32), 
+                            b: U256::from(2u32)
+                        })
+                            .abi_encode(),
+                    )
+                    .build_and_unwrap_result();
+                assert_eq!(
+                    U256::from(25u32),
+                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
+                    "EXP(5, 2) should equal 25 for {:?}", fixture_type
+                );
+            }
+
+            {
+                // Test EXP: 10 ** 0 = 1 (anything to power 0 is 1)
+                let result = builder::bare_call(addr)
+                    .data(
+                        Arithmetic::ArithmeticCalls::exp(Arithmetic::expCall { 
+                            a: U256::from(10u32), 
+                            b: U256::from(0u32)
+                        })
+                            .abi_encode(),
+                    )
+                    .build_and_unwrap_result();
+                assert_eq!(
+                    U256::from(1u32),
+                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
+                    "EXP(10, 0) should equal 1 for {:?}", fixture_type
+                );
+            }
+
+            {
+                // Test EXP: 1 ** 100 = 1 (1 to any power is 1)
+                let result = builder::bare_call(addr)
+                    .data(
+                        Arithmetic::ArithmeticCalls::exp(Arithmetic::expCall { 
+                            a: U256::from(1u32), 
+                            b: U256::from(100u32)
+                        })
+                            .abi_encode(),
+                    )
+                    .build_and_unwrap_result();
+                assert_eq!(
+                    U256::from(1u32),
+                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
+                    "EXP(1, 100) should equal 1 for {:?}", fixture_type
+                );
+            }
+
+            {
+                // Test EXP with larger numbers: 3 ** 4 = 81
+                let result = builder::bare_call(addr)
+                    .data(
+                        Arithmetic::ArithmeticCalls::exp(Arithmetic::expCall { 
+                            a: U256::from(3u32), 
+                            b: U256::from(4u32)
+                        })
+                            .abi_encode(),
+                    )
+                    .build_and_unwrap_result();
+                assert_eq!(
+                    U256::from(81u32),
+                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
+                    "EXP(3, 4) should equal 81 for {:?}", fixture_type
+                );
+            }
+		});
+	}
+}
+
+#[test]
+fn signextend_works() {
+	for fixture_type in [FixtureType::Solc, FixtureType::Resolc] {
+		let (code, _) = compile_module_with_type("Arithmetic", fixture_type).unwrap();
+		ExtBuilder::default().build().execute_with(|| {
+			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+			let Contract { addr, .. } =
+				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+            {
+                // Test SIGNEXTEND: extend 8-bit signed value 0xFF (-1) to 256 bits
+                // signextend(0, 0xFF) should extend from 8 bits, result should be all 1s (U256::MAX)
+                let result = builder::bare_call(addr)
+                    .data(
+                        Arithmetic::ArithmeticCalls::signextend(Arithmetic::signextendCall { 
+                            i: U256::from(0u32),  // extend from byte 0 (8 bits)
+                            x: U256::from(0xFFu32) // value 0xFF (all 1s in 8 bits)
+                        })
+                            .abi_encode(),
+                    )
+                    .build_and_unwrap_result();
+                assert_eq!(
+                    U256::MAX, // Should be all 1s when sign-extending 0xFF from 8 bits
+                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
+                    "SIGNEXTEND(0, 0xFF) should equal U256::MAX for {:?}", fixture_type
+                );
+            }
+
+            {
+                // Test SIGNEXTEND: extend 8-bit positive value 0x7F to 256 bits
+                // signextend(0, 0x7F) should keep it positive (sign bit is 0)
+                let result = builder::bare_call(addr)
+                    .data(
+                        Arithmetic::ArithmeticCalls::signextend(Arithmetic::signextendCall { 
+                            i: U256::from(0u32),  // extend from byte 0 (8 bits)
+                            x: U256::from(0x7Fu32) // value 0x7F (positive in 8 bits)
+                        })
+                            .abi_encode(),
+                    )
+                    .build_and_unwrap_result();
+                assert_eq!(
+                    U256::from(0x7Fu32), // Should remain 0x7F (positive)
+                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
+                    "SIGNEXTEND(0, 0x7F) should equal 0x7F for {:?}", fixture_type
+                );
+            }
+
+            {
+                // Test SIGNEXTEND: extend 16-bit signed value 0x8000 (-32768) to 256 bits
+                // signextend(1, 0x8000) should extend from 16 bits with sign bit set
+                let result = builder::bare_call(addr)
+                    .data(
+                        Arithmetic::ArithmeticCalls::signextend(Arithmetic::signextendCall { 
+                            i: U256::from(1u32),     // extend from byte 1 (16 bits)
+                            x: U256::from(0x8000u32) // value 0x8000 (negative in 16 bits)
+                        })
+                            .abi_encode(),
+                    )
+                    .build_and_unwrap_result();
+                // 0x8000 in 16 bits is negative, so should become 0xFFFF_FFFF_FFFF_FFFF_FFFF_FFFF_FFFF_8000
+                let expected = U256::MAX - U256::from(0x7FFFu32); // Two's complement representation
+                assert_eq!(
+                    expected,
+                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
+                    "SIGNEXTEND(1, 0x8000) should sign-extend negative 16-bit value for {:?}", fixture_type
+                );
+            }
+
+            {
+                // Test SIGNEXTEND: extend 16-bit positive value 0x7FFF to 256 bits
+                // signextend(1, 0x7FFF) should keep it positive
+                let result = builder::bare_call(addr)
+                    .data(
+                        Arithmetic::ArithmeticCalls::signextend(Arithmetic::signextendCall { 
+                            i: U256::from(1u32),     // extend from byte 1 (16 bits)
+                            x: U256::from(0x7FFFu32) // value 0x7FFF (positive in 16 bits)
+                        })
+                            .abi_encode(),
+                    )
+                    .build_and_unwrap_result();
+                assert_eq!(
+                    U256::from(0x7FFFu32), // Should remain 0x7FFF (positive)
+                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
+                    "SIGNEXTEND(1, 0x7FFF) should equal 0x7FFF for {:?}", fixture_type
+                );
+            }
+
+            {
+                // Test SIGNEXTEND: i >= 32 should return original value unchanged
+                // signextend(32, value) should return value as-is
+                let test_value = U256::from(0x123456789ABCDEFu64);
+                let result = builder::bare_call(addr)
+                    .data(
+                        Arithmetic::ArithmeticCalls::signextend(Arithmetic::signextendCall { 
+                            i: U256::from(32u32), // >= 32, should not modify
+                            x: test_value
+                        })
+                            .abi_encode(),
+                    )
+                    .build_and_unwrap_result();
+                assert_eq!(
+                    test_value,
+                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
+                    "SIGNEXTEND(32, value) should return value unchanged for {:?}", fixture_type
+                );
+            }
+		});
+	}
+}
\ No newline at end of file
diff --git a/substrate/frame/revive/src/tests/sol/block_info.rs b/substrate/frame/revive/src/tests/sol/block_info.rs
index e8ea76c30c9b..e688b7b96f23 100644
--- a/substrate/frame/revive/src/tests/sol/block_info.rs
+++ b/substrate/frame/revive/src/tests/sol/block_info.rs
@@ -18,7 +18,7 @@
 //! The pallet-revive shared VM integration test suite.
 
 use crate::{
-	test_utils::{builder::Contract, ALICE},
+	test_utils::{builder::Contract, ALICE, EVE_ADDR},
 	tests::{builder, ExtBuilder, System, Test},
 	Code, Config,
 };
@@ -53,3 +53,41 @@ fn block_number_works() {
 		});
 	}
 }
+
+/// Tests that the coinbase opcode works as expected.
+#[test]
+fn coinbase_works() {
+	let eve_as_u256 = {
+		let mut bytes = [0u8; 32];
+		bytes[12..32].copy_from_slice(&EVE_ADDR.0);
+		U256::from_be_bytes(bytes)
+	};
+	for fixture_type in [FixtureType::Solc, FixtureType::Resolc] {
+		let (code, _) = compile_module_with_type("BlockInfo", fixture_type).unwrap();
+		ExtBuilder::default().build().execute_with(|| {
+			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+			let Contract { addr, .. } =
+				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+			let result = builder::bare_call(addr)
+				.data(
+					BlockInfo::BlockInfoCalls::coinbase(BlockInfo::coinbaseCall {})
+						.abi_encode(),
+				)
+				.build_and_unwrap_result();
+			
+			// Verify that we got a 32-byte result (address is padded to 32 bytes in EVM)
+			assert_eq!(result.data.len(), 32, "Coinbase should return a 32-byte padded address");
+			
+			// The coinbase opcode should return the current block's beneficiary address
+			let coinbase_result = U256::from_be_bytes::<32>(result.data.try_into().unwrap());
+
+			assert_eq!(
+				coinbase_result, 
+				eve_as_u256,
+				"Coinbase should return expected beneficiary address for {:?}",
+				fixture_type
+			);
+		});
+	}
+}
diff --git a/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs b/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs
index 6aa47e2bae86..67910ad1d358 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs
@@ -19,7 +19,7 @@ use super::{
 	i256::{i256_div, i256_mod},
 	Context,
 };
-use crate::vm::Ext;
+use crate::{vm::Ext, RuntimeCosts};
 use revm::{
 	interpreter::{
 		gas as revm_gas,
@@ -30,7 +30,7 @@ use revm::{
 
 /// Implements the ADD instruction - adds two values from stack.
 pub fn add<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas_legacy!(context.interpreter, revm_gas::VERYLOW);
+	gas!(context.interpreter, RuntimeCosts::EVMGas(3));
 	popn_top!([op1], op2, context.interpreter);
 	*op2 = op1.wrapping_add(*op2);
 }
diff --git a/substrate/frame/revive/src/vm/evm/instructions/block_info.rs b/substrate/frame/revive/src/vm/evm/instructions/block_info.rs
index 375de2f6f9c2..3d4877439e0a 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/block_info.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/block_info.rs
@@ -19,7 +19,10 @@ use super::Context;
 use crate::{vm::Ext, RuntimeCosts};
 use revm::{
 	interpreter::{gas as revm_gas, host::Host, interpreter_types::RuntimeFlag},
-	primitives::{hardfork::SpecId::*, U256},
+	primitives::{hardfork::SpecId::*, U256, Address, },
+};
+use crate::{
+	evm::H160,
 };
 
 /// EIP-1344: ChainID opcode
@@ -33,8 +36,9 @@ pub fn chainid<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Pushes the current block's beneficiary address onto the stack.
 pub fn coinbase<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas_legacy!(context.interpreter, revm_gas::BASE);
-	push!(context.interpreter, context.host.beneficiary().into_word().into());
+	gas!(context.interpreter, RuntimeCosts::BlockAuthor);
+	let coinbase: Address = context.interpreter.extend.block_author().unwrap_or(H160::zero()).0.into();
+	push!(context.interpreter, coinbase.into_word().into());
 }
 
 /// Implements the TIMESTAMP instruction.

From 5b304a09c42e78da14409efcc4393e9acf6d35e7 Mon Sep 17 00:00:00 2001
From: 0xRVE <robertvaneerdewijk@gmail.com>
Date: Wed, 30 Jul 2025 10:32:13 +0200
Subject: [PATCH 094/186] fixes gas computation of evm arithemtic instructions
 (#9379)

fixes gas computation of evm arithemtic instructions
---
 .../src/vm/evm/instructions/arithmetic.rs     | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs b/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs
index 67910ad1d358..c1acf2c10f8e 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs
@@ -37,21 +37,21 @@ pub fn add<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 
 /// Implements the MUL instruction - multiplies two values from stack.
 pub fn mul<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas_legacy!(context.interpreter, revm_gas::LOW);
+	gas!(context.interpreter, RuntimeCosts::EVMGas(5));
 	popn_top!([op1], op2, context.interpreter);
 	*op2 = op1.wrapping_mul(*op2);
 }
 
 /// Implements the SUB instruction - subtracts two values from stack.
 pub fn sub<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas_legacy!(context.interpreter, revm_gas::VERYLOW);
+	gas!(context.interpreter, RuntimeCosts::EVMGas(3));
 	popn_top!([op1], op2, context.interpreter);
 	*op2 = op1.wrapping_sub(*op2);
 }
 
 /// Implements the DIV instruction - divides two values from stack.
 pub fn div<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas_legacy!(context.interpreter, revm_gas::LOW);
+	gas!(context.interpreter, RuntimeCosts::EVMGas(5));
 	popn_top!([op1], op2, context.interpreter);
 	if !op2.is_zero() {
 		*op2 = op1.wrapping_div(*op2);
@@ -62,7 +62,7 @@ pub fn div<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Performs signed division of two values from stack.
 pub fn sdiv<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas_legacy!(context.interpreter, revm_gas::LOW);
+	gas!(context.interpreter, RuntimeCosts::EVMGas(5));
 	popn_top!([op1], op2, context.interpreter);
 	*op2 = i256_div(op1, *op2);
 }
@@ -71,7 +71,7 @@ pub fn sdiv<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Pops two values from stack and pushes the remainder of their division.
 pub fn rem<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas_legacy!(context.interpreter, revm_gas::LOW);
+	gas!(context.interpreter, RuntimeCosts::EVMGas(5));
 	popn_top!([op1], op2, context.interpreter);
 	if !op2.is_zero() {
 		*op2 = op1.wrapping_rem(*op2);
@@ -82,7 +82,7 @@ pub fn rem<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Performs signed modulo of two values from stack.
 pub fn smod<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas_legacy!(context.interpreter, revm_gas::LOW);
+	gas!(context.interpreter, RuntimeCosts::EVMGas(5));
 	popn_top!([op1], op2, context.interpreter);
 	*op2 = i256_mod(op1, *op2)
 }
@@ -91,7 +91,7 @@ pub fn smod<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Pops three values from stack and pushes (a + b) % n.
 pub fn addmod<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas_legacy!(context.interpreter, revm_gas::MID);
+	gas!(context.interpreter, RuntimeCosts::EVMGas(8));
 	popn_top!([op1, op2], op3, context.interpreter);
 	*op3 = op1.add_mod(op2, *op3)
 }
@@ -100,16 +100,26 @@ pub fn addmod<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Pops three values from stack and pushes (a * b) % n.
 pub fn mulmod<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas_legacy!(context.interpreter, revm_gas::MID);
+	gas!(context.interpreter, RuntimeCosts::EVMGas(8));
 	popn_top!([op1, op2], op3, context.interpreter);
 	*op3 = op1.mul_mod(op2, *op3)
 }
 
 /// Implements the EXP instruction - exponentiates two values from stack.
 pub fn exp<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	let spec_id = context.interpreter.runtime_flag.spec_id();
 	popn_top!([op1], op2, context.interpreter);
-	gas_or_fail!(context.interpreter, revm_gas::exp_cost(spec_id, *op2));
+	
+	// Calculate gas cost for EXP: 10 (base) + 50 * byte_length_of_exponent
+	// For zero exponent, byte length is 1. For non-zero, calculate based on significant bits.
+	let exp_byte_len = if op2.is_zero() {
+		1u64
+	} else {
+		let significant_bits = 256 - op2.leading_zeros() as u64;
+		(significant_bits + 7) / 8  // Round up to nearest byte
+	};
+	let gas_cost = 10u64.saturating_add(50u64.saturating_mul(exp_byte_len));
+	gas!(context.interpreter, RuntimeCosts::EVMGas(gas_cost));
+	
 	*op2 = op1.pow(*op2);
 }
 
@@ -143,7 +153,7 @@ pub fn exp<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 /// Similarly, if `b == 0` then the yellow paper says the output should start with all zeros,
 /// then end with bits from `b`; this is equal to `y & mask` where `&` is bitwise `AND`.
 pub fn signextend<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas_legacy!(context.interpreter, revm_gas::LOW);
+	gas!(context.interpreter, RuntimeCosts::EVMGas(5));
 	popn_top!([ext], x, context.interpreter);
 	// For 31 we also don't need to do anything.
 	if ext < U256::from(31) {

From 8817d7e3c4a5ca51725d29d530db54bad1453bc6 Mon Sep 17 00:00:00 2001
From: Robert van Eerdewijk <robert@Roberts-MacBook-Pro.local>
Date: Tue, 12 Aug 2025 11:09:11 +0200
Subject: [PATCH 095/186] Revert "fixes gas computation of evm arithemtic
 instructions (#9379)"

This reverts commit 5b304a09c42e78da14409efcc4393e9acf6d35e7.
---
 .../src/vm/evm/instructions/arithmetic.rs     | 32 +++++++------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs b/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs
index c1acf2c10f8e..67910ad1d358 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs
@@ -37,21 +37,21 @@ pub fn add<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 
 /// Implements the MUL instruction - multiplies two values from stack.
 pub fn mul<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, RuntimeCosts::EVMGas(5));
+	gas_legacy!(context.interpreter, revm_gas::LOW);
 	popn_top!([op1], op2, context.interpreter);
 	*op2 = op1.wrapping_mul(*op2);
 }
 
 /// Implements the SUB instruction - subtracts two values from stack.
 pub fn sub<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, RuntimeCosts::EVMGas(3));
+	gas_legacy!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([op1], op2, context.interpreter);
 	*op2 = op1.wrapping_sub(*op2);
 }
 
 /// Implements the DIV instruction - divides two values from stack.
 pub fn div<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, RuntimeCosts::EVMGas(5));
+	gas_legacy!(context.interpreter, revm_gas::LOW);
 	popn_top!([op1], op2, context.interpreter);
 	if !op2.is_zero() {
 		*op2 = op1.wrapping_div(*op2);
@@ -62,7 +62,7 @@ pub fn div<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Performs signed division of two values from stack.
 pub fn sdiv<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, RuntimeCosts::EVMGas(5));
+	gas_legacy!(context.interpreter, revm_gas::LOW);
 	popn_top!([op1], op2, context.interpreter);
 	*op2 = i256_div(op1, *op2);
 }
@@ -71,7 +71,7 @@ pub fn sdiv<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Pops two values from stack and pushes the remainder of their division.
 pub fn rem<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, RuntimeCosts::EVMGas(5));
+	gas_legacy!(context.interpreter, revm_gas::LOW);
 	popn_top!([op1], op2, context.interpreter);
 	if !op2.is_zero() {
 		*op2 = op1.wrapping_rem(*op2);
@@ -82,7 +82,7 @@ pub fn rem<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Performs signed modulo of two values from stack.
 pub fn smod<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, RuntimeCosts::EVMGas(5));
+	gas_legacy!(context.interpreter, revm_gas::LOW);
 	popn_top!([op1], op2, context.interpreter);
 	*op2 = i256_mod(op1, *op2)
 }
@@ -91,7 +91,7 @@ pub fn smod<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Pops three values from stack and pushes (a + b) % n.
 pub fn addmod<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, RuntimeCosts::EVMGas(8));
+	gas_legacy!(context.interpreter, revm_gas::MID);
 	popn_top!([op1, op2], op3, context.interpreter);
 	*op3 = op1.add_mod(op2, *op3)
 }
@@ -100,26 +100,16 @@ pub fn addmod<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Pops three values from stack and pushes (a * b) % n.
 pub fn mulmod<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, RuntimeCosts::EVMGas(8));
+	gas_legacy!(context.interpreter, revm_gas::MID);
 	popn_top!([op1, op2], op3, context.interpreter);
 	*op3 = op1.mul_mod(op2, *op3)
 }
 
 /// Implements the EXP instruction - exponentiates two values from stack.
 pub fn exp<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
+	let spec_id = context.interpreter.runtime_flag.spec_id();
 	popn_top!([op1], op2, context.interpreter);
-	
-	// Calculate gas cost for EXP: 10 (base) + 50 * byte_length_of_exponent
-	// For zero exponent, byte length is 1. For non-zero, calculate based on significant bits.
-	let exp_byte_len = if op2.is_zero() {
-		1u64
-	} else {
-		let significant_bits = 256 - op2.leading_zeros() as u64;
-		(significant_bits + 7) / 8  // Round up to nearest byte
-	};
-	let gas_cost = 10u64.saturating_add(50u64.saturating_mul(exp_byte_len));
-	gas!(context.interpreter, RuntimeCosts::EVMGas(gas_cost));
-	
+	gas_or_fail!(context.interpreter, revm_gas::exp_cost(spec_id, *op2));
 	*op2 = op1.pow(*op2);
 }
 
@@ -153,7 +143,7 @@ pub fn exp<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 /// Similarly, if `b == 0` then the yellow paper says the output should start with all zeros,
 /// then end with bits from `b`; this is equal to `y & mask` where `&` is bitwise `AND`.
 pub fn signextend<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, RuntimeCosts::EVMGas(5));
+	gas_legacy!(context.interpreter, revm_gas::LOW);
 	popn_top!([ext], x, context.interpreter);
 	// For 31 we also don't need to do anything.
 	if ext < U256::from(31) {

From 02198ce8f88b845ebca7827a626e7dbc12894952 Mon Sep 17 00:00:00 2001
From: Robert van Eerdewijk <robert@Roberts-MacBook-Pro.local>
Date: Tue, 12 Aug 2025 11:09:13 +0200
Subject: [PATCH 096/186] Revert "Rve/revm arithmetic instructions WIP (#9361)"

This reverts commit 58b922044c41f5ada449ddae7173569de4e7259e.
---
 .../revive/fixtures/contracts/Arithmetic.sol  |  62 --
 substrate/frame/revive/src/tests/sol.rs       |   1 -
 .../frame/revive/src/tests/sol/arithmetic.rs  | 686 ------------------
 .../frame/revive/src/tests/sol/block_info.rs  |  40 +-
 .../src/vm/evm/instructions/arithmetic.rs     |   4 +-
 .../src/vm/evm/instructions/block_info.rs     |  10 +-
 6 files changed, 6 insertions(+), 797 deletions(-)
 delete mode 100644 substrate/frame/revive/fixtures/contracts/Arithmetic.sol
 delete mode 100644 substrate/frame/revive/src/tests/sol/arithmetic.rs

diff --git a/substrate/frame/revive/fixtures/contracts/Arithmetic.sol b/substrate/frame/revive/fixtures/contracts/Arithmetic.sol
deleted file mode 100644
index 7d9345ced2df..000000000000
--- a/substrate/frame/revive/fixtures/contracts/Arithmetic.sol
+++ /dev/null
@@ -1,62 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-contract Arithmetic {
-
-	function add(uint a, uint b) public view returns (uint) {
-		return a + b;
-	}
-
-    function mul(uint a, uint b) public view returns (uint) {
-		return a * b;
-	}
-
-    function sub(uint a, uint b) public view returns (uint) {
-		return a - b;
-	}
-
-    function div(uint a, uint b) public view returns (uint) {
-		return a / b;
-	}
-
-    function sdiv(int a, int b) public view returns (int) {
-		return a / b;
-	}
-
-    function rem(uint a, uint b) public view returns (uint) {
-		return a % b;
-	}
-
-    function smod(int a, int b) public view returns (int) {
-		return a % b;
-	}
-
-    // MOD instruction - unsigned modulo (alternative name to avoid Rust keyword conflict)
-    function umod(uint a, uint b) public view returns (uint) {
-		return a % b;
-	}
-
-    // ADDMOD instruction: (a + b) % n
-    function addmod(uint a, uint b, uint n) public view returns (uint) {
-		return (a + b) % n;
-	}
-
-    // MULMOD instruction: (a * b) % n  
-    function mulmod(uint a, uint b, uint n) public view returns (uint) {
-		return (a * b) % n;
-	}
-
-    // EXP instruction: a ** b (exponentiation)
-    function exp(uint a, uint b) public view returns (uint) {
-		return a ** b;
-	}
-
-    // SIGNEXTEND instruction: sign-extend value from (i+1)*8 bits to 256 bits
-    function signextend(uint i, uint x) public pure returns (uint) {
-        assembly {
-            x := signextend(i, x)
-        }
-        return x;
-    }
-
-}
diff --git a/substrate/frame/revive/src/tests/sol.rs b/substrate/frame/revive/src/tests/sol.rs
index 421d31b28498..15b52ebc4a82 100644
--- a/substrate/frame/revive/src/tests/sol.rs
+++ b/substrate/frame/revive/src/tests/sol.rs
@@ -15,7 +15,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-mod arithmetic;
 mod block_info;
 mod misc;
 mod system;
diff --git a/substrate/frame/revive/src/tests/sol/arithmetic.rs b/substrate/frame/revive/src/tests/sol/arithmetic.rs
deleted file mode 100644
index 53f0011dd7c9..000000000000
--- a/substrate/frame/revive/src/tests/sol/arithmetic.rs
+++ /dev/null
@@ -1,686 +0,0 @@
-// 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.
-
-//! The pallet-revive shared VM integration test suite.
-
-use crate::{
-	test_utils::{builder::Contract, ALICE},
-	tests::{builder, ExtBuilder, Test},
-	Code, Config,
-};
-
-use alloy_core::{primitives::U256, primitives::I256, sol_types::SolInterface};
-use frame_support::traits::fungible::Mutate;
-use pallet_revive_fixtures::{compile_module_with_type, Arithmetic, FixtureType};
-use pretty_assertions::assert_eq;
-
-#[test]
-fn add_works() {
-	for fixture_type in [FixtureType::Solc, FixtureType::Resolc] {
-		let (code, _) = compile_module_with_type("Arithmetic", fixture_type).unwrap();
-		ExtBuilder::default().build().execute_with(|| {
-			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-			let Contract { addr, .. } =
-				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-            {            
-                let result = builder::bare_call(addr)
-                    .data(
-                        Arithmetic::ArithmeticCalls::add(Arithmetic::addCall { a: U256::from(20u32), b: U256::from(22u32) })
-                            .abi_encode(),
-                    )
-                    .build_and_unwrap_result();
-                assert_eq!(
-                    U256::from(42u32),
-                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
-                    "ADD(20, 22) should equal 42 for {:?}", fixture_type
-                );
-            }
-
-            {
-                // Test large numbers but not MAX overflow
-                let large_a = U256::from(u64::MAX);
-                let large_b = U256::from(1000u32);
-                let expected = large_a + large_b;
-                let result = builder::bare_call(addr)
-                    .data(
-                        Arithmetic::ArithmeticCalls::add(Arithmetic::addCall { a: large_a, b: large_b })
-                            .abi_encode(),
-                    )
-                    .build_and_unwrap_result();
-                assert_eq!(
-                    expected,
-                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
-                    "ADD({}, {}) should equal {} for {:?}", large_a, large_b, expected, fixture_type
-                );
-            }
-		});
-	}
-}
-
-#[test]
-fn mul_works() {
-	for fixture_type in [FixtureType::Solc, FixtureType::Resolc] {
-		let (code, _) = compile_module_with_type("Arithmetic", fixture_type).unwrap();
-		ExtBuilder::default().build().execute_with(|| {
-			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-			let Contract { addr, .. } =
-				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-            {
-                let result = builder::bare_call(addr)
-                    .data(
-                        Arithmetic::ArithmeticCalls::mul(Arithmetic::mulCall { a: U256::from(20u32), b: U256::from(22u32) })
-                            .abi_encode(),
-                    )
-                    .build_and_unwrap_result();
-                assert_eq!(
-                    U256::from(440u32),
-                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
-                    "MUL(20, 22) should equal 440 for {:?}", fixture_type
-                );
-            }
-
-            {
-                // Test large numbers but not MAX overflow
-                let large_a = U256::from(u64::MAX);
-                let large_b = U256::from(1000u32);
-                let expected = large_a * large_b;
-                let result = builder::bare_call(addr)
-                    .data(
-                        Arithmetic::ArithmeticCalls::mul(Arithmetic::mulCall { a: large_a, b: large_b })
-                            .abi_encode(),
-                    )
-                    .build_and_unwrap_result();
-                assert_eq!(
-                    expected,
-                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
-                    "MUL({}, {}) should equal {} for {:?}", large_a, large_b, expected, fixture_type
-                );
-            }
-		});
-	}
-}
-
-#[test]
-fn sub_works() {
-	for fixture_type in [FixtureType::Solc, FixtureType::Resolc] {
-		let (code, _) = compile_module_with_type("Arithmetic", fixture_type).unwrap();
-		ExtBuilder::default().build().execute_with(|| {
-			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-			let Contract { addr, .. } =
-				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-            {
-                let result = builder::bare_call(addr)
-                    .data(
-                        Arithmetic::ArithmeticCalls::sub(Arithmetic::subCall { a: U256::from(20u32), b: U256::from(18u32) })
-                            .abi_encode(),
-                    )
-                    .build_and_unwrap_result();
-                assert_eq!(
-                    U256::from(2u32),
-                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
-                    "SUB(20, 18) should equal 2 for {:?}", fixture_type
-                );
-            }
-
-            {
-                // Test large numbers but not MAX overflow
-                let large_a = U256::from(u64::MAX);
-                let large_b = U256::from(1000u32);
-                let expected = large_a - large_b;
-                let result = builder::bare_call(addr)
-                    .data(
-                        Arithmetic::ArithmeticCalls::sub(Arithmetic::subCall { a: large_a, b: large_b })
-                            .abi_encode(),
-                    )
-                    .build_and_unwrap_result();
-                assert_eq!(
-                    expected,
-                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
-                    "SUB({}, {}) should equal {} for {:?}", large_a, large_b, expected, fixture_type
-                );
-            }
-		});
-	}
-}
-
-#[test]
-fn div_works() {
-	for fixture_type in [FixtureType::Solc, FixtureType::Resolc] {
-		let (code, _) = compile_module_with_type("Arithmetic", fixture_type).unwrap();
-		ExtBuilder::default().build().execute_with(|| {
-			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-			let Contract { addr, .. } =
-				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-            {
-                let result = builder::bare_call(addr)
-                    .data(
-                        Arithmetic::ArithmeticCalls::div(Arithmetic::divCall { a: U256::from(20u32), b: U256::from(5u32) })
-                            .abi_encode(),
-                    )
-                    .build_and_unwrap_result();
-                assert_eq!(
-                    U256::from(4u32),
-                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
-                    "DIV(20, 5) should equal 4 for {:?}", fixture_type
-                );
-            }
-
-            {
-                // Test large numbers but not MAX overflow
-                let large_a = U256::from(u64::MAX);
-                let large_b = U256::from(1000u32);
-                let expected = large_a / large_b;
-                let result = builder::bare_call(addr)
-                    .data(
-                        Arithmetic::ArithmeticCalls::div(Arithmetic::divCall { a: large_a, b: large_b })
-                            .abi_encode(),
-                    )
-                    .build_and_unwrap_result();
-                assert_eq!(
-                    expected,
-                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
-                    "DIV({}, {}) should equal {} for {:?}", large_a, large_b, expected, fixture_type
-                );
-            }
-		});
-	}
-}
-
-#[test]
-fn sdiv_works() {
-	for fixture_type in [FixtureType::Solc, FixtureType::Resolc] {
-		let (code, _) = compile_module_with_type("Arithmetic", fixture_type).unwrap();
-		ExtBuilder::default().build().execute_with(|| {
-			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-			let Contract { addr, .. } =
-				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-            {
-                let result = builder::bare_call(addr)
-                    .data(
-                        Arithmetic::ArithmeticCalls::sdiv(Arithmetic::sdivCall { a: I256::from_raw(U256::from(20u32)), b: I256::from_raw(U256::from(5u32)) })
-                            .abi_encode(),
-                    )
-                    .build_and_unwrap_result();
-                assert_eq!(
-                    I256::from_raw(U256::from(4u32)),
-                    I256::from_be_bytes::<32>(result.data.try_into().unwrap()),
-                    "SDIV(20, 5) should equal 4 for {:?}", fixture_type
-                );
-            }
-
-            {
-                // Test large numbers but not MAX overflow
-                let large_a = I256::from_raw(U256::from(i64::MAX as u64));
-                let large_b = -I256::from_raw(U256::from(1000u32));
-                let expected = large_a / large_b;
-                let result = builder::bare_call(addr)
-                    .data(
-                        Arithmetic::ArithmeticCalls::sdiv(Arithmetic::sdivCall { a: large_a, b: large_b })
-                            .abi_encode(),
-                    )
-                    .build_and_unwrap_result();
-                assert_eq!(
-                    expected,
-                    I256::from_be_bytes::<32>(result.data.try_into().unwrap()),
-                    "SDIV({}, {}) should equal {} for {:?}", large_a, large_b, expected, fixture_type
-                );
-            }
-		});
-	}
-}
-
-#[test]
-fn rem_works() {
-	for fixture_type in [FixtureType::Solc, FixtureType::Resolc] {
-		let (code, _) = compile_module_with_type("Arithmetic", fixture_type).unwrap();
-		ExtBuilder::default().build().execute_with(|| {
-			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-			let Contract { addr, .. } =
-				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-            {
-                let result = builder::bare_call(addr)
-                    .data(
-                        Arithmetic::ArithmeticCalls::rem(Arithmetic::remCall { a: U256::from(20u32), b: U256::from(5u32) })
-                            .abi_encode(),
-                    )
-                    .build_and_unwrap_result();
-                assert_eq!(
-                    U256::from(0u32),
-                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
-                    "REM(20, 5) should equal 0 for {:?}", fixture_type
-                );
-            }
-
-            {
-                // Test with remainder: 23 % 5 = 3
-                let result = builder::bare_call(addr)
-                    .data(
-                        Arithmetic::ArithmeticCalls::rem(Arithmetic::remCall { a: U256::from(23u32), b: U256::from(5u32) })
-                            .abi_encode(),
-                    )
-                    .build_and_unwrap_result();
-                assert_eq!(
-                    U256::from(3u32),
-                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
-                    "REM(23, 5) should equal 3 for {:?}", fixture_type
-                );
-            }
-
-            {
-                // Test large numbers with positive divisor
-                let large_a = U256::from(i64::MAX as u64);
-                let large_b = U256::from(1000u32);
-                let expected = large_a % large_b;
-                let result = builder::bare_call(addr)
-                    .data(
-                        Arithmetic::ArithmeticCalls::rem(Arithmetic::remCall { a: large_a, b: large_b })
-                            .abi_encode(),
-                    )
-                    .build_and_unwrap_result();
-                assert_eq!(
-                    expected,
-                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
-                    "REM({}, {}) should equal {} for {:?}", large_a, large_b, expected, fixture_type
-                );
-            }
-		});
-	}
-}
-
-#[test]
-fn smod_works() {
-	for fixture_type in [FixtureType::Solc, FixtureType::Resolc] {
-		let (code, _) = compile_module_with_type("Arithmetic", fixture_type).unwrap();
-		ExtBuilder::default().build().execute_with(|| {
-			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-			let Contract { addr, .. } =
-				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-            {
-                let result = builder::bare_call(addr)
-                    .data(
-                        Arithmetic::ArithmeticCalls::smod(Arithmetic::smodCall { a: I256::from_raw(U256::from(20u32)), b: I256::from_raw(U256::from(5u32)) })
-                            .abi_encode(),
-                    )
-                    .build_and_unwrap_result();
-                assert_eq!(
-                    I256::from_raw(U256::from(0u32)),
-                    I256::from_be_bytes::<32>(result.data.try_into().unwrap()),
-                    "SMOD(20, 5) should equal 0 for {:?}", fixture_type
-                );
-            }
-
-            {
-                // Test with remainder: 23 % 5 = 3
-                let result = builder::bare_call(addr)
-                    .data(
-                        Arithmetic::ArithmeticCalls::smod(Arithmetic::smodCall { a: I256::from_raw(U256::from(23u32)), b: I256::from_raw(U256::from(5u32)) })
-                            .abi_encode(),
-                    )
-                    .build_and_unwrap_result();
-                assert_eq!(
-                    I256::from_raw(U256::from(3u32)),
-                    I256::from_be_bytes::<32>(result.data.try_into().unwrap()),
-                    "SMOD(23, 5) should equal 3 for {:?}", fixture_type
-                );
-            }
-
-            {
-                // Test large numbers with positive divisor
-                let large_a = I256::from_raw(U256::from(i64::MAX as u64));
-                let large_b = I256::from_raw(U256::from(1000u32));
-                let expected = large_a % large_b;
-                let result = builder::bare_call(addr)
-                    .data(
-                        Arithmetic::ArithmeticCalls::smod(Arithmetic::smodCall { a: large_a, b: large_b })
-                            .abi_encode(),
-                    )
-                    .build_and_unwrap_result();
-                assert_eq!(
-                    expected,
-                    I256::from_be_bytes::<32>(result.data.try_into().unwrap()),
-                    "SMOD({}, {}) should equal {} for {:?}", large_a, large_b, expected, fixture_type
-                );
-            }
-
-            {
-                // Test negative numbers: -23 % 5 should equal -3 in most implementations
-                // We need to use two's complement representation for negative numbers
-                let neg_23 = I256::from_raw(U256::MAX - U256::from(22u32)); // -23 in two's complement
-                let pos_5 = I256::from_raw(U256::from(5u32));
-                let result = builder::bare_call(addr)
-                    .data(
-                        Arithmetic::ArithmeticCalls::smod(Arithmetic::smodCall { a: neg_23, b: pos_5 })
-                            .abi_encode(),
-                    )
-                    .build_and_unwrap_result();
-                let neg_3 = I256::from_raw(U256::MAX - U256::from(2u32)); // -3 in two's complement
-                assert_eq!(
-                    neg_3,
-                    I256::from_be_bytes::<32>(result.data.try_into().unwrap()),
-                    "REM(-23, 5) should equal -3 for {:?}", fixture_type
-                );
-            }
-		});
-	}
-}
-
-#[test]
-fn umod_works() {
-	for fixture_type in [FixtureType::Solc, FixtureType::Resolc] {
-		let (code, _) = compile_module_with_type("Arithmetic", fixture_type).unwrap();
-		ExtBuilder::default().build().execute_with(|| {
-			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-			let Contract { addr, .. } =
-				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-            {
-                let result = builder::bare_call(addr)
-                    .data(
-                        Arithmetic::ArithmeticCalls::umod(Arithmetic::umodCall { a: U256::from(23u32), b: U256::from(5u32) })
-                            .abi_encode(),
-                    )
-                    .build_and_unwrap_result();
-                assert_eq!(
-                    U256::from(3u32),
-                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
-                    "UMOD(23, 5) should equal 3 for {:?}", fixture_type
-                );
-            }
-		});
-	}
-}
-
-#[test]
-fn addmod_works() {
-	for fixture_type in [FixtureType::Solc, FixtureType::Resolc] {
-		let (code, _) = compile_module_with_type("Arithmetic", fixture_type).unwrap();
-		ExtBuilder::default().build().execute_with(|| {
-			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-			let Contract { addr, .. } =
-				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-            {
-                // Test ADDMOD: (10 + 15) % 7 = 25 % 7 = 4
-                let result = builder::bare_call(addr)
-                    .data(
-                        Arithmetic::ArithmeticCalls::addmod(Arithmetic::addmodCall { 
-                            a: U256::from(10u32), 
-                            b: U256::from(15u32), 
-                            n: U256::from(7u32) 
-                        })
-                            .abi_encode(),
-                    )
-                    .build_and_unwrap_result();
-                assert_eq!(
-                    U256::from(4u32),
-                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
-                    "ADDMOD(10, 15, 7) should equal 4 for {:?}", fixture_type
-                );
-            }
-		});
-	}
-}
-
-#[test]
-fn mulmod_works() {
-	for fixture_type in [FixtureType::Solc, FixtureType::Resolc] {
-		let (code, _) = compile_module_with_type("Arithmetic", fixture_type).unwrap();
-		ExtBuilder::default().build().execute_with(|| {
-			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-			let Contract { addr, .. } =
-				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-            {
-                // Test MULMOD: (6 * 7) % 10 = 42 % 10 = 2
-                let result = builder::bare_call(addr)
-                    .data(
-                        Arithmetic::ArithmeticCalls::mulmod(Arithmetic::mulmodCall { 
-                            a: U256::from(6u32), 
-                            b: U256::from(7u32), 
-                            n: U256::from(10u32) 
-                        })
-                            .abi_encode(),
-                    )
-                    .build_and_unwrap_result();
-                assert_eq!(
-                    U256::from(2u32),
-                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
-                    "MULMOD(6, 7, 10) should equal 2 for {:?}", fixture_type
-                );
-            }
-		});
-	}
-}
-
-#[test]
-fn exp_works() {
-	for fixture_type in [FixtureType::Solc, FixtureType::Resolc] {
-		let (code, _) = compile_module_with_type("Arithmetic", fixture_type).unwrap();
-		ExtBuilder::default().build().execute_with(|| {
-			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-			let Contract { addr, .. } =
-				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-            {
-                // Test EXP: 2 ** 3 = 8
-                let result = builder::bare_call(addr)
-                    .data(
-                        Arithmetic::ArithmeticCalls::exp(Arithmetic::expCall { 
-                            a: U256::from(2u32), 
-                            b: U256::from(3u32)
-                        })
-                            .abi_encode(),
-                    )
-                    .build_and_unwrap_result();
-                assert_eq!(
-                    U256::from(8u32),
-                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
-                    "EXP(2, 3) should equal 8 for {:?}", fixture_type
-                );
-            }
-
-            {
-                // Test EXP: 5 ** 2 = 25
-                let result = builder::bare_call(addr)
-                    .data(
-                        Arithmetic::ArithmeticCalls::exp(Arithmetic::expCall { 
-                            a: U256::from(5u32), 
-                            b: U256::from(2u32)
-                        })
-                            .abi_encode(),
-                    )
-                    .build_and_unwrap_result();
-                assert_eq!(
-                    U256::from(25u32),
-                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
-                    "EXP(5, 2) should equal 25 for {:?}", fixture_type
-                );
-            }
-
-            {
-                // Test EXP: 10 ** 0 = 1 (anything to power 0 is 1)
-                let result = builder::bare_call(addr)
-                    .data(
-                        Arithmetic::ArithmeticCalls::exp(Arithmetic::expCall { 
-                            a: U256::from(10u32), 
-                            b: U256::from(0u32)
-                        })
-                            .abi_encode(),
-                    )
-                    .build_and_unwrap_result();
-                assert_eq!(
-                    U256::from(1u32),
-                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
-                    "EXP(10, 0) should equal 1 for {:?}", fixture_type
-                );
-            }
-
-            {
-                // Test EXP: 1 ** 100 = 1 (1 to any power is 1)
-                let result = builder::bare_call(addr)
-                    .data(
-                        Arithmetic::ArithmeticCalls::exp(Arithmetic::expCall { 
-                            a: U256::from(1u32), 
-                            b: U256::from(100u32)
-                        })
-                            .abi_encode(),
-                    )
-                    .build_and_unwrap_result();
-                assert_eq!(
-                    U256::from(1u32),
-                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
-                    "EXP(1, 100) should equal 1 for {:?}", fixture_type
-                );
-            }
-
-            {
-                // Test EXP with larger numbers: 3 ** 4 = 81
-                let result = builder::bare_call(addr)
-                    .data(
-                        Arithmetic::ArithmeticCalls::exp(Arithmetic::expCall { 
-                            a: U256::from(3u32), 
-                            b: U256::from(4u32)
-                        })
-                            .abi_encode(),
-                    )
-                    .build_and_unwrap_result();
-                assert_eq!(
-                    U256::from(81u32),
-                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
-                    "EXP(3, 4) should equal 81 for {:?}", fixture_type
-                );
-            }
-		});
-	}
-}
-
-#[test]
-fn signextend_works() {
-	for fixture_type in [FixtureType::Solc, FixtureType::Resolc] {
-		let (code, _) = compile_module_with_type("Arithmetic", fixture_type).unwrap();
-		ExtBuilder::default().build().execute_with(|| {
-			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-			let Contract { addr, .. } =
-				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-            {
-                // Test SIGNEXTEND: extend 8-bit signed value 0xFF (-1) to 256 bits
-                // signextend(0, 0xFF) should extend from 8 bits, result should be all 1s (U256::MAX)
-                let result = builder::bare_call(addr)
-                    .data(
-                        Arithmetic::ArithmeticCalls::signextend(Arithmetic::signextendCall { 
-                            i: U256::from(0u32),  // extend from byte 0 (8 bits)
-                            x: U256::from(0xFFu32) // value 0xFF (all 1s in 8 bits)
-                        })
-                            .abi_encode(),
-                    )
-                    .build_and_unwrap_result();
-                assert_eq!(
-                    U256::MAX, // Should be all 1s when sign-extending 0xFF from 8 bits
-                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
-                    "SIGNEXTEND(0, 0xFF) should equal U256::MAX for {:?}", fixture_type
-                );
-            }
-
-            {
-                // Test SIGNEXTEND: extend 8-bit positive value 0x7F to 256 bits
-                // signextend(0, 0x7F) should keep it positive (sign bit is 0)
-                let result = builder::bare_call(addr)
-                    .data(
-                        Arithmetic::ArithmeticCalls::signextend(Arithmetic::signextendCall { 
-                            i: U256::from(0u32),  // extend from byte 0 (8 bits)
-                            x: U256::from(0x7Fu32) // value 0x7F (positive in 8 bits)
-                        })
-                            .abi_encode(),
-                    )
-                    .build_and_unwrap_result();
-                assert_eq!(
-                    U256::from(0x7Fu32), // Should remain 0x7F (positive)
-                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
-                    "SIGNEXTEND(0, 0x7F) should equal 0x7F for {:?}", fixture_type
-                );
-            }
-
-            {
-                // Test SIGNEXTEND: extend 16-bit signed value 0x8000 (-32768) to 256 bits
-                // signextend(1, 0x8000) should extend from 16 bits with sign bit set
-                let result = builder::bare_call(addr)
-                    .data(
-                        Arithmetic::ArithmeticCalls::signextend(Arithmetic::signextendCall { 
-                            i: U256::from(1u32),     // extend from byte 1 (16 bits)
-                            x: U256::from(0x8000u32) // value 0x8000 (negative in 16 bits)
-                        })
-                            .abi_encode(),
-                    )
-                    .build_and_unwrap_result();
-                // 0x8000 in 16 bits is negative, so should become 0xFFFF_FFFF_FFFF_FFFF_FFFF_FFFF_FFFF_8000
-                let expected = U256::MAX - U256::from(0x7FFFu32); // Two's complement representation
-                assert_eq!(
-                    expected,
-                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
-                    "SIGNEXTEND(1, 0x8000) should sign-extend negative 16-bit value for {:?}", fixture_type
-                );
-            }
-
-            {
-                // Test SIGNEXTEND: extend 16-bit positive value 0x7FFF to 256 bits
-                // signextend(1, 0x7FFF) should keep it positive
-                let result = builder::bare_call(addr)
-                    .data(
-                        Arithmetic::ArithmeticCalls::signextend(Arithmetic::signextendCall { 
-                            i: U256::from(1u32),     // extend from byte 1 (16 bits)
-                            x: U256::from(0x7FFFu32) // value 0x7FFF (positive in 16 bits)
-                        })
-                            .abi_encode(),
-                    )
-                    .build_and_unwrap_result();
-                assert_eq!(
-                    U256::from(0x7FFFu32), // Should remain 0x7FFF (positive)
-                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
-                    "SIGNEXTEND(1, 0x7FFF) should equal 0x7FFF for {:?}", fixture_type
-                );
-            }
-
-            {
-                // Test SIGNEXTEND: i >= 32 should return original value unchanged
-                // signextend(32, value) should return value as-is
-                let test_value = U256::from(0x123456789ABCDEFu64);
-                let result = builder::bare_call(addr)
-                    .data(
-                        Arithmetic::ArithmeticCalls::signextend(Arithmetic::signextendCall { 
-                            i: U256::from(32u32), // >= 32, should not modify
-                            x: test_value
-                        })
-                            .abi_encode(),
-                    )
-                    .build_and_unwrap_result();
-                assert_eq!(
-                    test_value,
-                    U256::from_be_bytes::<32>(result.data.try_into().unwrap()),
-                    "SIGNEXTEND(32, value) should return value unchanged for {:?}", fixture_type
-                );
-            }
-		});
-	}
-}
\ No newline at end of file
diff --git a/substrate/frame/revive/src/tests/sol/block_info.rs b/substrate/frame/revive/src/tests/sol/block_info.rs
index e688b7b96f23..e8ea76c30c9b 100644
--- a/substrate/frame/revive/src/tests/sol/block_info.rs
+++ b/substrate/frame/revive/src/tests/sol/block_info.rs
@@ -18,7 +18,7 @@
 //! The pallet-revive shared VM integration test suite.
 
 use crate::{
-	test_utils::{builder::Contract, ALICE, EVE_ADDR},
+	test_utils::{builder::Contract, ALICE},
 	tests::{builder, ExtBuilder, System, Test},
 	Code, Config,
 };
@@ -53,41 +53,3 @@ fn block_number_works() {
 		});
 	}
 }
-
-/// Tests that the coinbase opcode works as expected.
-#[test]
-fn coinbase_works() {
-	let eve_as_u256 = {
-		let mut bytes = [0u8; 32];
-		bytes[12..32].copy_from_slice(&EVE_ADDR.0);
-		U256::from_be_bytes(bytes)
-	};
-	for fixture_type in [FixtureType::Solc, FixtureType::Resolc] {
-		let (code, _) = compile_module_with_type("BlockInfo", fixture_type).unwrap();
-		ExtBuilder::default().build().execute_with(|| {
-			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-			let Contract { addr, .. } =
-				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-			let result = builder::bare_call(addr)
-				.data(
-					BlockInfo::BlockInfoCalls::coinbase(BlockInfo::coinbaseCall {})
-						.abi_encode(),
-				)
-				.build_and_unwrap_result();
-			
-			// Verify that we got a 32-byte result (address is padded to 32 bytes in EVM)
-			assert_eq!(result.data.len(), 32, "Coinbase should return a 32-byte padded address");
-			
-			// The coinbase opcode should return the current block's beneficiary address
-			let coinbase_result = U256::from_be_bytes::<32>(result.data.try_into().unwrap());
-
-			assert_eq!(
-				coinbase_result, 
-				eve_as_u256,
-				"Coinbase should return expected beneficiary address for {:?}",
-				fixture_type
-			);
-		});
-	}
-}
diff --git a/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs b/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs
index 67910ad1d358..6aa47e2bae86 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/arithmetic.rs
@@ -19,7 +19,7 @@ use super::{
 	i256::{i256_div, i256_mod},
 	Context,
 };
-use crate::{vm::Ext, RuntimeCosts};
+use crate::vm::Ext;
 use revm::{
 	interpreter::{
 		gas as revm_gas,
@@ -30,7 +30,7 @@ use revm::{
 
 /// Implements the ADD instruction - adds two values from stack.
 pub fn add<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, RuntimeCosts::EVMGas(3));
+	gas_legacy!(context.interpreter, revm_gas::VERYLOW);
 	popn_top!([op1], op2, context.interpreter);
 	*op2 = op1.wrapping_add(*op2);
 }
diff --git a/substrate/frame/revive/src/vm/evm/instructions/block_info.rs b/substrate/frame/revive/src/vm/evm/instructions/block_info.rs
index 3d4877439e0a..375de2f6f9c2 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/block_info.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/block_info.rs
@@ -19,10 +19,7 @@ use super::Context;
 use crate::{vm::Ext, RuntimeCosts};
 use revm::{
 	interpreter::{gas as revm_gas, host::Host, interpreter_types::RuntimeFlag},
-	primitives::{hardfork::SpecId::*, U256, Address, },
-};
-use crate::{
-	evm::H160,
+	primitives::{hardfork::SpecId::*, U256},
 };
 
 /// EIP-1344: ChainID opcode
@@ -36,9 +33,8 @@ pub fn chainid<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 ///
 /// Pushes the current block's beneficiary address onto the stack.
 pub fn coinbase<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
-	gas!(context.interpreter, RuntimeCosts::BlockAuthor);
-	let coinbase: Address = context.interpreter.extend.block_author().unwrap_or(H160::zero()).0.into();
-	push!(context.interpreter, coinbase.into_word().into());
+	gas_legacy!(context.interpreter, revm_gas::BASE);
+	push!(context.interpreter, context.host.beneficiary().into_word().into());
 }
 
 /// Implements the TIMESTAMP instruction.

From bb14f1c613ee9d43013ba671afdd6267b66fe8ef Mon Sep 17 00:00:00 2001
From: xermicus <cyrill@parity.io>
Date: Tue, 12 Aug 2025 18:04:10 +0200
Subject: [PATCH 097/186] [pallet-revive] do not silently fail Solidity
 fixtures compilation (#9474)

This prevents silent failing on compilation errors and using outdated
build artifacts. Instead of ignoring compilation errors and using
outdated fixtures, `cargo test` now bails out early and reports the
problems like this:

```
  Error: failed to compile the Solidity fixtures: [
    {
      "component": "general",
      "errorCode": "2314",
      "formattedMessage": "ParserError: Expected identifier but got '}'\n  --> Flipper.sol:11:1:\n   |\n11 | }\n   | ^\n\n",
      "message": "Expected identifier but got '}'",
      "severity": "error",
      "sourceLocation": {
        "end": 157,
        "file": "Flipper.sol",
        "start": 156
      },
      "type": "ParserError"
    }
  ]
```

Signed-off-by: xermicus <cyrill@parity.io>
---
 substrate/frame/revive/fixtures/build.rs | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/substrate/frame/revive/fixtures/build.rs b/substrate/frame/revive/fixtures/build.rs
index 08bdcd05d79a..a3030a66afad 100644
--- a/substrate/frame/revive/fixtures/build.rs
+++ b/substrate/frame/revive/fixtures/build.rs
@@ -182,7 +182,7 @@ fn invoke_build(current_dir: &Path) -> Result<()> {
 	let build_res = build_command.output().expect("failed to execute process");
 
 	if build_res.status.success() {
-		return Ok(())
+		return Ok(());
 	}
 
 	let stderr = String::from_utf8_lossy(&build_res.stderr);
@@ -272,6 +272,21 @@ fn compile_with_standard_json(
 	let compiler_json: serde_json::Value = serde_json::from_slice(&compiler_result.stdout)
 		.with_context(|| format!("Failed to parse {} JSON output", compiler))?;
 
+	// Abort on errors
+	if let Some(errors) = compiler_json.get("errors") {
+		if errors
+			.as_array()
+			.unwrap()
+			.iter()
+			.any(|object| object.get("severity").unwrap().as_str().unwrap() == "error")
+		{
+			bail!(
+				"failed to compile the Solidity fixtures: {}",
+				serde_json::to_string_pretty(errors)?
+			);
+		}
+	}
+
 	Ok(compiler_json)
 }
 
@@ -476,7 +491,7 @@ pub fn main() -> Result<()> {
 
 	let entries = collect_entries(&contracts_dir);
 	if entries.is_empty() {
-		return Ok(())
+		return Ok(());
 	}
 
 	// Compile Rust contracts

From 1bfbaa8514bed05cf46ffa6fced23dd2548593df Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Thu, 14 Aug 2025 10:24:27 +0000
Subject: [PATCH 098/186] refactor more benchmarks

---
 substrate/frame/revive/src/benchmarking.rs    | 51 +++++++++++++++++++
 substrate/frame/revive/src/call_builder.rs    | 21 ++++++++
 substrate/frame/revive/src/gas.rs             | 29 +++++++++++
 substrate/frame/revive/src/vm/evm.rs          | 20 +++++---
 .../revive/src/vm/evm/instructions/macros.rs  | 14 ++---
 .../frame/revive/src/vm/runtime_costs.rs      |  6 ---
 substrate/frame/revive/src/weights.rs         |  1 +
 7 files changed, 121 insertions(+), 21 deletions(-)

diff --git a/substrate/frame/revive/src/benchmarking.rs b/substrate/frame/revive/src/benchmarking.rs
index 2e2a5da89368..5f6bd672e569 100644
--- a/substrate/frame/revive/src/benchmarking.rs
+++ b/substrate/frame/revive/src/benchmarking.rs
@@ -149,6 +149,34 @@ mod benchmarks {
 		Ok(())
 	}
 
+	// This benchmarks the overhead of loading a code of size `c` byte from storage and into
+	// the execution engine.
+	/// This is similar to `call_with_code_per_byte` but for EVM bytecode.
+	#[benchmark(pov_mode = Measured)]
+	fn evm_call_with_code_per_byte(
+		c: Linear<1, { limits::code::BLOB_BYTES }>,
+	) -> Result<(), BenchmarkError> {
+		let instance = Contract::<T>::with_caller(
+			whitelisted_caller(),
+			VmBinaryModule::evm_sized(c - 1),
+			vec![],
+		)?;
+		let value = Pallet::<T>::min_balance();
+		let storage_deposit = default_deposit_limit::<T>();
+
+		#[extrinsic_call]
+		call(
+			RawOrigin::Signed(instance.caller.clone()),
+			instance.address,
+			value,
+			Weight::MAX,
+			storage_deposit,
+			vec![],
+		);
+
+		Ok(())
+	}
+
 	// Measure the amount of time it takes to compile a single basic block.
 	//
 	// (basic_block_compilation(1) - basic_block_compilation(0)).ref_time()
@@ -2201,6 +2229,29 @@ mod benchmarks {
 		Ok(())
 	}
 
+	/// Benchmark the cost of EVM instructions.
+	#[benchmark(pov_mode = Measured)]
+	fn evm_opcode(r: Linear<0, 10_000>) -> Result<(), BenchmarkError> {
+		use crate::vm::evm;
+		use revm::bytecode::Bytecode;
+
+		let module = VmBinaryModule::evm_noop(r);
+		let inputs = evm::EVMInputs::new(vec![]);
+
+		let code = Bytecode::new_raw(revm::primitives::Bytes::from(module.code.clone()));
+		let mut setup = CallSetup::<T>::new(module);
+		let (mut ext, _) = setup.ext();
+
+		let result;
+		#[block]
+		{
+			result = evm::call(code, &mut ext, inputs);
+		}
+
+		assert!(result.is_ok());
+		Ok(())
+	}
+
 	// Benchmark the execution of instructions.
 	//
 	// It benchmarks the absolute worst case by allocating a lot of memory
diff --git a/substrate/frame/revive/src/call_builder.rs b/substrate/frame/revive/src/call_builder.rs
index 931fef4a6bd3..1f288c906b6e 100644
--- a/substrate/frame/revive/src/call_builder.rs
+++ b/substrate/frame/revive/src/call_builder.rs
@@ -417,6 +417,19 @@ impl VmBinaryModule {
 		Self::with_num_instructions(size / 3)
 	}
 
+	// Same as sized but using EVM bytecode.
+	pub fn evm_sized(size: u32) -> Self {
+		use revm::bytecode::opcode::{JUMPDEST, STOP};
+
+		if size == 0 {
+			return Self::new(vec![])
+		}
+
+		let mut code = vec![STOP];
+		code.extend(vec![JUMPDEST; (size - 1) as usize]);
+		Self::new(code)
+	}
+
 	/// A contract code of specified number of instructions that uses all its bytes for instructions
 	/// but will return immediately.
 	///
@@ -478,4 +491,12 @@ impl VmBinaryModule {
 		let code = polkavm_common::assembler::assemble(&text).unwrap();
 		Self::new(code)
 	}
+
+	/// An evm contract that executes  `n` JUMPDEST instructions.
+	pub fn evm_noop(size: u32) -> Self {
+		use revm::bytecode::opcode::JUMPDEST;
+
+		let code = vec![JUMPDEST; size as usize];
+		Self::new(code)
+	}
 }
diff --git a/substrate/frame/revive/src/gas.rs b/substrate/frame/revive/src/gas.rs
index b310dd4a46a1..34eeb5fd4c4f 100644
--- a/substrate/frame/revive/src/gas.rs
+++ b/substrate/frame/revive/src/gas.rs
@@ -219,6 +219,35 @@ impl<T: Config> GasMeter<T> {
 		Ok(ChargedAmount(amount))
 	}
 
+	/// Charge the initial cost for executing EVM bytecode.
+	pub fn charge_evm_init_cost(&mut self) -> Result<(), DispatchError> {
+		self.gas_left = self
+			.gas_left
+			.checked_sub(&T::WeightInfo::evm_opcode(0))
+			.ok_or_else(|| Error::<T>::OutOfGas)?;
+		Ok(())
+	}
+
+	/// Charge the base cost for executing an EVM opcode.
+	pub fn charge_evm_base_cost(&mut self) -> Result<(), DispatchError> {
+		let base_cost = T::WeightInfo::evm_opcode(1).saturating_sub(T::WeightInfo::evm_opcode(0));
+		self.gas_left =
+			self.gas_left.checked_sub(&base_cost).ok_or_else(|| Error::<T>::OutOfGas)?;
+		Ok(())
+	}
+
+	/// Charge the specified amount of EVM gas.
+	/// This is used for basic opcodes (e.g arithmetic, bitwise, ...) that don't have a dedicated
+	/// benchmark
+	pub fn charge_evm_gas(&mut self, gas: u64) -> Result<(), DispatchError> {
+		let base_cost = T::WeightInfo::evm_opcode(1).saturating_sub(T::WeightInfo::evm_opcode(0));
+		self.gas_left = self
+			.gas_left
+			.checked_sub(&base_cost.saturating_mul(gas))
+			.ok_or_else(|| Error::<T>::OutOfGas)?;
+		Ok(())
+	}
+
 	/// Adjust a previously charged amount down to its actual amount.
 	///
 	/// This is when a maximum a priori amount was charged and then should be partially
diff --git a/substrate/frame/revive/src/vm/evm.rs b/substrate/frame/revive/src/vm/evm.rs
index 7d71d069c665..fd85b3838588 100644
--- a/substrate/frame/revive/src/vm/evm.rs
+++ b/substrate/frame/revive/src/vm/evm.rs
@@ -66,6 +66,8 @@ where
 
 /// Calls the EVM interpreter with the provided bytecode and inputs.
 pub fn call<'a, E: Ext>(bytecode: Bytecode, ext: &'a mut E, inputs: EVMInputs) -> ExecResult {
+	ext.gas_meter_mut().charge_evm_init_cost()?;
+
 	let mut interpreter: Interpreter<EVMInterpreter<'a, E>> = Interpreter {
 		gas: Gas::default(),
 		bytecode: ExtBytecode::new(bytecode),
@@ -96,12 +98,18 @@ fn run<WIRE: InterpreterTypes>(
 	table: &revm::interpreter::InstructionTable<WIRE, DummyHost>,
 ) -> InterpreterResult {
 	let host = &mut DummyHost {};
-	loop {
-		let action = interpreter.run_plain(table, host);
-		match action {
-			InterpreterAction::Return(result) => return result,
-			InterpreterAction::NewFrame(_) => unimplemented!(),
-		}
+	let action = interpreter.run_plain(table, host);
+	match action {
+		InterpreterAction::Return(result) => return result,
+		InterpreterAction::NewFrame(_) => {
+			// We should never hit this as creating a new frame should be handled by the opcode
+			// directly
+			InterpreterResult::new(
+				revm::interpreter::InstructionResult::FatalExternalError,
+				Default::default(),
+				interpreter.gas,
+			)
+		},
 	}
 }
 
diff --git a/substrate/frame/revive/src/vm/evm/instructions/macros.rs b/substrate/frame/revive/src/vm/evm/instructions/macros.rs
index 1d6efefe442f..d171622d0ebd 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/macros.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/macros.rs
@@ -84,12 +84,7 @@ macro_rules! gas_legacy {
 		gas_legacy!($interpreter, $gas, ())
 	};
 	($interpreter:expr, $gas:expr, $ret:expr) => {
-		if $interpreter
-			.extend
-			.gas_meter_mut()
-			.charge($crate::RuntimeCosts::EVMGas($gas))
-			.is_err()
-		{
+		if $interpreter.extend.gas_meter_mut().charge_evm_gas($gas).is_err() {
 			$interpreter.halt(revm::interpreter::InstructionResult::OutOfGas);
 			return $ret;
 		}
@@ -102,7 +97,8 @@ macro_rules! gas {
 		gas!($interpreter, $gas, ())
 	};
 	($interpreter:expr, $gas:expr, $ret:expr) => {
-		if $interpreter.extend.gas_meter_mut().charge($gas).is_err() {
+		let meter = $interpreter.extend.gas_meter_mut();
+		if meter.charge_evm_base_cost().is_err() || meter.charge($gas).is_err() {
 			$interpreter.halt(revm::interpreter::InstructionResult::OutOfGas);
 			return $ret;
 		}
@@ -126,7 +122,7 @@ macro_rules! gas_or_fail {
 	};
 }
 
-use crate::{vm::Ext, RuntimeCosts};
+use crate::vm::Ext;
 use revm::interpreter::gas::{MemoryExtensionResult, MemoryGas};
 
 /// Adapted from
@@ -140,7 +136,7 @@ pub fn record_memory_expansion<'a, E: Ext>(
 		return MemoryExtensionResult::Same;
 	};
 
-	if ext.gas_meter_mut().charge(RuntimeCosts::EVMGas(additional_cost)).is_err() {
+	if ext.gas_meter_mut().charge_evm_gas(additional_cost).is_err() {
 		return MemoryExtensionResult::OutOfGas;
 	}
 
diff --git a/substrate/frame/revive/src/vm/runtime_costs.rs b/substrate/frame/revive/src/vm/runtime_costs.rs
index d730c72579e2..e0fa23d3efc4 100644
--- a/substrate/frame/revive/src/vm/runtime_costs.rs
+++ b/substrate/frame/revive/src/vm/runtime_costs.rs
@@ -32,8 +32,6 @@ const WEIGHT_PER_GAS: u64 = WEIGHT_REF_TIME_PER_SECOND / GAS_PER_SECOND;
 #[cfg_attr(test, derive(Debug, PartialEq, Eq))]
 #[derive(Copy, Clone)]
 pub enum RuntimeCosts {
-	/// cost of an EVM gas unit.
-	EVMGas(u64),
 	/// Base Weight of calling a host function.
 	HostFn,
 	/// Weight charged for copying data from the sandbox.
@@ -311,10 +309,6 @@ impl<T: Config> Token<T> for RuntimeCosts {
 			Identity(len) => T::WeightInfo::identity(len),
 			Blake2F(rounds) => T::WeightInfo::blake2f(rounds),
 			Modexp(gas) => Weight::from_parts(gas.saturating_mul(WEIGHT_PER_GAS), 0),
-			EVMGas(gas) => {
-				// TODO replace this by a proper benchmark value
-				Weight::from_parts(gas.saturating_mul(WEIGHT_PER_GAS), 0)
-			},
 		}
 	}
 }
diff --git a/substrate/frame/revive/src/weights.rs b/substrate/frame/revive/src/weights.rs
index b85b5f00faa2..4de04ccd2ebb 100644
--- a/substrate/frame/revive/src/weights.rs
+++ b/substrate/frame/revive/src/weights.rs
@@ -158,6 +158,7 @@ pub trait WeightInfo {
 	fn seal_ecdsa_to_eth_address() -> Weight;
 	fn seal_set_code_hash() -> Weight;
 	fn instr(r: u32, ) -> Weight;
+	fn evm_opcode(_r: u32) -> Weight { Weight::zero() }
 	fn instr_empty_loop(r: u32, ) -> Weight;
 	fn v1_migration_step() -> Weight;
 }

From b2ceaaeacce400c2ed76b46adcc927c3d6b7ebf3 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Mon, 18 Aug 2025 08:37:44 +0200
Subject: [PATCH 099/186] revm file shuffling

---
 Cargo.lock                                    |  694 ++-
 Cargo.toml                                    |    2 +
 .../assets/asset-hub-westend/tests/tests.rs   |   25 +-
 substrate/frame/revive/Cargo.toml             |    2 +
 substrate/frame/revive/fixtures/Cargo.toml    |    5 +-
 substrate/frame/revive/fixtures/build.rs      |  250 +-
 .../frame/revive/fixtures/contracts/dummy.sol |   14 -
 .../frame/revive/fixtures/erc20/erc20.polkavm |  Bin 0 -> 44001 bytes
 .../frame/revive/fixtures/erc20/erc20.sol     |   20 +
 .../fixtures/erc20/expensive_erc20.polkavm    |  Bin 0 -> 40090 bytes
 .../revive/fixtures/erc20/expensive_erc20.sol |   21 +
 .../revive/fixtures/erc20/fake_erc20.polkavm  |  Bin 0 -> 6304 bytes
 substrate/frame/revive/fixtures/src/lib.rs    |   36 +-
 substrate/frame/revive/src/benchmarking.rs    |  107 +-
 substrate/frame/revive/src/call_builder.rs    |   23 +-
 substrate/frame/revive/src/exec.rs            |   54 +-
 substrate/frame/revive/src/exec/mock_ext.rs   |  269 +
 substrate/frame/revive/src/exec/tests.rs      |    4 +
 substrate/frame/revive/src/gas.rs             |   29 +
 substrate/frame/revive/src/impl_fungibles.rs  |   11 +-
 substrate/frame/revive/src/lib.rs             |   59 +-
 substrate/frame/revive/src/tests.rs           | 4934 +----------------
 substrate/frame/revive/src/tests/pvm.rs       | 4933 ++++++++++++++++
 substrate/frame/revive/src/vm/mod.rs          |  166 +-
 substrate/frame/revive/src/vm/pvm.rs          |  960 ++++
 substrate/frame/revive/src/vm/pvm/env.rs      | 1073 ++++
 substrate/frame/revive/src/vm/runtime.rs      | 2147 -------
 .../frame/revive/src/vm/runtime_costs.rs      |  315 ++
 28 files changed, 8722 insertions(+), 7431 deletions(-)
 delete mode 100644 substrate/frame/revive/fixtures/contracts/dummy.sol
 create mode 100644 substrate/frame/revive/fixtures/erc20/erc20.polkavm
 create mode 100644 substrate/frame/revive/fixtures/erc20/erc20.sol
 create mode 100644 substrate/frame/revive/fixtures/erc20/expensive_erc20.polkavm
 create mode 100644 substrate/frame/revive/fixtures/erc20/expensive_erc20.sol
 create mode 100644 substrate/frame/revive/fixtures/erc20/fake_erc20.polkavm
 create mode 100644 substrate/frame/revive/src/exec/mock_ext.rs
 create mode 100644 substrate/frame/revive/src/tests/pvm.rs
 create mode 100644 substrate/frame/revive/src/vm/pvm.rs
 create mode 100644 substrate/frame/revive/src/vm/pvm/env.rs
 create mode 100644 substrate/frame/revive/src/vm/runtime_costs.rs

diff --git a/Cargo.lock b/Cargo.lock
index 4c4d0344bf22..5f03050f15f1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -134,6 +134,63 @@ dependencies = [
  "winnow 0.7.10",
 ]
 
+[[package]]
+name = "alloy-eip2124"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "741bdd7499908b3aa0b159bba11e71c8cddd009a2c2eb7a06e825f1ec87900a5"
+dependencies = [
+ "alloy-primitives",
+ "alloy-rlp",
+ "crc",
+ "serde",
+ "thiserror 2.0.12",
+]
+
+[[package]]
+name = "alloy-eip2930"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b82752a889170df67bbb36d42ca63c531eb16274f0d7299ae2a680facba17bd"
+dependencies = [
+ "alloy-primitives",
+ "alloy-rlp",
+ "serde",
+]
+
+[[package]]
+name = "alloy-eip7702"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d4769c6ffddca380b0070d71c8b7f30bed375543fe76bb2f74ec0acf4b7cd16"
+dependencies = [
+ "alloy-primitives",
+ "alloy-rlp",
+ "k256",
+ "serde",
+ "thiserror 2.0.12",
+]
+
+[[package]]
+name = "alloy-eips"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5937e2d544e9b71000942d875cbc57965b32859a666ea543cc57aae5a06d602d"
+dependencies = [
+ "alloy-eip2124",
+ "alloy-eip2930",
+ "alloy-eip7702",
+ "alloy-primitives",
+ "alloy-rlp",
+ "alloy-serde",
+ "auto_impl",
+ "c-kzg",
+ "derive_more 2.0.1",
+ "either",
+ "serde",
+ "sha2 0.10.9",
+]
+
 [[package]]
 name = "alloy-json-abi"
 version = "1.1.2"
@@ -148,9 +205,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-primitives"
-version = "1.1.2"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18c35fc4b03ace65001676358ffbbaefe2a2b27ee50fe777c345082c7c888be8"
+checksum = "3cfebde8c581a5d37b678d0a48a32decb51efd7a63a08ce2517ddec26db705c8"
 dependencies = [
  "alloy-rlp",
  "bytes",
@@ -175,13 +232,35 @@ dependencies = [
 
 [[package]]
 name = "alloy-rlp"
-version = "0.3.3"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc0fac0fc16baf1f63f78b47c3d24718f3619b0714076f6a02957d808d52cbef"
+checksum = "5f70d83b765fdc080dbcd4f4db70d8d23fe4761f2f02ebfa9146b833900634b4"
 dependencies = [
+ "alloy-rlp-derive",
  "arrayvec 0.7.4",
  "bytes",
- "smol_str",
+]
+
+[[package]]
+name = "alloy-rlp-derive"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64b728d511962dda67c1bc7ea7c03736ec275ed2cf4c35d9585298ac9ccf3b73"
+dependencies = [
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "alloy-serde"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e1722bc30feef87cc0fa824e43c9013f9639cc6c037be7be28a31361c788be2"
+dependencies = [
+ "alloy-primitives",
+ "serde",
+ "serde_json",
 ]
 
 [[package]]
@@ -331,9 +410,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.98"
+version = "1.0.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
+checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100"
 
 [[package]]
 name = "approx"
@@ -360,9 +439,9 @@ dependencies = [
 
 [[package]]
 name = "arbitrary"
-version = "1.4.1"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
+checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1"
 dependencies = [
  "derive_arbitrary",
 ]
@@ -428,6 +507,18 @@ dependencies = [
  "ark-std 0.4.0",
 ]
 
+[[package]]
+name = "ark-bn254"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d69eab57e8d2663efa5c63135b2af4f396d66424f88954c21104125ab6b3e6bc"
+dependencies = [
+ "ark-ec 0.5.0",
+ "ark-ff 0.5.0",
+ "ark-r1cs-std",
+ "ark-std 0.5.0",
+]
+
 [[package]]
 name = "ark-bw6-761"
 version = "0.4.0"
@@ -724,6 +815,35 @@ dependencies = [
  "rayon",
 ]
 
+[[package]]
+name = "ark-r1cs-std"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "941551ef1df4c7a401de7068758db6503598e6f01850bdb2cfdb614a1f9dbea1"
+dependencies = [
+ "ark-ec 0.5.0",
+ "ark-ff 0.5.0",
+ "ark-relations",
+ "ark-std 0.5.0",
+ "educe",
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+ "tracing",
+]
+
+[[package]]
+name = "ark-relations"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec46ddc93e7af44bcab5230937635b06fb5744464dd6a7e7b083e80ebd274384"
+dependencies = [
+ "ark-ff 0.5.0",
+ "ark-std 0.5.0",
+ "tracing",
+ "tracing-subscriber 0.2.25",
+]
+
 [[package]]
 name = "ark-scale"
 version = "0.0.12"
@@ -869,7 +989,7 @@ dependencies = [
  "digest 0.10.7",
  "rand_chacha 0.3.1",
  "rayon",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "w3f-ring-proof",
  "zeroize",
 ]
@@ -1701,16 +1821,25 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "aurora-engine-modexp"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "518bc5745a6264b5fd7b09dffb9667e400ee9e2bbe18555fac75e1fe9afa0df9"
+dependencies = [
+ "hex",
+ "num",
+]
+
 [[package]]
 name = "auto_impl"
-version = "1.1.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fee3da8ef1276b0bee5dd1c7258010d8fffd31801447323115a25560e1327b89"
+checksum = "ffdcb70bdbc4d478427380519163274ac86e52916e10f0a8889adf0f96d3fee7"
 dependencies = [
- "proc-macro-error",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
- "syn 1.0.109",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -1730,6 +1859,12 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "az"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973"
+
 [[package]]
 name = "backoff"
 version = "0.4.0"
@@ -1851,7 +1986,7 @@ dependencies = [
  "k256",
  "rand_core 0.6.4",
  "ripemd",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "subtle 2.5.0",
  "zeroize",
 ]
@@ -1922,9 +2057,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.6.0"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
 dependencies = [
  "serde",
 ]
@@ -2041,6 +2176,18 @@ dependencies = [
  "log",
 ]
 
+[[package]]
+name = "blst"
+version = "0.3.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fd49896f12ac9b6dcd7a5998466b9b58263a695a3dd1ecc1aaca2e12a90b080"
+dependencies = [
+ "cc",
+ "glob",
+ "threadpool",
+ "zeroize",
+]
+
 [[package]]
 name = "bounded-collections"
 version = "0.1.9"
@@ -2797,7 +2944,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4"
 dependencies = [
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "tinyvec",
 ]
 
@@ -2874,6 +3021,21 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "c-kzg"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7318cfa722931cb5fe0838b98d3ce5621e75f6a6408abc21721d80de9223f2e4"
+dependencies = [
+ "blst",
+ "cc",
+ "glob",
+ "hex",
+ "libc",
+ "once_cell",
+ "serde",
+]
+
 [[package]]
 name = "c2-chacha"
 version = "0.3.3"
@@ -2930,9 +3092,9 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6"
 
 [[package]]
 name = "cc"
-version = "1.1.24"
+version = "1.2.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938"
+checksum = "deec109607ca693028562ed836a5f1c4b8bd77755c4e132fc5ce11b0b6211ae7"
 dependencies = [
  "jobserver",
  "libc",
@@ -4670,7 +4832,7 @@ dependencies = [
  "sp-io",
  "sp-maybe-compressed-blob",
  "tracing",
- "tracing-subscriber",
+ "tracing-subscriber 0.3.18",
 ]
 
 [[package]]
@@ -5376,9 +5538,9 @@ dependencies = [
 
 [[package]]
 name = "derive-where"
-version = "1.2.7"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25"
+checksum = "510c292c8cf384b1a340b816a9a6cf2599eb8f566a44949024af88418000c50b"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
@@ -5387,9 +5549,9 @@ dependencies = [
 
 [[package]]
 name = "derive_arbitrary"
-version = "1.4.1"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800"
+checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
@@ -5714,7 +5876,7 @@ dependencies = [
  "ed25519",
  "rand_core 0.6.4",
  "serde",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "subtle 2.5.0",
  "zeroize",
 ]
@@ -5730,7 +5892,7 @@ dependencies = [
  "hashbrown 0.14.5",
  "hex",
  "rand_core 0.6.4",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "zeroize",
 ]
 
@@ -5748,9 +5910,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.13.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 dependencies = [
  "serde",
 ]
@@ -6729,7 +6891,7 @@ dependencies = [
  "sp-runtime",
  "sp-statement-store",
  "tempfile",
- "tracing-subscriber",
+ "tracing-subscriber 0.3.18",
 ]
 
 [[package]]
@@ -7298,7 +7460,7 @@ version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3fda788993cc341f69012feba8bf45c0ba4f3291fcc08e214b4d5a7332d88aff"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "libc",
  "libgit2-sys",
  "log",
@@ -7409,6 +7571,16 @@ dependencies = [
  "testnet-parachains-constants",
 ]
 
+[[package]]
+name = "gmp-mpfr-sys"
+version = "1.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c66d61197a68f6323b9afa616cf83d55d69191e1bf364d4eb7d35ae18defe776"
+dependencies = [
+ "libc",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "governance-westend-integration-tests"
 version = "0.0.0"
@@ -8792,7 +8964,7 @@ dependencies = [
  "elliptic-curve",
  "once_cell",
  "serdect",
- "sha2 0.10.8",
+ "sha2 0.10.9",
 ]
 
 [[package]]
@@ -9269,7 +9441,7 @@ dependencies = [
  "multihash 0.19.1",
  "quick-protobuf",
  "rand 0.8.5",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "thiserror 1.0.65",
  "tracing",
  "zeroize",
@@ -9295,7 +9467,7 @@ dependencies = [
  "quick-protobuf",
  "quick-protobuf-codec",
  "rand 0.8.5",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "smallvec",
  "thiserror 1.0.65",
  "tracing",
@@ -9360,7 +9532,7 @@ dependencies = [
  "once_cell",
  "quick-protobuf",
  "rand 0.8.5",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "snow",
  "static_assertions",
  "thiserror 1.0.65",
@@ -9552,7 +9724,7 @@ dependencies = [
  "thiserror 1.0.65",
  "tracing",
  "yamux 0.12.1",
- "yamux 0.13.6",
+ "yamux 0.13.5",
 ]
 
 [[package]]
@@ -9754,7 +9926,7 @@ dependencies = [
  "prost-build",
  "rand 0.8.5",
  "serde",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "simple-dns",
  "smallvec",
  "snow",
@@ -9770,7 +9942,7 @@ dependencies = [
  "url",
  "x25519-dalek",
  "x509-parser 0.17.0",
- "yamux 0.13.6",
+ "yamux 0.13.5",
  "yasna",
  "zeroize",
 ]
@@ -9805,7 +9977,7 @@ dependencies = [
  "generator",
  "scoped-tls",
  "tracing",
- "tracing-subscriber",
+ "tracing-subscriber 0.3.18",
 ]
 
 [[package]]
@@ -10290,7 +10462,7 @@ dependencies = [
  "core2",
  "digest 0.10.7",
  "multihash-derive",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "sha3",
  "unsigned-varint 0.7.2",
 ]
@@ -10493,7 +10665,7 @@ version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "cfg-if",
  "libc",
 ]
@@ -10504,7 +10676,7 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "cfg-if",
  "cfg_aliases 0.2.1",
  "libc",
@@ -10842,6 +11014,28 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "num_enum"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a973b4e44ce6cad84ce69d797acf9a044532e4184c4f267913d1b546a0727b7a"
+dependencies = [
+ "num_enum_derive",
+ "rustversion",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d"
+dependencies = [
+ "proc-macro-crate 3.1.0",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "num_threads"
 version = "0.1.7"
@@ -10930,7 +11124,7 @@ version = "0.10.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -11038,6 +11232,18 @@ version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
 
+[[package]]
+name = "p256"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b"
+dependencies = [
+ "ecdsa",
+ "elliptic-curve",
+ "primeorder",
+ "sha2 0.10.9",
+]
+
 [[package]]
 name = "pallet-ah-ops"
 version = "0.1.0"
@@ -12892,6 +13098,7 @@ dependencies = [
  "pretty_assertions",
  "rand 0.8.5",
  "rand_pcg",
+ "revm",
  "ripemd",
  "rlp 0.6.1",
  "scale-info",
@@ -12954,10 +13161,13 @@ dependencies = [
 name = "pallet-revive-fixtures"
 version = "0.1.0"
 dependencies = [
+ "alloy-core",
  "anyhow",
  "cargo_metadata",
+ "hex",
  "pallet-revive-uapi",
  "polkavm-linker 0.27.0",
+ "serde_json",
  "sp-core 28.0.0",
  "sp-io",
  "toml",
@@ -14544,7 +14754,7 @@ checksum = "56af0a30af74d0445c0bf6d9d051c979b516a1a5af790d251daee76005420a48"
 dependencies = [
  "once_cell",
  "pest",
- "sha2 0.10.8",
+ "sha2 0.10.9",
 ]
 
 [[package]]
@@ -14557,6 +14767,48 @@ dependencies = [
  "indexmap",
 ]
 
+[[package]]
+name = "phf"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
+dependencies = [
+ "phf_macros",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
+dependencies = [
+ "phf_shared",
+ "rand 0.8.5",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
+dependencies = [
+ "siphasher 1.0.1",
+]
+
 [[package]]
 name = "pin-project"
 version = "1.1.10"
@@ -17279,6 +17531,15 @@ dependencies = [
  "syn 2.0.98",
 ]
 
+[[package]]
+name = "primeorder"
+version = "0.13.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6"
+dependencies = [
+ "elliptic-curve",
+]
+
 [[package]]
 name = "primitive-types"
 version = "0.12.2"
@@ -17427,7 +17688,7 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "chrono",
  "flate2",
  "hex",
@@ -17442,7 +17703,7 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "chrono",
  "hex",
 ]
@@ -17504,7 +17765,7 @@ checksum = "14cae93065090804185d3b75f0bf93b8eeda30c7a9b4a33d3bdb3988d6229e50"
 dependencies = [
  "bit-set",
  "bit-vec",
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "lazy_static",
  "num-traits",
  "rand 0.8.5",
@@ -17600,7 +17861,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
 dependencies = [
  "anyhow",
- "itertools 0.14.0",
+ "itertools 0.13.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "syn 2.0.98",
@@ -17989,7 +18250,7 @@ version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
 ]
 
 [[package]]
@@ -18281,6 +18542,195 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "revm"
+version = "27.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e6bf82101a1ad8a2b637363a37aef27f88b4efc8a6e24c72bf5f64923dc5532"
+dependencies = [
+ "revm-bytecode",
+ "revm-context",
+ "revm-context-interface",
+ "revm-database",
+ "revm-database-interface",
+ "revm-handler",
+ "revm-inspector",
+ "revm-interpreter",
+ "revm-precompile",
+ "revm-primitives",
+ "revm-state",
+]
+
+[[package]]
+name = "revm-bytecode"
+version = "6.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6922f7f4fbc15ca61ea459711ff75281cc875648c797088c34e4e064de8b8a7c"
+dependencies = [
+ "bitvec",
+ "once_cell",
+ "phf",
+ "revm-primitives",
+ "serde",
+]
+
+[[package]]
+name = "revm-context"
+version = "8.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cd508416a35a4d8a9feaf5ccd06ac6d6661cd31ee2dc0252f9f7316455d71f9"
+dependencies = [
+ "cfg-if",
+ "derive-where",
+ "revm-bytecode",
+ "revm-context-interface",
+ "revm-database-interface",
+ "revm-primitives",
+ "revm-state",
+ "serde",
+]
+
+[[package]]
+name = "revm-context-interface"
+version = "9.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc90302642d21c8f93e0876e201f3c5f7913c4fcb66fb465b0fd7b707dfe1c79"
+dependencies = [
+ "alloy-eip2930",
+ "alloy-eip7702",
+ "auto_impl",
+ "either",
+ "revm-database-interface",
+ "revm-primitives",
+ "revm-state",
+ "serde",
+]
+
+[[package]]
+name = "revm-database"
+version = "7.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c61495e01f01c343dd90e5cb41f406c7081a360e3506acf1be0fc7880bfb04eb"
+dependencies = [
+ "alloy-eips",
+ "revm-bytecode",
+ "revm-database-interface",
+ "revm-primitives",
+ "revm-state",
+ "serde",
+]
+
+[[package]]
+name = "revm-database-interface"
+version = "7.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c20628d6cd62961a05f981230746c16854f903762d01937f13244716530bf98f"
+dependencies = [
+ "auto_impl",
+ "either",
+ "revm-primitives",
+ "revm-state",
+ "serde",
+]
+
+[[package]]
+name = "revm-handler"
+version = "8.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1529c8050e663be64010e80ec92bf480315d21b1f2dbf65540028653a621b27d"
+dependencies = [
+ "auto_impl",
+ "derive-where",
+ "revm-bytecode",
+ "revm-context",
+ "revm-context-interface",
+ "revm-database-interface",
+ "revm-interpreter",
+ "revm-precompile",
+ "revm-primitives",
+ "revm-state",
+ "serde",
+]
+
+[[package]]
+name = "revm-inspector"
+version = "8.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f78db140e332489094ef314eaeb0bd1849d6d01172c113ab0eb6ea8ab9372926"
+dependencies = [
+ "auto_impl",
+ "either",
+ "revm-context",
+ "revm-database-interface",
+ "revm-handler",
+ "revm-interpreter",
+ "revm-primitives",
+ "revm-state",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "revm-interpreter"
+version = "24.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff9d7d9d71e8a33740b277b602165b6e3d25fff091ba3d7b5a8d373bf55f28a7"
+dependencies = [
+ "revm-bytecode",
+ "revm-context-interface",
+ "revm-primitives",
+ "serde",
+]
+
+[[package]]
+name = "revm-precompile"
+version = "25.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cee3f336b83621294b4cfe84d817e3eef6f3d0fce00951973364cc7f860424d"
+dependencies = [
+ "ark-bls12-381 0.5.0",
+ "ark-bn254",
+ "ark-ec 0.5.0",
+ "ark-ff 0.5.0",
+ "ark-serialize 0.5.0",
+ "arrayref",
+ "aurora-engine-modexp",
+ "c-kzg",
+ "cfg-if",
+ "k256",
+ "libsecp256k1",
+ "once_cell",
+ "p256",
+ "revm-primitives",
+ "ripemd",
+ "rug",
+ "secp256k1 0.31.1",
+ "sha2 0.10.9",
+]
+
+[[package]]
+name = "revm-primitives"
+version = "20.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66145d3dc61c0d6403f27fc0d18e0363bb3b7787e67970a05c71070092896599"
+dependencies = [
+ "alloy-primitives",
+ "num_enum",
+ "serde",
+]
+
+[[package]]
+name = "revm-state"
+version = "7.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cc830a0fd2600b91e371598e3d123480cd7bb473dd6def425a51213aa6c6d57"
+dependencies = [
+ "bitflags 2.9.1",
+ "revm-bytecode",
+ "revm-primitives",
+ "serde",
+]
+
 [[package]]
 name = "rfc6979"
 version = "0.4.0"
@@ -18668,6 +19118,18 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "rug"
+version = "1.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4207e8d668e5b8eb574bda8322088ccd0d7782d3d03c7e8d562e82ed82bdcbc3"
+dependencies = [
+ "az",
+ "gmp-mpfr-sys",
+ "libc",
+ "libm",
+]
+
 [[package]]
 name = "ruint"
 version = "1.15.0"
@@ -18781,7 +19243,7 @@ version = "0.38.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "errno",
  "libc",
  "linux-raw-sys 0.4.14",
@@ -18794,7 +19256,7 @@ version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "errno",
  "libc",
  "linux-raw-sys 0.9.4",
@@ -19657,7 +20119,7 @@ dependencies = [
  "substrate-test-runtime",
  "tempfile",
  "tracing",
- "tracing-subscriber",
+ "tracing-subscriber 0.3.18",
  "wat",
 ]
 
@@ -20431,7 +20893,7 @@ dependencies = [
  "thiserror 1.0.65",
  "tracing",
  "tracing-log",
- "tracing-subscriber",
+ "tracing-subscriber 0.3.18",
 ]
 
 [[package]]
@@ -20486,7 +20948,7 @@ dependencies = [
  "tokio",
  "tokio-stream",
  "tracing",
- "tracing-subscriber",
+ "tracing-subscriber 0.3.18",
  "zombienet-configuration",
  "zombienet-sdk",
 ]
@@ -20832,7 +21294,7 @@ dependencies = [
  "merlin",
  "rand_core 0.6.4",
  "serde_bytes",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "subtle 2.5.0",
  "zeroize",
 ]
@@ -20864,7 +21326,7 @@ dependencies = [
  "password-hash",
  "pbkdf2",
  "salsa20",
- "sha2 0.10.8",
+ "sha2 0.10.9",
 ]
 
 [[package]]
@@ -20921,6 +21383,17 @@ dependencies = [
  "secp256k1-sys 0.10.1",
 ]
 
+[[package]]
+name = "secp256k1"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c3c81b43dc2d8877c216a3fccf76677ee1ebccd429566d3e67447290d0c42b2"
+dependencies = [
+ "bitcoin_hashes 0.14.0",
+ "rand 0.9.0",
+ "secp256k1-sys 0.11.0",
+]
+
 [[package]]
 name = "secp256k1-sys"
 version = "0.9.2"
@@ -20939,6 +21412,15 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "secp256k1-sys"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcb913707158fadaf0d8702c2db0e857de66eb003ccfdda5924b5f5ac98efb38"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "secrecy"
 version = "0.8.0"
@@ -20964,7 +21446,7 @@ version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -21231,9 +21713,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.10.8"
+version = "0.10.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -21323,7 +21805,7 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dee851d0e5e7af3721faea1843e8015e820a234f81fda3dea9247e15bac9a86a"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
 ]
 
 [[package]]
@@ -21432,15 +21914,6 @@ dependencies = [
  "futures-lite 2.3.0",
 ]
 
-[[package]]
-name = "smol_str"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "smoldot"
 version = "0.11.0"
@@ -21483,7 +21956,7 @@ dependencies = [
  "schnorrkel 0.10.2",
  "serde",
  "serde_json",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "sha3",
  "siphasher 0.3.11",
  "slab",
@@ -21537,7 +22010,7 @@ dependencies = [
  "schnorrkel 0.11.4",
  "serde",
  "serde_json",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "sha3",
  "siphasher 1.0.1",
  "slab",
@@ -21640,7 +22113,7 @@ dependencies = [
  "rand_core 0.6.4",
  "ring 0.17.8",
  "rustc_version 0.4.0",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "subtle 2.5.0",
 ]
 
@@ -22605,7 +23078,7 @@ dependencies = [
  "secrecy 0.8.0",
  "serde",
  "serde_json",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "sp-crypto-hashing 0.1.0",
  "sp-debug-derive 14.0.0",
  "sp-externalities 0.25.0",
@@ -22716,7 +23189,7 @@ dependencies = [
  "byteorder",
  "criterion",
  "digest 0.10.7",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "sha3",
  "sp-crypto-hashing-proc-macro",
  "twox-hash",
@@ -22731,7 +23204,7 @@ dependencies = [
  "blake2b_simd",
  "byteorder",
  "digest 0.10.7",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "sha3",
  "twox-hash",
 ]
@@ -23155,7 +23628,7 @@ dependencies = [
  "parity-scale-codec",
  "rand 0.8.5",
  "scale-info",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "sp-api",
  "sp-application-crypto",
  "sp-core 28.0.0",
@@ -23232,7 +23705,7 @@ dependencies = [
  "regex",
  "tracing",
  "tracing-core",
- "tracing-subscriber",
+ "tracing-subscriber 0.3.18",
 ]
 
 [[package]]
@@ -23244,7 +23717,7 @@ dependencies = [
  "parity-scale-codec",
  "tracing",
  "tracing-core",
- "tracing-subscriber",
+ "tracing-subscriber 0.3.18",
 ]
 
 [[package]]
@@ -23450,7 +23923,7 @@ dependencies = [
  "percent-encoding",
  "serde",
  "serde_json",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "smallvec",
  "sqlformat",
  "thiserror 1.0.65",
@@ -23488,7 +23961,7 @@ dependencies = [
  "quote 1.0.40",
  "serde",
  "serde_json",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "sqlx-core",
  "sqlx-mysql",
  "sqlx-postgres",
@@ -23507,7 +23980,7 @@ checksum = "64bb4714269afa44aef2755150a0fc19d756fb580a67db8885608cf02f47d06a"
 dependencies = [
  "atoi",
  "base64 0.22.1",
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "byteorder",
  "bytes",
  "crc",
@@ -23532,7 +24005,7 @@ dependencies = [
  "rsa",
  "serde",
  "sha1",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "smallvec",
  "sqlx-core",
  "stringprep",
@@ -23549,7 +24022,7 @@ checksum = "6fa91a732d854c5d7726349bb4bb879bb9478993ceb764247660aee25f67c2f8"
 dependencies = [
  "atoi",
  "base64 0.22.1",
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "byteorder",
  "crc",
  "dotenvy",
@@ -23570,7 +24043,7 @@ dependencies = [
  "rand 0.8.5",
  "serde",
  "serde_json",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "smallvec",
  "sqlx-core",
  "stringprep",
@@ -23928,7 +24401,7 @@ dependencies = [
  "pbkdf2",
  "rustc-hex",
  "schnorrkel 0.11.4",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "zeroize",
 ]
 
@@ -23941,7 +24414,7 @@ dependencies = [
  "hmac 0.12.1",
  "pbkdf2",
  "schnorrkel 0.11.4",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "zeroize",
 ]
 
@@ -24253,7 +24726,7 @@ dependencies = [
  "tokio",
  "tokio-util",
  "tracing",
- "tracing-subscriber",
+ "tracing-subscriber 0.3.18",
 ]
 
 [[package]]
@@ -24613,7 +25086,7 @@ dependencies = [
  "secrecy 0.10.3",
  "serde",
  "serde_json",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "subxt-core 0.38.0",
  "zeroize",
 ]
@@ -24641,7 +25114,7 @@ dependencies = [
  "secrecy 0.10.3",
  "serde",
  "serde_json",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "subxt-core 0.41.0",
  "thiserror 2.0.12",
@@ -24870,7 +25343,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "core-foundation",
  "system-configuration-sys 0.6.0",
 ]
@@ -24989,20 +25462,20 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 
 [[package]]
 name = "test-log"
-version = "0.2.18"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e33b98a582ea0be1168eba097538ee8dd4bbe0f2b01b22ac92ea30054e5be7b"
+checksum = "3dffced63c2b5c7be278154d76b479f9f9920ed34e7574201407f0b14e2bbb93"
 dependencies = [
  "env_logger 0.11.3",
  "test-log-macros",
- "tracing-subscriber",
+ "tracing-subscriber 0.3.18",
 ]
 
 [[package]]
 name = "test-log-macros"
-version = "0.2.18"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "451b374529930d7601b1eef8d32bc79ae870b6079b069401709c2a8bf9e75f36"
+checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
@@ -25553,7 +26026,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140"
 dependencies = [
  "base64 0.21.7",
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "bytes",
  "futures-core",
  "futures-util",
@@ -25573,7 +26046,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "bytes",
  "http 1.1.0",
  "http-body 1.0.0",
@@ -25671,6 +26144,15 @@ dependencies = [
  "tracing-core",
 ]
 
+[[package]]
+name = "tracing-subscriber"
+version = "0.2.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71"
+dependencies = [
+ "tracing-core",
+]
+
 [[package]]
 name = "tracing-subscriber"
 version = "0.3.18"
@@ -26135,7 +26617,7 @@ dependencies = [
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "rand_core 0.6.4",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "sha3",
  "zeroize",
 ]
@@ -26473,7 +26955,7 @@ version = "0.235.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "161296c618fa2d63f6ed5fffd1112937e803cb9ec71b32b01a76321555660917"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "hashbrown 0.15.3",
  "indexmap",
  "semver 1.0.18",
@@ -26508,7 +26990,7 @@ checksum = "b6fe976922a16af3b0d67172c473d1fd4f1aa5d0af9c8ba6538c741f3af686f4"
 dependencies = [
  "addr2line 0.24.2",
  "anyhow",
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "bumpalo",
  "cc",
  "cfg-if",
@@ -26592,7 +27074,7 @@ dependencies = [
  "rustix 1.0.8",
  "serde",
  "serde_derive",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "toml",
  "windows-sys 0.59.0",
  "zstd 0.13.3",
@@ -27318,7 +27800,7 @@ version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
 ]
 
 [[package]]
@@ -27616,9 +28098,9 @@ dependencies = [
 
 [[package]]
 name = "yamux"
-version = "0.13.6"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b2dd50a6d6115feb3e5d7d0efd45e8ca364b6c83722c1e9c602f5764e0e9597"
+checksum = "3da1acad1c2dc53f0dde419115a38bd8221d8c3e47ae9aeceaf453266d29307e"
 dependencies = [
  "futures",
  "log",
@@ -27894,7 +28376,7 @@ dependencies = [
  "reqwest",
  "serde",
  "serde_json",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "sp-core 35.0.0",
  "subxt 0.38.1",
  "subxt-signer 0.38.0",
@@ -27938,7 +28420,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_yaml",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "tar",
  "thiserror 1.0.65",
  "tokio",
diff --git a/Cargo.toml b/Cargo.toml
index ea58a96bab29..28b912fe516e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1190,6 +1190,7 @@ regex = { version = "1.10.2" }
 relay-substrate-client = { path = "bridges/relays/client-substrate" }
 relay-utils = { path = "bridges/relays/utils" }
 remote-externalities = { path = "substrate/utils/frame/remote-externalities", default-features = false, package = "frame-remote-externalities" }
+revm = { version = "27.0.2", default-features = false }
 ripemd = { version = "0.1.3", default-features = false }
 rlp = { version = "0.6.1", default-features = false }
 rococo-emulated-chain = { path = "cumulus/parachains/integration-tests/emulated/chains/relays/rococo" }
@@ -1479,6 +1480,7 @@ zombienet-orchestrator = { version = "0.3.8" }
 zombienet-sdk = { version = "0.3.8" }
 zstd = { version = "0.12.4", default-features = false }
 
+
 [profile.release]
 # Polkadot runtime requires unwinding.
 opt-level = 3
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs
index 8f48a3171916..3d65d3b16829 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs
@@ -85,6 +85,16 @@ const ALICE: [u8; 32] = [1u8; 32];
 const BOB: [u8; 32] = [2u8; 32];
 const SOME_ASSET_ADMIN: [u8; 32] = [5u8; 32];
 
+const ERC20_PVM: &[u8] =
+	include_bytes!("../../../../../../substrate/frame/revive/fixtures/erc20/erc20.polkavm");
+
+const FAKE_ERC20_PVM: &[u8] =
+	include_bytes!("../../../../../../substrate/frame/revive/fixtures/erc20/fake_erc20.polkavm");
+
+const EXPENSIVE_ERC20_PVM: &[u8] = include_bytes!(
+	"../../../../../../substrate/frame/revive/fixtures/erc20/expensive_erc20.polkavm"
+);
+
 parameter_types! {
 	pub Governance: GovernanceOrigin<RuntimeOrigin> = GovernanceOrigin::Origin(RuntimeOrigin::root());
 }
@@ -1670,10 +1680,7 @@ fn withdraw_and_deposit_erc20s() {
 		assert_ok!(Revive::map_account(RuntimeOrigin::signed(sender.clone())));
 		assert_ok!(Revive::map_account(RuntimeOrigin::signed(beneficiary.clone())));
 
-		let code = include_bytes!(
-			"../../../../../../substrate/frame/revive/fixtures/contracts/erc20.polkavm"
-		)
-		.to_vec();
+		let code = ERC20_PVM.to_vec();
 
 		let initial_amount_u256 = U256::from(1_000_000_000_000u128);
 		let constructor_data = sol_data::Uint::<256>::abi_encode(&initial_amount_u256);
@@ -1832,10 +1839,7 @@ fn smart_contract_does_not_return_bool_fails() {
 		assert_ok!(Revive::map_account(RuntimeOrigin::signed(beneficiary.clone())));
 
 		// This contract implements the ERC20 interface for `transfer` except it returns a uint256.
-		let code = include_bytes!(
-			"../../../../../../substrate/frame/revive/fixtures/contracts/fake_erc20.polkavm"
-		)
-		.to_vec();
+		let code = FAKE_ERC20_PVM.to_vec();
 
 		let initial_amount_u256 = U256::from(1_000_000_000_000u128);
 		let constructor_data = sol_data::Uint::<256>::abi_encode(&initial_amount_u256);
@@ -1888,10 +1892,7 @@ fn expensive_erc20_runs_out_of_gas() {
 		assert_ok!(Revive::map_account(RuntimeOrigin::signed(beneficiary.clone())));
 
 		// This contract does a lot more storage writes in `transfer`.
-		let code = include_bytes!(
-			"../../../../../../substrate/frame/revive/fixtures/contracts/expensive_erc20.polkavm"
-		)
-		.to_vec();
+		let code = EXPENSIVE_ERC20_PVM.to_vec();
 
 		let initial_amount_u256 = U256::from(1_000_000_000_000u128);
 		let constructor_data = sol_data::Uint::<256>::abi_encode(&initial_amount_u256);
diff --git a/substrate/frame/revive/Cargo.toml b/substrate/frame/revive/Cargo.toml
index a2be0cd34f86..6a2078dd50c4 100644
--- a/substrate/frame/revive/Cargo.toml
+++ b/substrate/frame/revive/Cargo.toml
@@ -35,6 +35,7 @@ polkavm = { version = "0.27.0", default-features = false }
 polkavm-common = { version = "0.27.0", default-features = false, features = ["alloc"] }
 rand = { workspace = true, optional = true }
 rand_pcg = { workspace = true, optional = true }
+revm = { workspace = true }
 rlp = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 serde = { features = ["alloc", "derive"], workspace = true, default-features = false }
@@ -98,6 +99,7 @@ std = [
 	"polkavm-common/std",
 	"polkavm/std",
 	"rand?/std",
+	"revm/std",
 	"ripemd/std",
 	"rlp/std",
 	"scale-info/std",
diff --git a/substrate/frame/revive/fixtures/Cargo.toml b/substrate/frame/revive/fixtures/Cargo.toml
index f1a4d7d1969f..1d64a4efba00 100644
--- a/substrate/frame/revive/fixtures/Cargo.toml
+++ b/substrate/frame/revive/fixtures/Cargo.toml
@@ -16,6 +16,7 @@ exclude-from-umbrella = true
 workspace = true
 
 [dependencies]
+alloy-core = { workspace = true, default-features = true, features = ["sol-types"], optional = true }
 anyhow = { workspace = true, default-features = true, optional = true }
 sp-core = { workspace = true, default-features = true, optional = true }
 sp-io = { workspace = true, default-features = true, optional = true }
@@ -23,11 +24,13 @@ sp-io = { workspace = true, default-features = true, optional = true }
 [build-dependencies]
 anyhow = { workspace = true, default-features = true }
 cargo_metadata = { workspace = true }
+hex = { workspace = true, features = ["alloc"] }
 pallet-revive-uapi = { workspace = true }
 polkavm-linker = { version = "0.27.0" }
+serde_json = { workspace = true }
 toml = { workspace = true }
 
 [features]
 default = ["std"]
 # only when std is enabled all fixtures are available
-std = ["anyhow", "sp-core", "sp-io"]
+std = ["alloy-core", "anyhow", "sp-core", "sp-io"]
diff --git a/substrate/frame/revive/fixtures/build.rs b/substrate/frame/revive/fixtures/build.rs
index ce9215a165d2..a3030a66afad 100644
--- a/substrate/frame/revive/fixtures/build.rs
+++ b/substrate/frame/revive/fixtures/build.rs
@@ -30,15 +30,24 @@ const OVERRIDE_STRIP_ENV_VAR: &str = "PALLET_REVIVE_FIXTURES_STRIP";
 const OVERRIDE_OPTIMIZE_ENV_VAR: &str = "PALLET_REVIVE_FIXTURES_OPTIMIZE";
 
 /// A contract entry.
+#[derive(Clone)]
 struct Entry {
 	/// The path to the contract source file.
 	path: PathBuf,
+	/// The type of the contract (rust or solidity).
+	contract_type: ContractType,
+}
+
+#[derive(Clone, Copy)]
+enum ContractType {
+	Rust,
+	Solidity,
 }
 
 impl Entry {
 	/// Create a new contract entry from the given path.
-	fn new(path: PathBuf) -> Self {
-		Self { path }
+	fn new(path: PathBuf, contract_type: ContractType) -> Self {
+		Self { path, contract_type }
 	}
 
 	/// Return the path to the contract source file.
@@ -55,9 +64,12 @@ impl Entry {
 			.expect("name is valid unicode; qed")
 	}
 
-	/// Return the name of the polkavm file.
+	/// Return the name of the bytecode file.
 	fn out_filename(&self) -> String {
-		format!("{}.polkavm", self.name())
+		match self.contract_type {
+			ContractType::Rust => format!("{}.polkavm", self.name()),
+			ContractType::Solidity => format!("{}.resolc.polkavm", self.name()),
+		}
 	}
 }
 
@@ -67,16 +79,18 @@ fn collect_entries(contracts_dir: &Path) -> Vec<Entry> {
 		.expect("src dir exists; qed")
 		.filter_map(|file| {
 			let path = file.expect("file exists; qed").path();
-			if path.extension().map_or(true, |ext| ext != "rs") {
-				return None
-			}
+			let extension = path.extension();
 
-			Some(Entry::new(path))
+			match extension.and_then(|ext| ext.to_str()) {
+				Some("rs") => Some(Entry::new(path, ContractType::Rust)),
+				Some("sol") => Some(Entry::new(path, ContractType::Solidity)),
+				_ => None,
+			}
 		})
 		.collect::<Vec<_>>()
 }
 
-/// Create a `Cargo.toml` to compile the given contract entries.
+/// Create a `Cargo.toml` to compile the given Rust contract entries.
 fn create_cargo_toml<'a>(
 	fixtures_dir: &Path,
 	entries: impl Iterator<Item = &'a Entry>,
@@ -168,7 +182,7 @@ fn invoke_build(current_dir: &Path) -> Result<()> {
 	let build_res = build_command.output().expect("failed to execute process");
 
 	if build_res.status.success() {
-		return Ok(())
+		return Ok(());
 	}
 
 	let stderr = String::from_utf8_lossy(&build_res.stderr);
@@ -192,15 +206,166 @@ fn post_process(input_path: &Path, output_path: &Path) -> Result<()> {
 	Ok(())
 }
 
-/// Write the compiled contracts to the given output directory.
+/// Compile a Solidity contract using standard JSON interface.
+fn compile_with_standard_json(
+	compiler: &str,
+	contracts_dir: &Path,
+	solidity_entries: &[&Entry],
+) -> Result<serde_json::Value> {
+	let mut input_json = serde_json::json!({
+		"language": "Solidity",
+		"sources": {},
+		"settings": {
+			"optimizer": {
+				"enabled": true,
+				"runs": 200
+			},
+			"outputSelection":
+
+		serde_json::json!({
+			"*": {
+				"*": ["evm.bytecode"]
+			}
+		}),
+
+		}
+	});
+
+	// Add all Solidity files to the input
+	for entry in solidity_entries {
+		let source_code = fs::read_to_string(entry.path())
+			.with_context(|| format!("Failed to read Solidity source: {}", entry.path()))?;
+
+		let file_key = entry.path().split('/').last().unwrap_or(entry.name());
+		input_json["sources"][file_key] = serde_json::json!({
+			"content": source_code
+		});
+	}
+
+	let compiler_output = Command::new(compiler)
+		.current_dir(contracts_dir)
+		.arg("--standard-json")
+		.stdin(std::process::Stdio::piped())
+		.stdout(std::process::Stdio::piped())
+		.stderr(std::process::Stdio::piped())
+		.spawn()
+		.with_context(|| {
+			format!("Failed to execute {}. Make sure {} is installed.", compiler, compiler)
+		})?;
+
+	let mut stdin = compiler_output.stdin.as_ref().unwrap();
+	stdin
+		.write_all(input_json.to_string().as_bytes())
+		.with_context(|| format!("Failed to write to {} stdin", compiler))?;
+	let _ = stdin;
+
+	let compiler_result = compiler_output
+		.wait_with_output()
+		.with_context(|| format!("Failed to wait for {} output", compiler))?;
+
+	if !compiler_result.status.success() {
+		let stderr = String::from_utf8_lossy(&compiler_result.stderr);
+		bail!("{} compilation failed: {}", compiler, stderr);
+	}
+
+	// Parse JSON output
+	let compiler_json: serde_json::Value = serde_json::from_slice(&compiler_result.stdout)
+		.with_context(|| format!("Failed to parse {} JSON output", compiler))?;
+
+	// Abort on errors
+	if let Some(errors) = compiler_json.get("errors") {
+		if errors
+			.as_array()
+			.unwrap()
+			.iter()
+			.any(|object| object.get("severity").unwrap().as_str().unwrap() == "error")
+		{
+			bail!(
+				"failed to compile the Solidity fixtures: {}",
+				serde_json::to_string_pretty(errors)?
+			);
+		}
+	}
+
+	Ok(compiler_json)
+}
+
+/// Extract bytecode from compiler JSON output and write binary files.
+fn extract_and_write_bytecode(
+	compiler_json: &serde_json::Value,
+	out_dir: &Path,
+	file_suffix: &str,
+) -> Result<()> {
+	if let Some(contracts) = compiler_json["contracts"].as_object() {
+		for (_file_key, file_contracts) in contracts {
+			if let Some(contract_map) = file_contracts.as_object() {
+				for (contract_name, contract_data) in contract_map {
+					// Navigate through the JSON path to find the bytecode
+					let mut current = contract_data;
+					for path_segment in ["evm", "bytecode", "object"] {
+						if let Some(next) = current.get(path_segment) {
+							current = next;
+						} else {
+							// Skip if path doesn't exist (e.g., contract has no bytecode)
+							continue;
+						}
+					}
+
+					if let Some(bytecode_obj) = current.as_str() {
+						let bytecode_hex = bytecode_obj.strip_prefix("0x").unwrap_or(bytecode_obj);
+						let binary_content = hex::decode(bytecode_hex).map_err(|e| {
+							anyhow::anyhow!("Failed to decode hex for {contract_name}: {e}")
+						})?;
+
+						let out_path = out_dir.join(format!("{}{}", contract_name, file_suffix));
+						fs::write(&out_path, binary_content).with_context(|| {
+							format!("Failed to write {out_path:?} for {contract_name}")
+						})?;
+					}
+				}
+			}
+		}
+	}
+	Ok(())
+}
+
+/// Compile Solidity contracts using both solc and resolc.
+fn compile_solidity_contracts(
+	contracts_dir: &Path,
+	out_dir: &Path,
+	entries: &[Entry],
+) -> Result<()> {
+	let solidity_entries: Vec<_> = entries
+		.iter()
+		.filter(|entry| matches!(entry.contract_type, ContractType::Solidity))
+		.collect();
+
+	if solidity_entries.is_empty() {
+		return Ok(());
+	}
+
+	// Compile with solc for EVM bytecode
+	let json = compile_with_standard_json("solc", contracts_dir, &solidity_entries)?;
+	extract_and_write_bytecode(&json, out_dir, ".sol.bin")?;
+
+	// Compile with resolc for PVM bytecode
+	let json = compile_with_standard_json("resolc", contracts_dir, &solidity_entries)?;
+	extract_and_write_bytecode(&json, out_dir, ".resolc.polkavm")?;
+
+	Ok(())
+}
+
+/// Write the compiled Rust contracts to the given output directory.
 fn write_output(build_dir: &Path, out_dir: &Path, entries: Vec<Entry>) -> Result<()> {
 	for entry in entries {
-		post_process(
-			&build_dir
-				.join("target/riscv64emac-unknown-none-polkavm/release")
-				.join(entry.name()),
-			&out_dir.join(entry.out_filename()),
-		)?;
+		if matches!(entry.contract_type, ContractType::Rust) {
+			post_process(
+				&build_dir
+					.join("target/riscv64emac-unknown-none-polkavm/release")
+					.join(entry.name()),
+				&out_dir.join(entry.out_filename()),
+			)?;
+		}
 	}
 
 	Ok(())
@@ -211,7 +376,7 @@ fn create_out_dir() -> Result<PathBuf> {
 	let temp_dir: PathBuf =
 		env::var("OUT_DIR").context("Failed to fetch `OUT_DIR` env variable")?.into();
 
-	// this is set in case the user has overriden the target directory
+	// this is set in case the user has overridden the target directory
 	let out_dir = if let Ok(path) = env::var("CARGO_TARGET_DIR") {
 		let path = PathBuf::from(path);
 
@@ -263,25 +428,46 @@ fn create_out_dir() -> Result<PathBuf> {
 			.context(format!("Failed to create output directory: {})", out_dir.display(),))?;
 	}
 
-	// write the location of the out dir so it can be found later
+	Ok(out_dir)
+}
+
+/// Generate the fixture_location.rs file with macros and sol! definitions.
+fn generate_fixture_location(temp_dir: &Path, out_dir: &Path, entries: &[Entry]) -> Result<()> {
 	let mut file = fs::File::create(temp_dir.join("fixture_location.rs"))
 		.context("Failed to create fixture_location.rs")?;
+
 	write!(
 		file,
 		r#"
 			#[allow(dead_code)]
 			const FIXTURE_DIR: &str = "{0}";
+
+			#[macro_export]
 			macro_rules! fixture {{
 				($name: literal) => {{
 					include_bytes!(concat!("{0}", "/", $name, ".polkavm"))
 				}};
 			}}
+
+			#[macro_export]
+			macro_rules! fixture_resolc {{
+				($name: literal) => {{
+					include_bytes!(concat!("{0}", "/", $name, ".resolc.polkavm"))
+				}};
+			}}
 		"#,
 		out_dir.display()
 	)
 	.context("Failed to write to fixture_location.rs")?;
 
-	Ok(out_dir)
+	// Generate sol! macros for Solidity contracts
+	for entry in entries.iter().filter(|e| matches!(e.contract_type, ContractType::Solidity)) {
+		let relative_path = format!("contracts/{}", entry.path().split('/').last().unwrap());
+		writeln!(file, r#"alloy_core::sol!("{}");"#, relative_path)
+			.context("Failed to write sol! macro to fixture_location.rs")?;
+	}
+
+	Ok(())
 }
 
 pub fn main() -> Result<()> {
@@ -305,12 +491,28 @@ pub fn main() -> Result<()> {
 
 	let entries = collect_entries(&contracts_dir);
 	if entries.is_empty() {
-		return Ok(())
+		return Ok(());
 	}
 
-	create_cargo_toml(&fixtures_dir, entries.iter(), &build_dir)?;
-	invoke_build(&build_dir)?;
-	write_output(&build_dir, &out_dir, entries)?;
+	// Compile Rust contracts
+	let rust_entries: Vec<_> = entries
+		.iter()
+		.filter(|e| matches!(e.contract_type, ContractType::Rust))
+		.collect();
+	if !rust_entries.is_empty() {
+		create_cargo_toml(&fixtures_dir, rust_entries.into_iter(), &build_dir)?;
+		invoke_build(&build_dir)?;
+		write_output(&build_dir, &out_dir, entries.clone())?;
+	}
+
+	// Compile Solidity contracts
+	compile_solidity_contracts(&contracts_dir, &out_dir, &entries)?;
+
+	let temp_dir: PathBuf =
+		env::var("OUT_DIR").context("Failed to fetch `OUT_DIR` env variable")?.into();
+
+	// Generate fixture_location.rs with sol! macros
+	generate_fixture_location(&temp_dir, &out_dir, &entries)?;
 
 	Ok(())
 }
diff --git a/substrate/frame/revive/fixtures/contracts/dummy.sol b/substrate/frame/revive/fixtures/contracts/dummy.sol
deleted file mode 100644
index e64031b0e021..000000000000
--- a/substrate/frame/revive/fixtures/contracts/dummy.sol
+++ /dev/null
@@ -1,14 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.2 <0.9.0;
-
-contract Simple {
-    uint256 number;
-
-    function store(uint256 num) public {
-        number = num;
-    }
-
-    function retrieve() public view returns (uint256) {
-        return number;
-    }
-}
\ No newline at end of file
diff --git a/substrate/frame/revive/fixtures/erc20/erc20.polkavm b/substrate/frame/revive/fixtures/erc20/erc20.polkavm
new file mode 100644
index 0000000000000000000000000000000000000000..e545040080bf6f32fffbf56a3fc2b13de19c285b
GIT binary patch
literal 44001
zcmeIb3tSu5l|McsBs3D(kuVP#za|(vGEN&3l32FWT5&O!oU|3JlhU-C5E~cqXhdx{
z49uj#0|^p#Q%q1a#@=1(k{Ym^dXu!qkF>PS#==g!j-g#GZc_T%zkl0i*X_1l+TE1j
z_uP>{xK2XiCZG2A5BAZW$DMoc+<Wf1=XKBc?*1^x{rE7){&+L@t#jNE=T2!J+8_PN
zg0GbQ`sIPoulisA(Qj90fARUPzdE!s{GZP({q2YE`K|NK?&nV2_pSdqa!dQKE&uY-
zn;&{=^$Xkf3_Qy{`q=)LYJd9hAMg13Cq!%X^mmRgdpRX@=)a#{vG}ErerEkci(CI|
z&nJHT^I!b(p-*tPef;m|-t)0<J1=D1Fg)?`-=8y>*50%FJJp|<_)MTUd)d9t-`?}#
z-!6UTKf@~z{c7v;U(Bxl_EG=;uKN7I%fBxB%7ULn_Zyp^OQV;X3s?v!02Bf~0Pp}l
z2G|1F33wQ=_5QlL`zr6>dH;P|1NDv5XLW)5E2qzPR5xv-vu)cex77!BRPVfR+k@L4
z*jcr0=Y2bN2DaZ{watJ34*z|%+qQ1KzxKYHZn<^Gw)^Yu+rDk*XSYAF1DUEn{pru{
zynjpGHdYl~i9hz>{dJ$+cHhqJ_dl@XQ`@$0-&SdwXBhhTu#qYo`mb;*s;dh$rVhP-
zp!sWtp+AOy!2RCPo$?PUr&HRE&l`Vke8qHK>hr00m>)N<6!r-}vh-W$rA6lOb04<-
zA>)PY4LN%j{B+?{iyVs&h^f~;zEoWP>WV<YqlJHW<EERQxhcKq@uI&k8ohbZt<GET
zSruCK;;L(0Wv;O6UtGU&{n3@VdiClJt3SQ^$XfNbU*1;m0q%n@uiNeZt$XSEm)3WF
zs9?j^l7*g<JMO#l)sOD?rIv0ey}s-ZWnF*s-OVF+4cz_HkFEUp{Cmp(Huc{6d;9MD
zamBhV-Ywy+FIRfDeRrGuDQ{JmzrOlHbw$nG+8@>$KW+Q;#s_Kwx7Q!3Fa69T+w*p;
z-ua`Q%7c}S56Mp`H$GJIQ2j&h&((kK+0WS?{=ma~AO69^xy|=Bf2sNZG#Bn_*mZsv
zr@miZqt>ZUtLM}os=rWIwEUp;7mt`8wLdC8sy>?4_Nib`=&PaULiz2xcB^|{-ShR&
zOOF+O;VWPGbVsb?)xFCe|KsCd?)qhyHJlyxgtvzegwKS35dN?5YvJ9Ewld4wA`8#)
zPiaL_NoWZ!X$_9w<-!H$YU>bZc&a_)0|L?_;T&g(wwZ6@rjIyopzVQ3yQmF_5n0qu
ziqZXP!zZkf{e1Vyrw)rxwXG_(d?eavschnv-Qge~KEg|fE6*H0@Ehl?rIwqod}m>)
zCAXz}l8^SKDJR4GCZmVarL!#qlVz4mH*sNmOty(~mP5|AsUdm3poRo_zWRtwebmv?
zP$Y;xo8gAZfIskYH8(JzE)W7ICD|c0*`!86lC)DUNm-(uDwLGP+9{``EYePilCn@c
z<&cyG+9{i)<Z34cNuIAAc1d!McDPWIv$excNzT#^i;|qF9d=0aJngVek~6dcL29yV
z-7cx=8m+rfYMQHcJEf*MTDK@QrEA@&HcjicNljL5pCC0_w2(_`G;5(ksWDXxIi*IE
z780dKqZV>VjVW3PZ8T^>G?Q0tqMGGUvu$C!lis;Uww23SJ~`VH&Z=m&k5@jZwmH<0
zO>Gy{V4xweFE9`Y$_|H|YeSdFIbOTVYcKTLonE`>vAe|<M@z2QvcO$rnJh9}O=^xy
zbrh=eoocR#r-SsoT;q_dZL(jGtHPx{s;ykj@~NoLUU8)csH)l`sJm@y(4i_0wb7<F
z32H;&1=f;=Kx^P+z!kV&&PlW=TVCjr9fk4&r<|#`hMJNlqBWK)R3}c#wiqX8o#W)}
zC>PEe=kU_%DS4q=JtfEsJ?bf&ywInfbjS<J)x+`vhk96$7l`U%8){GoP-~(3gxW30
zxoWpf&K1;s4tc(f;fL&S`E17Y*8+Z^h3cSgt5+QYrGC|6qqIVGu<IJ9Iz+nAfdeNU
z1aVME2hBKe)4?DPJaljr2R=IJ!$CP6^l&YWEjblMLW-K}vKqss;-reVQt?(Qy_J2O
zqprOq+XOkQ^|QRyz<<E}JZC61nSHiYi_az;z9nq8{ZY1E<mIe!Ue1p3;jBx1*naf)
zgag?{W;a84>j(e0Bxgx8SCX^1Bxg}c&cc$M1tmGTB{}m;avUW&IVCySB{^9oIhiFn
z^Gb3uN^<NaIku9VYf5tFmgLMS$w@ECNh`^*mgHDUa)go`b4gBWNsg%`$5@h+Qj%jR
z$>B@P-sKXY0^kSKn_H?X%vLL}R@IwTzhqXc{bseM!aS-8qle6+ZRS#Qs`Ga@t)};p
zt0wqJgQzu#-sLVlTxgc7M02>xZ4UcIoICNl>7V+X>MutzJ{03ItGGGZCyYj{qwQ7@
z7Ze)_invlLq&olprj`b|>JqQ|CwQN2?(P56(m;nr7BmOx-Hs(@r+gE7Mnxu{%_jbj
zA~|G#Ij>0bWxpFquI%?ASs?p8NEXWe7^g^!WPgPsEtdU*I9Ve5k0QZ*a3P0X_KQd|
zWPc%&d9vS$BvbaELzXPrFDX*C?C--#j_mJ2BFKIRa#&<Phr}xTZAj8Ew~(aE{wT7{
zk^S|GG*|X(IJrjlcOa4d6Zqw2|2PtZ?7xI0MfP7rVwC+uNKCTduSlt~KgcN!=*DKw
zyL=+myZjPhJk=ep;?Sq#IJubWvt?vFq*go7pEk2vE11<f&OEx`JbFYJl>`mFdB}`W
zi4WDL8(U7J$7rbJ>Oo$vIm*kmeY{-PgC5L$<@dlZtLh)*)#{`CXvmT&j89HZg0JAz
znjSs|Dpb?QclC8??<5MAVeAhUs%T<MgUA}Ip>f%_Q{%3_-W!4Y4*>bM0sCu#{sG|s
zW=w#cm;pO51-6x#H+z>4qHm7^dZ@F9Qp5fpob;iy9Z$+?bu3k_IhU%|MN`$<q14d>
z=F!7f>g<<qXgS8(UoKbIqp$twYYcl`1zsn2`vhJmMfKOCul<+zwWRlT#k<nix89&u
zmFr#Yvn?F^?>|d7Uy;I~@A=K>Up8lHQZKIiZ%iMhQBaz!ikub+3Pb@0Y>|_W(GynC
z0i|({(v+^qa~0*9$Ub4T-x4`#i@fL<J)1Uq+!EO*j)n}FN=l>BWKiUkD-~c;nv9B^
zswn2yDIf(CUum={O&N+j?@A?PDNUJ*oUJH1S1v&V9iU}nYhhrGyrr2BtdOgHa*Z3U
z1?33_G1WTwE{*W|mG?0kH4Xv+8a0FjH0m4@(5NU9(5ML{piwa-AX1ljrD2I&b&&^Q
z1`5^#DpFIzRn5T33Y_?Xlj52GR;xNvRevy5t!@TxYN-)<owkQZFGY^5(;E2E)8<HU
zopyj9jSAWT-@1?QJ`n8WTU#GKucVwm#a+;h=Z~ZZH;P^6(eDUdZ3Ej=oe#cGMFY_v
zYV|meVNt8k@sWKtwI<3(1{`=db}fc$pb8T_E~qt^aLcCFUgYBgh~dHzQUB2T>URZ$
zB4`?4W<CctQ<S%2!K=f9S9y+?D`LQhyifj?X2sRd@++brTi{S{5f-BSU;ifT7zYPT
zU0k`VrJ*H+JJwXJbgr<pB!;D~&J$Ivu``yj28&wjiypVg)p+%NYqi5B;2teH>UKwD
zV6EC<(}E@}V1fLAj6vYLq8JXoOX>=BwMREuW%N#LlQ}9|quqv)r>(K4En|mJm_w~P
z$A{~e#Ol#=F+SRDjvca&?X#-rmgtv|f%<!`rkF;DEs=(`TDnQCKtG>0M|WCTdFjz%
zOJ(oKack^&+Ss8qxz;w)X_l*Fe5}(FbEjNrOi|HdwaOQ3#LD1~%4ym@Q{>p%(Fhh`
zw7y&2Cuk>4U2R>v16rUTJU!U{SerF^!m8FfkX^35#K&ZFv?*N$2CB8^=uE8{=c9+r
z+6hxcUW-|(HJG9ibF|%x<pIyDwYKQtwAf)F#U(!4W{I6Jj~o!F>tY8iV{H~0rHq^)
z)&cD+O*zfUl|wv;<0Tyxwg4sYmVwiOzQBqA^&Q^mk{PQbmcemw6P(R^ont~zZShoy
zr`$w~U(eIh#7#_dp1cYyQ&EqK;;9qE93M3E(d~v&(Hv|5J3&pws|(RR=`lB&9^*$2
zT4D#SV;Yu2ymniPS{vm@PFZ57(#9T78<B`mjkTv$HkGB7OoEkp>=2FoBSHScAwjM4
zJ$4!${@C%cW5AOReoV5ITEGofxmp{><*LFs4laM-*Y6UxJB`0iVEe>OY_Bb($*Uex
z`vkS$29`Pip6enXXhU!Ffe7(mfkVVDl%?HPlu~3af>bCvuQRGug{t3)QB?iSSixwL
z<D|?yB7jo?vAP5xqBYJte`E13kKr&1ILE77d-(88V(ccfTG7Wx>n$;hFxDWbRY&=#
zB+$I89OR=rjgReq?9Q<}(leR*g9isvS@5%`&0}W`WBaWay3L~=>xF~n%KeX@9qUhf
z#4-uwePj(pNX()1=vnJXcUr95GIq*Rx##ga$2{q(|0o7$68smBA&wqMiMZBk{U)>;
z6BrmgN)uAUTqy)PbT>un*WxhTFo|2kW?<eBKhl>L>odqT%{*q)g{N^Xi0p&>Bl2YQ
zS#(DSA5+qzccjI>lO8>luH9scoLxKmbei^}Njqp7Hl)PX8b_|@V%M9;jOLNGmQjmE
ztw3+o1o^RUOh?pRGsKTIffO_&5yrNst6QS{*p4*q*xJa8rcotDYhN2VX&OC@DHh|k
z?zIsRojxJbZ3-W8%XJzbJ7SIYrOS0_$sS>BKtOjAv5iSWv<1y=2InlQmE)Lf_))8R
zcuZTldWerjK-)1C$1Ty21=K`F@kCMj(x}&>P9f&Bs&yEY^z`T%Yjk&7Y_|{v(~c28
zW&x8pIw)xS#0WS|jq&aOwp<s$@Om;{!DlOY^gpk5jW#Ha7Ntp0WUHd2{pl*KG|f@u
zbVZp99y>B1fGR~^v_*mrEO*pJ)HJrrH`x?9Ls8f&kLy#c#2^@uEJe;#lx(FjXS#%a
z4$xj=I*8G*V$D_>9g3W*C=23zLUIX>ixhdGqAbROO)Ug_f;KcbK(Ik@brziD7Fq}=
zFl{igaC8Yrm}oe<h$Boq9D#)SIh)+3lR3FbCv)-+oy^JGU!TkoMxhF5V1jL!m7r>k
zU_pr2zl0@RCv~9Sk}=i_!ZgH(C6Q(vtv*dDu`gN28bJA@eDtt6cFY>>0oNboN1AX=
z<41O<p<C73W`5*onhGQv`A#}<VRQ}a)qX4%7x~Ii<=V>agkNRW1FsPiqi%7j{=yL_
zEupk()_K%Q_voEgbZV)^ZB(m!&|*{{vcy6t323-B4eQ6q+Vt33VeAY@F;K7xh%LnW
z(qm0%D-h9Y#YB&yUqjZ>W9CulT_8HPu|7V;B+{+<EfLTupY8gzSL37Bl&i>zQJcYF
zE>fBnD)M4QVWak^3?^|e#Ee}%k4SvpRWiHASx%&eBxV;Vh)#;5AXl>dN2ZeHuK->K
z{19*fFb4QnKn(CNfFA(94;TfE0L}wm0-OW<GvIrG?*d)~oCTZ#3<IKo(|{KM{{(m*
z@EyRn0p9`)0eVc6CCmHh=a6X<?fJ3^B4)|*Cy`8Ynd$gt5~ozxYs$3H8J$YiUovG{
z*%?lynu93ltL*V(?Dw1a%{1%xCpoF=i@1N3>Uc^o{VS|=sqTnLsy=LzY6eVFRX_3!
zQl78tdA=6U^DOc_gFH_o&p#s1H}u=j#c!X&?UT5D0=JKw)LK{T$tB^c9upWQ<=A{>
z(4id9RZc93G|-9&jycXPN6gCLBIWo(<-}s;)RJjA1H#N15_O15Nh!)PyE14~j%O$*
z=3QPwW4bb!r5w*xPGl>`a;8hb05e?-(U{W)<(Ne|E+{9g%BeIe0Rs<w*J}X<Jw8V{
zk*=JYs~k%RRF_jJi*k%t29*;A<y1<%2~!0e!b_Nx6Gr7!s&W!C1tYI00P-4W!617H
z;t66PWaE;RINU(Pc*Gp=j5~#ZWqdX0064r_2P9`O{<Suw;QVR@q##qZT&i3>0qw^n
z6Sxo)xIBnC<0iRg+~l*pzw#HL9iSsbM7Fqi?Yec5D33nYqU$2ZNkq|(uZwIVNhDIh
zhX;5lDM@KMpz{zwq7=Dy0*a_hfQtao*;>%q6QHv-NDsy7tQ4oSjogIu79+@rT15(o
z!l8>-OG+TCHrkb`Md(lD+37_{N?L?2U&fLaLcRZ!7on+zurX;NynGoWd093nN<v;v
zE}+q*$VNp;h2H7)Rxx4`v1WlS#Co-gspx9mf$NA%1nUcCnAc9Pi=5;^cH}CsDu>oZ
zUL?6i1~#a5F1p#rk4kAJ%kN7qS$;3zZvmeKd;)L};NyUDz{dc01MUKB2K)`63{VR2
z0X_=&2;jqjI{|k9HUYc<4`3sp1h4^64EPXWJ>YhL8z81)_B-k4x>TY;%TpOCx`Can
zV!!Ly?=sw=4DZ)7+^Q!Zq$E=yssrreB!522d|y24E%EdNEKR0lOH(EP^?;iJx25XO
zQwfqkFIB2u2`B=rO^rW;TT=D4D7i3oQt}tz)(V`s=;S7x+=x=vAYGl>8eI~u7E_~|
zps2jkt^nOyQX+Z6=s_!yp(4lV<6veCO1nvEF)E={r4^(>7+u5e7CT0}60FXO6s6Uo
zsDc8Xr#&rFER5zGrU}^!lrTqWO;<v5m1c%zn^*~)W3*$c1f!zbm1dg~%23+pQ5y`G
zm5`-0XDXp=rHx^_m6ZTO7BR>5mDd@R=J`s<p|s~JZ3`ltfWnE8>BKI=DWOG5`$DB{
zu@X!y+zpK7YfG$kX2x2LgTDb^1@c4u(6|>2_5?qUcLqv=?t&$OKnlu5Of?X8Cankz
zBq&5+AEOcdwuwM6Tn%cW2@`<^oloN?l4%NmWf_#wk#e8yrpBMmat(i7g%vbjSII{F
zSyW!0KuF%|Bb8TqVC7?jj~%%%m`*~}W10-MQ3j_7<`9Z<2=;vt@CW$|N0@w2vEV9n
zU?%9m02L-9bYLdvz;NQn;&Af|KZ6Wrf)H+k4$K4{7}OJ2tpl6L{d4NT$dCj9lqtcE
zLJ9W$D=Wcn{n$^S7JyOaowM=)8A%D|diBQ%wZP>{unx!ux)x01lhj~A5))^q2Rq92
zV1sY22Xp<|^<afp)`LM7CPi2?|JF2NuD7iTEBybTCJbtvN1#vx8Bj6vFK8gXeNb&+
z^7lb9dkH$Q4xTB&%Hue=rus+k61Lwq`AP!YFIR$<)1vUFN-%Y%0_;P&0!*!xcr@O*
z23ntT)$aiZs`|n9xWUA;V+nKncYmq}vs)87Fw%#qRWJo@fe5}`jBST5tRhJlw$;x^
zT|&$SU0D6w(}k%u6934+>+8cFaX}Xb$@+D5VWc4{pVozyC+Wflr*vU33C49{7~`t?
zDP7pnx1kF|kDy=4zR2`ps2@lJeV7dE18E7y8c8QMtq(g51^qc*3o)G-t>WXnb|Rq@
zJ7EeRcFVPceC#k(2T)C*MZ1|!jHLNKK1Sw@DCvA<=)vHhK*|teYO!n$@zH0^v5jB|
zDxfz(ri5NBt`j3O9%_!Bfkpy)F$~Zw^<v+f7uSoCrQ?I!e|Yt5z<WBe+33XLnB|{^
zUd#|vXXwQ+`qO$bjQO-)tWVdAVJ^h=Vm-QE?C6#CV!JC>S1R%r(u?&#F9y*U_AZ+K
zYDEVqW%-Bz)mV^+wvlvgDvXGuD@jL2_Tf^?hm0y7jjlJu)&t`z_{!GkZKQ%7iCSXO
z^s(-AG9i-@MoEvsWCimMm|5teqsPopl#PDd3bGW}lEDxNErG5j`+&XWIuJ6S&HeL#
zy;{+h<`r2ruU<<=y0)uiZ~rV>G9$EPfR_P31Y7`&0sa*b1N;l%2Y~MbMgb#$^MIEC
z=K%i<_#WW9fENL00cQZifGFTJ;03@x0iFkZ2k>pcw*W(c9wVgEKKeOiWLh#K<UnZ2
zkX)uEGbYQHU&5nbWe*%<zu&~~480ldAEi<UjgvF<Ww`#7Ud2~f6;PEKp(-;%Rc3^$
z47b0o-~L+s_OrPC3~oP-+y98$-_UPA7r%W9w@>2s3EVzzRBN&9Gc}p<JvG_1nv696
zOic!T*%j4fP%mO(s<k0yYBHouO=g0c48B5_jL^YA65=2UjT@mRGx}`nKM-Ryga`{r
z3egf?Gp~ybGF92&y2vn7l?|_hl8jVk)+?&YjBi<0<}$Xlk-Lu1R{X^Gua=zrzpE(&
zXRNEr^wEJdGE-R=nV~G}V0X2+whX%HdjWq7_$1&HfO`NR2b2Ro2Dlq=7hp5sZvbV0
zQh*QeQNTw49|qhBxC5{W;01U98v!MN4S-_6hXCsVw*%Y&k#yxw`nitj+;3pNtJv>4
z_Pboyl)qn3Zq<_y>d7)BM8Vz{Pj88*A7JSWEt(1XF~H4$+e~r&7}KvU#g&zSBEZ_j
z9bI#V_7zgoT&BqxdNbrKfWm$S(wmUph;$9o)h1nAW_nLsrdx)tPFu#v#h+1I)>74M
zwx;mSRUMG6nqeOglE(<NgQey^aA*~<OTfs$jkduvWsr+B*kG#W$lxn+a8rd{0y+iU
z1$#dM_NouJ;Fi?Gk)2|<0ZbLk5!G{CLJp1PsP5n*(3R^JKk!uK+Eg{fp;}UPqY=0b
z2dHLFH|dav4#YnAJRw^-53WkCib4?b!41}?ZuRh_a@~Q8L;UCv5(qN2B3z@8+odbV
z2XUnkS8QsflaD|JOP&N1{OES%M#JkkKJp@RJNQv09ga0DC%jAPMWL}I4<s;pqcW#%
z9p_;1#IxM!juhNrT~c$AHS`dSrfB^Zs5uW>N$jCDg(*G<c~nR?@>LL~#!;83Zh;SP
zo)}3JBQUAL_PstGHL*AA!xBZUB8?uohmgb0Q8?<*d&$*<%vprFsTrZ715_9dP|+Eo
zqQi+F3scF`m#`p#m2Ec4XpCB+8P&=Tqgn&j7KUE*FdT9q3r8hkq|XxTOB;)%sWq4Q
z=q8N+1Ru3n;2#z3w}62lr=-S|kv(94t@4%_`urRp+n#=*J3V%XVWiL+OR<a{w2VAU
z%H#`;>1F9(GY3`$jt7Ed>P|8U8QyS}>w`gv4DlftgqT78^$hPVRXxB~wW`m&%YPKT
z-D8$($nX_ugxedr;OZC!&*(s31gC_TQPLrh63*lQp6ZW+5m2kqwtb|I)=pqc!8O_m
zY$=$loxtXUIg&gZ=WVIcAxSp2QDF(&sIZuAR9M6|DlB9h6&A3K3b|~f!hE(-A%|^L
z$YvWAve-t2Otw*B9^0sp!8R(`i_H4czUkz5p{;pmRg-S&l{?G6n^4xoraYG1Rya3e
zv=2GdKAYMvr~?6+1a?A4^qoeol!1N{+U05&*rP(QM^3OuZeXDZ5+wo)Kk|3qQ>#2i
z)eq-`E#<&IADB~MpbV!5U?BXz_6YEC8IdhOvN6(M0R#KUvyGg<2oF0AF`PSvsLKNH
zMY!;yI==%Y!r#SjLkh{xFCYcy=I2oD#T3jI_-t}$#&`-iw-lev7x`Yot-q}5#jBN@
zh+X29rnph>3U<YWQBPtPpDVk^%vYL{oLeq;k4ZSUG%k64_ZTL&=`K33Ov1NnhG8+`
zqSL?(&sTDfA!9A}ldQm_qfO*m1ivCo7Lr&a@GX1H&~gZq20npMplrVJEcu3D$Bzo_
zkfymL=^9Ndl%%<u=9Hv4nkGt8x~5@9q-mN>lB}90NRkEngUH*7Jz!=Jq_PK0>;WTt
zAcZ|(U=Q$8qYCPVsipOyjvTEIb!2OOs3S}3Lmin~AL^K=^`VXotq*nBS>a1q;fq<}
zi&)_cS>X#<;km5v`7KpLjB-RlInII14VeQ?kwbB+AsOJ;64)2fXh#IP!n<5cfonS8
zD4-9}ld{IjafUT%0)EnM_%S=M5u+vsOZT}Hxh@LK8v@34V0%F@C0sp}60Ye<3D-8K
zz)u+ji#qad<;4UhmcKmw9wxHA5&<c2D6l$E00C*V%{tnB+2)kzcn+?Rg3or(;b@Cg
zWTs6iX1F&N8obM$0MU?XCX4WAWY0%HdayOdWgx2d$?J!`%N@vI18|1hi_9Pi9F7G;
z5$AWN<8D39{D6uXMO2^&i4}40|A~5+mm`A@;5Ov3BHTFkup)+W_bAT#06jB`=s^*K
ztcZ#)Ba?;<9f0O|E1Gc}WJNrRyO(fw5imZZh;iEE!;09l6`5kla1JmOZ^aOfqpXMz
z;cg-D(+Ln$^u93NQ2a~u1u)VDKT@BqQbZ;PGS~nDE>TzDkV~Pi;Bm7aXMR9Myac^B
zD^P;OO8C?(r_mM2-~+f*ut=c@H;z3Zu>Nmhqf0(jRAW9JAESH>674A>w6FWs3#5*v
z-9)Q}D0X8BbBfI8xRjO#s{noi`;0KW54`vSJz8Wb;_C5i*e*=SHh3dv!5cXn?ju<f
z=CIxI+KgRV+qD<4ME*H<X{8hi*j|;`p(Xn@w3uCpZ{NDhVKh5G`61e>RU}w>epi)Z
zF5md{p?fV)a`$Zf)X#6b@q5OyjnClR>ilA6>Bg7mWIL?R+nwQ@ab}9?;444l&2e~h
zY~CEfYeo-XhgD4n)>)g{=V0qBQDkTm_5EJIT2CG^yBfmPljiU~JAZdhirM+Y_4+Ua
z>kV=w$a_~b10+B_zzGlm4uFmKtmxoHXWgyk8&4cC^%u-3+jtVG)%iq5>BbMfy5(i7
zbM2zH+qli~#@(IsA+vMidU6!U-j+WU2}blxqQ$Bv!u{RJ>rE!_Vi|8V0to{=ykFwM
zvju~&S=VC&&f^ko+?c;!jW}Q;sNmIz4XK}>E;;`SB~uS2%G0LG!>)jMdBeBs<u%94
z3ntjXogaUml)l6cO2iJ<RDfYsYyEuS<g9kJo)RQwz9fTzw9S5RD;CAsZ*Rr++F5UK
zP4JBmwtNSZf`1nnM``|d5{x4h<?)Rj#5npfbl?*u{9^BGJrWxYBR1I5sK%M`rVHOz
zVWOwr*I4g2v)&KB)!v^~*B{0PWIK&hx9iP!7I#AoAm(LOeILR$WL^U0(z$lU^li1e
zLg#sA#g>5EA(H~*V{#ZDlg;>;EXK!VGCpP=<6|-yA7huWGq}3`t+HX5XvDY8k_~gd
za%0)XDo``4vpuJDqrdKn^;YMPZ+N?eV&w;QDt33yQnPdM2leUPGr<T2ov00i6XZ3o
zA0Ndr_O-L?eK^+Q$2~ZPuLPqqLlaP0&|!1KIVLfx!J!Fq7E<>`CqO$H6PxNBiq|!c
z?0SJ0S?*oIOM33^@d+Y5m&uRltYrDopFr8qIfqm~$U}l))M6O^QsqannUlZyt_YB#
z%Gtk}AOzA3LIBfvk^~v9#Uggn&dbL@@CTcD`MAW(C$MI%#G17dYt~AvSu3$-t;Cwe
z##w6q152AkJ(YX@5Z`Y<y}m@8JX>S-JFw2!_`uFUC~ypP+z<Ep_7vI*N}FkG;gNC-
zdz{Mou{H2?$BNN!psk{@{&ZS@Wf;U`y|94$_^}n~M5RWs;bOH}uJiC?3iG8Jyp1)b
zLHs>%DZU(IVcDgLv?0F6bvY8bXChHy9ErqM?x)YePoH6tn`t3jf5BMvD0j<q?=TiY
z#|X7xkRK-J4i6FxLk0GM;S6g=bu&LqE(GP23`?+m;v%gn;LX?*K1$dsLkkX86n08}
zBc$CBgWS$j3FIuFft=7Is@v6_0t>Z(9fFwHJE$!Ig~|_L2Ryif-C;kFHVC9`2hxUs
zw5>o|wVs!EJ9)WH<mEl!Ra$I1T}r~&=`C?d%o<uaRbCqyHzyc3Cm1&;CV>-^z==uV
z#3XQH5;)&{5`?#+ZAEroT?O2CVIHg&d36nVCLn!aJ3>b6W4uwL5Nk{)>vzm(9czag
z7k#}wZTKwu5)<GoCI_;gifvC*L4${t^x;$K!+Veo9o#4kW49WbEw92uMl<x1tDK|+
zT7{ZeFUhDIn#ol*-n$fUvlMT$wEhixBQ5}o?c5Jfye9$c67U=8Vkqi^^ZK|pM&f<q
z9_~xWiMY`!6l9DO*e9^99dDI!`paNjb)xE?K~!D4G`G61@D24d6Hs+u0$c=)101F`
zR+02GPSVd5l77Yo@u<dSl4}c1a-9>~97Nc1ZP@Z4n8MYf30}sga4l@PTR0P;co8?q
zIb$bEH{QNK7PdND=e=Ea=eAoC><)yr8*WKp{A1j|A7k#g6wd-%(wmWBOFD(Az?O7`
zpP()26e$B+(kX-mwxl0LvP6%Afw&nI!vb+LC~8Fp^sh+fVJkZl#Lb{E7l@k?LxR8=
z6y^efGbqdjCb^s3JYFYoMmg>waE1d3B4_xJAaVwU@Id?U3$<zm5=73ZM*`KB9|_dG
z8WMD*gan~8I<RvdBsdrs@*v|uI}j(EAajhAy%DW@)3v?^g$;nt9RiK(v+-&_sLufC
zjuL1IbOd@M8`o(9+1w+pb()uK?h(s6?F>KKou;jZ?WDf-MZWvY`F6wkCgFU)rS;gu
z5J$#N!&%M62ajQ&yp!*0leZK?mo4(6o!FHx*Ga)BKOiAA3I-EaC^CZekP!<jjBdap
z3l$l#*flb0VUZf-a6zqxeT<A(u!SXd?~^G)f;DW2<*OR!5HLioKBwo4PUnMR0@rlw
zQX}p1$1U3B&&+8E)1dE<q&i@)qI_<Cl=8t|MfqT_(!)8xovFq#Wi6v^g|L*t_62q(
z9?}7dX_%cTUxl8pnTOw!3YM1T^H1kfYb9JmT^j6PY(FA)ThbyD-*I^??&pNj*dJ(z
zO8K~X^bB<im}pqE=+$*)#{JjH6<9zkv5;;B%T*WUpgQHCLgm;NLgMt{g2?&A4sPgK
z)$am{V<OlRW;R*O%qEMN*<>Lzn=D{vlU$8Nu=#2=)}?)t<d}^lrSo5qq%?{mWoNZq
z!)lq!YMH}oNoTdBv07lw6IuC)^Fq4q*+^4TBP$*Yr9@QxIVV|4VZ$IaN(%RaSB`}+
zqA{*Z>tY%Z*K(|_tqt5HlcCWq@sJ^6CwJ%>c*a8cr-9Xx_&_@gr?r@c(^|yBX)R>o
zv=*>%T5zeyI<Z@7a<I5s^R*L@esi=Fh^v*Yoj_czEbRp1YGpDZW*#$wWe_J8XqRLg
z3)*F8()Bg0mbt8!Ijoj+R!bVI1>5$q_Us0iC^aGE1rwfSRuv)_psG|>m5EhlWL2fG
zstl|K^p5|rhDg21`T6&~U4nZSVO2;=#uQQCxFOD`zo{bXjg&@RH(ahX(n}rxJyf0W
z<B5|uwG9YNd}kYCYY|u4HjWe=YTHGm6>({m`$MwGFv0E8I9}a%iG$eL6gNP?>Hv{*
zU!<En24R4pX(`t@VBz#5wIKz|S%Z*65UJ!E4k>0(4cwL?%E&c^NHMc&oJcXdYDDZd
z_kkjNpki}R#f5@=jIDU(2rMwlIXB(*c6<A8-=EamzW4t*dVBf%FYj&gN?<*Wy6_?u
zK$8xn#QO)4qNkC8dR{jO!+inPV1EznI(>2Xg)&UJ<%n$*WTFD2(#;SjI%s*o8Qs34
z@G_%N%@EAVzRM-K@|lvHCn3poar2Lo#6p}{Ig{jkf5DR66I|_A-yOxEsBzp^6Ec^3
zhRg+CgfxSYyht<XLjuj92Z=+*Ql@JL#cu9fPcfPjA|Wr(u2V5anD%H<Xt9=PQCJ2S
zYf)GR7im#g1{Z2kha@e~qOc6+YEe+=`Es3$mlTIKhzD}CL1s!E!~<E{ATuQn;(>YE
zATuQn;sHBtqawOTw#RFj?Qt%%J<ega$8=_UOk=i3E3-XXXzvw~yjd&OU>$^YGp;HW
z4{&2&QLCXQpyy|=E5w#hdSLdtLLenQFng0N@O{>=gxAsK?7!#IzmgbpZN`{`G(*nb
zA*eeM($GP^{((UzavmpcBXErPi@>QV<<JQbuxCNco&lkI8bq%S1n!g*b^x3o6Tu;X
zARc#sF~z;XH<G&(e0LAG{m6Tg=4@=Osm^aKBBLGC(fh=M-0H)$-Y~;|Ttz*5EQ+hB
zXQ^=}BfvXm_#bD6|BEpEU%~=84jK=Po9Qy7&7|@5M2kon<P&?jqJcF+1q4b9?8j@Y
z_4rAXI77G&LdlCz3`K#Q!$8b4K+3ZaPJo!SB7kziqy*M^K$Oq8c<=Rv$mT(IkU+l+
zDb_NuXL1y48+a}`3Ze)`N{;&Ymd5EtHKoWZT8+-5*>88behSQ_&KyA+{o?Y(toSnb
z$^Q3d#q4H9UoOoGjc~#z_Hj%5ii8a3w(Qc4DX+YiYIWYZ?Cp+C#xgcGQbM16w*zDJ
zTK<&AFlAQeU4|@4sz-L7tSWy!@wp+eJ8&S-AL(AFA-Y4KAu_m*mMCo>@knwVB)s8u
zS`)<RbQxP^v}ZtsoB39m?>=$9PdHy-Ilso*dK$8HJwJ8~(U2fapB81vVO<e8gb^Ex
zLP?kgfe#KcX?oFhMdoIX_2U3{;mb4;W+&uLi+3b`&7aK@_^u0iJV|*EL6eM5V!~T9
zUu5pl-}VUi>XSuQI6)XlqaE0%?ME2o#oB&^L0+WoM;PRV+J1yVUZCwq801_sS0KtV
z9HB@)ov$57l;a%jIHDY9YsZ~ZW0rOtQI0dU<A`!RPdkn%#~H-gLjIkS+xEL8`5IQs
zTvp2*R!cgoC5_brVIMT=B*|^Cby7tZNoG}<Syid5Dif>9$f`<VRmJ7DBJ&VOhRDYw
zJscmF|3Qyl7k+Va<cJ0FvBo0SaN8u}2_cdY4E)0?`SrD)91jn|Fa@?QHi!st(DXwq
zJ!}~ZTHtLeL!TMzr+kEG&VMG$<NH3-V|D)G+P6Ew{_)xb@q^{D_gbB-RzQY>i^8-F
z=coGAwh9(#tgW2PjB1-NVR>w6Xohx@565Rw^Py%=?W<S&B}fr*JLB%@DNEi%ynG1C
z{Q{`N3!n}!fO5Y8%KZW;_Y0uhFMx8t;LVl$Nfs_FDw=~=_d9v@0JIPduy73q&QfG3
z#6MHFXna(~b~^MYH*z#Rb~J4)3N=lTj~+mLG$9sEQ7fBiZ)*(accw>gOOI(OBd4t~
z#XR;U^9Z7f^;^dFvtUj_KB55z1C~HRf*n)q@HVILHY@QqEAcif!FHX%igz3<-XK=I
zV{gQQ>HXa^L%FL#{6)B{?ha^vuu{%khNYRyaKiE`KE*wC@UO@8dX(c1zQabdIM@9&
z_rw<yT=z`VD=8&phYW68ZGw3c%tj+ZL)P;uR<a~3)NXJd?chQ}80NOOX@#l;BUB9S
z>_*_HN95J@z|~DQJ|GA75JwY@GTmWRPKiB}79C7%rQDwmzrO;ablAF2L=gehXb&;G
z&QGPsPSF7|VDiQwWPLwUOi`>f@<zNEO|gwYo>emHgf(g-X2ofFqk}x-H@*=<Cb*wx
zxqExw<9=pmeHySQS)abnE&GR=)+a1G1NutxSLigQ6R4pX1Zofj3QOC*qud)BpeSy2
z3~&w*1q`KL*#I?>D%W00mFq61V*3VSZXJceq%SpGJ)Rn_LAdMMo>X~DPb#6bPaNbv
z(Zjr5#S`3ff2aFH!Wj~Ngxd#~TAe@5eY@*me{NzO+-i0n$kktaHm-WolxrRM!nmuR
zHsxCPK(4O0!xUw%db$gb?gV&cSH0=-pq7Z2S3XtV;&^$UczN!G0u{bO#aOYKPmlwC
zK%ijk*oI@>+N?IfVHEU2zs})!YVkP5edd6!)@GO+0`o}LFkR_FrZdtdX-+bmkv>U-
zLFgim$cLPaZlqVzV1A3?h<wS(^hWxn>L{m6tYo#*-PL7S>~xoPGTP~G>)6DDBXV6Q
zv!3q0PF6qNg`Et4q<g9v;z-OUO}gH`W?Uv=TlP!3qdgQJy01NqaJsuaY;(HDz3ea7
zo$g`5gKa{t_K@p6>CVW2B3FZZq;F)%)nFj$Ga2B~^)F?>-lcym10j<2?`6P1N}tTY
z7eK1P5JJo1p7L!Izrn58|1N0|hq!NaC)PD_hBnEM1qK>K7k;5ZEJOkgA{HLfAc}Ex
z5vSa}oN;%r!nnJa2zM{6Of#7d$4sU}Na!KI&8_ZM{Q{Hbv9w^nknJy6zxzD5dmkC8
zm}oS6b)xgFsuK&}syfm2cGQV4aL;K81aQqjfEo<_^sb}?pZe$VDVrfE1JU}y$qd-|
z^Nnfe+tbgVO)Fh6dCV9%jA)1L@DD=l7(&F@Dukhi!`K<<l?wUT8JNc%h(nG2PVlbj
z=hQ8rc`MCwt&@+f6yyqlAFIdg65)Ynq3w>9Hhv6FNRWM0D4^+U9Jcusx(5-`XbMkT
zEB<4?PPQwieIM)NzK<1g-$#Fv@1rR<u1=3~+aoYjNU%8jU6O=Sp$mtTu2Yf_#7mUW
zQolozu)7MnaM-8?`dSXndoovJlN*R8l51dZ1R;WU3seZKI7krud_jK@QUk<CWt4}E
zn=rwuIzd!*YN+a@5Y`#o%fve&nFmUTgshE7?5a+VRh<@N9~dq!Qgte<>LeI@y>Jm0
z&2vcRCv@m%xF?=?mq^l!+{z~s7<rMK;qH8qBa+1FBxwRCAW4^yfFxby^g(N$B1yqG
zN$QA`q-Kz$7?}c-cQB4~GdxhwkrIKt*}lhpIZRzZ3dV7cNK%aZ%XL9L$4zvp)fc(9
zNRlq;56s@eF`+*&d)+kmc1Y5BuAnP{0Nf0c1QrAniHCQhT4h6Gh|v*d5p-e0aL=d`
zSW*KF>9q}qQb1Rj(_?KRKMaowY&xdoh@c)y=p^J2<g!-CWqWkFj3gkn+J$1s1+NW4
z&oOd7M0kTXtW2xqwl@-bbor@j$UyEQU_z0i<SGuk(jZ?|MRD#ydJ!pVt-{BZ@Ir_n
zigO>*OGrDA+Hf7Msfyve9O(o$9djwzXKBE0H-m17cBJ^kQSMiZ5^~lLxZicYCuhC6
zmbpyWU`*06$GC6qEfRQQQQz5p94z2&5jVj(@7P<q@kX_$-s*g4?%S0zJ~THWWkB0@
z>s+1ky}6X}Mt&ISb1(M{h*QEb?m!1)m#0iEP^&@^CB^Aqp&*)A(0<7M(-+=h)e+cR
z<{AA8ch46R^lYZZ7Ct3!m&MXK@Ygp+BnX@e8YYuvm|UotzSV)Wnb>)xK`74M%t|oM
zeeJRL2*{fgkW%57)&!IA6K>b%fkW@$w|z*C4hCV$z!!KlGIf$W64c1}TA8_2sDXc4
z2e#-!YrGs<WB97ULXa5HpK(9i!%QGrWv2|SA2}=q`YU_MnSwbnpQwCBhBLET2l4f6
z<q+BbCD}2nDa}4J`Iq6=eEFwYVD#AHFo4-N$Xf+0oT7ntBSQ;>@N}HPC;l7vs-4LI
zm=ll+sDoLbvN)IINC}@-=15s)Uhqfo6<C8^%+#Q66|wdff^WxnB0_1g5Ip^1T}d&F
zJ*|8CH^I~27(1I5gLfw;7%Vchj1M168$O(d&<evL^Kc42FG8PrfdlC1Ml*K8>w)Xa
z%tv3_h4wf%3vr@*k-Luk{NBNUxsWdyVl^|w0vZ4<rV#4@c04ECAD#D_aL5%Iii~Tl
z&9KR*2k|3x;K!n&XW2Hf=0C__t}@LP@vz}wViGC>+!5l(JvinNj}o3Gf&B?nth^t*
z5Sj9K%lpACLBI=~mG^`Hsgd}=VR=6|q)Ko_Tac>)_qS?S-g?WnD?z@(iwMAPj<=e?
zj^Vvv@@GD2Ht=;AFLD5-ckYr(g*E>hu7XOv0V;I~RMKCL6jajhK?*8KK2!}vC4DG~
zd_&_V#((G9Lu!pjch`u!70sR{hC1#oIQ@{r+dJg0LGQ#qmIA&R=o;Z-_3Tq!SQMg%
z5VXdMNH%=57veR9?StS+UHI+}!Z11!6_OdhPQ&;G>H2wd?0Ez+O|NVjIcTNeGzzQ?
z*h{>R4@S`a_4Ey-(GdGk3w$l3^f@C$e3TF%$6BeBrTykLlD@-jLma+UMPm~US?N1R
zL4=J&OZE$~LC`<6q|@L``RO#VBf<xI2p4a>1Ze`Oagbf3q?fbNK(kLUox=ra5(WKs
zlw(Fuj$b3V$-TrwSnR`(u{;@-C*s1S2!y>9KPKe8$N?*Wmawz~O$W)$6WAwL0-ZNa
z=|{+|>NpT}5GZ^MhMtwMNUnrMawRO1E8~0a;>ZdK7LMmCyv_+(33sXQ*+;w7TEbU!
z#^sS(f!t*3p>M|+h;*wEcA`hpqu0O5SB%PpJAXgL6NG^6KrA%`Y_A4(hk)(X!1f@p
z9oWxey86Ulat9xs@|&AIg2(;lX628h*7#@|Q9P1&4$m<@;bK0x5giI-Bry@YUhBnJ
zJ!D7pa9c`jhjlCnYK?x?5g+z?vXw#W8QTuz=|G<Y`J1tW5y<}~fxarV2RIDm$KEbv
zj-5p)D|{1eclyY7`eevxS6c8SMzexq@W5Vw0l9%UgozbEkF7wDEgguP`nA`>)^#zf
zIl3c_J`L0$L{(!fAHKDyKVohj7)Oj$E?R&lpbi8H+Y0nvi%;&QkDRj7SKIp2@WCxE
zY80Y_^sS+o2V2a5;s}x2hA-S%A3OAzhHtl#?Vnct(SGw|!xtn=ndK$y!$FDHnMZCD
zVz<#J?C9lVX3TYb9O;A*J7FDbwT_s{!*{IFiU6-Bovo1TnqfWp4=&V7YiIzh1udRn
zE51a2(Fyz1Um+WzR$-GwRSf+?e&*+plAn1LDfyWXndB|_gv-`TILFu}eZ~b6IR)lN
z|Kf8l;w7#FR0|vhTm^_`jdp@0q2qxO`Yw%W=HeT_g|-69K?kf<622hEAq<o)b>x^a
zb}T)%RG{y>RbY#y)iOM6gyTlc%4p{B5$kX_wn)IwquYx8m&3=*!%JBhiz_e{pZIOd
zb$m;ZkjE$fn)|*=b}qs#Sh{rM*KfEXc9F$;!6oiDob#|6KRBq8piKKa;f(b=?g^EK
znz<-8zg5k2@GY)+;6&e<*hF|2V#<8t1oy%&bcY4XKJ*5{tzc)H2jDj9K4FVrd*KNL
zUO}*}awF*j|G<@~-sLXjC<Hih4Lh$y9E!#wZZYp%hP&r*8U+l+%h)sG`&rmOgfe2R
zjQ`~fs?IKPWCvw-HDQV<?_%HJQ1@}ahl(<>TLE8?#%={I5~65PFyna<;}*6r6xpXY
zp~ooK^ca2OAGt5@V%GaA4dM1GfTJBq>q*2z#{96q8Q&$tid5Z<%pBi{%!J5LNrM=|
zw1*T(T;)gRVhV3Z*eh38;N`M;r)QV`g$h6WN`>A*@xV3M>?eUX_(TK047tjY!v}Di
z^7P0xIQE!W52a8c5Ll7}0hxYe_&3x>{56H(5smzKGYUa29{|yRSo9kly1|g5m%oX-
zM{$}Q324h4XBWO@j51gxATgCcfLw`CKnVXsWl$ubX1xp<ch6zOqky6KMmqgvhR^{q
z%nY9>@a4!gh#W@&J-q%hJvi>e?nN}@R^0Z%7VQDJQ}rIvg8{i=eJ)R>Lah8e<Z>ZL
zA;5`iXo!eIF_o3^>xU;HzTrFwXpR@6x1<?`XsnQQ{(F>7LY8_!MXDYVNdHVOE9NlW
zKZ<_t1N4}ZN2dp)Gss3~F5gDkG-T-jG@EYMy9LKVeRwKaYY=EC2xyK+Cwlt!FZ>TW
z57CJ<icTcjc=yATItsg|^z5Fvp4}I>jkxg<nKwXS+T2)=68(C3B!oVysem#wga7&G
zCRG?1(S6`GMWjBYg-AWf2@G~4RGo|X6y(n2k5O(QG$JqQcwUH<@ZO2sKw%NN{m3mM
zcQzmT++>kZNw47Gzx&W65kk<sN;dV+;f14sp+rz8hLl5SVvN0XE`P`8(09`@%2?O+
z;E5i{ML>oXblZlBF95js<k!)X!%THxPWi-zyos_+;IT`9i~8G-<8T};T+IJ}521zm
zlvCtaPPH(<h|42#9ky3Y!sC#Wv*68@9pu7UJzT5(5*RmmexVw&$@85mOv&>_H7GkA
za*ivZ1<2=LQ6}HL$i)vPedFs>j?ubwe2+-q{-`ur6j@LdtMXvlbhN!h9z~v`DCx?B
z>|>WF1^USIr`VT|{6c(ZV>>=o$t$v=7?cOuH@>jp5g%#O3y9(?nkGdtDi5-6d`%UA
z4=YufA##(L-DVE#2=oS?2wbl^9O1SlByHr1(RNF$pK*T<r~bWPbwMF~rw~L6A7hjk
zI^`T&>~vbR+7dmUK2m3qvkPN&W_a=8BgoMvd=oe|w#kAITOj0a^wCs&F{paXZyBu>
z<b}dxXD)=mIxXX4cL*c5T4J}-mv=|*pdf-5+OaJvJ+7*eGevoxLtfw$m-9EulL5av
zANHnP0o>FA8=O=B`gAgCj!ShoWeFWE!$|2UlwqcEh_Yl0msU)wz+)A7tP&pEd$^l8
zuf5)D_j~OXNyN)hA?IM0`a~!HV$-D8UhcK~ymmLETMoC^?(vBQ{L@W|Npn5_yT-({
z#-w?_K56PPX@ZzEPzq&B>Ta9b?ojs#>Z5Y5UtU;0dPErgx)mR}h9X8@;Ep3&pCIQ5
zWy0e|=)>h4AN+0P9FH2o)p9l5QUwkI)5|9o@{cr5LPaC03p}G=6V&-WbzwP0m({Rw
zRirPaBF>{GypvXiGT}c`<Sen}W2{X+@h1M)(xmEetMmPcGnpxH_~QYx!#TYRR?e=7
zJqpaP@9G2T=+a7setbELeFXMuJ}2sMT&?mL{yq-dRevVIG|MlL=wAZVzl;hhG5s;o
zR3L9+7x2ye7aJzkg*J78LsD#7xr;o7%3;)>tCc&+N2pvR2cdEYc?XrlsBhKE1^5L?
zpA|Ib0iZDt0F8M7Xv_mZV;%q+^8nD82Y~b-&G0D7&SAUlve|CCEVkP&lkK*f$9CIg
zu-$fcw#{w{+h(^|qiuGJ*fzU`8f~*%z_!`tYJ<Q>XL#R`np*)?3JrF@np@b_4}*TG
z<v6bbtsNdv#A&op=ZmBon_sSL#=?BSANY9SOyKLIPncy#xt#0KzXSw!RG#lkQj*r9
zG<29-b+iOU+2Ly0R$1;7Z{@2VoRo74agR=2eEEZum6DoMSXu28*YNERPO3Q-(JDk7
zbj7MrZ9Qhu<*JTsx4O_5t)s}bvE9}foLd+A)vWU9C)45R3Izz}Yo>K5u5g4-sjIuI
zz0`VvLt~i8avT5C&(aKiC#N9ZFWj&s(=?7|&{RABF|+EZh^ugN>!((iXpJ>iBd81f
zSX#oeo5gxgr;o=skUxH`p9FT*A;`PsJ%Wtoyv?D4aH$|%YPJ-%cYsKOR&uY&wh4or
zb;%%SUo?cXxD*zpv027`KUKjeqRsdsWvRIuF?=Dt)<SYcxNI1DRK#Tp7Nt#2e~9+{
z3G4Ym;XGD2KL?)a677_iYY=Js5S|ZMi1dL4BiaX!jEEmOfJMj&2VF~4`GfqUJ10rq
zMh+4e;UEEltt2O{B*$8kV=2iom*m6)IhN$WJc2-ve2Ez`;p7^4l{8TxXSpVdBMRoM
zyW~+oXSrq&*C?p7Tyqph6xdltbO)&^msEP#Iw4oXx217DoMo85orV*N^$ZOMjws$U
zwl?61Vm?FE!4buMma8S&y@776uEz!r(iI}M0Q2sHLkzq-f^gYk<@uyWicY}%`Y1qw
zOdfrR+98k&C8AegwkPa|ZvK%S?=*JB?T736+#Qn%17bz8LrhIYlKGH?D6rOuw&h1S
zmI_Eb(?SqQKORU?Vhg0LmYQZmOD#ky%Os><Qj=?B)i6Nc3JXWG0en(CvKJIw?GP~C
z6xa)@uh=0(@({=FfR?F{A32Vi%45f&`2ttIwIcQm^sWvT)T?mhkY&`1m|ix7^ePi%
zY%pg?Q_Poc2h#YMlaq%zIf3lK$%#5vtwt|vAYwB@8|z+7IcOfdk+O9!rYzl23LZ`p
zb8v#A6#ScTg3$zeNlR4b9kp0@tAcwIuu58}GAF48Dsz&8dlNZH&4>Hu>mVzsV}WMy
z)k5M(jCu+Gh0naxqfSB)T*rn<oo!=5x-LRBjuTACYWFZ1FvQ__h^}#tL?n2IvD^+8
zkt>F4E?lc%LA=PLiCLjN{Am3Y7Dc&aG=lC68;8N8A>tu64p(7HAV3#pH3D>z$CO$N
zN2rr9$WSCV;27|03xxJs4MKN^L9PqJ)&`V{qt<jluK2KT;_s=)up<lu_L)y`w9lM_
zxo4Iu8F>JsehG_YAFyRs!K!6AdXagO3@uksTu%`yih}a`D3BQRJNfRwJ3Z*}LHY=P
zLttu<F7tiju)zd`5fr@<lnizQvTMME03{u0c=F&>&3^Jv&HXL$xzF~J6tcY}TU~tg
znJe!laq4?X#4GM4p@<ytZ^Wts#S+p9q<*Bd(o`7e>&lt|CKR9!eQ6<Rpf3_$5q;vW
z2|hme0m!gd_ZhDLSHj7^Q4sGk;nT3)5IQghsEq$f9p;_L{HmSgS6x%cbo8#jQr8_)
z-f~dhZssj@lWT+?GT!y!$9fb$X@iJD<_Aft21%*`Nvdtes%C>h3-&`0bEr*`3P^SB
zA*~hIYk+IumHg+Bf?x7Sv1|?*S{e}+1z)n&_k@Q_xz|)MUMd(bl^8EOmjZqa8aXHg
z{eX(N8c|molM)JAb1+GF^Y%LEe9Do<2k_t`RDf<Ax}iqAhj;#GEpC&Fu@BG_FGbfQ
z_MntOR!TX4ma@U_9e4K7Rd+ZgTg*NDS85YN@F)3S)l3P&Ot)2t*Kq<8!P|9}v<SNG
zVhY!L`2dye!0g1^SJ{xFH>w0(YYKfecsse8{3a^+4Ykm?xhc{()*SGRNXlUfK^vi*
z8^_vILEp9XiCg#ulvBhD#E^$Hdgtg7q)}vsZf*#fNs~8(+?D*RH3{9^r}!JE+7I0v
z*&+PAv-{IvQ+%SI@1g@dQp2}@dXn>cI>r3f%=6yP{AJ!d3YNXEzw1t~*IQOrw*Ib7
zWu5uB{wM#t^1a>x+${DMcn3PW@>h5}JM;So3h-Fxrp`>e9T$*ilea8m)3RmDHneB1
zDC_m?J($0txY%3mX$=O0U9BBS<=X8p1%vtCV18a+UU4yQ^ag!9i!-j>>&egX=Fx8`
zpZykhdNM=Bd3*CS?APY4FD^#oHWe4Q20h%~zNGRt<%On-FUDU!N(}}*$nB*Aqb;;)
z`n7uV(Faox7w6ljPA-4(O{Jarn=+_=Pd;kLd(dOcyq#rq(MzrLZpzEB+w+p1Eb|=P
z^mx7(@8K;g-HaR=-uw_6P7mT4Z>O^#jp+>1yL96H^1ROng9GRy`t#J#JK`UT@66lK
zS%z1CB&oH%nVo&-i@og!on=%Sy=fl0s<?nh|D$2~VGosxaYVtL`hy`)G4h}pR9F69
z2VN$G+f;pTaVwsidjBgPWR@1&F^<%$x8#M2Q5n4&3cy=s+3|2Fhz9S)KO8Shl!n^$
z!{S7tz!7!@Lq6kgy<p(^V$SY1-fnZZy4}Uag0Z;RXvj;nKT%SmXeuUA=%%i+cwy^1
z@5IHjEIdzt8P{IvF;+zUMp@>D_R3CAh8N>E^KZRPP({%u7;QZM&=#BB?rsg*?0Y>)
zXq4QX>0=-U#*Rmqq2G%41baI>5^cS_L1ml5&OAFhj?lfBCW4N#7`zqBa1rI~^>p@P
z^zznESKuwPdN)_2w_gXrfH((x3uvs_5Fl45-@Y_&AkpXjc8r+^?+uh_N7)&Bdu>TA
z>sp_2SGUt!TH4!=I?<6pFzTe<47ay)Ght1bMwD<lluu|yZx=*4zymZ2h=o=M_hL@R
zhp)HTlT>`tdrWsryt8Q7%9j2qirM#~^q}V;YQ;Z1W=Rw{g<A~w=xSno^w~81Yg66s
z1d7?*gj@#RZr|069=~Ff*u{7?8Ot`Uh$G0gd0VL21DxKQovp9?FwI5!Uz%CE2i=!P
zT{+{g)dqYQjKKXQ9J3Mj=1*aFybQghq+do6_j)**nV`N)^ZNZXFF`Bzf~;UnG0lU;
z8GC8s7w03*v*VEvBda(B#&zcF&oZJ)w1$xlYVm**ox=V+1?@rSvb~+2Yun@WEir{z
zQ<7huXx`r5gU)t5h{*!90EGZ`Vt=0XiKfqZKI!EMUyDOFJcgV)<;YCB?abTc-Go_s
zZ7a&g-?dW+(3{+d<l_O9v$8AK&KGCqtq1l9;z64|V{b9&%p<`LtUHFFv$z$s-|jBH
z7IPqRqhq~yw{KBKP3FMO7~*BuPM4X#0aGRyU(_&S864P)nltSdk?<g2>~MEFy|-Wq
z4CUFYQ4~mI7_Z)I2kO#MuWdu=pU~NOXH4NRUiit5;_yL?(u(5J%me}@`cChU6&4-U
z^#ReJ)w^wzxGTT3vj%H(#)iDIc-Jq*<jp^bL3x95WD7z3J)aaq1sggUa$~VA#$r@_
z7b8x<A0TnNC*#TdvWykMgYkzF(~TatB)63CEyD}kvxhSCOP_RlGdF-7vcED=RQf}!
zJhZN40a=R=7K31wWtIY)?Rz(8Om%y5naRfkI4R2u9&{$RfOV1H&&76dBgr_kcY27t
z9Xi2{)7^Md%HDIYAQGEFf4wEe#hckE067l^yNFKfB$?<kV*sYP0AdB`e*Rr(L<s$D
zzg=$#`wi($*RO2qEY5HCYz9SB+ntm<`Q}05t?>3;(_?u)800!V2RqSU)H`-NI<gBH
z*eJz+yj{Jypnb)AgFxHn{LVhyWjJs%#y`&vl)xh%Z?Aa8nasEvRxJqV?HPBq<Nc8J
zAhnLx3L1?WXy=Wu7<$X~!D88ZFCT1Bbng^r_9tVdKbcSbkaw>bXBk+bEA*n-FWz@W
zsH-?nxE2gp(AlmJPv+jP{7q$_$3k?_lMydynlFgI%~UB2U-CT$@4@`<d$7Q^gD0fE
zME_yQ$-`}05owGw_kwf<*@Jp}!2_bSkY1D*6vHy`y2BRKSW9TGgp5;kBIKdz0G1bh
z#E7eanz0Vs?;=7B9uN=p7Q~0Lv)!4Ocd)B?Q=X|bK?IZE=61ay?01F9yLknWklsXp
z7bIDr2L<R$>Lxbp^25eN0dGVvJG%rB@TAi9hu93rn8LaB!nLfSs&ybW=>?a9pz3Is
z_jz#13<2|Wt`V3->k;|{y$g;36Fr3K5+7}_!->Xqib<8TS8GSF5!rZC+)YLuFB^g~
zYiD0s{tDJslt7a?-*Oj?1I>4DJ{HE#VxsZhvN(QX^+ZeJ8T6#nsH45!t`%71h)M+U
z)Ef;DtN#kqrVP}bh$1S=+sg<YTQI3<Nq-%)8mx>BDzUqX|I6}{i2pRf$h^`zqGPos
z@hFw?H`FpOL!$f96de_(b4*op*#XhIFDDNgFtI-vtjH+duo?fSn-_mhuQ^Y}EEcfl
zG6n&N0isG7@;X&UL*kEx^2$m#3=p~*kUt1CV7v}i{|&`UGxqk;MXVsN%QP@q2Nb!u
zvy)B7OyYZr!9`$b@!!6lCZYXCP&tMpy+J=1ru-13CTak?wkes+g%XpI?tAjkZ2W-R
zLKXR7#=*y9&f`rWPk0OLD?oEG5A#A|LBZ?IDc0Zkxg8uItr=j-Q6_c8vqHf=xA*65
zXg3mpz!e=0^<Q?uYkaZ<yo|}d7reL8R%)aEc`|=lC|GPnk)a@QCX{k{Rxm&~bQhx@
z$g1Foii;B$Jh%i-C>SIJL~)cA3rNslzm{6(F5X4R&Q{WpfGo((N_ShkZl(uqr~%7U
zo)twJR`@b#?n5VF)Z2K4UwsMGmq~h4`oFo8rf+AjI}E~{xTqh*=@sjqPGd(Vx<@o^
zI*86DvV;yUuoPeR%-%B5%UMM4ip#Dioldb<?xc&}<eFD3Lv6hW!ItKSdV3AtT_`l3
z*VxgXKeeLa+9pE+Yq2CltKnGzzPHTa0oM&$k!R9Z(J8W*&j=wfD1%zDH{X){#;7F>
zRS5oUv_9Omm(Z7r@1>T4r6mMoJP1e_q{IxbA<--p(+l*WX$0DqNu;XN*-orqFxXp$
z#hlf{uuETXsNcL(Z-u*EhNQ(LFE7hpO427$MM93!%new|r}8JpF{yf1L0LE->+uxt
zz^<Vp{MW}e<QA@_;@Dp%NX|>dn!8ELjN_Bg>-H{XC<xpZ(1pc$SgCP{>l-pXBKLm*
DQ8KGZ

literal 0
HcmV?d00001

diff --git a/substrate/frame/revive/fixtures/erc20/erc20.sol b/substrate/frame/revive/fixtures/erc20/erc20.sol
new file mode 100644
index 000000000000..14a21998f0ca
--- /dev/null
+++ b/substrate/frame/revive/fixtures/erc20/erc20.sol
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.20;
+
+import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+
+contract MyToken is ERC20 {
+    constructor(uint256 total) ERC20("TestToken1", "TT1") {
+        // We mint `total` tokens to the creator of this contract, as
+        // a sort of genesis.
+        _mint(msg.sender, total);
+    }
+
+    function mint(uint256 amount) public {
+        _mint(msg.sender, amount);
+    }
+
+    function burn(uint256 amount) public {
+        _burn(msg.sender, amount);
+    }
+}
diff --git a/substrate/frame/revive/fixtures/erc20/expensive_erc20.polkavm b/substrate/frame/revive/fixtures/erc20/expensive_erc20.polkavm
new file mode 100644
index 0000000000000000000000000000000000000000..b72214b86c6fbe6e52709e79520160ee68bc6b3d
GIT binary patch
literal 40090
zcmeIb3tSu5oi9EkBs3DTBVisgeknw@W#>_1^1yalD~^mMlBR-nTAFqnV&ftKTM^p{
z12fx_fdmOV{$m2w7^l0GlJc;drAZp&M_ZbvvFxN>$7owEZW?a??f$*5Ti<NEm%V*(
zzrQmQ564bOT=&y^|G_>wBh8sJXU_SZ-{X6Jzcc<%ew^dFpW)aaZ{)r=%#CvHw5Faz
zv7aybM%mkM4n1|}?*hXw2Xnsq%8vihe`D9LUbx{mAAj&SuDr>IzW3WBx3|4*`pGA5
z`|Ib{zq)hZ(2LxY`wzWQ^Z$P75BI+G8HYJ`>ifr5zL}Oa`ahpvv;2)uJhJ((m$&@K
zzR&!(U;gXA{q<+KyFUFl3m^Q{%dYd8A2~hw>Hj*bGi-ct{r7{PnS3PV$yxb1*KZ#D
z_-}4_;a6QZ_WzF^uY5Hp`0{YzcXvKD^yb@T-&peV*dcw>w=<~G3z3#0twkz8`Y4hY
z=~GDCk@g^c32Dc}wY3jbKD_7QhjxVO8fL!Lh90h*`L;XQxRbu^+*P@=F0?zi=b@dC
z?fk-?s-1ft+Px>V>*1=Mfrobo9;(^7W5>fa53RfXj@>&Su6=0N&OMLr`oeA$3jWn!
zJ-X-N?X^4Et>~BJWsf~v`{>Sx_UwB23%ftRbJwn&m4-#S(Y;|k-E6cooQ~Voh8ogG
zjfa~0b)$b9{xR37yFG0~+V-@S`iJyQ`Ub<xhKJJsDg74XtH#@eMw7?<oO#`XXBOmH
zyD}fnnaEka<cmvv%U)P^r{k-RTW&b9GQ7sT_WFXNTYq`${p<SI-BP%|Fm&6}J67NE
z={v)BzINxrqSB(yq8}IiN73(#7OgK@?^z#M|L}%`8`JKxZgROV-hFEGx_chE$LlFA
zo+_^1I=Hpn`#IkQ-}U#dzVFD#e|`T$pNM}#@%u|dW%vHYOMh|Wwtw8#|G;-YnO%N&
z`7@vX%7b@*X4_}?{$>6{3oCy4@X76~cPy^__|AXX`Mu9)1s)FkJosGg8($a*nI0K>
z<hzgj^CQQ0{qwF{cJJE#((d2xcJFE1b9B!y_WWv(<I&1TAAfY;qlX?%JlayPir*AZ
zim!<`HGHRGp|n+gK;ACLWak&1U)ukrPc<!mJpTCo%EIP`=KU?NKJm9tZf$+4^>FLa
z)_-nY6#i(qCR`ux4F64dZ-ceWw6V~{bNq8^VN4X7!z)_C6Au*O2iJOY52t&sE%T!S
z@<L&l)5Thi>$sUCjvH$ILbT1H4mqNdLp|Y$9m+U;+#Ef`cb|Cfu;aPbJ4;RX#~MtP
zjl8_KE6jHt;l;z1XAVE}Yu6p6rrR!mW@)J@uep1Qj}2tVC%O(!#riGcYt2JbWu}Yk
zxGq~lvO1(}yOd*9BGO_(i3rkS<q50uq`kSmP;mIIx{pkS0-;YUd7&X?i4Zy=N_Mf)
zDmDnBsGckm<rV750#RPBo^*-wGWDcGl$WX}?V`LyJ!uu?JoSViN{iLQMWU3e9xf22
z9QCkEl(N;s4pGWd58Fj)k$TuFN}1}AAU4|6?jo`AI<>n%Y+R^zyTrx?YPUmdw5Z*<
zZHC%y6&ua!K|yRVsgWYF!Kg+G#D;V=;u0GSYQ!Nn=+%f_Y)DfhXroRIqnW&7btu_(
zCCA!jbI~*RNY-*G+b`vKyRs`<Y!j7_DXn%TVpZA%B^;^`9SjYH!jj!C<yp}sQm)Td
z<g*p{Y%ZV8;kCIP&GzOzNAnVQp=qknXf`OhMT)&ZS?p5s9Jo46*GtuQDQJ}ff>hO2
z+M`&@m2AI)``Ick*8oLPngwOARSDY_*{(ELl}16S553A-QXgswod^|$Zjy3SEy|IW
z7D@I3X^Bh9(pp1J$#9@Grgz*f6u^inc6y>Z#V$}DQ0!L9D-=8XUF8(JgMMhofr}2p
zI4GclCLFlwU<3zVIvB=*pAH6aP)-Lu9HvEXMWK+U<Q19qU8RmG#hT!h?6aJb6GMkj
zaP-s{C95E1w>-+5b^J$-eVne;VDwwlO@6Cz-5p&v>mMZR1zyUY;H8`d-<5rl@3Ia5
z7Y$ENq0!A~(fqaF73Z#K;)-*Z7w0Z3&RtrZyQDZbuQ+#cajv~MH@7%9r#LseI5(>}
zcTsU}W^t~qIM-U7dtGtv!s6To#krQ^+>GK}b8)VzI9DjnH5TWl7v~y^bM?i!X~ns^
z;#|Ji=vyTsRUieB>Ws}*6-Kj}SE}laN<cI!!GKYzt}w<`A>MC{w;D^0>8=M0*VFSz
zRg-+Q-l5hze5;CZae+~)au~a++{Uhe1K(YET#NLG5-3MCepKT%DmWP*5aLmDyv>Yx
zk7}b~2Yx9P(p|d3=6b2>BCiA{dB1hx*MHkwPltsjGza-7?JJC~x7ML&6cqAXtxx<`
z7VT1?oR`JLQoxNYPYU>vEs+9VWJ{$$f|JE%QlLT>mrH>Wd|4p{hLM3(i%`NQ1supS
zr9c6)MN+_pEK3TUMUiYNAj)En6d1slTq)3lOppS0lrTvF4w+dBSdnFb?2%cdKnz6|
zNP#+8Tqp%pe7Q~vv?G%OllbJNzyva#6u5{iO$uB<rk4Vv$P7{-AdBfzAk4}2=*A|_
zw`wxox9TF&M7q1HibJ1H;LC+{zcq7pof5R8KdnZkMldS1oH2gL7(XJ!ML|Vx_8T!O
z$)S4g*5*^_F&Zi<IKoTS!@N{8z)Q6~=)tUe{uk)WtOQ1QB{<B-Bc?22Vrps%Vx3c}
zd-wzxMD+mQInb$IOA;)@*r(sBpoz`(4%S!|jm!D^f1z<#f8Sd{`(FU@?*#SNfc!(C
z|81B6doTlbV+!mnHg5B+8bRL<BlS>ckEVA8dhlfcoozq<1tpkBSE|pZE48t7rDile
z{){nx_;Q_ncR}+}*8XxSSckq2psz9PwH0`ryq`?sanh7P9r`+OX<v(4UswD|`nvlg
zN>#bm)qd;JP1LTd@8-*L81y~A4gJgJEKTa=Z~RY8AGtx08_lwm5e*B(0fwy66ZZIV
zGx&hqut09K$kIYtzAk!Dh!2{gC#=!e?eW(#;>S$UgN}Gahp8kt$c;K#O1oSI2Dwo$
zOX;#~yg~(OnD}yoRc_3brA3#kAzN<DlBFD3&b@pMD)<12jU5G{4bt`|KD0&(`lV_&
zS_{q-4r8jd^PMWu_2yd`kD3630FN3)1|D@58F*9-8F<trGVrJbGBBx&yj;IRs=B~~
zF@pr_kSfyCx~iH$lNI<908KhRGO1Lxrz?SQx)N*xZK~-}X_LB-M=wQ>Y*Op__$gyF
zyh(kAkH-Xch;KQ_cRv&E;9FY0bWTn?cal4=>dzgqgtt06jq&dbovlN=(p}>>D`+74
zLkUjs7#1aXmX98^D%CMQI%LPQvELH-4P0T8#}7*NMVzuKH5d5g0Ajc>MASbdUjs$q
zume1eFEgHn2I!D>K;YFv;8mXGrHTaTA^&^7p;>W_$d3s)+_w;d$oZ+?blE4MoKhE8
zKHgm49KjiLIwW0Dm$)JUQCI7Y$>ziv(|El}sqx2-nWP{d{oqFRumQA3LPyzUj}C2A
z>aA+n009<qh9nFE-x<Sj@SS33q_ZtnVwTW5i4tQ>GRL}gW6zrt&zr{kQJGz-I?H#}
ztw_|N=MsFZ+nDG#j~_HE=$6>mP=NY-qbeKXr%loNjjF|<RG^<v8Do3QtUgQZw5hUh
z?3g)mEMvSsL#nZkbr_{!f=_gq67IC~4QUEmtW^0E4Ui1(n3SO&G(?YXj7K4W(fV%X
zprD>GbhdWx4XL3)sN2xU6RqahakElmM{%j<BA<|qu||sm3RG&&(l@1gf{*nZ)#HY!
zv=OsZtvAG?##oyf;sMtyHP+bSjKpCO#YH~WYDye8jy)q#*Cn1YjklU4)G~IQR0p)L
zH0=~8RgUstju$mj*bb7wQ-)532108>)OUEIi$+LCh`|YH6P(qz+CHh})?_Xub8fOZ
zpp|KE<R)j7LS6xtDY%b<>ZudEI6iFTW4m;5hcR3ab%L6TM;BuIED1N7p5VuNO^IIf
zxC(KI$8JqiYGVA@NmJrv#`x12V<IuC@wSZ0#<Gm!DX230`)TB#2=nLr1*O)%{}eiW
z|FQ9-pp$lfTr`!Mpbb_PwbV~YRRu{JTs8LgpNQIB!M9V?J~@}#YYJ%cD*eiUpbT1-
zA$tfq*9AV*ir(f!QPRIc{iH6GW!zPmR%k4Q!RBzS)+<#7O2CCtR02(qU^L0`rOY@c
zKvMy;x`;$fYl3(E+T>f6z+nvOEU)b7;k(v366=gg#Q-0xGbK#Ic)g%h4f8Qkpm|q0
z!pHXL_wU_*-}t?jEQUVt&_F8J{^EJ#_-nfHL+10{#<<sfzSmfJ=;_zS2Q!{9O@Vly
z*Z}JebI1~V%{<nfk?1y!pEOnOd-}d{uSE$AV{oRRfAJXN*fVL-qK)dH0j<Ua1_j4y
zLaLZ61t5p+#%SF}9Cp=D;nZm(C~uS>8^}lu=%nf<9<%BE^Y|@{;v@VM(p2n4bVoa%
zkTYWUW+c9EiJi2l>kQG?HpZXNP+vEwy@u1ew8TdJ*iBsGCgZr?IJVIgH<^?Q^hR}<
zAMeI=#J#IW`SC`uf+l3b_%4gGJ;smk&QOnTjJ|G&%V}!c#^?z{{4l0if>*mYM!|Fj
zglM;+>xf&bRr$mbb8NsO)uJW)gz+H(-AT+gAquf(G`9(wvqPzzz+}URQq{v_+DgGu
zJ`n|P$50$I#Udtf6A9H5M;XYVUW>Vegv+edVo)rW*co$dZ$@IT5QEZ=5kG2zk{BNm
z)Ps&FG)<N1?Io+3?JVK(Bs_xOy7pgxb+s~DCpVbnMnRU$vYhcwDJ(ZGkR^*OFNBUA
z9TLEmqOV({VLQYfbrCg<N%=;rEM>|vlk)g|T9p`q0+KCDS+blXH{{OLaL^9kOG*bR
z8fM6Bxxp?=d9u7DsVB^?p<$UUEtTcv5ZKg0s3&Mcy&Vi23|CXZ$!;M*IEiV4iG`z!
zIKo83(FGh~;^7D^EWlZ%R*lU`jT)Pic57@-+I3|%M-+uy02~RoVpf8yH9!R+UH>9P
zxW?+hy+wVZ1&nEw?-Cs}<4F26rX{{+9<K-IkMXg?#>7!`tOr_um>+AzZz?~wHv`?O
z)HLy9!x;*QZ0!3M(!%IB$g4vT78m%+Nae=LT|{4H=4XCSN{q6-NC^~-xk!YP)U5R?
zmG1a`W^`()$*os{J!mm*A2B5&s0n1aF$3~rY@;QyQ5Zi1Rtyqs1Yrw_0ZXD0Z3Q8k
z&6wyh^lQW%KWdBv5`pR1%KEsUS)`|&%~9|vzxAfNe@~8DW1cLfMs1FQxlC?cDoe{{
znT^^z6-?4zNEy3&9g+0Bt5kON^PEWavy@$sAUY{Yf?V;cw+zLreunfW(od1jBaI{d
zBT@qCCrCd=`Uj*q(iqY?q&JYxBK<wmkC1+d^g7aONN12vBgK$TA-#(91Eg1wzK`@W
z()W-?k$MbM#j6JBqu(%v_I%v{6SH{Lv&g2nEDJuF#VOYI8L~|DjlPP(uNkt;>>Iv{
z)xD_b@7U!>+2?ohnPt?@PjO<^S8;xr?(v*f`!`taV(k%w7(8qctA`9?)ga1@P??vs
zGT%y;c@bq^K$+)J=9?(<9qshDlc!JO^a-3kj?>2sN=;GAi4|Q{Jq9RD^3lceh+RIG
zCm&xDttW{HjX9|;M~(8xGWpn2`S^1A<cb+P1IEl5GIfYciD~jtn>=Ebk7dfo7hPII
zgGC<6mXBr0$8+SPxid9jfEgA;Jm!>6K5CMW3G#8Xd@_S-z`%pvwYz|W9$O$Ex5y_K
z%12WM)umj@Bp>DF5&5`IKADzm!gK}wcnE`hTrZzYmruZ^VC)qYz+M9{7-0`VIza-A
zY(g}Xh8wD%h#EuQ36~HuO{@nWfQDCNhvf{#zs8CjnqQ589BitFOP7L^KtC=TpoJKq
z<-yFEFi6!C2EX-|)Bg(I0X{-ZWP1^>uHF=l@#teUwkdjyOceFlrf3OSBGI*c*ANf<
zknqeQO@{yxrAalD0HQ7;T|fe#tpT4s4nA9ryg$ij#U!6?;3i$S>%m5pDgq!1R{rzV
zvJ%*;4K{gN2))Ceoe@IfEFpBM7@H*swf>(igr)^y!z@8~sTd=BS<=aJ%3hvbL4!e-
z^s<}|-04bEj8sI(EU1N$S9daquErf&O<E#UUns-8dTLYj1P`_&RY6th-xPhF>=p^s
zpwt%8$pJntW)!b_D7|>q=aBvq>9a_mL3$AB(@5n=pF;X1(gR4_kp2Rx45<{!kMs$o
z`;k75bRW{aNF_)<Brnodq++BkNFJnnkTxUTjpRmhq+|BG=wo#{@t{@dj1_%^eYul;
zZepJ+ae@lmq7}G9%RWX~mOxww)WwMbC+fU8S@iZ~{!y0C=43adi-DVvZbP~&UAvxY
z5Ci$?V(><!LZpr9$!l;*3|^0#3(}{=z*?MIgD*w&WgWiUidr@xU!UF*ThSGCq{mc2
zR(QEh2Dvq-Me~JtubJ3Tp*{XIlo_4eW{{ipawJ`D0c#NA8`xQoJ>Hp8b=IWGEhbqJ
zWavC?8BvcAcj{&s*&5WaKyI<fk%e*-qp}iK180x7PuHNA6`R~-l_QyQ+ahX%?vfg^
z<)$n-k|Vb=N;k6_z{sM;Bwo2%CpRsYBX+qhPi|cj<pfktj7(#8QBIC5liQZct;^+b
zN^sXRm9I4=>x@jbnt*--y$bAy^q~nK6zoZU0?!PR1mA^90)rHsi<D{*>|9<E8cK19
z&_Tu{2Cb8!a90rALKP-M^_rf>P0r>i{N-&>#z)Hi)^$Jo#XM#B6#*+CURS9`{81n;
zZzv+|@Dt=!9=dV=$o?beM=WGS?N=qJjS@6PD2D*bVb~AAz#rkyA7S>vD@(2d12X^v
zL#i<7fq@x-f#FL4!r`_Xe+e7R03+N049oxw4DiHNV_=_M^2fx$Xdwv(C<DQU0fPO*
z<w3AJPW~LQ02XDg-6{`=kwCDbvY)45flEQKcGw0Q3a0Y2V6ZTmiSxt3h8Yev^4>UD
z(H|WLE4Vxk23webuqOWfAz?)y7zr!*{~r<t80QH9YG4BjX8w5<%y$6L1}6UiEVDO&
zfwl7t1S?O{;D#T)^(UhCyDHyGQTwGJSUCxWcY<KbTmbAI4FFRrMIMcJZ2;<1t^~Z$
zK$QU09ygSDb}V9U|K~e#Fq=7rfe{|2RADJ-J52Chj>IltVHLBmupI$DRwN{ffQ8k4
zFf2@|7WpTJu8fC0Q3Naumh}~}FhYpRXRxsHSy<S}G!}*>!6X)jF|Mkc#=?d_02YQG
zLBG=aBE!RQe-I7uFbS&<gc6K55GFQ*hn)gIf0kDx3=<<MKEbQUQ<&IsL)T%qR5QXS
z4g)#>G=UcFWtbRQ^8<W>mNR06`AWdS;5tBH2r0D?TcdpJMPp(s6oLxiCMcA`#gdp9
zE#u+Nu`@s<fQw;(=821~%Sz&6w9@ghpZxUd)qoE%vH4(PNy-Y$0~gaJlsUK<Mt=qu
z!<f(DVgnj3hPjZ$#d<VcZ20oH*xt(Zm9n&*aIqfXVlaKN-bK@2sb~kMEFTj9jfHuj
zjfAx+SVWB9NEjKd50{$m(JQz#wpo|h42rAZD_dfB5d=FHGbLh{@ooz(A=4s^Y)N3r
z3d=iCW`RY=jv4`!#a}jqEhSMhECd22&``3k+L~8`k@>CelJToGZE0T7s^-<BWQ4U{
zrF#2ELCN$$$&lVe`YF<Rq;aHwL`oq21nI{}|9})n8bdmV^aj#dq`yb{5z-HlUPpQj
z=?v0oq!`jEq*sxCfb<H|_mN&k`X16KQjZ>1=>UE7>lsR>haCu%4A~_pnSQoy`88bn
zckF_r?DM<$oP(R;{4muzqMw?Bm*My4v|D_G-2zaV9#EMcP?;W38BV{Xo&Hwx^ouzC
z0!}}V)8EAD?`WsLojiRKr%&MYahyJ;S85>k8BC`C5GI>}$q4ypFd6W&%fe)U7a^Ex
ztjHNmhMd7<2Eb(S6}qSg1_MiogC#Vf2TZ2-TQ~P67!M)F0+vF&gjbE5q9Y6{8`%^+
z&7iW=n*fp#RA#;`RHlF5P+5__xs}{?{8rCz|KV!c$^X4b88l-JD$_;>*2rA2EIJ1)
zYiDQGBw7Y6`g2HsiS${d&mcXB^l7AWq)#Dz66pb?ZAgECREAWF<VX4h()~yuN4gK`
zUZfHvACeboD^fAi79<bSJxH68?nZJWIS4Cv(Z_0rxqpOx-pM{UvCmZ+Qhtk;-JxY4
z)3TMwh=bjn%x_QTA7%L*6wLs94Cywcy9`NujNxlH;FlYb3XwLZ&S=OP+E+kLD>6*Y
z!Oc)|Edcv9$k!pi75N6_>kS%OX7~^-(^iJA4lQHs;*W@yHCHtm&1rm7RXc2}CajN#
z$zufQV5!l9RfP(yOJI?Ki?_lvWrT~?Td`El(SonY!A%wG62KI27V7;Z)T;rUf?HA#
zN9z=Obx^8UiI`U6B1)*NM6jKU0xQ>6{Gd~jYg5%Ihuad=jYi-!9H5#wZAphbbYS+u
z=LyBid1zHqRSbrZA8xQ#Wrvq1$aOb<9OdJq$Y99SIN%zE(nT6LK7wBg@QYQcbn#I@
zu;fWF$;Wr0G#XyZ@zK{&+Rn#i3mj`$NqCpig95Q64<smhafwrQOmJB6#I;;}cN$Kx
zE~&o28rqLVQ?!0NV9s7MnLQ*^81Om5<A$_GekY8n3Eaz}Y=;kTz9X99h+;_<Yu}qK
zxD$J_0f;DS6(M@$9zqT~!*JB0=aPaW%vprFsp$dHAyw#gfavsq=<p=~!BiZ60|E)E
zY?EF>W0VS2uT-|{m1?NASm;F$!yyN@a7+}&226>8jPYoOQhkw+m0<iQ`IyNB|ESoY
z2?_)`B{igt?SuMjmbNF*=V$rEF3b6DOX6PLSb;f_W*YA`jlD=<^7#f!nPssMx-)bv
z6sD!_SqnnCca?GjSP-Ix_y`t+*n<3(7T%kydO)p8)qwHwz%Y8d$0$|P!dJ8bZg1p*
zt5Fm@qeBBxd?mV!5r#k@ocD)6QUWn30!k2VJ4kS}dK}*V*Qv+h?Y~exj<|pYqBI}p
zZLz^FidGgwu!6-9EN3wU%UBG-QWit7gvAi#u^58IEQTPL#SrAM7=mmTLy*N{2o|vz
zf=m`eU@J6gqP@iNBcL_c7MgTZuiSU^hbgcoG3~MBHp96Qqup;;2CT}UpbUj1GT4b6
z(RV7jQicY}XqSRTP>%|r9=V_%xj}^vuqX$p@P6IjD^*^-5`go;_Ht04AId2xP=Zqf
zC=mW%`vmy7j7cUC**M`>puhq0Y$GQyqQeed0^eOitjGlKMY!<db^$wTguhF`iX4_*
zKtK-7Ex_Tn7t%0W;Iql0853#H+|vA3|L=a3a_cX9{q?K0n@C;a<;LWq-euMmQ;T{c
zTk*NPd(2|Fah7w-rS35)=az;QS9XtKW}D`sgOy46R?S&hOu6XPvxVo&xyR6AEkZrk
z;L>;_xfa2%2$O{@)+l_--qtnuW75DU5CF=yFTX~<Aqd7%fDWl@ktklLss*CBP*q)`
zxIk4MqG(Z7%!mwCwThxyRRvKrA#{hlo!A9Nc0oG3z`!ohvkTJL1v+*CFE%LPZkSr?
z0Pc~i4&WX+>HzMMtq$NGS?U1pu}B@jJu=k++{4ByU%@J0&MIHVDqqSfU&1QSW0fy%
zt{P>WBL>cK7Hn?R7;236C%J~GgI`PNU{s}u2y}&Sm6`_EbfjUV0i>R^4Q7thZO9Pt
zVX@-FXh$GMbpk8hXVawG7$|QP6xWXMf^b?_a5Sx}x+krxrYQ}6%3xTCrr<u=WphkP
z2w0I2up&{wO7;YYxD(~1wA8Jf6r`nI<)l?w>Q_$Kr6uLcVQGn7IV?y^9LixUVsPLy
zDCHF>Usk#WDNpIPN_m2E&@L^uYG{|esF2gU{=d^HYA^rU=?|%$#bboTP=9EBXf2Ge
zc&j<yeMtb!w|NfkmV)2<;E`CfSZJic7b9FK3v|9!E+mI8%Sfxvk4WD8!QK#lQ=}u#
z`PrLK`&QXez>37_?k+Tf?Ql32bcI~NwE$=9@GXE;F{g?OR3Wk|KKCy%->PyH@FTf(
z`K$^zj=ijkGdMepZv#j@bE@b;6(g*QihdMQQJ@{EDcOo99EVvItvGuT-!33c%&B66
z;)qxk+bdBhfdXfdMw6`=#c_;P;lbGg%mEjYBTefI!$&;-hQ0vR7r|H6Z>_u@h3qI`
zMH286bp;N&H0lZ+PS)XD0I4EbgVviBs6k{keEzLd=n53@Be~Nc2vLO_$6he;z{?1x
zang;dg;U8fa$=AuZi#qQ?c1-?B%p|;^}+xmzJvvZ#$hh4x!x>5XTj{l@P6TkuhON3
zrb4a`*LK;OCMBzAl(OrLQcl3wmEB~V69u;GE3ZNX|1qP$(h3EHZ>1u@q=1UnvLBM+
zVGr2#M%VbA2n90~3TB>vyh=8dZ+*W1bEX&h@~uDJHFCp}jIyn7A~(Cfl3BX7>X&!j
zYIYT_?#i8DOFiv;<s-gayD!)3%N2Y^JUt?~s@oyQt;&F%$#LTNKq|F(ve2F6ar1cn
zCv($`uI+cGILDs8AAHC;=EFJCUB}iC396)G`mK-EzEUV;y8h$(2e*Fo-?zV6X(-)#
z_n}0W*_E~AgO1P-Z=W?nqqnC<NYuT;mi8$&4&g0L$PnH_A#Vt8K`0xAw@}m_!doaD
z4&g1s$W~}Eb%?>EcsRu1Q3PBjbU9>;5Eg?BF?bX*hZwvBG6dmK$Q*+3C}a-6vzs8}
zD+J+{;~awU?8p#>=SPMpJPHRy`|t@BtpXXM@am93Oa_oabyShT4^2ddFuZm|;Xr2(
z^BS80*M(+TZuBBh5>nX@UotO}8z~i~cLA|E6Y0$Xx3Rezc})c-I187hd5=(?354og
zgf@F2JtT*kL+zoy=+;fDKp0)LXp`zAj4o>0q@Lm9-5Kh7*jjZhuk+n!&b8^zH45hj
zO)W>iBvl2*PhoMZhz}n{T#bwGY?ZbbK=*a<@eV}sNVQ@(#t(_<t{X94uv*Dz?jfUB
z!Jv>y%q&_mc-e1c1VcF*;qZeJggs5hE^Oyiv=5msBCO|8R<3G-Lx7<YJgb$9&6I;7
zgWoi3w1J|6aEhXWnE8#cF3q2s?g9Ij%DMSCm4kgt<zU}x;a^z(sJ2gA*W`u_%Nn+F
zEi7v-1PqES%v35@p_OamvCg5?)M@1cGvyRS-Z9Htg}u!Dm*JhQU__H1+DDV?A{dQB
zp*E<X$Bgka)GaXDU;)#kYs~3$tE7r1xX_1rX-7MTCB{M3;-GSI%;lJ79hNLPzqRo<
zqY9!*VE|I3_6lZYEoWBNGG=8hWmeV_W@Y865yW&aR)Q{AfTCz;3S=%*Aaj@knavc)
zET%v%VhUs?+^SKz*kDyD9^A(6avi(NLUxx0>@F5|mkf3n82=7dKf*#u6`qd{EH<#}
zLA4@<`abF+U<D=*QPHgEP&{!Wf&oo%ooc5@k#2Xa#ENiBJvRkOimTORFsI)tzxmxl
zeIX>M3fx8HLv1WBemRSaU&i9%m$JC{B`hvJ5AY8k+AB8NS%Cav^>~rkn5!N~fP9X6
z90Bs#>Tv|fXEBp`5i^<5GhtLKN>&zqZ)4H-*Ri`SWOrG>?qXqg$zXRukWV}A0=X(S
zB0vrnw@H-Ptq|vgTcxvG8Q87#>{e;)RyuYEJYHabeN-~I>^GNg{TO(x+4c6)56W8~
zDM<0wdyKBig667;^g=-ou?tHSOk*-#<3SV>L&P@5U@_uU02;!e%3vL04WDLXuo+cd
zNSCTA(83Ai0bZ-kIjc6hS*i|ox(<q0)av*HqC=^Ureq!A6mIdw?C;R(B;ghq#e*~j
zu}4BpfDfIR*Ukth1yNosN<ccS^WPr<*4zBINWc~i^WG#O32-=?xJ};%8SvL0;&3Qj
z{A3E_z?yC{29Yohh$ID&2IfsGc2KB8W~ITyHVrhE5b97l9W7kfNk+C90F?~@CJF`s
zwEzAFU|zj{82eb*XsEg||K4kZif%T6FjVvDe&T$*2o0DaOpYhH@0?JA6`FxQFB=-B
zIjw)shi5XQ+XkMgV3x28=8qX*f)U6tPt3q&TVA^L1*phomv{LGWd)zVX%;K^^iA)^
z3f^rBZ$ve7r!e4ksPbR~s2`s8#2?y`gT$)B$U$)^Km-V6)4*`}VYpWIz_oI~0LIVI
zm~>a(%_Kk-=t}sF__PviC%pyV${;H?-3)XCS1VO91JDilWRAj<-+w7CTF%eGMZGEd
z4s+i+2Jb4yV9JTUA^rbsfl)^rXFT>N;v4(8XGT(d!#$U8xEbFl*Z78C;~QR$Z@5$a
zx}W>Y5ym$nG;*OfO~5jlxlfIO!dIv<KwQh!7$B}?Y77w9QZ;55#U*MC5LccWgYK|c
zsx9J0*{+V@f?RckVPYe=AX^<_nAiv|Sfq|HOl$-f*vKE4L^6SB*D(-nAp_ACFc8hc
zK(q`7qL~?pW+EqIlE(9%bbz@4)1~-GJNMX8CFp*?d<3xzbi?=1y=L(d5G7qOe?9_w
zpZ6o-aRh?H9Ua`jOQ|te=ZrbTx3WvwEwF8K?Bui-I?AN*2&uuLlce~DPDs_|i1qXv
zr5#?QwB2o#;AJG$Os2y`fDU^RCQbmB5HX25@`IZ;TxMdZlQy2ClUx4Mhi3Tv%<y%2
zWQH?|?RR{c`{j$|mdOz7q_~<t)g;B$Jf#n51lJ6)o?txv0(kmG@N|mK0)@?8>w+RV
zd#$UEcn?->dA~#D-g;q!;097{^5Vnn$45pv2m2eu2#Z*PMJ(08I!>yV;80L4VY>|h
z_ZMJbbD(28_5-j&;uL{q;Uo*mgS8&y(0&6h<gm-I;}CXbV!Cr$q1j>9yN+D<LB;S}
z&XgG5VRW5yzMB{(nVAyB?bF({I;~9)qbizZ5SvURZ@R2TK2ry{OH!*ZpRS`eSqB(9
ztHX^tIM@gt66bbQ4!yC;%BHeXB_Jp9j=(yI_oV9B%{}<MW+XA@9|1!m^n_TyT7Z$@
zi2bWBf>}rer~nr(;E2{Q2&5rVpaQN*;E2{S2&y5G5R7pe(Gkj{EtL?$qb-*Z$fGTp
zU;!CNv}{5!khXL}D3P{&LO>CTi|SF1W(wJ5TKk&tGtCz%AZm*|fNZpN9xyL$sRvk&
zw%UVTptJ=aAU-g3rJ$FVeMsDqH7*5{Tc=6E<nC!w(4}pl2JA%JLk&cxZKEay*-mQM
z7%oVPD!`^0UG*6*^P7Jnq5n5r|8PnGIOYg|fP)GBB2DNQXhPqm34I4h!;wxZm@ED9
zKmqV32WFV{(&=iSJ6(koo%C?)h86f5kd0?&Dwy@pSOx3lTK<j@4kljbZ#lT$uf#8S
zzY@RbgGl^7?xp8a170*|z^gITGb`Xy6(oBAl068?Uj0r8l3|or#vut(xB$ACNI%z*
zajwmB?zN24B~z{X&|yT+wuR~y#3Eodg-_gxZA~ipu`{?y0iQSnh}4dKO|X7m$0r6k
zWjlD*jZiCGeBwqysu1|`I?NacKZeCExX)Bt`SCr#hrsus2h#3tzq+16K@f4r?1yQi
zVI&{R44_!J{?w5njOGQ>XH1Sa^OG#>>s<63unt5ZkO8P)s0Au0E^vt=EER`{mIdsh
zh}C(hpuj8z+6a;6F2R>@k^tjFb{!BXFcSzHa1w>F5!@3z1TNWNAPVCigmwXwQ#7Wg
zXdF$^*csue;AMCQWQ)M9kP-fb%%*58Rnhn<&>Q@?Owl+g0APGWbQ$BJa2>$6#VOTw
zfID&IPsCP+IRB9pm0jTGU=SBL!XP+}txVzzFo=uDfI(c~U_dgq5(Zmo2l+ICtt7Zh
zw15e2juvp1OOD+U?)+hTWMV5599eb=?$6h<dyc#LFy;vNKH17e?SlCm5|i2m^H&ME
z55iW4xrc^Q1J2E1D`fRUmYl|ns<I-}CFlsV2B7q5!1GlC%c?;UU$dSD*gJ>~te{%d
z6!52ksKZH(vLk}hF9pGpc7P?-f+bbCvCCrswG`oUBXc234;=+5rIQ;hmOnsbm$NsZ
zvk>PQ)zR_*iXexYSH(e=RUnVyyBGNd<WT#nu=yr4UC!dWAKxz`hZ<OA#qTh2suK8K
zj(ieMX<QooaCGp7&?(g_B2(>Ye#i6N_$pTfOJgUVF$|hr|CaYbmBr`tQpzIW+h_CM
zO<7DSiqMvmO5P0Y+KOsOQEWm#5Of=cB=3Qe$1s~7{D6U}8bD51%`kFwan%U&3KSe=
zb2Emyc^3S0G#&G@G3iqRM-ph}2cz8-1OlHDf^E?QP~_3u)$lV1KZl}?9KBY}AxAG(
z7a^yfDnO1=sCFSouU9+ZhwcYZ<i%2%8{0J?1ssO1Acv^ja)aOTBG<CA&|H{NXercT
zos8eK`8r&Mnjr+F?Wh6!$fOL*m$)DFf9N)@8J1G$NN7XI)zu2k8yh=eU$QpfAr+9c
z=JBu@yD&+$0SIA1f{7m+!P0pK!ESpquxWB~Cy^1MOn5Pax#0L6BV6^@6?AvVrR;#M
zwtik7f&}6&Rw@B1mylLJ2%R}s9fZQ1qYgq_&Q=GZDrc#K(32ObgHVz)DV8Z@B9NHv
zW&FOd`uRY`3Lcs)TZ)nbnG)842y-m|k(=0=<Wit0vc)aF%=9hu;{Zn>bNr6uT<}>)
zRL8YM^=aC7iEfx4*m4W{NCoy;g5`nXi)b611!#jaT5e{iF>vGt3e#BI-PduF`#~Sn
z4q6Z+jBEwN$d)sVY#GDImNJZN3B$<p7)G|3S;<XwuaJi3v4yhZ@4ZCEyh?4r<KEvO
znV8{Z0uiLECT233n7w3T#*zuO>6D-!&K)9;?bomcOZYItI-B@TANEL#msrBDL&mgg
zUY0sqs)&!I#h%x7t{3Z6fmF20d&^A!?YF5e`40E|*FMCW-WzKw6HddcMoLlpC@1w6
z3Ow2K*OK5dvxw#kxeJ`j*ju_a?PtGFH@lu+^g$&j^k-D}xcEss+<s~nO}kpa7pok=
z&y~F_-owP1<!VtM+8cT%G#KsPq{jI8fG#?+iBMzpAT3)+weSWwy-96^%Y}siQuPHW
z3{8BC#CIP*Hz1r_YdW{V+;R$j7j^vjQS7t_$BR=AU<Z6>6aW;-LsUwR7r<P@Bh2&S
zi&=%nCQ^L;j+eP#^uSorFo^f`2q3jf^92ZFVk~Cb=X)rVuz^tdpU@)!aqguC(#y1U
z{wDCU9_?9Q;U@nUf?p^EKY#=|s2;-J_si8o*!zB&dI)>pFI5j=@B1a{A?$shr!88N
zlp$A!#p*F8YmR}<<fzA(tU1PH%`qlxj)Bc&(oz$;XL^nQP?0EI$L_L_-DLs0i-p}K
zgWUygAu5n?hymhxbR$~hr&}3Sx>Y*6l|iLj=~cQ_no74yuJIQdM>$$Gd^+00@m<p2
zYWt#gy*@Q|#Dtv}$D`)1)+y{%hdt`B3V&K5kMWih6I~-s9FyTA*jp6hpq)>gHjRf(
zh+~jo4JQVv98sC8S6{mIR;8!T><U>w=oGpgE-jkp+zm#T%lbi;Pcy2St9&Lcw^zCA
z|As+wSG(p+O2WKfitxT<6y$$|jcJ69X$0hR#Wy3Q4DJ|L@)gj<wPcpiL)b#j8SbrT
zQuf!}g&Zi@?*i+%s!O-Nxgf`Gc9kytAk<N2%v-3@#<tuv>%wW~3UAxF%oQHSbA8yZ
z#9hgcjYJNjjgYq^zl3Cxdd=(HzaRQgh`+ZGFBQIGNg*UZ;*NELAg|#@*aZBC!{E-?
zu39CfnhZUt(%9PHSSmQ-p4ARY2qQHisXUloN-I0dE$wFO24DiPDX=^PRt(1z;;y1(
zpO^Cwdo9YJ3lnfN@qCWka`3|~Ig<7#8R!&Ah4C#S_t(%`3H<5Ot(_s-s_j_1v+A%o
z0$|0Vqez1;?ARjJa5}#u&V3vHoWOjc0}%5ew3m_DrEg0pGYY@2?8PbtklG?t2ykPE
z1L#bF&h?){Quh3qdp3$WaSivyf;Gja1nd<|32-!E9Me;xNe37s>9^=AFkmYnu25H~
z-(ar53Z?~*y+NqMhe_mg&A_}Q;9*(Disa6Kz@Y%k5RM}tufSOjTg|{}DRfAxA^g4$
z-iJ~RL1r-JUXyAF%NP03VW|dHRRV$`u%rT@$qqIOa4x1-foM*~j6pN+VnE(#v;fPP
z<IM(iIi3NFqRczT%1meGq)E@$DV7SIztwnnd6I{FlRVswoZ9L~PJWw7oi4#SzpPYy
zwFT^?W5xW@N~~nQ54Q&;SbnV*u<4oDzQ=$xo3LvNm#AaA?gL_r^&|e&jG$CL)`yi1
ztaJ1NJ}hDeJ61NvhAoNV47gk?wOH7A#h7>n`w>|xo5y<16lW@DV6B4hI>?8k=yurm
zq7aX;J(q#pu${@Vd5efxS97IYmZARxEqrvfj&gu^XoAEdX4<kmj2&Rml0!mb1l$=d
z>Cm}4elx?0i7kU$S50tu2wH?;XhMQxV1soUY&eS_05%BP=@`efOpf0mI6$O27g1^f
zK8!^mSF9RI)sq}Ks!MRzZmtG_R$t(-)(H~aD{Ti!x+JK+p@Rf7h8m@mGf4ns3Ie^X
z#*idPEF7Rp1<v0@kVK!<&up)KrG{t{4}R$eOCVqZ324h_ol=X31?C((Vu{`K9-EJs
z2`^7#wFS;BplCSDVp$A1v=RgeV8I2s7u3v{{Ww?tv=V&ZM4a>vnwJ*_B1>tiQ25}r
zqvh=&xO_gm8XXCOBa|NRMUx!~8P;qa`Wn64s!!}8)R4GAtUoQWn;AmbnNFzyfv15N
zwWD`H<om#!LF9cxqR%|u3R(q`zXpg=<rA+V%pR{XXth+X9!txJ@8#kh8Q~MStOD>O
zHciSnkEnc53$RG?I+8%a5?~+lkS{Zz_<h&$O?VANY)?kwUV_46&HBV`Y|ne_S=2H#
zfz6G$*ji94jH3aQvIE4t5%0>djGZ*o>lOylQjoJ=h>g%D;R!G90fNTfMy+@?g?WGf
zeibiWAf%04#^Qs<{in~1rZSTcrYUM%Z5+ExNZdv5o}j6pFk)t7SM%dS;<$Od#XM%D
zu%qz?bD7z0&{Q0$wh5jpKjm&ez?>v5v2`E}|4&wPe#U*S{X;e9UDX^otirW^1Y0p6
zu%l`iIf7%W29Qr6@4-Gh2`qn~)x+Th!Q~SO2prXS1@U{$sNU}YEo1+!c_}@Meoacx
z1uRw5W<Da6o(T}=MLj=uRG&C%Nj%MsyDg{J3a4ZGL=5wzj!&$`yaY!?;nOk8=_3{r
zG^h7jP9HVmJr$>)7U*pQUNeGV;#-aMB1JrCKfG}V|D!qD93~*b@Ax_Q+5Hr8NLoJv
z4q1??;}_gk_9KfjrPqA?f^)6gpFCKzpU_27!_xnWTehFHIPf;&-b|{`UkwPqPc`70
z`LRI^(8{3Sae@2zQ|Jy8oa$M8tsmP}c#+(C%}CZFLfsVbr6*U+f8l=kly6lLN)#YD
z^jdVR1II3XA*bVAhjF?N%U!c0Yz=Se{s}u_q#|q`|Hg$;Divajuv!*Yii_NcZABeb
zI6I85vqNmRFK~6@MP#WETgQLrJSdflu|-@h)j=V)P*tgp8*uh4v;}(a%4jljO?#M8
zS`fv+`yCfK4y8s=Vi>81*B+(^#{&R%QOVEt!4kx?g^`-(^hgtWL}fklHg^K0M3m6>
z{kWU8MBDa*RdSFjfk_!gYDxy$K7aTB^IJ3*;I2x6wvJzOkL`ov%vLVFSh@6L<<dQS
z<q|Il#LA@_jnHNQSTMyM5w2H<3IbYSFM@WfE3lONpWIFRU`pT_%b~qFko%DXo~`nt
zpp(LPm0%InZ#N20a#MS?72+Zkg6OI$Kwg2|g~A>RCMK;8t}H10zqoUI3x!H*?(ewV
zy~&8*N=7zk@oX`q(Nrih8}U&zFTtMg58RjcqNh<}7->Ljat{uBU`e2(AH`WKx==vk
zk{zv$IERk5vySHYGL)LcMHi7SXmw2BZ~~3f@wcOKPHLQ<Z){68&RNK%(=5lUHxcBo
zBFMiTLH=O``S&2m|DqDHON$He@=s~8i@p5Rp@iwxpSeXTYhU1RY5UVH%RV-1-}}$o
z<F%IQbv?P!Buj!Uo8`wcW_F-Rm64?dvTTtbV=sU?A<&D@KF@Xo4+zQVy*9kQg_k8+
z*2#~teeV&}hZh%U6~ypn8G|hA<;U2*_tO<%v+*h;tX5*9t;W#qP+#cFp_}m9(5}`M
zq_*cdurRAF%HqwT+B>k6B?VA}5crH2lt@cmQm!>|DkBy&#g19VYE4p3L88_;e#nRy
zgT)&0o~-mli3yv%VjHU1lj+z+J2)ON#cQzZg0TP0`3STUCl9S@><&}n4tg8a*uAu|
z#`!kz^o%4TgO{L6i?B6=-vI~Ea44WG1}2jy0Fqf^{XbGwVQ-XmNqB3kU4q{g-t-Dj
z6uUzbtzD%Rc(<yGcdNGJ-KwBs8(b7QpRLYk3;1jmvlzC$Ldu1V^E)j3^03cV?z8!Q
zHaFu;cDK*w^*a{whH!GeSoxCHnfa2b&6hgNmoVlFK#m-d-cH+QSM~|YlTuzlT3Sc1
z*L*4Y)>3JSJ4s{%cwH_Q-uLO1DCUq~iCU#xuM)+t<w{p`6=V)(mfw-Zk3R`0!=Wtk
z#=j*fi~Y*da@uT3W$)|M-fO7h4XxL11Mo5do6=-Enm@&w<agxo-Y4;<TV-*8z4epB
zACDy2T{A(RQcgwUNzi;<=Ky#{r&=oXVIO(+N~EiKxsKg_wdgRG?(Ej9-Za!OPpw#c
zFNXG>An=EoSL>vMZj-OkblCaH7G<ebS%OzVTh;O+a$PQmhvGuD+(k~y<qq;#F1M4r
zaydK{&1yMT`Ap)Yg38<(Rp!p9GIvImxihK(6i!o_JEIyvVP1Sp1lk%y-MK7cCx=Ds
zWV48!EEch|h(+vVvWOiU3)NY{LUop_6sog~h3YI-M^Nz+7OIn{!hT!q>N+^8<W&HS
zps^lQ@(MZ!u>x6Y`WCN%rtMy^!WpVi7CQ)3T3oJSN(Xp)U3Tb9=%x6Vjgq}w%JXX5
zVncXKi~S(+C<~=7GghHC^p{()H-{aPy{LI-Wx3yx$A7n3$}PYt`nHt+W^<*e<Q7y0
z{f_1QFPfFyidYr)#VATt;huGvK$oHiIc{aCKUPb7I3@O)p*AZ^14?#z?6a0wjJ>vO
zM94CaCUH4zDAw8C*;Z;E=g<<&1;4|=f2{c$uLa@Zy6RVC8R*@*G|SF?%Ba{YlAuUl
z-Ly!FRhtvlg0dt4dD11h*`{X}dW&K`EgvQZ$pBXDg0xrKCrA+Cc#AhUmI98Y<cM9i
zcCbcpNbdKNby6o~U(`uC7j#|OTpHU>q)EbSwiOxgN;AS{C^dc_n_0oksey?D><8YS
z>~-LU8B;TFWIA`;d~QTI2eAgvR&oXfArNo`3!~InYa*Tpb&HrDv@ha%P`Z>Tc@Lv!
zi5KVdKYyHDUdi$E0vtcF;yde=)W*xbj~cE@QZ>9|8)-u`sXB%u+SE)751@_Br0Nm;
zMw^>S)x$WV4bG(M0UYJQbstOnKnCEW+pri;zs&bv#TVN13~RACqJ7T*bK{8iK9hp*
z3Wie?w4$I$eog4rU>%m5321{~kwh-SaO{QGYFHF0z7_s&VgrTU!~a@rpvZeEh~-D@
zI3bW%AL3Ck(NpV;PX6aj*O<1F%Z#gdu_?98STWnJx4L4^A|u=Q0_c4Jn?_Z@beORw
z$c*s99C0+mY-z4;(lyt>HksbTLIqOaPA)t^>6>)Wj3S|<&^X{gI@SgQ+0EV+?cx*k
zT2jaOy?|^A__1TSQ+eVTwlakJy`v)W0@lFo<7+G+l(BwO+z0sEIxa(iO4#^_QH+Zp
z{?e2}ZrE_u_A*y(@H@C_Q@1KX^sx%=HD`k_%@;ct&4W*Mj^>M<t+{){Pg`Ve+Hm)V
zmo~m&EJ0l23WfQ2FISjzIGnUWQ{qyExq8D%8`LCXBLZ^uUW~=)E4(_L&`l5-JkF8X
zQ)9lC|L<R%y2gV})()IMPLtc2^)%kGirJN*kX+2hpqqSkgO1ax0M}j$-yvHFj%KX1
z{WPX9;0;2#f#$Ii<fqNns&C>8zc`hmq8K-ujDV0J>JVxfLa7_!2aE}^8%PEhk_jw9
z*gy^3yAgE=`U=)zK?n4;9oBD+3hT992TvQFv;!oSB&}IdhT5>-!XNu<4Esfn+}b8N
z3R2|&MbA@&VU#4?UxaidPr7++*#=ApEW>&wG-H}g(cT_cCV|wT7x4cjU+Y0n4$?Y)
zzdSuimw0q@JO+oc^9JxS!0<!>K;!}DfPv2*oT~Xxet@Xj+~1y@`%-8hc^*N$Dm#k!
z*b8Zi7cwBRlAF^XvS639wF;I`2yzZO2&JaCGGHIila|CuIv~OUyaW&Ji^%JcPa+Q>
zCoxl@qj!v{I&u_m*U^5XVI94f<Fe$F^f|bVZ;+<0R;~QMWmCm>+h(pz_$w@l5IHdA
z=MMhvM$9`0i}-S}wfzFNwqFF$dtM9se`dRS5Xi>?<SXI>4O1J0CR+Cj<HOvJj|`RK
zPQj9bU`f?rNi|KNY%A8iu=ECIE(L~>3&=GXj${R*9`PF#rNCL_P?iEQh|N(Q1)BnQ
z6SQE{u2Syz3bZZ-T9-mvmyJt<G6sMQ$XWoYB8kT>|NX091}+FP2f7LkX#-!^Fa=-`
zMf^zE41ocIICKM#`xx)KpH352H-OZWtVP@Qt_QV@uv+fo*HSTBDsD##YqgLg2Q6%T
zjJGsQB`se!?-!?1rZ2;>3h+2Cq}29;`^Nmg015`a&9)bGZ03I?qHa58C!W5_iX6RB
zC1~&?hc!z~<{+*9d-y(a3eg+17an8|6h>s_2-!e$fWl2cHdWBuUHpz>zL82g@Bj&v
zA?WTbU4lG@!a(6hQJ5gRQIz)b_lamfgW*c}_WD%&fx{7AeIM`YY{XVue#d?MemcM<
z_wy}{Q=HG+;c&KOo%3}#SNiT<yYlA2&ii~mUs+k%<_Aj3I-L0Z9sfI>KHm^ddVFhr
zLmi#YHNK7x=ity<T-H(2v2E>|HEYWHya)2Pv}LValb>Hwa!<a;<LPs@%&Mv_94_`a
zeVd&&o9+7ieB5J8OYaRGLd27Qz?;cFo!V!Ir`PMuj5rU31)D8DAMGj2&qsy2uxI5=
z)5<b^)79g2em-j5?D3#<Nj?soP2O#@o@AwO^Q>?Ak@i%}N@o2`m6x@3I7>U|{+@ig
zy9aIVpa<@xAAM*m%48l0hpjVB>FC^?`9L?yc{6<-ZM`LQl<#wPI1k`LT;oH>J%Dc>
z{DiAIJov5Hvuz9di2llMz%w4eKU|%)rlS*&zJ{J7_5ay+PuHrFvaBr!)>3VFQk%~i
zah92SoEQ%bgok<)BXYo#c_4YACqL6i&0zP6yb?wcoMtty%<r42d-^7G4tm4+Z7$ZS
z`GdGue#A+SmVbb1847z*jR(z*;2$nqbA9SsI>G*@a$oXHCdPcu-)5^IICNnyUr@Mw
zy$%EBaOCG(t+rJAr)!uw01>h;rM;c0`Z_A<mmyATYKM?&NV4S2*VHKYy2_kSd(bW6
zOa82i+p6aucRQK{{GlyPVYJTE5)ON=Fehg20g~u&W||yrF7#Xec8{~GCDqoM79^je
zY{+Aagp-7xIZd({Jl`6kexf_fjC?#H4QlFtnYXv(2F!>n5Ll)!bL9h|vdjZ)2vEuy
zvD-?slYQ=c3S;KMKcZbw#(}W&iRrQOb@XL*44m`$+S>9Tpc^s*!#H^JySS2$K3wJ;
z!~^>BiI$xp2i7PL)#D^O1YuFD_c`-@De_ynIo09QPjKmh)>$-g9eM90v2fUlx;&XH
zefju@o0m+tH`OVO_UKe<e6-0l^Vwq6>ry1v!Vz)Vgm75Uqr~j4o!hWfyIrLv5sgH^
zgPum2Z3bMAzXQ&>7o?hlmVimHb8Wrh?dU#qk4Bd>pDhkSaXUc!vuF%W!{31`QcUW0
z#1SLlftZ=S;jrE2+j0ZuCHs-c?|?Ty0{()DjzP*l5cXt7h+h$Nb=q)9WEEl8GNy`B
z9jqIuD@wQUsctJP^?24qIz8sntmM-qGxliHGaZd0p4aBg-hvBgnt-&3(<PsEbLMov
z%)Wm1G3eD<(t^vVBpcnn=`lvzY^9Jl7_RG4H~zdNPH3pttOQeONp(tU>{H*T?+SJs
z$u4;cbJ%RV-sbb@t)*ch;-z`L+2i$O+IUY^{^tCSu;A#mqJL5+ykG6xGO*BeyZM1U
zn{AD0=7FzYv$?|?$GAD$oh4;YL3Z|f=l76nGCP{w9WLMP5S)>GpC(!`DoL5gGMDy6
zZ-r#U-|hLm#MphH#>_2!j9XA~e8UF~>x?X-@nwu-kVqF}5fMsRFKC|{J!{99zX!Pd
zQjC!)n|{IUqLME5=}FF`H6~}IW7`erWLIX;!yWKscA-+5qNS)EWU+-6pWWf?c0Og+
z==EheOP{4@GWWXLw9}V<cIv@B@S`>r@o4y>P3aPcud^=?&+a+ky+H@EhCI(_vhoJd
z7iLw8M0;JyN@v&o?#<Bdfc~S~X_viAL+%EJcX;r~+U#(4>9q^NGFjVa-#2+YgcDgN
z@Np`sJ)8E)e#qS7fg0g+D%Q=Q>0S^u{bBB>D5?*1nd#dG?jMAN^{fQHA$lmYZXprO
z<S>55497>rGtC00nTKzVR-!nEvbKO1KqK?@IZ=t$EYM-<IY0y+*7A3D%o>Al+nSCn
z;(0`n`M!a+6wT&?8akYyi4H}pDNDP24oN%1v+hztT?tb4*lf=_%QDyC*|iSS=u>Ns
z>7BHojZ`N+2pAlgoh{Obp34H)aiUGL{uF(O$2W8U1CtfGEx*axF#zscM%|l*Tdqtp
zb7Cdop0x#-0?7fJ)yU*8sor@2UCvl!iB+R{4{N42U9`)>9`K~h1CCjBt--k9f4-@g
z73p=&enP4M1YCjv?8@?8Q3p*`M^n1g8JpF_viwYM=E}k14mtr91!|~m&}MspBy+@5
z0=CfRg*0X@y<~b*rF|rk?#`xpud#%PcB@XXGin->bWU(X5ZDaMI#8@{XKbL)(bhZr
z@ma%?EO`21P)|3Fm#;1CO0vp`OK-K^O1kt~8Znc0Q+(1*FZZ8h!`El`YQ$q342LT+
zF&SA)XJ4dsu<44TAXRotDTtW}0{q_TgADbWXHCrx^xT&0K{MnH1oHN*Qjd*Id#~*c
zj52F?er8f}(5B3mRK;j4smGvxC+Lr9PFqkCN6<7twg<c|R#+ylxS$x|uRXsP0ttFn
zgv|l^$#u8Z589+Co7E{0>L3`5D^m?Sofuqb|8zqqvl;p_58ynheI3H(c&*l3`jl!i
ztI2aa9@kPs@FzeS!6af@586m=DYb2TQ7MCQcSXk5A!xD|A{Ew&+jF<a2^AJH7Cn&s
z!Hb`CVHc!u*yG`BhElM?PAY|7a^@?zv&Yk}bQIG$+W`oCh-{3MQ0C8k3hE%llYVZK
zXZ2EQjuH1w{a@=t+cSM-{%2DYditE!8(<ar`MplwY4ABs>@J!Hhg;2Iqg3IRlDj*&
zOn1lZp_#suc93d=^X}OvrtgV^H7h&x?R`wLNBa7dzMia9TRXV21NvD-`<zXwQ;>Lg
z{LT(^(#j^VKTwnloSX`mfWkm_qyUg`fYQWdIUalVWJJr?uJjQbzdj$9<`4)Ibc*V|
zkJCp7F>Q!mrYNG)GG~W=_5(2D0-N(>u7Mfa>x49<x@^8@-APpdSEDtIQ0Sw>J?ru{
zhK_+U+<~S&oBq8-TwBmqA~hnqzM1k@BGNwSLY@P-oyN1~^b>u_e4L3>su5GE1A|H=
i_&Di|L_`kInD=pwu+R#djfpXscy#!9N1LnN&HZmp!=l*$

literal 0
HcmV?d00001

diff --git a/substrate/frame/revive/fixtures/erc20/expensive_erc20.sol b/substrate/frame/revive/fixtures/erc20/expensive_erc20.sol
new file mode 100644
index 000000000000..a1363845bd9e
--- /dev/null
+++ b/substrate/frame/revive/fixtures/erc20/expensive_erc20.sol
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.20;
+
+import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+
+contract MyToken is ERC20 {
+    constructor(uint256 total) ERC20("TestToken1", "TT1") {
+        // We mint `total` tokens to the creator of this contract, as
+        // a sort of genesis.
+        _mint(msg.sender, total);
+    }
+
+    function transfer(address to, uint256 value) public override returns (bool) {
+        address owner = msg.sender;
+        _transfer(owner, to, value);
+        for (uint256 i = 0; i < 1000000; i++) {
+            keccak256(abi.encode(i));
+        }
+        return true;
+    }
+}
diff --git a/substrate/frame/revive/fixtures/erc20/fake_erc20.polkavm b/substrate/frame/revive/fixtures/erc20/fake_erc20.polkavm
new file mode 100644
index 0000000000000000000000000000000000000000..932bbcaf61735c22e82e7bce8b617cee01eef4fd
GIT binary patch
literal 6304
zcmeHLeM}qY8NV}zyE6`)!T2ta57%{4L#xV*+s^67WTo_E({?g$GO=kDkigCc+M^^H
zXTSFcdCeA^W>RoLKGI61DKvyk71|;-1=KNhQ*AYWWW~~~tkSaosx|A<b?V2Yc6;6f
z2S~}*O;Oc9cH+VJ@!tDB@ALki-}AdS{JqC1YEq<(gJ!5-^VAX*Fc1CQLhe+7Z3Alp
z^MXA9)&h0_Oa>bOJJi|N*WT56q_h2y(jQ;D>Qg$q)~*i665ZsgdqD0!(th}eGSDe^
zM>`Kk+k3kY9qR0D-*fMMhr2ub+6TIi936Q2Ff@ui_0-WLod^56jo!(f)z^O9*>|+N
z{m4M)(}#c5JuuMSRc<qlT{M&K$CfL)y8HW-ct!R%ZqwMi-PGfBguX<#n>5o*d8A^Y
z;#bTyww~L=J;=3kN4aC%G-tCeSlwG1s(xE_clERU{kE5FXKOCkepuUOf6hK<pSLgD
z|6qSM&PTWhd>l>Duj;;>$|h4ghf`M$_~C|UFT~39>PXE)Ed2Udo-*Z*Gkd7DGm09w
z6%p@5bs}=`IE}WlIL)H1_$NI6shAw}vCc4WdQpig-^caJEN)<x1r>>Ef>-0Ls_Kh=
zRokgAdR1+QzUWc4?fRlq)wb!2qN+9Mi@d7U>kF)kw(95nDiZW_UKKg?a~>7d>F1m(
zvg_wW71iqJcoo&?v#gr1>8Jc^qFO)YRTEYEDUX`iqMvfA39EhzhON|3@oK`NPq1p7
z)6;%6&gf~c8n4jP9yMOBr=4ottfxgaUZ$tPN0XicH)+f}ah-@A{J71t2c~=t@hqwv
zK1y3m^h1o9GPRa7VcyJz`HFkkaogk<h;O4&U6@9WAU$5!K@Z!mbU8x1bt<&`Bv=Y;
zh)T*sl!c?Qe3HUZox-scg?ommg3cDsFookxgn5kFOL|ALKRf8u2c6@CJBJ6ajH^Qw
zih7GGgJjRxAd;OvCSXLGz4r?obt)+w^C%Oz$E(arLcJtxl>~<*)JcL}5^5!(MiOk2
zP$dalB*7{Pm6BkQ1WpndNvM#7a!D{tLYX9(B!QL~H6a?Y-)Y2thY|bjM(nrgvk=h+
zHO}i35J*8)Sv}=f)oLFz1QYUydCM!GCkNro$5~*O{wD;dRzV&bzFO0tYpP9)^ID=t
zL$%oy3lq=I^4SHkFmEZ$uv)xMOV~B!&@>@C!4}SP*#$m(Q7pV&S$LhxPB;r`lNR5q
zB}5I?Yg)sX+h~dH8rr65J2Z7?c9w;1vlsbnN-X49=s%ls7W6Vr<+KE=A&aI}5+C6H
z^-(UcT4IZateRG(#jDqPm=Ftjj`%}-uxKi+#WiHow6fJntnVORt|7CgRcM0@aS$8_
z7Y4<`TTCI#z^cMJE3kxq<qVR&%C})fl{;WX?F<kQIcOw{@JEMs^I$9(1?C6yf_cE4
zba3|-%9)H(bh5`uCws3@KJK4B#$tw`J82yC(74x6<32B~3@T~mg7P-*bLJMU_@F0;
zO-0P+PEgBp*5X{{<y<8+%e`RDEwaU28Se7uj+l#Z`It5LptY!%Ex%<cYRu)AndLMI
zz~$!wr1NIwEhVLJN)zrCQSU}qQIDTSF)xk43z!yN@{)L13AnYeNqLg8l+i=-9DrsL
zvS5aSm_TqM%<rgM5(a=CM8Qi#R?tenaspCh`2<ruQHc+EieA&@fl5dg@D0f<<V^mo
zIe#89i!Yux7teB7W)%cI<WXh*`O5sGmH87){thPZWpPYIF_BhMDC&pE!tz19d2#~7
zyhbLwe$71ho09Sp%oNKx>R9v=r1}ztdZ2wa4jHQxFtR8rLY6Bt1e(Xe2Np8L2h39S
z<UeqfC3!7^tG&EF51Ci3&jXiL>GQyPTU4|@li8akb6iwa-eAa`21D*J7;?M8klPG~
zY%mzI-eAbB215!4LpltGtTPzWZZKr6!H_iuL)v_d)5vQ6m!C<(PD$7y3EL%Mn<O-p
z7)X=^VKW}$C82sVHoDmyd~AS(q^9Mwaq$XNDu`LvvE*Pf4G%2kSQc?YL_IjpqZo@-
z2q}+YN#K?UK;!|4EG+a_&!G}{l(;eiz{$<9ByBRLVus7<EbevE%QM#Ej0MB0U(Q>U
z*CE$(uXD;E?)BzSWf3vCER&nJ6z4fO!7&0E9Ak+qI7WPgAHWesD~%`yI07_5p3abb
zAy9JCo1{#M?(Nd2w}L`xEwM^pUt(D;QKB!ES>wMO8FU>7Z^ED@4vw$m;2Rl~)8gwm
z80x?V3N3N)VD(KYR8`I>dzB{Oq{4Aa;gm(6CHX}1XohWNyC@&yW5c|o?vteIV`wNy
z6?DkaA96%Pj*b<Qc?Jc)J09&oGBgPD;+>y_9Bm;-IOGTbxXt6yK*$jc^Yyi#_*ge-
zu`U1cYF}>XED37`6>rD+kBR6Z1#d6Qf-YdU_!yolOAcBXQUZw+&XdNAKF&wE;LULx
z1#;n2kPFv9F1!bFfif9#p|r~Gj*lUwhNxSYRAoLER7I)6qo}%f<$AUHKOvgm;0Rgy
zSPKor{4ND`$_^5cq845#KYQ-@i`=+y1%wEa`@5bA31Ud#LjoIOV3r_fdiwDh9?yvQ
zEQ@E?iJ2I1sd{X1zwmGe^bSReHAD9}c8$XFr_@USG>owf`Umnh7St!4sR?>4{#?41
zy9-`^k3w=7!<$HMOF|06LJ(a6c`d8JyztWxYz;ph7@i_InuPQ*N((S^6e=O`f2p+m
zaYJbdAo&8Y^&Hp?*d$mH>=IZGYzZpt5DgV}5-RKxRM;UvP^rQ$LEky3utlh_m)2F-
z4x_?GH><Gy>ng1J6)NmScCEq&Q13=pQBM(w?Gg}M4(7Z>d(M|7<p9hZ%R%~BGz<$8
zprH)kP-p@h3XONQ(Cq&EM^GtAp$U*e<NxLs8c)kdUr(WF`qSS^g(k4R(DVfG84=I$
z2FwY5P;?F!Vg_RU)$s#j0N?}AfdvFXV64-CGEDSH$8x-~7`Nh{XmN_VJZHtx{yZ+r
zzgdZT1I0JXU~!a1&~CU_%`aN>C#?Agq1O5HaVF1za`5J-;J+s+cNj>B0uuURgbo-%
zya5U1!(vTx@T*9;>(3wJC{K{!BuEgyxk$J>@Zr~k1n=*!m5|_Ej|AC?2S90n<N)ab
zB(EICazN2A=y^~99%TXb06JoTjwqnx;3SQJERYN-+XpFoXo-~g6=qpe#lUMp^39iU
z;%FO=g$p_ZAB8tc;<o>lx3CPDivs3ixm8KrQIf>bHAxJ3l!L(MB}p7EN#Y=p#Oh{}
zxDCZF7$T-<$QKwv4ig;%!@Ne=X+6n$Y_O*Q`WE#-VcnDXD~<*U-ok*lo;GC`zC8ca
z$LUSKOv$c5gRv`6Z|n+eC10szV?Z!uufveNb%yM<8?v|7ki9jA?6r|ES+X}!Z7AO=
zL-}q2g|4dBlFq&7?GL^l(A{_NgA(Z4Hh`|p(76Fa=mrg;8zw@xZ3Eck|AvZIAh9BJ
zI}D*4T_<#xt_$5<N$9GpLbrc2p&KAbz_B0!J}fF>MjQipOd3iT-~mb(>Ln;$zy>(J
zX&RI?kpG8&`M=U#*(~_?N>^A_y7%9Cbxr9KajHV9h4}~VR{^#@kdkkJp4{FJpJ=bZ
zNdxQ<)%U_i5$ycjy6-e6a738@&P(ruCmiHC(cHV|VC!oJY;skAt;p_4&~z8T^)Mg!
z#rtdfWJA=7_8v0!%)<P>@%LBNck`p9SEA%WeS^5CBu~#(^1jp!KXjN6K6#Z21v5_f
zu>GA-BoaB@w5u_cac}b1((<sYxw&~Hm6Dp>>67lXdl%O@U23`VLVEZeZuDg7-i_T%
ztv+a+9;0e(aJXFex=uG;AFFjdMUJV{w$WxP4QH%vbR^Z1nF?my#HkV2BQ{&w<(h^o
zOXIGU_cnODe&k3nGCk#PB;(xXirB{8A@^toTpA6!M^1Yr_xNzBb>v1zOAiiY+<D9N
zZqC{09(7NJ->I2>c;DkMwcPG<?YgbhCgXPRa&xV>)6JR8{^zFLqx+_8v^&(~8V$lo
zH9t$aO+g4-b1GFxrDm_c)qKDON6jP6Eul!p9%)%|VS^_y>+7MJJ~;&qSNhrC+-&q?
z%-n8+K!hT}QW&nk0VlVuyBOP-X@a;-+aVm^a-D@ICAaoB@6Wg&fwACTtG#g~6>JF_
z!7X)Ja%0V#P=*B89g2`S>}#HK!5Ri#yI@6{U8A0n)8gp<n$laO+fDxtz}-8?eo*6r
Y&|Ghk3HLOc`PLMhW*f)$M}jQ%FI6q}^#A|>

literal 0
HcmV?d00001

diff --git a/substrate/frame/revive/fixtures/src/lib.rs b/substrate/frame/revive/fixtures/src/lib.rs
index 8d6a8236cd74..7b398e1ccccf 100644
--- a/substrate/frame/revive/fixtures/src/lib.rs
+++ b/substrate/frame/revive/fixtures/src/lib.rs
@@ -22,16 +22,46 @@ extern crate alloc;
 // generated file that tells us where to find the fixtures
 include!(concat!(env!("OUT_DIR"), "/fixture_location.rs"));
 
-/// Load a given polkavm module and returns a polkavm binary contents along with its hash.
+/// Enum for different fixture types
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum FixtureType {
+	/// Polkavm (compiled Rust contracts)
+	Rust,
+	/// Resolc (compiled Solidity contracts to Polkavm)
+	Resolc,
+	/// Solc (compiled Solidity contracts to EVM bytecode)
+	Solc,
+}
+
+impl FixtureType {
+	fn file_extension(&self) -> &'static str {
+		match self {
+			Self::Rust => ".polkavm",
+			Self::Resolc => ".resolc.polkavm",
+			Self::Solc => ".sol.bin",
+		}
+	}
+}
+
+/// Load a fixture module with the specified type and return binary contents along with its hash.
 #[cfg(feature = "std")]
-pub fn compile_module(fixture_name: &str) -> anyhow::Result<(Vec<u8>, sp_core::H256)> {
+pub fn compile_module_with_type(
+	fixture_name: &str,
+	fixture_type: FixtureType,
+) -> anyhow::Result<(Vec<u8>, sp_core::H256)> {
 	let out_dir: std::path::PathBuf = FIXTURE_DIR.into();
-	let fixture_path = out_dir.join(format!("{fixture_name}.polkavm"));
+	let fixture_path = out_dir.join(format!("{fixture_name}{}", fixture_type.file_extension()));
 	let binary = std::fs::read(fixture_path)?;
 	let code_hash = sp_io::hashing::keccak_256(&binary);
 	Ok((binary, sp_core::H256(code_hash)))
 }
 
+/// Load a given polkavm module and returns a polkavm binary contents along with its hash.
+#[cfg(feature = "std")]
+pub fn compile_module(fixture_name: &str) -> anyhow::Result<(Vec<u8>, sp_core::H256)> {
+	compile_module_with_type(fixture_name, FixtureType::Rust)
+}
+
 /// Fixtures used in runtime benchmarks.
 ///
 /// We explicitly include those fixtures into the binary to make them
diff --git a/substrate/frame/revive/src/benchmarking.rs b/substrate/frame/revive/src/benchmarking.rs
index 7a5b1c52b40a..f3794e502639 100644
--- a/substrate/frame/revive/src/benchmarking.rs
+++ b/substrate/frame/revive/src/benchmarking.rs
@@ -25,6 +25,7 @@ use crate::{
 	limits,
 	precompiles::{self, run::builtin as run_builtin_precompile},
 	storage::WriteOutcome,
+	vm::pvm,
 	Pallet as Contracts, *,
 };
 use alloc::{vec, vec::Vec};
@@ -76,7 +77,7 @@ macro_rules! build_runtime(
 		let $contract = setup.contract();
 		let input = setup.data();
 		let (mut ext, _) = setup.ext();
-		let mut $runtime = crate::vm::Runtime::<_, [u8]>::new(&mut ext, input);
+		let mut $runtime = $crate::vm::pvm::Runtime::<_, [u8]>::new(&mut ext, input);
 	};
 );
 
@@ -146,6 +147,34 @@ mod benchmarks {
 		Ok(())
 	}
 
+	// This benchmarks the overhead of loading a code of size `c` byte from storage and into
+	// the execution engine.
+	/// This is similar to `call_with_code_per_byte` but for EVM bytecode.
+	#[benchmark(pov_mode = Measured)]
+	fn evm_call_with_code_per_byte(
+		c: Linear<1, { limits::code::BLOB_BYTES }>,
+	) -> Result<(), BenchmarkError> {
+		let instance = Contract::<T>::with_caller(
+			whitelisted_caller(),
+			VmBinaryModule::evm_sized(c - 1),
+			vec![],
+		)?;
+		let value = Pallet::<T>::min_balance();
+		let storage_deposit = default_deposit_limit::<T>();
+
+		#[extrinsic_call]
+		call(
+			RawOrigin::Signed(instance.caller.clone()),
+			instance.address,
+			value,
+			Weight::MAX,
+			storage_deposit,
+			vec![],
+		);
+
+		Ok(())
+	}
+
 	// Measure the amount of time it takes to compile a single basic block.
 	//
 	// (basic_block_compilation(1) - basic_block_compilation(0)).ref_time()
@@ -646,7 +675,7 @@ mod benchmarks {
 		let mut setup = CallSetup::<T>::default();
 		setup.set_origin(Origin::Root);
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::Runtime::new(&mut ext, vec![]);
+		let mut runtime = pvm::Runtime::new(&mut ext, vec![]);
 
 		let result;
 		#[block]
@@ -785,7 +814,7 @@ mod benchmarks {
 		let (mut ext, _) = setup.ext();
 		ext.override_export(crate::exec::ExportedFunction::Constructor);
 
-		let mut runtime = crate::vm::Runtime::<_, [u8]>::new(&mut ext, input);
+		let mut runtime = pvm::Runtime::<_, [u8]>::new(&mut ext, input);
 
 		let result;
 		#[block]
@@ -825,7 +854,7 @@ mod benchmarks {
 	fn seal_return_data_size() {
 		let mut setup = CallSetup::<T>::default();
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::Runtime::new(&mut ext, vec![]);
+		let mut runtime = pvm::Runtime::new(&mut ext, vec![]);
 		let mut memory = memory!(vec![],);
 		*runtime.ext().last_frame_output_mut() =
 			ExecReturnValue { data: vec![42; 256], ..Default::default() };
@@ -841,7 +870,7 @@ mod benchmarks {
 	fn seal_call_data_size() {
 		let mut setup = CallSetup::<T>::default();
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::Runtime::new(&mut ext, vec![42u8; 128 as usize]);
+		let mut runtime = pvm::Runtime::new(&mut ext, vec![42u8; 128 as usize]);
 		let mut memory = memory!(vec![0u8; 4],);
 		let result;
 		#[block]
@@ -954,7 +983,7 @@ mod benchmarks {
 		let (mut ext, _) = setup.ext();
 		ext.set_block_number(BlockNumberFor::<T>::from(1u32));
 
-		let mut runtime = crate::vm::Runtime::<_, [u8]>::new(&mut ext, input);
+		let mut runtime = pvm::Runtime::<_, [u8]>::new(&mut ext, input);
 
 		let block_hash = H256::from([1; 32]);
 		frame_system::BlockHash::<T>::insert(
@@ -1005,7 +1034,7 @@ mod benchmarks {
 	fn seal_copy_to_contract(n: Linear<0, { limits::code::BLOB_BYTES - 4 }>) {
 		let mut setup = CallSetup::<T>::default();
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::Runtime::new(&mut ext, vec![]);
+		let mut runtime = pvm::Runtime::new(&mut ext, vec![]);
 		let mut memory = memory!(n.encode(), vec![0u8; n as usize],);
 		let result;
 		#[block]
@@ -1028,7 +1057,7 @@ mod benchmarks {
 	fn seal_call_data_load() {
 		let mut setup = CallSetup::<T>::default();
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::Runtime::new(&mut ext, vec![42u8; 32]);
+		let mut runtime = pvm::Runtime::new(&mut ext, vec![42u8; 32]);
 		let mut memory = memory!(vec![0u8; 32],);
 		let result;
 		#[block]
@@ -1043,7 +1072,7 @@ mod benchmarks {
 	fn seal_call_data_copy(n: Linear<0, { limits::code::BLOB_BYTES }>) {
 		let mut setup = CallSetup::<T>::default();
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::Runtime::new(&mut ext, vec![42u8; n as usize]);
+		let mut runtime = pvm::Runtime::new(&mut ext, vec![42u8; n as usize]);
 		let mut memory = memory!(vec![0u8; n as usize],);
 		let result;
 		#[block]
@@ -1064,7 +1093,10 @@ mod benchmarks {
 			result = runtime.bench_seal_return(memory.as_mut_slice(), 0, 0, n);
 		}
 
-		assert!(matches!(result, Err(crate::vm::TrapReason::Return(crate::vm::ReturnData { .. }))));
+		assert!(matches!(
+			result,
+			Err(crate::vm::pvm::TrapReason::Return(crate::vm::pvm::ReturnData { .. }))
+		));
 	}
 
 	#[benchmark(pov_mode = Measured)]
@@ -1079,7 +1111,7 @@ mod benchmarks {
 			result = runtime.bench_terminate(memory.as_mut_slice(), 0);
 		}
 
-		assert!(matches!(result, Err(crate::vm::TrapReason::Termination)));
+		assert!(matches!(result, Err(crate::vm::pvm::TrapReason::Termination)));
 
 		Ok(())
 	}
@@ -1383,7 +1415,7 @@ mod benchmarks {
 		let value = Some(vec![42u8; max_value_len as _]);
 		let mut setup = CallSetup::<T>::default();
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
+		let mut runtime = pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
 		runtime.ext().transient_storage().meter().current_mut().limit = u32::MAX;
 		let result;
 		#[block]
@@ -1406,7 +1438,7 @@ mod benchmarks {
 		let mut setup = CallSetup::<T>::default();
 		setup.set_transient_storage_size(limits::TRANSIENT_STORAGE_BYTES);
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
+		let mut runtime = pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
 		runtime.ext().transient_storage().meter().current_mut().limit = u32::MAX;
 		let result;
 		#[block]
@@ -1428,7 +1460,7 @@ mod benchmarks {
 
 		let mut setup = CallSetup::<T>::default();
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
+		let mut runtime = pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
 		runtime.ext().transient_storage().meter().current_mut().limit = u32::MAX;
 		runtime
 			.ext()
@@ -1454,7 +1486,7 @@ mod benchmarks {
 		let mut setup = CallSetup::<T>::default();
 		setup.set_transient_storage_size(limits::TRANSIENT_STORAGE_BYTES);
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
+		let mut runtime = pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
 		runtime.ext().transient_storage().meter().current_mut().limit = u32::MAX;
 		runtime
 			.ext()
@@ -1481,7 +1513,7 @@ mod benchmarks {
 		let mut setup = CallSetup::<T>::default();
 		setup.set_transient_storage_size(limits::TRANSIENT_STORAGE_BYTES);
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
+		let mut runtime = pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
 		runtime.ext().transient_storage().meter().current_mut().limit = u32::MAX;
 		runtime.ext().transient_storage().start_transaction();
 		runtime
@@ -1694,7 +1726,7 @@ mod benchmarks {
 		setup.set_balance(value + 1u32.into() + Pallet::<T>::min_balance());
 
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
+		let mut runtime = pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
 		let mut memory = memory!(callee_bytes, deposit_bytes, value_bytes,);
 
 		let result;
@@ -1751,7 +1783,7 @@ mod benchmarks {
 		setup.set_storage_deposit_limit(deposit);
 
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
+		let mut runtime = pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
 		let mut memory = memory!(callee_bytes, deposit_bytes, value_bytes, input_bytes,);
 
 		let mut do_benchmark = || {
@@ -1797,7 +1829,7 @@ mod benchmarks {
 		setup.set_origin(Origin::from_account_id(setup.contract().account_id.clone()));
 
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
+		let mut runtime = pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
 		let mut memory = memory!(address_bytes, deposit_bytes,);
 
 		let result;
@@ -1848,7 +1880,7 @@ mod benchmarks {
 
 		let account_id = &setup.contract().account_id.clone();
 		let (mut ext, _) = setup.ext();
-		let mut runtime = crate::vm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
+		let mut runtime = pvm::Runtime::<_, [u8]>::new(&mut ext, vec![]);
 
 		let input = vec![42u8; i as _];
 		let input_len = hash_bytes.len() as u32 + input.len() as u32;
@@ -2061,7 +2093,9 @@ mod benchmarks {
 	fn bn128_add() {
 		use hex_literal::hex;
 		let input = hex!("089142debb13c461f61523586a60732d8b69c5b38a3380a74da7b2961d867dbf2d5fc7bbc013c16d7945f190b232eacc25da675c0eb093fe6b9f1b4b4e107b3625f8c89ea3437f44f8fc8b6bfbb6312074dc6f983809a5e809ff4e1d076dd5850b38c7ced6e4daef9c4347f370d6d8b58f4b1d8dc61a3c59d651a0644a2a27cf").to_vec();
-		let expected = hex!("0a6678fd675aa4d8f0d03a1feb921a27f38ebdcb860cc083653519655acd6d79172fd5b3b2bfdd44e43bcec3eace9347608f9f0a16f1e184cb3f52e6f259cbeb");
+		let expected = hex!(
+			"0a6678fd675aa4d8f0d03a1feb921a27f38ebdcb860cc083653519655acd6d79172fd5b3b2bfdd44e43bcec3eace9347608f9f0a16f1e184cb3f52e6f259cbeb"
+		);
 		let mut call_setup = CallSetup::<T>::default();
 		let (mut ext, _) = call_setup.ext();
 
@@ -2079,7 +2113,9 @@ mod benchmarks {
 	fn bn128_mul() {
 		use hex_literal::hex;
 		let input = hex!("089142debb13c461f61523586a60732d8b69c5b38a3380a74da7b2961d867dbf2d5fc7bbc013c16d7945f190b232eacc25da675c0eb093fe6b9f1b4b4e107b36ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").to_vec();
-		let expected = hex!("0bf982b98a2757878c051bfe7eee228b12bc69274b918f08d9fcb21e9184ddc10b17c77cbf3c19d5d27e18cbd4a8c336afb488d0e92c18d56e64dd4ea5c437e6");
+		let expected = hex!(
+			"0bf982b98a2757878c051bfe7eee228b12bc69274b918f08d9fcb21e9184ddc10b17c77cbf3c19d5d27e18cbd4a8c336afb488d0e92c18d56e64dd4ea5c437e6"
+		);
 		let mut call_setup = CallSetup::<T>::default();
 		let (mut ext, _) = call_setup.ext();
 
@@ -2146,7 +2182,9 @@ mod benchmarks {
 	#[benchmark(pov_mode = Measured)]
 	fn blake2f(n: Linear<0, 1200>) {
 		use hex_literal::hex;
-		let input = hex!("48c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b61626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000001");
+		let input = hex!(
+			"48c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b61626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000001"
+		);
 		let input = n.to_be_bytes().to_vec().into_iter().chain(input.to_vec()).collect::<Vec<_>>();
 		let mut call_setup = CallSetup::<T>::default();
 		let (mut ext, _) = call_setup.ext();
@@ -2200,6 +2238,29 @@ mod benchmarks {
 		Ok(())
 	}
 
+	/// Benchmark the cost of EVM instructions.
+	#[benchmark(pov_mode = Measured)]
+	fn evm_opcode(r: Linear<0, 10_000>) -> Result<(), BenchmarkError> {
+		use crate::vm::evm;
+		use revm::bytecode::Bytecode;
+
+		let module = VmBinaryModule::evm_noop(r);
+		let inputs = evm::EVMInputs::new(vec![]);
+
+		let code = Bytecode::new_raw(revm::primitives::Bytes::from(module.code.clone()));
+		let mut setup = CallSetup::<T>::new(module);
+		let (mut ext, _) = setup.ext();
+
+		let result;
+		#[block]
+		{
+			result = evm::call(code, &mut ext, inputs);
+		}
+
+		assert!(result.is_ok());
+		Ok(())
+	}
+
 	// Benchmark the execution of instructions.
 	//
 	// It benchmarks the absolute worst case by allocating a lot of memory
diff --git a/substrate/frame/revive/src/call_builder.rs b/substrate/frame/revive/src/call_builder.rs
index 683cd5d5db80..a1c4c9b1c135 100644
--- a/substrate/frame/revive/src/call_builder.rs
+++ b/substrate/frame/revive/src/call_builder.rs
@@ -31,7 +31,7 @@ use crate::{
 	limits,
 	storage::meter::Meter,
 	transient_storage::MeterEntry,
-	vm::{PreparedCall, Runtime},
+	vm::pvm::{PreparedCall, Runtime},
 	AccountInfo, BalanceOf, BalanceWithDust, BumpNonce, Code, CodeInfoOf, Config, ContractBlob,
 	ContractInfo, DepositLimit, Error, GasMeter, MomentOf, Origin, Pallet as Contracts,
 	PristineCode, Weight,
@@ -416,6 +416,19 @@ impl VmBinaryModule {
 		Self::with_num_instructions(size / 3)
 	}
 
+	// Same as sized but using EVM bytecode.
+	pub fn evm_sized(size: u32) -> Self {
+		use revm::bytecode::opcode::{JUMPDEST, STOP};
+
+		if size == 0 {
+			return Self::new(vec![])
+		}
+
+		let mut code = vec![STOP];
+		code.extend(vec![JUMPDEST; (size - 1) as usize]);
+		Self::new(code)
+	}
+
 	/// A contract code of specified number of instructions that uses all its bytes for instructions
 	/// but will return immediately.
 	///
@@ -477,4 +490,12 @@ impl VmBinaryModule {
 		let code = polkavm_common::assembler::assemble(&text).unwrap();
 		Self::new(code)
 	}
+
+	/// An evm contract that executes  `n` JUMPDEST instructions.
+	pub fn evm_noop(size: u32) -> Self {
+		use revm::bytecode::opcode::JUMPDEST;
+
+		let code = vec![JUMPDEST; size as usize];
+		Self::new(code)
+	}
 }
diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index 6bf2f47d6694..c147011d3d85 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -61,6 +61,9 @@ use sp_runtime::{
 #[cfg(test)]
 mod tests;
 
+#[cfg(test)]
+pub mod mock_ext;
+
 pub type AccountIdOf<T> = <T as frame_system::Config>::AccountId;
 pub type MomentOf<T> = <<T as Config>::Time as Time>::Moment;
 pub type ExecResult = Result<ExecReturnValue, ExecError>;
@@ -477,6 +480,11 @@ pub trait Executable<T: Config>: Sized {
 
 	/// The code hash of the executable.
 	fn code_hash(&self) -> &H256;
+
+	/// Returns true if the executable is a PVM blob.
+	fn is_pvm(&self) -> bool {
+		self.code().starts_with(&polkavm_common::program::BLOB_MAGIC)
+	}
 }
 
 /// The complete call stack of a contract execution.
@@ -570,6 +578,13 @@ impl<T: Config, E: Executable<T>, Env> ExecutableOrPrecompile<T, E, Env> {
 		}
 	}
 
+	fn is_pvm(&self) -> bool {
+		match self {
+			Self::Executable(e) => e.is_pvm(),
+			_ => false,
+		}
+	}
+
 	fn as_precompile(&self) -> Option<&PrecompileInstance<Env>> {
 		if let Self::Precompile { instance, .. } = self {
 			Some(instance)
@@ -1090,6 +1105,7 @@ where
 	) -> Result<(), ExecError> {
 		let frame = self.top_frame();
 		let entry_point = frame.entry_point;
+		let is_pvm = executable.is_pvm();
 
 		if_tracing(|tracer| {
 			tracer.enter_child_span(
@@ -1119,6 +1135,7 @@ where
 
 		let do_transaction = || -> ExecResult {
 			let caller = self.caller();
+			let skip_transfer = self.skip_transfer;
 			let frame = top_frame_mut!(self);
 			let account_id = &frame.account_id.clone();
 
@@ -1160,12 +1177,14 @@ where
 					<System<T>>::inc_account_nonce(caller.account_id()?);
 				}
 				// The incremented refcount should be visible to the constructor.
-				<CodeInfo<T>>::increment_refcount(
-					*executable
-						.as_executable()
-						.expect("Precompiles cannot be instantiated; qed")
-						.code_hash(),
-				)?;
+				if is_pvm {
+					<CodeInfo<T>>::increment_refcount(
+						*executable
+							.as_executable()
+							.expect("Precompiles cannot be instantiated; qed")
+							.code_hash(),
+					)?;
+				}
 			}
 
 			// Every non delegate call or instantiate also optionally transfers the balance.
@@ -1200,12 +1219,12 @@ where
 				}
 			}
 
-			let code_deposit = executable
+			let mut code_deposit = executable
 				.as_executable()
 				.map(|exec| exec.code_info().deposit())
 				.unwrap_or_default();
 
-			let output = match executable {
+			let mut output = match executable {
 				ExecutableOrPrecompile::Executable(executable) =>
 					executable.execute(self, entry_point, input_data),
 				ExecutableOrPrecompile::Precompile { instance, .. } =>
@@ -1232,7 +1251,20 @@ where
 			// The deposit we charge for a contract depends on the size of the immutable data.
 			// Hence we need to delay charging the base deposit after execution.
 			if entry_point == ExportedFunction::Constructor {
-				let deposit = frame.contract_info().update_base_deposit(code_deposit);
+				let contract_info = frame.contract_info();
+				// if we are dealing with EVM bytecode
+				// We upload the new runtime code, and update the code
+				if !is_pvm {
+					let caller = caller.account_id()?.clone();
+					let addr = T::AddressMapper::to_address(account_id).0.to_vec();
+					let data = core::mem::replace(&mut output.data, addr);
+
+					let mut module = crate::ContractBlob::<T>::from_evm_code(data, caller)?;
+					code_deposit = module.store_code(skip_transfer)?;
+					contract_info.code_hash = *module.code_hash();
+				}
+
+				let deposit = contract_info.update_base_deposit(code_deposit);
 				frame
 					.nested_storage
 					.charge_deposit(frame.account_id.clone(), StorageDeposit::Charge(deposit));
@@ -2082,6 +2114,8 @@ mod sealing {
 	use super::*;
 
 	pub trait Sealed {}
-
 	impl<'a, T: Config, E> Sealed for Stack<'a, T, E> {}
+
+	#[cfg(test)]
+	impl<T: Config> sealing::Sealed for mock_ext::MockExt<T> {}
 }
diff --git a/substrate/frame/revive/src/exec/mock_ext.rs b/substrate/frame/revive/src/exec/mock_ext.rs
new file mode 100644
index 000000000000..ff774aa7c045
--- /dev/null
+++ b/substrate/frame/revive/src/exec/mock_ext.rs
@@ -0,0 +1,269 @@
+// 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.
+
+#![cfg(test)]
+
+use crate::{
+	exec::{AccountIdOf, ExecError, Ext, Key, Origin, PrecompileExt, PrecompileWithInfoExt},
+	gas::GasMeter,
+	precompiles::Diff,
+	storage::{ContractInfo, WriteOutcome},
+	transient_storage::TransientStorage,
+	Config, ExecReturnValue, ImmutableData,
+};
+use alloc::vec::Vec;
+use core::marker::PhantomData;
+use frame_support::{dispatch::DispatchResult, weights::Weight};
+use sp_core::{H160, H256, U256};
+use sp_runtime::DispatchError;
+
+/// Mock implementation of the Ext trait that panics for all methods
+pub struct MockExt<T: Config> {
+	gas_meter: GasMeter<T>,
+	_phantom: PhantomData<T>,
+}
+
+impl<T: Config> MockExt<T> {
+	pub fn new() -> Self {
+		Self { gas_meter: GasMeter::new(Weight::MAX), _phantom: PhantomData }
+	}
+}
+
+impl<T: Config> PrecompileExt for MockExt<T> {
+	type T = T;
+
+	fn call(
+		&mut self,
+		_gas_limit: Weight,
+		_deposit_limit: U256,
+		_to: &H160,
+		_value: U256,
+		_input_data: Vec<u8>,
+		_allows_reentry: bool,
+		_read_only: bool,
+	) -> Result<(), ExecError> {
+		panic!("MockExt::call")
+	}
+
+	fn get_transient_storage(&self, _key: &Key) -> Option<Vec<u8>> {
+		panic!("MockExt::get_transient_storage")
+	}
+
+	fn get_transient_storage_size(&self, _key: &Key) -> Option<u32> {
+		panic!("MockExt::get_transient_storage_size")
+	}
+
+	fn set_transient_storage(
+		&mut self,
+		_key: &Key,
+		_value: Option<Vec<u8>>,
+		_take_old: bool,
+	) -> Result<WriteOutcome, DispatchError> {
+		panic!("MockExt::set_transient_storage")
+	}
+
+	fn caller(&self) -> Origin<Self::T> {
+		panic!("MockExt::caller")
+	}
+
+	fn origin(&self) -> &Origin<Self::T> {
+		panic!("MockExt::origin")
+	}
+
+	fn to_account_id(&self, _address: &H160) -> AccountIdOf<Self::T> {
+		panic!("MockExt::to_account_id")
+	}
+
+	fn code_hash(&self, _address: &H160) -> H256 {
+		panic!("MockExt::code_hash")
+	}
+
+	fn code_size(&self, _address: &H160) -> u64 {
+		panic!("MockExt::code_size")
+	}
+
+	fn caller_is_origin(&self) -> bool {
+		panic!("MockExt::caller_is_origin")
+	}
+
+	fn caller_is_root(&self) -> bool {
+		panic!("MockExt::caller_is_root")
+	}
+
+	fn account_id(&self) -> &AccountIdOf<Self::T> {
+		panic!("MockExt::account_id")
+	}
+
+	fn balance(&self) -> U256 {
+		panic!("MockExt::balance")
+	}
+
+	fn balance_of(&self, _address: &H160) -> U256 {
+		panic!("MockExt::balance_of")
+	}
+
+	fn value_transferred(&self) -> U256 {
+		panic!("MockExt::value_transferred")
+	}
+
+	fn now(&self) -> U256 {
+		panic!("MockExt::now")
+	}
+
+	fn minimum_balance(&self) -> U256 {
+		panic!("MockExt::minimum_balance")
+	}
+
+	fn deposit_event(&mut self, _topics: Vec<H256>, _data: Vec<u8>) {
+		panic!("MockExt::deposit_event")
+	}
+
+	fn block_number(&self) -> U256 {
+		panic!("MockExt::block_number")
+	}
+
+	fn block_hash(&self, _block_number: U256) -> Option<H256> {
+		panic!("MockExt::block_hash")
+	}
+
+	fn block_author(&self) -> Option<H160> {
+		panic!("MockExt::block_author")
+	}
+
+	fn max_value_size(&self) -> u32 {
+		panic!("MockExt::max_value_size")
+	}
+
+	fn get_weight_price(&self, _weight: Weight) -> U256 {
+		panic!("MockExt::get_weight_price")
+	}
+
+	fn gas_meter(&self) -> &GasMeter<Self::T> {
+		&self.gas_meter
+	}
+
+	fn gas_meter_mut(&mut self) -> &mut GasMeter<Self::T> {
+		&mut self.gas_meter
+	}
+
+	fn ecdsa_recover(
+		&self,
+		_signature: &[u8; 65],
+		_message_hash: &[u8; 32],
+	) -> Result<[u8; 33], ()> {
+		panic!("MockExt::ecdsa_recover")
+	}
+
+	fn sr25519_verify(&self, _signature: &[u8; 64], _message: &[u8], _pub_key: &[u8; 32]) -> bool {
+		panic!("MockExt::sr25519_verify")
+	}
+
+	fn ecdsa_to_eth_address(&self, _pk: &[u8; 33]) -> Result<[u8; 20], ()> {
+		panic!("MockExt::ecdsa_to_eth_address")
+	}
+
+	#[cfg(any(test, feature = "runtime-benchmarks"))]
+	fn contract_info(&mut self) -> &mut ContractInfo<Self::T> {
+		panic!("MockExt::contract_info")
+	}
+
+	#[cfg(any(feature = "runtime-benchmarks", test))]
+	fn transient_storage(&mut self) -> &mut TransientStorage<Self::T> {
+		panic!("MockExt::transient_storage")
+	}
+
+	fn is_read_only(&self) -> bool {
+		panic!("MockExt::is_read_only")
+	}
+
+	fn last_frame_output(&self) -> &ExecReturnValue {
+		panic!("MockExt::last_frame_output")
+	}
+
+	fn last_frame_output_mut(&mut self) -> &mut ExecReturnValue {
+		panic!("MockExt::last_frame_output_mut")
+	}
+}
+
+impl<T: Config> PrecompileWithInfoExt for MockExt<T> {
+	fn get_storage(&mut self, _key: &Key) -> Option<Vec<u8>> {
+		panic!("MockExt::get_storage")
+	}
+
+	fn get_storage_size(&mut self, _key: &Key) -> Option<u32> {
+		panic!("MockExt::get_storage_size")
+	}
+
+	fn set_storage(
+		&mut self,
+		_key: &Key,
+		_value: Option<Vec<u8>>,
+		_take_old: bool,
+	) -> Result<WriteOutcome, DispatchError> {
+		panic!("MockExt::set_storage")
+	}
+
+	fn charge_storage(&mut self, _diff: &Diff) {}
+
+	fn instantiate(
+		&mut self,
+		_gas_limit: Weight,
+		_deposit_limit: U256,
+		_code: H256,
+		_value: U256,
+		_input_data: Vec<u8>,
+		_salt: Option<&[u8; 32]>,
+	) -> Result<H160, ExecError> {
+		panic!("MockExt::instantiate")
+	}
+}
+
+impl<T: Config> Ext for MockExt<T> {
+	fn delegate_call(
+		&mut self,
+		_gas_limit: Weight,
+		_deposit_limit: U256,
+		_address: H160,
+		_input_data: Vec<u8>,
+	) -> Result<(), ExecError> {
+		panic!("MockExt::delegate_call")
+	}
+
+	fn terminate(&mut self, _beneficiary: &H160) -> DispatchResult {
+		panic!("MockExt::terminate")
+	}
+
+	fn own_code_hash(&mut self) -> &H256 {
+		panic!("MockExt::own_code_hash")
+	}
+
+	fn set_code_hash(&mut self, _hash: H256) -> DispatchResult {
+		panic!("MockExt::set_code_hash")
+	}
+
+	fn immutable_data_len(&mut self) -> u32 {
+		panic!("MockExt::immutable_data_len")
+	}
+
+	fn get_immutable_data(&mut self) -> Result<ImmutableData, DispatchError> {
+		panic!("MockExt::get_immutable_data")
+	}
+
+	fn set_immutable_data(&mut self, _data: ImmutableData) -> Result<(), DispatchError> {
+		panic!("MockExt::set_immutable_data")
+	}
+}
diff --git a/substrate/frame/revive/src/exec/tests.rs b/substrate/frame/revive/src/exec/tests.rs
index eacf1353e8b3..68d87be00752 100644
--- a/substrate/frame/revive/src/exec/tests.rs
+++ b/substrate/frame/revive/src/exec/tests.rs
@@ -176,6 +176,10 @@ impl Executable<Test> for MockExecutable {
 		self.code_hash.as_ref()
 	}
 
+	fn is_pvm(&self) -> bool {
+		true
+	}
+
 	fn code_hash(&self) -> &H256 {
 		&self.code_hash
 	}
diff --git a/substrate/frame/revive/src/gas.rs b/substrate/frame/revive/src/gas.rs
index b310dd4a46a1..34eeb5fd4c4f 100644
--- a/substrate/frame/revive/src/gas.rs
+++ b/substrate/frame/revive/src/gas.rs
@@ -219,6 +219,35 @@ impl<T: Config> GasMeter<T> {
 		Ok(ChargedAmount(amount))
 	}
 
+	/// Charge the initial cost for executing EVM bytecode.
+	pub fn charge_evm_init_cost(&mut self) -> Result<(), DispatchError> {
+		self.gas_left = self
+			.gas_left
+			.checked_sub(&T::WeightInfo::evm_opcode(0))
+			.ok_or_else(|| Error::<T>::OutOfGas)?;
+		Ok(())
+	}
+
+	/// Charge the base cost for executing an EVM opcode.
+	pub fn charge_evm_base_cost(&mut self) -> Result<(), DispatchError> {
+		let base_cost = T::WeightInfo::evm_opcode(1).saturating_sub(T::WeightInfo::evm_opcode(0));
+		self.gas_left =
+			self.gas_left.checked_sub(&base_cost).ok_or_else(|| Error::<T>::OutOfGas)?;
+		Ok(())
+	}
+
+	/// Charge the specified amount of EVM gas.
+	/// This is used for basic opcodes (e.g arithmetic, bitwise, ...) that don't have a dedicated
+	/// benchmark
+	pub fn charge_evm_gas(&mut self, gas: u64) -> Result<(), DispatchError> {
+		let base_cost = T::WeightInfo::evm_opcode(1).saturating_sub(T::WeightInfo::evm_opcode(0));
+		self.gas_left = self
+			.gas_left
+			.checked_sub(&base_cost.saturating_mul(gas))
+			.ok_or_else(|| Error::<T>::OutOfGas)?;
+		Ok(())
+	}
+
 	/// Adjust a previously charged amount down to its actual amount.
 	///
 	/// This is when a maximum a priori amount was charged and then should be partially
diff --git a/substrate/frame/revive/src/impl_fungibles.rs b/substrate/frame/revive/src/impl_fungibles.rs
index 55c42a509109..404690c6765b 100644
--- a/substrate/frame/revive/src/impl_fungibles.rs
+++ b/substrate/frame/revive/src/impl_fungibles.rs
@@ -302,13 +302,14 @@ mod tests {
 		AccountInfoOf, Code,
 	};
 	use frame_support::assert_ok;
+	const ERC20_PVM_CODE: &[u8] = include_bytes!("../fixtures/erc20/erc20.polkavm");
 
 	#[test]
 	fn call_erc20_contract() {
 		ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
 			let _ =
 				<<Test as Config>::Currency as fungible::Mutate<_>>::set_balance(&ALICE, 1_000_000);
-			let code = include_bytes!("../fixtures/contracts/erc20.polkavm").to_vec();
+			let code = ERC20_PVM_CODE.to_vec();
 			let amount = EU256::from(1000);
 			let constructor_data = sol_data::Uint::<256>::abi_encode(&amount);
 			let Contract { addr, .. } = BareInstantiateBuilder::<Test>::bare_instantiate(
@@ -333,7 +334,7 @@ mod tests {
 		ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
 			let _ =
 				<<Test as Config>::Currency as fungible::Mutate<_>>::set_balance(&ALICE, 1_000_000);
-			let code = include_bytes!("../fixtures/contracts/erc20.polkavm").to_vec();
+			let code = ERC20_PVM_CODE.to_vec();
 			let amount = 1000;
 			let constructor_data = sol_data::Uint::<256>::abi_encode(&EU256::from(amount));
 			let Contract { addr, .. } = BareInstantiateBuilder::<Test>::bare_instantiate(
@@ -353,7 +354,7 @@ mod tests {
 		ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
 			let _ =
 				<<Test as Config>::Currency as fungible::Mutate<_>>::set_balance(&ALICE, 1_000_000);
-			let code = include_bytes!("../fixtures/contracts/erc20.polkavm").to_vec();
+			let code = ERC20_PVM_CODE.to_vec();
 			let amount = 1000;
 			let constructor_data = sol_data::Uint::<256>::abi_encode(&EU256::from(amount));
 			let Contract { addr, .. } = BareInstantiateBuilder::<Test>::bare_instantiate(
@@ -371,7 +372,7 @@ mod tests {
 		ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
 			let _ =
 				<<Test as Config>::Currency as fungible::Mutate<_>>::set_balance(&ALICE, 1_000_000);
-			let code = include_bytes!("../fixtures/contracts/erc20.polkavm").to_vec();
+			let code = ERC20_PVM_CODE.to_vec();
 			let amount = 1000;
 			let constructor_data = sol_data::Uint::<256>::abi_encode(&(EU256::from(amount * 2)));
 			let Contract { addr, .. } = BareInstantiateBuilder::<Test>::bare_instantiate(
@@ -407,7 +408,7 @@ mod tests {
 				&checking_account,
 				1_000_000,
 			);
-			let code = include_bytes!("../fixtures/contracts/erc20.polkavm").to_vec();
+			let code = ERC20_PVM_CODE.to_vec();
 			let amount = 1000;
 			let constructor_data = sol_data::Uint::<256>::abi_encode(&EU256::from(amount));
 			// We're instantiating the contract with the `CheckingAccount` so it has `amount` in it.
diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index 7eae79727189..a25959b486a2 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -102,7 +102,7 @@ pub use sp_runtime;
 pub use weights::WeightInfo;
 
 #[cfg(doc)]
-pub use crate::vm::SyscallDoc;
+pub use crate::vm::pvm::SyscallDoc;
 
 pub type BalanceOf<T> =
 	<<T as Config>::Currency as Inspect<<T as frame_system::Config>::AccountId>>::Balance;
@@ -226,6 +226,10 @@ pub mod pallet {
 		#[pallet::constant]
 		type UnsafeUnstableInterface: Get<bool>;
 
+		/// Allow EVM bytecode to be uploaded and instantiated.
+		#[pallet::constant]
+		type AllowEVMBytecode: Get<bool>;
+
 		/// Origin allowed to upload code.
 		///
 		/// By default, it is safe to set this to `EnsureSigned`, allowing anyone to upload contract
@@ -337,6 +341,7 @@ pub mod pallet {
 			type DepositPerItem = DepositPerItem;
 			type Time = Self;
 			type UnsafeUnstableInterface = ConstBool<true>;
+			type AllowEVMBytecode = ConstBool<true>;
 			type UploadOrigin = EnsureSigned<Self::AccountId>;
 			type InstantiateOrigin = EnsureSigned<Self::AccountId>;
 			type WeightInfo = ();
@@ -1135,9 +1140,9 @@ where
 
 			if_tracing(|t| t.instantiate_code(&code, salt.as_ref()));
 			let (executable, upload_deposit) = match code {
-				Code::Upload(code) => {
+				Code::Upload(code) if code.starts_with(&polkavm_common::program::BLOB_MAGIC) => {
 					let upload_account = T::UploadOrigin::ensure_origin(origin)?;
-					let (executable, upload_deposit) = Self::try_upload_code(
+					let (executable, upload_deposit) = Self::try_upload_pvm_code(
 						upload_account,
 						code,
 						storage_deposit_limit,
@@ -1146,6 +1151,14 @@ where
 					storage_deposit_limit.saturating_reduce(upload_deposit);
 					(executable, upload_deposit)
 				},
+				Code::Upload(code) =>
+					if T::AllowEVMBytecode::get() {
+						let origin = T::UploadOrigin::ensure_origin(origin)?;
+						let executable = ContractBlob::from_evm_code(code, origin)?;
+						(executable, Default::default())
+					} else {
+						return Err(<Error<T>>::CodeRejected.into())
+					},
 				Code::Existing(code_hash) =>
 					(ContractBlob::from_storage(code_hash, &mut gas_meter)?, Default::default()),
 			};
@@ -1245,10 +1258,10 @@ where
 				err == Error::<T>::StorageDepositLimitExhausted.into()
 			{
 				let balance = Self::evm_balance(&from);
-				return Err(EthTransactError::Message(
-						format!("insufficient funds for gas * price + value: address {from:?} have {balance} (supplied gas {})",
-							tx.gas.unwrap_or_default()))
-					);
+				return Err(EthTransactError::Message(format!(
+					"insufficient funds for gas * price + value: address {from:?} have {balance} (supplied gas {})",
+					tx.gas.unwrap_or_default()
+				)));
 			}
 
 			return Err(EthTransactError::Message(format!(
@@ -1331,16 +1344,21 @@ where
 			// A contract deployment
 			None => {
 				// Extract code and data from the input.
-				let (code, data) = match polkavm::ProgramBlob::blob_length(&input) {
-					Some(blob_len) => blob_len
-						.try_into()
-						.ok()
-						.and_then(|blob_len| (input.split_at_checked(blob_len)))
-						.unwrap_or_else(|| (&input[..], &[][..])),
-					_ => {
-						log::debug!(target: LOG_TARGET, "Failed to extract polkavm blob length");
-						(&input[..], &[][..])
-					},
+				let (code, data) = if input.starts_with(&polkavm_common::program::BLOB_MAGIC) {
+					match polkavm::ProgramBlob::blob_length(&input) {
+						Some(blob_len) => blob_len
+							.try_into()
+							.ok()
+							.and_then(|blob_len| (input.split_at_checked(blob_len)))
+							.unwrap_or_else(|| (&input[..], &[][..])),
+						_ => {
+							log::debug!(target: LOG_TARGET, "Failed to extract polkavm blob length");
+							(&input[..], &[][..])
+						},
+					}
+				} else {
+					// TODO support EVM
+					return Err(EthTransactError::Message("Invalid transaction".into()));
 				};
 
 				// Dry run the call.
@@ -1501,7 +1519,8 @@ where
 		storage_deposit_limit: BalanceOf<T>,
 	) -> CodeUploadResult<BalanceOf<T>> {
 		let origin = T::UploadOrigin::ensure_origin(origin)?;
-		let (module, deposit) = Self::try_upload_code(origin, code, storage_deposit_limit, false)?;
+		let (module, deposit) =
+			Self::try_upload_pvm_code(origin, code, storage_deposit_limit, false)?;
 		Ok(CodeUploadReturnValue { code_hash: *module.code_hash(), deposit })
 	}
 
@@ -1528,13 +1547,13 @@ where
 	}
 
 	/// Uploads new code and returns the Vm binary contract blob and deposit amount collected.
-	fn try_upload_code(
+	fn try_upload_pvm_code(
 		origin: T::AccountId,
 		code: Vec<u8>,
 		storage_deposit_limit: BalanceOf<T>,
 		skip_transfer: bool,
 	) -> Result<(ContractBlob<T>, BalanceOf<T>), DispatchError> {
-		let mut module = ContractBlob::from_code(code, origin)?;
+		let mut module = ContractBlob::from_pvm_code(code, origin)?;
 		let deposit = module.store_code(skip_transfer)?;
 		ensure!(storage_deposit_limit >= deposit, <Error<T>>::StorageDepositLimitExhausted);
 		Ok((module, deposit))
diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index 9a30dfb9d3da..df40c0f4e2f8 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -17,49 +17,25 @@
 
 mod pallet_dummy;
 mod precompiles;
+mod pvm;
+mod sol;
 
-use self::test_utils::{ensure_stored, expected_deposit};
 use crate::{
-	self as pallet_revive,
-	address::{create1, create2, AddressMapper},
-	evm::{runtime::GAS_PRICE, CallTrace, CallTracer, CallType, GenericTransaction},
-	exec::Key,
-	limits,
-	storage::DeletionQueueManager,
-	test_utils::{builder::Contract, *},
-	tests::test_utils::{get_contract, get_contract_checked},
-	tracing::trace,
-	weights::WeightInfo,
-	AccountId32Mapper, AccountInfo, AccountInfoOf, BalanceOf, BalanceWithDust, BumpNonce, Code,
-	CodeInfoOf, Config, ContractInfo, DeletionQueueCounter, DepositLimit, Error, EthTransactError,
-	HoldReason, Origin, Pallet, PristineCode, StorageDeposit, H160,
+	self as pallet_revive, test_utils::*, AccountId32Mapper, BalanceOf, BalanceWithDust,
+	CodeInfoOf, Config, Origin, Pallet,
 };
-use assert_matches::assert_matches;
-use codec::Encode;
 use frame_support::{
-	assert_err, assert_err_ignore_postinfo, assert_noop, assert_ok, derive_impl,
+	assert_ok, derive_impl,
 	pallet_prelude::EnsureOrigin,
 	parameter_types,
-	storage::child,
-	traits::{
-		fungible::{BalancedHold, Inspect, Mutate, MutateHold},
-		tokens::Preservation,
-		ConstU32, ConstU64, FindAuthor, OnIdle, OnInitialize, StorageVersion,
-	},
-	weights::{constants::WEIGHT_REF_TIME_PER_SECOND, FixedFee, IdentityFee, Weight, WeightMeter},
+	traits::{ConstU32, ConstU64, FindAuthor, StorageVersion},
+	weights::{constants::WEIGHT_REF_TIME_PER_SECOND, FixedFee, IdentityFee, Weight},
 };
-use frame_system::{EventRecord, Phase};
-use pallet_revive_fixtures::compile_module;
-use pallet_revive_uapi::{ReturnErrorCode as RuntimeReturnCode, ReturnFlags};
 use pallet_transaction_payment::{ConstFeeMultiplier, Multiplier};
-use pretty_assertions::{assert_eq, assert_ne};
-use sp_core::{Get, U256};
-use sp_io::hashing::blake2_256;
 use sp_keystore::{testing::MemoryKeystore, KeystoreExt};
 use sp_runtime::{
-	testing::H256,
-	traits::{BlakeTwo256, Convert, IdentityLookup, One, Zero},
-	AccountId32, BuildStorage, DispatchError, Perbill, TokenError,
+	traits::{BlakeTwo256, Convert, IdentityLookup, One},
+	AccountId32, BuildStorage, Perbill,
 };
 
 type Block = frame_system::mocking::MockBlock<Test>;
@@ -78,12 +54,14 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[macro_export]
 macro_rules! assert_return_code {
 	( $x:expr , $y:expr $(,)? ) => {{
 		assert_eq!(u32::from_le_bytes($x.data[..].try_into().unwrap()), $y as u32);
 	}};
 }
 
+#[macro_export]
 macro_rules! assert_refcount {
 	( $code_hash:expr , $should:expr $(,)? ) => {{
 		let is = crate::CodeInfoOf::<Test>::get($code_hash).map(|m| m.refcount()).unwrap();
@@ -194,7 +172,7 @@ pub mod test_utils {
 	}
 }
 
-mod builder {
+pub(crate) mod builder {
 	use super::Test;
 	use crate::{
 		test_utils::{builder::*, ALICE},
@@ -235,6 +213,10 @@ impl Test {
 	pub fn set_unstable_interface(unstable_interface: bool) {
 		UNSTABLE_INTERFACE.with(|v| *v.borrow_mut() = unstable_interface);
 	}
+
+	pub fn set_allow_evm_bytecode(allow_evm_bytecode: bool) {
+		ALLOW_E_V_M_BYTECODE.with(|v| *v.borrow_mut() = allow_evm_bytecode);
+	}
 }
 
 parameter_types! {
@@ -343,6 +325,7 @@ where
 }
 parameter_types! {
 	pub static UnstableInterface: bool = true;
+	pub static AllowEVMBytecode: bool = true;
 	pub CheckingAccount: AccountId32 = BOB.clone();
 }
 
@@ -363,6 +346,7 @@ impl Config for Test {
 	type DepositPerByte = DepositPerByte;
 	type DepositPerItem = DepositPerItem;
 	type UnsafeUnstableInterface = UnstableInterface;
+	type AllowEVMBytecode = AllowEVMBytecode;
 	type UploadOrigin = EnsureAccount<Self, UploadAccount>;
 	type InstantiateOrigin = EnsureAccount<Self, InstantiateAccount>;
 	type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent;
@@ -457,4885 +441,3 @@ impl Default for Origin<Test> {
 		Self::Signed(ALICE)
 	}
 }
-
-#[test]
-fn transfer_with_dust_works() {
-	struct TestCase {
-		description: &'static str,
-		from_balance: BalanceWithDust<u64>,
-		to_balance: BalanceWithDust<u64>,
-		amount: BalanceWithDust<u64>,
-		expected_from_balance: BalanceWithDust<u64>,
-		expected_to_balance: BalanceWithDust<u64>,
-		total_issuance_diff: i64,
-	}
-
-	let plank: u32 = <Test as Config>::NativeToEthRatio::get();
-
-	let test_cases = vec![
-		TestCase {
-			description: "without dust",
-			from_balance: BalanceWithDust::new_unchecked::<Test>(100, 0),
-			to_balance: BalanceWithDust::new_unchecked::<Test>(0, 0),
-			amount: BalanceWithDust::new_unchecked::<Test>(1, 0),
-			expected_from_balance: BalanceWithDust::new_unchecked::<Test>(99, 0),
-			expected_to_balance: BalanceWithDust::new_unchecked::<Test>(1, 0),
-			total_issuance_diff: 0,
-		},
-		TestCase {
-			description: "with dust",
-			from_balance: BalanceWithDust::new_unchecked::<Test>(100, 0),
-			to_balance: BalanceWithDust::new_unchecked::<Test>(0, 0),
-			amount: BalanceWithDust::new_unchecked::<Test>(1, 10),
-			expected_from_balance: BalanceWithDust::new_unchecked::<Test>(98, plank - 10),
-			expected_to_balance: BalanceWithDust::new_unchecked::<Test>(1, 10),
-			total_issuance_diff: 1,
-		},
-		TestCase {
-			description: "just dust",
-			from_balance: BalanceWithDust::new_unchecked::<Test>(100, 0),
-			to_balance: BalanceWithDust::new_unchecked::<Test>(0, 0),
-			amount: BalanceWithDust::new_unchecked::<Test>(0, 10),
-			expected_from_balance: BalanceWithDust::new_unchecked::<Test>(99, plank - 10),
-			expected_to_balance: BalanceWithDust::new_unchecked::<Test>(0, 10),
-			total_issuance_diff: 1,
-		},
-		TestCase {
-			description: "with existing dust",
-			from_balance: BalanceWithDust::new_unchecked::<Test>(100, 5),
-			to_balance: BalanceWithDust::new_unchecked::<Test>(0, plank - 5),
-			amount: BalanceWithDust::new_unchecked::<Test>(1, 10),
-			expected_from_balance: BalanceWithDust::new_unchecked::<Test>(98, plank - 5),
-			expected_to_balance: BalanceWithDust::new_unchecked::<Test>(2, 5),
-			total_issuance_diff: 0,
-		},
-		TestCase {
-			description: "with enough existing dust",
-			from_balance: BalanceWithDust::new_unchecked::<Test>(100, 10),
-			to_balance: BalanceWithDust::new_unchecked::<Test>(0, plank - 10),
-			amount: BalanceWithDust::new_unchecked::<Test>(1, 10),
-			expected_from_balance: BalanceWithDust::new_unchecked::<Test>(99, 0),
-			expected_to_balance: BalanceWithDust::new_unchecked::<Test>(2, 0),
-			total_issuance_diff: -1,
-		},
-		TestCase {
-			description: "receiver dust less than 1 plank",
-			from_balance: BalanceWithDust::new_unchecked::<Test>(100, plank / 10),
-			to_balance: BalanceWithDust::new_unchecked::<Test>(0, plank / 2),
-			amount: BalanceWithDust::new_unchecked::<Test>(1, plank / 10 * 3),
-			expected_from_balance: BalanceWithDust::new_unchecked::<Test>(98, plank / 10 * 8),
-			expected_to_balance: BalanceWithDust::new_unchecked::<Test>(1, plank / 10 * 8),
-			total_issuance_diff: 1,
-		},
-	];
-
-	for TestCase {
-		description,
-		from_balance,
-		to_balance,
-		amount,
-		expected_from_balance,
-		expected_to_balance,
-		total_issuance_diff,
-	} in test_cases.into_iter()
-	{
-		ExtBuilder::default().build().execute_with(|| {
-			test_utils::set_balance_with_dust(&ALICE_ADDR, from_balance);
-			test_utils::set_balance_with_dust(&BOB_ADDR, to_balance);
-
-			let total_issuance = <Test as Config>::Currency::total_issuance();
-			let evm_value = Pallet::<Test>::convert_native_to_evm(amount);
-
-			let (value, dust) = amount.deconstruct();
-			assert_eq!(Pallet::<Test>::has_dust(evm_value), !dust.is_zero());
-			assert_eq!(Pallet::<Test>::has_balance(evm_value), !value.is_zero());
-
-			let result =
-				builder::bare_call(BOB_ADDR).evm_value(evm_value).build_and_unwrap_result();
-			assert_eq!(result, Default::default(), "{description} tx failed");
-
-			assert_eq!(
-				Pallet::<Test>::evm_balance(&ALICE_ADDR),
-				Pallet::<Test>::convert_native_to_evm(expected_from_balance),
-				"{description}: invalid from balance"
-			);
-
-			assert_eq!(
-				Pallet::<Test>::evm_balance(&BOB_ADDR),
-				Pallet::<Test>::convert_native_to_evm(expected_to_balance),
-				"{description}: invalid to balance"
-			);
-
-			assert_eq!(
-				total_issuance as i64 - total_issuance_diff,
-				<Test as Config>::Currency::total_issuance() as i64,
-				"{description}: total issuance should match"
-			);
-		});
-	}
-}
-
-#[test]
-fn eth_call_transfer_with_dust_works() {
-	let (binary, _) = compile_module("dummy").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
-
-		let balance =
-			Pallet::<Test>::convert_native_to_evm(BalanceWithDust::new_unchecked::<Test>(100, 10));
-		assert_ok!(builder::eth_call(addr).value(balance).build());
-
-		assert_eq!(Pallet::<Test>::evm_balance(&addr), balance);
-	});
-}
-
-#[test]
-fn contract_call_transfer_with_dust_works() {
-	let (binary_caller, _code_hash_caller) = compile_module("call_with_value").unwrap();
-	let (binary_callee, _code_hash_callee) = compile_module("dummy").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let Contract { addr: addr_caller, .. } =
-			builder::bare_instantiate(Code::Upload(binary_caller))
-				.native_value(200)
-				.build_and_unwrap_contract();
-		let Contract { addr: addr_callee, .. } =
-			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
-
-		let balance =
-			Pallet::<Test>::convert_native_to_evm(BalanceWithDust::new_unchecked::<Test>(100, 10));
-		assert_ok!(builder::call(addr_caller).data((balance, addr_callee).encode()).build());
-
-		assert_eq!(Pallet::<Test>::evm_balance(&addr_callee), balance);
-	});
-}
-
-#[test]
-fn deposit_limit_enforced_on_plain_transfer() {
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let _ = <Test as Config>::Currency::set_balance(&BOB, 1_000_000);
-
-		// sending balance to a new account should fail when the limit is lower than the ed
-		let result = builder::bare_call(CHARLIE_ADDR)
-			.native_value(1)
-			.storage_deposit_limit(190.into())
-			.build();
-		assert_err!(result.result, <Error<Test>>::StorageDepositLimitExhausted);
-		assert_eq!(result.storage_deposit, StorageDeposit::Charge(0));
-		assert_eq!(test_utils::get_balance(&CHARLIE), 0);
-
-		// works when the account is prefunded
-		let result = builder::bare_call(BOB_ADDR)
-			.native_value(1)
-			.storage_deposit_limit(0.into())
-			.build();
-		assert_ok!(result.result);
-		assert_eq!(result.storage_deposit, StorageDeposit::Charge(0));
-		assert_eq!(test_utils::get_balance(&BOB), 1_000_001);
-
-		// also works allowing enough deposit
-		let result = builder::bare_call(CHARLIE_ADDR)
-			.native_value(1)
-			.storage_deposit_limit(200.into())
-			.build();
-		assert_ok!(result.result);
-		assert_eq!(result.storage_deposit, StorageDeposit::Charge(200));
-		assert_eq!(test_utils::get_balance(&CHARLIE), 201);
-	});
-}
-
-#[test]
-fn instantiate_and_call_and_deposit_event() {
-	let (binary, code_hash) = compile_module("event_and_return_on_deploy").unwrap();
-
-	ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let min_balance = Contracts::min_balance();
-		let value = 100;
-
-		// We determine the storage deposit limit after uploading because it depends on ALICEs
-		// free balance which is changed by uploading a module.
-		assert_ok!(Contracts::upload_code(
-			RuntimeOrigin::signed(ALICE),
-			binary,
-			deposit_limit::<Test>(),
-		));
-
-		// Drop previous events
-		initialize_block(2);
-
-		// Check at the end to get hash on error easily
-		let Contract { addr, account_id } = builder::bare_instantiate(Code::Existing(code_hash))
-			.native_value(value)
-			.build_and_unwrap_contract();
-		assert!(AccountInfoOf::<Test>::contains_key(&addr));
-
-		let hold_balance = test_utils::contract_base_deposit(&addr);
-
-		assert_eq!(
-			System::events(),
-			vec![
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::System(frame_system::Event::NewAccount {
-						account: account_id.clone()
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::Endowed {
-						account: account_id.clone(),
-						free_balance: min_balance,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
-						from: ALICE,
-						to: account_id.clone(),
-						amount: min_balance,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
-						from: ALICE,
-						to: account_id.clone(),
-						amount: value,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Contracts(crate::Event::ContractEmitted {
-						contract: addr,
-						data: vec![1, 2, 3, 4],
-						topics: vec![H256::repeat_byte(42)],
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Contracts(crate::Event::Instantiated {
-						deployer: ALICE_ADDR,
-						contract: addr
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::TransferAndHold {
-						reason: <Test as Config>::RuntimeHoldReason::Contracts(
-							HoldReason::StorageDepositReserve,
-						),
-						source: ALICE,
-						dest: account_id.clone(),
-						transferred: hold_balance,
-					}),
-					topics: vec![],
-				},
-			]
-		);
-	});
-}
-
-#[test]
-fn create1_address_from_extrinsic() {
-	let (binary, code_hash) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		assert_ok!(Contracts::upload_code(
-			RuntimeOrigin::signed(ALICE),
-			binary.clone(),
-			deposit_limit::<Test>(),
-		));
-
-		assert_eq!(System::account_nonce(&ALICE), 0);
-		System::inc_account_nonce(&ALICE);
-
-		for nonce in 1..3 {
-			let Contract { addr, .. } = builder::bare_instantiate(Code::Existing(code_hash))
-				.salt(None)
-				.build_and_unwrap_contract();
-			assert!(AccountInfoOf::<Test>::contains_key(&addr));
-			assert_eq!(
-				addr,
-				create1(&<Test as Config>::AddressMapper::to_address(&ALICE), nonce - 1)
-			);
-		}
-		assert_eq!(System::account_nonce(&ALICE), 3);
-
-		for nonce in 3..6 {
-			let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary.clone()))
-				.salt(None)
-				.build_and_unwrap_contract();
-			assert!(AccountInfoOf::<Test>::contains_key(&addr));
-			assert_eq!(
-				addr,
-				create1(&<Test as Config>::AddressMapper::to_address(&ALICE), nonce - 1)
-			);
-		}
-		assert_eq!(System::account_nonce(&ALICE), 6);
-	});
-}
-
-#[test]
-fn deposit_event_max_value_limit() {
-	let (binary, _code_hash) = compile_module("event_size").unwrap();
-
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		// Create
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.native_value(30_000)
-			.build_and_unwrap_contract();
-
-		// Call contract with allowed storage value.
-		assert_ok!(builder::call(addr)
-			.gas_limit(GAS_LIMIT.set_ref_time(GAS_LIMIT.ref_time() * 2)) // we are copying a huge buffer,
-			.data(limits::PAYLOAD_BYTES.encode())
-			.build());
-
-		// Call contract with too large a storage value.
-		assert_err_ignore_postinfo!(
-			builder::call(addr).data((limits::PAYLOAD_BYTES + 1).encode()).build(),
-			Error::<Test>::ValueTooLarge,
-		);
-	});
-}
-
-// Fail out of fuel (ref_time weight) in the engine.
-#[test]
-fn run_out_of_fuel_engine() {
-	let (binary, _code_hash) = compile_module("run_out_of_gas").unwrap();
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let min_balance = Contracts::min_balance();
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.native_value(100 * min_balance)
-			.build_and_unwrap_contract();
-
-		// Call the contract with a fixed gas limit. It must run out of gas because it just
-		// loops forever.
-		assert_err_ignore_postinfo!(
-			builder::call(addr)
-				.gas_limit(Weight::from_parts(10_000_000_000, u64::MAX))
-				.build(),
-			Error::<Test>::OutOfGas,
-		);
-	});
-}
-
-// Fail out of fuel (ref_time weight) in the host.
-#[test]
-fn run_out_of_fuel_host() {
-	use crate::precompiles::Precompile;
-	use alloy_core::sol_types::SolInterface;
-	use precompiles::{INoInfo, NoInfo};
-
-	let precompile_addr = H160(NoInfo::<Test>::MATCHER.base_address());
-	let input = INoInfo::INoInfoCalls::consumeMaxGas(INoInfo::consumeMaxGasCall {}).abi_encode();
-
-	ExtBuilder::default().build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-		let result = builder::bare_call(precompile_addr).data(input).build().result;
-		assert_err!(result, <Error<Test>>::OutOfGas);
-	});
-}
-
-#[test]
-fn gas_syncs_work() {
-	let (code, _code_hash) = compile_module("caller_is_origin_n").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let contract = builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		let result = builder::bare_call(contract.addr).data(0u32.encode()).build();
-		assert_ok!(result.result);
-		let engine_consumed_noop = result.gas_consumed.ref_time();
-
-		let result = builder::bare_call(contract.addr).data(1u32.encode()).build();
-		assert_ok!(result.result);
-		let gas_consumed_once = result.gas_consumed.ref_time();
-		let host_consumed_once = <Test as Config>::WeightInfo::seal_caller_is_origin().ref_time();
-		let engine_consumed_once = gas_consumed_once - host_consumed_once - engine_consumed_noop;
-
-		let result = builder::bare_call(contract.addr).data(2u32.encode()).build();
-		assert_ok!(result.result);
-		let gas_consumed_twice = result.gas_consumed.ref_time();
-		let host_consumed_twice = host_consumed_once * 2;
-		let engine_consumed_twice = gas_consumed_twice - host_consumed_twice - engine_consumed_noop;
-
-		// Second contract just repeats first contract's instructions twice.
-		// If runtime syncs gas with the engine properly, this should pass.
-		assert_eq!(engine_consumed_twice, engine_consumed_once * 2);
-	});
-}
-
-/// Check that contracts with the same account id have different trie ids.
-/// Check the `Nonce` storage item for more information.
-#[test]
-fn instantiate_unique_trie_id() {
-	let (binary, code_hash) = compile_module("self_destruct").unwrap();
-
-	ExtBuilder::default().existential_deposit(500).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		Contracts::upload_code(RuntimeOrigin::signed(ALICE), binary, deposit_limit::<Test>())
-			.unwrap();
-
-		// Instantiate the contract and store its trie id for later comparison.
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Existing(code_hash)).build_and_unwrap_contract();
-		let trie_id = get_contract(&addr).trie_id;
-
-		// Try to instantiate it again without termination should yield an error.
-		assert_err_ignore_postinfo!(
-			builder::instantiate(code_hash).build(),
-			<Error<Test>>::DuplicateContract,
-		);
-
-		// Terminate the contract.
-		assert_ok!(builder::call(addr).build());
-
-		// Re-Instantiate after termination.
-		assert_ok!(builder::instantiate(code_hash).build());
-
-		// Trie ids shouldn't match or we might have a collision
-		assert_ne!(trie_id, get_contract(&addr).trie_id);
-	});
-}
-
-#[test]
-fn storage_work() {
-	let (code, _code_hash) = compile_module("storage").unwrap();
-
-	ExtBuilder::default().build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let min_balance = Contracts::min_balance();
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-			.native_value(min_balance * 100)
-			.build_and_unwrap_contract();
-
-		builder::bare_call(addr).build_and_unwrap_result();
-	});
-}
-
-#[test]
-fn storage_max_value_limit() {
-	let (binary, _code_hash) = compile_module("storage_size").unwrap();
-
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		// Create
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.native_value(30_000)
-			.build_and_unwrap_contract();
-		get_contract(&addr);
-
-		// Call contract with allowed storage value.
-		assert_ok!(builder::call(addr)
-			.gas_limit(GAS_LIMIT.set_ref_time(GAS_LIMIT.ref_time() * 2)) // we are copying a huge buffer
-			.data(limits::PAYLOAD_BYTES.encode())
-			.build());
-
-		// Call contract with too large a storage value.
-		assert_err_ignore_postinfo!(
-			builder::call(addr).data((limits::PAYLOAD_BYTES + 1).encode()).build(),
-			Error::<Test>::ValueTooLarge,
-		);
-	});
-}
-
-#[test]
-fn clear_storage_on_zero_value() {
-	let (code, _code_hash) = compile_module("clear_storage_on_zero_value").unwrap();
-
-	ExtBuilder::default().build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let min_balance = Contracts::min_balance();
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-			.native_value(min_balance * 100)
-			.build_and_unwrap_contract();
-
-		builder::bare_call(addr).build_and_unwrap_result();
-	});
-}
-
-#[test]
-fn transient_storage_work() {
-	let (code, _code_hash) = compile_module("transient_storage").unwrap();
-
-	ExtBuilder::default().build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let min_balance = Contracts::min_balance();
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-			.native_value(min_balance * 100)
-			.build_and_unwrap_contract();
-
-		builder::bare_call(addr).build_and_unwrap_result();
-	});
-}
-
-#[test]
-fn transient_storage_limit_in_call() {
-	let (binary_caller, _code_hash_caller) =
-		compile_module("create_transient_storage_and_call").unwrap();
-	let (binary_callee, _code_hash_callee) = compile_module("set_transient_storage").unwrap();
-	ExtBuilder::default().build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Create both contracts: Constructors do nothing.
-		let Contract { addr: addr_caller, .. } =
-			builder::bare_instantiate(Code::Upload(binary_caller)).build_and_unwrap_contract();
-		let Contract { addr: addr_callee, .. } =
-			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
-
-		// Call contracts with storage values within the limit.
-		// Caller and Callee contracts each set a transient storage value of size 100.
-		assert_ok!(builder::call(addr_caller)
-			.data((100u32, 100u32, &addr_callee).encode())
-			.build(),);
-
-		// Call a contract with a storage value that is too large.
-		// Limit exceeded in the caller contract.
-		assert_err_ignore_postinfo!(
-			builder::call(addr_caller)
-				.data((4u32 * 1024u32, 200u32, &addr_callee).encode())
-				.build(),
-			<Error<Test>>::OutOfTransientStorage,
-		);
-
-		// Call a contract with a storage value that is too large.
-		// Limit exceeded in the callee contract.
-		assert_err_ignore_postinfo!(
-			builder::call(addr_caller)
-				.data((50u32, 4 * 1024u32, &addr_callee).encode())
-				.build(),
-			<Error<Test>>::ContractTrapped
-		);
-	});
-}
-
-#[test]
-fn deploy_and_call_other_contract() {
-	let (caller_binary, _caller_code_hash) = compile_module("caller_contract").unwrap();
-	let (callee_binary, callee_code_hash) = compile_module("return_with_data").unwrap();
-	let code_load_weight = crate::vm::code_load_weight(callee_binary.len() as u32);
-
-	ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
-		let min_balance = Contracts::min_balance();
-
-		// Create
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let Contract { addr: caller_addr, account_id: caller_account } =
-			builder::bare_instantiate(Code::Upload(caller_binary))
-				.native_value(100_000)
-				.build_and_unwrap_contract();
-
-		let callee_addr = create2(
-			&caller_addr,
-			&callee_binary,
-			&[0, 1, 34, 51, 68, 85, 102, 119], // hard coded in binary
-			&[0u8; 32],
-		);
-		let callee_account = <Test as Config>::AddressMapper::to_account_id(&callee_addr);
-
-		Contracts::upload_code(
-			RuntimeOrigin::signed(ALICE),
-			callee_binary,
-			deposit_limit::<Test>(),
-		)
-		.unwrap();
-
-		// Drop previous events
-		initialize_block(2);
-
-		// Call BOB contract, which attempts to instantiate and call the callee contract and
-		// makes various assertions on the results from those calls.
-		assert_ok!(builder::call(caller_addr)
-			.data(
-				(callee_code_hash, code_load_weight.ref_time(), code_load_weight.proof_size())
-					.encode()
-			)
-			.build());
-
-		assert_eq!(
-			System::events(),
-			vec![
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::System(frame_system::Event::NewAccount {
-						account: callee_account.clone()
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::Endowed {
-						account: callee_account.clone(),
-						free_balance: min_balance,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
-						from: ALICE,
-						to: callee_account.clone(),
-						amount: min_balance,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
-						from: caller_account.clone(),
-						to: callee_account.clone(),
-						amount: 32768 // hardcoded in binary
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
-						from: caller_account.clone(),
-						to: callee_account.clone(),
-						amount: 32768,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::TransferAndHold {
-						reason: <Test as Config>::RuntimeHoldReason::Contracts(
-							HoldReason::StorageDepositReserve,
-						),
-						source: ALICE,
-						dest: callee_account.clone(),
-						transferred: 555,
-					}),
-					topics: vec![],
-				},
-			]
-		);
-	});
-}
-
-#[test]
-fn delegate_call() {
-	let (caller_binary, _caller_code_hash) = compile_module("delegate_call").unwrap();
-	let (callee_binary, _callee_code_hash) = compile_module("delegate_call_lib").unwrap();
-
-	ExtBuilder::default().existential_deposit(500).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Instantiate the 'caller'
-		let Contract { addr: caller_addr, .. } =
-			builder::bare_instantiate(Code::Upload(caller_binary))
-				.native_value(300_000)
-				.build_and_unwrap_contract();
-
-		// Instantiate the 'callee'
-		let Contract { addr: callee_addr, .. } =
-			builder::bare_instantiate(Code::Upload(callee_binary))
-				.native_value(100_000)
-				.build_and_unwrap_contract();
-
-		assert_ok!(builder::call(caller_addr)
-			.value(1337)
-			.data((callee_addr, u64::MAX, u64::MAX).encode())
-			.build());
-	});
-}
-
-#[test]
-fn delegate_call_non_existant_is_noop() {
-	let (caller_binary, _caller_code_hash) = compile_module("delegate_call_simple").unwrap();
-
-	ExtBuilder::default().existential_deposit(500).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Instantiate the 'caller'
-		let Contract { addr: caller_addr, .. } =
-			builder::bare_instantiate(Code::Upload(caller_binary))
-				.native_value(300_000)
-				.build_and_unwrap_contract();
-
-		assert_ok!(builder::call(caller_addr)
-			.value(1337)
-			.data((BOB_ADDR, u64::MAX, u64::MAX).encode())
-			.build());
-
-		assert_eq!(test_utils::get_balance(&BOB_FALLBACK), 0);
-	});
-}
-
-#[test]
-fn delegate_call_with_weight_limit() {
-	let (caller_binary, _caller_code_hash) = compile_module("delegate_call").unwrap();
-	let (callee_binary, _callee_code_hash) = compile_module("delegate_call_lib").unwrap();
-
-	ExtBuilder::default().existential_deposit(500).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Instantiate the 'caller'
-		let Contract { addr: caller_addr, .. } =
-			builder::bare_instantiate(Code::Upload(caller_binary))
-				.native_value(300_000)
-				.build_and_unwrap_contract();
-
-		// Instantiate the 'callee'
-		let Contract { addr: callee_addr, .. } =
-			builder::bare_instantiate(Code::Upload(callee_binary))
-				.native_value(100_000)
-				.build_and_unwrap_contract();
-
-		// fails, not enough weight
-		assert_err!(
-			builder::bare_call(caller_addr)
-				.native_value(1337)
-				.data((callee_addr, 100u64, 100u64).encode())
-				.build()
-				.result,
-			Error::<Test>::ContractTrapped,
-		);
-
-		assert_ok!(builder::call(caller_addr)
-			.value(1337)
-			.data((callee_addr, 500_000_000u64, 100_000u64).encode())
-			.build());
-	});
-}
-
-#[test]
-fn delegate_call_with_deposit_limit() {
-	let (caller_binary, _caller_code_hash) = compile_module("delegate_call_deposit_limit").unwrap();
-	let (callee_binary, _callee_code_hash) = compile_module("delegate_call_lib").unwrap();
-
-	ExtBuilder::default().existential_deposit(500).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Instantiate the 'caller'
-		let Contract { addr: caller_addr, .. } =
-			builder::bare_instantiate(Code::Upload(caller_binary))
-				.native_value(300_000)
-				.build_and_unwrap_contract();
-
-		// Instantiate the 'callee'
-		let Contract { addr: callee_addr, .. } =
-			builder::bare_instantiate(Code::Upload(callee_binary))
-				.native_value(100_000)
-				.build_and_unwrap_contract();
-
-		// Delegate call will write 1 storage and deposit of 2 (1 item) + 32 (bytes) is required.
-		// + 32 + 16 for blake2_128concat
-		// Fails, not enough deposit
-		let ret = builder::bare_call(caller_addr)
-			.native_value(1337)
-			.data((callee_addr, 81u64).encode())
-			.build_and_unwrap_result();
-		assert_return_code!(ret, RuntimeReturnCode::OutOfResources);
-
-		assert_ok!(builder::call(caller_addr)
-			.value(1337)
-			.data((callee_addr, 82u64).encode())
-			.build());
-	});
-}
-
-#[test]
-fn transfer_expendable_cannot_kill_account() {
-	let (binary, _code_hash) = compile_module("dummy").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Instantiate the BOB contract.
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.native_value(1_000)
-			.build_and_unwrap_contract();
-
-		// Check that the BOB contract has been instantiated.
-		get_contract(&addr);
-
-		let account = <Test as Config>::AddressMapper::to_account_id(&addr);
-		let total_balance = <Test as Config>::Currency::total_balance(&account);
-
-		assert_eq!(
-			test_utils::get_balance_on_hold(&HoldReason::StorageDepositReserve.into(), &account),
-			test_utils::contract_base_deposit(&addr)
-		);
-
-		// Some or the total balance is held, so it can't be transferred.
-		assert_err!(
-			<<Test as Config>::Currency as Mutate<AccountId32>>::transfer(
-				&account,
-				&ALICE,
-				total_balance,
-				Preservation::Expendable,
-			),
-			TokenError::FundsUnavailable,
-		);
-
-		assert_eq!(<Test as Config>::Currency::total_balance(&account), total_balance);
-	});
-}
-
-#[test]
-fn cannot_self_destruct_through_draining() {
-	let (binary, _code_hash) = compile_module("drain").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let value = 1_000;
-		let min_balance = Contracts::min_balance();
-
-		// Instantiate the BOB contract.
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.native_value(value)
-			.build_and_unwrap_contract();
-		let account = <Test as Config>::AddressMapper::to_account_id(&addr);
-
-		// Check that the BOB contract has been instantiated.
-		get_contract(&addr);
-
-		// Call BOB which makes it send all funds to the zero address
-		// The contract code asserts that the transfer fails with the correct error code
-		assert_ok!(builder::call(addr).build());
-
-		// Make sure the account wasn't remove by sending all free balance away.
-		assert_eq!(
-			<Test as Config>::Currency::total_balance(&account),
-			value + test_utils::contract_base_deposit(&addr) + min_balance,
-		);
-	});
-}
-
-#[test]
-fn cannot_self_destruct_through_storage_refund_after_price_change() {
-	let (binary, _code_hash) = compile_module("store_call").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let min_balance = Contracts::min_balance();
-
-		// Instantiate the BOB contract.
-		let contract = builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
-		let info_deposit = test_utils::contract_base_deposit(&contract.addr);
-
-		// Check that the contract has been instantiated and has the minimum balance
-		assert_eq!(get_contract(&contract.addr).total_deposit(), info_deposit);
-		assert_eq!(get_contract(&contract.addr).extra_deposit(), 0);
-		assert_eq!(
-			<Test as Config>::Currency::total_balance(&contract.account_id),
-			info_deposit + min_balance
-		);
-
-		// Create 100 (16 + 32 bytes for key for blake128 concat) bytes of storage with a
-		// price of per byte and a single storage item of price 2
-		assert_ok!(builder::call(contract.addr).data(100u32.to_le_bytes().to_vec()).build());
-		assert_eq!(get_contract(&contract.addr).total_deposit(), info_deposit + 100 + 16 + 32 + 2);
-
-		// Increase the byte price and trigger a refund. This should not have any influence
-		// because the removal is pro rata and exactly those 100 bytes should have been
-		// removed as we didn't delete the key.
-		DEPOSIT_PER_BYTE.with(|c| *c.borrow_mut() = 500);
-		assert_ok!(builder::call(contract.addr).data(0u32.to_le_bytes().to_vec()).build());
-
-		// Make sure the account wasn't removed by the refund
-		assert_eq!(
-			<Test as Config>::Currency::total_balance(&contract.account_id),
-			get_contract(&contract.addr).total_deposit() + min_balance,
-		);
-		// + 1 because due to fixed point arithmetic we can sometimes refund
-		// one unit to little
-		assert_eq!(get_contract(&contract.addr).extra_deposit(), 16 + 32 + 2 + 1);
-	});
-}
-
-#[test]
-fn cannot_self_destruct_while_live() {
-	let (binary, _code_hash) = compile_module("self_destruct").unwrap();
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Instantiate the BOB contract.
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.native_value(100_000)
-			.build_and_unwrap_contract();
-
-		// Check that the BOB contract has been instantiated.
-		get_contract(&addr);
-
-		// Call BOB with input data, forcing it make a recursive call to itself to
-		// self-destruct, resulting in a trap.
-		assert_err_ignore_postinfo!(
-			builder::call(addr).data(vec![0]).build(),
-			Error::<Test>::ContractTrapped,
-		);
-
-		// Check that BOB is still there.
-		get_contract(&addr);
-	});
-}
-
-#[test]
-fn self_destruct_works() {
-	let (binary, code_hash) = compile_module("self_destruct").unwrap();
-	ExtBuilder::default().existential_deposit(1_000).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let _ = <Test as Config>::Currency::set_balance(&DJANGO_FALLBACK, 1_000_000);
-		let min_balance = Contracts::min_balance();
-
-		// Instantiate the BOB contract.
-		let contract = builder::bare_instantiate(Code::Upload(binary))
-			.native_value(100_000)
-			.build_and_unwrap_contract();
-
-		let hold_balance = test_utils::contract_base_deposit(&contract.addr);
-
-		// Check that the BOB contract has been instantiated.
-		let _ = get_contract(&contract.addr);
-
-		// Drop all previous events
-		initialize_block(2);
-
-		// Call BOB without input data which triggers termination.
-		assert_matches!(builder::call(contract.addr).build(), Ok(_));
-
-		// Check that code is still there but refcount dropped to zero.
-		assert_refcount!(&code_hash, 0);
-
-		// Check that account is gone
-		assert!(get_contract_checked(&contract.addr).is_none());
-		assert_eq!(<Test as Config>::Currency::total_balance(&contract.account_id), 0);
-
-		// Check that the beneficiary (django) got remaining balance.
-		assert_eq!(
-			<Test as Config>::Currency::free_balance(DJANGO_FALLBACK),
-			1_000_000 + 100_000 + min_balance
-		);
-
-		// Check that the Alice is missing Django's benefit. Within ALICE's total balance
-		// there's also the code upload deposit held.
-		assert_eq!(
-			<Test as Config>::Currency::total_balance(&ALICE),
-			1_000_000 - (100_000 + min_balance)
-		);
-
-		pretty_assertions::assert_eq!(
-			System::events(),
-			vec![
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::TransferOnHold {
-						reason: <Test as Config>::RuntimeHoldReason::Contracts(
-							HoldReason::StorageDepositReserve,
-						),
-						source: contract.account_id.clone(),
-						dest: ALICE,
-						amount: hold_balance,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::System(frame_system::Event::KilledAccount {
-						account: contract.account_id.clone()
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
-						from: contract.account_id.clone(),
-						to: DJANGO_FALLBACK,
-						amount: 100_000 + min_balance,
-					}),
-					topics: vec![],
-				},
-			],
-		);
-	});
-}
-
-// This tests that one contract cannot prevent another from self-destructing by sending it
-// additional funds after it has been drained.
-#[test]
-fn destroy_contract_and_transfer_funds() {
-	let (callee_binary, callee_code_hash) = compile_module("self_destruct").unwrap();
-	let (caller_binary, _caller_code_hash) = compile_module("destroy_and_transfer").unwrap();
-
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		// Create code hash for bob to instantiate
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		Contracts::upload_code(
-			RuntimeOrigin::signed(ALICE),
-			callee_binary.clone(),
-			deposit_limit::<Test>(),
-		)
-		.unwrap();
-
-		// This deploys the BOB contract, which in turn deploys the CHARLIE contract during
-		// construction.
-		let Contract { addr: addr_bob, .. } =
-			builder::bare_instantiate(Code::Upload(caller_binary))
-				.native_value(200_000)
-				.data(callee_code_hash.as_ref().to_vec())
-				.build_and_unwrap_contract();
-
-		// Check that the CHARLIE contract has been instantiated.
-		let salt = [47; 32]; // hard coded in fixture.
-		let addr_charlie = create2(&addr_bob, &callee_binary, &[], &salt);
-		get_contract(&addr_charlie);
-
-		// Call BOB, which calls CHARLIE, forcing CHARLIE to self-destruct.
-		assert_ok!(builder::call(addr_bob).data(addr_charlie.encode()).build());
-
-		// Check that CHARLIE has moved on to the great beyond (ie. died).
-		assert!(get_contract_checked(&addr_charlie).is_none());
-	});
-}
-
-#[test]
-fn cannot_self_destruct_in_constructor() {
-	let (binary, _) = compile_module("self_destructing_constructor").unwrap();
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Fail to instantiate the BOB because the constructor calls seal_terminate.
-		assert_err_ignore_postinfo!(
-			builder::instantiate_with_code(binary).value(100_000).build(),
-			Error::<Test>::TerminatedInConstructor,
-		);
-	});
-}
-
-#[test]
-fn crypto_hashes() {
-	let (binary, _code_hash) = compile_module("crypto_hashes").unwrap();
-
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Instantiate the CRYPTO_HASHES contract.
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.native_value(100_000)
-			.build_and_unwrap_contract();
-		// Perform the call.
-		let input = b"_DEAD_BEEF";
-		use sp_io::hashing::*;
-		// Wraps a hash function into a more dynamic form usable for testing.
-		macro_rules! dyn_hash_fn {
-			($name:ident) => {
-				Box::new(|input| $name(input).as_ref().to_vec().into_boxed_slice())
-			};
-		}
-		// All hash functions and their associated output byte lengths.
-		let test_cases: &[(u8, Box<dyn Fn(&[u8]) -> Box<[u8]>>, usize)] =
-			&[(2, dyn_hash_fn!(keccak_256), 32), (4, dyn_hash_fn!(blake2_128), 16)];
-		// Test the given hash functions for the input: "_DEAD_BEEF"
-		for (n, hash_fn, expected_size) in test_cases.iter() {
-			let mut params = vec![*n];
-			params.extend_from_slice(input);
-			let result = builder::bare_call(addr).data(params).build_and_unwrap_result();
-			assert!(!result.did_revert());
-			let expected = hash_fn(input.as_ref());
-			assert_eq!(&result.data[..*expected_size], &*expected);
-		}
-	})
-}
-
-#[test]
-fn transfer_return_code() {
-	let (binary, _code_hash) = compile_module("transfer_return_code").unwrap();
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let min_balance = Contracts::min_balance();
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
-
-		let contract = builder::bare_instantiate(Code::Upload(binary))
-			.native_value(min_balance * 100)
-			.build_and_unwrap_contract();
-
-		// Contract has only the minimal balance so any transfer will fail.
-		<Test as Config>::Currency::set_balance(&contract.account_id, min_balance);
-		let result = builder::bare_call(contract.addr).build_and_unwrap_result();
-		assert_return_code!(result, RuntimeReturnCode::TransferFailed);
-	});
-}
-
-#[test]
-fn call_return_code() {
-	use test_utils::u256_bytes;
-
-	let (caller_code, _caller_hash) = compile_module("call_return_code").unwrap();
-	let (callee_code, _callee_hash) = compile_module("ok_trap_revert").unwrap();
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let min_balance = Contracts::min_balance();
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
-		let _ = <Test as Config>::Currency::set_balance(&CHARLIE, 1000 * min_balance);
-
-		let bob = builder::bare_instantiate(Code::Upload(caller_code))
-			.native_value(min_balance * 100)
-			.build_and_unwrap_contract();
-
-		// BOB cannot pay the ed which is needed to pull DJANGO into existence
-		// this does trap the caller instead of returning an error code
-		// reasoning is that this error state does not exist on eth where
-		// ed does not exist. We hide this fact from the contract.
-		let result = builder::bare_call(bob.addr)
-			.data((DJANGO_ADDR, u256_bytes(1)).encode())
-			.origin(RuntimeOrigin::signed(BOB))
-			.build();
-		assert_err!(result.result, <Error<Test>>::StorageDepositNotEnoughFunds);
-
-		// Contract calls into Django which is no valid contract
-		// This will be a balance transfer into a new account
-		// with more than the contract has which will make the transfer fail
-		let value = Pallet::<Test>::convert_native_to_evm(min_balance * 200);
-		let result = builder::bare_call(bob.addr)
-			.data(
-				AsRef::<[u8]>::as_ref(&DJANGO_ADDR)
-					.iter()
-					.chain(&value.to_little_endian())
-					.cloned()
-					.collect(),
-			)
-			.build_and_unwrap_result();
-		assert_return_code!(result, RuntimeReturnCode::TransferFailed);
-
-		// Sending below the minimum balance should result in success.
-		// The ED is charged from the call origin.
-		let alice_before = test_utils::get_balance(&ALICE_FALLBACK);
-		assert_eq!(test_utils::get_balance(&DJANGO_FALLBACK), 0);
-
-		let value = Pallet::<Test>::convert_native_to_evm(1u64);
-		let result = builder::bare_call(bob.addr)
-			.data(
-				AsRef::<[u8]>::as_ref(&DJANGO_ADDR)
-					.iter()
-					.chain(&value.to_little_endian())
-					.cloned()
-					.collect(),
-			)
-			.build_and_unwrap_result();
-		assert_return_code!(result, RuntimeReturnCode::Success);
-		assert_eq!(test_utils::get_balance(&DJANGO_FALLBACK), min_balance + 1);
-		assert_eq!(test_utils::get_balance(&ALICE_FALLBACK), alice_before - min_balance);
-
-		let django = builder::bare_instantiate(Code::Upload(callee_code))
-			.origin(RuntimeOrigin::signed(CHARLIE))
-			.native_value(min_balance * 100)
-			.build_and_unwrap_contract();
-
-		// Sending more than the contract has will make the transfer fail.
-		let value = Pallet::<Test>::convert_native_to_evm(min_balance * 300);
-		let result = builder::bare_call(bob.addr)
-			.data(
-				AsRef::<[u8]>::as_ref(&django.addr)
-					.iter()
-					.chain(&value.to_little_endian())
-					.chain(&0u32.to_le_bytes())
-					.cloned()
-					.collect(),
-			)
-			.build_and_unwrap_result();
-		assert_return_code!(result, RuntimeReturnCode::TransferFailed);
-
-		// Contract has enough balance but callee reverts because "1" is passed.
-		<Test as Config>::Currency::set_balance(&bob.account_id, min_balance + 1000);
-		let value = Pallet::<Test>::convert_native_to_evm(5u64);
-		let result = builder::bare_call(bob.addr)
-			.data(
-				AsRef::<[u8]>::as_ref(&django.addr)
-					.iter()
-					.chain(&value.to_little_endian())
-					.chain(&1u32.to_le_bytes())
-					.cloned()
-					.collect(),
-			)
-			.build_and_unwrap_result();
-		assert_return_code!(result, RuntimeReturnCode::CalleeReverted);
-
-		// Contract has enough balance but callee traps because "2" is passed.
-		let result = builder::bare_call(bob.addr)
-			.data(
-				AsRef::<[u8]>::as_ref(&django.addr)
-					.iter()
-					.chain(&value.to_little_endian())
-					.chain(&2u32.to_le_bytes())
-					.cloned()
-					.collect(),
-			)
-			.build_and_unwrap_result();
-		assert_return_code!(result, RuntimeReturnCode::CalleeTrapped);
-	});
-}
-
-#[test]
-fn instantiate_return_code() {
-	let (caller_code, _caller_hash) = compile_module("instantiate_return_code").unwrap();
-	let (callee_code, callee_hash) = compile_module("ok_trap_revert").unwrap();
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let min_balance = Contracts::min_balance();
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
-		let _ = <Test as Config>::Currency::set_balance(&CHARLIE, 1000 * min_balance);
-		let callee_hash = callee_hash.as_ref().to_vec();
-
-		assert_ok!(builder::instantiate_with_code(callee_code).value(min_balance * 100).build());
-
-		let contract = builder::bare_instantiate(Code::Upload(caller_code))
-			.native_value(min_balance * 100)
-			.build_and_unwrap_contract();
-
-		// bob cannot pay the ED to create the contract as he has no money
-		// this traps the caller rather than returning an error
-		let result = builder::bare_call(contract.addr)
-			.data(callee_hash.iter().chain(&0u32.to_le_bytes()).cloned().collect())
-			.origin(RuntimeOrigin::signed(BOB))
-			.build();
-		assert_err!(result.result, <Error<Test>>::StorageDepositNotEnoughFunds);
-
-		// Contract has only the minimal balance so any transfer will fail.
-		<Test as Config>::Currency::set_balance(&contract.account_id, min_balance);
-		let result = builder::bare_call(contract.addr)
-			.data(callee_hash.iter().chain(&0u32.to_le_bytes()).cloned().collect())
-			.build_and_unwrap_result();
-		assert_return_code!(result, RuntimeReturnCode::TransferFailed);
-
-		// Contract has enough balance but the passed code hash is invalid
-		<Test as Config>::Currency::set_balance(&contract.account_id, min_balance + 10_000);
-		let result = builder::bare_call(contract.addr).data(vec![0; 36]).build();
-		assert_err!(result.result, <Error<Test>>::CodeNotFound);
-
-		// Contract has enough balance but callee reverts because "1" is passed.
-		let result = builder::bare_call(contract.addr)
-			.data(callee_hash.iter().chain(&1u32.to_le_bytes()).cloned().collect())
-			.build_and_unwrap_result();
-		assert_return_code!(result, RuntimeReturnCode::CalleeReverted);
-
-		// Contract has enough balance but callee traps because "2" is passed.
-		let result = builder::bare_call(contract.addr)
-			.data(callee_hash.iter().chain(&2u32.to_le_bytes()).cloned().collect())
-			.build_and_unwrap_result();
-		assert_return_code!(result, RuntimeReturnCode::CalleeTrapped);
-
-		// Contract instantiation succeeds
-		let result = builder::bare_call(contract.addr)
-			.data(callee_hash.iter().chain(&0u32.to_le_bytes()).cloned().collect())
-			.build_and_unwrap_result();
-		assert_return_code!(result, 0);
-
-		// Contract instantiation fails because the same salt is being used again.
-		let result = builder::bare_call(contract.addr)
-			.data(callee_hash.iter().chain(&0u32.to_le_bytes()).cloned().collect())
-			.build_and_unwrap_result();
-		assert_return_code!(result, RuntimeReturnCode::DuplicateContractAddress);
-	});
-}
-
-#[test]
-fn lazy_removal_works() {
-	let (code, _hash) = compile_module("self_destruct").unwrap();
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let min_balance = Contracts::min_balance();
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
-
-		let contract = builder::bare_instantiate(Code::Upload(code))
-			.native_value(min_balance * 100)
-			.build_and_unwrap_contract();
-
-		let info = get_contract(&contract.addr);
-		let trie = &info.child_trie_info();
-
-		// Put value into the contracts child trie
-		child::put(trie, &[99], &42);
-
-		// Terminate the contract
-		assert_ok!(builder::call(contract.addr).build());
-
-		// Contract info should be gone
-		assert!(!<AccountInfoOf::<Test>>::contains_key(&contract.addr));
-
-		// But value should be still there as the lazy removal did not run, yet.
-		assert_matches!(child::get(trie, &[99]), Some(42));
-
-		// Run the lazy removal
-		Contracts::on_idle(System::block_number(), Weight::MAX);
-
-		// Value should be gone now
-		assert_matches!(child::get::<i32>(trie, &[99]), None);
-	});
-}
-
-#[test]
-fn lazy_batch_removal_works() {
-	let (code, _hash) = compile_module("self_destruct").unwrap();
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let min_balance = Contracts::min_balance();
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
-		let mut tries: Vec<child::ChildInfo> = vec![];
-
-		for i in 0..3u8 {
-			let contract = builder::bare_instantiate(Code::Upload(code.clone()))
-				.native_value(min_balance * 100)
-				.salt(Some([i; 32]))
-				.build_and_unwrap_contract();
-
-			let info = get_contract(&contract.addr);
-			let trie = &info.child_trie_info();
-
-			// Put value into the contracts child trie
-			child::put(trie, &[99], &42);
-
-			// Terminate the contract. Contract info should be gone, but value should be still
-			// there as the lazy removal did not run, yet.
-			assert_ok!(builder::call(contract.addr).build());
-
-			assert!(!<AccountInfoOf::<Test>>::contains_key(&contract.addr));
-			assert_matches!(child::get(trie, &[99]), Some(42));
-
-			tries.push(trie.clone())
-		}
-
-		// Run single lazy removal
-		Contracts::on_idle(System::block_number(), Weight::MAX);
-
-		// The single lazy removal should have removed all queued tries
-		for trie in tries.iter() {
-			assert_matches!(child::get::<i32>(trie, &[99]), None);
-		}
-	});
-}
-
-#[test]
-fn ref_time_left_api_works() {
-	let (code, _) = compile_module("ref_time_left").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Create fixture: Constructor calls ref_time_left twice and asserts it to decrease
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		// Call the contract: It echoes back the ref_time returned by the ref_time_left API.
-		let received = builder::bare_call(addr).build_and_unwrap_result();
-		assert_eq!(received.flags, ReturnFlags::empty());
-
-		let returned_value = u64::from_le_bytes(received.data[..8].try_into().unwrap());
-		assert!(returned_value > 0);
-		assert!(returned_value < GAS_LIMIT.ref_time());
-	});
-}
-
-#[test]
-fn lazy_removal_partial_remove_works() {
-	let (code, _hash) = compile_module("self_destruct").unwrap();
-
-	// We create a contract with some extra keys above the weight limit
-	let extra_keys = 7u32;
-	let mut meter = WeightMeter::with_limit(Weight::from_parts(5_000_000_000, 100 * 1024));
-	let (weight_per_key, max_keys) = ContractInfo::<Test>::deletion_budget(&meter);
-	let vals: Vec<_> = (0..max_keys + extra_keys)
-		.map(|i| (blake2_256(&i.encode()), (i as u32), (i as u32).encode()))
-		.collect();
-
-	let mut ext = ExtBuilder::default().existential_deposit(50).build();
-
-	let trie = ext.execute_with(|| {
-		let min_balance = Contracts::min_balance();
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
-
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-			.native_value(min_balance * 100)
-			.build_and_unwrap_contract();
-
-		let info = get_contract(&addr);
-
-		// Put value into the contracts child trie
-		for val in &vals {
-			info.write(&Key::Fix(val.0), Some(val.2.clone()), None, false).unwrap();
-		}
-		AccountInfo::<Test>::insert_contract(&addr, info.clone());
-
-		// Terminate the contract
-		assert_ok!(builder::call(addr).build());
-
-		// Contract info should be gone
-		assert!(!<AccountInfoOf::<Test>>::contains_key(&addr));
-
-		let trie = info.child_trie_info();
-
-		// But value should be still there as the lazy removal did not run, yet.
-		for val in &vals {
-			assert_eq!(child::get::<u32>(&trie, &blake2_256(&val.0)), Some(val.1));
-		}
-
-		trie.clone()
-	});
-
-	// The lazy removal limit only applies to the backend but not to the overlay.
-	// This commits all keys from the overlay to the backend.
-	ext.commit_all().unwrap();
-
-	ext.execute_with(|| {
-		// Run the lazy removal
-		ContractInfo::<Test>::process_deletion_queue_batch(&mut meter);
-
-		// Weight should be exhausted because we could not even delete all keys
-		assert!(!meter.can_consume(weight_per_key));
-
-		let mut num_deleted = 0u32;
-		let mut num_remaining = 0u32;
-
-		for val in &vals {
-			match child::get::<u32>(&trie, &blake2_256(&val.0)) {
-				None => num_deleted += 1,
-				Some(x) if x == val.1 => num_remaining += 1,
-				Some(_) => panic!("Unexpected value in contract storage"),
-			}
-		}
-
-		// All but one key is removed
-		assert_eq!(num_deleted + num_remaining, vals.len() as u32);
-		assert_eq!(num_deleted, max_keys);
-		assert_eq!(num_remaining, extra_keys);
-	});
-}
-
-#[test]
-fn lazy_removal_does_no_run_on_low_remaining_weight() {
-	let (code, _hash) = compile_module("self_destruct").unwrap();
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let min_balance = Contracts::min_balance();
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
-
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-			.native_value(min_balance * 100)
-			.build_and_unwrap_contract();
-
-		let info = get_contract(&addr);
-		let trie = &info.child_trie_info();
-
-		// Put value into the contracts child trie
-		child::put(trie, &[99], &42);
-
-		// Terminate the contract
-		assert_ok!(builder::call(addr).build());
-
-		// Contract info should be gone
-		assert!(!<AccountInfoOf::<Test>>::contains_key(&addr));
-
-		// But value should be still there as the lazy removal did not run, yet.
-		assert_matches!(child::get(trie, &[99]), Some(42));
-
-		// Assign a remaining weight which is too low for a successful deletion of the contract
-		let low_remaining_weight =
-			<<Test as Config>::WeightInfo as WeightInfo>::on_process_deletion_queue_batch();
-
-		// Run the lazy removal
-		Contracts::on_idle(System::block_number(), low_remaining_weight);
-
-		// Value should still be there, since remaining weight was too low for removal
-		assert_matches!(child::get::<i32>(trie, &[99]), Some(42));
-
-		// Run the lazy removal while deletion_queue is not full
-		Contracts::on_initialize(System::block_number());
-
-		// Value should still be there, since deletion_queue was not full
-		assert_matches!(child::get::<i32>(trie, &[99]), Some(42));
-
-		// Run on_idle with max remaining weight, this should remove the value
-		Contracts::on_idle(System::block_number(), Weight::MAX);
-
-		// Value should be gone
-		assert_matches!(child::get::<i32>(trie, &[99]), None);
-	});
-}
-
-#[test]
-fn lazy_removal_does_not_use_all_weight() {
-	let (code, _hash) = compile_module("self_destruct").unwrap();
-
-	let mut meter = WeightMeter::with_limit(Weight::from_parts(5_000_000_000, 100 * 1024));
-	let mut ext = ExtBuilder::default().existential_deposit(50).build();
-
-	let (trie, vals, weight_per_key) = ext.execute_with(|| {
-		let min_balance = Contracts::min_balance();
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
-
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-			.native_value(min_balance * 100)
-			.build_and_unwrap_contract();
-
-		let info = get_contract(&addr);
-		let (weight_per_key, max_keys) = ContractInfo::<Test>::deletion_budget(&meter);
-		assert!(max_keys > 0);
-
-		// We create a contract with one less storage item than we can remove within the limit
-		let vals: Vec<_> = (0..max_keys - 1)
-			.map(|i| (blake2_256(&i.encode()), (i as u32), (i as u32).encode()))
-			.collect();
-
-		// Put value into the contracts child trie
-		for val in &vals {
-			info.write(&Key::Fix(val.0), Some(val.2.clone()), None, false).unwrap();
-		}
-		AccountInfo::<Test>::insert_contract(&addr, info.clone());
-
-		// Terminate the contract
-		assert_ok!(builder::call(addr).build());
-
-		// Contract info should be gone
-		assert!(!<AccountInfoOf::<Test>>::contains_key(&addr));
-
-		let trie = info.child_trie_info();
-
-		// But value should be still there as the lazy removal did not run, yet.
-		for val in &vals {
-			assert_eq!(child::get::<u32>(&trie, &blake2_256(&val.0)), Some(val.1));
-		}
-
-		(trie, vals, weight_per_key)
-	});
-
-	// The lazy removal limit only applies to the backend but not to the overlay.
-	// This commits all keys from the overlay to the backend.
-	ext.commit_all().unwrap();
-
-	ext.execute_with(|| {
-		// Run the lazy removal
-		ContractInfo::<Test>::process_deletion_queue_batch(&mut meter);
-		let base_weight =
-			<<Test as Config>::WeightInfo as WeightInfo>::on_process_deletion_queue_batch();
-		assert_eq!(meter.consumed(), weight_per_key.mul(vals.len() as _) + base_weight);
-
-		// All the keys are removed
-		for val in vals {
-			assert_eq!(child::get::<u32>(&trie, &blake2_256(&val.0)), None);
-		}
-	});
-}
-
-#[test]
-fn deletion_queue_ring_buffer_overflow() {
-	let (code, _hash) = compile_module("self_destruct").unwrap();
-	let mut ext = ExtBuilder::default().existential_deposit(50).build();
-
-	// setup the deletion queue with custom counters
-	ext.execute_with(|| {
-		let queue = DeletionQueueManager::from_test_values(u32::MAX - 1, u32::MAX - 1);
-		<DeletionQueueCounter<Test>>::set(queue);
-	});
-
-	// commit the changes to the storage
-	ext.commit_all().unwrap();
-
-	ext.execute_with(|| {
-		let min_balance = Contracts::min_balance();
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
-		let mut tries: Vec<child::ChildInfo> = vec![];
-
-		// add 3 contracts to the deletion queue
-		for i in 0..3u8 {
-			let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code.clone()))
-				.native_value(min_balance * 100)
-				.salt(Some([i; 32]))
-				.build_and_unwrap_contract();
-
-			let info = get_contract(&addr);
-			let trie = &info.child_trie_info();
-
-			// Put value into the contracts child trie
-			child::put(trie, &[99], &42);
-
-			// Terminate the contract. Contract info should be gone, but value should be still
-			// there as the lazy removal did not run, yet.
-			assert_ok!(builder::call(addr).build());
-
-			assert!(!<AccountInfoOf::<Test>>::contains_key(&addr));
-			assert_matches!(child::get(trie, &[99]), Some(42));
-
-			tries.push(trie.clone())
-		}
-
-		// Run single lazy removal
-		Contracts::on_idle(System::block_number(), Weight::MAX);
-
-		// The single lazy removal should have removed all queued tries
-		for trie in tries.iter() {
-			assert_matches!(child::get::<i32>(trie, &[99]), None);
-		}
-
-		// insert and delete counter values should go from u32::MAX - 1 to 1
-		assert_eq!(<DeletionQueueCounter<Test>>::get().as_test_tuple(), (1, 1));
-	})
-}
-#[test]
-fn refcounter() {
-	let (binary, code_hash) = compile_module("self_destruct").unwrap();
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let min_balance = Contracts::min_balance();
-
-		// Create two contracts with the same code and check that they do in fact share it.
-		let Contract { addr: addr0, .. } = builder::bare_instantiate(Code::Upload(binary.clone()))
-			.native_value(min_balance * 100)
-			.salt(Some([0; 32]))
-			.build_and_unwrap_contract();
-		let Contract { addr: addr1, .. } = builder::bare_instantiate(Code::Upload(binary.clone()))
-			.native_value(min_balance * 100)
-			.salt(Some([1; 32]))
-			.build_and_unwrap_contract();
-		assert_refcount!(code_hash, 2);
-
-		// Sharing should also work with the usual instantiate call
-		let Contract { addr: addr2, .. } = builder::bare_instantiate(Code::Existing(code_hash))
-			.native_value(min_balance * 100)
-			.salt(Some([2; 32]))
-			.build_and_unwrap_contract();
-		assert_refcount!(code_hash, 3);
-
-		// Terminating one contract should decrement the refcount
-		assert_ok!(builder::call(addr0).build());
-		assert_refcount!(code_hash, 2);
-
-		// remove another one
-		assert_ok!(builder::call(addr1).build());
-		assert_refcount!(code_hash, 1);
-
-		// Pristine code should still be there
-		PristineCode::<Test>::get(code_hash).unwrap();
-
-		// remove the last contract
-		assert_ok!(builder::call(addr2).build());
-		assert_refcount!(code_hash, 0);
-
-		// refcount is `0` but code should still exists because it needs to be removed manually
-		assert!(crate::PristineCode::<Test>::contains_key(&code_hash));
-	});
-}
-
-#[test]
-fn gas_estimation_for_subcalls() {
-	let (caller_code, _caller_hash) = compile_module("call_with_limit").unwrap();
-	let (dummy_code, _callee_hash) = compile_module("dummy").unwrap();
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let min_balance = Contracts::min_balance();
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 2_000 * min_balance);
-
-		let Contract { addr: addr_caller, .. } =
-			builder::bare_instantiate(Code::Upload(caller_code))
-				.native_value(min_balance * 100)
-				.build_and_unwrap_contract();
-
-		let Contract { addr: addr_dummy, .. } = builder::bare_instantiate(Code::Upload(dummy_code))
-			.native_value(min_balance * 100)
-			.build_and_unwrap_contract();
-
-		// Run the test for all of those weight limits for the subcall
-		let weights = [
-			Weight::MAX,
-			GAS_LIMIT,
-			GAS_LIMIT * 2,
-			GAS_LIMIT / 5,
-			Weight::from_parts(u64::MAX, GAS_LIMIT.proof_size()),
-			Weight::from_parts(GAS_LIMIT.ref_time(), u64::MAX),
-		];
-
-		let (sub_addr, sub_input) = (addr_dummy.as_ref(), vec![]);
-
-		for weight in weights {
-			let input: Vec<u8> = sub_addr
-				.iter()
-				.cloned()
-				.chain(weight.ref_time().to_le_bytes())
-				.chain(weight.proof_size().to_le_bytes())
-				.chain(sub_input.clone())
-				.collect();
-
-			// Call in order to determine the gas that is required for this call
-			let result_orig = builder::bare_call(addr_caller).data(input.clone()).build();
-			assert_ok!(&result_orig.result);
-			assert_eq!(result_orig.gas_required, result_orig.gas_consumed);
-
-			// Make the same call using the estimated gas. Should succeed.
-			let result = builder::bare_call(addr_caller)
-				.gas_limit(result_orig.gas_required)
-				.storage_deposit_limit(result_orig.storage_deposit.charge_or_zero().into())
-				.data(input.clone())
-				.build();
-			assert_ok!(&result.result);
-
-			// Check that it fails with too little ref_time
-			let result = builder::bare_call(addr_caller)
-				.gas_limit(result_orig.gas_required.sub_ref_time(1))
-				.storage_deposit_limit(result_orig.storage_deposit.charge_or_zero().into())
-				.data(input.clone())
-				.build();
-			assert_err!(result.result, <Error<Test>>::OutOfGas);
-
-			// Check that it fails with too little proof_size
-			let result = builder::bare_call(addr_caller)
-				.gas_limit(result_orig.gas_required.sub_proof_size(1))
-				.storage_deposit_limit(result_orig.storage_deposit.charge_or_zero().into())
-				.data(input.clone())
-				.build();
-			assert_err!(result.result, <Error<Test>>::OutOfGas);
-		}
-	});
-}
-
-#[test]
-fn call_runtime_reentrancy_guarded() {
-	use crate::precompiles::Precompile;
-	use alloy_core::sol_types::SolInterface;
-	use precompiles::{INoInfo, NoInfo};
-
-	let precompile_addr = H160(NoInfo::<Test>::MATCHER.base_address());
-
-	let (callee_code, _callee_hash) = compile_module("dummy").unwrap();
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let min_balance = Contracts::min_balance();
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
-		let _ = <Test as Config>::Currency::set_balance(&CHARLIE, 1000 * min_balance);
-
-		let Contract { addr: addr_callee, .. } =
-			builder::bare_instantiate(Code::Upload(callee_code))
-				.native_value(min_balance * 100)
-				.salt(Some([1; 32]))
-				.build_and_unwrap_contract();
-
-		// Call pallet_revive call() dispatchable
-		let call = RuntimeCall::Contracts(crate::Call::call {
-			dest: addr_callee,
-			value: 0,
-			gas_limit: GAS_LIMIT / 3,
-			storage_deposit_limit: deposit_limit::<Test>(),
-			data: vec![],
-		})
-		.encode();
-
-		// Call runtime to re-enter back to contracts engine by
-		// calling dummy contract
-		let result = builder::bare_call(precompile_addr)
-			.data(
-				INoInfo::INoInfoCalls::callRuntime(INoInfo::callRuntimeCall { call: call.into() })
-					.abi_encode(),
-			)
-			.build();
-		// Call to runtime should fail because of the re-entrancy guard
-		assert_err!(result.result, <Error<Test>>::ReenteredPallet);
-	});
-}
-
-#[test]
-fn sr25519_verify() {
-	let (binary, _code_hash) = compile_module("sr25519_verify").unwrap();
-
-	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Instantiate the sr25519_verify contract.
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.native_value(100_000)
-			.build_and_unwrap_contract();
-
-		let call_with = |message: &[u8; 11]| {
-			// Alice's signature for "hello world"
-			#[rustfmt::skip]
-			let signature: [u8; 64] = [
-				184, 49, 74, 238, 78, 165, 102, 252, 22, 92, 156, 176, 124, 118, 168, 116, 247,
-				99, 0, 94, 2, 45, 9, 170, 73, 222, 182, 74, 60, 32, 75, 64, 98, 174, 69, 55, 83,
-				85, 180, 98, 208, 75, 231, 57, 205, 62, 4, 105, 26, 136, 172, 17, 123, 99, 90, 255,
-				228, 54, 115, 63, 30, 207, 205, 131,
-			];
-
-			// Alice's public key
-			#[rustfmt::skip]
-			let public_key: [u8; 32] = [
-				212, 53, 147, 199, 21, 253, 211, 28, 97, 20, 26, 189, 4, 169, 159, 214, 130, 44,
-				133, 88, 133, 76, 205, 227, 154, 86, 132, 231, 165, 109, 162, 125,
-			];
-
-			let mut params = vec![];
-			params.extend_from_slice(&signature);
-			params.extend_from_slice(&public_key);
-			params.extend_from_slice(message);
-
-			builder::bare_call(addr).data(params).build_and_unwrap_result()
-		};
-
-		// verification should succeed for "hello world"
-		assert_return_code!(call_with(&b"hello world"), RuntimeReturnCode::Success);
-
-		// verification should fail for other messages
-		assert_return_code!(call_with(&b"hello worlD"), RuntimeReturnCode::Sr25519VerifyFailed);
-	});
-}
-
-#[test]
-fn upload_code_works() {
-	let (binary, code_hash) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Drop previous events
-		initialize_block(2);
-
-		assert!(!PristineCode::<Test>::contains_key(&code_hash));
-		assert_ok!(Contracts::upload_code(RuntimeOrigin::signed(ALICE), binary, 1_000,));
-		// Ensure the contract was stored and get expected deposit amount to be reserved.
-		expected_deposit(ensure_stored(code_hash));
-	});
-}
-
-#[test]
-fn upload_code_limit_too_low() {
-	let (binary, _code_hash) = compile_module("dummy").unwrap();
-	let deposit_expected = expected_deposit(binary.len());
-	let deposit_insufficient = deposit_expected.saturating_sub(1);
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Drop previous events
-		initialize_block(2);
-
-		assert_noop!(
-			Contracts::upload_code(RuntimeOrigin::signed(ALICE), binary, deposit_insufficient,),
-			<Error<Test>>::StorageDepositLimitExhausted,
-		);
-
-		assert_eq!(System::events(), vec![]);
-	});
-}
-
-#[test]
-fn upload_code_not_enough_balance() {
-	let (binary, _code_hash) = compile_module("dummy").unwrap();
-	let deposit_expected = expected_deposit(binary.len());
-	let deposit_insufficient = deposit_expected.saturating_sub(1);
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, deposit_insufficient);
-
-		// Drop previous events
-		initialize_block(2);
-
-		assert_noop!(
-			Contracts::upload_code(RuntimeOrigin::signed(ALICE), binary, 1_000,),
-			<Error<Test>>::StorageDepositNotEnoughFunds,
-		);
-
-		assert_eq!(System::events(), vec![]);
-	});
-}
-
-#[test]
-fn remove_code_works() {
-	let (binary, code_hash) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Drop previous events
-		initialize_block(2);
-
-		assert_ok!(Contracts::upload_code(RuntimeOrigin::signed(ALICE), binary, 1_000,));
-		// Ensure the contract was stored and get expected deposit amount to be reserved.
-		expected_deposit(ensure_stored(code_hash));
-		assert_ok!(Contracts::remove_code(RuntimeOrigin::signed(ALICE), code_hash));
-	});
-}
-
-#[test]
-fn remove_code_wrong_origin() {
-	let (binary, code_hash) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Drop previous events
-		initialize_block(2);
-
-		assert_ok!(Contracts::upload_code(RuntimeOrigin::signed(ALICE), binary, 1_000,));
-		// Ensure the contract was stored and get expected deposit amount to be reserved.
-		expected_deposit(ensure_stored(code_hash));
-
-		assert_noop!(
-			Contracts::remove_code(RuntimeOrigin::signed(BOB), code_hash),
-			sp_runtime::traits::BadOrigin,
-		);
-	});
-}
-
-#[test]
-fn remove_code_in_use() {
-	let (binary, code_hash) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		assert_ok!(builder::instantiate_with_code(binary).build());
-
-		// Drop previous events
-		initialize_block(2);
-
-		assert_noop!(
-			Contracts::remove_code(RuntimeOrigin::signed(ALICE), code_hash),
-			<Error<Test>>::CodeInUse,
-		);
-
-		assert_eq!(System::events(), vec![]);
-	});
-}
-
-#[test]
-fn remove_code_not_found() {
-	let (_binary, code_hash) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Drop previous events
-		initialize_block(2);
-
-		assert_noop!(
-			Contracts::remove_code(RuntimeOrigin::signed(ALICE), code_hash),
-			<Error<Test>>::CodeNotFound,
-		);
-
-		assert_eq!(System::events(), vec![]);
-	});
-}
-
-#[test]
-fn instantiate_with_zero_balance_works() {
-	let (binary, code_hash) = compile_module("dummy").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let min_balance = Contracts::min_balance();
-
-		// Drop previous events
-		initialize_block(2);
-
-		// Instantiate the BOB contract.
-		let Contract { addr, account_id } =
-			builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
-
-		// Ensure the contract was stored and get expected deposit amount to be reserved.
-		expected_deposit(ensure_stored(code_hash));
-
-		// Make sure the account exists even though no free balance was send
-		assert_eq!(<Test as Config>::Currency::free_balance(&account_id), min_balance);
-		assert_eq!(
-			<Test as Config>::Currency::total_balance(&account_id),
-			min_balance + test_utils::contract_base_deposit(&addr)
-		);
-
-		assert_eq!(
-			System::events(),
-			vec![
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::Held {
-						reason: <Test as Config>::RuntimeHoldReason::Contracts(
-							HoldReason::CodeUploadDepositReserve,
-						),
-						who: ALICE,
-						amount: 776,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::System(frame_system::Event::NewAccount {
-						account: account_id.clone(),
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::Endowed {
-						account: account_id.clone(),
-						free_balance: min_balance,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
-						from: ALICE,
-						to: account_id.clone(),
-						amount: min_balance,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Contracts(crate::Event::Instantiated {
-						deployer: ALICE_ADDR,
-						contract: addr,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::TransferAndHold {
-						reason: <Test as Config>::RuntimeHoldReason::Contracts(
-							HoldReason::StorageDepositReserve,
-						),
-						source: ALICE,
-						dest: account_id,
-						transferred: 336,
-					}),
-					topics: vec![],
-				},
-			]
-		);
-	});
-}
-
-#[test]
-fn instantiate_with_below_existential_deposit_works() {
-	let (binary, code_hash) = compile_module("dummy").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let min_balance = Contracts::min_balance();
-		let value = 50;
-
-		// Drop previous events
-		initialize_block(2);
-
-		// Instantiate the BOB contract.
-		let Contract { addr, account_id } = builder::bare_instantiate(Code::Upload(binary))
-			.native_value(value)
-			.build_and_unwrap_contract();
-
-		// Ensure the contract was stored and get expected deposit amount to be reserved.
-		expected_deposit(ensure_stored(code_hash));
-		// Make sure the account exists even though not enough free balance was send
-		assert_eq!(<Test as Config>::Currency::free_balance(&account_id), min_balance + value);
-		assert_eq!(
-			<Test as Config>::Currency::total_balance(&account_id),
-			min_balance + value + test_utils::contract_base_deposit(&addr)
-		);
-
-		assert_eq!(
-			System::events(),
-			vec![
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::Held {
-						reason: <Test as Config>::RuntimeHoldReason::Contracts(
-							HoldReason::CodeUploadDepositReserve,
-						),
-						who: ALICE,
-						amount: 776,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::System(frame_system::Event::NewAccount {
-						account: account_id.clone()
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::Endowed {
-						account: account_id.clone(),
-						free_balance: min_balance,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
-						from: ALICE,
-						to: account_id.clone(),
-						amount: min_balance,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
-						from: ALICE,
-						to: account_id.clone(),
-						amount: 50,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Contracts(crate::Event::Instantiated {
-						deployer: ALICE_ADDR,
-						contract: addr,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::TransferAndHold {
-						reason: <Test as Config>::RuntimeHoldReason::Contracts(
-							HoldReason::StorageDepositReserve,
-						),
-						source: ALICE,
-						dest: account_id.clone(),
-						transferred: 336,
-					}),
-					topics: vec![],
-				},
-			]
-		);
-	});
-}
-
-#[test]
-fn storage_deposit_works() {
-	let (binary, _code_hash) = compile_module("multi_store").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		let Contract { addr, account_id } =
-			builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
-
-		let mut deposit = test_utils::contract_base_deposit(&addr);
-
-		// Drop previous events
-		initialize_block(2);
-
-		// Create storage
-		assert_ok!(builder::call(addr).value(42).data((50u32, 20u32).encode()).build());
-		// 4 is for creating 2 storage items
-		// 48 is for each of the keys
-		let charged0 = 4 + 50 + 20 + 48 + 48;
-		deposit += charged0;
-		assert_eq!(get_contract(&addr).total_deposit(), deposit);
-
-		// Add more storage (but also remove some)
-		assert_ok!(builder::call(addr).data((100u32, 10u32).encode()).build());
-		let charged1 = 50 - 10;
-		deposit += charged1;
-		assert_eq!(get_contract(&addr).total_deposit(), deposit);
-
-		// Remove more storage (but also add some)
-		assert_ok!(builder::call(addr).data((10u32, 20u32).encode()).build());
-		// -1 for numeric instability
-		let refunded0 = 90 - 10 - 1;
-		deposit -= refunded0;
-		assert_eq!(get_contract(&addr).total_deposit(), deposit);
-
-		assert_eq!(
-			System::events(),
-			vec![
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
-						from: ALICE,
-						to: account_id.clone(),
-						amount: 42,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::TransferAndHold {
-						reason: <Test as Config>::RuntimeHoldReason::Contracts(
-							HoldReason::StorageDepositReserve,
-						),
-						source: ALICE,
-						dest: account_id.clone(),
-						transferred: charged0,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::TransferAndHold {
-						reason: <Test as Config>::RuntimeHoldReason::Contracts(
-							HoldReason::StorageDepositReserve,
-						),
-						source: ALICE,
-						dest: account_id.clone(),
-						transferred: charged1,
-					}),
-					topics: vec![],
-				},
-				EventRecord {
-					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::TransferOnHold {
-						reason: <Test as Config>::RuntimeHoldReason::Contracts(
-							HoldReason::StorageDepositReserve,
-						),
-						source: account_id.clone(),
-						dest: ALICE,
-						amount: refunded0,
-					}),
-					topics: vec![],
-				},
-			]
-		);
-	});
-}
-
-#[test]
-fn storage_deposit_callee_works() {
-	let (binary_caller, _code_hash_caller) = compile_module("call").unwrap();
-	let (binary_callee, _code_hash_callee) = compile_module("store_call").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Create both contracts: Constructors do nothing.
-		let Contract { addr: addr_caller, .. } =
-			builder::bare_instantiate(Code::Upload(binary_caller)).build_and_unwrap_contract();
-		let Contract { addr: addr_callee, .. } =
-			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
-
-		assert_ok!(builder::call(addr_caller).data((100u32, &addr_callee).encode()).build());
-
-		let callee = get_contract(&addr_callee);
-		let deposit = DepositPerByte::get() * 100 + DepositPerItem::get() * 1 + 48;
-
-		assert_eq!(Pallet::<Test>::evm_balance(&addr_caller), U256::zero());
-		assert_eq!(
-			callee.total_deposit(),
-			deposit + test_utils::contract_base_deposit(&addr_callee)
-		);
-	});
-}
-
-#[test]
-fn set_code_extrinsic() {
-	let (binary, code_hash) = compile_module("dummy").unwrap();
-	let (new_binary, new_code_hash) = compile_module("crypto_hashes").unwrap();
-
-	assert_ne!(code_hash, new_code_hash);
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
-
-		assert_ok!(Contracts::upload_code(
-			RuntimeOrigin::signed(ALICE),
-			new_binary,
-			deposit_limit::<Test>(),
-		));
-
-		// Drop previous events
-		initialize_block(2);
-
-		assert_eq!(get_contract(&addr).code_hash, code_hash);
-		assert_refcount!(&code_hash, 1);
-		assert_refcount!(&new_code_hash, 0);
-
-		// only root can execute this extrinsic
-		assert_noop!(
-			Contracts::set_code(RuntimeOrigin::signed(ALICE), addr, new_code_hash),
-			sp_runtime::traits::BadOrigin,
-		);
-		assert_eq!(get_contract(&addr).code_hash, code_hash);
-		assert_refcount!(&code_hash, 1);
-		assert_refcount!(&new_code_hash, 0);
-		assert_eq!(System::events(), vec![]);
-
-		// contract must exist
-		assert_noop!(
-			Contracts::set_code(RuntimeOrigin::root(), BOB_ADDR, new_code_hash),
-			<Error<Test>>::ContractNotFound,
-		);
-		assert_eq!(get_contract(&addr).code_hash, code_hash);
-		assert_refcount!(&code_hash, 1);
-		assert_refcount!(&new_code_hash, 0);
-		assert_eq!(System::events(), vec![]);
-
-		// new code hash must exist
-		assert_noop!(
-			Contracts::set_code(RuntimeOrigin::root(), addr, Default::default()),
-			<Error<Test>>::CodeNotFound,
-		);
-		assert_eq!(get_contract(&addr).code_hash, code_hash);
-		assert_refcount!(&code_hash, 1);
-		assert_refcount!(&new_code_hash, 0);
-		assert_eq!(System::events(), vec![]);
-
-		// successful call
-		assert_ok!(Contracts::set_code(RuntimeOrigin::root(), addr, new_code_hash));
-		assert_eq!(get_contract(&addr).code_hash, new_code_hash);
-		assert_refcount!(&code_hash, 0);
-		assert_refcount!(&new_code_hash, 1);
-	});
-}
-
-#[test]
-fn slash_cannot_kill_account() {
-	let (binary, _code_hash) = compile_module("dummy").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let value = 700;
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let min_balance = Contracts::min_balance();
-
-		let Contract { addr, account_id } = builder::bare_instantiate(Code::Upload(binary))
-			.native_value(value)
-			.build_and_unwrap_contract();
-
-		// Drop previous events
-		initialize_block(2);
-
-		let info_deposit = test_utils::contract_base_deposit(&addr);
-
-		assert_eq!(
-			test_utils::get_balance_on_hold(&HoldReason::StorageDepositReserve.into(), &account_id),
-			info_deposit
-		);
-
-		assert_eq!(
-			<Test as Config>::Currency::total_balance(&account_id),
-			info_deposit + value + min_balance
-		);
-
-		// Try to destroy the account of the contract by slashing the total balance.
-		// The account does not get destroyed because slashing only affects the balance held
-		// under certain `reason`. Slashing can for example happen if the contract takes part
-		// in staking.
-		let _ = <Test as Config>::Currency::slash(
-			&HoldReason::StorageDepositReserve.into(),
-			&account_id,
-			<Test as Config>::Currency::total_balance(&account_id),
-		);
-
-		// Slashing only removed the balance held.
-		assert_eq!(<Test as Config>::Currency::total_balance(&account_id), value + min_balance);
-	});
-}
-
-#[test]
-fn contract_reverted() {
-	let (binary, code_hash) = compile_module("return_with_data").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let flags = ReturnFlags::REVERT;
-		let buffer = [4u8, 8, 15, 16, 23, 42];
-		let input = (flags.bits(), buffer).encode();
-
-		// We just upload the code for later use
-		assert_ok!(Contracts::upload_code(
-			RuntimeOrigin::signed(ALICE),
-			binary.clone(),
-			deposit_limit::<Test>(),
-		));
-
-		// Calling extrinsic: revert leads to an error
-		assert_err_ignore_postinfo!(
-			builder::instantiate(code_hash).data(input.clone()).build(),
-			<Error<Test>>::ContractReverted,
-		);
-
-		// Calling extrinsic: revert leads to an error
-		assert_err_ignore_postinfo!(
-			builder::instantiate_with_code(binary).data(input.clone()).build(),
-			<Error<Test>>::ContractReverted,
-		);
-
-		// Calling directly: revert leads to success but the flags indicate the error
-		// This is just a different way of transporting the error that allows the read out
-		// the `data` which is only there on success. Obviously, the contract isn't
-		// instantiated.
-		let result = builder::bare_instantiate(Code::Existing(code_hash))
-			.data(input.clone())
-			.build_and_unwrap_result();
-		assert_eq!(result.result.flags, flags);
-		assert_eq!(result.result.data, buffer);
-		assert!(!<AccountInfoOf<Test>>::contains_key(result.addr));
-
-		// Pass empty flags and therefore successfully instantiate the contract for later use.
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Existing(code_hash))
-			.data(ReturnFlags::empty().bits().encode())
-			.build_and_unwrap_contract();
-
-		// Calling extrinsic: revert leads to an error
-		assert_err_ignore_postinfo!(
-			builder::call(addr).data(input.clone()).build(),
-			<Error<Test>>::ContractReverted,
-		);
-
-		// Calling directly: revert leads to success but the flags indicate the error
-		let result = builder::bare_call(addr).data(input).build_and_unwrap_result();
-		assert_eq!(result.flags, flags);
-		assert_eq!(result.data, buffer);
-	});
-}
-
-#[test]
-fn set_code_hash() {
-	let (binary, _) = compile_module("set_code_hash").unwrap();
-	let (new_binary, new_code_hash) = compile_module("new_set_code_hash_contract").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Instantiate the 'caller'
-		let Contract { addr: contract_addr, .. } = builder::bare_instantiate(Code::Upload(binary))
-			.native_value(300_000)
-			.build_and_unwrap_contract();
-		// upload new code
-		assert_ok!(Contracts::upload_code(
-			RuntimeOrigin::signed(ALICE),
-			new_binary.clone(),
-			deposit_limit::<Test>(),
-		));
-
-		System::reset_events();
-
-		// First call sets new code_hash and returns 1
-		let result = builder::bare_call(contract_addr)
-			.data(new_code_hash.as_ref().to_vec())
-			.build_and_unwrap_result();
-		assert_return_code!(result, 1);
-
-		// Second calls new contract code that returns 2
-		let result = builder::bare_call(contract_addr).build_and_unwrap_result();
-		assert_return_code!(result, 2);
-	});
-}
-
-#[test]
-fn storage_deposit_limit_is_enforced() {
-	let (binary, _code_hash) = compile_module("store_call").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let min_balance = Contracts::min_balance();
-
-		// Setting insufficient storage_deposit should fail.
-		assert_err!(
-			builder::bare_instantiate(Code::Upload(binary.clone()))
-				// expected deposit is 2 * ed + 3 for the call
-				.storage_deposit_limit((2 * min_balance + 3 - 1).into())
-				.build()
-				.result,
-			<Error<Test>>::StorageDepositLimitExhausted,
-		);
-
-		// Instantiate the BOB contract.
-		let Contract { addr, account_id } =
-			builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
-
-		let info_deposit = test_utils::contract_base_deposit(&addr);
-		// Check that the BOB contract has been instantiated and has the minimum balance
-		assert_eq!(get_contract(&addr).total_deposit(), info_deposit);
-		assert_eq!(
-			<Test as Config>::Currency::total_balance(&account_id),
-			info_deposit + min_balance
-		);
-
-		// Create 1 byte of storage with a price of per byte,
-		// setting insufficient deposit limit, as it requires 3 Balance:
-		// 2 for the item added + 1 (value) + 48 (key)
-		assert_err_ignore_postinfo!(
-			builder::call(addr)
-				.storage_deposit_limit(50)
-				.data(1u32.to_le_bytes().to_vec())
-				.build(),
-			<Error<Test>>::StorageDepositLimitExhausted,
-		);
-
-		// now with enough limit
-		assert_ok!(builder::call(addr)
-			.storage_deposit_limit(51)
-			.data(1u32.to_le_bytes().to_vec())
-			.build());
-
-		// Use 4 more bytes of the storage for the same item, which requires 4 Balance.
-		// Should fail as DefaultDepositLimit is 3 and hence isn't enough.
-		assert_err_ignore_postinfo!(
-			builder::call(addr)
-				.storage_deposit_limit(3)
-				.data(5u32.to_le_bytes().to_vec())
-				.build(),
-			<Error<Test>>::StorageDepositLimitExhausted,
-		);
-	});
-}
-
-#[test]
-fn deposit_limit_in_nested_calls() {
-	let (binary_caller, _code_hash_caller) = compile_module("create_storage_and_call").unwrap();
-	let (binary_callee, _code_hash_callee) = compile_module("store_call").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Create both contracts: Constructors do nothing.
-		let Contract { addr: addr_caller, .. } =
-			builder::bare_instantiate(Code::Upload(binary_caller)).build_and_unwrap_contract();
-		let Contract { addr: addr_callee, .. } =
-			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
-
-		// Create 100 bytes of storage with a price of per byte
-		// This is 100 Balance + 2 Balance for the item
-		// 48 for the key
-		assert_ok!(builder::call(addr_callee)
-			.storage_deposit_limit(102 + 48)
-			.data(100u32.to_le_bytes().to_vec())
-			.build());
-
-		// We do not remove any storage but add a storage item of 12 bytes in the caller
-		// contract. This would cost 12 + 2 + 72 = 86 Balance.
-		// The nested call doesn't get a special limit, which is set by passing `u64::MAX` to it.
-		// This should fail as the specified parent's limit is less than the cost: 13 <
-		// 14.
-		assert_err_ignore_postinfo!(
-			builder::call(addr_caller)
-				.storage_deposit_limit(85)
-				.data((100u32, &addr_callee, U256::MAX).encode())
-				.build(),
-			<Error<Test>>::StorageDepositLimitExhausted,
-		);
-
-		// Now we specify the parent's limit high enough to cover the caller's storage
-		// additions. However, we use a single byte more in the callee, hence the storage
-		// deposit should be 87 Balance.
-		// The nested call doesn't get a special limit, which is set by passing `u64::MAX` to it.
-		// This should fail as the specified parent's limit is less than the cost: 86 < 87
-		assert_err_ignore_postinfo!(
-			builder::call(addr_caller)
-				.storage_deposit_limit(86)
-				.data((101u32, &addr_callee, &U256::MAX).encode())
-				.build(),
-			<Error<Test>>::StorageDepositLimitExhausted,
-		);
-
-		// The parents storage deposit limit doesn't matter as the sub calls limit
-		// is enforced eagerly. However, we set a special deposit limit of 1 Balance for the
-		// nested call. This should fail as callee adds up 2 bytes to the storage, meaning
-		// that the nested call should have a deposit limit of at least 2 Balance. The
-		// sub-call should be rolled back, which is covered by the next test case.
-		let ret = builder::bare_call(addr_caller)
-			.storage_deposit_limit(DepositLimit::Balance(u64::MAX))
-			.data((102u32, &addr_callee, U256::from(1u64)).encode())
-			.build_and_unwrap_result();
-		assert_return_code!(ret, RuntimeReturnCode::OutOfResources);
-
-		// Refund in the callee contract but not enough to cover the Balance required by the
-		// caller. Note that if previous sub-call wouldn't roll back, this call would pass
-		// making the test case fail. We don't set a special limit for the nested call here.
-		assert_err_ignore_postinfo!(
-			builder::call(addr_caller)
-				.storage_deposit_limit(0)
-				.data((87u32, &addr_callee, &U256::MAX.to_little_endian()).encode())
-				.build(),
-			<Error<Test>>::StorageDepositLimitExhausted,
-		);
-
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 511);
-
-		// Require more than the sender's balance.
-		// Limit the sub call to little balance so it should fail in there
-		let ret = builder::bare_call(addr_caller)
-			.data((416, &addr_callee, U256::from(1u64)).encode())
-			.build_and_unwrap_result();
-		assert_return_code!(ret, RuntimeReturnCode::OutOfResources);
-
-		// Free up enough storage in the callee so that the caller can create a new item
-		// We set the special deposit limit of 1 Balance for the nested call, which isn't
-		// enforced as callee frees up storage. This should pass.
-		assert_ok!(builder::call(addr_caller)
-			.storage_deposit_limit(1)
-			.data((0u32, &addr_callee, U256::from(1u64)).encode())
-			.build());
-	});
-}
-
-#[test]
-fn deposit_limit_in_nested_instantiate() {
-	let (binary_caller, _code_hash_caller) =
-		compile_module("create_storage_and_instantiate").unwrap();
-	let (binary_callee, code_hash_callee) = compile_module("store_deploy").unwrap();
-	const ED: u64 = 5;
-	ExtBuilder::default().existential_deposit(ED).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let _ = <Test as Config>::Currency::set_balance(&BOB, 1_000_000);
-		// Create caller contract
-		let Contract { addr: addr_caller, account_id: caller_id } =
-			builder::bare_instantiate(Code::Upload(binary_caller))
-				.native_value(10_000) // this balance is later passed to the deployed contract
-				.build_and_unwrap_contract();
-		// Deploy a contract to get its occupied storage size
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary_callee))
-			.data(vec![0, 0, 0, 0])
-			.build_and_unwrap_contract();
-
-		// This is the deposit we expect to be charged just for instantiatiting the callee.
-		//
-		// - callee_info_len + 2 for storing the new contract info
-		// - the deposit for depending on a code hash
-		// - ED for deployed contract account
-		// - 2 for the storage item of 0 bytes being created in the callee constructor
-		// - 48 for the key
-		let callee_min_deposit = {
-			let callee_info_len =
-				AccountInfo::<Test>::load_contract(&addr).unwrap().encoded_size() as u64;
-			let code_deposit = test_utils::lockup_deposit(&code_hash_callee);
-			callee_info_len + code_deposit + 2 + ED + 2 + 48
-		};
-
-		// The parent just stores an item of the passed size so at least
-		// we need to pay for the item itself.
-		let caller_min_deposit = callee_min_deposit + 2 + 48;
-
-		// Fail in callee.
-		//
-		// We still fail in the sub call because we enforce limits on return from a contract.
-		// Sub calls return first to they are checked first.
-		let ret = builder::bare_call(addr_caller)
-			.origin(RuntimeOrigin::signed(BOB))
-			.storage_deposit_limit(DepositLimit::Balance(0))
-			.data((&code_hash_callee, 100u32, &U256::MAX.to_little_endian()).encode())
-			.build_and_unwrap_result();
-		assert_return_code!(ret, RuntimeReturnCode::OutOfResources);
-		// The charges made on instantiation should be rolled back.
-		assert_eq!(<Test as Config>::Currency::free_balance(&BOB), 1_000_000);
-
-		// Fail in the caller.
-		//
-		// For that we need to supply enough storage deposit so that the sub call
-		// succeeds but the parent call runs out of storage.
-		let ret = builder::bare_call(addr_caller)
-			.origin(RuntimeOrigin::signed(BOB))
-			.storage_deposit_limit(DepositLimit::Balance(callee_min_deposit))
-			.data((&code_hash_callee, 0u32, &U256::MAX.to_little_endian()).encode())
-			.build();
-		assert_err!(ret.result, <Error<Test>>::StorageDepositLimitExhausted);
-		// The charges made on the instantiation should be rolled back.
-		assert_eq!(<Test as Config>::Currency::free_balance(&BOB), 1_000_000);
-
-		// Fail in the callee with bytes.
-		//
-		// Same as above but stores one byte in both caller and callee.
-		let ret = builder::bare_call(addr_caller)
-			.origin(RuntimeOrigin::signed(BOB))
-			.storage_deposit_limit(DepositLimit::Balance(caller_min_deposit + 1))
-			.data((&code_hash_callee, 1u32, U256::from(callee_min_deposit)).encode())
-			.build_and_unwrap_result();
-		assert_return_code!(ret, RuntimeReturnCode::OutOfResources);
-		// The charges made on the instantiation should be rolled back.
-		assert_eq!(<Test as Config>::Currency::free_balance(&BOB), 1_000_000);
-
-		// Fail in the caller with bytes.
-		//
-		// Same as above but stores one byte in both caller and callee.
-		let ret = builder::bare_call(addr_caller)
-			.origin(RuntimeOrigin::signed(BOB))
-			.storage_deposit_limit(DepositLimit::Balance(callee_min_deposit + 1))
-			.data((&code_hash_callee, 1u32, U256::from(callee_min_deposit + 1)).encode())
-			.build();
-		assert_err!(ret.result, <Error<Test>>::StorageDepositLimitExhausted);
-		// The charges made on the instantiation should be rolled back.
-		assert_eq!(<Test as Config>::Currency::free_balance(&BOB), 1_000_000);
-
-		// Set enough deposit limit for the child instantiate. This should succeed.
-		let result = builder::bare_call(addr_caller)
-			.origin(RuntimeOrigin::signed(BOB))
-			.storage_deposit_limit((caller_min_deposit + 2).into())
-			.data((&code_hash_callee, 1u32, U256::from(callee_min_deposit + 1)).encode())
-			.build();
-
-		let returned = result.result.unwrap();
-		assert!(!returned.did_revert());
-
-		// All balance of the caller except ED has been transferred to the callee.
-		// No deposit has been taken from it.
-		assert_eq!(<Test as Config>::Currency::free_balance(&caller_id), ED);
-		// Get address of the deployed contract.
-		let addr_callee = H160::from_slice(&returned.data[0..20]);
-		let callee_account_id = <Test as Config>::AddressMapper::to_account_id(&addr_callee);
-		// 10_000 should be sent to callee from the caller contract, plus ED to be sent from the
-		// origin.
-		assert_eq!(<Test as Config>::Currency::free_balance(&callee_account_id), 10_000 + ED);
-		// The origin should be charged with what the outer call consumed
-		assert_eq!(
-			<Test as Config>::Currency::free_balance(&BOB),
-			1_000_000 - (caller_min_deposit + 2),
-		);
-		assert_eq!(result.storage_deposit.charge_or_zero(), (caller_min_deposit + 2))
-	});
-}
-
-#[test]
-fn deposit_limit_honors_liquidity_restrictions() {
-	let (binary, _code_hash) = compile_module("store_call").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let bobs_balance = 1_000;
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let _ = <Test as Config>::Currency::set_balance(&BOB, bobs_balance);
-		let min_balance = Contracts::min_balance();
-
-		// Instantiate the BOB contract.
-		let Contract { addr, account_id } =
-			builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
-
-		let info_deposit = test_utils::contract_base_deposit(&addr);
-		// Check that the contract has been instantiated and has the minimum balance
-		assert_eq!(get_contract(&addr).total_deposit(), info_deposit);
-		assert_eq!(
-			<Test as Config>::Currency::total_balance(&account_id),
-			info_deposit + min_balance
-		);
-
-		// check that the hold is honored
-		<Test as Config>::Currency::hold(
-			&HoldReason::CodeUploadDepositReserve.into(),
-			&BOB,
-			bobs_balance - min_balance,
-		)
-		.unwrap();
-		assert_err_ignore_postinfo!(
-			builder::call(addr)
-				.origin(RuntimeOrigin::signed(BOB))
-				.storage_deposit_limit(10_000)
-				.data(100u32.to_le_bytes().to_vec())
-				.build(),
-			<Error<Test>>::StorageDepositNotEnoughFunds,
-		);
-		assert_eq!(<Test as Config>::Currency::free_balance(&BOB), min_balance);
-	});
-}
-
-#[test]
-fn deposit_limit_honors_existential_deposit() {
-	let (binary, _code_hash) = compile_module("store_call").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let _ = <Test as Config>::Currency::set_balance(&BOB, 300);
-		let min_balance = Contracts::min_balance();
-
-		// Instantiate the BOB contract.
-		let Contract { addr, account_id } =
-			builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
-
-		let info_deposit = test_utils::contract_base_deposit(&addr);
-
-		// Check that the contract has been instantiated and has the minimum balance
-		assert_eq!(get_contract(&addr).total_deposit(), info_deposit);
-		assert_eq!(
-			<Test as Config>::Currency::total_balance(&account_id),
-			min_balance + info_deposit
-		);
-
-		// check that the deposit can't bring the account below the existential deposit
-		assert_err_ignore_postinfo!(
-			builder::call(addr)
-				.origin(RuntimeOrigin::signed(BOB))
-				.storage_deposit_limit(10_000)
-				.data(100u32.to_le_bytes().to_vec())
-				.build(),
-			<Error<Test>>::StorageDepositNotEnoughFunds,
-		);
-		assert_eq!(<Test as Config>::Currency::free_balance(&BOB), 300);
-	});
-}
-
-#[test]
-fn native_dependency_deposit_works() {
-	let (binary, code_hash) = compile_module("set_code_hash").unwrap();
-	let (dummy_binary, dummy_code_hash) = compile_module("dummy").unwrap();
-
-	// Test with both existing and uploaded code
-	for code in [Code::Upload(binary.clone()), Code::Existing(code_hash)] {
-		ExtBuilder::default().build().execute_with(|| {
-			let _ = Balances::set_balance(&ALICE, 1_000_000);
-			let lockup_deposit_percent = CodeHashLockupDepositPercent::get();
-
-			// Upload the dummy contract,
-			Contracts::upload_code(
-				RuntimeOrigin::signed(ALICE),
-				dummy_binary.clone(),
-				deposit_limit::<Test>(),
-			)
-			.unwrap();
-
-			// Upload `set_code_hash` contracts if using Code::Existing.
-			let add_upload_deposit = match code {
-				Code::Existing(_) => {
-					Contracts::upload_code(
-						RuntimeOrigin::signed(ALICE),
-						binary.clone(),
-						deposit_limit::<Test>(),
-					)
-					.unwrap();
-					false
-				},
-				Code::Upload(_) => true,
-			};
-
-			// Instantiate the set_code_hash contract.
-			let res = builder::bare_instantiate(code).build();
-
-			let addr = res.result.unwrap().addr;
-			let account_id = <Test as Config>::AddressMapper::to_account_id(&addr);
-			let base_deposit = test_utils::contract_base_deposit(&addr);
-			let upload_deposit = test_utils::get_code_deposit(&code_hash);
-			let extra_deposit = add_upload_deposit.then(|| upload_deposit).unwrap_or_default();
-
-			assert_eq!(
-				res.storage_deposit.charge_or_zero(),
-				extra_deposit + base_deposit + Contracts::min_balance()
-			);
-
-			// call set_code_hash
-			builder::bare_call(addr)
-				.data(dummy_code_hash.encode())
-				.build_and_unwrap_result();
-
-			// Check updated storage_deposit due to code size changes
-			let deposit_diff = lockup_deposit_percent
-				.mul_ceil(test_utils::get_code_deposit(&code_hash)) -
-				lockup_deposit_percent.mul_ceil(test_utils::get_code_deposit(&dummy_code_hash));
-			let new_base_deposit = test_utils::contract_base_deposit(&addr);
-			assert_ne!(deposit_diff, 0);
-			assert_eq!(base_deposit - new_base_deposit, deposit_diff);
-
-			assert_eq!(
-				test_utils::get_balance_on_hold(
-					&HoldReason::StorageDepositReserve.into(),
-					&account_id
-				),
-				new_base_deposit
-			);
-		});
-	}
-}
-
-#[test]
-fn block_hash_works() {
-	let (code, _) = compile_module("block_hash").unwrap();
-
-	ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		// The genesis config sets to the block number to 1
-		let block_hash = [1; 32];
-		frame_system::BlockHash::<Test>::insert(
-			&crate::BlockNumberFor::<Test>::from(0u32),
-			<Test as frame_system::Config>::Hash::from(&block_hash),
-		);
-		assert_ok!(builder::call(addr)
-			.data((U256::zero(), H256::from(block_hash)).encode())
-			.build());
-
-		// A block number out of range returns the zero value
-		assert_ok!(builder::call(addr).data((U256::from(1), H256::zero()).encode()).build());
-	});
-}
-
-#[test]
-fn block_author_works() {
-	let (code, _) = compile_module("block_author").unwrap();
-
-	ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		// The fixture asserts the input to match the find_author API method output.
-		assert_ok!(builder::call(addr).data(EVE_ADDR.encode()).build());
-	});
-}
-
-#[test]
-fn root_cannot_upload_code() {
-	let (binary, _) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().build().execute_with(|| {
-		assert_noop!(
-			Contracts::upload_code(RuntimeOrigin::root(), binary, deposit_limit::<Test>()),
-			DispatchError::BadOrigin,
-		);
-	});
-}
-
-#[test]
-fn root_cannot_remove_code() {
-	let (_, code_hash) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().build().execute_with(|| {
-		assert_noop!(
-			Contracts::remove_code(RuntimeOrigin::root(), code_hash),
-			DispatchError::BadOrigin,
-		);
-	});
-}
-
-#[test]
-fn signed_cannot_set_code() {
-	let (_, code_hash) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().build().execute_with(|| {
-		assert_noop!(
-			Contracts::set_code(RuntimeOrigin::signed(ALICE), BOB_ADDR, code_hash),
-			DispatchError::BadOrigin,
-		);
-	});
-}
-
-#[test]
-fn none_cannot_call_code() {
-	ExtBuilder::default().build().execute_with(|| {
-		assert_err_ignore_postinfo!(
-			builder::call(BOB_ADDR).origin(RuntimeOrigin::none()).build(),
-			DispatchError::BadOrigin,
-		);
-	});
-}
-
-#[test]
-fn root_can_call() {
-	let (binary, _) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
-
-		// Call the contract.
-		assert_ok!(builder::call(addr).origin(RuntimeOrigin::root()).build());
-	});
-}
-
-#[test]
-fn root_cannot_instantiate_with_code() {
-	let (binary, _) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().build().execute_with(|| {
-		assert_err_ignore_postinfo!(
-			builder::instantiate_with_code(binary).origin(RuntimeOrigin::root()).build(),
-			DispatchError::BadOrigin
-		);
-	});
-}
-
-#[test]
-fn root_cannot_instantiate() {
-	let (_, code_hash) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().build().execute_with(|| {
-		assert_err_ignore_postinfo!(
-			builder::instantiate(code_hash).origin(RuntimeOrigin::root()).build(),
-			DispatchError::BadOrigin
-		);
-	});
-}
-
-#[test]
-fn only_upload_origin_can_upload() {
-	let (binary, _) = compile_module("dummy").unwrap();
-	UploadAccount::set(Some(ALICE));
-	ExtBuilder::default().build().execute_with(|| {
-		let _ = Balances::set_balance(&ALICE, 1_000_000);
-		let _ = Balances::set_balance(&BOB, 1_000_000);
-
-		assert_err!(
-			Contracts::upload_code(RuntimeOrigin::root(), binary.clone(), deposit_limit::<Test>(),),
-			DispatchError::BadOrigin
-		);
-
-		assert_err!(
-			Contracts::upload_code(
-				RuntimeOrigin::signed(BOB),
-				binary.clone(),
-				deposit_limit::<Test>(),
-			),
-			DispatchError::BadOrigin
-		);
-
-		// Only alice is allowed to upload contract code.
-		assert_ok!(Contracts::upload_code(
-			RuntimeOrigin::signed(ALICE),
-			binary.clone(),
-			deposit_limit::<Test>(),
-		));
-	});
-}
-
-#[test]
-fn only_instantiation_origin_can_instantiate() {
-	let (code, code_hash) = compile_module("dummy").unwrap();
-	InstantiateAccount::set(Some(ALICE));
-	ExtBuilder::default().build().execute_with(|| {
-		let _ = Balances::set_balance(&ALICE, 1_000_000);
-		let _ = Balances::set_balance(&BOB, 1_000_000);
-
-		assert_err_ignore_postinfo!(
-			builder::instantiate_with_code(code.clone())
-				.origin(RuntimeOrigin::root())
-				.build(),
-			DispatchError::BadOrigin
-		);
-
-		assert_err_ignore_postinfo!(
-			builder::instantiate_with_code(code.clone())
-				.origin(RuntimeOrigin::signed(BOB))
-				.build(),
-			DispatchError::BadOrigin
-		);
-
-		// Only Alice can instantiate
-		assert_ok!(builder::instantiate_with_code(code).build());
-
-		// Bob cannot instantiate with either `instantiate_with_code` or `instantiate`.
-		assert_err_ignore_postinfo!(
-			builder::instantiate(code_hash).origin(RuntimeOrigin::signed(BOB)).build(),
-			DispatchError::BadOrigin
-		);
-	});
-}
-
-#[test]
-fn balance_of_api() {
-	let (binary, _code_hash) = compile_module("balance_of").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = Balances::set_balance(&ALICE, 1_000_000);
-		let _ = Balances::set_balance(&ALICE_FALLBACK, 1_000_000);
-
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(binary.to_vec())).build_and_unwrap_contract();
-
-		// The fixture asserts a non-zero returned free balance of the account;
-		// The ALICE_FALLBACK account is endowed;
-		// Hence we should not revert
-		assert_ok!(builder::call(addr).data(ALICE_ADDR.0.to_vec()).build());
-
-		// The fixture asserts a non-zero returned free balance of the account;
-		// The ETH_BOB account is not endowed;
-		// Hence we should revert
-		assert_err_ignore_postinfo!(
-			builder::call(addr).data(BOB_ADDR.0.to_vec()).build(),
-			<Error<Test>>::ContractTrapped
-		);
-	});
-}
-
-#[test]
-fn balance_api_returns_free_balance() {
-	let (binary, _code_hash) = compile_module("balance").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Instantiate the BOB contract without any extra balance.
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(binary.to_vec())).build_and_unwrap_contract();
-
-		let value = 0;
-		// Call BOB which makes it call the balance runtime API.
-		// The contract code asserts that the returned balance is 0.
-		assert_ok!(builder::call(addr).value(value).build());
-
-		let value = 1;
-		// Calling with value will trap the contract.
-		assert_err_ignore_postinfo!(
-			builder::call(addr).value(value).build(),
-			<Error<Test>>::ContractTrapped
-		);
-	});
-}
-
-#[test]
-fn call_depth_is_enforced() {
-	let (binary, _code_hash) = compile_module("recurse").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		let extra_recursions = 1024;
-
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(binary.to_vec())).build_and_unwrap_contract();
-
-		// takes the number of recursions
-		// returns the number of left over recursions
-		assert_eq!(
-			u32::from_le_bytes(
-				builder::bare_call(addr)
-					.data((limits::CALL_STACK_DEPTH + extra_recursions).encode())
-					.build_and_unwrap_result()
-					.data
-					.try_into()
-					.unwrap()
-			),
-			// + 1 because when the call depth is reached the caller contract is trapped without
-			// the ability to return any data. hence the last call frame is untracked.
-			extra_recursions + 1,
-		);
-	});
-}
-
-#[test]
-fn gas_consumed_is_linear_for_nested_calls() {
-	let (code, _code_hash) = compile_module("recurse").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		let [gas_0, gas_1, gas_2, gas_max] = {
-			[0u32, 1u32, 2u32, limits::CALL_STACK_DEPTH]
-				.iter()
-				.map(|i| {
-					let result = builder::bare_call(addr).data(i.encode()).build();
-					assert_eq!(
-						u32::from_le_bytes(result.result.unwrap().data.try_into().unwrap()),
-						0
-					);
-					result.gas_consumed
-				})
-				.collect::<Vec<_>>()
-				.try_into()
-				.unwrap()
-		};
-
-		let gas_per_recursion = gas_2.checked_sub(&gas_1).unwrap();
-		assert_eq!(gas_max, gas_0 + gas_per_recursion * limits::CALL_STACK_DEPTH as u64);
-	});
-}
-
-#[test]
-fn read_only_call_cannot_store() {
-	let (binary_caller, _code_hash_caller) = compile_module("read_only_call").unwrap();
-	let (binary_callee, _code_hash_callee) = compile_module("store_call").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Create both contracts: Constructors do nothing.
-		let Contract { addr: addr_caller, .. } =
-			builder::bare_instantiate(Code::Upload(binary_caller)).build_and_unwrap_contract();
-		let Contract { addr: addr_callee, .. } =
-			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
-
-		// Read-only call fails when modifying storage.
-		assert_err_ignore_postinfo!(
-			builder::call(addr_caller).data((&addr_callee, 100u32).encode()).build(),
-			<Error<Test>>::ContractTrapped
-		);
-	});
-}
-
-#[test]
-fn read_only_call_cannot_transfer() {
-	let (binary_caller, _code_hash_caller) = compile_module("call_with_flags_and_value").unwrap();
-	let (binary_callee, _code_hash_callee) = compile_module("dummy").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Create both contracts: Constructors do nothing.
-		let Contract { addr: addr_caller, .. } =
-			builder::bare_instantiate(Code::Upload(binary_caller)).build_and_unwrap_contract();
-		let Contract { addr: addr_callee, .. } =
-			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
-
-		// Read-only call fails when a non-zero value is set.
-		assert_err_ignore_postinfo!(
-			builder::call(addr_caller)
-				.data(
-					(addr_callee, pallet_revive_uapi::CallFlags::READ_ONLY.bits(), 100u64).encode()
-				)
-				.build(),
-			<Error<Test>>::StateChangeDenied
-		);
-	});
-}
-
-#[test]
-fn read_only_subsequent_call_cannot_store() {
-	let (binary_read_only_caller, _code_hash_caller) = compile_module("read_only_call").unwrap();
-	let (binary_caller, _code_hash_caller) = compile_module("call_with_flags_and_value").unwrap();
-	let (binary_callee, _code_hash_callee) = compile_module("store_call").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Create contracts: Constructors do nothing.
-		let Contract { addr: addr_caller, .. } =
-			builder::bare_instantiate(Code::Upload(binary_read_only_caller))
-				.build_and_unwrap_contract();
-		let Contract { addr: addr_subsequent_caller, .. } =
-			builder::bare_instantiate(Code::Upload(binary_caller)).build_and_unwrap_contract();
-		let Contract { addr: addr_callee, .. } =
-			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
-
-		// Subsequent call input.
-		let input = (&addr_callee, pallet_revive_uapi::CallFlags::empty().bits(), 0u64, 100u32);
-
-		// Read-only call fails when modifying storage.
-		assert_err_ignore_postinfo!(
-			builder::call(addr_caller)
-				.data((&addr_subsequent_caller, input).encode())
-				.build(),
-			<Error<Test>>::ContractTrapped
-		);
-	});
-}
-
-#[test]
-fn read_only_call_works() {
-	let (binary_caller, _code_hash_caller) = compile_module("read_only_call").unwrap();
-	let (binary_callee, _code_hash_callee) = compile_module("dummy").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Create both contracts: Constructors do nothing.
-		let Contract { addr: addr_caller, .. } =
-			builder::bare_instantiate(Code::Upload(binary_caller)).build_and_unwrap_contract();
-		let Contract { addr: addr_callee, .. } =
-			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
-
-		assert_ok!(builder::call(addr_caller).data(addr_callee.encode()).build());
-	});
-}
-
-#[test]
-fn create1_with_value_works() {
-	let (code, code_hash) = compile_module("create1_with_value").unwrap();
-	let value = 42;
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Create the contract: Constructor does nothing.
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		// Call the contract: Deploys itself using create1 and the expected value
-		assert_ok!(builder::call(addr).value(value).data(code_hash.encode()).build());
-
-		// We should see the expected balance at the expected account
-		let address = crate::address::create1(&addr, 1);
-		let account_id = <Test as Config>::AddressMapper::to_account_id(&address);
-		let usable_balance = <Test as Config>::Currency::usable_balance(&account_id);
-		assert_eq!(usable_balance, value);
-	});
-}
-
-#[test]
-fn gas_price_api_works() {
-	let (code, _) = compile_module("gas_price").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Create fixture: Constructor does nothing
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		// Call the contract: It echoes back the value returned by the gas price API.
-		let received = builder::bare_call(addr).build_and_unwrap_result();
-		assert_eq!(received.flags, ReturnFlags::empty());
-		assert_eq!(u64::from_le_bytes(received.data[..].try_into().unwrap()), u64::from(GAS_PRICE));
-	});
-}
-
-#[test]
-fn base_fee_api_works() {
-	let (code, _) = compile_module("base_fee").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Create fixture: Constructor does nothing
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		// Call the contract: It echoes back the value returned by the base fee API.
-		let received = builder::bare_call(addr).build_and_unwrap_result();
-		assert_eq!(received.flags, ReturnFlags::empty());
-		assert_eq!(U256::from_little_endian(received.data[..].try_into().unwrap()), U256::zero());
-	});
-}
-
-#[test]
-fn call_data_size_api_works() {
-	let (code, _) = compile_module("call_data_size").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Create fixture: Constructor does nothing
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		// Call the contract: It echoes back the value returned by the call data size API.
-		let received = builder::bare_call(addr).build_and_unwrap_result();
-		assert_eq!(received.flags, ReturnFlags::empty());
-		assert_eq!(u64::from_le_bytes(received.data.try_into().unwrap()), 0);
-
-		let received = builder::bare_call(addr).data(vec![1; 256]).build_and_unwrap_result();
-		assert_eq!(received.flags, ReturnFlags::empty());
-		assert_eq!(u64::from_le_bytes(received.data.try_into().unwrap()), 256);
-	});
-}
-
-#[test]
-fn call_data_copy_api_works() {
-	let (code, _) = compile_module("call_data_copy").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Create fixture: Constructor does nothing
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		// Call fixture: Expects an input of [255; 32] and executes tests.
-		assert_ok!(builder::call(addr).data(vec![255; 32]).build());
-	});
-}
-
-#[test]
-fn static_data_limit_is_enforced() {
-	let (oom_rw_trailing, _) = compile_module("oom_rw_trailing").unwrap();
-	let (oom_rw_included, _) = compile_module("oom_rw_included").unwrap();
-	let (oom_ro, _) = compile_module("oom_ro").unwrap();
-
-	ExtBuilder::default().build().execute_with(|| {
-		let _ = Balances::set_balance(&ALICE, 1_000_000);
-
-		assert_err!(
-			Contracts::upload_code(
-				RuntimeOrigin::signed(ALICE),
-				oom_rw_trailing,
-				deposit_limit::<Test>(),
-			),
-			<Error<Test>>::StaticMemoryTooLarge
-		);
-
-		assert_err!(
-			Contracts::upload_code(
-				RuntimeOrigin::signed(ALICE),
-				oom_rw_included,
-				deposit_limit::<Test>(),
-			),
-			<Error<Test>>::BlobTooLarge
-		);
-
-		assert_err!(
-			Contracts::upload_code(RuntimeOrigin::signed(ALICE), oom_ro, deposit_limit::<Test>(),),
-			<Error<Test>>::BlobTooLarge
-		);
-	});
-}
-
-#[test]
-fn call_diverging_out_len_works() {
-	let (code, _) = compile_module("call_diverging_out_len").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Create the contract: Constructor does nothing
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		// Call the contract: It will issue calls and deploys, asserting on
-		// correct output if the supplied output length was smaller than
-		// than what the callee returned.
-		assert_ok!(builder::call(addr).build());
-	});
-}
-
-#[test]
-fn chain_id_works() {
-	let (code, _) = compile_module("chain_id").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		let chain_id = U256::from(<Test as Config>::ChainId::get());
-		let received = builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_result();
-		assert_eq!(received.result.data, chain_id.encode());
-	});
-}
-
-#[test]
-fn call_data_load_api_works() {
-	let (code, _) = compile_module("call_data_load").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Create fixture: Constructor does nothing
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		// Call the contract: It reads a byte for the offset and then returns
-		// what call data load returned using this byte as the offset.
-		let input = (3u8, U256::max_value(), U256::max_value()).encode();
-		let received = builder::bare_call(addr).data(input).build().result.unwrap();
-		assert_eq!(received.flags, ReturnFlags::empty());
-		assert_eq!(U256::from_little_endian(&received.data), U256::max_value());
-
-		// Edge case
-		let input = (2u8, U256::from(255).to_big_endian()).encode();
-		let received = builder::bare_call(addr).data(input).build().result.unwrap();
-		assert_eq!(received.flags, ReturnFlags::empty());
-		assert_eq!(U256::from_little_endian(&received.data), U256::from(65280));
-
-		// Edge case
-		let received = builder::bare_call(addr).data(vec![1]).build().result.unwrap();
-		assert_eq!(received.flags, ReturnFlags::empty());
-		assert_eq!(U256::from_little_endian(&received.data), U256::zero());
-
-		// OOB case
-		let input = (42u8).encode();
-		let received = builder::bare_call(addr).data(input).build().result.unwrap();
-		assert_eq!(received.flags, ReturnFlags::empty());
-		assert_eq!(U256::from_little_endian(&received.data), U256::zero());
-
-		// No calldata should return the zero value
-		let received = builder::bare_call(addr).build().result.unwrap();
-		assert_eq!(received.flags, ReturnFlags::empty());
-		assert_eq!(U256::from_little_endian(&received.data), U256::zero());
-	});
-}
-
-#[test]
-fn return_data_api_works() {
-	let (code_return_data_api, _) = compile_module("return_data_api").unwrap();
-	let (code_return_with_data, hash_return_with_data) =
-		compile_module("return_with_data").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Upload the io echoing fixture for later use
-		assert_ok!(Contracts::upload_code(
-			RuntimeOrigin::signed(ALICE),
-			code_return_with_data,
-			deposit_limit::<Test>(),
-		));
-
-		// Create fixture: Constructor does nothing
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code_return_data_api))
-			.build_and_unwrap_contract();
-
-		// Call the contract: It will issue calls and deploys, asserting on
-		assert_ok!(builder::call(addr)
-			.value(10 * 1024)
-			.data(hash_return_with_data.encode())
-			.build());
-	});
-}
-
-#[test]
-fn immutable_data_works() {
-	let (code, _) = compile_module("immutable_data").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		let data = [0xfe; 8];
-
-		// Create fixture: Constructor sets the immtuable data
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-			.data(data.to_vec())
-			.build_and_unwrap_contract();
-
-		let contract = test_utils::get_contract(&addr);
-		let account = <Test as Config>::AddressMapper::to_account_id(&addr);
-		let actual_deposit =
-			test_utils::get_balance_on_hold(&HoldReason::StorageDepositReserve.into(), &account);
-
-		assert_eq!(contract.immutable_data_len(), data.len() as u32);
-
-		// Storing immmutable data charges storage deposit; verify it explicitly.
-		assert_eq!(actual_deposit, test_utils::contract_base_deposit(&addr));
-
-		// make sure it is also recorded in the base deposit
-		assert_eq!(
-			test_utils::get_balance_on_hold(&HoldReason::StorageDepositReserve.into(), &account),
-			contract.storage_base_deposit(),
-		);
-
-		// Call the contract: Asserts the input to equal the immutable data
-		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
-		);
-	});
-}
-
-#[test]
-fn origin_api_works() {
-	let (code, _) = compile_module("origin").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Create fixture: Constructor does nothing
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		// Call the contract: Asserts the origin API to work as expected
-		assert_ok!(builder::call(addr).build());
-	});
-}
-
-#[test]
-fn to_account_id_works() {
-	let (code_hash_code, _) = compile_module("to_account_id").unwrap();
-
-	ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let _ = <Test as Config>::Currency::set_balance(&EVE, 1_000_000);
-
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code_hash_code)).build_and_unwrap_contract();
-
-		// mapped account
-		<Pallet<Test>>::map_account(RuntimeOrigin::signed(EVE)).unwrap();
-		let expected_mapped_account_id = &<Test as Config>::AddressMapper::to_account_id(&EVE_ADDR);
-		assert_ne!(
-			expected_mapped_account_id.encode()[20..32],
-			[0xEE; 12],
-			"fallback suffix found where none should be"
-		);
-		assert_ok!(builder::call(addr)
-			.data((EVE_ADDR, expected_mapped_account_id).encode())
-			.build());
-
-		// fallback for unmapped accounts
-		let expected_fallback_account_id =
-			&<Test as Config>::AddressMapper::to_account_id(&BOB_ADDR);
-		assert_eq!(
-			expected_fallback_account_id.encode()[20..32],
-			[0xEE; 12],
-			"no fallback suffix found where one should be"
-		);
-		assert_ok!(builder::call(addr)
-			.data((BOB_ADDR, expected_fallback_account_id).encode())
-			.build());
-	});
-}
-
-#[test]
-fn code_hash_works() {
-	use crate::precompiles::{Precompile, EVM_REVERT};
-	use precompiles::NoInfo;
-
-	let builtin_precompile = H160(NoInfo::<Test>::MATCHER.base_address());
-	let primitive_precompile = H160::from_low_u64_be(1);
-
-	let (code_hash_code, self_code_hash) = compile_module("code_hash").unwrap();
-	let (dummy_code, code_hash) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code_hash_code)).build_and_unwrap_contract();
-		let Contract { addr: dummy_addr, .. } =
-			builder::bare_instantiate(Code::Upload(dummy_code)).build_and_unwrap_contract();
-
-		// code hash of dummy contract
-		assert_ok!(builder::call(addr).data((dummy_addr, code_hash).encode()).build());
-		// code hash of itself
-		assert_ok!(builder::call(addr).data((addr, self_code_hash).encode()).build());
-		// code hash of primitive pre-compile (exist but have no bytecode)
-		assert_ok!(builder::call(addr)
-			.data((primitive_precompile, crate::exec::EMPTY_CODE_HASH).encode())
-			.build());
-		// code hash of normal pre-compile (do have a bytecode)
-		assert_ok!(builder::call(addr)
-			.data((builtin_precompile, sp_io::hashing::keccak_256(&EVM_REVERT)).encode())
-			.build());
-
-		// EOA doesn't exists
-		assert_err!(
-			builder::bare_call(addr)
-				.data((BOB_ADDR, crate::exec::EMPTY_CODE_HASH).encode())
-				.build()
-				.result,
-			Error::<Test>::ContractTrapped
-		);
-		// non-existing will return zero
-		assert_ok!(builder::call(addr).data((BOB_ADDR, H256::zero()).encode()).build());
-
-		// create EOA
-		let _ = <Test as Config>::Currency::set_balance(
-			&<Test as Config>::AddressMapper::to_account_id(&BOB_ADDR),
-			1_000_000,
-		);
-
-		// EOA returns empty code hash
-		assert_ok!(builder::call(addr)
-			.data((BOB_ADDR, crate::exec::EMPTY_CODE_HASH).encode())
-			.build());
-	});
-}
-
-#[test]
-fn code_size_works() {
-	let (tester_code, _) = compile_module("extcodesize").unwrap();
-	let tester_code_len = tester_code.len() as u64;
-
-	let (dummy_code, _) = compile_module("dummy").unwrap();
-	let dummy_code_len = dummy_code.len() as u64;
-
-	ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		let Contract { addr: tester_addr, .. } =
-			builder::bare_instantiate(Code::Upload(tester_code)).build_and_unwrap_contract();
-		let Contract { addr: dummy_addr, .. } =
-			builder::bare_instantiate(Code::Upload(dummy_code)).build_and_unwrap_contract();
-
-		// code size of another contract address
-		assert_ok!(builder::call(tester_addr).data((dummy_addr, dummy_code_len).encode()).build());
-
-		// code size of own contract address
-		assert_ok!(builder::call(tester_addr)
-			.data((tester_addr, tester_code_len).encode())
-			.build());
-
-		// code size of non contract accounts
-		assert_ok!(builder::call(tester_addr).data(([8u8; 20], 0u64).encode()).build());
-	});
-}
-
-#[test]
-fn origin_must_be_mapped() {
-	let (code, hash) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		<Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		<Test as Config>::Currency::set_balance(&EVE, 1_000_000);
-
-		let eve = RuntimeOrigin::signed(EVE);
-
-		// alice can instantiate as she doesn't need a mapping
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		// without a mapping eve can neither call nor instantiate
-		assert_err!(
-			builder::bare_call(addr).origin(eve.clone()).build().result,
-			<Error<Test>>::AccountUnmapped
-		);
-		assert_err!(
-			builder::bare_instantiate(Code::Existing(hash))
-				.origin(eve.clone())
-				.build()
-				.result,
-			<Error<Test>>::AccountUnmapped
-		);
-
-		// after mapping eve is usable as an origin
-		<Pallet<Test>>::map_account(eve.clone()).unwrap();
-		assert_ok!(builder::bare_call(addr).origin(eve.clone()).build().result);
-		assert_ok!(builder::bare_instantiate(Code::Existing(hash)).origin(eve).build().result);
-	});
-}
-
-#[test]
-fn mapped_address_works() {
-	let (code, _) = compile_module("terminate_and_send_to_argument").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		<Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// without a mapping everything will be send to the fallback account
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code.clone())).build_and_unwrap_contract();
-		assert_eq!(<Test as Config>::Currency::total_balance(&EVE_FALLBACK), 0);
-		builder::bare_call(addr).data(EVE_ADDR.encode()).build_and_unwrap_result();
-		assert_eq!(<Test as Config>::Currency::total_balance(&EVE_FALLBACK), 100);
-
-		// after mapping it will be sent to the real eve account
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-		// need some balance to pay for the map deposit
-		<Test as Config>::Currency::set_balance(&EVE, 1_000);
-		<Pallet<Test>>::map_account(RuntimeOrigin::signed(EVE)).unwrap();
-		builder::bare_call(addr).data(EVE_ADDR.encode()).build_and_unwrap_result();
-		assert_eq!(<Test as Config>::Currency::total_balance(&EVE_FALLBACK), 100);
-		assert_eq!(<Test as Config>::Currency::total_balance(&EVE), 1_100);
-	});
-}
-
-#[test]
-fn recovery_works() {
-	let (code, _) = compile_module("terminate_and_send_to_argument").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		<Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// eve puts her AccountId20 as argument to terminate but forgot to register
-		// her AccountId32 first so now the funds are trapped in her fallback account
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code.clone())).build_and_unwrap_contract();
-		assert_eq!(<Test as Config>::Currency::total_balance(&EVE), 0);
-		assert_eq!(<Test as Config>::Currency::total_balance(&EVE_FALLBACK), 0);
-		builder::bare_call(addr).data(EVE_ADDR.encode()).build_and_unwrap_result();
-		assert_eq!(<Test as Config>::Currency::total_balance(&EVE_FALLBACK), 100);
-		assert_eq!(<Test as Config>::Currency::total_balance(&EVE), 0);
-
-		let call = RuntimeCall::Balances(pallet_balances::Call::transfer_all {
-			dest: EVE,
-			keep_alive: false,
-		});
-
-		// she now uses the recovery function to move all funds from the fallback
-		// account to her real account
-		<Pallet<Test>>::dispatch_as_fallback_account(RuntimeOrigin::signed(EVE), Box::new(call))
-			.unwrap();
-		assert_eq!(<Test as Config>::Currency::total_balance(&EVE_FALLBACK), 0);
-		assert_eq!(<Test as Config>::Currency::total_balance(&EVE), 100);
-	});
-}
-
-#[test]
-fn skip_transfer_works() {
-	let (code_caller, _) = compile_module("call").unwrap();
-	let (code, _) = compile_module("store_call").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		<Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		<Test as Config>::Currency::set_balance(&BOB, 0);
-
-		// when gas is some (transfers enabled): bob has no money: fail
-		assert_err!(
-			Pallet::<Test>::dry_run_eth_transact(
-				GenericTransaction {
-					from: Some(BOB_ADDR),
-					input: code.clone().into(),
-					gas: Some(1u32.into()),
-					..Default::default()
-				},
-				Weight::MAX,
-				|_, _| 0u64,
-			),
-			EthTransactError::Message(format!(
-				"insufficient funds for gas * price + value: address {BOB_ADDR:?} have 0 (supplied gas 1)"
-			))
-		);
-
-		// no gas specified (all transfers are skipped): even without money bob can deploy
-		assert_ok!(Pallet::<Test>::dry_run_eth_transact(
-			GenericTransaction {
-				from: Some(BOB_ADDR),
-				input: code.clone().into(),
-				..Default::default()
-			},
-			Weight::MAX,
-			|_, _| 0u64,
-		));
-
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		let Contract { addr: caller_addr, .. } =
-			builder::bare_instantiate(Code::Upload(code_caller)).build_and_unwrap_contract();
-
-		// call directly: fails with enabled transfers
-		assert_err!(
-			Pallet::<Test>::dry_run_eth_transact(
-				GenericTransaction {
-					from: Some(BOB_ADDR),
-					to: Some(addr),
-					input: 0u32.encode().into(),
-					gas: Some(1u32.into()),
-					..Default::default()
-				},
-				Weight::MAX,
-				|_, _| 0u64,
-			),
-			EthTransactError::Message(format!(
-				"insufficient funds for gas * price + value: address {BOB_ADDR:?} have 0 (supplied gas 1)"
-			))
-		);
-
-		// fails to call through other contract
-		// we didn't roll back the storage changes done by the previous
-		// call. So the item already exists. We simply increase the size of
-		// the storage item to incur some deposits (which bob can't pay).
-		assert!(Pallet::<Test>::dry_run_eth_transact(
-			GenericTransaction {
-				from: Some(BOB_ADDR),
-				to: Some(caller_addr),
-				input: (1u32, &addr).encode().into(),
-				gas: Some(1u32.into()),
-				..Default::default()
-			},
-			Weight::MAX,
-			|_, _| 0u64,
-		)
-		.is_err(),);
-
-		// works when no gas is specified (skip transfer)
-		assert_ok!(Pallet::<Test>::dry_run_eth_transact(
-			GenericTransaction {
-				from: Some(BOB_ADDR),
-				to: Some(addr),
-				input: 2u32.encode().into(),
-				..Default::default()
-			},
-			Weight::MAX,
-			|_, _| 0u64,
-		));
-
-		// call through contract works when transfers are skipped
-		assert_ok!(Pallet::<Test>::dry_run_eth_transact(
-			GenericTransaction {
-				from: Some(BOB_ADDR),
-				to: Some(caller_addr),
-				input: (3u32, &addr).encode().into(),
-				..Default::default()
-			},
-			Weight::MAX,
-			|_, _| 0u64,
-		));
-
-		// works with transfers enabled if we don't incur a storage cost
-		// we shrink the item so its actually a refund
-		assert_ok!(Pallet::<Test>::dry_run_eth_transact(
-			GenericTransaction {
-				from: Some(BOB_ADDR),
-				to: Some(caller_addr),
-				input: (2u32, &addr).encode().into(),
-				gas: Some(1u32.into()),
-				..Default::default()
-			},
-			Weight::MAX,
-			|_, _| 0u64,
-		));
-
-		// fails when trying to increase the storage item size
-		assert!(Pallet::<Test>::dry_run_eth_transact(
-			GenericTransaction {
-				from: Some(BOB_ADDR),
-				to: Some(caller_addr),
-				input: (3u32, &addr).encode().into(),
-				gas: Some(1u32.into()),
-				..Default::default()
-			},
-			Weight::MAX,
-			|_, _| 0u64,
-		)
-		.is_err());
-	});
-}
-
-#[test]
-fn gas_limit_api_works() {
-	let (code, _) = compile_module("gas_limit").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Create fixture: Constructor does nothing
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		// Call the contract: It echoes back the value returned by the gas limit API.
-		let received = builder::bare_call(addr).build_and_unwrap_result();
-		assert_eq!(received.flags, ReturnFlags::empty());
-		assert_eq!(
-			u64::from_le_bytes(received.data[..].try_into().unwrap()),
-			<Test as frame_system::Config>::BlockWeights::get().max_block.ref_time()
-		);
-	});
-}
-
-#[test]
-fn unknown_syscall_rejected() {
-	let (code, _) = compile_module("unknown_syscall").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		<Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		assert_err!(
-			builder::bare_instantiate(Code::Upload(code)).build().result,
-			<Error<Test>>::CodeRejected,
-		)
-	});
-}
-
-#[test]
-fn unstable_interface_rejected() {
-	let (code, _) = compile_module("unstable_interface").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		<Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		Test::set_unstable_interface(false);
-		assert_err!(
-			builder::bare_instantiate(Code::Upload(code.clone())).build().result,
-			<Error<Test>>::CodeRejected,
-		);
-
-		Test::set_unstable_interface(true);
-		assert_ok!(builder::bare_instantiate(Code::Upload(code)).build().result);
-	});
-}
-
-#[test]
-fn tracing_works_for_transfers() {
-	ExtBuilder::default().build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000);
-		let mut tracer = CallTracer::new(Default::default(), |_| U256::zero());
-		trace(&mut tracer, || {
-			builder::bare_call(BOB_ADDR).evm_value(10.into()).build_and_unwrap_result();
-		});
-
-		let trace = tracer.collect_trace();
-		assert_eq!(
-			trace,
-			Some(CallTrace {
-				from: ALICE_ADDR,
-				to: BOB_ADDR,
-				value: Some(U256::from(10)),
-				call_type: CallType::Call,
-				..Default::default()
-			})
-		)
-	});
-}
-
-#[test]
-fn call_tracing_works() {
-	use crate::evm::*;
-	use CallType::*;
-	let (code, _code_hash) = compile_module("tracing").unwrap();
-	let (binary_callee, _) = compile_module("tracing_callee").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000);
-
-		let Contract { addr: addr_callee, .. } =
-			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
-
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).evm_value(10_000_000.into()).build_and_unwrap_contract();
-
-
-		let tracer_configs = vec![
-			 CallTracerConfig{ with_logs: false, only_top_call: false},
-			 CallTracerConfig{ with_logs: false, only_top_call: false},
-			 CallTracerConfig{ with_logs: false, only_top_call: true},
-		];
-
-		// Verify that the first trace report the same weight reported by bare_call
-		// TODO: fix tracing ( https://github.com/paritytech/polkadot-sdk/issues/8362 )
-		/*
-		let mut tracer = CallTracer::new(false, |w| w);
-		let gas_used = trace(&mut tracer, || {
-			builder::bare_call(addr).data((3u32, addr_callee).encode()).build().gas_consumed
-		});
-		let trace = tracer.collect_trace().unwrap();
-		assert_eq!(&trace.gas_used, &gas_used);
-		*/
-
-		// Discarding gas usage, check that traces reported are correct
-		for config in tracer_configs {
-			let logs = if config.with_logs {
-				vec![
-					CallLog {
-						address: addr,
-						topics: Default::default(),
-						data: b"before".to_vec().into(),
-						position: 0,
-					},
-					CallLog {
-						address: addr,
-						topics: Default::default(),
-						data: b"after".to_vec().into(),
-						position: 1,
-					},
-				]
-			} else {
-				vec![]
-			};
-
-			let calls = if config.only_top_call {
-				vec![]
-			} else {
-				vec![
-						CallTrace {
-							from: addr,
-							to: addr_callee,
-							input: 2u32.encode().into(),
-							output: hex_literal::hex!(
-										"08c379a00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001a546869732066756e6374696f6e20616c77617973206661696c73000000000000"
-									).to_vec().into(),
-							revert_reason: Some("revert: This function always fails".to_string()),
-							error: Some("execution reverted".to_string()),
-							call_type: Call,
-							value: Some(U256::from(0)),
-							..Default::default()
-						},
-						CallTrace {
-							from: addr,
-							to: addr,
-							input: (2u32, addr_callee).encode().into(),
-							call_type: Call,
-							logs: logs.clone(),
-							value: Some(U256::from(0)),
-							calls: vec![
-								CallTrace {
-									from: addr,
-									to: addr_callee,
-									input: 1u32.encode().into(),
-									output: Default::default(),
-									error: Some("ContractTrapped".to_string()),
-									call_type: Call,
-									value: Some(U256::from(0)),
-									..Default::default()
-								},
-								CallTrace {
-									from: addr,
-									to: addr,
-									input: (1u32, addr_callee).encode().into(),
-									call_type: Call,
-									logs: logs.clone(),
-									value: Some(U256::from(0)),
-									calls: vec![
-										CallTrace {
-											from: addr,
-											to: addr_callee,
-											input: 0u32.encode().into(),
-											output: 0u32.to_le_bytes().to_vec().into(),
-											call_type: Call,
-											value: Some(U256::from(0)),
-											..Default::default()
-										},
-										CallTrace {
-											from: addr,
-											to: addr,
-											input: (0u32, addr_callee).encode().into(),
-											call_type: Call,
-											value: Some(U256::from(0)),
-											calls: vec![
-												CallTrace {
-													from: addr,
-													to: BOB_ADDR,
-													value: Some(U256::from(100)),
-													call_type: CallType::Call,
-													..Default::default()
-												}
-											],
-											..Default::default()
-										},
-									],
-									..Default::default()
-								},
-							],
-							..Default::default()
-						},
-					]
-			};
-
-			let mut tracer = CallTracer::new(config, |_| U256::zero());
-			trace(&mut tracer, || {
-				builder::bare_call(addr).data((3u32, addr_callee).encode()).build()
-			});
-
-			let trace = tracer.collect_trace();
-			let expected_trace = CallTrace {
-					from: ALICE_ADDR,
-					to: addr,
-					input: (3u32, addr_callee).encode().into(),
-					call_type: Call,
-					logs: logs.clone(),
-					value: Some(U256::from(0)),
-					calls: calls,
-					..Default::default()
-				};
-
-			assert_eq!(
-				trace,
-				expected_trace.into(),
-			);
-		}
-	});
-}
-
-#[test]
-fn create_call_tracing_works() {
-	use crate::evm::*;
-	let (code, code_hash) = compile_module("create2_with_value").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000);
-
-		let mut tracer = CallTracer::new(Default::default(), |_| U256::zero());
-
-		let Contract { addr, .. } = trace(&mut tracer, || {
-			builder::bare_instantiate(Code::Upload(code.clone()))
-				.evm_value(100.into())
-				.salt(None)
-				.build_and_unwrap_contract()
-		});
-
-		let call_trace = tracer.collect_trace().unwrap();
-		assert_eq!(
-			call_trace,
-			CallTrace {
-				from: ALICE_ADDR,
-				to: addr,
-				value: Some(100.into()),
-				input: Bytes(code.clone()),
-				call_type: CallType::Create,
-				..Default::default()
-			}
-		);
-
-		let mut tracer = CallTracer::new(Default::default(), |_| U256::zero());
-		let data = b"garbage";
-		let input = (code_hash, data).encode();
-		trace(&mut tracer, || {
-			assert_ok!(builder::call(addr).data(input.clone()).build());
-		});
-
-		let call_trace = tracer.collect_trace().unwrap();
-		let child_addr = crate::address::create2(&addr, &code, data, &[1u8; 32]);
-
-		assert_eq!(
-			call_trace,
-			CallTrace {
-				from: ALICE_ADDR,
-				to: addr,
-				value: Some(0.into()),
-				input: input.clone().into(),
-				calls: vec![CallTrace {
-					from: addr,
-					input: input.clone().into(),
-					to: child_addr,
-					value: Some(0.into()),
-					call_type: CallType::Create2,
-					..Default::default()
-				},],
-				..Default::default()
-			}
-		);
-	});
-}
-
-#[test]
-fn prestate_tracing_works() {
-	use crate::evm::*;
-	use alloc::collections::BTreeMap;
-
-	let (dummy_code, _) = compile_module("dummy").unwrap();
-	let (code, _) = compile_module("tracing").unwrap();
-	let (callee_code, _) = compile_module("tracing_callee").unwrap();
-	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000);
-
-		let Contract { addr: addr_callee, .. } =
-			builder::bare_instantiate(Code::Upload(callee_code.clone()))
-				.build_and_unwrap_contract();
-
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code.clone()))
-			.native_value(10)
-			.build_and_unwrap_contract();
-
-		// redact balance so that tests are resilient to weight changes
-		let alice_redacted_balance = Some(U256::from(1));
-
-		let test_cases: Vec<(Box<dyn FnOnce()>, _, _)> = vec![
-			(
-				Box::new(|| {
-					builder::bare_call(addr)
-						.data((3u32, addr_callee).encode())
-						.build_and_unwrap_result();
-				}),
-				PrestateTracerConfig {
-					diff_mode: false,
-					disable_storage: false,
-					disable_code: false,
-				},
-				PrestateTrace::Prestate(BTreeMap::from([
-					(
-						ALICE_ADDR,
-						PrestateTraceInfo {
-							balance: alice_redacted_balance,
-							nonce: Some(2),
-							..Default::default()
-						},
-					),
-					(
-						BOB_ADDR,
-						PrestateTraceInfo { balance: Some(U256::from(0u64)), ..Default::default() },
-					),
-					(
-						addr_callee,
-						PrestateTraceInfo {
-							balance: Some(U256::from(0u64)),
-							code: Some(Bytes(callee_code.clone())),
-							nonce: Some(1),
-							..Default::default()
-						},
-					),
-					(
-						addr,
-						PrestateTraceInfo {
-							balance: Some(U256::from(10_000_000u64)),
-							code: Some(Bytes(code.clone())),
-							nonce: Some(1),
-							..Default::default()
-						},
-					),
-				])),
-			),
-			(
-				Box::new(|| {
-					builder::bare_call(addr)
-						.data((3u32, addr_callee).encode())
-						.build_and_unwrap_result();
-				}),
-				PrestateTracerConfig {
-					diff_mode: true,
-					disable_storage: false,
-					disable_code: false,
-				},
-				PrestateTrace::DiffMode {
-					pre: BTreeMap::from([
-						(
-							BOB_ADDR,
-							PrestateTraceInfo {
-								balance: Some(U256::from(100u64)),
-								..Default::default()
-							},
-						),
-						(
-							addr,
-							PrestateTraceInfo {
-								balance: Some(U256::from(9_999_900u64)),
-								code: Some(Bytes(code.clone())),
-								nonce: Some(1),
-								..Default::default()
-							},
-						),
-					]),
-					post: BTreeMap::from([
-						(
-							BOB_ADDR,
-							PrestateTraceInfo {
-								balance: Some(U256::from(200u64)),
-								..Default::default()
-							},
-						),
-						(
-							addr,
-							PrestateTraceInfo {
-								balance: Some(U256::from(9_999_800u64)),
-								..Default::default()
-							},
-						),
-					]),
-				},
-			),
-			(
-				Box::new(|| {
-					builder::bare_instantiate(Code::Upload(dummy_code.clone()))
-						.salt(None)
-						.build_and_unwrap_result();
-				}),
-				PrestateTracerConfig {
-					diff_mode: true,
-					disable_storage: false,
-					disable_code: false,
-				},
-				PrestateTrace::DiffMode {
-					pre: BTreeMap::from([(
-						ALICE_ADDR,
-						PrestateTraceInfo {
-							balance: alice_redacted_balance,
-							nonce: Some(2),
-							..Default::default()
-						},
-					)]),
-					post: BTreeMap::from([
-						(
-							ALICE_ADDR,
-							PrestateTraceInfo {
-								balance: alice_redacted_balance,
-								nonce: Some(3),
-								..Default::default()
-							},
-						),
-						(
-							create1(&ALICE_ADDR, 1),
-							PrestateTraceInfo {
-								code: Some(dummy_code.clone().into()),
-								balance: Some(U256::from(0)),
-								nonce: Some(1),
-								..Default::default()
-							},
-						),
-					]),
-				},
-			),
-		];
-
-		for (exec_call, config, expected_trace) in test_cases.into_iter() {
-			let mut tracer = PrestateTracer::<Test>::new(config);
-			trace(&mut tracer, || {
-				exec_call();
-			});
-
-			let mut trace = tracer.collect_trace();
-
-			// redact alice balance
-			match trace {
-				PrestateTrace::DiffMode { ref mut pre, ref mut post } => {
-					pre.get_mut(&ALICE_ADDR).map(|info| {
-						info.balance = alice_redacted_balance;
-					});
-					post.get_mut(&ALICE_ADDR).map(|info| {
-						info.balance = alice_redacted_balance;
-					});
-				},
-				PrestateTrace::Prestate(ref mut pre) => {
-					pre.get_mut(&ALICE_ADDR).map(|info| {
-						info.balance = alice_redacted_balance;
-					});
-				},
-			}
-
-			assert_eq!(trace, expected_trace);
-		}
-	});
-}
-
-#[test]
-fn unknown_precompiles_revert() {
-	let (code, _code_hash) = compile_module("read_only_call").unwrap();
-
-	ExtBuilder::default().build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		let cases: Vec<(H160, Box<dyn FnOnce(_)>)> = vec![(
-			H160::from_low_u64_be(0x0a),
-			Box::new(|result| {
-				assert_err!(result, <Error<Test>>::UnsupportedPrecompileAddress);
-			}),
-		)];
-
-		for (callee_addr, assert_result) in cases {
-			let result =
-				builder::bare_call(addr).data((callee_addr, [0u8; 0]).encode()).build().result;
-			assert_result(result);
-		}
-	});
-}
-
-#[test]
-fn pure_precompile_works() {
-	use hex_literal::hex;
-
-	let cases = vec![
-		(
-			"ECRecover",
-			H160::from_low_u64_be(1),
-			hex!("18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c000000000000000000000000000000000000000000000000000000000000001c73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549").to_vec(),
-			hex!("000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b").to_vec(),
-		),
-		(
-			"Sha256",
-			H160::from_low_u64_be(2),
-			hex!("ec07171c4f0f0e2b").to_vec(),
-			hex!("d0591ea667763c69a5f5a3bae657368ea63318b2c9c8349cccaf507e3cbd7c7a").to_vec(),
-		),
-		(
-			"Ripemd160",
-			H160::from_low_u64_be(3),
-			hex!("ec07171c4f0f0e2b").to_vec(),
-			hex!("000000000000000000000000a9c5ebaf7589fd8acfd542c3a008956de84fbeb7").to_vec(),
-		),
-		(
-			"Identity",
-			H160::from_low_u64_be(4),
-			[42u8; 128].to_vec(),
-			[42u8; 128].to_vec(),
-		),
-		(
-			"Modexp",
-			H160::from_low_u64_be(5),
-			hex!("00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f").to_vec(),
-			hex!("0000000000000000000000000000000000000000000000000000000000000001").to_vec(),
-		),
-		(
-			"Bn128Add",
-			H160::from_low_u64_be(6),
-			hex!("18b18acfb4c2c30276db5411368e7185b311dd124691610c5d3b74034e093dc9063c909c4720840cb5134cb9f59fa749755796819658d32efc0d288198f3726607c2b7f58a84bd6145f00c9c2bc0bb1a187f20ff2c92963a88019e7c6a014eed06614e20c147e940f2d70da3f74c9a17df361706a4485c742bd6788478fa17d7").to_vec(),
-			hex!("2243525c5efd4b9c3d3c45ac0ca3fe4dd85e830a4ce6b65fa1eeaee202839703301d1d33be6da8e509df21cc35964723180eed7532537db9ae5e7d48f195c915").to_vec(),
-		),
-		(
-			"Bn128Mul",
-			H160::from_low_u64_be(7),
-			hex!("2bd3e6d0f3b142924f5ca7b49ce5b9d54c4703d7ae5648e61d02268b1a0a9fb721611ce0a6af85915e2f1d70300909ce2e49dfad4a4619c8390cae66cefdb20400000000000000000000000000000000000000000000000011138ce750fa15c2").to_vec(),
-			hex!("070a8d6a982153cae4be29d434e8faef8a47b274a053f5a4ee2a6c9c13c31e5c031b8ce914eba3a9ffb989f9cdd5b0f01943074bf4f0f315690ec3cec6981afc").to_vec(),
-		),
-		(
-			"Bn128Pairing",
-			H160::from_low_u64_be(8),
-			hex!("1c76476f4def4bb94541d57ebba1193381ffa7aa76ada664dd31c16024c43f593034dd2920f673e204fee2811c678745fc819b55d3e9d294e45c9b03a76aef41209dd15ebff5d46c4bd888e51a93cf99a7329636c63514396b4a452003a35bf704bf11ca01483bfa8b34b43561848d28905960114c8ac04049af4b6315a416782bb8324af6cfc93537a2ad1a445cfd0ca2a71acd7ac41fadbf933c2a51be344d120a2a4cf30c1bf9845f20c6fe39e07ea2cce61f0c9bb048165fe5e4de877550111e129f1cf1097710d41c4ac70fcdfa5ba2023c6ff1cbeac322de49d1b6df7c2032c61a830e3c17286de9462bf242fca2883585b93870a73853face6a6bf411198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa").to_vec(),
-			hex!("0000000000000000000000000000000000000000000000000000000000000001").to_vec(),
-		),
-		(
-			"Blake2F",
-			H160::from_low_u64_be(9),
-			hex!("0000000048c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b61626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000001").to_vec(),
-			hex!("08c9bcf367e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d282e6ad7f520e511f6c3e2b8c68059b9442be0454267ce079217e1319cde05b").to_vec(),
-		),
-	];
-
-	for (description, precompile_addr, input, output) in cases {
-		let (code, _code_hash) = compile_module("call_and_return").unwrap();
-		ExtBuilder::default().build().execute_with(|| {
-			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-			let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-				.native_value(1_000)
-				.build_and_unwrap_contract();
-
-			let result = builder::bare_call(addr)
-				.data(
-					(&precompile_addr, 100u64)
-						.encode()
-						.into_iter()
-						.chain(input)
-						.collect::<Vec<_>>(),
-				)
-				.build_and_unwrap_result();
-
-			assert_eq!(
-				Pallet::<Test>::evm_balance(&precompile_addr),
-				U256::from(100),
-				"{description}: unexpected balance"
-			);
-			assert_eq!(
-				alloy_core::hex::encode(result.data),
-				alloy_core::hex::encode(output),
-				"{description} Unexpected output for precompile: {precompile_addr:?}",
-			);
-			assert_eq!(result.flags, ReturnFlags::empty());
-		});
-	}
-}
-
-#[test]
-fn precompiles_work() {
-	use crate::precompiles::Precompile;
-	use alloy_core::sol_types::{Panic, PanicKind, Revert, SolError, SolInterface, SolValue};
-	use precompiles::{INoInfo, NoInfo};
-
-	let precompile_addr = H160(NoInfo::<Test>::MATCHER.base_address());
-
-	let cases = vec![
-		(
-			INoInfo::INoInfoCalls::identity(INoInfo::identityCall { number: 42u64.into() })
-				.abi_encode(),
-			42u64.abi_encode(),
-			RuntimeReturnCode::Success,
-		),
-		(
-			INoInfo::INoInfoCalls::reverts(INoInfo::revertsCall { error: "panic".to_string() })
-				.abi_encode(),
-			Revert::from("panic").abi_encode(),
-			RuntimeReturnCode::CalleeReverted,
-		),
-		(
-			INoInfo::INoInfoCalls::panics(INoInfo::panicsCall {}).abi_encode(),
-			Panic::from(PanicKind::Assert).abi_encode(),
-			RuntimeReturnCode::CalleeReverted,
-		),
-		(
-			INoInfo::INoInfoCalls::errors(INoInfo::errorsCall {}).abi_encode(),
-			Vec::new(),
-			RuntimeReturnCode::CalleeTrapped,
-		),
-		// passing non decodeable input reverts with solidity panic
-		(
-			b"invalid".to_vec(),
-			Panic::from(PanicKind::ResourceError).abi_encode(),
-			RuntimeReturnCode::CalleeReverted,
-		),
-		(
-			INoInfo::INoInfoCalls::passData(INoInfo::passDataCall {
-				inputLen: limits::CALLDATA_BYTES,
-			})
-			.abi_encode(),
-			Vec::new(),
-			RuntimeReturnCode::Success,
-		),
-		(
-			INoInfo::INoInfoCalls::passData(INoInfo::passDataCall {
-				inputLen: limits::CALLDATA_BYTES + 1,
-			})
-			.abi_encode(),
-			Vec::new(),
-			RuntimeReturnCode::CalleeTrapped,
-		),
-		(
-			INoInfo::INoInfoCalls::returnData(INoInfo::returnDataCall {
-				returnLen: limits::CALLDATA_BYTES - 4,
-			})
-			.abi_encode(),
-			vec![42u8; limits::CALLDATA_BYTES as usize - 4],
-			RuntimeReturnCode::Success,
-		),
-		(
-			INoInfo::INoInfoCalls::returnData(INoInfo::returnDataCall {
-				returnLen: limits::CALLDATA_BYTES + 1,
-			})
-			.abi_encode(),
-			vec![],
-			RuntimeReturnCode::CalleeTrapped,
-		),
-	];
-
-	for (input, output, error_code) in cases {
-		let (code, _code_hash) = compile_module("call_and_returncode").unwrap();
-		ExtBuilder::default().build().execute_with(|| {
-			let id = <Test as Config>::AddressMapper::to_account_id(&precompile_addr);
-			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-			let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-				.native_value(1000)
-				.build_and_unwrap_contract();
-
-			let result = builder::bare_call(addr)
-				.data(
-					(&precompile_addr, 0u64).encode().into_iter().chain(input).collect::<Vec<_>>(),
-				)
-				.build_and_unwrap_result();
-
-			// no account or contract info should be created for a NoInfo pre-compile
-			assert!(test_utils::get_contract_checked(&precompile_addr).is_none());
-			assert!(!System::account_exists(&id));
-			assert_eq!(Pallet::<Test>::evm_balance(&precompile_addr), U256::zero());
-
-			assert_eq!(result.flags, ReturnFlags::empty());
-			assert_eq!(u32::from_le_bytes(result.data[..4].try_into().unwrap()), error_code as u32);
-			assert_eq!(
-				&result.data[4..],
-				&output,
-				"Unexpected output for precompile: {precompile_addr:?}",
-			);
-		});
-	}
-}
-
-#[test]
-fn precompiles_with_info_creates_contract() {
-	use crate::precompiles::Precompile;
-	use alloy_core::sol_types::SolInterface;
-	use precompiles::{IWithInfo, WithInfo};
-
-	let precompile_addr = H160(WithInfo::<Test>::MATCHER.base_address());
-
-	let cases = vec![(
-		IWithInfo::IWithInfoCalls::dummy(IWithInfo::dummyCall {}).abi_encode(),
-		Vec::<u8>::new(),
-		RuntimeReturnCode::Success,
-	)];
-
-	for (input, output, error_code) in cases {
-		let (code, _code_hash) = compile_module("call_and_returncode").unwrap();
-		ExtBuilder::default().build().execute_with(|| {
-			let id = <Test as Config>::AddressMapper::to_account_id(&precompile_addr);
-			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-			let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-				.native_value(1000)
-				.build_and_unwrap_contract();
-
-			let result = builder::bare_call(addr)
-				.data(
-					(&precompile_addr, 0u64).encode().into_iter().chain(input).collect::<Vec<_>>(),
-				)
-				.build_and_unwrap_result();
-
-			// a pre-compile with contract info should create an account on first call
-			assert!(test_utils::get_contract_checked(&precompile_addr).is_some());
-			assert!(System::account_exists(&id));
-			assert_eq!(Pallet::<Test>::evm_balance(&precompile_addr), U256::from(0));
-
-			assert_eq!(result.flags, ReturnFlags::empty());
-			assert_eq!(u32::from_le_bytes(result.data[..4].try_into().unwrap()), error_code as u32);
-			assert_eq!(
-				&result.data[4..],
-				&output,
-				"Unexpected output for precompile: {precompile_addr:?}",
-			);
-		});
-	}
-}
-
-#[test]
-fn bump_nonce_once_works() {
-	let (code, hash) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		frame_system::Account::<Test>::mutate(&ALICE, |account| account.nonce = 1);
-
-		let _ = <Test as Config>::Currency::set_balance(&BOB, 1_000_000);
-		frame_system::Account::<Test>::mutate(&BOB, |account| account.nonce = 1);
-
-		builder::bare_instantiate(Code::Upload(code.clone()))
-			.origin(RuntimeOrigin::signed(ALICE))
-			.bump_nonce(BumpNonce::Yes)
-			.salt(None)
-			.build_and_unwrap_result();
-		assert_eq!(System::account_nonce(&ALICE), 2);
-
-		// instantiate again is ok
-		let result = builder::bare_instantiate(Code::Existing(hash))
-			.origin(RuntimeOrigin::signed(ALICE))
-			.bump_nonce(BumpNonce::Yes)
-			.salt(None)
-			.build()
-			.result;
-		assert!(result.is_ok());
-
-		builder::bare_instantiate(Code::Upload(code.clone()))
-			.origin(RuntimeOrigin::signed(BOB))
-			.bump_nonce(BumpNonce::No)
-			.salt(None)
-			.build_and_unwrap_result();
-		assert_eq!(System::account_nonce(&BOB), 1);
-
-		// instantiate again should fail
-		let err = builder::bare_instantiate(Code::Upload(code))
-			.origin(RuntimeOrigin::signed(BOB))
-			.bump_nonce(BumpNonce::No)
-			.salt(None)
-			.build()
-			.result
-			.unwrap_err();
-
-		assert_eq!(err, <Error<Test>>::DuplicateContract.into());
-	});
-}
-
-#[test]
-fn code_size_for_precompiles_works() {
-	use crate::precompiles::Precompile;
-	use precompiles::NoInfo;
-
-	let builtin_precompile = H160(NoInfo::<Test>::MATCHER.base_address());
-	let primitive_precompile = H160::from_low_u64_be(1);
-
-	let (code, _code_hash) = compile_module("extcodesize").unwrap();
-	ExtBuilder::default().build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
-			.native_value(1000)
-			.build_and_unwrap_contract();
-
-		// the primitive pre-compiles return 0 code size on eth
-		builder::bare_call(addr)
-			.data((&primitive_precompile, 0u64).encode())
-			.build_and_unwrap_result();
-
-		// other precompiles should return the minimal evm revert code
-		builder::bare_call(addr)
-			.data((&builtin_precompile, 5u64).encode())
-			.build_and_unwrap_result();
-	});
-}
-
-#[test]
-fn call_data_limit_is_enforced_subcalls() {
-	let (code, _code_hash) = compile_module("call_with_input_size").unwrap();
-
-	ExtBuilder::default().build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		let cases: Vec<(u32, Box<dyn FnOnce(_)>)> = vec![
-			(
-				0_u32,
-				Box::new(|result| {
-					assert_ok!(result);
-				}),
-			),
-			(
-				1_u32,
-				Box::new(|result| {
-					assert_ok!(result);
-				}),
-			),
-			(
-				limits::CALLDATA_BYTES,
-				Box::new(|result| {
-					assert_ok!(result);
-				}),
-			),
-			(
-				limits::CALLDATA_BYTES + 1,
-				Box::new(|result| {
-					assert_err!(result, <Error<Test>>::CallDataTooLarge);
-				}),
-			),
-		];
-
-		for (callee_input_size, assert_result) in cases {
-			let result = builder::bare_call(addr).data(callee_input_size.encode()).build().result;
-			assert_result(result);
-		}
-	});
-}
-
-#[test]
-fn call_data_limit_is_enforced_root_call() {
-	let (code, _code_hash) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		let cases: Vec<(H160, u32, Box<dyn FnOnce(_)>)> = vec![
-			(
-				addr,
-				0_u32,
-				Box::new(|result| {
-					assert_ok!(result);
-				}),
-			),
-			(
-				addr,
-				1_u32,
-				Box::new(|result| {
-					assert_ok!(result);
-				}),
-			),
-			(
-				addr,
-				limits::CALLDATA_BYTES,
-				Box::new(|result| {
-					assert_ok!(result);
-				}),
-			),
-			(
-				addr,
-				limits::CALLDATA_BYTES + 1,
-				Box::new(|result| {
-					assert_err!(result, <Error<Test>>::CallDataTooLarge);
-				}),
-			),
-			(
-				// limit is not enforced when tx calls EOA
-				BOB_ADDR,
-				limits::CALLDATA_BYTES + 1,
-				Box::new(|result| {
-					assert_ok!(result);
-				}),
-			),
-		];
-
-		for (addr, callee_input_size, assert_result) in cases {
-			let result = builder::bare_call(addr)
-				.data(vec![42; callee_input_size as usize])
-				.build()
-				.result;
-			assert_result(result);
-		}
-	});
-}
-
-#[test]
-fn return_data_limit_is_enforced() {
-	let (code, _code_hash) = compile_module("return_sized").unwrap();
-
-	ExtBuilder::default().build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-		let cases: Vec<(u32, Box<dyn FnOnce(_)>)> = vec![
-			(
-				1_u32,
-				Box::new(|result| {
-					assert_ok!(result);
-				}),
-			),
-			(
-				limits::CALLDATA_BYTES,
-				Box::new(|result| {
-					assert_ok!(result);
-				}),
-			),
-			(
-				limits::CALLDATA_BYTES + 1,
-				Box::new(|result| {
-					assert_err!(result, <Error<Test>>::ReturnDataTooLarge);
-				}),
-			),
-		];
-
-		for (return_size, assert_result) in cases {
-			let result = builder::bare_call(addr).data(return_size.encode()).build().result;
-			assert_result(result);
-		}
-	});
-}
diff --git a/substrate/frame/revive/src/tests/pvm.rs b/substrate/frame/revive/src/tests/pvm.rs
new file mode 100644
index 000000000000..c0ce54a6e475
--- /dev/null
+++ b/substrate/frame/revive/src/tests/pvm.rs
@@ -0,0 +1,4933 @@
+// 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.
+
+//! The pallet-revive PVM specific integration test suite.
+
+use super::{
+	precompiles,
+	precompiles::{INoInfo, NoInfo},
+};
+use crate::{
+	address::{create1, create2, AddressMapper},
+	assert_refcount, assert_return_code,
+	evm::{runtime::GAS_PRICE, CallTrace, CallTracer, CallType, GenericTransaction},
+	exec::Key,
+	limits,
+	storage::DeletionQueueManager,
+	test_utils::builder::Contract,
+	tests::{
+		builder, initialize_block, test_utils::*, Balances, CodeHashLockupDepositPercent,
+		Contracts, DepositPerByte, DepositPerItem, ExtBuilder, InstantiateAccount, RuntimeCall,
+		RuntimeEvent, RuntimeOrigin, System, Test, UploadAccount, DEPOSIT_PER_BYTE, *,
+	},
+	tracing::trace,
+	weights::WeightInfo,
+	AccountInfo, AccountInfoOf, BalanceWithDust, BumpNonce, Code, Config, ContractInfo,
+	DeletionQueueCounter, DepositLimit, Error, EthTransactError, HoldReason, Pallet, PristineCode,
+	StorageDeposit, H160,
+};
+use assert_matches::assert_matches;
+use codec::Encode;
+use frame_support::{
+	assert_err, assert_err_ignore_postinfo, assert_noop, assert_ok,
+	storage::child,
+	traits::{
+		fungible::{BalancedHold, Inspect, Mutate, MutateHold},
+		tokens::Preservation,
+		OnIdle, OnInitialize,
+	},
+	weights::{Weight, WeightMeter},
+};
+use frame_system::{EventRecord, Phase};
+use pallet_revive_fixtures::compile_module;
+use pallet_revive_uapi::{ReturnErrorCode as RuntimeReturnCode, ReturnFlags};
+use pretty_assertions::{assert_eq, assert_ne};
+use sp_core::{Get, U256};
+use sp_io::hashing::blake2_256;
+use sp_runtime::{testing::H256, traits::Zero, AccountId32, DispatchError, TokenError};
+
+#[test]
+fn transfer_with_dust_works() {
+	struct TestCase {
+		description: &'static str,
+		from_balance: BalanceWithDust<u64>,
+		to_balance: BalanceWithDust<u64>,
+		amount: BalanceWithDust<u64>,
+		expected_from_balance: BalanceWithDust<u64>,
+		expected_to_balance: BalanceWithDust<u64>,
+		total_issuance_diff: i64,
+	}
+
+	let plank: u32 = <Test as Config>::NativeToEthRatio::get();
+
+	let test_cases = vec![
+		TestCase {
+			description: "without dust",
+			from_balance: BalanceWithDust::new_unchecked::<Test>(100, 0),
+			to_balance: BalanceWithDust::new_unchecked::<Test>(0, 0),
+			amount: BalanceWithDust::new_unchecked::<Test>(1, 0),
+			expected_from_balance: BalanceWithDust::new_unchecked::<Test>(99, 0),
+			expected_to_balance: BalanceWithDust::new_unchecked::<Test>(1, 0),
+			total_issuance_diff: 0,
+		},
+		TestCase {
+			description: "with dust",
+			from_balance: BalanceWithDust::new_unchecked::<Test>(100, 0),
+			to_balance: BalanceWithDust::new_unchecked::<Test>(0, 0),
+			amount: BalanceWithDust::new_unchecked::<Test>(1, 10),
+			expected_from_balance: BalanceWithDust::new_unchecked::<Test>(98, plank - 10),
+			expected_to_balance: BalanceWithDust::new_unchecked::<Test>(1, 10),
+			total_issuance_diff: 1,
+		},
+		TestCase {
+			description: "just dust",
+			from_balance: BalanceWithDust::new_unchecked::<Test>(100, 0),
+			to_balance: BalanceWithDust::new_unchecked::<Test>(0, 0),
+			amount: BalanceWithDust::new_unchecked::<Test>(0, 10),
+			expected_from_balance: BalanceWithDust::new_unchecked::<Test>(99, plank - 10),
+			expected_to_balance: BalanceWithDust::new_unchecked::<Test>(0, 10),
+			total_issuance_diff: 1,
+		},
+		TestCase {
+			description: "with existing dust",
+			from_balance: BalanceWithDust::new_unchecked::<Test>(100, 5),
+			to_balance: BalanceWithDust::new_unchecked::<Test>(0, plank - 5),
+			amount: BalanceWithDust::new_unchecked::<Test>(1, 10),
+			expected_from_balance: BalanceWithDust::new_unchecked::<Test>(98, plank - 5),
+			expected_to_balance: BalanceWithDust::new_unchecked::<Test>(2, 5),
+			total_issuance_diff: 0,
+		},
+		TestCase {
+			description: "with enough existing dust",
+			from_balance: BalanceWithDust::new_unchecked::<Test>(100, 10),
+			to_balance: BalanceWithDust::new_unchecked::<Test>(0, plank - 10),
+			amount: BalanceWithDust::new_unchecked::<Test>(1, 10),
+			expected_from_balance: BalanceWithDust::new_unchecked::<Test>(99, 0),
+			expected_to_balance: BalanceWithDust::new_unchecked::<Test>(2, 0),
+			total_issuance_diff: -1,
+		},
+		TestCase {
+			description: "receiver dust less than 1 plank",
+			from_balance: BalanceWithDust::new_unchecked::<Test>(100, plank / 10),
+			to_balance: BalanceWithDust::new_unchecked::<Test>(0, plank / 2),
+			amount: BalanceWithDust::new_unchecked::<Test>(1, plank / 10 * 3),
+			expected_from_balance: BalanceWithDust::new_unchecked::<Test>(98, plank / 10 * 8),
+			expected_to_balance: BalanceWithDust::new_unchecked::<Test>(1, plank / 10 * 8),
+			total_issuance_diff: 1,
+		},
+	];
+
+	for TestCase {
+		description,
+		from_balance,
+		to_balance,
+		amount,
+		expected_from_balance,
+		expected_to_balance,
+		total_issuance_diff,
+	} in test_cases.into_iter()
+	{
+		ExtBuilder::default().build().execute_with(|| {
+			set_balance_with_dust(&ALICE_ADDR, from_balance);
+			set_balance_with_dust(&BOB_ADDR, to_balance);
+
+			let total_issuance = <Test as Config>::Currency::total_issuance();
+			let evm_value = Pallet::<Test>::convert_native_to_evm(amount);
+
+			let (value, dust) = amount.deconstruct();
+			assert_eq!(Pallet::<Test>::has_dust(evm_value), !dust.is_zero());
+			assert_eq!(Pallet::<Test>::has_balance(evm_value), !value.is_zero());
+
+			let result =
+				builder::bare_call(BOB_ADDR).evm_value(evm_value).build_and_unwrap_result();
+			assert_eq!(result, Default::default(), "{description} tx failed");
+
+			assert_eq!(
+				Pallet::<Test>::evm_balance(&ALICE_ADDR),
+				Pallet::<Test>::convert_native_to_evm(expected_from_balance),
+				"{description}: invalid from balance"
+			);
+
+			assert_eq!(
+				Pallet::<Test>::evm_balance(&BOB_ADDR),
+				Pallet::<Test>::convert_native_to_evm(expected_to_balance),
+				"{description}: invalid to balance"
+			);
+
+			assert_eq!(
+				total_issuance as i64 - total_issuance_diff,
+				<Test as Config>::Currency::total_issuance() as i64,
+				"{description}: total issuance should match"
+			);
+		});
+	}
+}
+
+#[test]
+fn eth_call_transfer_with_dust_works() {
+	let (binary, _) = compile_module("dummy").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
+
+		let balance =
+			Pallet::<Test>::convert_native_to_evm(BalanceWithDust::new_unchecked::<Test>(100, 10));
+		assert_ok!(builder::eth_call(addr).value(balance).build());
+
+		assert_eq!(Pallet::<Test>::evm_balance(&addr), balance);
+	});
+}
+
+#[test]
+fn contract_call_transfer_with_dust_works() {
+	let (binary_caller, _code_hash_caller) = compile_module("call_with_value").unwrap();
+	let (binary_callee, _code_hash_callee) = compile_module("dummy").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let Contract { addr: addr_caller, .. } =
+			builder::bare_instantiate(Code::Upload(binary_caller))
+				.native_value(200)
+				.build_and_unwrap_contract();
+		let Contract { addr: addr_callee, .. } =
+			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
+
+		let balance =
+			Pallet::<Test>::convert_native_to_evm(BalanceWithDust::new_unchecked::<Test>(100, 10));
+		assert_ok!(builder::call(addr_caller).data((balance, addr_callee).encode()).build());
+
+		assert_eq!(Pallet::<Test>::evm_balance(&addr_callee), balance);
+	});
+}
+
+#[test]
+fn deposit_limit_enforced_on_plain_transfer() {
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let _ = <Test as Config>::Currency::set_balance(&BOB, 1_000_000);
+
+		// sending balance to a new account should fail when the limit is lower than the ed
+		let result = builder::bare_call(CHARLIE_ADDR)
+			.native_value(1)
+			.storage_deposit_limit(190.into())
+			.build();
+		assert_err!(result.result, <Error<Test>>::StorageDepositLimitExhausted);
+		assert_eq!(result.storage_deposit, StorageDeposit::Charge(0));
+		assert_eq!(get_balance(&CHARLIE), 0);
+
+		// works when the account is prefunded
+		let result = builder::bare_call(BOB_ADDR)
+			.native_value(1)
+			.storage_deposit_limit(0.into())
+			.build();
+		assert_ok!(result.result);
+		assert_eq!(result.storage_deposit, StorageDeposit::Charge(0));
+		assert_eq!(get_balance(&BOB), 1_000_001);
+
+		// also works allowing enough deposit
+		let result = builder::bare_call(CHARLIE_ADDR)
+			.native_value(1)
+			.storage_deposit_limit(200.into())
+			.build();
+		assert_ok!(result.result);
+		assert_eq!(result.storage_deposit, StorageDeposit::Charge(200));
+		assert_eq!(get_balance(&CHARLIE), 201);
+	});
+}
+
+#[test]
+fn instantiate_and_call_and_deposit_event() {
+	let (binary, code_hash) = compile_module("event_and_return_on_deploy").unwrap();
+
+	ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let min_balance = Contracts::min_balance();
+		let value = 100;
+
+		// We determine the storage deposit limit after uploading because it depends on ALICEs
+		// free balance which is changed by uploading a module.
+		assert_ok!(Contracts::upload_code(
+			RuntimeOrigin::signed(ALICE),
+			binary,
+			deposit_limit::<Test>(),
+		));
+
+		// Drop previous events
+		initialize_block(2);
+
+		// Check at the end to get hash on error easily
+		let Contract { addr, account_id } = builder::bare_instantiate(Code::Existing(code_hash))
+			.native_value(value)
+			.build_and_unwrap_contract();
+		assert!(AccountInfoOf::<Test>::contains_key(&addr));
+
+		let hold_balance = contract_base_deposit(&addr);
+
+		assert_eq!(
+			System::events(),
+			vec![
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::System(frame_system::Event::NewAccount {
+						account: account_id.clone()
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::Endowed {
+						account: account_id.clone(),
+						free_balance: min_balance,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
+						from: ALICE,
+						to: account_id.clone(),
+						amount: min_balance,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
+						from: ALICE,
+						to: account_id.clone(),
+						amount: value,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Contracts(crate::Event::ContractEmitted {
+						contract: addr,
+						data: vec![1, 2, 3, 4],
+						topics: vec![H256::repeat_byte(42)],
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Contracts(crate::Event::Instantiated {
+						deployer: ALICE_ADDR,
+						contract: addr
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::TransferAndHold {
+						reason: <Test as Config>::RuntimeHoldReason::Contracts(
+							HoldReason::StorageDepositReserve,
+						),
+						source: ALICE,
+						dest: account_id.clone(),
+						transferred: hold_balance,
+					}),
+					topics: vec![],
+				},
+			]
+		);
+	});
+}
+
+#[test]
+fn create1_address_from_extrinsic() {
+	let (binary, code_hash) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		assert_ok!(Contracts::upload_code(
+			RuntimeOrigin::signed(ALICE),
+			binary.clone(),
+			deposit_limit::<Test>(),
+		));
+
+		assert_eq!(System::account_nonce(&ALICE), 0);
+		System::inc_account_nonce(&ALICE);
+
+		for nonce in 1..3 {
+			let Contract { addr, .. } = builder::bare_instantiate(Code::Existing(code_hash))
+				.salt(None)
+				.build_and_unwrap_contract();
+			assert!(AccountInfoOf::<Test>::contains_key(&addr));
+			assert_eq!(
+				addr,
+				create1(&<Test as Config>::AddressMapper::to_address(&ALICE), nonce - 1)
+			);
+		}
+		assert_eq!(System::account_nonce(&ALICE), 3);
+
+		for nonce in 3..6 {
+			let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary.clone()))
+				.salt(None)
+				.build_and_unwrap_contract();
+			assert!(AccountInfoOf::<Test>::contains_key(&addr));
+			assert_eq!(
+				addr,
+				create1(&<Test as Config>::AddressMapper::to_address(&ALICE), nonce - 1)
+			);
+		}
+		assert_eq!(System::account_nonce(&ALICE), 6);
+	});
+}
+
+#[test]
+fn deposit_event_max_value_limit() {
+	let (binary, _code_hash) = compile_module("event_size").unwrap();
+
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		// Create
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
+			.native_value(30_000)
+			.build_and_unwrap_contract();
+
+		// Call contract with allowed storage value.
+		assert_ok!(builder::call(addr)
+			.gas_limit(GAS_LIMIT.set_ref_time(GAS_LIMIT.ref_time() * 2)) // we are copying a huge buffer,
+			.data(limits::PAYLOAD_BYTES.encode())
+			.build());
+
+		// Call contract with too large a storage value.
+		assert_err_ignore_postinfo!(
+			builder::call(addr).data((limits::PAYLOAD_BYTES + 1).encode()).build(),
+			Error::<Test>::ValueTooLarge,
+		);
+	});
+}
+
+// Fail out of fuel (ref_time weight) in the engine.
+#[test]
+fn run_out_of_fuel_engine() {
+	let (binary, _code_hash) = compile_module("run_out_of_gas").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let min_balance = Contracts::min_balance();
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
+			.native_value(100 * min_balance)
+			.build_and_unwrap_contract();
+
+		// Call the contract with a fixed gas limit. It must run out of gas because it just
+		// loops forever.
+		assert_err_ignore_postinfo!(
+			builder::call(addr)
+				.gas_limit(Weight::from_parts(10_000_000_000, u64::MAX))
+				.build(),
+			Error::<Test>::OutOfGas,
+		);
+	});
+}
+
+// Fail out of fuel (ref_time weight) in the host.
+#[test]
+fn run_out_of_fuel_host() {
+	use crate::precompiles::Precompile;
+	use alloy_core::sol_types::SolInterface;
+
+	let precompile_addr = H160(NoInfo::<Test>::MATCHER.base_address());
+	let input = INoInfo::INoInfoCalls::consumeMaxGas(INoInfo::consumeMaxGasCall {}).abi_encode();
+
+	ExtBuilder::default().build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+		let result = builder::bare_call(precompile_addr).data(input).build().result;
+		assert_err!(result, <Error<Test>>::OutOfGas);
+	});
+}
+
+#[test]
+fn gas_syncs_work() {
+	let (code, _code_hash) = compile_module("caller_is_origin_n").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let contract = builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		let result = builder::bare_call(contract.addr).data(0u32.encode()).build();
+		assert_ok!(result.result);
+		let engine_consumed_noop = result.gas_consumed.ref_time();
+
+		let result = builder::bare_call(contract.addr).data(1u32.encode()).build();
+		assert_ok!(result.result);
+		let gas_consumed_once = result.gas_consumed.ref_time();
+		let host_consumed_once = <Test as Config>::WeightInfo::seal_caller_is_origin().ref_time();
+		let engine_consumed_once = gas_consumed_once - host_consumed_once - engine_consumed_noop;
+
+		let result = builder::bare_call(contract.addr).data(2u32.encode()).build();
+		assert_ok!(result.result);
+		let gas_consumed_twice = result.gas_consumed.ref_time();
+		let host_consumed_twice = host_consumed_once * 2;
+		let engine_consumed_twice = gas_consumed_twice - host_consumed_twice - engine_consumed_noop;
+
+		// Second contract just repeats first contract's instructions twice.
+		// If runtime syncs gas with the engine properly, this should pass.
+		assert_eq!(engine_consumed_twice, engine_consumed_once * 2);
+	});
+}
+
+/// Check that contracts with the same account id have different trie ids.
+/// Check the `Nonce` storage item for more information.
+#[test]
+fn instantiate_unique_trie_id() {
+	let (binary, code_hash) = compile_module("self_destruct").unwrap();
+
+	ExtBuilder::default().existential_deposit(500).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		Contracts::upload_code(RuntimeOrigin::signed(ALICE), binary, deposit_limit::<Test>())
+			.unwrap();
+
+		// Instantiate the contract and store its trie id for later comparison.
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Existing(code_hash)).build_and_unwrap_contract();
+		let trie_id = get_contract(&addr).trie_id;
+
+		// Try to instantiate it again without termination should yield an error.
+		assert_err_ignore_postinfo!(
+			builder::instantiate(code_hash).build(),
+			<Error<Test>>::DuplicateContract,
+		);
+
+		// Terminate the contract.
+		assert_ok!(builder::call(addr).build());
+
+		// Re-Instantiate after termination.
+		assert_ok!(builder::instantiate(code_hash).build());
+
+		// Trie ids shouldn't match or we might have a collision
+		assert_ne!(trie_id, get_contract(&addr).trie_id);
+	});
+}
+
+#[test]
+fn storage_work() {
+	let (code, _code_hash) = compile_module("storage").unwrap();
+
+	ExtBuilder::default().build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let min_balance = Contracts::min_balance();
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
+			.native_value(min_balance * 100)
+			.build_and_unwrap_contract();
+
+		builder::bare_call(addr).build_and_unwrap_result();
+	});
+}
+
+#[test]
+fn storage_max_value_limit() {
+	let (binary, _code_hash) = compile_module("storage_size").unwrap();
+
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		// Create
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
+			.native_value(30_000)
+			.build_and_unwrap_contract();
+		get_contract(&addr);
+
+		// Call contract with allowed storage value.
+		assert_ok!(builder::call(addr)
+			.gas_limit(GAS_LIMIT.set_ref_time(GAS_LIMIT.ref_time() * 2)) // we are copying a huge buffer
+			.data(limits::PAYLOAD_BYTES.encode())
+			.build());
+
+		// Call contract with too large a storage value.
+		assert_err_ignore_postinfo!(
+			builder::call(addr).data((limits::PAYLOAD_BYTES + 1).encode()).build(),
+			Error::<Test>::ValueTooLarge,
+		);
+	});
+}
+
+#[test]
+fn clear_storage_on_zero_value() {
+	let (code, _code_hash) = compile_module("clear_storage_on_zero_value").unwrap();
+
+	ExtBuilder::default().build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let min_balance = Contracts::min_balance();
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
+			.native_value(min_balance * 100)
+			.build_and_unwrap_contract();
+
+		builder::bare_call(addr).build_and_unwrap_result();
+	});
+}
+
+#[test]
+fn transient_storage_work() {
+	let (code, _code_hash) = compile_module("transient_storage").unwrap();
+
+	ExtBuilder::default().build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let min_balance = Contracts::min_balance();
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
+			.native_value(min_balance * 100)
+			.build_and_unwrap_contract();
+
+		builder::bare_call(addr).build_and_unwrap_result();
+	});
+}
+
+#[test]
+fn transient_storage_limit_in_call() {
+	let (binary_caller, _code_hash_caller) =
+		compile_module("create_transient_storage_and_call").unwrap();
+	let (binary_callee, _code_hash_callee) = compile_module("set_transient_storage").unwrap();
+	ExtBuilder::default().build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create both contracts: Constructors do nothing.
+		let Contract { addr: addr_caller, .. } =
+			builder::bare_instantiate(Code::Upload(binary_caller)).build_and_unwrap_contract();
+		let Contract { addr: addr_callee, .. } =
+			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
+
+		// Call contracts with storage values within the limit.
+		// Caller and Callee contracts each set a transient storage value of size 100.
+		assert_ok!(builder::call(addr_caller)
+			.data((100u32, 100u32, &addr_callee).encode())
+			.build(),);
+
+		// Call a contract with a storage value that is too large.
+		// Limit exceeded in the caller contract.
+		assert_err_ignore_postinfo!(
+			builder::call(addr_caller)
+				.data((4u32 * 1024u32, 200u32, &addr_callee).encode())
+				.build(),
+			<Error<Test>>::OutOfTransientStorage,
+		);
+
+		// Call a contract with a storage value that is too large.
+		// Limit exceeded in the callee contract.
+		assert_err_ignore_postinfo!(
+			builder::call(addr_caller)
+				.data((50u32, 4 * 1024u32, &addr_callee).encode())
+				.build(),
+			<Error<Test>>::ContractTrapped
+		);
+	});
+}
+
+#[test]
+fn deploy_and_call_other_contract() {
+	let (caller_binary, _caller_code_hash) = compile_module("caller_contract").unwrap();
+	let (callee_binary, callee_code_hash) = compile_module("return_with_data").unwrap();
+	let code_load_weight = crate::vm::code_load_weight(callee_binary.len() as u32);
+
+	ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
+		let min_balance = Contracts::min_balance();
+
+		// Create
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let Contract { addr: caller_addr, account_id: caller_account } =
+			builder::bare_instantiate(Code::Upload(caller_binary))
+				.native_value(100_000)
+				.build_and_unwrap_contract();
+
+		let callee_addr = create2(
+			&caller_addr,
+			&callee_binary,
+			&[0, 1, 34, 51, 68, 85, 102, 119], // hard coded in binary
+			&[0u8; 32],
+		);
+		let callee_account = <Test as Config>::AddressMapper::to_account_id(&callee_addr);
+
+		Contracts::upload_code(
+			RuntimeOrigin::signed(ALICE),
+			callee_binary,
+			deposit_limit::<Test>(),
+		)
+		.unwrap();
+
+		// Drop previous events
+		initialize_block(2);
+
+		// Call BOB contract, which attempts to instantiate and call the callee contract and
+		// makes various assertions on the results from those calls.
+		assert_ok!(builder::call(caller_addr)
+			.data(
+				(callee_code_hash, code_load_weight.ref_time(), code_load_weight.proof_size())
+					.encode()
+			)
+			.build());
+
+		assert_eq!(
+			System::events(),
+			vec![
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::System(frame_system::Event::NewAccount {
+						account: callee_account.clone()
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::Endowed {
+						account: callee_account.clone(),
+						free_balance: min_balance,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
+						from: ALICE,
+						to: callee_account.clone(),
+						amount: min_balance,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
+						from: caller_account.clone(),
+						to: callee_account.clone(),
+						amount: 32768 // hardcoded in binary
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
+						from: caller_account.clone(),
+						to: callee_account.clone(),
+						amount: 32768,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::TransferAndHold {
+						reason: <Test as Config>::RuntimeHoldReason::Contracts(
+							HoldReason::StorageDepositReserve,
+						),
+						source: ALICE,
+						dest: callee_account.clone(),
+						transferred: 555,
+					}),
+					topics: vec![],
+				},
+			]
+		);
+	});
+}
+
+#[test]
+fn delegate_call() {
+	let (caller_binary, _caller_code_hash) = compile_module("delegate_call").unwrap();
+	let (callee_binary, _callee_code_hash) = compile_module("delegate_call_lib").unwrap();
+
+	ExtBuilder::default().existential_deposit(500).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Instantiate the 'caller'
+		let Contract { addr: caller_addr, .. } =
+			builder::bare_instantiate(Code::Upload(caller_binary))
+				.native_value(300_000)
+				.build_and_unwrap_contract();
+
+		// Instantiate the 'callee'
+		let Contract { addr: callee_addr, .. } =
+			builder::bare_instantiate(Code::Upload(callee_binary))
+				.native_value(100_000)
+				.build_and_unwrap_contract();
+
+		assert_ok!(builder::call(caller_addr)
+			.value(1337)
+			.data((callee_addr, u64::MAX, u64::MAX).encode())
+			.build());
+	});
+}
+
+#[test]
+fn delegate_call_non_existant_is_noop() {
+	let (caller_binary, _caller_code_hash) = compile_module("delegate_call_simple").unwrap();
+
+	ExtBuilder::default().existential_deposit(500).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Instantiate the 'caller'
+		let Contract { addr: caller_addr, .. } =
+			builder::bare_instantiate(Code::Upload(caller_binary))
+				.native_value(300_000)
+				.build_and_unwrap_contract();
+
+		assert_ok!(builder::call(caller_addr)
+			.value(1337)
+			.data((BOB_ADDR, u64::MAX, u64::MAX).encode())
+			.build());
+
+		assert_eq!(get_balance(&BOB_FALLBACK), 0);
+	});
+}
+
+#[test]
+fn delegate_call_with_weight_limit() {
+	let (caller_binary, _caller_code_hash) = compile_module("delegate_call").unwrap();
+	let (callee_binary, _callee_code_hash) = compile_module("delegate_call_lib").unwrap();
+
+	ExtBuilder::default().existential_deposit(500).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Instantiate the 'caller'
+		let Contract { addr: caller_addr, .. } =
+			builder::bare_instantiate(Code::Upload(caller_binary))
+				.native_value(300_000)
+				.build_and_unwrap_contract();
+
+		// Instantiate the 'callee'
+		let Contract { addr: callee_addr, .. } =
+			builder::bare_instantiate(Code::Upload(callee_binary))
+				.native_value(100_000)
+				.build_and_unwrap_contract();
+
+		// fails, not enough weight
+		assert_err!(
+			builder::bare_call(caller_addr)
+				.native_value(1337)
+				.data((callee_addr, 100u64, 100u64).encode())
+				.build()
+				.result,
+			Error::<Test>::ContractTrapped,
+		);
+
+		assert_ok!(builder::call(caller_addr)
+			.value(1337)
+			.data((callee_addr, 500_000_000u64, 100_000u64).encode())
+			.build());
+	});
+}
+
+#[test]
+fn delegate_call_with_deposit_limit() {
+	let (caller_binary, _caller_code_hash) = compile_module("delegate_call_deposit_limit").unwrap();
+	let (callee_binary, _callee_code_hash) = compile_module("delegate_call_lib").unwrap();
+
+	ExtBuilder::default().existential_deposit(500).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Instantiate the 'caller'
+		let Contract { addr: caller_addr, .. } =
+			builder::bare_instantiate(Code::Upload(caller_binary))
+				.native_value(300_000)
+				.build_and_unwrap_contract();
+
+		// Instantiate the 'callee'
+		let Contract { addr: callee_addr, .. } =
+			builder::bare_instantiate(Code::Upload(callee_binary))
+				.native_value(100_000)
+				.build_and_unwrap_contract();
+
+		// Delegate call will write 1 storage and deposit of 2 (1 item) + 32 (bytes) is required.
+		// + 32 + 16 for blake2_128concat
+		// Fails, not enough deposit
+		let ret = builder::bare_call(caller_addr)
+			.native_value(1337)
+			.data((callee_addr, 81u64).encode())
+			.build_and_unwrap_result();
+		assert_return_code!(ret, RuntimeReturnCode::OutOfResources);
+
+		assert_ok!(builder::call(caller_addr)
+			.value(1337)
+			.data((callee_addr, 82u64).encode())
+			.build());
+	});
+}
+
+#[test]
+fn transfer_expendable_cannot_kill_account() {
+	let (binary, _code_hash) = compile_module("dummy").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Instantiate the BOB contract.
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
+			.native_value(1_000)
+			.build_and_unwrap_contract();
+
+		// Check that the BOB contract has been instantiated.
+		get_contract(&addr);
+
+		let account = <Test as Config>::AddressMapper::to_account_id(&addr);
+		let total_balance = <Test as Config>::Currency::total_balance(&account);
+
+		assert_eq!(
+			get_balance_on_hold(&HoldReason::StorageDepositReserve.into(), &account),
+			contract_base_deposit(&addr)
+		);
+
+		// Some or the total balance is held, so it can't be transferred.
+		assert_err!(
+			<<Test as Config>::Currency as Mutate<AccountId32>>::transfer(
+				&account,
+				&ALICE,
+				total_balance,
+				Preservation::Expendable,
+			),
+			TokenError::FundsUnavailable,
+		);
+
+		assert_eq!(<Test as Config>::Currency::total_balance(&account), total_balance);
+	});
+}
+
+#[test]
+fn cannot_self_destruct_through_draining() {
+	let (binary, _code_hash) = compile_module("drain").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let value = 1_000;
+		let min_balance = Contracts::min_balance();
+
+		// Instantiate the BOB contract.
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
+			.native_value(value)
+			.build_and_unwrap_contract();
+		let account = <Test as Config>::AddressMapper::to_account_id(&addr);
+
+		// Check that the BOB contract has been instantiated.
+		get_contract(&addr);
+
+		// Call BOB which makes it send all funds to the zero address
+		// The contract code asserts that the transfer fails with the correct error code
+		assert_ok!(builder::call(addr).build());
+
+		// Make sure the account wasn't remove by sending all free balance away.
+		assert_eq!(
+			<Test as Config>::Currency::total_balance(&account),
+			value + contract_base_deposit(&addr) + min_balance,
+		);
+	});
+}
+
+#[test]
+fn cannot_self_destruct_through_storage_refund_after_price_change() {
+	let (binary, _code_hash) = compile_module("store_call").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let min_balance = Contracts::min_balance();
+
+		// Instantiate the BOB contract.
+		let contract = builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
+		let info_deposit = contract_base_deposit(&contract.addr);
+
+		// Check that the contract has been instantiated and has the minimum balance
+		assert_eq!(get_contract(&contract.addr).total_deposit(), info_deposit);
+		assert_eq!(get_contract(&contract.addr).extra_deposit(), 0);
+		assert_eq!(
+			<Test as Config>::Currency::total_balance(&contract.account_id),
+			info_deposit + min_balance
+		);
+
+		// Create 100 (16 + 32 bytes for key for blake128 concat) bytes of storage with a
+		// price of per byte and a single storage item of price 2
+		assert_ok!(builder::call(contract.addr).data(100u32.to_le_bytes().to_vec()).build());
+		assert_eq!(get_contract(&contract.addr).total_deposit(), info_deposit + 100 + 16 + 32 + 2);
+
+		// Increase the byte price and trigger a refund. This should not have any influence
+		// because the removal is pro rata and exactly those 100 bytes should have been
+		// removed as we didn't delete the key.
+		DEPOSIT_PER_BYTE.with(|c| *c.borrow_mut() = 500);
+		assert_ok!(builder::call(contract.addr).data(0u32.to_le_bytes().to_vec()).build());
+
+		// Make sure the account wasn't removed by the refund
+		assert_eq!(
+			<Test as Config>::Currency::total_balance(&contract.account_id),
+			get_contract(&contract.addr).total_deposit() + min_balance,
+		);
+		// + 1 because due to fixed point arithmetic we can sometimes refund
+		// one unit to little
+		assert_eq!(get_contract(&contract.addr).extra_deposit(), 16 + 32 + 2 + 1);
+	});
+}
+
+#[test]
+fn cannot_self_destruct_while_live() {
+	let (binary, _code_hash) = compile_module("self_destruct").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Instantiate the BOB contract.
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
+			.native_value(100_000)
+			.build_and_unwrap_contract();
+
+		// Check that the BOB contract has been instantiated.
+		get_contract(&addr);
+
+		// Call BOB with input data, forcing it make a recursive call to itself to
+		// self-destruct, resulting in a trap.
+		assert_err_ignore_postinfo!(
+			builder::call(addr).data(vec![0]).build(),
+			Error::<Test>::ContractTrapped,
+		);
+
+		// Check that BOB is still there.
+		get_contract(&addr);
+	});
+}
+
+#[test]
+fn self_destruct_works() {
+	let (binary, code_hash) = compile_module("self_destruct").unwrap();
+	ExtBuilder::default().existential_deposit(1_000).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let _ = <Test as Config>::Currency::set_balance(&DJANGO_FALLBACK, 1_000_000);
+		let min_balance = Contracts::min_balance();
+
+		// Instantiate the BOB contract.
+		let contract = builder::bare_instantiate(Code::Upload(binary))
+			.native_value(100_000)
+			.build_and_unwrap_contract();
+
+		let hold_balance = contract_base_deposit(&contract.addr);
+
+		// Check that the BOB contract has been instantiated.
+		let _ = get_contract(&contract.addr);
+
+		// Drop all previous events
+		initialize_block(2);
+
+		// Call BOB without input data which triggers termination.
+		assert_matches!(builder::call(contract.addr).build(), Ok(_));
+
+		// Check that code is still there but refcount dropped to zero.
+		assert_refcount!(&code_hash, 0);
+
+		// Check that account is gone
+		assert!(get_contract_checked(&contract.addr).is_none());
+		assert_eq!(<Test as Config>::Currency::total_balance(&contract.account_id), 0);
+
+		// Check that the beneficiary (django) got remaining balance.
+		assert_eq!(
+			<Test as Config>::Currency::free_balance(DJANGO_FALLBACK),
+			1_000_000 + 100_000 + min_balance
+		);
+
+		// Check that the Alice is missing Django's benefit. Within ALICE's total balance
+		// there's also the code upload deposit held.
+		assert_eq!(
+			<Test as Config>::Currency::total_balance(&ALICE),
+			1_000_000 - (100_000 + min_balance)
+		);
+
+		pretty_assertions::assert_eq!(
+			System::events(),
+			vec![
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::TransferOnHold {
+						reason: <Test as Config>::RuntimeHoldReason::Contracts(
+							HoldReason::StorageDepositReserve,
+						),
+						source: contract.account_id.clone(),
+						dest: ALICE,
+						amount: hold_balance,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::System(frame_system::Event::KilledAccount {
+						account: contract.account_id.clone()
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
+						from: contract.account_id.clone(),
+						to: DJANGO_FALLBACK,
+						amount: 100_000 + min_balance,
+					}),
+					topics: vec![],
+				},
+			],
+		);
+	});
+}
+
+// This tests that one contract cannot prevent another from self-destructing by sending it
+// additional funds after it has been drained.
+#[test]
+fn destroy_contract_and_transfer_funds() {
+	let (callee_binary, callee_code_hash) = compile_module("self_destruct").unwrap();
+	let (caller_binary, _caller_code_hash) = compile_module("destroy_and_transfer").unwrap();
+
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		// Create code hash for bob to instantiate
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		Contracts::upload_code(
+			RuntimeOrigin::signed(ALICE),
+			callee_binary.clone(),
+			deposit_limit::<Test>(),
+		)
+		.unwrap();
+
+		// This deploys the BOB contract, which in turn deploys the CHARLIE contract during
+		// construction.
+		let Contract { addr: addr_bob, .. } =
+			builder::bare_instantiate(Code::Upload(caller_binary))
+				.native_value(200_000)
+				.data(callee_code_hash.as_ref().to_vec())
+				.build_and_unwrap_contract();
+
+		// Check that the CHARLIE contract has been instantiated.
+		let salt = [47; 32]; // hard coded in fixture.
+		let addr_charlie = create2(&addr_bob, &callee_binary, &[], &salt);
+		get_contract(&addr_charlie);
+
+		// Call BOB, which calls CHARLIE, forcing CHARLIE to self-destruct.
+		assert_ok!(builder::call(addr_bob).data(addr_charlie.encode()).build());
+
+		// Check that CHARLIE has moved on to the great beyond (ie. died).
+		assert!(get_contract_checked(&addr_charlie).is_none());
+	});
+}
+
+#[test]
+fn cannot_self_destruct_in_constructor() {
+	let (binary, _) = compile_module("self_destructing_constructor").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Fail to instantiate the BOB because the constructor calls seal_terminate.
+		assert_err_ignore_postinfo!(
+			builder::instantiate_with_code(binary).value(100_000).build(),
+			Error::<Test>::TerminatedInConstructor,
+		);
+	});
+}
+
+#[test]
+fn crypto_hashes() {
+	let (binary, _code_hash) = compile_module("crypto_hashes").unwrap();
+
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Instantiate the CRYPTO_HASHES contract.
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
+			.native_value(100_000)
+			.build_and_unwrap_contract();
+		// Perform the call.
+		let input = b"_DEAD_BEEF";
+		use sp_io::hashing::*;
+		// Wraps a hash function into a more dynamic form usable for testing.
+		macro_rules! dyn_hash_fn {
+			($name:ident) => {
+				Box::new(|input| $name(input).as_ref().to_vec().into_boxed_slice())
+			};
+		}
+		// All hash functions and their associated output byte lengths.
+		let test_cases: &[(u8, Box<dyn Fn(&[u8]) -> Box<[u8]>>, usize)] =
+			&[(2, dyn_hash_fn!(keccak_256), 32), (4, dyn_hash_fn!(blake2_128), 16)];
+		// Test the given hash functions for the input: "_DEAD_BEEF"
+		for (n, hash_fn, expected_size) in test_cases.iter() {
+			let mut params = vec![*n];
+			params.extend_from_slice(input);
+			let result = builder::bare_call(addr).data(params).build_and_unwrap_result();
+			assert!(!result.did_revert());
+			let expected = hash_fn(input.as_ref());
+			assert_eq!(&result.data[..*expected_size], &*expected);
+		}
+	})
+}
+
+#[test]
+fn transfer_return_code() {
+	let (binary, _code_hash) = compile_module("transfer_return_code").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let min_balance = Contracts::min_balance();
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
+
+		let contract = builder::bare_instantiate(Code::Upload(binary))
+			.native_value(min_balance * 100)
+			.build_and_unwrap_contract();
+
+		// Contract has only the minimal balance so any transfer will fail.
+		<Test as Config>::Currency::set_balance(&contract.account_id, min_balance);
+		let result = builder::bare_call(contract.addr).build_and_unwrap_result();
+		assert_return_code!(result, RuntimeReturnCode::TransferFailed);
+	});
+}
+
+#[test]
+fn call_return_code() {
+	let (caller_code, _caller_hash) = compile_module("call_return_code").unwrap();
+	let (callee_code, _callee_hash) = compile_module("ok_trap_revert").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let min_balance = Contracts::min_balance();
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
+		let _ = <Test as Config>::Currency::set_balance(&CHARLIE, 1000 * min_balance);
+
+		let bob = builder::bare_instantiate(Code::Upload(caller_code))
+			.native_value(min_balance * 100)
+			.build_and_unwrap_contract();
+
+		// BOB cannot pay the ed which is needed to pull DJANGO into existence
+		// this does trap the caller instead of returning an error code
+		// reasoning is that this error state does not exist on eth where
+		// ed does not exist. We hide this fact from the contract.
+		let result = builder::bare_call(bob.addr)
+			.data((DJANGO_ADDR, u256_bytes(1)).encode())
+			.origin(RuntimeOrigin::signed(BOB))
+			.build();
+		assert_err!(result.result, <Error<Test>>::StorageDepositNotEnoughFunds);
+
+		// Contract calls into Django which is no valid contract
+		// This will be a balance transfer into a new account
+		// with more than the contract has which will make the transfer fail
+		let value = Pallet::<Test>::convert_native_to_evm(min_balance * 200);
+		let result = builder::bare_call(bob.addr)
+			.data(
+				AsRef::<[u8]>::as_ref(&DJANGO_ADDR)
+					.iter()
+					.chain(&value.to_little_endian())
+					.cloned()
+					.collect(),
+			)
+			.build_and_unwrap_result();
+		assert_return_code!(result, RuntimeReturnCode::TransferFailed);
+
+		// Sending below the minimum balance should result in success.
+		// The ED is charged from the call origin.
+		let alice_before = get_balance(&ALICE_FALLBACK);
+		assert_eq!(get_balance(&DJANGO_FALLBACK), 0);
+
+		let value = Pallet::<Test>::convert_native_to_evm(1u64);
+		let result = builder::bare_call(bob.addr)
+			.data(
+				AsRef::<[u8]>::as_ref(&DJANGO_ADDR)
+					.iter()
+					.chain(&value.to_little_endian())
+					.cloned()
+					.collect(),
+			)
+			.build_and_unwrap_result();
+		assert_return_code!(result, RuntimeReturnCode::Success);
+		assert_eq!(get_balance(&DJANGO_FALLBACK), min_balance + 1);
+		assert_eq!(get_balance(&ALICE_FALLBACK), alice_before - min_balance);
+
+		let django = builder::bare_instantiate(Code::Upload(callee_code))
+			.origin(RuntimeOrigin::signed(CHARLIE))
+			.native_value(min_balance * 100)
+			.build_and_unwrap_contract();
+
+		// Sending more than the contract has will make the transfer fail.
+		let value = Pallet::<Test>::convert_native_to_evm(min_balance * 300);
+		let result = builder::bare_call(bob.addr)
+			.data(
+				AsRef::<[u8]>::as_ref(&django.addr)
+					.iter()
+					.chain(&value.to_little_endian())
+					.chain(&0u32.to_le_bytes())
+					.cloned()
+					.collect(),
+			)
+			.build_and_unwrap_result();
+		assert_return_code!(result, RuntimeReturnCode::TransferFailed);
+
+		// Contract has enough balance but callee reverts because "1" is passed.
+		<Test as Config>::Currency::set_balance(&bob.account_id, min_balance + 1000);
+		let value = Pallet::<Test>::convert_native_to_evm(5u64);
+		let result = builder::bare_call(bob.addr)
+			.data(
+				AsRef::<[u8]>::as_ref(&django.addr)
+					.iter()
+					.chain(&value.to_little_endian())
+					.chain(&1u32.to_le_bytes())
+					.cloned()
+					.collect(),
+			)
+			.build_and_unwrap_result();
+		assert_return_code!(result, RuntimeReturnCode::CalleeReverted);
+
+		// Contract has enough balance but callee traps because "2" is passed.
+		let result = builder::bare_call(bob.addr)
+			.data(
+				AsRef::<[u8]>::as_ref(&django.addr)
+					.iter()
+					.chain(&value.to_little_endian())
+					.chain(&2u32.to_le_bytes())
+					.cloned()
+					.collect(),
+			)
+			.build_and_unwrap_result();
+		assert_return_code!(result, RuntimeReturnCode::CalleeTrapped);
+	});
+}
+
+#[test]
+fn instantiate_return_code() {
+	let (caller_code, _caller_hash) = compile_module("instantiate_return_code").unwrap();
+	let (callee_code, callee_hash) = compile_module("ok_trap_revert").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let min_balance = Contracts::min_balance();
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
+		let _ = <Test as Config>::Currency::set_balance(&CHARLIE, 1000 * min_balance);
+		let callee_hash = callee_hash.as_ref().to_vec();
+
+		assert_ok!(builder::instantiate_with_code(callee_code).value(min_balance * 100).build());
+
+		let contract = builder::bare_instantiate(Code::Upload(caller_code))
+			.native_value(min_balance * 100)
+			.build_and_unwrap_contract();
+
+		// bob cannot pay the ED to create the contract as he has no money
+		// this traps the caller rather than returning an error
+		let result = builder::bare_call(contract.addr)
+			.data(callee_hash.iter().chain(&0u32.to_le_bytes()).cloned().collect())
+			.origin(RuntimeOrigin::signed(BOB))
+			.build();
+		assert_err!(result.result, <Error<Test>>::StorageDepositNotEnoughFunds);
+
+		// Contract has only the minimal balance so any transfer will fail.
+		<Test as Config>::Currency::set_balance(&contract.account_id, min_balance);
+		let result = builder::bare_call(contract.addr)
+			.data(callee_hash.iter().chain(&0u32.to_le_bytes()).cloned().collect())
+			.build_and_unwrap_result();
+		assert_return_code!(result, RuntimeReturnCode::TransferFailed);
+
+		// Contract has enough balance but the passed code hash is invalid
+		<Test as Config>::Currency::set_balance(&contract.account_id, min_balance + 10_000);
+		let result = builder::bare_call(contract.addr).data(vec![0; 36]).build();
+		assert_err!(result.result, <Error<Test>>::CodeNotFound);
+
+		// Contract has enough balance but callee reverts because "1" is passed.
+		let result = builder::bare_call(contract.addr)
+			.data(callee_hash.iter().chain(&1u32.to_le_bytes()).cloned().collect())
+			.build_and_unwrap_result();
+		assert_return_code!(result, RuntimeReturnCode::CalleeReverted);
+
+		// Contract has enough balance but callee traps because "2" is passed.
+		let result = builder::bare_call(contract.addr)
+			.data(callee_hash.iter().chain(&2u32.to_le_bytes()).cloned().collect())
+			.build_and_unwrap_result();
+		assert_return_code!(result, RuntimeReturnCode::CalleeTrapped);
+
+		// Contract instantiation succeeds
+		let result = builder::bare_call(contract.addr)
+			.data(callee_hash.iter().chain(&0u32.to_le_bytes()).cloned().collect())
+			.build_and_unwrap_result();
+		assert_return_code!(result, 0);
+
+		// Contract instantiation fails because the same salt is being used again.
+		let result = builder::bare_call(contract.addr)
+			.data(callee_hash.iter().chain(&0u32.to_le_bytes()).cloned().collect())
+			.build_and_unwrap_result();
+		assert_return_code!(result, RuntimeReturnCode::DuplicateContractAddress);
+	});
+}
+
+#[test]
+fn lazy_removal_works() {
+	let (code, _hash) = compile_module("self_destruct").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let min_balance = Contracts::min_balance();
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
+
+		let contract = builder::bare_instantiate(Code::Upload(code))
+			.native_value(min_balance * 100)
+			.build_and_unwrap_contract();
+
+		let info = get_contract(&contract.addr);
+		let trie = &info.child_trie_info();
+
+		// Put value into the contracts child trie
+		child::put(trie, &[99], &42);
+
+		// Terminate the contract
+		assert_ok!(builder::call(contract.addr).build());
+
+		// Contract info should be gone
+		assert!(!<AccountInfoOf::<Test>>::contains_key(&contract.addr));
+
+		// But value should be still there as the lazy removal did not run, yet.
+		assert_matches!(child::get(trie, &[99]), Some(42));
+
+		// Run the lazy removal
+		Contracts::on_idle(System::block_number(), Weight::MAX);
+
+		// Value should be gone now
+		assert_matches!(child::get::<i32>(trie, &[99]), None);
+	});
+}
+
+#[test]
+fn lazy_batch_removal_works() {
+	let (code, _hash) = compile_module("self_destruct").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let min_balance = Contracts::min_balance();
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
+		let mut tries: Vec<child::ChildInfo> = vec![];
+
+		for i in 0..3u8 {
+			let contract = builder::bare_instantiate(Code::Upload(code.clone()))
+				.native_value(min_balance * 100)
+				.salt(Some([i; 32]))
+				.build_and_unwrap_contract();
+
+			let info = get_contract(&contract.addr);
+			let trie = &info.child_trie_info();
+
+			// Put value into the contracts child trie
+			child::put(trie, &[99], &42);
+
+			// Terminate the contract. Contract info should be gone, but value should be still
+			// there as the lazy removal did not run, yet.
+			assert_ok!(builder::call(contract.addr).build());
+
+			assert!(!<AccountInfoOf::<Test>>::contains_key(&contract.addr));
+			assert_matches!(child::get(trie, &[99]), Some(42));
+
+			tries.push(trie.clone())
+		}
+
+		// Run single lazy removal
+		Contracts::on_idle(System::block_number(), Weight::MAX);
+
+		// The single lazy removal should have removed all queued tries
+		for trie in tries.iter() {
+			assert_matches!(child::get::<i32>(trie, &[99]), None);
+		}
+	});
+}
+
+#[test]
+fn ref_time_left_api_works() {
+	let (code, _) = compile_module("ref_time_left").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create fixture: Constructor calls ref_time_left twice and asserts it to decrease
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		// Call the contract: It echoes back the ref_time returned by the ref_time_left API.
+		let received = builder::bare_call(addr).build_and_unwrap_result();
+		assert_eq!(received.flags, ReturnFlags::empty());
+
+		let returned_value = u64::from_le_bytes(received.data[..8].try_into().unwrap());
+		assert!(returned_value > 0);
+		assert!(returned_value < GAS_LIMIT.ref_time());
+	});
+}
+
+#[test]
+fn lazy_removal_partial_remove_works() {
+	let (code, _hash) = compile_module("self_destruct").unwrap();
+
+	// We create a contract with some extra keys above the weight limit
+	let extra_keys = 7u32;
+	let mut meter = WeightMeter::with_limit(Weight::from_parts(5_000_000_000, 100 * 1024));
+	let (weight_per_key, max_keys) = ContractInfo::<Test>::deletion_budget(&meter);
+	let vals: Vec<_> = (0..max_keys + extra_keys)
+		.map(|i| (blake2_256(&i.encode()), (i as u32), (i as u32).encode()))
+		.collect();
+
+	let mut ext = ExtBuilder::default().existential_deposit(50).build();
+
+	let trie = ext.execute_with(|| {
+		let min_balance = Contracts::min_balance();
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
+
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
+			.native_value(min_balance * 100)
+			.build_and_unwrap_contract();
+
+		let info = get_contract(&addr);
+
+		// Put value into the contracts child trie
+		for val in &vals {
+			info.write(&Key::Fix(val.0), Some(val.2.clone()), None, false).unwrap();
+		}
+		AccountInfo::<Test>::insert_contract(&addr, info.clone());
+
+		// Terminate the contract
+		assert_ok!(builder::call(addr).build());
+
+		// Contract info should be gone
+		assert!(!<AccountInfoOf::<Test>>::contains_key(&addr));
+
+		let trie = info.child_trie_info();
+
+		// But value should be still there as the lazy removal did not run, yet.
+		for val in &vals {
+			assert_eq!(child::get::<u32>(&trie, &blake2_256(&val.0)), Some(val.1));
+		}
+
+		trie.clone()
+	});
+
+	// The lazy removal limit only applies to the backend but not to the overlay.
+	// This commits all keys from the overlay to the backend.
+	ext.commit_all().unwrap();
+
+	ext.execute_with(|| {
+		// Run the lazy removal
+		ContractInfo::<Test>::process_deletion_queue_batch(&mut meter);
+
+		// Weight should be exhausted because we could not even delete all keys
+		assert!(!meter.can_consume(weight_per_key));
+
+		let mut num_deleted = 0u32;
+		let mut num_remaining = 0u32;
+
+		for val in &vals {
+			match child::get::<u32>(&trie, &blake2_256(&val.0)) {
+				None => num_deleted += 1,
+				Some(x) if x == val.1 => num_remaining += 1,
+				Some(_) => panic!("Unexpected value in contract storage"),
+			}
+		}
+
+		// All but one key is removed
+		assert_eq!(num_deleted + num_remaining, vals.len() as u32);
+		assert_eq!(num_deleted, max_keys);
+		assert_eq!(num_remaining, extra_keys);
+	});
+}
+
+#[test]
+fn lazy_removal_does_no_run_on_low_remaining_weight() {
+	let (code, _hash) = compile_module("self_destruct").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let min_balance = Contracts::min_balance();
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
+
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
+			.native_value(min_balance * 100)
+			.build_and_unwrap_contract();
+
+		let info = get_contract(&addr);
+		let trie = &info.child_trie_info();
+
+		// Put value into the contracts child trie
+		child::put(trie, &[99], &42);
+
+		// Terminate the contract
+		assert_ok!(builder::call(addr).build());
+
+		// Contract info should be gone
+		assert!(!<AccountInfoOf::<Test>>::contains_key(&addr));
+
+		// But value should be still there as the lazy removal did not run, yet.
+		assert_matches!(child::get(trie, &[99]), Some(42));
+
+		// Assign a remaining weight which is too low for a successful deletion of the contract
+		let low_remaining_weight =
+			<<Test as Config>::WeightInfo as WeightInfo>::on_process_deletion_queue_batch();
+
+		// Run the lazy removal
+		Contracts::on_idle(System::block_number(), low_remaining_weight);
+
+		// Value should still be there, since remaining weight was too low for removal
+		assert_matches!(child::get::<i32>(trie, &[99]), Some(42));
+
+		// Run the lazy removal while deletion_queue is not full
+		Contracts::on_initialize(System::block_number());
+
+		// Value should still be there, since deletion_queue was not full
+		assert_matches!(child::get::<i32>(trie, &[99]), Some(42));
+
+		// Run on_idle with max remaining weight, this should remove the value
+		Contracts::on_idle(System::block_number(), Weight::MAX);
+
+		// Value should be gone
+		assert_matches!(child::get::<i32>(trie, &[99]), None);
+	});
+}
+
+#[test]
+fn lazy_removal_does_not_use_all_weight() {
+	let (code, _hash) = compile_module("self_destruct").unwrap();
+
+	let mut meter = WeightMeter::with_limit(Weight::from_parts(5_000_000_000, 100 * 1024));
+	let mut ext = ExtBuilder::default().existential_deposit(50).build();
+
+	let (trie, vals, weight_per_key) = ext.execute_with(|| {
+		let min_balance = Contracts::min_balance();
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
+
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
+			.native_value(min_balance * 100)
+			.build_and_unwrap_contract();
+
+		let info = get_contract(&addr);
+		let (weight_per_key, max_keys) = ContractInfo::<Test>::deletion_budget(&meter);
+		assert!(max_keys > 0);
+
+		// We create a contract with one less storage item than we can remove within the limit
+		let vals: Vec<_> = (0..max_keys - 1)
+			.map(|i| (blake2_256(&i.encode()), (i as u32), (i as u32).encode()))
+			.collect();
+
+		// Put value into the contracts child trie
+		for val in &vals {
+			info.write(&Key::Fix(val.0), Some(val.2.clone()), None, false).unwrap();
+		}
+		AccountInfo::<Test>::insert_contract(&addr, info.clone());
+
+		// Terminate the contract
+		assert_ok!(builder::call(addr).build());
+
+		// Contract info should be gone
+		assert!(!<AccountInfoOf::<Test>>::contains_key(&addr));
+
+		let trie = info.child_trie_info();
+
+		// But value should be still there as the lazy removal did not run, yet.
+		for val in &vals {
+			assert_eq!(child::get::<u32>(&trie, &blake2_256(&val.0)), Some(val.1));
+		}
+
+		(trie, vals, weight_per_key)
+	});
+
+	// The lazy removal limit only applies to the backend but not to the overlay.
+	// This commits all keys from the overlay to the backend.
+	ext.commit_all().unwrap();
+
+	ext.execute_with(|| {
+		// Run the lazy removal
+		ContractInfo::<Test>::process_deletion_queue_batch(&mut meter);
+		let base_weight =
+			<<Test as Config>::WeightInfo as WeightInfo>::on_process_deletion_queue_batch();
+		assert_eq!(meter.consumed(), weight_per_key.mul(vals.len() as _) + base_weight);
+
+		// All the keys are removed
+		for val in vals {
+			assert_eq!(child::get::<u32>(&trie, &blake2_256(&val.0)), None);
+		}
+	});
+}
+
+#[test]
+fn deletion_queue_ring_buffer_overflow() {
+	let (code, _hash) = compile_module("self_destruct").unwrap();
+	let mut ext = ExtBuilder::default().existential_deposit(50).build();
+
+	// setup the deletion queue with custom counters
+	ext.execute_with(|| {
+		let queue = DeletionQueueManager::from_test_values(u32::MAX - 1, u32::MAX - 1);
+		<DeletionQueueCounter<Test>>::set(queue);
+	});
+
+	// commit the changes to the storage
+	ext.commit_all().unwrap();
+
+	ext.execute_with(|| {
+		let min_balance = Contracts::min_balance();
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
+		let mut tries: Vec<child::ChildInfo> = vec![];
+
+		// add 3 contracts to the deletion queue
+		for i in 0..3u8 {
+			let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code.clone()))
+				.native_value(min_balance * 100)
+				.salt(Some([i; 32]))
+				.build_and_unwrap_contract();
+
+			let info = get_contract(&addr);
+			let trie = &info.child_trie_info();
+
+			// Put value into the contracts child trie
+			child::put(trie, &[99], &42);
+
+			// Terminate the contract. Contract info should be gone, but value should be still
+			// there as the lazy removal did not run, yet.
+			assert_ok!(builder::call(addr).build());
+
+			assert!(!<AccountInfoOf::<Test>>::contains_key(&addr));
+			assert_matches!(child::get(trie, &[99]), Some(42));
+
+			tries.push(trie.clone())
+		}
+
+		// Run single lazy removal
+		Contracts::on_idle(System::block_number(), Weight::MAX);
+
+		// The single lazy removal should have removed all queued tries
+		for trie in tries.iter() {
+			assert_matches!(child::get::<i32>(trie, &[99]), None);
+		}
+
+		// insert and delete counter values should go from u32::MAX - 1 to 1
+		assert_eq!(<DeletionQueueCounter<Test>>::get().as_test_tuple(), (1, 1));
+	})
+}
+#[test]
+fn refcounter() {
+	let (binary, code_hash) = compile_module("self_destruct").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let min_balance = Contracts::min_balance();
+
+		// Create two contracts with the same code and check that they do in fact share it.
+		let Contract { addr: addr0, .. } = builder::bare_instantiate(Code::Upload(binary.clone()))
+			.native_value(min_balance * 100)
+			.salt(Some([0; 32]))
+			.build_and_unwrap_contract();
+		let Contract { addr: addr1, .. } = builder::bare_instantiate(Code::Upload(binary.clone()))
+			.native_value(min_balance * 100)
+			.salt(Some([1; 32]))
+			.build_and_unwrap_contract();
+		assert_refcount!(code_hash, 2);
+
+		// Sharing should also work with the usual instantiate call
+		let Contract { addr: addr2, .. } = builder::bare_instantiate(Code::Existing(code_hash))
+			.native_value(min_balance * 100)
+			.salt(Some([2; 32]))
+			.build_and_unwrap_contract();
+		assert_refcount!(code_hash, 3);
+
+		// Terminating one contract should decrement the refcount
+		assert_ok!(builder::call(addr0).build());
+		assert_refcount!(code_hash, 2);
+
+		// remove another one
+		assert_ok!(builder::call(addr1).build());
+		assert_refcount!(code_hash, 1);
+
+		// Pristine code should still be there
+		PristineCode::<Test>::get(code_hash).unwrap();
+
+		// remove the last contract
+		assert_ok!(builder::call(addr2).build());
+		assert_refcount!(code_hash, 0);
+
+		// refcount is `0` but code should still exists because it needs to be removed manually
+		assert!(crate::PristineCode::<Test>::contains_key(&code_hash));
+	});
+}
+
+#[test]
+fn gas_estimation_for_subcalls() {
+	let (caller_code, _caller_hash) = compile_module("call_with_limit").unwrap();
+	let (dummy_code, _callee_hash) = compile_module("dummy").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let min_balance = Contracts::min_balance();
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 2_000 * min_balance);
+
+		let Contract { addr: addr_caller, .. } =
+			builder::bare_instantiate(Code::Upload(caller_code))
+				.native_value(min_balance * 100)
+				.build_and_unwrap_contract();
+
+		let Contract { addr: addr_dummy, .. } = builder::bare_instantiate(Code::Upload(dummy_code))
+			.native_value(min_balance * 100)
+			.build_and_unwrap_contract();
+
+		// Run the test for all of those weight limits for the subcall
+		let weights = [
+			Weight::MAX,
+			GAS_LIMIT,
+			GAS_LIMIT * 2,
+			GAS_LIMIT / 5,
+			Weight::from_parts(u64::MAX, GAS_LIMIT.proof_size()),
+			Weight::from_parts(GAS_LIMIT.ref_time(), u64::MAX),
+		];
+
+		let (sub_addr, sub_input) = (addr_dummy.as_ref(), vec![]);
+
+		for weight in weights {
+			let input: Vec<u8> = sub_addr
+				.iter()
+				.cloned()
+				.chain(weight.ref_time().to_le_bytes())
+				.chain(weight.proof_size().to_le_bytes())
+				.chain(sub_input.clone())
+				.collect();
+
+			// Call in order to determine the gas that is required for this call
+			let result_orig = builder::bare_call(addr_caller).data(input.clone()).build();
+			assert_ok!(&result_orig.result);
+			assert_eq!(result_orig.gas_required, result_orig.gas_consumed);
+
+			// Make the same call using the estimated gas. Should succeed.
+			let result = builder::bare_call(addr_caller)
+				.gas_limit(result_orig.gas_required)
+				.storage_deposit_limit(result_orig.storage_deposit.charge_or_zero().into())
+				.data(input.clone())
+				.build();
+			assert_ok!(&result.result);
+
+			// Check that it fails with too little ref_time
+			let result = builder::bare_call(addr_caller)
+				.gas_limit(result_orig.gas_required.sub_ref_time(1))
+				.storage_deposit_limit(result_orig.storage_deposit.charge_or_zero().into())
+				.data(input.clone())
+				.build();
+			assert_err!(result.result, <Error<Test>>::OutOfGas);
+
+			// Check that it fails with too little proof_size
+			let result = builder::bare_call(addr_caller)
+				.gas_limit(result_orig.gas_required.sub_proof_size(1))
+				.storage_deposit_limit(result_orig.storage_deposit.charge_or_zero().into())
+				.data(input.clone())
+				.build();
+			assert_err!(result.result, <Error<Test>>::OutOfGas);
+		}
+	});
+}
+
+#[test]
+fn call_runtime_reentrancy_guarded() {
+	use crate::precompiles::Precompile;
+	use alloy_core::sol_types::SolInterface;
+	use precompiles::{INoInfo, NoInfo};
+
+	let precompile_addr = H160(NoInfo::<Test>::MATCHER.base_address());
+
+	let (callee_code, _callee_hash) = compile_module("dummy").unwrap();
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let min_balance = Contracts::min_balance();
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1000 * min_balance);
+		let _ = <Test as Config>::Currency::set_balance(&CHARLIE, 1000 * min_balance);
+
+		let Contract { addr: addr_callee, .. } =
+			builder::bare_instantiate(Code::Upload(callee_code))
+				.native_value(min_balance * 100)
+				.salt(Some([1; 32]))
+				.build_and_unwrap_contract();
+
+		// Call pallet_revive call() dispatchable
+		let call = RuntimeCall::Contracts(crate::Call::call {
+			dest: addr_callee,
+			value: 0,
+			gas_limit: GAS_LIMIT / 3,
+			storage_deposit_limit: deposit_limit::<Test>(),
+			data: vec![],
+		})
+		.encode();
+
+		// Call runtime to re-enter back to contracts engine by
+		// calling dummy contract
+		let result = builder::bare_call(precompile_addr)
+			.data(
+				INoInfo::INoInfoCalls::callRuntime(INoInfo::callRuntimeCall { call: call.into() })
+					.abi_encode(),
+			)
+			.build();
+		// Call to runtime should fail because of the re-entrancy guard
+		assert_err!(result.result, <Error<Test>>::ReenteredPallet);
+	});
+}
+
+#[test]
+fn sr25519_verify() {
+	let (binary, _code_hash) = compile_module("sr25519_verify").unwrap();
+
+	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Instantiate the sr25519_verify contract.
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary))
+			.native_value(100_000)
+			.build_and_unwrap_contract();
+
+		let call_with = |message: &[u8; 11]| {
+			// Alice's signature for "hello world"
+			#[rustfmt::skip]
+			let signature: [u8; 64] = [
+				184, 49, 74, 238, 78, 165, 102, 252, 22, 92, 156, 176, 124, 118, 168, 116, 247,
+				99, 0, 94, 2, 45, 9, 170, 73, 222, 182, 74, 60, 32, 75, 64, 98, 174, 69, 55, 83,
+				85, 180, 98, 208, 75, 231, 57, 205, 62, 4, 105, 26, 136, 172, 17, 123, 99, 90, 255,
+				228, 54, 115, 63, 30, 207, 205, 131,
+			];
+
+			// Alice's public key
+			#[rustfmt::skip]
+			let public_key: [u8; 32] = [
+				212, 53, 147, 199, 21, 253, 211, 28, 97, 20, 26, 189, 4, 169, 159, 214, 130, 44,
+				133, 88, 133, 76, 205, 227, 154, 86, 132, 231, 165, 109, 162, 125,
+			];
+
+			let mut params = vec![];
+			params.extend_from_slice(&signature);
+			params.extend_from_slice(&public_key);
+			params.extend_from_slice(message);
+
+			builder::bare_call(addr).data(params).build_and_unwrap_result()
+		};
+
+		// verification should succeed for "hello world"
+		assert_return_code!(call_with(&b"hello world"), RuntimeReturnCode::Success);
+
+		// verification should fail for other messages
+		assert_return_code!(call_with(&b"hello worlD"), RuntimeReturnCode::Sr25519VerifyFailed);
+	});
+}
+
+#[test]
+fn upload_code_works() {
+	let (binary, code_hash) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Drop previous events
+		initialize_block(2);
+
+		assert!(!PristineCode::<Test>::contains_key(&code_hash));
+		assert_ok!(Contracts::upload_code(RuntimeOrigin::signed(ALICE), binary, 1_000,));
+		// Ensure the contract was stored and get expected deposit amount to be reserved.
+		expected_deposit(ensure_stored(code_hash));
+	});
+}
+
+#[test]
+fn upload_code_limit_too_low() {
+	let (binary, _code_hash) = compile_module("dummy").unwrap();
+	let deposit_expected = expected_deposit(binary.len());
+	let deposit_insufficient = deposit_expected.saturating_sub(1);
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Drop previous events
+		initialize_block(2);
+
+		assert_noop!(
+			Contracts::upload_code(RuntimeOrigin::signed(ALICE), binary, deposit_insufficient,),
+			<Error<Test>>::StorageDepositLimitExhausted,
+		);
+
+		assert_eq!(System::events(), vec![]);
+	});
+}
+
+#[test]
+fn upload_code_not_enough_balance() {
+	let (binary, _code_hash) = compile_module("dummy").unwrap();
+	let deposit_expected = expected_deposit(binary.len());
+	let deposit_insufficient = deposit_expected.saturating_sub(1);
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, deposit_insufficient);
+
+		// Drop previous events
+		initialize_block(2);
+
+		assert_noop!(
+			Contracts::upload_code(RuntimeOrigin::signed(ALICE), binary, 1_000,),
+			<Error<Test>>::StorageDepositNotEnoughFunds,
+		);
+
+		assert_eq!(System::events(), vec![]);
+	});
+}
+
+#[test]
+fn remove_code_works() {
+	let (binary, code_hash) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Drop previous events
+		initialize_block(2);
+
+		assert_ok!(Contracts::upload_code(RuntimeOrigin::signed(ALICE), binary, 1_000,));
+		// Ensure the contract was stored and get expected deposit amount to be reserved.
+		expected_deposit(ensure_stored(code_hash));
+		assert_ok!(Contracts::remove_code(RuntimeOrigin::signed(ALICE), code_hash));
+	});
+}
+
+#[test]
+fn remove_code_wrong_origin() {
+	let (binary, code_hash) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Drop previous events
+		initialize_block(2);
+
+		assert_ok!(Contracts::upload_code(RuntimeOrigin::signed(ALICE), binary, 1_000,));
+		// Ensure the contract was stored and get expected deposit amount to be reserved.
+		expected_deposit(ensure_stored(code_hash));
+
+		assert_noop!(
+			Contracts::remove_code(RuntimeOrigin::signed(BOB), code_hash),
+			sp_runtime::traits::BadOrigin,
+		);
+	});
+}
+
+#[test]
+fn remove_code_in_use() {
+	let (binary, code_hash) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		assert_ok!(builder::instantiate_with_code(binary).build());
+
+		// Drop previous events
+		initialize_block(2);
+
+		assert_noop!(
+			Contracts::remove_code(RuntimeOrigin::signed(ALICE), code_hash),
+			<Error<Test>>::CodeInUse,
+		);
+
+		assert_eq!(System::events(), vec![]);
+	});
+}
+
+#[test]
+fn remove_code_not_found() {
+	let (_binary, code_hash) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Drop previous events
+		initialize_block(2);
+
+		assert_noop!(
+			Contracts::remove_code(RuntimeOrigin::signed(ALICE), code_hash),
+			<Error<Test>>::CodeNotFound,
+		);
+
+		assert_eq!(System::events(), vec![]);
+	});
+}
+
+#[test]
+fn instantiate_with_zero_balance_works() {
+	let (binary, code_hash) = compile_module("dummy").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let min_balance = Contracts::min_balance();
+
+		// Drop previous events
+		initialize_block(2);
+
+		// Instantiate the BOB contract.
+		let Contract { addr, account_id } =
+			builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
+
+		// Ensure the contract was stored and get expected deposit amount to be reserved.
+		expected_deposit(ensure_stored(code_hash));
+
+		// Make sure the account exists even though no free balance was send
+		assert_eq!(<Test as Config>::Currency::free_balance(&account_id), min_balance);
+		assert_eq!(
+			<Test as Config>::Currency::total_balance(&account_id),
+			min_balance + contract_base_deposit(&addr)
+		);
+
+		assert_eq!(
+			System::events(),
+			vec![
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::Held {
+						reason: <Test as Config>::RuntimeHoldReason::Contracts(
+							HoldReason::CodeUploadDepositReserve,
+						),
+						who: ALICE,
+						amount: 776,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::System(frame_system::Event::NewAccount {
+						account: account_id.clone(),
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::Endowed {
+						account: account_id.clone(),
+						free_balance: min_balance,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
+						from: ALICE,
+						to: account_id.clone(),
+						amount: min_balance,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Contracts(crate::Event::Instantiated {
+						deployer: ALICE_ADDR,
+						contract: addr,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::TransferAndHold {
+						reason: <Test as Config>::RuntimeHoldReason::Contracts(
+							HoldReason::StorageDepositReserve,
+						),
+						source: ALICE,
+						dest: account_id,
+						transferred: 336,
+					}),
+					topics: vec![],
+				},
+			]
+		);
+	});
+}
+
+#[test]
+fn instantiate_with_below_existential_deposit_works() {
+	let (binary, code_hash) = compile_module("dummy").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let min_balance = Contracts::min_balance();
+		let value = 50;
+
+		// Drop previous events
+		initialize_block(2);
+
+		// Instantiate the BOB contract.
+		let Contract { addr, account_id } = builder::bare_instantiate(Code::Upload(binary))
+			.native_value(value)
+			.build_and_unwrap_contract();
+
+		// Ensure the contract was stored and get expected deposit amount to be reserved.
+		expected_deposit(ensure_stored(code_hash));
+		// Make sure the account exists even though not enough free balance was send
+		assert_eq!(<Test as Config>::Currency::free_balance(&account_id), min_balance + value);
+		assert_eq!(
+			<Test as Config>::Currency::total_balance(&account_id),
+			min_balance + value + contract_base_deposit(&addr)
+		);
+
+		assert_eq!(
+			System::events(),
+			vec![
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::Held {
+						reason: <Test as Config>::RuntimeHoldReason::Contracts(
+							HoldReason::CodeUploadDepositReserve,
+						),
+						who: ALICE,
+						amount: 776,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::System(frame_system::Event::NewAccount {
+						account: account_id.clone()
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::Endowed {
+						account: account_id.clone(),
+						free_balance: min_balance,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
+						from: ALICE,
+						to: account_id.clone(),
+						amount: min_balance,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
+						from: ALICE,
+						to: account_id.clone(),
+						amount: 50,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Contracts(crate::Event::Instantiated {
+						deployer: ALICE_ADDR,
+						contract: addr,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::TransferAndHold {
+						reason: <Test as Config>::RuntimeHoldReason::Contracts(
+							HoldReason::StorageDepositReserve,
+						),
+						source: ALICE,
+						dest: account_id.clone(),
+						transferred: 336,
+					}),
+					topics: vec![],
+				},
+			]
+		);
+	});
+}
+
+#[test]
+fn storage_deposit_works() {
+	let (binary, _code_hash) = compile_module("multi_store").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		let Contract { addr, account_id } =
+			builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
+
+		let mut deposit = contract_base_deposit(&addr);
+
+		// Drop previous events
+		initialize_block(2);
+
+		// Create storage
+		assert_ok!(builder::call(addr).value(42).data((50u32, 20u32).encode()).build());
+		// 4 is for creating 2 storage items
+		// 48 is for each of the keys
+		let charged0 = 4 + 50 + 20 + 48 + 48;
+		deposit += charged0;
+		assert_eq!(get_contract(&addr).total_deposit(), deposit);
+
+		// Add more storage (but also remove some)
+		assert_ok!(builder::call(addr).data((100u32, 10u32).encode()).build());
+		let charged1 = 50 - 10;
+		deposit += charged1;
+		assert_eq!(get_contract(&addr).total_deposit(), deposit);
+
+		// Remove more storage (but also add some)
+		assert_ok!(builder::call(addr).data((10u32, 20u32).encode()).build());
+		// -1 for numeric instability
+		let refunded0 = 90 - 10 - 1;
+		deposit -= refunded0;
+		assert_eq!(get_contract(&addr).total_deposit(), deposit);
+
+		assert_eq!(
+			System::events(),
+			vec![
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
+						from: ALICE,
+						to: account_id.clone(),
+						amount: 42,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::TransferAndHold {
+						reason: <Test as Config>::RuntimeHoldReason::Contracts(
+							HoldReason::StorageDepositReserve,
+						),
+						source: ALICE,
+						dest: account_id.clone(),
+						transferred: charged0,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::TransferAndHold {
+						reason: <Test as Config>::RuntimeHoldReason::Contracts(
+							HoldReason::StorageDepositReserve,
+						),
+						source: ALICE,
+						dest: account_id.clone(),
+						transferred: charged1,
+					}),
+					topics: vec![],
+				},
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::TransferOnHold {
+						reason: <Test as Config>::RuntimeHoldReason::Contracts(
+							HoldReason::StorageDepositReserve,
+						),
+						source: account_id.clone(),
+						dest: ALICE,
+						amount: refunded0,
+					}),
+					topics: vec![],
+				},
+			]
+		);
+	});
+}
+
+#[test]
+fn storage_deposit_callee_works() {
+	let (binary_caller, _code_hash_caller) = compile_module("call").unwrap();
+	let (binary_callee, _code_hash_callee) = compile_module("store_call").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create both contracts: Constructors do nothing.
+		let Contract { addr: addr_caller, .. } =
+			builder::bare_instantiate(Code::Upload(binary_caller)).build_and_unwrap_contract();
+		let Contract { addr: addr_callee, .. } =
+			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
+
+		assert_ok!(builder::call(addr_caller).data((100u32, &addr_callee).encode()).build());
+
+		let callee = get_contract(&addr_callee);
+		let deposit = DepositPerByte::get() * 100 + DepositPerItem::get() * 1 + 48;
+
+		assert_eq!(Pallet::<Test>::evm_balance(&addr_caller), U256::zero());
+		assert_eq!(callee.total_deposit(), deposit + contract_base_deposit(&addr_callee));
+	});
+}
+
+#[test]
+fn set_code_extrinsic() {
+	let (binary, code_hash) = compile_module("dummy").unwrap();
+	let (new_binary, new_code_hash) = compile_module("crypto_hashes").unwrap();
+
+	assert_ne!(code_hash, new_code_hash);
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
+
+		assert_ok!(Contracts::upload_code(
+			RuntimeOrigin::signed(ALICE),
+			new_binary,
+			deposit_limit::<Test>(),
+		));
+
+		// Drop previous events
+		initialize_block(2);
+
+		assert_eq!(get_contract(&addr).code_hash, code_hash);
+		assert_refcount!(&code_hash, 1);
+		assert_refcount!(&new_code_hash, 0);
+
+		// only root can execute this extrinsic
+		assert_noop!(
+			Contracts::set_code(RuntimeOrigin::signed(ALICE), addr, new_code_hash),
+			sp_runtime::traits::BadOrigin,
+		);
+		assert_eq!(get_contract(&addr).code_hash, code_hash);
+		assert_refcount!(&code_hash, 1);
+		assert_refcount!(&new_code_hash, 0);
+		assert_eq!(System::events(), vec![]);
+
+		// contract must exist
+		assert_noop!(
+			Contracts::set_code(RuntimeOrigin::root(), BOB_ADDR, new_code_hash),
+			<Error<Test>>::ContractNotFound,
+		);
+		assert_eq!(get_contract(&addr).code_hash, code_hash);
+		assert_refcount!(&code_hash, 1);
+		assert_refcount!(&new_code_hash, 0);
+		assert_eq!(System::events(), vec![]);
+
+		// new code hash must exist
+		assert_noop!(
+			Contracts::set_code(RuntimeOrigin::root(), addr, Default::default()),
+			<Error<Test>>::CodeNotFound,
+		);
+		assert_eq!(get_contract(&addr).code_hash, code_hash);
+		assert_refcount!(&code_hash, 1);
+		assert_refcount!(&new_code_hash, 0);
+		assert_eq!(System::events(), vec![]);
+
+		// successful call
+		assert_ok!(Contracts::set_code(RuntimeOrigin::root(), addr, new_code_hash));
+		assert_eq!(get_contract(&addr).code_hash, new_code_hash);
+		assert_refcount!(&code_hash, 0);
+		assert_refcount!(&new_code_hash, 1);
+	});
+}
+
+#[test]
+fn slash_cannot_kill_account() {
+	let (binary, _code_hash) = compile_module("dummy").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let value = 700;
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let min_balance = Contracts::min_balance();
+
+		let Contract { addr, account_id } = builder::bare_instantiate(Code::Upload(binary))
+			.native_value(value)
+			.build_and_unwrap_contract();
+
+		// Drop previous events
+		initialize_block(2);
+
+		let info_deposit = contract_base_deposit(&addr);
+
+		assert_eq!(
+			get_balance_on_hold(&HoldReason::StorageDepositReserve.into(), &account_id),
+			info_deposit
+		);
+
+		assert_eq!(
+			<Test as Config>::Currency::total_balance(&account_id),
+			info_deposit + value + min_balance
+		);
+
+		// Try to destroy the account of the contract by slashing the total balance.
+		// The account does not get destroyed because slashing only affects the balance held
+		// under certain `reason`. Slashing can for example happen if the contract takes part
+		// in staking.
+		let _ = <Test as Config>::Currency::slash(
+			&HoldReason::StorageDepositReserve.into(),
+			&account_id,
+			<Test as Config>::Currency::total_balance(&account_id),
+		);
+
+		// Slashing only removed the balance held.
+		assert_eq!(<Test as Config>::Currency::total_balance(&account_id), value + min_balance);
+	});
+}
+
+#[test]
+fn contract_reverted() {
+	let (binary, code_hash) = compile_module("return_with_data").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let flags = ReturnFlags::REVERT;
+		let buffer = [4u8, 8, 15, 16, 23, 42];
+		let input = (flags.bits(), buffer).encode();
+
+		// We just upload the code for later use
+		assert_ok!(Contracts::upload_code(
+			RuntimeOrigin::signed(ALICE),
+			binary.clone(),
+			deposit_limit::<Test>(),
+		));
+
+		// Calling extrinsic: revert leads to an error
+		assert_err_ignore_postinfo!(
+			builder::instantiate(code_hash).data(input.clone()).build(),
+			<Error<Test>>::ContractReverted,
+		);
+
+		// Calling extrinsic: revert leads to an error
+		assert_err_ignore_postinfo!(
+			builder::instantiate_with_code(binary).data(input.clone()).build(),
+			<Error<Test>>::ContractReverted,
+		);
+
+		// Calling directly: revert leads to success but the flags indicate the error
+		// This is just a different way of transporting the error that allows the read out
+		// the `data` which is only there on success. Obviously, the contract isn't
+		// instantiated.
+		let result = builder::bare_instantiate(Code::Existing(code_hash))
+			.data(input.clone())
+			.build_and_unwrap_result();
+		assert_eq!(result.result.flags, flags);
+		assert_eq!(result.result.data, buffer);
+		assert!(!<AccountInfoOf<Test>>::contains_key(result.addr));
+
+		// Pass empty flags and therefore successfully instantiate the contract for later use.
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Existing(code_hash))
+			.data(ReturnFlags::empty().bits().encode())
+			.build_and_unwrap_contract();
+
+		// Calling extrinsic: revert leads to an error
+		assert_err_ignore_postinfo!(
+			builder::call(addr).data(input.clone()).build(),
+			<Error<Test>>::ContractReverted,
+		);
+
+		// Calling directly: revert leads to success but the flags indicate the error
+		let result = builder::bare_call(addr).data(input).build_and_unwrap_result();
+		assert_eq!(result.flags, flags);
+		assert_eq!(result.data, buffer);
+	});
+}
+
+#[test]
+fn set_code_hash() {
+	let (binary, _) = compile_module("set_code_hash").unwrap();
+	let (new_binary, new_code_hash) = compile_module("new_set_code_hash_contract").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Instantiate the 'caller'
+		let Contract { addr: contract_addr, .. } = builder::bare_instantiate(Code::Upload(binary))
+			.native_value(300_000)
+			.build_and_unwrap_contract();
+		// upload new code
+		assert_ok!(Contracts::upload_code(
+			RuntimeOrigin::signed(ALICE),
+			new_binary.clone(),
+			deposit_limit::<Test>(),
+		));
+
+		System::reset_events();
+
+		// First call sets new code_hash and returns 1
+		let result = builder::bare_call(contract_addr)
+			.data(new_code_hash.as_ref().to_vec())
+			.build_and_unwrap_result();
+		assert_return_code!(result, 1);
+
+		// Second calls new contract code that returns 2
+		let result = builder::bare_call(contract_addr).build_and_unwrap_result();
+		assert_return_code!(result, 2);
+	});
+}
+
+#[test]
+fn storage_deposit_limit_is_enforced() {
+	let (binary, _code_hash) = compile_module("store_call").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let min_balance = Contracts::min_balance();
+
+		// Setting insufficient storage_deposit should fail.
+		assert_err!(
+			builder::bare_instantiate(Code::Upload(binary.clone()))
+				// expected deposit is 2 * ed + 3 for the call
+				.storage_deposit_limit((2 * min_balance + 3 - 1).into())
+				.build()
+				.result,
+			<Error<Test>>::StorageDepositLimitExhausted,
+		);
+
+		// Instantiate the BOB contract.
+		let Contract { addr, account_id } =
+			builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
+
+		let info_deposit = contract_base_deposit(&addr);
+		// Check that the BOB contract has been instantiated and has the minimum balance
+		assert_eq!(get_contract(&addr).total_deposit(), info_deposit);
+		assert_eq!(
+			<Test as Config>::Currency::total_balance(&account_id),
+			info_deposit + min_balance
+		);
+
+		// Create 1 byte of storage with a price of per byte,
+		// setting insufficient deposit limit, as it requires 3 Balance:
+		// 2 for the item added + 1 (value) + 48 (key)
+		assert_err_ignore_postinfo!(
+			builder::call(addr)
+				.storage_deposit_limit(50)
+				.data(1u32.to_le_bytes().to_vec())
+				.build(),
+			<Error<Test>>::StorageDepositLimitExhausted,
+		);
+
+		// now with enough limit
+		assert_ok!(builder::call(addr)
+			.storage_deposit_limit(51)
+			.data(1u32.to_le_bytes().to_vec())
+			.build());
+
+		// Use 4 more bytes of the storage for the same item, which requires 4 Balance.
+		// Should fail as DefaultDepositLimit is 3 and hence isn't enough.
+		assert_err_ignore_postinfo!(
+			builder::call(addr)
+				.storage_deposit_limit(3)
+				.data(5u32.to_le_bytes().to_vec())
+				.build(),
+			<Error<Test>>::StorageDepositLimitExhausted,
+		);
+	});
+}
+
+#[test]
+fn deposit_limit_in_nested_calls() {
+	let (binary_caller, _code_hash_caller) = compile_module("create_storage_and_call").unwrap();
+	let (binary_callee, _code_hash_callee) = compile_module("store_call").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create both contracts: Constructors do nothing.
+		let Contract { addr: addr_caller, .. } =
+			builder::bare_instantiate(Code::Upload(binary_caller)).build_and_unwrap_contract();
+		let Contract { addr: addr_callee, .. } =
+			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
+
+		// Create 100 bytes of storage with a price of per byte
+		// This is 100 Balance + 2 Balance for the item
+		// 48 for the key
+		assert_ok!(builder::call(addr_callee)
+			.storage_deposit_limit(102 + 48)
+			.data(100u32.to_le_bytes().to_vec())
+			.build());
+
+		// We do not remove any storage but add a storage item of 12 bytes in the caller
+		// contract. This would cost 12 + 2 + 72 = 86 Balance.
+		// The nested call doesn't get a special limit, which is set by passing `u64::MAX` to it.
+		// This should fail as the specified parent's limit is less than the cost: 13 <
+		// 14.
+		assert_err_ignore_postinfo!(
+			builder::call(addr_caller)
+				.storage_deposit_limit(85)
+				.data((100u32, &addr_callee, U256::MAX).encode())
+				.build(),
+			<Error<Test>>::StorageDepositLimitExhausted,
+		);
+
+		// Now we specify the parent's limit high enough to cover the caller's storage
+		// additions. However, we use a single byte more in the callee, hence the storage
+		// deposit should be 87 Balance.
+		// The nested call doesn't get a special limit, which is set by passing `u64::MAX` to it.
+		// This should fail as the specified parent's limit is less than the cost: 86 < 87
+		assert_err_ignore_postinfo!(
+			builder::call(addr_caller)
+				.storage_deposit_limit(86)
+				.data((101u32, &addr_callee, &U256::MAX).encode())
+				.build(),
+			<Error<Test>>::StorageDepositLimitExhausted,
+		);
+
+		// The parents storage deposit limit doesn't matter as the sub calls limit
+		// is enforced eagerly. However, we set a special deposit limit of 1 Balance for the
+		// nested call. This should fail as callee adds up 2 bytes to the storage, meaning
+		// that the nested call should have a deposit limit of at least 2 Balance. The
+		// sub-call should be rolled back, which is covered by the next test case.
+		let ret = builder::bare_call(addr_caller)
+			.storage_deposit_limit(DepositLimit::Balance(u64::MAX))
+			.data((102u32, &addr_callee, U256::from(1u64)).encode())
+			.build_and_unwrap_result();
+		assert_return_code!(ret, RuntimeReturnCode::OutOfResources);
+
+		// Refund in the callee contract but not enough to cover the Balance required by the
+		// caller. Note that if previous sub-call wouldn't roll back, this call would pass
+		// making the test case fail. We don't set a special limit for the nested call here.
+		assert_err_ignore_postinfo!(
+			builder::call(addr_caller)
+				.storage_deposit_limit(0)
+				.data((87u32, &addr_callee, &U256::MAX.to_little_endian()).encode())
+				.build(),
+			<Error<Test>>::StorageDepositLimitExhausted,
+		);
+
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 511);
+
+		// Require more than the sender's balance.
+		// Limit the sub call to little balance so it should fail in there
+		let ret = builder::bare_call(addr_caller)
+			.data((416, &addr_callee, U256::from(1u64)).encode())
+			.build_and_unwrap_result();
+		assert_return_code!(ret, RuntimeReturnCode::OutOfResources);
+
+		// Free up enough storage in the callee so that the caller can create a new item
+		// We set the special deposit limit of 1 Balance for the nested call, which isn't
+		// enforced as callee frees up storage. This should pass.
+		assert_ok!(builder::call(addr_caller)
+			.storage_deposit_limit(1)
+			.data((0u32, &addr_callee, U256::from(1u64)).encode())
+			.build());
+	});
+}
+
+#[test]
+fn deposit_limit_in_nested_instantiate() {
+	let (binary_caller, _code_hash_caller) =
+		compile_module("create_storage_and_instantiate").unwrap();
+	let (binary_callee, code_hash_callee) = compile_module("store_deploy").unwrap();
+	const ED: u64 = 5;
+	ExtBuilder::default().existential_deposit(ED).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let _ = <Test as Config>::Currency::set_balance(&BOB, 1_000_000);
+		// Create caller contract
+		let Contract { addr: addr_caller, account_id: caller_id } =
+			builder::bare_instantiate(Code::Upload(binary_caller))
+				.native_value(10_000) // this balance is later passed to the deployed contract
+				.build_and_unwrap_contract();
+		// Deploy a contract to get its occupied storage size
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(binary_callee))
+			.data(vec![0, 0, 0, 0])
+			.build_and_unwrap_contract();
+
+		// This is the deposit we expect to be charged just for instantiatiting the callee.
+		//
+		// - callee_info_len + 2 for storing the new contract info
+		// - the deposit for depending on a code hash
+		// - ED for deployed contract account
+		// - 2 for the storage item of 0 bytes being created in the callee constructor
+		// - 48 for the key
+		let callee_min_deposit = {
+			let callee_info_len =
+				AccountInfo::<Test>::load_contract(&addr).unwrap().encoded_size() as u64;
+			let code_deposit = lockup_deposit(&code_hash_callee);
+			callee_info_len + code_deposit + 2 + ED + 2 + 48
+		};
+
+		// The parent just stores an item of the passed size so at least
+		// we need to pay for the item itself.
+		let caller_min_deposit = callee_min_deposit + 2 + 48;
+
+		// Fail in callee.
+		//
+		// We still fail in the sub call because we enforce limits on return from a contract.
+		// Sub calls return first to they are checked first.
+		let ret = builder::bare_call(addr_caller)
+			.origin(RuntimeOrigin::signed(BOB))
+			.storage_deposit_limit(DepositLimit::Balance(0))
+			.data((&code_hash_callee, 100u32, &U256::MAX.to_little_endian()).encode())
+			.build_and_unwrap_result();
+		assert_return_code!(ret, RuntimeReturnCode::OutOfResources);
+		// The charges made on instantiation should be rolled back.
+		assert_eq!(<Test as Config>::Currency::free_balance(&BOB), 1_000_000);
+
+		// Fail in the caller.
+		//
+		// For that we need to supply enough storage deposit so that the sub call
+		// succeeds but the parent call runs out of storage.
+		let ret = builder::bare_call(addr_caller)
+			.origin(RuntimeOrigin::signed(BOB))
+			.storage_deposit_limit(DepositLimit::Balance(callee_min_deposit))
+			.data((&code_hash_callee, 0u32, &U256::MAX.to_little_endian()).encode())
+			.build();
+		assert_err!(ret.result, <Error<Test>>::StorageDepositLimitExhausted);
+		// The charges made on the instantiation should be rolled back.
+		assert_eq!(<Test as Config>::Currency::free_balance(&BOB), 1_000_000);
+
+		// Fail in the callee with bytes.
+		//
+		// Same as above but stores one byte in both caller and callee.
+		let ret = builder::bare_call(addr_caller)
+			.origin(RuntimeOrigin::signed(BOB))
+			.storage_deposit_limit(DepositLimit::Balance(caller_min_deposit + 1))
+			.data((&code_hash_callee, 1u32, U256::from(callee_min_deposit)).encode())
+			.build_and_unwrap_result();
+		assert_return_code!(ret, RuntimeReturnCode::OutOfResources);
+		// The charges made on the instantiation should be rolled back.
+		assert_eq!(<Test as Config>::Currency::free_balance(&BOB), 1_000_000);
+
+		// Fail in the caller with bytes.
+		//
+		// Same as above but stores one byte in both caller and callee.
+		let ret = builder::bare_call(addr_caller)
+			.origin(RuntimeOrigin::signed(BOB))
+			.storage_deposit_limit(DepositLimit::Balance(callee_min_deposit + 1))
+			.data((&code_hash_callee, 1u32, U256::from(callee_min_deposit + 1)).encode())
+			.build();
+		assert_err!(ret.result, <Error<Test>>::StorageDepositLimitExhausted);
+		// The charges made on the instantiation should be rolled back.
+		assert_eq!(<Test as Config>::Currency::free_balance(&BOB), 1_000_000);
+
+		// Set enough deposit limit for the child instantiate. This should succeed.
+		let result = builder::bare_call(addr_caller)
+			.origin(RuntimeOrigin::signed(BOB))
+			.storage_deposit_limit((caller_min_deposit + 2).into())
+			.data((&code_hash_callee, 1u32, U256::from(callee_min_deposit + 1)).encode())
+			.build();
+
+		let returned = result.result.unwrap();
+		assert!(!returned.did_revert());
+
+		// All balance of the caller except ED has been transferred to the callee.
+		// No deposit has been taken from it.
+		assert_eq!(<Test as Config>::Currency::free_balance(&caller_id), ED);
+		// Get address of the deployed contract.
+		let addr_callee = H160::from_slice(&returned.data[0..20]);
+		let callee_account_id = <Test as Config>::AddressMapper::to_account_id(&addr_callee);
+		// 10_000 should be sent to callee from the caller contract, plus ED to be sent from the
+		// origin.
+		assert_eq!(<Test as Config>::Currency::free_balance(&callee_account_id), 10_000 + ED);
+		// The origin should be charged with what the outer call consumed
+		assert_eq!(
+			<Test as Config>::Currency::free_balance(&BOB),
+			1_000_000 - (caller_min_deposit + 2),
+		);
+		assert_eq!(result.storage_deposit.charge_or_zero(), (caller_min_deposit + 2))
+	});
+}
+
+#[test]
+fn deposit_limit_honors_liquidity_restrictions() {
+	let (binary, _code_hash) = compile_module("store_call").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let bobs_balance = 1_000;
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let _ = <Test as Config>::Currency::set_balance(&BOB, bobs_balance);
+		let min_balance = Contracts::min_balance();
+
+		// Instantiate the BOB contract.
+		let Contract { addr, account_id } =
+			builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
+
+		let info_deposit = contract_base_deposit(&addr);
+		// Check that the contract has been instantiated and has the minimum balance
+		assert_eq!(get_contract(&addr).total_deposit(), info_deposit);
+		assert_eq!(
+			<Test as Config>::Currency::total_balance(&account_id),
+			info_deposit + min_balance
+		);
+
+		// check that the hold is honored
+		<Test as Config>::Currency::hold(
+			&HoldReason::CodeUploadDepositReserve.into(),
+			&BOB,
+			bobs_balance - min_balance,
+		)
+		.unwrap();
+		assert_err_ignore_postinfo!(
+			builder::call(addr)
+				.origin(RuntimeOrigin::signed(BOB))
+				.storage_deposit_limit(10_000)
+				.data(100u32.to_le_bytes().to_vec())
+				.build(),
+			<Error<Test>>::StorageDepositNotEnoughFunds,
+		);
+		assert_eq!(<Test as Config>::Currency::free_balance(&BOB), min_balance);
+	});
+}
+
+#[test]
+fn deposit_limit_honors_existential_deposit() {
+	let (binary, _code_hash) = compile_module("store_call").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let _ = <Test as Config>::Currency::set_balance(&BOB, 300);
+		let min_balance = Contracts::min_balance();
+
+		// Instantiate the BOB contract.
+		let Contract { addr, account_id } =
+			builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
+
+		let info_deposit = contract_base_deposit(&addr);
+
+		// Check that the contract has been instantiated and has the minimum balance
+		assert_eq!(get_contract(&addr).total_deposit(), info_deposit);
+		assert_eq!(
+			<Test as Config>::Currency::total_balance(&account_id),
+			min_balance + info_deposit
+		);
+
+		// check that the deposit can't bring the account below the existential deposit
+		assert_err_ignore_postinfo!(
+			builder::call(addr)
+				.origin(RuntimeOrigin::signed(BOB))
+				.storage_deposit_limit(10_000)
+				.data(100u32.to_le_bytes().to_vec())
+				.build(),
+			<Error<Test>>::StorageDepositNotEnoughFunds,
+		);
+		assert_eq!(<Test as Config>::Currency::free_balance(&BOB), 300);
+	});
+}
+
+#[test]
+fn native_dependency_deposit_works() {
+	let (binary, code_hash) = compile_module("set_code_hash").unwrap();
+	let (dummy_binary, dummy_code_hash) = compile_module("dummy").unwrap();
+
+	// Test with both existing and uploaded code
+	for code in [Code::Upload(binary.clone()), Code::Existing(code_hash)] {
+		ExtBuilder::default().build().execute_with(|| {
+			let _ = Balances::set_balance(&ALICE, 1_000_000);
+			let lockup_deposit_percent = CodeHashLockupDepositPercent::get();
+
+			// Upload the dummy contract,
+			Contracts::upload_code(
+				RuntimeOrigin::signed(ALICE),
+				dummy_binary.clone(),
+				deposit_limit::<Test>(),
+			)
+			.unwrap();
+
+			// Upload `set_code_hash` contracts if using Code::Existing.
+			let add_upload_deposit = match code {
+				Code::Existing(_) => {
+					Contracts::upload_code(
+						RuntimeOrigin::signed(ALICE),
+						binary.clone(),
+						deposit_limit::<Test>(),
+					)
+					.unwrap();
+					false
+				},
+				Code::Upload(_) => true,
+			};
+
+			// Instantiate the set_code_hash contract.
+			let res = builder::bare_instantiate(code).build();
+
+			let addr = res.result.unwrap().addr;
+			let account_id = <Test as Config>::AddressMapper::to_account_id(&addr);
+			let base_deposit = contract_base_deposit(&addr);
+			let upload_deposit = get_code_deposit(&code_hash);
+			let extra_deposit = add_upload_deposit.then(|| upload_deposit).unwrap_or_default();
+
+			assert_eq!(
+				res.storage_deposit.charge_or_zero(),
+				extra_deposit + base_deposit + Contracts::min_balance()
+			);
+
+			// call set_code_hash
+			builder::bare_call(addr)
+				.data(dummy_code_hash.encode())
+				.build_and_unwrap_result();
+
+			// Check updated storage_deposit due to code size changes
+			let deposit_diff = lockup_deposit_percent.mul_ceil(get_code_deposit(&code_hash)) -
+				lockup_deposit_percent.mul_ceil(get_code_deposit(&dummy_code_hash));
+			let new_base_deposit = contract_base_deposit(&addr);
+			assert_ne!(deposit_diff, 0);
+			assert_eq!(base_deposit - new_base_deposit, deposit_diff);
+
+			assert_eq!(
+				get_balance_on_hold(&HoldReason::StorageDepositReserve.into(), &account_id),
+				new_base_deposit
+			);
+		});
+	}
+}
+
+#[test]
+fn block_hash_works() {
+	let (code, _) = compile_module("block_hash").unwrap();
+
+	ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		// The genesis config sets to the block number to 1
+		let block_hash = [1; 32];
+		frame_system::BlockHash::<Test>::insert(
+			&crate::BlockNumberFor::<Test>::from(0u32),
+			<Test as frame_system::Config>::Hash::from(&block_hash),
+		);
+		assert_ok!(builder::call(addr)
+			.data((U256::zero(), H256::from(block_hash)).encode())
+			.build());
+
+		// A block number out of range returns the zero value
+		assert_ok!(builder::call(addr).data((U256::from(1), H256::zero()).encode()).build());
+	});
+}
+
+#[test]
+fn block_author_works() {
+	let (code, _) = compile_module("block_author").unwrap();
+
+	ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		// The fixture asserts the input to match the find_author API method output.
+		assert_ok!(builder::call(addr).data(EVE_ADDR.encode()).build());
+	});
+}
+
+#[test]
+fn root_cannot_upload_code() {
+	let (binary, _) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().build().execute_with(|| {
+		assert_noop!(
+			Contracts::upload_code(RuntimeOrigin::root(), binary, deposit_limit::<Test>()),
+			DispatchError::BadOrigin,
+		);
+	});
+}
+
+#[test]
+fn root_cannot_remove_code() {
+	let (_, code_hash) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().build().execute_with(|| {
+		assert_noop!(
+			Contracts::remove_code(RuntimeOrigin::root(), code_hash),
+			DispatchError::BadOrigin,
+		);
+	});
+}
+
+#[test]
+fn signed_cannot_set_code() {
+	let (_, code_hash) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().build().execute_with(|| {
+		assert_noop!(
+			Contracts::set_code(RuntimeOrigin::signed(ALICE), BOB_ADDR, code_hash),
+			DispatchError::BadOrigin,
+		);
+	});
+}
+
+#[test]
+fn none_cannot_call_code() {
+	ExtBuilder::default().build().execute_with(|| {
+		assert_err_ignore_postinfo!(
+			builder::call(BOB_ADDR).origin(RuntimeOrigin::none()).build(),
+			DispatchError::BadOrigin,
+		);
+	});
+}
+
+#[test]
+fn root_can_call() {
+	let (binary, _) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(binary)).build_and_unwrap_contract();
+
+		// Call the contract.
+		assert_ok!(builder::call(addr).origin(RuntimeOrigin::root()).build());
+	});
+}
+
+#[test]
+fn root_cannot_instantiate_with_code() {
+	let (binary, _) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().build().execute_with(|| {
+		assert_err_ignore_postinfo!(
+			builder::instantiate_with_code(binary).origin(RuntimeOrigin::root()).build(),
+			DispatchError::BadOrigin
+		);
+	});
+}
+
+#[test]
+fn root_cannot_instantiate() {
+	let (_, code_hash) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().build().execute_with(|| {
+		assert_err_ignore_postinfo!(
+			builder::instantiate(code_hash).origin(RuntimeOrigin::root()).build(),
+			DispatchError::BadOrigin
+		);
+	});
+}
+
+#[test]
+fn only_upload_origin_can_upload() {
+	let (binary, _) = compile_module("dummy").unwrap();
+	UploadAccount::set(Some(ALICE));
+	ExtBuilder::default().build().execute_with(|| {
+		let _ = Balances::set_balance(&ALICE, 1_000_000);
+		let _ = Balances::set_balance(&BOB, 1_000_000);
+
+		assert_err!(
+			Contracts::upload_code(RuntimeOrigin::root(), binary.clone(), deposit_limit::<Test>(),),
+			DispatchError::BadOrigin
+		);
+
+		assert_err!(
+			Contracts::upload_code(
+				RuntimeOrigin::signed(BOB),
+				binary.clone(),
+				deposit_limit::<Test>(),
+			),
+			DispatchError::BadOrigin
+		);
+
+		// Only alice is allowed to upload contract code.
+		assert_ok!(Contracts::upload_code(
+			RuntimeOrigin::signed(ALICE),
+			binary.clone(),
+			deposit_limit::<Test>(),
+		));
+	});
+}
+
+#[test]
+fn only_instantiation_origin_can_instantiate() {
+	let (code, code_hash) = compile_module("dummy").unwrap();
+	InstantiateAccount::set(Some(ALICE));
+	ExtBuilder::default().build().execute_with(|| {
+		let _ = Balances::set_balance(&ALICE, 1_000_000);
+		let _ = Balances::set_balance(&BOB, 1_000_000);
+
+		assert_err_ignore_postinfo!(
+			builder::instantiate_with_code(code.clone())
+				.origin(RuntimeOrigin::root())
+				.build(),
+			DispatchError::BadOrigin
+		);
+
+		assert_err_ignore_postinfo!(
+			builder::instantiate_with_code(code.clone())
+				.origin(RuntimeOrigin::signed(BOB))
+				.build(),
+			DispatchError::BadOrigin
+		);
+
+		// Only Alice can instantiate
+		assert_ok!(builder::instantiate_with_code(code).build());
+
+		// Bob cannot instantiate with either `instantiate_with_code` or `instantiate`.
+		assert_err_ignore_postinfo!(
+			builder::instantiate(code_hash).origin(RuntimeOrigin::signed(BOB)).build(),
+			DispatchError::BadOrigin
+		);
+	});
+}
+
+#[test]
+fn balance_of_api() {
+	let (binary, _code_hash) = compile_module("balance_of").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = Balances::set_balance(&ALICE, 1_000_000);
+		let _ = Balances::set_balance(&ALICE_FALLBACK, 1_000_000);
+
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(binary.to_vec())).build_and_unwrap_contract();
+
+		// The fixture asserts a non-zero returned free balance of the account;
+		// The ALICE_FALLBACK account is endowed;
+		// Hence we should not revert
+		assert_ok!(builder::call(addr).data(ALICE_ADDR.0.to_vec()).build());
+
+		// The fixture asserts a non-zero returned free balance of the account;
+		// The ETH_BOB account is not endowed;
+		// Hence we should revert
+		assert_err_ignore_postinfo!(
+			builder::call(addr).data(BOB_ADDR.0.to_vec()).build(),
+			<Error<Test>>::ContractTrapped
+		);
+	});
+}
+
+#[test]
+fn balance_api_returns_free_balance() {
+	let (binary, _code_hash) = compile_module("balance").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Instantiate the BOB contract without any extra balance.
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(binary.to_vec())).build_and_unwrap_contract();
+
+		let value = 0;
+		// Call BOB which makes it call the balance runtime API.
+		// The contract code asserts that the returned balance is 0.
+		assert_ok!(builder::call(addr).value(value).build());
+
+		let value = 1;
+		// Calling with value will trap the contract.
+		assert_err_ignore_postinfo!(
+			builder::call(addr).value(value).build(),
+			<Error<Test>>::ContractTrapped
+		);
+	});
+}
+
+#[test]
+fn call_depth_is_enforced() {
+	let (binary, _code_hash) = compile_module("recurse").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		let extra_recursions = 1024;
+
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(binary.to_vec())).build_and_unwrap_contract();
+
+		// takes the number of recursions
+		// returns the number of left over recursions
+		assert_eq!(
+			u32::from_le_bytes(
+				builder::bare_call(addr)
+					.data((limits::CALL_STACK_DEPTH + extra_recursions).encode())
+					.build_and_unwrap_result()
+					.data
+					.try_into()
+					.unwrap()
+			),
+			// + 1 because when the call depth is reached the caller contract is trapped without
+			// the ability to return any data. hence the last call frame is untracked.
+			extra_recursions + 1,
+		);
+	});
+}
+
+#[test]
+fn gas_consumed_is_linear_for_nested_calls() {
+	let (code, _code_hash) = compile_module("recurse").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		let [gas_0, gas_1, gas_2, gas_max] = {
+			[0u32, 1u32, 2u32, limits::CALL_STACK_DEPTH]
+				.iter()
+				.map(|i| {
+					let result = builder::bare_call(addr).data(i.encode()).build();
+					assert_eq!(
+						u32::from_le_bytes(result.result.unwrap().data.try_into().unwrap()),
+						0
+					);
+					result.gas_consumed
+				})
+				.collect::<Vec<_>>()
+				.try_into()
+				.unwrap()
+		};
+
+		let gas_per_recursion = gas_2.checked_sub(&gas_1).unwrap();
+		assert_eq!(gas_max, gas_0 + gas_per_recursion * limits::CALL_STACK_DEPTH as u64);
+	});
+}
+
+#[test]
+fn read_only_call_cannot_store() {
+	let (binary_caller, _code_hash_caller) = compile_module("read_only_call").unwrap();
+	let (binary_callee, _code_hash_callee) = compile_module("store_call").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create both contracts: Constructors do nothing.
+		let Contract { addr: addr_caller, .. } =
+			builder::bare_instantiate(Code::Upload(binary_caller)).build_and_unwrap_contract();
+		let Contract { addr: addr_callee, .. } =
+			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
+
+		// Read-only call fails when modifying storage.
+		assert_err_ignore_postinfo!(
+			builder::call(addr_caller).data((&addr_callee, 100u32).encode()).build(),
+			<Error<Test>>::ContractTrapped
+		);
+	});
+}
+
+#[test]
+fn read_only_call_cannot_transfer() {
+	let (binary_caller, _code_hash_caller) = compile_module("call_with_flags_and_value").unwrap();
+	let (binary_callee, _code_hash_callee) = compile_module("dummy").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create both contracts: Constructors do nothing.
+		let Contract { addr: addr_caller, .. } =
+			builder::bare_instantiate(Code::Upload(binary_caller)).build_and_unwrap_contract();
+		let Contract { addr: addr_callee, .. } =
+			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
+
+		// Read-only call fails when a non-zero value is set.
+		assert_err_ignore_postinfo!(
+			builder::call(addr_caller)
+				.data(
+					(addr_callee, pallet_revive_uapi::CallFlags::READ_ONLY.bits(), 100u64).encode()
+				)
+				.build(),
+			<Error<Test>>::StateChangeDenied
+		);
+	});
+}
+
+#[test]
+fn read_only_subsequent_call_cannot_store() {
+	let (binary_read_only_caller, _code_hash_caller) = compile_module("read_only_call").unwrap();
+	let (binary_caller, _code_hash_caller) = compile_module("call_with_flags_and_value").unwrap();
+	let (binary_callee, _code_hash_callee) = compile_module("store_call").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create contracts: Constructors do nothing.
+		let Contract { addr: addr_caller, .. } =
+			builder::bare_instantiate(Code::Upload(binary_read_only_caller))
+				.build_and_unwrap_contract();
+		let Contract { addr: addr_subsequent_caller, .. } =
+			builder::bare_instantiate(Code::Upload(binary_caller)).build_and_unwrap_contract();
+		let Contract { addr: addr_callee, .. } =
+			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
+
+		// Subsequent call input.
+		let input = (&addr_callee, pallet_revive_uapi::CallFlags::empty().bits(), 0u64, 100u32);
+
+		// Read-only call fails when modifying storage.
+		assert_err_ignore_postinfo!(
+			builder::call(addr_caller)
+				.data((&addr_subsequent_caller, input).encode())
+				.build(),
+			<Error<Test>>::ContractTrapped
+		);
+	});
+}
+
+#[test]
+fn read_only_call_works() {
+	let (binary_caller, _code_hash_caller) = compile_module("read_only_call").unwrap();
+	let (binary_callee, _code_hash_callee) = compile_module("dummy").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create both contracts: Constructors do nothing.
+		let Contract { addr: addr_caller, .. } =
+			builder::bare_instantiate(Code::Upload(binary_caller)).build_and_unwrap_contract();
+		let Contract { addr: addr_callee, .. } =
+			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
+
+		assert_ok!(builder::call(addr_caller).data(addr_callee.encode()).build());
+	});
+}
+
+#[test]
+fn create1_with_value_works() {
+	let (code, code_hash) = compile_module("create1_with_value").unwrap();
+	let value = 42;
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create the contract: Constructor does nothing.
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		// Call the contract: Deploys itself using create1 and the expected value
+		assert_ok!(builder::call(addr).value(value).data(code_hash.encode()).build());
+
+		// We should see the expected balance at the expected account
+		let address = crate::address::create1(&addr, 1);
+		let account_id = <Test as Config>::AddressMapper::to_account_id(&address);
+		let usable_balance = <Test as Config>::Currency::usable_balance(&account_id);
+		assert_eq!(usable_balance, value);
+	});
+}
+
+#[test]
+fn gas_price_api_works() {
+	let (code, _) = compile_module("gas_price").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create fixture: Constructor does nothing
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		// Call the contract: It echoes back the value returned by the gas price API.
+		let received = builder::bare_call(addr).build_and_unwrap_result();
+		assert_eq!(received.flags, ReturnFlags::empty());
+		assert_eq!(u64::from_le_bytes(received.data[..].try_into().unwrap()), u64::from(GAS_PRICE));
+	});
+}
+
+#[test]
+fn base_fee_api_works() {
+	let (code, _) = compile_module("base_fee").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create fixture: Constructor does nothing
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		// Call the contract: It echoes back the value returned by the base fee API.
+		let received = builder::bare_call(addr).build_and_unwrap_result();
+		assert_eq!(received.flags, ReturnFlags::empty());
+		assert_eq!(U256::from_little_endian(received.data[..].try_into().unwrap()), U256::zero());
+	});
+}
+
+#[test]
+fn call_data_size_api_works() {
+	let (code, _) = compile_module("call_data_size").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create fixture: Constructor does nothing
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		// Call the contract: It echoes back the value returned by the call data size API.
+		let received = builder::bare_call(addr).build_and_unwrap_result();
+		assert_eq!(received.flags, ReturnFlags::empty());
+		assert_eq!(u64::from_le_bytes(received.data.try_into().unwrap()), 0);
+
+		let received = builder::bare_call(addr).data(vec![1; 256]).build_and_unwrap_result();
+		assert_eq!(received.flags, ReturnFlags::empty());
+		assert_eq!(u64::from_le_bytes(received.data.try_into().unwrap()), 256);
+	});
+}
+
+#[test]
+fn call_data_copy_api_works() {
+	let (code, _) = compile_module("call_data_copy").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create fixture: Constructor does nothing
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		// Call fixture: Expects an input of [255; 32] and executes tests.
+		assert_ok!(builder::call(addr).data(vec![255; 32]).build());
+	});
+}
+
+#[test]
+fn static_data_limit_is_enforced() {
+	let (oom_rw_trailing, _) = compile_module("oom_rw_trailing").unwrap();
+	let (oom_rw_included, _) = compile_module("oom_rw_included").unwrap();
+	let (oom_ro, _) = compile_module("oom_ro").unwrap();
+
+	ExtBuilder::default().build().execute_with(|| {
+		let _ = Balances::set_balance(&ALICE, 1_000_000);
+
+		assert_err!(
+			Contracts::upload_code(
+				RuntimeOrigin::signed(ALICE),
+				oom_rw_trailing,
+				deposit_limit::<Test>(),
+			),
+			<Error<Test>>::StaticMemoryTooLarge
+		);
+
+		assert_err!(
+			Contracts::upload_code(
+				RuntimeOrigin::signed(ALICE),
+				oom_rw_included,
+				deposit_limit::<Test>(),
+			),
+			<Error<Test>>::BlobTooLarge
+		);
+
+		assert_err!(
+			Contracts::upload_code(RuntimeOrigin::signed(ALICE), oom_ro, deposit_limit::<Test>(),),
+			<Error<Test>>::BlobTooLarge
+		);
+	});
+}
+
+#[test]
+fn call_diverging_out_len_works() {
+	let (code, _) = compile_module("call_diverging_out_len").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create the contract: Constructor does nothing
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		// Call the contract: It will issue calls and deploys, asserting on
+		// correct output if the supplied output length was smaller than
+		// than what the callee returned.
+		assert_ok!(builder::call(addr).build());
+	});
+}
+
+#[test]
+fn chain_id_works() {
+	let (code, _) = compile_module("chain_id").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		let chain_id = U256::from(<Test as Config>::ChainId::get());
+		let received = builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_result();
+		assert_eq!(received.result.data, chain_id.encode());
+	});
+}
+
+#[test]
+fn call_data_load_api_works() {
+	let (code, _) = compile_module("call_data_load").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create fixture: Constructor does nothing
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		// Call the contract: It reads a byte for the offset and then returns
+		// what call data load returned using this byte as the offset.
+		let input = (3u8, U256::max_value(), U256::max_value()).encode();
+		let received = builder::bare_call(addr).data(input).build().result.unwrap();
+		assert_eq!(received.flags, ReturnFlags::empty());
+		assert_eq!(U256::from_little_endian(&received.data), U256::max_value());
+
+		// Edge case
+		let input = (2u8, U256::from(255).to_big_endian()).encode();
+		let received = builder::bare_call(addr).data(input).build().result.unwrap();
+		assert_eq!(received.flags, ReturnFlags::empty());
+		assert_eq!(U256::from_little_endian(&received.data), U256::from(65280));
+
+		// Edge case
+		let received = builder::bare_call(addr).data(vec![1]).build().result.unwrap();
+		assert_eq!(received.flags, ReturnFlags::empty());
+		assert_eq!(U256::from_little_endian(&received.data), U256::zero());
+
+		// OOB case
+		let input = (42u8).encode();
+		let received = builder::bare_call(addr).data(input).build().result.unwrap();
+		assert_eq!(received.flags, ReturnFlags::empty());
+		assert_eq!(U256::from_little_endian(&received.data), U256::zero());
+
+		// No calldata should return the zero value
+		let received = builder::bare_call(addr).build().result.unwrap();
+		assert_eq!(received.flags, ReturnFlags::empty());
+		assert_eq!(U256::from_little_endian(&received.data), U256::zero());
+	});
+}
+
+#[test]
+fn return_data_api_works() {
+	let (code_return_data_api, _) = compile_module("return_data_api").unwrap();
+	let (code_return_with_data, hash_return_with_data) =
+		compile_module("return_with_data").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Upload the io echoing fixture for later use
+		assert_ok!(Contracts::upload_code(
+			RuntimeOrigin::signed(ALICE),
+			code_return_with_data,
+			deposit_limit::<Test>(),
+		));
+
+		// Create fixture: Constructor does nothing
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code_return_data_api))
+			.build_and_unwrap_contract();
+
+		// Call the contract: It will issue calls and deploys, asserting on
+		assert_ok!(builder::call(addr)
+			.value(10 * 1024)
+			.data(hash_return_with_data.encode())
+			.build());
+	});
+}
+
+#[test]
+fn immutable_data_works() {
+	let (code, _) = compile_module("immutable_data").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		let data = [0xfe; 8];
+
+		// Create fixture: Constructor sets the immtuable data
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
+			.data(data.to_vec())
+			.build_and_unwrap_contract();
+
+		let contract = get_contract(&addr);
+		let account = <Test as Config>::AddressMapper::to_account_id(&addr);
+		let actual_deposit =
+			get_balance_on_hold(&HoldReason::StorageDepositReserve.into(), &account);
+
+		assert_eq!(contract.immutable_data_len(), data.len() as u32);
+
+		// Storing immmutable data charges storage deposit; verify it explicitly.
+		assert_eq!(actual_deposit, contract_base_deposit(&addr));
+
+		// make sure it is also recorded in the base deposit
+		assert_eq!(
+			get_balance_on_hold(&HoldReason::StorageDepositReserve.into(), &account),
+			contract.storage_base_deposit(),
+		);
+
+		// Call the contract: Asserts the input to equal the immutable data
+		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
+		);
+	});
+}
+
+#[test]
+fn origin_api_works() {
+	let (code, _) = compile_module("origin").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create fixture: Constructor does nothing
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		// Call the contract: Asserts the origin API to work as expected
+		assert_ok!(builder::call(addr).build());
+	});
+}
+
+#[test]
+fn to_account_id_works() {
+	let (code_hash_code, _) = compile_module("to_account_id").unwrap();
+
+	ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let _ = <Test as Config>::Currency::set_balance(&EVE, 1_000_000);
+
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code_hash_code)).build_and_unwrap_contract();
+
+		// mapped account
+		<Pallet<Test>>::map_account(RuntimeOrigin::signed(EVE)).unwrap();
+		let expected_mapped_account_id = &<Test as Config>::AddressMapper::to_account_id(&EVE_ADDR);
+		assert_ne!(
+			expected_mapped_account_id.encode()[20..32],
+			[0xEE; 12],
+			"fallback suffix found where none should be"
+		);
+		assert_ok!(builder::call(addr)
+			.data((EVE_ADDR, expected_mapped_account_id).encode())
+			.build());
+
+		// fallback for unmapped accounts
+		let expected_fallback_account_id =
+			&<Test as Config>::AddressMapper::to_account_id(&BOB_ADDR);
+		assert_eq!(
+			expected_fallback_account_id.encode()[20..32],
+			[0xEE; 12],
+			"no fallback suffix found where one should be"
+		);
+		assert_ok!(builder::call(addr)
+			.data((BOB_ADDR, expected_fallback_account_id).encode())
+			.build());
+	});
+}
+
+#[test]
+fn code_hash_works() {
+	use crate::precompiles::{Precompile, EVM_REVERT};
+	use precompiles::NoInfo;
+
+	let builtin_precompile = H160(NoInfo::<Test>::MATCHER.base_address());
+	let primitive_precompile = H160::from_low_u64_be(1);
+
+	let (code_hash_code, self_code_hash) = compile_module("code_hash").unwrap();
+	let (dummy_code, code_hash) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code_hash_code)).build_and_unwrap_contract();
+		let Contract { addr: dummy_addr, .. } =
+			builder::bare_instantiate(Code::Upload(dummy_code)).build_and_unwrap_contract();
+
+		// code hash of dummy contract
+		assert_ok!(builder::call(addr).data((dummy_addr, code_hash).encode()).build());
+		// code hash of itself
+		assert_ok!(builder::call(addr).data((addr, self_code_hash).encode()).build());
+		// code hash of primitive pre-compile (exist but have no bytecode)
+		assert_ok!(builder::call(addr)
+			.data((primitive_precompile, crate::exec::EMPTY_CODE_HASH).encode())
+			.build());
+		// code hash of normal pre-compile (do have a bytecode)
+		assert_ok!(builder::call(addr)
+			.data((builtin_precompile, sp_io::hashing::keccak_256(&EVM_REVERT)).encode())
+			.build());
+
+		// EOA doesn't exists
+		assert_err!(
+			builder::bare_call(addr)
+				.data((BOB_ADDR, crate::exec::EMPTY_CODE_HASH).encode())
+				.build()
+				.result,
+			Error::<Test>::ContractTrapped
+		);
+		// non-existing will return zero
+		assert_ok!(builder::call(addr).data((BOB_ADDR, H256::zero()).encode()).build());
+
+		// create EOA
+		let _ = <Test as Config>::Currency::set_balance(
+			&<Test as Config>::AddressMapper::to_account_id(&BOB_ADDR),
+			1_000_000,
+		);
+
+		// EOA returns empty code hash
+		assert_ok!(builder::call(addr)
+			.data((BOB_ADDR, crate::exec::EMPTY_CODE_HASH).encode())
+			.build());
+	});
+}
+
+#[test]
+fn code_size_works() {
+	let (tester_code, _) = compile_module("extcodesize").unwrap();
+	let tester_code_len = tester_code.len() as u64;
+
+	let (dummy_code, _) = compile_module("dummy").unwrap();
+	let dummy_code_len = dummy_code.len() as u64;
+
+	ExtBuilder::default().existential_deposit(1).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		let Contract { addr: tester_addr, .. } =
+			builder::bare_instantiate(Code::Upload(tester_code)).build_and_unwrap_contract();
+		let Contract { addr: dummy_addr, .. } =
+			builder::bare_instantiate(Code::Upload(dummy_code)).build_and_unwrap_contract();
+
+		// code size of another contract address
+		assert_ok!(builder::call(tester_addr).data((dummy_addr, dummy_code_len).encode()).build());
+
+		// code size of own contract address
+		assert_ok!(builder::call(tester_addr)
+			.data((tester_addr, tester_code_len).encode())
+			.build());
+
+		// code size of non contract accounts
+		assert_ok!(builder::call(tester_addr).data(([8u8; 20], 0u64).encode()).build());
+	});
+}
+
+#[test]
+fn origin_must_be_mapped() {
+	let (code, hash) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		<Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		<Test as Config>::Currency::set_balance(&EVE, 1_000_000);
+
+		let eve = RuntimeOrigin::signed(EVE);
+
+		// alice can instantiate as she doesn't need a mapping
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		// without a mapping eve can neither call nor instantiate
+		assert_err!(
+			builder::bare_call(addr).origin(eve.clone()).build().result,
+			<Error<Test>>::AccountUnmapped
+		);
+		assert_err!(
+			builder::bare_instantiate(Code::Existing(hash))
+				.origin(eve.clone())
+				.build()
+				.result,
+			<Error<Test>>::AccountUnmapped
+		);
+
+		// after mapping eve is usable as an origin
+		<Pallet<Test>>::map_account(eve.clone()).unwrap();
+		assert_ok!(builder::bare_call(addr).origin(eve.clone()).build().result);
+		assert_ok!(builder::bare_instantiate(Code::Existing(hash)).origin(eve).build().result);
+	});
+}
+
+#[test]
+fn mapped_address_works() {
+	let (code, _) = compile_module("terminate_and_send_to_argument").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		<Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// without a mapping everything will be send to the fallback account
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code.clone())).build_and_unwrap_contract();
+		assert_eq!(<Test as Config>::Currency::total_balance(&EVE_FALLBACK), 0);
+		builder::bare_call(addr).data(EVE_ADDR.encode()).build_and_unwrap_result();
+		assert_eq!(<Test as Config>::Currency::total_balance(&EVE_FALLBACK), 100);
+
+		// after mapping it will be sent to the real eve account
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+		// need some balance to pay for the map deposit
+		<Test as Config>::Currency::set_balance(&EVE, 1_000);
+		<Pallet<Test>>::map_account(RuntimeOrigin::signed(EVE)).unwrap();
+		builder::bare_call(addr).data(EVE_ADDR.encode()).build_and_unwrap_result();
+		assert_eq!(<Test as Config>::Currency::total_balance(&EVE_FALLBACK), 100);
+		assert_eq!(<Test as Config>::Currency::total_balance(&EVE), 1_100);
+	});
+}
+
+#[test]
+fn recovery_works() {
+	let (code, _) = compile_module("terminate_and_send_to_argument").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		<Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// eve puts her AccountId20 as argument to terminate but forgot to register
+		// her AccountId32 first so now the funds are trapped in her fallback account
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code.clone())).build_and_unwrap_contract();
+		assert_eq!(<Test as Config>::Currency::total_balance(&EVE), 0);
+		assert_eq!(<Test as Config>::Currency::total_balance(&EVE_FALLBACK), 0);
+		builder::bare_call(addr).data(EVE_ADDR.encode()).build_and_unwrap_result();
+		assert_eq!(<Test as Config>::Currency::total_balance(&EVE_FALLBACK), 100);
+		assert_eq!(<Test as Config>::Currency::total_balance(&EVE), 0);
+
+		let call = RuntimeCall::Balances(pallet_balances::Call::transfer_all {
+			dest: EVE,
+			keep_alive: false,
+		});
+
+		// she now uses the recovery function to move all funds from the fallback
+		// account to her real account
+		<Pallet<Test>>::dispatch_as_fallback_account(RuntimeOrigin::signed(EVE), Box::new(call))
+			.unwrap();
+		assert_eq!(<Test as Config>::Currency::total_balance(&EVE_FALLBACK), 0);
+		assert_eq!(<Test as Config>::Currency::total_balance(&EVE), 100);
+	});
+}
+
+#[test]
+fn skip_transfer_works() {
+	let (code_caller, _) = compile_module("call").unwrap();
+	let (code, _) = compile_module("store_call").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		<Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		<Test as Config>::Currency::set_balance(&BOB, 0);
+
+		// when gas is some (transfers enabled): bob has no money: fail
+		assert_err!(
+			Pallet::<Test>::dry_run_eth_transact(
+				GenericTransaction {
+					from: Some(BOB_ADDR),
+					input: code.clone().into(),
+					gas: Some(1u32.into()),
+					..Default::default()
+				},
+				Weight::MAX,
+				|_, _| 0u64,
+			),
+			EthTransactError::Message(format!(
+				"insufficient funds for gas * price + value: address {BOB_ADDR:?} have 0 (supplied gas 1)"
+			))
+		);
+
+		// no gas specified (all transfers are skipped): even without money bob can deploy
+		assert_ok!(Pallet::<Test>::dry_run_eth_transact(
+			GenericTransaction {
+				from: Some(BOB_ADDR),
+				input: code.clone().into(),
+				..Default::default()
+			},
+			Weight::MAX,
+			|_, _| 0u64,
+		));
+
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		let Contract { addr: caller_addr, .. } =
+			builder::bare_instantiate(Code::Upload(code_caller)).build_and_unwrap_contract();
+
+		// call directly: fails with enabled transfers
+		assert_err!(
+			Pallet::<Test>::dry_run_eth_transact(
+				GenericTransaction {
+					from: Some(BOB_ADDR),
+					to: Some(addr),
+					input: 0u32.encode().into(),
+					gas: Some(1u32.into()),
+					..Default::default()
+				},
+				Weight::MAX,
+				|_, _| 0u64,
+			),
+			EthTransactError::Message(format!(
+				"insufficient funds for gas * price + value: address {BOB_ADDR:?} have 0 (supplied gas 1)"
+			))
+		);
+
+		// fails to call through other contract
+		// we didn't roll back the storage changes done by the previous
+		// call. So the item already exists. We simply increase the size of
+		// the storage item to incur some deposits (which bob can't pay).
+		assert!(Pallet::<Test>::dry_run_eth_transact(
+			GenericTransaction {
+				from: Some(BOB_ADDR),
+				to: Some(caller_addr),
+				input: (1u32, &addr).encode().into(),
+				gas: Some(1u32.into()),
+				..Default::default()
+			},
+			Weight::MAX,
+			|_, _| 0u64,
+		)
+		.is_err(),);
+
+		// works when no gas is specified (skip transfer)
+		assert_ok!(Pallet::<Test>::dry_run_eth_transact(
+			GenericTransaction {
+				from: Some(BOB_ADDR),
+				to: Some(addr),
+				input: 2u32.encode().into(),
+				..Default::default()
+			},
+			Weight::MAX,
+			|_, _| 0u64,
+		));
+
+		// call through contract works when transfers are skipped
+		assert_ok!(Pallet::<Test>::dry_run_eth_transact(
+			GenericTransaction {
+				from: Some(BOB_ADDR),
+				to: Some(caller_addr),
+				input: (3u32, &addr).encode().into(),
+				..Default::default()
+			},
+			Weight::MAX,
+			|_, _| 0u64,
+		));
+
+		// works with transfers enabled if we don't incur a storage cost
+		// we shrink the item so its actually a refund
+		assert_ok!(Pallet::<Test>::dry_run_eth_transact(
+			GenericTransaction {
+				from: Some(BOB_ADDR),
+				to: Some(caller_addr),
+				input: (2u32, &addr).encode().into(),
+				gas: Some(1u32.into()),
+				..Default::default()
+			},
+			Weight::MAX,
+			|_, _| 0u64,
+		));
+
+		// fails when trying to increase the storage item size
+		assert!(Pallet::<Test>::dry_run_eth_transact(
+			GenericTransaction {
+				from: Some(BOB_ADDR),
+				to: Some(caller_addr),
+				input: (3u32, &addr).encode().into(),
+				gas: Some(1u32.into()),
+				..Default::default()
+			},
+			Weight::MAX,
+			|_, _| 0u64,
+		)
+		.is_err());
+	});
+}
+
+#[test]
+fn gas_limit_api_works() {
+	let (code, _) = compile_module("gas_limit").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Create fixture: Constructor does nothing
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		// Call the contract: It echoes back the value returned by the gas limit API.
+		let received = builder::bare_call(addr).build_and_unwrap_result();
+		assert_eq!(received.flags, ReturnFlags::empty());
+		assert_eq!(
+			u64::from_le_bytes(received.data[..].try_into().unwrap()),
+			<Test as frame_system::Config>::BlockWeights::get().max_block.ref_time()
+		);
+	});
+}
+
+#[test]
+fn unknown_syscall_rejected() {
+	let (code, _) = compile_module("unknown_syscall").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		<Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		assert_err!(
+			builder::bare_instantiate(Code::Upload(code)).build().result,
+			<Error<Test>>::CodeRejected,
+		)
+	});
+}
+
+#[test]
+fn unstable_interface_rejected() {
+	let (code, _) = compile_module("unstable_interface").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		<Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		Test::set_unstable_interface(false);
+		assert_err!(
+			builder::bare_instantiate(Code::Upload(code.clone())).build().result,
+			<Error<Test>>::CodeRejected,
+		);
+
+		Test::set_unstable_interface(true);
+		assert_ok!(builder::bare_instantiate(Code::Upload(code)).build().result);
+	});
+}
+
+#[test]
+fn tracing_works_for_transfers() {
+	ExtBuilder::default().build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000);
+		let mut tracer = CallTracer::new(Default::default(), |_| U256::zero());
+		trace(&mut tracer, || {
+			builder::bare_call(BOB_ADDR).evm_value(10.into()).build_and_unwrap_result();
+		});
+
+		let trace = tracer.collect_trace();
+		assert_eq!(
+			trace,
+			Some(CallTrace {
+				from: ALICE_ADDR,
+				to: BOB_ADDR,
+				value: Some(U256::from(10)),
+				call_type: CallType::Call,
+				..Default::default()
+			})
+		)
+	});
+}
+
+#[test]
+fn call_tracing_works() {
+	use crate::evm::*;
+	use CallType::*;
+	let (code, _code_hash) = compile_module("tracing").unwrap();
+	let (binary_callee, _) = compile_module("tracing_callee").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000);
+
+		let Contract { addr: addr_callee, .. } =
+			builder::bare_instantiate(Code::Upload(binary_callee)).build_and_unwrap_contract();
+
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).evm_value(10_000_000.into()).build_and_unwrap_contract();
+
+
+		let tracer_configs = vec![
+			 CallTracerConfig{ with_logs: false, only_top_call: false},
+			 CallTracerConfig{ with_logs: false, only_top_call: false},
+			 CallTracerConfig{ with_logs: false, only_top_call: true},
+		];
+
+		// Verify that the first trace report the same weight reported by bare_call
+		// TODO: fix tracing ( https://github.com/paritytech/polkadot-sdk/issues/8362 )
+		/*
+		let mut tracer = CallTracer::new(false, |w| w);
+		let gas_used = trace(&mut tracer, || {
+			builder::bare_call(addr).data((3u32, addr_callee).encode()).build().gas_consumed
+		});
+		let trace = tracer.collect_trace().unwrap();
+		assert_eq!(&trace.gas_used, &gas_used);
+		*/
+
+		// Discarding gas usage, check that traces reported are correct
+		for config in tracer_configs {
+			let logs = if config.with_logs {
+				vec![
+					CallLog {
+						address: addr,
+						topics: Default::default(),
+						data: b"before".to_vec().into(),
+						position: 0,
+					},
+					CallLog {
+						address: addr,
+						topics: Default::default(),
+						data: b"after".to_vec().into(),
+						position: 1,
+					},
+				]
+			} else {
+				vec![]
+			};
+
+			let calls = if config.only_top_call {
+				vec![]
+			} else {
+				vec![
+						CallTrace {
+							from: addr,
+							to: addr_callee,
+							input: 2u32.encode().into(),
+							output: hex_literal::hex!(
+										"08c379a00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001a546869732066756e6374696f6e20616c77617973206661696c73000000000000"
+									).to_vec().into(),
+							revert_reason: Some("revert: This function always fails".to_string()),
+							error: Some("execution reverted".to_string()),
+							call_type: Call,
+							value: Some(U256::from(0)),
+							..Default::default()
+						},
+						CallTrace {
+							from: addr,
+							to: addr,
+							input: (2u32, addr_callee).encode().into(),
+							call_type: Call,
+							logs: logs.clone(),
+							value: Some(U256::from(0)),
+							calls: vec![
+								CallTrace {
+									from: addr,
+									to: addr_callee,
+									input: 1u32.encode().into(),
+									output: Default::default(),
+									error: Some("ContractTrapped".to_string()),
+									call_type: Call,
+									value: Some(U256::from(0)),
+									..Default::default()
+								},
+								CallTrace {
+									from: addr,
+									to: addr,
+									input: (1u32, addr_callee).encode().into(),
+									call_type: Call,
+									logs: logs.clone(),
+									value: Some(U256::from(0)),
+									calls: vec![
+										CallTrace {
+											from: addr,
+											to: addr_callee,
+											input: 0u32.encode().into(),
+											output: 0u32.to_le_bytes().to_vec().into(),
+											call_type: Call,
+											value: Some(U256::from(0)),
+											..Default::default()
+										},
+										CallTrace {
+											from: addr,
+											to: addr,
+											input: (0u32, addr_callee).encode().into(),
+											call_type: Call,
+											value: Some(U256::from(0)),
+											calls: vec![
+												CallTrace {
+													from: addr,
+													to: BOB_ADDR,
+													value: Some(U256::from(100)),
+													call_type: CallType::Call,
+													..Default::default()
+												}
+											],
+											..Default::default()
+										},
+									],
+									..Default::default()
+								},
+							],
+							..Default::default()
+						},
+					]
+			};
+
+			let mut tracer = CallTracer::new(config, |_| U256::zero());
+			trace(&mut tracer, || {
+				builder::bare_call(addr).data((3u32, addr_callee).encode()).build()
+			});
+
+			let trace = tracer.collect_trace();
+			let expected_trace = CallTrace {
+					from: ALICE_ADDR,
+					to: addr,
+					input: (3u32, addr_callee).encode().into(),
+					call_type: Call,
+					logs: logs.clone(),
+					value: Some(U256::from(0)),
+					calls: calls,
+					..Default::default()
+				};
+
+			assert_eq!(
+				trace,
+				expected_trace.into(),
+			);
+		}
+	});
+}
+
+#[test]
+fn create_call_tracing_works() {
+	use crate::evm::*;
+	let (code, code_hash) = compile_module("create2_with_value").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000);
+
+		let mut tracer = CallTracer::new(Default::default(), |_| U256::zero());
+
+		let Contract { addr, .. } = trace(&mut tracer, || {
+			builder::bare_instantiate(Code::Upload(code.clone()))
+				.evm_value(100.into())
+				.salt(None)
+				.build_and_unwrap_contract()
+		});
+
+		let call_trace = tracer.collect_trace().unwrap();
+		assert_eq!(
+			call_trace,
+			CallTrace {
+				from: ALICE_ADDR,
+				to: addr,
+				value: Some(100.into()),
+				input: Bytes(code.clone()),
+				call_type: CallType::Create,
+				..Default::default()
+			}
+		);
+
+		let mut tracer = CallTracer::new(Default::default(), |_| U256::zero());
+		let data = b"garbage";
+		let input = (code_hash, data).encode();
+		trace(&mut tracer, || {
+			assert_ok!(builder::call(addr).data(input.clone()).build());
+		});
+
+		let call_trace = tracer.collect_trace().unwrap();
+		let child_addr = crate::address::create2(&addr, &code, data, &[1u8; 32]);
+
+		assert_eq!(
+			call_trace,
+			CallTrace {
+				from: ALICE_ADDR,
+				to: addr,
+				value: Some(0.into()),
+				input: input.clone().into(),
+				calls: vec![CallTrace {
+					from: addr,
+					input: input.clone().into(),
+					to: child_addr,
+					value: Some(0.into()),
+					call_type: CallType::Create2,
+					..Default::default()
+				},],
+				..Default::default()
+			}
+		);
+	});
+}
+
+#[test]
+fn prestate_tracing_works() {
+	use crate::evm::*;
+	use alloc::collections::BTreeMap;
+
+	let (dummy_code, _) = compile_module("dummy").unwrap();
+	let (code, _) = compile_module("tracing").unwrap();
+	let (callee_code, _) = compile_module("tracing_callee").unwrap();
+	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000);
+
+		let Contract { addr: addr_callee, .. } =
+			builder::bare_instantiate(Code::Upload(callee_code.clone()))
+				.build_and_unwrap_contract();
+
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code.clone()))
+			.native_value(10)
+			.build_and_unwrap_contract();
+
+		// redact balance so that tests are resilient to weight changes
+		let alice_redacted_balance = Some(U256::from(1));
+
+		let test_cases: Vec<(Box<dyn FnOnce()>, _, _)> = vec![
+			(
+				Box::new(|| {
+					builder::bare_call(addr)
+						.data((3u32, addr_callee).encode())
+						.build_and_unwrap_result();
+				}),
+				PrestateTracerConfig {
+					diff_mode: false,
+					disable_storage: false,
+					disable_code: false,
+				},
+				PrestateTrace::Prestate(BTreeMap::from([
+					(
+						ALICE_ADDR,
+						PrestateTraceInfo {
+							balance: alice_redacted_balance,
+							nonce: Some(2),
+							..Default::default()
+						},
+					),
+					(
+						BOB_ADDR,
+						PrestateTraceInfo { balance: Some(U256::from(0u64)), ..Default::default() },
+					),
+					(
+						addr_callee,
+						PrestateTraceInfo {
+							balance: Some(U256::from(0u64)),
+							code: Some(Bytes(callee_code.clone())),
+							nonce: Some(1),
+							..Default::default()
+						},
+					),
+					(
+						addr,
+						PrestateTraceInfo {
+							balance: Some(U256::from(10_000_000u64)),
+							code: Some(Bytes(code.clone())),
+							nonce: Some(1),
+							..Default::default()
+						},
+					),
+				])),
+			),
+			(
+				Box::new(|| {
+					builder::bare_call(addr)
+						.data((3u32, addr_callee).encode())
+						.build_and_unwrap_result();
+				}),
+				PrestateTracerConfig {
+					diff_mode: true,
+					disable_storage: false,
+					disable_code: false,
+				},
+				PrestateTrace::DiffMode {
+					pre: BTreeMap::from([
+						(
+							BOB_ADDR,
+							PrestateTraceInfo {
+								balance: Some(U256::from(100u64)),
+								..Default::default()
+							},
+						),
+						(
+							addr,
+							PrestateTraceInfo {
+								balance: Some(U256::from(9_999_900u64)),
+								code: Some(Bytes(code.clone())),
+								nonce: Some(1),
+								..Default::default()
+							},
+						),
+					]),
+					post: BTreeMap::from([
+						(
+							BOB_ADDR,
+							PrestateTraceInfo {
+								balance: Some(U256::from(200u64)),
+								..Default::default()
+							},
+						),
+						(
+							addr,
+							PrestateTraceInfo {
+								balance: Some(U256::from(9_999_800u64)),
+								..Default::default()
+							},
+						),
+					]),
+				},
+			),
+			(
+				Box::new(|| {
+					builder::bare_instantiate(Code::Upload(dummy_code.clone()))
+						.salt(None)
+						.build_and_unwrap_result();
+				}),
+				PrestateTracerConfig {
+					diff_mode: true,
+					disable_storage: false,
+					disable_code: false,
+				},
+				PrestateTrace::DiffMode {
+					pre: BTreeMap::from([(
+						ALICE_ADDR,
+						PrestateTraceInfo {
+							balance: alice_redacted_balance,
+							nonce: Some(2),
+							..Default::default()
+						},
+					)]),
+					post: BTreeMap::from([
+						(
+							ALICE_ADDR,
+							PrestateTraceInfo {
+								balance: alice_redacted_balance,
+								nonce: Some(3),
+								..Default::default()
+							},
+						),
+						(
+							create1(&ALICE_ADDR, 1),
+							PrestateTraceInfo {
+								code: Some(dummy_code.clone().into()),
+								balance: Some(U256::from(0)),
+								nonce: Some(1),
+								..Default::default()
+							},
+						),
+					]),
+				},
+			),
+		];
+
+		for (exec_call, config, expected_trace) in test_cases.into_iter() {
+			let mut tracer = PrestateTracer::<Test>::new(config);
+			trace(&mut tracer, || {
+				exec_call();
+			});
+
+			let mut trace = tracer.collect_trace();
+
+			// redact alice balance
+			match trace {
+				PrestateTrace::DiffMode { ref mut pre, ref mut post } => {
+					pre.get_mut(&ALICE_ADDR).map(|info| {
+						info.balance = alice_redacted_balance;
+					});
+					post.get_mut(&ALICE_ADDR).map(|info| {
+						info.balance = alice_redacted_balance;
+					});
+				},
+				PrestateTrace::Prestate(ref mut pre) => {
+					pre.get_mut(&ALICE_ADDR).map(|info| {
+						info.balance = alice_redacted_balance;
+					});
+				},
+			}
+
+			assert_eq!(trace, expected_trace);
+		}
+	});
+}
+
+#[test]
+fn unknown_precompiles_revert() {
+	let (code, _code_hash) = compile_module("read_only_call").unwrap();
+
+	ExtBuilder::default().build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		let cases: Vec<(H160, Box<dyn FnOnce(_)>)> = vec![(
+			H160::from_low_u64_be(0x0a),
+			Box::new(|result| {
+				assert_err!(result, <Error<Test>>::UnsupportedPrecompileAddress);
+			}),
+		)];
+
+		for (callee_addr, assert_result) in cases {
+			let result =
+				builder::bare_call(addr).data((callee_addr, [0u8; 0]).encode()).build().result;
+			assert_result(result);
+		}
+	});
+}
+
+#[test]
+fn pure_precompile_works() {
+	use hex_literal::hex;
+
+	let cases = vec![
+		(
+			"ECRecover",
+			H160::from_low_u64_be(1),
+			hex!("18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c000000000000000000000000000000000000000000000000000000000000001c73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549").to_vec(),
+			hex!("000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b").to_vec(),
+		),
+		(
+			"Sha256",
+			H160::from_low_u64_be(2),
+			hex!("ec07171c4f0f0e2b").to_vec(),
+			hex!("d0591ea667763c69a5f5a3bae657368ea63318b2c9c8349cccaf507e3cbd7c7a").to_vec(),
+		),
+		(
+			"Ripemd160",
+			H160::from_low_u64_be(3),
+			hex!("ec07171c4f0f0e2b").to_vec(),
+			hex!("000000000000000000000000a9c5ebaf7589fd8acfd542c3a008956de84fbeb7").to_vec(),
+		),
+		(
+			"Identity",
+			H160::from_low_u64_be(4),
+			[42u8; 128].to_vec(),
+			[42u8; 128].to_vec(),
+		),
+		(
+			"Modexp",
+			H160::from_low_u64_be(5),
+			hex!("00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f").to_vec(),
+			hex!("0000000000000000000000000000000000000000000000000000000000000001").to_vec(),
+		),
+		(
+			"Bn128Add",
+			H160::from_low_u64_be(6),
+			hex!("18b18acfb4c2c30276db5411368e7185b311dd124691610c5d3b74034e093dc9063c909c4720840cb5134cb9f59fa749755796819658d32efc0d288198f3726607c2b7f58a84bd6145f00c9c2bc0bb1a187f20ff2c92963a88019e7c6a014eed06614e20c147e940f2d70da3f74c9a17df361706a4485c742bd6788478fa17d7").to_vec(),
+			hex!("2243525c5efd4b9c3d3c45ac0ca3fe4dd85e830a4ce6b65fa1eeaee202839703301d1d33be6da8e509df21cc35964723180eed7532537db9ae5e7d48f195c915").to_vec(),
+		),
+		(
+			"Bn128Mul",
+			H160::from_low_u64_be(7),
+			hex!("2bd3e6d0f3b142924f5ca7b49ce5b9d54c4703d7ae5648e61d02268b1a0a9fb721611ce0a6af85915e2f1d70300909ce2e49dfad4a4619c8390cae66cefdb20400000000000000000000000000000000000000000000000011138ce750fa15c2").to_vec(),
+			hex!("070a8d6a982153cae4be29d434e8faef8a47b274a053f5a4ee2a6c9c13c31e5c031b8ce914eba3a9ffb989f9cdd5b0f01943074bf4f0f315690ec3cec6981afc").to_vec(),
+		),
+		(
+			"Bn128Pairing",
+			H160::from_low_u64_be(8),
+			hex!("1c76476f4def4bb94541d57ebba1193381ffa7aa76ada664dd31c16024c43f593034dd2920f673e204fee2811c678745fc819b55d3e9d294e45c9b03a76aef41209dd15ebff5d46c4bd888e51a93cf99a7329636c63514396b4a452003a35bf704bf11ca01483bfa8b34b43561848d28905960114c8ac04049af4b6315a416782bb8324af6cfc93537a2ad1a445cfd0ca2a71acd7ac41fadbf933c2a51be344d120a2a4cf30c1bf9845f20c6fe39e07ea2cce61f0c9bb048165fe5e4de877550111e129f1cf1097710d41c4ac70fcdfa5ba2023c6ff1cbeac322de49d1b6df7c2032c61a830e3c17286de9462bf242fca2883585b93870a73853face6a6bf411198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa").to_vec(),
+			hex!("0000000000000000000000000000000000000000000000000000000000000001").to_vec(),
+		),
+		(
+			"Blake2F",
+			H160::from_low_u64_be(9),
+			hex!("0000000048c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b61626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000001").to_vec(),
+			hex!("08c9bcf367e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d282e6ad7f520e511f6c3e2b8c68059b9442be0454267ce079217e1319cde05b").to_vec(),
+		),
+	];
+
+	for (description, precompile_addr, input, output) in cases {
+		let (code, _code_hash) = compile_module("call_and_return").unwrap();
+		ExtBuilder::default().build().execute_with(|| {
+			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+			let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
+				.native_value(1_000)
+				.build_and_unwrap_contract();
+
+			let result = builder::bare_call(addr)
+				.data(
+					(&precompile_addr, 100u64)
+						.encode()
+						.into_iter()
+						.chain(input)
+						.collect::<Vec<_>>(),
+				)
+				.build_and_unwrap_result();
+
+			assert_eq!(
+				Pallet::<Test>::evm_balance(&precompile_addr),
+				U256::from(100),
+				"{description}: unexpected balance"
+			);
+			assert_eq!(
+				alloy_core::hex::encode(result.data),
+				alloy_core::hex::encode(output),
+				"{description} Unexpected output for precompile: {precompile_addr:?}",
+			);
+			assert_eq!(result.flags, ReturnFlags::empty());
+		});
+	}
+}
+
+#[test]
+fn precompiles_work() {
+	use crate::precompiles::Precompile;
+	use alloy_core::sol_types::{Panic, PanicKind, Revert, SolError, SolInterface, SolValue};
+	use precompiles::{INoInfo, NoInfo};
+
+	let precompile_addr = H160(NoInfo::<Test>::MATCHER.base_address());
+
+	let cases = vec![
+		(
+			INoInfo::INoInfoCalls::identity(INoInfo::identityCall { number: 42u64.into() })
+				.abi_encode(),
+			42u64.abi_encode(),
+			RuntimeReturnCode::Success,
+		),
+		(
+			INoInfo::INoInfoCalls::reverts(INoInfo::revertsCall { error: "panic".to_string() })
+				.abi_encode(),
+			Revert::from("panic").abi_encode(),
+			RuntimeReturnCode::CalleeReverted,
+		),
+		(
+			INoInfo::INoInfoCalls::panics(INoInfo::panicsCall {}).abi_encode(),
+			Panic::from(PanicKind::Assert).abi_encode(),
+			RuntimeReturnCode::CalleeReverted,
+		),
+		(
+			INoInfo::INoInfoCalls::errors(INoInfo::errorsCall {}).abi_encode(),
+			Vec::new(),
+			RuntimeReturnCode::CalleeTrapped,
+		),
+		// passing non decodeable input reverts with solidity panic
+		(
+			b"invalid".to_vec(),
+			Panic::from(PanicKind::ResourceError).abi_encode(),
+			RuntimeReturnCode::CalleeReverted,
+		),
+		(
+			INoInfo::INoInfoCalls::passData(INoInfo::passDataCall {
+				inputLen: limits::CALLDATA_BYTES,
+			})
+			.abi_encode(),
+			Vec::new(),
+			RuntimeReturnCode::Success,
+		),
+		(
+			INoInfo::INoInfoCalls::passData(INoInfo::passDataCall {
+				inputLen: limits::CALLDATA_BYTES + 1,
+			})
+			.abi_encode(),
+			Vec::new(),
+			RuntimeReturnCode::CalleeTrapped,
+		),
+		(
+			INoInfo::INoInfoCalls::returnData(INoInfo::returnDataCall {
+				returnLen: limits::CALLDATA_BYTES - 4,
+			})
+			.abi_encode(),
+			vec![42u8; limits::CALLDATA_BYTES as usize - 4],
+			RuntimeReturnCode::Success,
+		),
+		(
+			INoInfo::INoInfoCalls::returnData(INoInfo::returnDataCall {
+				returnLen: limits::CALLDATA_BYTES + 1,
+			})
+			.abi_encode(),
+			vec![],
+			RuntimeReturnCode::CalleeTrapped,
+		),
+	];
+
+	for (input, output, error_code) in cases {
+		let (code, _code_hash) = compile_module("call_and_returncode").unwrap();
+		ExtBuilder::default().build().execute_with(|| {
+			let id = <Test as Config>::AddressMapper::to_account_id(&precompile_addr);
+			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+			let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
+				.native_value(1000)
+				.build_and_unwrap_contract();
+
+			let result = builder::bare_call(addr)
+				.data(
+					(&precompile_addr, 0u64).encode().into_iter().chain(input).collect::<Vec<_>>(),
+				)
+				.build_and_unwrap_result();
+
+			// no account or contract info should be created for a NoInfo pre-compile
+			assert!(get_contract_checked(&precompile_addr).is_none());
+			assert!(!System::account_exists(&id));
+			assert_eq!(Pallet::<Test>::evm_balance(&precompile_addr), U256::zero());
+
+			assert_eq!(result.flags, ReturnFlags::empty());
+			assert_eq!(u32::from_le_bytes(result.data[..4].try_into().unwrap()), error_code as u32);
+			assert_eq!(
+				&result.data[4..],
+				&output,
+				"Unexpected output for precompile: {precompile_addr:?}",
+			);
+		});
+	}
+}
+
+#[test]
+fn precompiles_with_info_creates_contract() {
+	use crate::precompiles::Precompile;
+	use alloy_core::sol_types::SolInterface;
+	use precompiles::{IWithInfo, WithInfo};
+
+	let precompile_addr = H160(WithInfo::<Test>::MATCHER.base_address());
+
+	let cases = vec![(
+		IWithInfo::IWithInfoCalls::dummy(IWithInfo::dummyCall {}).abi_encode(),
+		Vec::<u8>::new(),
+		RuntimeReturnCode::Success,
+	)];
+
+	for (input, output, error_code) in cases {
+		let (code, _code_hash) = compile_module("call_and_returncode").unwrap();
+		ExtBuilder::default().build().execute_with(|| {
+			let id = <Test as Config>::AddressMapper::to_account_id(&precompile_addr);
+			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+			let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
+				.native_value(1000)
+				.build_and_unwrap_contract();
+
+			let result = builder::bare_call(addr)
+				.data(
+					(&precompile_addr, 0u64).encode().into_iter().chain(input).collect::<Vec<_>>(),
+				)
+				.build_and_unwrap_result();
+
+			// a pre-compile with contract info should create an account on first call
+			assert!(get_contract_checked(&precompile_addr).is_some());
+			assert!(System::account_exists(&id));
+			assert_eq!(Pallet::<Test>::evm_balance(&precompile_addr), U256::from(0));
+
+			assert_eq!(result.flags, ReturnFlags::empty());
+			assert_eq!(u32::from_le_bytes(result.data[..4].try_into().unwrap()), error_code as u32);
+			assert_eq!(
+				&result.data[4..],
+				&output,
+				"Unexpected output for precompile: {precompile_addr:?}",
+			);
+		});
+	}
+}
+
+#[test]
+fn bump_nonce_once_works() {
+	let (code, hash) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		frame_system::Account::<Test>::mutate(&ALICE, |account| account.nonce = 1);
+
+		let _ = <Test as Config>::Currency::set_balance(&BOB, 1_000_000);
+		frame_system::Account::<Test>::mutate(&BOB, |account| account.nonce = 1);
+
+		builder::bare_instantiate(Code::Upload(code.clone()))
+			.origin(RuntimeOrigin::signed(ALICE))
+			.bump_nonce(BumpNonce::Yes)
+			.salt(None)
+			.build_and_unwrap_result();
+		assert_eq!(System::account_nonce(&ALICE), 2);
+
+		// instantiate again is ok
+		let result = builder::bare_instantiate(Code::Existing(hash))
+			.origin(RuntimeOrigin::signed(ALICE))
+			.bump_nonce(BumpNonce::Yes)
+			.salt(None)
+			.build()
+			.result;
+		assert!(result.is_ok());
+
+		builder::bare_instantiate(Code::Upload(code.clone()))
+			.origin(RuntimeOrigin::signed(BOB))
+			.bump_nonce(BumpNonce::No)
+			.salt(None)
+			.build_and_unwrap_result();
+		assert_eq!(System::account_nonce(&BOB), 1);
+
+		// instantiate again should fail
+		let err = builder::bare_instantiate(Code::Upload(code))
+			.origin(RuntimeOrigin::signed(BOB))
+			.bump_nonce(BumpNonce::No)
+			.salt(None)
+			.build()
+			.result
+			.unwrap_err();
+
+		assert_eq!(err, <Error<Test>>::DuplicateContract.into());
+	});
+}
+
+#[test]
+fn code_size_for_precompiles_works() {
+	use crate::precompiles::Precompile;
+	use precompiles::NoInfo;
+
+	let builtin_precompile = H160(NoInfo::<Test>::MATCHER.base_address());
+	let primitive_precompile = H160::from_low_u64_be(1);
+
+	let (code, _code_hash) = compile_module("extcodesize").unwrap();
+	ExtBuilder::default().build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code))
+			.native_value(1000)
+			.build_and_unwrap_contract();
+
+		// the primitive pre-compiles return 0 code size on eth
+		builder::bare_call(addr)
+			.data((&primitive_precompile, 0u64).encode())
+			.build_and_unwrap_result();
+
+		// other precompiles should return the minimal evm revert code
+		builder::bare_call(addr)
+			.data((&builtin_precompile, 5u64).encode())
+			.build_and_unwrap_result();
+	});
+}
+
+#[test]
+fn call_data_limit_is_enforced_subcalls() {
+	let (code, _code_hash) = compile_module("call_with_input_size").unwrap();
+
+	ExtBuilder::default().build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		let cases: Vec<(u32, Box<dyn FnOnce(_)>)> = vec![
+			(
+				0_u32,
+				Box::new(|result| {
+					assert_ok!(result);
+				}),
+			),
+			(
+				1_u32,
+				Box::new(|result| {
+					assert_ok!(result);
+				}),
+			),
+			(
+				limits::CALLDATA_BYTES,
+				Box::new(|result| {
+					assert_ok!(result);
+				}),
+			),
+			(
+				limits::CALLDATA_BYTES + 1,
+				Box::new(|result| {
+					assert_err!(result, <Error<Test>>::CallDataTooLarge);
+				}),
+			),
+		];
+
+		for (callee_input_size, assert_result) in cases {
+			let result = builder::bare_call(addr).data(callee_input_size.encode()).build().result;
+			assert_result(result);
+		}
+	});
+}
+
+#[test]
+fn call_data_limit_is_enforced_root_call() {
+	let (code, _code_hash) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		let cases: Vec<(H160, u32, Box<dyn FnOnce(_)>)> = vec![
+			(
+				addr,
+				0_u32,
+				Box::new(|result| {
+					assert_ok!(result);
+				}),
+			),
+			(
+				addr,
+				1_u32,
+				Box::new(|result| {
+					assert_ok!(result);
+				}),
+			),
+			(
+				addr,
+				limits::CALLDATA_BYTES,
+				Box::new(|result| {
+					assert_ok!(result);
+				}),
+			),
+			(
+				addr,
+				limits::CALLDATA_BYTES + 1,
+				Box::new(|result| {
+					assert_err!(result, <Error<Test>>::CallDataTooLarge);
+				}),
+			),
+			(
+				// limit is not enforced when tx calls EOA
+				BOB_ADDR,
+				limits::CALLDATA_BYTES + 1,
+				Box::new(|result| {
+					assert_ok!(result);
+				}),
+			),
+		];
+
+		for (addr, callee_input_size, assert_result) in cases {
+			let result = builder::bare_call(addr)
+				.data(vec![42; callee_input_size as usize])
+				.build()
+				.result;
+			assert_result(result);
+		}
+	});
+}
+
+#[test]
+fn return_data_limit_is_enforced() {
+	let (code, _code_hash) = compile_module("return_sized").unwrap();
+
+	ExtBuilder::default().build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
+
+		let cases: Vec<(u32, Box<dyn FnOnce(_)>)> = vec![
+			(
+				1_u32,
+				Box::new(|result| {
+					assert_ok!(result);
+				}),
+			),
+			(
+				limits::CALLDATA_BYTES,
+				Box::new(|result| {
+					assert_ok!(result);
+				}),
+			),
+			(
+				limits::CALLDATA_BYTES + 1,
+				Box::new(|result| {
+					assert_err!(result, <Error<Test>>::ReturnDataTooLarge);
+				}),
+			),
+		];
+
+		for (return_size, assert_result) in cases {
+			let result = builder::bare_call(addr).data(return_size.encode()).build().result;
+			assert_result(result);
+		}
+	});
+}
diff --git a/substrate/frame/revive/src/vm/mod.rs b/substrate/frame/revive/src/vm/mod.rs
index ced372c320ba..7a7cfb1163cc 100644
--- a/substrate/frame/revive/src/vm/mod.rs
+++ b/substrate/frame/revive/src/vm/mod.rs
@@ -18,23 +18,16 @@
 //! This module provides a means for executing contracts
 //! represented in vm bytecode.
 
-mod runtime;
+pub mod pvm;
+mod runtime_costs;
 
-#[cfg(doc)]
-pub use crate::vm::runtime::SyscallDoc;
-
-#[cfg(feature = "runtime-benchmarks")]
-pub use crate::vm::runtime::{ReturnData, TrapReason};
-
-pub use crate::vm::runtime::{Runtime, RuntimeCosts};
+pub use runtime_costs::RuntimeCosts;
 
 use crate::{
 	exec::{ExecResult, Executable, ExportedFunction, Ext},
 	gas::{GasMeter, Token},
-	limits,
-	storage::meter::Diff,
 	weights::WeightInfo,
-	AccountIdOf, BadOrigin, BalanceOf, CodeInfoOf, CodeVec, Config, Error, ExecError, HoldReason,
+	AccountIdOf, BadOrigin, BalanceOf, CodeInfoOf, CodeVec, Config, Error, HoldReason,
 	PristineCode, Weight, LOG_TARGET,
 };
 use alloc::vec::Vec;
@@ -132,29 +125,6 @@ impl<T: Config> ContractBlob<T>
 where
 	BalanceOf<T>: Into<U256> + TryFrom<U256>,
 {
-	/// We only check for size and nothing else when the code is uploaded.
-	pub fn from_code(code: Vec<u8>, owner: AccountIdOf<T>) -> Result<Self, DispatchError> {
-		// We do validation only when new code is deployed. This allows us to increase
-		// the limits later without affecting already deployed code.
-		let available_syscalls = runtime::list_syscalls(T::UnsafeUnstableInterface::get());
-		let code = limits::code::enforce::<T>(code, available_syscalls)?;
-
-		let code_len = code.len() as u32;
-		let bytes_added = code_len.saturating_add(<CodeInfo<T>>::max_encoded_len() as u32);
-		let deposit = Diff { bytes_added, items_added: 2, ..Default::default() }
-			.update_contract::<T>(None)
-			.charge_or_zero();
-		let code_info = CodeInfo {
-			owner,
-			deposit,
-			refcount: 0,
-			code_len,
-			behaviour_version: Default::default(),
-		};
-		let code_hash = H256(sp_io::hashing::keccak_256(&code));
-		Ok(ContractBlob { code, code_info, code_hash })
-	}
-
 	/// Remove the code from storage and refund the deposit to its owner.
 	///
 	/// Applies all necessary checks before removing the code.
@@ -284,119 +254,6 @@ impl<T: Config> CodeInfo<T> {
 	}
 }
 
-pub struct PreparedCall<'a, E: Ext> {
-	module: polkavm::Module,
-	instance: polkavm::RawInstance,
-	runtime: Runtime<'a, E, polkavm::RawInstance>,
-}
-
-impl<'a, E: Ext> PreparedCall<'a, E>
-where
-	BalanceOf<E::T>: Into<U256>,
-	BalanceOf<E::T>: TryFrom<U256>,
-{
-	pub fn call(mut self) -> ExecResult {
-		let exec_result = loop {
-			let interrupt = self.instance.run();
-			if let Some(exec_result) =
-				self.runtime.handle_interrupt(interrupt, &self.module, &mut self.instance)
-			{
-				break exec_result
-			}
-		};
-		let _ = self.runtime.ext().gas_meter_mut().sync_from_executor(self.instance.gas())?;
-		exec_result
-	}
-
-	/// The guest memory address at which the aux data is located.
-	#[cfg(feature = "runtime-benchmarks")]
-	pub fn aux_data_base(&self) -> u32 {
-		self.instance.module().memory_map().aux_data_address()
-	}
-
-	/// Copies `data` to the aux data at address `offset`.
-	///
-	/// It sets `a0` to the beginning of data inside the aux data.
-	/// It sets `a1` to the value passed.
-	///
-	/// Only used in benchmarking so far.
-	#[cfg(feature = "runtime-benchmarks")]
-	pub fn setup_aux_data(&mut self, data: &[u8], offset: u32, a1: u64) -> DispatchResult {
-		let a0 = self.aux_data_base().saturating_add(offset);
-		self.instance.write_memory(a0, data).map_err(|err| {
-			log::debug!(target: LOG_TARGET, "failed to write aux data: {err:?}");
-			Error::<E::T>::CodeRejected
-		})?;
-		self.instance.set_reg(polkavm::Reg::A0, a0.into());
-		self.instance.set_reg(polkavm::Reg::A1, a1);
-		Ok(())
-	}
-}
-
-impl<T: Config> ContractBlob<T> {
-	/// Compile and instantiate contract.
-	///
-	/// `aux_data_size` is only used for runtime benchmarks. Real contracts
-	/// don't make use of this buffer. Hence this should not be set to anything
-	/// other than `0` when not used for benchmarking.
-	pub fn prepare_call<E: Ext<T = T>>(
-		self,
-		mut runtime: Runtime<E, polkavm::RawInstance>,
-		entry_point: ExportedFunction,
-		aux_data_size: u32,
-	) -> Result<PreparedCall<E>, ExecError> {
-		let mut config = polkavm::Config::default();
-		config.set_backend(Some(polkavm::BackendKind::Interpreter));
-		config.set_cache_enabled(false);
-		#[cfg(feature = "std")]
-		if std::env::var_os("REVIVE_USE_COMPILER").is_some() {
-			log::warn!(target: LOG_TARGET, "Using PolkaVM compiler backend because env var REVIVE_USE_COMPILER is set");
-			config.set_backend(Some(polkavm::BackendKind::Compiler));
-		}
-		let engine = polkavm::Engine::new(&config).expect(
-			"on-chain (no_std) use of interpreter is hard coded.
-				interpreter is available on all platforms; qed",
-		);
-
-		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);
-		module_config.set_aux_data_size(aux_data_size);
-		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:?}");
-			Error::<T>::CodeRejected
-		})?;
-
-		let entry_program_counter = module
-			.exports()
-			.find(|export| export.symbol().as_bytes() == entry_point.identifier().as_bytes())
-			.ok_or_else(|| <Error<T>>::CodeRejected)?
-			.program_counter();
-
-		let gas_limit_polkavm: polkavm::Gas = runtime.ext().gas_meter_mut().engine_fuel_left()?;
-
-		let mut instance = module.instantiate().map_err(|err| {
-			log::debug!(target: LOG_TARGET, "failed to instantiate polkavm module: {err:?}");
-			Error::<T>::CodeRejected
-		})?;
-
-		instance.set_gas(gas_limit_polkavm);
-		instance
-			.set_interpreter_cache_size_limit(Some(polkavm::SetCacheSizeLimitArgs {
-				max_block_size: limits::code::BASIC_BLOCK_SIZE,
-				max_cache_size_bytes: limits::code::INTERPRETER_CACHE_BYTES
-					.try_into()
-					.map_err(|_| Error::<T>::CodeRejected)?,
-			}))
-			.map_err(|_| Error::<T>::CodeRejected)?;
-		instance.prepare_call_untyped(entry_program_counter, &[]);
-
-		Ok(PreparedCall { module, instance, runtime })
-	}
-}
-
 impl<T: Config> Executable<T> for ContractBlob<T>
 where
 	BalanceOf<T>: Into<U256> + TryFrom<U256>,
@@ -414,8 +271,19 @@ where
 		function: ExportedFunction,
 		input_data: Vec<u8>,
 	) -> ExecResult {
-		let prepared_call = self.prepare_call(Runtime::new(ext, input_data), function, 0)?;
-		prepared_call.call()
+		if self.is_pvm() {
+			let prepared_call =
+				self.prepare_call(pvm::Runtime::new(ext, input_data), function, 0)?;
+			prepared_call.call()
+		} else if T::AllowEVMBytecode::get() {
+			use crate::vm::evm::EVMInputs;
+			use revm::bytecode::Bytecode;
+			let inputs = EVMInputs::new(input_data);
+			let bytecode = Bytecode::new_raw(self.code.into_inner().into());
+			evm::call(bytecode, ext, inputs)
+		} else {
+			Err(Error::<T>::CodeRejected.into())
+		}
 	}
 
 	fn code(&self) -> &[u8] {
diff --git a/substrate/frame/revive/src/vm/pvm.rs b/substrate/frame/revive/src/vm/pvm.rs
new file mode 100644
index 000000000000..b0a2ed8264b2
--- /dev/null
+++ b/substrate/frame/revive/src/vm/pvm.rs
@@ -0,0 +1,960 @@
+// 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.
+
+//! Environment definition of the vm smart-contract runtime.
+
+pub mod env;
+
+#[cfg(doc)]
+pub use env::SyscallDoc;
+
+use crate::{
+	evm::runtime::GAS_PRICE,
+	exec::{ExecError, ExecResult, Ext, Key},
+	gas::ChargedAmount,
+	limits,
+	precompiles::{All as AllPrecompiles, Precompiles},
+	primitives::ExecReturnValue,
+	BalanceOf, Config, Error, Pallet, RuntimeCosts, LOG_TARGET, SENTINEL,
+};
+use alloc::{vec, vec::Vec};
+use codec::Encode;
+use core::{fmt, marker::PhantomData, mem};
+use frame_support::{ensure, weights::Weight};
+use pallet_revive_uapi::{CallFlags, ReturnErrorCode, ReturnFlags, StorageFlags};
+use sp_core::{H160, H256, U256};
+use sp_runtime::{DispatchError, RuntimeDebug};
+
+/// Abstraction over the memory access within syscalls.
+///
+/// The reason for this abstraction is that we run syscalls on the host machine when
+/// benchmarking them. In that case we have direct access to the contract's memory. However, when
+/// running within PolkaVM we need to resort to copying as we can't map the contracts memory into
+/// the host (as of now).
+pub trait Memory<T: Config> {
+	/// Read designated chunk from the sandbox memory into the supplied buffer.
+	///
+	/// Returns `Err` if one of the following conditions occurs:
+	///
+	/// - requested buffer is not within the bounds of the sandbox memory.
+	fn read_into_buf(&self, ptr: u32, buf: &mut [u8]) -> Result<(), DispatchError>;
+
+	/// Write the given buffer to the designated location in the sandbox memory.
+	///
+	/// Returns `Err` if one of the following conditions occurs:
+	///
+	/// - designated area is not within the bounds of the sandbox memory.
+	fn write(&mut self, ptr: u32, buf: &[u8]) -> Result<(), DispatchError>;
+
+	/// Zero the designated location in the sandbox memory.
+	///
+	/// Returns `Err` if one of the following conditions occurs:
+	///
+	/// - designated area is not within the bounds of the sandbox memory.
+	fn zero(&mut self, ptr: u32, len: u32) -> Result<(), DispatchError>;
+
+	/// This will reset all compilation artifacts of the currently executing instance.
+	///
+	/// This is used before we call into a new contract to free up some memory. Doing
+	/// so we make sure that we only ever have to hold one compilation cache at a time
+	/// independtently of of our call stack depth.
+	fn reset_interpreter_cache(&mut self);
+
+	/// Read designated chunk from the sandbox memory.
+	///
+	/// Returns `Err` if one of the following conditions occurs:
+	///
+	/// - requested buffer is not within the bounds of the sandbox memory.
+	fn read(&self, ptr: u32, len: u32) -> Result<Vec<u8>, DispatchError> {
+		let mut buf = vec![0u8; len as usize];
+		self.read_into_buf(ptr, buf.as_mut_slice())?;
+		Ok(buf)
+	}
+
+	/// Same as `read` but reads into a fixed size buffer.
+	fn read_array<const N: usize>(&self, ptr: u32) -> Result<[u8; N], DispatchError> {
+		let mut buf = [0u8; N];
+		self.read_into_buf(ptr, &mut buf)?;
+		Ok(buf)
+	}
+
+	/// Read a `u32` from the sandbox memory.
+	fn read_u32(&self, ptr: u32) -> Result<u32, DispatchError> {
+		let buf: [u8; 4] = self.read_array(ptr)?;
+		Ok(u32::from_le_bytes(buf))
+	}
+
+	/// Read a `U256` from the sandbox memory.
+	fn read_u256(&self, ptr: u32) -> Result<U256, DispatchError> {
+		let buf: [u8; 32] = self.read_array(ptr)?;
+		Ok(U256::from_little_endian(&buf))
+	}
+
+	/// Read a `H160` from the sandbox memory.
+	fn read_h160(&self, ptr: u32) -> Result<H160, DispatchError> {
+		let mut buf = H160::default();
+		self.read_into_buf(ptr, buf.as_bytes_mut())?;
+		Ok(buf)
+	}
+
+	/// Read a `H256` from the sandbox memory.
+	fn read_h256(&self, ptr: u32) -> Result<H256, DispatchError> {
+		let mut code_hash = H256::default();
+		self.read_into_buf(ptr, code_hash.as_bytes_mut())?;
+		Ok(code_hash)
+	}
+}
+
+/// Allows syscalls access to the PolkaVM instance they are executing in.
+///
+/// In case a contract is executing within PolkaVM its `memory` argument will also implement
+/// this trait. The benchmarking implementation of syscalls will only require `Memory`
+/// to be implemented.
+pub trait PolkaVmInstance<T: Config>: Memory<T> {
+	fn gas(&self) -> polkavm::Gas;
+	fn set_gas(&mut self, gas: polkavm::Gas);
+	fn read_input_regs(&self) -> (u64, u64, u64, u64, u64, u64);
+	fn write_output(&mut self, output: u64);
+}
+
+// Memory implementation used in benchmarking where guest memory is mapped into the host.
+//
+// Please note that we could optimize the `read_as_*` functions by decoding directly from
+// memory without a copy. However, we don't do that because as it would change the behaviour
+// of those functions: A `read_as` with a `len` larger than the actual type can succeed
+// in the streaming implementation while it could fail with a segfault in the copy implementation.
+#[cfg(feature = "runtime-benchmarks")]
+impl<T: Config> Memory<T> for [u8] {
+	fn read_into_buf(&self, ptr: u32, buf: &mut [u8]) -> Result<(), DispatchError> {
+		let ptr = ptr as usize;
+		let bound_checked =
+			self.get(ptr..ptr + buf.len()).ok_or_else(|| Error::<T>::OutOfBounds)?;
+		buf.copy_from_slice(bound_checked);
+		Ok(())
+	}
+
+	fn write(&mut self, ptr: u32, buf: &[u8]) -> Result<(), DispatchError> {
+		let ptr = ptr as usize;
+		let bound_checked =
+			self.get_mut(ptr..ptr + buf.len()).ok_or_else(|| Error::<T>::OutOfBounds)?;
+		bound_checked.copy_from_slice(buf);
+		Ok(())
+	}
+
+	fn zero(&mut self, ptr: u32, len: u32) -> Result<(), DispatchError> {
+		<[u8] as Memory<T>>::write(self, ptr, &vec![0; len as usize])
+	}
+
+	fn reset_interpreter_cache(&mut self) {}
+}
+
+impl<T: Config> Memory<T> for polkavm::RawInstance {
+	fn read_into_buf(&self, ptr: u32, buf: &mut [u8]) -> Result<(), DispatchError> {
+		self.read_memory_into(ptr, buf)
+			.map(|_| ())
+			.map_err(|_| Error::<T>::OutOfBounds.into())
+	}
+
+	fn write(&mut self, ptr: u32, buf: &[u8]) -> Result<(), DispatchError> {
+		self.write_memory(ptr, buf).map_err(|_| Error::<T>::OutOfBounds.into())
+	}
+
+	fn zero(&mut self, ptr: u32, len: u32) -> Result<(), DispatchError> {
+		self.zero_memory(ptr, len).map_err(|_| Error::<T>::OutOfBounds.into())
+	}
+
+	fn reset_interpreter_cache(&mut self) {
+		self.reset_interpreter_cache();
+	}
+}
+
+impl<T: Config> PolkaVmInstance<T> for polkavm::RawInstance {
+	fn gas(&self) -> polkavm::Gas {
+		self.gas()
+	}
+
+	fn set_gas(&mut self, gas: polkavm::Gas) {
+		self.set_gas(gas)
+	}
+
+	fn read_input_regs(&self) -> (u64, u64, u64, u64, u64, u64) {
+		(
+			self.reg(polkavm::Reg::A0),
+			self.reg(polkavm::Reg::A1),
+			self.reg(polkavm::Reg::A2),
+			self.reg(polkavm::Reg::A3),
+			self.reg(polkavm::Reg::A4),
+			self.reg(polkavm::Reg::A5),
+		)
+	}
+
+	fn write_output(&mut self, output: u64) {
+		self.set_reg(polkavm::Reg::A0, output);
+	}
+}
+
+impl From<&ExecReturnValue> for ReturnErrorCode {
+	fn from(from: &ExecReturnValue) -> Self {
+		if from.flags.contains(ReturnFlags::REVERT) {
+			Self::CalleeReverted
+		} else {
+			Self::Success
+		}
+	}
+}
+
+/// The data passed through when a contract uses `seal_return`.
+#[derive(RuntimeDebug)]
+pub struct ReturnData {
+	/// The flags as passed through by the contract. They are still unchecked and
+	/// will later be parsed into a `ReturnFlags` bitflags struct.
+	flags: u32,
+	/// The output buffer passed by the contract as return data.
+	data: Vec<u8>,
+}
+
+/// Enumerates all possible reasons why a trap was generated.
+///
+/// This is either used to supply the caller with more information about why an error
+/// occurred (the SupervisorError variant).
+/// The other case is where the trap does not constitute an error but rather was invoked
+/// as a quick way to terminate the application (all other variants).
+#[derive(RuntimeDebug)]
+pub enum TrapReason {
+	/// The supervisor trapped the contract because of an error condition occurred during
+	/// execution in privileged code.
+	SupervisorError(DispatchError),
+	/// Signals that trap was generated in response to call `seal_return` host function.
+	Return(ReturnData),
+	/// Signals that a trap was generated in response to a successful call to the
+	/// `seal_terminate` host function.
+	Termination,
+}
+
+impl<T: Into<DispatchError>> From<T> for TrapReason {
+	fn from(from: T) -> Self {
+		Self::SupervisorError(from.into())
+	}
+}
+
+impl fmt::Display for TrapReason {
+	fn fmt(&self, _f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
+		Ok(())
+	}
+}
+
+/// Same as [`Runtime::charge_gas`].
+///
+/// We need this access as a macro because sometimes hiding the lifetimes behind
+/// a function won't work out.
+macro_rules! charge_gas {
+	($runtime:expr, $costs:expr) => {{
+		$runtime.ext.gas_meter_mut().charge($costs)
+	}};
+}
+
+/// The kind of call that should be performed.
+enum CallType {
+	/// Execute another instantiated contract
+	Call { value_ptr: u32 },
+	/// Execute another contract code in the context (storage, account ID, value) of the caller
+	/// contract
+	DelegateCall,
+}
+
+impl CallType {
+	fn cost(&self) -> RuntimeCosts {
+		match self {
+			CallType::Call { .. } => RuntimeCosts::CallBase,
+			CallType::DelegateCall => RuntimeCosts::DelegateCallBase,
+		}
+	}
+}
+
+/// This is only appropriate when writing out data of constant size that does not depend on user
+/// input. In this case the costs for this copy was already charged as part of the token at
+/// the beginning of the API entry point.
+fn already_charged(_: u32) -> Option<RuntimeCosts> {
+	None
+}
+
+/// Helper to extract two `u32` values from a given `u64` register.
+fn extract_hi_lo(reg: u64) -> (u32, u32) {
+	((reg >> 32) as u32, reg as u32)
+}
+
+/// Provides storage variants to support standard and Etheruem compatible semantics.
+enum StorageValue {
+	/// Indicates that the storage value should be read from a memory buffer.
+	/// - `ptr`: A pointer to the start of the data in sandbox memory.
+	/// - `len`: The length (in bytes) of the data.
+	Memory { ptr: u32, len: u32 },
+
+	/// Indicates that the storage value is provided inline as a fixed-size (256-bit) value.
+	/// This is used by set_storage_or_clear() to avoid double reads.
+	/// This variant is used to implement Ethereum SSTORE-like semantics.
+	Value(Vec<u8>),
+}
+
+/// Controls the output behavior for storage reads, both when a key is found and when it is not.
+enum StorageReadMode {
+	/// VariableOutput mode: if the key exists, the full stored value is returned
+	/// using the caller‑provided output length.
+	VariableOutput { output_len_ptr: u32 },
+	/// Ethereum compatible(FixedOutput32) mode: always write a 32-byte value into the output
+	/// buffer. If the key is missing, write 32 bytes of zeros.
+	FixedOutput32,
+}
+
+/// Can only be used for one call.
+pub struct Runtime<'a, E: Ext, M: ?Sized> {
+	ext: &'a mut E,
+	input_data: Option<Vec<u8>>,
+	_phantom_data: PhantomData<M>,
+}
+
+impl<'a, E: Ext, M: ?Sized + Memory<E::T>> Runtime<'a, E, M> {
+	pub fn new(ext: &'a mut E, input_data: Vec<u8>) -> Self {
+		Self { ext, input_data: Some(input_data), _phantom_data: Default::default() }
+	}
+
+	/// Get a mutable reference to the inner `Ext`.
+	pub fn ext(&mut self) -> &mut E {
+		self.ext
+	}
+
+	/// Charge the gas meter with the specified token.
+	///
+	/// Returns `Err(HostError)` if there is not enough gas.
+	fn charge_gas(&mut self, costs: RuntimeCosts) -> Result<ChargedAmount, DispatchError> {
+		charge_gas!(self, costs)
+	}
+
+	/// Adjust a previously charged amount down to its actual amount.
+	///
+	/// This is when a maximum a priori amount was charged and then should be partially
+	/// refunded to match the actual amount.
+	fn adjust_gas(&mut self, charged: ChargedAmount, actual_costs: RuntimeCosts) {
+		self.ext.gas_meter_mut().adjust_gas(charged, actual_costs);
+	}
+
+	/// Write the given buffer and its length to the designated locations in sandbox memory and
+	/// charge gas according to the token returned by `create_token`.
+	///
+	/// `out_ptr` is the location in sandbox memory where `buf` should be written to.
+	/// `out_len_ptr` is an in-out location in sandbox memory. It is read to determine the
+	/// length of the buffer located at `out_ptr`. If that buffer is smaller than the actual
+	/// `buf.len()`, only what fits into that buffer is written to `out_ptr`.
+	/// The actual amount of bytes copied to `out_ptr` is written to `out_len_ptr`.
+	///
+	/// If `out_ptr` is set to the sentinel value of `SENTINEL` and `allow_skip` is true the
+	/// operation is skipped and `Ok` is returned. This is supposed to help callers to make copying
+	/// output optional. For example to skip copying back the output buffer of an `seal_call`
+	/// when the caller is not interested in the result.
+	///
+	/// `create_token` can optionally instruct this function to charge the gas meter with the token
+	/// it returns. `create_token` receives the variable amount of bytes that are about to be copied
+	/// by this function.
+	///
+	/// In addition to the error conditions of `Memory::write` this functions returns
+	/// `Err` if the size of the buffer located at `out_ptr` is too small to fit `buf`.
+	pub fn write_sandbox_output(
+		&mut self,
+		memory: &mut M,
+		out_ptr: u32,
+		out_len_ptr: u32,
+		buf: &[u8],
+		allow_skip: bool,
+		create_token: impl FnOnce(u32) -> Option<RuntimeCosts>,
+	) -> Result<(), DispatchError> {
+		if allow_skip && out_ptr == SENTINEL {
+			return Ok(());
+		}
+
+		let len = memory.read_u32(out_len_ptr)?;
+		let buf_len = len.min(buf.len() as u32);
+
+		if let Some(costs) = create_token(buf_len) {
+			self.charge_gas(costs)?;
+		}
+
+		memory.write(out_ptr, &buf[..buf_len as usize])?;
+		memory.write(out_len_ptr, &buf_len.encode())
+	}
+
+	/// Same as `write_sandbox_output` but for static size output.
+	pub fn write_fixed_sandbox_output(
+		&mut self,
+		memory: &mut M,
+		out_ptr: u32,
+		buf: &[u8],
+		allow_skip: bool,
+		create_token: impl FnOnce(u32) -> Option<RuntimeCosts>,
+	) -> Result<(), DispatchError> {
+		if buf.is_empty() || (allow_skip && out_ptr == SENTINEL) {
+			return Ok(());
+		}
+
+		let buf_len = buf.len() as u32;
+		if let Some(costs) = create_token(buf_len) {
+			self.charge_gas(costs)?;
+		}
+
+		memory.write(out_ptr, buf)
+	}
+
+	/// Computes the given hash function on the supplied input.
+	///
+	/// Reads from the sandboxed input buffer into an intermediate buffer.
+	/// Returns the result directly to the output buffer of the sandboxed memory.
+	///
+	/// It is the callers responsibility to provide an output buffer that
+	/// is large enough to hold the expected amount of bytes returned by the
+	/// chosen hash function.
+	///
+	/// # Note
+	///
+	/// The `input` and `output` buffers may overlap.
+	fn compute_hash_on_intermediate_buffer<F, R>(
+		&self,
+		memory: &mut M,
+		hash_fn: F,
+		input_ptr: u32,
+		input_len: u32,
+		output_ptr: u32,
+	) -> Result<(), DispatchError>
+	where
+		F: FnOnce(&[u8]) -> R,
+		R: AsRef<[u8]>,
+	{
+		// Copy input into supervisor memory.
+		let input = memory.read(input_ptr, input_len)?;
+		// Compute the hash on the input buffer using the given hash function.
+		let hash = hash_fn(&input);
+		// Write the resulting hash back into the sandboxed output buffer.
+		memory.write(output_ptr, hash.as_ref())?;
+		Ok(())
+	}
+
+	/// Fallible conversion of a `ExecError` to `ReturnErrorCode`.
+	///
+	/// This is used when converting the error returned from a subcall in order to decide
+	/// whether to trap the caller or allow handling of the error.
+	fn exec_error_into_return_code(from: ExecError) -> Result<ReturnErrorCode, DispatchError> {
+		use crate::exec::ErrorOrigin::Callee;
+		use ReturnErrorCode::*;
+
+		let transfer_failed = Error::<E::T>::TransferFailed.into();
+		let out_of_gas = Error::<E::T>::OutOfGas.into();
+		let out_of_deposit = Error::<E::T>::StorageDepositLimitExhausted.into();
+		let duplicate_contract = Error::<E::T>::DuplicateContract.into();
+		let unsupported_precompile = Error::<E::T>::UnsupportedPrecompileAddress.into();
+
+		// errors in the callee do not trap the caller
+		match (from.error, from.origin) {
+			(err, _) if err == transfer_failed => Ok(TransferFailed),
+			(err, _) if err == duplicate_contract => Ok(DuplicateContractAddress),
+			(err, _) if err == unsupported_precompile => Err(err),
+			(err, Callee) if err == out_of_gas || err == out_of_deposit => Ok(OutOfResources),
+			(_, Callee) => Ok(CalleeTrapped),
+			(err, _) => Err(err),
+		}
+	}
+
+	fn decode_key(&self, memory: &M, key_ptr: u32, key_len: u32) -> Result<Key, TrapReason> {
+		let res = match key_len {
+			SENTINEL => {
+				let mut buffer = [0u8; 32];
+				memory.read_into_buf(key_ptr, buffer.as_mut())?;
+				Ok(Key::from_fixed(buffer))
+			},
+			len => {
+				ensure!(len <= limits::STORAGE_KEY_BYTES, Error::<E::T>::DecodingFailed);
+				let key = memory.read(key_ptr, len)?;
+				Key::try_from_var(key)
+			},
+		};
+
+		res.map_err(|_| Error::<E::T>::DecodingFailed.into())
+	}
+
+	fn is_transient(flags: u32) -> Result<bool, TrapReason> {
+		StorageFlags::from_bits(flags)
+			.ok_or_else(|| <Error<E::T>>::InvalidStorageFlags.into())
+			.map(|flags| flags.contains(StorageFlags::TRANSIENT))
+	}
+
+	fn set_storage(
+		&mut self,
+		memory: &M,
+		flags: u32,
+		key_ptr: u32,
+		key_len: u32,
+		value: StorageValue,
+	) -> Result<u32, TrapReason> {
+		let transient = Self::is_transient(flags)?;
+		let costs = |new_bytes: u32, old_bytes: u32| {
+			if transient {
+				RuntimeCosts::SetTransientStorage { new_bytes, old_bytes }
+			} else {
+				RuntimeCosts::SetStorage { new_bytes, old_bytes }
+			}
+		};
+
+		let value_len = match &value {
+			StorageValue::Memory { ptr: _, len } => *len,
+			StorageValue::Value(data) => data.len() as u32,
+		};
+
+		let max_size = self.ext.max_value_size();
+		let charged = self.charge_gas(costs(value_len, self.ext.max_value_size()))?;
+		if value_len > max_size {
+			return Err(Error::<E::T>::ValueTooLarge.into());
+		}
+
+		let key = self.decode_key(memory, key_ptr, key_len)?;
+
+		let value = match value {
+			StorageValue::Memory { ptr, len } => Some(memory.read(ptr, len)?),
+			StorageValue::Value(data) => Some(data),
+		};
+
+		let write_outcome = if transient {
+			self.ext.set_transient_storage(&key, value, false)?
+		} else {
+			self.ext.set_storage(&key, value, false)?
+		};
+
+		self.adjust_gas(charged, costs(value_len, write_outcome.old_len()));
+		Ok(write_outcome.old_len_with_sentinel())
+	}
+
+	fn clear_storage(
+		&mut self,
+		memory: &M,
+		flags: u32,
+		key_ptr: u32,
+		key_len: u32,
+	) -> Result<u32, TrapReason> {
+		let transient = Self::is_transient(flags)?;
+		let costs = |len| {
+			if transient {
+				RuntimeCosts::ClearTransientStorage(len)
+			} else {
+				RuntimeCosts::ClearStorage(len)
+			}
+		};
+		let charged = self.charge_gas(costs(self.ext.max_value_size()))?;
+		let key = self.decode_key(memory, key_ptr, key_len)?;
+		let outcome = if transient {
+			self.ext.set_transient_storage(&key, None, false)?
+		} else {
+			self.ext.set_storage(&key, None, false)?
+		};
+		self.adjust_gas(charged, costs(outcome.old_len()));
+		Ok(outcome.old_len_with_sentinel())
+	}
+
+	fn get_storage(
+		&mut self,
+		memory: &mut M,
+		flags: u32,
+		key_ptr: u32,
+		key_len: u32,
+		out_ptr: u32,
+		read_mode: StorageReadMode,
+	) -> Result<ReturnErrorCode, TrapReason> {
+		let transient = Self::is_transient(flags)?;
+		let costs = |len| {
+			if transient {
+				RuntimeCosts::GetTransientStorage(len)
+			} else {
+				RuntimeCosts::GetStorage(len)
+			}
+		};
+		let charged = self.charge_gas(costs(self.ext.max_value_size()))?;
+		let key = self.decode_key(memory, key_ptr, key_len)?;
+		let outcome = if transient {
+			self.ext.get_transient_storage(&key)
+		} else {
+			self.ext.get_storage(&key)
+		};
+
+		if let Some(value) = outcome {
+			self.adjust_gas(charged, costs(value.len() as u32));
+
+			match read_mode {
+				StorageReadMode::FixedOutput32 => {
+					let mut fixed_output = [0u8; 32];
+					let len = value.len().min(fixed_output.len());
+					fixed_output[..len].copy_from_slice(&value[..len]);
+
+					self.write_fixed_sandbox_output(
+						memory,
+						out_ptr,
+						&fixed_output,
+						false,
+						already_charged,
+					)?;
+					Ok(ReturnErrorCode::Success)
+				},
+				StorageReadMode::VariableOutput { output_len_ptr: out_len_ptr } => {
+					self.write_sandbox_output(
+						memory,
+						out_ptr,
+						out_len_ptr,
+						&value,
+						false,
+						already_charged,
+					)?;
+					Ok(ReturnErrorCode::Success)
+				},
+			}
+		} else {
+			self.adjust_gas(charged, costs(0));
+
+			match read_mode {
+				StorageReadMode::FixedOutput32 => {
+					self.write_fixed_sandbox_output(
+						memory,
+						out_ptr,
+						&[0u8; 32],
+						false,
+						already_charged,
+					)?;
+					Ok(ReturnErrorCode::Success)
+				},
+				StorageReadMode::VariableOutput { .. } => Ok(ReturnErrorCode::KeyNotFound),
+			}
+		}
+	}
+
+	fn contains_storage(
+		&mut self,
+		memory: &M,
+		flags: u32,
+		key_ptr: u32,
+		key_len: u32,
+	) -> Result<u32, TrapReason> {
+		let transient = Self::is_transient(flags)?;
+		let costs = |len| {
+			if transient {
+				RuntimeCosts::ContainsTransientStorage(len)
+			} else {
+				RuntimeCosts::ContainsStorage(len)
+			}
+		};
+		let charged = self.charge_gas(costs(self.ext.max_value_size()))?;
+		let key = self.decode_key(memory, key_ptr, key_len)?;
+		let outcome = if transient {
+			self.ext.get_transient_storage_size(&key)
+		} else {
+			self.ext.get_storage_size(&key)
+		};
+		self.adjust_gas(charged, costs(outcome.unwrap_or(0)));
+		Ok(outcome.unwrap_or(SENTINEL))
+	}
+
+	fn take_storage(
+		&mut self,
+		memory: &mut M,
+		flags: u32,
+		key_ptr: u32,
+		key_len: u32,
+		out_ptr: u32,
+		out_len_ptr: u32,
+	) -> Result<ReturnErrorCode, TrapReason> {
+		let transient = Self::is_transient(flags)?;
+		let costs = |len| {
+			if transient {
+				RuntimeCosts::TakeTransientStorage(len)
+			} else {
+				RuntimeCosts::TakeStorage(len)
+			}
+		};
+		let charged = self.charge_gas(costs(self.ext.max_value_size()))?;
+		let key = self.decode_key(memory, key_ptr, key_len)?;
+		let outcome = if transient {
+			self.ext.set_transient_storage(&key, None, true)?
+		} else {
+			self.ext.set_storage(&key, None, true)?
+		};
+
+		if let crate::storage::WriteOutcome::Taken(value) = outcome {
+			self.adjust_gas(charged, costs(value.len() as u32));
+			self.write_sandbox_output(
+				memory,
+				out_ptr,
+				out_len_ptr,
+				&value,
+				false,
+				already_charged,
+			)?;
+			Ok(ReturnErrorCode::Success)
+		} else {
+			self.adjust_gas(charged, costs(0));
+			Ok(ReturnErrorCode::KeyNotFound)
+		}
+	}
+
+	fn call(
+		&mut self,
+		memory: &mut M,
+		flags: CallFlags,
+		call_type: CallType,
+		callee_ptr: u32,
+		deposit_ptr: u32,
+		weight: Weight,
+		input_data_ptr: u32,
+		input_data_len: u32,
+		output_ptr: u32,
+		output_len_ptr: u32,
+	) -> Result<ReturnErrorCode, TrapReason> {
+		let callee = memory.read_h160(callee_ptr)?;
+		let precompile = <AllPrecompiles<E::T>>::get::<E>(&callee.as_fixed_bytes());
+		match &precompile {
+			Some(precompile) if precompile.has_contract_info() =>
+				self.charge_gas(RuntimeCosts::PrecompileWithInfoBase)?,
+			Some(_) => self.charge_gas(RuntimeCosts::PrecompileBase)?,
+			None => self.charge_gas(call_type.cost())?,
+		};
+
+		let deposit_limit = memory.read_u256(deposit_ptr)?;
+
+		// we do check this in exec.rs but we want to error out early
+		if input_data_len > limits::CALLDATA_BYTES {
+			Err(<Error<E::T>>::CallDataTooLarge)?;
+		}
+
+		let input_data = if flags.contains(CallFlags::CLONE_INPUT) {
+			let input = self.input_data.as_ref().ok_or(Error::<E::T>::InputForwarded)?;
+			charge_gas!(self, RuntimeCosts::CallInputCloned(input.len() as u32))?;
+			input.clone()
+		} else if flags.contains(CallFlags::FORWARD_INPUT) {
+			self.input_data.take().ok_or(Error::<E::T>::InputForwarded)?
+		} else {
+			if precompile.is_some() {
+				self.charge_gas(RuntimeCosts::PrecompileDecode(input_data_len))?;
+			} else {
+				self.charge_gas(RuntimeCosts::CopyFromContract(input_data_len))?;
+			}
+			memory.read(input_data_ptr, input_data_len)?
+		};
+
+		memory.reset_interpreter_cache();
+
+		let call_outcome = match call_type {
+			CallType::Call { value_ptr } => {
+				let read_only = flags.contains(CallFlags::READ_ONLY);
+				let value = memory.read_u256(value_ptr)?;
+				if value > 0u32.into() {
+					// If the call value is non-zero and state change is not allowed, issue an
+					// error.
+					if read_only || self.ext.is_read_only() {
+						return Err(Error::<E::T>::StateChangeDenied.into());
+					}
+
+					self.charge_gas(RuntimeCosts::CallTransferSurcharge {
+						dust_transfer: Pallet::<E::T>::has_dust(value),
+					})?;
+				}
+				self.ext.call(
+					weight,
+					deposit_limit,
+					&callee,
+					value,
+					input_data,
+					flags.contains(CallFlags::ALLOW_REENTRY),
+					read_only,
+				)
+			},
+			CallType::DelegateCall => {
+				if flags.intersects(CallFlags::ALLOW_REENTRY | CallFlags::READ_ONLY) {
+					return Err(Error::<E::T>::InvalidCallFlags.into());
+				}
+				self.ext.delegate_call(weight, deposit_limit, callee, input_data)
+			},
+		};
+
+		match call_outcome {
+			// `TAIL_CALL` only matters on an `OK` result. Otherwise the call stack comes to
+			// a halt anyways without anymore code being executed.
+			Ok(_) if flags.contains(CallFlags::TAIL_CALL) => {
+				let output = mem::take(self.ext.last_frame_output_mut());
+				return Err(TrapReason::Return(ReturnData {
+					flags: output.flags.bits(),
+					data: output.data,
+				}));
+			},
+			Ok(_) => {
+				let output = mem::take(self.ext.last_frame_output_mut());
+				let write_result = self.write_sandbox_output(
+					memory,
+					output_ptr,
+					output_len_ptr,
+					&output.data,
+					true,
+					|len| Some(RuntimeCosts::CopyToContract(len)),
+				);
+				*self.ext.last_frame_output_mut() = output;
+				write_result?;
+				Ok(self.ext.last_frame_output().into())
+			},
+			Err(err) => {
+				let error_code = Self::exec_error_into_return_code(err)?;
+				memory.write(output_len_ptr, &0u32.to_le_bytes())?;
+				Ok(error_code)
+			},
+		}
+	}
+
+	fn instantiate(
+		&mut self,
+		memory: &mut M,
+		code_hash_ptr: u32,
+		weight: Weight,
+		deposit_ptr: u32,
+		value_ptr: u32,
+		input_data_ptr: u32,
+		input_data_len: u32,
+		address_ptr: u32,
+		output_ptr: u32,
+		output_len_ptr: u32,
+		salt_ptr: u32,
+	) -> Result<ReturnErrorCode, TrapReason> {
+		let value = match memory.read_u256(value_ptr) {
+			Ok(value) => {
+				self.charge_gas(RuntimeCosts::Instantiate {
+					input_data_len,
+					balance_transfer: Pallet::<E::T>::has_balance(value),
+					dust_transfer: Pallet::<E::T>::has_dust(value),
+				})?;
+				value
+			},
+			Err(err) => {
+				self.charge_gas(RuntimeCosts::Instantiate {
+					input_data_len: 0,
+					balance_transfer: false,
+					dust_transfer: false,
+				})?;
+				return Err(err.into());
+			},
+		};
+		let deposit_limit: U256 = memory.read_u256(deposit_ptr)?;
+		let code_hash = memory.read_h256(code_hash_ptr)?;
+		if input_data_len > limits::CALLDATA_BYTES {
+			Err(<Error<E::T>>::CallDataTooLarge)?;
+		}
+		let input_data = memory.read(input_data_ptr, input_data_len)?;
+		let salt = if salt_ptr == SENTINEL {
+			None
+		} else {
+			let salt: [u8; 32] = memory.read_array(salt_ptr)?;
+			Some(salt)
+		};
+
+		memory.reset_interpreter_cache();
+
+		match self.ext.instantiate(
+			weight,
+			deposit_limit,
+			code_hash,
+			value,
+			input_data,
+			salt.as_ref(),
+		) {
+			Ok(address) => {
+				if !self.ext.last_frame_output().flags.contains(ReturnFlags::REVERT) {
+					self.write_fixed_sandbox_output(
+						memory,
+						address_ptr,
+						&address.as_bytes(),
+						true,
+						already_charged,
+					)?;
+				}
+				let output = mem::take(self.ext.last_frame_output_mut());
+				let write_result = self.write_sandbox_output(
+					memory,
+					output_ptr,
+					output_len_ptr,
+					&output.data,
+					true,
+					|len| Some(RuntimeCosts::CopyToContract(len)),
+				);
+				*self.ext.last_frame_output_mut() = output;
+				write_result?;
+				Ok(self.ext.last_frame_output().into())
+			},
+			Err(err) => Ok(Self::exec_error_into_return_code(err)?),
+		}
+	}
+}
+
+pub struct PreparedCall<'a, E: Ext> {
+	module: polkavm::Module,
+	instance: polkavm::RawInstance,
+	runtime: Runtime<'a, E, polkavm::RawInstance>,
+}
+
+impl<'a, E: Ext> PreparedCall<'a, E>
+where
+	BalanceOf<E::T>: Into<U256>,
+	BalanceOf<E::T>: TryFrom<U256>,
+{
+	pub fn call(mut self) -> ExecResult {
+		let exec_result = loop {
+			let interrupt = self.instance.run();
+			if let Some(exec_result) =
+				self.runtime.handle_interrupt(interrupt, &self.module, &mut self.instance)
+			{
+				break exec_result
+			}
+		};
+		let _ = self.runtime.ext().gas_meter_mut().sync_from_executor(self.instance.gas())?;
+		exec_result
+	}
+
+	/// The guest memory address at which the aux data is located.
+	#[cfg(feature = "runtime-benchmarks")]
+	pub fn aux_data_base(&self) -> u32 {
+		self.instance.module().memory_map().aux_data_address()
+	}
+
+	/// Copies `data` to the aux data at address `offset`.
+	///
+	/// It sets `a0` to the beginning of data inside the aux data.
+	/// It sets `a1` to the value passed.
+	///
+	/// Only used in benchmarking so far.
+	#[cfg(feature = "runtime-benchmarks")]
+	pub fn setup_aux_data(
+		&mut self,
+		data: &[u8],
+		offset: u32,
+		a1: u64,
+	) -> frame_support::dispatch::DispatchResult {
+		let a0 = self.aux_data_base().saturating_add(offset);
+		self.instance.write_memory(a0, data).map_err(|err| {
+			log::debug!(target: LOG_TARGET, "failed to write aux data: {err:?}");
+			Error::<E::T>::CodeRejected
+		})?;
+		self.instance.set_reg(polkavm::Reg::A0, a0.into());
+		self.instance.set_reg(polkavm::Reg::A1, a1);
+		Ok(())
+	}
+}
diff --git a/substrate/frame/revive/src/vm/pvm/env.rs b/substrate/frame/revive/src/vm/pvm/env.rs
new file mode 100644
index 000000000000..16b59d51c36b
--- /dev/null
+++ b/substrate/frame/revive/src/vm/pvm/env.rs
@@ -0,0 +1,1073 @@
+// 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.
+
+use super::*;
+
+use crate::{
+	address::AddressMapper,
+	exec::Ext,
+	limits,
+	primitives::ExecReturnValue,
+	storage::meter::Diff,
+	vm::{ExportedFunction, RuntimeCosts},
+	AccountIdOf, BalanceOf, CodeInfo, Config, ContractBlob, Error, Weight, SENTINEL,
+};
+use alloc::vec::Vec;
+use codec::{Encode, MaxEncodedLen};
+use core::mem;
+use frame_support::traits::Get;
+use pallet_revive_proc_macro::define_env;
+use pallet_revive_uapi::{CallFlags, ReturnErrorCode, ReturnFlags};
+use sp_core::{H160, H256, U256};
+use sp_io::hashing::{blake2_128, keccak_256};
+use sp_runtime::DispatchError;
+
+impl<T: Config> ContractBlob<T> {
+	/// Compile and instantiate contract.
+	///
+	/// `aux_data_size` is only used for runtime benchmarks. Real contracts
+	/// don't make use of this buffer. Hence this should not be set to anything
+	/// other than `0` when not used for benchmarking.
+	pub fn prepare_call<E: Ext<T = T>>(
+		self,
+		mut runtime: Runtime<E, polkavm::RawInstance>,
+		entry_point: ExportedFunction,
+		aux_data_size: u32,
+	) -> Result<PreparedCall<E>, ExecError> {
+		let mut config = polkavm::Config::default();
+		config.set_backend(Some(polkavm::BackendKind::Interpreter));
+		config.set_cache_enabled(false);
+		#[cfg(feature = "std")]
+		if std::env::var_os("REVIVE_USE_COMPILER").is_some() {
+			log::warn!(target: LOG_TARGET, "Using PolkaVM compiler backend because env var REVIVE_USE_COMPILER is set");
+			config.set_backend(Some(polkavm::BackendKind::Compiler));
+		}
+		let engine = polkavm::Engine::new(&config).expect(
+			"on-chain (no_std) use of interpreter is hard coded.
+				interpreter is available on all platforms; qed",
+		);
+
+		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);
+		module_config.set_aux_data_size(aux_data_size);
+		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:?}");
+			Error::<T>::CodeRejected
+		})?;
+
+		let entry_program_counter = module
+			.exports()
+			.find(|export| export.symbol().as_bytes() == entry_point.identifier().as_bytes())
+			.ok_or_else(|| <Error<T>>::CodeRejected)?
+			.program_counter();
+
+		let gas_limit_polkavm: polkavm::Gas = runtime.ext().gas_meter_mut().engine_fuel_left()?;
+
+		let mut instance = module.instantiate().map_err(|err| {
+			log::debug!(target: LOG_TARGET, "failed to instantiate polkavm module: {err:?}");
+			Error::<T>::CodeRejected
+		})?;
+
+		instance.set_gas(gas_limit_polkavm);
+		instance
+			.set_interpreter_cache_size_limit(Some(polkavm::SetCacheSizeLimitArgs {
+				max_block_size: limits::code::BASIC_BLOCK_SIZE,
+				max_cache_size_bytes: limits::code::INTERPRETER_CACHE_BYTES
+					.try_into()
+					.map_err(|_| Error::<T>::CodeRejected)?,
+			}))
+			.map_err(|_| Error::<T>::CodeRejected)?;
+		instance.prepare_call_untyped(entry_program_counter, &[]);
+
+		Ok(PreparedCall { module, instance, runtime })
+	}
+}
+
+impl<T: Config> ContractBlob<T>
+where
+	BalanceOf<T>: Into<U256> + TryFrom<U256>,
+{
+	/// We only check for size and nothing else when the code is uploaded.
+	pub fn from_pvm_code(code: Vec<u8>, owner: AccountIdOf<T>) -> Result<Self, DispatchError> {
+		// We do validation only when new code is deployed. This allows us to increase
+		// the limits later without affecting already deployed code.
+		let available_syscalls = list_syscalls(T::UnsafeUnstableInterface::get());
+		let code = limits::code::enforce::<T>(code, available_syscalls)?;
+
+		let code_len = code.len() as u32;
+		let bytes_added = code_len.saturating_add(<CodeInfo<T>>::max_encoded_len() as u32);
+		let deposit = Diff { bytes_added, items_added: 2, ..Default::default() }
+			.update_contract::<T>(None)
+			.charge_or_zero();
+		let code_info = CodeInfo {
+			owner,
+			deposit,
+			refcount: 0,
+			code_len,
+			behaviour_version: Default::default(),
+		};
+		let code_hash = H256(sp_io::hashing::keccak_256(&code));
+		Ok(ContractBlob { code, code_info, code_hash })
+	}
+}
+
+impl<'a, E: Ext, M: PolkaVmInstance<E::T>> Runtime<'a, E, M> {
+	pub fn handle_interrupt(
+		&mut self,
+		interrupt: Result<polkavm::InterruptKind, polkavm::Error>,
+		module: &polkavm::Module,
+		instance: &mut M,
+	) -> Option<ExecResult> {
+		use polkavm::InterruptKind::*;
+
+		match interrupt {
+			Err(error) => {
+				// in contrast to the other returns this "should" not happen: log level error
+				log::error!(target: LOG_TARGET, "polkavm execution error: {error}");
+				Some(Err(Error::<E::T>::ExecutionFailed.into()))
+			},
+			Ok(Finished) =>
+				Some(Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: Vec::new() })),
+			Ok(Trap) => Some(Err(Error::<E::T>::ContractTrapped.into())),
+			Ok(Segfault(_)) => Some(Err(Error::<E::T>::ExecutionFailed.into())),
+			Ok(NotEnoughGas) => Some(Err(Error::<E::T>::OutOfGas.into())),
+			Ok(Step) => None,
+			Ok(Ecalli(idx)) => {
+				// This is a special hard coded syscall index which is used by benchmarks
+				// to abort contract execution. It is used to terminate the execution without
+				// breaking up a basic block. The fixed index is used so that the benchmarks
+				// don't have to deal with import tables.
+				if cfg!(feature = "runtime-benchmarks") && idx == SENTINEL {
+					return Some(Ok(ExecReturnValue {
+						flags: ReturnFlags::empty(),
+						data: Vec::new(),
+					}))
+				}
+				let Some(syscall_symbol) = module.imports().get(idx) else {
+					return Some(Err(<Error<E::T>>::InvalidSyscall.into()));
+				};
+				match self.handle_ecall(instance, syscall_symbol.as_bytes()) {
+					Ok(None) => None,
+					Ok(Some(return_value)) => {
+						instance.write_output(return_value);
+						None
+					},
+					Err(TrapReason::Return(ReturnData { flags, data })) =>
+						match ReturnFlags::from_bits(flags) {
+							None => Some(Err(Error::<E::T>::InvalidCallFlags.into())),
+							Some(flags) => Some(Ok(ExecReturnValue { flags, data })),
+						},
+					Err(TrapReason::Termination) => Some(Ok(Default::default())),
+					Err(TrapReason::SupervisorError(error)) => Some(Err(error.into())),
+				}
+			},
+		}
+	}
+}
+
+// This is the API exposed to contracts.
+//
+// # Note
+//
+// Any input that leads to a out of bound error (reading or writing) or failing to decode
+// data passed to the supervisor will lead to a trap. This is not documented explicitly
+// for every function.
+#[define_env]
+pub mod env {
+	/// Noop function used to benchmark the time it takes to execute an empty function.
+	///
+	/// Marked as stable because it needs to be called from benchmarks even when the benchmarked
+	/// parachain has unstable functions disabled.
+	#[cfg(feature = "runtime-benchmarks")]
+	#[stable]
+	fn noop(&mut self, memory: &mut M) -> Result<(), TrapReason> {
+		Ok(())
+	}
+
+	/// Set the value at the given key in the contract storage.
+	/// See [`pallet_revive_uapi::HostFn::set_storage_v2`]
+	#[stable]
+	#[mutating]
+	fn set_storage(
+		&mut self,
+		memory: &mut M,
+		flags: u32,
+		key_ptr: u32,
+		key_len: u32,
+		value_ptr: u32,
+		value_len: u32,
+	) -> Result<u32, TrapReason> {
+		self.set_storage(
+			memory,
+			flags,
+			key_ptr,
+			key_len,
+			StorageValue::Memory { ptr: value_ptr, len: value_len },
+		)
+	}
+
+	/// Sets the storage at a fixed 256-bit key with a fixed 256-bit value.
+	/// See [`pallet_revive_uapi::HostFn::set_storage_or_clear`].
+	#[stable]
+	#[mutating]
+	fn set_storage_or_clear(
+		&mut self,
+		memory: &mut M,
+		flags: u32,
+		key_ptr: u32,
+		value_ptr: u32,
+	) -> Result<u32, TrapReason> {
+		let value = memory.read(value_ptr, 32)?;
+
+		if value.iter().all(|&b| b == 0) {
+			self.clear_storage(memory, flags, key_ptr, SENTINEL)
+		} else {
+			self.set_storage(memory, flags, key_ptr, SENTINEL, StorageValue::Value(value))
+		}
+	}
+
+	/// Retrieve the value under the given key from storage.
+	/// See [`pallet_revive_uapi::HostFn::get_storage`]
+	#[stable]
+	fn get_storage(
+		&mut self,
+		memory: &mut M,
+		flags: u32,
+		key_ptr: u32,
+		key_len: u32,
+		out_ptr: u32,
+		out_len_ptr: u32,
+	) -> Result<ReturnErrorCode, TrapReason> {
+		self.get_storage(
+			memory,
+			flags,
+			key_ptr,
+			key_len,
+			out_ptr,
+			StorageReadMode::VariableOutput { output_len_ptr: out_len_ptr },
+		)
+	}
+
+	/// Reads the storage at a fixed 256-bit key and writes back a fixed 256-bit value.
+	/// See [`pallet_revive_uapi::HostFn::get_storage_or_zero`].
+	#[stable]
+	fn get_storage_or_zero(
+		&mut self,
+		memory: &mut M,
+		flags: u32,
+		key_ptr: u32,
+		out_ptr: u32,
+	) -> Result<(), TrapReason> {
+		let _ = self.get_storage(
+			memory,
+			flags,
+			key_ptr,
+			SENTINEL,
+			out_ptr,
+			StorageReadMode::FixedOutput32,
+		)?;
+
+		Ok(())
+	}
+
+	/// Make a call to another contract.
+	/// See [`pallet_revive_uapi::HostFn::call`].
+	#[stable]
+	fn call(
+		&mut self,
+		memory: &mut M,
+		flags_and_callee: u64,
+		ref_time_limit: u64,
+		proof_size_limit: u64,
+		deposit_and_value: u64,
+		input_data: u64,
+		output_data: u64,
+	) -> Result<ReturnErrorCode, TrapReason> {
+		let (flags, callee_ptr) = extract_hi_lo(flags_and_callee);
+		let (deposit_ptr, value_ptr) = extract_hi_lo(deposit_and_value);
+		let (input_data_len, input_data_ptr) = extract_hi_lo(input_data);
+		let (output_len_ptr, output_ptr) = extract_hi_lo(output_data);
+
+		self.call(
+			memory,
+			CallFlags::from_bits(flags).ok_or(Error::<E::T>::InvalidCallFlags)?,
+			CallType::Call { value_ptr },
+			callee_ptr,
+			deposit_ptr,
+			Weight::from_parts(ref_time_limit, proof_size_limit),
+			input_data_ptr,
+			input_data_len,
+			output_ptr,
+			output_len_ptr,
+		)
+	}
+
+	/// Execute code in the context (storage, caller, value) of the current contract.
+	/// See [`pallet_revive_uapi::HostFn::delegate_call`].
+	#[stable]
+	fn delegate_call(
+		&mut self,
+		memory: &mut M,
+		flags_and_callee: u64,
+		ref_time_limit: u64,
+		proof_size_limit: u64,
+		deposit_ptr: u32,
+		input_data: u64,
+		output_data: u64,
+	) -> Result<ReturnErrorCode, TrapReason> {
+		let (flags, address_ptr) = extract_hi_lo(flags_and_callee);
+		let (input_data_len, input_data_ptr) = extract_hi_lo(input_data);
+		let (output_len_ptr, output_ptr) = extract_hi_lo(output_data);
+
+		self.call(
+			memory,
+			CallFlags::from_bits(flags).ok_or(Error::<E::T>::InvalidCallFlags)?,
+			CallType::DelegateCall,
+			address_ptr,
+			deposit_ptr,
+			Weight::from_parts(ref_time_limit, proof_size_limit),
+			input_data_ptr,
+			input_data_len,
+			output_ptr,
+			output_len_ptr,
+		)
+	}
+
+	/// Instantiate a contract with the specified code hash.
+	/// See [`pallet_revive_uapi::HostFn::instantiate`].
+	#[stable]
+	#[mutating]
+	fn instantiate(
+		&mut self,
+		memory: &mut M,
+		ref_time_limit: u64,
+		proof_size_limit: u64,
+		deposit_and_value: u64,
+		input_data: u64,
+		output_data: u64,
+		address_and_salt: u64,
+	) -> Result<ReturnErrorCode, TrapReason> {
+		let (deposit_ptr, value_ptr) = extract_hi_lo(deposit_and_value);
+		let (input_data_len, code_hash_ptr) = extract_hi_lo(input_data);
+		let (output_len_ptr, output_ptr) = extract_hi_lo(output_data);
+		let (address_ptr, salt_ptr) = extract_hi_lo(address_and_salt);
+		let Some(input_data_ptr) = code_hash_ptr.checked_add(32) else {
+			return Err(Error::<E::T>::OutOfBounds.into());
+		};
+		let Some(input_data_len) = input_data_len.checked_sub(32) else {
+			return Err(Error::<E::T>::OutOfBounds.into());
+		};
+
+		self.instantiate(
+			memory,
+			code_hash_ptr,
+			Weight::from_parts(ref_time_limit, proof_size_limit),
+			deposit_ptr,
+			value_ptr,
+			input_data_ptr,
+			input_data_len,
+			address_ptr,
+			output_ptr,
+			output_len_ptr,
+			salt_ptr,
+		)
+	}
+
+	/// Returns the total size of the contract call input data.
+	/// See [`pallet_revive_uapi::HostFn::call_data_size `].
+	#[stable]
+	fn call_data_size(&mut self, memory: &mut M) -> Result<u64, TrapReason> {
+		self.charge_gas(RuntimeCosts::CallDataSize)?;
+		Ok(self
+			.input_data
+			.as_ref()
+			.map(|input| input.len().try_into().expect("usize fits into u64; qed"))
+			.unwrap_or_default())
+	}
+
+	/// Stores the input passed by the caller into the supplied buffer.
+	/// See [`pallet_revive_uapi::HostFn::call_data_copy`].
+	#[stable]
+	fn call_data_copy(
+		&mut self,
+		memory: &mut M,
+		out_ptr: u32,
+		out_len: u32,
+		offset: u32,
+	) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::CallDataCopy(out_len))?;
+
+		let Some(input) = self.input_data.as_ref() else {
+			return Err(Error::<E::T>::InputForwarded.into());
+		};
+
+		let start = offset as usize;
+		if start >= input.len() {
+			memory.zero(out_ptr, out_len)?;
+			return Ok(());
+		}
+
+		let end = start.saturating_add(out_len as usize).min(input.len());
+		memory.write(out_ptr, &input[start..end])?;
+
+		let bytes_written = (end - start) as u32;
+		memory.zero(out_ptr.saturating_add(bytes_written), out_len - bytes_written)?;
+
+		Ok(())
+	}
+
+	/// Stores the U256 value at given call input `offset` into the supplied buffer.
+	/// See [`pallet_revive_uapi::HostFn::call_data_load`].
+	#[stable]
+	fn call_data_load(
+		&mut self,
+		memory: &mut M,
+		out_ptr: u32,
+		offset: u32,
+	) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::CallDataLoad)?;
+
+		let Some(input) = self.input_data.as_ref() else {
+			return Err(Error::<E::T>::InputForwarded.into());
+		};
+
+		let mut data = [0; 32];
+		let start = offset as usize;
+		let data = if start >= input.len() {
+			data // Any index is valid to request; OOB offsets return zero.
+		} else {
+			let end = start.saturating_add(32).min(input.len());
+			data[..end - start].copy_from_slice(&input[start..end]);
+			data.reverse();
+			data // Solidity expects right-padded data
+		};
+
+		self.write_fixed_sandbox_output(memory, out_ptr, &data, false, already_charged)?;
+
+		Ok(())
+	}
+
+	/// Cease contract execution and save a data buffer as a result of the execution.
+	/// See [`pallet_revive_uapi::HostFn::return_value`].
+	#[stable]
+	fn seal_return(
+		&mut self,
+		memory: &mut M,
+		flags: u32,
+		data_ptr: u32,
+		data_len: u32,
+	) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::CopyFromContract(data_len))?;
+		if data_len > limits::CALLDATA_BYTES {
+			Err(<Error<E::T>>::ReturnDataTooLarge)?;
+		}
+		Err(TrapReason::Return(ReturnData { flags, data: memory.read(data_ptr, data_len)? }))
+	}
+
+	/// Stores the address of the caller into the supplied buffer.
+	/// See [`pallet_revive_uapi::HostFn::caller`].
+	#[stable]
+	fn caller(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::Caller)?;
+		let caller = <E::T as Config>::AddressMapper::to_address(self.ext.caller().account_id()?);
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			caller.as_bytes(),
+			false,
+			already_charged,
+		)?)
+	}
+
+	/// Stores the address of the call stack origin into the supplied buffer.
+	/// See [`pallet_revive_uapi::HostFn::origin`].
+	#[stable]
+	fn origin(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::Origin)?;
+		let origin = <E::T as Config>::AddressMapper::to_address(self.ext.origin().account_id()?);
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			origin.as_bytes(),
+			false,
+			already_charged,
+		)?)
+	}
+
+	/// Retrieve the code hash for a specified contract address.
+	/// See [`pallet_revive_uapi::HostFn::code_hash`].
+	#[stable]
+	fn code_hash(&mut self, memory: &mut M, addr_ptr: u32, out_ptr: u32) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::CodeHash)?;
+		let address = memory.read_h160(addr_ptr)?;
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			&self.ext.code_hash(&address).as_bytes(),
+			false,
+			already_charged,
+		)?)
+	}
+
+	/// Retrieve the code size for a given contract address.
+	/// See [`pallet_revive_uapi::HostFn::code_size`].
+	#[stable]
+	fn code_size(&mut self, memory: &mut M, addr_ptr: u32) -> Result<u64, TrapReason> {
+		self.charge_gas(RuntimeCosts::CodeSize)?;
+		let address = memory.read_h160(addr_ptr)?;
+		Ok(self.ext.code_size(&address))
+	}
+
+	/// Stores the address of the current contract into the supplied buffer.
+	/// See [`pallet_revive_uapi::HostFn::address`].
+	#[stable]
+	fn address(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::Address)?;
+		let address = self.ext.address();
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			address.as_bytes(),
+			false,
+			already_charged,
+		)?)
+	}
+
+	/// Stores the price for the specified amount of weight into the supplied buffer.
+	/// See [`pallet_revive_uapi::HostFn::weight_to_fee`].
+	#[stable]
+	fn weight_to_fee(
+		&mut self,
+		memory: &mut M,
+		ref_time_limit: u64,
+		proof_size_limit: u64,
+		out_ptr: u32,
+	) -> Result<(), TrapReason> {
+		let weight = Weight::from_parts(ref_time_limit, proof_size_limit);
+		self.charge_gas(RuntimeCosts::WeightToFee)?;
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			&self.ext.get_weight_price(weight).encode(),
+			false,
+			already_charged,
+		)?)
+	}
+
+	/// Stores the immutable data into the supplied buffer.
+	/// See [`pallet_revive_uapi::HostFn::get_immutable_data`].
+	#[stable]
+	fn get_immutable_data(
+		&mut self,
+		memory: &mut M,
+		out_ptr: u32,
+		out_len_ptr: u32,
+	) -> Result<(), TrapReason> {
+		// quering the length is free as it is stored with the contract metadata
+		let len = self.ext.immutable_data_len();
+		self.charge_gas(RuntimeCosts::GetImmutableData(len))?;
+		let data = self.ext.get_immutable_data()?;
+		self.write_sandbox_output(memory, out_ptr, out_len_ptr, &data, false, already_charged)?;
+		Ok(())
+	}
+
+	/// Attaches the supplied immutable data to the currently executing contract.
+	/// See [`pallet_revive_uapi::HostFn::set_immutable_data`].
+	#[stable]
+	fn set_immutable_data(&mut self, memory: &mut M, ptr: u32, len: u32) -> Result<(), TrapReason> {
+		if len > limits::IMMUTABLE_BYTES {
+			return Err(Error::<E::T>::OutOfBounds.into());
+		}
+		self.charge_gas(RuntimeCosts::SetImmutableData(len))?;
+		let buf = memory.read(ptr, len)?;
+		let data = buf.try_into().expect("bailed out earlier; qed");
+		self.ext.set_immutable_data(data)?;
+		Ok(())
+	}
+
+	/// Stores the *free* balance of the current account into the supplied buffer.
+	/// See [`pallet_revive_uapi::HostFn::balance`].
+	#[stable]
+	fn balance(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::Balance)?;
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			&self.ext.balance().to_little_endian(),
+			false,
+			already_charged,
+		)?)
+	}
+
+	/// Stores the *free* balance of the supplied address into the supplied buffer.
+	/// See [`pallet_revive_uapi::HostFn::balance`].
+	#[stable]
+	fn balance_of(
+		&mut self,
+		memory: &mut M,
+		addr_ptr: u32,
+		out_ptr: u32,
+	) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::BalanceOf)?;
+		let address = memory.read_h160(addr_ptr)?;
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			&self.ext.balance_of(&address).to_little_endian(),
+			false,
+			already_charged,
+		)?)
+	}
+
+	/// Returns the chain ID.
+	/// See [`pallet_revive_uapi::HostFn::chain_id`].
+	#[stable]
+	fn chain_id(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			&U256::from(<E::T as Config>::ChainId::get()).to_little_endian(),
+			false,
+			|_| Some(RuntimeCosts::CopyToContract(32)),
+		)?)
+	}
+
+	/// Returns the block ref_time limit.
+	/// See [`pallet_revive_uapi::HostFn::gas_limit`].
+	#[stable]
+	fn gas_limit(&mut self, memory: &mut M) -> Result<u64, TrapReason> {
+		self.charge_gas(RuntimeCosts::GasLimit)?;
+		Ok(<E::T as frame_system::Config>::BlockWeights::get().max_block.ref_time())
+	}
+
+	/// Stores the value transferred along with this call/instantiate into the supplied buffer.
+	/// See [`pallet_revive_uapi::HostFn::value_transferred`].
+	#[stable]
+	fn value_transferred(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::ValueTransferred)?;
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			&self.ext.value_transferred().to_little_endian(),
+			false,
+			already_charged,
+		)?)
+	}
+
+	/// Returns the simulated ethereum `GASPRICE` value.
+	/// See [`pallet_revive_uapi::HostFn::gas_price`].
+	#[stable]
+	fn gas_price(&mut self, memory: &mut M) -> Result<u64, TrapReason> {
+		self.charge_gas(RuntimeCosts::GasPrice)?;
+		Ok(GAS_PRICE.into())
+	}
+
+	/// Returns the simulated ethereum `BASEFEE` value.
+	/// See [`pallet_revive_uapi::HostFn::base_fee`].
+	#[stable]
+	fn base_fee(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::BaseFee)?;
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			&U256::zero().to_little_endian(),
+			false,
+			already_charged,
+		)?)
+	}
+
+	/// Load the latest block timestamp into the supplied buffer
+	/// See [`pallet_revive_uapi::HostFn::now`].
+	#[stable]
+	fn now(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::Now)?;
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			&self.ext.now().to_little_endian(),
+			false,
+			already_charged,
+		)?)
+	}
+
+	/// Deposit a contract event with the data buffer and optional list of topics.
+	/// See [pallet_revive_uapi::HostFn::deposit_event]
+	#[stable]
+	#[mutating]
+	fn deposit_event(
+		&mut self,
+		memory: &mut M,
+		topics_ptr: u32,
+		num_topic: u32,
+		data_ptr: u32,
+		data_len: u32,
+	) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::DepositEvent { num_topic, len: data_len })?;
+
+		if num_topic > limits::NUM_EVENT_TOPICS {
+			return Err(Error::<E::T>::TooManyTopics.into());
+		}
+
+		if data_len > self.ext.max_value_size() {
+			return Err(Error::<E::T>::ValueTooLarge.into());
+		}
+
+		let topics: Vec<H256> = match num_topic {
+			0 => Vec::new(),
+			_ => {
+				let mut v = Vec::with_capacity(num_topic as usize);
+				let topics_len = num_topic * H256::len_bytes() as u32;
+				let buf = memory.read(topics_ptr, topics_len)?;
+				for chunk in buf.chunks_exact(H256::len_bytes()) {
+					v.push(H256::from_slice(chunk));
+				}
+				v
+			},
+		};
+
+		let event_data = memory.read(data_ptr, data_len)?;
+		self.ext.deposit_event(topics, event_data);
+		Ok(())
+	}
+
+	/// Stores the current block number of the current contract into the supplied buffer.
+	/// See [`pallet_revive_uapi::HostFn::block_number`].
+	#[stable]
+	fn block_number(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::BlockNumber)?;
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			&self.ext.block_number().to_little_endian(),
+			false,
+			already_charged,
+		)?)
+	}
+
+	/// Stores the block hash at given block height into the supplied buffer.
+	/// See [`pallet_revive_uapi::HostFn::block_hash`].
+	#[stable]
+	fn block_hash(
+		&mut self,
+		memory: &mut M,
+		block_number_ptr: u32,
+		out_ptr: u32,
+	) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::BlockHash)?;
+		let block_number = memory.read_u256(block_number_ptr)?;
+		let block_hash = self.ext.block_hash(block_number).unwrap_or(H256::zero());
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			&block_hash.as_bytes(),
+			false,
+			already_charged,
+		)?)
+	}
+
+	/// Stores the current block author into the supplied buffer.
+	/// See [`pallet_revive_uapi::HostFn::block_author`].
+	#[stable]
+	fn block_author(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::BlockAuthor)?;
+		let block_author = self.ext.block_author().unwrap_or(H160::zero());
+
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			&block_author.as_bytes(),
+			false,
+			already_charged,
+		)?)
+	}
+
+	/// Computes the KECCAK 256-bit hash on the given input buffer.
+	/// See [`pallet_revive_uapi::HostFn::hash_keccak_256`].
+	#[stable]
+	fn hash_keccak_256(
+		&mut self,
+		memory: &mut M,
+		input_ptr: u32,
+		input_len: u32,
+		output_ptr: u32,
+	) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::HashKeccak256(input_len))?;
+		Ok(self.compute_hash_on_intermediate_buffer(
+			memory, keccak_256, input_ptr, input_len, output_ptr,
+		)?)
+	}
+
+	/// Stores the length of the data returned by the last call into the supplied buffer.
+	/// See [`pallet_revive_uapi::HostFn::return_data_size`].
+	#[stable]
+	fn return_data_size(&mut self, memory: &mut M) -> Result<u64, TrapReason> {
+		self.charge_gas(RuntimeCosts::ReturnDataSize)?;
+		Ok(self
+			.ext
+			.last_frame_output()
+			.data
+			.len()
+			.try_into()
+			.expect("usize fits into u64; qed"))
+	}
+
+	/// Stores data returned by the last call, starting from `offset`, into the supplied buffer.
+	/// See [`pallet_revive_uapi::HostFn::return_data`].
+	#[stable]
+	fn return_data_copy(
+		&mut self,
+		memory: &mut M,
+		out_ptr: u32,
+		out_len_ptr: u32,
+		offset: u32,
+	) -> Result<(), TrapReason> {
+		let output = mem::take(self.ext.last_frame_output_mut());
+		let result = if offset as usize > output.data.len() {
+			Err(Error::<E::T>::OutOfBounds.into())
+		} else {
+			self.write_sandbox_output(
+				memory,
+				out_ptr,
+				out_len_ptr,
+				&output.data[offset as usize..],
+				false,
+				|len| Some(RuntimeCosts::CopyToContract(len)),
+			)
+		};
+		*self.ext.last_frame_output_mut() = output;
+		Ok(result?)
+	}
+
+	/// Returns the amount of ref_time left.
+	/// See [`pallet_revive_uapi::HostFn::ref_time_left`].
+	#[stable]
+	fn ref_time_left(&mut self, memory: &mut M) -> Result<u64, TrapReason> {
+		self.charge_gas(RuntimeCosts::RefTimeLeft)?;
+		Ok(self.ext.gas_meter().gas_left().ref_time())
+	}
+
+	/// Checks whether the caller of the current contract is the origin of the whole call stack.
+	/// See [`pallet_revive_uapi::HostFn::caller_is_origin`].
+	fn caller_is_origin(&mut self, _memory: &mut M) -> Result<u32, TrapReason> {
+		self.charge_gas(RuntimeCosts::CallerIsOrigin)?;
+		Ok(self.ext.caller_is_origin() as u32)
+	}
+
+	/// Checks whether the caller of the current contract is root.
+	/// See [`pallet_revive_uapi::HostFn::caller_is_root`].
+	fn caller_is_root(&mut self, _memory: &mut M) -> Result<u32, TrapReason> {
+		self.charge_gas(RuntimeCosts::CallerIsRoot)?;
+		Ok(self.ext.caller_is_root() as u32)
+	}
+
+	/// Clear the value at the given key in the contract storage.
+	/// See [`pallet_revive_uapi::HostFn::clear_storage`]
+	#[mutating]
+	fn clear_storage(
+		&mut self,
+		memory: &mut M,
+		flags: u32,
+		key_ptr: u32,
+		key_len: u32,
+	) -> Result<u32, TrapReason> {
+		self.clear_storage(memory, flags, key_ptr, key_len)
+	}
+
+	/// Checks whether there is a value stored under the given key.
+	/// See [`pallet_revive_uapi::HostFn::contains_storage`]
+	fn contains_storage(
+		&mut self,
+		memory: &mut M,
+		flags: u32,
+		key_ptr: u32,
+		key_len: u32,
+	) -> Result<u32, TrapReason> {
+		self.contains_storage(memory, flags, key_ptr, key_len)
+	}
+
+	/// Calculates Ethereum address from the ECDSA compressed public key and stores
+	/// See [`pallet_revive_uapi::HostFn::ecdsa_to_eth_address`].
+	fn ecdsa_to_eth_address(
+		&mut self,
+		memory: &mut M,
+		key_ptr: u32,
+		out_ptr: u32,
+	) -> Result<ReturnErrorCode, TrapReason> {
+		self.charge_gas(RuntimeCosts::EcdsaToEthAddress)?;
+		let mut compressed_key: [u8; 33] = [0; 33];
+		memory.read_into_buf(key_ptr, &mut compressed_key)?;
+		let result = self.ext.ecdsa_to_eth_address(&compressed_key);
+		match result {
+			Ok(eth_address) => {
+				memory.write(out_ptr, eth_address.as_ref())?;
+				Ok(ReturnErrorCode::Success)
+			},
+			Err(_) => Ok(ReturnErrorCode::EcdsaRecoveryFailed),
+		}
+	}
+
+	/// Computes the BLAKE2 128-bit hash on the given input buffer.
+	/// See [`pallet_revive_uapi::HostFn::hash_blake2_128`].
+	fn hash_blake2_128(
+		&mut self,
+		memory: &mut M,
+		input_ptr: u32,
+		input_len: u32,
+		output_ptr: u32,
+	) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::HashBlake128(input_len))?;
+		Ok(self.compute_hash_on_intermediate_buffer(
+			memory, blake2_128, input_ptr, input_len, output_ptr,
+		)?)
+	}
+
+	/// Stores the minimum balance (a.k.a. existential deposit) into the supplied buffer.
+	/// See [`pallet_revive_uapi::HostFn::minimum_balance`].
+	fn minimum_balance(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::MinimumBalance)?;
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			&self.ext.minimum_balance().to_little_endian(),
+			false,
+			already_charged,
+		)?)
+	}
+
+	/// Retrieve the code hash of the currently executing contract.
+	/// See [`pallet_revive_uapi::HostFn::own_code_hash`].
+	fn own_code_hash(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::OwnCodeHash)?;
+		let code_hash = *self.ext.own_code_hash();
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			code_hash.as_bytes(),
+			false,
+			already_charged,
+		)?)
+	}
+
+	/// Replace the contract code at the specified address with new code.
+	/// See [`pallet_revive_uapi::HostFn::set_code_hash`].
+	///
+	/// Disabled until the internal implementation takes care of collecting
+	/// the immutable data of the new code hash.
+	#[mutating]
+	fn set_code_hash(&mut self, memory: &mut M, code_hash_ptr: u32) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::SetCodeHash)?;
+		let code_hash: H256 = memory.read_h256(code_hash_ptr)?;
+		self.ext.set_code_hash(code_hash)?;
+		Ok(())
+	}
+
+	/// Verify a sr25519 signature
+	/// See [`pallet_revive_uapi::HostFn::sr25519_verify`].
+	fn sr25519_verify(
+		&mut self,
+		memory: &mut M,
+		signature_ptr: u32,
+		pub_key_ptr: u32,
+		message_len: u32,
+		message_ptr: u32,
+	) -> Result<ReturnErrorCode, TrapReason> {
+		self.charge_gas(RuntimeCosts::Sr25519Verify(message_len))?;
+
+		let mut signature: [u8; 64] = [0; 64];
+		memory.read_into_buf(signature_ptr, &mut signature)?;
+
+		let mut pub_key: [u8; 32] = [0; 32];
+		memory.read_into_buf(pub_key_ptr, &mut pub_key)?;
+
+		let message: Vec<u8> = memory.read(message_ptr, message_len)?;
+
+		if self.ext.sr25519_verify(&signature, &message, &pub_key) {
+			Ok(ReturnErrorCode::Success)
+		} else {
+			Ok(ReturnErrorCode::Sr25519VerifyFailed)
+		}
+	}
+
+	/// Retrieve and remove the value under the given key from storage.
+	/// See [`pallet_revive_uapi::HostFn::take_storage`]
+	#[mutating]
+	fn take_storage(
+		&mut self,
+		memory: &mut M,
+		flags: u32,
+		key_ptr: u32,
+		key_len: u32,
+		out_ptr: u32,
+		out_len_ptr: u32,
+	) -> Result<ReturnErrorCode, TrapReason> {
+		self.take_storage(memory, flags, key_ptr, key_len, out_ptr, out_len_ptr)
+	}
+
+	/// Remove the calling account and transfer remaining **free** balance.
+	/// See [`pallet_revive_uapi::HostFn::terminate`].
+	#[mutating]
+	fn terminate(&mut self, memory: &mut M, beneficiary_ptr: u32) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::Terminate)?;
+		let beneficiary = memory.read_h160(beneficiary_ptr)?;
+		self.ext.terminate(&beneficiary)?;
+		Err(TrapReason::Termination)
+	}
+
+	/// Stores the amount of weight left into the supplied buffer.
+	/// See [`pallet_revive_uapi::HostFn::weight_left`].
+	fn weight_left(
+		&mut self,
+		memory: &mut M,
+		out_ptr: u32,
+		out_len_ptr: u32,
+	) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::WeightLeft)?;
+		let gas_left = &self.ext.gas_meter().gas_left().encode();
+		Ok(self.write_sandbox_output(
+			memory,
+			out_ptr,
+			out_len_ptr,
+			gas_left,
+			false,
+			already_charged,
+		)?)
+	}
+
+	/// Retrieves the account id for a specified contract address.
+	///
+	/// See [`pallet_revive_uapi::HostFn::to_account_id`].
+	fn to_account_id(
+		&mut self,
+		memory: &mut M,
+		addr_ptr: u32,
+		out_ptr: u32,
+	) -> Result<(), TrapReason> {
+		self.charge_gas(RuntimeCosts::ToAccountId)?;
+		let address = memory.read_h160(addr_ptr)?;
+		let account_id = self.ext.to_account_id(&address);
+		Ok(self.write_fixed_sandbox_output(
+			memory,
+			out_ptr,
+			&account_id.encode(),
+			false,
+			already_charged,
+		)?)
+	}
+}
diff --git a/substrate/frame/revive/src/vm/runtime.rs b/substrate/frame/revive/src/vm/runtime.rs
index c03544c39738..e69de29bb2d1 100644
--- a/substrate/frame/revive/src/vm/runtime.rs
+++ b/substrate/frame/revive/src/vm/runtime.rs
@@ -1,2147 +0,0 @@
-// 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.
-
-//! Environment definition of the vm smart-contract runtime.
-
-use crate::{
-	address::AddressMapper,
-	evm::runtime::GAS_PRICE,
-	exec::{ExecError, ExecResult, Ext, Key},
-	gas::{ChargedAmount, Token},
-	limits,
-	precompiles::{All as AllPrecompiles, Precompiles},
-	primitives::ExecReturnValue,
-	weights::WeightInfo,
-	Config, Error, Pallet, LOG_TARGET, SENTINEL,
-};
-use alloc::{vec, vec::Vec};
-use codec::Encode;
-use core::{fmt, marker::PhantomData, mem};
-use frame_support::{ensure, traits::Get, weights::Weight};
-use pallet_revive_proc_macro::define_env;
-use pallet_revive_uapi::{CallFlags, ReturnErrorCode, ReturnFlags, StorageFlags};
-use sp_core::{H160, H256, U256};
-use sp_io::hashing::{blake2_128, keccak_256};
-use sp_runtime::{DispatchError, RuntimeDebug};
-
-/// Abstraction over the memory access within syscalls.
-///
-/// The reason for this abstraction is that we run syscalls on the host machine when
-/// benchmarking them. In that case we have direct access to the contract's memory. However, when
-/// running within PolkaVM we need to resort to copying as we can't map the contracts memory into
-/// the host (as of now).
-pub trait Memory<T: Config> {
-	/// Read designated chunk from the sandbox memory into the supplied buffer.
-	///
-	/// Returns `Err` if one of the following conditions occurs:
-	///
-	/// - requested buffer is not within the bounds of the sandbox memory.
-	fn read_into_buf(&self, ptr: u32, buf: &mut [u8]) -> Result<(), DispatchError>;
-
-	/// Write the given buffer to the designated location in the sandbox memory.
-	///
-	/// Returns `Err` if one of the following conditions occurs:
-	///
-	/// - designated area is not within the bounds of the sandbox memory.
-	fn write(&mut self, ptr: u32, buf: &[u8]) -> Result<(), DispatchError>;
-
-	/// Zero the designated location in the sandbox memory.
-	///
-	/// Returns `Err` if one of the following conditions occurs:
-	///
-	/// - designated area is not within the bounds of the sandbox memory.
-	fn zero(&mut self, ptr: u32, len: u32) -> Result<(), DispatchError>;
-
-	/// This will reset all compilation artifacts of the currently executing instance.
-	///
-	/// This is used before we call into a new contract to free up some memory. Doing
-	/// so we make sure that we only ever have to hold one compilation cache at a time
-	/// independtently of of our call stack depth.
-	fn reset_interpreter_cache(&mut self);
-
-	/// Read designated chunk from the sandbox memory.
-	///
-	/// Returns `Err` if one of the following conditions occurs:
-	///
-	/// - requested buffer is not within the bounds of the sandbox memory.
-	fn read(&self, ptr: u32, len: u32) -> Result<Vec<u8>, DispatchError> {
-		let mut buf = vec![0u8; len as usize];
-		self.read_into_buf(ptr, buf.as_mut_slice())?;
-		Ok(buf)
-	}
-
-	/// Same as `read` but reads into a fixed size buffer.
-	fn read_array<const N: usize>(&self, ptr: u32) -> Result<[u8; N], DispatchError> {
-		let mut buf = [0u8; N];
-		self.read_into_buf(ptr, &mut buf)?;
-		Ok(buf)
-	}
-
-	/// Read a `u32` from the sandbox memory.
-	fn read_u32(&self, ptr: u32) -> Result<u32, DispatchError> {
-		let buf: [u8; 4] = self.read_array(ptr)?;
-		Ok(u32::from_le_bytes(buf))
-	}
-
-	/// Read a `U256` from the sandbox memory.
-	fn read_u256(&self, ptr: u32) -> Result<U256, DispatchError> {
-		let buf: [u8; 32] = self.read_array(ptr)?;
-		Ok(U256::from_little_endian(&buf))
-	}
-
-	/// Read a `H160` from the sandbox memory.
-	fn read_h160(&self, ptr: u32) -> Result<H160, DispatchError> {
-		let mut buf = H160::default();
-		self.read_into_buf(ptr, buf.as_bytes_mut())?;
-		Ok(buf)
-	}
-
-	/// Read a `H256` from the sandbox memory.
-	fn read_h256(&self, ptr: u32) -> Result<H256, DispatchError> {
-		let mut code_hash = H256::default();
-		self.read_into_buf(ptr, code_hash.as_bytes_mut())?;
-		Ok(code_hash)
-	}
-}
-
-/// Allows syscalls access to the PolkaVM instance they are executing in.
-///
-/// In case a contract is executing within PolkaVM its `memory` argument will also implement
-/// this trait. The benchmarking implementation of syscalls will only require `Memory`
-/// to be implemented.
-pub trait PolkaVmInstance<T: Config>: Memory<T> {
-	fn gas(&self) -> polkavm::Gas;
-	fn set_gas(&mut self, gas: polkavm::Gas);
-	fn read_input_regs(&self) -> (u64, u64, u64, u64, u64, u64);
-	fn write_output(&mut self, output: u64);
-}
-
-// Memory implementation used in benchmarking where guest memory is mapped into the host.
-//
-// Please note that we could optimize the `read_as_*` functions by decoding directly from
-// memory without a copy. However, we don't do that because as it would change the behaviour
-// of those functions: A `read_as` with a `len` larger than the actual type can succeed
-// in the streaming implementation while it could fail with a segfault in the copy implementation.
-#[cfg(feature = "runtime-benchmarks")]
-impl<T: Config> Memory<T> for [u8] {
-	fn read_into_buf(&self, ptr: u32, buf: &mut [u8]) -> Result<(), DispatchError> {
-		let ptr = ptr as usize;
-		let bound_checked =
-			self.get(ptr..ptr + buf.len()).ok_or_else(|| Error::<T>::OutOfBounds)?;
-		buf.copy_from_slice(bound_checked);
-		Ok(())
-	}
-
-	fn write(&mut self, ptr: u32, buf: &[u8]) -> Result<(), DispatchError> {
-		let ptr = ptr as usize;
-		let bound_checked =
-			self.get_mut(ptr..ptr + buf.len()).ok_or_else(|| Error::<T>::OutOfBounds)?;
-		bound_checked.copy_from_slice(buf);
-		Ok(())
-	}
-
-	fn zero(&mut self, ptr: u32, len: u32) -> Result<(), DispatchError> {
-		<[u8] as Memory<T>>::write(self, ptr, &vec![0; len as usize])
-	}
-
-	fn reset_interpreter_cache(&mut self) {}
-}
-
-impl<T: Config> Memory<T> for polkavm::RawInstance {
-	fn read_into_buf(&self, ptr: u32, buf: &mut [u8]) -> Result<(), DispatchError> {
-		self.read_memory_into(ptr, buf)
-			.map(|_| ())
-			.map_err(|_| Error::<T>::OutOfBounds.into())
-	}
-
-	fn write(&mut self, ptr: u32, buf: &[u8]) -> Result<(), DispatchError> {
-		self.write_memory(ptr, buf).map_err(|_| Error::<T>::OutOfBounds.into())
-	}
-
-	fn zero(&mut self, ptr: u32, len: u32) -> Result<(), DispatchError> {
-		self.zero_memory(ptr, len).map_err(|_| Error::<T>::OutOfBounds.into())
-	}
-
-	fn reset_interpreter_cache(&mut self) {
-		self.reset_interpreter_cache();
-	}
-}
-
-impl<T: Config> PolkaVmInstance<T> for polkavm::RawInstance {
-	fn gas(&self) -> polkavm::Gas {
-		self.gas()
-	}
-
-	fn set_gas(&mut self, gas: polkavm::Gas) {
-		self.set_gas(gas)
-	}
-
-	fn read_input_regs(&self) -> (u64, u64, u64, u64, u64, u64) {
-		(
-			self.reg(polkavm::Reg::A0),
-			self.reg(polkavm::Reg::A1),
-			self.reg(polkavm::Reg::A2),
-			self.reg(polkavm::Reg::A3),
-			self.reg(polkavm::Reg::A4),
-			self.reg(polkavm::Reg::A5),
-		)
-	}
-
-	fn write_output(&mut self, output: u64) {
-		self.set_reg(polkavm::Reg::A0, output);
-	}
-}
-
-impl From<&ExecReturnValue> for ReturnErrorCode {
-	fn from(from: &ExecReturnValue) -> Self {
-		if from.flags.contains(ReturnFlags::REVERT) {
-			Self::CalleeReverted
-		} else {
-			Self::Success
-		}
-	}
-}
-
-/// The data passed through when a contract uses `seal_return`.
-#[derive(RuntimeDebug)]
-pub struct ReturnData {
-	/// The flags as passed through by the contract. They are still unchecked and
-	/// will later be parsed into a `ReturnFlags` bitflags struct.
-	flags: u32,
-	/// The output buffer passed by the contract as return data.
-	data: Vec<u8>,
-}
-
-/// Enumerates all possible reasons why a trap was generated.
-///
-/// This is either used to supply the caller with more information about why an error
-/// occurred (the SupervisorError variant).
-/// The other case is where the trap does not constitute an error but rather was invoked
-/// as a quick way to terminate the application (all other variants).
-#[derive(RuntimeDebug)]
-pub enum TrapReason {
-	/// The supervisor trapped the contract because of an error condition occurred during
-	/// execution in privileged code.
-	SupervisorError(DispatchError),
-	/// Signals that trap was generated in response to call `seal_return` host function.
-	Return(ReturnData),
-	/// Signals that a trap was generated in response to a successful call to the
-	/// `seal_terminate` host function.
-	Termination,
-}
-
-impl<T: Into<DispatchError>> From<T> for TrapReason {
-	fn from(from: T) -> Self {
-		Self::SupervisorError(from.into())
-	}
-}
-
-impl fmt::Display for TrapReason {
-	fn fmt(&self, _f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-		Ok(())
-	}
-}
-
-#[cfg_attr(test, derive(Debug, PartialEq, Eq))]
-#[derive(Copy, Clone)]
-pub enum RuntimeCosts {
-	/// Base Weight of calling a host function.
-	HostFn,
-	/// Weight charged for copying data from the sandbox.
-	CopyFromContract(u32),
-	/// Weight charged for copying data to the sandbox.
-	CopyToContract(u32),
-	/// Weight of calling `seal_call_data_load``.
-	CallDataLoad,
-	/// Weight of calling `seal_call_data_copy`.
-	CallDataCopy(u32),
-	/// Weight of calling `seal_caller`.
-	Caller,
-	/// Weight of calling `seal_call_data_size`.
-	CallDataSize,
-	/// Weight of calling `seal_return_data_size`.
-	ReturnDataSize,
-	/// Weight of calling `seal_to_account_id`.
-	ToAccountId,
-	/// Weight of calling `seal_origin`.
-	Origin,
-	/// Weight of calling `seal_code_hash`.
-	CodeHash,
-	/// Weight of calling `seal_own_code_hash`.
-	OwnCodeHash,
-	/// Weight of calling `seal_code_size`.
-	CodeSize,
-	/// Weight of calling `seal_caller_is_origin`.
-	CallerIsOrigin,
-	/// Weight of calling `caller_is_root`.
-	CallerIsRoot,
-	/// Weight of calling `seal_address`.
-	Address,
-	/// Weight of calling `seal_ref_time_left`.
-	RefTimeLeft,
-	/// Weight of calling `seal_weight_left`.
-	WeightLeft,
-	/// Weight of calling `seal_balance`.
-	Balance,
-	/// Weight of calling `seal_balance_of`.
-	BalanceOf,
-	/// Weight of calling `seal_value_transferred`.
-	ValueTransferred,
-	/// Weight of calling `seal_minimum_balance`.
-	MinimumBalance,
-	/// Weight of calling `seal_block_number`.
-	BlockNumber,
-	/// Weight of calling `seal_block_hash`.
-	BlockHash,
-	/// Weight of calling `seal_block_author`.
-	BlockAuthor,
-	/// Weight of calling `seal_gas_price`.
-	GasPrice,
-	/// Weight of calling `seal_base_fee`.
-	BaseFee,
-	/// Weight of calling `seal_now`.
-	Now,
-	/// Weight of calling `seal_gas_limit`.
-	GasLimit,
-	/// Weight of calling `seal_weight_to_fee`.
-	WeightToFee,
-	/// Weight of calling `seal_terminate`.
-	Terminate,
-	/// Weight of calling `seal_deposit_event` with the given number of topics and event size.
-	DepositEvent { num_topic: u32, len: u32 },
-	/// Weight of calling `seal_set_storage` for the given storage item sizes.
-	SetStorage { old_bytes: u32, new_bytes: u32 },
-	/// Weight of calling `seal_clear_storage` per cleared byte.
-	ClearStorage(u32),
-	/// Weight of calling `seal_contains_storage` per byte of the checked item.
-	ContainsStorage(u32),
-	/// Weight of calling `seal_get_storage` with the specified size in storage.
-	GetStorage(u32),
-	/// Weight of calling `seal_take_storage` for the given size.
-	TakeStorage(u32),
-	/// Weight of calling `seal_set_transient_storage` for the given storage item sizes.
-	SetTransientStorage { old_bytes: u32, new_bytes: u32 },
-	/// Weight of calling `seal_clear_transient_storage` per cleared byte.
-	ClearTransientStorage(u32),
-	/// Weight of calling `seal_contains_transient_storage` per byte of the checked item.
-	ContainsTransientStorage(u32),
-	/// Weight of calling `seal_get_transient_storage` with the specified size in storage.
-	GetTransientStorage(u32),
-	/// Weight of calling `seal_take_transient_storage` for the given size.
-	TakeTransientStorage(u32),
-	/// Base weight of calling `seal_call`.
-	CallBase,
-	/// Weight of calling `seal_delegate_call` for the given input size.
-	DelegateCallBase,
-	/// Weight of calling a precompile.
-	PrecompileBase,
-	/// Weight of calling a precompile that has a contract info.
-	PrecompileWithInfoBase,
-	/// Weight of reading and decoding the input to a precompile.
-	PrecompileDecode(u32),
-	/// Weight of the transfer performed during a call.
-	/// parameter `dust_transfer` indicates whether the transfer has a `dust` value.
-	CallTransferSurcharge { dust_transfer: bool },
-	/// Weight per byte that is cloned by supplying the `CLONE_INPUT` flag.
-	CallInputCloned(u32),
-	/// Weight of calling `seal_instantiate`.
-	Instantiate { input_data_len: u32, balance_transfer: bool, dust_transfer: bool },
-	/// Weight of calling `Ripemd160` precompile for the given input size.
-	Ripemd160(u32),
-	/// Weight of calling `Sha256` precompile for the given input size.
-	HashSha256(u32),
-	/// Weight of calling `seal_hash_keccak_256` for the given input size.
-	HashKeccak256(u32),
-	/// Weight of calling the `System::hash_blake2_256` precompile function for the given input
-	/// size.
-	HashBlake256(u32),
-	/// Weight of calling `seal_hash_blake2_128` for the given input size.
-	HashBlake128(u32),
-	/// Weight of calling `ECERecover` precompile.
-	EcdsaRecovery,
-	/// Weight of calling `seal_sr25519_verify` for the given input size.
-	Sr25519Verify(u32),
-	/// Weight charged by a precompile.
-	Precompile(Weight),
-	/// Weight of calling `seal_set_code_hash`
-	SetCodeHash,
-	/// Weight of calling `ecdsa_to_eth_address`
-	EcdsaToEthAddress,
-	/// Weight of calling `get_immutable_dependency`
-	GetImmutableData(u32),
-	/// Weight of calling `set_immutable_dependency`
-	SetImmutableData(u32),
-	/// Weight of calling `Bn128Add` precompile
-	Bn128Add,
-	/// Weight of calling `Bn128Add` precompile
-	Bn128Mul,
-	/// Weight of calling `Bn128Pairing` precompile for the given number of input pairs.
-	Bn128Pairing(u32),
-	/// Weight of calling `Identity` precompile for the given number of input length.
-	Identity(u32),
-	/// Weight of calling `Blake2F` precompile for the given number of rounds.
-	Blake2F(u32),
-	/// Weight of calling `Modexp` precompile
-	Modexp(u64),
-}
-
-/// For functions that modify storage, benchmarks are performed with one item in the
-/// storage. To account for the worst-case scenario, the weight of the overhead of
-/// writing to or reading from full storage is included. For transient storage writes,
-/// the rollback weight is added to reflect the worst-case scenario for this operation.
-macro_rules! cost_storage {
-    (write_transient, $name:ident $(, $arg:expr )*) => {
-        T::WeightInfo::$name($( $arg ),*)
-            .saturating_add(T::WeightInfo::rollback_transient_storage())
-            .saturating_add(T::WeightInfo::set_transient_storage_full()
-            .saturating_sub(T::WeightInfo::set_transient_storage_empty()))
-    };
-
-    (read_transient, $name:ident $(, $arg:expr )*) => {
-        T::WeightInfo::$name($( $arg ),*)
-            .saturating_add(T::WeightInfo::get_transient_storage_full()
-            .saturating_sub(T::WeightInfo::get_transient_storage_empty()))
-    };
-
-    (write, $name:ident $(, $arg:expr )*) => {
-        T::WeightInfo::$name($( $arg ),*)
-            .saturating_add(T::WeightInfo::set_storage_full()
-            .saturating_sub(T::WeightInfo::set_storage_empty()))
-    };
-
-    (read, $name:ident $(, $arg:expr )*) => {
-        T::WeightInfo::$name($( $arg ),*)
-            .saturating_add(T::WeightInfo::get_storage_full()
-            .saturating_sub(T::WeightInfo::get_storage_empty()))
-    };
-}
-
-macro_rules! cost_args {
-	// cost_args!(name, a, b, c) -> T::WeightInfo::name(a, b, c).saturating_sub(T::WeightInfo::name(0, 0, 0))
-	($name:ident, $( $arg: expr ),+) => {
-		(T::WeightInfo::$name($( $arg ),+).saturating_sub(cost_args!(@call_zero $name, $( $arg ),+)))
-	};
-	// Transform T::WeightInfo::name(a, b, c) into T::WeightInfo::name(0, 0, 0)
-	(@call_zero $name:ident, $( $arg:expr ),*) => {
-		T::WeightInfo::$name($( cost_args!(@replace_token $arg) ),*)
-	};
-	// Replace the token with 0.
-	(@replace_token $_in:tt) => { 0 };
-}
-
-impl<T: Config> Token<T> for RuntimeCosts {
-	fn influence_lowest_gas_limit(&self) -> bool {
-		true
-	}
-
-	fn weight(&self) -> Weight {
-		use self::RuntimeCosts::*;
-		match *self {
-			HostFn => cost_args!(noop_host_fn, 1),
-			CopyToContract(len) => T::WeightInfo::seal_copy_to_contract(len),
-			CopyFromContract(len) => T::WeightInfo::seal_return(len),
-			CallDataSize => T::WeightInfo::seal_call_data_size(),
-			ReturnDataSize => T::WeightInfo::seal_return_data_size(),
-			CallDataLoad => T::WeightInfo::seal_call_data_load(),
-			CallDataCopy(len) => T::WeightInfo::seal_call_data_copy(len),
-			Caller => T::WeightInfo::seal_caller(),
-			Origin => T::WeightInfo::seal_origin(),
-			ToAccountId => T::WeightInfo::seal_to_account_id(),
-			CodeHash => T::WeightInfo::seal_code_hash(),
-			CodeSize => T::WeightInfo::seal_code_size(),
-			OwnCodeHash => T::WeightInfo::seal_own_code_hash(),
-			CallerIsOrigin => T::WeightInfo::seal_caller_is_origin(),
-			CallerIsRoot => T::WeightInfo::seal_caller_is_root(),
-			Address => T::WeightInfo::seal_address(),
-			RefTimeLeft => T::WeightInfo::seal_ref_time_left(),
-			WeightLeft => T::WeightInfo::seal_weight_left(),
-			Balance => T::WeightInfo::seal_balance(),
-			BalanceOf => T::WeightInfo::seal_balance_of(),
-			ValueTransferred => T::WeightInfo::seal_value_transferred(),
-			MinimumBalance => T::WeightInfo::seal_minimum_balance(),
-			BlockNumber => T::WeightInfo::seal_block_number(),
-			BlockHash => T::WeightInfo::seal_block_hash(),
-			BlockAuthor => T::WeightInfo::seal_block_author(),
-			GasPrice => T::WeightInfo::seal_gas_price(),
-			BaseFee => T::WeightInfo::seal_base_fee(),
-			Now => T::WeightInfo::seal_now(),
-			GasLimit => T::WeightInfo::seal_gas_limit(),
-			WeightToFee => T::WeightInfo::seal_weight_to_fee(),
-			Terminate => T::WeightInfo::seal_terminate(),
-			DepositEvent { num_topic, len } => T::WeightInfo::seal_deposit_event(num_topic, len),
-			SetStorage { new_bytes, old_bytes } => {
-				cost_storage!(write, seal_set_storage, new_bytes, old_bytes)
-			},
-			ClearStorage(len) => cost_storage!(write, seal_clear_storage, len),
-			ContainsStorage(len) => cost_storage!(read, seal_contains_storage, len),
-			GetStorage(len) => cost_storage!(read, seal_get_storage, len),
-			TakeStorage(len) => cost_storage!(write, seal_take_storage, len),
-			SetTransientStorage { new_bytes, old_bytes } => {
-				cost_storage!(write_transient, seal_set_transient_storage, new_bytes, old_bytes)
-			},
-			ClearTransientStorage(len) => {
-				cost_storage!(write_transient, seal_clear_transient_storage, len)
-			},
-			ContainsTransientStorage(len) => {
-				cost_storage!(read_transient, seal_contains_transient_storage, len)
-			},
-			GetTransientStorage(len) => {
-				cost_storage!(read_transient, seal_get_transient_storage, len)
-			},
-			TakeTransientStorage(len) => {
-				cost_storage!(write_transient, seal_take_transient_storage, len)
-			},
-			CallBase => T::WeightInfo::seal_call(0, 0, 0),
-			DelegateCallBase => T::WeightInfo::seal_delegate_call(),
-			PrecompileBase => T::WeightInfo::seal_call_precompile(0, 0),
-			PrecompileWithInfoBase => T::WeightInfo::seal_call_precompile(1, 0),
-			PrecompileDecode(len) => cost_args!(seal_call_precompile, 0, len),
-			CallTransferSurcharge { dust_transfer } =>
-				cost_args!(seal_call, 1, dust_transfer.into(), 0),
-			CallInputCloned(len) => cost_args!(seal_call, 0, 0, len),
-			Instantiate { input_data_len, balance_transfer, dust_transfer } =>
-				T::WeightInfo::seal_instantiate(
-					input_data_len,
-					balance_transfer.into(),
-					dust_transfer.into(),
-				),
-			HashSha256(len) => T::WeightInfo::sha2_256(len),
-			Ripemd160(len) => T::WeightInfo::ripemd_160(len),
-			HashKeccak256(len) => T::WeightInfo::seal_hash_keccak_256(len),
-			HashBlake256(len) => T::WeightInfo::hash_blake2_256(len),
-			HashBlake128(len) => T::WeightInfo::seal_hash_blake2_128(len),
-			EcdsaRecovery => T::WeightInfo::ecdsa_recover(),
-			Sr25519Verify(len) => T::WeightInfo::seal_sr25519_verify(len),
-			Precompile(weight) => weight,
-			SetCodeHash => T::WeightInfo::seal_set_code_hash(),
-			EcdsaToEthAddress => T::WeightInfo::seal_ecdsa_to_eth_address(),
-			GetImmutableData(len) => T::WeightInfo::seal_get_immutable_data(len),
-			SetImmutableData(len) => T::WeightInfo::seal_set_immutable_data(len),
-			Bn128Add => T::WeightInfo::bn128_add(),
-			Bn128Mul => T::WeightInfo::bn128_mul(),
-			Bn128Pairing(len) => T::WeightInfo::bn128_pairing(len),
-			Identity(len) => T::WeightInfo::identity(len),
-			Blake2F(rounds) => T::WeightInfo::blake2f(rounds),
-			Modexp(gas) => {
-				use frame_support::weights::constants::WEIGHT_REF_TIME_PER_SECOND;
-				/// Current approximation of the gas/s consumption considering
-				/// EVM execution over compiled WASM (on 4.4Ghz CPU).
-				/// Given the 2000ms Weight, from which 75% only are used for transactions,
-				/// the total EVM execution gas limit is: GAS_PER_SECOND * 2 * 0.75 ~= 60_000_000.
-				const GAS_PER_SECOND: u64 = 40_000_000;
-
-				/// Approximate ratio of the amount of Weight per Gas.
-				/// u64 works for approximations because Weight is a very small unit compared to
-				/// gas.
-				const WEIGHT_PER_GAS: u64 = WEIGHT_REF_TIME_PER_SECOND / GAS_PER_SECOND;
-				Weight::from_parts(gas.saturating_mul(WEIGHT_PER_GAS), 0)
-			},
-		}
-	}
-}
-
-/// Same as [`Runtime::charge_gas`].
-///
-/// We need this access as a macro because sometimes hiding the lifetimes behind
-/// a function won't work out.
-macro_rules! charge_gas {
-	($runtime:expr, $costs:expr) => {{
-		$runtime.ext.gas_meter_mut().charge($costs)
-	}};
-}
-
-/// The kind of call that should be performed.
-enum CallType {
-	/// Execute another instantiated contract
-	Call { value_ptr: u32 },
-	/// Execute another contract code in the context (storage, account ID, value) of the caller
-	/// contract
-	DelegateCall,
-}
-
-impl CallType {
-	fn cost(&self) -> RuntimeCosts {
-		match self {
-			CallType::Call { .. } => RuntimeCosts::CallBase,
-			CallType::DelegateCall => RuntimeCosts::DelegateCallBase,
-		}
-	}
-}
-
-/// This is only appropriate when writing out data of constant size that does not depend on user
-/// input. In this case the costs for this copy was already charged as part of the token at
-/// the beginning of the API entry point.
-fn already_charged(_: u32) -> Option<RuntimeCosts> {
-	None
-}
-
-/// Helper to extract two `u32` values from a given `u64` register.
-fn extract_hi_lo(reg: u64) -> (u32, u32) {
-	((reg >> 32) as u32, reg as u32)
-}
-
-/// Provides storage variants to support standard and Etheruem compatible semantics.
-enum StorageValue {
-	/// Indicates that the storage value should be read from a memory buffer.
-	/// - `ptr`: A pointer to the start of the data in sandbox memory.
-	/// - `len`: The length (in bytes) of the data.
-	Memory { ptr: u32, len: u32 },
-
-	/// Indicates that the storage value is provided inline as a fixed-size (256-bit) value.
-	/// This is used by set_storage_or_clear() to avoid double reads.
-	/// This variant is used to implement Ethereum SSTORE-like semantics.
-	Value(Vec<u8>),
-}
-
-/// Controls the output behavior for storage reads, both when a key is found and when it is not.
-enum StorageReadMode {
-	/// VariableOutput mode: if the key exists, the full stored value is returned
-	/// using the caller‑provided output length.
-	VariableOutput { output_len_ptr: u32 },
-	/// Ethereum commpatible(FixedOutput32) mode: always write a 32-byte value into the output
-	/// buffer. If the key is missing, write 32 bytes of zeros.
-	FixedOutput32,
-}
-
-/// Can only be used for one call.
-pub struct Runtime<'a, E: Ext, M: ?Sized> {
-	ext: &'a mut E,
-	input_data: Option<Vec<u8>>,
-	_phantom_data: PhantomData<M>,
-}
-
-impl<'a, E: Ext, M: PolkaVmInstance<E::T>> Runtime<'a, E, M> {
-	pub fn handle_interrupt(
-		&mut self,
-		interrupt: Result<polkavm::InterruptKind, polkavm::Error>,
-		module: &polkavm::Module,
-		instance: &mut M,
-	) -> Option<ExecResult> {
-		use polkavm::InterruptKind::*;
-
-		match interrupt {
-			Err(error) => {
-				// in contrast to the other returns this "should" not happen: log level error
-				log::error!(target: LOG_TARGET, "polkavm execution error: {error}");
-				Some(Err(Error::<E::T>::ExecutionFailed.into()))
-			},
-			Ok(Finished) =>
-				Some(Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: Vec::new() })),
-			Ok(Trap) => Some(Err(Error::<E::T>::ContractTrapped.into())),
-			Ok(Segfault(_)) => Some(Err(Error::<E::T>::ExecutionFailed.into())),
-			Ok(NotEnoughGas) => Some(Err(Error::<E::T>::OutOfGas.into())),
-			Ok(Step) => None,
-			Ok(Ecalli(idx)) => {
-				// This is a special hard coded syscall index which is used by benchmarks
-				// to abort contract execution. It is used to terminate the execution without
-				// breaking up a basic block. The fixed index is used so that the benchmarks
-				// don't have to deal with import tables.
-				if cfg!(feature = "runtime-benchmarks") && idx == SENTINEL {
-					return Some(Ok(ExecReturnValue {
-						flags: ReturnFlags::empty(),
-						data: Vec::new(),
-					}))
-				}
-				let Some(syscall_symbol) = module.imports().get(idx) else {
-					return Some(Err(<Error<E::T>>::InvalidSyscall.into()));
-				};
-				match self.handle_ecall(instance, syscall_symbol.as_bytes()) {
-					Ok(None) => None,
-					Ok(Some(return_value)) => {
-						instance.write_output(return_value);
-						None
-					},
-					Err(TrapReason::Return(ReturnData { flags, data })) =>
-						match ReturnFlags::from_bits(flags) {
-							None => Some(Err(Error::<E::T>::InvalidCallFlags.into())),
-							Some(flags) => Some(Ok(ExecReturnValue { flags, data })),
-						},
-					Err(TrapReason::Termination) => Some(Ok(Default::default())),
-					Err(TrapReason::SupervisorError(error)) => Some(Err(error.into())),
-				}
-			},
-		}
-	}
-}
-
-impl<'a, E: Ext, M: ?Sized + Memory<E::T>> Runtime<'a, E, M> {
-	pub fn new(ext: &'a mut E, input_data: Vec<u8>) -> Self {
-		Self { ext, input_data: Some(input_data), _phantom_data: Default::default() }
-	}
-
-	/// Get a mutable reference to the inner `Ext`.
-	pub fn ext(&mut self) -> &mut E {
-		self.ext
-	}
-
-	/// Charge the gas meter with the specified token.
-	///
-	/// Returns `Err(HostError)` if there is not enough gas.
-	fn charge_gas(&mut self, costs: RuntimeCosts) -> Result<ChargedAmount, DispatchError> {
-		charge_gas!(self, costs)
-	}
-
-	/// Adjust a previously charged amount down to its actual amount.
-	///
-	/// This is when a maximum a priori amount was charged and then should be partially
-	/// refunded to match the actual amount.
-	fn adjust_gas(&mut self, charged: ChargedAmount, actual_costs: RuntimeCosts) {
-		self.ext.gas_meter_mut().adjust_gas(charged, actual_costs);
-	}
-
-	/// Write the given buffer and its length to the designated locations in sandbox memory and
-	/// charge gas according to the token returned by `create_token`.
-	///
-	/// `out_ptr` is the location in sandbox memory where `buf` should be written to.
-	/// `out_len_ptr` is an in-out location in sandbox memory. It is read to determine the
-	/// length of the buffer located at `out_ptr`. If that buffer is smaller than the actual
-	/// `buf.len()`, only what fits into that buffer is written to `out_ptr`.
-	/// The actual amount of bytes copied to `out_ptr` is written to `out_len_ptr`.
-	///
-	/// If `out_ptr` is set to the sentinel value of `SENTINEL` and `allow_skip` is true the
-	/// operation is skipped and `Ok` is returned. This is supposed to help callers to make copying
-	/// output optional. For example to skip copying back the output buffer of an `seal_call`
-	/// when the caller is not interested in the result.
-	///
-	/// `create_token` can optionally instruct this function to charge the gas meter with the token
-	/// it returns. `create_token` receives the variable amount of bytes that are about to be copied
-	/// by this function.
-	///
-	/// In addition to the error conditions of `Memory::write` this functions returns
-	/// `Err` if the size of the buffer located at `out_ptr` is too small to fit `buf`.
-	pub fn write_sandbox_output(
-		&mut self,
-		memory: &mut M,
-		out_ptr: u32,
-		out_len_ptr: u32,
-		buf: &[u8],
-		allow_skip: bool,
-		create_token: impl FnOnce(u32) -> Option<RuntimeCosts>,
-	) -> Result<(), DispatchError> {
-		if allow_skip && out_ptr == SENTINEL {
-			return Ok(());
-		}
-
-		let len = memory.read_u32(out_len_ptr)?;
-		let buf_len = len.min(buf.len() as u32);
-
-		if let Some(costs) = create_token(buf_len) {
-			self.charge_gas(costs)?;
-		}
-
-		memory.write(out_ptr, &buf[..buf_len as usize])?;
-		memory.write(out_len_ptr, &buf_len.encode())
-	}
-
-	/// Same as `write_sandbox_output` but for static size output.
-	pub fn write_fixed_sandbox_output(
-		&mut self,
-		memory: &mut M,
-		out_ptr: u32,
-		buf: &[u8],
-		allow_skip: bool,
-		create_token: impl FnOnce(u32) -> Option<RuntimeCosts>,
-	) -> Result<(), DispatchError> {
-		if buf.is_empty() || (allow_skip && out_ptr == SENTINEL) {
-			return Ok(());
-		}
-
-		let buf_len = buf.len() as u32;
-		if let Some(costs) = create_token(buf_len) {
-			self.charge_gas(costs)?;
-		}
-
-		memory.write(out_ptr, buf)
-	}
-
-	/// Computes the given hash function on the supplied input.
-	///
-	/// Reads from the sandboxed input buffer into an intermediate buffer.
-	/// Returns the result directly to the output buffer of the sandboxed memory.
-	///
-	/// It is the callers responsibility to provide an output buffer that
-	/// is large enough to hold the expected amount of bytes returned by the
-	/// chosen hash function.
-	///
-	/// # Note
-	///
-	/// The `input` and `output` buffers may overlap.
-	fn compute_hash_on_intermediate_buffer<F, R>(
-		&self,
-		memory: &mut M,
-		hash_fn: F,
-		input_ptr: u32,
-		input_len: u32,
-		output_ptr: u32,
-	) -> Result<(), DispatchError>
-	where
-		F: FnOnce(&[u8]) -> R,
-		R: AsRef<[u8]>,
-	{
-		// Copy input into supervisor memory.
-		let input = memory.read(input_ptr, input_len)?;
-		// Compute the hash on the input buffer using the given hash function.
-		let hash = hash_fn(&input);
-		// Write the resulting hash back into the sandboxed output buffer.
-		memory.write(output_ptr, hash.as_ref())?;
-		Ok(())
-	}
-
-	/// Fallible conversion of a `ExecError` to `ReturnErrorCode`.
-	///
-	/// This is used when converting the error returned from a subcall in order to decide
-	/// whether to trap the caller or allow handling of the error.
-	fn exec_error_into_return_code(from: ExecError) -> Result<ReturnErrorCode, DispatchError> {
-		use crate::exec::ErrorOrigin::Callee;
-		use ReturnErrorCode::*;
-
-		let transfer_failed = Error::<E::T>::TransferFailed.into();
-		let out_of_gas = Error::<E::T>::OutOfGas.into();
-		let out_of_deposit = Error::<E::T>::StorageDepositLimitExhausted.into();
-		let duplicate_contract = Error::<E::T>::DuplicateContract.into();
-		let unsupported_precompile = Error::<E::T>::UnsupportedPrecompileAddress.into();
-
-		// errors in the callee do not trap the caller
-		match (from.error, from.origin) {
-			(err, _) if err == transfer_failed => Ok(TransferFailed),
-			(err, _) if err == duplicate_contract => Ok(DuplicateContractAddress),
-			(err, _) if err == unsupported_precompile => Err(err),
-			(err, Callee) if err == out_of_gas || err == out_of_deposit => Ok(OutOfResources),
-			(_, Callee) => Ok(CalleeTrapped),
-			(err, _) => Err(err),
-		}
-	}
-
-	fn decode_key(&self, memory: &M, key_ptr: u32, key_len: u32) -> Result<Key, TrapReason> {
-		let res = match key_len {
-			SENTINEL => {
-				let mut buffer = [0u8; 32];
-				memory.read_into_buf(key_ptr, buffer.as_mut())?;
-				Ok(Key::from_fixed(buffer))
-			},
-			len => {
-				ensure!(len <= limits::STORAGE_KEY_BYTES, Error::<E::T>::DecodingFailed);
-				let key = memory.read(key_ptr, len)?;
-				Key::try_from_var(key)
-			},
-		};
-
-		res.map_err(|_| Error::<E::T>::DecodingFailed.into())
-	}
-
-	fn is_transient(flags: u32) -> Result<bool, TrapReason> {
-		StorageFlags::from_bits(flags)
-			.ok_or_else(|| <Error<E::T>>::InvalidStorageFlags.into())
-			.map(|flags| flags.contains(StorageFlags::TRANSIENT))
-	}
-
-	fn set_storage(
-		&mut self,
-		memory: &M,
-		flags: u32,
-		key_ptr: u32,
-		key_len: u32,
-		value: StorageValue,
-	) -> Result<u32, TrapReason> {
-		let transient = Self::is_transient(flags)?;
-		let costs = |new_bytes: u32, old_bytes: u32| {
-			if transient {
-				RuntimeCosts::SetTransientStorage { new_bytes, old_bytes }
-			} else {
-				RuntimeCosts::SetStorage { new_bytes, old_bytes }
-			}
-		};
-
-		let value_len = match &value {
-			StorageValue::Memory { ptr: _, len } => *len,
-			StorageValue::Value(data) => data.len() as u32,
-		};
-
-		let max_size = self.ext.max_value_size();
-		let charged = self.charge_gas(costs(value_len, self.ext.max_value_size()))?;
-		if value_len > max_size {
-			return Err(Error::<E::T>::ValueTooLarge.into());
-		}
-
-		let key = self.decode_key(memory, key_ptr, key_len)?;
-
-		let value = match value {
-			StorageValue::Memory { ptr, len } => Some(memory.read(ptr, len)?),
-			StorageValue::Value(data) => Some(data),
-		};
-
-		let write_outcome = if transient {
-			self.ext.set_transient_storage(&key, value, false)?
-		} else {
-			self.ext.set_storage(&key, value, false)?
-		};
-
-		self.adjust_gas(charged, costs(value_len, write_outcome.old_len()));
-		Ok(write_outcome.old_len_with_sentinel())
-	}
-
-	fn clear_storage(
-		&mut self,
-		memory: &M,
-		flags: u32,
-		key_ptr: u32,
-		key_len: u32,
-	) -> Result<u32, TrapReason> {
-		let transient = Self::is_transient(flags)?;
-		let costs = |len| {
-			if transient {
-				RuntimeCosts::ClearTransientStorage(len)
-			} else {
-				RuntimeCosts::ClearStorage(len)
-			}
-		};
-		let charged = self.charge_gas(costs(self.ext.max_value_size()))?;
-		let key = self.decode_key(memory, key_ptr, key_len)?;
-		let outcome = if transient {
-			self.ext.set_transient_storage(&key, None, false)?
-		} else {
-			self.ext.set_storage(&key, None, false)?
-		};
-		self.adjust_gas(charged, costs(outcome.old_len()));
-		Ok(outcome.old_len_with_sentinel())
-	}
-
-	fn get_storage(
-		&mut self,
-		memory: &mut M,
-		flags: u32,
-		key_ptr: u32,
-		key_len: u32,
-		out_ptr: u32,
-		read_mode: StorageReadMode,
-	) -> Result<ReturnErrorCode, TrapReason> {
-		let transient = Self::is_transient(flags)?;
-		let costs = |len| {
-			if transient {
-				RuntimeCosts::GetTransientStorage(len)
-			} else {
-				RuntimeCosts::GetStorage(len)
-			}
-		};
-		let charged = self.charge_gas(costs(self.ext.max_value_size()))?;
-		let key = self.decode_key(memory, key_ptr, key_len)?;
-		let outcome = if transient {
-			self.ext.get_transient_storage(&key)
-		} else {
-			self.ext.get_storage(&key)
-		};
-
-		if let Some(value) = outcome {
-			self.adjust_gas(charged, costs(value.len() as u32));
-
-			match read_mode {
-				StorageReadMode::FixedOutput32 => {
-					let mut fixed_output = [0u8; 32];
-					let len = value.len().min(fixed_output.len());
-					fixed_output[..len].copy_from_slice(&value[..len]);
-
-					self.write_fixed_sandbox_output(
-						memory,
-						out_ptr,
-						&fixed_output,
-						false,
-						already_charged,
-					)?;
-					Ok(ReturnErrorCode::Success)
-				},
-				StorageReadMode::VariableOutput { output_len_ptr: out_len_ptr } => {
-					self.write_sandbox_output(
-						memory,
-						out_ptr,
-						out_len_ptr,
-						&value,
-						false,
-						already_charged,
-					)?;
-					Ok(ReturnErrorCode::Success)
-				},
-			}
-		} else {
-			self.adjust_gas(charged, costs(0));
-
-			match read_mode {
-				StorageReadMode::FixedOutput32 => {
-					self.write_fixed_sandbox_output(
-						memory,
-						out_ptr,
-						&[0u8; 32],
-						false,
-						already_charged,
-					)?;
-					Ok(ReturnErrorCode::Success)
-				},
-				StorageReadMode::VariableOutput { .. } => Ok(ReturnErrorCode::KeyNotFound),
-			}
-		}
-	}
-
-	fn contains_storage(
-		&mut self,
-		memory: &M,
-		flags: u32,
-		key_ptr: u32,
-		key_len: u32,
-	) -> Result<u32, TrapReason> {
-		let transient = Self::is_transient(flags)?;
-		let costs = |len| {
-			if transient {
-				RuntimeCosts::ContainsTransientStorage(len)
-			} else {
-				RuntimeCosts::ContainsStorage(len)
-			}
-		};
-		let charged = self.charge_gas(costs(self.ext.max_value_size()))?;
-		let key = self.decode_key(memory, key_ptr, key_len)?;
-		let outcome = if transient {
-			self.ext.get_transient_storage_size(&key)
-		} else {
-			self.ext.get_storage_size(&key)
-		};
-		self.adjust_gas(charged, costs(outcome.unwrap_or(0)));
-		Ok(outcome.unwrap_or(SENTINEL))
-	}
-
-	fn take_storage(
-		&mut self,
-		memory: &mut M,
-		flags: u32,
-		key_ptr: u32,
-		key_len: u32,
-		out_ptr: u32,
-		out_len_ptr: u32,
-	) -> Result<ReturnErrorCode, TrapReason> {
-		let transient = Self::is_transient(flags)?;
-		let costs = |len| {
-			if transient {
-				RuntimeCosts::TakeTransientStorage(len)
-			} else {
-				RuntimeCosts::TakeStorage(len)
-			}
-		};
-		let charged = self.charge_gas(costs(self.ext.max_value_size()))?;
-		let key = self.decode_key(memory, key_ptr, key_len)?;
-		let outcome = if transient {
-			self.ext.set_transient_storage(&key, None, true)?
-		} else {
-			self.ext.set_storage(&key, None, true)?
-		};
-
-		if let crate::storage::WriteOutcome::Taken(value) = outcome {
-			self.adjust_gas(charged, costs(value.len() as u32));
-			self.write_sandbox_output(
-				memory,
-				out_ptr,
-				out_len_ptr,
-				&value,
-				false,
-				already_charged,
-			)?;
-			Ok(ReturnErrorCode::Success)
-		} else {
-			self.adjust_gas(charged, costs(0));
-			Ok(ReturnErrorCode::KeyNotFound)
-		}
-	}
-
-	fn call(
-		&mut self,
-		memory: &mut M,
-		flags: CallFlags,
-		call_type: CallType,
-		callee_ptr: u32,
-		deposit_ptr: u32,
-		weight: Weight,
-		input_data_ptr: u32,
-		input_data_len: u32,
-		output_ptr: u32,
-		output_len_ptr: u32,
-	) -> Result<ReturnErrorCode, TrapReason> {
-		let callee = memory.read_h160(callee_ptr)?;
-		let precompile = <AllPrecompiles<E::T>>::get::<E>(&callee.as_fixed_bytes());
-		match &precompile {
-			Some(precompile) if precompile.has_contract_info() =>
-				self.charge_gas(RuntimeCosts::PrecompileWithInfoBase)?,
-			Some(_) => self.charge_gas(RuntimeCosts::PrecompileBase)?,
-			None => self.charge_gas(call_type.cost())?,
-		};
-
-		let deposit_limit = memory.read_u256(deposit_ptr)?;
-
-		// we do check this in exec.rs but we want to error out early
-		if input_data_len > limits::CALLDATA_BYTES {
-			Err(<Error<E::T>>::CallDataTooLarge)?;
-		}
-
-		let input_data = if flags.contains(CallFlags::CLONE_INPUT) {
-			let input = self.input_data.as_ref().ok_or(Error::<E::T>::InputForwarded)?;
-			charge_gas!(self, RuntimeCosts::CallInputCloned(input.len() as u32))?;
-			input.clone()
-		} else if flags.contains(CallFlags::FORWARD_INPUT) {
-			self.input_data.take().ok_or(Error::<E::T>::InputForwarded)?
-		} else {
-			if precompile.is_some() {
-				self.charge_gas(RuntimeCosts::PrecompileDecode(input_data_len))?;
-			} else {
-				self.charge_gas(RuntimeCosts::CopyFromContract(input_data_len))?;
-			}
-			memory.read(input_data_ptr, input_data_len)?
-		};
-
-		memory.reset_interpreter_cache();
-
-		let call_outcome = match call_type {
-			CallType::Call { value_ptr } => {
-				let read_only = flags.contains(CallFlags::READ_ONLY);
-				let value = memory.read_u256(value_ptr)?;
-				if value > 0u32.into() {
-					// If the call value is non-zero and state change is not allowed, issue an
-					// error.
-					if read_only || self.ext.is_read_only() {
-						return Err(Error::<E::T>::StateChangeDenied.into());
-					}
-
-					self.charge_gas(RuntimeCosts::CallTransferSurcharge {
-						dust_transfer: Pallet::<E::T>::has_dust(value),
-					})?;
-				}
-				self.ext.call(
-					weight,
-					deposit_limit,
-					&callee,
-					value,
-					input_data,
-					flags.contains(CallFlags::ALLOW_REENTRY),
-					read_only,
-				)
-			},
-			CallType::DelegateCall => {
-				if flags.intersects(CallFlags::ALLOW_REENTRY | CallFlags::READ_ONLY) {
-					return Err(Error::<E::T>::InvalidCallFlags.into());
-				}
-				self.ext.delegate_call(weight, deposit_limit, callee, input_data)
-			},
-		};
-
-		match call_outcome {
-			// `TAIL_CALL` only matters on an `OK` result. Otherwise the call stack comes to
-			// a halt anyways without anymore code being executed.
-			Ok(_) if flags.contains(CallFlags::TAIL_CALL) => {
-				let output = mem::take(self.ext.last_frame_output_mut());
-				return Err(TrapReason::Return(ReturnData {
-					flags: output.flags.bits(),
-					data: output.data,
-				}));
-			},
-			Ok(_) => {
-				let output = mem::take(self.ext.last_frame_output_mut());
-				let write_result = self.write_sandbox_output(
-					memory,
-					output_ptr,
-					output_len_ptr,
-					&output.data,
-					true,
-					|len| Some(RuntimeCosts::CopyToContract(len)),
-				);
-				*self.ext.last_frame_output_mut() = output;
-				write_result?;
-				Ok(self.ext.last_frame_output().into())
-			},
-			Err(err) => {
-				let error_code = Self::exec_error_into_return_code(err)?;
-				memory.write(output_len_ptr, &0u32.to_le_bytes())?;
-				Ok(error_code)
-			},
-		}
-	}
-
-	fn instantiate(
-		&mut self,
-		memory: &mut M,
-		code_hash_ptr: u32,
-		weight: Weight,
-		deposit_ptr: u32,
-		value_ptr: u32,
-		input_data_ptr: u32,
-		input_data_len: u32,
-		address_ptr: u32,
-		output_ptr: u32,
-		output_len_ptr: u32,
-		salt_ptr: u32,
-	) -> Result<ReturnErrorCode, TrapReason> {
-		let value = match memory.read_u256(value_ptr) {
-			Ok(value) => {
-				self.charge_gas(RuntimeCosts::Instantiate {
-					input_data_len,
-					balance_transfer: Pallet::<E::T>::has_balance(value),
-					dust_transfer: Pallet::<E::T>::has_dust(value),
-				})?;
-				value
-			},
-			Err(err) => {
-				self.charge_gas(RuntimeCosts::Instantiate {
-					input_data_len: 0,
-					balance_transfer: false,
-					dust_transfer: false,
-				})?;
-				return Err(err.into());
-			},
-		};
-		let deposit_limit: U256 = memory.read_u256(deposit_ptr)?;
-		let code_hash = memory.read_h256(code_hash_ptr)?;
-		if input_data_len > limits::CALLDATA_BYTES {
-			Err(<Error<E::T>>::CallDataTooLarge)?;
-		}
-		let input_data = memory.read(input_data_ptr, input_data_len)?;
-		let salt = if salt_ptr == SENTINEL {
-			None
-		} else {
-			let salt: [u8; 32] = memory.read_array(salt_ptr)?;
-			Some(salt)
-		};
-
-		memory.reset_interpreter_cache();
-
-		match self.ext.instantiate(
-			weight,
-			deposit_limit,
-			code_hash,
-			value,
-			input_data,
-			salt.as_ref(),
-		) {
-			Ok(address) => {
-				if !self.ext.last_frame_output().flags.contains(ReturnFlags::REVERT) {
-					self.write_fixed_sandbox_output(
-						memory,
-						address_ptr,
-						&address.as_bytes(),
-						true,
-						already_charged,
-					)?;
-				}
-				let output = mem::take(self.ext.last_frame_output_mut());
-				let write_result = self.write_sandbox_output(
-					memory,
-					output_ptr,
-					output_len_ptr,
-					&output.data,
-					true,
-					|len| Some(RuntimeCosts::CopyToContract(len)),
-				);
-				*self.ext.last_frame_output_mut() = output;
-				write_result?;
-				Ok(self.ext.last_frame_output().into())
-			},
-			Err(err) => Ok(Self::exec_error_into_return_code(err)?),
-		}
-	}
-}
-
-// This is the API exposed to contracts.
-//
-// # Note
-//
-// Any input that leads to a out of bound error (reading or writing) or failing to decode
-// data passed to the supervisor will lead to a trap. This is not documented explicitly
-// for every function.
-#[define_env]
-pub mod env {
-	/// Noop function used to benchmark the time it takes to execute an empty function.
-	///
-	/// Marked as stable because it needs to be called from benchmarks even when the benchmarked
-	/// parachain has unstable functions disabled.
-	#[cfg(feature = "runtime-benchmarks")]
-	#[stable]
-	fn noop(&mut self, memory: &mut M) -> Result<(), TrapReason> {
-		Ok(())
-	}
-
-	/// Set the value at the given key in the contract storage.
-	/// See [`pallet_revive_uapi::HostFn::set_storage_v2`]
-	#[stable]
-	#[mutating]
-	fn set_storage(
-		&mut self,
-		memory: &mut M,
-		flags: u32,
-		key_ptr: u32,
-		key_len: u32,
-		value_ptr: u32,
-		value_len: u32,
-	) -> Result<u32, TrapReason> {
-		self.set_storage(
-			memory,
-			flags,
-			key_ptr,
-			key_len,
-			StorageValue::Memory { ptr: value_ptr, len: value_len },
-		)
-	}
-
-	/// Sets the storage at a fixed 256-bit key with a fixed 256-bit value.
-	/// See [`pallet_revive_uapi::HostFn::set_storage_or_clear`].
-	#[stable]
-	#[mutating]
-	fn set_storage_or_clear(
-		&mut self,
-		memory: &mut M,
-		flags: u32,
-		key_ptr: u32,
-		value_ptr: u32,
-	) -> Result<u32, TrapReason> {
-		let value = memory.read(value_ptr, 32)?;
-
-		if value.iter().all(|&b| b == 0) {
-			self.clear_storage(memory, flags, key_ptr, SENTINEL)
-		} else {
-			self.set_storage(memory, flags, key_ptr, SENTINEL, StorageValue::Value(value))
-		}
-	}
-
-	/// Retrieve the value under the given key from storage.
-	/// See [`pallet_revive_uapi::HostFn::get_storage`]
-	#[stable]
-	fn get_storage(
-		&mut self,
-		memory: &mut M,
-		flags: u32,
-		key_ptr: u32,
-		key_len: u32,
-		out_ptr: u32,
-		out_len_ptr: u32,
-	) -> Result<ReturnErrorCode, TrapReason> {
-		self.get_storage(
-			memory,
-			flags,
-			key_ptr,
-			key_len,
-			out_ptr,
-			StorageReadMode::VariableOutput { output_len_ptr: out_len_ptr },
-		)
-	}
-
-	/// Reads the storage at a fixed 256-bit key and writes back a fixed 256-bit value.
-	/// See [`pallet_revive_uapi::HostFn::get_storage_or_zero`].
-	#[stable]
-	fn get_storage_or_zero(
-		&mut self,
-		memory: &mut M,
-		flags: u32,
-		key_ptr: u32,
-		out_ptr: u32,
-	) -> Result<(), TrapReason> {
-		let _ = self.get_storage(
-			memory,
-			flags,
-			key_ptr,
-			SENTINEL,
-			out_ptr,
-			StorageReadMode::FixedOutput32,
-		)?;
-
-		Ok(())
-	}
-
-	/// Make a call to another contract.
-	/// See [`pallet_revive_uapi::HostFn::call`].
-	#[stable]
-	fn call(
-		&mut self,
-		memory: &mut M,
-		flags_and_callee: u64,
-		ref_time_limit: u64,
-		proof_size_limit: u64,
-		deposit_and_value: u64,
-		input_data: u64,
-		output_data: u64,
-	) -> Result<ReturnErrorCode, TrapReason> {
-		let (flags, callee_ptr) = extract_hi_lo(flags_and_callee);
-		let (deposit_ptr, value_ptr) = extract_hi_lo(deposit_and_value);
-		let (input_data_len, input_data_ptr) = extract_hi_lo(input_data);
-		let (output_len_ptr, output_ptr) = extract_hi_lo(output_data);
-
-		self.call(
-			memory,
-			CallFlags::from_bits(flags).ok_or(Error::<E::T>::InvalidCallFlags)?,
-			CallType::Call { value_ptr },
-			callee_ptr,
-			deposit_ptr,
-			Weight::from_parts(ref_time_limit, proof_size_limit),
-			input_data_ptr,
-			input_data_len,
-			output_ptr,
-			output_len_ptr,
-		)
-	}
-
-	/// Execute code in the context (storage, caller, value) of the current contract.
-	/// See [`pallet_revive_uapi::HostFn::delegate_call`].
-	#[stable]
-	fn delegate_call(
-		&mut self,
-		memory: &mut M,
-		flags_and_callee: u64,
-		ref_time_limit: u64,
-		proof_size_limit: u64,
-		deposit_ptr: u32,
-		input_data: u64,
-		output_data: u64,
-	) -> Result<ReturnErrorCode, TrapReason> {
-		let (flags, address_ptr) = extract_hi_lo(flags_and_callee);
-		let (input_data_len, input_data_ptr) = extract_hi_lo(input_data);
-		let (output_len_ptr, output_ptr) = extract_hi_lo(output_data);
-
-		self.call(
-			memory,
-			CallFlags::from_bits(flags).ok_or(Error::<E::T>::InvalidCallFlags)?,
-			CallType::DelegateCall,
-			address_ptr,
-			deposit_ptr,
-			Weight::from_parts(ref_time_limit, proof_size_limit),
-			input_data_ptr,
-			input_data_len,
-			output_ptr,
-			output_len_ptr,
-		)
-	}
-
-	/// Instantiate a contract with the specified code hash.
-	/// See [`pallet_revive_uapi::HostFn::instantiate`].
-	#[stable]
-	#[mutating]
-	fn instantiate(
-		&mut self,
-		memory: &mut M,
-		ref_time_limit: u64,
-		proof_size_limit: u64,
-		deposit_and_value: u64,
-		input_data: u64,
-		output_data: u64,
-		address_and_salt: u64,
-	) -> Result<ReturnErrorCode, TrapReason> {
-		let (deposit_ptr, value_ptr) = extract_hi_lo(deposit_and_value);
-		let (input_data_len, code_hash_ptr) = extract_hi_lo(input_data);
-		let (output_len_ptr, output_ptr) = extract_hi_lo(output_data);
-		let (address_ptr, salt_ptr) = extract_hi_lo(address_and_salt);
-		let Some(input_data_ptr) = code_hash_ptr.checked_add(32) else {
-			return Err(Error::<E::T>::OutOfBounds.into());
-		};
-		let Some(input_data_len) = input_data_len.checked_sub(32) else {
-			return Err(Error::<E::T>::OutOfBounds.into());
-		};
-
-		self.instantiate(
-			memory,
-			code_hash_ptr,
-			Weight::from_parts(ref_time_limit, proof_size_limit),
-			deposit_ptr,
-			value_ptr,
-			input_data_ptr,
-			input_data_len,
-			address_ptr,
-			output_ptr,
-			output_len_ptr,
-			salt_ptr,
-		)
-	}
-
-	/// Returns the total size of the contract call input data.
-	/// See [`pallet_revive_uapi::HostFn::call_data_size `].
-	#[stable]
-	fn call_data_size(&mut self, memory: &mut M) -> Result<u64, TrapReason> {
-		self.charge_gas(RuntimeCosts::CallDataSize)?;
-		Ok(self
-			.input_data
-			.as_ref()
-			.map(|input| input.len().try_into().expect("usize fits into u64; qed"))
-			.unwrap_or_default())
-	}
-
-	/// Stores the input passed by the caller into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::call_data_copy`].
-	#[stable]
-	fn call_data_copy(
-		&mut self,
-		memory: &mut M,
-		out_ptr: u32,
-		out_len: u32,
-		offset: u32,
-	) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::CallDataCopy(out_len))?;
-
-		let Some(input) = self.input_data.as_ref() else {
-			return Err(Error::<E::T>::InputForwarded.into());
-		};
-
-		let start = offset as usize;
-		if start >= input.len() {
-			memory.zero(out_ptr, out_len)?;
-			return Ok(());
-		}
-
-		let end = start.saturating_add(out_len as usize).min(input.len());
-		memory.write(out_ptr, &input[start..end])?;
-
-		let bytes_written = (end - start) as u32;
-		memory.zero(out_ptr.saturating_add(bytes_written), out_len - bytes_written)?;
-
-		Ok(())
-	}
-
-	/// Stores the U256 value at given call input `offset` into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::call_data_load`].
-	#[stable]
-	fn call_data_load(
-		&mut self,
-		memory: &mut M,
-		out_ptr: u32,
-		offset: u32,
-	) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::CallDataLoad)?;
-
-		let Some(input) = self.input_data.as_ref() else {
-			return Err(Error::<E::T>::InputForwarded.into());
-		};
-
-		let mut data = [0; 32];
-		let start = offset as usize;
-		let data = if start >= input.len() {
-			data // Any index is valid to request; OOB offsets return zero.
-		} else {
-			let end = start.saturating_add(32).min(input.len());
-			data[..end - start].copy_from_slice(&input[start..end]);
-			data.reverse();
-			data // Solidity expects right-padded data
-		};
-
-		self.write_fixed_sandbox_output(memory, out_ptr, &data, false, already_charged)?;
-
-		Ok(())
-	}
-
-	/// Cease contract execution and save a data buffer as a result of the execution.
-	/// See [`pallet_revive_uapi::HostFn::return_value`].
-	#[stable]
-	fn seal_return(
-		&mut self,
-		memory: &mut M,
-		flags: u32,
-		data_ptr: u32,
-		data_len: u32,
-	) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::CopyFromContract(data_len))?;
-		if data_len > limits::CALLDATA_BYTES {
-			Err(<Error<E::T>>::ReturnDataTooLarge)?;
-		}
-		Err(TrapReason::Return(ReturnData { flags, data: memory.read(data_ptr, data_len)? }))
-	}
-
-	/// Stores the address of the caller into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::caller`].
-	#[stable]
-	fn caller(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::Caller)?;
-		let caller = <E::T as Config>::AddressMapper::to_address(self.ext.caller().account_id()?);
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			caller.as_bytes(),
-			false,
-			already_charged,
-		)?)
-	}
-
-	/// Stores the address of the call stack origin into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::origin`].
-	#[stable]
-	fn origin(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::Origin)?;
-		let origin = <E::T as Config>::AddressMapper::to_address(self.ext.origin().account_id()?);
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			origin.as_bytes(),
-			false,
-			already_charged,
-		)?)
-	}
-
-	/// Retrieve the code hash for a specified contract address.
-	/// See [`pallet_revive_uapi::HostFn::code_hash`].
-	#[stable]
-	fn code_hash(&mut self, memory: &mut M, addr_ptr: u32, out_ptr: u32) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::CodeHash)?;
-		let address = memory.read_h160(addr_ptr)?;
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			&self.ext.code_hash(&address).as_bytes(),
-			false,
-			already_charged,
-		)?)
-	}
-
-	/// Retrieve the code size for a given contract address.
-	/// See [`pallet_revive_uapi::HostFn::code_size`].
-	#[stable]
-	fn code_size(&mut self, memory: &mut M, addr_ptr: u32) -> Result<u64, TrapReason> {
-		self.charge_gas(RuntimeCosts::CodeSize)?;
-		let address = memory.read_h160(addr_ptr)?;
-		Ok(self.ext.code_size(&address))
-	}
-
-	/// Stores the address of the current contract into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::address`].
-	#[stable]
-	fn address(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::Address)?;
-		let address = self.ext.address();
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			address.as_bytes(),
-			false,
-			already_charged,
-		)?)
-	}
-
-	/// Stores the price for the specified amount of weight into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::weight_to_fee`].
-	#[stable]
-	fn weight_to_fee(
-		&mut self,
-		memory: &mut M,
-		ref_time_limit: u64,
-		proof_size_limit: u64,
-		out_ptr: u32,
-	) -> Result<(), TrapReason> {
-		let weight = Weight::from_parts(ref_time_limit, proof_size_limit);
-		self.charge_gas(RuntimeCosts::WeightToFee)?;
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			&self.ext.get_weight_price(weight).encode(),
-			false,
-			already_charged,
-		)?)
-	}
-
-	/// Stores the immutable data into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::get_immutable_data`].
-	#[stable]
-	fn get_immutable_data(
-		&mut self,
-		memory: &mut M,
-		out_ptr: u32,
-		out_len_ptr: u32,
-	) -> Result<(), TrapReason> {
-		// quering the length is free as it is stored with the contract metadata
-		let len = self.ext.immutable_data_len();
-		self.charge_gas(RuntimeCosts::GetImmutableData(len))?;
-		let data = self.ext.get_immutable_data()?;
-		self.write_sandbox_output(memory, out_ptr, out_len_ptr, &data, false, already_charged)?;
-		Ok(())
-	}
-
-	/// Attaches the supplied immutable data to the currently executing contract.
-	/// See [`pallet_revive_uapi::HostFn::set_immutable_data`].
-	#[stable]
-	fn set_immutable_data(&mut self, memory: &mut M, ptr: u32, len: u32) -> Result<(), TrapReason> {
-		if len > limits::IMMUTABLE_BYTES {
-			return Err(Error::<E::T>::OutOfBounds.into());
-		}
-		self.charge_gas(RuntimeCosts::SetImmutableData(len))?;
-		let buf = memory.read(ptr, len)?;
-		let data = buf.try_into().expect("bailed out earlier; qed");
-		self.ext.set_immutable_data(data)?;
-		Ok(())
-	}
-
-	/// Stores the *free* balance of the current account into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::balance`].
-	#[stable]
-	fn balance(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::Balance)?;
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			&self.ext.balance().to_little_endian(),
-			false,
-			already_charged,
-		)?)
-	}
-
-	/// Stores the *free* balance of the supplied address into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::balance`].
-	#[stable]
-	fn balance_of(
-		&mut self,
-		memory: &mut M,
-		addr_ptr: u32,
-		out_ptr: u32,
-	) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::BalanceOf)?;
-		let address = memory.read_h160(addr_ptr)?;
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			&self.ext.balance_of(&address).to_little_endian(),
-			false,
-			already_charged,
-		)?)
-	}
-
-	/// Returns the chain ID.
-	/// See [`pallet_revive_uapi::HostFn::chain_id`].
-	#[stable]
-	fn chain_id(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			&U256::from(<E::T as Config>::ChainId::get()).to_little_endian(),
-			false,
-			|_| Some(RuntimeCosts::CopyToContract(32)),
-		)?)
-	}
-
-	/// Returns the block ref_time limit.
-	/// See [`pallet_revive_uapi::HostFn::gas_limit`].
-	#[stable]
-	fn gas_limit(&mut self, memory: &mut M) -> Result<u64, TrapReason> {
-		self.charge_gas(RuntimeCosts::GasLimit)?;
-		Ok(<E::T as frame_system::Config>::BlockWeights::get().max_block.ref_time())
-	}
-
-	/// Stores the value transferred along with this call/instantiate into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::value_transferred`].
-	#[stable]
-	fn value_transferred(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::ValueTransferred)?;
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			&self.ext.value_transferred().to_little_endian(),
-			false,
-			already_charged,
-		)?)
-	}
-
-	/// Returns the simulated ethereum `GASPRICE` value.
-	/// See [`pallet_revive_uapi::HostFn::gas_price`].
-	#[stable]
-	fn gas_price(&mut self, memory: &mut M) -> Result<u64, TrapReason> {
-		self.charge_gas(RuntimeCosts::GasPrice)?;
-		Ok(GAS_PRICE.into())
-	}
-
-	/// Returns the simulated ethereum `BASEFEE` value.
-	/// See [`pallet_revive_uapi::HostFn::base_fee`].
-	#[stable]
-	fn base_fee(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::BaseFee)?;
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			&U256::zero().to_little_endian(),
-			false,
-			already_charged,
-		)?)
-	}
-
-	/// Load the latest block timestamp into the supplied buffer
-	/// See [`pallet_revive_uapi::HostFn::now`].
-	#[stable]
-	fn now(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::Now)?;
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			&self.ext.now().to_little_endian(),
-			false,
-			already_charged,
-		)?)
-	}
-
-	/// Deposit a contract event with the data buffer and optional list of topics.
-	/// See [pallet_revive_uapi::HostFn::deposit_event]
-	#[stable]
-	#[mutating]
-	fn deposit_event(
-		&mut self,
-		memory: &mut M,
-		topics_ptr: u32,
-		num_topic: u32,
-		data_ptr: u32,
-		data_len: u32,
-	) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::DepositEvent { num_topic, len: data_len })?;
-
-		if num_topic > limits::NUM_EVENT_TOPICS {
-			return Err(Error::<E::T>::TooManyTopics.into());
-		}
-
-		if data_len > self.ext.max_value_size() {
-			return Err(Error::<E::T>::ValueTooLarge.into());
-		}
-
-		let topics: Vec<H256> = match num_topic {
-			0 => Vec::new(),
-			_ => {
-				let mut v = Vec::with_capacity(num_topic as usize);
-				let topics_len = num_topic * H256::len_bytes() as u32;
-				let buf = memory.read(topics_ptr, topics_len)?;
-				for chunk in buf.chunks_exact(H256::len_bytes()) {
-					v.push(H256::from_slice(chunk));
-				}
-				v
-			},
-		};
-
-		let event_data = memory.read(data_ptr, data_len)?;
-		self.ext.deposit_event(topics, event_data);
-		Ok(())
-	}
-
-	/// Stores the current block number of the current contract into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::block_number`].
-	#[stable]
-	fn block_number(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::BlockNumber)?;
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			&self.ext.block_number().to_little_endian(),
-			false,
-			already_charged,
-		)?)
-	}
-
-	/// Stores the block hash at given block height into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::block_hash`].
-	#[stable]
-	fn block_hash(
-		&mut self,
-		memory: &mut M,
-		block_number_ptr: u32,
-		out_ptr: u32,
-	) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::BlockHash)?;
-		let block_number = memory.read_u256(block_number_ptr)?;
-		let block_hash = self.ext.block_hash(block_number).unwrap_or(H256::zero());
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			&block_hash.as_bytes(),
-			false,
-			already_charged,
-		)?)
-	}
-
-	/// Stores the current block author into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::block_author`].
-	#[stable]
-	fn block_author(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::BlockAuthor)?;
-		let block_author = self.ext.block_author().unwrap_or(H160::zero());
-
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			&block_author.as_bytes(),
-			false,
-			already_charged,
-		)?)
-	}
-
-	/// Computes the KECCAK 256-bit hash on the given input buffer.
-	/// See [`pallet_revive_uapi::HostFn::hash_keccak_256`].
-	#[stable]
-	fn hash_keccak_256(
-		&mut self,
-		memory: &mut M,
-		input_ptr: u32,
-		input_len: u32,
-		output_ptr: u32,
-	) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::HashKeccak256(input_len))?;
-		Ok(self.compute_hash_on_intermediate_buffer(
-			memory, keccak_256, input_ptr, input_len, output_ptr,
-		)?)
-	}
-
-	/// Stores the length of the data returned by the last call into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::return_data_size`].
-	#[stable]
-	fn return_data_size(&mut self, memory: &mut M) -> Result<u64, TrapReason> {
-		self.charge_gas(RuntimeCosts::ReturnDataSize)?;
-		Ok(self
-			.ext
-			.last_frame_output()
-			.data
-			.len()
-			.try_into()
-			.expect("usize fits into u64; qed"))
-	}
-
-	/// Stores data returned by the last call, starting from `offset`, into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::return_data`].
-	#[stable]
-	fn return_data_copy(
-		&mut self,
-		memory: &mut M,
-		out_ptr: u32,
-		out_len_ptr: u32,
-		offset: u32,
-	) -> Result<(), TrapReason> {
-		let output = mem::take(self.ext.last_frame_output_mut());
-		let result = if offset as usize > output.data.len() {
-			Err(Error::<E::T>::OutOfBounds.into())
-		} else {
-			self.write_sandbox_output(
-				memory,
-				out_ptr,
-				out_len_ptr,
-				&output.data[offset as usize..],
-				false,
-				|len| Some(RuntimeCosts::CopyToContract(len)),
-			)
-		};
-		*self.ext.last_frame_output_mut() = output;
-		Ok(result?)
-	}
-
-	/// Returns the amount of ref_time left.
-	/// See [`pallet_revive_uapi::HostFn::ref_time_left`].
-	#[stable]
-	fn ref_time_left(&mut self, memory: &mut M) -> Result<u64, TrapReason> {
-		self.charge_gas(RuntimeCosts::RefTimeLeft)?;
-		Ok(self.ext.gas_meter().gas_left().ref_time())
-	}
-
-	/// Checks whether the caller of the current contract is the origin of the whole call stack.
-	/// See [`pallet_revive_uapi::HostFn::caller_is_origin`].
-	fn caller_is_origin(&mut self, _memory: &mut M) -> Result<u32, TrapReason> {
-		self.charge_gas(RuntimeCosts::CallerIsOrigin)?;
-		Ok(self.ext.caller_is_origin() as u32)
-	}
-
-	/// Checks whether the caller of the current contract is root.
-	/// See [`pallet_revive_uapi::HostFn::caller_is_root`].
-	fn caller_is_root(&mut self, _memory: &mut M) -> Result<u32, TrapReason> {
-		self.charge_gas(RuntimeCosts::CallerIsRoot)?;
-		Ok(self.ext.caller_is_root() as u32)
-	}
-
-	/// Clear the value at the given key in the contract storage.
-	/// See [`pallet_revive_uapi::HostFn::clear_storage`]
-	#[mutating]
-	fn clear_storage(
-		&mut self,
-		memory: &mut M,
-		flags: u32,
-		key_ptr: u32,
-		key_len: u32,
-	) -> Result<u32, TrapReason> {
-		self.clear_storage(memory, flags, key_ptr, key_len)
-	}
-
-	/// Checks whether there is a value stored under the given key.
-	/// See [`pallet_revive_uapi::HostFn::contains_storage`]
-	fn contains_storage(
-		&mut self,
-		memory: &mut M,
-		flags: u32,
-		key_ptr: u32,
-		key_len: u32,
-	) -> Result<u32, TrapReason> {
-		self.contains_storage(memory, flags, key_ptr, key_len)
-	}
-
-	/// Calculates Ethereum address from the ECDSA compressed public key and stores
-	/// See [`pallet_revive_uapi::HostFn::ecdsa_to_eth_address`].
-	fn ecdsa_to_eth_address(
-		&mut self,
-		memory: &mut M,
-		key_ptr: u32,
-		out_ptr: u32,
-	) -> Result<ReturnErrorCode, TrapReason> {
-		self.charge_gas(RuntimeCosts::EcdsaToEthAddress)?;
-		let mut compressed_key: [u8; 33] = [0; 33];
-		memory.read_into_buf(key_ptr, &mut compressed_key)?;
-		let result = self.ext.ecdsa_to_eth_address(&compressed_key);
-		match result {
-			Ok(eth_address) => {
-				memory.write(out_ptr, eth_address.as_ref())?;
-				Ok(ReturnErrorCode::Success)
-			},
-			Err(_) => Ok(ReturnErrorCode::EcdsaRecoveryFailed),
-		}
-	}
-
-	/// Computes the BLAKE2 128-bit hash on the given input buffer.
-	/// See [`pallet_revive_uapi::HostFn::hash_blake2_128`].
-	fn hash_blake2_128(
-		&mut self,
-		memory: &mut M,
-		input_ptr: u32,
-		input_len: u32,
-		output_ptr: u32,
-	) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::HashBlake128(input_len))?;
-		Ok(self.compute_hash_on_intermediate_buffer(
-			memory, blake2_128, input_ptr, input_len, output_ptr,
-		)?)
-	}
-
-	/// Stores the minimum balance (a.k.a. existential deposit) into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::minimum_balance`].
-	fn minimum_balance(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::MinimumBalance)?;
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			&self.ext.minimum_balance().to_little_endian(),
-			false,
-			already_charged,
-		)?)
-	}
-
-	/// Retrieve the code hash of the currently executing contract.
-	/// See [`pallet_revive_uapi::HostFn::own_code_hash`].
-	fn own_code_hash(&mut self, memory: &mut M, out_ptr: u32) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::OwnCodeHash)?;
-		let code_hash = *self.ext.own_code_hash();
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			code_hash.as_bytes(),
-			false,
-			already_charged,
-		)?)
-	}
-
-	/// Replace the contract code at the specified address with new code.
-	/// See [`pallet_revive_uapi::HostFn::set_code_hash`].
-	///
-	/// Disabled until the internal implementation takes care of collecting
-	/// the immutable data of the new code hash.
-	#[mutating]
-	fn set_code_hash(&mut self, memory: &mut M, code_hash_ptr: u32) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::SetCodeHash)?;
-		let code_hash: H256 = memory.read_h256(code_hash_ptr)?;
-		self.ext.set_code_hash(code_hash)?;
-		Ok(())
-	}
-
-	/// Verify a sr25519 signature
-	/// See [`pallet_revive_uapi::HostFn::sr25519_verify`].
-	fn sr25519_verify(
-		&mut self,
-		memory: &mut M,
-		signature_ptr: u32,
-		pub_key_ptr: u32,
-		message_len: u32,
-		message_ptr: u32,
-	) -> Result<ReturnErrorCode, TrapReason> {
-		self.charge_gas(RuntimeCosts::Sr25519Verify(message_len))?;
-
-		let mut signature: [u8; 64] = [0; 64];
-		memory.read_into_buf(signature_ptr, &mut signature)?;
-
-		let mut pub_key: [u8; 32] = [0; 32];
-		memory.read_into_buf(pub_key_ptr, &mut pub_key)?;
-
-		let message: Vec<u8> = memory.read(message_ptr, message_len)?;
-
-		if self.ext.sr25519_verify(&signature, &message, &pub_key) {
-			Ok(ReturnErrorCode::Success)
-		} else {
-			Ok(ReturnErrorCode::Sr25519VerifyFailed)
-		}
-	}
-
-	/// Retrieve and remove the value under the given key from storage.
-	/// See [`pallet_revive_uapi::HostFn::take_storage`]
-	#[mutating]
-	fn take_storage(
-		&mut self,
-		memory: &mut M,
-		flags: u32,
-		key_ptr: u32,
-		key_len: u32,
-		out_ptr: u32,
-		out_len_ptr: u32,
-	) -> Result<ReturnErrorCode, TrapReason> {
-		self.take_storage(memory, flags, key_ptr, key_len, out_ptr, out_len_ptr)
-	}
-
-	/// Remove the calling account and transfer remaining **free** balance.
-	/// See [`pallet_revive_uapi::HostFn::terminate`].
-	#[mutating]
-	fn terminate(&mut self, memory: &mut M, beneficiary_ptr: u32) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::Terminate)?;
-		let beneficiary = memory.read_h160(beneficiary_ptr)?;
-		self.ext.terminate(&beneficiary)?;
-		Err(TrapReason::Termination)
-	}
-
-	/// Stores the amount of weight left into the supplied buffer.
-	/// See [`pallet_revive_uapi::HostFn::weight_left`].
-	fn weight_left(
-		&mut self,
-		memory: &mut M,
-		out_ptr: u32,
-		out_len_ptr: u32,
-	) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::WeightLeft)?;
-		let gas_left = &self.ext.gas_meter().gas_left().encode();
-		Ok(self.write_sandbox_output(
-			memory,
-			out_ptr,
-			out_len_ptr,
-			gas_left,
-			false,
-			already_charged,
-		)?)
-	}
-
-	/// Retrieves the account id for a specified contract address.
-	///
-	/// See [`pallet_revive_uapi::HostFn::to_account_id`].
-	fn to_account_id(
-		&mut self,
-		memory: &mut M,
-		addr_ptr: u32,
-		out_ptr: u32,
-	) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::ToAccountId)?;
-		let address = memory.read_h160(addr_ptr)?;
-		let account_id = self.ext.to_account_id(&address);
-		Ok(self.write_fixed_sandbox_output(
-			memory,
-			out_ptr,
-			&account_id.encode(),
-			false,
-			already_charged,
-		)?)
-	}
-}
diff --git a/substrate/frame/revive/src/vm/runtime_costs.rs b/substrate/frame/revive/src/vm/runtime_costs.rs
new file mode 100644
index 000000000000..deac0c46bc00
--- /dev/null
+++ b/substrate/frame/revive/src/vm/runtime_costs.rs
@@ -0,0 +1,315 @@
+// 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.
+
+use crate::{gas::Token, weights::WeightInfo, Config};
+use frame_support::weights::{constants::WEIGHT_REF_TIME_PER_SECOND, Weight};
+
+/// Current approximation of the gas/s consumption considering
+/// EVM execution over compiled WASM (on 4.4Ghz CPU).
+/// Given the 2000ms Weight, from which 75% only are used for transactions,
+/// the total EVM execution gas limit is: GAS_PER_SECOND * 2 * 0.75 ~= 60_000_000.
+const GAS_PER_SECOND: u64 = 40_000_000;
+
+/// Approximate ratio of the amount of Weight per Gas.
+/// u64 works for approximations because Weight is a very small unit compared to
+/// gas.
+const WEIGHT_PER_GAS: u64 = WEIGHT_REF_TIME_PER_SECOND / GAS_PER_SECOND;
+
+#[cfg_attr(test, derive(Debug, PartialEq, Eq))]
+#[derive(Copy, Clone)]
+pub enum RuntimeCosts {
+	/// Base Weight of calling a host function.
+	HostFn,
+	/// Weight charged for copying data from the sandbox.
+	CopyFromContract(u32),
+	/// Weight charged for copying data to the sandbox.
+	CopyToContract(u32),
+	/// Weight of calling `seal_call_data_load``.
+	CallDataLoad,
+	/// Weight of calling `seal_call_data_copy`.
+	CallDataCopy(u32),
+	/// Weight of calling `seal_caller`.
+	Caller,
+	/// Weight of calling `seal_call_data_size`.
+	CallDataSize,
+	/// Weight of calling `seal_return_data_size`.
+	ReturnDataSize,
+	/// Weight of calling `seal_to_account_id`.
+	ToAccountId,
+	/// Weight of calling `seal_origin`.
+	Origin,
+	/// Weight of calling `seal_code_hash`.
+	CodeHash,
+	/// Weight of calling `seal_own_code_hash`.
+	OwnCodeHash,
+	/// Weight of calling `seal_code_size`.
+	CodeSize,
+	/// Weight of calling `seal_caller_is_origin`.
+	CallerIsOrigin,
+	/// Weight of calling `caller_is_root`.
+	CallerIsRoot,
+	/// Weight of calling `seal_address`.
+	Address,
+	/// Weight of calling `seal_ref_time_left`.
+	RefTimeLeft,
+	/// Weight of calling `seal_weight_left`.
+	WeightLeft,
+	/// Weight of calling `seal_balance`.
+	Balance,
+	/// Weight of calling `seal_balance_of`.
+	BalanceOf,
+	/// Weight of calling `seal_value_transferred`.
+	ValueTransferred,
+	/// Weight of calling `seal_minimum_balance`.
+	MinimumBalance,
+	/// Weight of calling `seal_block_number`.
+	BlockNumber,
+	/// Weight of calling `seal_block_hash`.
+	BlockHash,
+	/// Weight of calling `seal_block_author`.
+	BlockAuthor,
+	/// Weight of calling `seal_gas_price`.
+	GasPrice,
+	/// Weight of calling `seal_base_fee`.
+	BaseFee,
+	/// Weight of calling `seal_now`.
+	Now,
+	/// Weight of calling `seal_gas_limit`.
+	GasLimit,
+	/// Weight of calling `seal_weight_to_fee`.
+	WeightToFee,
+	/// Weight of calling `seal_terminate`.
+	Terminate,
+	/// Weight of calling `seal_deposit_event` with the given number of topics and event size.
+	DepositEvent { num_topic: u32, len: u32 },
+	/// Weight of calling `seal_set_storage` for the given storage item sizes.
+	SetStorage { old_bytes: u32, new_bytes: u32 },
+	/// Weight of calling `seal_clear_storage` per cleared byte.
+	ClearStorage(u32),
+	/// Weight of calling `seal_contains_storage` per byte of the checked item.
+	ContainsStorage(u32),
+	/// Weight of calling `seal_get_storage` with the specified size in storage.
+	GetStorage(u32),
+	/// Weight of calling `seal_take_storage` for the given size.
+	TakeStorage(u32),
+	/// Weight of calling `seal_set_transient_storage` for the given storage item sizes.
+	SetTransientStorage { old_bytes: u32, new_bytes: u32 },
+	/// Weight of calling `seal_clear_transient_storage` per cleared byte.
+	ClearTransientStorage(u32),
+	/// Weight of calling `seal_contains_transient_storage` per byte of the checked item.
+	ContainsTransientStorage(u32),
+	/// Weight of calling `seal_get_transient_storage` with the specified size in storage.
+	GetTransientStorage(u32),
+	/// Weight of calling `seal_take_transient_storage` for the given size.
+	TakeTransientStorage(u32),
+	/// Base weight of calling `seal_call`.
+	CallBase,
+	/// Weight of calling `seal_delegate_call` for the given input size.
+	DelegateCallBase,
+	/// Weight of calling a precompile.
+	PrecompileBase,
+	/// Weight of calling a precompile that has a contract info.
+	PrecompileWithInfoBase,
+	/// Weight of reading and decoding the input to a precompile.
+	PrecompileDecode(u32),
+	/// Weight of the transfer performed during a call.
+	/// parameter `dust_transfer` indicates whether the transfer has a `dust` value.
+	CallTransferSurcharge { dust_transfer: bool },
+	/// Weight per byte that is cloned by supplying the `CLONE_INPUT` flag.
+	CallInputCloned(u32),
+	/// Weight of calling `seal_instantiate`.
+	Instantiate { input_data_len: u32, balance_transfer: bool, dust_transfer: bool },
+	/// Weight of calling `Ripemd160` precompile for the given input size.
+	Ripemd160(u32),
+	/// Weight of calling `Sha256` precompile for the given input size.
+	HashSha256(u32),
+	/// Weight of calling `seal_hash_keccak_256` for the given input size.
+	HashKeccak256(u32),
+	/// Weight of calling the `System::hash_blake2_256` precompile function for the given input
+	/// size.
+	HashBlake256(u32),
+	/// Weight of calling `seal_hash_blake2_128` for the given input size.
+	HashBlake128(u32),
+	/// Weight of calling `ECERecover` precompile.
+	EcdsaRecovery,
+	/// Weight of calling `seal_sr25519_verify` for the given input size.
+	Sr25519Verify(u32),
+	/// Weight charged by a precompile.
+	Precompile(Weight),
+	/// Weight of calling `seal_set_code_hash`
+	SetCodeHash,
+	/// Weight of calling `ecdsa_to_eth_address`
+	EcdsaToEthAddress,
+	/// Weight of calling `get_immutable_dependency`
+	GetImmutableData(u32),
+	/// Weight of calling `set_immutable_dependency`
+	SetImmutableData(u32),
+	/// Weight of calling `Bn128Add` precompile
+	Bn128Add,
+	/// Weight of calling `Bn128Add` precompile
+	Bn128Mul,
+	/// Weight of calling `Bn128Pairing` precompile for the given number of input pairs.
+	Bn128Pairing(u32),
+	/// Weight of calling `Identity` precompile for the given number of input length.
+	Identity(u32),
+	/// Weight of calling `Blake2F` precompile for the given number of rounds.
+	Blake2F(u32),
+	/// Weight of calling `Modexp` precompile
+	Modexp(u64),
+}
+
+/// For functions that modify storage, benchmarks are performed with one item in the
+/// storage. To account for the worst-case scenario, the weight of the overhead of
+/// writing to or reading from full storage is included. For transient storage writes,
+/// the rollback weight is added to reflect the worst-case scenario for this operation.
+macro_rules! cost_storage {
+    (write_transient, $name:ident $(, $arg:expr )*) => {
+        T::WeightInfo::$name($( $arg ),*)
+            .saturating_add(T::WeightInfo::rollback_transient_storage())
+            .saturating_add(T::WeightInfo::set_transient_storage_full()
+            .saturating_sub(T::WeightInfo::set_transient_storage_empty()))
+    };
+
+    (read_transient, $name:ident $(, $arg:expr )*) => {
+        T::WeightInfo::$name($( $arg ),*)
+            .saturating_add(T::WeightInfo::get_transient_storage_full()
+            .saturating_sub(T::WeightInfo::get_transient_storage_empty()))
+    };
+
+    (write, $name:ident $(, $arg:expr )*) => {
+        T::WeightInfo::$name($( $arg ),*)
+            .saturating_add(T::WeightInfo::set_storage_full()
+            .saturating_sub(T::WeightInfo::set_storage_empty()))
+    };
+
+    (read, $name:ident $(, $arg:expr )*) => {
+        T::WeightInfo::$name($( $arg ),*)
+            .saturating_add(T::WeightInfo::get_storage_full()
+            .saturating_sub(T::WeightInfo::get_storage_empty()))
+    };
+}
+
+macro_rules! cost_args {
+	// cost_args!(name, a, b, c) -> T::WeightInfo::name(a, b, c).saturating_sub(T::WeightInfo::name(0, 0, 0))
+	($name:ident, $( $arg: expr ),+) => {
+		(T::WeightInfo::$name($( $arg ),+).saturating_sub(cost_args!(@call_zero $name, $( $arg ),+)))
+	};
+	// Transform T::WeightInfo::name(a, b, c) into T::WeightInfo::name(0, 0, 0)
+	(@call_zero $name:ident, $( $arg:expr ),*) => {
+		T::WeightInfo::$name($( cost_args!(@replace_token $arg) ),*)
+	};
+	// Replace the token with 0.
+	(@replace_token $_in:tt) => { 0 };
+}
+
+impl<T: Config> Token<T> for RuntimeCosts {
+	fn influence_lowest_gas_limit(&self) -> bool {
+		true
+	}
+
+	fn weight(&self) -> Weight {
+		use self::RuntimeCosts::*;
+		match *self {
+			HostFn => cost_args!(noop_host_fn, 1),
+			CopyToContract(len) => T::WeightInfo::seal_copy_to_contract(len),
+			CopyFromContract(len) => T::WeightInfo::seal_return(len),
+			CallDataSize => T::WeightInfo::seal_call_data_size(),
+			ReturnDataSize => T::WeightInfo::seal_return_data_size(),
+			CallDataLoad => T::WeightInfo::seal_call_data_load(),
+			CallDataCopy(len) => T::WeightInfo::seal_call_data_copy(len),
+			Caller => T::WeightInfo::seal_caller(),
+			Origin => T::WeightInfo::seal_origin(),
+			ToAccountId => T::WeightInfo::seal_to_account_id(),
+			CodeHash => T::WeightInfo::seal_code_hash(),
+			CodeSize => T::WeightInfo::seal_code_size(),
+			OwnCodeHash => T::WeightInfo::seal_own_code_hash(),
+			CallerIsOrigin => T::WeightInfo::seal_caller_is_origin(),
+			CallerIsRoot => T::WeightInfo::seal_caller_is_root(),
+			Address => T::WeightInfo::seal_address(),
+			RefTimeLeft => T::WeightInfo::seal_ref_time_left(),
+			WeightLeft => T::WeightInfo::seal_weight_left(),
+			Balance => T::WeightInfo::seal_balance(),
+			BalanceOf => T::WeightInfo::seal_balance_of(),
+			ValueTransferred => T::WeightInfo::seal_value_transferred(),
+			MinimumBalance => T::WeightInfo::seal_minimum_balance(),
+			BlockNumber => T::WeightInfo::seal_block_number(),
+			BlockHash => T::WeightInfo::seal_block_hash(),
+			BlockAuthor => T::WeightInfo::seal_block_author(),
+			GasPrice => T::WeightInfo::seal_gas_price(),
+			BaseFee => T::WeightInfo::seal_base_fee(),
+			Now => T::WeightInfo::seal_now(),
+			GasLimit => T::WeightInfo::seal_gas_limit(),
+			WeightToFee => T::WeightInfo::seal_weight_to_fee(),
+			Terminate => T::WeightInfo::seal_terminate(),
+			DepositEvent { num_topic, len } => T::WeightInfo::seal_deposit_event(num_topic, len),
+			SetStorage { new_bytes, old_bytes } => {
+				cost_storage!(write, seal_set_storage, new_bytes, old_bytes)
+			},
+			ClearStorage(len) => cost_storage!(write, seal_clear_storage, len),
+			ContainsStorage(len) => cost_storage!(read, seal_contains_storage, len),
+			GetStorage(len) => cost_storage!(read, seal_get_storage, len),
+			TakeStorage(len) => cost_storage!(write, seal_take_storage, len),
+			SetTransientStorage { new_bytes, old_bytes } => {
+				cost_storage!(write_transient, seal_set_transient_storage, new_bytes, old_bytes)
+			},
+			ClearTransientStorage(len) => {
+				cost_storage!(write_transient, seal_clear_transient_storage, len)
+			},
+			ContainsTransientStorage(len) => {
+				cost_storage!(read_transient, seal_contains_transient_storage, len)
+			},
+			GetTransientStorage(len) => {
+				cost_storage!(read_transient, seal_get_transient_storage, len)
+			},
+			TakeTransientStorage(len) => {
+				cost_storage!(write_transient, seal_take_transient_storage, len)
+			},
+			CallBase => T::WeightInfo::seal_call(0, 0, 0),
+			DelegateCallBase => T::WeightInfo::seal_delegate_call(),
+			PrecompileBase => T::WeightInfo::seal_call_precompile(0, 0),
+			PrecompileWithInfoBase => T::WeightInfo::seal_call_precompile(1, 0),
+			PrecompileDecode(len) => cost_args!(seal_call_precompile, 0, len),
+			CallTransferSurcharge { dust_transfer } =>
+				cost_args!(seal_call, 1, dust_transfer.into(), 0),
+			CallInputCloned(len) => cost_args!(seal_call, 0, 0, len),
+			Instantiate { input_data_len, balance_transfer, dust_transfer } =>
+				T::WeightInfo::seal_instantiate(
+					input_data_len,
+					balance_transfer.into(),
+					dust_transfer.into(),
+				),
+			HashSha256(len) => T::WeightInfo::sha2_256(len),
+			Ripemd160(len) => T::WeightInfo::ripemd_160(len),
+			HashKeccak256(len) => T::WeightInfo::seal_hash_keccak_256(len),
+			HashBlake256(len) => T::WeightInfo::hash_blake2_256(len),
+			HashBlake128(len) => T::WeightInfo::seal_hash_blake2_128(len),
+			EcdsaRecovery => T::WeightInfo::ecdsa_recover(),
+			Sr25519Verify(len) => T::WeightInfo::seal_sr25519_verify(len),
+			Precompile(weight) => weight,
+			SetCodeHash => T::WeightInfo::seal_set_code_hash(),
+			EcdsaToEthAddress => T::WeightInfo::seal_ecdsa_to_eth_address(),
+			GetImmutableData(len) => T::WeightInfo::seal_get_immutable_data(len),
+			SetImmutableData(len) => T::WeightInfo::seal_set_immutable_data(len),
+			Bn128Add => T::WeightInfo::bn128_add(),
+			Bn128Mul => T::WeightInfo::bn128_mul(),
+			Bn128Pairing(len) => T::WeightInfo::bn128_pairing(len),
+			Identity(len) => T::WeightInfo::identity(len),
+			Blake2F(rounds) => T::WeightInfo::blake2f(rounds),
+			Modexp(gas) => Weight::from_parts(gas.saturating_mul(WEIGHT_PER_GAS), 0),
+		}
+	}
+}

From 7e68c516790d61c23122eec50341300cbfed3a44 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Mon, 18 Aug 2025 07:02:01 +0000
Subject: [PATCH 100/186] fixes

---
 .../revive/fixtures/contracts/dummy.polkavm   | Bin 1726 -> 0 bytes
 .../revive/fixtures/contracts/erc20.polkavm   | Bin 44001 -> 0 bytes
 .../frame/revive/fixtures/contracts/erc20.sol |  20 -------
 .../contracts/expensive_erc20.polkavm         | Bin 40090 -> 0 bytes
 .../fixtures/contracts/expensive_erc20.sol    |  21 -------
 .../fixtures/contracts/fake_erc20.polkavm     | Bin 6304 -> 0 bytes
 .../revive/fixtures/contracts/fake_erc20.sol  |  54 ------------------
 substrate/frame/revive/src/benchmarking.rs    |  51 -----------------
 substrate/frame/revive/src/exec.rs            |  17 +-----
 substrate/frame/revive/src/exec/mock_ext.rs   |   6 --
 substrate/frame/revive/src/gas.rs             |  29 ----------
 substrate/frame/revive/src/lib.rs             |   9 +--
 substrate/frame/revive/src/tests.rs           |   1 -
 substrate/frame/revive/src/vm/mod.rs          |   8 +--
 14 files changed, 4 insertions(+), 212 deletions(-)
 delete mode 100644 substrate/frame/revive/fixtures/contracts/dummy.polkavm
 delete mode 100644 substrate/frame/revive/fixtures/contracts/erc20.polkavm
 delete mode 100644 substrate/frame/revive/fixtures/contracts/erc20.sol
 delete mode 100644 substrate/frame/revive/fixtures/contracts/expensive_erc20.polkavm
 delete mode 100644 substrate/frame/revive/fixtures/contracts/expensive_erc20.sol
 delete mode 100644 substrate/frame/revive/fixtures/contracts/fake_erc20.polkavm
 delete mode 100644 substrate/frame/revive/fixtures/contracts/fake_erc20.sol

diff --git a/substrate/frame/revive/fixtures/contracts/dummy.polkavm b/substrate/frame/revive/fixtures/contracts/dummy.polkavm
deleted file mode 100644
index d970e700ce564485c496e1b5254d2f8d434db72d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1726
zcmb_bO>7fK7@hS`c5FhJHL+*ogs@NtIaR4#R<x!Sl7-NarK;q(38jZBak1+k1(xQA
zj6FVtu~Td~lv-M8$SJK-K@th|ScwRMs#cshRH?+Fhp3lUm8v4Oswya<;{-@0da63w
zr`>ro-}lXX-%j$xTL9c_0~<q8!EFR?frMw~W7uLkBzh!XlsG7nkVr|qCvhr0Ha3z;
zPo_ss*=I{zvoSlJ*_urh%Gq3Ya%5uC9#7}86WR3G$ar>gYW&QEWDBQHPfe!ZAIoke
zYB5jtolB2RWk)8*(`P0=$c~R^GhWR#yVujoJKNuu$(|jvOKr1{C3zqLqRM{dm~v0~
zMG3fiT}NDByYIStJvTjGujcLdzT&-9LMh)HrcVLNbz$D2uv*_;tFH~mB@sR32f%gx
zV&Je8>@pz&t~(dh17Pb506TBL%ft2(?}qjb%5+*rv;-*?D{)%cEmmT*(koV?w6aUA
z7_`zOR&-kF7AuHW!r}&`tV=A%DZ^qpMp;NKM=1-6WrMO#v8+?JQ!FFO0%8f$vL@!@
zw7f&i#b~)h%tdK=yO=X*xn0c3vfIQQqGi9h0%^%78gW`uMI%N_ZK4sSC9h~0wB!*D
zotE69A<yU%b$LvMBZCKZ9zu>5Jpdf-K0}ZNYg3Bfr5sj0z%}SqlgQ&sqP9Qe@-2qq
zEEscwiJG=%stFSsNd#}M6TEu{5Zp`fE`oaq?j|@)a2LTk!I<C>!9jvM3EoL?fMAVa
zMDPxRI|$xRa67@<2=)`~BN!5_65K|xmtYUUZh~C|D@3(4-BK(KS{kZizp8MIxUTaq
z$iu4wu3lAFFQ|iR$W%?3ME?EjRcfk=>GOLOQ=O3=OQLpty*h0|$ti~*l)~V4Q$@gC
zo%Va5ZR+^#Q7h8)nE=UHM_XHGNLN@8DJ%pPCuk^Act+OQlpgr%(f=&nZ9?h#Q`s!9
zAKIKhvE*&tlU1s@TT+r=QO@VS2ZP6M-_5)nR8q%wz534Rn~H<iYSU{hhcX{pShp~;
zFtk*uQkqso{3_ztbiN4r(lg&us;2OqetvogzW`<OHJRMwm(&{I`JVtU+y}h)CtyVZ
zSm82Y`8r^^8DQ=EQsN7VYrx6P11I0&=79-19c`YWlPs8Ip#dj2DlOxjS0TTIcwOfe
zotF?VLq2VPV_&hC>}k7Z->~EMOAPBQj93?BA=VRTdW>~PS*KCet6{_RJvO%)rs{8V
z2Io0C$%9EQvumUBLT+?D^x9vWy=yh@KbX+I;lT;)#+&){A0KZ0MONsf6-rvNU~bgO
zC#+Dy1mWjpX3p^oI&UC;5%Rj!)lyey`cqZd(&CmDv$UwC83S5kQ(3h;(GsWn-5kfc
z9^+k69yVljy%o=jIx8TShb;G;a9$YYxjfIG<weShah8v<T-3=MtYDa+$I<RFWU!#l
zLWnn{tGoeO7oSD^BYpE$$X%}J`hzEvB<lVBft2iPx$Kc903-VALsQ;=<7fF&l4$P_
z4}mq%G$OUmZ-@IWs~P#1CzT2Z_E^o@<$o;pFIvZ&{?Ey$uSZs+LxrP97b3N1%e94C
zWKYrKiS%0st>c0IqZjKNW1t!7vr@yu&E`VHi7X!ZF4DKSPZs^`$l^xX=8&@xX*7qL
WLw)^LYU3<@eV;@E$DPiA3;Yc>C+^??

diff --git a/substrate/frame/revive/fixtures/contracts/erc20.polkavm b/substrate/frame/revive/fixtures/contracts/erc20.polkavm
deleted file mode 100644
index e545040080bf6f32fffbf56a3fc2b13de19c285b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 44001
zcmeIb3tSu5l|McsBs3D(kuVP#za|(vGEN&3l32FWT5&O!oU|3JlhU-C5E~cqXhdx{
z49uj#0|^p#Q%q1a#@=1(k{Ym^dXu!qkF>PS#==g!j-g#GZc_T%zkl0i*X_1l+TE1j
z_uP>{xK2XiCZG2A5BAZW$DMoc+<Wf1=XKBc?*1^x{rE7){&+L@t#jNE=T2!J+8_PN
zg0GbQ`sIPoulisA(Qj90fARUPzdE!s{GZP({q2YE`K|NK?&nV2_pSdqa!dQKE&uY-
zn;&{=^$Xkf3_Qy{`q=)LYJd9hAMg13Cq!%X^mmRgdpRX@=)a#{vG}ErerEkci(CI|
z&nJHT^I!b(p-*tPef;m|-t)0<J1=D1Fg)?`-=8y>*50%FJJp|<_)MTUd)d9t-`?}#
z-!6UTKf@~z{c7v;U(Bxl_EG=;uKN7I%fBxB%7ULn_Zyp^OQV;X3s?v!02Bf~0Pp}l
z2G|1F33wQ=_5QlL`zr6>dH;P|1NDv5XLW)5E2qzPR5xv-vu)cex77!BRPVfR+k@L4
z*jcr0=Y2bN2DaZ{watJ34*z|%+qQ1KzxKYHZn<^Gw)^Yu+rDk*XSYAF1DUEn{pru{
zynjpGHdYl~i9hz>{dJ$+cHhqJ_dl@XQ`@$0-&SdwXBhhTu#qYo`mb;*s;dh$rVhP-
zp!sWtp+AOy!2RCPo$?PUr&HRE&l`Vke8qHK>hr00m>)N<6!r-}vh-W$rA6lOb04<-
zA>)PY4LN%j{B+?{iyVs&h^f~;zEoWP>WV<YqlJHW<EERQxhcKq@uI&k8ohbZt<GET
zSruCK;;L(0Wv;O6UtGU&{n3@VdiClJt3SQ^$XfNbU*1;m0q%n@uiNeZt$XSEm)3WF
zs9?j^l7*g<JMO#l)sOD?rIv0ey}s-ZWnF*s-OVF+4cz_HkFEUp{Cmp(Huc{6d;9MD
zamBhV-Ywy+FIRfDeRrGuDQ{JmzrOlHbw$nG+8@>$KW+Q;#s_Kwx7Q!3Fa69T+w*p;
z-ua`Q%7c}S56Mp`H$GJIQ2j&h&((kK+0WS?{=ma~AO69^xy|=Bf2sNZG#Bn_*mZsv
zr@miZqt>ZUtLM}os=rWIwEUp;7mt`8wLdC8sy>?4_Nib`=&PaULiz2xcB^|{-ShR&
zOOF+O;VWPGbVsb?)xFCe|KsCd?)qhyHJlyxgtvzegwKS35dN?5YvJ9Ewld4wA`8#)
zPiaL_NoWZ!X$_9w<-!H$YU>bZc&a_)0|L?_;T&g(wwZ6@rjIyopzVQ3yQmF_5n0qu
ziqZXP!zZkf{e1Vyrw)rxwXG_(d?eavschnv-Qge~KEg|fE6*H0@Ehl?rIwqod}m>)
zCAXz}l8^SKDJR4GCZmVarL!#qlVz4mH*sNmOty(~mP5|AsUdm3poRo_zWRtwebmv?
zP$Y;xo8gAZfIskYH8(JzE)W7ICD|c0*`!86lC)DUNm-(uDwLGP+9{``EYePilCn@c
z<&cyG+9{i)<Z34cNuIAAc1d!McDPWIv$excNzT#^i;|qF9d=0aJngVek~6dcL29yV
z-7cx=8m+rfYMQHcJEf*MTDK@QrEA@&HcjicNljL5pCC0_w2(_`G;5(ksWDXxIi*IE
z780dKqZV>VjVW3PZ8T^>G?Q0tqMGGUvu$C!lis;Uww23SJ~`VH&Z=m&k5@jZwmH<0
zO>Gy{V4xweFE9`Y$_|H|YeSdFIbOTVYcKTLonE`>vAe|<M@z2QvcO$rnJh9}O=^xy
zbrh=eoocR#r-SsoT;q_dZL(jGtHPx{s;ykj@~NoLUU8)csH)l`sJm@y(4i_0wb7<F
z32H;&1=f;=Kx^P+z!kV&&PlW=TVCjr9fk4&r<|#`hMJNlqBWK)R3}c#wiqX8o#W)}
zC>PEe=kU_%DS4q=JtfEsJ?bf&ywInfbjS<J)x+`vhk96$7l`U%8){GoP-~(3gxW30
zxoWpf&K1;s4tc(f;fL&S`E17Y*8+Z^h3cSgt5+QYrGC|6qqIVGu<IJ9Iz+nAfdeNU
z1aVME2hBKe)4?DPJaljr2R=IJ!$CP6^l&YWEjblMLW-K}vKqss;-reVQt?(Qy_J2O
zqprOq+XOkQ^|QRyz<<E}JZC61nSHiYi_az;z9nq8{ZY1E<mIe!Ue1p3;jBx1*naf)
zgag?{W;a84>j(e0Bxgx8SCX^1Bxg}c&cc$M1tmGTB{}m;avUW&IVCySB{^9oIhiFn
z^Gb3uN^<NaIku9VYf5tFmgLMS$w@ECNh`^*mgHDUa)go`b4gBWNsg%`$5@h+Qj%jR
z$>B@P-sKXY0^kSKn_H?X%vLL}R@IwTzhqXc{bseM!aS-8qle6+ZRS#Qs`Ga@t)};p
zt0wqJgQzu#-sLVlTxgc7M02>xZ4UcIoICNl>7V+X>MutzJ{03ItGGGZCyYj{qwQ7@
z7Ze)_invlLq&olprj`b|>JqQ|CwQN2?(P56(m;nr7BmOx-Hs(@r+gE7Mnxu{%_jbj
zA~|G#Ij>0bWxpFquI%?ASs?p8NEXWe7^g^!WPgPsEtdU*I9Ve5k0QZ*a3P0X_KQd|
zWPc%&d9vS$BvbaELzXPrFDX*C?C--#j_mJ2BFKIRa#&<Phr}xTZAj8Ew~(aE{wT7{
zk^S|GG*|X(IJrjlcOa4d6Zqw2|2PtZ?7xI0MfP7rVwC+uNKCTduSlt~KgcN!=*DKw
zyL=+myZjPhJk=ep;?Sq#IJubWvt?vFq*go7pEk2vE11<f&OEx`JbFYJl>`mFdB}`W
zi4WDL8(U7J$7rbJ>Oo$vIm*kmeY{-PgC5L$<@dlZtLh)*)#{`CXvmT&j89HZg0JAz
znjSs|Dpb?QclC8??<5MAVeAhUs%T<MgUA}Ip>f%_Q{%3_-W!4Y4*>bM0sCu#{sG|s
zW=w#cm;pO51-6x#H+z>4qHm7^dZ@F9Qp5fpob;iy9Z$+?bu3k_IhU%|MN`$<q14d>
z=F!7f>g<<qXgS8(UoKbIqp$twYYcl`1zsn2`vhJmMfKOCul<+zwWRlT#k<nix89&u
zmFr#Yvn?F^?>|d7Uy;I~@A=K>Up8lHQZKIiZ%iMhQBaz!ikub+3Pb@0Y>|_W(GynC
z0i|({(v+^qa~0*9$Ub4T-x4`#i@fL<J)1Uq+!EO*j)n}FN=l>BWKiUkD-~c;nv9B^
zswn2yDIf(CUum={O&N+j?@A?PDNUJ*oUJH1S1v&V9iU}nYhhrGyrr2BtdOgHa*Z3U
z1?33_G1WTwE{*W|mG?0kH4Xv+8a0FjH0m4@(5NU9(5ML{piwa-AX1ljrD2I&b&&^Q
z1`5^#DpFIzRn5T33Y_?Xlj52GR;xNvRevy5t!@TxYN-)<owkQZFGY^5(;E2E)8<HU
zopyj9jSAWT-@1?QJ`n8WTU#GKucVwm#a+;h=Z~ZZH;P^6(eDUdZ3Ej=oe#cGMFY_v
zYV|meVNt8k@sWKtwI<3(1{`=db}fc$pb8T_E~qt^aLcCFUgYBgh~dHzQUB2T>URZ$
zB4`?4W<CctQ<S%2!K=f9S9y+?D`LQhyifj?X2sRd@++brTi{S{5f-BSU;ifT7zYPT
zU0k`VrJ*H+JJwXJbgr<pB!;D~&J$Ivu``yj28&wjiypVg)p+%NYqi5B;2teH>UKwD
zV6EC<(}E@}V1fLAj6vYLq8JXoOX>=BwMREuW%N#LlQ}9|quqv)r>(K4En|mJm_w~P
z$A{~e#Ol#=F+SRDjvca&?X#-rmgtv|f%<!`rkF;DEs=(`TDnQCKtG>0M|WCTdFjz%
zOJ(oKack^&+Ss8qxz;w)X_l*Fe5}(FbEjNrOi|HdwaOQ3#LD1~%4ym@Q{>p%(Fhh`
zw7y&2Cuk>4U2R>v16rUTJU!U{SerF^!m8FfkX^35#K&ZFv?*N$2CB8^=uE8{=c9+r
z+6hxcUW-|(HJG9ibF|%x<pIyDwYKQtwAf)F#U(!4W{I6Jj~o!F>tY8iV{H~0rHq^)
z)&cD+O*zfUl|wv;<0Tyxwg4sYmVwiOzQBqA^&Q^mk{PQbmcemw6P(R^ont~zZShoy
zr`$w~U(eIh#7#_dp1cYyQ&EqK;;9qE93M3E(d~v&(Hv|5J3&pws|(RR=`lB&9^*$2
zT4D#SV;Yu2ymniPS{vm@PFZ57(#9T78<B`mjkTv$HkGB7OoEkp>=2FoBSHScAwjM4
zJ$4!${@C%cW5AOReoV5ITEGofxmp{><*LFs4laM-*Y6UxJB`0iVEe>OY_Bb($*Uex
z`vkS$29`Pip6enXXhU!Ffe7(mfkVVDl%?HPlu~3af>bCvuQRGug{t3)QB?iSSixwL
z<D|?yB7jo?vAP5xqBYJte`E13kKr&1ILE77d-(88V(ccfTG7Wx>n$;hFxDWbRY&=#
zB+$I89OR=rjgReq?9Q<}(leR*g9isvS@5%`&0}W`WBaWay3L~=>xF~n%KeX@9qUhf
z#4-uwePj(pNX()1=vnJXcUr95GIq*Rx##ga$2{q(|0o7$68smBA&wqMiMZBk{U)>;
z6BrmgN)uAUTqy)PbT>un*WxhTFo|2kW?<eBKhl>L>odqT%{*q)g{N^Xi0p&>Bl2YQ
zS#(DSA5+qzccjI>lO8>luH9scoLxKmbei^}Njqp7Hl)PX8b_|@V%M9;jOLNGmQjmE
ztw3+o1o^RUOh?pRGsKTIffO_&5yrNst6QS{*p4*q*xJa8rcotDYhN2VX&OC@DHh|k
z?zIsRojxJbZ3-W8%XJzbJ7SIYrOS0_$sS>BKtOjAv5iSWv<1y=2InlQmE)Lf_))8R
zcuZTldWerjK-)1C$1Ty21=K`F@kCMj(x}&>P9f&Bs&yEY^z`T%Yjk&7Y_|{v(~c28
zW&x8pIw)xS#0WS|jq&aOwp<s$@Om;{!DlOY^gpk5jW#Ha7Ntp0WUHd2{pl*KG|f@u
zbVZp99y>B1fGR~^v_*mrEO*pJ)HJrrH`x?9Ls8f&kLy#c#2^@uEJe;#lx(FjXS#%a
z4$xj=I*8G*V$D_>9g3W*C=23zLUIX>ixhdGqAbROO)Ug_f;KcbK(Ik@brziD7Fq}=
zFl{igaC8Yrm}oe<h$Boq9D#)SIh)+3lR3FbCv)-+oy^JGU!TkoMxhF5V1jL!m7r>k
zU_pr2zl0@RCv~9Sk}=i_!ZgH(C6Q(vtv*dDu`gN28bJA@eDtt6cFY>>0oNboN1AX=
z<41O<p<C73W`5*onhGQv`A#}<VRQ}a)qX4%7x~Ii<=V>agkNRW1FsPiqi%7j{=yL_
zEupk()_K%Q_voEgbZV)^ZB(m!&|*{{vcy6t323-B4eQ6q+Vt33VeAY@F;K7xh%LnW
z(qm0%D-h9Y#YB&yUqjZ>W9CulT_8HPu|7V;B+{+<EfLTupY8gzSL37Bl&i>zQJcYF
zE>fBnD)M4QVWak^3?^|e#Ee}%k4SvpRWiHASx%&eBxV;Vh)#;5AXl>dN2ZeHuK->K
z{19*fFb4QnKn(CNfFA(94;TfE0L}wm0-OW<GvIrG?*d)~oCTZ#3<IKo(|{KM{{(m*
z@EyRn0p9`)0eVc6CCmHh=a6X<?fJ3^B4)|*Cy`8Ynd$gt5~ozxYs$3H8J$YiUovG{
z*%?lynu93ltL*V(?Dw1a%{1%xCpoF=i@1N3>Uc^o{VS|=sqTnLsy=LzY6eVFRX_3!
zQl78tdA=6U^DOc_gFH_o&p#s1H}u=j#c!X&?UT5D0=JKw)LK{T$tB^c9upWQ<=A{>
z(4id9RZc93G|-9&jycXPN6gCLBIWo(<-}s;)RJjA1H#N15_O15Nh!)PyE14~j%O$*
z=3QPwW4bb!r5w*xPGl>`a;8hb05e?-(U{W)<(Ne|E+{9g%BeIe0Rs<w*J}X<Jw8V{
zk*=JYs~k%RRF_jJi*k%t29*;A<y1<%2~!0e!b_Nx6Gr7!s&W!C1tYI00P-4W!617H
z;t66PWaE;RINU(Pc*Gp=j5~#ZWqdX0064r_2P9`O{<Suw;QVR@q##qZT&i3>0qw^n
z6Sxo)xIBnC<0iRg+~l*pzw#HL9iSsbM7Fqi?Yec5D33nYqU$2ZNkq|(uZwIVNhDIh
zhX;5lDM@KMpz{zwq7=Dy0*a_hfQtao*;>%q6QHv-NDsy7tQ4oSjogIu79+@rT15(o
z!l8>-OG+TCHrkb`Md(lD+37_{N?L?2U&fLaLcRZ!7on+zurX;NynGoWd093nN<v;v
zE}+q*$VNp;h2H7)Rxx4`v1WlS#Co-gspx9mf$NA%1nUcCnAc9Pi=5;^cH}CsDu>oZ
zUL?6i1~#a5F1p#rk4kAJ%kN7qS$;3zZvmeKd;)L};NyUDz{dc01MUKB2K)`63{VR2
z0X_=&2;jqjI{|k9HUYc<4`3sp1h4^64EPXWJ>YhL8z81)_B-k4x>TY;%TpOCx`Can
zV!!Ly?=sw=4DZ)7+^Q!Zq$E=yssrreB!522d|y24E%EdNEKR0lOH(EP^?;iJx25XO
zQwfqkFIB2u2`B=rO^rW;TT=D4D7i3oQt}tz)(V`s=;S7x+=x=vAYGl>8eI~u7E_~|
zps2jkt^nOyQX+Z6=s_!yp(4lV<6veCO1nvEF)E={r4^(>7+u5e7CT0}60FXO6s6Uo
zsDc8Xr#&rFER5zGrU}^!lrTqWO;<v5m1c%zn^*~)W3*$c1f!zbm1dg~%23+pQ5y`G
zm5`-0XDXp=rHx^_m6ZTO7BR>5mDd@R=J`s<p|s~JZ3`ltfWnE8>BKI=DWOG5`$DB{
zu@X!y+zpK7YfG$kX2x2LgTDb^1@c4u(6|>2_5?qUcLqv=?t&$OKnlu5Of?X8Cankz
zBq&5+AEOcdwuwM6Tn%cW2@`<^oloN?l4%NmWf_#wk#e8yrpBMmat(i7g%vbjSII{F
zSyW!0KuF%|Bb8TqVC7?jj~%%%m`*~}W10-MQ3j_7<`9Z<2=;vt@CW$|N0@w2vEV9n
zU?%9m02L-9bYLdvz;NQn;&Af|KZ6Wrf)H+k4$K4{7}OJ2tpl6L{d4NT$dCj9lqtcE
zLJ9W$D=Wcn{n$^S7JyOaowM=)8A%D|diBQ%wZP>{unx!ux)x01lhj~A5))^q2Rq92
zV1sY22Xp<|^<afp)`LM7CPi2?|JF2NuD7iTEBybTCJbtvN1#vx8Bj6vFK8gXeNb&+
z^7lb9dkH$Q4xTB&%Hue=rus+k61Lwq`AP!YFIR$<)1vUFN-%Y%0_;P&0!*!xcr@O*
z23ntT)$aiZs`|n9xWUA;V+nKncYmq}vs)87Fw%#qRWJo@fe5}`jBST5tRhJlw$;x^
zT|&$SU0D6w(}k%u6934+>+8cFaX}Xb$@+D5VWc4{pVozyC+Wflr*vU33C49{7~`t?
zDP7pnx1kF|kDy=4zR2`ps2@lJeV7dE18E7y8c8QMtq(g51^qc*3o)G-t>WXnb|Rq@
zJ7EeRcFVPceC#k(2T)C*MZ1|!jHLNKK1Sw@DCvA<=)vHhK*|teYO!n$@zH0^v5jB|
zDxfz(ri5NBt`j3O9%_!Bfkpy)F$~Zw^<v+f7uSoCrQ?I!e|Yt5z<WBe+33XLnB|{^
zUd#|vXXwQ+`qO$bjQO-)tWVdAVJ^h=Vm-QE?C6#CV!JC>S1R%r(u?&#F9y*U_AZ+K
zYDEVqW%-Bz)mV^+wvlvgDvXGuD@jL2_Tf^?hm0y7jjlJu)&t`z_{!GkZKQ%7iCSXO
z^s(-AG9i-@MoEvsWCimMm|5teqsPopl#PDd3bGW}lEDxNErG5j`+&XWIuJ6S&HeL#
zy;{+h<`r2ruU<<=y0)uiZ~rV>G9$EPfR_P31Y7`&0sa*b1N;l%2Y~MbMgb#$^MIEC
z=K%i<_#WW9fENL00cQZifGFTJ;03@x0iFkZ2k>pcw*W(c9wVgEKKeOiWLh#K<UnZ2
zkX)uEGbYQHU&5nbWe*%<zu&~~480ldAEi<UjgvF<Ww`#7Ud2~f6;PEKp(-;%Rc3^$
z47b0o-~L+s_OrPC3~oP-+y98$-_UPA7r%W9w@>2s3EVzzRBN&9Gc}p<JvG_1nv696
zOic!T*%j4fP%mO(s<k0yYBHouO=g0c48B5_jL^YA65=2UjT@mRGx}`nKM-Ryga`{r
z3egf?Gp~ybGF92&y2vn7l?|_hl8jVk)+?&YjBi<0<}$Xlk-Lu1R{X^Gua=zrzpE(&
zXRNEr^wEJdGE-R=nV~G}V0X2+whX%HdjWq7_$1&HfO`NR2b2Ro2Dlq=7hp5sZvbV0
zQh*QeQNTw49|qhBxC5{W;01U98v!MN4S-_6hXCsVw*%Y&k#yxw`nitj+;3pNtJv>4
z_Pboyl)qn3Zq<_y>d7)BM8Vz{Pj88*A7JSWEt(1XF~H4$+e~r&7}KvU#g&zSBEZ_j
z9bI#V_7zgoT&BqxdNbrKfWm$S(wmUph;$9o)h1nAW_nLsrdx)tPFu#v#h+1I)>74M
zwx;mSRUMG6nqeOglE(<NgQey^aA*~<OTfs$jkduvWsr+B*kG#W$lxn+a8rd{0y+iU
z1$#dM_NouJ;Fi?Gk)2|<0ZbLk5!G{CLJp1PsP5n*(3R^JKk!uK+Eg{fp;}UPqY=0b
z2dHLFH|dav4#YnAJRw^-53WkCib4?b!41}?ZuRh_a@~Q8L;UCv5(qN2B3z@8+odbV
z2XUnkS8QsflaD|JOP&N1{OES%M#JkkKJp@RJNQv09ga0DC%jAPMWL}I4<s;pqcW#%
z9p_;1#IxM!juhNrT~c$AHS`dSrfB^Zs5uW>N$jCDg(*G<c~nR?@>LL~#!;83Zh;SP
zo)}3JBQUAL_PstGHL*AA!xBZUB8?uohmgb0Q8?<*d&$*<%vprFsTrZ715_9dP|+Eo
zqQi+F3scF`m#`p#m2Ec4XpCB+8P&=Tqgn&j7KUE*FdT9q3r8hkq|XxTOB;)%sWq4Q
z=q8N+1Ru3n;2#z3w}62lr=-S|kv(94t@4%_`urRp+n#=*J3V%XVWiL+OR<a{w2VAU
z%H#`;>1F9(GY3`$jt7Ed>P|8U8QyS}>w`gv4DlftgqT78^$hPVRXxB~wW`m&%YPKT
z-D8$($nX_ugxedr;OZC!&*(s31gC_TQPLrh63*lQp6ZW+5m2kqwtb|I)=pqc!8O_m
zY$=$loxtXUIg&gZ=WVIcAxSp2QDF(&sIZuAR9M6|DlB9h6&A3K3b|~f!hE(-A%|^L
z$YvWAve-t2Otw*B9^0sp!8R(`i_H4czUkz5p{;pmRg-S&l{?G6n^4xoraYG1Rya3e
zv=2GdKAYMvr~?6+1a?A4^qoeol!1N{+U05&*rP(QM^3OuZeXDZ5+wo)Kk|3qQ>#2i
z)eq-`E#<&IADB~MpbV!5U?BXz_6YEC8IdhOvN6(M0R#KUvyGg<2oF0AF`PSvsLKNH
zMY!;yI==%Y!r#SjLkh{xFCYcy=I2oD#T3jI_-t}$#&`-iw-lev7x`Yot-q}5#jBN@
zh+X29rnph>3U<YWQBPtPpDVk^%vYL{oLeq;k4ZSUG%k64_ZTL&=`K33Ov1NnhG8+`
zqSL?(&sTDfA!9A}ldQm_qfO*m1ivCo7Lr&a@GX1H&~gZq20npMplrVJEcu3D$Bzo_
zkfymL=^9Ndl%%<u=9Hv4nkGt8x~5@9q-mN>lB}90NRkEngUH*7Jz!=Jq_PK0>;WTt
zAcZ|(U=Q$8qYCPVsipOyjvTEIb!2OOs3S}3Lmin~AL^K=^`VXotq*nBS>a1q;fq<}
zi&)_cS>X#<;km5v`7KpLjB-RlInII14VeQ?kwbB+AsOJ;64)2fXh#IP!n<5cfonS8
zD4-9}ld{IjafUT%0)EnM_%S=M5u+vsOZT}Hxh@LK8v@34V0%F@C0sp}60Ye<3D-8K
zz)u+ji#qad<;4UhmcKmw9wxHA5&<c2D6l$E00C*V%{tnB+2)kzcn+?Rg3or(;b@Cg
zWTs6iX1F&N8obM$0MU?XCX4WAWY0%HdayOdWgx2d$?J!`%N@vI18|1hi_9Pi9F7G;
z5$AWN<8D39{D6uXMO2^&i4}40|A~5+mm`A@;5Ov3BHTFkup)+W_bAT#06jB`=s^*K
ztcZ#)Ba?;<9f0O|E1Gc}WJNrRyO(fw5imZZh;iEE!;09l6`5kla1JmOZ^aOfqpXMz
z;cg-D(+Ln$^u93NQ2a~u1u)VDKT@BqQbZ;PGS~nDE>TzDkV~Pi;Bm7aXMR9Myac^B
zD^P;OO8C?(r_mM2-~+f*ut=c@H;z3Zu>Nmhqf0(jRAW9JAESH>674A>w6FWs3#5*v
z-9)Q}D0X8BbBfI8xRjO#s{noi`;0KW54`vSJz8Wb;_C5i*e*=SHh3dv!5cXn?ju<f
z=CIxI+KgRV+qD<4ME*H<X{8hi*j|;`p(Xn@w3uCpZ{NDhVKh5G`61e>RU}w>epi)Z
zF5md{p?fV)a`$Zf)X#6b@q5OyjnClR>ilA6>Bg7mWIL?R+nwQ@ab}9?;444l&2e~h
zY~CEfYeo-XhgD4n)>)g{=V0qBQDkTm_5EJIT2CG^yBfmPljiU~JAZdhirM+Y_4+Ua
z>kV=w$a_~b10+B_zzGlm4uFmKtmxoHXWgyk8&4cC^%u-3+jtVG)%iq5>BbMfy5(i7
zbM2zH+qli~#@(IsA+vMidU6!U-j+WU2}blxqQ$Bv!u{RJ>rE!_Vi|8V0to{=ykFwM
zvju~&S=VC&&f^ko+?c;!jW}Q;sNmIz4XK}>E;;`SB~uS2%G0LG!>)jMdBeBs<u%94
z3ntjXogaUml)l6cO2iJ<RDfYsYyEuS<g9kJo)RQwz9fTzw9S5RD;CAsZ*Rr++F5UK
zP4JBmwtNSZf`1nnM``|d5{x4h<?)Rj#5npfbl?*u{9^BGJrWxYBR1I5sK%M`rVHOz
zVWOwr*I4g2v)&KB)!v^~*B{0PWIK&hx9iP!7I#AoAm(LOeILR$WL^U0(z$lU^li1e
zLg#sA#g>5EA(H~*V{#ZDlg;>;EXK!VGCpP=<6|-yA7huWGq}3`t+HX5XvDY8k_~gd
za%0)XDo``4vpuJDqrdKn^;YMPZ+N?eV&w;QDt33yQnPdM2leUPGr<T2ov00i6XZ3o
zA0Ndr_O-L?eK^+Q$2~ZPuLPqqLlaP0&|!1KIVLfx!J!Fq7E<>`CqO$H6PxNBiq|!c
z?0SJ0S?*oIOM33^@d+Y5m&uRltYrDopFr8qIfqm~$U}l))M6O^QsqannUlZyt_YB#
z%Gtk}AOzA3LIBfvk^~v9#Uggn&dbL@@CTcD`MAW(C$MI%#G17dYt~AvSu3$-t;Cwe
z##w6q152AkJ(YX@5Z`Y<y}m@8JX>S-JFw2!_`uFUC~ypP+z<Ep_7vI*N}FkG;gNC-
zdz{Mou{H2?$BNN!psk{@{&ZS@Wf;U`y|94$_^}n~M5RWs;bOH}uJiC?3iG8Jyp1)b
zLHs>%DZU(IVcDgLv?0F6bvY8bXChHy9ErqM?x)YePoH6tn`t3jf5BMvD0j<q?=TiY
z#|X7xkRK-J4i6FxLk0GM;S6g=bu&LqE(GP23`?+m;v%gn;LX?*K1$dsLkkX86n08}
zBc$CBgWS$j3FIuFft=7Is@v6_0t>Z(9fFwHJE$!Ig~|_L2Ryif-C;kFHVC9`2hxUs
zw5>o|wVs!EJ9)WH<mEl!Ra$I1T}r~&=`C?d%o<uaRbCqyHzyc3Cm1&;CV>-^z==uV
z#3XQH5;)&{5`?#+ZAEroT?O2CVIHg&d36nVCLn!aJ3>b6W4uwL5Nk{)>vzm(9czag
z7k#}wZTKwu5)<GoCI_;gifvC*L4${t^x;$K!+Veo9o#4kW49WbEw92uMl<x1tDK|+
zT7{ZeFUhDIn#ol*-n$fUvlMT$wEhixBQ5}o?c5Jfye9$c67U=8Vkqi^^ZK|pM&f<q
z9_~xWiMY`!6l9DO*e9^99dDI!`paNjb)xE?K~!D4G`G61@D24d6Hs+u0$c=)101F`
zR+02GPSVd5l77Yo@u<dSl4}c1a-9>~97Nc1ZP@Z4n8MYf30}sga4l@PTR0P;co8?q
zIb$bEH{QNK7PdND=e=Ea=eAoC><)yr8*WKp{A1j|A7k#g6wd-%(wmWBOFD(Az?O7`
zpP()26e$B+(kX-mwxl0LvP6%Afw&nI!vb+LC~8Fp^sh+fVJkZl#Lb{E7l@k?LxR8=
z6y^efGbqdjCb^s3JYFYoMmg>waE1d3B4_xJAaVwU@Id?U3$<zm5=73ZM*`KB9|_dG
z8WMD*gan~8I<RvdBsdrs@*v|uI}j(EAajhAy%DW@)3v?^g$;nt9RiK(v+-&_sLufC
zjuL1IbOd@M8`o(9+1w+pb()uK?h(s6?F>KKou;jZ?WDf-MZWvY`F6wkCgFU)rS;gu
z5J$#N!&%M62ajQ&yp!*0leZK?mo4(6o!FHx*Ga)BKOiAA3I-EaC^CZekP!<jjBdap
z3l$l#*flb0VUZf-a6zqxeT<A(u!SXd?~^G)f;DW2<*OR!5HLioKBwo4PUnMR0@rlw
zQX}p1$1U3B&&+8E)1dE<q&i@)qI_<Cl=8t|MfqT_(!)8xovFq#Wi6v^g|L*t_62q(
z9?}7dX_%cTUxl8pnTOw!3YM1T^H1kfYb9JmT^j6PY(FA)ThbyD-*I^??&pNj*dJ(z
zO8K~X^bB<im}pqE=+$*)#{JjH6<9zkv5;;B%T*WUpgQHCLgm;NLgMt{g2?&A4sPgK
z)$am{V<OlRW;R*O%qEMN*<>Lzn=D{vlU$8Nu=#2=)}?)t<d}^lrSo5qq%?{mWoNZq
z!)lq!YMH}oNoTdBv07lw6IuC)^Fq4q*+^4TBP$*Yr9@QxIVV|4VZ$IaN(%RaSB`}+
zqA{*Z>tY%Z*K(|_tqt5HlcCWq@sJ^6CwJ%>c*a8cr-9Xx_&_@gr?r@c(^|yBX)R>o
zv=*>%T5zeyI<Z@7a<I5s^R*L@esi=Fh^v*Yoj_czEbRp1YGpDZW*#$wWe_J8XqRLg
z3)*F8()Bg0mbt8!Ijoj+R!bVI1>5$q_Us0iC^aGE1rwfSRuv)_psG|>m5EhlWL2fG
zstl|K^p5|rhDg21`T6&~U4nZSVO2;=#uQQCxFOD`zo{bXjg&@RH(ahX(n}rxJyf0W
z<B5|uwG9YNd}kYCYY|u4HjWe=YTHGm6>({m`$MwGFv0E8I9}a%iG$eL6gNP?>Hv{*
zU!<En24R4pX(`t@VBz#5wIKz|S%Z*65UJ!E4k>0(4cwL?%E&c^NHMc&oJcXdYDDZd
z_kkjNpki}R#f5@=jIDU(2rMwlIXB(*c6<A8-=EamzW4t*dVBf%FYj&gN?<*Wy6_?u
zK$8xn#QO)4qNkC8dR{jO!+inPV1EznI(>2Xg)&UJ<%n$*WTFD2(#;SjI%s*o8Qs34
z@G_%N%@EAVzRM-K@|lvHCn3poar2Lo#6p}{Ig{jkf5DR66I|_A-yOxEsBzp^6Ec^3
zhRg+CgfxSYyht<XLjuj92Z=+*Ql@JL#cu9fPcfPjA|Wr(u2V5anD%H<Xt9=PQCJ2S
zYf)GR7im#g1{Z2kha@e~qOc6+YEe+=`Es3$mlTIKhzD}CL1s!E!~<E{ATuQn;(>YE
zATuQn;sHBtqawOTw#RFj?Qt%%J<ega$8=_UOk=i3E3-XXXzvw~yjd&OU>$^YGp;HW
z4{&2&QLCXQpyy|=E5w#hdSLdtLLenQFng0N@O{>=gxAsK?7!#IzmgbpZN`{`G(*nb
zA*eeM($GP^{((UzavmpcBXErPi@>QV<<JQbuxCNco&lkI8bq%S1n!g*b^x3o6Tu;X
zARc#sF~z;XH<G&(e0LAG{m6Tg=4@=Osm^aKBBLGC(fh=M-0H)$-Y~;|Ttz*5EQ+hB
zXQ^=}BfvXm_#bD6|BEpEU%~=84jK=Po9Qy7&7|@5M2kon<P&?jqJcF+1q4b9?8j@Y
z_4rAXI77G&LdlCz3`K#Q!$8b4K+3ZaPJo!SB7kziqy*M^K$Oq8c<=Rv$mT(IkU+l+
zDb_NuXL1y48+a}`3Ze)`N{;&Ymd5EtHKoWZT8+-5*>88behSQ_&KyA+{o?Y(toSnb
z$^Q3d#q4H9UoOoGjc~#z_Hj%5ii8a3w(Qc4DX+YiYIWYZ?Cp+C#xgcGQbM16w*zDJ
zTK<&AFlAQeU4|@4sz-L7tSWy!@wp+eJ8&S-AL(AFA-Y4KAu_m*mMCo>@knwVB)s8u
zS`)<RbQxP^v}ZtsoB39m?>=$9PdHy-Ilso*dK$8HJwJ8~(U2fapB81vVO<e8gb^Ex
zLP?kgfe#KcX?oFhMdoIX_2U3{;mb4;W+&uLi+3b`&7aK@_^u0iJV|*EL6eM5V!~T9
zUu5pl-}VUi>XSuQI6)XlqaE0%?ME2o#oB&^L0+WoM;PRV+J1yVUZCwq801_sS0KtV
z9HB@)ov$57l;a%jIHDY9YsZ~ZW0rOtQI0dU<A`!RPdkn%#~H-gLjIkS+xEL8`5IQs
zTvp2*R!cgoC5_brVIMT=B*|^Cby7tZNoG}<Syid5Dif>9$f`<VRmJ7DBJ&VOhRDYw
zJscmF|3Qyl7k+Va<cJ0FvBo0SaN8u}2_cdY4E)0?`SrD)91jn|Fa@?QHi!st(DXwq
zJ!}~ZTHtLeL!TMzr+kEG&VMG$<NH3-V|D)G+P6Ew{_)xb@q^{D_gbB-RzQY>i^8-F
z=coGAwh9(#tgW2PjB1-NVR>w6Xohx@565Rw^Py%=?W<S&B}fr*JLB%@DNEi%ynG1C
z{Q{`N3!n}!fO5Y8%KZW;_Y0uhFMx8t;LVl$Nfs_FDw=~=_d9v@0JIPduy73q&QfG3
z#6MHFXna(~b~^MYH*z#Rb~J4)3N=lTj~+mLG$9sEQ7fBiZ)*(accw>gOOI(OBd4t~
z#XR;U^9Z7f^;^dFvtUj_KB55z1C~HRf*n)q@HVILHY@QqEAcif!FHX%igz3<-XK=I
zV{gQQ>HXa^L%FL#{6)B{?ha^vuu{%khNYRyaKiE`KE*wC@UO@8dX(c1zQabdIM@9&
z_rw<yT=z`VD=8&phYW68ZGw3c%tj+ZL)P;uR<a~3)NXJd?chQ}80NOOX@#l;BUB9S
z>_*_HN95J@z|~DQJ|GA75JwY@GTmWRPKiB}79C7%rQDwmzrO;ablAF2L=gehXb&;G
z&QGPsPSF7|VDiQwWPLwUOi`>f@<zNEO|gwYo>emHgf(g-X2ofFqk}x-H@*=<Cb*wx
zxqExw<9=pmeHySQS)abnE&GR=)+a1G1NutxSLigQ6R4pX1Zofj3QOC*qud)BpeSy2
z3~&w*1q`KL*#I?>D%W00mFq61V*3VSZXJceq%SpGJ)Rn_LAdMMo>X~DPb#6bPaNbv
z(Zjr5#S`3ff2aFH!Wj~Ngxd#~TAe@5eY@*me{NzO+-i0n$kktaHm-WolxrRM!nmuR
zHsxCPK(4O0!xUw%db$gb?gV&cSH0=-pq7Z2S3XtV;&^$UczN!G0u{bO#aOYKPmlwC
zK%ijk*oI@>+N?IfVHEU2zs})!YVkP5edd6!)@GO+0`o}LFkR_FrZdtdX-+bmkv>U-
zLFgim$cLPaZlqVzV1A3?h<wS(^hWxn>L{m6tYo#*-PL7S>~xoPGTP~G>)6DDBXV6Q
zv!3q0PF6qNg`Et4q<g9v;z-OUO}gH`W?Uv=TlP!3qdgQJy01NqaJsuaY;(HDz3ea7
zo$g`5gKa{t_K@p6>CVW2B3FZZq;F)%)nFj$Ga2B~^)F?>-lcym10j<2?`6P1N}tTY
z7eK1P5JJo1p7L!Izrn58|1N0|hq!NaC)PD_hBnEM1qK>K7k;5ZEJOkgA{HLfAc}Ex
z5vSa}oN;%r!nnJa2zM{6Of#7d$4sU}Na!KI&8_ZM{Q{Hbv9w^nknJy6zxzD5dmkC8
zm}oS6b)xgFsuK&}syfm2cGQV4aL;K81aQqjfEo<_^sb}?pZe$VDVrfE1JU}y$qd-|
z^Nnfe+tbgVO)Fh6dCV9%jA)1L@DD=l7(&F@Dukhi!`K<<l?wUT8JNc%h(nG2PVlbj
z=hQ8rc`MCwt&@+f6yyqlAFIdg65)Ynq3w>9Hhv6FNRWM0D4^+U9Jcusx(5-`XbMkT
zEB<4?PPQwieIM)NzK<1g-$#Fv@1rR<u1=3~+aoYjNU%8jU6O=Sp$mtTu2Yf_#7mUW
zQolozu)7MnaM-8?`dSXndoovJlN*R8l51dZ1R;WU3seZKI7krud_jK@QUk<CWt4}E
zn=rwuIzd!*YN+a@5Y`#o%fve&nFmUTgshE7?5a+VRh<@N9~dq!Qgte<>LeI@y>Jm0
z&2vcRCv@m%xF?=?mq^l!+{z~s7<rMK;qH8qBa+1FBxwRCAW4^yfFxby^g(N$B1yqG
zN$QA`q-Kz$7?}c-cQB4~GdxhwkrIKt*}lhpIZRzZ3dV7cNK%aZ%XL9L$4zvp)fc(9
zNRlq;56s@eF`+*&d)+kmc1Y5BuAnP{0Nf0c1QrAniHCQhT4h6Gh|v*d5p-e0aL=d`
zSW*KF>9q}qQb1Rj(_?KRKMaowY&xdoh@c)y=p^J2<g!-CWqWkFj3gkn+J$1s1+NW4
z&oOd7M0kTXtW2xqwl@-bbor@j$UyEQU_z0i<SGuk(jZ?|MRD#ydJ!pVt-{BZ@Ir_n
zigO>*OGrDA+Hf7Msfyve9O(o$9djwzXKBE0H-m17cBJ^kQSMiZ5^~lLxZicYCuhC6
zmbpyWU`*06$GC6qEfRQQQQz5p94z2&5jVj(@7P<q@kX_$-s*g4?%S0zJ~THWWkB0@
z>s+1ky}6X}Mt&ISb1(M{h*QEb?m!1)m#0iEP^&@^CB^Aqp&*)A(0<7M(-+=h)e+cR
z<{AA8ch46R^lYZZ7Ct3!m&MXK@Ygp+BnX@e8YYuvm|UotzSV)Wnb>)xK`74M%t|oM
zeeJRL2*{fgkW%57)&!IA6K>b%fkW@$w|z*C4hCV$z!!KlGIf$W64c1}TA8_2sDXc4
z2e#-!YrGs<WB97ULXa5HpK(9i!%QGrWv2|SA2}=q`YU_MnSwbnpQwCBhBLET2l4f6
z<q+BbCD}2nDa}4J`Iq6=eEFwYVD#AHFo4-N$Xf+0oT7ntBSQ;>@N}HPC;l7vs-4LI
zm=ll+sDoLbvN)IINC}@-=15s)Uhqfo6<C8^%+#Q66|wdff^WxnB0_1g5Ip^1T}d&F
zJ*|8CH^I~27(1I5gLfw;7%Vchj1M168$O(d&<evL^Kc42FG8PrfdlC1Ml*K8>w)Xa
z%tv3_h4wf%3vr@*k-Luk{NBNUxsWdyVl^|w0vZ4<rV#4@c04ECAD#D_aL5%Iii~Tl
z&9KR*2k|3x;K!n&XW2Hf=0C__t}@LP@vz}wViGC>+!5l(JvinNj}o3Gf&B?nth^t*
z5Sj9K%lpACLBI=~mG^`Hsgd}=VR=6|q)Ko_Tac>)_qS?S-g?WnD?z@(iwMAPj<=e?
zj^Vvv@@GD2Ht=;AFLD5-ckYr(g*E>hu7XOv0V;I~RMKCL6jajhK?*8KK2!}vC4DG~
zd_&_V#((G9Lu!pjch`u!70sR{hC1#oIQ@{r+dJg0LGQ#qmIA&R=o;Z-_3Tq!SQMg%
z5VXdMNH%=57veR9?StS+UHI+}!Z11!6_OdhPQ&;G>H2wd?0Ez+O|NVjIcTNeGzzQ?
z*h{>R4@S`a_4Ey-(GdGk3w$l3^f@C$e3TF%$6BeBrTykLlD@-jLma+UMPm~US?N1R
zL4=J&OZE$~LC`<6q|@L``RO#VBf<xI2p4a>1Ze`Oagbf3q?fbNK(kLUox=ra5(WKs
zlw(Fuj$b3V$-TrwSnR`(u{;@-C*s1S2!y>9KPKe8$N?*Wmawz~O$W)$6WAwL0-ZNa
z=|{+|>NpT}5GZ^MhMtwMNUnrMawRO1E8~0a;>ZdK7LMmCyv_+(33sXQ*+;w7TEbU!
z#^sS(f!t*3p>M|+h;*wEcA`hpqu0O5SB%PpJAXgL6NG^6KrA%`Y_A4(hk)(X!1f@p
z9oWxey86Ulat9xs@|&AIg2(;lX628h*7#@|Q9P1&4$m<@;bK0x5giI-Bry@YUhBnJ
zJ!D7pa9c`jhjlCnYK?x?5g+z?vXw#W8QTuz=|G<Y`J1tW5y<}~fxarV2RIDm$KEbv
zj-5p)D|{1eclyY7`eevxS6c8SMzexq@W5Vw0l9%UgozbEkF7wDEgguP`nA`>)^#zf
zIl3c_J`L0$L{(!fAHKDyKVohj7)Oj$E?R&lpbi8H+Y0nvi%;&QkDRj7SKIp2@WCxE
zY80Y_^sS+o2V2a5;s}x2hA-S%A3OAzhHtl#?Vnct(SGw|!xtn=ndK$y!$FDHnMZCD
zVz<#J?C9lVX3TYb9O;A*J7FDbwT_s{!*{IFiU6-Bovo1TnqfWp4=&V7YiIzh1udRn
zE51a2(Fyz1Um+WzR$-GwRSf+?e&*+plAn1LDfyWXndB|_gv-`TILFu}eZ~b6IR)lN
z|Kf8l;w7#FR0|vhTm^_`jdp@0q2qxO`Yw%W=HeT_g|-69K?kf<622hEAq<o)b>x^a
zb}T)%RG{y>RbY#y)iOM6gyTlc%4p{B5$kX_wn)IwquYx8m&3=*!%JBhiz_e{pZIOd
zb$m;ZkjE$fn)|*=b}qs#Sh{rM*KfEXc9F$;!6oiDob#|6KRBq8piKKa;f(b=?g^EK
znz<-8zg5k2@GY)+;6&e<*hF|2V#<8t1oy%&bcY4XKJ*5{tzc)H2jDj9K4FVrd*KNL
zUO}*}awF*j|G<@~-sLXjC<Hih4Lh$y9E!#wZZYp%hP&r*8U+l+%h)sG`&rmOgfe2R
zjQ`~fs?IKPWCvw-HDQV<?_%HJQ1@}ahl(<>TLE8?#%={I5~65PFyna<;}*6r6xpXY
zp~ooK^ca2OAGt5@V%GaA4dM1GfTJBq>q*2z#{96q8Q&$tid5Z<%pBi{%!J5LNrM=|
zw1*T(T;)gRVhV3Z*eh38;N`M;r)QV`g$h6WN`>A*@xV3M>?eUX_(TK047tjY!v}Di
z^7P0xIQE!W52a8c5Ll7}0hxYe_&3x>{56H(5smzKGYUa29{|yRSo9kly1|g5m%oX-
zM{$}Q324h4XBWO@j51gxATgCcfLw`CKnVXsWl$ubX1xp<ch6zOqky6KMmqgvhR^{q
z%nY9>@a4!gh#W@&J-q%hJvi>e?nN}@R^0Z%7VQDJQ}rIvg8{i=eJ)R>Lah8e<Z>ZL
zA;5`iXo!eIF_o3^>xU;HzTrFwXpR@6x1<?`XsnQQ{(F>7LY8_!MXDYVNdHVOE9NlW
zKZ<_t1N4}ZN2dp)Gss3~F5gDkG-T-jG@EYMy9LKVeRwKaYY=EC2xyK+Cwlt!FZ>TW
z57CJ<icTcjc=yATItsg|^z5Fvp4}I>jkxg<nKwXS+T2)=68(C3B!oVysem#wga7&G
zCRG?1(S6`GMWjBYg-AWf2@G~4RGo|X6y(n2k5O(QG$JqQcwUH<@ZO2sKw%NN{m3mM
zcQzmT++>kZNw47Gzx&W65kk<sN;dV+;f14sp+rz8hLl5SVvN0XE`P`8(09`@%2?O+
z;E5i{ML>oXblZlBF95js<k!)X!%THxPWi-zyos_+;IT`9i~8G-<8T};T+IJ}521zm
zlvCtaPPH(<h|42#9ky3Y!sC#Wv*68@9pu7UJzT5(5*RmmexVw&$@85mOv&>_H7GkA
za*ivZ1<2=LQ6}HL$i)vPedFs>j?ubwe2+-q{-`ur6j@LdtMXvlbhN!h9z~v`DCx?B
z>|>WF1^USIr`VT|{6c(ZV>>=o$t$v=7?cOuH@>jp5g%#O3y9(?nkGdtDi5-6d`%UA
z4=YufA##(L-DVE#2=oS?2wbl^9O1SlByHr1(RNF$pK*T<r~bWPbwMF~rw~L6A7hjk
zI^`T&>~vbR+7dmUK2m3qvkPN&W_a=8BgoMvd=oe|w#kAITOj0a^wCs&F{paXZyBu>
z<b}dxXD)=mIxXX4cL*c5T4J}-mv=|*pdf-5+OaJvJ+7*eGevoxLtfw$m-9EulL5av
zANHnP0o>FA8=O=B`gAgCj!ShoWeFWE!$|2UlwqcEh_Yl0msU)wz+)A7tP&pEd$^l8
zuf5)D_j~OXNyN)hA?IM0`a~!HV$-D8UhcK~ymmLETMoC^?(vBQ{L@W|Npn5_yT-({
z#-w?_K56PPX@ZzEPzq&B>Ta9b?ojs#>Z5Y5UtU;0dPErgx)mR}h9X8@;Ep3&pCIQ5
zWy0e|=)>h4AN+0P9FH2o)p9l5QUwkI)5|9o@{cr5LPaC03p}G=6V&-WbzwP0m({Rw
zRirPaBF>{GypvXiGT}c`<Sen}W2{X+@h1M)(xmEetMmPcGnpxH_~QYx!#TYRR?e=7
zJqpaP@9G2T=+a7setbELeFXMuJ}2sMT&?mL{yq-dRevVIG|MlL=wAZVzl;hhG5s;o
zR3L9+7x2ye7aJzkg*J78LsD#7xr;o7%3;)>tCc&+N2pvR2cdEYc?XrlsBhKE1^5L?
zpA|Ib0iZDt0F8M7Xv_mZV;%q+^8nD82Y~b-&G0D7&SAUlve|CCEVkP&lkK*f$9CIg
zu-$fcw#{w{+h(^|qiuGJ*fzU`8f~*%z_!`tYJ<Q>XL#R`np*)?3JrF@np@b_4}*TG
z<v6bbtsNdv#A&op=ZmBon_sSL#=?BSANY9SOyKLIPncy#xt#0KzXSw!RG#lkQj*r9
zG<29-b+iOU+2Ly0R$1;7Z{@2VoRo74agR=2eEEZum6DoMSXu28*YNERPO3Q-(JDk7
zbj7MrZ9Qhu<*JTsx4O_5t)s}bvE9}foLd+A)vWU9C)45R3Izz}Yo>K5u5g4-sjIuI
zz0`VvLt~i8avT5C&(aKiC#N9ZFWj&s(=?7|&{RABF|+EZh^ugN>!((iXpJ>iBd81f
zSX#oeo5gxgr;o=skUxH`p9FT*A;`PsJ%Wtoyv?D4aH$|%YPJ-%cYsKOR&uY&wh4or
zb;%%SUo?cXxD*zpv027`KUKjeqRsdsWvRIuF?=Dt)<SYcxNI1DRK#Tp7Nt#2e~9+{
z3G4Ym;XGD2KL?)a677_iYY=Js5S|ZMi1dL4BiaX!jEEmOfJMj&2VF~4`GfqUJ10rq
zMh+4e;UEEltt2O{B*$8kV=2iom*m6)IhN$WJc2-ve2Ez`;p7^4l{8TxXSpVdBMRoM
zyW~+oXSrq&*C?p7Tyqph6xdltbO)&^msEP#Iw4oXx217DoMo85orV*N^$ZOMjws$U
zwl?61Vm?FE!4buMma8S&y@776uEz!r(iI}M0Q2sHLkzq-f^gYk<@uyWicY}%`Y1qw
zOdfrR+98k&C8AegwkPa|ZvK%S?=*JB?T736+#Qn%17bz8LrhIYlKGH?D6rOuw&h1S
zmI_Eb(?SqQKORU?Vhg0LmYQZmOD#ky%Os><Qj=?B)i6Nc3JXWG0en(CvKJIw?GP~C
z6xa)@uh=0(@({=FfR?F{A32Vi%45f&`2ttIwIcQm^sWvT)T?mhkY&`1m|ix7^ePi%
zY%pg?Q_Poc2h#YMlaq%zIf3lK$%#5vtwt|vAYwB@8|z+7IcOfdk+O9!rYzl23LZ`p
zb8v#A6#ScTg3$zeNlR4b9kp0@tAcwIuu58}GAF48Dsz&8dlNZH&4>Hu>mVzsV}WMy
z)k5M(jCu+Gh0naxqfSB)T*rn<oo!=5x-LRBjuTACYWFZ1FvQ__h^}#tL?n2IvD^+8
zkt>F4E?lc%LA=PLiCLjN{Am3Y7Dc&aG=lC68;8N8A>tu64p(7HAV3#pH3D>z$CO$N
zN2rr9$WSCV;27|03xxJs4MKN^L9PqJ)&`V{qt<jluK2KT;_s=)up<lu_L)y`w9lM_
zxo4Iu8F>JsehG_YAFyRs!K!6AdXagO3@uksTu%`yih}a`D3BQRJNfRwJ3Z*}LHY=P
zLttu<F7tiju)zd`5fr@<lnizQvTMME03{u0c=F&>&3^Jv&HXL$xzF~J6tcY}TU~tg
znJe!laq4?X#4GM4p@<ytZ^Wts#S+p9q<*Bd(o`7e>&lt|CKR9!eQ6<Rpf3_$5q;vW
z2|hme0m!gd_ZhDLSHj7^Q4sGk;nT3)5IQghsEq$f9p;_L{HmSgS6x%cbo8#jQr8_)
z-f~dhZssj@lWT+?GT!y!$9fb$X@iJD<_Aft21%*`Nvdtes%C>h3-&`0bEr*`3P^SB
zA*~hIYk+IumHg+Bf?x7Sv1|?*S{e}+1z)n&_k@Q_xz|)MUMd(bl^8EOmjZqa8aXHg
z{eX(N8c|molM)JAb1+GF^Y%LEe9Do<2k_t`RDf<Ax}iqAhj;#GEpC&Fu@BG_FGbfQ
z_MntOR!TX4ma@U_9e4K7Rd+ZgTg*NDS85YN@F)3S)l3P&Ot)2t*Kq<8!P|9}v<SNG
zVhY!L`2dye!0g1^SJ{xFH>w0(YYKfecsse8{3a^+4Ykm?xhc{()*SGRNXlUfK^vi*
z8^_vILEp9XiCg#ulvBhD#E^$Hdgtg7q)}vsZf*#fNs~8(+?D*RH3{9^r}!JE+7I0v
z*&+PAv-{IvQ+%SI@1g@dQp2}@dXn>cI>r3f%=6yP{AJ!d3YNXEzw1t~*IQOrw*Ib7
zWu5uB{wM#t^1a>x+${DMcn3PW@>h5}JM;So3h-Fxrp`>e9T$*ilea8m)3RmDHneB1
zDC_m?J($0txY%3mX$=O0U9BBS<=X8p1%vtCV18a+UU4yQ^ag!9i!-j>>&egX=Fx8`
zpZykhdNM=Bd3*CS?APY4FD^#oHWe4Q20h%~zNGRt<%On-FUDU!N(}}*$nB*Aqb;;)
z`n7uV(Faox7w6ljPA-4(O{Jarn=+_=Pd;kLd(dOcyq#rq(MzrLZpzEB+w+p1Eb|=P
z^mx7(@8K;g-HaR=-uw_6P7mT4Z>O^#jp+>1yL96H^1ROng9GRy`t#J#JK`UT@66lK
zS%z1CB&oH%nVo&-i@og!on=%Sy=fl0s<?nh|D$2~VGosxaYVtL`hy`)G4h}pR9F69
z2VN$G+f;pTaVwsidjBgPWR@1&F^<%$x8#M2Q5n4&3cy=s+3|2Fhz9S)KO8Shl!n^$
z!{S7tz!7!@Lq6kgy<p(^V$SY1-fnZZy4}Uag0Z;RXvj;nKT%SmXeuUA=%%i+cwy^1
z@5IHjEIdzt8P{IvF;+zUMp@>D_R3CAh8N>E^KZRPP({%u7;QZM&=#BB?rsg*?0Y>)
zXq4QX>0=-U#*Rmqq2G%41baI>5^cS_L1ml5&OAFhj?lfBCW4N#7`zqBa1rI~^>p@P
z^zznESKuwPdN)_2w_gXrfH((x3uvs_5Fl45-@Y_&AkpXjc8r+^?+uh_N7)&Bdu>TA
z>sp_2SGUt!TH4!=I?<6pFzTe<47ay)Ght1bMwD<lluu|yZx=*4zymZ2h=o=M_hL@R
zhp)HTlT>`tdrWsryt8Q7%9j2qirM#~^q}V;YQ;Z1W=Rw{g<A~w=xSno^w~81Yg66s
z1d7?*gj@#RZr|069=~Ff*u{7?8Ot`Uh$G0gd0VL21DxKQovp9?FwI5!Uz%CE2i=!P
zT{+{g)dqYQjKKXQ9J3Mj=1*aFybQghq+do6_j)**nV`N)^ZNZXFF`Bzf~;UnG0lU;
z8GC8s7w03*v*VEvBda(B#&zcF&oZJ)w1$xlYVm**ox=V+1?@rSvb~+2Yun@WEir{z
zQ<7huXx`r5gU)t5h{*!90EGZ`Vt=0XiKfqZKI!EMUyDOFJcgV)<;YCB?abTc-Go_s
zZ7a&g-?dW+(3{+d<l_O9v$8AK&KGCqtq1l9;z64|V{b9&%p<`LtUHFFv$z$s-|jBH
z7IPqRqhq~yw{KBKP3FMO7~*BuPM4X#0aGRyU(_&S864P)nltSdk?<g2>~MEFy|-Wq
z4CUFYQ4~mI7_Z)I2kO#MuWdu=pU~NOXH4NRUiit5;_yL?(u(5J%me}@`cChU6&4-U
z^#ReJ)w^wzxGTT3vj%H(#)iDIc-Jq*<jp^bL3x95WD7z3J)aaq1sggUa$~VA#$r@_
z7b8x<A0TnNC*#TdvWykMgYkzF(~TatB)63CEyD}kvxhSCOP_RlGdF-7vcED=RQf}!
zJhZN40a=R=7K31wWtIY)?Rz(8Om%y5naRfkI4R2u9&{$RfOV1H&&76dBgr_kcY27t
z9Xi2{)7^Md%HDIYAQGEFf4wEe#hckE067l^yNFKfB$?<kV*sYP0AdB`e*Rr(L<s$D
zzg=$#`wi($*RO2qEY5HCYz9SB+ntm<`Q}05t?>3;(_?u)800!V2RqSU)H`-NI<gBH
z*eJz+yj{Jypnb)AgFxHn{LVhyWjJs%#y`&vl)xh%Z?Aa8nasEvRxJqV?HPBq<Nc8J
zAhnLx3L1?WXy=Wu7<$X~!D88ZFCT1Bbng^r_9tVdKbcSbkaw>bXBk+bEA*n-FWz@W
zsH-?nxE2gp(AlmJPv+jP{7q$_$3k?_lMydynlFgI%~UB2U-CT$@4@`<d$7Q^gD0fE
zME_yQ$-`}05owGw_kwf<*@Jp}!2_bSkY1D*6vHy`y2BRKSW9TGgp5;kBIKdz0G1bh
z#E7eanz0Vs?;=7B9uN=p7Q~0Lv)!4Ocd)B?Q=X|bK?IZE=61ay?01F9yLknWklsXp
z7bIDr2L<R$>Lxbp^25eN0dGVvJG%rB@TAi9hu93rn8LaB!nLfSs&ybW=>?a9pz3Is
z_jz#13<2|Wt`V3->k;|{y$g;36Fr3K5+7}_!->Xqib<8TS8GSF5!rZC+)YLuFB^g~
zYiD0s{tDJslt7a?-*Oj?1I>4DJ{HE#VxsZhvN(QX^+ZeJ8T6#nsH45!t`%71h)M+U
z)Ef;DtN#kqrVP}bh$1S=+sg<YTQI3<Nq-%)8mx>BDzUqX|I6}{i2pRf$h^`zqGPos
z@hFw?H`FpOL!$f96de_(b4*op*#XhIFDDNgFtI-vtjH+duo?fSn-_mhuQ^Y}EEcfl
zG6n&N0isG7@;X&UL*kEx^2$m#3=p~*kUt1CV7v}i{|&`UGxqk;MXVsN%QP@q2Nb!u
zvy)B7OyYZr!9`$b@!!6lCZYXCP&tMpy+J=1ru-13CTak?wkes+g%XpI?tAjkZ2W-R
zLKXR7#=*y9&f`rWPk0OLD?oEG5A#A|LBZ?IDc0Zkxg8uItr=j-Q6_c8vqHf=xA*65
zXg3mpz!e=0^<Q?uYkaZ<yo|}d7reL8R%)aEc`|=lC|GPnk)a@QCX{k{Rxm&~bQhx@
z$g1Foii;B$Jh%i-C>SIJL~)cA3rNslzm{6(F5X4R&Q{WpfGo((N_ShkZl(uqr~%7U
zo)twJR`@b#?n5VF)Z2K4UwsMGmq~h4`oFo8rf+AjI}E~{xTqh*=@sjqPGd(Vx<@o^
zI*86DvV;yUuoPeR%-%B5%UMM4ip#Dioldb<?xc&}<eFD3Lv6hW!ItKSdV3AtT_`l3
z*VxgXKeeLa+9pE+Yq2CltKnGzzPHTa0oM&$k!R9Z(J8W*&j=wfD1%zDH{X){#;7F>
zRS5oUv_9Omm(Z7r@1>T4r6mMoJP1e_q{IxbA<--p(+l*WX$0DqNu;XN*-orqFxXp$
z#hlf{uuETXsNcL(Z-u*EhNQ(LFE7hpO427$MM93!%new|r}8JpF{yf1L0LE->+uxt
zz^<Vp{MW}e<QA@_;@Dp%NX|>dn!8ELjN_Bg>-H{XC<xpZ(1pc$SgCP{>l-pXBKLm*
DQ8KGZ

diff --git a/substrate/frame/revive/fixtures/contracts/erc20.sol b/substrate/frame/revive/fixtures/contracts/erc20.sol
deleted file mode 100644
index 14a21998f0ca..000000000000
--- a/substrate/frame/revive/fixtures/contracts/erc20.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
-
-import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
-
-contract MyToken is ERC20 {
-    constructor(uint256 total) ERC20("TestToken1", "TT1") {
-        // We mint `total` tokens to the creator of this contract, as
-        // a sort of genesis.
-        _mint(msg.sender, total);
-    }
-
-    function mint(uint256 amount) public {
-        _mint(msg.sender, amount);
-    }
-
-    function burn(uint256 amount) public {
-        _burn(msg.sender, amount);
-    }
-}
diff --git a/substrate/frame/revive/fixtures/contracts/expensive_erc20.polkavm b/substrate/frame/revive/fixtures/contracts/expensive_erc20.polkavm
deleted file mode 100644
index b72214b86c6fbe6e52709e79520160ee68bc6b3d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 40090
zcmeIb3tSu5oi9EkBs3DTBVisgeknw@W#>_1^1yalD~^mMlBR-nTAFqnV&ftKTM^p{
z12fx_fdmOV{$m2w7^l0GlJc;drAZp&M_ZbvvFxN>$7owEZW?a??f$*5Ti<NEm%V*(
zzrQmQ564bOT=&y^|G_>wBh8sJXU_SZ-{X6Jzcc<%ew^dFpW)aaZ{)r=%#CvHw5Faz
zv7aybM%mkM4n1|}?*hXw2Xnsq%8vihe`D9LUbx{mAAj&SuDr>IzW3WBx3|4*`pGA5
z`|Ib{zq)hZ(2LxY`wzWQ^Z$P75BI+G8HYJ`>ifr5zL}Oa`ahpvv;2)uJhJ((m$&@K
zzR&!(U;gXA{q<+KyFUFl3m^Q{%dYd8A2~hw>Hj*bGi-ct{r7{PnS3PV$yxb1*KZ#D
z_-}4_;a6QZ_WzF^uY5Hp`0{YzcXvKD^yb@T-&peV*dcw>w=<~G3z3#0twkz8`Y4hY
z=~GDCk@g^c32Dc}wY3jbKD_7QhjxVO8fL!Lh90h*`L;XQxRbu^+*P@=F0?zi=b@dC
z?fk-?s-1ft+Px>V>*1=Mfrobo9;(^7W5>fa53RfXj@>&Su6=0N&OMLr`oeA$3jWn!
zJ-X-N?X^4Et>~BJWsf~v`{>Sx_UwB23%ftRbJwn&m4-#S(Y;|k-E6cooQ~Voh8ogG
zjfa~0b)$b9{xR37yFG0~+V-@S`iJyQ`Ub<xhKJJsDg74XtH#@eMw7?<oO#`XXBOmH
zyD}fnnaEka<cmvv%U)P^r{k-RTW&b9GQ7sT_WFXNTYq`${p<SI-BP%|Fm&6}J67NE
z={v)BzINxrqSB(yq8}IiN73(#7OgK@?^z#M|L}%`8`JKxZgROV-hFEGx_chE$LlFA
zo+_^1I=Hpn`#IkQ-}U#dzVFD#e|`T$pNM}#@%u|dW%vHYOMh|Wwtw8#|G;-YnO%N&
z`7@vX%7b@*X4_}?{$>6{3oCy4@X76~cPy^__|AXX`Mu9)1s)FkJosGg8($a*nI0K>
z<hzgj^CQQ0{qwF{cJJE#((d2xcJFE1b9B!y_WWv(<I&1TAAfY;qlX?%JlayPir*AZ
zim!<`HGHRGp|n+gK;ACLWak&1U)ukrPc<!mJpTCo%EIP`=KU?NKJm9tZf$+4^>FLa
z)_-nY6#i(qCR`ux4F64dZ-ceWw6V~{bNq8^VN4X7!z)_C6Au*O2iJOY52t&sE%T!S
z@<L&l)5Thi>$sUCjvH$ILbT1H4mqNdLp|Y$9m+U;+#Ef`cb|Cfu;aPbJ4;RX#~MtP
zjl8_KE6jHt;l;z1XAVE}Yu6p6rrR!mW@)J@uep1Qj}2tVC%O(!#riGcYt2JbWu}Yk
zxGq~lvO1(}yOd*9BGO_(i3rkS<q50uq`kSmP;mIIx{pkS0-;YUd7&X?i4Zy=N_Mf)
zDmDnBsGckm<rV750#RPBo^*-wGWDcGl$WX}?V`LyJ!uu?JoSViN{iLQMWU3e9xf22
z9QCkEl(N;s4pGWd58Fj)k$TuFN}1}AAU4|6?jo`AI<>n%Y+R^zyTrx?YPUmdw5Z*<
zZHC%y6&ua!K|yRVsgWYF!Kg+G#D;V=;u0GSYQ!Nn=+%f_Y)DfhXroRIqnW&7btu_(
zCCA!jbI~*RNY-*G+b`vKyRs`<Y!j7_DXn%TVpZA%B^;^`9SjYH!jj!C<yp}sQm)Td
z<g*p{Y%ZV8;kCIP&GzOzNAnVQp=qknXf`OhMT)&ZS?p5s9Jo46*GtuQDQJ}ff>hO2
z+M`&@m2AI)``Ick*8oLPngwOARSDY_*{(ELl}16S553A-QXgswod^|$Zjy3SEy|IW
z7D@I3X^Bh9(pp1J$#9@Grgz*f6u^inc6y>Z#V$}DQ0!L9D-=8XUF8(JgMMhofr}2p
zI4GclCLFlwU<3zVIvB=*pAH6aP)-Lu9HvEXMWK+U<Q19qU8RmG#hT!h?6aJb6GMkj
zaP-s{C95E1w>-+5b^J$-eVne;VDwwlO@6Cz-5p&v>mMZR1zyUY;H8`d-<5rl@3Ia5
z7Y$ENq0!A~(fqaF73Z#K;)-*Z7w0Z3&RtrZyQDZbuQ+#cajv~MH@7%9r#LseI5(>}
zcTsU}W^t~qIM-U7dtGtv!s6To#krQ^+>GK}b8)VzI9DjnH5TWl7v~y^bM?i!X~ns^
z;#|Ji=vyTsRUieB>Ws}*6-Kj}SE}laN<cI!!GKYzt}w<`A>MC{w;D^0>8=M0*VFSz
zRg-+Q-l5hze5;CZae+~)au~a++{Uhe1K(YET#NLG5-3MCepKT%DmWP*5aLmDyv>Yx
zk7}b~2Yx9P(p|d3=6b2>BCiA{dB1hx*MHkwPltsjGza-7?JJC~x7ML&6cqAXtxx<`
z7VT1?oR`JLQoxNYPYU>vEs+9VWJ{$$f|JE%QlLT>mrH>Wd|4p{hLM3(i%`NQ1supS
zr9c6)MN+_pEK3TUMUiYNAj)En6d1slTq)3lOppS0lrTvF4w+dBSdnFb?2%cdKnz6|
zNP#+8Tqp%pe7Q~vv?G%OllbJNzyva#6u5{iO$uB<rk4Vv$P7{-AdBfzAk4}2=*A|_
zw`wxox9TF&M7q1HibJ1H;LC+{zcq7pof5R8KdnZkMldS1oH2gL7(XJ!ML|Vx_8T!O
z$)S4g*5*^_F&Zi<IKoTS!@N{8z)Q6~=)tUe{uk)WtOQ1QB{<B-Bc?22Vrps%Vx3c}
zd-wzxMD+mQInb$IOA;)@*r(sBpoz`(4%S!|jm!D^f1z<#f8Sd{`(FU@?*#SNfc!(C
z|81B6doTlbV+!mnHg5B+8bRL<BlS>ckEVA8dhlfcoozq<1tpkBSE|pZE48t7rDile
z{){nx_;Q_ncR}+}*8XxSSckq2psz9PwH0`ryq`?sanh7P9r`+OX<v(4UswD|`nvlg
zN>#bm)qd;JP1LTd@8-*L81y~A4gJgJEKTa=Z~RY8AGtx08_lwm5e*B(0fwy66ZZIV
zGx&hqut09K$kIYtzAk!Dh!2{gC#=!e?eW(#;>S$UgN}Gahp8kt$c;K#O1oSI2Dwo$
zOX;#~yg~(OnD}yoRc_3brA3#kAzN<DlBFD3&b@pMD)<12jU5G{4bt`|KD0&(`lV_&
zS_{q-4r8jd^PMWu_2yd`kD3630FN3)1|D@58F*9-8F<trGVrJbGBBx&yj;IRs=B~~
zF@pr_kSfyCx~iH$lNI<908KhRGO1Lxrz?SQx)N*xZK~-}X_LB-M=wQ>Y*Op__$gyF
zyh(kAkH-Xch;KQ_cRv&E;9FY0bWTn?cal4=>dzgqgtt06jq&dbovlN=(p}>>D`+74
zLkUjs7#1aXmX98^D%CMQI%LPQvELH-4P0T8#}7*NMVzuKH5d5g0Ajc>MASbdUjs$q
zume1eFEgHn2I!D>K;YFv;8mXGrHTaTA^&^7p;>W_$d3s)+_w;d$oZ+?blE4MoKhE8
zKHgm49KjiLIwW0Dm$)JUQCI7Y$>ziv(|El}sqx2-nWP{d{oqFRumQA3LPyzUj}C2A
z>aA+n009<qh9nFE-x<Sj@SS33q_ZtnVwTW5i4tQ>GRL}gW6zrt&zr{kQJGz-I?H#}
ztw_|N=MsFZ+nDG#j~_HE=$6>mP=NY-qbeKXr%loNjjF|<RG^<v8Do3QtUgQZw5hUh
z?3g)mEMvSsL#nZkbr_{!f=_gq67IC~4QUEmtW^0E4Ui1(n3SO&G(?YXj7K4W(fV%X
zprD>GbhdWx4XL3)sN2xU6RqahakElmM{%j<BA<|qu||sm3RG&&(l@1gf{*nZ)#HY!
zv=OsZtvAG?##oyf;sMtyHP+bSjKpCO#YH~WYDye8jy)q#*Cn1YjklU4)G~IQR0p)L
zH0=~8RgUstju$mj*bb7wQ-)532108>)OUEIi$+LCh`|YH6P(qz+CHh})?_Xub8fOZ
zpp|KE<R)j7LS6xtDY%b<>ZudEI6iFTW4m;5hcR3ab%L6TM;BuIED1N7p5VuNO^IIf
zxC(KI$8JqiYGVA@NmJrv#`x12V<IuC@wSZ0#<Gm!DX230`)TB#2=nLr1*O)%{}eiW
z|FQ9-pp$lfTr`!Mpbb_PwbV~YRRu{JTs8LgpNQIB!M9V?J~@}#YYJ%cD*eiUpbT1-
zA$tfq*9AV*ir(f!QPRIc{iH6GW!zPmR%k4Q!RBzS)+<#7O2CCtR02(qU^L0`rOY@c
zKvMy;x`;$fYl3(E+T>f6z+nvOEU)b7;k(v366=gg#Q-0xGbK#Ic)g%h4f8Qkpm|q0
z!pHXL_wU_*-}t?jEQUVt&_F8J{^EJ#_-nfHL+10{#<<sfzSmfJ=;_zS2Q!{9O@Vly
z*Z}JebI1~V%{<nfk?1y!pEOnOd-}d{uSE$AV{oRRfAJXN*fVL-qK)dH0j<Ua1_j4y
zLaLZ61t5p+#%SF}9Cp=D;nZm(C~uS>8^}lu=%nf<9<%BE^Y|@{;v@VM(p2n4bVoa%
zkTYWUW+c9EiJi2l>kQG?HpZXNP+vEwy@u1ew8TdJ*iBsGCgZr?IJVIgH<^?Q^hR}<
zAMeI=#J#IW`SC`uf+l3b_%4gGJ;smk&QOnTjJ|G&%V}!c#^?z{{4l0if>*mYM!|Fj
zglM;+>xf&bRr$mbb8NsO)uJW)gz+H(-AT+gAquf(G`9(wvqPzzz+}URQq{v_+DgGu
zJ`n|P$50$I#Udtf6A9H5M;XYVUW>Vegv+edVo)rW*co$dZ$@IT5QEZ=5kG2zk{BNm
z)Ps&FG)<N1?Io+3?JVK(Bs_xOy7pgxb+s~DCpVbnMnRU$vYhcwDJ(ZGkR^*OFNBUA
z9TLEmqOV({VLQYfbrCg<N%=;rEM>|vlk)g|T9p`q0+KCDS+blXH{{OLaL^9kOG*bR
z8fM6Bxxp?=d9u7DsVB^?p<$UUEtTcv5ZKg0s3&Mcy&Vi23|CXZ$!;M*IEiV4iG`z!
zIKo83(FGh~;^7D^EWlZ%R*lU`jT)Pic57@-+I3|%M-+uy02~RoVpf8yH9!R+UH>9P
zxW?+hy+wVZ1&nEw?-Cs}<4F26rX{{+9<K-IkMXg?#>7!`tOr_um>+AzZz?~wHv`?O
z)HLy9!x;*QZ0!3M(!%IB$g4vT78m%+Nae=LT|{4H=4XCSN{q6-NC^~-xk!YP)U5R?
zmG1a`W^`()$*os{J!mm*A2B5&s0n1aF$3~rY@;QyQ5Zi1Rtyqs1Yrw_0ZXD0Z3Q8k
z&6wyh^lQW%KWdBv5`pR1%KEsUS)`|&%~9|vzxAfNe@~8DW1cLfMs1FQxlC?cDoe{{
znT^^z6-?4zNEy3&9g+0Bt5kON^PEWavy@$sAUY{Yf?V;cw+zLreunfW(od1jBaI{d
zBT@qCCrCd=`Uj*q(iqY?q&JYxBK<wmkC1+d^g7aONN12vBgK$TA-#(91Eg1wzK`@W
z()W-?k$MbM#j6JBqu(%v_I%v{6SH{Lv&g2nEDJuF#VOYI8L~|DjlPP(uNkt;>>Iv{
z)xD_b@7U!>+2?ohnPt?@PjO<^S8;xr?(v*f`!`taV(k%w7(8qctA`9?)ga1@P??vs
zGT%y;c@bq^K$+)J=9?(<9qshDlc!JO^a-3kj?>2sN=;GAi4|Q{Jq9RD^3lceh+RIG
zCm&xDttW{HjX9|;M~(8xGWpn2`S^1A<cb+P1IEl5GIfYciD~jtn>=Ebk7dfo7hPII
zgGC<6mXBr0$8+SPxid9jfEgA;Jm!>6K5CMW3G#8Xd@_S-z`%pvwYz|W9$O$Ex5y_K
z%12WM)umj@Bp>DF5&5`IKADzm!gK}wcnE`hTrZzYmruZ^VC)qYz+M9{7-0`VIza-A
zY(g}Xh8wD%h#EuQ36~HuO{@nWfQDCNhvf{#zs8CjnqQ589BitFOP7L^KtC=TpoJKq
z<-yFEFi6!C2EX-|)Bg(I0X{-ZWP1^>uHF=l@#teUwkdjyOceFlrf3OSBGI*c*ANf<
zknqeQO@{yxrAalD0HQ7;T|fe#tpT4s4nA9ryg$ij#U!6?;3i$S>%m5pDgq!1R{rzV
zvJ%*;4K{gN2))Ceoe@IfEFpBM7@H*swf>(igr)^y!z@8~sTd=BS<=aJ%3hvbL4!e-
z^s<}|-04bEj8sI(EU1N$S9daquErf&O<E#UUns-8dTLYj1P`_&RY6th-xPhF>=p^s
zpwt%8$pJntW)!b_D7|>q=aBvq>9a_mL3$AB(@5n=pF;X1(gR4_kp2Rx45<{!kMs$o
z`;k75bRW{aNF_)<Brnodq++BkNFJnnkTxUTjpRmhq+|BG=wo#{@t{@dj1_%^eYul;
zZepJ+ae@lmq7}G9%RWX~mOxww)WwMbC+fU8S@iZ~{!y0C=43adi-DVvZbP~&UAvxY
z5Ci$?V(><!LZpr9$!l;*3|^0#3(}{=z*?MIgD*w&WgWiUidr@xU!UF*ThSGCq{mc2
zR(QEh2Dvq-Me~JtubJ3Tp*{XIlo_4eW{{ipawJ`D0c#NA8`xQoJ>Hp8b=IWGEhbqJ
zWavC?8BvcAcj{&s*&5WaKyI<fk%e*-qp}iK180x7PuHNA6`R~-l_QyQ+ahX%?vfg^
z<)$n-k|Vb=N;k6_z{sM;Bwo2%CpRsYBX+qhPi|cj<pfktj7(#8QBIC5liQZct;^+b
zN^sXRm9I4=>x@jbnt*--y$bAy^q~nK6zoZU0?!PR1mA^90)rHsi<D{*>|9<E8cK19
z&_Tu{2Cb8!a90rALKP-M^_rf>P0r>i{N-&>#z)Hi)^$Jo#XM#B6#*+CURS9`{81n;
zZzv+|@Dt=!9=dV=$o?beM=WGS?N=qJjS@6PD2D*bVb~AAz#rkyA7S>vD@(2d12X^v
zL#i<7fq@x-f#FL4!r`_Xe+e7R03+N049oxw4DiHNV_=_M^2fx$Xdwv(C<DQU0fPO*
z<w3AJPW~LQ02XDg-6{`=kwCDbvY)45flEQKcGw0Q3a0Y2V6ZTmiSxt3h8Yev^4>UD
z(H|WLE4Vxk23webuqOWfAz?)y7zr!*{~r<t80QH9YG4BjX8w5<%y$6L1}6UiEVDO&
zfwl7t1S?O{;D#T)^(UhCyDHyGQTwGJSUCxWcY<KbTmbAI4FFRrMIMcJZ2;<1t^~Z$
zK$QU09ygSDb}V9U|K~e#Fq=7rfe{|2RADJ-J52Chj>IltVHLBmupI$DRwN{ffQ8k4
zFf2@|7WpTJu8fC0Q3Naumh}~}FhYpRXRxsHSy<S}G!}*>!6X)jF|Mkc#=?d_02YQG
zLBG=aBE!RQe-I7uFbS&<gc6K55GFQ*hn)gIf0kDx3=<<MKEbQUQ<&IsL)T%qR5QXS
z4g)#>G=UcFWtbRQ^8<W>mNR06`AWdS;5tBH2r0D?TcdpJMPp(s6oLxiCMcA`#gdp9
zE#u+Nu`@s<fQw;(=821~%Sz&6w9@ghpZxUd)qoE%vH4(PNy-Y$0~gaJlsUK<Mt=qu
z!<f(DVgnj3hPjZ$#d<VcZ20oH*xt(Zm9n&*aIqfXVlaKN-bK@2sb~kMEFTj9jfHuj
zjfAx+SVWB9NEjKd50{$m(JQz#wpo|h42rAZD_dfB5d=FHGbLh{@ooz(A=4s^Y)N3r
z3d=iCW`RY=jv4`!#a}jqEhSMhECd22&``3k+L~8`k@>CelJToGZE0T7s^-<BWQ4U{
zrF#2ELCN$$$&lVe`YF<Rq;aHwL`oq21nI{}|9})n8bdmV^aj#dq`yb{5z-HlUPpQj
z=?v0oq!`jEq*sxCfb<H|_mN&k`X16KQjZ>1=>UE7>lsR>haCu%4A~_pnSQoy`88bn
zckF_r?DM<$oP(R;{4muzqMw?Bm*My4v|D_G-2zaV9#EMcP?;W38BV{Xo&Hwx^ouzC
z0!}}V)8EAD?`WsLojiRKr%&MYahyJ;S85>k8BC`C5GI>}$q4ypFd6W&%fe)U7a^Ex
ztjHNmhMd7<2Eb(S6}qSg1_MiogC#Vf2TZ2-TQ~P67!M)F0+vF&gjbE5q9Y6{8`%^+
z&7iW=n*fp#RA#;`RHlF5P+5__xs}{?{8rCz|KV!c$^X4b88l-JD$_;>*2rA2EIJ1)
zYiDQGBw7Y6`g2HsiS${d&mcXB^l7AWq)#Dz66pb?ZAgECREAWF<VX4h()~yuN4gK`
zUZfHvACeboD^fAi79<bSJxH68?nZJWIS4Cv(Z_0rxqpOx-pM{UvCmZ+Qhtk;-JxY4
z)3TMwh=bjn%x_QTA7%L*6wLs94Cywcy9`NujNxlH;FlYb3XwLZ&S=OP+E+kLD>6*Y
z!Oc)|Edcv9$k!pi75N6_>kS%OX7~^-(^iJA4lQHs;*W@yHCHtm&1rm7RXc2}CajN#
z$zufQV5!l9RfP(yOJI?Ki?_lvWrT~?Td`El(SonY!A%wG62KI27V7;Z)T;rUf?HA#
zN9z=Obx^8UiI`U6B1)*NM6jKU0xQ>6{Gd~jYg5%Ihuad=jYi-!9H5#wZAphbbYS+u
z=LyBid1zHqRSbrZA8xQ#Wrvq1$aOb<9OdJq$Y99SIN%zE(nT6LK7wBg@QYQcbn#I@
zu;fWF$;Wr0G#XyZ@zK{&+Rn#i3mj`$NqCpig95Q64<smhafwrQOmJB6#I;;}cN$Kx
zE~&o28rqLVQ?!0NV9s7MnLQ*^81Om5<A$_GekY8n3Eaz}Y=;kTz9X99h+;_<Yu}qK
zxD$J_0f;DS6(M@$9zqT~!*JB0=aPaW%vprFsp$dHAyw#gfavsq=<p=~!BiZ60|E)E
zY?EF>W0VS2uT-|{m1?NASm;F$!yyN@a7+}&226>8jPYoOQhkw+m0<iQ`IyNB|ESoY
z2?_)`B{igt?SuMjmbNF*=V$rEF3b6DOX6PLSb;f_W*YA`jlD=<^7#f!nPssMx-)bv
z6sD!_SqnnCca?GjSP-Ix_y`t+*n<3(7T%kydO)p8)qwHwz%Y8d$0$|P!dJ8bZg1p*
zt5Fm@qeBBxd?mV!5r#k@ocD)6QUWn30!k2VJ4kS}dK}*V*Qv+h?Y~exj<|pYqBI}p
zZLz^FidGgwu!6-9EN3wU%UBG-QWit7gvAi#u^58IEQTPL#SrAM7=mmTLy*N{2o|vz
zf=m`eU@J6gqP@iNBcL_c7MgTZuiSU^hbgcoG3~MBHp96Qqup;;2CT}UpbUj1GT4b6
z(RV7jQicY}XqSRTP>%|r9=V_%xj}^vuqX$p@P6IjD^*^-5`go;_Ht04AId2xP=Zqf
zC=mW%`vmy7j7cUC**M`>puhq0Y$GQyqQeed0^eOitjGlKMY!<db^$wTguhF`iX4_*
zKtK-7Ex_Tn7t%0W;Iql0853#H+|vA3|L=a3a_cX9{q?K0n@C;a<;LWq-euMmQ;T{c
zTk*NPd(2|Fah7w-rS35)=az;QS9XtKW}D`sgOy46R?S&hOu6XPvxVo&xyR6AEkZrk
z;L>;_xfa2%2$O{@)+l_--qtnuW75DU5CF=yFTX~<Aqd7%fDWl@ktklLss*CBP*q)`
zxIk4MqG(Z7%!mwCwThxyRRvKrA#{hlo!A9Nc0oG3z`!ohvkTJL1v+*CFE%LPZkSr?
z0Pc~i4&WX+>HzMMtq$NGS?U1pu}B@jJu=k++{4ByU%@J0&MIHVDqqSfU&1QSW0fy%
zt{P>WBL>cK7Hn?R7;236C%J~GgI`PNU{s}u2y}&Sm6`_EbfjUV0i>R^4Q7thZO9Pt
zVX@-FXh$GMbpk8hXVawG7$|QP6xWXMf^b?_a5Sx}x+krxrYQ}6%3xTCrr<u=WphkP
z2w0I2up&{wO7;YYxD(~1wA8Jf6r`nI<)l?w>Q_$Kr6uLcVQGn7IV?y^9LixUVsPLy
zDCHF>Usk#WDNpIPN_m2E&@L^uYG{|esF2gU{=d^HYA^rU=?|%$#bboTP=9EBXf2Ge
zc&j<yeMtb!w|NfkmV)2<;E`CfSZJic7b9FK3v|9!E+mI8%Sfxvk4WD8!QK#lQ=}u#
z`PrLK`&QXez>37_?k+Tf?Ql32bcI~NwE$=9@GXE;F{g?OR3Wk|KKCy%->PyH@FTf(
z`K$^zj=ijkGdMepZv#j@bE@b;6(g*QihdMQQJ@{EDcOo99EVvItvGuT-!33c%&B66
z;)qxk+bdBhfdXfdMw6`=#c_;P;lbGg%mEjYBTefI!$&;-hQ0vR7r|H6Z>_u@h3qI`
zMH286bp;N&H0lZ+PS)XD0I4EbgVviBs6k{keEzLd=n53@Be~Nc2vLO_$6he;z{?1x
zang;dg;U8fa$=AuZi#qQ?c1-?B%p|;^}+xmzJvvZ#$hh4x!x>5XTj{l@P6TkuhON3
zrb4a`*LK;OCMBzAl(OrLQcl3wmEB~V69u;GE3ZNX|1qP$(h3EHZ>1u@q=1UnvLBM+
zVGr2#M%VbA2n90~3TB>vyh=8dZ+*W1bEX&h@~uDJHFCp}jIyn7A~(Cfl3BX7>X&!j
zYIYT_?#i8DOFiv;<s-gayD!)3%N2Y^JUt?~s@oyQt;&F%$#LTNKq|F(ve2F6ar1cn
zCv($`uI+cGILDs8AAHC;=EFJCUB}iC396)G`mK-EzEUV;y8h$(2e*Fo-?zV6X(-)#
z_n}0W*_E~AgO1P-Z=W?nqqnC<NYuT;mi8$&4&g0L$PnH_A#Vt8K`0xAw@}m_!doaD
z4&g1s$W~}Eb%?>EcsRu1Q3PBjbU9>;5Eg?BF?bX*hZwvBG6dmK$Q*+3C}a-6vzs8}
zD+J+{;~awU?8p#>=SPMpJPHRy`|t@BtpXXM@am93Oa_oabyShT4^2ddFuZm|;Xr2(
z^BS80*M(+TZuBBh5>nX@UotO}8z~i~cLA|E6Y0$Xx3Rezc})c-I187hd5=(?354og
zgf@F2JtT*kL+zoy=+;fDKp0)LXp`zAj4o>0q@Lm9-5Kh7*jjZhuk+n!&b8^zH45hj
zO)W>iBvl2*PhoMZhz}n{T#bwGY?ZbbK=*a<@eV}sNVQ@(#t(_<t{X94uv*Dz?jfUB
z!Jv>y%q&_mc-e1c1VcF*;qZeJggs5hE^Oyiv=5msBCO|8R<3G-Lx7<YJgb$9&6I;7
zgWoi3w1J|6aEhXWnE8#cF3q2s?g9Ij%DMSCm4kgt<zU}x;a^z(sJ2gA*W`u_%Nn+F
zEi7v-1PqES%v35@p_OamvCg5?)M@1cGvyRS-Z9Htg}u!Dm*JhQU__H1+DDV?A{dQB
zp*E<X$Bgka)GaXDU;)#kYs~3$tE7r1xX_1rX-7MTCB{M3;-GSI%;lJ79hNLPzqRo<
zqY9!*VE|I3_6lZYEoWBNGG=8hWmeV_W@Y865yW&aR)Q{AfTCz;3S=%*Aaj@knavc)
zET%v%VhUs?+^SKz*kDyD9^A(6avi(NLUxx0>@F5|mkf3n82=7dKf*#u6`qd{EH<#}
zLA4@<`abF+U<D=*QPHgEP&{!Wf&oo%ooc5@k#2Xa#ENiBJvRkOimTORFsI)tzxmxl
zeIX>M3fx8HLv1WBemRSaU&i9%m$JC{B`hvJ5AY8k+AB8NS%Cav^>~rkn5!N~fP9X6
z90Bs#>Tv|fXEBp`5i^<5GhtLKN>&zqZ)4H-*Ri`SWOrG>?qXqg$zXRukWV}A0=X(S
zB0vrnw@H-Ptq|vgTcxvG8Q87#>{e;)RyuYEJYHabeN-~I>^GNg{TO(x+4c6)56W8~
zDM<0wdyKBig667;^g=-ou?tHSOk*-#<3SV>L&P@5U@_uU02;!e%3vL04WDLXuo+cd
zNSCTA(83Ai0bZ-kIjc6hS*i|ox(<q0)av*HqC=^Ureq!A6mIdw?C;R(B;ghq#e*~j
zu}4BpfDfIR*Ukth1yNosN<ccS^WPr<*4zBINWc~i^WG#O32-=?xJ};%8SvL0;&3Qj
z{A3E_z?yC{29Yohh$ID&2IfsGc2KB8W~ITyHVrhE5b97l9W7kfNk+C90F?~@CJF`s
zwEzAFU|zj{82eb*XsEg||K4kZif%T6FjVvDe&T$*2o0DaOpYhH@0?JA6`FxQFB=-B
zIjw)shi5XQ+XkMgV3x28=8qX*f)U6tPt3q&TVA^L1*phomv{LGWd)zVX%;K^^iA)^
z3f^rBZ$ve7r!e4ksPbR~s2`s8#2?y`gT$)B$U$)^Km-V6)4*`}VYpWIz_oI~0LIVI
zm~>a(%_Kk-=t}sF__PviC%pyV${;H?-3)XCS1VO91JDilWRAj<-+w7CTF%eGMZGEd
z4s+i+2Jb4yV9JTUA^rbsfl)^rXFT>N;v4(8XGT(d!#$U8xEbFl*Z78C;~QR$Z@5$a
zx}W>Y5ym$nG;*OfO~5jlxlfIO!dIv<KwQh!7$B}?Y77w9QZ;55#U*MC5LccWgYK|c
zsx9J0*{+V@f?RckVPYe=AX^<_nAiv|Sfq|HOl$-f*vKE4L^6SB*D(-nAp_ACFc8hc
zK(q`7qL~?pW+EqIlE(9%bbz@4)1~-GJNMX8CFp*?d<3xzbi?=1y=L(d5G7qOe?9_w
zpZ6o-aRh?H9Ua`jOQ|te=ZrbTx3WvwEwF8K?Bui-I?AN*2&uuLlce~DPDs_|i1qXv
zr5#?QwB2o#;AJG$Os2y`fDU^RCQbmB5HX25@`IZ;TxMdZlQy2ClUx4Mhi3Tv%<y%2
zWQH?|?RR{c`{j$|mdOz7q_~<t)g;B$Jf#n51lJ6)o?txv0(kmG@N|mK0)@?8>w+RV
zd#$UEcn?->dA~#D-g;q!;097{^5Vnn$45pv2m2eu2#Z*PMJ(08I!>yV;80L4VY>|h
z_ZMJbbD(28_5-j&;uL{q;Uo*mgS8&y(0&6h<gm-I;}CXbV!Cr$q1j>9yN+D<LB;S}
z&XgG5VRW5yzMB{(nVAyB?bF({I;~9)qbizZ5SvURZ@R2TK2ry{OH!*ZpRS`eSqB(9
ztHX^tIM@gt66bbQ4!yC;%BHeXB_Jp9j=(yI_oV9B%{}<MW+XA@9|1!m^n_TyT7Z$@
zi2bWBf>}rer~nr(;E2{Q2&5rVpaQN*;E2{S2&y5G5R7pe(Gkj{EtL?$qb-*Z$fGTp
zU;!CNv}{5!khXL}D3P{&LO>CTi|SF1W(wJ5TKk&tGtCz%AZm*|fNZpN9xyL$sRvk&
zw%UVTptJ=aAU-g3rJ$FVeMsDqH7*5{Tc=6E<nC!w(4}pl2JA%JLk&cxZKEay*-mQM
z7%oVPD!`^0UG*6*^P7Jnq5n5r|8PnGIOYg|fP)GBB2DNQXhPqm34I4h!;wxZm@ED9
zKmqV32WFV{(&=iSJ6(koo%C?)h86f5kd0?&Dwy@pSOx3lTK<j@4kljbZ#lT$uf#8S
zzY@RbgGl^7?xp8a170*|z^gITGb`Xy6(oBAl068?Uj0r8l3|or#vut(xB$ACNI%z*
zajwmB?zN24B~z{X&|yT+wuR~y#3Eodg-_gxZA~ipu`{?y0iQSnh}4dKO|X7m$0r6k
zWjlD*jZiCGeBwqysu1|`I?NacKZeCExX)Bt`SCr#hrsus2h#3tzq+16K@f4r?1yQi
zVI&{R44_!J{?w5njOGQ>XH1Sa^OG#>>s<63unt5ZkO8P)s0Au0E^vt=EER`{mIdsh
zh}C(hpuj8z+6a;6F2R>@k^tjFb{!BXFcSzHa1w>F5!@3z1TNWNAPVCigmwXwQ#7Wg
zXdF$^*csue;AMCQWQ)M9kP-fb%%*58Rnhn<&>Q@?Owl+g0APGWbQ$BJa2>$6#VOTw
zfID&IPsCP+IRB9pm0jTGU=SBL!XP+}txVzzFo=uDfI(c~U_dgq5(Zmo2l+ICtt7Zh
zw15e2juvp1OOD+U?)+hTWMV5599eb=?$6h<dyc#LFy;vNKH17e?SlCm5|i2m^H&ME
z55iW4xrc^Q1J2E1D`fRUmYl|ns<I-}CFlsV2B7q5!1GlC%c?;UU$dSD*gJ>~te{%d
z6!52ksKZH(vLk}hF9pGpc7P?-f+bbCvCCrswG`oUBXc234;=+5rIQ;hmOnsbm$NsZ
zvk>PQ)zR_*iXexYSH(e=RUnVyyBGNd<WT#nu=yr4UC!dWAKxz`hZ<OA#qTh2suK8K
zj(ieMX<QooaCGp7&?(g_B2(>Ye#i6N_$pTfOJgUVF$|hr|CaYbmBr`tQpzIW+h_CM
zO<7DSiqMvmO5P0Y+KOsOQEWm#5Of=cB=3Qe$1s~7{D6U}8bD51%`kFwan%U&3KSe=
zb2Emyc^3S0G#&G@G3iqRM-ph}2cz8-1OlHDf^E?QP~_3u)$lV1KZl}?9KBY}AxAG(
z7a^yfDnO1=sCFSouU9+ZhwcYZ<i%2%8{0J?1ssO1Acv^ja)aOTBG<CA&|H{NXercT
zos8eK`8r&Mnjr+F?Wh6!$fOL*m$)DFf9N)@8J1G$NN7XI)zu2k8yh=eU$QpfAr+9c
z=JBu@yD&+$0SIA1f{7m+!P0pK!ESpquxWB~Cy^1MOn5Pax#0L6BV6^@6?AvVrR;#M
zwtik7f&}6&Rw@B1mylLJ2%R}s9fZQ1qYgq_&Q=GZDrc#K(32ObgHVz)DV8Z@B9NHv
zW&FOd`uRY`3Lcs)TZ)nbnG)842y-m|k(=0=<Wit0vc)aF%=9hu;{Zn>bNr6uT<}>)
zRL8YM^=aC7iEfx4*m4W{NCoy;g5`nXi)b611!#jaT5e{iF>vGt3e#BI-PduF`#~Sn
z4q6Z+jBEwN$d)sVY#GDImNJZN3B$<p7)G|3S;<XwuaJi3v4yhZ@4ZCEyh?4r<KEvO
znV8{Z0uiLECT233n7w3T#*zuO>6D-!&K)9;?bomcOZYItI-B@TANEL#msrBDL&mgg
zUY0sqs)&!I#h%x7t{3Z6fmF20d&^A!?YF5e`40E|*FMCW-WzKw6HddcMoLlpC@1w6
z3Ow2K*OK5dvxw#kxeJ`j*ju_a?PtGFH@lu+^g$&j^k-D}xcEss+<s~nO}kpa7pok=
z&y~F_-owP1<!VtM+8cT%G#KsPq{jI8fG#?+iBMzpAT3)+weSWwy-96^%Y}siQuPHW
z3{8BC#CIP*Hz1r_YdW{V+;R$j7j^vjQS7t_$BR=AU<Z6>6aW;-LsUwR7r<P@Bh2&S
zi&=%nCQ^L;j+eP#^uSorFo^f`2q3jf^92ZFVk~Cb=X)rVuz^tdpU@)!aqguC(#y1U
z{wDCU9_?9Q;U@nUf?p^EKY#=|s2;-J_si8o*!zB&dI)>pFI5j=@B1a{A?$shr!88N
zlp$A!#p*F8YmR}<<fzA(tU1PH%`qlxj)Bc&(oz$;XL^nQP?0EI$L_L_-DLs0i-p}K
zgWUygAu5n?hymhxbR$~hr&}3Sx>Y*6l|iLj=~cQ_no74yuJIQdM>$$Gd^+00@m<p2
zYWt#gy*@Q|#Dtv}$D`)1)+y{%hdt`B3V&K5kMWih6I~-s9FyTA*jp6hpq)>gHjRf(
zh+~jo4JQVv98sC8S6{mIR;8!T><U>w=oGpgE-jkp+zm#T%lbi;Pcy2St9&Lcw^zCA
z|As+wSG(p+O2WKfitxT<6y$$|jcJ69X$0hR#Wy3Q4DJ|L@)gj<wPcpiL)b#j8SbrT
zQuf!}g&Zi@?*i+%s!O-Nxgf`Gc9kytAk<N2%v-3@#<tuv>%wW~3UAxF%oQHSbA8yZ
z#9hgcjYJNjjgYq^zl3Cxdd=(HzaRQgh`+ZGFBQIGNg*UZ;*NELAg|#@*aZBC!{E-?
zu39CfnhZUt(%9PHSSmQ-p4ARY2qQHisXUloN-I0dE$wFO24DiPDX=^PRt(1z;;y1(
zpO^Cwdo9YJ3lnfN@qCWka`3|~Ig<7#8R!&Ah4C#S_t(%`3H<5Ot(_s-s_j_1v+A%o
z0$|0Vqez1;?ARjJa5}#u&V3vHoWOjc0}%5ew3m_DrEg0pGYY@2?8PbtklG?t2ykPE
z1L#bF&h?){Quh3qdp3$WaSivyf;Gja1nd<|32-!E9Me;xNe37s>9^=AFkmYnu25H~
z-(ar53Z?~*y+NqMhe_mg&A_}Q;9*(Disa6Kz@Y%k5RM}tufSOjTg|{}DRfAxA^g4$
z-iJ~RL1r-JUXyAF%NP03VW|dHRRV$`u%rT@$qqIOa4x1-foM*~j6pN+VnE(#v;fPP
z<IM(iIi3NFqRczT%1meGq)E@$DV7SIztwnnd6I{FlRVswoZ9L~PJWw7oi4#SzpPYy
zwFT^?W5xW@N~~nQ54Q&;SbnV*u<4oDzQ=$xo3LvNm#AaA?gL_r^&|e&jG$CL)`yi1
ztaJ1NJ}hDeJ61NvhAoNV47gk?wOH7A#h7>n`w>|xo5y<16lW@DV6B4hI>?8k=yurm
zq7aX;J(q#pu${@Vd5efxS97IYmZARxEqrvfj&gu^XoAEdX4<kmj2&Rml0!mb1l$=d
z>Cm}4elx?0i7kU$S50tu2wH?;XhMQxV1soUY&eS_05%BP=@`efOpf0mI6$O27g1^f
zK8!^mSF9RI)sq}Ks!MRzZmtG_R$t(-)(H~aD{Ti!x+JK+p@Rf7h8m@mGf4ns3Ie^X
z#*idPEF7Rp1<v0@kVK!<&up)KrG{t{4}R$eOCVqZ324h_ol=X31?C((Vu{`K9-EJs
z2`^7#wFS;BplCSDVp$A1v=RgeV8I2s7u3v{{Ww?tv=V&ZM4a>vnwJ*_B1>tiQ25}r
zqvh=&xO_gm8XXCOBa|NRMUx!~8P;qa`Wn64s!!}8)R4GAtUoQWn;AmbnNFzyfv15N
zwWD`H<om#!LF9cxqR%|u3R(q`zXpg=<rA+V%pR{XXth+X9!txJ@8#kh8Q~MStOD>O
zHciSnkEnc53$RG?I+8%a5?~+lkS{Zz_<h&$O?VANY)?kwUV_46&HBV`Y|ne_S=2H#
zfz6G$*ji94jH3aQvIE4t5%0>djGZ*o>lOylQjoJ=h>g%D;R!G90fNTfMy+@?g?WGf
zeibiWAf%04#^Qs<{in~1rZSTcrYUM%Z5+ExNZdv5o}j6pFk)t7SM%dS;<$Od#XM%D
zu%qz?bD7z0&{Q0$wh5jpKjm&ez?>v5v2`E}|4&wPe#U*S{X;e9UDX^otirW^1Y0p6
zu%l`iIf7%W29Qr6@4-Gh2`qn~)x+Th!Q~SO2prXS1@U{$sNU}YEo1+!c_}@Meoacx
z1uRw5W<Da6o(T}=MLj=uRG&C%Nj%MsyDg{J3a4ZGL=5wzj!&$`yaY!?;nOk8=_3{r
zG^h7jP9HVmJr$>)7U*pQUNeGV;#-aMB1JrCKfG}V|D!qD93~*b@Ax_Q+5Hr8NLoJv
z4q1??;}_gk_9KfjrPqA?f^)6gpFCKzpU_27!_xnWTehFHIPf;&-b|{`UkwPqPc`70
z`LRI^(8{3Sae@2zQ|Jy8oa$M8tsmP}c#+(C%}CZFLfsVbr6*U+f8l=kly6lLN)#YD
z^jdVR1II3XA*bVAhjF?N%U!c0Yz=Se{s}u_q#|q`|Hg$;Divajuv!*Yii_NcZABeb
zI6I85vqNmRFK~6@MP#WETgQLrJSdflu|-@h)j=V)P*tgp8*uh4v;}(a%4jljO?#M8
zS`fv+`yCfK4y8s=Vi>81*B+(^#{&R%QOVEt!4kx?g^`-(^hgtWL}fklHg^K0M3m6>
z{kWU8MBDa*RdSFjfk_!gYDxy$K7aTB^IJ3*;I2x6wvJzOkL`ov%vLVFSh@6L<<dQS
z<q|Il#LA@_jnHNQSTMyM5w2H<3IbYSFM@WfE3lONpWIFRU`pT_%b~qFko%DXo~`nt
zpp(LPm0%InZ#N20a#MS?72+Zkg6OI$Kwg2|g~A>RCMK;8t}H10zqoUI3x!H*?(ewV
zy~&8*N=7zk@oX`q(Nrih8}U&zFTtMg58RjcqNh<}7->Ljat{uBU`e2(AH`WKx==vk
zk{zv$IERk5vySHYGL)LcMHi7SXmw2BZ~~3f@wcOKPHLQ<Z){68&RNK%(=5lUHxcBo
zBFMiTLH=O``S&2m|DqDHON$He@=s~8i@p5Rp@iwxpSeXTYhU1RY5UVH%RV-1-}}$o
z<F%IQbv?P!Buj!Uo8`wcW_F-Rm64?dvTTtbV=sU?A<&D@KF@Xo4+zQVy*9kQg_k8+
z*2#~teeV&}hZh%U6~ypn8G|hA<;U2*_tO<%v+*h;tX5*9t;W#qP+#cFp_}m9(5}`M
zq_*cdurRAF%HqwT+B>k6B?VA}5crH2lt@cmQm!>|DkBy&#g19VYE4p3L88_;e#nRy
zgT)&0o~-mli3yv%VjHU1lj+z+J2)ON#cQzZg0TP0`3STUCl9S@><&}n4tg8a*uAu|
z#`!kz^o%4TgO{L6i?B6=-vI~Ea44WG1}2jy0Fqf^{XbGwVQ-XmNqB3kU4q{g-t-Dj
z6uUzbtzD%Rc(<yGcdNGJ-KwBs8(b7QpRLYk3;1jmvlzC$Ldu1V^E)j3^03cV?z8!Q
zHaFu;cDK*w^*a{whH!GeSoxCHnfa2b&6hgNmoVlFK#m-d-cH+QSM~|YlTuzlT3Sc1
z*L*4Y)>3JSJ4s{%cwH_Q-uLO1DCUq~iCU#xuM)+t<w{p`6=V)(mfw-Zk3R`0!=Wtk
z#=j*fi~Y*da@uT3W$)|M-fO7h4XxL11Mo5do6=-Enm@&w<agxo-Y4;<TV-*8z4epB
zACDy2T{A(RQcgwUNzi;<=Ky#{r&=oXVIO(+N~EiKxsKg_wdgRG?(Ej9-Za!OPpw#c
zFNXG>An=EoSL>vMZj-OkblCaH7G<ebS%OzVTh;O+a$PQmhvGuD+(k~y<qq;#F1M4r
zaydK{&1yMT`Ap)Yg38<(Rp!p9GIvImxihK(6i!o_JEIyvVP1Sp1lk%y-MK7cCx=Ds
zWV48!EEch|h(+vVvWOiU3)NY{LUop_6sog~h3YI-M^Nz+7OIn{!hT!q>N+^8<W&HS
zps^lQ@(MZ!u>x6Y`WCN%rtMy^!WpVi7CQ)3T3oJSN(Xp)U3Tb9=%x6Vjgq}w%JXX5
zVncXKi~S(+C<~=7GghHC^p{()H-{aPy{LI-Wx3yx$A7n3$}PYt`nHt+W^<*e<Q7y0
z{f_1QFPfFyidYr)#VATt;huGvK$oHiIc{aCKUPb7I3@O)p*AZ^14?#z?6a0wjJ>vO
zM94CaCUH4zDAw8C*;Z;E=g<<&1;4|=f2{c$uLa@Zy6RVC8R*@*G|SF?%Ba{YlAuUl
z-Ly!FRhtvlg0dt4dD11h*`{X}dW&K`EgvQZ$pBXDg0xrKCrA+Cc#AhUmI98Y<cM9i
zcCbcpNbdKNby6o~U(`uC7j#|OTpHU>q)EbSwiOxgN;AS{C^dc_n_0oksey?D><8YS
z>~-LU8B;TFWIA`;d~QTI2eAgvR&oXfArNo`3!~InYa*Tpb&HrDv@ha%P`Z>Tc@Lv!
zi5KVdKYyHDUdi$E0vtcF;yde=)W*xbj~cE@QZ>9|8)-u`sXB%u+SE)751@_Br0Nm;
zMw^>S)x$WV4bG(M0UYJQbstOnKnCEW+pri;zs&bv#TVN13~RACqJ7T*bK{8iK9hp*
z3Wie?w4$I$eog4rU>%m5321{~kwh-SaO{QGYFHF0z7_s&VgrTU!~a@rpvZeEh~-D@
zI3bW%AL3Ck(NpV;PX6aj*O<1F%Z#gdu_?98STWnJx4L4^A|u=Q0_c4Jn?_Z@beORw
z$c*s99C0+mY-z4;(lyt>HksbTLIqOaPA)t^>6>)Wj3S|<&^X{gI@SgQ+0EV+?cx*k
zT2jaOy?|^A__1TSQ+eVTwlakJy`v)W0@lFo<7+G+l(BwO+z0sEIxa(iO4#^_QH+Zp
z{?e2}ZrE_u_A*y(@H@C_Q@1KX^sx%=HD`k_%@;ct&4W*Mj^>M<t+{){Pg`Ve+Hm)V
zmo~m&EJ0l23WfQ2FISjzIGnUWQ{qyExq8D%8`LCXBLZ^uUW~=)E4(_L&`l5-JkF8X
zQ)9lC|L<R%y2gV})()IMPLtc2^)%kGirJN*kX+2hpqqSkgO1ax0M}j$-yvHFj%KX1
z{WPX9;0;2#f#$Ii<fqNns&C>8zc`hmq8K-ujDV0J>JVxfLa7_!2aE}^8%PEhk_jw9
z*gy^3yAgE=`U=)zK?n4;9oBD+3hT992TvQFv;!oSB&}IdhT5>-!XNu<4Esfn+}b8N
z3R2|&MbA@&VU#4?UxaidPr7++*#=ApEW>&wG-H}g(cT_cCV|wT7x4cjU+Y0n4$?Y)
zzdSuimw0q@JO+oc^9JxS!0<!>K;!}DfPv2*oT~Xxet@Xj+~1y@`%-8hc^*N$Dm#k!
z*b8Zi7cwBRlAF^XvS639wF;I`2yzZO2&JaCGGHIila|CuIv~OUyaW&Ji^%JcPa+Q>
zCoxl@qj!v{I&u_m*U^5XVI94f<Fe$F^f|bVZ;+<0R;~QMWmCm>+h(pz_$w@l5IHdA
z=MMhvM$9`0i}-S}wfzFNwqFF$dtM9se`dRS5Xi>?<SXI>4O1J0CR+Cj<HOvJj|`RK
zPQj9bU`f?rNi|KNY%A8iu=ECIE(L~>3&=GXj${R*9`PF#rNCL_P?iEQh|N(Q1)BnQ
z6SQE{u2Syz3bZZ-T9-mvmyJt<G6sMQ$XWoYB8kT>|NX091}+FP2f7LkX#-!^Fa=-`
zMf^zE41ocIICKM#`xx)KpH352H-OZWtVP@Qt_QV@uv+fo*HSTBDsD##YqgLg2Q6%T
zjJGsQB`se!?-!?1rZ2;>3h+2Cq}29;`^Nmg015`a&9)bGZ03I?qHa58C!W5_iX6RB
zC1~&?hc!z~<{+*9d-y(a3eg+17an8|6h>s_2-!e$fWl2cHdWBuUHpz>zL82g@Bj&v
zA?WTbU4lG@!a(6hQJ5gRQIz)b_lamfgW*c}_WD%&fx{7AeIM`YY{XVue#d?MemcM<
z_wy}{Q=HG+;c&KOo%3}#SNiT<yYlA2&ii~mUs+k%<_Aj3I-L0Z9sfI>KHm^ddVFhr
zLmi#YHNK7x=ity<T-H(2v2E>|HEYWHya)2Pv}LValb>Hwa!<a;<LPs@%&Mv_94_`a
zeVd&&o9+7ieB5J8OYaRGLd27Qz?;cFo!V!Ir`PMuj5rU31)D8DAMGj2&qsy2uxI5=
z)5<b^)79g2em-j5?D3#<Nj?soP2O#@o@AwO^Q>?Ak@i%}N@o2`m6x@3I7>U|{+@ig
zy9aIVpa<@xAAM*m%48l0hpjVB>FC^?`9L?yc{6<-ZM`LQl<#wPI1k`LT;oH>J%Dc>
z{DiAIJov5Hvuz9di2llMz%w4eKU|%)rlS*&zJ{J7_5ay+PuHrFvaBr!)>3VFQk%~i
zah92SoEQ%bgok<)BXYo#c_4YACqL6i&0zP6yb?wcoMtty%<r42d-^7G4tm4+Z7$ZS
z`GdGue#A+SmVbb1847z*jR(z*;2$nqbA9SsI>G*@a$oXHCdPcu-)5^IICNnyUr@Mw
zy$%EBaOCG(t+rJAr)!uw01>h;rM;c0`Z_A<mmyATYKM?&NV4S2*VHKYy2_kSd(bW6
zOa82i+p6aucRQK{{GlyPVYJTE5)ON=Fehg20g~u&W||yrF7#Xec8{~GCDqoM79^je
zY{+Aagp-7xIZd({Jl`6kexf_fjC?#H4QlFtnYXv(2F!>n5Ll)!bL9h|vdjZ)2vEuy
zvD-?slYQ=c3S;KMKcZbw#(}W&iRrQOb@XL*44m`$+S>9Tpc^s*!#H^JySS2$K3wJ;
z!~^>BiI$xp2i7PL)#D^O1YuFD_c`-@De_ynIo09QPjKmh)>$-g9eM90v2fUlx;&XH
zefju@o0m+tH`OVO_UKe<e6-0l^Vwq6>ry1v!Vz)Vgm75Uqr~j4o!hWfyIrLv5sgH^
zgPum2Z3bMAzXQ&>7o?hlmVimHb8Wrh?dU#qk4Bd>pDhkSaXUc!vuF%W!{31`QcUW0
z#1SLlftZ=S;jrE2+j0ZuCHs-c?|?Ty0{()DjzP*l5cXt7h+h$Nb=q)9WEEl8GNy`B
z9jqIuD@wQUsctJP^?24qIz8sntmM-qGxliHGaZd0p4aBg-hvBgnt-&3(<PsEbLMov
z%)Wm1G3eD<(t^vVBpcnn=`lvzY^9Jl7_RG4H~zdNPH3pttOQeONp(tU>{H*T?+SJs
z$u4;cbJ%RV-sbb@t)*ch;-z`L+2i$O+IUY^{^tCSu;A#mqJL5+ykG6xGO*BeyZM1U
zn{AD0=7FzYv$?|?$GAD$oh4;YL3Z|f=l76nGCP{w9WLMP5S)>GpC(!`DoL5gGMDy6
zZ-r#U-|hLm#MphH#>_2!j9XA~e8UF~>x?X-@nwu-kVqF}5fMsRFKC|{J!{99zX!Pd
zQjC!)n|{IUqLME5=}FF`H6~}IW7`erWLIX;!yWKscA-+5qNS)EWU+-6pWWf?c0Og+
z==EheOP{4@GWWXLw9}V<cIv@B@S`>r@o4y>P3aPcud^=?&+a+ky+H@EhCI(_vhoJd
z7iLw8M0;JyN@v&o?#<Bdfc~S~X_viAL+%EJcX;r~+U#(4>9q^NGFjVa-#2+YgcDgN
z@Np`sJ)8E)e#qS7fg0g+D%Q=Q>0S^u{bBB>D5?*1nd#dG?jMAN^{fQHA$lmYZXprO
z<S>55497>rGtC00nTKzVR-!nEvbKO1KqK?@IZ=t$EYM-<IY0y+*7A3D%o>Al+nSCn
z;(0`n`M!a+6wT&?8akYyi4H}pDNDP24oN%1v+hztT?tb4*lf=_%QDyC*|iSS=u>Ns
z>7BHojZ`N+2pAlgoh{Obp34H)aiUGL{uF(O$2W8U1CtfGEx*axF#zscM%|l*Tdqtp
zb7Cdop0x#-0?7fJ)yU*8sor@2UCvl!iB+R{4{N42U9`)>9`K~h1CCjBt--k9f4-@g
z73p=&enP4M1YCjv?8@?8Q3p*`M^n1g8JpF_viwYM=E}k14mtr91!|~m&}MspBy+@5
z0=CfRg*0X@y<~b*rF|rk?#`xpud#%PcB@XXGin->bWU(X5ZDaMI#8@{XKbL)(bhZr
z@ma%?EO`21P)|3Fm#;1CO0vp`OK-K^O1kt~8Znc0Q+(1*FZZ8h!`El`YQ$q342LT+
zF&SA)XJ4dsu<44TAXRotDTtW}0{q_TgADbWXHCrx^xT&0K{MnH1oHN*Qjd*Id#~*c
zj52F?er8f}(5B3mRK;j4smGvxC+Lr9PFqkCN6<7twg<c|R#+ylxS$x|uRXsP0ttFn
zgv|l^$#u8Z589+Co7E{0>L3`5D^m?Sofuqb|8zqqvl;p_58ynheI3H(c&*l3`jl!i
ztI2aa9@kPs@FzeS!6af@586m=DYb2TQ7MCQcSXk5A!xD|A{Ew&+jF<a2^AJH7Cn&s
z!Hb`CVHc!u*yG`BhElM?PAY|7a^@?zv&Yk}bQIG$+W`oCh-{3MQ0C8k3hE%llYVZK
zXZ2EQjuH1w{a@=t+cSM-{%2DYditE!8(<ar`MplwY4ABs>@J!Hhg;2Iqg3IRlDj*&
zOn1lZp_#suc93d=^X}OvrtgV^H7h&x?R`wLNBa7dzMia9TRXV21NvD-`<zXwQ;>Lg
z{LT(^(#j^VKTwnloSX`mfWkm_qyUg`fYQWdIUalVWJJr?uJjQbzdj$9<`4)Ibc*V|
zkJCp7F>Q!mrYNG)GG~W=_5(2D0-N(>u7Mfa>x49<x@^8@-APpdSEDtIQ0Sw>J?ru{
zhK_+U+<~S&oBq8-TwBmqA~hnqzM1k@BGNwSLY@P-oyN1~^b>u_e4L3>su5GE1A|H=
i_&Di|L_`kInD=pwu+R#djfpXscy#!9N1LnN&HZmp!=l*$

diff --git a/substrate/frame/revive/fixtures/contracts/expensive_erc20.sol b/substrate/frame/revive/fixtures/contracts/expensive_erc20.sol
deleted file mode 100644
index a1363845bd9e..000000000000
--- a/substrate/frame/revive/fixtures/contracts/expensive_erc20.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
-
-import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
-
-contract MyToken is ERC20 {
-    constructor(uint256 total) ERC20("TestToken1", "TT1") {
-        // We mint `total` tokens to the creator of this contract, as
-        // a sort of genesis.
-        _mint(msg.sender, total);
-    }
-
-    function transfer(address to, uint256 value) public override returns (bool) {
-        address owner = msg.sender;
-        _transfer(owner, to, value);
-        for (uint256 i = 0; i < 1000000; i++) {
-            keccak256(abi.encode(i));
-        }
-        return true;
-    }
-}
diff --git a/substrate/frame/revive/fixtures/contracts/fake_erc20.polkavm b/substrate/frame/revive/fixtures/contracts/fake_erc20.polkavm
deleted file mode 100644
index 932bbcaf61735c22e82e7bce8b617cee01eef4fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6304
zcmeHLeM}qY8NV}zyE6`)!T2ta57%{4L#xV*+s^67WTo_E({?g$GO=kDkigCc+M^^H
zXTSFcdCeA^W>RoLKGI61DKvyk71|;-1=KNhQ*AYWWW~~~tkSaosx|A<b?V2Yc6;6f
z2S~}*O;Oc9cH+VJ@!tDB@ALki-}AdS{JqC1YEq<(gJ!5-^VAX*Fc1CQLhe+7Z3Alp
z^MXA9)&h0_Oa>bOJJi|N*WT56q_h2y(jQ;D>Qg$q)~*i665ZsgdqD0!(th}eGSDe^
zM>`Kk+k3kY9qR0D-*fMMhr2ub+6TIi936Q2Ff@ui_0-WLod^56jo!(f)z^O9*>|+N
z{m4M)(}#c5JuuMSRc<qlT{M&K$CfL)y8HW-ct!R%ZqwMi-PGfBguX<#n>5o*d8A^Y
z;#bTyww~L=J;=3kN4aC%G-tCeSlwG1s(xE_clERU{kE5FXKOCkepuUOf6hK<pSLgD
z|6qSM&PTWhd>l>Duj;;>$|h4ghf`M$_~C|UFT~39>PXE)Ed2Udo-*Z*Gkd7DGm09w
z6%p@5bs}=`IE}WlIL)H1_$NI6shAw}vCc4WdQpig-^caJEN)<x1r>>Ef>-0Ls_Kh=
zRokgAdR1+QzUWc4?fRlq)wb!2qN+9Mi@d7U>kF)kw(95nDiZW_UKKg?a~>7d>F1m(
zvg_wW71iqJcoo&?v#gr1>8Jc^qFO)YRTEYEDUX`iqMvfA39EhzhON|3@oK`NPq1p7
z)6;%6&gf~c8n4jP9yMOBr=4ottfxgaUZ$tPN0XicH)+f}ah-@A{J71t2c~=t@hqwv
zK1y3m^h1o9GPRa7VcyJz`HFkkaogk<h;O4&U6@9WAU$5!K@Z!mbU8x1bt<&`Bv=Y;
zh)T*sl!c?Qe3HUZox-scg?ommg3cDsFookxgn5kFOL|ALKRf8u2c6@CJBJ6ajH^Qw
zih7GGgJjRxAd;OvCSXLGz4r?obt)+w^C%Oz$E(arLcJtxl>~<*)JcL}5^5!(MiOk2
zP$dalB*7{Pm6BkQ1WpndNvM#7a!D{tLYX9(B!QL~H6a?Y-)Y2thY|bjM(nrgvk=h+
zHO}i35J*8)Sv}=f)oLFz1QYUydCM!GCkNro$5~*O{wD;dRzV&bzFO0tYpP9)^ID=t
zL$%oy3lq=I^4SHkFmEZ$uv)xMOV~B!&@>@C!4}SP*#$m(Q7pV&S$LhxPB;r`lNR5q
zB}5I?Yg)sX+h~dH8rr65J2Z7?c9w;1vlsbnN-X49=s%ls7W6Vr<+KE=A&aI}5+C6H
z^-(UcT4IZateRG(#jDqPm=Ftjj`%}-uxKi+#WiHow6fJntnVORt|7CgRcM0@aS$8_
z7Y4<`TTCI#z^cMJE3kxq<qVR&%C})fl{;WX?F<kQIcOw{@JEMs^I$9(1?C6yf_cE4
zba3|-%9)H(bh5`uCws3@KJK4B#$tw`J82yC(74x6<32B~3@T~mg7P-*bLJMU_@F0;
zO-0P+PEgBp*5X{{<y<8+%e`RDEwaU28Se7uj+l#Z`It5LptY!%Ex%<cYRu)AndLMI
zz~$!wr1NIwEhVLJN)zrCQSU}qQIDTSF)xk43z!yN@{)L13AnYeNqLg8l+i=-9DrsL
zvS5aSm_TqM%<rgM5(a=CM8Qi#R?tenaspCh`2<ruQHc+EieA&@fl5dg@D0f<<V^mo
zIe#89i!Yux7teB7W)%cI<WXh*`O5sGmH87){thPZWpPYIF_BhMDC&pE!tz19d2#~7
zyhbLwe$71ho09Sp%oNKx>R9v=r1}ztdZ2wa4jHQxFtR8rLY6Bt1e(Xe2Np8L2h39S
z<UeqfC3!7^tG&EF51Ci3&jXiL>GQyPTU4|@li8akb6iwa-eAa`21D*J7;?M8klPG~
zY%mzI-eAbB215!4LpltGtTPzWZZKr6!H_iuL)v_d)5vQ6m!C<(PD$7y3EL%Mn<O-p
z7)X=^VKW}$C82sVHoDmyd~AS(q^9Mwaq$XNDu`LvvE*Pf4G%2kSQc?YL_IjpqZo@-
z2q}+YN#K?UK;!|4EG+a_&!G}{l(;eiz{$<9ByBRLVus7<EbevE%QM#Ej0MB0U(Q>U
z*CE$(uXD;E?)BzSWf3vCER&nJ6z4fO!7&0E9Ak+qI7WPgAHWesD~%`yI07_5p3abb
zAy9JCo1{#M?(Nd2w}L`xEwM^pUt(D;QKB!ES>wMO8FU>7Z^ED@4vw$m;2Rl~)8gwm
z80x?V3N3N)VD(KYR8`I>dzB{Oq{4Aa;gm(6CHX}1XohWNyC@&yW5c|o?vteIV`wNy
z6?DkaA96%Pj*b<Qc?Jc)J09&oGBgPD;+>y_9Bm;-IOGTbxXt6yK*$jc^Yyi#_*ge-
zu`U1cYF}>XED37`6>rD+kBR6Z1#d6Qf-YdU_!yolOAcBXQUZw+&XdNAKF&wE;LULx
z1#;n2kPFv9F1!bFfif9#p|r~Gj*lUwhNxSYRAoLER7I)6qo}%f<$AUHKOvgm;0Rgy
zSPKor{4ND`$_^5cq845#KYQ-@i`=+y1%wEa`@5bA31Ud#LjoIOV3r_fdiwDh9?yvQ
zEQ@E?iJ2I1sd{X1zwmGe^bSReHAD9}c8$XFr_@USG>owf`Umnh7St!4sR?>4{#?41
zy9-`^k3w=7!<$HMOF|06LJ(a6c`d8JyztWxYz;ph7@i_InuPQ*N((S^6e=O`f2p+m
zaYJbdAo&8Y^&Hp?*d$mH>=IZGYzZpt5DgV}5-RKxRM;UvP^rQ$LEky3utlh_m)2F-
z4x_?GH><Gy>ng1J6)NmScCEq&Q13=pQBM(w?Gg}M4(7Z>d(M|7<p9hZ%R%~BGz<$8
zprH)kP-p@h3XONQ(Cq&EM^GtAp$U*e<NxLs8c)kdUr(WF`qSS^g(k4R(DVfG84=I$
z2FwY5P;?F!Vg_RU)$s#j0N?}AfdvFXV64-CGEDSH$8x-~7`Nh{XmN_VJZHtx{yZ+r
zzgdZT1I0JXU~!a1&~CU_%`aN>C#?Agq1O5HaVF1za`5J-;J+s+cNj>B0uuURgbo-%
zya5U1!(vTx@T*9;>(3wJC{K{!BuEgyxk$J>@Zr~k1n=*!m5|_Ej|AC?2S90n<N)ab
zB(EICazN2A=y^~99%TXb06JoTjwqnx;3SQJERYN-+XpFoXo-~g6=qpe#lUMp^39iU
z;%FO=g$p_ZAB8tc;<o>lx3CPDivs3ixm8KrQIf>bHAxJ3l!L(MB}p7EN#Y=p#Oh{}
zxDCZF7$T-<$QKwv4ig;%!@Ne=X+6n$Y_O*Q`WE#-VcnDXD~<*U-ok*lo;GC`zC8ca
z$LUSKOv$c5gRv`6Z|n+eC10szV?Z!uufveNb%yM<8?v|7ki9jA?6r|ES+X}!Z7AO=
zL-}q2g|4dBlFq&7?GL^l(A{_NgA(Z4Hh`|p(76Fa=mrg;8zw@xZ3Eck|AvZIAh9BJ
zI}D*4T_<#xt_$5<N$9GpLbrc2p&KAbz_B0!J}fF>MjQipOd3iT-~mb(>Ln;$zy>(J
zX&RI?kpG8&`M=U#*(~_?N>^A_y7%9Cbxr9KajHV9h4}~VR{^#@kdkkJp4{FJpJ=bZ
zNdxQ<)%U_i5$ycjy6-e6a738@&P(ruCmiHC(cHV|VC!oJY;skAt;p_4&~z8T^)Mg!
z#rtdfWJA=7_8v0!%)<P>@%LBNck`p9SEA%WeS^5CBu~#(^1jp!KXjN6K6#Z21v5_f
zu>GA-BoaB@w5u_cac}b1((<sYxw&~Hm6Dp>>67lXdl%O@U23`VLVEZeZuDg7-i_T%
ztv+a+9;0e(aJXFex=uG;AFFjdMUJV{w$WxP4QH%vbR^Z1nF?my#HkV2BQ{&w<(h^o
zOXIGU_cnODe&k3nGCk#PB;(xXirB{8A@^toTpA6!M^1Yr_xNzBb>v1zOAiiY+<D9N
zZqC{09(7NJ->I2>c;DkMwcPG<?YgbhCgXPRa&xV>)6JR8{^zFLqx+_8v^&(~8V$lo
zH9t$aO+g4-b1GFxrDm_c)qKDON6jP6Eul!p9%)%|VS^_y>+7MJJ~;&qSNhrC+-&q?
z%-n8+K!hT}QW&nk0VlVuyBOP-X@a;-+aVm^a-D@ICAaoB@6Wg&fwACTtG#g~6>JF_
z!7X)Ja%0V#P=*B89g2`S>}#HK!5Ri#yI@6{U8A0n)8gp<n$laO+fDxtz}-8?eo*6r
Y&|Ghk3HLOc`PLMhW*f)$M}jQ%FI6q}^#A|>

diff --git a/substrate/frame/revive/fixtures/contracts/fake_erc20.sol b/substrate/frame/revive/fixtures/contracts/fake_erc20.sol
deleted file mode 100644
index 1c6d0aca5c8c..000000000000
--- a/substrate/frame/revive/fixtures/contracts/fake_erc20.sol
+++ /dev/null
@@ -1,54 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
-
-contract MyToken {
-    mapping(address account => uint256) private _balances;
-
-    uint256 private _totalSupply;
-
-    constructor(uint256 total) {
-        // We mint `total` tokens to the creator of this contract, as
-        // a sort of genesis.
-        _mint(msg.sender, total);
-    }
-
-    function transfer(address to, uint256 value) public virtual returns (uint256) {
-        address owner = msg.sender;
-        _transfer(owner, to, value);
-        return 1243657816489523;
-    }
-
-    function _transfer(address from, address to, uint256 value) internal {
-        _update(from, to, value);
-    }
-
-    function _update(address from, address to, uint256 value) internal virtual {
-        if (from == address(0)) {
-            // Overflow check required: The rest of the code assumes that totalSupply never overflows
-            _totalSupply += value;
-        } else {
-            uint256 fromBalance = _balances[from];
-            unchecked {
-                // Overflow not possible: value <= fromBalance <= totalSupply.
-                _balances[from] = fromBalance - value;
-            }
-        }
-
-        if (to == address(0)) {
-            unchecked {
-                // Overflow not possible: value <= totalSupply or value <= fromBalance <= totalSupply.
-                _totalSupply -= value;
-            }
-        } else {
-            unchecked {
-                // Overflow not possible: balance + value is at most totalSupply, which we know fits into a uint256.
-                _balances[to] += value;
-            }
-        }
-    }
-
-    function _mint(address account, uint256 value) internal {
-        _update(address(0), account, value);
-    }
-}
-
diff --git a/substrate/frame/revive/src/benchmarking.rs b/substrate/frame/revive/src/benchmarking.rs
index f3794e502639..1def86834253 100644
--- a/substrate/frame/revive/src/benchmarking.rs
+++ b/substrate/frame/revive/src/benchmarking.rs
@@ -147,34 +147,6 @@ mod benchmarks {
 		Ok(())
 	}
 
-	// This benchmarks the overhead of loading a code of size `c` byte from storage and into
-	// the execution engine.
-	/// This is similar to `call_with_code_per_byte` but for EVM bytecode.
-	#[benchmark(pov_mode = Measured)]
-	fn evm_call_with_code_per_byte(
-		c: Linear<1, { limits::code::BLOB_BYTES }>,
-	) -> Result<(), BenchmarkError> {
-		let instance = Contract::<T>::with_caller(
-			whitelisted_caller(),
-			VmBinaryModule::evm_sized(c - 1),
-			vec![],
-		)?;
-		let value = Pallet::<T>::min_balance();
-		let storage_deposit = default_deposit_limit::<T>();
-
-		#[extrinsic_call]
-		call(
-			RawOrigin::Signed(instance.caller.clone()),
-			instance.address,
-			value,
-			Weight::MAX,
-			storage_deposit,
-			vec![],
-		);
-
-		Ok(())
-	}
-
 	// Measure the amount of time it takes to compile a single basic block.
 	//
 	// (basic_block_compilation(1) - basic_block_compilation(0)).ref_time()
@@ -2238,29 +2210,6 @@ mod benchmarks {
 		Ok(())
 	}
 
-	/// Benchmark the cost of EVM instructions.
-	#[benchmark(pov_mode = Measured)]
-	fn evm_opcode(r: Linear<0, 10_000>) -> Result<(), BenchmarkError> {
-		use crate::vm::evm;
-		use revm::bytecode::Bytecode;
-
-		let module = VmBinaryModule::evm_noop(r);
-		let inputs = evm::EVMInputs::new(vec![]);
-
-		let code = Bytecode::new_raw(revm::primitives::Bytes::from(module.code.clone()));
-		let mut setup = CallSetup::<T>::new(module);
-		let (mut ext, _) = setup.ext();
-
-		let result;
-		#[block]
-		{
-			result = evm::call(code, &mut ext, inputs);
-		}
-
-		assert!(result.is_ok());
-		Ok(())
-	}
-
 	// Benchmark the execution of instructions.
 	//
 	// It benchmarks the absolute worst case by allocating a lot of memory
diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index c147011d3d85..16985cdfddf3 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -1135,7 +1135,6 @@ where
 
 		let do_transaction = || -> ExecResult {
 			let caller = self.caller();
-			let skip_transfer = self.skip_transfer;
 			let frame = top_frame_mut!(self);
 			let account_id = &frame.account_id.clone();
 
@@ -1219,12 +1218,12 @@ where
 				}
 			}
 
-			let mut code_deposit = executable
+			let code_deposit = executable
 				.as_executable()
 				.map(|exec| exec.code_info().deposit())
 				.unwrap_or_default();
 
-			let mut output = match executable {
+			let output = match executable {
 				ExecutableOrPrecompile::Executable(executable) =>
 					executable.execute(self, entry_point, input_data),
 				ExecutableOrPrecompile::Precompile { instance, .. } =>
@@ -1252,18 +1251,6 @@ where
 			// Hence we need to delay charging the base deposit after execution.
 			if entry_point == ExportedFunction::Constructor {
 				let contract_info = frame.contract_info();
-				// if we are dealing with EVM bytecode
-				// We upload the new runtime code, and update the code
-				if !is_pvm {
-					let caller = caller.account_id()?.clone();
-					let addr = T::AddressMapper::to_address(account_id).0.to_vec();
-					let data = core::mem::replace(&mut output.data, addr);
-
-					let mut module = crate::ContractBlob::<T>::from_evm_code(data, caller)?;
-					code_deposit = module.store_code(skip_transfer)?;
-					contract_info.code_hash = *module.code_hash();
-				}
-
 				let deposit = contract_info.update_base_deposit(code_deposit);
 				frame
 					.nested_storage
diff --git a/substrate/frame/revive/src/exec/mock_ext.rs b/substrate/frame/revive/src/exec/mock_ext.rs
index ff774aa7c045..66866b912c46 100644
--- a/substrate/frame/revive/src/exec/mock_ext.rs
+++ b/substrate/frame/revive/src/exec/mock_ext.rs
@@ -37,12 +37,6 @@ pub struct MockExt<T: Config> {
 	_phantom: PhantomData<T>,
 }
 
-impl<T: Config> MockExt<T> {
-	pub fn new() -> Self {
-		Self { gas_meter: GasMeter::new(Weight::MAX), _phantom: PhantomData }
-	}
-}
-
 impl<T: Config> PrecompileExt for MockExt<T> {
 	type T = T;
 
diff --git a/substrate/frame/revive/src/gas.rs b/substrate/frame/revive/src/gas.rs
index 34eeb5fd4c4f..b310dd4a46a1 100644
--- a/substrate/frame/revive/src/gas.rs
+++ b/substrate/frame/revive/src/gas.rs
@@ -219,35 +219,6 @@ impl<T: Config> GasMeter<T> {
 		Ok(ChargedAmount(amount))
 	}
 
-	/// Charge the initial cost for executing EVM bytecode.
-	pub fn charge_evm_init_cost(&mut self) -> Result<(), DispatchError> {
-		self.gas_left = self
-			.gas_left
-			.checked_sub(&T::WeightInfo::evm_opcode(0))
-			.ok_or_else(|| Error::<T>::OutOfGas)?;
-		Ok(())
-	}
-
-	/// Charge the base cost for executing an EVM opcode.
-	pub fn charge_evm_base_cost(&mut self) -> Result<(), DispatchError> {
-		let base_cost = T::WeightInfo::evm_opcode(1).saturating_sub(T::WeightInfo::evm_opcode(0));
-		self.gas_left =
-			self.gas_left.checked_sub(&base_cost).ok_or_else(|| Error::<T>::OutOfGas)?;
-		Ok(())
-	}
-
-	/// Charge the specified amount of EVM gas.
-	/// This is used for basic opcodes (e.g arithmetic, bitwise, ...) that don't have a dedicated
-	/// benchmark
-	pub fn charge_evm_gas(&mut self, gas: u64) -> Result<(), DispatchError> {
-		let base_cost = T::WeightInfo::evm_opcode(1).saturating_sub(T::WeightInfo::evm_opcode(0));
-		self.gas_left = self
-			.gas_left
-			.checked_sub(&base_cost.saturating_mul(gas))
-			.ok_or_else(|| Error::<T>::OutOfGas)?;
-		Ok(())
-	}
-
 	/// Adjust a previously charged amount down to its actual amount.
 	///
 	/// This is when a maximum a priori amount was charged and then should be partially
diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index a25959b486a2..400330a7df8a 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -1151,14 +1151,7 @@ where
 					storage_deposit_limit.saturating_reduce(upload_deposit);
 					(executable, upload_deposit)
 				},
-				Code::Upload(code) =>
-					if T::AllowEVMBytecode::get() {
-						let origin = T::UploadOrigin::ensure_origin(origin)?;
-						let executable = ContractBlob::from_evm_code(code, origin)?;
-						(executable, Default::default())
-					} else {
-						return Err(<Error<T>>::CodeRejected.into())
-					},
+				Code::Upload(_code) => return Err(<Error<T>>::CodeRejected.into()),
 				Code::Existing(code_hash) =>
 					(ContractBlob::from_storage(code_hash, &mut gas_meter)?, Default::default()),
 			};
diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index df40c0f4e2f8..3b215ae98a5a 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -18,7 +18,6 @@
 mod pallet_dummy;
 mod precompiles;
 mod pvm;
-mod sol;
 
 use crate::{
 	self as pallet_revive, test_utils::*, AccountId32Mapper, BalanceOf, BalanceWithDust,
diff --git a/substrate/frame/revive/src/vm/mod.rs b/substrate/frame/revive/src/vm/mod.rs
index 7a7cfb1163cc..3c65cbbfccab 100644
--- a/substrate/frame/revive/src/vm/mod.rs
+++ b/substrate/frame/revive/src/vm/mod.rs
@@ -37,7 +37,7 @@ use frame_support::{
 	ensure,
 	traits::{fungible::MutateHold, tokens::Precision::BestEffort},
 };
-use sp_core::{Get, H256, U256};
+use sp_core::{H256, U256};
 use sp_runtime::DispatchError;
 
 /// Validated Vm module ready for execution.
@@ -275,12 +275,6 @@ where
 			let prepared_call =
 				self.prepare_call(pvm::Runtime::new(ext, input_data), function, 0)?;
 			prepared_call.call()
-		} else if T::AllowEVMBytecode::get() {
-			use crate::vm::evm::EVMInputs;
-			use revm::bytecode::Bytecode;
-			let inputs = EVMInputs::new(input_data);
-			let bytecode = Bytecode::new_raw(self.code.into_inner().into());
-			evm::call(bytecode, ext, inputs)
 		} else {
 			Err(Error::<T>::CodeRejected.into())
 		}

From 6ec16815fe8fec949f74fddc1ae6b91e8216469d Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Mon, 18 Aug 2025 07:05:39 +0000
Subject: [PATCH 101/186] rm stuff for later

---
 substrate/frame/revive/src/call_builder.rs | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/substrate/frame/revive/src/call_builder.rs b/substrate/frame/revive/src/call_builder.rs
index a1c4c9b1c135..f4bea6ea3e8c 100644
--- a/substrate/frame/revive/src/call_builder.rs
+++ b/substrate/frame/revive/src/call_builder.rs
@@ -416,19 +416,6 @@ impl VmBinaryModule {
 		Self::with_num_instructions(size / 3)
 	}
 
-	// Same as sized but using EVM bytecode.
-	pub fn evm_sized(size: u32) -> Self {
-		use revm::bytecode::opcode::{JUMPDEST, STOP};
-
-		if size == 0 {
-			return Self::new(vec![])
-		}
-
-		let mut code = vec![STOP];
-		code.extend(vec![JUMPDEST; (size - 1) as usize]);
-		Self::new(code)
-	}
-
 	/// A contract code of specified number of instructions that uses all its bytes for instructions
 	/// but will return immediately.
 	///

From c89d0265fdbada6aa11397ae70e49eb54662120a Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Mon, 18 Aug 2025 07:05:59 +0000
Subject: [PATCH 102/186] rm evm

---
 substrate/frame/revive/src/call_builder.rs | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/substrate/frame/revive/src/call_builder.rs b/substrate/frame/revive/src/call_builder.rs
index f4bea6ea3e8c..1213dc874d4e 100644
--- a/substrate/frame/revive/src/call_builder.rs
+++ b/substrate/frame/revive/src/call_builder.rs
@@ -477,12 +477,4 @@ impl VmBinaryModule {
 		let code = polkavm_common::assembler::assemble(&text).unwrap();
 		Self::new(code)
 	}
-
-	/// An evm contract that executes  `n` JUMPDEST instructions.
-	pub fn evm_noop(size: u32) -> Self {
-		use revm::bytecode::opcode::JUMPDEST;
-
-		let code = vec![JUMPDEST; size as usize];
-		Self::new(code)
-	}
 }

From d53e0acffafadf162b5bbbdc27e8cf902a23f326 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Mon, 18 Aug 2025 07:08:29 +0000
Subject: [PATCH 103/186] rm evm stuff

---
 substrate/frame/revive/src/lib.rs   | 5 -----
 substrate/frame/revive/src/tests.rs | 6 ------
 2 files changed, 11 deletions(-)

diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index 400330a7df8a..908fe2034a11 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -226,10 +226,6 @@ pub mod pallet {
 		#[pallet::constant]
 		type UnsafeUnstableInterface: Get<bool>;
 
-		/// Allow EVM bytecode to be uploaded and instantiated.
-		#[pallet::constant]
-		type AllowEVMBytecode: Get<bool>;
-
 		/// Origin allowed to upload code.
 		///
 		/// By default, it is safe to set this to `EnsureSigned`, allowing anyone to upload contract
@@ -341,7 +337,6 @@ pub mod pallet {
 			type DepositPerItem = DepositPerItem;
 			type Time = Self;
 			type UnsafeUnstableInterface = ConstBool<true>;
-			type AllowEVMBytecode = ConstBool<true>;
 			type UploadOrigin = EnsureSigned<Self::AccountId>;
 			type InstantiateOrigin = EnsureSigned<Self::AccountId>;
 			type WeightInfo = ();
diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index 3b215ae98a5a..9b3a3c10a932 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -212,10 +212,6 @@ impl Test {
 	pub fn set_unstable_interface(unstable_interface: bool) {
 		UNSTABLE_INTERFACE.with(|v| *v.borrow_mut() = unstable_interface);
 	}
-
-	pub fn set_allow_evm_bytecode(allow_evm_bytecode: bool) {
-		ALLOW_E_V_M_BYTECODE.with(|v| *v.borrow_mut() = allow_evm_bytecode);
-	}
 }
 
 parameter_types! {
@@ -324,7 +320,6 @@ where
 }
 parameter_types! {
 	pub static UnstableInterface: bool = true;
-	pub static AllowEVMBytecode: bool = true;
 	pub CheckingAccount: AccountId32 = BOB.clone();
 }
 
@@ -345,7 +340,6 @@ impl Config for Test {
 	type DepositPerByte = DepositPerByte;
 	type DepositPerItem = DepositPerItem;
 	type UnsafeUnstableInterface = UnstableInterface;
-	type AllowEVMBytecode = AllowEVMBytecode;
 	type UploadOrigin = EnsureAccount<Self, UploadAccount>;
 	type InstantiateOrigin = EnsureAccount<Self, InstantiateAccount>;
 	type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent;

From edde1d180d577f52d19b5c5897e325a09db42627 Mon Sep 17 00:00:00 2001
From: "cmd[bot]" <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 18 Aug 2025 07:16:59 +0000
Subject: [PATCH 104/186] Update from github-actions[bot] running command
 'prdoc --audience runtime_dev --bump patch'

---
 prdoc/pr_9501.prdoc | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 prdoc/pr_9501.prdoc

diff --git a/prdoc/pr_9501.prdoc b/prdoc/pr_9501.prdoc
new file mode 100644
index 000000000000..995095f0819c
--- /dev/null
+++ b/prdoc/pr_9501.prdoc
@@ -0,0 +1,13 @@
+title: '[revive] revm move existing files'
+doc:
+- audience: Runtime Dev
+  description: |-
+    - Move exisiting files in pallet-revive to accomodate the upcoming EVM backend
+    - Add solc/resolc compilation feature for fixtures
+crates:
+- name: asset-hub-westend-runtime
+  bump: patch
+- name: pallet-revive
+  bump: patch
+- name: pallet-revive-fixtures
+  bump: patch

From 4f38703fd63bec7ed0687edfd7243a2a6cfbcb5e Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Mon, 18 Aug 2025 07:26:31 +0000
Subject: [PATCH 105/186] rm

---
 substrate/frame/revive/src/lib.rs        | 1 -
 substrate/frame/revive/src/vm/runtime.rs | 0
 2 files changed, 1 deletion(-)
 delete mode 100644 substrate/frame/revive/src/vm/runtime.rs

diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index 908fe2034a11..5e1f0f5b3ac1 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -1345,7 +1345,6 @@ where
 						},
 					}
 				} else {
-					// TODO support EVM
 					return Err(EthTransactError::Message("Invalid transaction".into()));
 				};
 
diff --git a/substrate/frame/revive/src/vm/runtime.rs b/substrate/frame/revive/src/vm/runtime.rs
deleted file mode 100644
index e69de29bb2d1..000000000000

From ab3761ebe961001d35e2fa22a033fbf37410bd02 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Mon, 18 Aug 2025 07:56:30 +0000
Subject: [PATCH 106/186] taplo fix

---
 substrate/frame/revive/fixtures/Cargo.toml | 9 ++++++++-
 substrate/primitives/runtime/Cargo.toml    | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/substrate/frame/revive/fixtures/Cargo.toml b/substrate/frame/revive/fixtures/Cargo.toml
index 1d64a4efba00..820a9b7952a5 100644
--- a/substrate/frame/revive/fixtures/Cargo.toml
+++ b/substrate/frame/revive/fixtures/Cargo.toml
@@ -33,4 +33,11 @@ toml = { workspace = true }
 [features]
 default = ["std"]
 # only when std is enabled all fixtures are available
-std = ["alloy-core", "anyhow", "sp-core", "sp-io"]
+std = [
+	"alloy-core",
+	"anyhow",
+	"hex/std",
+	"serde_json/std",
+	"sp-core",
+	"sp-io",
+]
diff --git a/substrate/primitives/runtime/Cargo.toml b/substrate/primitives/runtime/Cargo.toml
index 10f9ab7daec3..2f739f7a7ab2 100644
--- a/substrate/primitives/runtime/Cargo.toml
+++ b/substrate/primitives/runtime/Cargo.toml
@@ -57,6 +57,7 @@ default = ["std"]
 std = [
 	"binary-merkle-tree/std",
 	"codec/std",
+	"either/std",
 	"either/use_std",
 	"hash256-std-hasher/std",
 	"log/std",

From 7dadbc13bb8ed2ace0ccd7572d14961ac28b38ff Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Mon, 18 Aug 2025 08:30:27 +0000
Subject: [PATCH 107/186] fix up cargo.lock

---
 Cargo.lock | 118 ++++++++++++++++++++++++++---------------------------
 1 file changed, 59 insertions(+), 59 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5f03050f15f1..4071811a6a4b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -173,9 +173,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-eips"
-version = "1.0.23"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5937e2d544e9b71000942d875cbc57965b32859a666ea543cc57aae5a06d602d"
+checksum = "6f35887da30b5fc50267109a3c61cd63e6ca1f45967983641053a40ee83468c1"
 dependencies = [
  "alloy-eip2124",
  "alloy-eip2930",
@@ -205,9 +205,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-primitives"
-version = "1.3.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cfebde8c581a5d37b678d0a48a32decb51efd7a63a08ce2517ddec26db705c8"
+checksum = "bc9485c56de23438127a731a6b4c87803d49faf1a7068dcd1d8768aca3a9edb9"
 dependencies = [
  "alloy-rlp",
  "bytes",
@@ -254,9 +254,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-serde"
-version = "1.0.23"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e1722bc30feef87cc0fa824e43c9013f9639cc6c037be7be28a31361c788be2"
+checksum = "ee8d2c52adebf3e6494976c8542fbdf12f10123b26e11ad56f77274c16a2a039"
 dependencies = [
  "alloy-primitives",
  "serde",
@@ -410,9 +410,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.99"
+version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100"
+checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
 
 [[package]]
 name = "approx"
@@ -439,9 +439,9 @@ dependencies = [
 
 [[package]]
 name = "arbitrary"
-version = "1.4.2"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1"
+checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
 dependencies = [
  "derive_arbitrary",
 ]
@@ -2057,9 +2057,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.9.1"
+version = "2.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
+checksum = "6a65b545ab31d687cff52899d4890855fec459eb6afe0da6417b8a18da87aa29"
 dependencies = [
  "serde",
 ]
@@ -3092,9 +3092,9 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6"
 
 [[package]]
 name = "cc"
-version = "1.2.30"
+version = "1.2.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "deec109607ca693028562ed836a5f1c4b8bd77755c4e132fc5ce11b0b6211ae7"
+checksum = "3ee0f8803222ba5a7e2777dd72ca451868909b1ac410621b676adf07280e9b5f"
 dependencies = [
  "jobserver",
  "libc",
@@ -5538,9 +5538,9 @@ dependencies = [
 
 [[package]]
 name = "derive-where"
-version = "1.5.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "510c292c8cf384b1a340b816a9a6cf2599eb8f566a44949024af88418000c50b"
+checksum = "ef941ded77d15ca19b40374869ac6000af1c9f2a4c0f3d4c70926287e6364a8f"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
@@ -5549,9 +5549,9 @@ dependencies = [
 
 [[package]]
 name = "derive_arbitrary"
-version = "1.4.2"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a"
+checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
@@ -7460,7 +7460,7 @@ version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3fda788993cc341f69012feba8bf45c0ba4f3291fcc08e214b4d5a7332d88aff"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.9.2",
  "libc",
  "libgit2-sys",
  "log",
@@ -9724,7 +9724,7 @@ dependencies = [
  "thiserror 1.0.65",
  "tracing",
  "yamux 0.12.1",
- "yamux 0.13.5",
+ "yamux 0.13.6",
 ]
 
 [[package]]
@@ -9942,7 +9942,7 @@ dependencies = [
  "url",
  "x25519-dalek",
  "x509-parser 0.17.0",
- "yamux 0.13.5",
+ "yamux 0.13.6",
  "yasna",
  "zeroize",
 ]
@@ -10665,7 +10665,7 @@ version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.9.2",
  "cfg-if",
  "libc",
 ]
@@ -10676,7 +10676,7 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.9.2",
  "cfg-if",
  "cfg_aliases 0.2.1",
  "libc",
@@ -11124,7 +11124,7 @@ version = "0.10.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.9.2",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -17688,7 +17688,7 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.9.2",
  "chrono",
  "flate2",
  "hex",
@@ -17703,7 +17703,7 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.9.2",
  "chrono",
  "hex",
 ]
@@ -17765,7 +17765,7 @@ checksum = "14cae93065090804185d3b75f0bf93b8eeda30c7a9b4a33d3bdb3988d6229e50"
 dependencies = [
  "bit-set",
  "bit-vec",
- "bitflags 2.9.1",
+ "bitflags 2.9.2",
  "lazy_static",
  "num-traits",
  "rand 0.8.5",
@@ -17861,7 +17861,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
 dependencies = [
  "anyhow",
- "itertools 0.13.0",
+ "itertools 0.14.0",
  "proc-macro2 1.0.95",
  "quote 1.0.40",
  "syn 2.0.98",
@@ -18250,7 +18250,7 @@ version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.9.2",
 ]
 
 [[package]]
@@ -18563,12 +18563,11 @@ dependencies = [
 
 [[package]]
 name = "revm-bytecode"
-version = "6.1.0"
+version = "6.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6922f7f4fbc15ca61ea459711ff75281cc875648c797088c34e4e064de8b8a7c"
+checksum = "1d800e6c2119457ded5b0af71634eb2468040bf97de468eee5a730272a106da0"
 dependencies = [
  "bitvec",
- "once_cell",
  "phf",
  "revm-primitives",
  "serde",
@@ -18608,9 +18607,9 @@ dependencies = [
 
 [[package]]
 name = "revm-database"
-version = "7.0.2"
+version = "7.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61495e01f01c343dd90e5cb41f406c7081a360e3506acf1be0fc7880bfb04eb"
+checksum = "40000c7d917c865f6c232a78581b78e70c43f52db17282bd1b52d4f0565bc8a2"
 dependencies = [
  "alloy-eips",
  "revm-bytecode",
@@ -18622,9 +18621,9 @@ dependencies = [
 
 [[package]]
 name = "revm-database-interface"
-version = "7.0.2"
+version = "7.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20628d6cd62961a05f981230746c16854f903762d01937f13244716530bf98f"
+checksum = "f4ccea7a168cba1196b1e57dd3e22c36047208c135f600f8e58cbe7d49957dba"
 dependencies = [
  "auto_impl",
  "either",
@@ -18710,22 +18709,23 @@ dependencies = [
 
 [[package]]
 name = "revm-primitives"
-version = "20.1.0"
+version = "20.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66145d3dc61c0d6403f27fc0d18e0363bb3b7787e67970a05c71070092896599"
+checksum = "5aa29d9da06fe03b249b6419b33968ecdf92ad6428e2f012dc57bcd619b5d94e"
 dependencies = [
  "alloy-primitives",
  "num_enum",
+ "once_cell",
  "serde",
 ]
 
 [[package]]
 name = "revm-state"
-version = "7.0.2"
+version = "7.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cc830a0fd2600b91e371598e3d123480cd7bb473dd6def425a51213aa6c6d57"
+checksum = "f9d7f39ea56df3bfbb3c81c99b1f028d26f205b6004156baffbf1a4f84b46cfa"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.9.2",
  "revm-bytecode",
  "revm-primitives",
  "serde",
@@ -19243,7 +19243,7 @@ version = "0.38.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.9.2",
  "errno",
  "libc",
  "linux-raw-sys 0.4.14",
@@ -19256,7 +19256,7 @@ version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.9.2",
  "errno",
  "libc",
  "linux-raw-sys 0.9.4",
@@ -21446,7 +21446,7 @@ version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.9.2",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -21805,7 +21805,7 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dee851d0e5e7af3721faea1843e8015e820a234f81fda3dea9247e15bac9a86a"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.9.2",
 ]
 
 [[package]]
@@ -23980,7 +23980,7 @@ checksum = "64bb4714269afa44aef2755150a0fc19d756fb580a67db8885608cf02f47d06a"
 dependencies = [
  "atoi",
  "base64 0.22.1",
- "bitflags 2.9.1",
+ "bitflags 2.9.2",
  "byteorder",
  "bytes",
  "crc",
@@ -24022,7 +24022,7 @@ checksum = "6fa91a732d854c5d7726349bb4bb879bb9478993ceb764247660aee25f67c2f8"
 dependencies = [
  "atoi",
  "base64 0.22.1",
- "bitflags 2.9.1",
+ "bitflags 2.9.2",
  "byteorder",
  "crc",
  "dotenvy",
@@ -25343,7 +25343,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.9.2",
  "core-foundation",
  "system-configuration-sys 0.6.0",
 ]
@@ -25462,9 +25462,9 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 
 [[package]]
 name = "test-log"
-version = "0.2.16"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dffced63c2b5c7be278154d76b479f9f9920ed34e7574201407f0b14e2bbb93"
+checksum = "1e33b98a582ea0be1168eba097538ee8dd4bbe0f2b01b22ac92ea30054e5be7b"
 dependencies = [
  "env_logger 0.11.3",
  "test-log-macros",
@@ -25473,9 +25473,9 @@ dependencies = [
 
 [[package]]
 name = "test-log-macros"
-version = "0.2.16"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5"
+checksum = "451b374529930d7601b1eef8d32bc79ae870b6079b069401709c2a8bf9e75f36"
 dependencies = [
  "proc-macro2 1.0.95",
  "quote 1.0.40",
@@ -26026,7 +26026,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140"
 dependencies = [
  "base64 0.21.7",
- "bitflags 2.9.1",
+ "bitflags 2.9.2",
  "bytes",
  "futures-core",
  "futures-util",
@@ -26046,7 +26046,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.9.2",
  "bytes",
  "http 1.1.0",
  "http-body 1.0.0",
@@ -26955,7 +26955,7 @@ version = "0.235.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "161296c618fa2d63f6ed5fffd1112937e803cb9ec71b32b01a76321555660917"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.9.2",
  "hashbrown 0.15.3",
  "indexmap",
  "semver 1.0.18",
@@ -26990,7 +26990,7 @@ checksum = "b6fe976922a16af3b0d67172c473d1fd4f1aa5d0af9c8ba6538c741f3af686f4"
 dependencies = [
  "addr2line 0.24.2",
  "anyhow",
- "bitflags 2.9.1",
+ "bitflags 2.9.2",
  "bumpalo",
  "cc",
  "cfg-if",
@@ -27800,7 +27800,7 @@ version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.9.2",
 ]
 
 [[package]]
@@ -28098,9 +28098,9 @@ dependencies = [
 
 [[package]]
 name = "yamux"
-version = "0.13.5"
+version = "0.13.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3da1acad1c2dc53f0dde419115a38bd8221d8c3e47ae9aeceaf453266d29307e"
+checksum = "2b2dd50a6d6115feb3e5d7d0efd45e8ca364b6c83722c1e9c602f5764e0e9597"
 dependencies = [
  "futures",
  "log",

From abcd13c02791f377d7c9638e10404709652b1651 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Mon, 18 Aug 2025 09:15:01 +0000
Subject: [PATCH 108/186] try

---
 Cargo.lock | 5 ++---
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4071811a6a4b..0fe24dbadbb9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10900,11 +10900,10 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.4"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
- "autocfg",
  "num-integer",
  "num-traits",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 28b912fe516e..2c26a61baef8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -928,7 +928,7 @@ node-rpc = { path = "substrate/bin/node/rpc" }
 node-testing = { path = "substrate/bin/node/testing" }
 nohash-hasher = { version = "0.2.0" }
 novelpoly = { version = "2.0.0", package = "reed-solomon-novelpoly" }
-num-bigint = { version = "0.4.3", default-features = false }
+num-bigint = { version = "0.4.6", default-features = false }
 num-format = { version = "0.4.3" }
 num-integer = { version = "0.1.46", default-features = false }
 num-rational = { version = "0.4.1" }

From 6d30298c431bb8fdf058acfeb82d4f8844137bff Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Mon, 18 Aug 2025 11:30:57 +0200
Subject: [PATCH 109/186] fixes

---
 Cargo.toml                                 | 1 -
 substrate/frame/revive/fixtures/src/lib.rs | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 2c26a61baef8..fb0d30d88e43 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1480,7 +1480,6 @@ zombienet-orchestrator = { version = "0.3.8" }
 zombienet-sdk = { version = "0.3.8" }
 zstd = { version = "0.12.4", default-features = false }
 
-
 [profile.release]
 # Polkadot runtime requires unwinding.
 opt-level = 3
diff --git a/substrate/frame/revive/fixtures/src/lib.rs b/substrate/frame/revive/fixtures/src/lib.rs
index 7b398e1ccccf..022dcb9b43f0 100644
--- a/substrate/frame/revive/fixtures/src/lib.rs
+++ b/substrate/frame/revive/fixtures/src/lib.rs
@@ -33,6 +33,7 @@ pub enum FixtureType {
 	Solc,
 }
 
+#[cfg(feature = "std")]
 impl FixtureType {
 	fn file_extension(&self) -> &'static str {
 		match self {

From 551c71137f8d802cd22ceaa95022a90645ba72ce Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Mon, 18 Aug 2025 13:35:07 +0200
Subject: [PATCH 110/186] rm vm/runtime.rs

---
 substrate/frame/revive/src/vm/runtime.rs | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 substrate/frame/revive/src/vm/runtime.rs

diff --git a/substrate/frame/revive/src/vm/runtime.rs b/substrate/frame/revive/src/vm/runtime.rs
deleted file mode 100644
index e69de29bb2d1..000000000000

From 2debf91a9ebafd0a2995249443d997c4c4d3f89b Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Mon, 18 Aug 2025 12:28:57 +0000
Subject: [PATCH 111/186] fix

---
 substrate/frame/contracts/src/benchmarking/call_builder.rs | 2 +-
 substrate/frame/revive/src/vm/mod.rs                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/substrate/frame/contracts/src/benchmarking/call_builder.rs b/substrate/frame/contracts/src/benchmarking/call_builder.rs
index 66e76a3de8e3..5833639d7ce2 100644
--- a/substrate/frame/contracts/src/benchmarking/call_builder.rs
+++ b/substrate/frame/contracts/src/benchmarking/call_builder.rs
@@ -231,6 +231,6 @@ macro_rules! build_runtime(
 		let $contract = setup.contract();
 		let input = setup.data();
 		let (mut ext, _) = setup.ext();
-		let mut $runtime = $crate::wasm::Runtime::new(&mut ext, input);
+		let mut $runtime = crate::wasm::Runtime::new(&mut ext, input);
 	};
 );
diff --git a/substrate/frame/revive/src/vm/mod.rs b/substrate/frame/revive/src/vm/mod.rs
index b1ee1025e25a..6bf9ae67a0dc 100644
--- a/substrate/frame/revive/src/vm/mod.rs
+++ b/substrate/frame/revive/src/vm/mod.rs
@@ -38,7 +38,7 @@ use frame_support::{
 	ensure,
 	traits::{fungible::MutateHold, tokens::Precision::BestEffort},
 };
-use sp_core::{H256, U256};
+use sp_core::{Get, H256, U256};
 use sp_runtime::DispatchError;
 
 /// Validated Vm module ready for execution.

From 017532834fde98c70719b9410047e5dcad4b6952 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Mon, 18 Aug 2025 12:33:31 +0000
Subject: [PATCH 112/186] nit

---
 .../fixtures/contracts/AddressPredictor.sol   | 33 -------------------
 substrate/frame/revive/src/vm/runtime.rs      |  0
 2 files changed, 33 deletions(-)
 delete mode 100644 substrate/frame/revive/fixtures/contracts/AddressPredictor.sol
 delete mode 100644 substrate/frame/revive/src/vm/runtime.rs

diff --git a/substrate/frame/revive/fixtures/contracts/AddressPredictor.sol b/substrate/frame/revive/fixtures/contracts/AddressPredictor.sol
deleted file mode 100644
index 59b76c4a04b1..000000000000
--- a/substrate/frame/revive/fixtures/contracts/AddressPredictor.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
-
-contract Predicted {
-    uint public salt;
-
-    constructor(uint _salt) {
-        salt = _salt;
-    }
-}
-
-contract AddressPredictor {
-    constructor(uint _salt, bytes memory _bytecode) payable {
-        address deployed = address(new Predicted{salt: bytes32(_salt)}(_salt));
-        address predicted = predictAddress(_salt, _bytecode);
-        assert(deployed == predicted);
-    }
-
-    function predictAddress(
-        uint _foo,
-        bytes memory _bytecode
-    ) public view returns (address predicted) {
-        bytes32 addr = keccak256(
-            abi.encodePacked(
-                bytes1(0xff),
-                address(this),
-                bytes32(_foo),
-                keccak256(abi.encodePacked(_bytecode, abi.encode(_foo)))
-            )
-        );
-        predicted = address(uint160(uint(addr)));
-    }
-}
diff --git a/substrate/frame/revive/src/vm/runtime.rs b/substrate/frame/revive/src/vm/runtime.rs
deleted file mode 100644
index e69de29bb2d1..000000000000

From 59e59e8202a09b825cae78783a167ee0a6b43ad8 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Mon, 18 Aug 2025 13:58:15 +0000
Subject: [PATCH 113/186] fixes

---
 substrate/frame/revive/src/evm/runtime.rs     | 27 +++++++++++--------
 substrate/frame/revive/src/lib.rs             | 20 ++++++++------
 .../revive/src/vm/evm/instructions/bitwise.rs |  3 +--
 .../revive/src/vm/evm/instructions/system.rs  |  4 ++-
 4 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/substrate/frame/revive/src/evm/runtime.rs b/substrate/frame/revive/src/evm/runtime.rs
index 48380f83899b..04b03c9afec0 100644
--- a/substrate/frame/revive/src/evm/runtime.rs
+++ b/substrate/frame/revive/src/evm/runtime.rs
@@ -350,23 +350,28 @@ pub trait EthExtra {
 				.into()
 			}
 		} else {
-			let blob = match polkavm::ProgramBlob::blob_length(&data) {
-				Some(blob_len) =>
-					blob_len.try_into().ok().and_then(|blob_len| (data.split_at_checked(blob_len))),
-				_ => None,
-			};
-
-			let Some((code, data)) = blob else {
-				log::debug!(target: LOG_TARGET, "Failed to extract polkavm code & data");
-				return Err(InvalidTransaction::Call);
+			let (code, data) = if data.starts_with(&polkavm_common::program::BLOB_MAGIC) {
+				let try_parse = || {
+					let blob_len = polkavm::ProgramBlob::blob_length(&data)?;
+					let blob_len = blob_len.try_into().ok()?;
+					let (code, data) = data.split_at_checked(blob_len)?;
+					Some((code.to_vec(), data.to_vec()))
+				};
+				let Some((code, data)) = try_parse() else {
+					log::debug!(target: LOG_TARGET, "Failed to extract polkavm code & data");
+					return Err(InvalidTransaction::Call);
+				};
+				(code, data)
+			} else {
+				(data, Default::default())
 			};
 
 			crate::Call::eth_instantiate_with_code::<Self::Config> {
 				value,
 				gas_limit,
 				storage_deposit_limit,
-				code: code.to_vec(),
-				data: data.to_vec(),
+				code,
+				data,
 			}
 			.into()
 		};
diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index a25959b486a2..84600cb484b3 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -1157,6 +1157,10 @@ where
 						let executable = ContractBlob::from_evm_code(code, origin)?;
 						(executable, Default::default())
 					} else {
+						log::debug!(
+							target: LOG_TARGET,
+							"Rejected upload of EVM bytecode because AllowEVMBytecode is false"
+						);
 						return Err(<Error<T>>::CodeRejected.into())
 					},
 				Code::Existing(code_hash) =>
@@ -1345,7 +1349,7 @@ where
 			None => {
 				// Extract code and data from the input.
 				let (code, data) = if input.starts_with(&polkavm_common::program::BLOB_MAGIC) {
-					match polkavm::ProgramBlob::blob_length(&input) {
+					let (code, data) = match polkavm::ProgramBlob::blob_length(&input) {
 						Some(blob_len) => blob_len
 							.try_into()
 							.ok()
@@ -1355,10 +1359,10 @@ where
 							log::debug!(target: LOG_TARGET, "Failed to extract polkavm blob length");
 							(&input[..], &[][..])
 						},
-					}
+					};
+					(code.to_vec(), data.to_vec())
 				} else {
-					// TODO support EVM
-					return Err(EthTransactError::Message("Invalid transaction".into()));
+					(input, vec![])
 				};
 
 				// Dry run the call.
@@ -1367,8 +1371,8 @@ where
 					value,
 					gas_limit,
 					storage_deposit_limit,
-					Code::Upload(code.to_vec()),
-					data.to_vec(),
+					Code::Upload(code.clone()),
+					data.clone(),
 					None,
 					BumpNonce::No,
 				);
@@ -1403,8 +1407,8 @@ where
 						value,
 						gas_limit,
 						storage_deposit_limit,
-						code: code.to_vec(),
-						data: data.to_vec(),
+						code,
+						data,
 					}
 					.into();
 				(result, dispatch_call)
diff --git a/substrate/frame/revive/src/vm/evm/instructions/bitwise.rs b/substrate/frame/revive/src/vm/evm/instructions/bitwise.rs
index b7325146d868..87a2ec4d4967 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/bitwise.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/bitwise.rs
@@ -204,8 +204,7 @@ mod tests {
 		let mock_ext = Box::leak(Box::new(crate::exec::mock_ext::MockExt::<Test>::new()));
 
 		Interpreter {
-			// TODO clean up once we move to use our own gas meter
-			gas: revm::interpreter::Gas::new(30_000_000),
+			gas: revm::interpreter::Gas::new(0),
 			bytecode: Default::default(),
 			stack: Stack::new(),
 			return_data: Default::default(),
diff --git a/substrate/frame/revive/src/vm/evm/instructions/system.rs b/substrate/frame/revive/src/vm/evm/instructions/system.rs
index 3ff91600f62f..fa83212b3772 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/system.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/system.rs
@@ -39,7 +39,9 @@ pub fn keccak256<'ext, E: Ext>(context: Context<'_, 'ext, E>) {
 	} else {
 		let from = as_usize_or_fail!(context.interpreter, offset);
 		resize_memory!(context.interpreter, from, len);
-		revm::primitives::keccak256(context.interpreter.memory.slice_len(from, len).as_ref())
+		let data = context.interpreter.memory.slice_len(from, len);
+		let data: &[u8] = data.as_ref();
+		revm::primitives::keccak256(data)
 	};
 	*top = hash.into();
 }

From f1f2ffc398456ebc842194d0462e509769477be2 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Mon, 18 Aug 2025 16:29:11 +0200
Subject: [PATCH 114/186] nit

---
 substrate/frame/revive/src/benchmarking.rs | 4 +---
 substrate/frame/revive/src/lib.rs          | 4 ----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/substrate/frame/revive/src/benchmarking.rs b/substrate/frame/revive/src/benchmarking.rs
index ec08c563126a..bd1b1a1a16ef 100644
--- a/substrate/frame/revive/src/benchmarking.rs
+++ b/substrate/frame/revive/src/benchmarking.rs
@@ -154,9 +154,7 @@ mod benchmarks {
 	// the execution engine.
 	/// This is similar to `call_with_code_per_byte` but for EVM bytecode.
 	#[benchmark(pov_mode = Measured)]
-	fn evm_call_with_code_per_byte(
-		c: Linear<1, { limits::code::BLOB_BYTES }>,
-	) -> Result<(), BenchmarkError> {
+	fn evm_call_with_code_per_byte(c: Linear<1, { 100 * 1024 }>) -> Result<(), BenchmarkError> {
 		let instance = Contract::<T>::with_caller(
 			whitelisted_caller(),
 			VmBinaryModule::evm_sized(c - 1),
diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index 84600cb484b3..e1eb544c3e38 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -1157,10 +1157,6 @@ where
 						let executable = ContractBlob::from_evm_code(code, origin)?;
 						(executable, Default::default())
 					} else {
-						log::debug!(
-							target: LOG_TARGET,
-							"Rejected upload of EVM bytecode because AllowEVMBytecode is false"
-						);
 						return Err(<Error<T>>::CodeRejected.into())
 					},
 				Code::Existing(code_hash) =>

From 82ea9bc5e95aa8a23bffd480d85ab225d5bfdb7d Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Mon, 18 Aug 2025 16:45:40 +0200
Subject: [PATCH 115/186] update call_with_code_per_byte

---
 substrate/frame/revive/src/benchmarking.rs | 12 +++---
 substrate/frame/revive/src/vm/evm.rs       |  3 +-
 substrate/frame/revive/src/vm/mod.rs       | 47 ++++++++++++++++------
 substrate/frame/revive/src/vm/pvm/env.rs   |  3 +-
 substrate/frame/revive/src/weights.rs      |  7 ++--
 5 files changed, 49 insertions(+), 23 deletions(-)

diff --git a/substrate/frame/revive/src/benchmarking.rs b/substrate/frame/revive/src/benchmarking.rs
index bd1b1a1a16ef..1a0bda781426 100644
--- a/substrate/frame/revive/src/benchmarking.rs
+++ b/substrate/frame/revive/src/benchmarking.rs
@@ -122,7 +122,7 @@ mod benchmarks {
 	// This benchmarks the overhead of loading a code of size `c` byte from storage and into
 	// the execution engine.
 	//
-	// `call_with_code_per_byte(c) - call_with_code_per_byte(0)`
+	// `call_with_pvm_code_per_byte(c) - call_with_pvm_code_per_byte(0)`
 	//
 	// This does **not** include the actual execution for which the gas meter
 	// is responsible. The code used here will just return on call.
@@ -131,7 +131,7 @@ mod benchmarks {
 	// is not in the first basic block is never read. We are primarily interested in the
 	// `proof_size` result of this benchmark.
 	#[benchmark(pov_mode = Measured)]
-	fn call_with_code_per_byte(c: Linear<0, { 100 * 1024 }>) -> Result<(), BenchmarkError> {
+	fn call_with_pvm_code_per_byte(c: Linear<0, { 100 * 1024 }>) -> Result<(), BenchmarkError> {
 		let instance =
 			Contract::<T>::with_caller(whitelisted_caller(), VmBinaryModule::sized(c), vec![])?;
 		let value = Pallet::<T>::min_balance();
@@ -152,9 +152,9 @@ mod benchmarks {
 
 	// This benchmarks the overhead of loading a code of size `c` byte from storage and into
 	// the execution engine.
-	/// This is similar to `call_with_code_per_byte` but for EVM bytecode.
+	/// This is similar to `call_with_pvm_code_per_byte` but for EVM bytecode.
 	#[benchmark(pov_mode = Measured)]
-	fn evm_call_with_code_per_byte(c: Linear<1, { 100 * 1024 }>) -> Result<(), BenchmarkError> {
+	fn call_with_evm_code_per_byte(c: Linear<1, { 100 * 1024 }>) -> Result<(), BenchmarkError> {
 		let instance = Contract::<T>::with_caller(
 			whitelisted_caller(),
 			VmBinaryModule::evm_sized(c - 1),
@@ -185,7 +185,7 @@ mod benchmarks {
 	// we will always charge one max sized block per contract call.
 	//
 	// We ignore the proof size component when using this benchmark as this is already accounted
-	// for in `call_with_code_per_byte`.
+	// for in `call_with_pvm_code_per_byte`.
 	#[benchmark(pov_mode = Measured)]
 	fn basic_block_compilation(b: Linear<0, 1>) -> Result<(), BenchmarkError> {
 		let instance = Contract::<T>::with_caller(
@@ -354,7 +354,7 @@ mod benchmarks {
 	// The dummy contract used here does not do this. The costs for the data copy is billed as
 	// part of `seal_call_data_copy`. The costs for invoking a contract of a specific size are not
 	// part of this benchmark because we cannot know the size of the contract when issuing a call
-	// transaction. See `call_with_code_per_byte` for this.
+	// transaction. See `call_with_pvm_code_per_byte` for this.
 	#[benchmark(pov_mode = Measured)]
 	fn call() -> Result<(), BenchmarkError> {
 		let data = vec![42u8; 1024];
diff --git a/substrate/frame/revive/src/vm/evm.rs b/substrate/frame/revive/src/vm/evm.rs
index fd85b3838588..906c303d0890 100644
--- a/substrate/frame/revive/src/vm/evm.rs
+++ b/substrate/frame/revive/src/vm/evm.rs
@@ -18,7 +18,7 @@
 mod instructions;
 
 use crate::{
-	vm::{ExecResult, Ext},
+	vm::{BytecodeType, ExecResult, Ext},
 	AccountIdOf, BalanceOf, CodeInfo, CodeVec, Config, ContractBlob, DispatchError, Error,
 	ExecReturnValue, H256, LOG_TARGET, U256,
 };
@@ -57,6 +57,7 @@ where
 			deposit: Default::default(),
 			refcount: 0,
 			code_len,
+			code_type: BytecodeType::Evm,
 			behaviour_version: Default::default(),
 		};
 		let code_hash = H256(sp_io::hashing::keccak_256(&code));
diff --git a/substrate/frame/revive/src/vm/mod.rs b/substrate/frame/revive/src/vm/mod.rs
index 6bf9ae67a0dc..3387579f3af6 100644
--- a/substrate/frame/revive/src/vm/mod.rs
+++ b/substrate/frame/revive/src/vm/mod.rs
@@ -56,6 +56,14 @@ pub struct ContractBlob<T: Config> {
 	code_hash: H256,
 }
 
+#[derive(Copy, Clone, Encode, Decode, MaxEncodedLen, scale_info::TypeInfo)]
+pub enum BytecodeType {
+	/// The code is a PVM bytecode.
+	Pvm,
+	/// The code is an EVM bytecode.
+	Evm,
+}
+
 /// Contract code related data, such as:
 ///
 /// - owner of the contract, i.e. account uploaded its code,
@@ -77,6 +85,8 @@ pub struct CodeInfo<T: Config> {
 	refcount: u64,
 	/// Length of the code in bytes.
 	code_len: u32,
+	/// Bytecode type
+	code_type: BytecodeType,
 	/// The behaviour version that this contract operates under.
 	///
 	/// Whenever any observeable change (with the exception of weights) are made we need
@@ -100,20 +110,33 @@ impl ExportedFunction {
 /// Cost of code loading from storage.
 #[cfg_attr(test, derive(Debug, PartialEq, Eq))]
 #[derive(Clone, Copy)]
-struct CodeLoadToken(u32);
+struct CodeLoadToken {
+	code_len: u32,
+	code_type: BytecodeType,
+}
+
+impl CodeLoadToken {
+	fn from_code_info<T: Config>(code_info: &CodeInfo<T>) -> Self {
+		Self { code_len: code_info.code_len, code_type: code_info.code_type }
+	}
+}
 
 impl<T: Config> Token<T> for CodeLoadToken {
 	fn weight(&self) -> Weight {
-		// the proof size impact is accounted for in the `call_with_code_per_byte`
-		// strictly speaking we are double charging for the first BASIC_BLOCK_SIZE
-		// instructions here. Let's consider this as a safety margin.
-		T::WeightInfo::call_with_code_per_byte(self.0)
-			.saturating_sub(T::WeightInfo::call_with_code_per_byte(0))
-			.saturating_add(
-				T::WeightInfo::basic_block_compilation(1)
-					.saturating_sub(T::WeightInfo::basic_block_compilation(0))
-					.set_proof_size(0),
-			)
+		match self.code_type {
+			// the proof size impact is accounted for in the `call_with_pvm_code_per_byte`
+			// strictly speaking we are double charging for the first BASIC_BLOCK_SIZE
+			// instructions here. Let's consider this as a safety margin.
+			BytecodeType::Pvm => T::WeightInfo::call_with_pvm_code_per_byte(self.code_len)
+				.saturating_sub(T::WeightInfo::call_with_pvm_code_per_byte(0))
+				.saturating_add(
+					T::WeightInfo::basic_block_compilation(1)
+						.saturating_sub(T::WeightInfo::basic_block_compilation(0))
+						.set_proof_size(0),
+				),
+			BytecodeType::Evm => T::WeightInfo::call_with_evm_code_per_byte(self.code_len)
+				.saturating_sub(T::WeightInfo::call_with_evm_code_per_byte(0)),
+		}
 	}
 }
 
@@ -261,7 +284,7 @@ where
 {
 	fn from_storage(code_hash: H256, gas_meter: &mut GasMeter<T>) -> Result<Self, DispatchError> {
 		let code_info = <CodeInfoOf<T>>::get(code_hash).ok_or(Error::<T>::CodeNotFound)?;
-		gas_meter.charge(CodeLoadToken(code_info.code_len))?;
+		gas_meter.charge(CodeLoadToken::from_code_info(&code_info))?;
 		let code = <PristineCode<T>>::get(&code_hash).ok_or(Error::<T>::CodeNotFound)?;
 		Ok(Self { code, code_info, code_hash })
 	}
diff --git a/substrate/frame/revive/src/vm/pvm/env.rs b/substrate/frame/revive/src/vm/pvm/env.rs
index fa8d7193d371..c42b976124e4 100644
--- a/substrate/frame/revive/src/vm/pvm/env.rs
+++ b/substrate/frame/revive/src/vm/pvm/env.rs
@@ -23,7 +23,7 @@ use crate::{
 	limits,
 	primitives::ExecReturnValue,
 	storage::meter::Diff,
-	vm::{ExportedFunction, RuntimeCosts},
+	vm::{BytecodeType, ExportedFunction, RuntimeCosts},
 	AccountIdOf, BalanceOf, CodeInfo, Config, ContractBlob, Error, Weight, SENTINEL,
 };
 use alloc::vec::Vec;
@@ -121,6 +121,7 @@ where
 			deposit,
 			refcount: 0,
 			code_len,
+			code_type: BytecodeType::Pvm,
 			behaviour_version: Default::default(),
 		};
 		let code_hash = H256(sp_io::hashing::keccak_256(&code));
diff --git a/substrate/frame/revive/src/weights.rs b/substrate/frame/revive/src/weights.rs
index a22c7d5d1246..2673cf5064be 100644
--- a/substrate/frame/revive/src/weights.rs
+++ b/substrate/frame/revive/src/weights.rs
@@ -73,7 +73,8 @@ use core::marker::PhantomData;
 pub trait WeightInfo {
 	fn on_process_deletion_queue_batch() -> Weight;
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight;
-	fn call_with_code_per_byte(c: u32, ) -> Weight;
+	fn call_with_pvm_code_per_byte(c: u32, ) -> Weight;
+	fn call_with_evm_code_per_byte(c: u32, ) -> Weight { Self::call_with_pvm_code_per_byte(c) }
 	fn basic_block_compilation(b: u32, ) -> Weight;
 	fn instantiate_with_code(c: u32, i: u32, ) -> Weight;
 	fn eth_instantiate_with_code(c: u32, i: u32, d: u32, ) -> Weight;
@@ -206,7 +207,7 @@ 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, 102400]`.
-	fn call_with_code_per_byte(c: u32, ) -> Weight {
+	fn call_with_pvm_code_per_byte(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1171 + c * (1 ±0)`
 		//  Estimated: `7106 + c * (1 ±0)`
@@ -1266,7 +1267,7 @@ 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, 102400]`.
-	fn call_with_code_per_byte(c: u32, ) -> Weight {
+	fn call_with_pvm_code_per_byte(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1171 + c * (1 ±0)`
 		//  Estimated: `7106 + c * (1 ±0)`

From 20511d109fe912b233dff6275b5ef59fe12bb67e Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Mon, 18 Aug 2025 17:41:56 +0200
Subject: [PATCH 116/186] fixes

---
 substrate/frame/revive/src/evm/runtime.rs |  8 ++++++--
 substrate/frame/revive/src/exec.rs        |  7 +------
 substrate/frame/revive/src/exec/tests.rs  |  4 ----
 substrate/frame/revive/src/tests/pvm.rs   | 10 +++++-----
 substrate/frame/revive/src/vm/mod.rs      | 14 +++++++++++---
 5 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/substrate/frame/revive/src/evm/runtime.rs b/substrate/frame/revive/src/evm/runtime.rs
index 04b03c9afec0..b8f092ee3f91 100644
--- a/substrate/frame/revive/src/evm/runtime.rs
+++ b/substrate/frame/revive/src/evm/runtime.rs
@@ -666,13 +666,17 @@ mod test {
 
 	#[test]
 	fn check_instantiate_data() {
-		let code = b"invalid code".to_vec();
+		let code: Vec<u8> = polkavm_common::program::BLOB_MAGIC
+			.into_iter()
+			.chain(b"invalid code".iter().cloned())
+			.collect();
 		let data = vec![1];
+
 		let builder = UncheckedExtrinsicBuilder::instantiate_with(code.clone(), data.clone());
 
 		// Fail because the tx input fail to get the blob length
 		assert_eq!(
-			builder.mutate_estimate_and_check(Box::new(|tx| tx.input = vec![1, 2, 3].into())),
+			builder.check(),
 			Err(TransactionValidityError::Invalid(InvalidTransaction::Call))
 		);
 	}
diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index c0e9bcd06703..737b395a846f 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -477,11 +477,6 @@ pub trait Executable<T: Config>: Sized {
 
 	/// The code hash of the executable.
 	fn code_hash(&self) -> &H256;
-
-	/// Returns true if the executable is a PVM blob.
-	fn is_pvm(&self) -> bool {
-		self.code().starts_with(&polkavm_common::program::BLOB_MAGIC)
-	}
 }
 
 /// The complete call stack of a contract execution.
@@ -577,7 +572,7 @@ impl<T: Config, E: Executable<T>, Env> ExecutableOrPrecompile<T, E, Env> {
 
 	fn is_pvm(&self) -> bool {
 		match self {
-			Self::Executable(e) => e.is_pvm(),
+			Self::Executable(e) => e.code_info().is_pvm(),
 			_ => false,
 		}
 	}
diff --git a/substrate/frame/revive/src/exec/tests.rs b/substrate/frame/revive/src/exec/tests.rs
index 9b1995e2db7e..381abc7c2611 100644
--- a/substrate/frame/revive/src/exec/tests.rs
+++ b/substrate/frame/revive/src/exec/tests.rs
@@ -176,10 +176,6 @@ impl Executable<Test> for MockExecutable {
 		self.code_hash.as_ref()
 	}
 
-	fn is_pvm(&self) -> bool {
-		true
-	}
-
 	fn code_hash(&self) -> &H256 {
 		&self.code_hash
 	}
diff --git a/substrate/frame/revive/src/tests/pvm.rs b/substrate/frame/revive/src/tests/pvm.rs
index f41cb890bb4a..78efeb8fd1ea 100644
--- a/substrate/frame/revive/src/tests/pvm.rs
+++ b/substrate/frame/revive/src/tests/pvm.rs
@@ -722,7 +722,7 @@ fn deploy_and_call_other_contract() {
 						),
 						source: ALICE,
 						dest: callee_account.clone(),
-						transferred: 555,
+						transferred: 556,
 					}),
 					topics: vec![],
 				},
@@ -2051,7 +2051,7 @@ fn instantiate_with_zero_balance_works() {
 							HoldReason::CodeUploadDepositReserve,
 						),
 						who: ALICE,
-						amount: 776,
+						amount: 777,
 					}),
 					topics: vec![],
 				},
@@ -2095,7 +2095,7 @@ fn instantiate_with_zero_balance_works() {
 						),
 						source: ALICE,
 						dest: account_id,
-						transferred: 336,
+						transferred: 337,
 					}),
 					topics: vec![],
 				},
@@ -2139,7 +2139,7 @@ fn instantiate_with_below_existential_deposit_works() {
 							HoldReason::CodeUploadDepositReserve,
 						),
 						who: ALICE,
-						amount: 776,
+						amount: 777,
 					}),
 					topics: vec![],
 				},
@@ -2192,7 +2192,7 @@ fn instantiate_with_below_existential_deposit_works() {
 						),
 						source: ALICE,
 						dest: account_id.clone(),
-						transferred: 336,
+						transferred: 337,
 					}),
 					topics: vec![],
 				},
diff --git a/substrate/frame/revive/src/vm/mod.rs b/substrate/frame/revive/src/vm/mod.rs
index 3387579f3af6..a854f2ebb5a5 100644
--- a/substrate/frame/revive/src/vm/mod.rs
+++ b/substrate/frame/revive/src/vm/mod.rs
@@ -56,7 +56,9 @@ pub struct ContractBlob<T: Config> {
 	code_hash: H256,
 }
 
-#[derive(Copy, Clone, Encode, Decode, MaxEncodedLen, scale_info::TypeInfo)]
+#[derive(
+	PartialEq, Eq, Debug, Copy, Clone, Encode, Decode, MaxEncodedLen, scale_info::TypeInfo,
+)]
 pub enum BytecodeType {
 	/// The code is a PVM bytecode.
 	Pvm,
@@ -142,7 +144,7 @@ impl<T: Config> Token<T> for CodeLoadToken {
 
 #[cfg(test)]
 pub fn code_load_weight(code_len: u32) -> Weight {
-	Token::<crate::tests::Test>::weight(&CodeLoadToken(code_len))
+	Token::<crate::tests::Test>::weight(&CodeLoadToken { code_len, code_type: BytecodeType::Pvm })
 }
 
 impl<T: Config> ContractBlob<T>
@@ -216,6 +218,7 @@ impl<T: Config> CodeInfo<T> {
 			deposit: Default::default(),
 			refcount: 0,
 			code_len: 0,
+			code_type: BytecodeType::Pvm,
 			behaviour_version: Default::default(),
 		}
 	}
@@ -236,6 +239,11 @@ impl<T: Config> CodeInfo<T> {
 		self.code_len.into()
 	}
 
+	/// Returns true if the executable is a PVM blob.
+	pub fn is_pvm(&self) -> bool {
+		matches!(self.code_type, BytecodeType::Pvm)
+	}
+
 	/// Returns the number of times the specified contract exists on the call stack. Delegated calls
 	/// Increment the reference count of a stored code by one.
 	///
@@ -295,7 +303,7 @@ where
 		function: ExportedFunction,
 		input_data: Vec<u8>,
 	) -> ExecResult {
-		if self.is_pvm() {
+		if self.code_info().is_pvm() {
 			let prepared_call =
 				self.prepare_call(pvm::Runtime::new(ext, input_data), function, 0)?;
 			prepared_call.call()

From e1bbcb9dae75c9189949e949fbf80bc1c6d48055 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Mon, 18 Aug 2025 18:41:16 +0200
Subject: [PATCH 117/186] added migration

---
 substrate/frame/revive/src/benchmarking.rs  |  39 ++-
 substrate/frame/revive/src/migrations.rs    |   3 +
 substrate/frame/revive/src/migrations/v2.rs | 251 ++++++++++++++++++++
 substrate/frame/revive/src/weights.rs       |   2 +
 4 files changed, 294 insertions(+), 1 deletion(-)
 create mode 100644 substrate/frame/revive/src/migrations/v2.rs

diff --git a/substrate/frame/revive/src/benchmarking.rs b/substrate/frame/revive/src/benchmarking.rs
index 1a0bda781426..67d5b24f2fbe 100644
--- a/substrate/frame/revive/src/benchmarking.rs
+++ b/substrate/frame/revive/src/benchmarking.rs
@@ -27,7 +27,7 @@ use crate::{
 		self, run::builtin as run_builtin_precompile, BenchmarkSystem, BuiltinPrecompile, ISystem,
 	},
 	storage::WriteOutcome,
-	vm::pvm,
+	vm::{pvm, BytecodeType},
 	Pallet as Contracts, *,
 };
 use alloc::{vec, vec::Vec};
@@ -2369,6 +2369,43 @@ mod benchmarks {
 		assert_eq!(meter.consumed(), <T as Config>::WeightInfo::v1_migration_step() * 2);
 	}
 
+	#[benchmark]
+	fn v2_migration_step() {
+		use crate::migrations::v2;
+		let code_hash = H256::from([0; 32]);
+		v2::old::CodeInfoOf::<T>::insert(
+			code_hash,
+			v2::old::CodeInfo {
+				owner: whitelisted_caller(),
+				deposit: 1000u32.into(),
+				refcount: 1,
+				code_len: 100,
+				behaviour_version: 0,
+			},
+		);
+		let mut meter = WeightMeter::new();
+
+		#[block]
+		{
+			v2::Migration::<T>::step(None, &mut meter).unwrap();
+		}
+
+		assert_eq!(
+			v2::new::CodeInfoOf::<T>::get(&code_hash).unwrap(),
+			v2::new::CodeInfo {
+				owner: whitelisted_caller(),
+				deposit: 1000u32.into(),
+				refcount: 1,
+				code_len: 100,
+				code_type: BytecodeType::Pvm,
+				behaviour_version: 0,
+			},
+		);
+
+		// uses twice the weight once for migration and then for checking if there is another key.
+		assert_eq!(meter.consumed(), <T as Config>::WeightInfo::v2_migration_step() * 2);
+	}
+
 	impl_benchmark_test_suite!(
 		Contracts,
 		crate::tests::ExtBuilder::default().build(),
diff --git a/substrate/frame/revive/src/migrations.rs b/substrate/frame/revive/src/migrations.rs
index 694ecfd75d2f..f2c702a3e900 100644
--- a/substrate/frame/revive/src/migrations.rs
+++ b/substrate/frame/revive/src/migrations.rs
@@ -20,5 +20,8 @@
 /// Migrations from the old `ContractInfoOf` to the new `AccountInfoOf` storage
 pub mod v1;
 
+/// Migrations from the old `CodeInfoOf` to the new `CodeInfoOf` storage
+pub mod v2;
+
 /// A unique identifier across all pallets.
 const PALLET_MIGRATIONS_ID: &[u8; 17] = b"pallet-revive-mbm";
diff --git a/substrate/frame/revive/src/migrations/v2.rs b/substrate/frame/revive/src/migrations/v2.rs
new file mode 100644
index 000000000000..be914ec66c48
--- /dev/null
+++ b/substrate/frame/revive/src/migrations/v2.rs
@@ -0,0 +1,251 @@
+// 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.
+
+//! # Multi-Block Migration v2
+//!
+//! This migrate the old `CodeInfoOf` storage to the new `CodeInfoOf` which add the new `code_type`
+//! field.
+
+extern crate alloc;
+
+use super::PALLET_MIGRATIONS_ID;
+use crate::{vm::BytecodeType, weights::WeightInfo, Config, H256};
+use frame_support::{
+	migrations::{MigrationId, SteppedMigration, SteppedMigrationError},
+	pallet_prelude::PhantomData,
+	weights::WeightMeter,
+};
+
+#[cfg(feature = "try-runtime")]
+use alloc::collections::btree_map::BTreeMap;
+
+#[cfg(feature = "try-runtime")]
+use alloc::vec::Vec;
+
+/// Module containing the old storage items.
+pub mod old {
+	use super::Config;
+	use crate::{pallet::Pallet, AccountIdOf, BalanceOf, H256};
+	use codec::{Decode, Encode};
+	use frame_support::{storage_alias, Identity};
+
+	#[derive(Clone, Encode, Decode)]
+	pub struct CodeInfo<T: Config> {
+		pub owner: AccountIdOf<T>,
+		#[codec(compact)]
+		pub deposit: BalanceOf<T>,
+		#[codec(compact)]
+		pub refcount: u64,
+		pub code_len: u32,
+		pub behaviour_version: u32,
+	}
+
+	#[storage_alias]
+	/// The storage item that is being migrated from.
+	pub type CodeInfoOf<T: Config> = StorageMap<Pallet<T>, Identity, H256, CodeInfo<T>>;
+}
+
+pub mod new {
+	use super::{BytecodeType, Config};
+	use crate::{pallet::Pallet, AccountIdOf, BalanceOf, H256};
+	use codec::{Decode, Encode};
+	use frame_support::{storage_alias, DebugNoBound, Identity};
+
+	#[derive(PartialEq, Eq, DebugNoBound, Encode, Decode)]
+	pub struct CodeInfo<T: Config> {
+		pub owner: AccountIdOf<T>,
+		#[codec(compact)]
+		pub deposit: BalanceOf<T>,
+		#[codec(compact)]
+		pub refcount: u64,
+		pub code_len: u32,
+		pub code_type: BytecodeType,
+		pub behaviour_version: u32,
+	}
+
+	#[storage_alias]
+	/// The storage item that is being migrated to.
+	pub type CodeInfoOf<T: Config> = StorageMap<Pallet<T>, Identity, H256, CodeInfo<T>>;
+}
+
+/// Migrates the items of the [`old::CodeInfoOf`] map into [`crate::CodeInfoOf`] by adding the
+/// `code_type` field.
+pub struct Migration<T: Config>(PhantomData<T>);
+
+impl<T: Config> SteppedMigration for Migration<T> {
+	type Cursor = H256;
+	type Identifier = MigrationId<17>;
+
+	fn id() -> Self::Identifier {
+		MigrationId { pallet_id: *PALLET_MIGRATIONS_ID, version_from: 1, version_to: 2 }
+	}
+
+	fn step(
+		mut cursor: Option<Self::Cursor>,
+		meter: &mut WeightMeter,
+	) -> Result<Option<Self::Cursor>, SteppedMigrationError> {
+		let required = <T as Config>::WeightInfo::v2_migration_step();
+		if meter.remaining().any_lt(required) {
+			return Err(SteppedMigrationError::InsufficientWeight { required });
+		}
+
+		loop {
+			if meter.try_consume(required).is_err() {
+				break;
+			}
+
+			let iter = if let Some(last_key) = cursor {
+				old::CodeInfoOf::<T>::iter_from(old::CodeInfoOf::<T>::hashed_key_for(last_key))
+			} else {
+				old::CodeInfoOf::<T>::iter()
+			};
+
+			if let Some((last_key, value)) = iter.drain().next() {
+				new::CodeInfoOf::<T>::insert(
+					last_key,
+					new::CodeInfo {
+						owner: value.owner,
+						deposit: value.deposit,
+						refcount: value.refcount,
+						code_len: value.code_len,
+						code_type: BytecodeType::Pvm,
+						behaviour_version: value.behaviour_version,
+					},
+				);
+				cursor = Some(last_key)
+			} else {
+				cursor = None;
+				break
+			}
+		}
+		Ok(cursor)
+	}
+
+	#[cfg(feature = "try-runtime")]
+	fn pre_upgrade() -> Result<Vec<u8>, frame_support::sp_runtime::TryRuntimeError> {
+		use codec::Encode;
+
+		// Return the state of the storage before the migration.
+		Ok(old::CodeInfoOf::<T>::iter().collect::<BTreeMap<_, _>>().encode())
+	}
+
+	#[cfg(feature = "try-runtime")]
+	fn post_upgrade(prev: Vec<u8>) -> Result<(), frame_support::sp_runtime::TryRuntimeError> {
+		use codec::Decode;
+
+		// Check the state of the storage after the migration.
+		let prev_map = BTreeMap::<H256, old::CodeInfo<T>>::decode(&mut &prev[..])
+			.expect("Failed to decode the previous storage state");
+
+		// Check the len of prev and post are the same.
+		assert_eq!(
+			crate::CodeInfoOf::<T>::iter().count(),
+			prev_map.len(),
+			"Migration failed: the number of items in the storage after the migration is not the same as before"
+		);
+
+		for (key, value) in prev_map {
+			let new_value = new::CodeInfoOf::<T>::get(key)
+				.expect("Failed to get the value after the migration");
+			assert_eq!(
+				value.owner, new_value.owner,
+				"Migration failed: owner mismatch after migration"
+			);
+			assert_eq!(
+				value.deposit, new_value.deposit,
+				"Migration failed: deposit mismatch after migration"
+			);
+			assert_eq!(
+				value.refcount, new_value.refcount,
+				"Migration failed: refcount mismatch after migration"
+			);
+			assert_eq!(
+				value.code_len, new_value.code_len,
+				"Migration failed: code_len mismatch after migration"
+			);
+			assert_eq!(
+				value.behaviour_version, new_value.behaviour_version,
+				"Migration failed: behaviour_version mismatch after migration"
+			);
+			assert_eq!(
+				new_value.code_type,
+				BytecodeType::Pvm,
+				"Migration failed: code_type should be Pvm after migration"
+			);
+		}
+
+		Ok(())
+	}
+}
+
+#[test]
+fn migrate_to_v2() {
+	use crate::{
+		tests::{ExtBuilder, Test},
+		AccountIdOf,
+	};
+	use alloc::collections::BTreeMap;
+
+	ExtBuilder::default().build().execute_with(|| {
+		// Store the original values to verify against later
+		let mut original_values = BTreeMap::new();
+
+		for i in 0..10u8 {
+			let code_hash = H256::from([i; 32]);
+			let old_info = old::CodeInfo {
+				owner: AccountIdOf::<Test>::from([i; 32]),
+				deposit: (1000u32 + i as u32).into(),
+				refcount: 1 + i as u64,
+				code_len: 100 + i as u32,
+				behaviour_version: i as u32,
+			};
+
+			old::CodeInfoOf::<Test>::insert(code_hash, old_info.clone());
+			original_values.insert(code_hash, old_info);
+		}
+
+		let mut cursor = None;
+		let mut weight_meter = WeightMeter::new();
+		while let Some(new_cursor) = Migration::<Test>::step(cursor, &mut weight_meter).unwrap() {
+			cursor = Some(new_cursor);
+		}
+
+		assert_eq!(new::CodeInfoOf::<Test>::iter().count(), 10);
+
+		// Verify all values match between old and new with code_type set to PVM
+		for (code_hash, old_value) in original_values {
+			let new_value = new::CodeInfoOf::<Test>::get(code_hash)
+				.expect("New storage should contain migrated value");
+
+			assert_eq!(new_value.owner, old_value.owner, "Owner should match original value");
+			assert_eq!(new_value.deposit, old_value.deposit, "Deposit should match original value");
+			assert_eq!(
+				new_value.refcount, old_value.refcount,
+				"Refcount should match original value"
+			);
+			assert_eq!(
+				new_value.code_len, old_value.code_len,
+				"Code length should match original value"
+			);
+			assert_eq!(
+				new_value.behaviour_version, old_value.behaviour_version,
+				"Behaviour version should match original value"
+			);
+			assert_eq!(new_value.code_type, BytecodeType::Pvm, "Code type should be set to PVM");
+		}
+	})
+}
diff --git a/substrate/frame/revive/src/weights.rs b/substrate/frame/revive/src/weights.rs
index 2673cf5064be..3b6f463f6d4d 100644
--- a/substrate/frame/revive/src/weights.rs
+++ b/substrate/frame/revive/src/weights.rs
@@ -162,6 +162,8 @@ pub trait WeightInfo {
 	fn evm_opcode(_r: u32) -> Weight { Weight::zero() }
 	fn instr_empty_loop(r: u32, ) -> Weight;
 	fn v1_migration_step() -> Weight;
+	fn v2_migration_step() -> Weight { Weight::zero() }
+
 }
 
 /// Weights for `pallet_revive` using the Substrate node and recommended hardware.

From f8da76fefacfcfa061ff1c1028cb6661827c6752 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Tue, 19 Aug 2025 08:54:04 +0200
Subject: [PATCH 118/186] refactoring

---
 substrate/frame/revive/src/evm/runtime.rs |  9 ++-------
 substrate/frame/revive/src/lib.rs         | 15 ++-------------
 substrate/frame/revive/src/vm/pvm.rs      |  8 ++++++++
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/substrate/frame/revive/src/evm/runtime.rs b/substrate/frame/revive/src/evm/runtime.rs
index b8f092ee3f91..595a26fcafe3 100644
--- a/substrate/frame/revive/src/evm/runtime.rs
+++ b/substrate/frame/revive/src/evm/runtime.rs
@@ -20,6 +20,7 @@ use crate::{
 		api::{GenericTransaction, TransactionSigned},
 		GasEncoder,
 	},
+	vm::pvm::extract_code_and_data,
 	AccountIdOf, AddressMapper, BalanceOf, Config, MomentOf, OnChargeTransactionBalanceOf, Pallet,
 	LOG_TARGET, RUNTIME_PALLETS_ADDR,
 };
@@ -351,13 +352,7 @@ pub trait EthExtra {
 			}
 		} else {
 			let (code, data) = if data.starts_with(&polkavm_common::program::BLOB_MAGIC) {
-				let try_parse = || {
-					let blob_len = polkavm::ProgramBlob::blob_length(&data)?;
-					let blob_len = blob_len.try_into().ok()?;
-					let (code, data) = data.split_at_checked(blob_len)?;
-					Some((code.to_vec(), data.to_vec()))
-				};
-				let Some((code, data)) = try_parse() else {
+				let Some((code, data)) = extract_code_and_data(&data) else {
 					log::debug!(target: LOG_TARGET, "Failed to extract polkavm code & data");
 					return Err(InvalidTransaction::Call);
 				};
diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index e299f38045e5..aca9e13c8cc2 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -54,7 +54,7 @@ use crate::{
 		meter::Meter as StorageMeter, AccountInfo, AccountType, ContractInfo, DeletionQueueManager,
 	},
 	tracing::if_tracing,
-	vm::{CodeInfo, ContractBlob, RuntimeCosts},
+	vm::{pvm::extract_code_and_data, CodeInfo, ContractBlob, RuntimeCosts},
 };
 use alloc::{boxed::Box, format, vec};
 use codec::{Codec, Decode, Encode};
@@ -1345,18 +1345,7 @@ where
 			None => {
 				// Extract code and data from the input.
 				let (code, data) = if input.starts_with(&polkavm_common::program::BLOB_MAGIC) {
-					let (code, data) = match polkavm::ProgramBlob::blob_length(&input) {
-						Some(blob_len) => blob_len
-							.try_into()
-							.ok()
-							.and_then(|blob_len| (input.split_at_checked(blob_len)))
-							.unwrap_or_else(|| (&input[..], &[][..])),
-						_ => {
-							log::debug!(target: LOG_TARGET, "Failed to extract polkavm blob length");
-							(&input[..], &[][..])
-						},
-					};
-					(code.to_vec(), data.to_vec())
+					extract_code_and_data(&input).unwrap_or_else(|| (input, Default::default()))
 				} else {
 					(input, vec![])
 				};
diff --git a/substrate/frame/revive/src/vm/pvm.rs b/substrate/frame/revive/src/vm/pvm.rs
index b0a2ed8264b2..d9229eb00c0c 100644
--- a/substrate/frame/revive/src/vm/pvm.rs
+++ b/substrate/frame/revive/src/vm/pvm.rs
@@ -39,6 +39,14 @@ use pallet_revive_uapi::{CallFlags, ReturnErrorCode, ReturnFlags, StorageFlags};
 use sp_core::{H160, H256, U256};
 use sp_runtime::{DispatchError, RuntimeDebug};
 
+/// Extracts the code and data from a given program blob.
+pub fn extract_code_and_data(data: &[u8]) -> Option<(Vec<u8>, Vec<u8>)> {
+	let blob_len = polkavm::ProgramBlob::blob_length(data)?;
+	let blob_len = blob_len.try_into().ok()?;
+	let (code, data) = data.split_at_checked(blob_len)?;
+	Some((code.to_vec(), data.to_vec()))
+}
+
 /// Abstraction over the memory access within syscalls.
 ///
 /// The reason for this abstraction is that we run syscalls on the host machine when

From b1b11921464d7542b9ab6c22d413eb74d1041899 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Tue, 19 Aug 2025 07:26:04 +0000
Subject: [PATCH 119/186] fix clippy

---
 substrate/frame/revive/src/vm/evm/instructions/macros.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/substrate/frame/revive/src/vm/evm/instructions/macros.rs b/substrate/frame/revive/src/vm/evm/instructions/macros.rs
index d171622d0ebd..1e4dd91079e3 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/macros.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/macros.rs
@@ -127,7 +127,7 @@ use revm::interpreter::gas::{MemoryExtensionResult, MemoryGas};
 
 /// Adapted from
 /// https://docs.rs/revm/latest/revm/interpreter/struct.Gas.html#method.record_memory_expansion
-pub fn record_memory_expansion<'a, E: Ext>(
+pub fn record_memory_expansion<E: Ext>(
 	memory: &mut MemoryGas,
 	ext: &mut E,
 	new_len: usize,

From a829fab2f712ae3767ca85a1a240ec86eb94a1d5 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Tue, 19 Aug 2025 07:53:42 +0000
Subject: [PATCH 120/186] fix clippy

---
 substrate/frame/revive/src/tests/sol/misc.rs   | 9 +++++----
 substrate/frame/revive/src/tests/sol/system.rs | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/substrate/frame/revive/src/tests/sol/misc.rs b/substrate/frame/revive/src/tests/sol/misc.rs
index 90b62c80c8cf..f7ad0cac3f3d 100644
--- a/substrate/frame/revive/src/tests/sol/misc.rs
+++ b/substrate/frame/revive/src/tests/sol/misc.rs
@@ -58,10 +58,11 @@ fn basic_evm_flow_works() {
 /// Tests that the sstore and sload storage opcodes work as expected.
 #[test]
 fn flipper() {
-	for fixture_type in [
-		FixtureType::Resolc,
-		// FixtureType::Solc, TODO uncomment once implemented
-	] {
+	for fixture_type in [FixtureType::Resolc, FixtureType::Solc]
+		// TODO remove take(1) once Solc supported
+		.into_iter()
+		.take(1)
+	{
 		let (code, _) = compile_module_with_type("Flipper", fixture_type).unwrap();
 		ExtBuilder::default().build().execute_with(|| {
 			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
diff --git a/substrate/frame/revive/src/tests/sol/system.rs b/substrate/frame/revive/src/tests/sol/system.rs
index 115612db3be6..9bf1179483f3 100644
--- a/substrate/frame/revive/src/tests/sol/system.rs
+++ b/substrate/frame/revive/src/tests/sol/system.rs
@@ -32,10 +32,11 @@ use sp_io::hashing::keccak_256;
 
 #[test]
 fn keccak_256_works() {
-	for fixture_type in [
-		FixtureType::Resolc,
-		// FixtureType::Solc, TODO uncomment once implemented
-	] {
+	for fixture_type in [FixtureType::Resolc, FixtureType::Solc]
+		// TODO remove take(1) once Solc supported
+		.into_iter()
+		.take(1)
+	{
 		let (code, _) = compile_module_with_type("System", fixture_type).unwrap();
 		ExtBuilder::default().build().execute_with(|| {
 			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);

From 953ee61d6673130189cfb9d03e9af0774cfc15ad Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Thu, 21 Aug 2025 11:21:36 +0200
Subject: [PATCH 121/186] merge fix

---
 substrate/frame/revive/src/exec/tests.rs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/substrate/frame/revive/src/exec/tests.rs b/substrate/frame/revive/src/exec/tests.rs
index 9b1995e2db7e..381abc7c2611 100644
--- a/substrate/frame/revive/src/exec/tests.rs
+++ b/substrate/frame/revive/src/exec/tests.rs
@@ -176,10 +176,6 @@ impl Executable<Test> for MockExecutable {
 		self.code_hash.as_ref()
 	}
 
-	fn is_pvm(&self) -> bool {
-		true
-	}
-
 	fn code_hash(&self) -> &H256 {
 		&self.code_hash
 	}

From 7cee5bec9d8ffe3a9dcbede0680125bc0a3799ec Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Thu, 21 Aug 2025 11:21:58 +0200
Subject: [PATCH 122/186] simplify migration tests

---
 substrate/frame/revive/src/migrations/v2.rs | 36 +++++++--------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/substrate/frame/revive/src/migrations/v2.rs b/substrate/frame/revive/src/migrations/v2.rs
index be914ec66c48..13b6e8e93ce3 100644
--- a/substrate/frame/revive/src/migrations/v2.rs
+++ b/substrate/frame/revive/src/migrations/v2.rs
@@ -161,31 +161,17 @@ impl<T: Config> SteppedMigration for Migration<T> {
 		for (key, value) in prev_map {
 			let new_value = new::CodeInfoOf::<T>::get(key)
 				.expect("Failed to get the value after the migration");
-			assert_eq!(
-				value.owner, new_value.owner,
-				"Migration failed: owner mismatch after migration"
-			);
-			assert_eq!(
-				value.deposit, new_value.deposit,
-				"Migration failed: deposit mismatch after migration"
-			);
-			assert_eq!(
-				value.refcount, new_value.refcount,
-				"Migration failed: refcount mismatch after migration"
-			);
-			assert_eq!(
-				value.code_len, new_value.code_len,
-				"Migration failed: code_len mismatch after migration"
-			);
-			assert_eq!(
-				value.behaviour_version, new_value.behaviour_version,
-				"Migration failed: behaviour_version mismatch after migration"
-			);
-			assert_eq!(
-				new_value.code_type,
-				BytecodeType::Pvm,
-				"Migration failed: code_type should be Pvm after migration"
-			);
+			
+			let expected = new::CodeInfo {
+				owner: value.owner,
+				deposit: value.deposit,
+				refcount: value.refcount,
+				code_len: value.code_len,
+				code_type: BytecodeType::Pvm,
+				behaviour_version: value.behaviour_version,
+			};
+			
+			assert_eq!(new_value, expected, "Migration failed: CodeInfo mismatch for key {:?}", key);
 		}
 
 		Ok(())

From b8dc7176ba227ca51c5c2f266a5ef93f3e04c238 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Thu, 21 Aug 2025 11:24:59 +0200
Subject: [PATCH 123/186] add migration

---
 .../parachains/runtimes/assets/asset-hub-westend/src/lib.rs  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
index 91d0581a98c2..6a646b2122f1 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
@@ -1200,7 +1200,10 @@ parameter_types! {
 impl pallet_migrations::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	#[cfg(not(feature = "runtime-benchmarks"))]
-	type Migrations = pallet_revive::migrations::v1::Migration<Runtime>;
+	type Migrations = (
+		pallet_revive::migrations::v1::Migration<Runtime>,
+		pallet_revive::migrations::v2::Migration<Runtime>,
+	);
 	// Benchmarks need mocked migrations to guarantee that they succeed.
 	#[cfg(feature = "runtime-benchmarks")]
 	type Migrations = pallet_migrations::mock_helpers::MockedMigrations;

From 81578a0f4ec9533e86da717a31eee07eed328b89 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Thu, 21 Aug 2025 11:36:24 +0200
Subject: [PATCH 124/186] remove unneeded tests for this PR

---
 .../revive/fixtures/contracts/Flipper.sol     | 10 --
 substrate/frame/revive/src/benchmarking.rs    | 16 ++--
 substrate/frame/revive/src/migrations/v2.rs   | 23 ++++-
 substrate/frame/revive/src/tests/sol.rs       | 38 +++++++-
 substrate/frame/revive/src/tests/sol/misc.rs  | 93 -------------------
 5 files changed, 65 insertions(+), 115 deletions(-)
 delete mode 100644 substrate/frame/revive/fixtures/contracts/Flipper.sol
 delete mode 100644 substrate/frame/revive/src/tests/sol/misc.rs

diff --git a/substrate/frame/revive/fixtures/contracts/Flipper.sol b/substrate/frame/revive/fixtures/contracts/Flipper.sol
deleted file mode 100644
index 2eff39a5a6e3..000000000000
--- a/substrate/frame/revive/fixtures/contracts/Flipper.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8;
-
-contract Flipper {
-    bool public coin;
-
-    fallback() external {
-        coin = !coin;
-    }
-}
diff --git a/substrate/frame/revive/src/benchmarking.rs b/substrate/frame/revive/src/benchmarking.rs
index 95cf261e920c..236944cbe704 100644
--- a/substrate/frame/revive/src/benchmarking.rs
+++ b/substrate/frame/revive/src/benchmarking.rs
@@ -2383,16 +2383,14 @@ mod benchmarks {
 	fn v2_migration_step() {
 		use crate::migrations::v2;
 		let code_hash = H256::from([0; 32]);
-		v2::old::CodeInfoOf::<T>::insert(
-			code_hash,
-			v2::old::CodeInfo {
-				owner: whitelisted_caller(),
-				deposit: 1000u32.into(),
-				refcount: 1,
-				code_len: 100,
-				behaviour_version: 0,
-			},
+		let old_code_info = v2::Migration::<T>::create_old_code_info(
+			whitelisted_caller(),
+			1000u32.into(),
+			1,
+			100,
+			0,
 		);
+		v2::Migration::<T>::insert_old_code_info(code_hash, old_code_info);
 		let mut meter = WeightMeter::new();
 
 		#[block]
diff --git a/substrate/frame/revive/src/migrations/v2.rs b/substrate/frame/revive/src/migrations/v2.rs
index 13b6e8e93ce3..55be0fb67b84 100644
--- a/substrate/frame/revive/src/migrations/v2.rs
+++ b/substrate/frame/revive/src/migrations/v2.rs
@@ -23,7 +23,7 @@
 extern crate alloc;
 
 use super::PALLET_MIGRATIONS_ID;
-use crate::{vm::BytecodeType, weights::WeightInfo, Config, H256};
+use crate::{vm::BytecodeType, weights::WeightInfo, AccountIdOf, BalanceOf, Config, H256};
 use frame_support::{
 	migrations::{MigrationId, SteppedMigration, SteppedMigrationError},
 	pallet_prelude::PhantomData,
@@ -37,7 +37,7 @@ use alloc::collections::btree_map::BTreeMap;
 use alloc::vec::Vec;
 
 /// Module containing the old storage items.
-pub mod old {
+mod old {
 	use super::Config;
 	use crate::{pallet::Pallet, AccountIdOf, BalanceOf, H256};
 	use codec::{Decode, Encode};
@@ -178,6 +178,25 @@ impl<T: Config> SteppedMigration for Migration<T> {
 	}
 }
 
+#[cfg(feature = "runtime-benchmarks")]
+impl<T: Config> Migration<T> {
+	/// Insert an old CodeInfo for benchmarking purposes.
+	pub fn insert_old_code_info(code_hash: H256, code_info: old::CodeInfo<T>) {
+		old::CodeInfoOf::<T>::insert(code_hash, code_info);
+	}
+
+	/// Create an old CodeInfo struct for benchmarking.
+	pub fn create_old_code_info(
+		owner: AccountIdOf<T>,
+		deposit: BalanceOf<T>,
+		refcount: u64,
+		code_len: u32,
+		behaviour_version: u32,
+	) -> old::CodeInfo<T> {
+		old::CodeInfo { owner, deposit, refcount, code_len, behaviour_version }
+	}
+}
+
 #[test]
 fn migrate_to_v2() {
 	use crate::{
diff --git a/substrate/frame/revive/src/tests/sol.rs b/substrate/frame/revive/src/tests/sol.rs
index 15b52ebc4a82..268c8c089400 100644
--- a/substrate/frame/revive/src/tests/sol.rs
+++ b/substrate/frame/revive/src/tests/sol.rs
@@ -16,5 +16,41 @@
 // limitations under the License.
 
 mod block_info;
-mod misc;
 mod system;
+
+use crate::{
+	test_utils::{builder::Contract, ALICE},
+	tests::{
+		builder,
+		test_utils::{ensure_stored, get_contract_checked},
+		ExtBuilder, Test,
+	},
+	Code, Config,
+};
+use alloy_core::{primitives::U256, sol_types::SolInterface};
+use frame_support::traits::fungible::Mutate;
+use pallet_revive_fixtures::{compile_module_with_type, Fibonacci, FixtureType};
+use pretty_assertions::assert_eq;
+
+#[test]
+fn basic_evm_flow_works() {
+	let (code, _) = compile_module_with_type("Fibonacci", FixtureType::Solc).unwrap();
+
+	ExtBuilder::default().build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+		let Contract { addr, .. } =
+			builder::bare_instantiate(Code::Upload(code.clone())).build_and_unwrap_contract();
+
+		// check the code exists
+		let contract = get_contract_checked(&addr).unwrap();
+		ensure_stored(contract.code_hash);
+
+		let result = builder::bare_call(addr)
+			.data(
+				Fibonacci::FibonacciCalls::fib(Fibonacci::fibCall { n: U256::from(10u64) })
+					.abi_encode(),
+			)
+			.build_and_unwrap_result();
+		assert_eq!(U256::from(55u32), U256::from_be_bytes::<32>(result.data.try_into().unwrap()));
+	});
+}
diff --git a/substrate/frame/revive/src/tests/sol/misc.rs b/substrate/frame/revive/src/tests/sol/misc.rs
deleted file mode 100644
index f7ad0cac3f3d..000000000000
--- a/substrate/frame/revive/src/tests/sol/misc.rs
+++ /dev/null
@@ -1,93 +0,0 @@
-// 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.
-
-//! The pallet-revive EVM specific integration test suite.
-
-use crate::{
-	test_utils::{builder::Contract, ALICE},
-	tests::{
-		builder,
-		test_utils::{ensure_stored, get_contract_checked},
-		ExtBuilder, Test,
-	},
-	Code, Config,
-};
-use alloy_core::{primitives::U256, sol_types::SolInterface};
-use frame_support::traits::fungible::Mutate;
-use pallet_revive_fixtures::{compile_module_with_type, Fibonacci, FixtureType, Flipper};
-use pretty_assertions::assert_eq;
-
-/// Tests that the EVM can calculate a fibonacci number.
-#[test]
-fn basic_evm_flow_works() {
-	let (code, _) = compile_module_with_type("Fibonacci", FixtureType::Solc).unwrap();
-
-	ExtBuilder::default().build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code.clone())).build_and_unwrap_contract();
-
-		// check the code exists
-		let contract = get_contract_checked(&addr).unwrap();
-		ensure_stored(contract.code_hash);
-
-		let result = builder::bare_call(addr)
-			.data(
-				Fibonacci::FibonacciCalls::fib(Fibonacci::fibCall { n: U256::from(10u64) })
-					.abi_encode(),
-			)
-			.build_and_unwrap_result();
-		assert_eq!(U256::from(55u32), U256::from_be_bytes::<32>(result.data.try_into().unwrap()));
-	});
-}
-
-/// Tests that the sstore and sload storage opcodes work as expected.
-#[test]
-fn flipper() {
-	for fixture_type in [FixtureType::Resolc, FixtureType::Solc]
-		// TODO remove take(1) once Solc supported
-		.into_iter()
-		.take(1)
-	{
-		let (code, _) = compile_module_with_type("Flipper", fixture_type).unwrap();
-		ExtBuilder::default().build().execute_with(|| {
-			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-			let Contract { addr, .. } =
-				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-			let result = builder::bare_call(addr)
-				.data(Flipper::FlipperCalls::coin(Flipper::coinCall {}).abi_encode())
-				.build_and_unwrap_result();
-			assert_eq!(U256::ZERO, U256::from_be_bytes::<32>(result.data.try_into().unwrap()));
-
-			// Should be false
-			let result = builder::bare_call(addr)
-				.data(Flipper::FlipperCalls::coin(Flipper::coinCall {}).abi_encode())
-				.build_and_unwrap_result();
-			assert_eq!(U256::ZERO, U256::from_be_bytes::<32>(result.data.try_into().unwrap()));
-
-			// Flip the coin
-			builder::bare_call(addr).build_and_unwrap_result();
-
-			// Should be true
-			let result = builder::bare_call(addr)
-				.data(Flipper::FlipperCalls::coin(Flipper::coinCall {}).abi_encode())
-				.build_and_unwrap_result();
-			assert_eq!(U256::ONE, U256::from_be_bytes::<32>(result.data.try_into().unwrap()));
-		});
-	}
-}

From 6000ed43100eb9eedf1394d9dc8811d0969ea12e Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Thu, 21 Aug 2025 11:57:42 +0200
Subject: [PATCH 125/186] fixes

---
 .../frame/revive/fixtures/contracts/Dummy.sol |  5 --
 substrate/frame/revive/src/benchmarking.rs    | 16 +----
 substrate/frame/revive/src/migrations/v2.rs   | 70 ++++++++++---------
 substrate/frame/revive/src/vm/evm.rs          |  2 +-
 4 files changed, 42 insertions(+), 51 deletions(-)
 delete mode 100644 substrate/frame/revive/fixtures/contracts/Dummy.sol

diff --git a/substrate/frame/revive/fixtures/contracts/Dummy.sol b/substrate/frame/revive/fixtures/contracts/Dummy.sol
deleted file mode 100644
index f702a52c7f3d..000000000000
--- a/substrate/frame/revive/fixtures/contracts/Dummy.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8;
-
-contract Dummy {
-}
diff --git a/substrate/frame/revive/src/benchmarking.rs b/substrate/frame/revive/src/benchmarking.rs
index 236944cbe704..c7490033901a 100644
--- a/substrate/frame/revive/src/benchmarking.rs
+++ b/substrate/frame/revive/src/benchmarking.rs
@@ -27,7 +27,7 @@ use crate::{
 		self, run::builtin as run_builtin_precompile, BenchmarkSystem, BuiltinPrecompile, ISystem,
 	},
 	storage::WriteOutcome,
-	vm::{pvm, BytecodeType},
+	vm::pvm,
 	Pallet as Contracts, *,
 };
 use alloc::{vec, vec::Vec};
@@ -2390,7 +2390,7 @@ mod benchmarks {
 			100,
 			0,
 		);
-		v2::Migration::<T>::insert_old_code_info(code_hash, old_code_info);
+		v2::Migration::<T>::insert_old_code_info(code_hash, old_code_info.clone());
 		let mut meter = WeightMeter::new();
 
 		#[block]
@@ -2398,17 +2398,7 @@ mod benchmarks {
 			v2::Migration::<T>::step(None, &mut meter).unwrap();
 		}
 
-		assert_eq!(
-			v2::new::CodeInfoOf::<T>::get(&code_hash).unwrap(),
-			v2::new::CodeInfo {
-				owner: whitelisted_caller(),
-				deposit: 1000u32.into(),
-				refcount: 1,
-				code_len: 100,
-				code_type: BytecodeType::Pvm,
-				behaviour_version: 0,
-			},
-		);
+		v2::Migration::<T>::assert_migrated_code_info_matches(code_hash, &old_code_info);
 
 		// uses twice the weight once for migration and then for checking if there is another key.
 		assert_eq!(meter.consumed(), <T as Config>::WeightInfo::v2_migration_step() * 2);
diff --git a/substrate/frame/revive/src/migrations/v2.rs b/substrate/frame/revive/src/migrations/v2.rs
index 55be0fb67b84..cd9cbe3dde08 100644
--- a/substrate/frame/revive/src/migrations/v2.rs
+++ b/substrate/frame/revive/src/migrations/v2.rs
@@ -59,7 +59,7 @@ mod old {
 	pub type CodeInfoOf<T: Config> = StorageMap<Pallet<T>, Identity, H256, CodeInfo<T>>;
 }
 
-pub mod new {
+mod new {
 	use super::{BytecodeType, Config};
 	use crate::{pallet::Pallet, AccountIdOf, BalanceOf, H256};
 	use codec::{Decode, Encode};
@@ -161,7 +161,7 @@ impl<T: Config> SteppedMigration for Migration<T> {
 		for (key, value) in prev_map {
 			let new_value = new::CodeInfoOf::<T>::get(key)
 				.expect("Failed to get the value after the migration");
-			
+
 			let expected = new::CodeInfo {
 				owner: value.owner,
 				deposit: value.deposit,
@@ -170,15 +170,19 @@ impl<T: Config> SteppedMigration for Migration<T> {
 				code_type: BytecodeType::Pvm,
 				behaviour_version: value.behaviour_version,
 			};
-			
-			assert_eq!(new_value, expected, "Migration failed: CodeInfo mismatch for key {:?}", key);
+
+			assert_eq!(
+				new_value, expected,
+				"Migration failed: CodeInfo mismatch for key {:?}",
+				key
+			);
 		}
 
 		Ok(())
 	}
 }
 
-#[cfg(feature = "runtime-benchmarks")]
+#[cfg(any(feature = "runtime-benchmarks", test))]
 impl<T: Config> Migration<T> {
 	/// Insert an old CodeInfo for benchmarking purposes.
 	pub fn insert_old_code_info(code_hash: H256, code_info: old::CodeInfo<T>) {
@@ -195,6 +199,25 @@ impl<T: Config> Migration<T> {
 	) -> old::CodeInfo<T> {
 		old::CodeInfo { owner, deposit, refcount, code_len, behaviour_version }
 	}
+
+	/// Assert that the migrated CodeInfo matches the expected values from the old CodeInfo.
+	pub fn assert_migrated_code_info_matches(code_hash: H256, old_code_info: &old::CodeInfo<T>) {
+		let migrated =
+			new::CodeInfoOf::<T>::get(code_hash).expect("Failed to get migrated CodeInfo");
+
+		assert_eq!(
+			migrated,
+			new::CodeInfo {
+				owner: old_code_info.owner.clone(),
+				deposit: old_code_info.deposit,
+				refcount: old_code_info.refcount,
+				code_len: old_code_info.code_len,
+				behaviour_version: old_code_info.behaviour_version,
+				code_type: BytecodeType::Pvm,
+			},
+			"Migration failed: deposit mismatch for key {code_hash:?}",
+		);
+	}
 }
 
 #[test]
@@ -211,15 +234,15 @@ fn migrate_to_v2() {
 
 		for i in 0..10u8 {
 			let code_hash = H256::from([i; 32]);
-			let old_info = old::CodeInfo {
-				owner: AccountIdOf::<Test>::from([i; 32]),
-				deposit: (1000u32 + i as u32).into(),
-				refcount: 1 + i as u64,
-				code_len: 100 + i as u32,
-				behaviour_version: i as u32,
-			};
+			let old_info = Migration::<Test>::create_old_code_info(
+				AccountIdOf::<Test>::from([i; 32]),
+				(1000u32 + i as u32).into(),
+				1 + i as u64,
+				100 + i as u32,
+				i as u32,
+			);
 
-			old::CodeInfoOf::<Test>::insert(code_hash, old_info.clone());
+			Migration::<Test>::insert_old_code_info(code_hash, old_info.clone());
 			original_values.insert(code_hash, old_info);
 		}
 
@@ -229,28 +252,11 @@ fn migrate_to_v2() {
 			cursor = Some(new_cursor);
 		}
 
-		assert_eq!(new::CodeInfoOf::<Test>::iter().count(), 10);
+		assert_eq!(crate::CodeInfoOf::<Test>::iter().count(), 10);
 
 		// Verify all values match between old and new with code_type set to PVM
 		for (code_hash, old_value) in original_values {
-			let new_value = new::CodeInfoOf::<Test>::get(code_hash)
-				.expect("New storage should contain migrated value");
-
-			assert_eq!(new_value.owner, old_value.owner, "Owner should match original value");
-			assert_eq!(new_value.deposit, old_value.deposit, "Deposit should match original value");
-			assert_eq!(
-				new_value.refcount, old_value.refcount,
-				"Refcount should match original value"
-			);
-			assert_eq!(
-				new_value.code_len, old_value.code_len,
-				"Code length should match original value"
-			);
-			assert_eq!(
-				new_value.behaviour_version, old_value.behaviour_version,
-				"Behaviour version should match original value"
-			);
-			assert_eq!(new_value.code_type, BytecodeType::Pvm, "Code type should be set to PVM");
+			Migration::<Test>::assert_migrated_code_info_matches(code_hash, &old_value);
 		}
 	})
 }
diff --git a/substrate/frame/revive/src/vm/evm.rs b/substrate/frame/revive/src/vm/evm.rs
index 906c303d0890..e9ae86d093eb 100644
--- a/substrate/frame/revive/src/vm/evm.rs
+++ b/substrate/frame/revive/src/vm/evm.rs
@@ -93,7 +93,7 @@ pub fn call<'a, E: Ext>(bytecode: Bytecode, ext: &'a mut E, inputs: EVMInputs) -
 	}
 }
 
-/// Runs the EVM interpreter until it returns an action.
+/// Runs the EVM interpreter
 fn run<WIRE: InterpreterTypes>(
 	interpreter: &mut Interpreter<WIRE>,
 	table: &revm::interpreter::InstructionTable<WIRE, DummyHost>,

From c679776b3def4ceae1373edbb1798299efe04388 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Thu, 21 Aug 2025 12:08:25 +0200
Subject: [PATCH 126/186] keep these files for next PR

---
 .../revive/fixtures/contracts/BlockInfo.sol   |  33 ------
 .../frame/revive/fixtures/contracts/Host.sol  | 101 ------------------
 .../revive/fixtures/contracts/System.sol      |  74 -------------
 .../fixtures/contracts/TransactionInfo.sol    |  16 ---
 substrate/frame/revive/src/tests/sol.rs       |   3 -
 .../frame/revive/src/tests/sol/block_info.rs  |  55 ----------
 .../frame/revive/src/tests/sol/system.rs      |  61 -----------
 7 files changed, 343 deletions(-)
 delete mode 100644 substrate/frame/revive/fixtures/contracts/BlockInfo.sol
 delete mode 100644 substrate/frame/revive/fixtures/contracts/Host.sol
 delete mode 100644 substrate/frame/revive/fixtures/contracts/System.sol
 delete mode 100644 substrate/frame/revive/fixtures/contracts/TransactionInfo.sol
 delete mode 100644 substrate/frame/revive/src/tests/sol/block_info.rs
 delete mode 100644 substrate/frame/revive/src/tests/sol/system.rs

diff --git a/substrate/frame/revive/fixtures/contracts/BlockInfo.sol b/substrate/frame/revive/fixtures/contracts/BlockInfo.sol
deleted file mode 100644
index f934b1c62ce0..000000000000
--- a/substrate/frame/revive/fixtures/contracts/BlockInfo.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-contract BlockInfo {
-
-	function blockNumber() public view returns (uint) {
-		return block.number;
-	}
-
-	function coinbase() public view returns (address) {
-		return block.coinbase;
-	}
-
-	function timestamp() public view returns (uint) {
-		return block.timestamp;
-	}
-
-	function difficulty() public view returns (uint) {
-		return block.difficulty;
-	}
-
-	function gaslimit() public view returns (uint) {
-		return block.gaslimit;
-	}
-
-	function chainid() public view returns (uint) {
-		return block.chainid;
-	}
-
-	function basefee() public view returns (uint) {
-		return block.basefee;
-	}
-}
diff --git a/substrate/frame/revive/fixtures/contracts/Host.sol b/substrate/frame/revive/fixtures/contracts/Host.sol
deleted file mode 100644
index 203a23ba4a9f..000000000000
--- a/substrate/frame/revive/fixtures/contracts/Host.sol
+++ /dev/null
@@ -1,101 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-contract Host {
-    function balance(address account) public view returns (uint256) {
-        return account.balance;
-    }
-
-    function extcodesize(address account) public view returns (uint256) {
-        uint256 size;
-        assembly {
-            size := extcodesize(account)
-        }
-        return size;
-    }
-
-    function extcodecopy(address /* account */, uint256 /* destOffset */, uint256 /* offset */, uint256 size) public pure returns (bytes memory) {
-        bytes memory code = new bytes(size);
-        return code;
-    }
-
-    function extcodehash(address account) public view returns (bytes32) {
-        bytes32 hash;
-        assembly {
-            hash := extcodehash(account)
-        }
-        return hash;
-    }
-
-    function blockhash(uint256 blockNumber) public view returns (bytes32) {
-        return blockhash(blockNumber);
-    }
-
-    function sload(uint256 slot) public view returns (uint256) {
-        uint256 value;
-        assembly {
-            value := sload(slot)
-        }
-        return value;
-    }
-
-    function sstore(uint256 slot, uint256 value) public returns (uint256) {
-        assembly {
-            sstore(slot, value)
-        }
-        return value;
-    }
-
-    function tload(uint256 slot) public view returns (uint256) {
-        uint256 value;
-        assembly {
-            value := tload(slot)
-        }
-        return value;
-    }
-
-    function tstore(uint256 slot, uint256 value) public returns (uint256) {
-        assembly {
-            tstore(slot, value)
-        }
-        return value;
-    }
-
-    function log0(bytes32 data) public {
-        assembly {
-            log0(data, 0x20)
-        }
-    }
-
-    function log1(bytes32 data, bytes32 topic1) public {
-        assembly {
-            log1(data, 0x20, topic1)
-        }
-    }
-
-    function log2(bytes32 data, bytes32 topic1, bytes32 topic2) public {
-        assembly {
-            log2(data, 0x20, topic1, topic2)
-        }
-    }
-
-    function log3(bytes32 data, bytes32 topic1, bytes32 topic2, bytes32 topic3) public {
-        assembly {
-            log3(data, 0x20, topic1, topic2, topic3)
-        }
-    }
-
-    function log4(bytes32 data, bytes32 topic1, bytes32 topic2, bytes32 topic3, bytes32 topic4) public {
-        assembly {
-            log4(data, 0x20, topic1, topic2, topic3, topic4)
-        }
-    }
-
-    function selfdestruct(address payable recipient) public {
-        selfdestruct(recipient);
-    }
-
-    function selfbalance() public view returns (uint256) {
-        return address(this).balance;
-    }
-}
\ No newline at end of file
diff --git a/substrate/frame/revive/fixtures/contracts/System.sol b/substrate/frame/revive/fixtures/contracts/System.sol
deleted file mode 100644
index 068e673577bf..000000000000
--- a/substrate/frame/revive/fixtures/contracts/System.sol
+++ /dev/null
@@ -1,74 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8.20;
-
-contract System {
-    function keccak256Func(bytes memory data) public pure returns (bytes32) {
-        return keccak256(data);
-    }
-
-    function addressFunc() public view returns (address) {
-        return address(this);
-    }
-
-    function caller() public view returns (address) {
-        return msg.sender;
-    }
-
-    function callvalue() public payable returns (uint256) {
-        return msg.value;
-    }
-
-    function calldataload(uint256 offset) public pure returns (bytes32) {
-        bytes32 data;
-        assembly {
-            data := calldataload(offset)
-        }
-        return data;
-    }
-
-    function calldatasize() public pure returns (uint256) {
-        return msg.data.length;
-    }
-
-    function calldatacopy(uint256 destOffset, uint256 offset, uint256 size) public pure returns (bytes memory) {
-        bytes memory data = new bytes(size);
-        assembly {
-            calldatacopy(add(data, 0x20), offset, size)
-        }
-        return data;
-    }
-
-    function codesize() public pure returns (uint256) {
-        uint256 size;
-        assembly {
-            size := codesize()
-        }
-        return size;
-    }
-
-    function codecopy(uint256 /* destOffset */, uint256 /* offset */, uint256 size) public pure returns (bytes memory) {
-        bytes memory code = new bytes(size);
-        return code;
-    }
-
-    function returndatasize() public pure returns (uint256) {
-        uint256 size;
-        assembly {
-            size := returndatasize()
-        }
-        return size;
-    }
-
-    function returndatacopy(uint256 destOffset, uint256 offset, uint256 size) public pure returns (bytes memory) {
-        bytes memory data = new bytes(size);
-        assembly {
-            returndatacopy(add(data, 0x20), offset, size)
-        }
-        return data;
-    }
-
-    function gas() public view returns (uint256) {
-        return gasleft();
-    }
-}
diff --git a/substrate/frame/revive/fixtures/contracts/TransactionInfo.sol b/substrate/frame/revive/fixtures/contracts/TransactionInfo.sol
deleted file mode 100644
index e92cfe3aa88d..000000000000
--- a/substrate/frame/revive/fixtures/contracts/TransactionInfo.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-contract TransactionInfo {
-    function origin() public view returns (address) {
-        return tx.origin;
-    }
-
-    function gasprice() public view returns (uint256) {
-        return tx.gasprice;
-    }
-
-    function blobhash(uint256 index) public view returns (bytes32) {
-        return blobhash(index);
-    }
-}
\ No newline at end of file
diff --git a/substrate/frame/revive/src/tests/sol.rs b/substrate/frame/revive/src/tests/sol.rs
index 268c8c089400..476b343afca6 100644
--- a/substrate/frame/revive/src/tests/sol.rs
+++ b/substrate/frame/revive/src/tests/sol.rs
@@ -15,9 +15,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-mod block_info;
-mod system;
-
 use crate::{
 	test_utils::{builder::Contract, ALICE},
 	tests::{
diff --git a/substrate/frame/revive/src/tests/sol/block_info.rs b/substrate/frame/revive/src/tests/sol/block_info.rs
deleted file mode 100644
index e8ea76c30c9b..000000000000
--- a/substrate/frame/revive/src/tests/sol/block_info.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-// 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.
-
-//! The pallet-revive shared VM integration test suite.
-
-use crate::{
-	test_utils::{builder::Contract, ALICE},
-	tests::{builder, ExtBuilder, System, Test},
-	Code, Config,
-};
-
-use alloy_core::{primitives::U256, sol_types::SolInterface};
-use frame_support::traits::fungible::Mutate;
-use pallet_revive_fixtures::{compile_module_with_type, BlockInfo, FixtureType};
-use pretty_assertions::assert_eq;
-
-/// Tests that the blocknumber opcode works as expected.
-#[test]
-fn block_number_works() {
-	for fixture_type in [FixtureType::Solc, FixtureType::Resolc] {
-		let (code, _) = compile_module_with_type("BlockInfo", fixture_type).unwrap();
-		ExtBuilder::default().build().execute_with(|| {
-			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-			let Contract { addr, .. } =
-				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-			System::set_block_number(42);
-
-			let result = builder::bare_call(addr)
-				.data(
-					BlockInfo::BlockInfoCalls::blockNumber(BlockInfo::blockNumberCall {})
-						.abi_encode(),
-				)
-				.build_and_unwrap_result();
-			assert_eq!(
-				U256::from(42u32),
-				U256::from_be_bytes::<32>(result.data.try_into().unwrap())
-			);
-		});
-	}
-}
diff --git a/substrate/frame/revive/src/tests/sol/system.rs b/substrate/frame/revive/src/tests/sol/system.rs
deleted file mode 100644
index 9bf1179483f3..000000000000
--- a/substrate/frame/revive/src/tests/sol/system.rs
+++ /dev/null
@@ -1,61 +0,0 @@
-// 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.
-
-//! The pallet-revive shared VM integration test suite.
-
-use crate::{
-	test_utils::{builder::Contract, ALICE},
-	tests::{builder, ExtBuilder, Test},
-	Code, Config,
-};
-
-use alloy_core::sol_types::SolInterface;
-use frame_support::traits::fungible::Mutate;
-use pallet_revive_fixtures::{compile_module_with_type, FixtureType, System as SystemFixture};
-use pretty_assertions::assert_eq;
-use revm::primitives::Bytes;
-use sp_io::hashing::keccak_256;
-
-#[test]
-fn keccak_256_works() {
-	for fixture_type in [FixtureType::Resolc, FixtureType::Solc]
-		// TODO remove take(1) once Solc supported
-		.into_iter()
-		.take(1)
-	{
-		let (code, _) = compile_module_with_type("System", fixture_type).unwrap();
-		ExtBuilder::default().build().execute_with(|| {
-			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-			let Contract { addr, .. } =
-				builder::bare_instantiate(Code::Upload(code)).build_and_unwrap_contract();
-
-			let pre = b"revive";
-			let expected = keccak_256(pre);
-
-			let result = builder::bare_call(addr)
-				.data(
-					SystemFixture::SystemCalls::keccak256Func(SystemFixture::keccak256FuncCall {
-						data: Bytes::from(pre),
-					})
-					.abi_encode(),
-				)
-				.build_and_unwrap_result();
-
-			assert_eq!(&expected, result.data.as_slice());
-		});
-	}
-}

From 5f839b69ca572fe72bb35abae76c5dd3806a49c6 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Thu, 21 Aug 2025 12:18:54 +0200
Subject: [PATCH 127/186] comments

---
 substrate/frame/revive/src/benchmarking.rs | 2 +-
 substrate/frame/revive/src/call_builder.rs | 4 ++--
 substrate/frame/revive/src/vm/evm.rs       | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/substrate/frame/revive/src/benchmarking.rs b/substrate/frame/revive/src/benchmarking.rs
index c7490033901a..b559c13a90c1 100644
--- a/substrate/frame/revive/src/benchmarking.rs
+++ b/substrate/frame/revive/src/benchmarking.rs
@@ -2251,7 +2251,7 @@ mod benchmarks {
 		Ok(())
 	}
 
-	/// Benchmark the cost of EVM instructions.
+	/// Benchmark the cost of executing `r` noop (JUMPDEST - 1 EVM GAS) instructions.
 	#[benchmark(pov_mode = Measured)]
 	fn evm_opcode(r: Linear<0, 10_000>) -> Result<(), BenchmarkError> {
 		use crate::vm::evm;
diff --git a/substrate/frame/revive/src/call_builder.rs b/substrate/frame/revive/src/call_builder.rs
index a1c4c9b1c135..2bbe087134a5 100644
--- a/substrate/frame/revive/src/call_builder.rs
+++ b/substrate/frame/revive/src/call_builder.rs
@@ -416,7 +416,7 @@ impl VmBinaryModule {
 		Self::with_num_instructions(size / 3)
 	}
 
-	// Same as sized but using EVM bytecode.
+	// Same as [`Self::sized`] but using EVM bytecode.
 	pub fn evm_sized(size: u32) -> Self {
 		use revm::bytecode::opcode::{JUMPDEST, STOP};
 
@@ -491,7 +491,7 @@ impl VmBinaryModule {
 		Self::new(code)
 	}
 
-	/// An evm contract that executes  `n` JUMPDEST instructions.
+	/// An evm contract that executes  `size` JUMPDEST instructions.
 	pub fn evm_noop(size: u32) -> Self {
 		use revm::bytecode::opcode::JUMPDEST;
 
diff --git a/substrate/frame/revive/src/vm/evm.rs b/substrate/frame/revive/src/vm/evm.rs
index e9ae86d093eb..be31611bc877 100644
--- a/substrate/frame/revive/src/vm/evm.rs
+++ b/substrate/frame/revive/src/vm/evm.rs
@@ -103,8 +103,7 @@ fn run<WIRE: InterpreterTypes>(
 	match action {
 		InterpreterAction::Return(result) => return result,
 		InterpreterAction::NewFrame(_) => {
-			// We should never hit this as creating a new frame should be handled by the opcode
-			// directly
+			// TODO handle new frame
 			InterpreterResult::new(
 				revm::interpreter::InstructionResult::FatalExternalError,
 				Default::default(),

From 81103926bc97481b0eb3ac2eba9f4aa5b0769e9d Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Thu, 21 Aug 2025 12:26:04 +0200
Subject: [PATCH 128/186] fixes

---
 substrate/frame/revive/src/migrations/v2.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/substrate/frame/revive/src/migrations/v2.rs b/substrate/frame/revive/src/migrations/v2.rs
index cd9cbe3dde08..c5e3974c7270 100644
--- a/substrate/frame/revive/src/migrations/v2.rs
+++ b/substrate/frame/revive/src/migrations/v2.rs
@@ -23,7 +23,7 @@
 extern crate alloc;
 
 use super::PALLET_MIGRATIONS_ID;
-use crate::{vm::BytecodeType, weights::WeightInfo, AccountIdOf, BalanceOf, Config, H256};
+use crate::{vm::BytecodeType, weights::WeightInfo, Config, H256};
 use frame_support::{
 	migrations::{MigrationId, SteppedMigration, SteppedMigrationError},
 	pallet_prelude::PhantomData,
@@ -191,8 +191,8 @@ impl<T: Config> Migration<T> {
 
 	/// Create an old CodeInfo struct for benchmarking.
 	pub fn create_old_code_info(
-		owner: AccountIdOf<T>,
-		deposit: BalanceOf<T>,
+		owner: crate::AccountIdOf<T>,
+		deposit: crate::BalanceOf<T>,
 		refcount: u64,
 		code_len: u32,
 		behaviour_version: u32,

From 7a1c0a6d00f589d2cb5b0130b875763c352e5993 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Thu, 21 Aug 2025 11:20:48 +0000
Subject: [PATCH 129/186] fix

---
 substrate/frame/revive/fixtures/build.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/substrate/frame/revive/fixtures/build.rs b/substrate/frame/revive/fixtures/build.rs
index a3030a66afad..f26ca85f5e30 100644
--- a/substrate/frame/revive/fixtures/build.rs
+++ b/substrate/frame/revive/fixtures/build.rs
@@ -463,7 +463,7 @@ fn generate_fixture_location(temp_dir: &Path, out_dir: &Path, entries: &[Entry])
 	// Generate sol! macros for Solidity contracts
 	for entry in entries.iter().filter(|e| matches!(e.contract_type, ContractType::Solidity)) {
 		let relative_path = format!("contracts/{}", entry.path().split('/').last().unwrap());
-		writeln!(file, r#"alloy_core::sol!("{}");"#, relative_path)
+		writeln!(file, r#"#[cfg(feature = "std")] alloy_core::sol!("{}");"#, relative_path)
 			.context("Failed to write sol! macro to fixture_location.rs")?;
 	}
 

From 83ea8cd8eb974031dd595f759b61f6417a3cbacc Mon Sep 17 00:00:00 2001
From: "cmd[bot]" <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 21 Aug 2025 13:12:26 +0000
Subject: [PATCH 130/186] Update from github-actions[bot] running command
 'bench --runtime dev --pallet pallet_revive'

---
 substrate/frame/revive/src/weights.rs | 1359 +++++++++++++------------
 1 file changed, 728 insertions(+), 631 deletions(-)

diff --git a/substrate/frame/revive/src/weights.rs b/substrate/frame/revive/src/weights.rs
index ab349df4fdc6..1c0fcc68fe15 100644
--- a/substrate/frame/revive/src/weights.rs
+++ b/substrate/frame/revive/src/weights.rs
@@ -35,9 +35,9 @@
 //! Autogenerated weights for `pallet_revive`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
-//! DATE: 2025-08-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2025-08-21, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `c19fa2715a10`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! HOSTNAME: `948f494ac939`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
@@ -74,7 +74,7 @@ pub trait WeightInfo {
 	fn on_process_deletion_queue_batch() -> Weight;
 	fn on_initialize_per_trie_key(k: u32, ) -> Weight;
 	fn call_with_pvm_code_per_byte(c: u32, ) -> Weight;
-	fn call_with_evm_code_per_byte(c: u32, ) -> Weight { Self::call_with_pvm_code_per_byte(c) }
+	fn call_with_evm_code_per_byte(c: u32, ) -> Weight;
 	fn basic_block_compilation(b: u32, ) -> Weight;
 	fn instantiate_with_code(c: u32, i: u32, ) -> Weight;
 	fn eth_instantiate_with_code(c: u32, i: u32, d: u32, ) -> Weight;
@@ -90,7 +90,7 @@ pub trait WeightInfo {
 	fn noop_host_fn(r: u32, ) -> Weight;
 	fn seal_caller() -> Weight;
 	fn seal_origin() -> Weight;
-	fn seal_to_account_id() -> Weight;
+	fn to_account_id() -> Weight;
 	fn seal_code_hash() -> Weight;
 	fn seal_own_code_hash() -> Weight;
 	fn seal_code_size() -> Weight;
@@ -145,11 +145,11 @@ pub trait WeightInfo {
 	fn seal_delegate_call() -> Weight;
 	fn seal_instantiate(t: u32, d: u32, i: u32, ) -> Weight;
 	fn sha2_256(n: u32, ) -> Weight;
-	fn hash_blake2_256(n: u32, ) -> Weight;
-	fn hash_blake2_128(n: u32, ) -> Weight;
 	fn identity(n: u32, ) -> Weight;
 	fn ripemd_160(n: u32, ) -> Weight;
 	fn seal_hash_keccak_256(n: u32, ) -> Weight;
+	fn hash_blake2_256(n: u32, ) -> Weight;
+	fn hash_blake2_128(n: u32, ) -> Weight;
 	fn seal_sr25519_verify(n: u32, ) -> Weight;
 	fn ecdsa_recover() -> Weight;
 	fn bn128_add() -> Weight;
@@ -158,12 +158,11 @@ pub trait WeightInfo {
 	fn blake2f(n: u32, ) -> Weight;
 	fn seal_ecdsa_to_eth_address() -> Weight;
 	fn seal_set_code_hash() -> Weight;
+	fn evm_opcode(r: u32, ) -> Weight;
 	fn instr(r: u32, ) -> Weight;
-	fn evm_opcode(_r: u32) -> Weight { Weight::zero() }
 	fn instr_empty_loop(r: u32, ) -> Weight;
 	fn v1_migration_step() -> Weight;
-	fn v2_migration_step() -> Weight { Weight::zero() }
-
+	fn v2_migration_step() -> Weight;
 }
 
 /// Weights for `pallet_revive` using the Substrate node and recommended hardware.
@@ -175,8 +174,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `147`
 		//  Estimated: `1632`
-		// Minimum execution time: 3_008_000 picoseconds.
-		Weight::from_parts(3_256_000, 1632)
+		// Minimum execution time: 3_150_000 picoseconds.
+		Weight::from_parts(3_421_000, 1632)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -186,10 +185,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `458 + k * (69 ±0)`
 		//  Estimated: `448 + k * (70 ±0)`
-		// Minimum execution time: 14_584_000 picoseconds.
-		Weight::from_parts(772_449, 448)
-			// Standard Error: 1_278
-			.saturating_add(Weight::from_parts(1_204_643, 0).saturating_mul(k.into()))
+		// Minimum execution time: 14_380_000 picoseconds.
+		Weight::from_parts(14_911_000, 448)
+			// Standard Error: 1_088
+			.saturating_add(Weight::from_parts(1_199_036, 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))
@@ -201,7 +200,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
 	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
-	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
 	/// Storage: `Timestamp::Now` (r:1 w:0)
@@ -211,12 +210,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `c` is `[0, 102400]`.
 	fn call_with_pvm_code_per_byte(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1171 + c * (1 ±0)`
-		//  Estimated: `7106 + c * (1 ±0)`
-		// Minimum execution time: 86_230_000 picoseconds.
-		Weight::from_parts(124_424_225, 7106)
-			// Standard Error: 10
-			.saturating_add(Weight::from_parts(1_256, 0).saturating_mul(c.into()))
+		//  Measured:  `1172 + c * (1 ±0)`
+		//  Estimated: `7107 + c * (1 ±0)`
+		// Minimum execution time: 86_173_000 picoseconds.
+		Weight::from_parts(120_432_125, 7107)
+			// Standard Error: 9
+			.saturating_add(Weight::from_parts(1_435, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(c.into()))
@@ -226,7 +225,31 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
 	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
-	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
+	/// Storage: `Revive::PristineCode` (r:1 w:0)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// 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 `[1, 102400]`.
+	fn call_with_evm_code_per_byte(c: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `1104`
+		//  Estimated: `7046`
+		// Minimum execution time: 80_755_000 picoseconds.
+		Weight::from_parts(85_415_387, 7046)
+			// Standard Error: 2
+			.saturating_add(Weight::from_parts(33, 0).saturating_mul(c.into()))
+			.saturating_add(T::DbWeight::get().reads(7_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
+	}
+	/// Storage: `Revive::OriginalAccount` (r:2 w:0)
+	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
+	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
+	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
 	/// Storage: `Timestamp::Now` (r:1 w:0)
@@ -236,15 +259,15 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `b` is `[0, 1]`.
 	fn basic_block_compilation(_b: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `4515`
-		//  Estimated: `10455`
-		// Minimum execution time: 124_359_000 picoseconds.
-		Weight::from_parts(129_025_585, 10455)
+		//  Measured:  `4516`
+		//  Estimated: `10456`
+		// Minimum execution time: 123_589_000 picoseconds.
+		Weight::from_parts(127_489_869, 10456)
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
-	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Balances::Holds` (r:2 w:2)
 	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
@@ -263,17 +286,17 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1108`
 		//  Estimated: `7041`
-		// Minimum execution time: 755_622_000 picoseconds.
-		Weight::from_parts(57_161_132, 7041)
-			// Standard Error: 36
-			.saturating_add(Weight::from_parts(19_425, 0).saturating_mul(c.into()))
-			// Standard Error: 28
-			.saturating_add(Weight::from_parts(5_000, 0).saturating_mul(i.into()))
+		// Minimum execution time: 754_650_000 picoseconds.
+		Weight::from_parts(758_926_000, 7041)
+			// Standard Error: 85
+			.saturating_add(Weight::from_parts(15_657, 0).saturating_mul(c.into()))
+			// Standard Error: 67
+			.saturating_add(Weight::from_parts(1_573, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
-	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Balances::Holds` (r:2 w:2)
 	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
@@ -293,14 +316,14 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1122`
 		//  Estimated: `7062 + d * (2475 ±0)`
-		// Minimum execution time: 281_326_000 picoseconds.
-		Weight::from_parts(192_766_004, 7062)
-			// Standard Error: 15
-			.saturating_add(Weight::from_parts(14_166, 0).saturating_mul(c.into()))
-			// Standard Error: 11
-			.saturating_add(Weight::from_parts(403, 0).saturating_mul(i.into()))
-			// Standard Error: 983_169
-			.saturating_add(Weight::from_parts(30_340_467, 0).saturating_mul(d.into()))
+		// Minimum execution time: 278_747_000 picoseconds.
+		Weight::from_parts(145_795_450, 7062)
+			// Standard Error: 17
+			.saturating_add(Weight::from_parts(14_966, 0).saturating_mul(c.into()))
+			// Standard Error: 13
+			.saturating_add(Weight::from_parts(542, 0).saturating_mul(i.into()))
+			// Standard Error: 1_133_623
+			.saturating_add(Weight::from_parts(41_772_022, 0).saturating_mul(d.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(d.into())))
 			.saturating_add(T::DbWeight::get().writes(6_u64))
@@ -308,7 +331,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 			.saturating_add(Weight::from_parts(0, 2475).saturating_mul(d.into()))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
-	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
@@ -324,12 +347,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `i` is `[0, 131072]`.
 	fn instantiate(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1912`
-		//  Estimated: `5362`
-		// Minimum execution time: 172_513_000 picoseconds.
-		Weight::from_parts(178_290_134, 5362)
-			// Standard Error: 11
-			.saturating_add(Weight::from_parts(4_158, 0).saturating_mul(i.into()))
+		//  Measured:  `1913`
+		//  Estimated: `5338`
+		// Minimum execution time: 171_706_000 picoseconds.
+		Weight::from_parts(177_711_925, 5338)
+			// Standard Error: 10
+			.saturating_add(Weight::from_parts(4_170, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -338,7 +361,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
 	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
-	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
 	/// Storage: `Timestamp::Now` (r:1 w:0)
@@ -347,10 +370,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:  `1792`
-		//  Estimated: `7732`
-		// Minimum execution time: 87_638_000 picoseconds.
-		Weight::from_parts(90_000_000, 7732)
+		//  Measured:  `1794`
+		//  Estimated: `7734`
+		// Minimum execution time: 86_797_000 picoseconds.
+		Weight::from_parts(90_276_000, 7734)
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -359,7 +382,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Storage: `Revive::AccountInfoOf` (r:2 w:2)
 	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
-	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
 	/// Storage: `Timestamp::Now` (r:1 w:0)
@@ -369,12 +392,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `d` is `[0, 1]`.
 	fn eth_call(d: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1792`
-		//  Estimated: `7732 + d * (2475 ±0)`
-		// Minimum execution time: 85_839_000 picoseconds.
-		Weight::from_parts(90_556_373, 7732)
-			// Standard Error: 358_297
-			.saturating_add(Weight::from_parts(27_649_126, 0).saturating_mul(d.into()))
+		//  Measured:  `1794`
+		//  Estimated: `7734 + d * (2475 ±0)`
+		// Minimum execution time: 86_087_000 picoseconds.
+		Weight::from_parts(89_671_759, 7734)
+			// Standard Error: 300_888
+			.saturating_add(Weight::from_parts(26_362_240, 0).saturating_mul(d.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(d.into())))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
@@ -382,7 +405,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 			.saturating_add(Weight::from_parts(0, 2475).saturating_mul(d.into()))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
-	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Balances::Holds` (r:1 w:1)
 	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:0 w:1)
@@ -392,38 +415,38 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `505`
 		//  Estimated: `3970`
-		// Minimum execution time: 56_805_000 picoseconds.
-		Weight::from_parts(50_855_179, 3970)
-			// Standard Error: 35
-			.saturating_add(Weight::from_parts(13_927, 0).saturating_mul(c.into()))
+		// Minimum execution time: 57_265_000 picoseconds.
+		Weight::from_parts(38_840_872, 3970)
+			// Standard Error: 20
+			.saturating_add(Weight::from_parts(14_420, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
-	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Balances::Holds` (r:1 w:1)
 	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:0 w:1)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
 	fn remove_code() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `658`
-		//  Estimated: `4123`
-		// Minimum execution time: 47_344_000 picoseconds.
-		Weight::from_parts(48_892_000, 4123)
+		//  Measured:  `659`
+		//  Estimated: `4124`
+		// Minimum execution time: 47_571_000 picoseconds.
+		Weight::from_parts(48_571_000, 4124)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
 	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:2 w:2)
-	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	fn set_code() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `530`
-		//  Estimated: `6470`
-		// Minimum execution time: 20_627_000 picoseconds.
-		Weight::from_parts(21_451_000, 6470)
+		//  Measured:  `532`
+		//  Estimated: `6472`
+		// Minimum execution time: 20_565_000 picoseconds.
+		Weight::from_parts(21_420_000, 6472)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -435,8 +458,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `813`
 		//  Estimated: `4278`
-		// Minimum execution time: 57_209_000 picoseconds.
-		Weight::from_parts(58_942_000, 4278)
+		// Minimum execution time: 58_321_000 picoseconds.
+		Weight::from_parts(58_922_000, 4278)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -448,8 +471,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `395`
 		//  Estimated: `3860`
-		// Minimum execution time: 42_757_000 picoseconds.
-		Weight::from_parts(44_178_000, 3860)
+		// Minimum execution time: 43_929_000 picoseconds.
+		Weight::from_parts(44_755_000, 3860)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -461,8 +484,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `145`
 		//  Estimated: `3610`
-		// Minimum execution time: 13_062_000 picoseconds.
-		Weight::from_parts(13_660_000, 3610)
+		// Minimum execution time: 12_925_000 picoseconds.
+		Weight::from_parts(13_333_000, 3610)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 	}
 	/// The range of component `r` is `[0, 1600]`.
@@ -470,33 +493,33 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 7_588_000 picoseconds.
-		Weight::from_parts(8_755_261, 0)
-			// Standard Error: 236
-			.saturating_add(Weight::from_parts(182_421, 0).saturating_mul(r.into()))
+		// Minimum execution time: 7_528_000 picoseconds.
+		Weight::from_parts(8_699_408, 0)
+			// Standard Error: 197
+			.saturating_add(Weight::from_parts(182_534, 0).saturating_mul(r.into()))
 	}
 	fn seal_caller() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 335_000 picoseconds.
-		Weight::from_parts(390_000, 0)
+		// Minimum execution time: 306_000 picoseconds.
+		Weight::from_parts(375_000, 0)
 	}
 	fn seal_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 350_000 picoseconds.
-		Weight::from_parts(386_000, 0)
+		// Minimum execution time: 288_000 picoseconds.
+		Weight::from_parts(362_000, 0)
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
-	fn seal_to_account_id() -> Weight {
+	fn to_account_id() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `571`
-		//  Estimated: `4036`
-		// Minimum execution time: 9_818_000 picoseconds.
-		Weight::from_parts(10_279_000, 4036)
+		//  Measured:  `567`
+		//  Estimated: `4032`
+		// Minimum execution time: 7_364_000 picoseconds.
+		Weight::from_parts(7_904_000, 4032)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:0)
@@ -505,70 +528,70 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `403`
 		//  Estimated: `3868`
-		// Minimum execution time: 9_222_000 picoseconds.
-		Weight::from_parts(9_806_000, 3868)
+		// Minimum execution time: 9_050_000 picoseconds.
+		Weight::from_parts(9_489_000, 3868)
 			.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: 282_000 picoseconds.
-		Weight::from_parts(336_000, 0)
+		// Minimum execution time: 302_000 picoseconds.
+		Weight::from_parts(337_000, 0)
 	}
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:0)
 	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
-	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	fn seal_code_size() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `474`
-		//  Estimated: `3939`
-		// Minimum execution time: 12_825_000 picoseconds.
-		Weight::from_parts(13_490_000, 3939)
+		//  Measured:  `475`
+		//  Estimated: `3940`
+		// Minimum execution time: 12_570_000 picoseconds.
+		Weight::from_parts(13_223_000, 3940)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 	}
 	fn seal_caller_is_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 321_000 picoseconds.
-		Weight::from_parts(372_000, 0)
+		// Minimum execution time: 310_000 picoseconds.
+		Weight::from_parts(364_000, 0)
 	}
 	fn seal_caller_is_root() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 269_000 picoseconds.
-		Weight::from_parts(327_000, 0)
+		// Minimum execution time: 259_000 picoseconds.
+		Weight::from_parts(302_000, 0)
 	}
 	fn seal_address() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 304_000 picoseconds.
-		Weight::from_parts(343_000, 0)
+		// Minimum execution time: 330_000 picoseconds.
+		Weight::from_parts(357_000, 0)
 	}
 	fn seal_weight_left() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 700_000 picoseconds.
-		Weight::from_parts(802_000, 0)
+		// Minimum execution time: 723_000 picoseconds.
+		Weight::from_parts(797_000, 0)
 	}
 	fn seal_ref_time_left() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 263_000 picoseconds.
-		Weight::from_parts(325_000, 0)
+		// Minimum execution time: 268_000 picoseconds.
+		Weight::from_parts(305_000, 0)
 	}
 	fn seal_balance() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `506`
+		//  Measured:  `540`
 		//  Estimated: `0`
-		// Minimum execution time: 13_351_000 picoseconds.
-		Weight::from_parts(13_878_000, 0)
+		// Minimum execution time: 12_855_000 picoseconds.
+		Weight::from_parts(13_194_000, 0)
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
@@ -580,8 +603,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `791`
 		//  Estimated: `4256`
-		// Minimum execution time: 18_603_000 picoseconds.
-		Weight::from_parts(19_511_000, 4256)
+		// Minimum execution time: 18_281_000 picoseconds.
+		Weight::from_parts(19_051_000, 4256)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 	}
 	/// Storage: `Revive::ImmutableDataOf` (r:1 w:0)
@@ -591,10 +614,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `271 + n * (1 ±0)`
 		//  Estimated: `3736 + n * (1 ±0)`
-		// Minimum execution time: 6_013_000 picoseconds.
-		Weight::from_parts(6_757_699, 3736)
-			// Standard Error: 5
-			.saturating_add(Weight::from_parts(483, 0).saturating_mul(n.into()))
+		// Minimum execution time: 5_711_000 picoseconds.
+		Weight::from_parts(6_613_746, 3736)
+			// Standard Error: 7
+			.saturating_add(Weight::from_parts(499, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -605,67 +628,67 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_052_000 picoseconds.
-		Weight::from_parts(2_330_454, 0)
+		// Minimum execution time: 2_087_000 picoseconds.
+		Weight::from_parts(2_316_148, 0)
 			// Standard Error: 2
-			.saturating_add(Weight::from_parts(525, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(493, 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: 259_000 picoseconds.
-		Weight::from_parts(331_000, 0)
+		// Minimum execution time: 267_000 picoseconds.
+		Weight::from_parts(315_000, 0)
 	}
 	fn seal_minimum_balance() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 278_000 picoseconds.
-		Weight::from_parts(339_000, 0)
+		// Minimum execution time: 270_000 picoseconds.
+		Weight::from_parts(313_000, 0)
 	}
 	fn seal_return_data_size() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 272_000 picoseconds.
-		Weight::from_parts(326_000, 0)
+		// Minimum execution time: 264_000 picoseconds.
+		Weight::from_parts(324_000, 0)
 	}
 	fn seal_call_data_size() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 268_000 picoseconds.
-		Weight::from_parts(313_000, 0)
+		// Minimum execution time: 262_000 picoseconds.
+		Weight::from_parts(309_000, 0)
 	}
 	fn seal_gas_limit() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 436_000 picoseconds.
-		Weight::from_parts(509_000, 0)
+		// Minimum execution time: 531_000 picoseconds.
+		Weight::from_parts(625_000, 0)
 	}
 	fn seal_gas_price() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 262_000 picoseconds.
-		Weight::from_parts(317_000, 0)
+		// Minimum execution time: 260_000 picoseconds.
+		Weight::from_parts(311_000, 0)
 	}
 	fn seal_base_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 289_000 picoseconds.
-		Weight::from_parts(347_000, 0)
+		// Minimum execution time: 282_000 picoseconds.
+		Weight::from_parts(312_000, 0)
 	}
 	fn seal_block_number() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 305_000 picoseconds.
-		Weight::from_parts(358_000, 0)
+		// Minimum execution time: 261_000 picoseconds.
+		Weight::from_parts(325_000, 0)
 	}
 	/// Storage: `Session::Validators` (r:1 w:0)
 	/// Proof: `Session::Validators` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -673,8 +696,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `141`
 		//  Estimated: `1626`
-		// Minimum execution time: 22_975_000 picoseconds.
-		Weight::from_parts(23_506_000, 1626)
+		// Minimum execution time: 21_538_000 picoseconds.
+		Weight::from_parts(22_409_000, 1626)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `System::BlockHash` (r:1 w:0)
@@ -683,48 +706,48 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `30`
 		//  Estimated: `3495`
-		// Minimum execution time: 3_631_000 picoseconds.
-		Weight::from_parts(3_829_000, 3495)
+		// Minimum execution time: 3_401_000 picoseconds.
+		Weight::from_parts(3_673_000, 3495)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	fn seal_now() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 271_000 picoseconds.
-		Weight::from_parts(337_000, 0)
+		// Minimum execution time: 300_000 picoseconds.
+		Weight::from_parts(354_000, 0)
 	}
 	fn seal_weight_to_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_603_000 picoseconds.
-		Weight::from_parts(1_712_000, 0)
+		// Minimum execution time: 1_680_000 picoseconds.
+		Weight::from_parts(1_742_000, 0)
 	}
 	/// The range of component `n` is `[0, 1048572]`.
 	fn seal_copy_to_contract(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 433_000 picoseconds.
-		Weight::from_parts(460_000, 0)
+		// Minimum execution time: 392_000 picoseconds.
+		Weight::from_parts(262_995, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(203, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(202, 0).saturating_mul(n.into()))
 	}
 	fn seal_call_data_load() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 293_000 picoseconds.
-		Weight::from_parts(325_000, 0)
+		// Minimum execution time: 234_000 picoseconds.
+		Weight::from_parts(291_000, 0)
 	}
 	/// The range of component `n` is `[0, 1048576]`.
 	fn seal_call_data_copy(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 269_000 picoseconds.
-		Weight::from_parts(806_378, 0)
+		// Minimum execution time: 267_000 picoseconds.
+		Weight::from_parts(610_075, 0)
 			// Standard Error: 0
 			.saturating_add(Weight::from_parts(112, 0).saturating_mul(n.into()))
 	}
@@ -733,27 +756,27 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 290_000 picoseconds.
-		Weight::from_parts(488_982, 0)
+		// Minimum execution time: 292_000 picoseconds.
+		Weight::from_parts(466_044, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(201, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(200, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
 	/// Storage: `Revive::DeletionQueueCounter` (r:1 w:1)
 	/// Proof: `Revive::DeletionQueueCounter` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
-	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::DeletionQueue` (r:0 w:1)
 	/// Proof: `Revive::DeletionQueue` (`max_values`: None, `max_size`: Some(142), added: 2617, mode: `Measured`)
 	/// Storage: `Revive::ImmutableDataOf` (r:0 w:1)
 	/// Proof: `Revive::ImmutableDataOf` (`max_values`: None, `max_size`: Some(4118), added: 6593, mode: `Measured`)
 	fn seal_terminate() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `582`
-		//  Estimated: `4047`
-		// Minimum execution time: 17_674_000 picoseconds.
-		Weight::from_parts(18_031_000, 4047)
+		//  Measured:  `583`
+		//  Estimated: `4048`
+		// Minimum execution time: 16_855_000 picoseconds.
+		Weight::from_parts(17_325_000, 4048)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -763,12 +786,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_375_000 picoseconds.
-		Weight::from_parts(4_568_155, 0)
-			// Standard Error: 3_591
-			.saturating_add(Weight::from_parts(223_460, 0).saturating_mul(t.into()))
-			// Standard Error: 39
-			.saturating_add(Weight::from_parts(854, 0).saturating_mul(n.into()))
+		// Minimum execution time: 4_416_000 picoseconds.
+		Weight::from_parts(4_382_711, 0)
+			// Standard Error: 3_063
+			.saturating_add(Weight::from_parts(257_304, 0).saturating_mul(t.into()))
+			// Standard Error: 33
+			.saturating_add(Weight::from_parts(1_239, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
 	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -776,8 +799,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `648`
 		//  Estimated: `648`
-		// Minimum execution time: 7_272_000 picoseconds.
-		Weight::from_parts(7_635_000, 648)
+		// Minimum execution time: 7_148_000 picoseconds.
+		Weight::from_parts(7_616_000, 648)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -786,8 +809,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `10658`
 		//  Estimated: `10658`
-		// Minimum execution time: 41_207_000 picoseconds.
-		Weight::from_parts(41_863_000, 10658)
+		// Minimum execution time: 41_435_000 picoseconds.
+		Weight::from_parts(42_294_000, 10658)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -796,8 +819,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `648`
 		//  Estimated: `648`
-		// Minimum execution time: 8_492_000 picoseconds.
-		Weight::from_parts(9_013_000, 648)
+		// Minimum execution time: 8_266_000 picoseconds.
+		Weight::from_parts(8_704_000, 648)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -807,8 +830,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `10658`
 		//  Estimated: `10658`
-		// Minimum execution time: 42_398_000 picoseconds.
-		Weight::from_parts(44_113_000, 10658)
+		// Minimum execution time: 43_187_000 picoseconds.
+		Weight::from_parts(44_235_000, 10658)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -820,12 +843,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: 8_728_000 picoseconds.
-		Weight::from_parts(9_632_969, 247)
-			// Standard Error: 56
-			.saturating_add(Weight::from_parts(556, 0).saturating_mul(n.into()))
-			// Standard Error: 56
-			.saturating_add(Weight::from_parts(958, 0).saturating_mul(o.into()))
+		// Minimum execution time: 8_740_000 picoseconds.
+		Weight::from_parts(9_473_762, 247)
+			// Standard Error: 60
+			.saturating_add(Weight::from_parts(684, 0).saturating_mul(n.into()))
+			// Standard Error: 60
+			.saturating_add(Weight::from_parts(488, 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()))
@@ -837,10 +860,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_032_000 picoseconds.
-		Weight::from_parts(9_816_471, 247)
-			// Standard Error: 82
-			.saturating_add(Weight::from_parts(582, 0).saturating_mul(n.into()))
+		// Minimum execution time: 8_609_000 picoseconds.
+		Weight::from_parts(9_456_962, 247)
+			// Standard Error: 78
+			.saturating_add(Weight::from_parts(882, 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()))
@@ -852,10 +875,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_313_000 picoseconds.
-		Weight::from_parts(9_381_907, 247)
-			// Standard Error: 91
-			.saturating_add(Weight::from_parts(1_184, 0).saturating_mul(n.into()))
+		// Minimum execution time: 7_777_000 picoseconds.
+		Weight::from_parts(8_957_787, 247)
+			// Standard Error: 85
+			.saturating_add(Weight::from_parts(2_018, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -866,10 +889,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: 7_645_000 picoseconds.
-		Weight::from_parts(8_714_974, 247)
-			// Standard Error: 87
-			.saturating_add(Weight::from_parts(717, 0).saturating_mul(n.into()))
+		// Minimum execution time: 7_552_000 picoseconds.
+		Weight::from_parts(8_333_059, 247)
+			// Standard Error: 68
+			.saturating_add(Weight::from_parts(1_086, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -880,10 +903,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_388_000 picoseconds.
-		Weight::from_parts(10_430_193, 247)
-			// Standard Error: 77
-			.saturating_add(Weight::from_parts(1_346, 0).saturating_mul(n.into()))
+		// Minimum execution time: 9_262_000 picoseconds.
+		Weight::from_parts(10_280_631, 247)
+			// Standard Error: 84
+			.saturating_add(Weight::from_parts(780, 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()))
@@ -892,36 +915,36 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_597_000 picoseconds.
-		Weight::from_parts(1_691_000, 0)
+		// Minimum execution time: 1_559_000 picoseconds.
+		Weight::from_parts(1_678_000, 0)
 	}
 	fn set_transient_storage_full() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_005_000 picoseconds.
-		Weight::from_parts(2_129_000, 0)
+		// Minimum execution time: 1_939_000 picoseconds.
+		Weight::from_parts(2_073_000, 0)
 	}
 	fn get_transient_storage_empty() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_602_000 picoseconds.
-		Weight::from_parts(1_721_000, 0)
+		// Minimum execution time: 1_490_000 picoseconds.
+		Weight::from_parts(1_582_000, 0)
 	}
 	fn get_transient_storage_full() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_796_000 picoseconds.
-		Weight::from_parts(1_951_000, 0)
+		// Minimum execution time: 1_679_000 picoseconds.
+		Weight::from_parts(1_739_000, 0)
 	}
 	fn rollback_transient_storage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
 		// Minimum execution time: 1_279_000 picoseconds.
-		Weight::from_parts(1_353_000, 0)
+		Weight::from_parts(1_339_000, 0)
 	}
 	/// The range of component `n` is `[0, 416]`.
 	/// The range of component `o` is `[0, 416]`.
@@ -929,57 +952,59 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_407_000 picoseconds.
-		Weight::from_parts(2_715_278, 0)
-			// Standard Error: 18
-			.saturating_add(Weight::from_parts(147, 0).saturating_mul(n.into()))
-			// Standard Error: 18
-			.saturating_add(Weight::from_parts(292, 0).saturating_mul(o.into()))
+		// Minimum execution time: 2_300_000 picoseconds.
+		Weight::from_parts(2_536_575, 0)
+			// Standard Error: 17
+			.saturating_add(Weight::from_parts(334, 0).saturating_mul(n.into()))
+			// Standard Error: 17
+			.saturating_add(Weight::from_parts(392, 0).saturating_mul(o.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_clear_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_140_000 picoseconds.
-		Weight::from_parts(2_612_392, 0)
-			// Standard Error: 25
-			.saturating_add(Weight::from_parts(305, 0).saturating_mul(n.into()))
+		// Minimum execution time: 2_164_000 picoseconds.
+		Weight::from_parts(2_555_863, 0)
+			// Standard Error: 34
+			.saturating_add(Weight::from_parts(226, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_get_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_034_000 picoseconds.
-		Weight::from_parts(2_357_344, 0)
-			// Standard Error: 21
-			.saturating_add(Weight::from_parts(276, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_870_000 picoseconds.
+		Weight::from_parts(2_188_923, 0)
+			// Standard Error: 27
+			.saturating_add(Weight::from_parts(316, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_contains_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_888_000 picoseconds.
-		Weight::from_parts(2_137_193, 0)
-			// Standard Error: 16
-			.saturating_add(Weight::from_parts(172, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_713_000 picoseconds.
+		Weight::from_parts(2_013_249, 0)
+			// Standard Error: 20
+			.saturating_add(Weight::from_parts(210, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
-	fn seal_take_transient_storage(_n: u32, ) -> Weight {
+	fn seal_take_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_733_000 picoseconds.
-		Weight::from_parts(3_004_772, 0)
+		// Minimum execution time: 2_549_000 picoseconds.
+		Weight::from_parts(2_811_411, 0)
+			// Standard Error: 31
+			.saturating_add(Weight::from_parts(61, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
 	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
-	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
 	/// Storage: `System::Account` (r:1 w:1)
@@ -989,16 +1014,16 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `i` is `[0, 1048576]`.
 	fn seal_call(t: u32, d: u32, i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2005`
-		//  Estimated: `5470`
-		// Minimum execution time: 91_390_000 picoseconds.
-		Weight::from_parts(71_229_693, 5470)
-			// Standard Error: 146_616
-			.saturating_add(Weight::from_parts(19_125_819, 0).saturating_mul(t.into()))
-			// Standard Error: 146_616
-			.saturating_add(Weight::from_parts(26_490_547, 0).saturating_mul(d.into()))
+		//  Measured:  `1925`
+		//  Estimated: `5390`
+		// Minimum execution time: 88_918_000 picoseconds.
+		Weight::from_parts(70_713_518, 5390)
+			// Standard Error: 172_359
+			.saturating_add(Weight::from_parts(18_545_016, 0).saturating_mul(t.into()))
+			// Standard Error: 172_359
+			.saturating_add(Weight::from_parts(24_817_484, 0).saturating_mul(d.into()))
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(4, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(2, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(5_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(t.into())))
@@ -1013,12 +1038,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `366 + d * (212 ±0)`
 		//  Estimated: `2021 + d * (2021 ±0)`
-		// Minimum execution time: 24_210_000 picoseconds.
-		Weight::from_parts(11_783_977, 2021)
-			// Standard Error: 49_916
-			.saturating_add(Weight::from_parts(14_132_066, 0).saturating_mul(d.into()))
+		// Minimum execution time: 24_697_000 picoseconds.
+		Weight::from_parts(12_092_184, 2021)
+			// Standard Error: 60_308
+			.saturating_add(Weight::from_parts(13_519_246, 0).saturating_mul(d.into()))
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(325, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(319, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(d.into())))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(d.into())))
 			.saturating_add(Weight::from_parts(0, 2021).saturating_mul(d.into()))
@@ -1026,19 +1051,19 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:0)
 	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
-	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
 	fn seal_delegate_call() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1362`
-		//  Estimated: `4827`
-		// Minimum execution time: 31_948_000 picoseconds.
-		Weight::from_parts(33_936_000, 4827)
+		//  Measured:  `1363`
+		//  Estimated: `4828`
+		// Minimum execution time: 32_134_000 picoseconds.
+		Weight::from_parts(33_037_000, 4828)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
-	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
@@ -1050,36 +1075,38 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// The range of component `i` is `[0, 131072]`.
 	fn seal_instantiate(t: u32, d: u32, i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1417`
-		//  Estimated: `4876`
-		// Minimum execution time: 150_079_000 picoseconds.
-		Weight::from_parts(104_920_700, 4876)
-			// Standard Error: 456_076
-			.saturating_add(Weight::from_parts(20_263_777, 0).saturating_mul(t.into()))
-			// Standard Error: 456_076
-			.saturating_add(Weight::from_parts(30_617_352, 0).saturating_mul(d.into()))
-			// Standard Error: 5
-			.saturating_add(Weight::from_parts(3_949, 0).saturating_mul(i.into()))
+		//  Measured:  `1413`
+		//  Estimated: `4863 + d * (26 ±1) + t * (26 ±1)`
+		// Minimum execution time: 153_561_000 picoseconds.
+		Weight::from_parts(109_353_814, 4863)
+			// Standard Error: 568_290
+			.saturating_add(Weight::from_parts(21_328_059, 0).saturating_mul(t.into()))
+			// Standard Error: 568_290
+			.saturating_add(Weight::from_parts(29_078_265, 0).saturating_mul(d.into()))
+			// Standard Error: 6
+			.saturating_add(Weight::from_parts(3_922, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 26).saturating_mul(d.into()))
+			.saturating_add(Weight::from_parts(0, 26).saturating_mul(t.into()))
 	}
 	/// The range of component `n` is `[0, 1048576]`.
 	fn sha2_256(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_165_000 picoseconds.
-		Weight::from_parts(9_566_786, 0)
-			// Standard Error: 0
-			.saturating_add(Weight::from_parts(1_251, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_210_000 picoseconds.
+		Weight::from_parts(6_742_356, 0)
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(1_262, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 1048576]`.
 	fn identity(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 727_000 picoseconds.
-		Weight::from_parts(868_990, 0)
+		// Minimum execution time: 744_000 picoseconds.
+		Weight::from_parts(726_223, 0)
 			// Standard Error: 0
 			.saturating_add(Weight::from_parts(112, 0).saturating_mul(n.into()))
 	}
@@ -1088,129 +1115,139 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_228_000 picoseconds.
-		Weight::from_parts(8_112_183, 0)
-			// Standard Error: 0
-			.saturating_add(Weight::from_parts(3_718, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_303_000 picoseconds.
+		Weight::from_parts(5_014_415, 0)
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(3_746, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 1048576]`.
 	fn seal_hash_keccak_256(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_142_000 picoseconds.
-		Weight::from_parts(12_135_609, 0)
+		// Minimum execution time: 1_191_000 picoseconds.
+		Weight::from_parts(8_433_779, 0)
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(3_539, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(3_561, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 1048576]`.
 	fn hash_blake2_256(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_520_000 picoseconds.
-		Weight::from_parts(10_863_970, 0)
-			// Standard Error: 0
-			.saturating_add(Weight::from_parts(1_405, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_642_000 picoseconds.
+		Weight::from_parts(16_588_050, 0)
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(1_403, 0).saturating_mul(n.into()))
 	}
-	/// The range of component `n` is `[0, 262144]`.
+	/// The range of component `n` is `[0, 1048576]`.
 	fn hash_blake2_128(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 713_000 picoseconds.
-		Weight::from_parts(5_972_288, 0)
-			// Standard Error: 0
-			.saturating_add(Weight::from_parts(1_498, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_560_000 picoseconds.
+		Weight::from_parts(11_627_209, 0)
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(1_418, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 1048321]`.
 	fn seal_sr25519_verify(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 42_872_000 picoseconds.
-		Weight::from_parts(83_548_865, 0)
-			// Standard Error: 3
-			.saturating_add(Weight::from_parts(4_865, 0).saturating_mul(n.into()))
+		// Minimum execution time: 43_050_000 picoseconds.
+		Weight::from_parts(78_880_483, 0)
+			// Standard Error: 4
+			.saturating_add(Weight::from_parts(4_820, 0).saturating_mul(n.into()))
 	}
 	fn ecdsa_recover() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 45_827_000 picoseconds.
-		Weight::from_parts(46_613_000, 0)
+		// Minimum execution time: 46_308_000 picoseconds.
+		Weight::from_parts(47_213_000, 0)
 	}
 	fn bn128_add() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 14_422_000 picoseconds.
-		Weight::from_parts(15_942_000, 0)
+		// Minimum execution time: 14_418_000 picoseconds.
+		Weight::from_parts(15_454_000, 0)
 	}
 	fn bn128_mul() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 974_593_000 picoseconds.
-		Weight::from_parts(980_966_000, 0)
+		// Minimum execution time: 998_849_000 picoseconds.
+		Weight::from_parts(1_007_812_000, 0)
 	}
 	/// The range of component `n` is `[0, 20]`.
 	fn bn128_pairing(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 851_000 picoseconds.
-		Weight::from_parts(4_760_087_459, 0)
-			// Standard Error: 10_485_749
-			.saturating_add(Weight::from_parts(5_940_723_809, 0).saturating_mul(n.into()))
+		// Minimum execution time: 878_000 picoseconds.
+		Weight::from_parts(4_894_017_610, 0)
+			// Standard Error: 10_490_929
+			.saturating_add(Weight::from_parts(5_933_404_461, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 1200]`.
 	fn blake2f(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 953_000 picoseconds.
-		Weight::from_parts(1_258_163, 0)
-			// Standard Error: 50
-			.saturating_add(Weight::from_parts(28_977, 0).saturating_mul(n.into()))
+		// Minimum execution time: 976_000 picoseconds.
+		Weight::from_parts(1_204_210, 0)
+			// Standard Error: 11
+			.saturating_add(Weight::from_parts(29_014, 0).saturating_mul(n.into()))
 	}
 	fn seal_ecdsa_to_eth_address() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 13_049_000 picoseconds.
-		Weight::from_parts(13_232_000, 0)
+		// Minimum execution time: 12_997_000 picoseconds.
+		Weight::from_parts(13_136_000, 0)
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
-	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	fn seal_set_code_hash() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `296`
-		//  Estimated: `3761`
-		// Minimum execution time: 10_342_000 picoseconds.
-		Weight::from_parts(10_818_000, 3761)
+		//  Measured:  `297`
+		//  Estimated: `3762`
+		// Minimum execution time: 12_778_000 picoseconds.
+		Weight::from_parts(13_084_000, 3762)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// The range of component `r` is `[0, 10000]`.
+	fn evm_opcode(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 1_130_000 picoseconds.
+		Weight::from_parts(1_549_653, 0)
+			// Standard Error: 4
+			.saturating_add(Weight::from_parts(2_365, 0).saturating_mul(r.into()))
+	}
+	/// The range of component `r` is `[0, 10000]`.
 	fn instr(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 11_081_000 picoseconds.
-		Weight::from_parts(39_209_404, 0)
-			// Standard Error: 395
-			.saturating_add(Weight::from_parts(106_585, 0).saturating_mul(r.into()))
+		// Minimum execution time: 12_557_000 picoseconds.
+		Weight::from_parts(60_327_563, 0)
+			// Standard Error: 1_035
+			.saturating_add(Weight::from_parts(143_372, 0).saturating_mul(r.into()))
 	}
 	/// The range of component `r` is `[0, 100000]`.
 	fn instr_empty_loop(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_146_000 picoseconds.
-		Weight::from_parts(4_731_872, 0)
-			// Standard Error: 13
-			.saturating_add(Weight::from_parts(73_452, 0).saturating_mul(r.into()))
+		// Minimum execution time: 3_315_000 picoseconds.
+		Weight::from_parts(7_548_170, 0)
+			// Standard Error: 24
+			.saturating_add(Weight::from_parts(72_139, 0).saturating_mul(r.into()))
 	}
 	/// Storage: UNKNOWN KEY `0x735f040a5d490f1107ad9c56f5ca00d2060e99e5378e562537cf3bc983e17b91` (r:2 w:1)
 	/// Proof: UNKNOWN KEY `0x735f040a5d490f1107ad9c56f5ca00d2060e99e5378e562537cf3bc983e17b91` (r:2 w:1)
@@ -1220,11 +1257,22 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `316`
 		//  Estimated: `6256`
-		// Minimum execution time: 12_136_000 picoseconds.
-		Weight::from_parts(12_668_000, 6256)
+		// Minimum execution time: 11_803_000 picoseconds.
+		Weight::from_parts(12_358_000, 6256)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
+	/// Storage: `Revive::CodeInfoOf` (r:2 w:1)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `MaxEncodedLen`)
+	fn v2_migration_step() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `245`
+		//  Estimated: `6134`
+		// Minimum execution time: 10_980_000 picoseconds.
+		Weight::from_parts(11_452_000, 6134)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
 }
 
 // For backwards compatibility and tests.
@@ -1235,8 +1283,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `147`
 		//  Estimated: `1632`
-		// Minimum execution time: 3_008_000 picoseconds.
-		Weight::from_parts(3_256_000, 1632)
+		// Minimum execution time: 3_150_000 picoseconds.
+		Weight::from_parts(3_421_000, 1632)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -1246,10 +1294,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `458 + k * (69 ±0)`
 		//  Estimated: `448 + k * (70 ±0)`
-		// Minimum execution time: 14_584_000 picoseconds.
-		Weight::from_parts(772_449, 448)
-			// Standard Error: 1_278
-			.saturating_add(Weight::from_parts(1_204_643, 0).saturating_mul(k.into()))
+		// Minimum execution time: 14_380_000 picoseconds.
+		Weight::from_parts(14_911_000, 448)
+			// Standard Error: 1_088
+			.saturating_add(Weight::from_parts(1_199_036, 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))
@@ -1261,7 +1309,7 @@ impl WeightInfo for () {
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
 	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
-	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
 	/// Storage: `Timestamp::Now` (r:1 w:0)
@@ -1271,12 +1319,12 @@ impl WeightInfo for () {
 	/// The range of component `c` is `[0, 102400]`.
 	fn call_with_pvm_code_per_byte(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1171 + c * (1 ±0)`
-		//  Estimated: `7106 + c * (1 ±0)`
-		// Minimum execution time: 86_230_000 picoseconds.
-		Weight::from_parts(124_424_225, 7106)
-			// Standard Error: 10
-			.saturating_add(Weight::from_parts(1_256, 0).saturating_mul(c.into()))
+		//  Measured:  `1172 + c * (1 ±0)`
+		//  Estimated: `7107 + c * (1 ±0)`
+		// Minimum execution time: 86_173_000 picoseconds.
+		Weight::from_parts(120_432_125, 7107)
+			// Standard Error: 9
+			.saturating_add(Weight::from_parts(1_435, 0).saturating_mul(c.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(c.into()))
@@ -1286,7 +1334,31 @@ impl WeightInfo for () {
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
 	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
-	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
+	/// Storage: `Revive::PristineCode` (r:1 w:0)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// 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 `[1, 102400]`.
+	fn call_with_evm_code_per_byte(c: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `1104`
+		//  Estimated: `7046`
+		// Minimum execution time: 80_755_000 picoseconds.
+		Weight::from_parts(85_415_387, 7046)
+			// Standard Error: 2
+			.saturating_add(Weight::from_parts(33, 0).saturating_mul(c.into()))
+			.saturating_add(RocksDbWeight::get().reads(7_u64))
+			.saturating_add(RocksDbWeight::get().writes(2_u64))
+	}
+	/// Storage: `Revive::OriginalAccount` (r:2 w:0)
+	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
+	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
+	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
+	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
 	/// Storage: `Timestamp::Now` (r:1 w:0)
@@ -1296,15 +1368,15 @@ impl WeightInfo for () {
 	/// The range of component `b` is `[0, 1]`.
 	fn basic_block_compilation(_b: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `4515`
-		//  Estimated: `10455`
-		// Minimum execution time: 124_359_000 picoseconds.
-		Weight::from_parts(129_025_585, 10455)
+		//  Measured:  `4516`
+		//  Estimated: `10456`
+		// Minimum execution time: 123_589_000 picoseconds.
+		Weight::from_parts(127_489_869, 10456)
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
-	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Balances::Holds` (r:2 w:2)
 	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
@@ -1323,17 +1395,17 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1108`
 		//  Estimated: `7041`
-		// Minimum execution time: 755_622_000 picoseconds.
-		Weight::from_parts(57_161_132, 7041)
-			// Standard Error: 36
-			.saturating_add(Weight::from_parts(19_425, 0).saturating_mul(c.into()))
-			// Standard Error: 28
-			.saturating_add(Weight::from_parts(5_000, 0).saturating_mul(i.into()))
+		// Minimum execution time: 754_650_000 picoseconds.
+		Weight::from_parts(758_926_000, 7041)
+			// Standard Error: 85
+			.saturating_add(Weight::from_parts(15_657, 0).saturating_mul(c.into()))
+			// Standard Error: 67
+			.saturating_add(Weight::from_parts(1_573, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
-	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Balances::Holds` (r:2 w:2)
 	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
@@ -1353,14 +1425,14 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1122`
 		//  Estimated: `7062 + d * (2475 ±0)`
-		// Minimum execution time: 281_326_000 picoseconds.
-		Weight::from_parts(192_766_004, 7062)
-			// Standard Error: 15
-			.saturating_add(Weight::from_parts(14_166, 0).saturating_mul(c.into()))
-			// Standard Error: 11
-			.saturating_add(Weight::from_parts(403, 0).saturating_mul(i.into()))
-			// Standard Error: 983_169
-			.saturating_add(Weight::from_parts(30_340_467, 0).saturating_mul(d.into()))
+		// Minimum execution time: 278_747_000 picoseconds.
+		Weight::from_parts(145_795_450, 7062)
+			// Standard Error: 17
+			.saturating_add(Weight::from_parts(14_966, 0).saturating_mul(c.into()))
+			// Standard Error: 13
+			.saturating_add(Weight::from_parts(542, 0).saturating_mul(i.into()))
+			// Standard Error: 1_133_623
+			.saturating_add(Weight::from_parts(41_772_022, 0).saturating_mul(d.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(d.into())))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
@@ -1368,7 +1440,7 @@ impl WeightInfo for () {
 			.saturating_add(Weight::from_parts(0, 2475).saturating_mul(d.into()))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
-	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
@@ -1384,12 +1456,12 @@ impl WeightInfo for () {
 	/// The range of component `i` is `[0, 131072]`.
 	fn instantiate(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1912`
-		//  Estimated: `5362`
-		// Minimum execution time: 172_513_000 picoseconds.
-		Weight::from_parts(178_290_134, 5362)
-			// Standard Error: 11
-			.saturating_add(Weight::from_parts(4_158, 0).saturating_mul(i.into()))
+		//  Measured:  `1913`
+		//  Estimated: `5338`
+		// Minimum execution time: 171_706_000 picoseconds.
+		Weight::from_parts(177_711_925, 5338)
+			// Standard Error: 10
+			.saturating_add(Weight::from_parts(4_170, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -1398,7 +1470,7 @@ impl WeightInfo for () {
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
 	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
-	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
 	/// Storage: `Timestamp::Now` (r:1 w:0)
@@ -1407,10 +1479,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:  `1792`
-		//  Estimated: `7732`
-		// Minimum execution time: 87_638_000 picoseconds.
-		Weight::from_parts(90_000_000, 7732)
+		//  Measured:  `1794`
+		//  Estimated: `7734`
+		// Minimum execution time: 86_797_000 picoseconds.
+		Weight::from_parts(90_276_000, 7734)
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -1419,7 +1491,7 @@ impl WeightInfo for () {
 	/// Storage: `Revive::AccountInfoOf` (r:2 w:2)
 	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
-	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
 	/// Storage: `Timestamp::Now` (r:1 w:0)
@@ -1429,12 +1501,12 @@ impl WeightInfo for () {
 	/// The range of component `d` is `[0, 1]`.
 	fn eth_call(d: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1792`
-		//  Estimated: `7732 + d * (2475 ±0)`
-		// Minimum execution time: 85_839_000 picoseconds.
-		Weight::from_parts(90_556_373, 7732)
-			// Standard Error: 358_297
-			.saturating_add(Weight::from_parts(27_649_126, 0).saturating_mul(d.into()))
+		//  Measured:  `1794`
+		//  Estimated: `7734 + d * (2475 ±0)`
+		// Minimum execution time: 86_087_000 picoseconds.
+		Weight::from_parts(89_671_759, 7734)
+			// Standard Error: 300_888
+			.saturating_add(Weight::from_parts(26_362_240, 0).saturating_mul(d.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(d.into())))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
@@ -1442,7 +1514,7 @@ impl WeightInfo for () {
 			.saturating_add(Weight::from_parts(0, 2475).saturating_mul(d.into()))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
-	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Balances::Holds` (r:1 w:1)
 	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:0 w:1)
@@ -1452,38 +1524,38 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `505`
 		//  Estimated: `3970`
-		// Minimum execution time: 56_805_000 picoseconds.
-		Weight::from_parts(50_855_179, 3970)
-			// Standard Error: 35
-			.saturating_add(Weight::from_parts(13_927, 0).saturating_mul(c.into()))
+		// Minimum execution time: 57_265_000 picoseconds.
+		Weight::from_parts(38_840_872, 3970)
+			// Standard Error: 20
+			.saturating_add(Weight::from_parts(14_420, 0).saturating_mul(c.into()))
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
-	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Balances::Holds` (r:1 w:1)
 	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:0 w:1)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
 	fn remove_code() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `658`
-		//  Estimated: `4123`
-		// Minimum execution time: 47_344_000 picoseconds.
-		Weight::from_parts(48_892_000, 4123)
+		//  Measured:  `659`
+		//  Estimated: `4124`
+		// Minimum execution time: 47_571_000 picoseconds.
+		Weight::from_parts(48_571_000, 4124)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
 	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:2 w:2)
-	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	fn set_code() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `530`
-		//  Estimated: `6470`
-		// Minimum execution time: 20_627_000 picoseconds.
-		Weight::from_parts(21_451_000, 6470)
+		//  Measured:  `532`
+		//  Estimated: `6472`
+		// Minimum execution time: 20_565_000 picoseconds.
+		Weight::from_parts(21_420_000, 6472)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -1495,8 +1567,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `813`
 		//  Estimated: `4278`
-		// Minimum execution time: 57_209_000 picoseconds.
-		Weight::from_parts(58_942_000, 4278)
+		// Minimum execution time: 58_321_000 picoseconds.
+		Weight::from_parts(58_922_000, 4278)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -1508,8 +1580,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `395`
 		//  Estimated: `3860`
-		// Minimum execution time: 42_757_000 picoseconds.
-		Weight::from_parts(44_178_000, 3860)
+		// Minimum execution time: 43_929_000 picoseconds.
+		Weight::from_parts(44_755_000, 3860)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -1521,8 +1593,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `145`
 		//  Estimated: `3610`
-		// Minimum execution time: 13_062_000 picoseconds.
-		Weight::from_parts(13_660_000, 3610)
+		// Minimum execution time: 12_925_000 picoseconds.
+		Weight::from_parts(13_333_000, 3610)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 	}
 	/// The range of component `r` is `[0, 1600]`.
@@ -1530,33 +1602,33 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 7_588_000 picoseconds.
-		Weight::from_parts(8_755_261, 0)
-			// Standard Error: 236
-			.saturating_add(Weight::from_parts(182_421, 0).saturating_mul(r.into()))
+		// Minimum execution time: 7_528_000 picoseconds.
+		Weight::from_parts(8_699_408, 0)
+			// Standard Error: 197
+			.saturating_add(Weight::from_parts(182_534, 0).saturating_mul(r.into()))
 	}
 	fn seal_caller() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 335_000 picoseconds.
-		Weight::from_parts(390_000, 0)
+		// Minimum execution time: 306_000 picoseconds.
+		Weight::from_parts(375_000, 0)
 	}
 	fn seal_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 350_000 picoseconds.
-		Weight::from_parts(386_000, 0)
+		// Minimum execution time: 288_000 picoseconds.
+		Weight::from_parts(362_000, 0)
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
-	fn seal_to_account_id() -> Weight {
+	fn to_account_id() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `571`
-		//  Estimated: `4036`
-		// Minimum execution time: 9_818_000 picoseconds.
-		Weight::from_parts(10_279_000, 4036)
+		//  Measured:  `567`
+		//  Estimated: `4032`
+		// Minimum execution time: 7_364_000 picoseconds.
+		Weight::from_parts(7_904_000, 4032)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:0)
@@ -1565,70 +1637,70 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `403`
 		//  Estimated: `3868`
-		// Minimum execution time: 9_222_000 picoseconds.
-		Weight::from_parts(9_806_000, 3868)
+		// Minimum execution time: 9_050_000 picoseconds.
+		Weight::from_parts(9_489_000, 3868)
 			.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: 282_000 picoseconds.
-		Weight::from_parts(336_000, 0)
+		// Minimum execution time: 302_000 picoseconds.
+		Weight::from_parts(337_000, 0)
 	}
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:0)
 	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
-	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	fn seal_code_size() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `474`
-		//  Estimated: `3939`
-		// Minimum execution time: 12_825_000 picoseconds.
-		Weight::from_parts(13_490_000, 3939)
+		//  Measured:  `475`
+		//  Estimated: `3940`
+		// Minimum execution time: 12_570_000 picoseconds.
+		Weight::from_parts(13_223_000, 3940)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 	}
 	fn seal_caller_is_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 321_000 picoseconds.
-		Weight::from_parts(372_000, 0)
+		// Minimum execution time: 310_000 picoseconds.
+		Weight::from_parts(364_000, 0)
 	}
 	fn seal_caller_is_root() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 269_000 picoseconds.
-		Weight::from_parts(327_000, 0)
+		// Minimum execution time: 259_000 picoseconds.
+		Weight::from_parts(302_000, 0)
 	}
 	fn seal_address() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 304_000 picoseconds.
-		Weight::from_parts(343_000, 0)
+		// Minimum execution time: 330_000 picoseconds.
+		Weight::from_parts(357_000, 0)
 	}
 	fn seal_weight_left() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 700_000 picoseconds.
-		Weight::from_parts(802_000, 0)
+		// Minimum execution time: 723_000 picoseconds.
+		Weight::from_parts(797_000, 0)
 	}
 	fn seal_ref_time_left() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 263_000 picoseconds.
-		Weight::from_parts(325_000, 0)
+		// Minimum execution time: 268_000 picoseconds.
+		Weight::from_parts(305_000, 0)
 	}
 	fn seal_balance() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `506`
+		//  Measured:  `540`
 		//  Estimated: `0`
-		// Minimum execution time: 13_351_000 picoseconds.
-		Weight::from_parts(13_878_000, 0)
+		// Minimum execution time: 12_855_000 picoseconds.
+		Weight::from_parts(13_194_000, 0)
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
@@ -1640,8 +1712,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `791`
 		//  Estimated: `4256`
-		// Minimum execution time: 18_603_000 picoseconds.
-		Weight::from_parts(19_511_000, 4256)
+		// Minimum execution time: 18_281_000 picoseconds.
+		Weight::from_parts(19_051_000, 4256)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 	}
 	/// Storage: `Revive::ImmutableDataOf` (r:1 w:0)
@@ -1651,10 +1723,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `271 + n * (1 ±0)`
 		//  Estimated: `3736 + n * (1 ±0)`
-		// Minimum execution time: 6_013_000 picoseconds.
-		Weight::from_parts(6_757_699, 3736)
-			// Standard Error: 5
-			.saturating_add(Weight::from_parts(483, 0).saturating_mul(n.into()))
+		// Minimum execution time: 5_711_000 picoseconds.
+		Weight::from_parts(6_613_746, 3736)
+			// Standard Error: 7
+			.saturating_add(Weight::from_parts(499, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -1665,67 +1737,67 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_052_000 picoseconds.
-		Weight::from_parts(2_330_454, 0)
+		// Minimum execution time: 2_087_000 picoseconds.
+		Weight::from_parts(2_316_148, 0)
 			// Standard Error: 2
-			.saturating_add(Weight::from_parts(525, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(493, 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: 259_000 picoseconds.
-		Weight::from_parts(331_000, 0)
+		// Minimum execution time: 267_000 picoseconds.
+		Weight::from_parts(315_000, 0)
 	}
 	fn seal_minimum_balance() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 278_000 picoseconds.
-		Weight::from_parts(339_000, 0)
+		// Minimum execution time: 270_000 picoseconds.
+		Weight::from_parts(313_000, 0)
 	}
 	fn seal_return_data_size() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 272_000 picoseconds.
-		Weight::from_parts(326_000, 0)
+		// Minimum execution time: 264_000 picoseconds.
+		Weight::from_parts(324_000, 0)
 	}
 	fn seal_call_data_size() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 268_000 picoseconds.
-		Weight::from_parts(313_000, 0)
+		// Minimum execution time: 262_000 picoseconds.
+		Weight::from_parts(309_000, 0)
 	}
 	fn seal_gas_limit() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 436_000 picoseconds.
-		Weight::from_parts(509_000, 0)
+		// Minimum execution time: 531_000 picoseconds.
+		Weight::from_parts(625_000, 0)
 	}
 	fn seal_gas_price() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 262_000 picoseconds.
-		Weight::from_parts(317_000, 0)
+		// Minimum execution time: 260_000 picoseconds.
+		Weight::from_parts(311_000, 0)
 	}
 	fn seal_base_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 289_000 picoseconds.
-		Weight::from_parts(347_000, 0)
+		// Minimum execution time: 282_000 picoseconds.
+		Weight::from_parts(312_000, 0)
 	}
 	fn seal_block_number() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 305_000 picoseconds.
-		Weight::from_parts(358_000, 0)
+		// Minimum execution time: 261_000 picoseconds.
+		Weight::from_parts(325_000, 0)
 	}
 	/// Storage: `Session::Validators` (r:1 w:0)
 	/// Proof: `Session::Validators` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -1733,8 +1805,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `141`
 		//  Estimated: `1626`
-		// Minimum execution time: 22_975_000 picoseconds.
-		Weight::from_parts(23_506_000, 1626)
+		// Minimum execution time: 21_538_000 picoseconds.
+		Weight::from_parts(22_409_000, 1626)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `System::BlockHash` (r:1 w:0)
@@ -1743,48 +1815,48 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `30`
 		//  Estimated: `3495`
-		// Minimum execution time: 3_631_000 picoseconds.
-		Weight::from_parts(3_829_000, 3495)
+		// Minimum execution time: 3_401_000 picoseconds.
+		Weight::from_parts(3_673_000, 3495)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	fn seal_now() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 271_000 picoseconds.
-		Weight::from_parts(337_000, 0)
+		// Minimum execution time: 300_000 picoseconds.
+		Weight::from_parts(354_000, 0)
 	}
 	fn seal_weight_to_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_603_000 picoseconds.
-		Weight::from_parts(1_712_000, 0)
+		// Minimum execution time: 1_680_000 picoseconds.
+		Weight::from_parts(1_742_000, 0)
 	}
 	/// The range of component `n` is `[0, 1048572]`.
 	fn seal_copy_to_contract(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 433_000 picoseconds.
-		Weight::from_parts(460_000, 0)
+		// Minimum execution time: 392_000 picoseconds.
+		Weight::from_parts(262_995, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(203, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(202, 0).saturating_mul(n.into()))
 	}
 	fn seal_call_data_load() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 293_000 picoseconds.
-		Weight::from_parts(325_000, 0)
+		// Minimum execution time: 234_000 picoseconds.
+		Weight::from_parts(291_000, 0)
 	}
 	/// The range of component `n` is `[0, 1048576]`.
 	fn seal_call_data_copy(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 269_000 picoseconds.
-		Weight::from_parts(806_378, 0)
+		// Minimum execution time: 267_000 picoseconds.
+		Weight::from_parts(610_075, 0)
 			// Standard Error: 0
 			.saturating_add(Weight::from_parts(112, 0).saturating_mul(n.into()))
 	}
@@ -1793,27 +1865,27 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 290_000 picoseconds.
-		Weight::from_parts(488_982, 0)
+		// Minimum execution time: 292_000 picoseconds.
+		Weight::from_parts(466_044, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(201, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(200, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
 	/// Storage: `Revive::DeletionQueueCounter` (r:1 w:1)
 	/// Proof: `Revive::DeletionQueueCounter` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
-	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::DeletionQueue` (r:0 w:1)
 	/// Proof: `Revive::DeletionQueue` (`max_values`: None, `max_size`: Some(142), added: 2617, mode: `Measured`)
 	/// Storage: `Revive::ImmutableDataOf` (r:0 w:1)
 	/// Proof: `Revive::ImmutableDataOf` (`max_values`: None, `max_size`: Some(4118), added: 6593, mode: `Measured`)
 	fn seal_terminate() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `582`
-		//  Estimated: `4047`
-		// Minimum execution time: 17_674_000 picoseconds.
-		Weight::from_parts(18_031_000, 4047)
+		//  Measured:  `583`
+		//  Estimated: `4048`
+		// Minimum execution time: 16_855_000 picoseconds.
+		Weight::from_parts(17_325_000, 4048)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -1823,12 +1895,12 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_375_000 picoseconds.
-		Weight::from_parts(4_568_155, 0)
-			// Standard Error: 3_591
-			.saturating_add(Weight::from_parts(223_460, 0).saturating_mul(t.into()))
-			// Standard Error: 39
-			.saturating_add(Weight::from_parts(854, 0).saturating_mul(n.into()))
+		// Minimum execution time: 4_416_000 picoseconds.
+		Weight::from_parts(4_382_711, 0)
+			// Standard Error: 3_063
+			.saturating_add(Weight::from_parts(257_304, 0).saturating_mul(t.into()))
+			// Standard Error: 33
+			.saturating_add(Weight::from_parts(1_239, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
 	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -1836,8 +1908,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `648`
 		//  Estimated: `648`
-		// Minimum execution time: 7_272_000 picoseconds.
-		Weight::from_parts(7_635_000, 648)
+		// Minimum execution time: 7_148_000 picoseconds.
+		Weight::from_parts(7_616_000, 648)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -1846,8 +1918,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `10658`
 		//  Estimated: `10658`
-		// Minimum execution time: 41_207_000 picoseconds.
-		Weight::from_parts(41_863_000, 10658)
+		// Minimum execution time: 41_435_000 picoseconds.
+		Weight::from_parts(42_294_000, 10658)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -1856,8 +1928,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `648`
 		//  Estimated: `648`
-		// Minimum execution time: 8_492_000 picoseconds.
-		Weight::from_parts(9_013_000, 648)
+		// Minimum execution time: 8_266_000 picoseconds.
+		Weight::from_parts(8_704_000, 648)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -1867,8 +1939,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `10658`
 		//  Estimated: `10658`
-		// Minimum execution time: 42_398_000 picoseconds.
-		Weight::from_parts(44_113_000, 10658)
+		// Minimum execution time: 43_187_000 picoseconds.
+		Weight::from_parts(44_235_000, 10658)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -1880,12 +1952,12 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + o * (1 ±0)`
 		//  Estimated: `247 + o * (1 ±0)`
-		// Minimum execution time: 8_728_000 picoseconds.
-		Weight::from_parts(9_632_969, 247)
-			// Standard Error: 56
-			.saturating_add(Weight::from_parts(556, 0).saturating_mul(n.into()))
-			// Standard Error: 56
-			.saturating_add(Weight::from_parts(958, 0).saturating_mul(o.into()))
+		// Minimum execution time: 8_740_000 picoseconds.
+		Weight::from_parts(9_473_762, 247)
+			// Standard Error: 60
+			.saturating_add(Weight::from_parts(684, 0).saturating_mul(n.into()))
+			// Standard Error: 60
+			.saturating_add(Weight::from_parts(488, 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()))
@@ -1897,10 +1969,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 9_032_000 picoseconds.
-		Weight::from_parts(9_816_471, 247)
-			// Standard Error: 82
-			.saturating_add(Weight::from_parts(582, 0).saturating_mul(n.into()))
+		// Minimum execution time: 8_609_000 picoseconds.
+		Weight::from_parts(9_456_962, 247)
+			// Standard Error: 78
+			.saturating_add(Weight::from_parts(882, 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()))
@@ -1912,10 +1984,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 8_313_000 picoseconds.
-		Weight::from_parts(9_381_907, 247)
-			// Standard Error: 91
-			.saturating_add(Weight::from_parts(1_184, 0).saturating_mul(n.into()))
+		// Minimum execution time: 7_777_000 picoseconds.
+		Weight::from_parts(8_957_787, 247)
+			// Standard Error: 85
+			.saturating_add(Weight::from_parts(2_018, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -1926,10 +1998,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 7_645_000 picoseconds.
-		Weight::from_parts(8_714_974, 247)
-			// Standard Error: 87
-			.saturating_add(Weight::from_parts(717, 0).saturating_mul(n.into()))
+		// Minimum execution time: 7_552_000 picoseconds.
+		Weight::from_parts(8_333_059, 247)
+			// Standard Error: 68
+			.saturating_add(Weight::from_parts(1_086, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -1940,10 +2012,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 9_388_000 picoseconds.
-		Weight::from_parts(10_430_193, 247)
-			// Standard Error: 77
-			.saturating_add(Weight::from_parts(1_346, 0).saturating_mul(n.into()))
+		// Minimum execution time: 9_262_000 picoseconds.
+		Weight::from_parts(10_280_631, 247)
+			// Standard Error: 84
+			.saturating_add(Weight::from_parts(780, 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()))
@@ -1952,36 +2024,36 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_597_000 picoseconds.
-		Weight::from_parts(1_691_000, 0)
+		// Minimum execution time: 1_559_000 picoseconds.
+		Weight::from_parts(1_678_000, 0)
 	}
 	fn set_transient_storage_full() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_005_000 picoseconds.
-		Weight::from_parts(2_129_000, 0)
+		// Minimum execution time: 1_939_000 picoseconds.
+		Weight::from_parts(2_073_000, 0)
 	}
 	fn get_transient_storage_empty() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_602_000 picoseconds.
-		Weight::from_parts(1_721_000, 0)
+		// Minimum execution time: 1_490_000 picoseconds.
+		Weight::from_parts(1_582_000, 0)
 	}
 	fn get_transient_storage_full() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_796_000 picoseconds.
-		Weight::from_parts(1_951_000, 0)
+		// Minimum execution time: 1_679_000 picoseconds.
+		Weight::from_parts(1_739_000, 0)
 	}
 	fn rollback_transient_storage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
 		// Minimum execution time: 1_279_000 picoseconds.
-		Weight::from_parts(1_353_000, 0)
+		Weight::from_parts(1_339_000, 0)
 	}
 	/// The range of component `n` is `[0, 416]`.
 	/// The range of component `o` is `[0, 416]`.
@@ -1989,57 +2061,59 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_407_000 picoseconds.
-		Weight::from_parts(2_715_278, 0)
-			// Standard Error: 18
-			.saturating_add(Weight::from_parts(147, 0).saturating_mul(n.into()))
-			// Standard Error: 18
-			.saturating_add(Weight::from_parts(292, 0).saturating_mul(o.into()))
+		// Minimum execution time: 2_300_000 picoseconds.
+		Weight::from_parts(2_536_575, 0)
+			// Standard Error: 17
+			.saturating_add(Weight::from_parts(334, 0).saturating_mul(n.into()))
+			// Standard Error: 17
+			.saturating_add(Weight::from_parts(392, 0).saturating_mul(o.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_clear_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_140_000 picoseconds.
-		Weight::from_parts(2_612_392, 0)
-			// Standard Error: 25
-			.saturating_add(Weight::from_parts(305, 0).saturating_mul(n.into()))
+		// Minimum execution time: 2_164_000 picoseconds.
+		Weight::from_parts(2_555_863, 0)
+			// Standard Error: 34
+			.saturating_add(Weight::from_parts(226, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_get_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_034_000 picoseconds.
-		Weight::from_parts(2_357_344, 0)
-			// Standard Error: 21
-			.saturating_add(Weight::from_parts(276, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_870_000 picoseconds.
+		Weight::from_parts(2_188_923, 0)
+			// Standard Error: 27
+			.saturating_add(Weight::from_parts(316, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_contains_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_888_000 picoseconds.
-		Weight::from_parts(2_137_193, 0)
-			// Standard Error: 16
-			.saturating_add(Weight::from_parts(172, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_713_000 picoseconds.
+		Weight::from_parts(2_013_249, 0)
+			// Standard Error: 20
+			.saturating_add(Weight::from_parts(210, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
-	fn seal_take_transient_storage(_n: u32, ) -> Weight {
+	fn seal_take_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_733_000 picoseconds.
-		Weight::from_parts(3_004_772, 0)
+		// Minimum execution time: 2_549_000 picoseconds.
+		Weight::from_parts(2_811_411, 0)
+			// Standard Error: 31
+			.saturating_add(Weight::from_parts(61, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
 	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
-	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
 	/// Storage: `System::Account` (r:1 w:1)
@@ -2049,16 +2123,16 @@ impl WeightInfo for () {
 	/// The range of component `i` is `[0, 1048576]`.
 	fn seal_call(t: u32, d: u32, i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2005`
-		//  Estimated: `5470`
-		// Minimum execution time: 91_390_000 picoseconds.
-		Weight::from_parts(71_229_693, 5470)
-			// Standard Error: 146_616
-			.saturating_add(Weight::from_parts(19_125_819, 0).saturating_mul(t.into()))
-			// Standard Error: 146_616
-			.saturating_add(Weight::from_parts(26_490_547, 0).saturating_mul(d.into()))
+		//  Measured:  `1925`
+		//  Estimated: `5390`
+		// Minimum execution time: 88_918_000 picoseconds.
+		Weight::from_parts(70_713_518, 5390)
+			// Standard Error: 172_359
+			.saturating_add(Weight::from_parts(18_545_016, 0).saturating_mul(t.into()))
+			// Standard Error: 172_359
+			.saturating_add(Weight::from_parts(24_817_484, 0).saturating_mul(d.into()))
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(4, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(2, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(5_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 			.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(t.into())))
@@ -2073,12 +2147,12 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `366 + d * (212 ±0)`
 		//  Estimated: `2021 + d * (2021 ±0)`
-		// Minimum execution time: 24_210_000 picoseconds.
-		Weight::from_parts(11_783_977, 2021)
-			// Standard Error: 49_916
-			.saturating_add(Weight::from_parts(14_132_066, 0).saturating_mul(d.into()))
+		// Minimum execution time: 24_697_000 picoseconds.
+		Weight::from_parts(12_092_184, 2021)
+			// Standard Error: 60_308
+			.saturating_add(Weight::from_parts(13_519_246, 0).saturating_mul(d.into()))
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(325, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(319, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads((2_u64).saturating_mul(d.into())))
 			.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(d.into())))
 			.saturating_add(Weight::from_parts(0, 2021).saturating_mul(d.into()))
@@ -2086,19 +2160,19 @@ impl WeightInfo for () {
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:0)
 	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
-	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
 	fn seal_delegate_call() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1362`
-		//  Estimated: `4827`
-		// Minimum execution time: 31_948_000 picoseconds.
-		Weight::from_parts(33_936_000, 4827)
+		//  Measured:  `1363`
+		//  Estimated: `4828`
+		// Minimum execution time: 32_134_000 picoseconds.
+		Weight::from_parts(33_037_000, 4828)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
-	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
 	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
@@ -2110,36 +2184,38 @@ impl WeightInfo for () {
 	/// The range of component `i` is `[0, 131072]`.
 	fn seal_instantiate(t: u32, d: u32, i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1417`
-		//  Estimated: `4876`
-		// Minimum execution time: 150_079_000 picoseconds.
-		Weight::from_parts(104_920_700, 4876)
-			// Standard Error: 456_076
-			.saturating_add(Weight::from_parts(20_263_777, 0).saturating_mul(t.into()))
-			// Standard Error: 456_076
-			.saturating_add(Weight::from_parts(30_617_352, 0).saturating_mul(d.into()))
-			// Standard Error: 5
-			.saturating_add(Weight::from_parts(3_949, 0).saturating_mul(i.into()))
+		//  Measured:  `1413`
+		//  Estimated: `4863 + d * (26 ±1) + t * (26 ±1)`
+		// Minimum execution time: 153_561_000 picoseconds.
+		Weight::from_parts(109_353_814, 4863)
+			// Standard Error: 568_290
+			.saturating_add(Weight::from_parts(21_328_059, 0).saturating_mul(t.into()))
+			// Standard Error: 568_290
+			.saturating_add(Weight::from_parts(29_078_265, 0).saturating_mul(d.into()))
+			// Standard Error: 6
+			.saturating_add(Weight::from_parts(3_922, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 26).saturating_mul(d.into()))
+			.saturating_add(Weight::from_parts(0, 26).saturating_mul(t.into()))
 	}
 	/// The range of component `n` is `[0, 1048576]`.
 	fn sha2_256(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_165_000 picoseconds.
-		Weight::from_parts(9_566_786, 0)
-			// Standard Error: 0
-			.saturating_add(Weight::from_parts(1_251, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_210_000 picoseconds.
+		Weight::from_parts(6_742_356, 0)
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(1_262, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 1048576]`.
 	fn identity(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 727_000 picoseconds.
-		Weight::from_parts(868_990, 0)
+		// Minimum execution time: 744_000 picoseconds.
+		Weight::from_parts(726_223, 0)
 			// Standard Error: 0
 			.saturating_add(Weight::from_parts(112, 0).saturating_mul(n.into()))
 	}
@@ -2148,129 +2224,139 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_228_000 picoseconds.
-		Weight::from_parts(8_112_183, 0)
-			// Standard Error: 0
-			.saturating_add(Weight::from_parts(3_718, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_303_000 picoseconds.
+		Weight::from_parts(5_014_415, 0)
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(3_746, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 1048576]`.
 	fn seal_hash_keccak_256(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_142_000 picoseconds.
-		Weight::from_parts(12_135_609, 0)
+		// Minimum execution time: 1_191_000 picoseconds.
+		Weight::from_parts(8_433_779, 0)
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(3_539, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(3_561, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 1048576]`.
 	fn hash_blake2_256(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_520_000 picoseconds.
-		Weight::from_parts(10_863_970, 0)
-			// Standard Error: 0
-			.saturating_add(Weight::from_parts(1_405, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_642_000 picoseconds.
+		Weight::from_parts(16_588_050, 0)
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(1_403, 0).saturating_mul(n.into()))
 	}
-	/// The range of component `n` is `[0, 262144]`.
+	/// The range of component `n` is `[0, 1048576]`.
 	fn hash_blake2_128(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 713_000 picoseconds.
-		Weight::from_parts(5_972_288, 0)
-			// Standard Error: 0
-			.saturating_add(Weight::from_parts(1_498, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_560_000 picoseconds.
+		Weight::from_parts(11_627_209, 0)
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(1_418, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 1048321]`.
 	fn seal_sr25519_verify(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 42_872_000 picoseconds.
-		Weight::from_parts(83_548_865, 0)
-			// Standard Error: 3
-			.saturating_add(Weight::from_parts(4_865, 0).saturating_mul(n.into()))
+		// Minimum execution time: 43_050_000 picoseconds.
+		Weight::from_parts(78_880_483, 0)
+			// Standard Error: 4
+			.saturating_add(Weight::from_parts(4_820, 0).saturating_mul(n.into()))
 	}
 	fn ecdsa_recover() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 45_827_000 picoseconds.
-		Weight::from_parts(46_613_000, 0)
+		// Minimum execution time: 46_308_000 picoseconds.
+		Weight::from_parts(47_213_000, 0)
 	}
 	fn bn128_add() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 14_422_000 picoseconds.
-		Weight::from_parts(15_942_000, 0)
+		// Minimum execution time: 14_418_000 picoseconds.
+		Weight::from_parts(15_454_000, 0)
 	}
 	fn bn128_mul() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 974_593_000 picoseconds.
-		Weight::from_parts(980_966_000, 0)
+		// Minimum execution time: 998_849_000 picoseconds.
+		Weight::from_parts(1_007_812_000, 0)
 	}
 	/// The range of component `n` is `[0, 20]`.
 	fn bn128_pairing(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 851_000 picoseconds.
-		Weight::from_parts(4_760_087_459, 0)
-			// Standard Error: 10_485_749
-			.saturating_add(Weight::from_parts(5_940_723_809, 0).saturating_mul(n.into()))
+		// Minimum execution time: 878_000 picoseconds.
+		Weight::from_parts(4_894_017_610, 0)
+			// Standard Error: 10_490_929
+			.saturating_add(Weight::from_parts(5_933_404_461, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 1200]`.
 	fn blake2f(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 953_000 picoseconds.
-		Weight::from_parts(1_258_163, 0)
-			// Standard Error: 50
-			.saturating_add(Weight::from_parts(28_977, 0).saturating_mul(n.into()))
+		// Minimum execution time: 976_000 picoseconds.
+		Weight::from_parts(1_204_210, 0)
+			// Standard Error: 11
+			.saturating_add(Weight::from_parts(29_014, 0).saturating_mul(n.into()))
 	}
 	fn seal_ecdsa_to_eth_address() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 13_049_000 picoseconds.
-		Weight::from_parts(13_232_000, 0)
+		// Minimum execution time: 12_997_000 picoseconds.
+		Weight::from_parts(13_136_000, 0)
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
-	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(96), added: 2571, mode: `Measured`)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	fn seal_set_code_hash() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `296`
-		//  Estimated: `3761`
-		// Minimum execution time: 10_342_000 picoseconds.
-		Weight::from_parts(10_818_000, 3761)
+		//  Measured:  `297`
+		//  Estimated: `3762`
+		// Minimum execution time: 12_778_000 picoseconds.
+		Weight::from_parts(13_084_000, 3762)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// The range of component `r` is `[0, 10000]`.
+	fn evm_opcode(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 1_130_000 picoseconds.
+		Weight::from_parts(1_549_653, 0)
+			// Standard Error: 4
+			.saturating_add(Weight::from_parts(2_365, 0).saturating_mul(r.into()))
+	}
+	/// The range of component `r` is `[0, 10000]`.
 	fn instr(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 11_081_000 picoseconds.
-		Weight::from_parts(39_209_404, 0)
-			// Standard Error: 395
-			.saturating_add(Weight::from_parts(106_585, 0).saturating_mul(r.into()))
+		// Minimum execution time: 12_557_000 picoseconds.
+		Weight::from_parts(60_327_563, 0)
+			// Standard Error: 1_035
+			.saturating_add(Weight::from_parts(143_372, 0).saturating_mul(r.into()))
 	}
 	/// The range of component `r` is `[0, 100000]`.
 	fn instr_empty_loop(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_146_000 picoseconds.
-		Weight::from_parts(4_731_872, 0)
-			// Standard Error: 13
-			.saturating_add(Weight::from_parts(73_452, 0).saturating_mul(r.into()))
+		// Minimum execution time: 3_315_000 picoseconds.
+		Weight::from_parts(7_548_170, 0)
+			// Standard Error: 24
+			.saturating_add(Weight::from_parts(72_139, 0).saturating_mul(r.into()))
 	}
 	/// Storage: UNKNOWN KEY `0x735f040a5d490f1107ad9c56f5ca00d2060e99e5378e562537cf3bc983e17b91` (r:2 w:1)
 	/// Proof: UNKNOWN KEY `0x735f040a5d490f1107ad9c56f5ca00d2060e99e5378e562537cf3bc983e17b91` (r:2 w:1)
@@ -2280,9 +2366,20 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `316`
 		//  Estimated: `6256`
-		// Minimum execution time: 12_136_000 picoseconds.
-		Weight::from_parts(12_668_000, 6256)
+		// Minimum execution time: 11_803_000 picoseconds.
+		Weight::from_parts(12_358_000, 6256)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
+	/// Storage: `Revive::CodeInfoOf` (r:2 w:1)
+	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `MaxEncodedLen`)
+	fn v2_migration_step() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `245`
+		//  Estimated: `6134`
+		// Minimum execution time: 10_980_000 picoseconds.
+		Weight::from_parts(11_452_000, 6134)
+			.saturating_add(RocksDbWeight::get().reads(2_u64))
+			.saturating_add(RocksDbWeight::get().writes(1_u64))
+	}
 }

From 165957c7bcfe7bb4b7bba0e5012c1539439d168a Mon Sep 17 00:00:00 2001
From: "cmd[bot]" <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 21 Aug 2025 13:23:05 +0000
Subject: [PATCH 131/186] Update from github-actions[bot] running command
 'prdoc --audience runtime_dev --bump patch'

---
 prdoc/pr_9285.prdoc | 85 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 prdoc/pr_9285.prdoc

diff --git a/prdoc/pr_9285.prdoc b/prdoc/pr_9285.prdoc
new file mode 100644
index 000000000000..186e912a1060
--- /dev/null
+++ b/prdoc/pr_9285.prdoc
@@ -0,0 +1,85 @@
+title: '[revive] revm backend'
+doc:
+- audience: Runtime Dev
+  description: "# EVM initial support  for pallet-revive\n\nInitial EVM support via\
+    \ the REVM crate to create a dual-VM system that can execute both PolkaVM and\
+    \ EVM\n\n- Added `AllowEVMBytecode: Get<bool>` to the config to enable/disable\
+    \ EVM call and instantiation\n- The basic flow of uploading an EVM contract and\
+    \ running it should work\n- instructions are copied and adapted from REVM they\
+    \ should be ignored in this PR and reviewed in follow-up PR\n(**reviewers** please\
+    \ ignore `substrate/frame/revive/src/vm/evm/instructions/*` for now)\n\n## Implementation\
+    \ Guidelines\n\n### Basic Instruction Structure\nA basic instruction looks like\
+    \ this:\n\n```rust\npub fn coinbase<'ext, E: Ext>(context: Context<'_, 'ext, E>)\
+    \ {\n\tgas_legacy!(context.interpreter, revm_gas::BASE);\n\tpush!(context.interpreter,\
+    \ context.host.beneficiary().into_word().into());\n}\n```\n\n### Required Changes\
+    \ for REVM Instructions\n\nAll instructions have been copied from `REVM` and updated\
+    \ with generic types for pallet-revive. Two main changes are required:\n\n####\
+    \ 1. Gas Handling\nReplace REVM gas calls with existing benchmarks where available:\n\
+    \n```diff\n- gas_legacy!(context.interpreter, revm_gas::BASE);\n+ gas!(context.interpreter,\
+    \ RuntimeCosts::BlockAuthor);\n```\n\n#### 2. Context Access\nReplace `context.host`\
+    \ calls with `context.extend` (set to `&mut Ext`):\n\n```diff\n- push!(context.interpreter,\
+    \ context.host.beneficiary().into_word().into());\n+ let coinbase: Address = context.interpreter.extend.block_author().unwrap_or_default().0.into();\n\
+    + push!(context.interpreter, coinbase.into_word().into());\n```\n\n### Gas Benchmarking\
+    \ Notes\n- For cases without existing benchmarks (e.g arithmetic, bitwise) , we\
+    \ will keep  `gas_legacy!`\n- The u64 gas value will be multiplied by a gas-to-weight\
+    \ ratio (we will need a benchmark for that similar to instr for PVM)\n- We will\
+    \ also need an `base_op_code` benchmark to take into account the interpreter loop\
+    \ execution overhead\n\n### Important Rules\n- All calls to `context.host` should\
+    \ be removed (initialized to default values)\n- All calls to `context.interpreter.gas`\
+    \ should be removed (except `gas.memory` handled by `resize_memory!` macro)\n\
+    - See `block_number` implementation as a reference example\n\nThe following instructions\
+    \ in src/vm/evm/instructions/** need to be updated\n\n### Basic Instructions\n\
+    \nWe probably don't need to touch these implementations here, they use the gas_legacy!\
+    \ macro to charge a low gas value that will be scaled with our gas_to_weight benchmark.\
+    \ The only thing needed here are tests that exercise these instructions\n\n<details>\n\
+    \n#### Arithmetic Instructions\n\n- [ ] **add**\n- [ ] **mul**\n- [ ] **sub**\n\
+    - [ ] **div**\n- [ ] **sdiv**\n- [ ] **rem**\n- [ ] **smod**\n- [ ] **addmod**\n\
+    - [ ] **mulmod**\n- [ ] **exp**\n- [ ] **signextend**\n\n#### Bitwise Instructions\n\
+    \n- [ ] **lt**\n- [ ] **gt**\n- [ ] **slt**\n- [ ] **sgt**\n- [ ] **eq**\n- [\
+    \ ] **iszero**\n- [ ] **bitand**\n- [ ] **bitor**\n- [ ] **bitxor**\n- [ ] **not**\n\
+    - [ ] **byte**\n- [ ] **shl**\n- [ ] **shr**\n- [ ] **sar**\n- [ ] **clz**\n\n\
+    #### Control Flow Instructions\n\n- [ ] **jump**\n- [ ] **jumpi**\n- [ ] **jumpdest**\n\
+    - [ ] **pc**\n- [ ] **stop**\n- [ ] **ret**\n- [ ] **revert**\n- [ ] **invalid**\n\
+    \n### Memory Instructions\n- [ ] **mload**\n- [ ] **mstore**\n- [ ] **mstore8**\n\
+    - [ ] **msize**\n- [ ] **mcopy**\n\n#### Stack Instructions\n- [ ] **pop**\n-\
+    \ [ ] **push0**\n- [ ] **push**\n- [ ] **dup**\n- [ ] **swap**\n\n</details>\n\
+    \n### Sys calls instructions\n\nThese instructions should be updated from using\
+    \ gas_legacy! to gas! with the appropriate RuntimeCost, the returned value need\
+    \ to be pulled from our `&mut Ext` ctx.interpreter.extend  instead of the host\
+    \ or input context value\n\n<details>\n\n#### Block Info Instructions\n\n- [x]\
+    \ **block_number**\n- [ ] **coinbase**\n- [ ] **timestamp**\n- [ ] **difficulty**\n\
+    - [ ] **gaslimit**\n- [ ] **chainid**\n- [ ] **basefee**\n- [ ] **blob_basefee**\n\
+    \n#### Host Instructions\n\n- [ ] **balance**\n- [ ] **extcodesize**\n- [ ] **extcodecopy**\n\
+    - [ ] **extcodehash**\n- [ ] **blockhash**\n- [ ] **sload**\n- [ ] **sstore**\n\
+    - [ ] **tload**\n- [ ] **tstore**\n- [ ] **log**\n- [ ] **selfdestruct**\n- [\
+    \ ] **selfbalance**\n\n#### System Instructions\n- [ ] **keccak256**\n- [ ] **address**\n\
+    - [ ] **caller**\n- [ ] **callvalue**\n- [ ] **calldataload**\n- [ ] **calldatasize**\n\
+    - [ ] **calldatacopy**\n- [ ] **codesize**\n- [ ] **codecopy**\n- [ ] **returndatasize**\n\
+    - [ ] **returndatacopy**\n- [ ] **gas**\n\n#### Transaction Info Instructions\n\
+    - [ ] **origin**\n- [ ] **gasprice**\n- [ ] **blob_hash**\n\n</details>\n\n###\
+    \ Contract Instructions\n\nThese instructions should be updated,, that's where\
+    \ I expect the most code change in the instruction implementation.\nSee how it's\
+    \ done in vm/pvm module, the final result should look pretty similar to what we\
+    \ are doing there with the addition of custom gas_limit calculation that works\
+    \ with our gas model.\n\nsee also example code here https://github.com/paritytech/revm_example\n\
+    \n<details>\n\n- [ ] **create**\n- [ ] **create**\n- [ ] **call**\n- [ ] **call_code**\n\
+    - [ ] **delegate_call**\n- [ ] **static_call**\n\n</details>"
+crates:
+- name: pallet-revive
+  bump: patch
+- name: pallet-revive-fixtures
+  bump: patch
+- name: assets-common
+  bump: patch
+- name: asset-hub-westend-runtime
+  bump: patch
+- name: pallet-xcm
+  bump: patch
+- name: pallet-assets
+  bump: patch
+- name: pallet-contracts
+  bump: patch
+- name: penpal-runtime
+  bump: patch
+- name: sp-runtime
+  bump: patch

From 2b07ca6697f6948967d24decba7baac52b55734e Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Thu, 21 Aug 2025 14:40:12 +0000
Subject: [PATCH 132/186] rename seal_to_account_id

---
 substrate/frame/revive/src/vm/runtime_costs.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/substrate/frame/revive/src/vm/runtime_costs.rs b/substrate/frame/revive/src/vm/runtime_costs.rs
index 7c71a1bb1b93..861423dc0b28 100644
--- a/substrate/frame/revive/src/vm/runtime_costs.rs
+++ b/substrate/frame/revive/src/vm/runtime_costs.rs
@@ -48,7 +48,7 @@ pub enum RuntimeCosts {
 	CallDataSize,
 	/// Weight of calling `seal_return_data_size`.
 	ReturnDataSize,
-	/// Weight of calling `seal_to_account_id`.
+	/// Weight of calling `to_account_id`.
 	ToAccountId,
 	/// Weight of calling `seal_origin`.
 	Origin,
@@ -233,7 +233,7 @@ impl<T: Config> Token<T> for RuntimeCosts {
 			CallDataCopy(len) => T::WeightInfo::seal_call_data_copy(len),
 			Caller => T::WeightInfo::seal_caller(),
 			Origin => T::WeightInfo::seal_origin(),
-			ToAccountId => T::WeightInfo::seal_to_account_id(),
+			ToAccountId => T::WeightInfo::to_account_id(),
 			CodeHash => T::WeightInfo::seal_code_hash(),
 			CodeSize => T::WeightInfo::seal_code_size(),
 			OwnCodeHash => T::WeightInfo::seal_own_code_hash(),

From f96fa39cc1fb76ea2420274fe1b0f1c6a4bbde5f Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Thu, 21 Aug 2025 15:43:28 +0000
Subject: [PATCH 133/186] update PRDOC

---
 prdoc/pr_9285.prdoc | 78 +++------------------------------------------
 1 file changed, 5 insertions(+), 73 deletions(-)

diff --git a/prdoc/pr_9285.prdoc b/prdoc/pr_9285.prdoc
index 186e912a1060..7197b711c67d 100644
--- a/prdoc/pr_9285.prdoc
+++ b/prdoc/pr_9285.prdoc
@@ -1,85 +1,17 @@
 title: '[revive] revm backend'
 doc:
 - audience: Runtime Dev
-  description: "# EVM initial support  for pallet-revive\n\nInitial EVM support via\
-    \ the REVM crate to create a dual-VM system that can execute both PolkaVM and\
-    \ EVM\n\n- Added `AllowEVMBytecode: Get<bool>` to the config to enable/disable\
-    \ EVM call and instantiation\n- The basic flow of uploading an EVM contract and\
-    \ running it should work\n- instructions are copied and adapted from REVM they\
-    \ should be ignored in this PR and reviewed in follow-up PR\n(**reviewers** please\
-    \ ignore `substrate/frame/revive/src/vm/evm/instructions/*` for now)\n\n## Implementation\
-    \ Guidelines\n\n### Basic Instruction Structure\nA basic instruction looks like\
-    \ this:\n\n```rust\npub fn coinbase<'ext, E: Ext>(context: Context<'_, 'ext, E>)\
-    \ {\n\tgas_legacy!(context.interpreter, revm_gas::BASE);\n\tpush!(context.interpreter,\
-    \ context.host.beneficiary().into_word().into());\n}\n```\n\n### Required Changes\
-    \ for REVM Instructions\n\nAll instructions have been copied from `REVM` and updated\
-    \ with generic types for pallet-revive. Two main changes are required:\n\n####\
-    \ 1. Gas Handling\nReplace REVM gas calls with existing benchmarks where available:\n\
-    \n```diff\n- gas_legacy!(context.interpreter, revm_gas::BASE);\n+ gas!(context.interpreter,\
-    \ RuntimeCosts::BlockAuthor);\n```\n\n#### 2. Context Access\nReplace `context.host`\
-    \ calls with `context.extend` (set to `&mut Ext`):\n\n```diff\n- push!(context.interpreter,\
-    \ context.host.beneficiary().into_word().into());\n+ let coinbase: Address = context.interpreter.extend.block_author().unwrap_or_default().0.into();\n\
-    + push!(context.interpreter, coinbase.into_word().into());\n```\n\n### Gas Benchmarking\
-    \ Notes\n- For cases without existing benchmarks (e.g arithmetic, bitwise) , we\
-    \ will keep  `gas_legacy!`\n- The u64 gas value will be multiplied by a gas-to-weight\
-    \ ratio (we will need a benchmark for that similar to instr for PVM)\n- We will\
-    \ also need an `base_op_code` benchmark to take into account the interpreter loop\
-    \ execution overhead\n\n### Important Rules\n- All calls to `context.host` should\
-    \ be removed (initialized to default values)\n- All calls to `context.interpreter.gas`\
-    \ should be removed (except `gas.memory` handled by `resize_memory!` macro)\n\
-    - See `block_number` implementation as a reference example\n\nThe following instructions\
-    \ in src/vm/evm/instructions/** need to be updated\n\n### Basic Instructions\n\
-    \nWe probably don't need to touch these implementations here, they use the gas_legacy!\
-    \ macro to charge a low gas value that will be scaled with our gas_to_weight benchmark.\
-    \ The only thing needed here are tests that exercise these instructions\n\n<details>\n\
-    \n#### Arithmetic Instructions\n\n- [ ] **add**\n- [ ] **mul**\n- [ ] **sub**\n\
-    - [ ] **div**\n- [ ] **sdiv**\n- [ ] **rem**\n- [ ] **smod**\n- [ ] **addmod**\n\
-    - [ ] **mulmod**\n- [ ] **exp**\n- [ ] **signextend**\n\n#### Bitwise Instructions\n\
-    \n- [ ] **lt**\n- [ ] **gt**\n- [ ] **slt**\n- [ ] **sgt**\n- [ ] **eq**\n- [\
-    \ ] **iszero**\n- [ ] **bitand**\n- [ ] **bitor**\n- [ ] **bitxor**\n- [ ] **not**\n\
-    - [ ] **byte**\n- [ ] **shl**\n- [ ] **shr**\n- [ ] **sar**\n- [ ] **clz**\n\n\
-    #### Control Flow Instructions\n\n- [ ] **jump**\n- [ ] **jumpi**\n- [ ] **jumpdest**\n\
-    - [ ] **pc**\n- [ ] **stop**\n- [ ] **ret**\n- [ ] **revert**\n- [ ] **invalid**\n\
-    \n### Memory Instructions\n- [ ] **mload**\n- [ ] **mstore**\n- [ ] **mstore8**\n\
-    - [ ] **msize**\n- [ ] **mcopy**\n\n#### Stack Instructions\n- [ ] **pop**\n-\
-    \ [ ] **push0**\n- [ ] **push**\n- [ ] **dup**\n- [ ] **swap**\n\n</details>\n\
-    \n### Sys calls instructions\n\nThese instructions should be updated from using\
-    \ gas_legacy! to gas! with the appropriate RuntimeCost, the returned value need\
-    \ to be pulled from our `&mut Ext` ctx.interpreter.extend  instead of the host\
-    \ or input context value\n\n<details>\n\n#### Block Info Instructions\n\n- [x]\
-    \ **block_number**\n- [ ] **coinbase**\n- [ ] **timestamp**\n- [ ] **difficulty**\n\
-    - [ ] **gaslimit**\n- [ ] **chainid**\n- [ ] **basefee**\n- [ ] **blob_basefee**\n\
-    \n#### Host Instructions\n\n- [ ] **balance**\n- [ ] **extcodesize**\n- [ ] **extcodecopy**\n\
-    - [ ] **extcodehash**\n- [ ] **blockhash**\n- [ ] **sload**\n- [ ] **sstore**\n\
-    - [ ] **tload**\n- [ ] **tstore**\n- [ ] **log**\n- [ ] **selfdestruct**\n- [\
-    \ ] **selfbalance**\n\n#### System Instructions\n- [ ] **keccak256**\n- [ ] **address**\n\
-    - [ ] **caller**\n- [ ] **callvalue**\n- [ ] **calldataload**\n- [ ] **calldatasize**\n\
-    - [ ] **calldatacopy**\n- [ ] **codesize**\n- [ ] **codecopy**\n- [ ] **returndatasize**\n\
-    - [ ] **returndatacopy**\n- [ ] **gas**\n\n#### Transaction Info Instructions\n\
-    - [ ] **origin**\n- [ ] **gasprice**\n- [ ] **blob_hash**\n\n</details>\n\n###\
-    \ Contract Instructions\n\nThese instructions should be updated,, that's where\
-    \ I expect the most code change in the instruction implementation.\nSee how it's\
-    \ done in vm/pvm module, the final result should look pretty similar to what we\
-    \ are doing there with the addition of custom gas_limit calculation that works\
-    \ with our gas model.\n\nsee also example code here https://github.com/paritytech/revm_example\n\
-    \n<details>\n\n- [ ] **create**\n- [ ] **create**\n- [ ] **call**\n- [ ] **call_code**\n\
-    - [ ] **delegate_call**\n- [ ] **static_call**\n\n</details>"
+  description: |
+    Initial EVM support for pallet-revive via the REVM crate to create a dual-VM system that can execute both PolkaVM and EVM
+    - Added AllowEVMBytecode: Get<bool> to the config to enable/disable EVM call and instantiation
+    - The basic flow of uploading an EVM contract and running it should work
+    - instructions are copied and adapted from REVM they should be ignored in this PR and reviewed in follow-up PR
 crates:
 - name: pallet-revive
   bump: patch
 - name: pallet-revive-fixtures
   bump: patch
-- name: assets-common
-  bump: patch
 - name: asset-hub-westend-runtime
   bump: patch
-- name: pallet-xcm
-  bump: patch
-- name: pallet-assets
-  bump: patch
-- name: pallet-contracts
-  bump: patch
 - name: penpal-runtime
   bump: patch
-- name: sp-runtime
-  bump: patch

From b66b47a1e5b1f01ca50b61ca5c31281dbe230fc1 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Thu, 21 Aug 2025 21:55:13 +0000
Subject: [PATCH 134/186] fix bench

---
 .../parachains/runtimes/assets/asset-hub-westend/src/lib.rs    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
index cc31b826c2d5..b9fa6e6e937f 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
@@ -1182,6 +1182,9 @@ impl pallet_revive::Config for Runtime {
 	type RuntimeMemory = ConstU32<{ 128 * 1024 * 1024 }>;
 	type PVFMemory = ConstU32<{ 512 * 1024 * 1024 }>;
 	type UnsafeUnstableInterface = ConstBool<false>;
+	#[cfg(feature = "runtime-benchmarks")]
+	type AllowEVMBytecode = ConstBool<true>;
+	#[cfg(not(feature = "runtime-benchmarks"))]
 	type AllowEVMBytecode = ConstBool<false>;
 	type UploadOrigin = EnsureSigned<Self::AccountId>;
 	type InstantiateOrigin = EnsureSigned<Self::AccountId>;

From 4d0db7e8e2e4405461e9f3f731010c1ed61d10c3 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 22 Aug 2025 09:49:15 +0000
Subject: [PATCH 135/186] output.data shoudl be untouched

---
 substrate/frame/revive/src/exec.rs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index 9f1b53e004cd..5272b3fdda79 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -1216,7 +1216,7 @@ where
 				.map(|exec| exec.code_info().deposit())
 				.unwrap_or_default();
 
-			let mut output = match executable {
+			let output = match executable {
 				ExecutableOrPrecompile::Executable(executable) =>
 					executable.execute(self, entry_point, input_data),
 				ExecutableOrPrecompile::Precompile { instance, .. } =>
@@ -1247,11 +1247,10 @@ where
 				// if we are dealing with EVM bytecode
 				// We upload the new runtime code, and update the code
 				if !is_pvm {
-					let caller = caller.account_id()?.clone();
-					let addr = T::AddressMapper::to_address(account_id).0.to_vec();
-					let data = core::mem::replace(&mut output.data, addr);
-
-					let mut module = crate::ContractBlob::<T>::from_evm_code(data, caller)?;
+					let mut module = crate::ContractBlob::<T>::from_evm_code(
+						output.data.clone(),
+						caller.account_id()?.clone(),
+					)?;
 					code_deposit = module.store_code(skip_transfer)?;
 					contract_info.code_hash = *module.code_hash();
 				}

From 79b84da844b938ae5d4294adcf0a79c92c1a581a Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 22 Aug 2025 12:52:18 +0000
Subject: [PATCH 136/186] install solidity in job

---
 .github/workflows/tests-misc.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/tests-misc.yml b/.github/workflows/tests-misc.yml
index 846a7e5aeb87..f73fc9f43517 100644
--- a/.github/workflows/tests-misc.yml
+++ b/.github/workflows/tests-misc.yml
@@ -370,6 +370,8 @@ jobs:
           components: cargo, clippy, rust-docs, rust-src, rustfmt, rustc, rust-std
       - name: Install protobuf
         run: brew install protobuf
+      - name: install solc
+        run: brew install solidity
       - name: cargo info
         run: |
           echo "######## rustup show ########"
@@ -406,3 +408,4 @@ jobs:
           else
             echo '### Good job! All the required jobs passed 🚀' >> $GITHUB_STEP_SUMMARY
           fi
+

From 4b80099358e73555becfc39b55802353eee899c7 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 22 Aug 2025 14:00:05 +0000
Subject: [PATCH 137/186] use resolc too

---
 .github/workflows/tests-misc.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.github/workflows/tests-misc.yml b/.github/workflows/tests-misc.yml
index f73fc9f43517..d04c6ab7af12 100644
--- a/.github/workflows/tests-misc.yml
+++ b/.github/workflows/tests-misc.yml
@@ -372,6 +372,16 @@ jobs:
         run: brew install protobuf
       - name: install solc
         run: brew install solidity
+      - name: Install resolc
+        run: |
+          ASSET_URL="https://github.com/paritytech/revive/releases/download/v${{ inputs.version }}/resolc-universal-apple-darwin"
+          echo "Downloading resolc v${{ inputs.version }} from $ASSET_URL"
+          curl -Lsf --show-error -o /tmp/resolc "$ASSET_URL"
+          sudo cp /tmp/resolc /usr/local/bin/resolc
+          sudo chmod 755 /usr/local/bin/resolc
+        with:
+          version: 0.3.0        
+
       - name: cargo info
         run: |
           echo "######## rustup show ########"

From 4b6f4d2a4933a863253605d7710142bee58d72e4 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 22 Aug 2025 14:02:03 +0000
Subject: [PATCH 138/186] rm line

---
 .github/workflows/tests-misc.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/tests-misc.yml b/.github/workflows/tests-misc.yml
index d04c6ab7af12..8fb97782a663 100644
--- a/.github/workflows/tests-misc.yml
+++ b/.github/workflows/tests-misc.yml
@@ -381,7 +381,6 @@ jobs:
           sudo chmod 755 /usr/local/bin/resolc
         with:
           version: 0.3.0        
-
       - name: cargo info
         run: |
           echo "######## rustup show ########"

From ab15dc11f88f3767460b0c06aef561e8194e0744 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Sat, 23 Aug 2025 09:29:51 +0200
Subject: [PATCH 139/186] enforce evm code size limit

---
 substrate/frame/revive/src/exec.rs   | 6 +++++-
 substrate/frame/revive/src/lib.rs    | 2 +-
 substrate/frame/revive/src/vm/evm.rs | 8 +++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index 5272b3fdda79..3b58bedc36f3 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -1247,7 +1247,11 @@ where
 				// if we are dealing with EVM bytecode
 				// We upload the new runtime code, and update the code
 				if !is_pvm {
-					let mut module = crate::ContractBlob::<T>::from_evm_code(
+					if output.data.len() > revm::primitives::eip170::MAX_CODE_SIZE {
+						return Err(Error::<T>::BlobTooLarge.into());
+					}
+
+					let mut module = crate::ContractBlob::<T>::from_evm_init_code(
 						output.data.clone(),
 						caller.account_id()?.clone(),
 					)?;
diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index aca9e13c8cc2..4fbe66531164 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -1154,7 +1154,7 @@ where
 				Code::Upload(code) =>
 					if T::AllowEVMBytecode::get() {
 						let origin = T::UploadOrigin::ensure_origin(origin)?;
-						let executable = ContractBlob::from_evm_code(code, origin)?;
+						let executable = ContractBlob::from_evm_init_code(code, origin)?;
 						(executable, Default::default())
 					} else {
 						return Err(<Error<T>>::CodeRejected.into())
diff --git a/substrate/frame/revive/src/vm/evm.rs b/substrate/frame/revive/src/vm/evm.rs
index be31611bc877..4de8b2126911 100644
--- a/substrate/frame/revive/src/vm/evm.rs
+++ b/substrate/frame/revive/src/vm/evm.rs
@@ -42,10 +42,16 @@ where
 	BalanceOf<T>: Into<U256> + TryFrom<U256>,
 {
 	/// Create a new contract from EVM code.
-	pub fn from_evm_code(code: Vec<u8>, owner: AccountIdOf<T>) -> Result<Self, DispatchError> {
+	pub fn from_evm_init_code(code: Vec<u8>, owner: AccountIdOf<T>) -> Result<Self, DispatchError> {
 		use revm::{bytecode::Bytecode, primitives::Bytes};
 
 		let code: CodeVec = code.try_into().map_err(|_| <Error<T>>::BlobTooLarge)?;
+
+		// Also enforce the EIP-3860 limit on initcode size.
+		if code.len() > revm::primitives::eip3860::MAX_INITCODE_SIZE {
+			return Err(<Error<T>>::BlobTooLarge.into());
+		}
+
 		Bytecode::new_raw_checked(Bytes::from(code.to_vec())).map_err(|err| {
 			log::debug!(target: LOG_TARGET, "failed to create evm bytecode from code: {err:?}" );
 			<Error<T>>::CodeRejected

From e93c1a0b7136b3178c1e9f68aeec50fe4b3978eb Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Mon, 25 Aug 2025 12:05:14 +0200
Subject: [PATCH 140/186] fix

---
 substrate/frame/revive/src/benchmarking.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/substrate/frame/revive/src/benchmarking.rs b/substrate/frame/revive/src/benchmarking.rs
index b559c13a90c1..cddea17a683b 100644
--- a/substrate/frame/revive/src/benchmarking.rs
+++ b/substrate/frame/revive/src/benchmarking.rs
@@ -154,7 +154,7 @@ mod benchmarks {
 	// the execution engine.
 	/// This is similar to `call_with_pvm_code_per_byte` but for EVM bytecode.
 	#[benchmark(pov_mode = Measured)]
-	fn call_with_evm_code_per_byte(c: Linear<1, { 100 * 1024 }>) -> Result<(), BenchmarkError> {
+	fn call_with_evm_code_per_byte(c: Linear<1, { 10 * 1024 }>) -> Result<(), BenchmarkError> {
 		let instance = Contract::<T>::with_caller(
 			whitelisted_caller(),
 			VmBinaryModule::evm_sized(c - 1),

From 04d05515235f6f5c723d3a56246a700474a8c5bb Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Mon, 25 Aug 2025 12:15:36 +0200
Subject: [PATCH 141/186] fix

---
 substrate/frame/revive/src/exec.rs    | 11 +++++++++--
 substrate/frame/revive/src/tracing.rs |  4 ++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index 3b58bedc36f3..e7d615294be0 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -1216,7 +1216,7 @@ where
 				.map(|exec| exec.code_info().deposit())
 				.unwrap_or_default();
 
-			let output = match executable {
+			let mut output = match executable {
 				ExecutableOrPrecompile::Executable(executable) =>
 					executable.execute(self, entry_point, input_data),
 				ExecutableOrPrecompile::Precompile { instance, .. } =>
@@ -1251,8 +1251,15 @@ where
 						return Err(Error::<T>::BlobTooLarge.into());
 					}
 
+					// Only keep return data for tracing
+					let data = if crate::tracing::if_tracing(|_| {}).is_none() {
+						core::mem::replace(&mut output.data, Default::default())
+					} else {
+						s
+					};
+
 					let mut module = crate::ContractBlob::<T>::from_evm_init_code(
-						output.data.clone(),
+						data,
 						caller.account_id()?.clone(),
 					)?;
 					code_deposit = module.store_code(skip_transfer)?;
diff --git a/substrate/frame/revive/src/tracing.rs b/substrate/frame/revive/src/tracing.rs
index 3be2717c8f45..1641ad1e33e6 100644
--- a/substrate/frame/revive/src/tracing.rs
+++ b/substrate/frame/revive/src/tracing.rs
@@ -36,8 +36,8 @@ pub fn trace<R, F: FnOnce() -> R>(tracer: &mut (dyn Tracing + 'static), f: F) ->
 ///
 /// This is safe to be called from on-chain code as tracing will never be activated
 /// there. Hence the closure is not executed in this case.
-pub(crate) fn if_tracing<F: FnOnce(&mut (dyn Tracing + 'static))>(f: F) {
-	tracer::with(f);
+pub(crate) fn if_tracing<R, F: FnOnce(&mut (dyn Tracing + 'static)) -> R>(f: F) -> Option<R> {
+	tracer::with(f)
 }
 
 /// Defines methods to trace contract interactions.

From 8f8ebcc80bddeba8b7553be48d21bdf6ee806505 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Mon, 25 Aug 2025 14:45:14 +0200
Subject: [PATCH 142/186] fix

---
 substrate/frame/revive/src/exec.rs      |  2 +-
 substrate/frame/revive/src/tests/sol.rs | 67 ++++++++++++++++++++++++-
 2 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index e7d615294be0..97d0fa41707e 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -1255,7 +1255,7 @@ where
 					let data = if crate::tracing::if_tracing(|_| {}).is_none() {
 						core::mem::replace(&mut output.data, Default::default())
 					} else {
-						s
+						output.data.clone()
 					};
 
 					let mut module = crate::ContractBlob::<T>::from_evm_init_code(
diff --git a/substrate/frame/revive/src/tests/sol.rs b/substrate/frame/revive/src/tests/sol.rs
index 476b343afca6..7e7eb8229794 100644
--- a/substrate/frame/revive/src/tests/sol.rs
+++ b/substrate/frame/revive/src/tests/sol.rs
@@ -22,7 +22,7 @@ use crate::{
 		test_utils::{ensure_stored, get_contract_checked},
 		ExtBuilder, Test,
 	},
-	Code, Config,
+	Code, Config, PristineCode,
 };
 use alloy_core::{primitives::U256, sol_types::SolInterface};
 use frame_support::traits::fungible::Mutate;
@@ -51,3 +51,68 @@ fn basic_evm_flow_works() {
 		assert_eq!(U256::from(55u32), U256::from_be_bytes::<32>(result.data.try_into().unwrap()));
 	});
 }
+
+#[test]
+fn basic_evm_flow_tracing_works() {
+	use crate::{
+		evm::{CallTrace, CallTracer, CallType},
+		test_utils::ALICE_ADDR,
+		tracing::trace,
+	};
+	let (code, _) = compile_module_with_type("Fibonacci", FixtureType::Solc).unwrap();
+
+	ExtBuilder::default().build().execute_with(|| {
+		let mut tracer = CallTracer::new(Default::default(), |_| crate::U256::zero());
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+
+		let Contract { addr, .. } = trace(&mut tracer, || {
+			builder::bare_instantiate(Code::Upload(code.clone())).build_and_unwrap_contract()
+		});
+
+		let contract = get_contract_checked(&addr).unwrap();
+		let runtime_code = PristineCode::<Test>::get(contract.code_hash).unwrap();
+
+		assert_eq!(
+			tracer.collect_trace().unwrap(),
+			CallTrace {
+				from: ALICE_ADDR,
+				call_type: CallType::Create2,
+				to: addr,
+				input: code.into(),
+				output: runtime_code.into_inner().into(),
+				value: Some(crate::U256::zero()),
+				..Default::default()
+			}
+		);
+
+		let mut call_tracer = CallTracer::new(Default::default(), |_| crate::U256::zero());
+		let result = trace(&mut call_tracer, || {
+			builder::bare_call(addr)
+				.data(
+					Fibonacci::FibonacciCalls::fib(Fibonacci::fibCall { n: U256::from(10u64) })
+						.abi_encode(),
+				)
+				.build_and_unwrap_result()
+		});
+
+		assert_eq!(
+			U256::from(55u32),
+			U256::from_be_bytes::<32>(result.data.clone().try_into().unwrap())
+		);
+
+		assert_eq!(
+			call_tracer.collect_trace().unwrap(),
+			CallTrace {
+				call_type: CallType::Call,
+				from: ALICE_ADDR,
+				to: addr,
+				input: Fibonacci::FibonacciCalls::fib(Fibonacci::fibCall { n: U256::from(10u64) })
+					.abi_encode()
+					.into(),
+				output: result.data.into(),
+				value: Some(crate::U256::zero()),
+				..Default::default()
+			},
+		);
+	});
+}

From dec08497c9ebe7802b80cad89a1602dce179b927 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Tue, 26 Aug 2025 12:07:08 +0200
Subject: [PATCH 143/186] PR review

---
 substrate/frame/revive/src/call_builder.rs | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/substrate/frame/revive/src/call_builder.rs b/substrate/frame/revive/src/call_builder.rs
index 2bbe087134a5..781ef426342d 100644
--- a/substrate/frame/revive/src/call_builder.rs
+++ b/substrate/frame/revive/src/call_builder.rs
@@ -418,14 +418,8 @@ impl VmBinaryModule {
 
 	// Same as [`Self::sized`] but using EVM bytecode.
 	pub fn evm_sized(size: u32) -> Self {
-		use revm::bytecode::opcode::{JUMPDEST, STOP};
-
-		if size == 0 {
-			return Self::new(vec![])
-		}
-
-		let mut code = vec![STOP];
-		code.extend(vec![JUMPDEST; (size - 1) as usize]);
+		use revm::bytecode::opcode::STOP;
+		let code = vec![STOP; size as usize];
 		Self::new(code)
 	}
 

From dbfc430a039745341061c9706fae48065c05bd16 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Tue, 26 Aug 2025 14:36:28 +0200
Subject: [PATCH 144/186] make pristine unbounded and check PVM & EVM code size

---
 substrate/frame/revive/src/exec.rs       |  6 +----
 substrate/frame/revive/src/lib.rs        |  6 +++--
 substrate/frame/revive/src/limits.rs     | 22 +++++++++----------
 substrate/frame/revive/src/tests/sol.rs  |  2 +-
 substrate/frame/revive/src/vm/evm.rs     | 28 +++++++++++++++++-------
 substrate/frame/revive/src/vm/mod.rs     | 10 ++++-----
 substrate/frame/revive/src/vm/pvm/env.rs | 10 ++++-----
 7 files changed, 47 insertions(+), 37 deletions(-)

diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index 97d0fa41707e..ba3c641bef79 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -1247,10 +1247,6 @@ where
 				// if we are dealing with EVM bytecode
 				// We upload the new runtime code, and update the code
 				if !is_pvm {
-					if output.data.len() > revm::primitives::eip170::MAX_CODE_SIZE {
-						return Err(Error::<T>::BlobTooLarge.into());
-					}
-
 					// Only keep return data for tracing
 					let data = if crate::tracing::if_tracing(|_| {}).is_none() {
 						core::mem::replace(&mut output.data, Default::default())
@@ -1258,7 +1254,7 @@ where
 						output.data.clone()
 					};
 
-					let mut module = crate::ContractBlob::<T>::from_evm_init_code(
+					let mut module = crate::ContractBlob::<T>::from_evm_runtime_code(
 						data,
 						caller.account_id()?.clone(),
 					)?;
diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index 4fbe66531164..183c1f2812ff 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -107,7 +107,6 @@ pub use crate::vm::pvm::SyscallDoc;
 pub type BalanceOf<T> =
 	<<T as Config>::Currency as Inspect<<T as frame_system::Config>::AccountId>>::Balance;
 type TrieId = BoundedVec<u8, ConstU32<128>>;
-type CodeVec = BoundedVec<u8, ConstU32<{ limits::code::BLOB_BYTES }>>;
 type ImmutableData = BoundedVec<u8, ConstU32<{ limits::IMMUTABLE_BYTES }>>;
 pub(crate) type OnChargeTransactionBalanceOf<T> = <<T as pallet_transaction_payment::Config>::OnChargeTransaction as OnChargeTransaction<T>>::Balance;
 
@@ -496,8 +495,11 @@ pub mod pallet {
 	}
 
 	/// A mapping from a contract's code hash to its code.
+	/// The code's size is bounded by [`crate::limits::BLOB_BYTES`] for PVM and
+	/// [`revm::primitives::eip170::MAX_CODE_SIZE`] for EVM bytecode.
 	#[pallet::storage]
-	pub(crate) type PristineCode<T: Config> = StorageMap<_, Identity, H256, CodeVec>;
+	#[pallet::unbounded]
+	pub(crate) type PristineCode<T: Config> = StorageMap<_, Identity, H256, Vec<u8>>;
 
 	/// A mapping from a contract's code hash to its code info.
 	#[pallet::storage]
diff --git a/substrate/frame/revive/src/limits.rs b/substrate/frame/revive/src/limits.rs
index 1a88f73749f1..8fb426446aba 100644
--- a/substrate/frame/revive/src/limits.rs
+++ b/substrate/frame/revive/src/limits.rs
@@ -82,7 +82,7 @@ pub const IMMUTABLE_BYTES: u32 = 4 * 1024;
 /// will not be affected by those limits.
 pub mod code {
 	use super::PAGE_SIZE;
-	use crate::{CodeVec, Config, Error, LOG_TARGET};
+	use crate::{Config, Error, LOG_TARGET};
 	use alloc::vec::Vec;
 	use sp_runtime::DispatchError;
 
@@ -115,25 +115,25 @@ pub mod code {
 
 	/// Make sure that the various program parts are within the defined limits.
 	pub fn enforce<T: Config>(
-		blob: Vec<u8>,
+		pvm_blob: Vec<u8>,
 		available_syscalls: &[&[u8]],
-	) -> Result<CodeVec, DispatchError> {
+	) -> Result<Vec<u8>, DispatchError> {
 		use polkavm::program::ISA64_V1 as ISA;
 		use polkavm_common::program::EstimateInterpreterMemoryUsageArgs;
 
-		let len: u64 = blob.len() as u64;
-		let blob: CodeVec = blob.try_into().map_err(|_| {
-			log::debug!(target: LOG_TARGET, "contract blob too large: {len} limit: {}", BLOB_BYTES);
-			<Error<T>>::BlobTooLarge
-		})?;
+		let len: u64 = pvm_blob.len() as u64;
+		if len > crate::limits::code::BLOB_BYTES.into() {
+			log::debug!(target: LOG_TARGET, "contract blob too large: {len} limit: {BLOB_BYTES}");
+			return Err(<Error<T>>::BlobTooLarge.into())
+		}
 
 		#[cfg(feature = "std")]
 		if std::env::var_os("REVIVE_SKIP_VALIDATION").is_some() {
 			log::warn!(target: LOG_TARGET, "Skipping validation because env var REVIVE_SKIP_VALIDATION is set");
-			return Ok(blob)
+			return Ok(pvm_blob)
 		}
 
-		let program = polkavm::ProgramBlob::parse(blob.as_slice().into()).map_err(|err| {
+		let program = polkavm::ProgramBlob::parse(pvm_blob.as_slice().into()).map_err(|err| {
 			log::debug!(target: LOG_TARGET, "failed to parse polkavm blob: {err:?}");
 			Error::<T>::CodeRejected
 		})?;
@@ -242,7 +242,7 @@ pub mod code {
 			return Err(Error::<T>::StaticMemoryTooLarge.into())
 		}
 
-		Ok(blob)
+		Ok(pvm_blob)
 	}
 }
 
diff --git a/substrate/frame/revive/src/tests/sol.rs b/substrate/frame/revive/src/tests/sol.rs
index 7e7eb8229794..923bef803afb 100644
--- a/substrate/frame/revive/src/tests/sol.rs
+++ b/substrate/frame/revive/src/tests/sol.rs
@@ -79,7 +79,7 @@ fn basic_evm_flow_tracing_works() {
 				call_type: CallType::Create2,
 				to: addr,
 				input: code.into(),
-				output: runtime_code.into_inner().into(),
+				output: runtime_code.into(),
 				value: Some(crate::U256::zero()),
 				..Default::default()
 			}
diff --git a/substrate/frame/revive/src/vm/evm.rs b/substrate/frame/revive/src/vm/evm.rs
index 4de8b2126911..ce5e09292301 100644
--- a/substrate/frame/revive/src/vm/evm.rs
+++ b/substrate/frame/revive/src/vm/evm.rs
@@ -19,8 +19,8 @@ mod instructions;
 
 use crate::{
 	vm::{BytecodeType, ExecResult, Ext},
-	AccountIdOf, BalanceOf, CodeInfo, CodeVec, Config, ContractBlob, DispatchError, Error,
-	ExecReturnValue, H256, LOG_TARGET, U256,
+	AccountIdOf, BalanceOf, CodeInfo, Config, ContractBlob, DispatchError, Error, ExecReturnValue,
+	H256, LOG_TARGET, U256,
 };
 use alloc::vec::Vec;
 use instructions::instruction_table;
@@ -41,16 +41,28 @@ impl<T: Config> ContractBlob<T>
 where
 	BalanceOf<T>: Into<U256> + TryFrom<U256>,
 {
-	/// Create a new contract from EVM code.
+	/// Create a new contract from EVM init code.
 	pub fn from_evm_init_code(code: Vec<u8>, owner: AccountIdOf<T>) -> Result<Self, DispatchError> {
-		use revm::{bytecode::Bytecode, primitives::Bytes};
-
-		let code: CodeVec = code.try_into().map_err(|_| <Error<T>>::BlobTooLarge)?;
-
-		// Also enforce the EIP-3860 limit on initcode size.
 		if code.len() > revm::primitives::eip3860::MAX_INITCODE_SIZE {
 			return Err(<Error<T>>::BlobTooLarge.into());
 		}
+		Self::from_evm_code(code, owner)
+	}
+
+	/// Create a new contract from EVM runtime code.
+	pub fn from_evm_runtime_code(
+		code: Vec<u8>,
+		owner: AccountIdOf<T>,
+	) -> Result<Self, DispatchError> {
+		if code.len() > revm::primitives::eip170::MAX_CODE_SIZE {
+			return Err(<Error<T>>::BlobTooLarge.into());
+		}
+
+		Self::from_evm_code(code, owner)
+	}
+
+	fn from_evm_code(code: Vec<u8>, owner: AccountIdOf<T>) -> Result<Self, DispatchError> {
+		use revm::{bytecode::Bytecode, primitives::Bytes};
 
 		Bytecode::new_raw_checked(Bytes::from(code.to_vec())).map_err(|err| {
 			log::debug!(target: LOG_TARGET, "failed to create evm bytecode from code: {err:?}" );
diff --git a/substrate/frame/revive/src/vm/mod.rs b/substrate/frame/revive/src/vm/mod.rs
index a854f2ebb5a5..f28e8744cd26 100644
--- a/substrate/frame/revive/src/vm/mod.rs
+++ b/substrate/frame/revive/src/vm/mod.rs
@@ -28,8 +28,8 @@ use crate::{
 	exec::{ExecResult, Executable, ExportedFunction, Ext},
 	gas::{GasMeter, Token},
 	weights::WeightInfo,
-	AccountIdOf, BadOrigin, BalanceOf, CodeInfoOf, CodeVec, Config, Error, HoldReason,
-	PristineCode, Weight, LOG_TARGET,
+	AccountIdOf, BadOrigin, BalanceOf, CodeInfoOf, Config, Error, HoldReason, PristineCode, Weight,
+	LOG_TARGET,
 };
 use alloc::vec::Vec;
 use codec::{Decode, Encode, MaxEncodedLen};
@@ -47,7 +47,7 @@ use sp_runtime::DispatchError;
 #[codec(mel_bound())]
 #[scale_info(skip_type_params(T))]
 pub struct ContractBlob<T: Config> {
-	code: CodeVec,
+	code: Vec<u8>,
 	// This isn't needed for contract execution and is not stored alongside it.
 	#[codec(skip)]
 	code_info: CodeInfo<T>,
@@ -201,7 +201,7 @@ where
 					}
 
 					self.code_info.refcount = 0;
-					<PristineCode<T>>::insert(code_hash, &self.code);
+					<PristineCode<T>>::insert(code_hash, &self.code.to_vec());
 					*stored_code_info = Some(self.code_info.clone());
 					Ok(deposit)
 				},
@@ -311,7 +311,7 @@ where
 			use crate::vm::evm::EVMInputs;
 			use revm::bytecode::Bytecode;
 			let inputs = EVMInputs::new(input_data);
-			let bytecode = Bytecode::new_raw(self.code.into_inner().into());
+			let bytecode = Bytecode::new_raw(self.code.into());
 			evm::call(bytecode, ext, inputs)
 		} else {
 			Err(Error::<T>::CodeRejected.into())
diff --git a/substrate/frame/revive/src/vm/pvm/env.rs b/substrate/frame/revive/src/vm/pvm/env.rs
index 74311d6b5ab2..c10758646064 100644
--- a/substrate/frame/revive/src/vm/pvm/env.rs
+++ b/substrate/frame/revive/src/vm/pvm/env.rs
@@ -66,11 +66,11 @@ impl<T: Config> ContractBlob<T> {
 		module_config.set_gas_metering(Some(polkavm::GasMeteringKind::Sync));
 		module_config.set_allow_sbrk(false);
 		module_config.set_aux_data_size(aux_data_size);
-		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:?}");
-			Error::<T>::CodeRejected
-		})?;
+		let module =
+			polkavm::Module::new(&engine, &module_config, self.code.into()).map_err(|err| {
+				log::debug!(target: LOG_TARGET, "failed to create polkavm module: {err:?}");
+				Error::<T>::CodeRejected
+			})?;
 
 		let entry_program_counter = module
 			.exports()

From 87b7b4e217b15ab3482f8cfadb8ed5f5e1dba167 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Tue, 26 Aug 2025 14:55:02 +0200
Subject: [PATCH 145/186] nit

---
 substrate/frame/revive/src/vm/evm.rs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/substrate/frame/revive/src/vm/evm.rs b/substrate/frame/revive/src/vm/evm.rs
index ce5e09292301..5a9717478df5 100644
--- a/substrate/frame/revive/src/vm/evm.rs
+++ b/substrate/frame/revive/src/vm/evm.rs
@@ -19,8 +19,8 @@ mod instructions;
 
 use crate::{
 	vm::{BytecodeType, ExecResult, Ext},
-	AccountIdOf, BalanceOf, CodeInfo, Config, ContractBlob, DispatchError, Error, ExecReturnValue,
-	H256, LOG_TARGET, U256,
+	AccountIdOf, CodeInfo, Config, ContractBlob, DispatchError, Error, ExecReturnValue, H256,
+	LOG_TARGET,
 };
 use alloc::vec::Vec;
 use instructions::instruction_table;
@@ -37,10 +37,7 @@ use revm::{
 	primitives::{self, hardfork::SpecId, Address},
 };
 
-impl<T: Config> ContractBlob<T>
-where
-	BalanceOf<T>: Into<U256> + TryFrom<U256>,
-{
+impl<T: Config> ContractBlob<T> {
 	/// Create a new contract from EVM init code.
 	pub fn from_evm_init_code(code: Vec<u8>, owner: AccountIdOf<T>) -> Result<Self, DispatchError> {
 		if code.len() > revm::primitives::eip3860::MAX_INITCODE_SIZE {

From b769010c0610c12a9d82d14511a3070762eeb60f Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Tue, 26 Aug 2025 16:46:18 +0200
Subject: [PATCH 146/186] refcount = 1 for evm

---
 substrate/frame/revive/src/vm/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/substrate/frame/revive/src/vm/mod.rs b/substrate/frame/revive/src/vm/mod.rs
index f28e8744cd26..62eac2a89a6a 100644
--- a/substrate/frame/revive/src/vm/mod.rs
+++ b/substrate/frame/revive/src/vm/mod.rs
@@ -200,7 +200,7 @@ where
 					})?;
 					}
 
-					self.code_info.refcount = 0;
+					self.code_info.refcount = if self.code_info.is_pvm() { 0 } else { 1 };
 					<PristineCode<T>>::insert(code_hash, &self.code.to_vec());
 					*stored_code_info = Some(self.code_info.clone());
 					Ok(deposit)

From 0abfc742ee77d35818b3f847d4dfc5a272277dbe Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Tue, 26 Aug 2025 17:28:35 +0200
Subject: [PATCH 147/186] fix

---
 substrate/frame/revive/src/tests/sol.rs  |  7 ++++-
 substrate/frame/revive/src/vm/evm.rs     | 38 ++++++++++++++++--------
 substrate/frame/revive/src/vm/mod.rs     | 11 ++++++-
 substrate/frame/revive/src/vm/pvm/env.rs | 11 +++----
 4 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/substrate/frame/revive/src/tests/sol.rs b/substrate/frame/revive/src/tests/sol.rs
index 923bef803afb..258f5d2eb81b 100644
--- a/substrate/frame/revive/src/tests/sol.rs
+++ b/substrate/frame/revive/src/tests/sol.rs
@@ -16,10 +16,11 @@
 // limitations under the License.
 
 use crate::{
+	assert_refcount,
 	test_utils::{builder::Contract, ALICE},
 	tests::{
 		builder,
-		test_utils::{ensure_stored, get_contract_checked},
+		test_utils::{contract_base_deposit, ensure_stored, get_contract_checked},
 		ExtBuilder, Test,
 	},
 	Code, Config, PristineCode,
@@ -42,6 +43,10 @@ fn basic_evm_flow_works() {
 		let contract = get_contract_checked(&addr).unwrap();
 		ensure_stored(contract.code_hash);
 
+		let deposit = contract_base_deposit(&addr);
+		assert_eq!(contract.total_deposit(), deposit);
+		assert_refcount!(contract.code_hash, 1);
+
 		let result = builder::bare_call(addr)
 			.data(
 				Fibonacci::FibonacciCalls::fib(Fibonacci::fibCall { n: U256::from(10u64) })
diff --git a/substrate/frame/revive/src/vm/evm.rs b/substrate/frame/revive/src/vm/evm.rs
index 5a9717478df5..9a0ec50e924c 100644
--- a/substrate/frame/revive/src/vm/evm.rs
+++ b/substrate/frame/revive/src/vm/evm.rs
@@ -43,7 +43,18 @@ impl<T: Config> ContractBlob<T> {
 		if code.len() > revm::primitives::eip3860::MAX_INITCODE_SIZE {
 			return Err(<Error<T>>::BlobTooLarge.into());
 		}
-		Self::from_evm_code(code, owner)
+
+		let code_len = code.len() as u32;
+		let code_info = CodeInfo {
+			owner,
+			deposit: Default::default(),
+			refcount: 0,
+			code_len,
+			code_type: BytecodeType::Evm,
+			behaviour_version: Default::default(),
+		};
+
+		Self::from_evm_code(code, code_info)
 	}
 
 	/// Create a new contract from EVM runtime code.
@@ -55,10 +66,22 @@ impl<T: Config> ContractBlob<T> {
 			return Err(<Error<T>>::BlobTooLarge.into());
 		}
 
-		Self::from_evm_code(code, owner)
+		let code_len = code.len() as u32;
+		let deposit = super::calculate_code_deposit::<T>(code_len);
+
+		let code_info = CodeInfo {
+			owner,
+			deposit,
+			refcount: 1,
+			code_len,
+			code_type: BytecodeType::Evm,
+			behaviour_version: Default::default(),
+		};
+
+		Self::from_evm_code(code, code_info)
 	}
 
-	fn from_evm_code(code: Vec<u8>, owner: AccountIdOf<T>) -> Result<Self, DispatchError> {
+	fn from_evm_code(code: Vec<u8>, code_info: CodeInfo<T>) -> Result<Self, DispatchError> {
 		use revm::{bytecode::Bytecode, primitives::Bytes};
 
 		Bytecode::new_raw_checked(Bytes::from(code.to_vec())).map_err(|err| {
@@ -66,15 +89,6 @@ impl<T: Config> ContractBlob<T> {
 			<Error<T>>::CodeRejected
 		})?;
 
-		let code_len = code.len() as u32;
-		let code_info = CodeInfo {
-			owner,
-			deposit: Default::default(),
-			refcount: 0,
-			code_len,
-			code_type: BytecodeType::Evm,
-			behaviour_version: Default::default(),
-		};
 		let code_hash = H256(sp_io::hashing::keccak_256(&code));
 		Ok(ContractBlob { code, code_info, code_hash })
 	}
diff --git a/substrate/frame/revive/src/vm/mod.rs b/substrate/frame/revive/src/vm/mod.rs
index 62eac2a89a6a..475be58f1687 100644
--- a/substrate/frame/revive/src/vm/mod.rs
+++ b/substrate/frame/revive/src/vm/mod.rs
@@ -27,6 +27,7 @@ pub use runtime_costs::RuntimeCosts;
 use crate::{
 	exec::{ExecResult, Executable, ExportedFunction, Ext},
 	gas::{GasMeter, Token},
+	storage::meter::Diff,
 	weights::WeightInfo,
 	AccountIdOf, BadOrigin, BalanceOf, CodeInfoOf, Config, Error, HoldReason, PristineCode, Weight,
 	LOG_TARGET,
@@ -99,6 +100,15 @@ pub struct CodeInfo<T: Config> {
 	behaviour_version: u32,
 }
 
+/// Calculate the deposit required for storing code and its metadata.
+pub fn calculate_code_deposit<T: Config>(code_len: u32) -> BalanceOf<T> {
+	let bytes_added = code_len.saturating_add(<CodeInfo<T>>::max_encoded_len() as u32);
+	let deposit = Diff { bytes_added, items_added: 2, ..Default::default() }
+		.update_contract::<T>(None)
+		.charge_or_zero();
+	deposit
+}
+
 impl ExportedFunction {
 	/// The vm export name for the function.
 	fn identifier(&self) -> &str {
@@ -200,7 +210,6 @@ where
 					})?;
 					}
 
-					self.code_info.refcount = if self.code_info.is_pvm() { 0 } else { 1 };
 					<PristineCode<T>>::insert(code_hash, &self.code.to_vec());
 					*stored_code_info = Some(self.code_info.clone());
 					Ok(deposit)
diff --git a/substrate/frame/revive/src/vm/pvm/env.rs b/substrate/frame/revive/src/vm/pvm/env.rs
index c10758646064..83a11921c534 100644
--- a/substrate/frame/revive/src/vm/pvm/env.rs
+++ b/substrate/frame/revive/src/vm/pvm/env.rs
@@ -22,12 +22,11 @@ use crate::{
 	exec::Ext,
 	limits,
 	primitives::ExecReturnValue,
-	storage::meter::Diff,
-	vm::{BytecodeType, ExportedFunction, RuntimeCosts},
+	vm::{calculate_code_deposit, BytecodeType, ExportedFunction, RuntimeCosts},
 	AccountIdOf, BalanceOf, CodeInfo, Config, ContractBlob, Error, Weight, SENTINEL,
 };
 use alloc::vec::Vec;
-use codec::{Encode, MaxEncodedLen};
+use codec::Encode;
 use core::mem;
 use frame_support::traits::Get;
 use pallet_revive_proc_macro::define_env;
@@ -112,10 +111,8 @@ where
 		let code = limits::code::enforce::<T>(code, available_syscalls)?;
 
 		let code_len = code.len() as u32;
-		let bytes_added = code_len.saturating_add(<CodeInfo<T>>::max_encoded_len() as u32);
-		let deposit = Diff { bytes_added, items_added: 2, ..Default::default() }
-			.update_contract::<T>(None)
-			.charge_or_zero();
+		let deposit = calculate_code_deposit::<T>(code_len);
+
 		let code_info = CodeInfo {
 			owner,
 			deposit,

From 6060eb418c588d83c9dabfa9ff0f08741fb2713f Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Tue, 26 Aug 2025 17:32:08 +0200
Subject: [PATCH 148/186] fix

---
 substrate/frame/revive/src/tests/sol.rs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/substrate/frame/revive/src/tests/sol.rs b/substrate/frame/revive/src/tests/sol.rs
index 258f5d2eb81b..309c440f7bd1 100644
--- a/substrate/frame/revive/src/tests/sol.rs
+++ b/substrate/frame/revive/src/tests/sol.rs
@@ -20,7 +20,7 @@ use crate::{
 	test_utils::{builder::Contract, ALICE},
 	tests::{
 		builder,
-		test_utils::{contract_base_deposit, ensure_stored, get_contract_checked},
+		test_utils::{contract_base_deposit, ensure_stored, get_contract},
 		ExtBuilder, Test,
 	},
 	Code, Config, PristineCode,
@@ -40,9 +40,8 @@ fn basic_evm_flow_works() {
 			builder::bare_instantiate(Code::Upload(code.clone())).build_and_unwrap_contract();
 
 		// check the code exists
-		let contract = get_contract_checked(&addr).unwrap();
+		let contract = get_contract(&addr);
 		ensure_stored(contract.code_hash);
-
 		let deposit = contract_base_deposit(&addr);
 		assert_eq!(contract.total_deposit(), deposit);
 		assert_refcount!(contract.code_hash, 1);
@@ -74,7 +73,7 @@ fn basic_evm_flow_tracing_works() {
 			builder::bare_instantiate(Code::Upload(code.clone())).build_and_unwrap_contract()
 		});
 
-		let contract = get_contract_checked(&addr).unwrap();
+		let contract = get_contract(&addr);
 		let runtime_code = PristineCode::<Test>::get(contract.code_hash).unwrap();
 
 		assert_eq!(

From 2007fb5ec2d66c554b3ca58eb330e2c3b25aa556 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Tue, 26 Aug 2025 17:36:53 +0200
Subject: [PATCH 149/186] add one more assert

---
 substrate/frame/revive/src/tests/sol.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/substrate/frame/revive/src/tests/sol.rs b/substrate/frame/revive/src/tests/sol.rs
index 309c440f7bd1..aed1cc52c7e0 100644
--- a/substrate/frame/revive/src/tests/sol.rs
+++ b/substrate/frame/revive/src/tests/sol.rs
@@ -32,7 +32,7 @@ use pretty_assertions::assert_eq;
 
 #[test]
 fn basic_evm_flow_works() {
-	let (code, _) = compile_module_with_type("Fibonacci", FixtureType::Solc).unwrap();
+	let (code, init_hash) = compile_module_with_type("Fibonacci", FixtureType::Solc).unwrap();
 
 	ExtBuilder::default().build().execute_with(|| {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
@@ -46,6 +46,9 @@ fn basic_evm_flow_works() {
 		assert_eq!(contract.total_deposit(), deposit);
 		assert_refcount!(contract.code_hash, 1);
 
+		// init code is not stored
+		assert!(!PristineCode::<Test>::contains_key(init_hash));
+
 		let result = builder::bare_call(addr)
 			.data(
 				Fibonacci::FibonacciCalls::fib(Fibonacci::fibCall { n: U256::from(10u64) })

From f219e06cfbe0493e7139bee743e6d5891ae1b9ee Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Tue, 26 Aug 2025 17:46:17 +0200
Subject: [PATCH 150/186] nit

---
 substrate/frame/revive/src/vm/evm.rs     | 4 +---
 substrate/frame/revive/src/vm/mod.rs     | 5 ++---
 substrate/frame/revive/src/vm/pvm/env.rs | 4 +---
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/substrate/frame/revive/src/vm/evm.rs b/substrate/frame/revive/src/vm/evm.rs
index 9a0ec50e924c..ad87f84ac5c7 100644
--- a/substrate/frame/revive/src/vm/evm.rs
+++ b/substrate/frame/revive/src/vm/evm.rs
@@ -67,11 +67,9 @@ impl<T: Config> ContractBlob<T> {
 		}
 
 		let code_len = code.len() as u32;
-		let deposit = super::calculate_code_deposit::<T>(code_len);
-
 		let code_info = CodeInfo {
 			owner,
-			deposit,
+			deposit: super::calculate_code_deposit::<T>(code_len),
 			refcount: 1,
 			code_len,
 			code_type: BytecodeType::Evm,
diff --git a/substrate/frame/revive/src/vm/mod.rs b/substrate/frame/revive/src/vm/mod.rs
index 475be58f1687..ec3ae517584d 100644
--- a/substrate/frame/revive/src/vm/mod.rs
+++ b/substrate/frame/revive/src/vm/mod.rs
@@ -103,10 +103,9 @@ pub struct CodeInfo<T: Config> {
 /// Calculate the deposit required for storing code and its metadata.
 pub fn calculate_code_deposit<T: Config>(code_len: u32) -> BalanceOf<T> {
 	let bytes_added = code_len.saturating_add(<CodeInfo<T>>::max_encoded_len() as u32);
-	let deposit = Diff { bytes_added, items_added: 2, ..Default::default() }
+	Diff { bytes_added, items_added: 2, ..Default::default() }
 		.update_contract::<T>(None)
-		.charge_or_zero();
-	deposit
+		.charge_or_zero()
 }
 
 impl ExportedFunction {
diff --git a/substrate/frame/revive/src/vm/pvm/env.rs b/substrate/frame/revive/src/vm/pvm/env.rs
index 83a11921c534..dbfe4cd5d763 100644
--- a/substrate/frame/revive/src/vm/pvm/env.rs
+++ b/substrate/frame/revive/src/vm/pvm/env.rs
@@ -111,11 +111,9 @@ where
 		let code = limits::code::enforce::<T>(code, available_syscalls)?;
 
 		let code_len = code.len() as u32;
-		let deposit = calculate_code_deposit::<T>(code_len);
-
 		let code_info = CodeInfo {
 			owner,
-			deposit,
+			deposit: calculate_code_deposit::<T>(code_len),
 			refcount: 0,
 			code_len,
 			code_type: BytecodeType::Pvm,

From 33e92163ef78cf741ac623107d790ac4eae55f47 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Tue, 26 Aug 2025 23:32:09 +0200
Subject: [PATCH 151/186] Remove refcount and owner for EVM CodeInfo

---
 substrate/frame/revive/src/exec.rs          |   7 +-
 substrate/frame/revive/src/lib.rs           |   9 +-
 substrate/frame/revive/src/migrations/v2.rs |  62 +++----
 substrate/frame/revive/src/tests/sol.rs     |   2 -
 substrate/frame/revive/src/vm/evm.rs        |  29 ++--
 substrate/frame/revive/src/vm/mod.rs        | 169 ++++++++++----------
 substrate/frame/revive/src/vm/pvm/env.rs    |  54 ++++++-
 7 files changed, 184 insertions(+), 148 deletions(-)

diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index ba3c641bef79..798bf6c97cc4 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -1254,11 +1254,8 @@ where
 						output.data.clone()
 					};
 
-					let mut module = crate::ContractBlob::<T>::from_evm_runtime_code(
-						data,
-						caller.account_id()?.clone(),
-					)?;
-					code_deposit = module.store_code(skip_transfer)?;
+					let mut module = crate::ContractBlob::<T>::from_evm_runtime_code(data)?;
+					code_deposit = module.store_code(caller.account_id()?, skip_transfer)?;
 					contract_info.code_hash = *module.code_hash();
 				}
 
diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index 183c1f2812ff..23a080dbc08f 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -953,7 +953,7 @@ pub mod pallet {
 			code_hash: sp_core::H256,
 		) -> DispatchResultWithPostInfo {
 			let origin = ensure_signed(origin)?;
-			<ContractBlob<T>>::remove(&origin, code_hash)?;
+			<ContractBlob<T>>::remove_pvm_code(&origin, code_hash)?;
 			// we waive the fee because removing unused code is beneficial
 			Ok(Pays::No.into())
 		}
@@ -1155,8 +1155,7 @@ where
 				},
 				Code::Upload(code) =>
 					if T::AllowEVMBytecode::get() {
-						let origin = T::UploadOrigin::ensure_origin(origin)?;
-						let executable = ContractBlob::from_evm_init_code(code, origin)?;
+						let executable = ContractBlob::from_evm_init_code(code)?;
 						(executable, Default::default())
 					} else {
 						return Err(<Error<T>>::CodeRejected.into())
@@ -1544,8 +1543,8 @@ where
 		storage_deposit_limit: BalanceOf<T>,
 		skip_transfer: bool,
 	) -> Result<(ContractBlob<T>, BalanceOf<T>), DispatchError> {
-		let mut module = ContractBlob::from_pvm_code(code, origin)?;
-		let deposit = module.store_code(skip_transfer)?;
+		let mut module = ContractBlob::from_pvm_code(code, origin.clone())?;
+		let deposit = module.store_code(&origin, skip_transfer)?;
 		ensure!(storage_deposit_limit >= deposit, <Error<T>>::StorageDepositLimitExhausted);
 		Ok((module, deposit))
 	}
diff --git a/substrate/frame/revive/src/migrations/v2.rs b/substrate/frame/revive/src/migrations/v2.rs
index c5e3974c7270..a0b020b89f8e 100644
--- a/substrate/frame/revive/src/migrations/v2.rs
+++ b/substrate/frame/revive/src/migrations/v2.rs
@@ -23,7 +23,7 @@
 extern crate alloc;
 
 use super::PALLET_MIGRATIONS_ID;
-use crate::{vm::BytecodeType, weights::WeightInfo, Config, H256};
+use crate::{weights::WeightInfo, Config, H256};
 use frame_support::{
 	migrations::{MigrationId, SteppedMigration, SteppedMigrationError},
 	pallet_prelude::PhantomData,
@@ -60,20 +60,27 @@ mod old {
 }
 
 mod new {
-	use super::{BytecodeType, Config};
+	use super::Config;
 	use crate::{pallet::Pallet, AccountIdOf, BalanceOf, H256};
 	use codec::{Decode, Encode};
-	use frame_support::{storage_alias, DebugNoBound, Identity};
+	use frame_support::{storage_alias, Identity, RuntimeDebugNoBound};
+
+	#[derive(RuntimeDebugNoBound, Clone, Encode, Decode, PartialEq, Eq)]
+	pub enum BytecodeInfo<T: Config> {
+		Pvm {
+			owner: AccountIdOf<T>,
+			#[codec(compact)]
+			refcount: u64,
+		},
+		Evm,
+	}
 
-	#[derive(PartialEq, Eq, DebugNoBound, Encode, Decode)]
+	#[derive(RuntimeDebugNoBound, PartialEq, Eq, Encode, Decode)]
 	pub struct CodeInfo<T: Config> {
-		pub owner: AccountIdOf<T>,
 		#[codec(compact)]
 		pub deposit: BalanceOf<T>,
-		#[codec(compact)]
-		pub refcount: u64,
 		pub code_len: u32,
-		pub code_type: BytecodeType,
+		pub bytecode_info: BytecodeInfo<T>,
 		pub behaviour_version: u32,
 	}
 
@@ -118,11 +125,12 @@ impl<T: Config> SteppedMigration for Migration<T> {
 				new::CodeInfoOf::<T>::insert(
 					last_key,
 					new::CodeInfo {
-						owner: value.owner,
 						deposit: value.deposit,
-						refcount: value.refcount,
 						code_len: value.code_len,
-						code_type: BytecodeType::Pvm,
+						bytecode_info: new::BytecodeInfo::Pvm {
+							owner: value.owner,
+							refcount: value.refcount,
+						},
 						behaviour_version: value.behaviour_version,
 					},
 				);
@@ -163,19 +171,16 @@ impl<T: Config> SteppedMigration for Migration<T> {
 				.expect("Failed to get the value after the migration");
 
 			let expected = new::CodeInfo {
-				owner: value.owner,
 				deposit: value.deposit,
-				refcount: value.refcount,
 				code_len: value.code_len,
-				code_type: BytecodeType::Pvm,
+				bytecode_info: new::BytecodeInfo::Pvm {
+					owner: value.owner,
+					refcount: value.refcount,
+				},
 				behaviour_version: value.behaviour_version,
 			};
 
-			assert_eq!(
-				new_value, expected,
-				"Migration failed: CodeInfo mismatch for key {:?}",
-				key
-			);
+			assert_eq!(new_value, expected, "Migration failed: CodeInfo mismatch for key {key:?}");
 		}
 
 		Ok(())
@@ -205,18 +210,19 @@ impl<T: Config> Migration<T> {
 		let migrated =
 			new::CodeInfoOf::<T>::get(code_hash).expect("Failed to get migrated CodeInfo");
 
-		assert_eq!(
-			migrated,
-			new::CodeInfo {
+		let expected = new::CodeInfo {
+			deposit: old_code_info.deposit,
+			code_len: old_code_info.code_len,
+			bytecode_info: new::BytecodeInfo::Pvm {
 				owner: old_code_info.owner.clone(),
-				deposit: old_code_info.deposit,
 				refcount: old_code_info.refcount,
-				code_len: old_code_info.code_len,
-				behaviour_version: old_code_info.behaviour_version,
-				code_type: BytecodeType::Pvm,
 			},
-			"Migration failed: deposit mismatch for key {code_hash:?}",
-		);
+			behaviour_version: old_code_info.behaviour_version,
+		};
+
+		if migrated != expected {
+			panic!("Migration failed: deposit mismatch for key {code_hash:?}",);
+		}
 	}
 }
 
diff --git a/substrate/frame/revive/src/tests/sol.rs b/substrate/frame/revive/src/tests/sol.rs
index aed1cc52c7e0..bcb439200001 100644
--- a/substrate/frame/revive/src/tests/sol.rs
+++ b/substrate/frame/revive/src/tests/sol.rs
@@ -16,7 +16,6 @@
 // limitations under the License.
 
 use crate::{
-	assert_refcount,
 	test_utils::{builder::Contract, ALICE},
 	tests::{
 		builder,
@@ -44,7 +43,6 @@ fn basic_evm_flow_works() {
 		ensure_stored(contract.code_hash);
 		let deposit = contract_base_deposit(&addr);
 		assert_eq!(contract.total_deposit(), deposit);
-		assert_refcount!(contract.code_hash, 1);
 
 		// init code is not stored
 		assert!(!PristineCode::<Test>::contains_key(init_hash));
diff --git a/substrate/frame/revive/src/vm/evm.rs b/substrate/frame/revive/src/vm/evm.rs
index ad87f84ac5c7..50301edc2963 100644
--- a/substrate/frame/revive/src/vm/evm.rs
+++ b/substrate/frame/revive/src/vm/evm.rs
@@ -18,11 +18,12 @@
 mod instructions;
 
 use crate::{
-	vm::{BytecodeType, ExecResult, Ext},
-	AccountIdOf, CodeInfo, Config, ContractBlob, DispatchError, Error, ExecReturnValue, H256,
-	LOG_TARGET,
+	storage::meter::Diff,
+	vm::{BytecodeInfo, ExecResult, Ext},
+	CodeInfo, Config, ContractBlob, DispatchError, Error, ExecReturnValue, H256, LOG_TARGET,
 };
 use alloc::vec::Vec;
+use codec::MaxEncodedLen;
 use instructions::instruction_table;
 use pallet_revive_uapi::ReturnFlags;
 use revm::{
@@ -39,18 +40,16 @@ use revm::{
 
 impl<T: Config> ContractBlob<T> {
 	/// Create a new contract from EVM init code.
-	pub fn from_evm_init_code(code: Vec<u8>, owner: AccountIdOf<T>) -> Result<Self, DispatchError> {
+	pub fn from_evm_init_code(code: Vec<u8>) -> Result<Self, DispatchError> {
 		if code.len() > revm::primitives::eip3860::MAX_INITCODE_SIZE {
 			return Err(<Error<T>>::BlobTooLarge.into());
 		}
 
 		let code_len = code.len() as u32;
 		let code_info = CodeInfo {
-			owner,
 			deposit: Default::default(),
-			refcount: 0,
 			code_len,
-			code_type: BytecodeType::Evm,
+			bytecode_info: BytecodeInfo::Evm,
 			behaviour_version: Default::default(),
 		};
 
@@ -58,21 +57,21 @@ impl<T: Config> ContractBlob<T> {
 	}
 
 	/// Create a new contract from EVM runtime code.
-	pub fn from_evm_runtime_code(
-		code: Vec<u8>,
-		owner: AccountIdOf<T>,
-	) -> Result<Self, DispatchError> {
+	pub fn from_evm_runtime_code(code: Vec<u8>) -> Result<Self, DispatchError> {
 		if code.len() > revm::primitives::eip170::MAX_CODE_SIZE {
 			return Err(<Error<T>>::BlobTooLarge.into());
 		}
 
 		let code_len = code.len() as u32;
+		let bytes_added = code_len.saturating_add(<CodeInfo<T>>::max_encoded_len() as u32);
+		let deposit = Diff { bytes_added, items_added: 2, ..Default::default() }
+			.update_contract::<T>(None)
+			.charge_or_zero();
+
 		let code_info = CodeInfo {
-			owner,
-			deposit: super::calculate_code_deposit::<T>(code_len),
-			refcount: 1,
+			deposit,
 			code_len,
-			code_type: BytecodeType::Evm,
+			bytecode_info: BytecodeInfo::Evm,
 			behaviour_version: Default::default(),
 		};
 
diff --git a/substrate/frame/revive/src/vm/mod.rs b/substrate/frame/revive/src/vm/mod.rs
index ec3ae517584d..519a842726b7 100644
--- a/substrate/frame/revive/src/vm/mod.rs
+++ b/substrate/frame/revive/src/vm/mod.rs
@@ -27,18 +27,13 @@ pub use runtime_costs::RuntimeCosts;
 use crate::{
 	exec::{ExecResult, Executable, ExportedFunction, Ext},
 	gas::{GasMeter, Token},
-	storage::meter::Diff,
 	weights::WeightInfo,
-	AccountIdOf, BadOrigin, BalanceOf, CodeInfoOf, Config, Error, HoldReason, PristineCode, Weight,
+	AccountIdOf, BalanceOf, CodeInfoOf, Config, Error, HoldReason, PristineCode, Weight,
 	LOG_TARGET,
 };
 use alloc::vec::Vec;
 use codec::{Decode, Encode, MaxEncodedLen};
-use frame_support::{
-	dispatch::DispatchResult,
-	ensure,
-	traits::{fungible::MutateHold, tokens::Precision::BestEffort},
-};
+use frame_support::{dispatch::DispatchResult, traits::fungible::MutateHold};
 use sp_core::{Get, H256, U256};
 use sp_runtime::DispatchError;
 
@@ -57,39 +52,37 @@ pub struct ContractBlob<T: Config> {
 	code_hash: H256,
 }
 
-#[derive(
-	PartialEq, Eq, Debug, Copy, Clone, Encode, Decode, MaxEncodedLen, scale_info::TypeInfo,
-)]
-pub enum BytecodeType {
-	/// The code is a PVM bytecode.
-	Pvm,
-	/// The code is an EVM bytecode.
+/// Bytecode information including type-specific ownership data
+#[derive(Clone, Encode, Decode, Debug, PartialEq, Eq, scale_info::TypeInfo, MaxEncodedLen)]
+#[codec(mel_bound())]
+#[scale_info(skip_type_params(T))]
+pub enum BytecodeInfo<T: Config> {
+	/// PVM bytecode with ownership and refcount tracking
+	Pvm {
+		/// The account that has uploaded the contract code and hence is allowed to remove it.
+		owner: AccountIdOf<T>,
+		/// The number of instantiated contracts that use this as their code.
+		#[codec(compact)]
+		refcount: u64,
+	},
+	/// EVM bytecode
 	Evm,
 }
 
-/// Contract code related data, such as:
-///
-/// - owner of the contract, i.e. account uploaded its code,
-/// - storage deposit amount,
-/// - reference count,
+/// Contract code related data.
 ///
 /// It is stored in a separate storage entry to avoid loading the code when not necessary.
 #[derive(Clone, Encode, Decode, scale_info::TypeInfo, MaxEncodedLen)]
 #[codec(mel_bound())]
 #[scale_info(skip_type_params(T))]
 pub struct CodeInfo<T: Config> {
-	/// The account that has uploaded the contract code and hence is allowed to remove it.
-	owner: AccountIdOf<T>,
 	/// The amount of balance that was deposited by the owner in order to store it on-chain.
 	#[codec(compact)]
 	deposit: BalanceOf<T>,
-	/// The number of instantiated contracts that use this as their code.
-	#[codec(compact)]
-	refcount: u64,
 	/// Length of the code in bytes.
 	code_len: u32,
-	/// Bytecode type
-	code_type: BytecodeType,
+	/// Bytecode information (type + ownership data for PVM)
+	bytecode_info: BytecodeInfo<T>,
 	/// The behaviour version that this contract operates under.
 	///
 	/// Whenever any observeable change (with the exception of weights) are made we need
@@ -100,14 +93,6 @@ pub struct CodeInfo<T: Config> {
 	behaviour_version: u32,
 }
 
-/// Calculate the deposit required for storing code and its metadata.
-pub fn calculate_code_deposit<T: Config>(code_len: u32) -> BalanceOf<T> {
-	let bytes_added = code_len.saturating_add(<CodeInfo<T>>::max_encoded_len() as u32);
-	Diff { bytes_added, items_added: 2, ..Default::default() }
-		.update_contract::<T>(None)
-		.charge_or_zero()
-}
-
 impl ExportedFunction {
 	/// The vm export name for the function.
 	fn identifier(&self) -> &str {
@@ -118,6 +103,14 @@ impl ExportedFunction {
 	}
 }
 
+/// The bytecode type, either PVM or EVM
+#[cfg_attr(test, derive(Debug, PartialEq, Eq))]
+#[derive(Clone, Copy)]
+pub enum BytecodeType {
+	Pvm,
+	Evm,
+}
+
 /// Cost of code loading from storage.
 #[cfg_attr(test, derive(Debug, PartialEq, Eq))]
 #[derive(Clone, Copy)]
@@ -128,7 +121,11 @@ struct CodeLoadToken {
 
 impl CodeLoadToken {
 	fn from_code_info<T: Config>(code_info: &CodeInfo<T>) -> Self {
-		Self { code_len: code_info.code_len, code_type: code_info.code_type }
+		let code_type = match &code_info.bytecode_info {
+			BytecodeInfo::Pvm { .. } => BytecodeType::Pvm,
+			BytecodeInfo::Evm => BytecodeType::Evm,
+		};
+		Self { code_len: code_info.code_len, code_type }
 	}
 }
 
@@ -160,32 +157,12 @@ impl<T: Config> ContractBlob<T>
 where
 	BalanceOf<T>: Into<U256> + TryFrom<U256>,
 {
-	/// Remove the code from storage and refund the deposit to its owner.
-	///
-	/// Applies all necessary checks before removing the code.
-	pub fn remove(origin: &T::AccountId, code_hash: H256) -> DispatchResult {
-		<CodeInfoOf<T>>::try_mutate_exists(&code_hash, |existing| {
-			if let Some(code_info) = existing {
-				ensure!(code_info.refcount == 0, <Error<T>>::CodeInUse);
-				ensure!(&code_info.owner == origin, BadOrigin);
-				let _ = T::Currency::release(
-					&HoldReason::CodeUploadDepositReserve.into(),
-					&code_info.owner,
-					code_info.deposit,
-					BestEffort,
-				);
-
-				*existing = None;
-				<PristineCode<T>>::remove(&code_hash);
-				Ok(())
-			} else {
-				Err(<Error<T>>::CodeNotFound.into())
-			}
-		})
-	}
-
 	/// Puts the module blob into storage, and returns the deposit collected for the storage.
-	pub fn store_code(&mut self, skip_transfer: bool) -> Result<BalanceOf<T>, Error<T>> {
+	pub fn store_code(
+		&mut self,
+		owner: &AccountIdOf<T>,
+		skip_transfer: bool,
+	) -> Result<BalanceOf<T>, Error<T>> {
 		let code_hash = *self.code_hash();
 		<CodeInfoOf<T>>::mutate(code_hash, |stored_code_info| {
 			match stored_code_info {
@@ -200,13 +177,13 @@ where
 
 					if !skip_transfer {
 						T::Currency::hold(
-						&HoldReason::CodeUploadDepositReserve.into(),
-						&self.code_info.owner,
-						deposit,
-					) .map_err(|err| {
-							log::debug!(target: LOG_TARGET, "failed to hold store code deposit {deposit:?} for owner: {:?}: {err:?}", self.code_info.owner);
+							&HoldReason::CodeUploadDepositReserve.into(),
+							owner,
+							deposit,
+						).map_err(|err| {
+							log::debug!(target: LOG_TARGET, "failed to hold store code deposit {deposit:?} for owner: {:?}: {err:?}", owner);
 							<Error<T>>::StorageDepositNotEnoughFunds
-					})?;
+						})?;
 					}
 
 					<PristineCode<T>>::insert(code_hash, &self.code.to_vec());
@@ -222,19 +199,20 @@ impl<T: Config> CodeInfo<T> {
 	#[cfg(test)]
 	pub fn new(owner: T::AccountId) -> Self {
 		CodeInfo {
-			owner,
 			deposit: Default::default(),
-			refcount: 0,
 			code_len: 0,
-			code_type: BytecodeType::Pvm,
+			bytecode_info: BytecodeInfo::Pvm { owner, refcount: 0 },
 			behaviour_version: Default::default(),
 		}
 	}
 
-	/// Returns reference count of the module.
+	/// Returns reference count of the module (only for PVM).
 	#[cfg(test)]
 	pub fn refcount(&self) -> u64 {
-		self.refcount
+		match &self.bytecode_info {
+			BytecodeInfo::Pvm { refcount, .. } => *refcount,
+			BytecodeInfo::Evm => 0,
+		}
 	}
 
 	/// Returns the deposit of the module.
@@ -242,6 +220,14 @@ impl<T: Config> CodeInfo<T> {
 		self.deposit
 	}
 
+	/// Returns the owner of the module (only for PVM).
+	pub fn owner(&self) -> Option<&AccountIdOf<T>> {
+		match &self.bytecode_info {
+			BytecodeInfo::Pvm { owner, .. } => Some(owner),
+			BytecodeInfo::Evm => None,
+		}
+	}
+
 	/// Returns the code length.
 	pub fn code_len(&self) -> u64 {
 		self.code_len.into()
@@ -249,11 +235,10 @@ impl<T: Config> CodeInfo<T> {
 
 	/// Returns true if the executable is a PVM blob.
 	pub fn is_pvm(&self) -> bool {
-		matches!(self.code_type, BytecodeType::Pvm)
+		matches!(self.bytecode_info, BytecodeInfo::Pvm { .. })
 	}
 
-	/// Returns the number of times the specified contract exists on the call stack. Delegated calls
-	/// Increment the reference count of a stored code by one.
+	/// Increment the reference count of a stored code by one (PVM only).
 	///
 	/// # Errors
 	///
@@ -262,18 +247,25 @@ impl<T: Config> CodeInfo<T> {
 	pub fn increment_refcount(code_hash: H256) -> DispatchResult {
 		<CodeInfoOf<T>>::mutate(code_hash, |existing| -> Result<(), DispatchError> {
 			if let Some(info) = existing {
-				info.refcount = info
-					.refcount
-					.checked_add(1)
-					.ok_or_else(|| <Error<T>>::RefcountOverOrUnderflow)?;
-				Ok(())
+				match &mut info.bytecode_info {
+					BytecodeInfo::Pvm { refcount, .. } => {
+						*refcount = refcount
+							.checked_add(1)
+							.ok_or_else(|| <Error<T>>::RefcountOverOrUnderflow)?;
+						Ok(())
+					},
+					BytecodeInfo::Evm => {
+						// EVM contracts don't use refcounting, so this is a no-op
+						Ok(())
+					},
+				}
 			} else {
 				Err(Error::<T>::CodeNotFound.into())
 			}
 		})
 	}
 
-	/// Decrement the reference count of a stored code by one.
+	/// Decrement the reference count of a stored code by one (PVM only).
 	///
 	/// # Note
 	///
@@ -282,11 +274,18 @@ impl<T: Config> CodeInfo<T> {
 	pub fn decrement_refcount(code_hash: H256) -> DispatchResult {
 		<CodeInfoOf<T>>::mutate(code_hash, |existing| {
 			if let Some(info) = existing {
-				info.refcount = info
-					.refcount
-					.checked_sub(1)
-					.ok_or_else(|| <Error<T>>::RefcountOverOrUnderflow)?;
-				Ok(())
+				match &mut info.bytecode_info {
+					BytecodeInfo::Pvm { refcount, .. } => {
+						*refcount = refcount
+							.checked_sub(1)
+							.ok_or_else(|| <Error<T>>::RefcountOverOrUnderflow)?;
+						Ok(())
+					},
+					BytecodeInfo::Evm => {
+						// EVM contracts don't use refcounting, so this is a no-op
+						Ok(())
+					},
+				}
 			} else {
 				Err(Error::<T>::CodeNotFound.into())
 			}
diff --git a/substrate/frame/revive/src/vm/pvm/env.rs b/substrate/frame/revive/src/vm/pvm/env.rs
index dbfe4cd5d763..44e50c83bc44 100644
--- a/substrate/frame/revive/src/vm/pvm/env.rs
+++ b/substrate/frame/revive/src/vm/pvm/env.rs
@@ -22,13 +22,19 @@ use crate::{
 	exec::Ext,
 	limits,
 	primitives::ExecReturnValue,
-	vm::{calculate_code_deposit, BytecodeType, ExportedFunction, RuntimeCosts},
-	AccountIdOf, BalanceOf, CodeInfo, Config, ContractBlob, Error, Weight, SENTINEL,
+	storage::meter::Diff,
+	vm::{BytecodeInfo, ExportedFunction, RuntimeCosts},
+	AccountIdOf, BadOrigin, BalanceOf, CodeInfo, CodeInfoOf, Config, ContractBlob, Error,
+	HoldReason, PristineCode, Weight, SENTINEL,
 };
 use alloc::vec::Vec;
-use codec::Encode;
+use codec::{Encode, MaxEncodedLen};
 use core::mem;
-use frame_support::traits::Get;
+use frame_support::{
+	dispatch::DispatchResult,
+	ensure,
+	traits::{fungible::MutateHold, tokens::Precision::BestEffort, Get},
+};
 use pallet_revive_proc_macro::define_env;
 use pallet_revive_uapi::{CallFlags, ReturnErrorCode, ReturnFlags};
 use sp_core::{H160, H256, U256};
@@ -103,6 +109,35 @@ impl<T: Config> ContractBlob<T>
 where
 	BalanceOf<T>: Into<U256> + TryFrom<U256>,
 {
+	/// Remove PVM code from storage and refund the deposit to its owner.
+	///
+	/// Applies all necessary checks before removing the code.
+	pub fn remove_pvm_code(origin: &T::AccountId, code_hash: H256) -> DispatchResult {
+		<CodeInfoOf<T>>::try_mutate_exists(&code_hash, |existing| {
+			if let Some(code_info) = existing {
+				match &code_info.bytecode_info {
+					BytecodeInfo::Pvm { owner, refcount } => {
+						ensure!(*refcount == 0, <Error<T>>::CodeInUse);
+						ensure!(owner == origin, BadOrigin);
+						let _ = T::Currency::release(
+							&HoldReason::CodeUploadDepositReserve.into(),
+							owner,
+							code_info.deposit,
+							BestEffort,
+						);
+
+						*existing = None;
+						<PristineCode<T>>::remove(&code_hash);
+						Ok(())
+					},
+					BytecodeInfo::Evm => Err(<Error<T>>::CodeInUse.into()),
+				}
+			} else {
+				Err(<Error<T>>::CodeNotFound.into())
+			}
+		})
+	}
+
 	/// We only check for size and nothing else when the code is uploaded.
 	pub fn from_pvm_code(code: Vec<u8>, owner: AccountIdOf<T>) -> Result<Self, DispatchError> {
 		// We do validation only when new code is deployed. This allows us to increase
@@ -111,12 +146,15 @@ where
 		let code = limits::code::enforce::<T>(code, available_syscalls)?;
 
 		let code_len = code.len() as u32;
+		let bytes_added = code_len.saturating_add(<CodeInfo<T>>::max_encoded_len() as u32);
+		let deposit = Diff { bytes_added, items_added: 2, ..Default::default() }
+			.update_contract::<T>(None)
+			.charge_or_zero();
+
 		let code_info = CodeInfo {
-			owner,
-			deposit: calculate_code_deposit::<T>(code_len),
-			refcount: 0,
+			deposit,
 			code_len,
-			code_type: BytecodeType::Pvm,
+			bytecode_info: BytecodeInfo::Pvm { owner, refcount: 0 },
 			behaviour_version: Default::default(),
 		};
 		let code_hash = H256(sp_io::hashing::keccak_256(&code));

From f75403a243c46107731d0e8b4245b9aed7a3af47 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Tue, 26 Aug 2025 23:56:26 +0200
Subject: [PATCH 152/186] rm unused

---
 substrate/frame/revive/src/vm/mod.rs | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/substrate/frame/revive/src/vm/mod.rs b/substrate/frame/revive/src/vm/mod.rs
index 519a842726b7..6ea3bc119fe0 100644
--- a/substrate/frame/revive/src/vm/mod.rs
+++ b/substrate/frame/revive/src/vm/mod.rs
@@ -220,14 +220,6 @@ impl<T: Config> CodeInfo<T> {
 		self.deposit
 	}
 
-	/// Returns the owner of the module (only for PVM).
-	pub fn owner(&self) -> Option<&AccountIdOf<T>> {
-		match &self.bytecode_info {
-			BytecodeInfo::Pvm { owner, .. } => Some(owner),
-			BytecodeInfo::Evm => None,
-		}
-	}
-
 	/// Returns the code length.
 	pub fn code_len(&self) -> u64 {
 		self.code_len.into()

From d26d8ac08ee26fe974d42ad7aa804fc7989f7365 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Wed, 27 Aug 2025 00:53:27 +0200
Subject: [PATCH 153/186] origin should be held not caller

---
 substrate/frame/revive/src/exec.rs   | 5 +++--
 substrate/frame/revive/src/vm/mod.rs | 9 ++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index 798bf6c97cc4..906c68fa803f 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -1127,6 +1127,7 @@ where
 
 		let do_transaction = || -> ExecResult {
 			let caller = self.caller();
+			let origin = self.origin.clone();
 			let skip_transfer = self.skip_transfer;
 			let frame = top_frame_mut!(self);
 			let account_id = &frame.account_id.clone();
@@ -1143,7 +1144,7 @@ where
 			if entry_point == ExportedFunction::Constructor {
 				// Root origin can't be used to instantiate a contract, so it is safe to assume that
 				// if we reached this point the origin has an associated account.
-				let origin = &self.origin.account_id()?;
+				let origin = &origin.account_id()?;
 
 				let ed = <Contracts<T>>::min_balance();
 				frame.nested_storage.record_charge(&StorageDeposit::Charge(ed))?;
@@ -1255,7 +1256,7 @@ where
 					};
 
 					let mut module = crate::ContractBlob::<T>::from_evm_runtime_code(data)?;
-					code_deposit = module.store_code(caller.account_id()?, skip_transfer)?;
+					code_deposit = module.store_code(origin.account_id()?, skip_transfer)?;
 					contract_info.code_hash = *module.code_hash();
 				}
 
diff --git a/substrate/frame/revive/src/vm/mod.rs b/substrate/frame/revive/src/vm/mod.rs
index 6ea3bc119fe0..b233a8706ba7 100644
--- a/substrate/frame/revive/src/vm/mod.rs
+++ b/substrate/frame/revive/src/vm/mod.rs
@@ -160,7 +160,7 @@ where
 	/// Puts the module blob into storage, and returns the deposit collected for the storage.
 	pub fn store_code(
 		&mut self,
-		owner: &AccountIdOf<T>,
+		origin: &AccountIdOf<T>,
 		skip_transfer: bool,
 	) -> Result<BalanceOf<T>, Error<T>> {
 		let code_hash = *self.code_hash();
@@ -170,18 +170,17 @@ where
 				Some(_) => Ok(Default::default()),
 				// Upload a new contract code.
 				// We need to store the code and its code_info, and collect the deposit.
-				// This `None` case happens only with freshly uploaded modules. This means that
-				// the `owner` is always the origin of the current transaction.
+				// This `None` case happens only with freshly uploaded modules.
 				None => {
 					let deposit = self.code_info.deposit;
 
 					if !skip_transfer {
 						T::Currency::hold(
 							&HoldReason::CodeUploadDepositReserve.into(),
-							owner,
+							origin,
 							deposit,
 						).map_err(|err| {
-							log::debug!(target: LOG_TARGET, "failed to hold store code deposit {deposit:?} for owner: {:?}: {err:?}", owner);
+							log::debug!(target: LOG_TARGET, "failed to hold store code deposit {deposit:?} for origin: {origin:?}: {err:?}");
 							<Error<T>>::StorageDepositNotEnoughFunds
 						})?;
 					}

From e405e186bd75aa6f23cf9902b5358f11a0863d23 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Wed, 27 Aug 2025 14:51:26 +0200
Subject: [PATCH 154/186] rollback refcount removals

---
 substrate/frame/revive/src/exec.rs          |  12 +-
 substrate/frame/revive/src/lib.rs           |   9 +-
 substrate/frame/revive/src/migrations/v2.rs |  62 ++++----
 substrate/frame/revive/src/tests/sol.rs     |  14 +-
 substrate/frame/revive/src/vm/evm.rs        |  27 ++--
 substrate/frame/revive/src/vm/mod.rs        | 165 +++++++++++---------
 substrate/frame/revive/src/vm/pvm/env.rs    |  52 +-----
 7 files changed, 164 insertions(+), 177 deletions(-)

diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index 906c68fa803f..460f1800f360 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -1127,7 +1127,6 @@ where
 
 		let do_transaction = || -> ExecResult {
 			let caller = self.caller();
-			let origin = self.origin.clone();
 			let skip_transfer = self.skip_transfer;
 			let frame = top_frame_mut!(self);
 			let account_id = &frame.account_id.clone();
@@ -1144,7 +1143,7 @@ where
 			if entry_point == ExportedFunction::Constructor {
 				// Root origin can't be used to instantiate a contract, so it is safe to assume that
 				// if we reached this point the origin has an associated account.
-				let origin = &origin.account_id()?;
+				let origin = &self.origin.account_id()?;
 
 				let ed = <Contracts<T>>::min_balance();
 				frame.nested_storage.record_charge(&StorageDeposit::Charge(ed))?;
@@ -1255,9 +1254,14 @@ where
 						output.data.clone()
 					};
 
-					let mut module = crate::ContractBlob::<T>::from_evm_runtime_code(data)?;
-					code_deposit = module.store_code(origin.account_id()?, skip_transfer)?;
+					let mut module = crate::ContractBlob::<T>::from_evm_runtime_code(
+						data,
+						caller.account_id()?.clone(),
+					)?;
+					code_deposit = module.store_code(skip_transfer)?;
 					contract_info.code_hash = *module.code_hash();
+
+					<CodeInfo<T>>::increment_refcount(contract_info.code_hash)?;
 				}
 
 				let deposit = contract_info.update_base_deposit(code_deposit);
diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index 23a080dbc08f..183c1f2812ff 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -953,7 +953,7 @@ pub mod pallet {
 			code_hash: sp_core::H256,
 		) -> DispatchResultWithPostInfo {
 			let origin = ensure_signed(origin)?;
-			<ContractBlob<T>>::remove_pvm_code(&origin, code_hash)?;
+			<ContractBlob<T>>::remove(&origin, code_hash)?;
 			// we waive the fee because removing unused code is beneficial
 			Ok(Pays::No.into())
 		}
@@ -1155,7 +1155,8 @@ where
 				},
 				Code::Upload(code) =>
 					if T::AllowEVMBytecode::get() {
-						let executable = ContractBlob::from_evm_init_code(code)?;
+						let origin = T::UploadOrigin::ensure_origin(origin)?;
+						let executable = ContractBlob::from_evm_init_code(code, origin)?;
 						(executable, Default::default())
 					} else {
 						return Err(<Error<T>>::CodeRejected.into())
@@ -1543,8 +1544,8 @@ where
 		storage_deposit_limit: BalanceOf<T>,
 		skip_transfer: bool,
 	) -> Result<(ContractBlob<T>, BalanceOf<T>), DispatchError> {
-		let mut module = ContractBlob::from_pvm_code(code, origin.clone())?;
-		let deposit = module.store_code(&origin, skip_transfer)?;
+		let mut module = ContractBlob::from_pvm_code(code, origin)?;
+		let deposit = module.store_code(skip_transfer)?;
 		ensure!(storage_deposit_limit >= deposit, <Error<T>>::StorageDepositLimitExhausted);
 		Ok((module, deposit))
 	}
diff --git a/substrate/frame/revive/src/migrations/v2.rs b/substrate/frame/revive/src/migrations/v2.rs
index a0b020b89f8e..c5e3974c7270 100644
--- a/substrate/frame/revive/src/migrations/v2.rs
+++ b/substrate/frame/revive/src/migrations/v2.rs
@@ -23,7 +23,7 @@
 extern crate alloc;
 
 use super::PALLET_MIGRATIONS_ID;
-use crate::{weights::WeightInfo, Config, H256};
+use crate::{vm::BytecodeType, weights::WeightInfo, Config, H256};
 use frame_support::{
 	migrations::{MigrationId, SteppedMigration, SteppedMigrationError},
 	pallet_prelude::PhantomData,
@@ -60,27 +60,20 @@ mod old {
 }
 
 mod new {
-	use super::Config;
+	use super::{BytecodeType, Config};
 	use crate::{pallet::Pallet, AccountIdOf, BalanceOf, H256};
 	use codec::{Decode, Encode};
-	use frame_support::{storage_alias, Identity, RuntimeDebugNoBound};
-
-	#[derive(RuntimeDebugNoBound, Clone, Encode, Decode, PartialEq, Eq)]
-	pub enum BytecodeInfo<T: Config> {
-		Pvm {
-			owner: AccountIdOf<T>,
-			#[codec(compact)]
-			refcount: u64,
-		},
-		Evm,
-	}
+	use frame_support::{storage_alias, DebugNoBound, Identity};
 
-	#[derive(RuntimeDebugNoBound, PartialEq, Eq, Encode, Decode)]
+	#[derive(PartialEq, Eq, DebugNoBound, Encode, Decode)]
 	pub struct CodeInfo<T: Config> {
+		pub owner: AccountIdOf<T>,
 		#[codec(compact)]
 		pub deposit: BalanceOf<T>,
+		#[codec(compact)]
+		pub refcount: u64,
 		pub code_len: u32,
-		pub bytecode_info: BytecodeInfo<T>,
+		pub code_type: BytecodeType,
 		pub behaviour_version: u32,
 	}
 
@@ -125,12 +118,11 @@ impl<T: Config> SteppedMigration for Migration<T> {
 				new::CodeInfoOf::<T>::insert(
 					last_key,
 					new::CodeInfo {
+						owner: value.owner,
 						deposit: value.deposit,
+						refcount: value.refcount,
 						code_len: value.code_len,
-						bytecode_info: new::BytecodeInfo::Pvm {
-							owner: value.owner,
-							refcount: value.refcount,
-						},
+						code_type: BytecodeType::Pvm,
 						behaviour_version: value.behaviour_version,
 					},
 				);
@@ -171,16 +163,19 @@ impl<T: Config> SteppedMigration for Migration<T> {
 				.expect("Failed to get the value after the migration");
 
 			let expected = new::CodeInfo {
+				owner: value.owner,
 				deposit: value.deposit,
+				refcount: value.refcount,
 				code_len: value.code_len,
-				bytecode_info: new::BytecodeInfo::Pvm {
-					owner: value.owner,
-					refcount: value.refcount,
-				},
+				code_type: BytecodeType::Pvm,
 				behaviour_version: value.behaviour_version,
 			};
 
-			assert_eq!(new_value, expected, "Migration failed: CodeInfo mismatch for key {key:?}");
+			assert_eq!(
+				new_value, expected,
+				"Migration failed: CodeInfo mismatch for key {:?}",
+				key
+			);
 		}
 
 		Ok(())
@@ -210,19 +205,18 @@ impl<T: Config> Migration<T> {
 		let migrated =
 			new::CodeInfoOf::<T>::get(code_hash).expect("Failed to get migrated CodeInfo");
 
-		let expected = new::CodeInfo {
-			deposit: old_code_info.deposit,
-			code_len: old_code_info.code_len,
-			bytecode_info: new::BytecodeInfo::Pvm {
+		assert_eq!(
+			migrated,
+			new::CodeInfo {
 				owner: old_code_info.owner.clone(),
+				deposit: old_code_info.deposit,
 				refcount: old_code_info.refcount,
+				code_len: old_code_info.code_len,
+				behaviour_version: old_code_info.behaviour_version,
+				code_type: BytecodeType::Pvm,
 			},
-			behaviour_version: old_code_info.behaviour_version,
-		};
-
-		if migrated != expected {
-			panic!("Migration failed: deposit mismatch for key {code_hash:?}",);
-		}
+			"Migration failed: deposit mismatch for key {code_hash:?}",
+		);
 	}
 }
 
diff --git a/substrate/frame/revive/src/tests/sol.rs b/substrate/frame/revive/src/tests/sol.rs
index bcb439200001..d5065c3e5e1f 100644
--- a/substrate/frame/revive/src/tests/sol.rs
+++ b/substrate/frame/revive/src/tests/sol.rs
@@ -16,6 +16,7 @@
 // limitations under the License.
 
 use crate::{
+	assert_refcount,
 	test_utils::{builder::Contract, ALICE},
 	tests::{
 		builder,
@@ -35,14 +36,16 @@ fn basic_evm_flow_works() {
 
 	ExtBuilder::default().build().execute_with(|| {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-		let Contract { addr, .. } =
-			builder::bare_instantiate(Code::Upload(code.clone())).build_and_unwrap_contract();
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code.clone()))
+			.salt(Some([1; 32]))
+			.build_and_unwrap_contract();
 
 		// check the code exists
 		let contract = get_contract(&addr);
 		ensure_stored(contract.code_hash);
 		let deposit = contract_base_deposit(&addr);
 		assert_eq!(contract.total_deposit(), deposit);
+		assert_refcount!(contract.code_hash, 1);
 
 		// init code is not stored
 		assert!(!PristineCode::<Test>::contains_key(init_hash));
@@ -54,6 +57,13 @@ fn basic_evm_flow_works() {
 			)
 			.build_and_unwrap_result();
 		assert_eq!(U256::from(55u32), U256::from_be_bytes::<32>(result.data.try_into().unwrap()));
+
+		// Instantiate again
+		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code.clone()))
+			.salt(Some([2; 32]))
+			.build_and_unwrap_contract();
+		let contract = get_contract(&addr);
+		assert_refcount!(contract.code_hash, 2);
 	});
 }
 
diff --git a/substrate/frame/revive/src/vm/evm.rs b/substrate/frame/revive/src/vm/evm.rs
index 50301edc2963..6cb109a35c93 100644
--- a/substrate/frame/revive/src/vm/evm.rs
+++ b/substrate/frame/revive/src/vm/evm.rs
@@ -18,12 +18,11 @@
 mod instructions;
 
 use crate::{
-	storage::meter::Diff,
-	vm::{BytecodeInfo, ExecResult, Ext},
-	CodeInfo, Config, ContractBlob, DispatchError, Error, ExecReturnValue, H256, LOG_TARGET,
+	vm::{BytecodeType, ExecResult, Ext},
+	AccountIdOf, CodeInfo, Config, ContractBlob, DispatchError, Error, ExecReturnValue, H256,
+	LOG_TARGET,
 };
 use alloc::vec::Vec;
-use codec::MaxEncodedLen;
 use instructions::instruction_table;
 use pallet_revive_uapi::ReturnFlags;
 use revm::{
@@ -40,16 +39,18 @@ use revm::{
 
 impl<T: Config> ContractBlob<T> {
 	/// Create a new contract from EVM init code.
-	pub fn from_evm_init_code(code: Vec<u8>) -> Result<Self, DispatchError> {
+	pub fn from_evm_init_code(code: Vec<u8>, owner: AccountIdOf<T>) -> Result<Self, DispatchError> {
 		if code.len() > revm::primitives::eip3860::MAX_INITCODE_SIZE {
 			return Err(<Error<T>>::BlobTooLarge.into());
 		}
 
 		let code_len = code.len() as u32;
 		let code_info = CodeInfo {
+			owner,
 			deposit: Default::default(),
+			refcount: 0,
 			code_len,
-			bytecode_info: BytecodeInfo::Evm,
+			code_type: BytecodeType::Evm,
 			behaviour_version: Default::default(),
 		};
 
@@ -57,21 +58,23 @@ impl<T: Config> ContractBlob<T> {
 	}
 
 	/// Create a new contract from EVM runtime code.
-	pub fn from_evm_runtime_code(code: Vec<u8>) -> Result<Self, DispatchError> {
+	pub fn from_evm_runtime_code(
+		code: Vec<u8>,
+		owner: AccountIdOf<T>,
+	) -> Result<Self, DispatchError> {
 		if code.len() > revm::primitives::eip170::MAX_CODE_SIZE {
 			return Err(<Error<T>>::BlobTooLarge.into());
 		}
 
 		let code_len = code.len() as u32;
-		let bytes_added = code_len.saturating_add(<CodeInfo<T>>::max_encoded_len() as u32);
-		let deposit = Diff { bytes_added, items_added: 2, ..Default::default() }
-			.update_contract::<T>(None)
-			.charge_or_zero();
+		let deposit = super::calculate_code_deposit::<T>(code_len);
 
 		let code_info = CodeInfo {
+			owner,
 			deposit,
+			refcount: 0,
 			code_len,
-			bytecode_info: BytecodeInfo::Evm,
+			code_type: BytecodeType::Evm,
 			behaviour_version: Default::default(),
 		};
 
diff --git a/substrate/frame/revive/src/vm/mod.rs b/substrate/frame/revive/src/vm/mod.rs
index b233a8706ba7..475be58f1687 100644
--- a/substrate/frame/revive/src/vm/mod.rs
+++ b/substrate/frame/revive/src/vm/mod.rs
@@ -27,13 +27,18 @@ pub use runtime_costs::RuntimeCosts;
 use crate::{
 	exec::{ExecResult, Executable, ExportedFunction, Ext},
 	gas::{GasMeter, Token},
+	storage::meter::Diff,
 	weights::WeightInfo,
-	AccountIdOf, BalanceOf, CodeInfoOf, Config, Error, HoldReason, PristineCode, Weight,
+	AccountIdOf, BadOrigin, BalanceOf, CodeInfoOf, Config, Error, HoldReason, PristineCode, Weight,
 	LOG_TARGET,
 };
 use alloc::vec::Vec;
 use codec::{Decode, Encode, MaxEncodedLen};
-use frame_support::{dispatch::DispatchResult, traits::fungible::MutateHold};
+use frame_support::{
+	dispatch::DispatchResult,
+	ensure,
+	traits::{fungible::MutateHold, tokens::Precision::BestEffort},
+};
 use sp_core::{Get, H256, U256};
 use sp_runtime::DispatchError;
 
@@ -52,37 +57,39 @@ pub struct ContractBlob<T: Config> {
 	code_hash: H256,
 }
 
-/// Bytecode information including type-specific ownership data
-#[derive(Clone, Encode, Decode, Debug, PartialEq, Eq, scale_info::TypeInfo, MaxEncodedLen)]
-#[codec(mel_bound())]
-#[scale_info(skip_type_params(T))]
-pub enum BytecodeInfo<T: Config> {
-	/// PVM bytecode with ownership and refcount tracking
-	Pvm {
-		/// The account that has uploaded the contract code and hence is allowed to remove it.
-		owner: AccountIdOf<T>,
-		/// The number of instantiated contracts that use this as their code.
-		#[codec(compact)]
-		refcount: u64,
-	},
-	/// EVM bytecode
+#[derive(
+	PartialEq, Eq, Debug, Copy, Clone, Encode, Decode, MaxEncodedLen, scale_info::TypeInfo,
+)]
+pub enum BytecodeType {
+	/// The code is a PVM bytecode.
+	Pvm,
+	/// The code is an EVM bytecode.
 	Evm,
 }
 
-/// Contract code related data.
+/// Contract code related data, such as:
+///
+/// - owner of the contract, i.e. account uploaded its code,
+/// - storage deposit amount,
+/// - reference count,
 ///
 /// It is stored in a separate storage entry to avoid loading the code when not necessary.
 #[derive(Clone, Encode, Decode, scale_info::TypeInfo, MaxEncodedLen)]
 #[codec(mel_bound())]
 #[scale_info(skip_type_params(T))]
 pub struct CodeInfo<T: Config> {
+	/// The account that has uploaded the contract code and hence is allowed to remove it.
+	owner: AccountIdOf<T>,
 	/// The amount of balance that was deposited by the owner in order to store it on-chain.
 	#[codec(compact)]
 	deposit: BalanceOf<T>,
+	/// The number of instantiated contracts that use this as their code.
+	#[codec(compact)]
+	refcount: u64,
 	/// Length of the code in bytes.
 	code_len: u32,
-	/// Bytecode information (type + ownership data for PVM)
-	bytecode_info: BytecodeInfo<T>,
+	/// Bytecode type
+	code_type: BytecodeType,
 	/// The behaviour version that this contract operates under.
 	///
 	/// Whenever any observeable change (with the exception of weights) are made we need
@@ -93,6 +100,15 @@ pub struct CodeInfo<T: Config> {
 	behaviour_version: u32,
 }
 
+/// Calculate the deposit required for storing code and its metadata.
+pub fn calculate_code_deposit<T: Config>(code_len: u32) -> BalanceOf<T> {
+	let bytes_added = code_len.saturating_add(<CodeInfo<T>>::max_encoded_len() as u32);
+	let deposit = Diff { bytes_added, items_added: 2, ..Default::default() }
+		.update_contract::<T>(None)
+		.charge_or_zero();
+	deposit
+}
+
 impl ExportedFunction {
 	/// The vm export name for the function.
 	fn identifier(&self) -> &str {
@@ -103,14 +119,6 @@ impl ExportedFunction {
 	}
 }
 
-/// The bytecode type, either PVM or EVM
-#[cfg_attr(test, derive(Debug, PartialEq, Eq))]
-#[derive(Clone, Copy)]
-pub enum BytecodeType {
-	Pvm,
-	Evm,
-}
-
 /// Cost of code loading from storage.
 #[cfg_attr(test, derive(Debug, PartialEq, Eq))]
 #[derive(Clone, Copy)]
@@ -121,11 +129,7 @@ struct CodeLoadToken {
 
 impl CodeLoadToken {
 	fn from_code_info<T: Config>(code_info: &CodeInfo<T>) -> Self {
-		let code_type = match &code_info.bytecode_info {
-			BytecodeInfo::Pvm { .. } => BytecodeType::Pvm,
-			BytecodeInfo::Evm => BytecodeType::Evm,
-		};
-		Self { code_len: code_info.code_len, code_type }
+		Self { code_len: code_info.code_len, code_type: code_info.code_type }
 	}
 }
 
@@ -157,12 +161,32 @@ impl<T: Config> ContractBlob<T>
 where
 	BalanceOf<T>: Into<U256> + TryFrom<U256>,
 {
+	/// Remove the code from storage and refund the deposit to its owner.
+	///
+	/// Applies all necessary checks before removing the code.
+	pub fn remove(origin: &T::AccountId, code_hash: H256) -> DispatchResult {
+		<CodeInfoOf<T>>::try_mutate_exists(&code_hash, |existing| {
+			if let Some(code_info) = existing {
+				ensure!(code_info.refcount == 0, <Error<T>>::CodeInUse);
+				ensure!(&code_info.owner == origin, BadOrigin);
+				let _ = T::Currency::release(
+					&HoldReason::CodeUploadDepositReserve.into(),
+					&code_info.owner,
+					code_info.deposit,
+					BestEffort,
+				);
+
+				*existing = None;
+				<PristineCode<T>>::remove(&code_hash);
+				Ok(())
+			} else {
+				Err(<Error<T>>::CodeNotFound.into())
+			}
+		})
+	}
+
 	/// Puts the module blob into storage, and returns the deposit collected for the storage.
-	pub fn store_code(
-		&mut self,
-		origin: &AccountIdOf<T>,
-		skip_transfer: bool,
-	) -> Result<BalanceOf<T>, Error<T>> {
+	pub fn store_code(&mut self, skip_transfer: bool) -> Result<BalanceOf<T>, Error<T>> {
 		let code_hash = *self.code_hash();
 		<CodeInfoOf<T>>::mutate(code_hash, |stored_code_info| {
 			match stored_code_info {
@@ -170,19 +194,20 @@ where
 				Some(_) => Ok(Default::default()),
 				// Upload a new contract code.
 				// We need to store the code and its code_info, and collect the deposit.
-				// This `None` case happens only with freshly uploaded modules.
+				// This `None` case happens only with freshly uploaded modules. This means that
+				// the `owner` is always the origin of the current transaction.
 				None => {
 					let deposit = self.code_info.deposit;
 
 					if !skip_transfer {
 						T::Currency::hold(
-							&HoldReason::CodeUploadDepositReserve.into(),
-							origin,
-							deposit,
-						).map_err(|err| {
-							log::debug!(target: LOG_TARGET, "failed to hold store code deposit {deposit:?} for origin: {origin:?}: {err:?}");
+						&HoldReason::CodeUploadDepositReserve.into(),
+						&self.code_info.owner,
+						deposit,
+					) .map_err(|err| {
+							log::debug!(target: LOG_TARGET, "failed to hold store code deposit {deposit:?} for owner: {:?}: {err:?}", self.code_info.owner);
 							<Error<T>>::StorageDepositNotEnoughFunds
-						})?;
+					})?;
 					}
 
 					<PristineCode<T>>::insert(code_hash, &self.code.to_vec());
@@ -198,20 +223,19 @@ impl<T: Config> CodeInfo<T> {
 	#[cfg(test)]
 	pub fn new(owner: T::AccountId) -> Self {
 		CodeInfo {
+			owner,
 			deposit: Default::default(),
+			refcount: 0,
 			code_len: 0,
-			bytecode_info: BytecodeInfo::Pvm { owner, refcount: 0 },
+			code_type: BytecodeType::Pvm,
 			behaviour_version: Default::default(),
 		}
 	}
 
-	/// Returns reference count of the module (only for PVM).
+	/// Returns reference count of the module.
 	#[cfg(test)]
 	pub fn refcount(&self) -> u64 {
-		match &self.bytecode_info {
-			BytecodeInfo::Pvm { refcount, .. } => *refcount,
-			BytecodeInfo::Evm => 0,
-		}
+		self.refcount
 	}
 
 	/// Returns the deposit of the module.
@@ -226,10 +250,11 @@ impl<T: Config> CodeInfo<T> {
 
 	/// Returns true if the executable is a PVM blob.
 	pub fn is_pvm(&self) -> bool {
-		matches!(self.bytecode_info, BytecodeInfo::Pvm { .. })
+		matches!(self.code_type, BytecodeType::Pvm)
 	}
 
-	/// Increment the reference count of a stored code by one (PVM only).
+	/// Returns the number of times the specified contract exists on the call stack. Delegated calls
+	/// Increment the reference count of a stored code by one.
 	///
 	/// # Errors
 	///
@@ -238,25 +263,18 @@ impl<T: Config> CodeInfo<T> {
 	pub fn increment_refcount(code_hash: H256) -> DispatchResult {
 		<CodeInfoOf<T>>::mutate(code_hash, |existing| -> Result<(), DispatchError> {
 			if let Some(info) = existing {
-				match &mut info.bytecode_info {
-					BytecodeInfo::Pvm { refcount, .. } => {
-						*refcount = refcount
-							.checked_add(1)
-							.ok_or_else(|| <Error<T>>::RefcountOverOrUnderflow)?;
-						Ok(())
-					},
-					BytecodeInfo::Evm => {
-						// EVM contracts don't use refcounting, so this is a no-op
-						Ok(())
-					},
-				}
+				info.refcount = info
+					.refcount
+					.checked_add(1)
+					.ok_or_else(|| <Error<T>>::RefcountOverOrUnderflow)?;
+				Ok(())
 			} else {
 				Err(Error::<T>::CodeNotFound.into())
 			}
 		})
 	}
 
-	/// Decrement the reference count of a stored code by one (PVM only).
+	/// Decrement the reference count of a stored code by one.
 	///
 	/// # Note
 	///
@@ -265,18 +283,11 @@ impl<T: Config> CodeInfo<T> {
 	pub fn decrement_refcount(code_hash: H256) -> DispatchResult {
 		<CodeInfoOf<T>>::mutate(code_hash, |existing| {
 			if let Some(info) = existing {
-				match &mut info.bytecode_info {
-					BytecodeInfo::Pvm { refcount, .. } => {
-						*refcount = refcount
-							.checked_sub(1)
-							.ok_or_else(|| <Error<T>>::RefcountOverOrUnderflow)?;
-						Ok(())
-					},
-					BytecodeInfo::Evm => {
-						// EVM contracts don't use refcounting, so this is a no-op
-						Ok(())
-					},
-				}
+				info.refcount = info
+					.refcount
+					.checked_sub(1)
+					.ok_or_else(|| <Error<T>>::RefcountOverOrUnderflow)?;
+				Ok(())
 			} else {
 				Err(Error::<T>::CodeNotFound.into())
 			}
diff --git a/substrate/frame/revive/src/vm/pvm/env.rs b/substrate/frame/revive/src/vm/pvm/env.rs
index 44e50c83bc44..83a11921c534 100644
--- a/substrate/frame/revive/src/vm/pvm/env.rs
+++ b/substrate/frame/revive/src/vm/pvm/env.rs
@@ -22,19 +22,13 @@ use crate::{
 	exec::Ext,
 	limits,
 	primitives::ExecReturnValue,
-	storage::meter::Diff,
-	vm::{BytecodeInfo, ExportedFunction, RuntimeCosts},
-	AccountIdOf, BadOrigin, BalanceOf, CodeInfo, CodeInfoOf, Config, ContractBlob, Error,
-	HoldReason, PristineCode, Weight, SENTINEL,
+	vm::{calculate_code_deposit, BytecodeType, ExportedFunction, RuntimeCosts},
+	AccountIdOf, BalanceOf, CodeInfo, Config, ContractBlob, Error, Weight, SENTINEL,
 };
 use alloc::vec::Vec;
-use codec::{Encode, MaxEncodedLen};
+use codec::Encode;
 use core::mem;
-use frame_support::{
-	dispatch::DispatchResult,
-	ensure,
-	traits::{fungible::MutateHold, tokens::Precision::BestEffort, Get},
-};
+use frame_support::traits::Get;
 use pallet_revive_proc_macro::define_env;
 use pallet_revive_uapi::{CallFlags, ReturnErrorCode, ReturnFlags};
 use sp_core::{H160, H256, U256};
@@ -109,35 +103,6 @@ impl<T: Config> ContractBlob<T>
 where
 	BalanceOf<T>: Into<U256> + TryFrom<U256>,
 {
-	/// Remove PVM code from storage and refund the deposit to its owner.
-	///
-	/// Applies all necessary checks before removing the code.
-	pub fn remove_pvm_code(origin: &T::AccountId, code_hash: H256) -> DispatchResult {
-		<CodeInfoOf<T>>::try_mutate_exists(&code_hash, |existing| {
-			if let Some(code_info) = existing {
-				match &code_info.bytecode_info {
-					BytecodeInfo::Pvm { owner, refcount } => {
-						ensure!(*refcount == 0, <Error<T>>::CodeInUse);
-						ensure!(owner == origin, BadOrigin);
-						let _ = T::Currency::release(
-							&HoldReason::CodeUploadDepositReserve.into(),
-							owner,
-							code_info.deposit,
-							BestEffort,
-						);
-
-						*existing = None;
-						<PristineCode<T>>::remove(&code_hash);
-						Ok(())
-					},
-					BytecodeInfo::Evm => Err(<Error<T>>::CodeInUse.into()),
-				}
-			} else {
-				Err(<Error<T>>::CodeNotFound.into())
-			}
-		})
-	}
-
 	/// We only check for size and nothing else when the code is uploaded.
 	pub fn from_pvm_code(code: Vec<u8>, owner: AccountIdOf<T>) -> Result<Self, DispatchError> {
 		// We do validation only when new code is deployed. This allows us to increase
@@ -146,15 +111,14 @@ where
 		let code = limits::code::enforce::<T>(code, available_syscalls)?;
 
 		let code_len = code.len() as u32;
-		let bytes_added = code_len.saturating_add(<CodeInfo<T>>::max_encoded_len() as u32);
-		let deposit = Diff { bytes_added, items_added: 2, ..Default::default() }
-			.update_contract::<T>(None)
-			.charge_or_zero();
+		let deposit = calculate_code_deposit::<T>(code_len);
 
 		let code_info = CodeInfo {
+			owner,
 			deposit,
+			refcount: 0,
 			code_len,
-			bytecode_info: BytecodeInfo::Pvm { owner, refcount: 0 },
+			code_type: BytecodeType::Pvm,
 			behaviour_version: Default::default(),
 		};
 		let code_hash = H256(sp_io::hashing::keccak_256(&code));

From 8b1669f21a7dd9e3fed27f497fb6af66b9786038 Mon Sep 17 00:00:00 2001
From: PG Herveou <pgherveou@gmail.com>
Date: Wed, 27 Aug 2025 14:56:50 +0200
Subject: [PATCH 155/186] Update Cargo.toml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Alexander Theißen <alex.theissen@me.com>
---
 Cargo.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 2c26a61baef8..fb0d30d88e43 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1480,7 +1480,6 @@ zombienet-orchestrator = { version = "0.3.8" }
 zombienet-sdk = { version = "0.3.8" }
 zstd = { version = "0.12.4", default-features = false }
 
-
 [profile.release]
 # Polkadot runtime requires unwinding.
 opt-level = 3

From 4f86e9bb9e2c87fe40c452923f72819ee39e3417 Mon Sep 17 00:00:00 2001
From: PG Herveou <pgherveou@gmail.com>
Date: Wed, 27 Aug 2025 14:56:57 +0200
Subject: [PATCH 156/186] Update prdoc/pr_9285.prdoc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Alexander Theißen <alex.theissen@me.com>
---
 prdoc/pr_9285.prdoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prdoc/pr_9285.prdoc b/prdoc/pr_9285.prdoc
index 7197b711c67d..8e0b4f8cf7b6 100644
--- a/prdoc/pr_9285.prdoc
+++ b/prdoc/pr_9285.prdoc
@@ -8,7 +8,7 @@ doc:
     - instructions are copied and adapted from REVM they should be ignored in this PR and reviewed in follow-up PR
 crates:
 - name: pallet-revive
-  bump: patch
+  bump: major
 - name: pallet-revive-fixtures
   bump: patch
 - name: asset-hub-westend-runtime

From 315ae52c47ebb038a914e01a5ca7a02b7ef08934 Mon Sep 17 00:00:00 2001
From: PG Herveou <pgherveou@gmail.com>
Date: Wed, 27 Aug 2025 14:57:10 +0200
Subject: [PATCH 157/186] Update substrate/frame/revive/src/call_builder.rs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Alexander Theißen <alex.theissen@me.com>
---
 substrate/frame/revive/src/call_builder.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/substrate/frame/revive/src/call_builder.rs b/substrate/frame/revive/src/call_builder.rs
index 781ef426342d..6d6ca9348fdf 100644
--- a/substrate/frame/revive/src/call_builder.rs
+++ b/substrate/frame/revive/src/call_builder.rs
@@ -485,7 +485,7 @@ impl VmBinaryModule {
 		Self::new(code)
 	}
 
-	/// An evm contract that executes  `size` JUMPDEST instructions.
+	/// An evm contract that executes `size` JUMPDEST instructions.
 	pub fn evm_noop(size: u32) -> Self {
 		use revm::bytecode::opcode::JUMPDEST;
 

From 3598d6fc7a4bfe7bad3916b727216c8d5c7c3ce7 Mon Sep 17 00:00:00 2001
From: PG Herveou <pgherveou@gmail.com>
Date: Wed, 27 Aug 2025 14:57:19 +0200
Subject: [PATCH 158/186] Update substrate/frame/revive/src/benchmarking.rs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Alexander Theißen <alex.theissen@me.com>
---
 substrate/frame/revive/src/benchmarking.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/substrate/frame/revive/src/benchmarking.rs b/substrate/frame/revive/src/benchmarking.rs
index cddea17a683b..22ab3e70e113 100644
--- a/substrate/frame/revive/src/benchmarking.rs
+++ b/substrate/frame/revive/src/benchmarking.rs
@@ -2251,7 +2251,7 @@ mod benchmarks {
 		Ok(())
 	}
 
-	/// Benchmark the cost of executing `r` noop (JUMPDEST - 1 EVM GAS) instructions.
+	/// Benchmark the cost of executing `r` noop (JUMPDEST) instructions.
 	#[benchmark(pov_mode = Measured)]
 	fn evm_opcode(r: Linear<0, 10_000>) -> Result<(), BenchmarkError> {
 		use crate::vm::evm;

From 3272e99301179daab08f640747b24903c829f1aa Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Wed, 27 Aug 2025 15:03:34 +0200
Subject: [PATCH 159/186] rm charge_evm_init_cost

---
 substrate/frame/revive/src/gas.rs    | 9 ---------
 substrate/frame/revive/src/vm/evm.rs | 2 --
 2 files changed, 11 deletions(-)

diff --git a/substrate/frame/revive/src/gas.rs b/substrate/frame/revive/src/gas.rs
index 34eeb5fd4c4f..f701d01fb46f 100644
--- a/substrate/frame/revive/src/gas.rs
+++ b/substrate/frame/revive/src/gas.rs
@@ -219,15 +219,6 @@ impl<T: Config> GasMeter<T> {
 		Ok(ChargedAmount(amount))
 	}
 
-	/// Charge the initial cost for executing EVM bytecode.
-	pub fn charge_evm_init_cost(&mut self) -> Result<(), DispatchError> {
-		self.gas_left = self
-			.gas_left
-			.checked_sub(&T::WeightInfo::evm_opcode(0))
-			.ok_or_else(|| Error::<T>::OutOfGas)?;
-		Ok(())
-	}
-
 	/// Charge the base cost for executing an EVM opcode.
 	pub fn charge_evm_base_cost(&mut self) -> Result<(), DispatchError> {
 		let base_cost = T::WeightInfo::evm_opcode(1).saturating_sub(T::WeightInfo::evm_opcode(0));
diff --git a/substrate/frame/revive/src/vm/evm.rs b/substrate/frame/revive/src/vm/evm.rs
index 6cb109a35c93..1b64ed8e03a2 100644
--- a/substrate/frame/revive/src/vm/evm.rs
+++ b/substrate/frame/revive/src/vm/evm.rs
@@ -96,8 +96,6 @@ impl<T: Config> ContractBlob<T> {
 
 /// Calls the EVM interpreter with the provided bytecode and inputs.
 pub fn call<'a, E: Ext>(bytecode: Bytecode, ext: &'a mut E, inputs: EVMInputs) -> ExecResult {
-	ext.gas_meter_mut().charge_evm_init_cost()?;
-
 	let mut interpreter: Interpreter<EVMInterpreter<'a, E>> = Interpreter {
 		gas: Gas::default(),
 		bytecode: ExtBytecode::new(bytecode),

From e2242a230fab800873f26ec6892da5b5f3b5f62c Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Wed, 27 Aug 2025 15:08:15 +0200
Subject: [PATCH 160/186] fix

---
 substrate/frame/revive/src/gas.rs                        | 8 --------
 substrate/frame/revive/src/vm/evm/instructions/macros.rs | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/substrate/frame/revive/src/gas.rs b/substrate/frame/revive/src/gas.rs
index f701d01fb46f..7f791c7eb567 100644
--- a/substrate/frame/revive/src/gas.rs
+++ b/substrate/frame/revive/src/gas.rs
@@ -219,14 +219,6 @@ impl<T: Config> GasMeter<T> {
 		Ok(ChargedAmount(amount))
 	}
 
-	/// Charge the base cost for executing an EVM opcode.
-	pub fn charge_evm_base_cost(&mut self) -> Result<(), DispatchError> {
-		let base_cost = T::WeightInfo::evm_opcode(1).saturating_sub(T::WeightInfo::evm_opcode(0));
-		self.gas_left =
-			self.gas_left.checked_sub(&base_cost).ok_or_else(|| Error::<T>::OutOfGas)?;
-		Ok(())
-	}
-
 	/// Charge the specified amount of EVM gas.
 	/// This is used for basic opcodes (e.g arithmetic, bitwise, ...) that don't have a dedicated
 	/// benchmark
diff --git a/substrate/frame/revive/src/vm/evm/instructions/macros.rs b/substrate/frame/revive/src/vm/evm/instructions/macros.rs
index 1e4dd91079e3..cb706d52add5 100644
--- a/substrate/frame/revive/src/vm/evm/instructions/macros.rs
+++ b/substrate/frame/revive/src/vm/evm/instructions/macros.rs
@@ -98,7 +98,7 @@ macro_rules! gas {
 	};
 	($interpreter:expr, $gas:expr, $ret:expr) => {
 		let meter = $interpreter.extend.gas_meter_mut();
-		if meter.charge_evm_base_cost().is_err() || meter.charge($gas).is_err() {
+		if meter.charge_evm_gas(1).is_err() || meter.charge($gas).is_err() {
 			$interpreter.halt(revm::interpreter::InstructionResult::OutOfGas);
 			return $ret;
 		}

From 7fa642140d92d90a7851417ac7fc335983c951f2 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Wed, 27 Aug 2025 15:09:51 +0200
Subject: [PATCH 161/186] rm - 1

---
 substrate/frame/revive/src/benchmarking.rs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/substrate/frame/revive/src/benchmarking.rs b/substrate/frame/revive/src/benchmarking.rs
index 22ab3e70e113..7539797ce091 100644
--- a/substrate/frame/revive/src/benchmarking.rs
+++ b/substrate/frame/revive/src/benchmarking.rs
@@ -155,11 +155,8 @@ mod benchmarks {
 	/// This is similar to `call_with_pvm_code_per_byte` but for EVM bytecode.
 	#[benchmark(pov_mode = Measured)]
 	fn call_with_evm_code_per_byte(c: Linear<1, { 10 * 1024 }>) -> Result<(), BenchmarkError> {
-		let instance = Contract::<T>::with_caller(
-			whitelisted_caller(),
-			VmBinaryModule::evm_sized(c - 1),
-			vec![],
-		)?;
+		let instance =
+			Contract::<T>::with_caller(whitelisted_caller(), VmBinaryModule::evm_sized(c), vec![])?;
 		let value = Pallet::<T>::min_balance();
 		let storage_deposit = default_deposit_limit::<T>();
 

From ae647b6eabb446268cdc26c13d3d06f741239b9b Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Wed, 27 Aug 2025 20:30:55 +0200
Subject: [PATCH 162/186] restore legacy behaviour

---
 substrate/frame/revive/src/exec.rs      |  3 +-
 substrate/frame/revive/src/tests/sol.rs | 50 ++++++++++++-------------
 2 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index 460f1800f360..a6527153141e 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -1258,7 +1258,8 @@ where
 						data,
 						caller.account_id()?.clone(),
 					)?;
-					code_deposit = module.store_code(skip_transfer)?;
+					module.store_code(skip_transfer)?;
+					code_deposit = module.code_info().deposit();
 					contract_info.code_hash = *module.code_hash();
 
 					<CodeInfo<T>>::increment_refcount(contract_info.code_hash)?;
diff --git a/substrate/frame/revive/src/tests/sol.rs b/substrate/frame/revive/src/tests/sol.rs
index d5065c3e5e1f..5fe1f578fdf3 100644
--- a/substrate/frame/revive/src/tests/sol.rs
+++ b/substrate/frame/revive/src/tests/sol.rs
@@ -35,35 +35,33 @@ fn basic_evm_flow_works() {
 	let (code, init_hash) = compile_module_with_type("Fibonacci", FixtureType::Solc).unwrap();
 
 	ExtBuilder::default().build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code.clone()))
-			.salt(Some([1; 32]))
-			.build_and_unwrap_contract();
-
-		// check the code exists
-		let contract = get_contract(&addr);
-		ensure_stored(contract.code_hash);
-		let deposit = contract_base_deposit(&addr);
-		assert_eq!(contract.total_deposit(), deposit);
-		assert_refcount!(contract.code_hash, 1);
+		for i in 1u8..=2 {
+			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000_000);
+			let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code.clone()))
+				.salt(Some([i; 32]))
+				.build_and_unwrap_contract();
+
+			// check the code exists
+			let contract = get_contract(&addr);
+			ensure_stored(contract.code_hash);
+			let deposit = contract_base_deposit(&addr);
+			assert_eq!(contract.total_deposit(), deposit);
+			assert_refcount!(contract.code_hash, i as u64);
+
+			let result = builder::bare_call(addr)
+				.data(
+					Fibonacci::FibonacciCalls::fib(Fibonacci::fibCall { n: U256::from(10u64) })
+						.abi_encode(),
+				)
+				.build_and_unwrap_result();
+			assert_eq!(
+				U256::from(55u32),
+				U256::from_be_bytes::<32>(result.data.try_into().unwrap())
+			);
+		}
 
 		// init code is not stored
 		assert!(!PristineCode::<Test>::contains_key(init_hash));
-
-		let result = builder::bare_call(addr)
-			.data(
-				Fibonacci::FibonacciCalls::fib(Fibonacci::fibCall { n: U256::from(10u64) })
-					.abi_encode(),
-			)
-			.build_and_unwrap_result();
-		assert_eq!(U256::from(55u32), U256::from_be_bytes::<32>(result.data.try_into().unwrap()));
-
-		// Instantiate again
-		let Contract { addr, .. } = builder::bare_instantiate(Code::Upload(code.clone()))
-			.salt(Some([2; 32]))
-			.build_and_unwrap_contract();
-		let contract = get_contract(&addr);
-		assert_refcount!(contract.code_hash, 2);
 	});
 }
 

From 1a073b63f6467eb0552d9744c97f7dc6368f7491 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Thu, 28 Aug 2025 10:31:44 +0200
Subject: [PATCH 163/186] update

---
 substrate/frame/revive/src/vm/evm.rs | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/substrate/frame/revive/src/vm/evm.rs b/substrate/frame/revive/src/vm/evm.rs
index 1b64ed8e03a2..c7963f307ab2 100644
--- a/substrate/frame/revive/src/vm/evm.rs
+++ b/substrate/frame/revive/src/vm/evm.rs
@@ -200,3 +200,24 @@ impl InputsTr for EVMInputs {
 		primitives::U256::ZERO
 	}
 }
+
+/// Blanket conversion trait between `sp_core::U256` and `revm::primitives::U256`
+trait U256Converter {
+	/// Convert `self` into `revm::primitives::U256`
+	fn into_revm_u256(&self) -> revm::primitives::U256;
+
+	/// Convert from `revm::primitives::U256` into `Self`
+	fn from_revm_u256(value: &revm::primitives::U256) -> Self;
+}
+
+impl U256Converter for sp_core::U256 {
+	fn into_revm_u256(&self) -> revm::primitives::U256 {
+		let bytes = self.to_big_endian();
+		revm::primitives::U256::from_be_bytes(bytes)
+	}
+
+	fn from_revm_u256(value: &revm::primitives::U256) -> Self {
+		let bytes = value.to_be_bytes::<32>();
+		sp_core::U256::from_big_endian(&bytes)
+	}
+}

From d4d8c1a9bc270b94db2189f17d29d2e6ae1a7b5b Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Thu, 28 Aug 2025 11:37:30 +0200
Subject: [PATCH 164/186] deadcode unused for now

---
 substrate/frame/revive/src/vm/evm.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/substrate/frame/revive/src/vm/evm.rs b/substrate/frame/revive/src/vm/evm.rs
index c7963f307ab2..b0f7f65aeec5 100644
--- a/substrate/frame/revive/src/vm/evm.rs
+++ b/substrate/frame/revive/src/vm/evm.rs
@@ -202,7 +202,8 @@ impl InputsTr for EVMInputs {
 }
 
 /// Blanket conversion trait between `sp_core::U256` and `revm::primitives::U256`
-trait U256Converter {
+#[allow(dead_code)]
+pub trait U256Converter {
 	/// Convert `self` into `revm::primitives::U256`
 	fn into_revm_u256(&self) -> revm::primitives::U256;
 

From e286c49b580f75cc8dcaa2afe7445c771139db6b Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Thu, 28 Aug 2025 18:16:27 +0200
Subject: [PATCH 165/186] deposit fixes

- CodeUploadDeposit is transferred from a pallet-account instead of the
  origin
- Migration takes care of moving the hold from the owner to the pallet's
  account
- Remove code extrinsic is gone, it happens automatically when refcount
  drops to 0
---
 substrate/frame/revive/src/benchmarking.rs    |  87 +++++-----
 substrate/frame/revive/src/exec.rs            |  23 +--
 substrate/frame/revive/src/exec/mock_ext.rs   |   8 +-
 substrate/frame/revive/src/exec/tests.rs      |   2 +-
 substrate/frame/revive/src/lib.rs             |  29 +---
 substrate/frame/revive/src/migrations/v2.rs   |  44 ++++-
 substrate/frame/revive/src/primitives.rs      |   9 +
 substrate/frame/revive/src/tests.rs           |   5 +-
 substrate/frame/revive/src/tests/pvm.rs       | 155 +++++-------------
 substrate/frame/revive/src/vm/mod.rs          |  88 +++++-----
 substrate/frame/revive/src/vm/pvm/env.rs      |  12 +-
 .../frame/revive/src/vm/runtime_costs.rs      |   9 +-
 substrate/frame/revive/src/weights.rs         |  12 +-
 13 files changed, 218 insertions(+), 265 deletions(-)

diff --git a/substrate/frame/revive/src/benchmarking.rs b/substrate/frame/revive/src/benchmarking.rs
index 7539797ce091..0e3b5777396e 100644
--- a/substrate/frame/revive/src/benchmarking.rs
+++ b/substrate/frame/revive/src/benchmarking.rs
@@ -232,9 +232,11 @@ mod benchmarks {
 
 		let deposit =
 			T::Currency::balance_on_hold(&HoldReason::StorageDepositReserve.into(), &account_id);
-		// uploading the code reserves some balance in the callers account
-		let code_deposit =
-			T::Currency::balance_on_hold(&HoldReason::CodeUploadDepositReserve.into(), &caller);
+		// uploading the code reserves some balance in the pallet's account
+		let code_deposit = T::Currency::balance_on_hold(
+			&HoldReason::CodeUploadDepositReserve.into(),
+			&Pallet::<T>::pallet_account(),
+		);
 		let mapping_deposit =
 			T::Currency::balance_on_hold(&HoldReason::AddressMapping.into(), &caller);
 		assert_eq!(
@@ -282,9 +284,11 @@ mod benchmarks {
 
 		let deposit =
 			T::Currency::balance_on_hold(&HoldReason::StorageDepositReserve.into(), &account_id);
-		// uploading the code reserves some balance in the callers account
-		let code_deposit =
-			T::Currency::balance_on_hold(&HoldReason::CodeUploadDepositReserve.into(), &caller);
+		// uploading the code reserves some balance in the pallet account
+		let code_deposit = T::Currency::balance_on_hold(
+			&HoldReason::CodeUploadDepositReserve.into(),
+			&Pallet::<T>::pallet_account(),
+		);
 		let mapping_deposit =
 			T::Currency::balance_on_hold(&HoldReason::AddressMapping.into(), &caller);
 
@@ -327,8 +331,10 @@ mod benchmarks {
 
 		let deposit =
 			T::Currency::balance_on_hold(&HoldReason::StorageDepositReserve.into(), &account_id);
-		let code_deposit =
-			T::Currency::balance_on_hold(&HoldReason::CodeUploadDepositReserve.into(), &account_id);
+		let code_deposit = T::Currency::balance_on_hold(
+			&HoldReason::CodeUploadDepositReserve.into(),
+			&Pallet::<T>::pallet_account(),
+		);
 		let mapping_deposit =
 			T::Currency::balance_on_hold(&HoldReason::AddressMapping.into(), &account_id);
 		// value was removed from the caller
@@ -369,7 +375,7 @@ mod benchmarks {
 		);
 		let code_deposit = T::Currency::balance_on_hold(
 			&HoldReason::CodeUploadDepositReserve.into(),
-			&instance.caller,
+			&Pallet::<T>::pallet_account(),
 		);
 		let mapping_deposit =
 			T::Currency::balance_on_hold(&HoldReason::AddressMapping.into(), &instance.caller);
@@ -413,7 +419,7 @@ mod benchmarks {
 		);
 		let code_deposit = T::Currency::balance_on_hold(
 			&HoldReason::CodeUploadDepositReserve.into(),
-			&instance.caller,
+			&Pallet::<T>::pallet_account(),
 		);
 		let mapping_deposit =
 			T::Currency::balance_on_hold(&HoldReason::AddressMapping.into(), &instance.caller);
@@ -449,32 +455,9 @@ mod benchmarks {
 		let storage_deposit = default_deposit_limit::<T>();
 		#[extrinsic_call]
 		_(origin, code, storage_deposit);
-		// uploading the code reserves some balance in the callers account
-		assert!(T::Currency::total_balance_on_hold(&caller) > 0u32.into());
-		assert!(<Contract<T>>::code_exists(&hash));
-	}
-
-	// Removing code does not depend on the size of the contract because all the information
-	// needed to verify the removal claim (refcount, owner) is stored in a separate storage
-	// item (`CodeInfoOf`).
-	#[benchmark(pov_mode = Measured)]
-	fn remove_code() -> Result<(), BenchmarkError> {
-		let caller = whitelisted_caller();
-		T::Currency::set_balance(&caller, caller_funding::<T>());
-		let VmBinaryModule { code, hash, .. } = VmBinaryModule::dummy();
-		let origin = RawOrigin::Signed(caller.clone());
-		let storage_deposit = default_deposit_limit::<T>();
-		let uploaded =
-			<Contracts<T>>::bare_upload_code(origin.clone().into(), code, storage_deposit)?;
-		assert_eq!(uploaded.code_hash, hash);
-		assert_eq!(uploaded.deposit, T::Currency::total_balance_on_hold(&caller));
+		// uploading the code reserves some balance in the pallet's account
+		assert!(T::Currency::total_balance_on_hold(&Pallet::<T>::pallet_account()) > 0u32.into());
 		assert!(<Contract<T>>::code_exists(&hash));
-		#[extrinsic_call]
-		_(origin, hash);
-		// removing the code should have unreserved the deposit
-		assert_eq!(T::Currency::total_balance_on_hold(&caller), 0u32.into());
-		assert!(<Contract<T>>::code_removed(&hash));
-		Ok(())
 	}
 
 	#[benchmark(pov_mode = Measured)]
@@ -1102,11 +1085,21 @@ mod benchmarks {
 		));
 	}
 
+	/// Benchmark the ocst of terminating a contract.
+	///
+	/// `r`: whether the old code will be removed as a result of this operation. (1: yes, 0: no)
 	#[benchmark(pov_mode = Measured)]
-	fn seal_terminate() -> Result<(), BenchmarkError> {
+	fn seal_terminate(r: Linear<0, 1>) -> Result<(), BenchmarkError> {
+		let delete_code = r == 1;
 		let beneficiary = account::<T::AccountId>("beneficiary", 0, 0);
 
-		build_runtime!(runtime, memory: [beneficiary.encode(),]);
+		build_runtime!(runtime, instance, memory: [beneficiary.encode(),]);
+		let code_hash = instance.info()?.code_hash;
+
+		// Increment the refcount of the code hash so that it does not get deleted
+		if !delete_code {
+			<CodeInfo<T>>::increment_refcount(code_hash).unwrap();
+		}
 
 		let result;
 		#[block]
@@ -2231,12 +2224,23 @@ mod benchmarks {
 		assert_eq!(&memory[..20], runtime.ext().ecdsa_to_eth_address(&pub_key_bytes).unwrap());
 	}
 
+	/// Benchmark the cost of setting the code hash of a contract.
+	///
+	/// `r`: whether the old code will be removed as a result of this operation. (1: yes, 0: no)
 	#[benchmark(pov_mode = Measured)]
-	fn seal_set_code_hash() -> Result<(), BenchmarkError> {
-		let code_hash =
-			Contract::<T>::with_index(1, VmBinaryModule::dummy(), vec![])?.info()?.code_hash;
+	fn seal_set_code_hash(r: Linear<0, 1>) -> Result<(), BenchmarkError> {
+		let delete_old_code = r == 1;
+		let code_hash = Contract::<T>::with_index(1, VmBinaryModule::sized(42), vec![])?
+			.info()?
+			.code_hash;
+
+		build_runtime!(runtime, instance, memory: [ code_hash.encode(),]);
+		let old_code_hash = instance.info()?.code_hash;
 
-		build_runtime!(runtime, memory: [ code_hash.encode(),]);
+		// Increment the refcount of the code hash so that it does not get deleted
+		if !delete_old_code {
+			<CodeInfo<T>>::increment_refcount(old_code_hash).unwrap();
+		}
 
 		let result;
 		#[block]
@@ -2245,6 +2249,7 @@ mod benchmarks {
 		}
 
 		assert_ok!(result);
+		assert_eq!(PristineCode::<T>::get(old_code_hash).is_none(), delete_old_code);
 		Ok(())
 	}
 
diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index a6527153141e..41fe73aee209 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -25,9 +25,9 @@ use crate::{
 	storage::{self, meter::Diff, AccountIdOrAddress, WriteOutcome},
 	tracing::if_tracing,
 	transient_storage::TransientStorage,
-	AccountInfo, AccountInfoOf, BalanceOf, BalanceWithDust, CodeInfo, CodeInfoOf, Config,
-	ContractInfo, Error, Event, ImmutableData, ImmutableDataOf, Pallet as Contracts, RuntimeCosts,
-	LOG_TARGET,
+	AccountInfo, AccountInfoOf, BalanceOf, BalanceWithDust, CodeInfo, CodeInfoOf, CodeRemoved,
+	Config, ContractInfo, Error, Event, ImmutableData, ImmutableDataOf, Pallet as Contracts,
+	RuntimeCosts, LOG_TARGET,
 };
 use alloc::vec::Vec;
 use core::{fmt::Debug, marker::PhantomData, mem};
@@ -203,13 +203,14 @@ pub trait Ext: PrecompileWithInfoExt {
 	///
 	/// This function will fail if the same contract is present on the contract
 	/// call stack.
-	fn terminate(&mut self, beneficiary: &H160) -> DispatchResult;
+	fn terminate(&mut self, beneficiary: &H160) -> Result<CodeRemoved, DispatchError>;
 
 	/// Returns the code hash of the contract being executed.
 	fn own_code_hash(&mut self) -> &H256;
 
 	/// Sets new code hash and immutable data for an existing contract.
-	fn set_code_hash(&mut self, hash: H256) -> DispatchResult;
+	/// Returns whether the old code was removed as a result of this operation.
+	fn set_code_hash(&mut self, hash: H256) -> Result<CodeRemoved, DispatchError>;
 
 	/// Get the length of the immutable data.
 	///
@@ -1662,7 +1663,7 @@ where
 		}
 	}
 
-	fn terminate(&mut self, beneficiary: &H160) -> DispatchResult {
+	fn terminate(&mut self, beneficiary: &H160) -> Result<CodeRemoved, DispatchError> {
 		if self.is_recursive() {
 			return Err(Error::<T>::TerminatedWhileReentrant.into());
 		}
@@ -1678,9 +1679,9 @@ where
 		let account_address = T::AddressMapper::to_address(&frame.account_id);
 		AccountInfoOf::<T>::remove(&account_address);
 		ImmutableDataOf::<T>::remove(&account_address);
-		<CodeInfo<T>>::decrement_refcount(info.code_hash)?;
+		let removed = <CodeInfo<T>>::decrement_refcount(info.code_hash)?;
 
-		Ok(())
+		Ok(removed)
 	}
 
 	fn own_code_hash(&mut self) -> &H256 {
@@ -1702,7 +1703,7 @@ where
 	/// `self.immutable_data` at the address of the (reverted) contract instantiation.
 	///
 	/// The `set_code_hash` contract API stays disabled until this change is implemented.
-	fn set_code_hash(&mut self, hash: H256) -> DispatchResult {
+	fn set_code_hash(&mut self, hash: H256) -> Result<CodeRemoved, DispatchError> {
 		let frame = top_frame_mut!(self);
 
 		let info = frame.contract_info();
@@ -1720,8 +1721,8 @@ where
 		frame.nested_storage.charge_deposit(frame.account_id.clone(), deposit);
 
 		<CodeInfo<T>>::increment_refcount(hash)?;
-		<CodeInfo<T>>::decrement_refcount(prev_hash)?;
-		Ok(())
+		let removed = <CodeInfo<T>>::decrement_refcount(prev_hash)?;
+		Ok(removed)
 	}
 
 	fn immutable_data_len(&mut self) -> u32 {
diff --git a/substrate/frame/revive/src/exec/mock_ext.rs b/substrate/frame/revive/src/exec/mock_ext.rs
index edf006b88048..28505b7815e6 100644
--- a/substrate/frame/revive/src/exec/mock_ext.rs
+++ b/substrate/frame/revive/src/exec/mock_ext.rs
@@ -23,11 +23,11 @@ use crate::{
 	precompiles::Diff,
 	storage::{ContractInfo, WriteOutcome},
 	transient_storage::TransientStorage,
-	Config, ExecReturnValue, ImmutableData,
+	CodeRemoved, Config, ExecReturnValue, ImmutableData,
 };
 use alloc::vec::Vec;
 use core::marker::PhantomData;
-use frame_support::{dispatch::DispatchResult, weights::Weight};
+use frame_support::weights::Weight;
 use sp_core::{H160, H256, U256};
 use sp_runtime::DispatchError;
 
@@ -239,7 +239,7 @@ impl<T: Config> Ext for MockExt<T> {
 		panic!("MockExt::delegate_call")
 	}
 
-	fn terminate(&mut self, _beneficiary: &H160) -> DispatchResult {
+	fn terminate(&mut self, _beneficiary: &H160) -> Result<CodeRemoved, DispatchError> {
 		panic!("MockExt::terminate")
 	}
 
@@ -247,7 +247,7 @@ impl<T: Config> Ext for MockExt<T> {
 		panic!("MockExt::own_code_hash")
 	}
 
-	fn set_code_hash(&mut self, _hash: H256) -> DispatchResult {
+	fn set_code_hash(&mut self, _hash: H256) -> Result<CodeRemoved, DispatchError> {
 		panic!("MockExt::set_code_hash")
 	}
 
diff --git a/substrate/frame/revive/src/exec/tests.rs b/substrate/frame/revive/src/exec/tests.rs
index 381abc7c2611..9dfb213cbf52 100644
--- a/substrate/frame/revive/src/exec/tests.rs
+++ b/substrate/frame/revive/src/exec/tests.rs
@@ -1272,7 +1272,7 @@ fn instantiation_traps() {
 #[test]
 fn termination_from_instantiate_fails() {
 	let terminate_ch = MockLoader::insert(Constructor, |ctx, _| {
-		ctx.ext.terminate(&ALICE_ADDR)?;
+		let _ = ctx.ext.terminate(&ALICE_ADDR)?;
 		exec_success()
 	});
 
diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index 183c1f2812ff..bca76dd91314 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -61,8 +61,8 @@ use codec::{Codec, Decode, Encode};
 use environmental::*;
 use frame_support::{
 	dispatch::{
-		DispatchErrorWithPostInfo, DispatchResultWithPostInfo, GetDispatchInfo, Pays,
-		PostDispatchInfo, RawOrigin,
+		DispatchErrorWithPostInfo, DispatchResultWithPostInfo, GetDispatchInfo, PostDispatchInfo,
+		RawOrigin,
 	},
 	ensure,
 	pallet_prelude::DispatchClass,
@@ -81,7 +81,7 @@ use frame_system::{
 use pallet_transaction_payment::OnChargeTransaction;
 use scale_info::TypeInfo;
 use sp_runtime::{
-	traits::{BadOrigin, Bounded, Convert, Dispatchable, Saturating},
+	traits::{Bounded, Convert, Dispatchable, Saturating},
 	AccountId32, DispatchError,
 };
 
@@ -942,22 +942,6 @@ pub mod pallet {
 			Self::bare_upload_code(origin, code, storage_deposit_limit).map(|_| ())
 		}
 
-		/// Remove the code stored under `code_hash` and refund the deposit to its owner.
-		///
-		/// A code can only be removed by its original uploader (its owner) and only if it is
-		/// not used by any contract.
-		#[pallet::call_index(5)]
-		#[pallet::weight(T::WeightInfo::remove_code())]
-		pub fn remove_code(
-			origin: OriginFor<T>,
-			code_hash: sp_core::H256,
-		) -> DispatchResultWithPostInfo {
-			let origin = ensure_signed(origin)?;
-			<ContractBlob<T>>::remove(&origin, code_hash)?;
-			// we waive the fee because removing unused code is beneficial
-			Ok(Pays::No.into())
-		}
-
 		/// Privileged function that changes the code of an existing contract.
 		///
 		/// This takes care of updating refcounts and all other necessary operations. Returns
@@ -986,7 +970,7 @@ pub mod pallet {
 				};
 
 				<CodeInfo<T>>::increment_refcount(code_hash)?;
-				<CodeInfo<T>>::decrement_refcount(contract.code_hash)?;
+				let _ = <CodeInfo<T>>::decrement_refcount(contract.code_hash)?;
 				contract.code_hash = code_hash;
 
 				Ok(())
@@ -1580,6 +1564,11 @@ where
 }
 
 impl<T: Config> Pallet<T> {
+	fn pallet_account() -> AccountIdOf<T> {
+		use frame_support::PalletId;
+		use sp_runtime::traits::AccountIdConversion;
+		PalletId(*b"py/rev  ").into_account_truncating()
+	}
 	/// Returns true if the evm value carries dust.
 	fn has_dust(value: U256) -> bool {
 		value % U256::from(<T>::NativeToEthRatio::get()) != U256::zero()
diff --git a/substrate/frame/revive/src/migrations/v2.rs b/substrate/frame/revive/src/migrations/v2.rs
index c5e3974c7270..9f6687285265 100644
--- a/substrate/frame/revive/src/migrations/v2.rs
+++ b/substrate/frame/revive/src/migrations/v2.rs
@@ -17,24 +17,28 @@
 
 //! # Multi-Block Migration v2
 //!
-//! This migrate the old `CodeInfoOf` storage to the new `CodeInfoOf` which add the new `code_type`
+//! - migrate the old `CodeInfoOf` storage to the new `CodeInfoOf` which add the new `code_type`
 //! field.
+//! - Unhold the deposit on the owner and transfer it to the pallet account.
 
 extern crate alloc;
-
 use super::PALLET_MIGRATIONS_ID;
-use crate::{vm::BytecodeType, weights::WeightInfo, Config, H256};
+use crate::{vm::BytecodeType, weights::WeightInfo, Config, Pallet, H256, LOG_TARGET};
 use frame_support::{
 	migrations::{MigrationId, SteppedMigration, SteppedMigrationError},
 	pallet_prelude::PhantomData,
+	traits::{
+		fungible::MutateHold,
+		tokens::{Fortitude, Precision, Restriction},
+	},
 	weights::WeightMeter,
 };
 
 #[cfg(feature = "try-runtime")]
-use alloc::collections::btree_map::BTreeMap;
+use alloc::{collections::btree_map::BTreeMap, vec::Vec};
 
 #[cfg(feature = "try-runtime")]
-use alloc::vec::Vec;
+use frame_support::sp_runtime::TryRuntimeError;
 
 /// Module containing the old storage items.
 mod old {
@@ -108,13 +112,29 @@ impl<T: Config> SteppedMigration for Migration<T> {
 				break;
 			}
 
-			let iter = if let Some(last_key) = cursor {
+			let mut iter = if let Some(last_key) = cursor {
 				old::CodeInfoOf::<T>::iter_from(old::CodeInfoOf::<T>::hashed_key_for(last_key))
 			} else {
 				old::CodeInfoOf::<T>::iter()
 			};
 
-			if let Some((last_key, value)) = iter.drain().next() {
+			if let Some((last_key, value)) = iter.next() {
+				if let Err(err) = T::Currency::transfer_on_hold(
+					&crate::HoldReason::CodeUploadDepositReserve.into(),
+					&value.owner,
+					&Pallet::<T>::pallet_account(),
+					value.deposit,
+					Precision::Exact,
+					Restriction::OnHold,
+					Fortitude::Polite,
+				) {
+					log::error!(
+						target: LOG_TARGET,
+						"Failed to unhold the deposit for code hash {last_key:?} and owner {:?}: {err:?}",
+						value.owner,
+					);
+				}
+
 				new::CodeInfoOf::<T>::insert(
 					last_key,
 					new::CodeInfo {
@@ -136,15 +156,21 @@ impl<T: Config> SteppedMigration for Migration<T> {
 	}
 
 	#[cfg(feature = "try-runtime")]
-	fn pre_upgrade() -> Result<Vec<u8>, frame_support::sp_runtime::TryRuntimeError> {
+	fn pre_upgrade() -> Result<Vec<u8>, TryRuntimeError> {
 		use codec::Encode;
 
+		if !frame_system::Pallet::<T>::account_exists(&Pallet::<T>::pallet_account()) {
+			return Err(TryRuntimeError::Other(
+				"pallet_account should exist before running the migration",
+			))
+		}
+
 		// Return the state of the storage before the migration.
 		Ok(old::CodeInfoOf::<T>::iter().collect::<BTreeMap<_, _>>().encode())
 	}
 
 	#[cfg(feature = "try-runtime")]
-	fn post_upgrade(prev: Vec<u8>) -> Result<(), frame_support::sp_runtime::TryRuntimeError> {
+	fn post_upgrade(prev: Vec<u8>) -> Result<(), TryRuntimeError> {
 		use codec::Decode;
 
 		// Check the state of the storage after the migration.
diff --git a/substrate/frame/revive/src/primitives.rs b/substrate/frame/revive/src/primitives.rs
index 5bebe36b444e..4690e79d4144 100644
--- a/substrate/frame/revive/src/primitives.rs
+++ b/substrate/frame/revive/src/primitives.rs
@@ -357,3 +357,12 @@ pub enum BumpNonce {
 	/// Increment the nonce after contract instantiation
 	Yes,
 }
+
+/// Indicates whether the code was removed after the last refcount was decremented.
+#[must_use = "You must handle whether the code was removed or not."]
+pub enum CodeRemoved {
+	/// The code was not removed. (refcount > 0)
+	No,
+	/// The code was removed. (refcount == 0)
+	Yes,
+}
diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index df40c0f4e2f8..a9d2c9275311 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -401,7 +401,10 @@ impl ExtBuilder {
 		let checking_account = Pallet::<Test>::checking_account();
 
 		pallet_balances::GenesisConfig::<Test> {
-			balances: vec![(checking_account.clone(), 1_000_000_000_000)],
+			balances: vec![
+				(checking_account.clone(), 1_000_000_000_000),
+				(Pallet::<Test>::pallet_account(), 1_000_000_000_000),
+			],
 			..Default::default()
 		}
 		.assimilate_storage(&mut t)
diff --git a/substrate/frame/revive/src/tests/pvm.rs b/substrate/frame/revive/src/tests/pvm.rs
index 7623959a06ac..9235ebf460b2 100644
--- a/substrate/frame/revive/src/tests/pvm.rs
+++ b/substrate/frame/revive/src/tests/pvm.rs
@@ -46,7 +46,7 @@ use frame_support::{
 	assert_err, assert_err_ignore_postinfo, assert_noop, assert_ok,
 	storage::child,
 	traits::{
-		fungible::{BalancedHold, Inspect, Mutate, MutateHold},
+		fungible::{BalancedHold, Inspect, Mutate},
 		tokens::Preservation,
 		OnIdle, OnInitialize,
 	},
@@ -490,8 +490,12 @@ fn instantiate_unique_trie_id() {
 
 	ExtBuilder::default().existential_deposit(500).build().execute_with(|| {
 		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		Contracts::upload_code(RuntimeOrigin::signed(ALICE), binary, deposit_limit::<Test>())
-			.unwrap();
+		Contracts::upload_code(
+			RuntimeOrigin::signed(ALICE),
+			binary.clone(),
+			deposit_limit::<Test>(),
+		)
+		.unwrap();
 
 		// Instantiate the contract and store its trie id for later comparison.
 		let Contract { addr, .. } =
@@ -508,6 +512,8 @@ fn instantiate_unique_trie_id() {
 		assert_ok!(builder::call(addr).build());
 
 		// Re-Instantiate after termination.
+		Contracts::upload_code(RuntimeOrigin::signed(ALICE), binary, deposit_limit::<Test>())
+			.unwrap();
 		assert_ok!(builder::instantiate(code_hash).build());
 
 		// Trie ids shouldn't match or we might have a collision
@@ -1000,6 +1006,7 @@ fn self_destruct_works() {
 			.build_and_unwrap_contract();
 
 		let hold_balance = contract_base_deposit(&contract.addr);
+		let upload_deposit = get_code_deposit(&code_hash);
 
 		// Check that the BOB contract has been instantiated.
 		let _ = get_contract(&contract.addr);
@@ -1010,8 +1017,8 @@ fn self_destruct_works() {
 		// Call BOB without input data which triggers termination.
 		assert_matches!(builder::call(contract.addr).build(), Ok(_));
 
-		// Check that code is still there but refcount dropped to zero.
-		assert_refcount!(&code_hash, 0);
+		// Check that the code is gone
+		assert!(PristineCode::<Test>::get(&code_hash).is_none());
 
 		// Check that account is gone
 		assert!(get_contract_checked(&contract.addr).is_none());
@@ -1033,6 +1040,18 @@ fn self_destruct_works() {
 		pretty_assertions::assert_eq!(
 			System::events(),
 			vec![
+				EventRecord {
+					phase: Phase::Initialization,
+					event: RuntimeEvent::Balances(pallet_balances::Event::TransferOnHold {
+						reason: <Test as Config>::RuntimeHoldReason::Contracts(
+							HoldReason::CodeUploadDepositReserve,
+						),
+						source: Pallet::<Test>::pallet_account(),
+						dest: ALICE,
+						amount: upload_deposit,
+					}),
+					topics: vec![],
+				},
 				EventRecord {
 					phase: Phase::Initialization,
 					event: RuntimeEvent::Balances(pallet_balances::Event::TransferOnHold {
@@ -1711,10 +1730,7 @@ fn refcounter() {
 
 		// remove the last contract
 		assert_ok!(builder::call(addr2).build());
-		assert_refcount!(code_hash, 0);
-
-		// refcount is `0` but code should still exists because it needs to be removed manually
-		assert!(crate::PristineCode::<Test>::contains_key(&code_hash));
+		assert!(PristineCode::<Test>::get(&code_hash).is_none());
 	});
 }
 
@@ -1935,84 +1951,6 @@ fn upload_code_not_enough_balance() {
 	});
 }
 
-#[test]
-fn remove_code_works() {
-	let (binary, code_hash) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Drop previous events
-		initialize_block(2);
-
-		assert_ok!(Contracts::upload_code(RuntimeOrigin::signed(ALICE), binary, 1_000,));
-		// Ensure the contract was stored and get expected deposit amount to be reserved.
-		expected_deposit(ensure_stored(code_hash));
-		assert_ok!(Contracts::remove_code(RuntimeOrigin::signed(ALICE), code_hash));
-	});
-}
-
-#[test]
-fn remove_code_wrong_origin() {
-	let (binary, code_hash) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Drop previous events
-		initialize_block(2);
-
-		assert_ok!(Contracts::upload_code(RuntimeOrigin::signed(ALICE), binary, 1_000,));
-		// Ensure the contract was stored and get expected deposit amount to be reserved.
-		expected_deposit(ensure_stored(code_hash));
-
-		assert_noop!(
-			Contracts::remove_code(RuntimeOrigin::signed(BOB), code_hash),
-			sp_runtime::traits::BadOrigin,
-		);
-	});
-}
-
-#[test]
-fn remove_code_in_use() {
-	let (binary, code_hash) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		assert_ok!(builder::instantiate_with_code(binary).build());
-
-		// Drop previous events
-		initialize_block(2);
-
-		assert_noop!(
-			Contracts::remove_code(RuntimeOrigin::signed(ALICE), code_hash),
-			<Error<Test>>::CodeInUse,
-		);
-
-		assert_eq!(System::events(), vec![]);
-	});
-}
-
-#[test]
-fn remove_code_not_found() {
-	let (_binary, code_hash) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-
-		// Drop previous events
-		initialize_block(2);
-
-		assert_noop!(
-			Contracts::remove_code(RuntimeOrigin::signed(ALICE), code_hash),
-			<Error<Test>>::CodeNotFound,
-		);
-
-		assert_eq!(System::events(), vec![]);
-	});
-}
-
 #[test]
 fn instantiate_with_zero_balance_works() {
 	let (binary, code_hash) = compile_module("dummy").unwrap();
@@ -2042,12 +1980,13 @@ fn instantiate_with_zero_balance_works() {
 			vec![
 				EventRecord {
 					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::Held {
+					event: RuntimeEvent::Balances(pallet_balances::Event::TransferAndHold {
+						source: ALICE,
+						dest: Pallet::<Test>::pallet_account(),
+						transferred: 777,
 						reason: <Test as Config>::RuntimeHoldReason::Contracts(
 							HoldReason::CodeUploadDepositReserve,
 						),
-						who: ALICE,
-						amount: 777,
 					}),
 					topics: vec![],
 				},
@@ -2130,12 +2069,13 @@ fn instantiate_with_below_existential_deposit_works() {
 			vec![
 				EventRecord {
 					phase: Phase::Initialization,
-					event: RuntimeEvent::Balances(pallet_balances::Event::Held {
+					event: RuntimeEvent::Balances(pallet_balances::Event::TransferAndHold {
+						source: ALICE,
+						dest: Pallet::<Test>::pallet_account(),
+						transferred: 777,
 						reason: <Test as Config>::RuntimeHoldReason::Contracts(
 							HoldReason::CodeUploadDepositReserve,
 						),
-						who: ALICE,
-						amount: 777,
 					}),
 					topics: vec![],
 				},
@@ -2367,7 +2307,7 @@ fn set_code_extrinsic() {
 		// successful call
 		assert_ok!(Contracts::set_code(RuntimeOrigin::root(), addr, new_code_hash));
 		assert_eq!(get_contract(&addr).code_hash, new_code_hash);
-		assert_refcount!(&code_hash, 0);
+		assert!(PristineCode::<Test>::get(&code_hash).is_none());
 		assert_refcount!(&new_code_hash, 1);
 	});
 }
@@ -2770,10 +2710,9 @@ fn deposit_limit_in_nested_instantiate() {
 fn deposit_limit_honors_liquidity_restrictions() {
 	let (binary, _code_hash) = compile_module("store_call").unwrap();
 	ExtBuilder::default().existential_deposit(200).build().execute_with(|| {
-		let bobs_balance = 1_000;
-		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
-		let _ = <Test as Config>::Currency::set_balance(&BOB, bobs_balance);
 		let min_balance = Contracts::min_balance();
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+		let _ = <Test as Config>::Currency::set_balance(&BOB, min_balance);
 
 		// Instantiate the BOB contract.
 		let Contract { addr, account_id } =
@@ -2787,13 +2726,6 @@ fn deposit_limit_honors_liquidity_restrictions() {
 			info_deposit + min_balance
 		);
 
-		// check that the hold is honored
-		<Test as Config>::Currency::hold(
-			&HoldReason::CodeUploadDepositReserve.into(),
-			&BOB,
-			bobs_balance - min_balance,
-		)
-		.unwrap();
 		assert_err_ignore_postinfo!(
 			builder::call(addr)
 				.origin(RuntimeOrigin::signed(BOB))
@@ -2802,7 +2734,6 @@ fn deposit_limit_honors_liquidity_restrictions() {
 				.build(),
 			<Error<Test>>::StorageDepositNotEnoughFunds,
 		);
-		assert_eq!(<Test as Config>::Currency::free_balance(&BOB), min_balance);
 	});
 }
 
@@ -2893,7 +2824,7 @@ fn native_dependency_deposit_works() {
 				.build_and_unwrap_result();
 
 			// Check updated storage_deposit due to code size changes
-			let deposit_diff = lockup_deposit_percent.mul_ceil(get_code_deposit(&code_hash)) -
+			let deposit_diff = lockup_deposit_percent.mul_ceil(upload_deposit) -
 				lockup_deposit_percent.mul_ceil(get_code_deposit(&dummy_code_hash));
 			let new_base_deposit = contract_base_deposit(&addr);
 			assert_ne!(deposit_diff, 0);
@@ -2959,18 +2890,6 @@ fn root_cannot_upload_code() {
 	});
 }
 
-#[test]
-fn root_cannot_remove_code() {
-	let (_, code_hash) = compile_module("dummy").unwrap();
-
-	ExtBuilder::default().build().execute_with(|| {
-		assert_noop!(
-			Contracts::remove_code(RuntimeOrigin::root(), code_hash),
-			DispatchError::BadOrigin,
-		);
-	});
-}
-
 #[test]
 fn signed_cannot_set_code() {
 	let (_, code_hash) = compile_module("dummy").unwrap();
diff --git a/substrate/frame/revive/src/vm/mod.rs b/substrate/frame/revive/src/vm/mod.rs
index 475be58f1687..9dfa1c116ec4 100644
--- a/substrate/frame/revive/src/vm/mod.rs
+++ b/substrate/frame/revive/src/vm/mod.rs
@@ -26,18 +26,21 @@ pub use runtime_costs::RuntimeCosts;
 
 use crate::{
 	exec::{ExecResult, Executable, ExportedFunction, Ext},
+	frame_support::traits::tokens::Restriction,
 	gas::{GasMeter, Token},
 	storage::meter::Diff,
 	weights::WeightInfo,
-	AccountIdOf, BadOrigin, BalanceOf, CodeInfoOf, Config, Error, HoldReason, PristineCode, Weight,
-	LOG_TARGET,
+	AccountIdOf, BalanceOf, CodeInfoOf, CodeRemoved, Config, Error, HoldReason, PristineCode,
+	Weight, LOG_TARGET,
 };
 use alloc::vec::Vec;
 use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::{
 	dispatch::DispatchResult,
-	ensure,
-	traits::{fungible::MutateHold, tokens::Precision::BestEffort},
+	traits::{
+		fungible::MutateHold,
+		tokens::{Fortitude, Precision, Preservation},
+	},
 };
 use sp_core::{Get, H256, U256};
 use sp_runtime::DispatchError;
@@ -74,7 +77,9 @@ pub enum BytecodeType {
 /// - reference count,
 ///
 /// It is stored in a separate storage entry to avoid loading the code when not necessary.
-#[derive(Clone, Encode, Decode, scale_info::TypeInfo, MaxEncodedLen)]
+#[derive(
+	frame_support::DebugNoBound, Clone, Encode, Decode, scale_info::TypeInfo, MaxEncodedLen,
+)]
 #[codec(mel_bound())]
 #[scale_info(skip_type_params(T))]
 pub struct CodeInfo<T: Config> {
@@ -161,30 +166,6 @@ impl<T: Config> ContractBlob<T>
 where
 	BalanceOf<T>: Into<U256> + TryFrom<U256>,
 {
-	/// Remove the code from storage and refund the deposit to its owner.
-	///
-	/// Applies all necessary checks before removing the code.
-	pub fn remove(origin: &T::AccountId, code_hash: H256) -> DispatchResult {
-		<CodeInfoOf<T>>::try_mutate_exists(&code_hash, |existing| {
-			if let Some(code_info) = existing {
-				ensure!(code_info.refcount == 0, <Error<T>>::CodeInUse);
-				ensure!(&code_info.owner == origin, BadOrigin);
-				let _ = T::Currency::release(
-					&HoldReason::CodeUploadDepositReserve.into(),
-					&code_info.owner,
-					code_info.deposit,
-					BestEffort,
-				);
-
-				*existing = None;
-				<PristineCode<T>>::remove(&code_hash);
-				Ok(())
-			} else {
-				Err(<Error<T>>::CodeNotFound.into())
-			}
-		})
-	}
-
 	/// Puts the module blob into storage, and returns the deposit collected for the storage.
 	pub fn store_code(&mut self, skip_transfer: bool) -> Result<BalanceOf<T>, Error<T>> {
 		let code_hash = *self.code_hash();
@@ -200,11 +181,15 @@ where
 					let deposit = self.code_info.deposit;
 
 					if !skip_transfer {
-						T::Currency::hold(
-						&HoldReason::CodeUploadDepositReserve.into(),
-						&self.code_info.owner,
-						deposit,
-					) .map_err(|err| {
+						T::Currency::transfer_and_hold(
+							&HoldReason::CodeUploadDepositReserve.into(),
+							&self.code_info.owner,
+							&crate::Pallet::<T>::pallet_account(), deposit,
+							Precision::Exact,
+							Preservation::Preserve,
+							Fortitude::Polite,
+						)
+					 .map_err(|err| {
 							log::debug!(target: LOG_TARGET, "failed to hold store code deposit {deposit:?} for owner: {:?}: {err:?}", self.code_info.owner);
 							<Error<T>>::StorageDepositNotEnoughFunds
 					})?;
@@ -275,21 +260,32 @@ impl<T: Config> CodeInfo<T> {
 	}
 
 	/// Decrement the reference count of a stored code by one.
-	///
-	/// # Note
-	///
-	/// A contract whose reference count dropped to zero isn't automatically removed. A
-	/// `remove_code` transaction must be submitted by the original uploader to do so.
-	pub fn decrement_refcount(code_hash: H256) -> DispatchResult {
-		<CodeInfoOf<T>>::mutate(code_hash, |existing| {
-			if let Some(info) = existing {
-				info.refcount = info
+	/// Remove the code from storage when the reference count is zero.
+	pub fn decrement_refcount(code_hash: H256) -> Result<CodeRemoved, DispatchError> {
+		<CodeInfoOf<T>>::try_mutate_exists(code_hash, |existing| {
+			let Some(code_info) = existing else { return Err(Error::<T>::CodeNotFound.into()) };
+
+			if code_info.refcount == 1 {
+				T::Currency::transfer_on_hold(
+					&HoldReason::CodeUploadDepositReserve.into(),
+					&crate::Pallet::<T>::pallet_account(),
+					&code_info.owner,
+					code_info.deposit,
+					Precision::Exact,
+					Restriction::Free,
+					Fortitude::Polite,
+				)?;
+
+				<PristineCode<T>>::remove(&code_hash);
+				*existing = None;
+
+				Ok(CodeRemoved::Yes)
+			} else {
+				code_info.refcount = code_info
 					.refcount
 					.checked_sub(1)
 					.ok_or_else(|| <Error<T>>::RefcountOverOrUnderflow)?;
-				Ok(())
-			} else {
-				Err(Error::<T>::CodeNotFound.into())
+				Ok(CodeRemoved::No)
 			}
 		})
 	}
diff --git a/substrate/frame/revive/src/vm/pvm/env.rs b/substrate/frame/revive/src/vm/pvm/env.rs
index 83a11921c534..fe0572126856 100644
--- a/substrate/frame/revive/src/vm/pvm/env.rs
+++ b/substrate/frame/revive/src/vm/pvm/env.rs
@@ -955,9 +955,11 @@ pub mod env {
 	/// the immutable data of the new code hash.
 	#[mutating]
 	fn set_code_hash(&mut self, memory: &mut M, code_hash_ptr: u32) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::SetCodeHash)?;
+		let charged = self.charge_gas(RuntimeCosts::SetCodeHash { old_code_removed: true })?;
 		let code_hash: H256 = memory.read_h256(code_hash_ptr)?;
-		self.ext.set_code_hash(code_hash)?;
+		if matches!(self.ext.set_code_hash(code_hash)?, crate::CodeRemoved::No) {
+			self.adjust_gas(charged, RuntimeCosts::SetCodeHash { old_code_removed: false });
+		}
 		Ok(())
 	}
 
@@ -1007,9 +1009,11 @@ pub mod env {
 	/// See [`pallet_revive_uapi::HostFn::terminate`].
 	#[mutating]
 	fn terminate(&mut self, memory: &mut M, beneficiary_ptr: u32) -> Result<(), TrapReason> {
-		self.charge_gas(RuntimeCosts::Terminate)?;
+		let charged = self.charge_gas(RuntimeCosts::Terminate { code_removed: true })?;
 		let beneficiary = memory.read_h160(beneficiary_ptr)?;
-		self.ext.terminate(&beneficiary)?;
+		if matches!(self.ext.terminate(&beneficiary)?, crate::CodeRemoved::No) {
+			self.adjust_gas(charged, RuntimeCosts::Terminate { code_removed: false });
+		}
 		Err(TrapReason::Termination)
 	}
 
diff --git a/substrate/frame/revive/src/vm/runtime_costs.rs b/substrate/frame/revive/src/vm/runtime_costs.rs
index 861423dc0b28..44fc68ab5e11 100644
--- a/substrate/frame/revive/src/vm/runtime_costs.rs
+++ b/substrate/frame/revive/src/vm/runtime_costs.rs
@@ -93,7 +93,7 @@ pub enum RuntimeCosts {
 	/// Weight of calling `seal_weight_to_fee`.
 	WeightToFee,
 	/// Weight of calling `seal_terminate`.
-	Terminate,
+	Terminate { code_removed: bool },
 	/// Weight of calling `seal_deposit_event` with the given number of topics and event size.
 	DepositEvent { num_topic: u32, len: u32 },
 	/// Weight of calling `seal_set_storage` for the given storage item sizes.
@@ -151,7 +151,7 @@ pub enum RuntimeCosts {
 	/// Weight charged by a precompile.
 	Precompile(Weight),
 	/// Weight of calling `seal_set_code_hash`
-	SetCodeHash,
+	SetCodeHash { old_code_removed: bool },
 	/// Weight of calling `ecdsa_to_eth_address`
 	EcdsaToEthAddress,
 	/// Weight of calling `get_immutable_dependency`
@@ -254,7 +254,7 @@ impl<T: Config> Token<T> for RuntimeCosts {
 			Now => T::WeightInfo::seal_now(),
 			GasLimit => T::WeightInfo::seal_gas_limit(),
 			WeightToFee => T::WeightInfo::seal_weight_to_fee(),
-			Terminate => T::WeightInfo::seal_terminate(),
+			Terminate { code_removed } => T::WeightInfo::seal_terminate(code_removed.into()),
 			DepositEvent { num_topic, len } => T::WeightInfo::seal_deposit_event(num_topic, len),
 			SetStorage { new_bytes, old_bytes } => {
 				cost_storage!(write, seal_set_storage, new_bytes, old_bytes)
@@ -300,7 +300,8 @@ impl<T: Config> Token<T> for RuntimeCosts {
 			EcdsaRecovery => T::WeightInfo::ecdsa_recover(),
 			Sr25519Verify(len) => T::WeightInfo::seal_sr25519_verify(len),
 			Precompile(weight) => weight,
-			SetCodeHash => T::WeightInfo::seal_set_code_hash(),
+			SetCodeHash { old_code_removed } =>
+				T::WeightInfo::seal_set_code_hash(old_code_removed.into()),
 			EcdsaToEthAddress => T::WeightInfo::seal_ecdsa_to_eth_address(),
 			GetImmutableData(len) => T::WeightInfo::seal_get_immutable_data(len),
 			SetImmutableData(len) => T::WeightInfo::seal_set_immutable_data(len),
diff --git a/substrate/frame/revive/src/weights.rs b/substrate/frame/revive/src/weights.rs
index 1c0fcc68fe15..f5fe01b854f5 100644
--- a/substrate/frame/revive/src/weights.rs
+++ b/substrate/frame/revive/src/weights.rs
@@ -119,7 +119,7 @@ pub trait WeightInfo {
 	fn seal_call_data_load() -> Weight;
 	fn seal_call_data_copy(n: u32, ) -> Weight;
 	fn seal_return(n: u32, ) -> Weight;
-	fn seal_terminate() -> Weight;
+	fn seal_terminate(n:u32) -> Weight;
 	fn seal_deposit_event(t: u32, n: u32, ) -> Weight;
 	fn get_storage_empty() -> Weight;
 	fn get_storage_full() -> Weight;
@@ -157,7 +157,7 @@ pub trait WeightInfo {
 	fn bn128_pairing(n: u32, ) -> Weight;
 	fn blake2f(n: u32, ) -> Weight;
 	fn seal_ecdsa_to_eth_address() -> Weight;
-	fn seal_set_code_hash() -> Weight;
+	fn seal_set_code_hash(n: u32) -> Weight;
 	fn evm_opcode(r: u32, ) -> Weight;
 	fn instr(r: u32, ) -> Weight;
 	fn instr_empty_loop(r: u32, ) -> Weight;
@@ -771,7 +771,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `Revive::DeletionQueue` (`max_values`: None, `max_size`: Some(142), added: 2617, mode: `Measured`)
 	/// Storage: `Revive::ImmutableDataOf` (r:0 w:1)
 	/// Proof: `Revive::ImmutableDataOf` (`max_values`: None, `max_size`: Some(4118), added: 6593, mode: `Measured`)
-	fn seal_terminate() -> Weight {
+	fn seal_terminate(_u: u32) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `583`
 		//  Estimated: `4048`
@@ -1210,7 +1210,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
-	fn seal_set_code_hash() -> Weight {
+	fn seal_set_code_hash(_n: u32) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `297`
 		//  Estimated: `3762`
@@ -1880,7 +1880,7 @@ impl WeightInfo for () {
 	/// Proof: `Revive::DeletionQueue` (`max_values`: None, `max_size`: Some(142), added: 2617, mode: `Measured`)
 	/// Storage: `Revive::ImmutableDataOf` (r:0 w:1)
 	/// Proof: `Revive::ImmutableDataOf` (`max_values`: None, `max_size`: Some(4118), added: 6593, mode: `Measured`)
-	fn seal_terminate() -> Weight {
+	fn seal_terminate(_u: u32) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `583`
 		//  Estimated: `4048`
@@ -2319,7 +2319,7 @@ impl WeightInfo for () {
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
-	fn seal_set_code_hash() -> Weight {
+	fn seal_set_code_hash(_n: u32) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `297`
 		//  Estimated: `3762`

From f9aebdc04f8f11c0156fb03da740453bfa67483a Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Thu, 28 Aug 2025 18:30:57 +0200
Subject: [PATCH 166/186] add missing assert

---
 substrate/frame/revive/src/benchmarking.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/substrate/frame/revive/src/benchmarking.rs b/substrate/frame/revive/src/benchmarking.rs
index 0e3b5777396e..0162f7317217 100644
--- a/substrate/frame/revive/src/benchmarking.rs
+++ b/substrate/frame/revive/src/benchmarking.rs
@@ -1108,6 +1108,7 @@ mod benchmarks {
 		}
 
 		assert!(matches!(result, Err(crate::vm::pvm::TrapReason::Termination)));
+		assert_eq!(PristineCode::<T>::get(code_hash).is_none(), delete_code);
 
 		Ok(())
 	}

From 7232f99068c37776e08b7f0a340bebf4f63f103a Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Thu, 28 Aug 2025 18:54:42 +0200
Subject: [PATCH 167/186] tweak tests

---
 substrate/frame/revive/src/benchmarking.rs  |  2 +-
 substrate/frame/revive/src/migrations/v2.rs | 30 ++++++++++++++++++---
 substrate/frame/revive/src/tests.rs         |  2 +-
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/substrate/frame/revive/src/benchmarking.rs b/substrate/frame/revive/src/benchmarking.rs
index 0162f7317217..68f60b0fa7ff 100644
--- a/substrate/frame/revive/src/benchmarking.rs
+++ b/substrate/frame/revive/src/benchmarking.rs
@@ -2401,7 +2401,7 @@ mod benchmarks {
 			v2::Migration::<T>::step(None, &mut meter).unwrap();
 		}
 
-		v2::Migration::<T>::assert_migrated_code_info_matches(code_hash, &old_code_info);
+		v2::Migration::<T>::assert_migrated_code_info(code_hash, &old_code_info);
 
 		// uses twice the weight once for migration and then for checking if there is another key.
 		assert_eq!(meter.consumed(), <T as Config>::WeightInfo::v2_migration_step() * 2);
diff --git a/substrate/frame/revive/src/migrations/v2.rs b/substrate/frame/revive/src/migrations/v2.rs
index 9f6687285265..b059f1c5bb5b 100644
--- a/substrate/frame/revive/src/migrations/v2.rs
+++ b/substrate/frame/revive/src/migrations/v2.rs
@@ -38,7 +38,7 @@ use frame_support::{
 use alloc::{collections::btree_map::BTreeMap, vec::Vec};
 
 #[cfg(feature = "try-runtime")]
-use frame_support::sp_runtime::TryRuntimeError;
+use frame_support::{sp_runtime::TryRuntimeError, traits::fungible::InspectHold};
 
 /// Module containing the old storage items.
 mod old {
@@ -172,6 +172,7 @@ impl<T: Config> SteppedMigration for Migration<T> {
 	#[cfg(feature = "try-runtime")]
 	fn post_upgrade(prev: Vec<u8>) -> Result<(), TryRuntimeError> {
 		use codec::Decode;
+		use sp_runtime::{traits::Zero, Saturating};
 
 		// Check the state of the storage after the migration.
 		let prev_map = BTreeMap::<H256, old::CodeInfo<T>>::decode(&mut &prev[..])
@@ -184,10 +185,13 @@ impl<T: Config> SteppedMigration for Migration<T> {
 			"Migration failed: the number of items in the storage after the migration is not the same as before"
 		);
 
+		let deposit_sum: crate::BalanceOf<T> = Zero::zero();
+
 		for (key, value) in prev_map {
 			let new_value = new::CodeInfoOf::<T>::get(key)
 				.expect("Failed to get the value after the migration");
 
+			deposit_sum.saturating_add(value.deposit);
 			let expected = new::CodeInfo {
 				owner: value.owner,
 				deposit: value.deposit,
@@ -202,6 +206,20 @@ impl<T: Config> SteppedMigration for Migration<T> {
 				"Migration failed: CodeInfo mismatch for key {:?}",
 				key
 			);
+
+			assert!(<T as Config>::Currency::balance_on_hold(
+				&crate::HoldReason::CodeUploadDepositReserve.into(),
+				&expected.owner
+			)
+			.is_zero());
+
+			assert_eq!(
+				<T as Config>::Currency::balance_on_hold(
+					&crate::HoldReason::CodeUploadDepositReserve.into(),
+					&Pallet::<T>::pallet_account(),
+				),
+				deposit_sum,
+			);
 		}
 
 		Ok(())
@@ -223,11 +241,17 @@ impl<T: Config> Migration<T> {
 		code_len: u32,
 		behaviour_version: u32,
 	) -> old::CodeInfo<T> {
+		use frame_support::traits::fungible::Mutate;
+		T::Currency::mint_into(&owner, Pallet::<T>::min_balance() + deposit)
+			.expect("Failed to mint into owner account");
+		T::Currency::hold(&crate::HoldReason::CodeUploadDepositReserve.into(), &owner, deposit)
+			.expect("Failed to hold the deposit on the owner account");
+
 		old::CodeInfo { owner, deposit, refcount, code_len, behaviour_version }
 	}
 
 	/// Assert that the migrated CodeInfo matches the expected values from the old CodeInfo.
-	pub fn assert_migrated_code_info_matches(code_hash: H256, old_code_info: &old::CodeInfo<T>) {
+	pub fn assert_migrated_code_info(code_hash: H256, old_code_info: &old::CodeInfo<T>) {
 		let migrated =
 			new::CodeInfoOf::<T>::get(code_hash).expect("Failed to get migrated CodeInfo");
 
@@ -282,7 +306,7 @@ fn migrate_to_v2() {
 
 		// Verify all values match between old and new with code_type set to PVM
 		for (code_hash, old_value) in original_values {
-			Migration::<Test>::assert_migrated_code_info_matches(code_hash, &old_value);
+			Migration::<Test>::assert_migrated_code_info(code_hash, &old_value);
 		}
 	})
 }
diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index a9d2c9275311..66d1c0775c61 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -403,7 +403,7 @@ impl ExtBuilder {
 		pallet_balances::GenesisConfig::<Test> {
 			balances: vec![
 				(checking_account.clone(), 1_000_000_000_000),
-				(Pallet::<Test>::pallet_account(), 1_000_000_000_000),
+				(Pallet::<Test>::pallet_account(), Contracts::min_balance()),
 			],
 			..Default::default()
 		}

From f175c1bf293baaeef61d8a34cebeb7c1a44f11b6 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Thu, 28 Aug 2025 23:26:35 +0200
Subject: [PATCH 168/186] ensure pallet_account exits

---
 substrate/frame/revive/src/lib.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index bca76dd91314..28a8d381e132 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -545,6 +545,13 @@ pub mod pallet {
 	#[pallet::genesis_build]
 	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 		fn build(&self) {
+			if !System::<T>::account_exists(&Pallet::<T>::pallet_account()) {
+				let _ = T::Currency::mint_into(
+					&Pallet::<T>::pallet_account(),
+					T::Currency::minimum_balance(),
+				);
+			}
+
 			for id in &self.mapped_accounts {
 				if let Err(err) = T::AddressMapper::map(id) {
 					log::error!(target: LOG_TARGET, "Failed to map account {id:?}: {err:?}");

From bf19cf032a12dd07f0c698f9514cdc0414496e1f Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 29 Aug 2025 08:14:58 +0200
Subject: [PATCH 169/186] fixes

---
 .../assets/asset-hub-westend/tests/tests.rs    | 18 ++++++++++++++++++
 substrate/frame/revive/src/lib.rs              |  3 ++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs
index 3d65d3b16829..7f7df026e2fb 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs
@@ -1664,11 +1664,14 @@ fn weight_of_message_increases_when_dealing_with_erc20s() {
 fn withdraw_and_deposit_erc20s() {
 	let sender: AccountId = ALICE.into();
 	let beneficiary: AccountId = BOB.into();
+	let revive_account = pallet_revive::Pallet::<Runtime>::pallet_account();
 	let checking_account =
 		asset_hub_westend_runtime::xcm_config::ERC20TransfersCheckingAccount::get();
 	let initial_wnd_amount = 10_000_000_000_000u128;
 
 	ExtBuilder::<Runtime>::default().build().execute_with(|| {
+		// Bring the revive account to life.
+		assert_ok!(Balances::mint_into(&revive_account, initial_wnd_amount));
 		// We need to give enough funds for every account involved so they
 		// can call `Revive::map_account`.
 		assert_ok!(Balances::mint_into(&sender, initial_wnd_amount));
@@ -1729,6 +1732,7 @@ fn withdraw_and_deposit_erc20s() {
 fn non_existent_erc20_will_error() {
 	let sender: AccountId = ALICE.into();
 	let beneficiary: AccountId = BOB.into();
+	let revive_account = pallet_revive::Pallet::<Runtime>::pallet_account();
 	let checking_account =
 		asset_hub_westend_runtime::xcm_config::ERC20TransfersCheckingAccount::get();
 	let initial_wnd_amount = 10_000_000_000_000u128;
@@ -1736,6 +1740,8 @@ fn non_existent_erc20_will_error() {
 	let non_existent_contract_address = [1u8; 20];
 
 	ExtBuilder::<Runtime>::default().build().execute_with(|| {
+		// Bring the revive account to life.
+		assert_ok!(Balances::mint_into(&revive_account, initial_wnd_amount));
 		// We need to give enough funds for every account involved so they
 		// can call `Revive::map_account`.
 		assert_ok!(Balances::mint_into(&sender, initial_wnd_amount));
@@ -1772,11 +1778,15 @@ fn non_existent_erc20_will_error() {
 fn smart_contract_not_erc20_will_error() {
 	let sender: AccountId = ALICE.into();
 	let beneficiary: AccountId = BOB.into();
+	let revive_account = pallet_revive::Pallet::<Runtime>::pallet_account();
 	let checking_account =
 		asset_hub_westend_runtime::xcm_config::ERC20TransfersCheckingAccount::get();
 	let initial_wnd_amount = 10_000_000_000_000u128;
 
 	ExtBuilder::<Runtime>::default().build().execute_with(|| {
+		// Bring the revive account to life.
+		assert_ok!(Balances::mint_into(&revive_account, initial_wnd_amount));
+
 		// We need to give enough funds for every account involved so they
 		// can call `Revive::map_account`.
 		assert_ok!(Balances::mint_into(&sender, initial_wnd_amount));
@@ -1822,11 +1832,15 @@ fn smart_contract_not_erc20_will_error() {
 fn smart_contract_does_not_return_bool_fails() {
 	let sender: AccountId = ALICE.into();
 	let beneficiary: AccountId = BOB.into();
+	let revive_account = pallet_revive::Pallet::<Runtime>::pallet_account();
 	let checking_account =
 		asset_hub_westend_runtime::xcm_config::ERC20TransfersCheckingAccount::get();
 	let initial_wnd_amount = 10_000_000_000_000u128;
 
 	ExtBuilder::<Runtime>::default().build().execute_with(|| {
+		// Bring the revive account to life.
+		assert_ok!(Balances::mint_into(&revive_account, initial_wnd_amount));
+
 		// We need to give enough funds for every account involved so they
 		// can call `Revive::map_account`.
 		assert_ok!(Balances::mint_into(&sender, initial_wnd_amount));
@@ -1875,11 +1889,15 @@ fn smart_contract_does_not_return_bool_fails() {
 fn expensive_erc20_runs_out_of_gas() {
 	let sender: AccountId = ALICE.into();
 	let beneficiary: AccountId = BOB.into();
+	let revive_account = pallet_revive::Pallet::<Runtime>::pallet_account();
 	let checking_account =
 		asset_hub_westend_runtime::xcm_config::ERC20TransfersCheckingAccount::get();
 	let initial_wnd_amount = 10_000_000_000_000u128;
 
 	ExtBuilder::<Runtime>::default().build().execute_with(|| {
+		// Bring the revive account to life.
+		assert_ok!(Balances::mint_into(&revive_account, initial_wnd_amount));
+
 		// We need to give enough funds for every account involved so they
 		// can call `Revive::map_account`.
 		assert_ok!(Balances::mint_into(&sender, initial_wnd_amount));
diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index 28a8d381e132..1631bb09d5b0 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -1571,7 +1571,8 @@ where
 }
 
 impl<T: Config> Pallet<T> {
-	fn pallet_account() -> AccountIdOf<T> {
+	/// Pallet account, used to hold funds for contracts upload deposit.
+	pub fn pallet_account() -> AccountIdOf<T> {
 		use frame_support::PalletId;
 		use sp_runtime::traits::AccountIdConversion;
 		PalletId(*b"py/rev  ").into_account_truncating()

From 7211711cd9bab8825fb2fb2917dc43b5a944ed6d Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 29 Aug 2025 09:21:44 +0200
Subject: [PATCH 170/186] nit

---
 substrate/frame/revive/src/migrations/v2.rs | 60 +++++++++------------
 substrate/frame/revive/src/vm/mod.rs        |  5 +-
 2 files changed, 26 insertions(+), 39 deletions(-)

diff --git a/substrate/frame/revive/src/migrations/v2.rs b/substrate/frame/revive/src/migrations/v2.rs
index b059f1c5bb5b..0d43cbf2840e 100644
--- a/substrate/frame/revive/src/migrations/v2.rs
+++ b/substrate/frame/revive/src/migrations/v2.rs
@@ -160,9 +160,11 @@ impl<T: Config> SteppedMigration for Migration<T> {
 		use codec::Encode;
 
 		if !frame_system::Pallet::<T>::account_exists(&Pallet::<T>::pallet_account()) {
-			return Err(TryRuntimeError::Other(
-				"pallet_account should exist before running the migration",
-			))
+			log::error!(
+				target: LOG_TARGET,
+				"Revive account {:?} should be created before running the migration", Pallet::<T>::pallet_account()
+			);
+			return Err(TryRuntimeError::Other("Revive account does not exist"))
 		}
 
 		// Return the state of the storage before the migration.
@@ -187,46 +189,24 @@ impl<T: Config> SteppedMigration for Migration<T> {
 
 		let deposit_sum: crate::BalanceOf<T> = Zero::zero();
 
-		for (key, value) in prev_map {
-			let new_value = new::CodeInfoOf::<T>::get(key)
-				.expect("Failed to get the value after the migration");
-
-			deposit_sum.saturating_add(value.deposit);
-			let expected = new::CodeInfo {
-				owner: value.owner,
-				deposit: value.deposit,
-				refcount: value.refcount,
-				code_len: value.code_len,
-				code_type: BytecodeType::Pvm,
-				behaviour_version: value.behaviour_version,
-			};
-
-			assert_eq!(
-				new_value, expected,
-				"Migration failed: CodeInfo mismatch for key {:?}",
-				key
-			);
+		for (code_hash, old_code_info) in prev_map {
+			deposit_sum.saturating_add(old_code_info.deposit);
+			Self::assert_migrated_code_info(code_hash, &old_code_info);
+		}
 
-			assert!(<T as Config>::Currency::balance_on_hold(
+		assert_eq!(
+			<T as Config>::Currency::balance_on_hold(
 				&crate::HoldReason::CodeUploadDepositReserve.into(),
-				&expected.owner
-			)
-			.is_zero());
-
-			assert_eq!(
-				<T as Config>::Currency::balance_on_hold(
-					&crate::HoldReason::CodeUploadDepositReserve.into(),
-					&Pallet::<T>::pallet_account(),
-				),
-				deposit_sum,
-			);
-		}
+				&Pallet::<T>::pallet_account(),
+			),
+			deposit_sum,
+		);
 
 		Ok(())
 	}
 }
 
-#[cfg(any(feature = "runtime-benchmarks", test))]
+#[cfg(any(feature = "runtime-benchmarks", feature = "try-runtime", test))]
 impl<T: Config> Migration<T> {
 	/// Insert an old CodeInfo for benchmarking purposes.
 	pub fn insert_old_code_info(code_hash: H256, code_info: old::CodeInfo<T>) {
@@ -252,9 +232,17 @@ impl<T: Config> Migration<T> {
 
 	/// Assert that the migrated CodeInfo matches the expected values from the old CodeInfo.
 	pub fn assert_migrated_code_info(code_hash: H256, old_code_info: &old::CodeInfo<T>) {
+		use frame_support::traits::fungible::InspectHold;
+		use sp_runtime::traits::Zero;
 		let migrated =
 			new::CodeInfoOf::<T>::get(code_hash).expect("Failed to get migrated CodeInfo");
 
+		assert!(<T as Config>::Currency::balance_on_hold(
+			&crate::HoldReason::CodeUploadDepositReserve.into(),
+			&old_code_info.owner
+		)
+		.is_zero());
+
 		assert_eq!(
 			migrated,
 			new::CodeInfo {
diff --git a/substrate/frame/revive/src/vm/mod.rs b/substrate/frame/revive/src/vm/mod.rs
index 9dfa1c116ec4..32d012c355e0 100644
--- a/substrate/frame/revive/src/vm/mod.rs
+++ b/substrate/frame/revive/src/vm/mod.rs
@@ -108,10 +108,9 @@ pub struct CodeInfo<T: Config> {
 /// Calculate the deposit required for storing code and its metadata.
 pub fn calculate_code_deposit<T: Config>(code_len: u32) -> BalanceOf<T> {
 	let bytes_added = code_len.saturating_add(<CodeInfo<T>>::max_encoded_len() as u32);
-	let deposit = Diff { bytes_added, items_added: 2, ..Default::default() }
+	Diff { bytes_added, items_added: 2, ..Default::default() }
 		.update_contract::<T>(None)
-		.charge_or_zero();
-	deposit
+		.charge_or_zero()
 }
 
 impl ExportedFunction {

From c1ba77dfb778f6de6383807df24ec8e9c6af21aa Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 29 Aug 2025 09:25:34 +0200
Subject: [PATCH 171/186] update comment

---
 substrate/frame/revive/src/lib.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index 1631bb09d5b0..94a90d7cea4f 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -930,8 +930,7 @@ pub mod pallet {
 		/// Upload new `code` without instantiating a contract from it.
 		///
 		/// If the code does not already exist a deposit is reserved from the caller
-		/// and unreserved only when [`Self::remove_code`] is called. The size of the reserve
-		/// depends on the size of the supplied `code`.
+		/// The size of the reserve depends on the size of the supplied `code`.
 		///
 		/// # Note
 		///
@@ -939,6 +938,9 @@ pub mod pallet {
 		/// To avoid this situation a constructor could employ access control so that it can
 		/// only be instantiated by permissioned entities. The same is true when uploading
 		/// through [`Self::instantiate_with_code`].
+		///
+		///If the refcount of the code reaches zero after terminating the last contract that
+		/// references this code, the code will be removed automatically.
 		#[pallet::call_index(4)]
 		#[pallet::weight(T::WeightInfo::upload_code(code.len() as u32))]
 		pub fn upload_code(

From 46f6dfb156bae790395a7c1612383df2361aa6a9 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 29 Aug 2025 10:04:59 +0200
Subject: [PATCH 172/186] Add back remove_code

---
 substrate/frame/revive/src/benchmarking.rs | 24 ++++++
 substrate/frame/revive/src/lib.rs          | 20 ++++-
 substrate/frame/revive/src/tests/pvm.rs    | 89 ++++++++++++++++++++++
 substrate/frame/revive/src/vm/mod.rs       | 31 +++++++-
 4 files changed, 160 insertions(+), 4 deletions(-)

diff --git a/substrate/frame/revive/src/benchmarking.rs b/substrate/frame/revive/src/benchmarking.rs
index 68f60b0fa7ff..64c3b9543a6c 100644
--- a/substrate/frame/revive/src/benchmarking.rs
+++ b/substrate/frame/revive/src/benchmarking.rs
@@ -460,6 +460,30 @@ mod benchmarks {
 		assert!(<Contract<T>>::code_exists(&hash));
 	}
 
+	// Removing code does not depend on the size of the contract because all the information
+	// needed to verify the removal claim (refcount, owner) is stored in a separate storage
+	// item (`CodeInfoOf`).
+	#[benchmark(pov_mode = Measured)]
+	fn remove_code() -> Result<(), BenchmarkError> {
+		let caller = whitelisted_caller();
+		let pallet_account = Pallet::<T>::pallet_account();
+		T::Currency::set_balance(&caller, caller_funding::<T>());
+		let VmBinaryModule { code, hash, .. } = VmBinaryModule::dummy();
+		let origin = RawOrigin::Signed(caller.clone());
+		let storage_deposit = default_deposit_limit::<T>();
+		let uploaded =
+			<Contracts<T>>::bare_upload_code(origin.clone().into(), code, storage_deposit)?;
+		assert_eq!(uploaded.code_hash, hash);
+		assert_eq!(uploaded.deposit, T::Currency::total_balance_on_hold(&pallet_account));
+		assert!(<Contract<T>>::code_exists(&hash));
+		#[extrinsic_call]
+		_(origin, hash);
+		// removing the code should have unreserved the deposit
+		assert_eq!(T::Currency::total_balance_on_hold(&pallet_account), 0u32.into());
+		assert!(<Contract<T>>::code_removed(&hash));
+		Ok(())
+	}
+
 	#[benchmark(pov_mode = Measured)]
 	fn set_code() -> Result<(), BenchmarkError> {
 		let instance =
diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index 94a90d7cea4f..f040d7121fc3 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -61,8 +61,8 @@ use codec::{Codec, Decode, Encode};
 use environmental::*;
 use frame_support::{
 	dispatch::{
-		DispatchErrorWithPostInfo, DispatchResultWithPostInfo, GetDispatchInfo, PostDispatchInfo,
-		RawOrigin,
+		DispatchErrorWithPostInfo, DispatchResultWithPostInfo, GetDispatchInfo, Pays,
+		PostDispatchInfo, RawOrigin,
 	},
 	ensure,
 	pallet_prelude::DispatchClass,
@@ -951,6 +951,22 @@ pub mod pallet {
 			Self::bare_upload_code(origin, code, storage_deposit_limit).map(|_| ())
 		}
 
+		/// Remove the code stored under `code_hash` and refund the deposit to its owner.
+		///
+		/// A code can only be removed by its original uploader (its owner) and only if it is
+		/// not used by any contract.
+		#[pallet::call_index(5)]
+		#[pallet::weight(T::WeightInfo::remove_code())]
+		pub fn remove_code(
+			origin: OriginFor<T>,
+			code_hash: sp_core::H256,
+		) -> DispatchResultWithPostInfo {
+			let origin = ensure_signed(origin)?;
+			<ContractBlob<T>>::remove(&origin, code_hash)?;
+			// we waive the fee because removing unused code is beneficial
+			Ok(Pays::No.into())
+		}
+
 		/// Privileged function that changes the code of an existing contract.
 		///
 		/// This takes care of updating refcounts and all other necessary operations. Returns
diff --git a/substrate/frame/revive/src/tests/pvm.rs b/substrate/frame/revive/src/tests/pvm.rs
index 9235ebf460b2..fbe0c485483b 100644
--- a/substrate/frame/revive/src/tests/pvm.rs
+++ b/substrate/frame/revive/src/tests/pvm.rs
@@ -1951,6 +1951,83 @@ fn upload_code_not_enough_balance() {
 	});
 }
 
+#[test]
+fn remove_code_works() {
+	let (binary, code_hash) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Drop previous events
+		initialize_block(2);
+
+		assert_ok!(Contracts::upload_code(RuntimeOrigin::signed(ALICE), binary, 1_000,));
+		// Ensure the contract was stored and get expected deposit amount to be reserved.
+		expected_deposit(ensure_stored(code_hash));
+		assert_ok!(Contracts::remove_code(RuntimeOrigin::signed(ALICE), code_hash));
+	});
+}
+#[test]
+fn remove_code_wrong_origin() {
+	let (binary, code_hash) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Drop previous events
+		initialize_block(2);
+
+		assert_ok!(Contracts::upload_code(RuntimeOrigin::signed(ALICE), binary, 1_000,));
+		// Ensure the contract was stored and get expected deposit amount to be reserved.
+		expected_deposit(ensure_stored(code_hash));
+
+		assert_noop!(
+			Contracts::remove_code(RuntimeOrigin::signed(BOB), code_hash),
+			sp_runtime::traits::BadOrigin,
+		);
+	});
+}
+
+#[test]
+fn remove_code_in_use() {
+	let (binary, code_hash) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		assert_ok!(builder::instantiate_with_code(binary).build());
+
+		// Drop previous events
+		initialize_block(2);
+
+		assert_noop!(
+			Contracts::remove_code(RuntimeOrigin::signed(ALICE), code_hash),
+			<Error<Test>>::CodeInUse,
+		);
+
+		assert_eq!(System::events(), vec![]);
+	});
+}
+
+#[test]
+fn remove_code_not_found() {
+	let (_binary, code_hash) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		let _ = <Test as Config>::Currency::set_balance(&ALICE, 1_000_000);
+
+		// Drop previous events
+		initialize_block(2);
+
+		assert_noop!(
+			Contracts::remove_code(RuntimeOrigin::signed(ALICE), code_hash),
+			<Error<Test>>::CodeNotFound,
+		);
+
+		assert_eq!(System::events(), vec![]);
+	});
+}
+
 #[test]
 fn instantiate_with_zero_balance_works() {
 	let (binary, code_hash) = compile_module("dummy").unwrap();
@@ -2890,6 +2967,18 @@ fn root_cannot_upload_code() {
 	});
 }
 
+#[test]
+fn root_cannot_remove_code() {
+	let (_, code_hash) = compile_module("dummy").unwrap();
+
+	ExtBuilder::default().build().execute_with(|| {
+		assert_noop!(
+			Contracts::remove_code(RuntimeOrigin::root(), code_hash),
+			DispatchError::BadOrigin,
+		);
+	});
+}
+
 #[test]
 fn signed_cannot_set_code() {
 	let (_, code_hash) = compile_module("dummy").unwrap();
diff --git a/substrate/frame/revive/src/vm/mod.rs b/substrate/frame/revive/src/vm/mod.rs
index 32d012c355e0..f0d8ff8c44b8 100644
--- a/substrate/frame/revive/src/vm/mod.rs
+++ b/substrate/frame/revive/src/vm/mod.rs
@@ -26,7 +26,7 @@ pub use runtime_costs::RuntimeCosts;
 
 use crate::{
 	exec::{ExecResult, Executable, ExportedFunction, Ext},
-	frame_support::traits::tokens::Restriction,
+	frame_support::{ensure, error::BadOrigin, traits::tokens::Restriction},
 	gas::{GasMeter, Token},
 	storage::meter::Diff,
 	weights::WeightInfo,
@@ -165,6 +165,33 @@ impl<T: Config> ContractBlob<T>
 where
 	BalanceOf<T>: Into<U256> + TryFrom<U256>,
 {
+	/// Remove the code from storage and refund the deposit to its owner.
+	///
+	/// Applies all necessary checks before removing the code.
+	pub fn remove(origin: &T::AccountId, code_hash: H256) -> DispatchResult {
+		<CodeInfoOf<T>>::try_mutate_exists(&code_hash, |existing| {
+			if let Some(code_info) = existing {
+				ensure!(code_info.refcount == 0, <Error<T>>::CodeInUse);
+				ensure!(&code_info.owner == origin, BadOrigin);
+				T::Currency::transfer_on_hold(
+					&HoldReason::CodeUploadDepositReserve.into(),
+					&crate::Pallet::<T>::pallet_account(),
+					&code_info.owner,
+					code_info.deposit,
+					Precision::Exact,
+					Restriction::Free,
+					Fortitude::Polite,
+				)?;
+
+				*existing = None;
+				<PristineCode<T>>::remove(&code_hash);
+				Ok(())
+			} else {
+				Err(<Error<T>>::CodeNotFound.into())
+			}
+		})
+	}
+
 	/// Puts the module blob into storage, and returns the deposit collected for the storage.
 	pub fn store_code(&mut self, skip_transfer: bool) -> Result<BalanceOf<T>, Error<T>> {
 		let code_hash = *self.code_hash();
@@ -275,8 +302,8 @@ impl<T: Config> CodeInfo<T> {
 					Fortitude::Polite,
 				)?;
 
-				<PristineCode<T>>::remove(&code_hash);
 				*existing = None;
+				<PristineCode<T>>::remove(&code_hash);
 
 				Ok(CodeRemoved::Yes)
 			} else {

From 546d65dd54baf0440845856530b767fdc02fd682 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 29 Aug 2025 10:37:39 +0200
Subject: [PATCH 173/186] nit

---
 .../assets/asset-hub-westend/tests/tests.rs        | 10 +++++-----
 substrate/frame/revive/src/benchmarking.rs         | 14 +++++++-------
 substrate/frame/revive/src/lib.rs                  |  7 ++++---
 substrate/frame/revive/src/migrations/v2.rs        |  8 ++++----
 substrate/frame/revive/src/tests.rs                |  8 ++++----
 substrate/frame/revive/src/tests/pvm.rs            |  6 +++---
 substrate/frame/revive/src/vm/mod.rs               |  6 +++---
 7 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs
index 7f7df026e2fb..52bb4a74cdb6 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs
@@ -1664,7 +1664,7 @@ fn weight_of_message_increases_when_dealing_with_erc20s() {
 fn withdraw_and_deposit_erc20s() {
 	let sender: AccountId = ALICE.into();
 	let beneficiary: AccountId = BOB.into();
-	let revive_account = pallet_revive::Pallet::<Runtime>::pallet_account();
+	let revive_account = pallet_revive::Pallet::<Runtime>::account_id();
 	let checking_account =
 		asset_hub_westend_runtime::xcm_config::ERC20TransfersCheckingAccount::get();
 	let initial_wnd_amount = 10_000_000_000_000u128;
@@ -1732,7 +1732,7 @@ fn withdraw_and_deposit_erc20s() {
 fn non_existent_erc20_will_error() {
 	let sender: AccountId = ALICE.into();
 	let beneficiary: AccountId = BOB.into();
-	let revive_account = pallet_revive::Pallet::<Runtime>::pallet_account();
+	let revive_account = pallet_revive::Pallet::<Runtime>::account_id();
 	let checking_account =
 		asset_hub_westend_runtime::xcm_config::ERC20TransfersCheckingAccount::get();
 	let initial_wnd_amount = 10_000_000_000_000u128;
@@ -1778,7 +1778,7 @@ fn non_existent_erc20_will_error() {
 fn smart_contract_not_erc20_will_error() {
 	let sender: AccountId = ALICE.into();
 	let beneficiary: AccountId = BOB.into();
-	let revive_account = pallet_revive::Pallet::<Runtime>::pallet_account();
+	let revive_account = pallet_revive::Pallet::<Runtime>::account_id();
 	let checking_account =
 		asset_hub_westend_runtime::xcm_config::ERC20TransfersCheckingAccount::get();
 	let initial_wnd_amount = 10_000_000_000_000u128;
@@ -1832,7 +1832,7 @@ fn smart_contract_not_erc20_will_error() {
 fn smart_contract_does_not_return_bool_fails() {
 	let sender: AccountId = ALICE.into();
 	let beneficiary: AccountId = BOB.into();
-	let revive_account = pallet_revive::Pallet::<Runtime>::pallet_account();
+	let revive_account = pallet_revive::Pallet::<Runtime>::account_id();
 	let checking_account =
 		asset_hub_westend_runtime::xcm_config::ERC20TransfersCheckingAccount::get();
 	let initial_wnd_amount = 10_000_000_000_000u128;
@@ -1889,7 +1889,7 @@ fn smart_contract_does_not_return_bool_fails() {
 fn expensive_erc20_runs_out_of_gas() {
 	let sender: AccountId = ALICE.into();
 	let beneficiary: AccountId = BOB.into();
-	let revive_account = pallet_revive::Pallet::<Runtime>::pallet_account();
+	let revive_account = pallet_revive::Pallet::<Runtime>::account_id();
 	let checking_account =
 		asset_hub_westend_runtime::xcm_config::ERC20TransfersCheckingAccount::get();
 	let initial_wnd_amount = 10_000_000_000_000u128;
diff --git a/substrate/frame/revive/src/benchmarking.rs b/substrate/frame/revive/src/benchmarking.rs
index 64c3b9543a6c..d2366ba17350 100644
--- a/substrate/frame/revive/src/benchmarking.rs
+++ b/substrate/frame/revive/src/benchmarking.rs
@@ -235,7 +235,7 @@ mod benchmarks {
 		// uploading the code reserves some balance in the pallet's account
 		let code_deposit = T::Currency::balance_on_hold(
 			&HoldReason::CodeUploadDepositReserve.into(),
-			&Pallet::<T>::pallet_account(),
+			&Pallet::<T>::account_id(),
 		);
 		let mapping_deposit =
 			T::Currency::balance_on_hold(&HoldReason::AddressMapping.into(), &caller);
@@ -287,7 +287,7 @@ mod benchmarks {
 		// uploading the code reserves some balance in the pallet account
 		let code_deposit = T::Currency::balance_on_hold(
 			&HoldReason::CodeUploadDepositReserve.into(),
-			&Pallet::<T>::pallet_account(),
+			&Pallet::<T>::account_id(),
 		);
 		let mapping_deposit =
 			T::Currency::balance_on_hold(&HoldReason::AddressMapping.into(), &caller);
@@ -333,7 +333,7 @@ mod benchmarks {
 			T::Currency::balance_on_hold(&HoldReason::StorageDepositReserve.into(), &account_id);
 		let code_deposit = T::Currency::balance_on_hold(
 			&HoldReason::CodeUploadDepositReserve.into(),
-			&Pallet::<T>::pallet_account(),
+			&Pallet::<T>::account_id(),
 		);
 		let mapping_deposit =
 			T::Currency::balance_on_hold(&HoldReason::AddressMapping.into(), &account_id);
@@ -375,7 +375,7 @@ mod benchmarks {
 		);
 		let code_deposit = T::Currency::balance_on_hold(
 			&HoldReason::CodeUploadDepositReserve.into(),
-			&Pallet::<T>::pallet_account(),
+			&Pallet::<T>::account_id(),
 		);
 		let mapping_deposit =
 			T::Currency::balance_on_hold(&HoldReason::AddressMapping.into(), &instance.caller);
@@ -419,7 +419,7 @@ mod benchmarks {
 		);
 		let code_deposit = T::Currency::balance_on_hold(
 			&HoldReason::CodeUploadDepositReserve.into(),
-			&Pallet::<T>::pallet_account(),
+			&Pallet::<T>::account_id(),
 		);
 		let mapping_deposit =
 			T::Currency::balance_on_hold(&HoldReason::AddressMapping.into(), &instance.caller);
@@ -456,7 +456,7 @@ mod benchmarks {
 		#[extrinsic_call]
 		_(origin, code, storage_deposit);
 		// uploading the code reserves some balance in the pallet's account
-		assert!(T::Currency::total_balance_on_hold(&Pallet::<T>::pallet_account()) > 0u32.into());
+		assert!(T::Currency::total_balance_on_hold(&Pallet::<T>::account_id()) > 0u32.into());
 		assert!(<Contract<T>>::code_exists(&hash));
 	}
 
@@ -466,7 +466,7 @@ mod benchmarks {
 	#[benchmark(pov_mode = Measured)]
 	fn remove_code() -> Result<(), BenchmarkError> {
 		let caller = whitelisted_caller();
-		let pallet_account = Pallet::<T>::pallet_account();
+		let pallet_account = Pallet::<T>::account_id();
 		T::Currency::set_balance(&caller, caller_funding::<T>());
 		let VmBinaryModule { code, hash, .. } = VmBinaryModule::dummy();
 		let origin = RawOrigin::Signed(caller.clone());
diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index f040d7121fc3..62dbb1068930 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -545,9 +545,9 @@ pub mod pallet {
 	#[pallet::genesis_build]
 	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 		fn build(&self) {
-			if !System::<T>::account_exists(&Pallet::<T>::pallet_account()) {
+			if !System::<T>::account_exists(&Pallet::<T>::account_id()) {
 				let _ = T::Currency::mint_into(
-					&Pallet::<T>::pallet_account(),
+					&Pallet::<T>::account_id(),
 					T::Currency::minimum_balance(),
 				);
 			}
@@ -1590,11 +1590,12 @@ where
 
 impl<T: Config> Pallet<T> {
 	/// Pallet account, used to hold funds for contracts upload deposit.
-	pub fn pallet_account() -> AccountIdOf<T> {
+	pub fn account_id() -> T::AccountId {
 		use frame_support::PalletId;
 		use sp_runtime::traits::AccountIdConversion;
 		PalletId(*b"py/rev  ").into_account_truncating()
 	}
+
 	/// Returns true if the evm value carries dust.
 	fn has_dust(value: U256) -> bool {
 		value % U256::from(<T>::NativeToEthRatio::get()) != U256::zero()
diff --git a/substrate/frame/revive/src/migrations/v2.rs b/substrate/frame/revive/src/migrations/v2.rs
index 0d43cbf2840e..42e8e745a790 100644
--- a/substrate/frame/revive/src/migrations/v2.rs
+++ b/substrate/frame/revive/src/migrations/v2.rs
@@ -122,7 +122,7 @@ impl<T: Config> SteppedMigration for Migration<T> {
 				if let Err(err) = T::Currency::transfer_on_hold(
 					&crate::HoldReason::CodeUploadDepositReserve.into(),
 					&value.owner,
-					&Pallet::<T>::pallet_account(),
+					&Pallet::<T>::account_id(),
 					value.deposit,
 					Precision::Exact,
 					Restriction::OnHold,
@@ -159,10 +159,10 @@ impl<T: Config> SteppedMigration for Migration<T> {
 	fn pre_upgrade() -> Result<Vec<u8>, TryRuntimeError> {
 		use codec::Encode;
 
-		if !frame_system::Pallet::<T>::account_exists(&Pallet::<T>::pallet_account()) {
+		if !frame_system::Pallet::<T>::account_exists(&Pallet::<T>::account_id()) {
 			log::error!(
 				target: LOG_TARGET,
-				"Revive account {:?} should be created before running the migration", Pallet::<T>::pallet_account()
+				"Revive account {:?} should be created before running the migration", Pallet::<T>::account_id()
 			);
 			return Err(TryRuntimeError::Other("Revive account does not exist"))
 		}
@@ -197,7 +197,7 @@ impl<T: Config> SteppedMigration for Migration<T> {
 		assert_eq!(
 			<T as Config>::Currency::balance_on_hold(
 				&crate::HoldReason::CodeUploadDepositReserve.into(),
-				&Pallet::<T>::pallet_account(),
+				&Pallet::<T>::account_id(),
 			),
 			deposit_sum,
 		);
diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index 66d1c0775c61..55abd635de7f 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -215,7 +215,7 @@ impl Test {
 	}
 
 	pub fn set_allow_evm_bytecode(allow_evm_bytecode: bool) {
-		ALLOW_E_V_M_BYTECODE.with(|v| *v.borrow_mut() = allow_evm_bytecode);
+		ALLOW_EVM_BYTECODE.with(|v| *v.borrow_mut() = allow_evm_bytecode);
 	}
 }
 
@@ -325,7 +325,7 @@ where
 }
 parameter_types! {
 	pub static UnstableInterface: bool = true;
-	pub static AllowEVMBytecode: bool = true;
+	pub static AllowEvmBytecode: bool = true;
 	pub CheckingAccount: AccountId32 = BOB.clone();
 }
 
@@ -346,7 +346,7 @@ impl Config for Test {
 	type DepositPerByte = DepositPerByte;
 	type DepositPerItem = DepositPerItem;
 	type UnsafeUnstableInterface = UnstableInterface;
-	type AllowEVMBytecode = AllowEVMBytecode;
+	type AllowEVMBytecode = AllowEvmBytecode;
 	type UploadOrigin = EnsureAccount<Self, UploadAccount>;
 	type InstantiateOrigin = EnsureAccount<Self, InstantiateAccount>;
 	type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent;
@@ -403,7 +403,7 @@ impl ExtBuilder {
 		pallet_balances::GenesisConfig::<Test> {
 			balances: vec![
 				(checking_account.clone(), 1_000_000_000_000),
-				(Pallet::<Test>::pallet_account(), Contracts::min_balance()),
+				(Pallet::<Test>::account_id(), Contracts::min_balance()),
 			],
 			..Default::default()
 		}
diff --git a/substrate/frame/revive/src/tests/pvm.rs b/substrate/frame/revive/src/tests/pvm.rs
index fbe0c485483b..c21dfe3ad02a 100644
--- a/substrate/frame/revive/src/tests/pvm.rs
+++ b/substrate/frame/revive/src/tests/pvm.rs
@@ -1046,7 +1046,7 @@ fn self_destruct_works() {
 						reason: <Test as Config>::RuntimeHoldReason::Contracts(
 							HoldReason::CodeUploadDepositReserve,
 						),
-						source: Pallet::<Test>::pallet_account(),
+						source: Pallet::<Test>::account_id(),
 						dest: ALICE,
 						amount: upload_deposit,
 					}),
@@ -2059,7 +2059,7 @@ fn instantiate_with_zero_balance_works() {
 					phase: Phase::Initialization,
 					event: RuntimeEvent::Balances(pallet_balances::Event::TransferAndHold {
 						source: ALICE,
-						dest: Pallet::<Test>::pallet_account(),
+						dest: Pallet::<Test>::account_id(),
 						transferred: 777,
 						reason: <Test as Config>::RuntimeHoldReason::Contracts(
 							HoldReason::CodeUploadDepositReserve,
@@ -2148,7 +2148,7 @@ fn instantiate_with_below_existential_deposit_works() {
 					phase: Phase::Initialization,
 					event: RuntimeEvent::Balances(pallet_balances::Event::TransferAndHold {
 						source: ALICE,
-						dest: Pallet::<Test>::pallet_account(),
+						dest: Pallet::<Test>::account_id(),
 						transferred: 777,
 						reason: <Test as Config>::RuntimeHoldReason::Contracts(
 							HoldReason::CodeUploadDepositReserve,
diff --git a/substrate/frame/revive/src/vm/mod.rs b/substrate/frame/revive/src/vm/mod.rs
index f0d8ff8c44b8..e28d2de668f0 100644
--- a/substrate/frame/revive/src/vm/mod.rs
+++ b/substrate/frame/revive/src/vm/mod.rs
@@ -175,7 +175,7 @@ where
 				ensure!(&code_info.owner == origin, BadOrigin);
 				T::Currency::transfer_on_hold(
 					&HoldReason::CodeUploadDepositReserve.into(),
-					&crate::Pallet::<T>::pallet_account(),
+					&crate::Pallet::<T>::account_id(),
 					&code_info.owner,
 					code_info.deposit,
 					Precision::Exact,
@@ -210,7 +210,7 @@ where
 						T::Currency::transfer_and_hold(
 							&HoldReason::CodeUploadDepositReserve.into(),
 							&self.code_info.owner,
-							&crate::Pallet::<T>::pallet_account(), deposit,
+							&crate::Pallet::<T>::account_id(), deposit,
 							Precision::Exact,
 							Preservation::Preserve,
 							Fortitude::Polite,
@@ -294,7 +294,7 @@ impl<T: Config> CodeInfo<T> {
 			if code_info.refcount == 1 {
 				T::Currency::transfer_on_hold(
 					&HoldReason::CodeUploadDepositReserve.into(),
-					&crate::Pallet::<T>::pallet_account(),
+					&crate::Pallet::<T>::account_id(),
 					&code_info.owner,
 					code_info.deposit,
 					Precision::Exact,

From d820477333c01217d6743c465713237c16ae3e29 Mon Sep 17 00:00:00 2001
From: PG Herveou <pgherveou@gmail.com>
Date: Fri, 29 Aug 2025 14:20:47 +0200
Subject: [PATCH 174/186] Update substrate/frame/revive/src/lib.rs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Alexander Theißen <alex.theissen@me.com>
---
 substrate/frame/revive/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index 62dbb1068930..debbcff53775 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -939,7 +939,7 @@ pub mod pallet {
 		/// only be instantiated by permissioned entities. The same is true when uploading
 		/// through [`Self::instantiate_with_code`].
 		///
-		///If the refcount of the code reaches zero after terminating the last contract that
+		/// If the refcount of the code reaches zero after terminating the last contract that
 		/// references this code, the code will be removed automatically.
 		#[pallet::call_index(4)]
 		#[pallet::weight(T::WeightInfo::upload_code(code.len() as u32))]

From c16e6ced3a39e09bb3b342dfeab15377d040bb01 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 29 Aug 2025 14:31:11 +0200
Subject: [PATCH 175/186] mint balance in migration

---
 substrate/frame/revive/src/lib.rs           | 2 +-
 substrate/frame/revive/src/migrations/v2.rs | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index debbcff53775..3de742e6f2fb 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -1593,7 +1593,7 @@ impl<T: Config> Pallet<T> {
 	pub fn account_id() -> T::AccountId {
 		use frame_support::PalletId;
 		use sp_runtime::traits::AccountIdConversion;
-		PalletId(*b"py/rev  ").into_account_truncating()
+		PalletId(*b"py/reviv").into_account_truncating()
 	}
 
 	/// Returns true if the evm value carries dust.
diff --git a/substrate/frame/revive/src/migrations/v2.rs b/substrate/frame/revive/src/migrations/v2.rs
index 42e8e745a790..04f7a6b158fa 100644
--- a/substrate/frame/revive/src/migrations/v2.rs
+++ b/substrate/frame/revive/src/migrations/v2.rs
@@ -107,6 +107,11 @@ impl<T: Config> SteppedMigration for Migration<T> {
 			return Err(SteppedMigrationError::InsufficientWeight { required });
 		}
 
+		if !System::<T>::account_exists(&Pallet::<T>::account_id()) {
+			let _ =
+				T::Currency::mint_into(&Pallet::<T>::account_id(), T::Currency::minimum_balance());
+		}
+
 		loop {
 			if meter.try_consume(required).is_err() {
 				break;

From 1541263dc69720028f1366816799b5c84a4d5833 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 29 Aug 2025 14:33:04 +0200
Subject: [PATCH 176/186] rm check

---
 substrate/frame/revive/src/migrations/v2.rs | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/substrate/frame/revive/src/migrations/v2.rs b/substrate/frame/revive/src/migrations/v2.rs
index 04f7a6b158fa..31a41fcd21f8 100644
--- a/substrate/frame/revive/src/migrations/v2.rs
+++ b/substrate/frame/revive/src/migrations/v2.rs
@@ -164,14 +164,6 @@ impl<T: Config> SteppedMigration for Migration<T> {
 	fn pre_upgrade() -> Result<Vec<u8>, TryRuntimeError> {
 		use codec::Encode;
 
-		if !frame_system::Pallet::<T>::account_exists(&Pallet::<T>::account_id()) {
-			log::error!(
-				target: LOG_TARGET,
-				"Revive account {:?} should be created before running the migration", Pallet::<T>::account_id()
-			);
-			return Err(TryRuntimeError::Other("Revive account does not exist"))
-		}
-
 		// Return the state of the storage before the migration.
 		Ok(old::CodeInfoOf::<T>::iter().collect::<BTreeMap<_, _>>().encode())
 	}

From 0a8935c09910575ca860a76127d2c3dcb2f3b3a8 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 29 Aug 2025 14:34:35 +0200
Subject: [PATCH 177/186] fmt

---
 substrate/frame/revive/src/vm/mod.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/substrate/frame/revive/src/vm/mod.rs b/substrate/frame/revive/src/vm/mod.rs
index e28d2de668f0..d7ddf3ed24d5 100644
--- a/substrate/frame/revive/src/vm/mod.rs
+++ b/substrate/frame/revive/src/vm/mod.rs
@@ -210,7 +210,8 @@ where
 						T::Currency::transfer_and_hold(
 							&HoldReason::CodeUploadDepositReserve.into(),
 							&self.code_info.owner,
-							&crate::Pallet::<T>::account_id(), deposit,
+							&crate::Pallet::<T>::account_id(),
+							deposit,
 							Precision::Exact,
 							Preservation::Preserve,
 							Fortitude::Polite,

From 692abb2810e1a4b9f5f9b213398adb19056ea4d8 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 29 Aug 2025 14:41:12 +0200
Subject: [PATCH 178/186] fixes

---
 substrate/frame/revive/src/migrations/v2.rs |  4 ++--
 substrate/frame/revive/src/vm/evm.rs        | 17 +++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/substrate/frame/revive/src/migrations/v2.rs b/substrate/frame/revive/src/migrations/v2.rs
index 31a41fcd21f8..a0ee709994d7 100644
--- a/substrate/frame/revive/src/migrations/v2.rs
+++ b/substrate/frame/revive/src/migrations/v2.rs
@@ -28,7 +28,7 @@ use frame_support::{
 	migrations::{MigrationId, SteppedMigration, SteppedMigrationError},
 	pallet_prelude::PhantomData,
 	traits::{
-		fungible::MutateHold,
+		fungible::{Inspect, Mutate, MutateHold},
 		tokens::{Fortitude, Precision, Restriction},
 	},
 	weights::WeightMeter,
@@ -107,7 +107,7 @@ impl<T: Config> SteppedMigration for Migration<T> {
 			return Err(SteppedMigrationError::InsufficientWeight { required });
 		}
 
-		if !System::<T>::account_exists(&Pallet::<T>::account_id()) {
+		if frame_system::Pallet::<T>::account_exists(&Pallet::<T>::account_id()) {
 			let _ =
 				T::Currency::mint_into(&Pallet::<T>::account_id(), T::Currency::minimum_balance());
 		}
diff --git a/substrate/frame/revive/src/vm/evm.rs b/substrate/frame/revive/src/vm/evm.rs
index b0f7f65aeec5..52ec7b296b2c 100644
--- a/substrate/frame/revive/src/vm/evm.rs
+++ b/substrate/frame/revive/src/vm/evm.rs
@@ -34,7 +34,7 @@ use revm::{
 		interpreter_types::InputsTr,
 		CallInput, Gas, Interpreter, InterpreterResult, InterpreterTypes, SharedMemory, Stack,
 	},
-	primitives::{self, hardfork::SpecId, Address},
+	primitives::{self, hardfork::SpecId, Address, Bytes},
 };
 
 impl<T: Config> ContractBlob<T> {
@@ -54,7 +54,14 @@ impl<T: Config> ContractBlob<T> {
 			behaviour_version: Default::default(),
 		};
 
-		Self::from_evm_code(code, code_info)
+		Bytecode::new_raw_checked(Bytes::from(code.to_vec())).map_err(|err| {
+			log::debug!(target: LOG_TARGET, "failed to create evm bytecode from init code: {err:?}" );
+			<Error<T>>::CodeRejected
+		})?;
+
+		// Code hash is not relevant for init code, since it is not stored on-chain.
+		let code_hash = H256::default();
+		Ok(ContractBlob { code, code_info, code_hash })
 	}
 
 	/// Create a new contract from EVM runtime code.
@@ -78,12 +85,6 @@ impl<T: Config> ContractBlob<T> {
 			behaviour_version: Default::default(),
 		};
 
-		Self::from_evm_code(code, code_info)
-	}
-
-	fn from_evm_code(code: Vec<u8>, code_info: CodeInfo<T>) -> Result<Self, DispatchError> {
-		use revm::{bytecode::Bytecode, primitives::Bytes};
-
 		Bytecode::new_raw_checked(Bytes::from(code.to_vec())).map_err(|err| {
 			log::debug!(target: LOG_TARGET, "failed to create evm bytecode from code: {err:?}" );
 			<Error<T>>::CodeRejected

From a504987ee4e14a537490001e31e582f7a8bc4056 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 29 Aug 2025 14:53:55 +0200
Subject: [PATCH 179/186] reject hash == 0

---
 substrate/frame/revive/src/vm/mod.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/substrate/frame/revive/src/vm/mod.rs b/substrate/frame/revive/src/vm/mod.rs
index d7ddf3ed24d5..b13aaeac47c1 100644
--- a/substrate/frame/revive/src/vm/mod.rs
+++ b/substrate/frame/revive/src/vm/mod.rs
@@ -195,6 +195,8 @@ where
 	/// Puts the module blob into storage, and returns the deposit collected for the storage.
 	pub fn store_code(&mut self, skip_transfer: bool) -> Result<BalanceOf<T>, Error<T>> {
 		let code_hash = *self.code_hash();
+		ensure!(code_hash != H256::zero(), <Error<T>>::CodeNotFound);
+
 		<CodeInfoOf<T>>::mutate(code_hash, |stored_code_info| {
 			match stored_code_info {
 				// Contract code is already stored in storage. Nothing to be done here.

From 3a9f3d79337ec6dc15257355c92de2213e4a7316 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 29 Aug 2025 15:21:43 +0200
Subject: [PATCH 180/186] warm up pallet_account

---
 substrate/frame/revive/src/benchmarking.rs | 28 ++++++++++++++++------
 substrate/frame/revive/src/lib.rs          |  5 ++++
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/substrate/frame/revive/src/benchmarking.rs b/substrate/frame/revive/src/benchmarking.rs
index d2366ba17350..d07dd0c46043 100644
--- a/substrate/frame/revive/src/benchmarking.rs
+++ b/substrate/frame/revive/src/benchmarking.rs
@@ -84,6 +84,14 @@ macro_rules! build_runtime(
 	};
 );
 
+/// Get the pallet account and whitelist it for benchmarking.
+/// The account is warmed up `on_initialize` so read should not impact the PoV.
+fn whitelisted_pallet_account<T: Config>() -> T::AccountId {
+	let pallet_account = Pallet::<T>::account_id();
+	whitelist_account!(pallet_account);
+	pallet_account
+}
+
 #[benchmarks(
 	where
 		BalanceOf<T>: Into<U256> + TryFrom<U256>,
@@ -215,6 +223,7 @@ mod benchmarks {
 		c: Linear<0, { 100 * 1024 }>,
 		i: Linear<0, { limits::CALLDATA_BYTES }>,
 	) {
+		let pallet_account = whitelisted_pallet_account::<T>();
 		let input = vec![42u8; i as usize];
 		let salt = [42u8; 32];
 		let value = Pallet::<T>::min_balance();
@@ -235,7 +244,7 @@ mod benchmarks {
 		// uploading the code reserves some balance in the pallet's account
 		let code_deposit = T::Currency::balance_on_hold(
 			&HoldReason::CodeUploadDepositReserve.into(),
-			&Pallet::<T>::account_id(),
+			&pallet_account,
 		);
 		let mapping_deposit =
 			T::Currency::balance_on_hold(&HoldReason::AddressMapping.into(), &caller);
@@ -259,6 +268,7 @@ mod benchmarks {
 		i: Linear<0, { limits::CALLDATA_BYTES }>,
 		d: Linear<0, 1>,
 	) {
+		let pallet_account = whitelisted_pallet_account::<T>();
 		let input = vec![42u8; i as usize];
 
 		let value = Pallet::<T>::min_balance();
@@ -287,7 +297,7 @@ mod benchmarks {
 		// uploading the code reserves some balance in the pallet account
 		let code_deposit = T::Currency::balance_on_hold(
 			&HoldReason::CodeUploadDepositReserve.into(),
-			&Pallet::<T>::account_id(),
+			&pallet_account,
 		);
 		let mapping_deposit =
 			T::Currency::balance_on_hold(&HoldReason::AddressMapping.into(), &caller);
@@ -311,6 +321,7 @@ mod benchmarks {
 	// `s`: Size of e salt in bytes.
 	#[benchmark(pov_mode = Measured)]
 	fn instantiate(i: Linear<0, { limits::CALLDATA_BYTES }>) -> Result<(), BenchmarkError> {
+		let pallet_account = whitelisted_pallet_account::<T>();
 		let input = vec![42u8; i as usize];
 		let salt = [42u8; 32];
 		let value = Pallet::<T>::min_balance();
@@ -333,7 +344,7 @@ mod benchmarks {
 			T::Currency::balance_on_hold(&HoldReason::StorageDepositReserve.into(), &account_id);
 		let code_deposit = T::Currency::balance_on_hold(
 			&HoldReason::CodeUploadDepositReserve.into(),
-			&Pallet::<T>::account_id(),
+			&pallet_account,
 		);
 		let mapping_deposit =
 			T::Currency::balance_on_hold(&HoldReason::AddressMapping.into(), &account_id);
@@ -360,6 +371,7 @@ mod benchmarks {
 	// transaction. See `call_with_pvm_code_per_byte` for this.
 	#[benchmark(pov_mode = Measured)]
 	fn call() -> Result<(), BenchmarkError> {
+		let pallet_account = whitelisted_pallet_account::<T>();
 		let data = vec![42u8; 1024];
 		let instance =
 			Contract::<T>::with_caller(whitelisted_caller(), VmBinaryModule::dummy(), vec![])?;
@@ -375,7 +387,7 @@ mod benchmarks {
 		);
 		let code_deposit = T::Currency::balance_on_hold(
 			&HoldReason::CodeUploadDepositReserve.into(),
-			&Pallet::<T>::account_id(),
+			&pallet_account,
 		);
 		let mapping_deposit =
 			T::Currency::balance_on_hold(&HoldReason::AddressMapping.into(), &instance.caller);
@@ -398,6 +410,7 @@ mod benchmarks {
 	// `d`: with or without dust value to transfer
 	#[benchmark(pov_mode = Measured)]
 	fn eth_call(d: Linear<0, 1>) -> Result<(), BenchmarkError> {
+		let pallet_account = whitelisted_pallet_account::<T>();
 		let data = vec![42u8; 1024];
 		let instance =
 			Contract::<T>::with_caller(whitelisted_caller(), VmBinaryModule::dummy(), vec![])?;
@@ -419,7 +432,7 @@ mod benchmarks {
 		);
 		let code_deposit = T::Currency::balance_on_hold(
 			&HoldReason::CodeUploadDepositReserve.into(),
-			&Pallet::<T>::account_id(),
+			&pallet_account,
 		);
 		let mapping_deposit =
 			T::Currency::balance_on_hold(&HoldReason::AddressMapping.into(), &instance.caller);
@@ -449,6 +462,7 @@ mod benchmarks {
 	#[benchmark(pov_mode = Measured)]
 	fn upload_code(c: Linear<0, { 100 * 1024 }>) {
 		let caller = whitelisted_caller();
+		let pallet_account = whitelisted_pallet_account::<T>();
 		T::Currency::set_balance(&caller, caller_funding::<T>());
 		let VmBinaryModule { code, hash, .. } = VmBinaryModule::sized(c);
 		let origin = RawOrigin::Signed(caller.clone());
@@ -456,7 +470,7 @@ mod benchmarks {
 		#[extrinsic_call]
 		_(origin, code, storage_deposit);
 		// uploading the code reserves some balance in the pallet's account
-		assert!(T::Currency::total_balance_on_hold(&Pallet::<T>::account_id()) > 0u32.into());
+		assert!(T::Currency::total_balance_on_hold(&pallet_account) > 0u32.into());
 		assert!(<Contract<T>>::code_exists(&hash));
 	}
 
@@ -466,7 +480,7 @@ mod benchmarks {
 	#[benchmark(pov_mode = Measured)]
 	fn remove_code() -> Result<(), BenchmarkError> {
 		let caller = whitelisted_caller();
-		let pallet_account = Pallet::<T>::account_id();
+		let pallet_account = whitelisted_pallet_account::<T>();
 		T::Currency::set_balance(&caller, caller_funding::<T>());
 		let VmBinaryModule { code, hash, .. } = VmBinaryModule::dummy();
 		let origin = RawOrigin::Signed(caller.clone());
diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index 3de742e6f2fb..192cc7ffcb99 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -562,6 +562,11 @@ pub mod pallet {
 
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+		fn on_initialize(_block: BlockNumberFor<T>) -> Weight {
+			// Warm up the pallet account.
+			System::<T>::account_exists(&Pallet::<T>::account_id());
+			return T::DbWeight::get().reads(1)
+		}
 		fn on_idle(_block: BlockNumberFor<T>, limit: Weight) -> Weight {
 			let mut meter = WeightMeter::with_limit(limit);
 			ContractInfo::<T>::process_deletion_queue_batch(&mut meter);

From c2456214b89929a7963e7d0be2dd59f337a753bf Mon Sep 17 00:00:00 2001
From: PG Herveou <pgherveou@gmail.com>
Date: Fri, 29 Aug 2025 15:23:15 +0200
Subject: [PATCH 181/186] Update substrate/frame/revive/src/migrations/v2.rs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Alexander Theißen <alex.theissen@me.com>
---
 substrate/frame/revive/src/migrations/v2.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/substrate/frame/revive/src/migrations/v2.rs b/substrate/frame/revive/src/migrations/v2.rs
index a0ee709994d7..e07630fc75de 100644
--- a/substrate/frame/revive/src/migrations/v2.rs
+++ b/substrate/frame/revive/src/migrations/v2.rs
@@ -107,7 +107,7 @@ impl<T: Config> SteppedMigration for Migration<T> {
 			return Err(SteppedMigrationError::InsufficientWeight { required });
 		}
 
-		if frame_system::Pallet::<T>::account_exists(&Pallet::<T>::account_id()) {
+		if !frame_system::Pallet::<T>::account_exists(&Pallet::<T>::account_id()) {
 			let _ =
 				T::Currency::mint_into(&Pallet::<T>::account_id(), T::Currency::minimum_balance());
 		}

From 88c6b23df163e78fa60815ea26ac5e2f828c6eb4 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Fri, 29 Aug 2025 15:27:32 +0200
Subject: [PATCH 182/186] Update ExtBuilder

---
 substrate/frame/revive/src/migrations/v2.rs |  2 +-
 substrate/frame/revive/src/tests.rs         | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/substrate/frame/revive/src/migrations/v2.rs b/substrate/frame/revive/src/migrations/v2.rs
index e07630fc75de..803283c6ab34 100644
--- a/substrate/frame/revive/src/migrations/v2.rs
+++ b/substrate/frame/revive/src/migrations/v2.rs
@@ -263,7 +263,7 @@ fn migrate_to_v2() {
 	};
 	use alloc::collections::BTreeMap;
 
-	ExtBuilder::default().build().execute_with(|| {
+	ExtBuilder::default().genesis_config(None).build().execute_with(|| {
 		// Store the original values to verify against later
 		let mut original_values = BTreeMap::new();
 
diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index 55abd635de7f..2a3e3e218069 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -370,6 +370,7 @@ pub struct ExtBuilder {
 	existential_deposit: u64,
 	storage_version: Option<StorageVersion>,
 	code_hashes: Vec<sp_core::H256>,
+	genesis_config: Option<crate::GenesisConfig<Test>>,
 }
 
 impl Default for ExtBuilder {
@@ -378,11 +379,17 @@ impl Default for ExtBuilder {
 			existential_deposit: ExistentialDeposit::get(),
 			storage_version: None,
 			code_hashes: vec![],
+			genesis_config: Some(crate::GenesisConfig::<Test>::default()),
 		}
 	}
 }
 
 impl ExtBuilder {
+	/// The pallet genesis config to use, or None if you don't want to include it.
+	pub fn genesis_config(mut self, config: Option<crate::GenesisConfig<Test>>) -> Self {
+		self.genesis_config = config;
+		self
+	}
 	pub fn existential_deposit(mut self, existential_deposit: u64) -> Self {
 		self.existential_deposit = existential_deposit;
 		self
@@ -401,16 +408,15 @@ impl ExtBuilder {
 		let checking_account = Pallet::<Test>::checking_account();
 
 		pallet_balances::GenesisConfig::<Test> {
-			balances: vec![
-				(checking_account.clone(), 1_000_000_000_000),
-				(Pallet::<Test>::account_id(), Contracts::min_balance()),
-			],
+			balances: vec![(checking_account.clone(), 1_000_000_000_000)],
 			..Default::default()
 		}
 		.assimilate_storage(&mut t)
 		.unwrap();
 
-		crate::GenesisConfig::<Test>::default().assimilate_storage(&mut t).unwrap();
+		if let Some(genesis_config) = self.genesis_config {
+			genesis_config.assimilate_storage(&mut t).unwrap();
+		}
 		let mut ext = sp_io::TestExternalities::new(t);
 		ext.register_extension(KeystoreExt::new(MemoryKeystore::new()));
 		ext.execute_with(|| {

From 400c9126fa277c1059322486c67cf37fb34b341c Mon Sep 17 00:00:00 2001
From: PG Herveou <pgherveou@gmail.com>
Date: Fri, 29 Aug 2025 18:51:50 +0200
Subject: [PATCH 183/186] Update .github/workflows/tests-misc.yml

---
 .github/workflows/tests-misc.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/tests-misc.yml b/.github/workflows/tests-misc.yml
index 8fb97782a663..ed754975af94 100644
--- a/.github/workflows/tests-misc.yml
+++ b/.github/workflows/tests-misc.yml
@@ -379,6 +379,7 @@ jobs:
           curl -Lsf --show-error -o /tmp/resolc "$ASSET_URL"
           sudo cp /tmp/resolc /usr/local/bin/resolc
           sudo chmod 755 /usr/local/bin/resolc
+          xattr -c /usr/local/bin/resolc
         with:
           version: 0.3.0        
       - name: cargo info

From a1178f3dd0c19d62d8890376aae9243c6f6ae61b Mon Sep 17 00:00:00 2001
From: "cmd[bot]" <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 29 Aug 2025 20:03:58 +0000
Subject: [PATCH 184/186] Update from github-actions[bot] running command
 'bench --runtime dev --pallet pallet_revive'

---
 substrate/frame/revive/src/weights.rs | 1348 +++++++++++++------------
 1 file changed, 708 insertions(+), 640 deletions(-)

diff --git a/substrate/frame/revive/src/weights.rs b/substrate/frame/revive/src/weights.rs
index f5fe01b854f5..7a2f46555c7f 100644
--- a/substrate/frame/revive/src/weights.rs
+++ b/substrate/frame/revive/src/weights.rs
@@ -35,9 +35,9 @@
 //! Autogenerated weights for `pallet_revive`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
-//! DATE: 2025-08-21, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2025-08-29, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `948f494ac939`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! HOSTNAME: `63d21d694e5f`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
@@ -119,7 +119,7 @@ pub trait WeightInfo {
 	fn seal_call_data_load() -> Weight;
 	fn seal_call_data_copy(n: u32, ) -> Weight;
 	fn seal_return(n: u32, ) -> Weight;
-	fn seal_terminate(n:u32) -> Weight;
+	fn seal_terminate(r: u32, ) -> Weight;
 	fn seal_deposit_event(t: u32, n: u32, ) -> Weight;
 	fn get_storage_empty() -> Weight;
 	fn get_storage_full() -> Weight;
@@ -157,7 +157,7 @@ pub trait WeightInfo {
 	fn bn128_pairing(n: u32, ) -> Weight;
 	fn blake2f(n: u32, ) -> Weight;
 	fn seal_ecdsa_to_eth_address() -> Weight;
-	fn seal_set_code_hash(n: u32) -> Weight;
+	fn seal_set_code_hash(r: u32, ) -> Weight;
 	fn evm_opcode(r: u32, ) -> Weight;
 	fn instr(r: u32, ) -> Weight;
 	fn instr_empty_loop(r: u32, ) -> Weight;
@@ -174,8 +174,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `147`
 		//  Estimated: `1632`
-		// Minimum execution time: 3_150_000 picoseconds.
-		Weight::from_parts(3_421_000, 1632)
+		// Minimum execution time: 3_146_000 picoseconds.
+		Weight::from_parts(3_400_000, 1632)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -185,10 +185,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `458 + k * (69 ±0)`
 		//  Estimated: `448 + k * (70 ±0)`
-		// Minimum execution time: 14_380_000 picoseconds.
-		Weight::from_parts(14_911_000, 448)
-			// Standard Error: 1_088
-			.saturating_add(Weight::from_parts(1_199_036, 0).saturating_mul(k.into()))
+		// Minimum execution time: 14_245_000 picoseconds.
+		Weight::from_parts(14_708_000, 448)
+			// Standard Error: 830
+			.saturating_add(Weight::from_parts(1_175_004, 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))
@@ -202,7 +202,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
-	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Timestamp::Now` (r:1 w:0)
 	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
 	/// Storage: `System::Account` (r:1 w:1)
@@ -212,10 +212,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1172 + c * (1 ±0)`
 		//  Estimated: `7107 + c * (1 ±0)`
-		// Minimum execution time: 86_173_000 picoseconds.
-		Weight::from_parts(120_432_125, 7107)
-			// Standard Error: 9
-			.saturating_add(Weight::from_parts(1_435, 0).saturating_mul(c.into()))
+		// Minimum execution time: 86_441_000 picoseconds.
+		Weight::from_parts(123_780_707, 7107)
+			// Standard Error: 11
+			.saturating_add(Weight::from_parts(1_438, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(c.into()))
@@ -227,20 +227,20 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
-	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Timestamp::Now` (r:1 w:0)
 	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
 	/// 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 `[1, 102400]`.
+	/// The range of component `c` is `[1, 10240]`.
 	fn call_with_evm_code_per_byte(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1104`
-		//  Estimated: `7046`
-		// Minimum execution time: 80_755_000 picoseconds.
-		Weight::from_parts(85_415_387, 7046)
-			// Standard Error: 2
-			.saturating_add(Weight::from_parts(33, 0).saturating_mul(c.into()))
+		//  Measured:  `1112`
+		//  Estimated: `7051`
+		// Minimum execution time: 81_282_000 picoseconds.
+		Weight::from_parts(85_248_488, 7051)
+			// Standard Error: 21
+			.saturating_add(Weight::from_parts(36, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -251,7 +251,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
-	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Timestamp::Now` (r:1 w:0)
 	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
 	/// Storage: `System::Account` (r:1 w:1)
@@ -261,8 +261,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `4516`
 		//  Estimated: `10456`
-		// Minimum execution time: 123_589_000 picoseconds.
-		Weight::from_parts(127_489_869, 10456)
+		// Minimum execution time: 124_393_000 picoseconds.
+		Weight::from_parts(129_685_861, 10456)
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -279,19 +279,19 @@ 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`)
 	/// Storage: `Revive::PristineCode` (r:0 w:1)
-	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `c` is `[0, 102400]`.
 	/// The range of component `i` is `[0, 131072]`.
 	fn instantiate_with_code(c: u32, i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1108`
-		//  Estimated: `7041`
-		// Minimum execution time: 754_650_000 picoseconds.
-		Weight::from_parts(758_926_000, 7041)
-			// Standard Error: 85
-			.saturating_add(Weight::from_parts(15_657, 0).saturating_mul(c.into()))
-			// Standard Error: 67
-			.saturating_add(Weight::from_parts(1_573, 0).saturating_mul(i.into()))
+		//  Measured:  `1171`
+		//  Estimated: `7104`
+		// Minimum execution time: 762_496_000 picoseconds.
+		Weight::from_parts(55_020_008, 7104)
+			// Standard Error: 44
+			.saturating_add(Weight::from_parts(20_306, 0).saturating_mul(c.into()))
+			// Standard Error: 35
+			.saturating_add(Weight::from_parts(5_068, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
@@ -308,22 +308,22 @@ 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`)
 	/// Storage: `Revive::PristineCode` (r:0 w:1)
-	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `c` is `[0, 102400]`.
 	/// The range of component `i` is `[0, 131072]`.
 	/// The range of component `d` is `[0, 1]`.
 	fn eth_instantiate_with_code(c: u32, i: u32, d: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1122`
-		//  Estimated: `7062 + d * (2475 ±0)`
-		// Minimum execution time: 278_747_000 picoseconds.
-		Weight::from_parts(145_795_450, 7062)
-			// Standard Error: 17
-			.saturating_add(Weight::from_parts(14_966, 0).saturating_mul(c.into()))
-			// Standard Error: 13
-			.saturating_add(Weight::from_parts(542, 0).saturating_mul(i.into()))
-			// Standard Error: 1_133_623
-			.saturating_add(Weight::from_parts(41_772_022, 0).saturating_mul(d.into()))
+		//  Measured:  `1185`
+		//  Estimated: `7125 + d * (2475 ±0)`
+		// Minimum execution time: 284_562_000 picoseconds.
+		Weight::from_parts(163_089_642, 7125)
+			// Standard Error: 34
+			.saturating_add(Weight::from_parts(15_162, 0).saturating_mul(c.into()))
+			// Standard Error: 27
+			.saturating_add(Weight::from_parts(514, 0).saturating_mul(i.into()))
+			// Standard Error: 2_273_714
+			.saturating_add(Weight::from_parts(38_746_748, 0).saturating_mul(d.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(d.into())))
 			.saturating_add(T::DbWeight::get().writes(6_u64))
@@ -333,7 +333,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
-	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
@@ -348,11 +348,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn instantiate(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1913`
-		//  Estimated: `5338`
-		// Minimum execution time: 171_706_000 picoseconds.
-		Weight::from_parts(177_711_925, 5338)
-			// Standard Error: 10
-			.saturating_add(Weight::from_parts(4_170, 0).saturating_mul(i.into()))
+		//  Estimated: `5339`
+		// Minimum execution time: 171_348_000 picoseconds.
+		Weight::from_parts(176_612_673, 5339)
+			// Standard Error: 11
+			.saturating_add(Weight::from_parts(4_290, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -363,7 +363,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
-	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Timestamp::Now` (r:1 w:0)
 	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
 	/// Storage: `System::Account` (r:1 w:1)
@@ -372,8 +372,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1794`
 		//  Estimated: `7734`
-		// Minimum execution time: 86_797_000 picoseconds.
-		Weight::from_parts(90_276_000, 7734)
+		// Minimum execution time: 88_764_000 picoseconds.
+		Weight::from_parts(93_353_000, 7734)
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -384,7 +384,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
-	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Timestamp::Now` (r:1 w:0)
 	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
 	/// Storage: `System::Account` (r:1 w:1)
@@ -394,10 +394,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1794`
 		//  Estimated: `7734 + d * (2475 ±0)`
-		// Minimum execution time: 86_087_000 picoseconds.
-		Weight::from_parts(89_671_759, 7734)
-			// Standard Error: 300_888
-			.saturating_add(Weight::from_parts(26_362_240, 0).saturating_mul(d.into()))
+		// Minimum execution time: 86_142_000 picoseconds.
+		Weight::from_parts(90_482_761, 7734)
+			// Standard Error: 430_134
+			.saturating_add(Weight::from_parts(30_624_838, 0).saturating_mul(d.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(d.into())))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
@@ -409,16 +409,16 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Storage: `Balances::Holds` (r:1 w:1)
 	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:0 w:1)
-	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `c` is `[0, 102400]`.
 	fn upload_code(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `505`
-		//  Estimated: `3970`
-		// Minimum execution time: 57_265_000 picoseconds.
-		Weight::from_parts(38_840_872, 3970)
-			// Standard Error: 20
-			.saturating_add(Weight::from_parts(14_420, 0).saturating_mul(c.into()))
+		//  Measured:  `606`
+		//  Estimated: `4071`
+		// Minimum execution time: 57_080_000 picoseconds.
+		Weight::from_parts(49_101_825, 4071)
+			// Standard Error: 18
+			.saturating_add(Weight::from_parts(14_610, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -427,13 +427,13 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Storage: `Balances::Holds` (r:1 w:1)
 	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:0 w:1)
-	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn remove_code() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `659`
-		//  Estimated: `4124`
-		// Minimum execution time: 47_571_000 picoseconds.
-		Weight::from_parts(48_571_000, 4124)
+		//  Measured:  `760`
+		//  Estimated: `4225`
+		// Minimum execution time: 53_084_000 picoseconds.
+		Weight::from_parts(54_573_000, 4225)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -441,14 +441,20 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:2 w:2)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
+	/// Storage: `Balances::Holds` (r:1 w:1)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Revive::PristineCode` (r:0 w:1)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn set_code() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `532`
-		//  Estimated: `6472`
-		// Minimum execution time: 20_565_000 picoseconds.
-		Weight::from_parts(21_420_000, 6472)
-			.saturating_add(T::DbWeight::get().reads(3_u64))
-			.saturating_add(T::DbWeight::get().writes(3_u64))
+		//  Measured:  `1095`
+		//  Estimated: `7035`
+		// Minimum execution time: 65_666_000 picoseconds.
+		Weight::from_parts(67_373_000, 7035)
+			.saturating_add(T::DbWeight::get().reads(5_u64))
+			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:1)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
@@ -458,8 +464,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `813`
 		//  Estimated: `4278`
-		// Minimum execution time: 58_321_000 picoseconds.
-		Weight::from_parts(58_922_000, 4278)
+		// Minimum execution time: 55_888_000 picoseconds.
+		Weight::from_parts(57_747_000, 4278)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -471,8 +477,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `395`
 		//  Estimated: `3860`
-		// Minimum execution time: 43_929_000 picoseconds.
-		Weight::from_parts(44_755_000, 3860)
+		// Minimum execution time: 42_171_000 picoseconds.
+		Weight::from_parts(43_198_000, 3860)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -484,8 +490,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `145`
 		//  Estimated: `3610`
-		// Minimum execution time: 12_925_000 picoseconds.
-		Weight::from_parts(13_333_000, 3610)
+		// Minimum execution time: 13_030_000 picoseconds.
+		Weight::from_parts(13_365_000, 3610)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 	}
 	/// The range of component `r` is `[0, 1600]`.
@@ -493,23 +499,23 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 7_528_000 picoseconds.
-		Weight::from_parts(8_699_408, 0)
-			// Standard Error: 197
-			.saturating_add(Weight::from_parts(182_534, 0).saturating_mul(r.into()))
+		// Minimum execution time: 7_473_000 picoseconds.
+		Weight::from_parts(8_474_805, 0)
+			// Standard Error: 322
+			.saturating_add(Weight::from_parts(178_929, 0).saturating_mul(r.into()))
 	}
 	fn seal_caller() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 306_000 picoseconds.
-		Weight::from_parts(375_000, 0)
+		// Minimum execution time: 355_000 picoseconds.
+		Weight::from_parts(397_000, 0)
 	}
 	fn seal_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 288_000 picoseconds.
+		// Minimum execution time: 318_000 picoseconds.
 		Weight::from_parts(362_000, 0)
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
@@ -518,8 +524,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `567`
 		//  Estimated: `4032`
-		// Minimum execution time: 7_364_000 picoseconds.
-		Weight::from_parts(7_904_000, 4032)
+		// Minimum execution time: 7_507_000 picoseconds.
+		Weight::from_parts(8_064_000, 4032)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:0)
@@ -528,16 +534,16 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `403`
 		//  Estimated: `3868`
-		// Minimum execution time: 9_050_000 picoseconds.
-		Weight::from_parts(9_489_000, 3868)
+		// Minimum execution time: 9_458_000 picoseconds.
+		Weight::from_parts(10_105_000, 3868)
 			.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: 302_000 picoseconds.
-		Weight::from_parts(337_000, 0)
+		// Minimum execution time: 317_000 picoseconds.
+		Weight::from_parts(355_000, 0)
 	}
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:0)
 	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
@@ -547,51 +553,51 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `475`
 		//  Estimated: `3940`
-		// Minimum execution time: 12_570_000 picoseconds.
-		Weight::from_parts(13_223_000, 3940)
+		// Minimum execution time: 13_105_000 picoseconds.
+		Weight::from_parts(13_354_000, 3940)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 	}
 	fn seal_caller_is_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 310_000 picoseconds.
-		Weight::from_parts(364_000, 0)
+		// Minimum execution time: 331_000 picoseconds.
+		Weight::from_parts(381_000, 0)
 	}
 	fn seal_caller_is_root() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 259_000 picoseconds.
-		Weight::from_parts(302_000, 0)
+		// Minimum execution time: 307_000 picoseconds.
+		Weight::from_parts(336_000, 0)
 	}
 	fn seal_address() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 330_000 picoseconds.
-		Weight::from_parts(357_000, 0)
+		// Minimum execution time: 323_000 picoseconds.
+		Weight::from_parts(368_000, 0)
 	}
 	fn seal_weight_left() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 723_000 picoseconds.
-		Weight::from_parts(797_000, 0)
+		// Minimum execution time: 701_000 picoseconds.
+		Weight::from_parts(785_000, 0)
 	}
 	fn seal_ref_time_left() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 268_000 picoseconds.
-		Weight::from_parts(305_000, 0)
+		// Minimum execution time: 278_000 picoseconds.
+		Weight::from_parts(334_000, 0)
 	}
 	fn seal_balance() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `540`
 		//  Estimated: `0`
-		// Minimum execution time: 12_855_000 picoseconds.
-		Weight::from_parts(13_194_000, 0)
+		// Minimum execution time: 12_890_000 picoseconds.
+		Weight::from_parts(13_471_000, 0)
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
@@ -603,8 +609,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `791`
 		//  Estimated: `4256`
-		// Minimum execution time: 18_281_000 picoseconds.
-		Weight::from_parts(19_051_000, 4256)
+		// Minimum execution time: 18_523_000 picoseconds.
+		Weight::from_parts(19_059_000, 4256)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 	}
 	/// Storage: `Revive::ImmutableDataOf` (r:1 w:0)
@@ -614,10 +620,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `271 + n * (1 ±0)`
 		//  Estimated: `3736 + n * (1 ±0)`
-		// Minimum execution time: 5_711_000 picoseconds.
-		Weight::from_parts(6_613_746, 3736)
-			// Standard Error: 7
-			.saturating_add(Weight::from_parts(499, 0).saturating_mul(n.into()))
+		// Minimum execution time: 6_027_000 picoseconds.
+		Weight::from_parts(6_736_994, 3736)
+			// Standard Error: 5
+			.saturating_add(Weight::from_parts(592, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -628,67 +634,67 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_087_000 picoseconds.
-		Weight::from_parts(2_316_148, 0)
+		// Minimum execution time: 2_033_000 picoseconds.
+		Weight::from_parts(2_294_007, 0)
 			// Standard Error: 2
-			.saturating_add(Weight::from_parts(493, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(565, 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: 267_000 picoseconds.
-		Weight::from_parts(315_000, 0)
+		// Minimum execution time: 276_000 picoseconds.
+		Weight::from_parts(323_000, 0)
 	}
 	fn seal_minimum_balance() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 270_000 picoseconds.
-		Weight::from_parts(313_000, 0)
+		// Minimum execution time: 273_000 picoseconds.
+		Weight::from_parts(325_000, 0)
 	}
 	fn seal_return_data_size() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 264_000 picoseconds.
-		Weight::from_parts(324_000, 0)
+		// Minimum execution time: 265_000 picoseconds.
+		Weight::from_parts(302_000, 0)
 	}
 	fn seal_call_data_size() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 262_000 picoseconds.
-		Weight::from_parts(309_000, 0)
+		// Minimum execution time: 279_000 picoseconds.
+		Weight::from_parts(353_000, 0)
 	}
 	fn seal_gas_limit() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 531_000 picoseconds.
-		Weight::from_parts(625_000, 0)
+		// Minimum execution time: 518_000 picoseconds.
+		Weight::from_parts(572_000, 0)
 	}
 	fn seal_gas_price() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 260_000 picoseconds.
-		Weight::from_parts(311_000, 0)
+		// Minimum execution time: 308_000 picoseconds.
+		Weight::from_parts(339_000, 0)
 	}
 	fn seal_base_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 282_000 picoseconds.
-		Weight::from_parts(312_000, 0)
+		// Minimum execution time: 283_000 picoseconds.
+		Weight::from_parts(315_000, 0)
 	}
 	fn seal_block_number() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 261_000 picoseconds.
-		Weight::from_parts(325_000, 0)
+		// Minimum execution time: 300_000 picoseconds.
+		Weight::from_parts(334_000, 0)
 	}
 	/// Storage: `Session::Validators` (r:1 w:0)
 	/// Proof: `Session::Validators` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -696,8 +702,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `141`
 		//  Estimated: `1626`
-		// Minimum execution time: 21_538_000 picoseconds.
-		Weight::from_parts(22_409_000, 1626)
+		// Minimum execution time: 22_163_000 picoseconds.
+		Weight::from_parts(22_643_000, 1626)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `System::BlockHash` (r:1 w:0)
@@ -706,60 +712,60 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `30`
 		//  Estimated: `3495`
-		// Minimum execution time: 3_401_000 picoseconds.
-		Weight::from_parts(3_673_000, 3495)
+		// Minimum execution time: 3_625_000 picoseconds.
+		Weight::from_parts(3_850_000, 3495)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	fn seal_now() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 300_000 picoseconds.
-		Weight::from_parts(354_000, 0)
+		// Minimum execution time: 293_000 picoseconds.
+		Weight::from_parts(349_000, 0)
 	}
 	fn seal_weight_to_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_680_000 picoseconds.
-		Weight::from_parts(1_742_000, 0)
+		// Minimum execution time: 1_597_000 picoseconds.
+		Weight::from_parts(1_720_000, 0)
 	}
 	/// The range of component `n` is `[0, 1048572]`.
 	fn seal_copy_to_contract(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 392_000 picoseconds.
-		Weight::from_parts(262_995, 0)
+		// Minimum execution time: 425_000 picoseconds.
+		Weight::from_parts(437_000, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(202, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(239, 0).saturating_mul(n.into()))
 	}
 	fn seal_call_data_load() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 234_000 picoseconds.
-		Weight::from_parts(291_000, 0)
+		// Minimum execution time: 277_000 picoseconds.
+		Weight::from_parts(313_000, 0)
 	}
 	/// The range of component `n` is `[0, 1048576]`.
 	fn seal_call_data_copy(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 267_000 picoseconds.
-		Weight::from_parts(610_075, 0)
+		// Minimum execution time: 257_000 picoseconds.
+		Weight::from_parts(288_000, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(112, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(150, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 131072]`.
 	fn seal_return(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 292_000 picoseconds.
-		Weight::from_parts(466_044, 0)
+		// Minimum execution time: 315_000 picoseconds.
+		Weight::from_parts(476_627, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(200, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(238, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
@@ -767,18 +773,30 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: `Revive::DeletionQueueCounter` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
+	/// Storage: `Balances::Holds` (r:1 w:1)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
 	/// Storage: `Revive::DeletionQueue` (r:0 w:1)
 	/// Proof: `Revive::DeletionQueue` (`max_values`: None, `max_size`: Some(142), added: 2617, mode: `Measured`)
+	/// Storage: `Revive::PristineCode` (r:0 w:1)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Revive::ImmutableDataOf` (r:0 w:1)
 	/// Proof: `Revive::ImmutableDataOf` (`max_values`: None, `max_size`: Some(4118), added: 6593, mode: `Measured`)
-	fn seal_terminate(_u: u32) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `583`
-		//  Estimated: `4048`
-		// Minimum execution time: 16_855_000 picoseconds.
-		Weight::from_parts(17_325_000, 4048)
+	/// The range of component `r` is `[0, 1]`.
+	fn seal_terminate(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `583 + r * (670 ±0)`
+		//  Estimated: `4048 + r * (2359 ±0)`
+		// Minimum execution time: 16_560_000 picoseconds.
+		Weight::from_parts(17_630_489, 4048)
+			// Standard Error: 66_463
+			.saturating_add(Weight::from_parts(46_618_510, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(r.into())))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
+			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(r.into())))
+			.saturating_add(Weight::from_parts(0, 2359).saturating_mul(r.into()))
 	}
 	/// The range of component `t` is `[0, 4]`.
 	/// The range of component `n` is `[0, 416]`.
@@ -786,12 +804,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_416_000 picoseconds.
-		Weight::from_parts(4_382_711, 0)
-			// Standard Error: 3_063
-			.saturating_add(Weight::from_parts(257_304, 0).saturating_mul(t.into()))
-			// Standard Error: 33
-			.saturating_add(Weight::from_parts(1_239, 0).saturating_mul(n.into()))
+		// Minimum execution time: 4_523_000 picoseconds.
+		Weight::from_parts(4_505_303, 0)
+			// Standard Error: 3_656
+			.saturating_add(Weight::from_parts(240_684, 0).saturating_mul(t.into()))
+			// Standard Error: 40
+			.saturating_add(Weight::from_parts(1_232, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
 	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -799,8 +817,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `648`
 		//  Estimated: `648`
-		// Minimum execution time: 7_148_000 picoseconds.
-		Weight::from_parts(7_616_000, 648)
+		// Minimum execution time: 7_228_000 picoseconds.
+		Weight::from_parts(7_734_000, 648)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -809,8 +827,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `10658`
 		//  Estimated: `10658`
-		// Minimum execution time: 41_435_000 picoseconds.
-		Weight::from_parts(42_294_000, 10658)
+		// Minimum execution time: 41_276_000 picoseconds.
+		Weight::from_parts(42_310_000, 10658)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -819,8 +837,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `648`
 		//  Estimated: `648`
-		// Minimum execution time: 8_266_000 picoseconds.
-		Weight::from_parts(8_704_000, 648)
+		// Minimum execution time: 8_396_000 picoseconds.
+		Weight::from_parts(8_776_000, 648)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -830,8 +848,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `10658`
 		//  Estimated: `10658`
-		// Minimum execution time: 43_187_000 picoseconds.
-		Weight::from_parts(44_235_000, 10658)
+		// Minimum execution time: 42_661_000 picoseconds.
+		Weight::from_parts(44_266_000, 10658)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -843,12 +861,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: 8_740_000 picoseconds.
-		Weight::from_parts(9_473_762, 247)
-			// Standard Error: 60
-			.saturating_add(Weight::from_parts(684, 0).saturating_mul(n.into()))
-			// Standard Error: 60
-			.saturating_add(Weight::from_parts(488, 0).saturating_mul(o.into()))
+		// Minimum execution time: 8_864_000 picoseconds.
+		Weight::from_parts(9_769_026, 247)
+			// Standard Error: 67
+			.saturating_add(Weight::from_parts(81, 0).saturating_mul(n.into()))
+			// Standard Error: 67
+			.saturating_add(Weight::from_parts(866, 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()))
@@ -860,10 +878,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_609_000 picoseconds.
-		Weight::from_parts(9_456_962, 247)
-			// Standard Error: 78
-			.saturating_add(Weight::from_parts(882, 0).saturating_mul(n.into()))
+		// Minimum execution time: 8_552_000 picoseconds.
+		Weight::from_parts(9_609_466, 247)
+			// Standard Error: 88
+			.saturating_add(Weight::from_parts(789, 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()))
@@ -875,10 +893,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: 7_777_000 picoseconds.
-		Weight::from_parts(8_957_787, 247)
-			// Standard Error: 85
-			.saturating_add(Weight::from_parts(2_018, 0).saturating_mul(n.into()))
+		// Minimum execution time: 8_101_000 picoseconds.
+		Weight::from_parts(9_115_278, 247)
+			// Standard Error: 75
+			.saturating_add(Weight::from_parts(1_381, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -889,10 +907,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: 7_552_000 picoseconds.
-		Weight::from_parts(8_333_059, 247)
-			// Standard Error: 68
-			.saturating_add(Weight::from_parts(1_086, 0).saturating_mul(n.into()))
+		// Minimum execution time: 7_594_000 picoseconds.
+		Weight::from_parts(8_575_324, 247)
+			// Standard Error: 78
+			.saturating_add(Weight::from_parts(635, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -903,10 +921,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_262_000 picoseconds.
-		Weight::from_parts(10_280_631, 247)
-			// Standard Error: 84
-			.saturating_add(Weight::from_parts(780, 0).saturating_mul(n.into()))
+		// Minimum execution time: 9_130_000 picoseconds.
+		Weight::from_parts(10_301_501, 247)
+			// Standard Error: 85
+			.saturating_add(Weight::from_parts(1_584, 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()))
@@ -915,36 +933,36 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_559_000 picoseconds.
+		// Minimum execution time: 1_553_000 picoseconds.
 		Weight::from_parts(1_678_000, 0)
 	}
 	fn set_transient_storage_full() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_939_000 picoseconds.
-		Weight::from_parts(2_073_000, 0)
+		// Minimum execution time: 1_962_000 picoseconds.
+		Weight::from_parts(2_085_000, 0)
 	}
 	fn get_transient_storage_empty() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_490_000 picoseconds.
-		Weight::from_parts(1_582_000, 0)
+		// Minimum execution time: 1_599_000 picoseconds.
+		Weight::from_parts(1_715_000, 0)
 	}
 	fn get_transient_storage_full() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_679_000 picoseconds.
-		Weight::from_parts(1_739_000, 0)
+		// Minimum execution time: 1_837_000 picoseconds.
+		Weight::from_parts(1_930_000, 0)
 	}
 	fn rollback_transient_storage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_279_000 picoseconds.
-		Weight::from_parts(1_339_000, 0)
+		// Minimum execution time: 1_273_000 picoseconds.
+		Weight::from_parts(1_356_000, 0)
 	}
 	/// The range of component `n` is `[0, 416]`.
 	/// The range of component `o` is `[0, 416]`.
@@ -952,52 +970,52 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_300_000 picoseconds.
-		Weight::from_parts(2_536_575, 0)
-			// Standard Error: 17
-			.saturating_add(Weight::from_parts(334, 0).saturating_mul(n.into()))
-			// Standard Error: 17
-			.saturating_add(Weight::from_parts(392, 0).saturating_mul(o.into()))
+		// Minimum execution time: 2_307_000 picoseconds.
+		Weight::from_parts(2_700_633, 0)
+			// Standard Error: 22
+			.saturating_add(Weight::from_parts(264, 0).saturating_mul(n.into()))
+			// Standard Error: 22
+			.saturating_add(Weight::from_parts(241, 0).saturating_mul(o.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_clear_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_164_000 picoseconds.
-		Weight::from_parts(2_555_863, 0)
-			// Standard Error: 34
-			.saturating_add(Weight::from_parts(226, 0).saturating_mul(n.into()))
+		// Minimum execution time: 2_159_000 picoseconds.
+		Weight::from_parts(2_531_527, 0)
+			// Standard Error: 22
+			.saturating_add(Weight::from_parts(344, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_get_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_870_000 picoseconds.
-		Weight::from_parts(2_188_923, 0)
-			// Standard Error: 27
-			.saturating_add(Weight::from_parts(316, 0).saturating_mul(n.into()))
+		// Minimum execution time: 2_066_000 picoseconds.
+		Weight::from_parts(2_317_959, 0)
+			// Standard Error: 19
+			.saturating_add(Weight::from_parts(218, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_contains_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_713_000 picoseconds.
-		Weight::from_parts(2_013_249, 0)
-			// Standard Error: 20
-			.saturating_add(Weight::from_parts(210, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_772_000 picoseconds.
+		Weight::from_parts(2_109_656, 0)
+			// Standard Error: 17
+			.saturating_add(Weight::from_parts(127, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_take_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_549_000 picoseconds.
-		Weight::from_parts(2_811_411, 0)
-			// Standard Error: 31
-			.saturating_add(Weight::from_parts(61, 0).saturating_mul(n.into()))
+		// Minimum execution time: 2_677_000 picoseconds.
+		Weight::from_parts(2_887_082, 0)
+			// Standard Error: 21
+			.saturating_add(Weight::from_parts(3, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
@@ -1006,7 +1024,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
-	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// 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 `t` is `[0, 1]`.
@@ -1016,12 +1034,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1925`
 		//  Estimated: `5390`
-		// Minimum execution time: 88_918_000 picoseconds.
-		Weight::from_parts(70_713_518, 5390)
-			// Standard Error: 172_359
-			.saturating_add(Weight::from_parts(18_545_016, 0).saturating_mul(t.into()))
-			// Standard Error: 172_359
-			.saturating_add(Weight::from_parts(24_817_484, 0).saturating_mul(d.into()))
+		// Minimum execution time: 88_854_000 picoseconds.
+		Weight::from_parts(71_114_290, 5390)
+			// Standard Error: 191_071
+			.saturating_add(Weight::from_parts(18_628_762, 0).saturating_mul(t.into()))
+			// Standard Error: 191_071
+			.saturating_add(Weight::from_parts(25_344_741, 0).saturating_mul(d.into()))
 			// Standard Error: 0
 			.saturating_add(Weight::from_parts(2, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(5_u64))
@@ -1038,12 +1056,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `366 + d * (212 ±0)`
 		//  Estimated: `2021 + d * (2021 ±0)`
-		// Minimum execution time: 24_697_000 picoseconds.
-		Weight::from_parts(12_092_184, 2021)
-			// Standard Error: 60_308
-			.saturating_add(Weight::from_parts(13_519_246, 0).saturating_mul(d.into()))
+		// Minimum execution time: 23_987_000 picoseconds.
+		Weight::from_parts(11_982_236, 2021)
+			// Standard Error: 52_781
+			.saturating_add(Weight::from_parts(13_796_260, 0).saturating_mul(d.into()))
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(319, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(397, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(d.into())))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(d.into())))
 			.saturating_add(Weight::from_parts(0, 2021).saturating_mul(d.into()))
@@ -1053,19 +1071,19 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
-	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn seal_delegate_call() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1363`
 		//  Estimated: `4828`
-		// Minimum execution time: 32_134_000 picoseconds.
-		Weight::from_parts(33_037_000, 4828)
+		// Minimum execution time: 32_754_000 picoseconds.
+		Weight::from_parts(33_660_000, 4828)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
-	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
 	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `System::Account` (r:1 w:1)
@@ -1076,178 +1094,190 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	fn seal_instantiate(t: u32, d: u32, i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1413`
-		//  Estimated: `4863 + d * (26 ±1) + t * (26 ±1)`
-		// Minimum execution time: 153_561_000 picoseconds.
-		Weight::from_parts(109_353_814, 4863)
-			// Standard Error: 568_290
-			.saturating_add(Weight::from_parts(21_328_059, 0).saturating_mul(t.into()))
-			// Standard Error: 568_290
-			.saturating_add(Weight::from_parts(29_078_265, 0).saturating_mul(d.into()))
+		//  Estimated: `4857 + d * (28 ±1) + t * (28 ±1)`
+		// Minimum execution time: 149_649_000 picoseconds.
+		Weight::from_parts(106_708_312, 4857)
+			// Standard Error: 531_299
+			.saturating_add(Weight::from_parts(19_820_332, 0).saturating_mul(t.into()))
+			// Standard Error: 531_299
+			.saturating_add(Weight::from_parts(30_026_552, 0).saturating_mul(d.into()))
 			// Standard Error: 6
-			.saturating_add(Weight::from_parts(3_922, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(4_025, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
-			.saturating_add(Weight::from_parts(0, 26).saturating_mul(d.into()))
-			.saturating_add(Weight::from_parts(0, 26).saturating_mul(t.into()))
+			.saturating_add(Weight::from_parts(0, 28).saturating_mul(d.into()))
+			.saturating_add(Weight::from_parts(0, 28).saturating_mul(t.into()))
 	}
 	/// The range of component `n` is `[0, 1048576]`.
 	fn sha2_256(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_210_000 picoseconds.
-		Weight::from_parts(6_742_356, 0)
-			// Standard Error: 1
-			.saturating_add(Weight::from_parts(1_262, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_183_000 picoseconds.
+		Weight::from_parts(12_193_562, 0)
+			// Standard Error: 0
+			.saturating_add(Weight::from_parts(1_286, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 1048576]`.
 	fn identity(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 744_000 picoseconds.
-		Weight::from_parts(726_223, 0)
+		// Minimum execution time: 724_000 picoseconds.
+		Weight::from_parts(423_926, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(112, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(149, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 1048576]`.
 	fn ripemd_160(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_303_000 picoseconds.
-		Weight::from_parts(5_014_415, 0)
+		// Minimum execution time: 1_235_000 picoseconds.
+		Weight::from_parts(6_941_606, 0)
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(3_746, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(3_767, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 1048576]`.
 	fn seal_hash_keccak_256(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_191_000 picoseconds.
-		Weight::from_parts(8_433_779, 0)
+		// Minimum execution time: 1_148_000 picoseconds.
+		Weight::from_parts(12_850_349, 0)
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(3_561, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(3_590, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 1048576]`.
 	fn hash_blake2_256(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_642_000 picoseconds.
-		Weight::from_parts(16_588_050, 0)
+		// Minimum execution time: 1_570_000 picoseconds.
+		Weight::from_parts(14_584_934, 0)
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(1_403, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(1_442, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 1048576]`.
 	fn hash_blake2_128(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_560_000 picoseconds.
-		Weight::from_parts(11_627_209, 0)
-			// Standard Error: 1
-			.saturating_add(Weight::from_parts(1_418, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_625_000 picoseconds.
+		Weight::from_parts(14_771_647, 0)
+			// Standard Error: 0
+			.saturating_add(Weight::from_parts(1_444, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 1048321]`.
 	fn seal_sr25519_verify(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 43_050_000 picoseconds.
-		Weight::from_parts(78_880_483, 0)
+		// Minimum execution time: 42_969_000 picoseconds.
+		Weight::from_parts(90_649_318, 0)
 			// Standard Error: 4
-			.saturating_add(Weight::from_parts(4_820, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(4_813, 0).saturating_mul(n.into()))
 	}
 	fn ecdsa_recover() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 46_308_000 picoseconds.
-		Weight::from_parts(47_213_000, 0)
+		// Minimum execution time: 46_096_000 picoseconds.
+		Weight::from_parts(46_988_000, 0)
 	}
 	fn bn128_add() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 14_418_000 picoseconds.
-		Weight::from_parts(15_454_000, 0)
+		// Minimum execution time: 14_848_000 picoseconds.
+		Weight::from_parts(17_210_000, 0)
 	}
 	fn bn128_mul() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 998_849_000 picoseconds.
-		Weight::from_parts(1_007_812_000, 0)
+		// Minimum execution time: 991_766_000 picoseconds.
+		Weight::from_parts(996_123_000, 0)
 	}
 	/// The range of component `n` is `[0, 20]`.
 	fn bn128_pairing(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 878_000 picoseconds.
-		Weight::from_parts(4_894_017_610, 0)
-			// Standard Error: 10_490_929
-			.saturating_add(Weight::from_parts(5_933_404_461, 0).saturating_mul(n.into()))
+		// Minimum execution time: 848_000 picoseconds.
+		Weight::from_parts(4_990_945_553, 0)
+			// Standard Error: 10_630_771
+			.saturating_add(Weight::from_parts(6_054_433_018, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 1200]`.
 	fn blake2f(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 976_000 picoseconds.
-		Weight::from_parts(1_204_210, 0)
-			// Standard Error: 11
-			.saturating_add(Weight::from_parts(29_014, 0).saturating_mul(n.into()))
+		// Minimum execution time: 961_000 picoseconds.
+		Weight::from_parts(1_252_241, 0)
+			// Standard Error: 26
+			.saturating_add(Weight::from_parts(30_105, 0).saturating_mul(n.into()))
 	}
 	fn seal_ecdsa_to_eth_address() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 12_997_000 picoseconds.
-		Weight::from_parts(13_136_000, 0)
+		// Minimum execution time: 13_095_000 picoseconds.
+		Weight::from_parts(13_230_000, 0)
 	}
-	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
+	/// Storage: `Revive::CodeInfoOf` (r:2 w:2)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
-	fn seal_set_code_hash(_n: u32) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `297`
-		//  Estimated: `3762`
-		// Minimum execution time: 12_778_000 picoseconds.
-		Weight::from_parts(13_084_000, 3762)
-			.saturating_add(T::DbWeight::get().reads(1_u64))
-			.saturating_add(T::DbWeight::get().writes(1_u64))
+	/// Storage: `Balances::Holds` (r:1 w:1)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Revive::PristineCode` (r:0 w:1)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 1]`.
+	fn seal_set_code_hash(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `391 + r * (703 ±0)`
+		//  Estimated: `6331 + r * (2280 ±0)`
+		// Minimum execution time: 14_670_000 picoseconds.
+		Weight::from_parts(15_744_806, 6331)
+			// Standard Error: 54_003
+			.saturating_add(Weight::from_parts(47_474_393, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(r.into())))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
+			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(r.into())))
+			.saturating_add(Weight::from_parts(0, 2280).saturating_mul(r.into()))
 	}
 	/// The range of component `r` is `[0, 10000]`.
 	fn evm_opcode(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_130_000 picoseconds.
-		Weight::from_parts(1_549_653, 0)
-			// Standard Error: 4
-			.saturating_add(Weight::from_parts(2_365, 0).saturating_mul(r.into()))
+		// Minimum execution time: 1_189_000 picoseconds.
+		Weight::from_parts(1_470_372, 0)
+			// Standard Error: 20
+			.saturating_add(Weight::from_parts(6_508, 0).saturating_mul(r.into()))
 	}
 	/// The range of component `r` is `[0, 10000]`.
 	fn instr(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 12_557_000 picoseconds.
-		Weight::from_parts(60_327_563, 0)
-			// Standard Error: 1_035
-			.saturating_add(Weight::from_parts(143_372, 0).saturating_mul(r.into()))
+		// Minimum execution time: 12_052_000 picoseconds.
+		Weight::from_parts(56_794_418, 0)
+			// Standard Error: 416
+			.saturating_add(Weight::from_parts(116_801, 0).saturating_mul(r.into()))
 	}
 	/// The range of component `r` is `[0, 100000]`.
 	fn instr_empty_loop(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_315_000 picoseconds.
-		Weight::from_parts(7_548_170, 0)
-			// Standard Error: 24
-			.saturating_add(Weight::from_parts(72_139, 0).saturating_mul(r.into()))
+		// Minimum execution time: 3_321_000 picoseconds.
+		Weight::from_parts(8_236_588, 0)
+			// Standard Error: 32
+			.saturating_add(Weight::from_parts(71_473, 0).saturating_mul(r.into()))
 	}
 	/// Storage: UNKNOWN KEY `0x735f040a5d490f1107ad9c56f5ca00d2060e99e5378e562537cf3bc983e17b91` (r:2 w:1)
 	/// Proof: UNKNOWN KEY `0x735f040a5d490f1107ad9c56f5ca00d2060e99e5378e562537cf3bc983e17b91` (r:2 w:1)
@@ -1257,21 +1287,25 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `316`
 		//  Estimated: `6256`
-		// Minimum execution time: 11_803_000 picoseconds.
-		Weight::from_parts(12_358_000, 6256)
+		// Minimum execution time: 12_137_000 picoseconds.
+		Weight::from_parts(12_594_000, 6256)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `Revive::CodeInfoOf` (r:2 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Holds` (r:2 w:2)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `MaxEncodedLen`)
 	fn v2_migration_step() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `245`
-		//  Estimated: `6134`
-		// Minimum execution time: 10_980_000 picoseconds.
-		Weight::from_parts(11_452_000, 6134)
-			.saturating_add(T::DbWeight::get().reads(2_u64))
-			.saturating_add(T::DbWeight::get().writes(1_u64))
+		//  Measured:  `741`
+		//  Estimated: `6794`
+		// Minimum execution time: 64_340_000 picoseconds.
+		Weight::from_parts(67_378_000, 6794)
+			.saturating_add(T::DbWeight::get().reads(5_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
 }
 
@@ -1283,8 +1317,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `147`
 		//  Estimated: `1632`
-		// Minimum execution time: 3_150_000 picoseconds.
-		Weight::from_parts(3_421_000, 1632)
+		// Minimum execution time: 3_146_000 picoseconds.
+		Weight::from_parts(3_400_000, 1632)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -1294,10 +1328,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `458 + k * (69 ±0)`
 		//  Estimated: `448 + k * (70 ±0)`
-		// Minimum execution time: 14_380_000 picoseconds.
-		Weight::from_parts(14_911_000, 448)
-			// Standard Error: 1_088
-			.saturating_add(Weight::from_parts(1_199_036, 0).saturating_mul(k.into()))
+		// Minimum execution time: 14_245_000 picoseconds.
+		Weight::from_parts(14_708_000, 448)
+			// Standard Error: 830
+			.saturating_add(Weight::from_parts(1_175_004, 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))
@@ -1311,7 +1345,7 @@ impl WeightInfo for () {
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
-	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Timestamp::Now` (r:1 w:0)
 	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
 	/// Storage: `System::Account` (r:1 w:1)
@@ -1321,10 +1355,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1172 + c * (1 ±0)`
 		//  Estimated: `7107 + c * (1 ±0)`
-		// Minimum execution time: 86_173_000 picoseconds.
-		Weight::from_parts(120_432_125, 7107)
-			// Standard Error: 9
-			.saturating_add(Weight::from_parts(1_435, 0).saturating_mul(c.into()))
+		// Minimum execution time: 86_441_000 picoseconds.
+		Weight::from_parts(123_780_707, 7107)
+			// Standard Error: 11
+			.saturating_add(Weight::from_parts(1_438, 0).saturating_mul(c.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(c.into()))
@@ -1336,20 +1370,20 @@ impl WeightInfo for () {
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
-	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Timestamp::Now` (r:1 w:0)
 	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
 	/// 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 `[1, 102400]`.
+	/// The range of component `c` is `[1, 10240]`.
 	fn call_with_evm_code_per_byte(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1104`
-		//  Estimated: `7046`
-		// Minimum execution time: 80_755_000 picoseconds.
-		Weight::from_parts(85_415_387, 7046)
-			// Standard Error: 2
-			.saturating_add(Weight::from_parts(33, 0).saturating_mul(c.into()))
+		//  Measured:  `1112`
+		//  Estimated: `7051`
+		// Minimum execution time: 81_282_000 picoseconds.
+		Weight::from_parts(85_248_488, 7051)
+			// Standard Error: 21
+			.saturating_add(Weight::from_parts(36, 0).saturating_mul(c.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -1360,7 +1394,7 @@ impl WeightInfo for () {
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
-	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Timestamp::Now` (r:1 w:0)
 	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
 	/// Storage: `System::Account` (r:1 w:1)
@@ -1370,8 +1404,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `4516`
 		//  Estimated: `10456`
-		// Minimum execution time: 123_589_000 picoseconds.
-		Weight::from_parts(127_489_869, 10456)
+		// Minimum execution time: 124_393_000 picoseconds.
+		Weight::from_parts(129_685_861, 10456)
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -1388,19 +1422,19 @@ impl WeightInfo for () {
 	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:0 w:1)
-	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `c` is `[0, 102400]`.
 	/// The range of component `i` is `[0, 131072]`.
 	fn instantiate_with_code(c: u32, i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1108`
-		//  Estimated: `7041`
-		// Minimum execution time: 754_650_000 picoseconds.
-		Weight::from_parts(758_926_000, 7041)
-			// Standard Error: 85
-			.saturating_add(Weight::from_parts(15_657, 0).saturating_mul(c.into()))
-			// Standard Error: 67
-			.saturating_add(Weight::from_parts(1_573, 0).saturating_mul(i.into()))
+		//  Measured:  `1171`
+		//  Estimated: `7104`
+		// Minimum execution time: 762_496_000 picoseconds.
+		Weight::from_parts(55_020_008, 7104)
+			// Standard Error: 44
+			.saturating_add(Weight::from_parts(20_306, 0).saturating_mul(c.into()))
+			// Standard Error: 35
+			.saturating_add(Weight::from_parts(5_068, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
@@ -1417,22 +1451,22 @@ impl WeightInfo for () {
 	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:0 w:1)
-	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `c` is `[0, 102400]`.
 	/// The range of component `i` is `[0, 131072]`.
 	/// The range of component `d` is `[0, 1]`.
 	fn eth_instantiate_with_code(c: u32, i: u32, d: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1122`
-		//  Estimated: `7062 + d * (2475 ±0)`
-		// Minimum execution time: 278_747_000 picoseconds.
-		Weight::from_parts(145_795_450, 7062)
-			// Standard Error: 17
-			.saturating_add(Weight::from_parts(14_966, 0).saturating_mul(c.into()))
-			// Standard Error: 13
-			.saturating_add(Weight::from_parts(542, 0).saturating_mul(i.into()))
-			// Standard Error: 1_133_623
-			.saturating_add(Weight::from_parts(41_772_022, 0).saturating_mul(d.into()))
+		//  Measured:  `1185`
+		//  Estimated: `7125 + d * (2475 ±0)`
+		// Minimum execution time: 284_562_000 picoseconds.
+		Weight::from_parts(163_089_642, 7125)
+			// Standard Error: 34
+			.saturating_add(Weight::from_parts(15_162, 0).saturating_mul(c.into()))
+			// Standard Error: 27
+			.saturating_add(Weight::from_parts(514, 0).saturating_mul(i.into()))
+			// Standard Error: 2_273_714
+			.saturating_add(Weight::from_parts(38_746_748, 0).saturating_mul(d.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(d.into())))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
@@ -1442,7 +1476,7 @@ impl WeightInfo for () {
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
-	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
@@ -1457,11 +1491,11 @@ impl WeightInfo for () {
 	fn instantiate(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1913`
-		//  Estimated: `5338`
-		// Minimum execution time: 171_706_000 picoseconds.
-		Weight::from_parts(177_711_925, 5338)
-			// Standard Error: 10
-			.saturating_add(Weight::from_parts(4_170, 0).saturating_mul(i.into()))
+		//  Estimated: `5339`
+		// Minimum execution time: 171_348_000 picoseconds.
+		Weight::from_parts(176_612_673, 5339)
+			// Standard Error: 11
+			.saturating_add(Weight::from_parts(4_290, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -1472,7 +1506,7 @@ impl WeightInfo for () {
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
-	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Timestamp::Now` (r:1 w:0)
 	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
 	/// Storage: `System::Account` (r:1 w:1)
@@ -1481,8 +1515,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1794`
 		//  Estimated: `7734`
-		// Minimum execution time: 86_797_000 picoseconds.
-		Weight::from_parts(90_276_000, 7734)
+		// Minimum execution time: 88_764_000 picoseconds.
+		Weight::from_parts(93_353_000, 7734)
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -1493,7 +1527,7 @@ impl WeightInfo for () {
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
-	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Timestamp::Now` (r:1 w:0)
 	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
 	/// Storage: `System::Account` (r:1 w:1)
@@ -1503,10 +1537,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1794`
 		//  Estimated: `7734 + d * (2475 ±0)`
-		// Minimum execution time: 86_087_000 picoseconds.
-		Weight::from_parts(89_671_759, 7734)
-			// Standard Error: 300_888
-			.saturating_add(Weight::from_parts(26_362_240, 0).saturating_mul(d.into()))
+		// Minimum execution time: 86_142_000 picoseconds.
+		Weight::from_parts(90_482_761, 7734)
+			// Standard Error: 430_134
+			.saturating_add(Weight::from_parts(30_624_838, 0).saturating_mul(d.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(d.into())))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
@@ -1518,16 +1552,16 @@ impl WeightInfo for () {
 	/// Storage: `Balances::Holds` (r:1 w:1)
 	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:0 w:1)
-	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// The range of component `c` is `[0, 102400]`.
 	fn upload_code(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `505`
-		//  Estimated: `3970`
-		// Minimum execution time: 57_265_000 picoseconds.
-		Weight::from_parts(38_840_872, 3970)
-			// Standard Error: 20
-			.saturating_add(Weight::from_parts(14_420, 0).saturating_mul(c.into()))
+		//  Measured:  `606`
+		//  Estimated: `4071`
+		// Minimum execution time: 57_080_000 picoseconds.
+		Weight::from_parts(49_101_825, 4071)
+			// Standard Error: 18
+			.saturating_add(Weight::from_parts(14_610, 0).saturating_mul(c.into()))
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -1536,13 +1570,13 @@ impl WeightInfo for () {
 	/// Storage: `Balances::Holds` (r:1 w:1)
 	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:0 w:1)
-	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn remove_code() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `659`
-		//  Estimated: `4124`
-		// Minimum execution time: 47_571_000 picoseconds.
-		Weight::from_parts(48_571_000, 4124)
+		//  Measured:  `760`
+		//  Estimated: `4225`
+		// Minimum execution time: 53_084_000 picoseconds.
+		Weight::from_parts(54_573_000, 4225)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -1550,14 +1584,20 @@ impl WeightInfo for () {
 	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:2 w:2)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
+	/// Storage: `Balances::Holds` (r:1 w:1)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Revive::PristineCode` (r:0 w:1)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn set_code() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `532`
-		//  Estimated: `6472`
-		// Minimum execution time: 20_565_000 picoseconds.
-		Weight::from_parts(21_420_000, 6472)
-			.saturating_add(RocksDbWeight::get().reads(3_u64))
-			.saturating_add(RocksDbWeight::get().writes(3_u64))
+		//  Measured:  `1095`
+		//  Estimated: `7035`
+		// Minimum execution time: 65_666_000 picoseconds.
+		Weight::from_parts(67_373_000, 7035)
+			.saturating_add(RocksDbWeight::get().reads(5_u64))
+			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:1)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
@@ -1567,8 +1607,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `813`
 		//  Estimated: `4278`
-		// Minimum execution time: 58_321_000 picoseconds.
-		Weight::from_parts(58_922_000, 4278)
+		// Minimum execution time: 55_888_000 picoseconds.
+		Weight::from_parts(57_747_000, 4278)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -1580,8 +1620,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `395`
 		//  Estimated: `3860`
-		// Minimum execution time: 43_929_000 picoseconds.
-		Weight::from_parts(44_755_000, 3860)
+		// Minimum execution time: 42_171_000 picoseconds.
+		Weight::from_parts(43_198_000, 3860)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -1593,8 +1633,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `145`
 		//  Estimated: `3610`
-		// Minimum execution time: 12_925_000 picoseconds.
-		Weight::from_parts(13_333_000, 3610)
+		// Minimum execution time: 13_030_000 picoseconds.
+		Weight::from_parts(13_365_000, 3610)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 	}
 	/// The range of component `r` is `[0, 1600]`.
@@ -1602,23 +1642,23 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 7_528_000 picoseconds.
-		Weight::from_parts(8_699_408, 0)
-			// Standard Error: 197
-			.saturating_add(Weight::from_parts(182_534, 0).saturating_mul(r.into()))
+		// Minimum execution time: 7_473_000 picoseconds.
+		Weight::from_parts(8_474_805, 0)
+			// Standard Error: 322
+			.saturating_add(Weight::from_parts(178_929, 0).saturating_mul(r.into()))
 	}
 	fn seal_caller() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 306_000 picoseconds.
-		Weight::from_parts(375_000, 0)
+		// Minimum execution time: 355_000 picoseconds.
+		Weight::from_parts(397_000, 0)
 	}
 	fn seal_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 288_000 picoseconds.
+		// Minimum execution time: 318_000 picoseconds.
 		Weight::from_parts(362_000, 0)
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
@@ -1627,8 +1667,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `567`
 		//  Estimated: `4032`
-		// Minimum execution time: 7_364_000 picoseconds.
-		Weight::from_parts(7_904_000, 4032)
+		// Minimum execution time: 7_507_000 picoseconds.
+		Weight::from_parts(8_064_000, 4032)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:0)
@@ -1637,16 +1677,16 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `403`
 		//  Estimated: `3868`
-		// Minimum execution time: 9_050_000 picoseconds.
-		Weight::from_parts(9_489_000, 3868)
+		// Minimum execution time: 9_458_000 picoseconds.
+		Weight::from_parts(10_105_000, 3868)
 			.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: 302_000 picoseconds.
-		Weight::from_parts(337_000, 0)
+		// Minimum execution time: 317_000 picoseconds.
+		Weight::from_parts(355_000, 0)
 	}
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:0)
 	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
@@ -1656,51 +1696,51 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `475`
 		//  Estimated: `3940`
-		// Minimum execution time: 12_570_000 picoseconds.
-		Weight::from_parts(13_223_000, 3940)
+		// Minimum execution time: 13_105_000 picoseconds.
+		Weight::from_parts(13_354_000, 3940)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 	}
 	fn seal_caller_is_origin() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 310_000 picoseconds.
-		Weight::from_parts(364_000, 0)
+		// Minimum execution time: 331_000 picoseconds.
+		Weight::from_parts(381_000, 0)
 	}
 	fn seal_caller_is_root() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 259_000 picoseconds.
-		Weight::from_parts(302_000, 0)
+		// Minimum execution time: 307_000 picoseconds.
+		Weight::from_parts(336_000, 0)
 	}
 	fn seal_address() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 330_000 picoseconds.
-		Weight::from_parts(357_000, 0)
+		// Minimum execution time: 323_000 picoseconds.
+		Weight::from_parts(368_000, 0)
 	}
 	fn seal_weight_left() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 723_000 picoseconds.
-		Weight::from_parts(797_000, 0)
+		// Minimum execution time: 701_000 picoseconds.
+		Weight::from_parts(785_000, 0)
 	}
 	fn seal_ref_time_left() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 268_000 picoseconds.
-		Weight::from_parts(305_000, 0)
+		// Minimum execution time: 278_000 picoseconds.
+		Weight::from_parts(334_000, 0)
 	}
 	fn seal_balance() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `540`
 		//  Estimated: `0`
-		// Minimum execution time: 12_855_000 picoseconds.
-		Weight::from_parts(13_194_000, 0)
+		// Minimum execution time: 12_890_000 picoseconds.
+		Weight::from_parts(13_471_000, 0)
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
@@ -1712,8 +1752,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `791`
 		//  Estimated: `4256`
-		// Minimum execution time: 18_281_000 picoseconds.
-		Weight::from_parts(19_051_000, 4256)
+		// Minimum execution time: 18_523_000 picoseconds.
+		Weight::from_parts(19_059_000, 4256)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 	}
 	/// Storage: `Revive::ImmutableDataOf` (r:1 w:0)
@@ -1723,10 +1763,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `271 + n * (1 ±0)`
 		//  Estimated: `3736 + n * (1 ±0)`
-		// Minimum execution time: 5_711_000 picoseconds.
-		Weight::from_parts(6_613_746, 3736)
-			// Standard Error: 7
-			.saturating_add(Weight::from_parts(499, 0).saturating_mul(n.into()))
+		// Minimum execution time: 6_027_000 picoseconds.
+		Weight::from_parts(6_736_994, 3736)
+			// Standard Error: 5
+			.saturating_add(Weight::from_parts(592, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -1737,67 +1777,67 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_087_000 picoseconds.
-		Weight::from_parts(2_316_148, 0)
+		// Minimum execution time: 2_033_000 picoseconds.
+		Weight::from_parts(2_294_007, 0)
 			// Standard Error: 2
-			.saturating_add(Weight::from_parts(493, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(565, 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: 267_000 picoseconds.
-		Weight::from_parts(315_000, 0)
+		// Minimum execution time: 276_000 picoseconds.
+		Weight::from_parts(323_000, 0)
 	}
 	fn seal_minimum_balance() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 270_000 picoseconds.
-		Weight::from_parts(313_000, 0)
+		// Minimum execution time: 273_000 picoseconds.
+		Weight::from_parts(325_000, 0)
 	}
 	fn seal_return_data_size() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 264_000 picoseconds.
-		Weight::from_parts(324_000, 0)
+		// Minimum execution time: 265_000 picoseconds.
+		Weight::from_parts(302_000, 0)
 	}
 	fn seal_call_data_size() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 262_000 picoseconds.
-		Weight::from_parts(309_000, 0)
+		// Minimum execution time: 279_000 picoseconds.
+		Weight::from_parts(353_000, 0)
 	}
 	fn seal_gas_limit() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 531_000 picoseconds.
-		Weight::from_parts(625_000, 0)
+		// Minimum execution time: 518_000 picoseconds.
+		Weight::from_parts(572_000, 0)
 	}
 	fn seal_gas_price() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 260_000 picoseconds.
-		Weight::from_parts(311_000, 0)
+		// Minimum execution time: 308_000 picoseconds.
+		Weight::from_parts(339_000, 0)
 	}
 	fn seal_base_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 282_000 picoseconds.
-		Weight::from_parts(312_000, 0)
+		// Minimum execution time: 283_000 picoseconds.
+		Weight::from_parts(315_000, 0)
 	}
 	fn seal_block_number() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 261_000 picoseconds.
-		Weight::from_parts(325_000, 0)
+		// Minimum execution time: 300_000 picoseconds.
+		Weight::from_parts(334_000, 0)
 	}
 	/// Storage: `Session::Validators` (r:1 w:0)
 	/// Proof: `Session::Validators` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -1805,8 +1845,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `141`
 		//  Estimated: `1626`
-		// Minimum execution time: 21_538_000 picoseconds.
-		Weight::from_parts(22_409_000, 1626)
+		// Minimum execution time: 22_163_000 picoseconds.
+		Weight::from_parts(22_643_000, 1626)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `System::BlockHash` (r:1 w:0)
@@ -1815,60 +1855,60 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `30`
 		//  Estimated: `3495`
-		// Minimum execution time: 3_401_000 picoseconds.
-		Weight::from_parts(3_673_000, 3495)
+		// Minimum execution time: 3_625_000 picoseconds.
+		Weight::from_parts(3_850_000, 3495)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	fn seal_now() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 300_000 picoseconds.
-		Weight::from_parts(354_000, 0)
+		// Minimum execution time: 293_000 picoseconds.
+		Weight::from_parts(349_000, 0)
 	}
 	fn seal_weight_to_fee() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_680_000 picoseconds.
-		Weight::from_parts(1_742_000, 0)
+		// Minimum execution time: 1_597_000 picoseconds.
+		Weight::from_parts(1_720_000, 0)
 	}
 	/// The range of component `n` is `[0, 1048572]`.
 	fn seal_copy_to_contract(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 392_000 picoseconds.
-		Weight::from_parts(262_995, 0)
+		// Minimum execution time: 425_000 picoseconds.
+		Weight::from_parts(437_000, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(202, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(239, 0).saturating_mul(n.into()))
 	}
 	fn seal_call_data_load() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 234_000 picoseconds.
-		Weight::from_parts(291_000, 0)
+		// Minimum execution time: 277_000 picoseconds.
+		Weight::from_parts(313_000, 0)
 	}
 	/// The range of component `n` is `[0, 1048576]`.
 	fn seal_call_data_copy(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 267_000 picoseconds.
-		Weight::from_parts(610_075, 0)
+		// Minimum execution time: 257_000 picoseconds.
+		Weight::from_parts(288_000, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(112, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(150, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 131072]`.
 	fn seal_return(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 292_000 picoseconds.
-		Weight::from_parts(466_044, 0)
+		// Minimum execution time: 315_000 picoseconds.
+		Weight::from_parts(476_627, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(200, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(238, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
@@ -1876,18 +1916,30 @@ impl WeightInfo for () {
 	/// Proof: `Revive::DeletionQueueCounter` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
+	/// Storage: `Balances::Holds` (r:1 w:1)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
 	/// Storage: `Revive::DeletionQueue` (r:0 w:1)
 	/// Proof: `Revive::DeletionQueue` (`max_values`: None, `max_size`: Some(142), added: 2617, mode: `Measured`)
+	/// Storage: `Revive::PristineCode` (r:0 w:1)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Revive::ImmutableDataOf` (r:0 w:1)
 	/// Proof: `Revive::ImmutableDataOf` (`max_values`: None, `max_size`: Some(4118), added: 6593, mode: `Measured`)
-	fn seal_terminate(_u: u32) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `583`
-		//  Estimated: `4048`
-		// Minimum execution time: 16_855_000 picoseconds.
-		Weight::from_parts(17_325_000, 4048)
+	/// The range of component `r` is `[0, 1]`.
+	fn seal_terminate(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `583 + r * (670 ±0)`
+		//  Estimated: `4048 + r * (2359 ±0)`
+		// Minimum execution time: 16_560_000 picoseconds.
+		Weight::from_parts(17_630_489, 4048)
+			// Standard Error: 66_463
+			.saturating_add(Weight::from_parts(46_618_510, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
+			.saturating_add(RocksDbWeight::get().reads((2_u64).saturating_mul(r.into())))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
+			.saturating_add(RocksDbWeight::get().writes((3_u64).saturating_mul(r.into())))
+			.saturating_add(Weight::from_parts(0, 2359).saturating_mul(r.into()))
 	}
 	/// The range of component `t` is `[0, 4]`.
 	/// The range of component `n` is `[0, 416]`.
@@ -1895,12 +1947,12 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_416_000 picoseconds.
-		Weight::from_parts(4_382_711, 0)
-			// Standard Error: 3_063
-			.saturating_add(Weight::from_parts(257_304, 0).saturating_mul(t.into()))
-			// Standard Error: 33
-			.saturating_add(Weight::from_parts(1_239, 0).saturating_mul(n.into()))
+		// Minimum execution time: 4_523_000 picoseconds.
+		Weight::from_parts(4_505_303, 0)
+			// Standard Error: 3_656
+			.saturating_add(Weight::from_parts(240_684, 0).saturating_mul(t.into()))
+			// Standard Error: 40
+			.saturating_add(Weight::from_parts(1_232, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
 	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -1908,8 +1960,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `648`
 		//  Estimated: `648`
-		// Minimum execution time: 7_148_000 picoseconds.
-		Weight::from_parts(7_616_000, 648)
+		// Minimum execution time: 7_228_000 picoseconds.
+		Weight::from_parts(7_734_000, 648)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -1918,8 +1970,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `10658`
 		//  Estimated: `10658`
-		// Minimum execution time: 41_435_000 picoseconds.
-		Weight::from_parts(42_294_000, 10658)
+		// Minimum execution time: 41_276_000 picoseconds.
+		Weight::from_parts(42_310_000, 10658)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -1928,8 +1980,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `648`
 		//  Estimated: `648`
-		// Minimum execution time: 8_266_000 picoseconds.
-		Weight::from_parts(8_704_000, 648)
+		// Minimum execution time: 8_396_000 picoseconds.
+		Weight::from_parts(8_776_000, 648)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -1939,8 +1991,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `10658`
 		//  Estimated: `10658`
-		// Minimum execution time: 43_187_000 picoseconds.
-		Weight::from_parts(44_235_000, 10658)
+		// Minimum execution time: 42_661_000 picoseconds.
+		Weight::from_parts(44_266_000, 10658)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -1952,12 +2004,12 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + o * (1 ±0)`
 		//  Estimated: `247 + o * (1 ±0)`
-		// Minimum execution time: 8_740_000 picoseconds.
-		Weight::from_parts(9_473_762, 247)
-			// Standard Error: 60
-			.saturating_add(Weight::from_parts(684, 0).saturating_mul(n.into()))
-			// Standard Error: 60
-			.saturating_add(Weight::from_parts(488, 0).saturating_mul(o.into()))
+		// Minimum execution time: 8_864_000 picoseconds.
+		Weight::from_parts(9_769_026, 247)
+			// Standard Error: 67
+			.saturating_add(Weight::from_parts(81, 0).saturating_mul(n.into()))
+			// Standard Error: 67
+			.saturating_add(Weight::from_parts(866, 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()))
@@ -1969,10 +2021,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 8_609_000 picoseconds.
-		Weight::from_parts(9_456_962, 247)
-			// Standard Error: 78
-			.saturating_add(Weight::from_parts(882, 0).saturating_mul(n.into()))
+		// Minimum execution time: 8_552_000 picoseconds.
+		Weight::from_parts(9_609_466, 247)
+			// Standard Error: 88
+			.saturating_add(Weight::from_parts(789, 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()))
@@ -1984,10 +2036,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 7_777_000 picoseconds.
-		Weight::from_parts(8_957_787, 247)
-			// Standard Error: 85
-			.saturating_add(Weight::from_parts(2_018, 0).saturating_mul(n.into()))
+		// Minimum execution time: 8_101_000 picoseconds.
+		Weight::from_parts(9_115_278, 247)
+			// Standard Error: 75
+			.saturating_add(Weight::from_parts(1_381, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -1998,10 +2050,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 7_552_000 picoseconds.
-		Weight::from_parts(8_333_059, 247)
-			// Standard Error: 68
-			.saturating_add(Weight::from_parts(1_086, 0).saturating_mul(n.into()))
+		// Minimum execution time: 7_594_000 picoseconds.
+		Weight::from_parts(8_575_324, 247)
+			// Standard Error: 78
+			.saturating_add(Weight::from_parts(635, 0).saturating_mul(n.into()))
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
@@ -2012,10 +2064,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `248 + n * (1 ±0)`
 		//  Estimated: `247 + n * (1 ±0)`
-		// Minimum execution time: 9_262_000 picoseconds.
-		Weight::from_parts(10_280_631, 247)
-			// Standard Error: 84
-			.saturating_add(Weight::from_parts(780, 0).saturating_mul(n.into()))
+		// Minimum execution time: 9_130_000 picoseconds.
+		Weight::from_parts(10_301_501, 247)
+			// Standard Error: 85
+			.saturating_add(Weight::from_parts(1_584, 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()))
@@ -2024,36 +2076,36 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_559_000 picoseconds.
+		// Minimum execution time: 1_553_000 picoseconds.
 		Weight::from_parts(1_678_000, 0)
 	}
 	fn set_transient_storage_full() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_939_000 picoseconds.
-		Weight::from_parts(2_073_000, 0)
+		// Minimum execution time: 1_962_000 picoseconds.
+		Weight::from_parts(2_085_000, 0)
 	}
 	fn get_transient_storage_empty() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_490_000 picoseconds.
-		Weight::from_parts(1_582_000, 0)
+		// Minimum execution time: 1_599_000 picoseconds.
+		Weight::from_parts(1_715_000, 0)
 	}
 	fn get_transient_storage_full() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_679_000 picoseconds.
-		Weight::from_parts(1_739_000, 0)
+		// Minimum execution time: 1_837_000 picoseconds.
+		Weight::from_parts(1_930_000, 0)
 	}
 	fn rollback_transient_storage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_279_000 picoseconds.
-		Weight::from_parts(1_339_000, 0)
+		// Minimum execution time: 1_273_000 picoseconds.
+		Weight::from_parts(1_356_000, 0)
 	}
 	/// The range of component `n` is `[0, 416]`.
 	/// The range of component `o` is `[0, 416]`.
@@ -2061,52 +2113,52 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_300_000 picoseconds.
-		Weight::from_parts(2_536_575, 0)
-			// Standard Error: 17
-			.saturating_add(Weight::from_parts(334, 0).saturating_mul(n.into()))
-			// Standard Error: 17
-			.saturating_add(Weight::from_parts(392, 0).saturating_mul(o.into()))
+		// Minimum execution time: 2_307_000 picoseconds.
+		Weight::from_parts(2_700_633, 0)
+			// Standard Error: 22
+			.saturating_add(Weight::from_parts(264, 0).saturating_mul(n.into()))
+			// Standard Error: 22
+			.saturating_add(Weight::from_parts(241, 0).saturating_mul(o.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_clear_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_164_000 picoseconds.
-		Weight::from_parts(2_555_863, 0)
-			// Standard Error: 34
-			.saturating_add(Weight::from_parts(226, 0).saturating_mul(n.into()))
+		// Minimum execution time: 2_159_000 picoseconds.
+		Weight::from_parts(2_531_527, 0)
+			// Standard Error: 22
+			.saturating_add(Weight::from_parts(344, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_get_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_870_000 picoseconds.
-		Weight::from_parts(2_188_923, 0)
-			// Standard Error: 27
-			.saturating_add(Weight::from_parts(316, 0).saturating_mul(n.into()))
+		// Minimum execution time: 2_066_000 picoseconds.
+		Weight::from_parts(2_317_959, 0)
+			// Standard Error: 19
+			.saturating_add(Weight::from_parts(218, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_contains_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_713_000 picoseconds.
-		Weight::from_parts(2_013_249, 0)
-			// Standard Error: 20
-			.saturating_add(Weight::from_parts(210, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_772_000 picoseconds.
+		Weight::from_parts(2_109_656, 0)
+			// Standard Error: 17
+			.saturating_add(Weight::from_parts(127, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 416]`.
 	fn seal_take_transient_storage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_549_000 picoseconds.
-		Weight::from_parts(2_811_411, 0)
-			// Standard Error: 31
-			.saturating_add(Weight::from_parts(61, 0).saturating_mul(n.into()))
+		// Minimum execution time: 2_677_000 picoseconds.
+		Weight::from_parts(2_887_082, 0)
+			// Standard Error: 21
+			.saturating_add(Weight::from_parts(3, 0).saturating_mul(n.into()))
 	}
 	/// Storage: `Revive::OriginalAccount` (r:1 w:0)
 	/// Proof: `Revive::OriginalAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `Measured`)
@@ -2115,7 +2167,7 @@ impl WeightInfo for () {
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
-	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// 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 `t` is `[0, 1]`.
@@ -2125,12 +2177,12 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1925`
 		//  Estimated: `5390`
-		// Minimum execution time: 88_918_000 picoseconds.
-		Weight::from_parts(70_713_518, 5390)
-			// Standard Error: 172_359
-			.saturating_add(Weight::from_parts(18_545_016, 0).saturating_mul(t.into()))
-			// Standard Error: 172_359
-			.saturating_add(Weight::from_parts(24_817_484, 0).saturating_mul(d.into()))
+		// Minimum execution time: 88_854_000 picoseconds.
+		Weight::from_parts(71_114_290, 5390)
+			// Standard Error: 191_071
+			.saturating_add(Weight::from_parts(18_628_762, 0).saturating_mul(t.into()))
+			// Standard Error: 191_071
+			.saturating_add(Weight::from_parts(25_344_741, 0).saturating_mul(d.into()))
 			// Standard Error: 0
 			.saturating_add(Weight::from_parts(2, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(5_u64))
@@ -2147,12 +2199,12 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `366 + d * (212 ±0)`
 		//  Estimated: `2021 + d * (2021 ±0)`
-		// Minimum execution time: 24_697_000 picoseconds.
-		Weight::from_parts(12_092_184, 2021)
-			// Standard Error: 60_308
-			.saturating_add(Weight::from_parts(13_519_246, 0).saturating_mul(d.into()))
+		// Minimum execution time: 23_987_000 picoseconds.
+		Weight::from_parts(11_982_236, 2021)
+			// Standard Error: 52_781
+			.saturating_add(Weight::from_parts(13_796_260, 0).saturating_mul(d.into()))
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(319, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(397, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads((2_u64).saturating_mul(d.into())))
 			.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(d.into())))
 			.saturating_add(Weight::from_parts(0, 2021).saturating_mul(d.into()))
@@ -2162,19 +2214,19 @@ impl WeightInfo for () {
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:0)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
-	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn seal_delegate_call() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1363`
 		//  Estimated: `4828`
-		// Minimum execution time: 32_134_000 picoseconds.
-		Weight::from_parts(33_037_000, 4828)
+		// Minimum execution time: 32_754_000 picoseconds.
+		Weight::from_parts(33_660_000, 4828)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 	}
 	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
 	/// Storage: `Revive::PristineCode` (r:1 w:0)
-	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: Some(1048612), added: 1051087, mode: `Measured`)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Revive::AccountInfoOf` (r:1 w:1)
 	/// Proof: `Revive::AccountInfoOf` (`max_values`: None, `max_size`: Some(247), added: 2722, mode: `Measured`)
 	/// Storage: `System::Account` (r:1 w:1)
@@ -2185,178 +2237,190 @@ impl WeightInfo for () {
 	fn seal_instantiate(t: u32, d: u32, i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1413`
-		//  Estimated: `4863 + d * (26 ±1) + t * (26 ±1)`
-		// Minimum execution time: 153_561_000 picoseconds.
-		Weight::from_parts(109_353_814, 4863)
-			// Standard Error: 568_290
-			.saturating_add(Weight::from_parts(21_328_059, 0).saturating_mul(t.into()))
-			// Standard Error: 568_290
-			.saturating_add(Weight::from_parts(29_078_265, 0).saturating_mul(d.into()))
+		//  Estimated: `4857 + d * (28 ±1) + t * (28 ±1)`
+		// Minimum execution time: 149_649_000 picoseconds.
+		Weight::from_parts(106_708_312, 4857)
+			// Standard Error: 531_299
+			.saturating_add(Weight::from_parts(19_820_332, 0).saturating_mul(t.into()))
+			// Standard Error: 531_299
+			.saturating_add(Weight::from_parts(30_026_552, 0).saturating_mul(d.into()))
 			// Standard Error: 6
-			.saturating_add(Weight::from_parts(3_922, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(4_025, 0).saturating_mul(i.into()))
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
-			.saturating_add(Weight::from_parts(0, 26).saturating_mul(d.into()))
-			.saturating_add(Weight::from_parts(0, 26).saturating_mul(t.into()))
+			.saturating_add(Weight::from_parts(0, 28).saturating_mul(d.into()))
+			.saturating_add(Weight::from_parts(0, 28).saturating_mul(t.into()))
 	}
 	/// The range of component `n` is `[0, 1048576]`.
 	fn sha2_256(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_210_000 picoseconds.
-		Weight::from_parts(6_742_356, 0)
-			// Standard Error: 1
-			.saturating_add(Weight::from_parts(1_262, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_183_000 picoseconds.
+		Weight::from_parts(12_193_562, 0)
+			// Standard Error: 0
+			.saturating_add(Weight::from_parts(1_286, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 1048576]`.
 	fn identity(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 744_000 picoseconds.
-		Weight::from_parts(726_223, 0)
+		// Minimum execution time: 724_000 picoseconds.
+		Weight::from_parts(423_926, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(112, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(149, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 1048576]`.
 	fn ripemd_160(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_303_000 picoseconds.
-		Weight::from_parts(5_014_415, 0)
+		// Minimum execution time: 1_235_000 picoseconds.
+		Weight::from_parts(6_941_606, 0)
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(3_746, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(3_767, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 1048576]`.
 	fn seal_hash_keccak_256(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_191_000 picoseconds.
-		Weight::from_parts(8_433_779, 0)
+		// Minimum execution time: 1_148_000 picoseconds.
+		Weight::from_parts(12_850_349, 0)
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(3_561, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(3_590, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 1048576]`.
 	fn hash_blake2_256(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_642_000 picoseconds.
-		Weight::from_parts(16_588_050, 0)
+		// Minimum execution time: 1_570_000 picoseconds.
+		Weight::from_parts(14_584_934, 0)
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(1_403, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(1_442, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 1048576]`.
 	fn hash_blake2_128(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_560_000 picoseconds.
-		Weight::from_parts(11_627_209, 0)
-			// Standard Error: 1
-			.saturating_add(Weight::from_parts(1_418, 0).saturating_mul(n.into()))
+		// Minimum execution time: 1_625_000 picoseconds.
+		Weight::from_parts(14_771_647, 0)
+			// Standard Error: 0
+			.saturating_add(Weight::from_parts(1_444, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 1048321]`.
 	fn seal_sr25519_verify(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 43_050_000 picoseconds.
-		Weight::from_parts(78_880_483, 0)
+		// Minimum execution time: 42_969_000 picoseconds.
+		Weight::from_parts(90_649_318, 0)
 			// Standard Error: 4
-			.saturating_add(Weight::from_parts(4_820, 0).saturating_mul(n.into()))
+			.saturating_add(Weight::from_parts(4_813, 0).saturating_mul(n.into()))
 	}
 	fn ecdsa_recover() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 46_308_000 picoseconds.
-		Weight::from_parts(47_213_000, 0)
+		// Minimum execution time: 46_096_000 picoseconds.
+		Weight::from_parts(46_988_000, 0)
 	}
 	fn bn128_add() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 14_418_000 picoseconds.
-		Weight::from_parts(15_454_000, 0)
+		// Minimum execution time: 14_848_000 picoseconds.
+		Weight::from_parts(17_210_000, 0)
 	}
 	fn bn128_mul() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 998_849_000 picoseconds.
-		Weight::from_parts(1_007_812_000, 0)
+		// Minimum execution time: 991_766_000 picoseconds.
+		Weight::from_parts(996_123_000, 0)
 	}
 	/// The range of component `n` is `[0, 20]`.
 	fn bn128_pairing(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 878_000 picoseconds.
-		Weight::from_parts(4_894_017_610, 0)
-			// Standard Error: 10_490_929
-			.saturating_add(Weight::from_parts(5_933_404_461, 0).saturating_mul(n.into()))
+		// Minimum execution time: 848_000 picoseconds.
+		Weight::from_parts(4_990_945_553, 0)
+			// Standard Error: 10_630_771
+			.saturating_add(Weight::from_parts(6_054_433_018, 0).saturating_mul(n.into()))
 	}
 	/// The range of component `n` is `[0, 1200]`.
 	fn blake2f(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 976_000 picoseconds.
-		Weight::from_parts(1_204_210, 0)
-			// Standard Error: 11
-			.saturating_add(Weight::from_parts(29_014, 0).saturating_mul(n.into()))
+		// Minimum execution time: 961_000 picoseconds.
+		Weight::from_parts(1_252_241, 0)
+			// Standard Error: 26
+			.saturating_add(Weight::from_parts(30_105, 0).saturating_mul(n.into()))
 	}
 	fn seal_ecdsa_to_eth_address() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 12_997_000 picoseconds.
-		Weight::from_parts(13_136_000, 0)
+		// Minimum execution time: 13_095_000 picoseconds.
+		Weight::from_parts(13_230_000, 0)
 	}
-	/// Storage: `Revive::CodeInfoOf` (r:1 w:1)
+	/// Storage: `Revive::CodeInfoOf` (r:2 w:2)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `Measured`)
-	fn seal_set_code_hash(_n: u32) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `297`
-		//  Estimated: `3762`
-		// Minimum execution time: 12_778_000 picoseconds.
-		Weight::from_parts(13_084_000, 3762)
-			.saturating_add(RocksDbWeight::get().reads(1_u64))
-			.saturating_add(RocksDbWeight::get().writes(1_u64))
+	/// Storage: `Balances::Holds` (r:1 w:1)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Revive::PristineCode` (r:0 w:1)
+	/// Proof: `Revive::PristineCode` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 1]`.
+	fn seal_set_code_hash(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `391 + r * (703 ±0)`
+		//  Estimated: `6331 + r * (2280 ±0)`
+		// Minimum execution time: 14_670_000 picoseconds.
+		Weight::from_parts(15_744_806, 6331)
+			// Standard Error: 54_003
+			.saturating_add(Weight::from_parts(47_474_393, 0).saturating_mul(r.into()))
+			.saturating_add(RocksDbWeight::get().reads(2_u64))
+			.saturating_add(RocksDbWeight::get().reads((2_u64).saturating_mul(r.into())))
+			.saturating_add(RocksDbWeight::get().writes(2_u64))
+			.saturating_add(RocksDbWeight::get().writes((3_u64).saturating_mul(r.into())))
+			.saturating_add(Weight::from_parts(0, 2280).saturating_mul(r.into()))
 	}
 	/// The range of component `r` is `[0, 10000]`.
 	fn evm_opcode(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_130_000 picoseconds.
-		Weight::from_parts(1_549_653, 0)
-			// Standard Error: 4
-			.saturating_add(Weight::from_parts(2_365, 0).saturating_mul(r.into()))
+		// Minimum execution time: 1_189_000 picoseconds.
+		Weight::from_parts(1_470_372, 0)
+			// Standard Error: 20
+			.saturating_add(Weight::from_parts(6_508, 0).saturating_mul(r.into()))
 	}
 	/// The range of component `r` is `[0, 10000]`.
 	fn instr(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 12_557_000 picoseconds.
-		Weight::from_parts(60_327_563, 0)
-			// Standard Error: 1_035
-			.saturating_add(Weight::from_parts(143_372, 0).saturating_mul(r.into()))
+		// Minimum execution time: 12_052_000 picoseconds.
+		Weight::from_parts(56_794_418, 0)
+			// Standard Error: 416
+			.saturating_add(Weight::from_parts(116_801, 0).saturating_mul(r.into()))
 	}
 	/// The range of component `r` is `[0, 100000]`.
 	fn instr_empty_loop(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_315_000 picoseconds.
-		Weight::from_parts(7_548_170, 0)
-			// Standard Error: 24
-			.saturating_add(Weight::from_parts(72_139, 0).saturating_mul(r.into()))
+		// Minimum execution time: 3_321_000 picoseconds.
+		Weight::from_parts(8_236_588, 0)
+			// Standard Error: 32
+			.saturating_add(Weight::from_parts(71_473, 0).saturating_mul(r.into()))
 	}
 	/// Storage: UNKNOWN KEY `0x735f040a5d490f1107ad9c56f5ca00d2060e99e5378e562537cf3bc983e17b91` (r:2 w:1)
 	/// Proof: UNKNOWN KEY `0x735f040a5d490f1107ad9c56f5ca00d2060e99e5378e562537cf3bc983e17b91` (r:2 w:1)
@@ -2366,20 +2430,24 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `316`
 		//  Estimated: `6256`
-		// Minimum execution time: 11_803_000 picoseconds.
-		Weight::from_parts(12_358_000, 6256)
+		// Minimum execution time: 12_137_000 picoseconds.
+		Weight::from_parts(12_594_000, 6256)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `Revive::CodeInfoOf` (r:2 w:1)
 	/// Proof: `Revive::CodeInfoOf` (`max_values`: None, `max_size`: Some(97), added: 2572, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Holds` (r:2 w:2)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(427), added: 2902, mode: `MaxEncodedLen`)
 	fn v2_migration_step() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `245`
-		//  Estimated: `6134`
-		// Minimum execution time: 10_980_000 picoseconds.
-		Weight::from_parts(11_452_000, 6134)
-			.saturating_add(RocksDbWeight::get().reads(2_u64))
-			.saturating_add(RocksDbWeight::get().writes(1_u64))
+		//  Measured:  `741`
+		//  Estimated: `6794`
+		// Minimum execution time: 64_340_000 picoseconds.
+		Weight::from_parts(67_378_000, 6794)
+			.saturating_add(RocksDbWeight::get().reads(5_u64))
+			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
 }

From d502f36e9af309a900741bd35198f2238ec01eb8 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Mon, 1 Sep 2025 09:06:36 +0200
Subject: [PATCH 185/186] fix tests-misc

---
 .github/workflows/tests-misc.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/tests-misc.yml b/.github/workflows/tests-misc.yml
index ed754975af94..030244a596db 100644
--- a/.github/workflows/tests-misc.yml
+++ b/.github/workflows/tests-misc.yml
@@ -374,14 +374,13 @@ jobs:
         run: brew install solidity
       - name: Install resolc
         run: |
-          ASSET_URL="https://github.com/paritytech/revive/releases/download/v${{ inputs.version }}/resolc-universal-apple-darwin"
-          echo "Downloading resolc v${{ inputs.version }} from $ASSET_URL"
+          VERSION="0.3.0"
+          ASSET_URL="https://github.com/paritytech/revive/releases/download/v$VERSION/resolc-universal-apple-darwin"
+          echo "Downloading resolc v$VERSION from $ASSET_URL"
           curl -Lsf --show-error -o /tmp/resolc "$ASSET_URL"
           sudo cp /tmp/resolc /usr/local/bin/resolc
           sudo chmod 755 /usr/local/bin/resolc
           xattr -c /usr/local/bin/resolc
-        with:
-          version: 0.3.0        
       - name: cargo info
         run: |
           echo "######## rustup show ########"

From 28a1b65a3b57a4bd642ce86c58f40f065f674fc9 Mon Sep 17 00:00:00 2001
From: pgherveou <pgherveou@gmail.com>
Date: Mon, 1 Sep 2025 10:39:41 +0200
Subject: [PATCH 186/186] fix

---
 .github/workflows/tests-misc.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/tests-misc.yml b/.github/workflows/tests-misc.yml
index 030244a596db..c2148a60d676 100644
--- a/.github/workflows/tests-misc.yml
+++ b/.github/workflows/tests-misc.yml
@@ -377,10 +377,10 @@ jobs:
           VERSION="0.3.0"
           ASSET_URL="https://github.com/paritytech/revive/releases/download/v$VERSION/resolc-universal-apple-darwin"
           echo "Downloading resolc v$VERSION from $ASSET_URL"
-          curl -Lsf --show-error -o /tmp/resolc "$ASSET_URL"
-          sudo cp /tmp/resolc /usr/local/bin/resolc
-          sudo chmod 755 /usr/local/bin/resolc
-          xattr -c /usr/local/bin/resolc
+          curl -Lsf --show-error -o $HOME/.cargo/bin/resolc "$ASSET_URL"
+          chmod +x $HOME/.cargo/bin/resolc
+          xattr -c $HOME/.cargo/bin/resolc
+          resolc --version
       - name: cargo info
         run: |
           echo "######## rustup show ########"