Skip to content

fix(eip-7778): use separate accumulators for receipt and block gas #33765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
qu0b wants to merge 1 commit into from
+15 −5
Closed

fix(eip-7778): use separate accumulators for receipt and block gas #33765

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions core/parallel_state_processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,22 @@ func (p *ParallelStateProcessor) prepareExecResult(block *types.Block, allStateR
return cmp.Compare(a.TransactionIndex, b.TransactionIndex)
})

var cumulativeGasUsed uint64
var (
// cumulativeGasUsed tracks post-refund gas for receipt.CumulativeGasUsed
cumulativeGasUsed uint64
// blockGasUsed tracks pre-refund gas (receipt.GasUsed = MaxUsedGas for Amsterdam)
// for block header and gas limit validation per EIP-7778
blockGasUsed uint64
)
var allLogs []*types.Log
for _, receipt := range receipts {
receipt.CumulativeGasUsed = cumulativeGasUsed + receipt.GasUsed
cumulativeGasUsed += receipt.GasUsed
if receipt.CumulativeGasUsed > header.GasLimit {
// receipt.CumulativeGasUsed holds this tx's post-refund gas (result.UsedGas)
// since execTx called ApplyTransactionWithEVM with cumulativeGas=0
cumulativeGasUsed += receipt.CumulativeGasUsed
receipt.CumulativeGasUsed = cumulativeGasUsed
// receipt.GasUsed is pre-refund (MaxUsedGas for Amsterdam) for block accounting
blockGasUsed += receipt.GasUsed
if blockGasUsed > header.GasLimit {
return &ProcessResultWithMetrics{
ProcessResult: &ProcessResult{Error: fmt.Errorf("gas limit exceeded")},
}
Expand Down Expand Up @@ -148,7 +158,7 @@ func (p *ParallelStateProcessor) prepareExecResult(block *types.Block, allStateR
Receipts: receipts,
Requests: requests,
Logs: allLogs,
GasUsed: cumulativeGasUsed,
GasUsed: blockGasUsed,
},
PostProcessTime: tPostprocess,
ExecTime: tExec,
Expand Down
Loading