add emerald configs

cmd/geth/chaincmd.go

@@ -52,6 +52,7 @@ var (
 			utils.DataDirFlag,
 			utils.OverrideMorph203TimeFlag,
 			utils.OverrideViridianTimeFlag,
+			utils.OverrideEmeraldTimeFlag,
 		},
 		Category: "BLOCKCHAIN COMMANDS",
 		Description: `
@@ -220,6 +221,10 @@ func initGenesis(ctx *cli.Context) error {
 		v := ctx.Uint64(utils.OverrideViridianTimeFlag.Name)
 		overrides.ViridianTime = &v
 	}
+	if ctx.IsSet(utils.OverrideEmeraldTimeFlag.Name) {
+		v := ctx.Uint64(utils.OverrideEmeraldTimeFlag.Name)
+		overrides.EmeraldTime = &v
+	}
 
 	for _, name := range []string{"chaindata", "lightchaindata"} {
 		chaindb, err := stack.OpenDatabase(name, 0, 0, "", false)

cmd/geth/config.go

@@ -166,6 +166,10 @@ func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) {
 		v := ctx.Uint64(utils.OverrideViridianTimeFlag.Name)
 		cfg.Eth.OverrideViridianTime = &v
 	}
+	if ctx.GlobalIsSet(utils.OverrideEmeraldTimeFlag.Name) {
+		v := ctx.Uint64(utils.OverrideEmeraldTimeFlag.Name)
+		cfg.Eth.OverrideEmeraldTime = &v
+	}
 
 	backend, _ := utils.RegisterEthService(stack, &cfg.Eth)
 

cmd/geth/main.go

@@ -73,6 +73,7 @@ var (
 		utils.OverrideArrowGlacierFlag,
 		utils.OverrideMorph203TimeFlag,
 		utils.OverrideViridianTimeFlag,
+		utils.OverrideEmeraldTimeFlag,
 		utils.EthashCacheDirFlag,
 		utils.EthashCachesInMemoryFlag,
 		utils.EthashCachesOnDiskFlag,

cmd/utils/flags.go

@@ -279,6 +279,10 @@ var (
 		Name:  "override.viridiantime",
 		Usage: "Manually specify the Viridian fork timestamp, overriding the bundled setting",
 	}
+	OverrideEmeraldTimeFlag = &cli.Uint64Flag{
+		Name:  "override.emeraldtime",
+		Usage: "Manually specify the Emerald fork timestamp, overriding the bundled setting",
+	}
 	// Light server and client settings
 	LightServeFlag = cli.IntFlag{
 		Name:  "light.serve",

eth/backend.go

@@ -137,6 +137,9 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
 	if config.OverrideViridianTime != nil {
 		overrides.ViridianTime = config.OverrideViridianTime
 	}
+	if config.OverrideEmeraldTime != nil {
+		overrides.EmeraldTime = config.OverrideEmeraldTime
+	}
 	chainConfig, genesisHash, genesisErr := core.SetupGenesisBlockWithOverride(chainDb, config.Genesis, &overrides)
 	if _, ok := genesisErr.(*params.ConfigCompatError); genesisErr != nil && !ok {
 		return nil, genesisErr

eth/ethconfig/config.go

@@ -221,6 +221,9 @@ type Config struct {
 
 	// ViridianTime override
 	OverrideViridianTime *uint64 `toml:",omitempty"`
+
+	// EmeraldTime override
+	OverrideEmeraldTime *uint64 `toml:",omitempty"`
 }
 
 // CreateConsensusEngine creates a consensus engine for the given chain config.

les/client.go

@@ -96,6 +96,9 @@ func New(stack *node.Node, config *ethconfig.Config) (*LightEthereum, error) {
 	if config.OverrideViridianTime != nil {
 		overrides.ViridianTime = config.OverrideViridianTime
 	}
+	if config.OverrideEmeraldTime != nil {
+		overrides.EmeraldTime = config.OverrideEmeraldTime
+	}
 	chainConfig, genesisHash, genesisErr := core.SetupGenesisBlockWithOverride(chainDb, config.Genesis, &overrides)
 	if _, isCompat := genesisErr.(*params.ConfigCompatError); genesisErr != nil && !isCompat {
 		return nil, genesisErr