forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-06-17 20:31:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix parallel state processor to perform 2D gas accounting

Browse source
This commit is contained in:
Jared Wasinger 2026-04-01 13:23:38 -04:00
parent 7098564c83
commit f66b7eac54
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/parallel_state_processor.go
View file

@ -201,7 +201,7 @@ func (p *ParallelStateProcessor) resultHandler(block *types.Block, preTxReads ba
// 1. if the block has transactions, receive the execution results from all of them and return an error on resCh if any txs err'd // 1. if the block has transactions, receive the execution results from all of them and return an error on resCh if any txs err'd
// 2. once all txs are executed, compute the post-tx state transition and produce the ProcessResult sending it on resCh (or an error if the post-tx state didn't match what is reported in the BAL) // 2. once all txs are executed, compute the post-tx state transition and produce the ProcessResult sending it on resCh (or an error if the post-tx state didn't match what is reported in the BAL)
var results []txExecResult var results []txExecResult
gp := NewGasPool(block.GasLimit()) var cumulativeStateGas, cumulativeRegularGas uint64
var execErr error var execErr error
var numTxComplete int var numTxComplete int
@ -217,9 +217,10 @@ func (p *ParallelStateProcessor) resultHandler(block *types.Block, preTxReads ba
// short-circuit if invalid block was detected // short-circuit if invalid block was detected
if res.err != nil { if res.err != nil {
execErr = res.err execErr = res.err
} else if err := gp.SubGas(res.receipt.CumulativeGasUsed); err != nil { } else if bottleneck := max(cumulativeRegularGas+res.txRegular, cumulativeStateGas+res.txState); bottleneck > block.GasLimit() {
execErr = err execErr = fmt.Errorf("block used too much gas in bottleneck dimension: %d. block gas limit is %d", bottleneck, block.GasLimit())
} else { } else {
cumulativeStateGas += res.txState
results = append(results, res) results = append(results, res)
accesses.Merge(res.stateReads) accesses.Merge(res.stateReads)
} }