fix: nonce changed is not reverted in journal if fail due to insufficient balance

Author: rakita

crates/handler/src/pre_execution.rs

@@ -138,12 +138,6 @@ pub fn validate_against_state_and_deduct_caller<
         is_nonce_check_disabled,
     )?;
 
-    // Bump the nonce for calls. Nonce for CREATE will be bumped in `make_create_frame`.
-    if tx.kind().is_call() {
-        // Nonce is already checked
-        caller_account.info.nonce = caller_account.info.nonce.saturating_add(1);
-    }
-
     let max_balance_spending = tx.max_balance_spending()?;
 
     // Check if account has enough balance for `gas_limit * max_fee`` and value transfer.
@@ -178,6 +172,12 @@ pub fn validate_against_state_and_deduct_caller<
     caller_account.mark_touch();
     caller_account.info.balance = new_balance;
 
+    // Bump the nonce for calls. Nonce for CREATE will be bumped in `make_create_frame`.
+    if tx.kind().is_call() {
+        // Nonce is already checked
+        caller_account.info.nonce = caller_account.info.nonce.saturating_add(1);
+    }
+
     journal.caller_accounting_journal_entry(tx.caller(), old_balance, tx.kind().is_call());
     Ok(())
 }

crates/op-revm/src/handler.rs

@@ -157,11 +157,6 @@ where
             )?;
         }
 
-        // Bump the nonce for calls. Nonce for CREATE will be bumped in `handle_create`.
-        if tx.kind().is_call() {
-            caller_account.info.nonce = caller_account.info.nonce.saturating_add(1);
-        }
-
         let max_balance_spending = tx.max_balance_spending()?.saturating_add(additional_cost);
 
         // old balance is journaled before mint is incremented.
@@ -210,6 +205,11 @@ where
         caller_account.mark_touch();
         caller_account.info.balance = new_balance;
 
+        // Bump the nonce for calls. Nonce for CREATE will be bumped in `handle_create`.
+        if tx.kind().is_call() {
+            caller_account.info.nonce = caller_account.info.nonce.saturating_add(1);
+        }
+
         // NOTE: all changes to the caller account should journaled so in case of error
         // we can revert the changes.
         journal.caller_accounting_journal_entry(tx.caller(), old_balance, tx.kind().is_call());