Skip to content

fix(op-acceptance-tests): stabilize TestUnsafeGapFillAfterUnsafeReorg_RestartL2CL #20199

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
wwared merged 2 commits into from
Apr 22, 2026
Merged

fix(op-acceptance-tests): stabilize TestUnsafeGapFillAfterUnsafeReorg_RestartL2CL #20199

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ead613c
fix(op-acceptance-tests): stabilize TestUnsafeGapFillAfterUnsafeReorg…
ajsutton Apr 21, 2026
3d8c640
fix(op-acceptance-tests): widen Matched budget on initial sync in Uns…
ajsutton Apr 21, 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
13 changes: 11 additions & 2 deletions op-acceptance-tests/tests/sync/elsync/reorg/sync_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,18 +151,21 @@ func TestUnsafeGapFillAfterUnsafeReorg_RestartL2CL(gt *testing.T) {
return l2Unsafe.Number > 0 && l2Unsafe.L1Origin.Number > startL1Block.Number
}, 120*time.Second, 2*time.Second)

sys.L2ELB.Matched(sys.L2EL, types.LocalUnsafe, 5)
sys.L2ELB.Matched(sys.L2EL, types.LocalUnsafe, 30)

// Pick reorg block
l2BlockBeforeReorg := sys.L2EL.BlockRefByLabel(eth.Unsafe)
logger.Info("Target L2 Block to reorg", "l2", l2BlockBeforeReorg, "l1_origin", l2BlockBeforeReorg.L1Origin)

// Make few more unsafe blocks which will be reorged out
sys.L2EL.Advanced(eth.Unsafe, 4)
sys.L2ELB.Matched(sys.L2EL, types.LocalUnsafe, 5)
sys.L2ELB.Matched(sys.L2EL, types.LocalUnsafe, 30)

// Stop Verifier CL
sys.L2CLB.Stop()
// Capture verifier's frozen unsafe head to use as a lower bound for what
// the sequencer must exceed after the reorg.
verUnsafeFrozen := sys.L2ELB.BlockRefByLabel(eth.Unsafe)

// Reorg L1 block which unsafe block L1 Origin points to
l1BlockBeforeReorg := sys.L1EL.BlockRefByNumber(l2BlockBeforeReorg.L1Origin.Number)
Expand All @@ -188,6 +191,12 @@ func TestUnsafeGapFillAfterUnsafeReorg_RestartL2CL(gt *testing.T) {
require.NotEqual(l2BlockAfterReorg.Hash, l2BlockBeforeReorg.Hash)
logger.Info("Triggered L2 reorg", "l2", l2BlockAfterReorg)

// Wait for the sequencer to strictly exceed the verifier's frozen height
// before asserting seq > ver — ReorgTriggered only guarantees the block at
// l2BlockBeforeReorg.Number has been rewritten, not that the sequencer has
// rebuilt past the verifier.
sys.L2EL.Reached(eth.Unsafe, verUnsafeFrozen.Number+1, 30)

// Check the divergence before restarting verifier L2CLB
verUnsafe := sys.L2ELB.BlockRefByLabel(eth.Unsafe)
seqUnsafe := sys.L2EL.BlockRefByLabel(eth.Unsafe)
Expand Down
Loading