Feat: refactore gas charge logic form EVM exit reason

Cargo.toml

@@ -31,10 +31,10 @@ byte-slice-cast = { version = "1", default-features = false }
 criterion = "0.5"
 digest = "0.10"
 ethabi = { version = "18", default-features = false }
-evm = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.43.1-aurora", default-features = false }
-evm-core = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.43.1-aurora", default-features = false, features = ["std"] }
-evm-gasometer = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.43.1-aurora", default-features = false, features = ["std", "tracing"] }
-evm-runtime = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.43.1-aurora", default-features = false, features = ["std", "tracing"] }
+evm = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.45.0-aurora", default-features = false }
+evm-core = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.45.0-aurora", default-features = false, features = ["std"] }
+evm-gasometer = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.45.0-aurora", default-features = false, features = ["std", "tracing"] }
+evm-runtime = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.45.0-aurora", default-features = false, features = ["std", "tracing"] }
 fixed-hash = { version = "0.8", default-features = false }
 function_name = "0.3"
 git2 = "0.19"

engine-tests/src/tests/erc20.rs

@@ -12,8 +12,9 @@ use aurora_engine_types::account_id::AccountId;
 use aurora_engine_types::parameters::connector::{
     Erc20Identifier, Erc20Metadata, SetErc20MetadataArgs,
 };
-use aurora_engine_types::parameters::engine::SetOwnerArgs;
+use aurora_engine_types::parameters::engine::{EvmErrorKind, SetOwnerArgs};
 use bstr::ByteSlice;
+
 use libsecp256k1::SecretKey;
 use std::str::FromStr;
 
@@ -78,7 +79,10 @@ fn erc20_mint_out_of_gas() {
     mint_tx.gas_price = U256::from(GAS_PRICE); // also set non-zero gas price to check gas still charged.
     let outcome = runner.submit_transaction(&source_account.secret_key, mint_tx);
     let error = outcome.unwrap();
-    assert_eq!(error.status, TransactionStatus::OutOfGas);
+    assert_eq!(
+        error.status,
+        TransactionStatus::Error(EvmErrorKind::OutOfGas)
+    );
 
     // Validate post-state
 
@@ -232,7 +236,10 @@ fn deploy_erc_20_out_of_gas() {
     deploy_transaction.gas_limit = U256::from(intrinsic_gas + 1);
     let outcome = runner.submit_transaction(&source_account, deploy_transaction);
     let error = outcome.unwrap();
-    assert_eq!(error.status, TransactionStatus::OutOfGas);
+    assert_eq!(
+        error.status,
+        TransactionStatus::Error(EvmErrorKind::OutOfGas)
+    );
 
     // Validate post-state
     utils::validate_address_balance_and_nonce(

engine-tests/src/tests/repro.rs

@@ -26,7 +26,7 @@ fn repro_GdASJ3KESs() {
         block_timestamp: 1_645_717_564_644_206_730,
         input_path: "src/tests/res/input_GdASJ3KESs.hex",
         evm_gas_used: 706_713,
-        near_gas_used: 113,
+        near_gas_used: 114,
     });
 }
 
@@ -51,7 +51,7 @@ fn repro_8ru7VEA() {
         block_timestamp: 1_648_829_935_343_349_589,
         input_path: "src/tests/res/input_8ru7VEA.hex",
         evm_gas_used: 1_732_181,
-        near_gas_used: 204,
+        near_gas_used: 205,
     });
 }
 
@@ -71,7 +71,7 @@ fn repro_FRcorNv() {
         block_timestamp: 1_650_960_438_774_745_116,
         input_path: "src/tests/res/input_FRcorNv.hex",
         evm_gas_used: 1_239_721,
-        near_gas_used: 165,
+        near_gas_used: 167,
     });
 }
 
@@ -88,7 +88,7 @@ fn repro_5bEgfRQ() {
         block_timestamp: 1_651_073_772_931_594_646,
         input_path: "src/tests/res/input_5bEgfRQ.hex",
         evm_gas_used: 6_414_105,
-        near_gas_used: 645,
+        near_gas_used: 649,
     });
 }
 
@@ -106,7 +106,7 @@ fn repro_D98vwmi() {
         block_timestamp: 1_651_753_443_421_003_245,
         input_path: "src/tests/res/input_D98vwmi.hex",
         evm_gas_used: 1_035_348,
-        near_gas_used: 167,
+        near_gas_used: 168,
     });
 }
 
@@ -125,7 +125,7 @@ fn repro_Emufid2() {
         block_timestamp: 1_662_118_048_636_713_538,
         input_path: "src/tests/res/input_Emufid2.hex",
         evm_gas_used: 1_156_364,
-        near_gas_used: 291,
+        near_gas_used: 293,
     });
 }
 

engine-tests/src/tests/sanity.rs

@@ -7,6 +7,7 @@ use aurora_engine_sdk as sdk;
 use aurora_engine_types::borsh::BorshDeserialize;
 #[cfg(not(feature = "ext-connector"))]
 use aurora_engine_types::parameters::connector::FungibleTokenMetadata;
+use aurora_engine_types::parameters::engine::EvmErrorKind;
 use aurora_engine_types::H160;
 use libsecp256k1::SecretKey;
 use near_vm_runner::ContractCode;
@@ -54,7 +55,10 @@ fn bench_memory_get_standalone() {
         .unwrap();
     let duration = start.elapsed().as_secs_f32();
     assert!(
-        matches!(result.status, TransactionStatus::OutOfGas),
+        matches!(
+            result.status,
+            TransactionStatus::Error(EvmErrorKind::OutOfGas)
+        ),
         "Infinite loops in the EVM run out of gas"
     );
     assert!(
@@ -108,7 +112,10 @@ fn test_returndatacopy() {
     let address = deploy_contract(&mut runner, &mut signer, contract_bytes);
     let result = call_contract(&mut runner, &mut signer, address);
     assert!(
-        matches!(result.status, TransactionStatus::OutOfGas),
+        matches!(
+            result.status,
+            TransactionStatus::Error(EvmErrorKind::OutOfGas)
+        ),
         "EVM must run out of gas if len > 0 with large memory offset"
     );
 }
@@ -564,7 +571,10 @@ fn test_create_out_of_gas() {
         })
         .unwrap();
     assert!(
-        matches!(result.status, TransactionStatus::OutOfGas),
+        matches!(
+            result.status,
+            TransactionStatus::Error(EvmErrorKind::OutOfGas)
+        ),
         "Unexpected status: {:?}",
         result.status
     );
@@ -758,7 +768,10 @@ fn test_eth_transfer_insufficient_balance() {
             utils::transfer(dest_address, INITIAL_BALANCE + INITIAL_BALANCE, nonce)
         })
         .unwrap();
-    assert_eq!(result.status, TransactionStatus::OutOfFund);
+    assert_eq!(
+        result.status,
+        TransactionStatus::Error(EvmErrorKind::OutOfFund)
+    );
 
     // validate post-state
     utils::validate_address_balance_and_nonce(
@@ -1067,7 +1080,8 @@ fn test_block_hash_contract() {
         })
         .unwrap();
 
-    utils::panic_on_fail(result.status);
+    let res = utils::panic_on_fail(result.status);
+    assert!(res.is_none(), "Status: {res:?}");
 }
 
 #[cfg(not(feature = "ext-connector"))]
@@ -1220,7 +1234,7 @@ mod workspace {
     use crate::prelude::{Address, U256};
     use crate::tests::sanity::{GAS_PRICE, INITIAL_BALANCE, INITIAL_NONCE, TRANSFER_AMOUNT};
     use crate::utils;
-    use aurora_engine_types::parameters::engine::TransactionStatus;
+    use aurora_engine_types::parameters::engine::{EvmErrorKind, TransactionStatus};
     use aurora_engine_workspace::EngineContract;
 
     // Same as `test_eth_transfer_insufficient_balance` above, except runs through
@@ -1245,13 +1259,17 @@ mod workspace {
             Some(utils::AuroraRunner::default().chain_id),
             &signer.secret_key,
         );
+
         let result = aurora
             .submit(rlp::encode(&signed_tx).to_vec())
             .transact()
             .await
             .unwrap()
             .into_value();
-        assert_eq!(result.status, TransactionStatus::OutOfFund);
+        assert_eq!(
+            result.status,
+            TransactionStatus::Error(EvmErrorKind::OutOfFund)
+        );
 
         // validate post-state
         assert_eq!(

engine-tests/src/tests/serde.rs

@@ -5,12 +5,13 @@ use aurora_engine::{
     parameters::{ResultLog, SubmitResult, TransactionStatus},
 };
 use aurora_engine_transactions::eip_2930::AccessTuple;
+use aurora_engine_types::parameters::engine::EvmErrorKind;
 use aurora_engine_types::{types::Address, H160};
 
 #[test]
 fn test_serde_submit_result() {
     let result = SubmitResult::new(
-        TransactionStatus::OutOfFund,
+        TransactionStatus::Error(EvmErrorKind::OutOfFund),
         0,
         vec![ResultLog {
             address: Address::default(),

engine-tests/src/tests/silo.rs

@@ -2,7 +2,7 @@ use aurora_engine::engine::EngineErrorKind;
 use aurora_engine_sdk as sdk;
 use aurora_engine_types::account_id::AccountId;
 use aurora_engine_types::borsh::BorshSerialize;
-use aurora_engine_types::parameters::engine::TransactionStatus;
+use aurora_engine_types::parameters::engine::{EvmErrorKind, TransactionStatus};
 use aurora_engine_types::parameters::silo::{
     FixedGasArgs, SiloParamsArgs, WhitelistAccountArgs, WhitelistAddressArgs, WhitelistArgs,
     WhitelistKind, WhitelistStatusArgs,
@@ -99,7 +99,10 @@ fn test_transfer_insufficient_balance() {
             )
         })
         .unwrap();
-    assert_eq!(result.status, TransactionStatus::OutOfFund);
+    assert_eq!(
+        result.status,
+        TransactionStatus::Error(EvmErrorKind::OutOfFund)
+    );
 
     // validate post-state
     validate_address_balance_and_nonce(
@@ -164,7 +167,10 @@ fn test_transfer_insufficient_balance_fee() {
             utils::transfer_with_price(receiver, TRANSFER_AMOUNT, nonce, ONE_GAS_PRICE.raw())
         })
         .unwrap();
-    assert!(matches!(result.status, TransactionStatus::OutOfFund));
+    assert!(matches!(
+        result.status,
+        TransactionStatus::Error(EvmErrorKind::OutOfFund)
+    ));
 }
 
 #[test]

engine-tests/src/tests/standalone/call_tracer.rs

@@ -2,6 +2,7 @@ use crate::prelude::{H160, H256};
 use crate::utils::solidity::erc20::{ERC20Constructor, ERC20};
 use crate::utils::{self, standalone, Signer};
 use aurora_engine_modexp::AuroraModExp;
+use aurora_engine_types::parameters::engine::{EvmErrorKind, TransactionStatus};
 use aurora_engine_types::{
     parameters::{CrossContractCallArgs, PromiseArgs, PromiseCreateArgs},
     storage,
@@ -296,10 +297,10 @@ fn test_contract_create_too_large() {
     let standalone_result = sputnik::traced_call(&mut listener, || {
         runner.submit_transaction(&signer.secret_key, tx)
     });
-    assert!(
-        standalone_result.is_err(),
-        "Expected contract too large error"
-    );
+    assert!(matches!(
+        standalone_result.unwrap().status,
+        TransactionStatus::Error(EvmErrorKind::CreateContractLimit)
+    ));
 }
 
 #[allow(clippy::too_many_lines)]

engine-tests/src/tests/standard_precompiles.rs

@@ -24,7 +24,8 @@ fn test_standard_precompiles() {
         .submit_with_signer(&mut signer, |nonce| contract.call_method("test_all", nonce))
         .unwrap();
 
-    utils::panic_on_fail(outcome.status);
+    let res = utils::panic_on_fail(outcome.status);
+    assert!(res.is_none(), "Status: {res:?}");
 }
 
 #[test]

engine-tests/src/tests/uniswap.rs

@@ -58,7 +58,7 @@ fn test_uniswap_exact_output() {
 
     let (_amount_in, profile) =
         context.exact_output_single(&token_a, &token_b, OUTPUT_AMOUNT.into());
-    utils::assert_gas_bound(profile.all_gas(), 16);
+    utils::assert_gas_bound(profile.all_gas(), 17);
     let wasm_fraction = 100 * profile.wasm_gas() / profile.all_gas();
     assert!(
         (40..=50).contains(&wasm_fraction),

engine-tests/src/tests/xcc.rs

@@ -1054,7 +1054,7 @@ pub mod workspace {
                     .unwrap();
                 anyhow::bail!("TX has been reverted with message: {revert_message}");
             }
-            _ => anyhow::bail!("Wrong status of the transaction"),
+            TransactionStatus::Error(_) => anyhow::bail!("Wrong status of the transaction"),
         }
     }
 

engine-tests/src/utils/mod.rs

@@ -1000,11 +1000,15 @@ pub fn unwrap_revert_slice(result: &SubmitResult) -> &[u8] {
     }
 }
 
-pub fn panic_on_fail(status: TransactionStatus) {
+pub fn panic_on_fail(status: TransactionStatus) -> Option<String> {
     match status {
-        TransactionStatus::Succeed(_) => (),
-        TransactionStatus::Revert(message) => panic!("{}", String::from_utf8_lossy(&message)),
-        other => panic!("{}", String::from_utf8_lossy(other.as_ref())),
+        TransactionStatus::Succeed(_) => None,
+        TransactionStatus::Revert(message) => {
+            Some(format!("Revert: {}", String::from_utf8_lossy(&message)))
+        }
+        TransactionStatus::Error(err) => {
+            Some(format!("Error: {}", String::from_utf8_lossy(err.as_ref())))
+        }
     }
 }
 

engine-tests/src/utils/solidity/exit_precompile.rs

@@ -94,7 +94,9 @@ impl Tester {
         match result.status {
             aurora_engine::parameters::TransactionStatus::Succeed(_) => Ok(result),
             aurora_engine::parameters::TransactionStatus::Revert(_bytes) => Err(Revert),
-            other => panic!("Unexpected status {other:?}"),
+            aurora_engine::parameters::TransactionStatus::Error(err) => {
+                panic!("Unexpected status {err:?}")
+            }
         }
     }