chore: refine some trivals

Author: will-2012

src/evm/api/exec.rs

@@ -31,10 +31,11 @@ where
         self.inner.set_block(block);
     }
 
-    fn transact_one(&mut self, tx: Self::Tx) -> Result<Self::ExecutionResult, Self::Error> {
-        let mut tx = tx;
+    fn transact_one(&mut self, mut tx: Self::Tx) -> Result<Self::ExecutionResult, Self::Error> {
         self.prepare_tx_for_execution(&mut tx);
-        self.maybe_bump_beneficiary_balance_for_trace(tx.is_system_transaction, tx.base.value);
+        if tx.is_system_transaction {
+            self.fund_beneficiary_for_system_tx_replay(tx.base.value);
+        }
         self.inner.ctx.set_tx(tx);
         BscHandler::new().run(self)
     }
@@ -45,9 +46,10 @@ where
 
     fn replay(&mut self) -> Result<ResultAndState, Self::Error> {
         self.prepare_current_tx_for_execution();
-        let is_sys = self.inner.ctx.tx.is_system_transaction;
-        let value = self.inner.ctx.tx.base.value;
-        self.maybe_bump_beneficiary_balance_for_trace(is_sys, value);
+        if self.inner.ctx.tx.is_system_transaction {
+            let value = self.inner.ctx.tx.base.value;
+            self.fund_beneficiary_for_system_tx_replay(value);
+        }
         BscHandler::new().run(self).map(|result| {
             let state = self.finalize();
             ResultAndState::new(result, state)
@@ -75,10 +77,11 @@ where
         self.inner.set_inspector(inspector);
     }
 
-    fn inspect_one_tx(&mut self, tx: Self::Tx) -> Result<Self::ExecutionResult, Self::Error> {
-        let mut tx = tx;
+    fn inspect_one_tx(&mut self, mut tx: Self::Tx) -> Result<Self::ExecutionResult, Self::Error> {
         self.prepare_tx_for_execution(&mut tx);
-        self.maybe_bump_beneficiary_balance_for_trace(tx.is_system_transaction, tx.base.value);
+        if tx.is_system_transaction {
+            self.fund_beneficiary_for_system_tx_replay(tx.base.value);
+        }
         self.inner.ctx.set_tx(tx);
         BscHandler::new().inspect_run(self)
     }

src/evm/api/mod.rs

@@ -110,15 +110,12 @@ impl<DB: Database, I> BscEvm<DB, I> {
         }
     }
 
-    /// Trace-only: top up beneficiary so a value-transferring system tx (e.g. the
-    /// block-reward deposit) does not fail balance checks during replay — archive
-    /// state at block start has not yet received that reward.
-    pub(crate) fn maybe_bump_beneficiary_balance_for_trace(
-        &mut self,
-        is_system_tx: bool,
-        value: revm::primitives::U256,
-    ) {
-        if !self.trace || !is_system_tx {
+    /// Fund the beneficiary with `value` so a value-transferring BSC system tx
+    /// (e.g. the block-reward deposit) does not fail balance checks during trace
+    /// replay — archive state at block start has not yet received that reward.
+    /// Trace-mode only; callers must gate on `tx.is_system_transaction`.
+    pub(crate) fn fund_beneficiary_for_system_tx_replay(&mut self, value: revm::primitives::U256) {
+        if !self.trace {
             return;
         }
         let beneficiary = self.block.beneficiary;
@@ -419,7 +416,7 @@ mod tests {
         );
         db.insert_account_info(system_contract, AccountInfo::default());
 
-        // trace = true enables `maybe_bump_beneficiary_balance_for_trace`.
+        // trace = true enables `fund_beneficiary_for_system_tx_replay`.
         BscEvm::new(env, db, NoOpInspector, false, true)
     }
 

src/node/evm/mod.rs

@@ -69,9 +69,9 @@ where
         // BlockExecutor filters mined system txs out before reaching here; trace
         // RPCs do not — let `prepare` mark them idempotently for `BscHandler`.
         self.prepare_tx_for_execution(&mut tx);
-        self.maybe_bump_beneficiary_balance_for_trace(tx.is_system_transaction, tx.base.value);
 
         let saved_env = if tx.is_system_transaction {
+            self.fund_beneficiary_for_system_tx_replay(tx.base.value);
             Some((
                 core::mem::replace(&mut self.block.gas_limit, tx.base.gas_limit),
                 core::mem::replace(&mut self.block.basefee, 0),
@@ -81,10 +81,8 @@ where
             None
         };
 
-        // Execute transaction
         let res = if self.inspect { self.inspect_tx(tx) } else { ExecuteEvm::transact(self, tx) };
 
-        // Restore environment for system transactions
         if let Some((gas_limit, basefee, disable_nonce_check)) = saved_env {
             self.block.gas_limit = gas_limit;
             self.block.basefee = basefee;