From 3eeb7b3a772542e12804188d61ef738512bc8856 Mon Sep 17 00:00:00 2001 From: Sunny Date: Mon, 25 Nov 2024 15:11:30 +0800 Subject: [PATCH] fix: error handling when fallback to serial process --- core/blockchain.go | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/core/blockchain.go b/core/blockchain.go index 2b9814ca2..3471aa22e 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -1953,8 +1953,15 @@ func (bc *BlockChain) insertChain(chain types.Blocks, setHead bool) (int, error) blockProcessedInParallel = true if err != nil { // parallel processing fail , fallback to serial with new statDB. - log.Warn("ParallelEVM fallback!!!", "error", err.Error()) + log.Warn("ParallelEVM fallback to serial process", "error", err.Error()) + execErr := err statedb, err = bc.reGenerateStateForFallBack(parent.Root, block.Root(), statedb) + if err != nil { + // Can not get new statedb for serial run, report the process error. + bc.reportBlock(block, receipts, execErr) + followupInterrupt.Store(true) + return it.index, err + } statedb.StartPrefetcher("chain") activeState = statedb receipts, logs, usedGas, err = bc.serialProcessor.Process(block, statedb, bc.vmConfig) @@ -1973,19 +1980,32 @@ func (bc *BlockChain) insertChain(chain types.Blocks, setHead bool) (int, error) if err := bc.validator.ValidateState(block, statedb, receipts, usedGas); err != nil { if blockProcessedInParallel { // invalid parallel execution, try serial - log.Warn("ParallelEVM fallback after ValidateState!!!", "error", err.Error()) + log.Warn("ParallelEVM fallback to serial process after ValidateState", "error", err.Error()) parent := it.previous() if parent == nil { parent = bc.GetHeader(block.ParentHash(), block.NumberU64()-1) } + validateErr := err statedb, err = bc.reGenerateStateForFallBack(parent.Root, block.Root(), statedb) + if err != nil { + // can not get new statedb for serial run, report the validate error. + bc.reportBlock(block, receipts, validateErr) + followupInterrupt.Store(true) + return it.index, err + } statedb.StartPrefetcher("chain") activeState = statedb - receipts, logs, usedGas, err = bc.serialProcessor.Process(block, statedb, bc.vmConfig) + if err != nil { + // serial process with process error. + bc.reportBlock(block, receipts, err) + followupInterrupt.Store(true) + return it.index, err + } blockProcessedInParallel = false if err := bc.validator.ValidateState(block, statedb, receipts, usedGas); err != nil { + // serial process with validation error. bc.reportBlock(block, receipts, err) followupInterrupt.Store(true) return it.index, err