fix: set anvilSlotsInAnEpoch in e2e_offchain_payment to prevent finalization race#21452
Merged
nventuro merged 1 commit intomerge-train/fairiesfrom Mar 12, 2026
Merged
Conversation
…ization race The e2e_offchain_payment test simulates L1 reorgs but uses the default anvilSlotsInAnEpoch of 1, causing finalization to race ahead of the rollback target (finalized = latest - 2). This sets it to 32 (matching mainnet) like epochs_l1_reorgs does, so rollbacks have room.
nventuro
approved these changes
Mar 12, 2026
github-merge-queue bot
pushed a commit
that referenced
this pull request
Mar 13, 2026
BEGIN_COMMIT_OVERRIDE fix: skip oracle version check for pinned protocol contracts (#21349) fix: not reusing tags of partially reverted txs (#20817) feat: move storage_slot from partial commitment to completion hash (#21351) feat: offchain reception (#20893) fix: handle workspace members in needsRecompile crate collection (#21284) fix(aztec-nr): return Option from decode functions and fix event commitment capacity (#21264) fix: handle bad note lengths on compute_note_hash_and_nullifier (#21271) fix: address review feedback from PRs #21284 and #21237 (#21369) fix: claim contract & improve nullif docs (#21234) feat!: auto-enqueue public init nullifier for contracts with public functions (#20775) fix: search for all note nonces instead of just the one for the note index (#21438) fix: set anvilSlotsInAnEpoch in e2e_offchain_payment to prevent finalization race (#21452) fix: complete legacy oracle mappings for all pinned contracts (#21404) fix: correct inverted constrained encryption check in message delivery (#21399) feat!: improve L2ToL1MessageWitness API (#21231) END_COMMIT_OVERRIDE
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
anvilSlotsInAnEpoch: 32ine2e_offchain_paymenttest setup, matching whatepochs_l1_reorgsalready does.Problem
PR #21156 added
--slots-in-an-epoch 1as the default for anvil, makingfinalized = latest - 2. PR #20893 addede2e_offchain_paymentwhich simulates L1 reorgs. When both landed onmerge-train/fairies, the reorg test fails deterministically because finalization races past the rollback target block.Fix
Use
anvilSlotsInAnEpoch: 32(matching Ethereum mainnet) so the finalized block stays far enough behind latest to allow rollbacks in the test.ClaudeBox log: https://claudebox.work/s/c5ac5d52da86e23a?run=4