fix(l1): fix failing eip 7623 hive tests

crates/vm/levm/src/errors.rs

@@ -96,8 +96,10 @@ pub enum TxValidationError {
         priority_fee: U256,
         max_fee_per_gas: U256,
     },
-    #[error("Intrinsic gas too low")]
+    #[error("Transaction gas limit lower than the minimum gas cost to execute the transaction")]
     IntrinsicGasTooLow,
+    #[error("Transaction gas limit lower than the gas cost floor for calldata tokens")]
+    IntrinsicGasBelowFloorGasCost,
     #[error(
         "Gas allowance exceeded. Block gas limit: {block_gas_limit}, transaction gas limit: {tx_gas_limit}"
     )]

crates/vm/levm/src/hooks/default_hook.rs

@@ -11,8 +11,6 @@ use crate::{
 use bytes::Bytes;
 use ethrex_common::{Address, U256, types::Fork};
 
-use std::cmp::max;
-
 pub const MAX_REFUND_QUOTIENT: u64 = 5;
 
 pub struct DefaultHook;
@@ -248,6 +246,10 @@ pub fn validate_min_gas_limit(vm: &mut VM<'_>) -> Result<(), VMError> {
     let calldata = vm.current_call_frame.calldata.clone();
     let intrinsic_gas: u64 = vm.get_intrinsic_gas()?;
 
+    if vm.current_call_frame.gas_limit < intrinsic_gas {
+        return Err(TxValidationError::IntrinsicGasTooLow.into());
+    }
+
     // calldata_cost = tokens_in_calldata * 4
     let calldata_cost: u64 = gas_cost::tx_calldata(&calldata)?;
 
@@ -261,9 +263,8 @@ pub fn validate_min_gas_limit(vm: &mut VM<'_>) -> Result<(), VMError> {
         .checked_add(TX_BASE_COST)
         .ok_or(InternalError::Overflow)?;
 
-    let min_gas_limit = max(intrinsic_gas, floor_cost_by_tokens);
-    if vm.current_call_frame.gas_limit < min_gas_limit {
-        return Err(TxValidationError::IntrinsicGasTooLow.into());
+    if vm.current_call_frame.gas_limit < floor_cost_by_tokens {
+        return Err(TxValidationError::IntrinsicGasBelowFloorGasCost.into());
     }
 
     Ok(())

tooling/ef_tests/blockchain/deserialize.rs

@@ -40,7 +40,7 @@ where
                     )
                 }
                 "TransactionException.INTRINSIC_GAS_TOO_LOW" => {
-                    BlockChainExpectedException::TxtException("Intrinsic gas too low".to_string())
+                    BlockChainExpectedException::TxtException("Transaction gas limit lower than the minimum gas cost to execute the transaction".to_string())
                 }
                 "TransactionException.INSUFFICIENT_ACCOUNT_FUNDS" => {
                     BlockChainExpectedException::TxtException(

tooling/ef_tests/blockchain/test_runner.rs

@@ -242,9 +242,11 @@ fn match_alternative_revm_exception_msg(expected_msg: &String, msg: &str) -> boo
             SENDER_NOT_EOA_REGEX
         ) | (
             "call gas cost exceeds the gas limit",
-            "Intrinsic gas too low"
-        ) | ("gas floor exceeds the gas limit", "Intrinsic gas too low")
-            | ("empty blobs", "Type 3 transaction without blobs")
+            "Transaction gas limit lower than the minimum gas cost to execute the transaction"
+        ) | (
+            "gas floor exceeds the gas limit",
+            "Transaction gas limit lower than the minimum gas cost to execute the transaction"
+        ) | ("empty blobs", "Type 3 transaction without blobs")
             | (
                 "blob versioned hashes not supported",
                 "Type 3 transactions are not supported before the Cancun fork"

tooling/ef_tests/state/deserialize.rs

@@ -41,6 +41,9 @@ where
                     "TransactionException.INTRINSIC_GAS_TOO_LOW" => {
                         TransactionExpectedException::IntrinsicGasTooLow
                     }
+                    "TransactionException.INTRINSIC_BELOW_FLOOR_GAS_COST" => {
+                        TransactionExpectedException::IntrinsicGasBelowFloorGasCost
+                    }
                     "TransactionException.INSUFFICIENT_ACCOUNT_FUNDS" => {
                         TransactionExpectedException::InsufficientAccountFunds
                     }

tooling/ef_tests/state/runner/levm_runner.rs

@@ -309,6 +309,9 @@ fn exception_is_expected(
             (
                 TransactionExpectedException::IntrinsicGasTooLow,
                 VMError::TxValidation(TxValidationError::IntrinsicGasTooLow)
+            ) | (
+                TransactionExpectedException::IntrinsicGasBelowFloorGasCost,
+                VMError::TxValidation(TxValidationError::IntrinsicGasBelowFloorGasCost)
             ) | (
                 TransactionExpectedException::InsufficientAccountFunds,
                 VMError::TxValidation(TxValidationError::InsufficientAccountFunds)

tooling/ef_tests/state/types.rs

@@ -156,6 +156,7 @@ pub enum TransactionExpectedException {
     Type3TxInvalidBlobVersionedHash,
     Type4TxContractCreation,
     IntrinsicGasTooLow,
+    IntrinsicGasBelowFloorGasCost,
     InsufficientAccountFunds,
     SenderNotEoa,
     PriorityGreaterThanMaxFeePerGas,

tooling/ef_tests/state_v2/src/modules/deserialize.rs

@@ -38,6 +38,9 @@ where
                     "TransactionException.INTRINSIC_GAS_TOO_LOW" => {
                         TransactionExpectedException::IntrinsicGasTooLow
                     }
+                    "TransactionException.INTRINSIC_GAS_BELOW_FLOOR_GAS_COST" => {
+                        TransactionExpectedException::IntrinsicGasBelowFloorGasCost
+                    }
                     "TransactionException.INSUFFICIENT_ACCOUNT_FUNDS" => {
                         TransactionExpectedException::InsufficientAccountFunds
                     }

tooling/ef_tests/state_v2/src/modules/result_check.rs

@@ -160,6 +160,9 @@ fn exception_matches_expected(
             (
                 TransactionExpectedException::IntrinsicGasTooLow,
                 VMError::TxValidation(TxValidationError::IntrinsicGasTooLow)
+            ) | (
+                TransactionExpectedException::IntrinsicGasBelowFloorGasCost,
+                VMError::TxValidation(TxValidationError::IntrinsicGasBelowFloorGasCost)
             ) | (
                 TransactionExpectedException::InsufficientAccountFunds,
                 VMError::TxValidation(TxValidationError::InsufficientAccountFunds)

tooling/ef_tests/state_v2/src/modules/types.rs

@@ -447,6 +447,7 @@ pub enum TransactionExpectedException {
     Type3TxInvalidBlobVersionedHash,
     Type4TxContractCreation,
     IntrinsicGasTooLow,
+    IntrinsicGasBelowFloorGasCost,
     InsufficientAccountFunds,
     SenderNotEoa,
     PriorityGreaterThanMaxFeePerGas,