fix(pxe): harden change set failure paths in the coordinator (backport of aztec-labs-eng/aztec-node#100) - #25367
Open
nventuro wants to merge 1 commit into
Conversation
(cherry picked from commit 61dee49ea1931d562df6cf54f59dd72d646d7b44)
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
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#100 to the v5 line: a
git cherry-pick -xof its squash commit onaztec-node/main,61dee49ea1931d562df6cf54f59dd72d646d7b44. 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.End-state check for the stack up to this PR.
aztec-node/mainat this PR's squash commit (61dee49ea1) is the last point before that repo renamed its packages to the@aztec-labsscope, soyarn-project/pxe/srcmust differ from it only by drift that already existed before the backports (3c35735616is the train tip the stack was built on,10ab86541e^isaztec-node/mainright before the first backported PR):Expected: two context lines in
sync_tagged_private_logs.test.tswhereJOB_IDbecameCHANGE_SET_ID(the rename from Initial Archiver #35 landing on a v5-only hunk), nothing else. Any other output means a hunk was dropped or invented somewhere in the stack. (The check cannot extend past this PR: feat: aztec-node looks up contract paths #98 merged after the scope rename, which reshuffled import blocks repo-wide there; feat: aztec-node looks up contract paths #98 is covered by its own range-diff instead.)Stack
Stacked on the backport of aztec-labs-eng/aztec-node#94 (base branch
nico/port-node-94-recipient-tagging-store); to be rebased ontomerge-train/fairies-v5once that one merges. Order: #20 → #35 → #40 → #47 → #94 → #100 → #98 (aztec-node numbers).