From 3fc6f1ca4395153468cd190a97585b3378f15d91 Mon Sep 17 00:00:00 2001 From: rjl493456442 Date: Thu, 7 Jan 2021 15:54:03 +0800 Subject: [PATCH 1/2] core: amining genesis when middle block is missing --- core/blockchain.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/core/blockchain.go b/core/blockchain.go index d9505dcf69a1..14516d525efe 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -528,8 +528,13 @@ func (bc *BlockChain) SetHeadBeyondRoot(head uint64, root common.Hash) (uint64, if _, err := state.New(newHeadBlock.Root(), bc.stateCache, bc.snaps); err != nil { log.Trace("Block state missing, rewinding further", "number", newHeadBlock.NumberU64(), "hash", newHeadBlock.Hash()) if pivot == nil || newHeadBlock.NumberU64() > *pivot { - newHeadBlock = bc.GetBlock(newHeadBlock.ParentHash(), newHeadBlock.NumberU64()-1) - continue + parent := bc.GetBlock(newHeadBlock.ParentHash(), newHeadBlock.NumberU64()-1) + if parent != nil { + newHeadBlock = parent + continue + } + log.Error("Miss block in middle, aiming genesis", "number", newHeadBlock.NumberU64()-1, "hash", newHeadBlock.ParentHash()) + newHeadBlock = bc.genesisBlock } else { log.Trace("Rewind passed pivot, aiming genesis", "number", newHeadBlock.NumberU64(), "hash", newHeadBlock.Hash(), "pivot", *pivot) newHeadBlock = bc.genesisBlock From b70ce58139090d78ab95a1c3c92bc1e8f72ff276 Mon Sep 17 00:00:00 2001 From: gary rong Date: Tue, 12 Jan 2021 14:29:46 +0800 Subject: [PATCH 2/2] Update core/blockchain.go Co-authored-by: ligi --- core/blockchain.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/blockchain.go b/core/blockchain.go index 14516d525efe..44bae0e0f714 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -533,7 +533,7 @@ func (bc *BlockChain) SetHeadBeyondRoot(head uint64, root common.Hash) (uint64, newHeadBlock = parent continue } - log.Error("Miss block in middle, aiming genesis", "number", newHeadBlock.NumberU64()-1, "hash", newHeadBlock.ParentHash()) + log.Error("Missing block in the middle, aiming genesis", "number", newHeadBlock.NumberU64()-1, "hash", newHeadBlock.ParentHash()) newHeadBlock = bc.genesisBlock } else { log.Trace("Rewind passed pivot, aiming genesis", "number", newHeadBlock.NumberU64(), "hash", newHeadBlock.Hash(), "pivot", *pivot)