fix(pxe): per-change-set staging store that rejects dead change sets (backport of aztec-labs-eng/aztec-node#47) - #25338
Open
nventuro wants to merge 1 commit into
Conversation
nchamo
approved these changes
Aug 28, 2026
…47) * fix(pxe): per-change-set staging store that rejects dead change sets * test(pxe): inline the change-set switch in note store tests * docs(pxe): clarify BaseStagingStore thread safety and type params * fix(pxe): reject commits while change set ops are in flight * refactor(pxe): rename staged-store methods to change set terms (cherry picked from commit e9d1410eba861752ef4a9ebf7e54768917e589e1)
nventuro
force-pushed
the
nico/port-node-47-base-staging-store
branch
from
August 28, 2026 21:15
2eb02f4 to
9c6b7ab
Compare
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.
Backport of aztec-labs-eng/aztec-node#47 to the v5 line: a
git cherry-pick -xof its squash commit onaztec-node/main,e9d1410eba861752ef4a9ebf7e54768917e589e1. The change itself was described and reviewed there; this PR is only about the port being faithful, so please review it as such.Validating the backport
Fetch the source repo once:
git remote add node https://github.com/aztec-labs-eng/aztec-node && git fetch node main.Compare the upstream patch with this PR's patch (
range-diffcompares patches, so unrelated histories are fine):Expected: only the
(cherry picked from commit …)trailer under the commit message and nothing else — no-/+lines under any file header. The patch applied without conflicts and was not edited.Build and run the unit suites at this commit (from
yarn-project/):yarn workspace @aztec/pxe build && yarn workspace @aztec/txe build && yarn workspace @aztec/pxe test && yarn workspace @aztec/txe test. The upstream PR's own tests are part of these suites, so passing them is the behavioral check; CI on this PR runs them as well.Stack
Stacked on the backport of aztec-labs-eng/aztec-node#40 (base branch
nico/port-node-40-rollbackable); to be rebased ontomerge-train/fairies-v5once that one merges. Order: #20 → #35 → #40 → #47 → #94 → #100 → #98 (aztec-node numbers).