core: initialize current block/fastblock atomics to nil, fix ethereum…

…#19286 (ethereum#19352)
enriquefynn · Feb 15, 2021 · a5652ab · a5652ab
1 parent 4f9cd0f
commit a5652ab
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/core/blockchain.go b/core/blockchain.go
@@ -228,10 +228,16 @@ func NewBlockChain(db ethdb.Database, cacheConfig *CacheConfig, chainConfig *par
 	if bc.genesisBlock == nil {
 		return nil, ErrNoGenesis
 	}
+
+	var nilBlock *types.Block
+	bc.currentBlock.Store(nilBlock)
+	bc.currentFastBlock.Store(nilBlock)
+
 	// Initialize the chain with ancient data if it isn't empty.
 	if bc.empty() {
 		rawdb.InitDatabaseFromFreezer(bc.db)
 	}
+
 	if err := bc.loadLastState(); err != nil {
 		return nil, err
 	}