Merge pull request #8406 from testinprod-io/tip/delta-override

Add Delta override flag

op-node/flags/flags.go

@@ -284,6 +284,12 @@ var (
 		EnvVars: prefixEnvVars("OVERRIDE_CANYON"),
 		Hidden:  false,
 	}
+	DeltaOverrideFlag = &cli.Uint64Flag{
+		Name:    "override.delta",
+		Usage:   "Manually specify the Delta fork timestamp, overriding the bundled setting",
+		EnvVars: prefixEnvVars("OVERRIDE_DELTA"),
+		Hidden:  false,
+	}
 )
 
 var requiredFlags = []cli.Flag{
@@ -332,6 +338,7 @@ var optionalFlags = []cli.Flag{
 	RollupLoadProtocolVersions,
 	CanyonOverrideFlag,
 	L1RethDBPath,
+	DeltaOverrideFlag,
 }
 
 // Flags contains the list of configuration options available to the binary.

op-node/service.go

@@ -203,16 +203,12 @@ Startup will proceed to use the network-parameter and ignore the rollup config.
 Conflicting configuration is deprecated, and will stop the op-node from starting in the future.
 `, "network", network, "rollup_config", rollupConfigPath)
 		}
-		config, err := chaincfg.GetRollupConfig(network)
+		rollupConfig, err := chaincfg.GetRollupConfig(network)
 		if err != nil {
 			return nil, err
 		}
-		if ctx.IsSet(flags.CanyonOverrideFlag.Name) {
-			canyon := ctx.Uint64(flags.CanyonOverrideFlag.Name)
-			config.CanyonTime = &canyon
-		}
-
-		return config, nil
+		applyOverrides(ctx, rollupConfig)
+		return rollupConfig, nil
 	}
 
 	file, err := os.Open(rollupConfigPath)
@@ -225,11 +221,19 @@ Conflicting configuration is deprecated, and will stop the op-node from starting
 	if err := json.NewDecoder(file).Decode(&rollupConfig); err != nil {
 		return nil, fmt.Errorf("failed to decode rollup config: %w", err)
 	}
+	applyOverrides(ctx, &rollupConfig)
+	return &rollupConfig, nil
+}
+
+func applyOverrides(ctx *cli.Context, rollupConfig *rollup.Config) {
 	if ctx.IsSet(flags.CanyonOverrideFlag.Name) {
 		canyon := ctx.Uint64(flags.CanyonOverrideFlag.Name)
 		rollupConfig.CanyonTime = &canyon
 	}
-	return &rollupConfig, nil
+	if ctx.IsSet(flags.DeltaOverrideFlag.Name) {
+		delta := ctx.Uint64(flags.DeltaOverrideFlag.Name)
+		rollupConfig.DeltaTime = &delta
+	}
 }
 
 func NewSnapshotLogger(ctx *cli.Context) (log.Logger, error) {