fix: prevent race in e2e_offchain_payment reorg test#22386
Draft
AztecBot wants to merge 1 commit intomerge-train/barretenbergfrom
Draft
fix: prevent race in e2e_offchain_payment reorg test#22386AztecBot wants to merge 1 commit intomerge-train/barretenbergfrom
AztecBot wants to merge 1 commit intomerge-train/barretenbergfrom
Conversation
Disable L1 automine before triggering the reorg so that Anvil does not immediately re-mine the reverted checkpoint. Without this, the archiver can re-sync the same block before the test checks rollback balances, causing sync_state to re-deliver offchain capsule messages and re-add notes that were properly deleted by the PXE rollback.
AztecBot
added
ci-draft
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
1 participant
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
Fixes a consistent test failure in
e2e_offchain_payment.test.ts("reprocesses an offchain-delivered payment after an L1 reorg") that was blocking themerge-train/barretenbergCI.Root cause: After
forceReorgtriggers an L1 reorg viacheatCodes.eth.reorg(1), Anvil immediately auto-mines the reverted transaction back into a new L1 block. TherollbackTocall resumes the archiver in itsfinallyblock, so the archiver can re-sync the re-mined checkpoint before the test checks rollback balances. When this happens,sync_statere-delivers offchain capsule messages (which persist across reorgs by design) and re-adds notes that were properly deleted by the PXE rollback, causing Alice's balance to be 60n instead of the expected 100n.Fix: Disable L1 automine before triggering the reorg, then re-enable it after verifying rollback balances. This prevents the race without changing any production code.
Test plan
e2e_offchain_payment.test.tspasses consistently (3/3 targeted runs + 1 full suite run)ClaudeBox log: https://claudebox.work/s/637a1c6a0c33aa91?run=1