Skip to content

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
nico/port-node-94-recipient-tagging-storefrom
nico/port-node-100-coordinator-failure-paths
Open

fix(pxe): harden change set failure paths in the coordinator (backport of aztec-labs-eng/aztec-node#100)#25367
nventuro wants to merge 1 commit into
nico/port-node-94-recipient-tagging-storefrom
nico/port-node-100-coordinator-failure-paths

Conversation

@nventuro

Copy link
Copy Markdown
Contributor

Backport of aztec-labs-eng/aztec-node#100 to the v5 line: a git cherry-pick -x of its squash commit on aztec-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

  1. Fetch the source repo once: git remote add node https://github.com/aztec-labs-eng/aztec-node && git fetch node main.

  2. Compare the upstream patch with this PR's patch (range-diff compares patches, so unrelated histories are fine):

    git range-diff 61dee49ea1^..61dee49ea1 origin/nico/port-node-100-coordinator-failure-paths^..origin/nico/port-node-100-coordinator-failure-paths
    

    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.

  3. 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.

  4. End-state check for the stack up to this PR. aztec-node/main at this PR's squash commit (61dee49ea1) is the last point before that repo renamed its packages to the @aztec-labs scope, so yarn-project/pxe/src must differ from it only by drift that already existed before the backports (3c35735616 is the train tip the stack was built on, 10ab86541e^ is aztec-node/main right before the first backported PR):

    diff <(git diff 3c35735616 10ab86541e^ -- yarn-project/pxe/src | grep -vE '^(index |@@ )') \
         <(git diff origin/nico/port-node-100-coordinator-failure-paths 61dee49ea1 -- yarn-project/pxe/src | grep -vE '^(index |@@ )')
    

    Expected: two context lines in sync_tagged_private_logs.test.ts where JOB_ID became CHANGE_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 onto merge-train/fairies-v5 once that one merges. Order: #20#35#40#47#94#100#98 (aztec-node numbers).

(cherry picked from commit 61dee49ea1931d562df6cf54f59dd72d646d7b44)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants