Skip to content

refactor(pxe): extract a Rollbackable interface for reorg rollbacks (backport of aztec-labs-eng/aztec-node#40) - #25337

Queued
nventuro wants to merge 1 commit into
nico/port-node-35-operation-lifecyclefrom
nico/port-node-40-rollbackable
Queued

refactor(pxe): extract a Rollbackable interface for reorg rollbacks (backport of aztec-labs-eng/aztec-node#40)#25337
nventuro wants to merge 1 commit into
nico/port-node-35-operation-lifecyclefrom
nico/port-node-40-rollbackable

Conversation

@nventuro

@nventuro nventuro commented Aug 27, 2026

Copy link
Copy Markdown
Contributor

Backport of aztec-labs-eng/aztec-node#40 to the v5 line: a git cherry-pick -x of its squash commit on aztec-node/main, da18494f46c209d3c624c32f0eebfd32c0c1b677. 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 da18494f46^..da18494f46 origin/nico/port-node-40-rollbackable^..origin/nico/port-node-40-rollbackable
    

    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.

Stack

Stacked on the backport of aztec-labs-eng/aztec-node#35 (base branch nico/port-node-35-operation-lifecycle); to be rebased onto merge-train/fairies-v5 once that one merges. Order: #20#35#40#47#94#100#98 (aztec-node numbers).

@nventuro
nventuro force-pushed the nico/port-node-40-rollbackable branch from 654e4e7 to 2f3544a Compare August 28, 2026 21:15
)

* refactor(pxe): extract a Rollbackable interface for reorg rollbacks

* test(pxe): assert the prune contract against a mock Rollbackable

* test(pxe): replay a failed prune on the next sync

(cherry picked from commit da18494f46c209d3c624c32f0eebfd32c0c1b677)
@nventuro
nventuro force-pushed the nico/port-node-40-rollbackable branch from 2f3544a to 7e13074 Compare September 1, 2026 15:54
@nventuro
nventuro added this pull request to the merge queue Sep 1, 2026
Any commits made after this event will not be merged.
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