Call OnBlockchainInit before OnGenesisBlock (ethereum#22)

# Conflicts: # core/blockchain.go
streamingfast · Mar 14, 2024 · 1770744 · 1770744
1 parent 77a701c
commit 1770744
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/core/blockchain.go b/core/blockchain.go
@@ -437,6 +437,10 @@ func NewBlockChain(db ethdb.Database, cacheConfig *CacheConfig, genesis *Genesis
 		}
 	}
 
+	if bc.logger != nil && bc.logger.OnBlockchainInit != nil {
+		bc.logger.OnBlockchainInit(chainConfig)
+	}
+
 	if bc.logger != nil && bc.logger.OnGenesisBlock != nil {
 		if block := bc.CurrentBlock(); block.Number.Uint64() == 0 {
 			alloc, err := getGenesisState(bc.db, block.Hash())
@@ -488,10 +492,8 @@ func NewBlockChain(db ethdb.Database, cacheConfig *CacheConfig, genesis *Genesis
 		}
 		rawdb.WriteChainConfig(db, genesisHash, chainConfig)
 	}
-	if bc.logger != nil && bc.logger.OnBlockchainInit != nil {
-		bc.logger.OnBlockchainInit(chainConfig)
-	}
-	// Start tx indexer/unindexer if required.
+
+	// Start tx indexer if it's enabled.
 	if txLookupLimit != nil {
 		bc.txLookupLimit = *txLookupLimit