From 7098564c83f814e81f2c029e839e6211eca5551c Mon Sep 17 00:00:00 2001 From: qu0b Date: Fri, 27 Mar 2026 19:10:36 +0000 Subject: [PATCH] core: fix 2D gas pool accounting for EIP-8037 ReturnGasAmsterdam was draining the gas pool by the 1D sum of regular+state gas consumed per tx (tx_gas_used), but EIP-8037 defines block validity as max(sum_regular, sum_state) <= gas_limit. This caused valid blocks to be rejected when the sum of both dimensions exceeded the gas limit, even though each dimension individually was within bounds. Fix: set remaining = initial - max(cumulativeRegular, cumulativeState) after each tx, so SubGas correctly gates subsequent transactions against the 2D block capacity. Co-authored-by: Jared Wasinger --- core/gaspool.go | 20 +++++++++++--------- core/state_transition.go | 2 +- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/core/gaspool.go b/core/gaspool.go index 690882c7b1..9ce156bb9b 100644 --- a/core/gaspool.go +++ b/core/gaspool.go @@ -73,18 +73,20 @@ func (gp *GasPool) ReturnGas(returned uint64, gasUsed uint64) error { return nil } -// ReturnGasAmsterdam handles 2D gas accounting for Amsterdam (EIP-8037). -// It undoes the SubGas deduction fully and accumulates per-dimension block totals. -func (gp *GasPool) ReturnGasAmsterdam(returned, txRegular, txState, receiptGasUsed uint64) error { - if gp.remaining > math.MaxUint64-returned { - return fmt.Errorf("%w: remaining: %d, returned: %d", ErrGasLimitOverflow, gp.remaining, returned) - } - // Undo SubGas deduction fully (Amsterdam uses cumulative tracking) - gp.remaining += returned - // Accumulate 2D block dimensions +// ReturnGasAmsterdam calculates the new remaining gas in the pool after the +// execution of a message. The remaining gas in the pool is +// block.gasLimit - max(cumulative_regular, cumulative_state) +func (gp *GasPool) ReturnGasAmsterdam(txRegular, txState, receiptGasUsed uint64) error { gp.cumulativeRegular += txRegular gp.cumulativeState += txState gp.cumulativeUsed += receiptGasUsed + + blockUsed := max(gp.cumulativeRegular, gp.cumulativeState) + if gp.initial < blockUsed { + return fmt.Errorf("%w: block gas overflow: initial %d, used %d (regular: %d, state: %d)", + ErrGasLimitReached, gp.initial, blockUsed, gp.cumulativeRegular, gp.cumulativeState) + } + gp.remaining = gp.initial - blockUsed return nil } diff --git a/core/state_transition.go b/core/state_transition.go index a4f298011f..b69bff85d1 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -608,7 +608,7 @@ func (st *stateTransition) execute() (*ExecutionResult, error) { txState := (gas.StateGas - authRefund) + execGasUsed.StateGasCharged txRegular := gas.RegularGas + execGasUsed.RegularGasUsed txRegular = max(txRegular, floorDataGas) - if err := st.gp.ReturnGasAmsterdam(returned, txRegular, txState, st.gasUsed()); err != nil { + if err := st.gp.ReturnGasAmsterdam(txRegular, txState, st.gasUsed()); err != nil { return nil, err } } else {