Always read chain config from genesis

This will prevent problems where a node needs to be restarted twice before it could pick up a new hardfork from genesis. This was caused by an old version of chain config, which was previously stored in database, being used by a node at start. The commit will avoid reading any old chain config from db and always read it directly from a genesis file or from the binary itself.

Author: cffls

eth/backend.go

@@ -164,20 +164,6 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
 		}
 	}
 
-	// Here we determine genesis hash and active ChainConfig.
-	// We need these to figure out the consensus parameters and to set up history pruning.
-	chainConfig, _, err := core.LoadChainConfig(chainDb, config.Genesis)
-	if err != nil {
-		return nil, err
-	}
-
-	/*
-		engine, err := ethconfig.CreateConsensusEngine(chainConfig, chainDb)
-		if err != nil {
-			return nil, err
-		}
-	*/
-
 	// Assemble the Ethereum object.
 	eth := &Ethereum{
 		config:          config,
@@ -204,7 +190,7 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
 	gpoParams := config.GPO
 
 	blockChainAPI := ethapi.NewBlockChainAPI(eth.APIBackend)
-	engine, err := ethconfig.CreateConsensusEngine(chainConfig, config, chainDb, blockChainAPI)
+	engine, err := ethconfig.CreateConsensusEngine(config.Genesis.Config, config, chainDb, blockChainAPI)
 	eth.engine = engine
 	if err != nil {
 		return nil, err