fix: patch runner to not exit on calculating weight (polkadot-evm#1813)

* fix: patch runner to not exit on calculating weight

* chore: fix tests

* fix: test args

* chore fmt

Author: DylanVerstraete

frame/ethereum/src/tests/eip1559.rs

@@ -18,7 +18,7 @@
 //! Consensus extension module tests for BABE consensus.
 
 use super::*;
-use evm::{ExitReason, ExitRevert, ExitSucceed};
+use evm::{ExitError, ExitReason, ExitRevert, ExitSucceed};
 use fp_ethereum::{TransactionData, ValidatedTransaction};
 use frame_support::{dispatch::DispatchClass, traits::Get, weights::Weight};
 use pallet_evm::{AddressMapping, GasWeightMapping};
@@ -577,6 +577,8 @@ fn proof_size_weight_limit_validation_works() {
 	let alice = &pairs[0];
 
 	ext.execute_with(|| {
+		System::set_block_number(1);
+
 		let mut tx = EIP1559UnsignedTransaction {
 			nonce: U256::from(2),
 			max_priority_fee_per_gas: U256::zero(),
@@ -596,11 +598,21 @@ fn proof_size_weight_limit_validation_works() {
 		// Gas limit cannot afford the extra byte and thus is expected to exhaust.
 		tx.input = vec![0u8; (weight_limit.proof_size() + 1) as usize];
 		let tx = tx.sign(&alice.private_key, None);
+		let transaction_hash = tx.hash();
 
-		// Execute
-		assert!(
-			Ethereum::transact(RawOrigin::EthereumTransaction(alice.address).into(), tx,).is_err()
-		);
+		// Execute - transaction is applied but execution fails with OutOfGas
+		assert_ok!(Ethereum::apply_validated_transaction(
+			alice.address,
+			tx,
+			None
+		));
+		System::assert_last_event(RuntimeEvent::Ethereum(Event::Executed {
+			from: alice.address,
+			to: alice.address,
+			transaction_hash,
+			exit_reason: ExitReason::Error(ExitError::OutOfGas),
+			extra_data: vec![],
+		}));
 	});
 }
 

frame/ethereum/src/tests/eip2930.rs

@@ -18,7 +18,7 @@
 //! Consensus extension module tests for BABE consensus.
 
 use super::*;
-use evm::{ExitReason, ExitRevert, ExitSucceed};
+use evm::{ExitError, ExitReason, ExitRevert, ExitSucceed};
 use fp_ethereum::{TransactionData, ValidatedTransaction};
 use frame_support::{
 	dispatch::{DispatchClass, GetDispatchInfo},
@@ -501,6 +501,8 @@ fn proof_size_weight_limit_validation_works() {
 	let alice = &pairs[0];
 
 	ext.execute_with(|| {
+		System::set_block_number(1);
+
 		let mut tx = EIP2930UnsignedTransaction {
 			nonce: U256::from(2),
 			gas_price: U256::from(1),
@@ -519,11 +521,21 @@ fn proof_size_weight_limit_validation_works() {
 		// Gas limit cannot afford the extra byte and thus is expected to exhaust.
 		tx.input = vec![0u8; (weight_limit.proof_size() + 1) as usize];
 		let tx = tx.sign(&alice.private_key, None);
+		let transaction_hash = tx.hash();
 
-		// Execute
-		assert!(
-			Ethereum::transact(RawOrigin::EthereumTransaction(alice.address).into(), tx,).is_err()
-		);
+		// Execute - transaction is applied but execution fails with OutOfGas
+		assert_ok!(Ethereum::apply_validated_transaction(
+			alice.address,
+			tx,
+			None
+		));
+		System::assert_last_event(RuntimeEvent::Ethereum(Event::Executed {
+			from: alice.address,
+			to: alice.address,
+			transaction_hash,
+			exit_reason: ExitReason::Error(ExitError::OutOfGas),
+			extra_data: vec![],
+		}));
 	});
 }
 

frame/ethereum/src/tests/legacy.rs

@@ -18,7 +18,7 @@
 //! Consensus extension module tests for BABE consensus.
 
 use super::*;
-use evm::{ExitReason, ExitRevert, ExitSucceed};
+use evm::{ExitError, ExitReason, ExitRevert, ExitSucceed};
 use fp_ethereum::{TransactionData, ValidatedTransaction};
 use frame_support::{
 	dispatch::{DispatchClass, GetDispatchInfo, Pays, PostDispatchInfo},
@@ -645,6 +645,8 @@ fn proof_size_weight_limit_validation_works() {
 	let alice = &pairs[0];
 
 	ext.execute_with(|| {
+		System::set_block_number(1);
+
 		let mut tx = LegacyUnsignedTransaction {
 			nonce: U256::from(2),
 			gas_price: U256::from(1),
@@ -663,11 +665,21 @@ fn proof_size_weight_limit_validation_works() {
 		// Gas limit cannot afford the extra byte and thus is expected to exhaust.
 		tx.input = vec![0u8; (weight_limit.proof_size() + 1) as usize];
 		let tx = tx.sign(&alice.private_key);
+		let transaction_hash = tx.hash();
 
-		// Execute
-		assert!(
-			Ethereum::transact(RawOrigin::EthereumTransaction(alice.address).into(), tx,).is_err()
-		);
+		// Execute - transaction is applied but execution fails with OutOfGas
+		assert_ok!(Ethereum::apply_validated_transaction(
+			alice.address,
+			tx,
+			None
+		));
+		System::assert_last_event(RuntimeEvent::Ethereum(Event::Executed {
+			from: alice.address,
+			to: alice.address,
+			transaction_hash,
+			exit_reason: ExitReason::Error(ExitError::OutOfGas),
+			extra_data: vec![],
+		}));
 	});
 }
 

frame/evm/src/runner/stack.rs

@@ -189,12 +189,21 @@ where
 	{
 		// Used to record the external costs in the evm through the StackState implementation
 		let maybe_weight_info =
-			WeightInfo::new_from_weight_limit(weight_limit, proof_size_base_cost).map_err(
-				|_| RunnerError {
-					error: Error::<T>::GasLimitTooLow,
-					weight,
-				},
-			)?;
+			match WeightInfo::new_from_weight_limit(weight_limit, proof_size_base_cost) {
+				Ok(weight_info) => weight_info,
+				Err(_) => {
+					return Ok(ExecutionInfoV2 {
+						exit_reason: ExitError::OutOfGas.into(),
+						value: Default::default(),
+						used_gas: fp_evm::UsedGas {
+							standard: gas_limit.into(),
+							effective: gas_limit.into(),
+						},
+						weight_info: None,
+						logs: Default::default(),
+					})
+				}
+			};
 		// The precompile check is only used for transactional invocations. However, here we always
 		// execute the check, because the check has side effects.
 		match precompiles.is_precompile(source, gas_limit) {