forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-03-20 18:10:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

core: fix deadlock in parallel state processor

Browse source
This commit is contained in:
Marius van der Wijden 2026-03-19 12:03:28 +01:00
parent 931955cdcc
commit 41feef2a84
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/parallel_state_processor.go
View file

@ -212,21 +212,18 @@ func (p *ParallelStateProcessor) resultHandler(block *types.Block, preTxReads ba
for {
select {
case res := <-txResCh:
numTxComplete++
if execErr == nil {
// short-circuit if invalid block was detected
if res.err != nil {
execErr = res.err
continue
}
if err := gp.SubGas(res.receipt.CumulativeGasUsed); err != nil {
} else if err := gp.SubGas(res.receipt.CumulativeGasUsed); err != nil {
execErr = err
} else {
results = append(results, res)
accesses.Merge(res.stateReads)
}
}
numTxComplete++
if numTxComplete == len(block.Transactions()) {
break loop
}
@ -234,6 +231,8 @@ func (p *ParallelStateProcessor) resultHandler(block *types.Block, preTxReads ba
}
if execErr != nil {
// Drain stateRootCalcResCh so calcAndVerifyRoot goroutine can exit.
<-stateRootCalcResCh
resCh <- &ProcessResultWithMetrics{ProcessResult: &ProcessResult{Error: execErr}}
return
}