diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 4384401fb0d..0c75f31a6f0 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -138,6 +138,10 @@ var ( Name: "override.terminaltotaldifficulty", Usage: "Manually specify TerminalTotalDifficulty, overriding the bundled setting", } + OverrideMergeForkBlock = BigFlag{ + Name: "override.mergeForkBlock", + Usage: "Manually specify TerminalTotalDifficulty, overriding the bundled setting", + } // Ethash settings EthashCachesInMemoryFlag = cli.IntFlag{ Name: "ethash.cachesinmem", @@ -1500,6 +1504,9 @@ func SetEthConfig(ctx *cli.Context, nodeConfig *node.Config, cfg *ethconfig.Conf if ctx.GlobalIsSet(OverrideTerminalTotalDifficulty.Name) { cfg.Genesis.Config.TerminalTotalDifficulty = GlobalBig(ctx, OverrideTerminalTotalDifficulty.Name) } + if ctx.GlobalIsSet(OverrideMergeForkBlock.Name) { + cfg.Genesis.Config.MergeForkBlock = GlobalBig(ctx, OverrideMergeForkBlock.Name) + } } // SetDNSDiscoveryDefaults configures DNS discovery with the given URL if diff --git a/turbo/cli/default_flags.go b/turbo/cli/default_flags.go index f66bf3821b8..60a0105c98f 100644 --- a/turbo/cli/default_flags.go +++ b/turbo/cli/default_flags.go @@ -125,4 +125,5 @@ var DefaultFlags = []cli.Flag{ utils.WithoutHeimdallFlag, utils.EthStatsURLFlag, utils.OverrideTerminalTotalDifficulty, + utils.OverrideMergeForkBlock, }