diff --git a/op-node/service.go b/op-node/service.go index bd7627c97255..707525fc49b7 100644 --- a/op-node/service.go +++ b/op-node/service.go @@ -253,6 +253,10 @@ func applyOverrides(ctx *cli.Context, rollupConfig *rollup.Config) { ecotone := ctx.Uint64(opflags.EcotoneOverrideFlagName) rollupConfig.EcotoneTime = &ecotone } + if ctx.IsSet(opflags.FjordOverrideFlagName) { + fjord := ctx.Uint64(opflags.FjordOverrideFlagName) + rollupConfig.FjordTime = &fjord + } } func NewSnapshotLogger(ctx *cli.Context) (log.Logger, error) { @@ -271,7 +275,7 @@ func NewSnapshotLogger(ctx *cli.Context) (log.Logger, error) { func NewSyncConfig(ctx *cli.Context, log log.Logger) (*sync.Config, error) { if ctx.IsSet(flags.L2EngineSyncEnabled.Name) && ctx.IsSet(flags.SyncModeFlag.Name) { - return nil, errors.New("cannot set both --l2.engine-sync and --syncmode at the same time.") + return nil, errors.New("cannot set both --l2.engine-sync and --syncmode at the same time") } else if ctx.IsSet(flags.L2EngineSyncEnabled.Name) { log.Error("l2.engine-sync is deprecated and will be removed in a future release. Use --syncmode=execution-layer instead.") } diff --git a/op-service/flags/flags.go b/op-service/flags/flags.go index 31ca3eb5bc6b..f607bbf73dd6 100644 --- a/op-service/flags/flags.go +++ b/op-service/flags/flags.go @@ -16,6 +16,7 @@ const ( CanyonOverrideFlagName = "override.canyon" DeltaOverrideFlagName = "override.delta" EcotoneOverrideFlagName = "override.ecotone" + FjordOverrideFlagName = "override.fjord" ) func CLIFlags(envPrefix string, category string) []cli.Flag { @@ -41,6 +42,13 @@ func CLIFlags(envPrefix string, category string) []cli.Flag { Hidden: false, Category: category, }, + &cli.Uint64Flag{ + Name: FjordOverrideFlagName, + Usage: "Manually specify the Fjord fork timestamp, overriding the bundled setting", + EnvVars: opservice.PrefixEnvVar(envPrefix, "OVERRIDE_FJORD"), + Hidden: false, + Category: category, + }, CLINetworkFlag(envPrefix, category), CLIRollupConfigFlag(envPrefix, category), }