fix(l1, levm): solve hive regression

cmd/ef_tests/levm/runner/levm_runner.rs

@@ -122,6 +122,9 @@ pub fn prepare_vm_for_tx(vector: &TestVector, test: &EFTest) -> Result<VM, EFTes
             tx_max_priority_fee_per_gas: tx.max_priority_fee_per_gas,
             tx_max_fee_per_gas: tx.max_fee_per_gas,
             tx_max_fee_per_blob_gas: tx.max_fee_per_blob_gas,
+            tx_nonce: tx.nonce.try_into().map_err(|_| {
+                EFTestRunnerError::VMInitializationFailed("Nonce to large".to_string())
+            })?,
             block_gas_limit: test.env.current_gas_limit,
             transient_storage: HashMap::new(),
         },

crates/vm/levm/src/environment.rs

@@ -26,6 +26,7 @@ pub struct Environment {
     pub tx_max_priority_fee_per_gas: Option<U256>,
     pub tx_max_fee_per_gas: Option<U256>,
     pub tx_max_fee_per_blob_gas: Option<U256>,
+    pub tx_nonce: u64,
     pub block_gas_limit: u64,
     pub transient_storage: TransientStorage,
 }

crates/vm/levm/src/errors.rs

@@ -90,6 +90,8 @@ pub enum TxValidationError {
     InsufficientAccountFunds,
     #[error("Nonce is max (overflow)")]
     NonceIsMax,
+    #[error("Nonce mismatch")]
+    NonceMismatch,
     #[error("Initcode size exceeded")]
     InitcodeSizeExceeded,
     #[error("Priority fee greater than max fee per gas")]

crates/vm/levm/src/vm.rs

@@ -480,6 +480,11 @@ impl VM {
         increment_account_nonce(&mut self.cache, &self.db, sender_address)
             .map_err(|_| VMError::TxValidation(TxValidationError::NonceIsMax))?;
 
+        // check for nonce mismatch
+        if sender_account.info.nonce != self.env.tx_nonce {
+            return Err(VMError::TxValidation(TxValidationError::NonceMismatch));
+        }
+
         // (8) PRIORITY_GREATER_THAN_MAX_FEE_PER_GAS
         if let (Some(tx_max_priority_fee), Some(tx_max_fee_per_gas)) = (
             self.env.tx_max_priority_fee_per_gas,

crates/vm/vm.rs

@@ -314,6 +314,7 @@ cfg_if::cfg_if! {
                 tx_max_priority_fee_per_gas: tx.max_priority_fee().map(U256::from),
                 tx_max_fee_per_gas: tx.max_fee_per_gas().map(U256::from),
                 tx_max_fee_per_blob_gas: tx.max_fee_per_blob_gas().map(U256::from),
+                tx_nonce: tx.nonce(),
                 block_gas_limit: block_header.gas_limit,
                 transient_storage: HashMap::new(),
             };
@@ -446,7 +447,7 @@ fn run_evm(
             }
         }
 
-        match state {
+        let exec_result = match state {
             EvmState::Store(db) => {
                 let mut evm = evm_builder.with_db(db).build();
                 evm.transact_commit().map_err(EvmError::from)?
@@ -455,7 +456,8 @@ fn run_evm(
                 let mut evm = evm_builder.with_db(db).build();
                 evm.transact_commit().map_err(EvmError::from)?
             }
-        }
+        };
+        exec_result
     };
     Ok(tx_result.into())
 }