Commit c53d7be8 authored by protolambda's avatar protolambda

op-node: remove beta prefix from rollup.load-protocol-versions and rollup.halt flags

parent 312bccae
...@@ -243,13 +243,13 @@ var ( ...@@ -243,13 +243,13 @@ var (
"Available networks: %s", strings.Join(chaincfg.BetaAvailableNetworks(), ", ")), "Available networks: %s", strings.Join(chaincfg.BetaAvailableNetworks(), ", ")),
EnvVars: prefixEnvVars("BETA_EXTRA_NETWORKS"), EnvVars: prefixEnvVars("BETA_EXTRA_NETWORKS"),
} }
BetaRollupHalt = &cli.StringFlag{ RollupHalt = &cli.StringFlag{
Name: "beta.rollup.halt", Name: "rollup.halt",
Usage: "Beta feature: opt-in option to halt on incompatible protocol version requirements of the given level (major/minor/patch/none), as signaled onchain in L1", Usage: "Beta feature: opt-in option to halt on incompatible protocol version requirements of the given level (major/minor/patch/none), as signaled onchain in L1",
EnvVars: prefixEnvVars("BETA_ROLLUP_HALT"), EnvVars: prefixEnvVars("BETA_ROLLUP_HALT"),
} }
BetaRollupLoadProtocolVersions = &cli.BoolFlag{ RollupLoadProtocolVersions = &cli.BoolFlag{
Name: "beta.rollup.load-protocol-versions", Name: "rollup.load-protocol-versions",
Usage: "Beta feature: load protocol versions from the superchain L1 ProtocolVersions contract (if available), and report in logs and metrics", Usage: "Beta feature: load protocol versions from the superchain L1 ProtocolVersions contract (if available), and report in logs and metrics",
EnvVars: prefixEnvVars("BETA_ROLLUP_LOAD_PROTOCOL_VERSIONS"), EnvVars: prefixEnvVars("BETA_ROLLUP_LOAD_PROTOCOL_VERSIONS"),
} }
...@@ -300,8 +300,8 @@ var optionalFlags = []cli.Flag{ ...@@ -300,8 +300,8 @@ var optionalFlags = []cli.Flag{
L2EngineSyncEnabled, L2EngineSyncEnabled,
SkipSyncStartCheck, SkipSyncStartCheck,
BetaExtraNetworks, BetaExtraNetworks,
BetaRollupHalt, RollupHalt,
BetaRollupLoadProtocolVersions, RollupLoadProtocolVersions,
CanyonOverrideFlag, CanyonOverrideFlag,
} }
......
...@@ -36,7 +36,7 @@ func NewConfig(ctx *cli.Context, log log.Logger) (*node.Config, error) { ...@@ -36,7 +36,7 @@ func NewConfig(ctx *cli.Context, log log.Logger) (*node.Config, error) {
return nil, err return nil, err
} }
if !ctx.Bool(flags.BetaRollupLoadProtocolVersions.Name) { if !ctx.Bool(flags.RollupLoadProtocolVersions.Name) {
log.Info("Not opted in to ProtocolVersions signal loading, disabling ProtocolVersions contract now.") log.Info("Not opted in to ProtocolVersions signal loading, disabling ProtocolVersions contract now.")
rollupConfig.ProtocolVersionsAddress = common.Address{} rollupConfig.ProtocolVersionsAddress = common.Address{}
} }
...@@ -66,7 +66,7 @@ func NewConfig(ctx *cli.Context, log log.Logger) (*node.Config, error) { ...@@ -66,7 +66,7 @@ func NewConfig(ctx *cli.Context, log log.Logger) (*node.Config, error) {
syncConfig := NewSyncConfig(ctx) syncConfig := NewSyncConfig(ctx)
haltOption := ctx.String(flags.BetaRollupHalt.Name) haltOption := ctx.String(flags.RollupHalt.Name)
if haltOption == "none" { if haltOption == "none" {
haltOption = "" haltOption = ""
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment