Skip to content

Commit 49cdcf5

Browse files
authored
core: reset to genesis when middle block is missing (ethereum#22135)
When a sethead/rewind finds that the targeted block is missing, it resets to genesis instead of crashing. Closes ethereum#22129
1 parent 04a7226 commit 49cdcf5

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

core/blockchain.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -524,8 +524,13 @@ func (bc *BlockChain) SetHeadBeyondRoot(head uint64, root common.Hash) (uint64,
524524
if _, err := state.New(newHeadBlock.Root(), bc.stateCache, bc.snaps); err != nil {
525525
log.Trace("Block state missing, rewinding further", "number", newHeadBlock.NumberU64(), "hash", newHeadBlock.Hash())
526526
if pivot == nil || newHeadBlock.NumberU64() > *pivot {
527-
newHeadBlock = bc.GetBlock(newHeadBlock.ParentHash(), newHeadBlock.NumberU64()-1)
528-
continue
527+
parent := bc.GetBlock(newHeadBlock.ParentHash(), newHeadBlock.NumberU64()-1)
528+
if parent != nil {
529+
newHeadBlock = parent
530+
continue
531+
}
532+
log.Error("Missing block in the middle, aiming genesis", "number", newHeadBlock.NumberU64()-1, "hash", newHeadBlock.ParentHash())
533+
newHeadBlock = bc.genesisBlock
529534
} else {
530535
log.Trace("Rewind passed pivot, aiming genesis", "number", newHeadBlock.NumberU64(), "hash", newHeadBlock.Hash(), "pivot", *pivot)
531536
newHeadBlock = bc.genesisBlock

0 commit comments

Comments
 (0)