fix evm-tests

modules/evm/src/precompiles/blake2/mod.rs

@@ -106,6 +106,19 @@ impl Precompile for Blake2F {
 			output: output_buf.to_vec(),
 		})
 	}
+
+	#[cfg(feature = "evm-tests")]
+	fn execute_ext(
+		input: &[u8],
+		target_gas: Option<u64>,
+		context: &crate::Context,
+		is_static: bool,
+	) -> Result<(PrecompileOutput, u64), PrecompileFailure> {
+		let mut handle = crate::precompiles::tests::MockPrecompileHandle::new(&input, target_gas, context, is_static);
+		let output = Self::execute(&mut handle)?;
+
+		Ok((output, handle.gas_used))
+	}
 }
 
 #[cfg(test)]

modules/evm/src/precompiles/bn128.rs

@@ -97,6 +97,19 @@ impl Precompile for Bn128Add {
 			output: buf.to_vec(),
 		})
 	}
+
+	#[cfg(feature = "evm-tests")]
+	fn execute_ext(
+		input: &[u8],
+		target_gas: Option<u64>,
+		context: &crate::Context,
+		is_static: bool,
+	) -> Result<(PrecompileOutput, u64), PrecompileFailure> {
+		let mut handle = crate::precompiles::tests::MockPrecompileHandle::new(&input, target_gas, context, is_static);
+		let output = Self::execute(&mut handle)?;
+
+		Ok((output, handle.gas_used))
+	}
 }
 
 /// The Bn128Mul builtin
@@ -137,6 +150,19 @@ impl Precompile for Bn128Mul {
 			output: buf.to_vec(),
 		})
 	}
+
+	#[cfg(feature = "evm-tests")]
+	fn execute_ext(
+		input: &[u8],
+		target_gas: Option<u64>,
+		context: &crate::Context,
+		is_static: bool,
+	) -> Result<(PrecompileOutput, u64), PrecompileFailure> {
+		let mut handle = crate::precompiles::tests::MockPrecompileHandle::new(&input, target_gas, context, is_static);
+		let output = Self::execute(&mut handle)?;
+
+		Ok((output, handle.gas_used))
+	}
 }
 
 /// The Bn128Pairing builtin
@@ -236,6 +262,19 @@ impl Precompile for Bn128Pairing {
 			output: buf.to_vec(),
 		})
 	}
+
+	#[cfg(feature = "evm-tests")]
+	fn execute_ext(
+		input: &[u8],
+		target_gas: Option<u64>,
+		context: &crate::Context,
+		is_static: bool,
+	) -> Result<(PrecompileOutput, u64), PrecompileFailure> {
+		let mut handle = crate::precompiles::tests::MockPrecompileHandle::new(&input, target_gas, context, is_static);
+		let output = Self::execute(&mut handle)?;
+
+		Ok((output, handle.gas_used))
+	}
 }
 
 #[cfg(test)]

modules/evm/src/precompiles/mod.rs

@@ -48,6 +48,14 @@ pub trait Precompile {
 	/// `target_gas`. Return `Ok(status, output, gas_used)` if the execution is
 	/// successful. Otherwise return `Err(_)`.
 	fn execute(handle: &mut impl PrecompileHandle) -> PrecompileResult;
+
+	#[cfg(feature = "evm-tests")]
+	fn execute_ext(
+		input: &[u8],
+		target_gas: Option<u64>,
+		context: &crate::Context,
+		is_static: bool,
+	) -> Result<(PrecompileOutput, u64), PrecompileFailure>;
 }
 
 pub trait LinearCostPrecompile {
@@ -66,6 +74,18 @@ impl<T: LinearCostPrecompile> Precompile for T {
 		let (exit_status, output) = T::execute(handle.input(), cost)?;
 		Ok(PrecompileOutput { exit_status, output })
 	}
+
+	#[cfg(feature = "evm-tests")]
+	fn execute_ext(
+		input: &[u8],
+		target_gas: Option<u64>,
+		context: &crate::Context,
+		is_static: bool,
+	) -> Result<(PrecompileOutput, u64), PrecompileFailure> {
+		let cost = ensure_linear_cost(target_gas, input.len() as u64, T::BASE, T::WORD)?;
+		let (exit_status, output) = T::execute(input, cost)?;
+		Ok((PrecompileOutput { exit_status, output }, cost))
+	}
 }
 
 /// Linear gas cost

modules/evm/src/precompiles/modexp.rs

@@ -295,6 +295,19 @@ impl Precompile for IstanbulModexp {
 			output,
 		})
 	}
+
+	#[cfg(feature = "evm-tests")]
+	fn execute_ext(
+		input: &[u8],
+		target_gas: Option<u64>,
+		context: &crate::Context,
+		is_static: bool,
+	) -> Result<(PrecompileOutput, u64), PrecompileFailure> {
+		let mut handle = crate::precompiles::tests::MockPrecompileHandle::new(&input, target_gas, context, is_static);
+		let output = Self::execute(&mut handle)?;
+
+		Ok((output, handle.gas_used))
+	}
 }
 
 impl Precompile for Modexp {
@@ -335,6 +348,19 @@ impl Precompile for Modexp {
 			output,
 		})
 	}
+
+	#[cfg(feature = "evm-tests")]
+	fn execute_ext(
+		input: &[u8],
+		target_gas: Option<u64>,
+		context: &crate::Context,
+		is_static: bool,
+	) -> Result<(PrecompileOutput, u64), PrecompileFailure> {
+		let mut handle = crate::precompiles::tests::MockPrecompileHandle::new(&input, target_gas, context, is_static);
+		let output = Self::execute(&mut handle)?;
+
+		Ok((output, handle.gas_used))
+	}
 }
 
 #[cfg(test)]

modules/evm/src/runner/stack.rs

@@ -622,7 +622,7 @@ impl<'vicinity, 'config, T: Config> BackendT for SubstrateStackState<'vicinity,
 	}
 
 	fn block_randomness(&self) -> Option<H256> {
-		None
+		self.vicinity.block_randomness
 	}
 
 	fn block_hash(&self, number: U256) -> H256 {

primitives/src/evm.rs

@@ -73,6 +73,8 @@ pub struct Vicinity {
 	pub block_difficulty: Option<U256>,
 	/// Environmental base fee per gas.
 	pub block_base_fee_per_gas: Option<U256>,
+	/// Environmental randomness.
+	pub block_randomness: Option<H256>,
 }
 
 #[derive(Clone, Eq, PartialEq, Encode, Decode, RuntimeDebug, TypeInfo)]

runtime/mandala/src/lib.rs

@@ -1644,7 +1644,7 @@ impl<I: From<Balance>> frame_support::traits::Get<I> for TxFeePerGasV2 {
 }
 
 #[cfg(feature = "with-ethereum-compatibility")]
-static LONDON_CONFIG: module_evm_utility::evm::Config = module_evm_utility::evm::Config::london();
+static SHANGHAI_CONFIG: module_evm_utility::evm::Config = module_evm_utility::evm::Config::shanghai();
 
 impl module_evm::Config for Runtime {
 	type AddressMapping = EvmAddressMapping<Runtime>;
@@ -1673,7 +1673,7 @@ impl module_evm::Config for Runtime {
 
 	#[cfg(feature = "with-ethereum-compatibility")]
 	fn config() -> &'static module_evm_utility::evm::Config {
-		&LONDON_CONFIG
+		&SHANGHAI_CONFIG
 	}
 }