Merge pull request #2095 from cheng762/feature/bump-version-to-1.4.1

when update chainconfig,write it to db
PlatONnetwork · Jul 6, 2023 · fd2b22c · fd2b22c
2 parents d77eaf7 + 02bd486
commit fd2b22c
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/eth/backend.go b/eth/backend.go
@@ -217,7 +217,7 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
  }
  }
 
- chainConfig, _, genesisErr := core.SetupGenesisBlock(chainDb, snapshotBaseDB, config.Genesis)
+ chainConfig, genesisHash, genesisErr := core.SetupGenesisBlock(chainDb, snapshotBaseDB, config.Genesis)
 
  if _, ok := genesisErr.(*params.ConfigCompatError); genesisErr != nil && !ok {
  return nil, genesisErr
@@ -300,10 +300,10 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
 
  // Rewind the chain in case of an incompatible config upgrade.
  if compat, ok := genesisErr.(*params.ConfigCompatError); ok {
- log.Warn("Rewinding chain to upgrade configuration", "err", compat)
- return nil, compat
+ log.Warn("upgrade configuration", "err", compat)
+ //return nil, compat
  //eth.blockchain.SetHead(compat.RewindTo)
- //rawdb.WriteChainConfig(chainDb, genesisHash, chainConfig)
+ rawdb.WriteChainConfig(chainDb, genesisHash, chainConfig)
  }
  eth.bloomIndexer.Start(eth.blockchain)