Commit 5f03195d authored by Joshua Gutow's avatar Joshua Gutow

op-node: Remove RPC flags from the required flag list

These flags are	not actually required to run the op-node. They now default
to 0.0.0.0 for the address & 8545 for the port.
parent ef6fd959
...@@ -44,18 +44,19 @@ var ( ...@@ -44,18 +44,19 @@ var (
Usage: fmt.Sprintf("Predefined network selection. Available networks: %s", strings.Join(chaincfg.AvailableNetworks(), ", ")), Usage: fmt.Sprintf("Predefined network selection. Available networks: %s", strings.Join(chaincfg.AvailableNetworks(), ", ")),
EnvVars: prefixEnvVars("NETWORK"), EnvVars: prefixEnvVars("NETWORK"),
} }
/* Optional Flags */
RPCListenAddr = &cli.StringFlag{ RPCListenAddr = &cli.StringFlag{
Name: "rpc.addr", Name: "rpc.addr",
Usage: "RPC listening address", Usage: "RPC listening address",
EnvVars: prefixEnvVars("RPC_ADDR"), EnvVars: prefixEnvVars("RPC_ADDR"),
Value: "127.0.0.1",
} }
RPCListenPort = &cli.IntFlag{ RPCListenPort = &cli.IntFlag{
Name: "rpc.port", Name: "rpc.port",
Usage: "RPC listening port", Usage: "RPC listening port",
EnvVars: prefixEnvVars("RPC_PORT"), EnvVars: prefixEnvVars("RPC_PORT"),
Value: 9545, // Note: op-service/rpc/cli.go uses 8545 as the default.
} }
/* Optional Flags */
RPCEnableAdmin = &cli.BoolFlag{ RPCEnableAdmin = &cli.BoolFlag{
Name: "rpc.enable-admin", Name: "rpc.enable-admin",
Usage: "Enable the admin API (experimental)", Usage: "Enable the admin API (experimental)",
...@@ -153,7 +154,7 @@ var ( ...@@ -153,7 +154,7 @@ var (
MetricsAddrFlag = &cli.StringFlag{ MetricsAddrFlag = &cli.StringFlag{
Name: "metrics.addr", Name: "metrics.addr",
Usage: "Metrics listening address", Usage: "Metrics listening address",
Value: "0.0.0.0", Value: "0.0.0.0", // TODO(CLI-4159): Switch to 127.0.0.1
EnvVars: prefixEnvVars("METRICS_ADDR"), EnvVars: prefixEnvVars("METRICS_ADDR"),
} }
MetricsPortFlag = &cli.IntFlag{ MetricsPortFlag = &cli.IntFlag{
...@@ -170,7 +171,7 @@ var ( ...@@ -170,7 +171,7 @@ var (
PprofAddrFlag = &cli.StringFlag{ PprofAddrFlag = &cli.StringFlag{
Name: "pprof.addr", Name: "pprof.addr",
Usage: "pprof listening address", Usage: "pprof listening address",
Value: "0.0.0.0", Value: "0.0.0.0", // TODO(CLI-4159): Switch to 127.0.0.1
EnvVars: prefixEnvVars("PPROF_ADDR"), EnvVars: prefixEnvVars("PPROF_ADDR"),
} }
PprofPortFlag = &cli.IntFlag{ PprofPortFlag = &cli.IntFlag{
...@@ -218,11 +219,11 @@ var ( ...@@ -218,11 +219,11 @@ var (
var requiredFlags = []cli.Flag{ var requiredFlags = []cli.Flag{
L1NodeAddr, L1NodeAddr,
L2EngineAddr, L2EngineAddr,
RPCListenAddr,
RPCListenPort,
} }
var optionalFlags = []cli.Flag{ var optionalFlags = []cli.Flag{
RPCListenAddr,
RPCListenPort,
RollupConfig, RollupConfig,
Network, Network,
L1TrustRPC, L1TrustRPC,
......
...@@ -25,7 +25,7 @@ func CLIFlags(envPrefix string) []cli.Flag { ...@@ -25,7 +25,7 @@ func CLIFlags(envPrefix string) []cli.Flag {
&cli.StringFlag{ &cli.StringFlag{
Name: ListenAddrFlagName, Name: ListenAddrFlagName,
Usage: "Metrics listening address", Usage: "Metrics listening address",
Value: "0.0.0.0", Value: "0.0.0.0", // TODO(CLI-4159): Switch to 127.0.0.1
EnvVars: opservice.PrefixEnvVar(envPrefix, "METRICS_ADDR"), EnvVars: opservice.PrefixEnvVar(envPrefix, "METRICS_ADDR"),
}, },
&cli.IntFlag{ &cli.IntFlag{
......
...@@ -24,7 +24,7 @@ func CLIFlags(envPrefix string) []cli.Flag { ...@@ -24,7 +24,7 @@ func CLIFlags(envPrefix string) []cli.Flag {
&cli.StringFlag{ &cli.StringFlag{
Name: ListenAddrFlagName, Name: ListenAddrFlagName,
Usage: "pprof listening address", Usage: "pprof listening address",
Value: "0.0.0.0", Value: "0.0.0.0", // TODO(CLI-4159): Switch to 127.0.0.1
EnvVars: opservice.PrefixEnvVar(envPrefix, "PPROF_ADDR"), EnvVars: opservice.PrefixEnvVar(envPrefix, "PPROF_ADDR"),
}, },
&cli.IntFlag{ &cli.IntFlag{
......
...@@ -18,7 +18,7 @@ func CLIFlags(envPrefix string) []cli.Flag { ...@@ -18,7 +18,7 @@ func CLIFlags(envPrefix string) []cli.Flag {
&cli.StringFlag{ &cli.StringFlag{
Name: ListenAddrFlagName, Name: ListenAddrFlagName,
Usage: "rpc listening address", Usage: "rpc listening address",
Value: "0.0.0.0", Value: "0.0.0.0", // TODO(CLI-4159): Switch to 127.0.0.1
EnvVars: opservice.PrefixEnvVar(envPrefix, "RPC_ADDR"), EnvVars: opservice.PrefixEnvVar(envPrefix, "RPC_ADDR"),
}, },
&cli.IntFlag{ &cli.IntFlag{
......
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