fix(pxe): serialize block stream event handling to prevent race conditions#22635
Merged
nchamo merged 1 commit intomerge-train/fairiesfrom Apr 17, 2026
Merged
Conversation
Thunkar
approved these changes
Apr 17, 2026
Contributor
Author
|
Exactly, the potential problem was if the handler is too slow for some reason, and we get another event. The fix was quite simple, so I thought it made sense |
AztecBot
pushed a commit
that referenced
this pull request
Apr 17, 2026
Collaborator
|
✅ Successfully backported to backport-to-v4-next-staging #22580. |
github-merge-queue Bot
pushed a commit
that referenced
this pull request
Apr 17, 2026
BEGIN_COMMIT_OVERRIDE fix(pxe): stop block synchronizer on PXE shutdown (#22604) fix(aztec): respect TEST_ACCOUNTS env var in local network mode (#22600) fix: check all aztec-nr dependency tags, not just aztec (#22483) fix: reuse anchor block in kernel oracle (#22631) refactor: unify contract compilation pipeline via bb aztec_process (#22590) fix(pxe): queue registerSender wipe to avoid racing with in-flight jobs (#22623) fix(pxe): bounds-check PropertySelector in pick_notes (#22614) fix(pxe): guard private event store rollback against in-flight jobs (#22615) refactor(pxe): rename sideEffectCounter to initialSideEffectCounter (#22599) fix(pxe): correct stale authwitness comment and inverted tagging error (#22537) fix(aztec-nr): range-check auth witness fields before byte cast (#22624) fix(pxe): serialize block stream event handling to prevent race conditions (#22635) fix(pxe): throw error on origin/contract address mismatch in simulation (#22637) 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
3 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.
Problem
BlockSynchronizer.handleBlockStreamEventis a public method that assumes serial invocation. While the L2BlockStream currently dispatches events serially, nothing enforces this at the handler level. If two calls were to run concurrently, ablocks-addedevent could race with achain-prunedevent, causing the anchor block header to be read and then modified between the check and the rollback.Fix
Serialize
handleBlockStreamEventthrough aSerialQueue(the same primitive used elsewhere in the codebase for this pattern). The queue is started in the constructor and ended onstop(), ensuring all in-flight events complete before shutdown.Fixes AztecProtocol/aztec-claude#162