Fix OverrideTerminalTotalDifficulty when datadir is not empty

cmd/utils/flags.go

@@ -1486,10 +1486,10 @@ func SetEthConfig(ctx *cli.Context, nodeConfig *nodecfg.Config, cfg *ethconfig.C
 	}
 
 	if ctx.GlobalIsSet(OverrideTerminalTotalDifficulty.Name) {
-		cfg.Genesis.Config.TerminalTotalDifficulty = GlobalBig(ctx, OverrideTerminalTotalDifficulty.Name)
+		cfg.OverrideTerminalTotalDifficulty = GlobalBig(ctx, OverrideTerminalTotalDifficulty.Name)
 	}
 	if ctx.GlobalIsSet(OverrideMergeForkBlock.Name) {
-		cfg.Genesis.Config.MergeForkBlock = GlobalBig(ctx, OverrideMergeForkBlock.Name)
+		cfg.OverrideMergeForkBlock = GlobalBig(ctx, OverrideMergeForkBlock.Name)
 	}
 }
 

core/genesis.go

@@ -173,12 +173,16 @@ func (e *GenesisMismatchError) Error() string {
 //
 // The returned chain configuration is never nil.
 func CommitGenesisBlock(db kv.RwDB, genesis *Genesis) (*params.ChainConfig, *types.Block, error) {
+	return CommitGenesisBlockWithOverride(db, genesis, nil, nil)
+}
+
+func CommitGenesisBlockWithOverride(db kv.RwDB, genesis *Genesis, overrideMergeForkBlock, overrideTerminalTotalDifficulty *big.Int) (*params.ChainConfig, *types.Block, error) {
 	tx, err := db.BeginRw(context.Background())
 	if err != nil {
 		return nil, nil, err
 	}
 	defer tx.Rollback()
-	c, b, err := WriteGenesisBlock(tx, genesis)
+	c, b, err := WriteGenesisBlock(tx, genesis, overrideMergeForkBlock, overrideTerminalTotalDifficulty)
 	if err != nil {
 		return c, b, err
 	}
@@ -197,7 +201,7 @@ func MustCommitGenesisBlock(db kv.RwDB, genesis *Genesis) (*params.ChainConfig,
 	return c, b
 }
 
-func WriteGenesisBlock(db kv.RwTx, genesis *Genesis) (*params.ChainConfig, *types.Block, error) {
+func WriteGenesisBlock(db kv.RwTx, genesis *Genesis, overrideMergeForkBlock, overrideTerminalTotalDifficulty *big.Int) (*params.ChainConfig, *types.Block, error) {
 	if genesis != nil && genesis.Config == nil {
 		return params.AllEthashProtocolChanges, nil, ErrGenesisNoConfig
 	}
@@ -213,6 +217,12 @@ func WriteGenesisBlock(db kv.RwTx, genesis *Genesis) (*params.ChainConfig, *type
 			genesis = DefaultGenesisBlock()
 			custom = false
 		}
+		if overrideMergeForkBlock != nil {
+			genesis.Config.MergeForkBlock = overrideMergeForkBlock
+		}
+		if overrideTerminalTotalDifficulty != nil {
+			genesis.Config.TerminalTotalDifficulty = overrideTerminalTotalDifficulty
+		}
 		block, _, err1 := genesis.Write(db)
 		if err1 != nil {
 			return genesis.Config, nil, err1
@@ -240,6 +250,12 @@ func WriteGenesisBlock(db kv.RwTx, genesis *Genesis) (*params.ChainConfig, *type
 	}
 	// Get the existing chain configuration.
 	newcfg := genesis.configOrDefault(stored)
+	if overrideMergeForkBlock != nil {
+		newcfg.MergeForkBlock = overrideMergeForkBlock
+	}
+	if overrideTerminalTotalDifficulty != nil {
+		newcfg.TerminalTotalDifficulty = overrideTerminalTotalDifficulty
+	}
 	if err := newcfg.CheckConfigForkOrder(); err != nil {
 		return newcfg, nil, err
 	}
@@ -259,6 +275,12 @@ func WriteGenesisBlock(db kv.RwTx, genesis *Genesis) (*params.ChainConfig, *type
 	// config is supplied. These chains would get AllProtocolChanges (and a compat error)
 	// if we just continued here.
 	if genesis == nil && stored != params.MainnetGenesisHash {
+		if overrideMergeForkBlock != nil {
+			storedcfg.MergeForkBlock = overrideMergeForkBlock
+		}
+		if overrideTerminalTotalDifficulty != nil {
+			storedcfg.TerminalTotalDifficulty = overrideTerminalTotalDifficulty
+		}
 		return storedcfg, storedBlock, nil
 	}
 	// Check config compatibility and write the config. Compatibility errors

core/genesis_test.go

@@ -20,7 +20,7 @@ func TestDefaultBSCGenesisBlock(t *testing.T) {
 			t.Fatal(err)
 		}
 		defer tx.Rollback()
-		_, block, err := WriteGenesisBlock(tx, genesis)
+		_, block, err := WriteGenesisBlock(tx, genesis, nil, nil)
 		require.NoError(t, err)
 		expect := params.GenesisHashByChainName(network)
 		require.NotNil(t, expect, network)
@@ -34,13 +34,13 @@ func TestDefaultBSCGenesisBlock(t *testing.T) {
 func TestCommitGenesisIdempotency(t *testing.T) {
 	_, tx := memdb.NewTestTx(t)
 	genesis := DefaultGenesisBlockByChainName(networkname.MainnetChainName)
-	_, _, err := WriteGenesisBlock(tx, genesis)
+	_, _, err := WriteGenesisBlock(tx, genesis, nil, nil)
 	require.NoError(t, err)
 	seq, err := tx.ReadSequence(kv.EthTx)
 	require.NoError(t, err)
 	require.Equal(t, uint64(2), seq)
 
-	_, _, err = WriteGenesisBlock(tx, genesis)
+	_, _, err = WriteGenesisBlock(tx, genesis, nil, nil)
 	require.NoError(t, err)
 	seq, err = tx.ReadSequence(kv.EthTx)
 	require.NoError(t, err)

eth/backend.go

@@ -175,7 +175,7 @@ func New(stack *node.Node, config *ethconfig.Config, logger log.Logger) (*Ethere
 		panic(err)
 	}
 
-	chainConfig, genesis, genesisErr := core.CommitGenesisBlock(chainKv, config.Genesis)
+	chainConfig, genesis, genesisErr := core.CommitGenesisBlockWithOverride(chainKv, config.Genesis, config.OverrideMergeForkBlock, config.OverrideTerminalTotalDifficulty)
 	if _, ok := genesisErr.(*params.ConfigCompatError); genesisErr != nil && !ok {
 		return nil, genesisErr
 	}

eth/ethconfig/config.go

@@ -228,6 +228,11 @@ type Config struct {
 	WithoutHeimdall bool
 	// Ethstats service
 	Ethstats string
+
+	// FORK_NEXT_VALUE (see EIP-3675) block override
+	OverrideMergeForkBlock *big.Int `toml:",omitempty"`
+
+	OverrideTerminalTotalDifficulty *big.Int `toml:",omitempty"`
 }
 
 type SyncMode string