Skip to content

op-supernode: fix env var prefix wrangling #18720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
axelKingsley merged 3 commits into from
Jan 7, 2026
Merged

op-supernode: fix env var prefix wrangling #18720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c063b94
Upgrade env var prefixes for supernode flags
geoknee Jan 6, 2026
1a32cb9
tidy
geoknee Jan 6, 2026
0ae2cf4
Panic on unprefixed env vars
geoknee Jan 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions op-supernode/flags/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,12 @@ func FullDynamicFlags(chains []uint64) []cli.Flag {
for _, f := range opnodeflags.Flags {
baseName := f.Names()[0]
// vn.all.* env var/alias prefixing
allEnvs := prefixEnvVar(f, "VN_ALL_")
allEnvs := upgradeEnvVarPrefixes(f, opnodeflags.EnvVarPrefix, "VN_ALL")
allAliases := prefixAliases(f, VNFlagGlobalPrefix)
final = append(final, renameFlagWithEnv(f, VNFlagGlobalPrefix+baseName, allEnvs, allAliases))
// per-chain
for _, id := range chains {
perChainEnvs := prefixEnvVar(f, fmt.Sprintf("VN_%d_", id))
perChainEnvs := upgradeEnvVarPrefixes(f, opnodeflags.EnvVarPrefix, fmt.Sprintf("VN_%d", id))
perAliases := prefixAliases(f, fmt.Sprintf("%s%d.", VNFlagNamePrefix, id))
final = append(final, renameFlagWithEnv(f, fmt.Sprintf("%s%d.%s", VNFlagNamePrefix, id, baseName), perChainEnvs, perAliases))
}
Expand Down
18 changes: 10 additions & 8 deletions op-supernode/flags/virtual_flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,21 +137,23 @@ func renameFlagWithEnv(f cli.Flag, name string, envs []string, aliases []string)
}
}

// prefixEnvVar prefixes the env vars of the given flag with the given middle string
// e.g. "VN_ALL_" or "VN_123_".
func prefixEnvVar(f cli.Flag, mid string) []string {
// upgradeEnvVarPrefixes returns a slice of the env vars of the given flag
// each with a modified prefix, formed by the OP_SUPERNODE prefix
// followed by given infix such as "VN_ALL"
// e.g. "OP_NODE_FINALITY_DELAY" becomes "OP_SUPERNODE_VN_ALL_FINALITY_DELAY"
// or "OP_SUPERNODE_VN_123_FINALITY_DELAY".
func upgradeEnvVarPrefixes(f cli.Flag, existingPrefix, newInfix string) []string {
envs := f.(interface{ GetEnvVars() []string }).GetEnvVars()
if len(envs) == 0 {
return nil
}
out := make([]string, 0, len(envs))
for _, e := range envs {
idx := strings.Index(e, "_")
if idx < 0 {
continue
suffix := strings.TrimPrefix(e, existingPrefix+"_")
if suffix == e {
panic("encountered unprefixed flag")
}
Comment thread
axelKingsley marked this conversation as resolved.
suffix := e[idx+1:]
out = append(out, EnvVarPrefix+"_"+mid+suffix)
out = append(out, EnvVarPrefix+"_"+newInfix+"_"+suffix)
}
return out
}
Expand Down
14 changes: 14 additions & 0 deletions op-supernode/flags/virtual_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"reflect"
"testing"

"github.com/stretchr/testify/require"
"github.com/urfave/cli/v2"

opnodeflags "github.com/ethereum-optimism/optimism/op-node/flags"
Expand Down Expand Up @@ -84,6 +85,19 @@ func TestParseChainsVariants(t *testing.T) {
}
}

func TestUpgradeEnvVarPrefixes(t *testing.T) {
flag := &cli.StringFlag{Name: "flag", EnvVars: []string{"OP_NODE_FINALITY_DELAY"}}
got := upgradeEnvVarPrefixes(flag, "OP_NODE", "VN_987")
expected := []string{"OP_SUPERNODE_VN_987_FINALITY_DELAY"}
require.Equal(t, expected, got)
got = upgradeEnvVarPrefixes(flag, "OP_NODE", "VN_ALL")
expected = []string{"OP_SUPERNODE_VN_ALL_FINALITY_DELAY"}
require.Equal(t, expected, got)

badFlag := &cli.StringFlag{Name: "flag", EnvVars: []string{"BAD_FLAG_FINALITY_DELAY"}}
require.Panics(t, func() { upgradeEnvVarPrefixes(badFlag, "OP_NODE", "VN_987") })
}

func TestFullDynamicFlags_ClonesAllFlagsForChainsAndGlobal(t *testing.T) {
chains := []uint64{100, 200}
flagsOut := FullDynamicFlags(chains)
Expand Down