Simplify last_frame_result: remove initial_reservoir parameter and fix reservoir handling

- Remove unused `initial_reservoir` parameter from `last_frame_result` across all handlers
- Fix precompile provider to save reservoir before overwriting gas tracker
- Add deprecated `gas_used()` method on ExecutionResult pointing to `tx_gas_used()`

Author: rakita

crates/context/interface/src/result.rs

@@ -503,6 +503,16 @@ impl<HaltReasonTy> ExecutionResult<HaltReasonTy> {
     pub fn tx_gas_used(&self) -> u64 {
         self.gas().tx_gas_used()
     }
+
+    /// Returns the gas used.
+    #[inline]
+    #[deprecated(
+        since = "32.0.0",
+        note = "Use `tx_gas_used()` instead, `gas_used` is ambiguous after EIP-8037 state gas split"
+    )]
+    pub fn gas_used(&self) -> u64 {
+        self.tx_gas_used()
+    }
 }
 
 impl<HaltReasonTy: fmt::Display> fmt::Display for ExecutionResult<HaltReasonTy> {

crates/handler/src/handler.rs

@@ -220,13 +220,12 @@ pub trait Handler {
         // Create first frame action
         // Note: first_frame_input now handles state gas deduction from the reservoir
         let first_frame_input = self.first_frame_input(evm, gas_limit, init_and_floor_gas)?;
-        let initial_reservoir = first_frame_input.frame_input.reservoir();
 
         // Run execution loop
         let mut frame_result = self.run_exec_loop(evm, first_frame_input)?;
 
         // Handle last frame result
-        self.last_frame_result(evm, &mut frame_result, initial_reservoir)?;
+        self.last_frame_result(evm, &mut frame_result)?;
         Ok(frame_result)
     }
 
@@ -448,7 +447,6 @@ pub trait Handler {
         &mut self,
         evm: &mut Self::Evm,
         frame_result: &mut <<Self::Evm as EvmTr>::Frame as FrameTr>::FrameResult,
-        initial_reservoir: u64,
     ) -> Result<(), Self::Error> {
         let instruction_result = frame_result.interpreter_result().result;
         let gas = frame_result.gas_mut();

crates/handler/src/precompile_provider.rs

@@ -94,10 +94,10 @@ impl<CTX: ContextTr> PrecompileProvider<CTX> for EthPrecompiles {
         let Some(precompile) = self.precompiles.get(&inputs.bytecode_address) else {
             return Ok(None);
         };
-
+        let reservoir = inputs.reservoir;
         let mut result = InterpreterResult {
             result: InstructionResult::Return,
-            gas: Gas::new_with_regular_gas_and_reservoir(inputs.gas_limit, inputs.reservoir),
+            gas: Gas::new_with_regular_gas_and_reservoir(inputs.gas_limit, reservoir),
             output: Bytes::new(),
         };
 
@@ -119,11 +119,10 @@ impl<CTX: ContextTr> PrecompileProvider<CTX> for EthPrecompiles {
 
         match exec_result {
             Ok(output) => {
+                *result.gas.tracker_mut() = output.gas;
                 // Preserve the reservoir before replacing the tracker.
                 // Precompile output doesn't track reservoir, but we need to
                 // propagate it back to the parent frame.
-                let reservoir = result.gas.reservoir();
-                *result.gas.tracker_mut() = output.gas;
                 result.gas.set_reservoir(reservoir);
                 result.result = if output.reverted {
                     InstructionResult::Revert

crates/inspector/src/handler.rs

@@ -89,13 +89,12 @@ where
         // Note: first_frame_input already handles initial state gas deduction
         // from the reservoir (or gas_limit deficit).
         let first_frame_input = self.first_frame_input(evm, gas_limit, init_and_floor_gas)?;
-        let initial_reservoir = first_frame_input.frame_input.reservoir();
 
         // Run execution loop
         let mut frame_result = self.inspect_run_exec_loop(evm, first_frame_input)?;
 
         // Handle last frame result
-        self.last_frame_result(evm, &mut frame_result, initial_reservoir)?;
+        self.last_frame_result(evm, &mut frame_result)?;
         Ok(frame_result)
     }
 

crates/op-revm/src/handler.rs

@@ -186,7 +186,6 @@ where
         &mut self,
         evm: &mut Self::Evm,
         frame_result: &mut <<Self::Evm as EvmTr>::Frame as FrameTr>::FrameResult,
-        initial_reservoir: u64,
     ) -> Result<(), Self::Error> {
         let ctx = evm.ctx();
         let tx = ctx.tx();
@@ -220,8 +219,7 @@ where
             //   - Regular transactions report their gas used as normal.
             if !is_deposit || is_regolith {
                 // Return unused regular gas and unused reservoir gas.
-                gas.erase_cost(remaining + reservoir);
-                gas.set_reservoir(reservoir);
+                gas.erase_cost(remaining);
                 gas.record_refund(refunded);
             } else if is_deposit && tx.is_system_transaction() {
                 // System transactions were a special type of deposit transaction in
@@ -242,20 +240,14 @@ where
             //     gas used on failure. Refunds on remaining gas enabled.
             //   - Regular transactions receive a refund on remaining gas as normal.
             if !is_deposit || is_regolith {
-                // Return unused regular gas and unused reservoir gas.
-                gas.erase_cost(remaining + reservoir);
+                // Return unused regular gas.
+                gas.erase_cost(remaining);
             }
-            // On revert, refill reservoir: state gas that spilled into regular gas
-            // gets returned to the reservoir.
-            gas.set_reservoir(initial_reservoir + state_gas_spent);
-        } else {
-            // On halt, refill reservoir.
-            // TODO(state-gas)handle state gas.
-            gas.set_reservoir(initial_reservoir.max(state_gas_spent));
         }
 
         // Restore state_gas_spent on all paths (lost by Gas::new_spent overwrite).
         gas.set_state_gas_spent(state_gas_spent);
+        gas.set_reservoir(reservoir);
 
         Ok(())
     }
@@ -438,8 +430,7 @@ where
             // clear the journal
             output = Ok(ExecutionResult::Halt {
                 reason: OpHaltReason::FailedDeposit,
-                gas: ResultGas::default()
-                    .with_total_gas_spent(gas_used),
+                gas: ResultGas::default().with_total_gas_spent(gas_used),
                 logs: Vec::new(),
             })
         }
@@ -511,7 +502,7 @@ mod tests {
             OpHandler::<_, EVMError<_, OpTransactionError>, EthFrame<EthInterpreter>>::new();
 
         handler
-            .last_frame_result(&mut evm, &mut exec_result, 0)
+            .last_frame_result(&mut evm, &mut exec_result)
             .unwrap();
         handler.refund(&mut evm, &mut exec_result, 0);
         *exec_result.gas()