Skip to content

op-challenger: convert l1 genesis flag to VMFlag #17708

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

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
+124 −68
Open

op-challenger: convert l1 genesis flag to VMFlag #17708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3e93a5e
op-challenger: convert l1 genesis flag to VMFlag
geoknee Oct 2, 2025
f6a1547
loop l1 genesis flag into check on flag compatibility
geoknee Oct 3, 2025
7b578b2
remove requirement to pass L1GenesisPath when CustomFlag is set
geoknee Oct 3, 2025
f8c0919
fix string format
geoknee Oct 3, 2025
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
79 changes: 46 additions & 33 deletions op-challenger/cmd/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ func TestAsteriscBaseRequiredArgs(t *testing.T) {
t.Run(fmt.Sprintf("TestMustNotSpecifyNetworkAndRollup-%v", traceType), func(t *testing.T) {
verifyArgsInvalid(
t,
"flag network can not be used with rollup-config, l2-genesis or asterisc-kona-l2-custom",
"flag network can not be used with rollup-config, l2-genesis, asterisc-kona-l2-custom or l1-genesis",
addRequiredArgs(traceType, "--rollup-config=rollup.json"))
})

Expand Down Expand Up @@ -657,22 +657,26 @@ func TestCannonCustomConfigArgs(t *testing.T) {
t.Run(fmt.Sprintf("TestRequireEitherCannonNetworkOrRollupAndGenesis-%v", traceType), func(t *testing.T) {
verifyArgsInvalid(
t,
"flag network or rollup-config/cannon-rollup-config and l2-genesis/cannon-l2-genesis is required",
"flag network or rollup-config/cannon-rollup-config, l2-genesis/cannon-l2-genesis and l1-genesis/cannon-l1-genesis is required",
addRequiredArgsExcept(traceType, "--network"))
verifyArgsInvalid(
t,
"flag network or rollup-config/cannon-rollup-config and l2-genesis/cannon-l2-genesis is required",
addRequiredArgsExcept(traceType, "--network", "--cannon-rollup-config=rollup.json"))
"flag network or rollup-config/cannon-rollup-config, l2-genesis/cannon-l2-genesis and l1-genesis/cannon-l1-genesis is required",
addRequiredArgsExcept(traceType, "--network", "--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=gensis.json"))
verifyArgsInvalid(
t,
"flag network or rollup-config/cannon-rollup-config, l2-genesis/cannon-l2-genesis and l1-genesis/cannon-l1-genesis is required",
addRequiredArgsExcept(traceType, "--network", "--cannon-l2-genesis=gensis.json", "--cannon-l1-genesis=l1-genesis.json"))
verifyArgsInvalid(
t,
"flag network or rollup-config/cannon-rollup-config and l2-genesis/cannon-l2-genesis is required",
addRequiredArgsExcept(traceType, "--network", "--cannon-l2-genesis=gensis.json"))
"flag network or rollup-config/cannon-rollup-config, l2-genesis/cannon-l2-genesis and l1-genesis/cannon-l1-genesis is required",
addRequiredArgsExcept(traceType, "--network", "--cannon-rollup-config=rollup.json", "--cannon-l1-genesis=l1-genesis.json"))
})

t.Run(fmt.Sprintf("TestMustNotSpecifyNetworkAndRollup-%v", traceType), func(t *testing.T) {
verifyArgsInvalid(
t,
"flag network can not be used with cannon-rollup-config, l2-genesis or cannon-l2-custom",
"flag network can not be used with cannon-rollup-config, l2-genesis, cannon-l2-custom or l1-genesis",
addRequiredArgs(traceType, "--cannon-rollup-config=rollup.json"))
})

Expand All @@ -686,14 +690,14 @@ func TestCannonCustomConfigArgs(t *testing.T) {
args["--cannon-l2-custom"] = "true"
verifyArgsInvalid(
t,
"flag network can not be used with cannon-rollup-config, cannon-l2-genesis or cannon-l2-custom",
"flag network can not be used with cannon-rollup-config, cannon-l2-genesis, cannon-l2-custom or l1-genesis",
toArgList(args))
})

t.Run(fmt.Sprintf("TestNetwork-%v", traceType), func(t *testing.T) {
t.Run("NotRequiredWhenRollupAndGenesIsSpecified", func(t *testing.T) {
configForArgs(t, addRequiredArgsExcept(traceType, "--network",
"--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=genesis.json"))
"--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=genesis.json", "--cannon-l1-genesis=l1-genesis.json"))
})

t.Run("Valid", func(t *testing.T) {
Expand All @@ -706,6 +710,7 @@ func TestCannonCustomConfigArgs(t *testing.T) {
cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--network",
"--cannon-rollup-config=rollup.json",
"--cannon-l2-genesis=genesis.json",
"--cannon-l1-genesis=l1-genesis.json",
"--cannon-l2-custom"))
require.True(t, cfg.Cannon.L2Custom)
})
Expand All @@ -716,7 +721,7 @@ func TestCannonCustomConfigArgs(t *testing.T) {
})

t.Run("Valid", func(t *testing.T) {
cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--network", "--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=genesis.json"))
cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--network", "--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=genesis.json", "--cannon-l1-genesis=l1-genesis.json"))
require.Equal(t, []string{"rollup.json"}, cfg.Cannon.RollupConfigPaths)
})
})
Expand All @@ -727,7 +732,7 @@ func TestCannonCustomConfigArgs(t *testing.T) {
})

t.Run("Valid", func(t *testing.T) {
cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--network", "--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=genesis.json"))
cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--network", "--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=genesis.json", "--cannon-l1-genesis=l1-genesis.json"))
require.Equal(t, []string{"genesis.json"}, cfg.Cannon.L2GenesisPaths)
})
})
Expand All @@ -739,7 +744,7 @@ func TestSuperCannonCustomConfigArgs(t *testing.T) {
traceType := traceType

t.Run(fmt.Sprintf("TestRequireEitherCannonNetworkOrRollupAndGenesisAndDepset-%v", traceType), func(t *testing.T) {
expectedErrorMessage := "flag network or rollup-config/cannon-rollup-config, l2-genesis/cannon-l2-genesis and depset-config/cannon-depset-config is required"
expectedErrorMessage := "flag network or rollup-config/cannon-rollup-config, l2-genesis/cannon-l2-genesis, depset-config/cannon-depset-config and l1-genesis/cannon-l1-genesis is required"
// Missing all
verifyArgsInvalid(
t,
Expand All @@ -749,23 +754,28 @@ func TestSuperCannonCustomConfigArgs(t *testing.T) {
verifyArgsInvalid(
t,
expectedErrorMessage,
addRequiredArgsExcept(traceType, "--network", "--cannon-rollup-config=rollup.json", "--cannon-depset-config=depset.json"))
addRequiredArgsExcept(traceType, "--network", "--cannon-rollup-config=rollup.json", "--cannon-depset-config=depset.json", "--cannon-l1-genesis=l1-genesis.json"))
// Missing rollup-config
verifyArgsInvalid(
t,
expectedErrorMessage,
addRequiredArgsExcept(traceType, "--network", "--cannon-l2-genesis=gensis.json", "--cannon-depset-config=depset.json"))
addRequiredArgsExcept(traceType, "--network", "--cannon-l2-genesis=gensis.json", "--cannon-depset-config=depset.json", "--cannon-l1-genesis=l1-genesis.json"))
// Missing depset-config
verifyArgsInvalid(
t,
expectedErrorMessage,
addRequiredArgsExcept(traceType, "--network", "--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=gensis.json"))
addRequiredArgsExcept(traceType, "--network", "--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=gensis.json", "--cannon-l1-genesis=l1-genesis.json"))
// Missing l1-genesis
verifyArgsInvalid(
t,
expectedErrorMessage,
addRequiredArgsExcept(traceType, "--network", "--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=gensis.json", "--cannon-depset-config=depset.json"))
})

t.Run(fmt.Sprintf("TestMustNotSpecifyNetworkAndRollup-%v", traceType), func(t *testing.T) {
verifyArgsInvalid(
t,
"flag network can not be used with cannon-rollup-config, l2-genesis or cannon-l2-custom",
"flag network can not be used with cannon-rollup-config, l2-genesis, cannon-l2-custom or l1-genesis",
addRequiredArgs(traceType, "--cannon-rollup-config=rollup.json"))
})

Expand All @@ -779,14 +789,14 @@ func TestSuperCannonCustomConfigArgs(t *testing.T) {
args["--cannon-l2-custom"] = "true"
verifyArgsInvalid(
t,
"flag network can not be used with cannon-rollup-config, cannon-l2-genesis or cannon-l2-custom",
"failed to setup: flag network can not be used with cannon-rollup-config, cannon-l2-genesis, cannon-l2-custom or l1-genesis",
toArgList(args))
})

t.Run(fmt.Sprintf("TestNetwork-%v", traceType), func(t *testing.T) {
t.Run("NotRequiredWhenRollupGenesisAndDepsetIsSpecified", func(t *testing.T) {
configForArgs(t, addRequiredArgsExcept(traceType, "--network",
"--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=genesis.json", "--cannon-depset-config=depset.json"))
"--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=genesis.json", "--cannon-depset-config=depset.json", "--cannon-l1-genesis=l1-genesis.json"))
})

t.Run("Valid", func(t *testing.T) {
Expand All @@ -800,7 +810,8 @@ func TestSuperCannonCustomConfigArgs(t *testing.T) {
"--cannon-rollup-config=rollup.json",
"--cannon-l2-genesis=genesis.json",
"--cannon-depset-config=depset.json",
"--cannon-l2-custom"))
"--cannon-l2-custom",
"--cannon-l1-genesis=l1-genesis.json"))
require.True(t, cfg.Cannon.L2Custom)
})

Expand All @@ -811,7 +822,7 @@ func TestSuperCannonCustomConfigArgs(t *testing.T) {

t.Run("Valid", func(t *testing.T) {
cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--network",
"--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=genesis.json", "--cannon-depset-config=depset.json"))
"--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=genesis.json", "--cannon-depset-config=depset.json", "--cannon-l1-genesis=l1-genesis.json"))
require.Equal(t, []string{"rollup.json"}, cfg.Cannon.RollupConfigPaths)
})
})
Expand All @@ -822,7 +833,7 @@ func TestSuperCannonCustomConfigArgs(t *testing.T) {
})

t.Run("Valid", func(t *testing.T) {
cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--network", "--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=genesis.json", "--cannon-depset-config=depset.json"))
cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--network", "--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=genesis.json", "--cannon-depset-config=depset.json", "--cannon-l1-genesis=l1-genesis.json"))
require.Equal(t, []string{"genesis.json"}, cfg.Cannon.L2GenesisPaths)
})
})
Expand All @@ -833,7 +844,7 @@ func TestSuperCannonCustomConfigArgs(t *testing.T) {
})

t.Run("Valid", func(t *testing.T) {
cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--network", "--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=genesis.json", "--cannon-depset-config=depset.json"))
cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--network", "--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=genesis.json", "--cannon-depset-config=depset.json", "--cannon-l1-genesis=l1-genesis.json"))
require.Equal(t, "depset.json", cfg.Cannon.DepsetConfigPath)
})
})
Expand All @@ -845,7 +856,7 @@ func TestSuperAsteriscKonaCustomConfigArgs(t *testing.T) {
traceType := traceType

t.Run(fmt.Sprintf("TestRequireEitherAsteriscKonaNetworkOrRollupAndGenesisAndDepset-%v", traceType), func(t *testing.T) {
expectedErrorMessage := "flag network or rollup-config/asterisc-kona-rollup-config, l2-genesis/asterisc-kona-l2-genesis and depset-config/asterisc-kona-depset-config is required"
expectedErrorMessage := "flag network or rollup-config/asterisc-kona-rollup-config, l2-genesis/asterisc-kona-l2-genesis, depset-config/asterisc-kona-depset-config and l1-genesis/asterisc-kona-l1-genesis is required"
// Missing all
verifyArgsInvalid(
t,
Expand All @@ -871,7 +882,7 @@ func TestSuperAsteriscKonaCustomConfigArgs(t *testing.T) {
t.Run(fmt.Sprintf("TestMustNotSpecifyNetworkAndRollup-%v", traceType), func(t *testing.T) {
verifyArgsInvalid(
t,
"flag network can not be used with asterisc-kona-rollup-config, l2-genesis or asterisc-kona-l2-custom",
"flag network can not be used with asterisc-kona-rollup-config, l2-genesis, asterisc-kona-l2-custom or l1-genesis",
addRequiredArgs(traceType, "--asterisc-kona-rollup-config=rollup.json"))
})

Expand All @@ -883,16 +894,17 @@ func TestSuperAsteriscKonaCustomConfigArgs(t *testing.T) {
args["--asterisc-kona-rollup-config"] = "rollup.json"
args["--asterisc-kona-l2-genesis"] = "gensis.json"
args["--asterisc-kona-l2-custom"] = "true"
args["--asterisc-kona-l1-genesis"] = "l1-genesis.json"
verifyArgsInvalid(
t,
"flag network can not be used with asterisc-kona-rollup-config, asterisc-kona-l2-genesis or asterisc-kona-l2-custom",
"flag network can not be used with asterisc-kona-rollup-config, asterisc-kona-l2-genesis, asterisc-kona-l2-custom or asterisc-kona-l1-genesis",
toArgList(args))
})

t.Run(fmt.Sprintf("TestNetwork-%v", traceType), func(t *testing.T) {
t.Run("NotRequiredWhenRollupGenesisAndDepsetIsSpecified", func(t *testing.T) {
configForArgs(t, addRequiredArgsExcept(traceType, "--network",
"--asterisc-kona-rollup-config=rollup.json", "--asterisc-kona-l2-genesis=genesis.json", "--asterisc-kona-depset-config=depset.json"))
"--asterisc-kona-rollup-config=rollup.json", "--asterisc-kona-l2-genesis=genesis.json", "--asterisc-kona-depset-config=depset.json", "--asterisc-kona-l1-genesis=l1-genesis.json"))
})

t.Run("Valid", func(t *testing.T) {
Expand All @@ -906,7 +918,8 @@ func TestSuperAsteriscKonaCustomConfigArgs(t *testing.T) {
"--asterisc-kona-rollup-config=rollup.json",
"--asterisc-kona-l2-genesis=genesis.json",
"--asterisc-kona-depset-config=depset.json",
"--asterisc-kona-l2-custom"))
"--asterisc-kona-l2-custom",
"--asterisc-kona-l1-genesis=l1-genesis.json"))
require.True(t, cfg.AsteriscKona.L2Custom)
})

Expand All @@ -917,7 +930,7 @@ func TestSuperAsteriscKonaCustomConfigArgs(t *testing.T) {

t.Run("Valid", func(t *testing.T) {
cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--network",
"--asterisc-kona-rollup-config=rollup.json", "--asterisc-kona-l2-genesis=genesis.json", "--asterisc-kona-depset-config=depset.json"))
"--asterisc-kona-rollup-config=rollup.json", "--asterisc-kona-l2-genesis=genesis.json", "--asterisc-kona-depset-config=depset.json", "--asterisc-kona-l1-genesis=l1-genesis.json"))
require.Equal(t, []string{"rollup.json"}, cfg.AsteriscKona.RollupConfigPaths)
})
})
Expand All @@ -928,7 +941,7 @@ func TestSuperAsteriscKonaCustomConfigArgs(t *testing.T) {
})

t.Run("Valid", func(t *testing.T) {
cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--network", "--asterisc-kona-rollup-config=rollup.json", "--asterisc-kona-l2-genesis=genesis.json", "--asterisc-kona-depset-config=depset.json"))
cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--network", "--asterisc-kona-rollup-config=rollup.json", "--asterisc-kona-l2-genesis=genesis.json", "--asterisc-kona-depset-config=depset.json", "--asterisc-kona-l1-genesis=l1-genesis.json"))
require.Equal(t, []string{"genesis.json"}, cfg.AsteriscKona.L2GenesisPaths)
})
})
Expand All @@ -939,7 +952,7 @@ func TestSuperAsteriscKonaCustomConfigArgs(t *testing.T) {
})

t.Run("Valid", func(t *testing.T) {
cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--network", "--asterisc-kona-rollup-config=rollup.json", "--asterisc-kona-l2-genesis=genesis.json", "--asterisc-kona-depset-config=depset.json"))
cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--network", "--asterisc-kona-rollup-config=rollup.json", "--asterisc-kona-l2-genesis=genesis.json", "--asterisc-kona-depset-config=depset.json", "--asterisc-kona-l1-genesis=l1-genesis.json"))
require.Equal(t, "depset.json", cfg.AsteriscKona.DepsetConfigPath)
})
})
Expand Down Expand Up @@ -1090,18 +1103,18 @@ func TestDepsetConfig(t *testing.T) {
if traceType == types.TraceTypeSuperCannon || traceType == types.TraceTypeSuperPermissioned {
t.Run("Required-"+traceType.String(), func(t *testing.T) {
verifyArgsInvalid(t,
"flag network or rollup-config/cannon-rollup-config, l2-genesis/cannon-l2-genesis and depset-config/cannon-depset-config is required",
"failed to setup: flag network or rollup-config/cannon-rollup-config, l2-genesis/cannon-l2-genesis, depset-config/cannon-depset-config and l1-genesis/cannon-l1-genesis is required",
addRequiredArgsExcept(traceType, "--network", "--rollup-config=rollup.json", "--l2-genesis=genesis.json"))
})
} else if traceType == types.TraceTypeSuperAsteriscKona {
t.Run("Required-"+traceType.String(), func(t *testing.T) {
verifyArgsInvalid(t,
"flag network or rollup-config/asterisc-kona-rollup-config, l2-genesis/asterisc-kona-l2-genesis and depset-config/asterisc-kona-depset-config is required",
"failed to setup: flag network or rollup-config/asterisc-kona-rollup-config, l2-genesis/asterisc-kona-l2-genesis, depset-config/asterisc-kona-depset-config and l1-genesis/asterisc-kona-l1-genesis is required",
addRequiredArgsExcept(traceType, "--network", "--rollup-config=rollup.json", "--l2-genesis=genesis.json"))
})
} else {
t.Run("NotRequired-"+traceType.String(), func(t *testing.T) {
cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--network", "--rollup-config=rollup.json", "--l2-genesis=genesis.json"))
cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--network", "--rollup-config=rollup.json", "--l2-genesis=genesis.json", "--l1-genesis=l1-genesis.json"))
require.Equal(t, "", cfg.Cannon.DepsetConfigPath)
})
}
Expand Down
Loading