From d786c41d9f2693bacb38d67e2b016c6ecdb8810c Mon Sep 17 00:00:00 2001 From: Josh Klopfenstein Date: Mon, 2 Nov 2026 19:52:14 -0800 Subject: [PATCH 1/4] op-devstack,op-acceptance-tests: run CL-pinned tests once instead of skipping them on kona-node The confirmations and safedb_parity tests pin the CL kind of every node, so they have no kona-node gap. They now run only in the kona-node variant, through RunOnceOnCL, and no longer show up as SkipOnKonaNode skips. Co-Authored-By: Claude Opus 5.5 --- docs/ai/acceptance-tests.md | 4 +++- .../tests/derivation/confirmations/confirmations_test.go | 2 +- op-acceptance-tests/tests/safedb_parity/init_test.go | 3 +-- op-devstack/sysgo/mixed_runtime.go | 9 +++++++++ 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/docs/ai/acceptance-tests.md b/docs/ai/acceptance-tests.md index fa9688f131c..7945b49af04 100644 --- a/docs/ai/acceptance-tests.md +++ b/docs/ai/acceptance-tests.md @@ -53,7 +53,9 @@ CI runs two variants of the `op-acceptance-tests` job: `memory-all-opn-op-reth-< (op-node + op-reth) and `memory-all-kona-op-reth-` (kona-node + op-reth). A test that cannot run under a given client skips itself in code rather than being left out of -a list — `sysgo.SkipOnKonaNode`, `sysgo.SkipOnOpReth` and `sysgo.SkipOnOpGeth`. +a list — `sysgo.SkipOnKonaNode`, `sysgo.SkipOnOpReth` and `sysgo.SkipOnOpGeth`. A test that +pins the CL kind of every node itself calls `sysgo.RunOnceOnCL` instead, so it runs in one CL +variant only. ### Kona Prestate diff --git a/op-acceptance-tests/tests/derivation/confirmations/confirmations_test.go b/op-acceptance-tests/tests/derivation/confirmations/confirmations_test.go index 0e1b6f34206..614343ae473 100644 --- a/op-acceptance-tests/tests/derivation/confirmations/confirmations_test.go +++ b/op-acceptance-tests/tests/derivation/confirmations/confirmations_test.go @@ -28,7 +28,7 @@ type capturedTest struct { func (t capturedTest) Logger() log.Logger { return t.logger } func TestVerifierConfirmationsProtectDerivationFromShallowL1Reorg(gt *testing.T) { - sysgo.SkipOnKonaNode(devtest.SerialT(gt), "pins op-node and kona-node explicitly; covered by the op-node variant") + sysgo.RunOnceOnCL(devtest.SerialT(gt)) for _, confirmations := range []uint64{0, 4} { gt.Run(fmt.Sprintf("confirmations_%d", confirmations), func(gt *testing.T) { testShallowL1Reorg(gt, confirmations) diff --git a/op-acceptance-tests/tests/safedb_parity/init_test.go b/op-acceptance-tests/tests/safedb_parity/init_test.go index 8482e5eec12..b1609907071 100644 --- a/op-acceptance-tests/tests/safedb_parity/init_test.go +++ b/op-acceptance-tests/tests/safedb_parity/init_test.go @@ -38,8 +38,7 @@ func newParitySystemWithSafeDB(t devtest.T, enabled bool) *paritySystem { } func newParitySystemWithExecutionClient(t devtest.T, enabled bool, executionClient sysgo.MixedL2ELKind) *paritySystem { - // Every node's CL kind is pinned, so the kona-node CI variant would only repeat this run. - sysgo.SkipOnKonaNode(t, "pins op-node and kona-node explicitly; covered by the op-node variant") + sysgo.RunOnceOnCL(t) var deployerOptions []sysgo.DeployerOption if executionClient == sysgo.MixedL2ELOpGeth { // op-geth cannot build or import Karst blocks, so its chain stays on Jovian. diff --git a/op-devstack/sysgo/mixed_runtime.go b/op-devstack/sysgo/mixed_runtime.go index bdb6e8b0df6..354597f7780 100644 --- a/op-devstack/sysgo/mixed_runtime.go +++ b/op-devstack/sysgo/mixed_runtime.go @@ -70,6 +70,15 @@ func SkipOnOpReth(t devtest.T, reason string) { } } +// RunOnceOnCL is for tests that pin the CL kind of every node themselves, so the +// DEVSTACK_L2CL_KIND matrix would only repeat the same run. It runs the test only in the +// kona-node variant, or when DEVSTACK_L2CL_KIND is unset so local runs still execute it. +func RunOnceOnCL(t devtest.T) { + if kind := devstackL2CLKind(); kind != "" && kind != MixedL2CLKona { + t.Skipf("test pins its own CL kinds; runs only in the %s variant, not %s", MixedL2CLKona, kind) + } +} + // SkipOnKonaNode skips the test when the L2 consensus layer is kona-node func SkipOnKonaNode(t devtest.T, reason string) { if devstackL2CLKind() == MixedL2CLKona { From de7eb78e5cf207f2849f84e2ac8e66eba3573440 Mon Sep 17 00:00:00 2001 From: Josh Klopfenstein Date: Mon, 2 Nov 2026 19:52:14 -0800 Subject: [PATCH 2/4] op-acceptance-tests: run non-interop ZK tests against kona-node kona-node serves the pre-interop superroot_atTimestamp RPC, so the non-interop ZK proposer and challenger tests no longer need to skip it. Co-Authored-By: Claude Opus 5.5 --- op-acceptance-tests/tests/proofs/zk/non_interop_test.go | 3 +-- op-devstack/dsl/super_root_source.go | 6 +++--- op-devstack/sysgo/singlechain_runtime.go | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/op-acceptance-tests/tests/proofs/zk/non_interop_test.go b/op-acceptance-tests/tests/proofs/zk/non_interop_test.go index 3bcbcf23e51..0619230288c 100644 --- a/op-acceptance-tests/tests/proofs/zk/non_interop_test.go +++ b/op-acceptance-tests/tests/proofs/zk/non_interop_test.go @@ -16,7 +16,6 @@ import ( ) func newNonInteropZKSystem(t devtest.T) (*presets.Minimal, *proofs.DisputeGameFactory) { - sysgo.SkipOnKonaNode(t, "requires op-node's single-chain superroot_atTimestamp RPC") sys := presets.NewMinimal(t, presets.WithDeployerOptions( sysgo.WithJovianAtGenesis, @@ -29,7 +28,7 @@ func newNonInteropZKSystem(t devtest.T) (*presets.Minimal, *proofs.DisputeGameFa t.Require().Len(sys.L2Networks(), 1) t.Require().Nil(sys.L2Chain.Escape().RollupConfig().LagoonTime, "interop must remain disabled") - // Minimal runs no supernode; the proposer and challenger source super roots from op-node. + // Minimal runs no supernode; the proposer and challenger source super roots from the rollup node. factory := proofs.NewDisputeGameFactory(t, sys.L1Network, sys.L1EL.EthClient(), sys.L2Chain.DisputeGameFactoryProxyAddr(), sys.L2CL, sys.L2EL, dsl.NewOpNodeSuperRoots(sys.L2CL), nil, nil) return sys, factory diff --git a/op-devstack/dsl/super_root_source.go b/op-devstack/dsl/super_root_source.go index da2c79ca37e..f6528700f23 100644 --- a/op-devstack/dsl/super_root_source.go +++ b/op-devstack/dsl/super_root_source.go @@ -46,9 +46,9 @@ type SuperRootQuerier struct { userRPC string } -// NewOpNodeSuperRoots wraps a single op-node's superroot_atTimestamp endpoint as a -// super-root source. Only superroot_atTimestamp is served by op-node; SyncStatus -// (supernode_syncStatus) is not available on this source. +// NewOpNodeSuperRoots wraps a single rollup node's (op-node or kona-node) +// superroot_atTimestamp endpoint as a super-root source. Only superroot_atTimestamp is +// served by a rollup node; SyncStatus (supernode_syncStatus) is not available on this source. func NewOpNodeSuperRoots(cl *L2CLNode) *SuperRootQuerier { return &SuperRootQuerier{ commonImpl: commonFromT(cl.t), diff --git a/op-devstack/sysgo/singlechain_runtime.go b/op-devstack/sysgo/singlechain_runtime.go index 7d443958482..3c02e207e07 100644 --- a/op-devstack/sysgo/singlechain_runtime.go +++ b/op-devstack/sysgo/singlechain_runtime.go @@ -464,7 +464,7 @@ func startMinimalChallenger( var zkChallengerSuperRootRPCProxy *StallableProxy switch { case zkEnabled: - // The ZK game validates super roots from the op-node's superroot_atTimestamp endpoint; + // The ZK game validates super roots from the rollup node's superroot_atTimestamp endpoint; // it needs no VM config or dependency set. zkChallengerSuperRootRPCProxy = StartStallableProxy(t, "zk-challenger-super-root", l2CL.UserRPC()) options = append(options, From 0390a4afd832727c5d9e9ab4caf66b0348eac1e7 Mon Sep 17 00:00:00 2001 From: Josh Klopfenstein Date: Mon, 2 Nov 2026 20:32:32 -0800 Subject: [PATCH 3/4] op-acceptance-tests: run TestNotTruncateDatabaseOnRestartWithExistingDatabase against kona-node kona-node's SafeDB persists safe-head history across a CL restart, so the test no longer needs to skip it. Co-Authored-By: Claude Opus 5.5 --- .../tests/safeheaddb_elsync/safeheaddb_test.go | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/op-acceptance-tests/tests/safeheaddb_elsync/safeheaddb_test.go b/op-acceptance-tests/tests/safeheaddb_elsync/safeheaddb_test.go index 9aa4a2114d2..c7929eee690 100644 --- a/op-acceptance-tests/tests/safeheaddb_elsync/safeheaddb_test.go +++ b/op-acceptance-tests/tests/safeheaddb_elsync/safeheaddb_test.go @@ -74,16 +74,6 @@ func TestTruncateDatabaseOnELResync(gt *testing.T) { func TestNotTruncateDatabaseOnRestartWithExistingDatabase(gt *testing.T) { t := devtest.ParallelT(gt) - // Example error with kona-node: - // - // assertions.go:387: ERROR[03-31|10:35:59.154] - // assertions.go:387: Error Trace: /Users/josh/repos/optimism/op-devstack/dsl/safedb.go:22 - // assertions.go:387: /Users/josh/repos/optimism/op-devstack/dsl/l2_cl.go:432 - // assertions.go:387: /Users/josh/repos/optimism/op-acceptance-tests/tests/safeheaddb_elsync/safeheaddb_test.go:74 - // assertions.go:387: Error: Expected value not to be nil. - // assertions.go:387: Test: TestNotTruncateDatabaseOnRestartWithExistingDatabase - // assertions.go:387: Messages: no safe head data available at L1 block 4 - sysgo.SkipOnKonaNode(t, "not supported") sys := newSingleChainMultiNodeELSync(t) dsl.CheckAll(t, From 5180646716c9364f7d8234ae86c6ae43fd15ef46 Mon Sep 17 00:00:00 2001 From: Josh Klopfenstein Date: Tue, 3 Nov 2026 07:31:25 -0800 Subject: [PATCH 4/4] op-devstack,op-acceptance-tests: run CL-pinned tests in both CL variants Drop RunOnceOnCL per review: running the seven CL-pinned tests in both the op-node and kona-node jobs is redundant but less brittle than gating them on DEVSTACK_L2CL_KIND. Document that in the AI acceptance test notes, and trim the NewOpNodeSuperRoots doc comment. Co-Authored-By: Claude Opus 5.5 --- docs/ai/acceptance-tests.md | 6 +++--- .../tests/derivation/confirmations/confirmations_test.go | 1 - op-acceptance-tests/tests/safedb_parity/init_test.go | 1 - op-devstack/dsl/super_root_source.go | 3 +-- op-devstack/sysgo/mixed_runtime.go | 9 --------- 5 files changed, 4 insertions(+), 16 deletions(-) diff --git a/docs/ai/acceptance-tests.md b/docs/ai/acceptance-tests.md index 7945b49af04..135c135f0d0 100644 --- a/docs/ai/acceptance-tests.md +++ b/docs/ai/acceptance-tests.md @@ -53,9 +53,9 @@ CI runs two variants of the `op-acceptance-tests` job: `memory-all-opn-op-reth-< (op-node + op-reth) and `memory-all-kona-op-reth-` (kona-node + op-reth). A test that cannot run under a given client skips itself in code rather than being left out of -a list — `sysgo.SkipOnKonaNode`, `sysgo.SkipOnOpReth` and `sysgo.SkipOnOpGeth`. A test that -pins the CL kind of every node itself calls `sysgo.RunOnceOnCL` instead, so it runs in one CL -variant only. +a list — `sysgo.SkipOnKonaNode`, `sysgo.SkipOnOpReth` and `sysgo.SkipOnOpGeth`. Skip only for +a real client gap. A test that pins the CL kind of every node itself runs the same way in both +CL variants; let it run twice rather than skipping one variant to save CI time. ### Kona Prestate diff --git a/op-acceptance-tests/tests/derivation/confirmations/confirmations_test.go b/op-acceptance-tests/tests/derivation/confirmations/confirmations_test.go index 614343ae473..93a83edb202 100644 --- a/op-acceptance-tests/tests/derivation/confirmations/confirmations_test.go +++ b/op-acceptance-tests/tests/derivation/confirmations/confirmations_test.go @@ -28,7 +28,6 @@ type capturedTest struct { func (t capturedTest) Logger() log.Logger { return t.logger } func TestVerifierConfirmationsProtectDerivationFromShallowL1Reorg(gt *testing.T) { - sysgo.RunOnceOnCL(devtest.SerialT(gt)) for _, confirmations := range []uint64{0, 4} { gt.Run(fmt.Sprintf("confirmations_%d", confirmations), func(gt *testing.T) { testShallowL1Reorg(gt, confirmations) diff --git a/op-acceptance-tests/tests/safedb_parity/init_test.go b/op-acceptance-tests/tests/safedb_parity/init_test.go index b1609907071..8abba6b772c 100644 --- a/op-acceptance-tests/tests/safedb_parity/init_test.go +++ b/op-acceptance-tests/tests/safedb_parity/init_test.go @@ -38,7 +38,6 @@ func newParitySystemWithSafeDB(t devtest.T, enabled bool) *paritySystem { } func newParitySystemWithExecutionClient(t devtest.T, enabled bool, executionClient sysgo.MixedL2ELKind) *paritySystem { - sysgo.RunOnceOnCL(t) var deployerOptions []sysgo.DeployerOption if executionClient == sysgo.MixedL2ELOpGeth { // op-geth cannot build or import Karst blocks, so its chain stays on Jovian. diff --git a/op-devstack/dsl/super_root_source.go b/op-devstack/dsl/super_root_source.go index f6528700f23..a00936848a0 100644 --- a/op-devstack/dsl/super_root_source.go +++ b/op-devstack/dsl/super_root_source.go @@ -47,8 +47,7 @@ type SuperRootQuerier struct { } // NewOpNodeSuperRoots wraps a single rollup node's (op-node or kona-node) -// superroot_atTimestamp endpoint as a super-root source. Only superroot_atTimestamp is -// served by a rollup node; SyncStatus (supernode_syncStatus) is not available on this source. +// superroot_atTimestamp endpoint as a super-root source. func NewOpNodeSuperRoots(cl *L2CLNode) *SuperRootQuerier { return &SuperRootQuerier{ commonImpl: commonFromT(cl.t), diff --git a/op-devstack/sysgo/mixed_runtime.go b/op-devstack/sysgo/mixed_runtime.go index 354597f7780..bdb6e8b0df6 100644 --- a/op-devstack/sysgo/mixed_runtime.go +++ b/op-devstack/sysgo/mixed_runtime.go @@ -70,15 +70,6 @@ func SkipOnOpReth(t devtest.T, reason string) { } } -// RunOnceOnCL is for tests that pin the CL kind of every node themselves, so the -// DEVSTACK_L2CL_KIND matrix would only repeat the same run. It runs the test only in the -// kona-node variant, or when DEVSTACK_L2CL_KIND is unset so local runs still execute it. -func RunOnceOnCL(t devtest.T) { - if kind := devstackL2CLKind(); kind != "" && kind != MixedL2CLKona { - t.Skipf("test pins its own CL kinds; runs only in the %s variant, not %s", MixedL2CLKona, kind) - } -} - // SkipOnKonaNode skips the test when the L2 consensus layer is kona-node func SkipOnKonaNode(t devtest.T, reason string) { if devstackL2CLKind() == MixedL2CLKona {