Skip to content

refactor(pxe): migrate FactStore to BaseStagingStore (backport of aztec-labs-eng/aztec-node#98) - #25368

Open
nventuro wants to merge 3 commits into
nico/port-node-47-base-staging-storefrom
nico/port-node-98-fact-store-staging
Open

refactor(pxe): migrate FactStore to BaseStagingStore (backport of aztec-labs-eng/aztec-node#98)#25368
nventuro wants to merge 3 commits into
nico/port-node-47-base-staging-storefrom
nico/port-node-98-fact-store-staging

Conversation

@nventuro

@nventuro nventuro commented Aug 31, 2026

Copy link
Copy Markdown
Contributor

Backport of aztec-labs-eng/aztec-node#98 to the v5 line: a git cherry-pick -x of its squash commit on aztec-node/main, 4a7a2e233528f717e6c22e894526831367d80be3. 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 4a7a2e2335^..4a7a2e2335 origin/nico/port-node-98-fact-store-staging^..origin/nico/port-node-98-fact-store-staging
    

    Expected: the (cherry picked from commit …) trailer, and exactly one patch-level difference, in yarn-project/pxe/src/storage/fact_store/fact_store.ts:

    --import { Semaphore } from '@aztec-labs/foundation/queue';
    +-import { Semaphore } from '@aztec/foundation/queue';
    

    Same removal on both sides; the package scope differs because upstream renamed its packages from @aztec/* to @aztec-labs/* (chore: publish labs packages under the @aztec-labs npm scope aztec-labs-eng/aztec-node#93) before this PR merged there, and this repo keeps @aztec/*. For the same reason the surrounding import lines show up as context-only differences (a single - or + followed by a space). No other file differs.

  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. Confirm the upstream scope rename leaked nothing into this repo: git grep -c @aztec-labs -- yarn-project on this PR's head must return no matches.

Stack

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

(cherry picked from commit 1f14e9a69d10d12177032cc3fa5acddbeea2b751)
(cherry picked from commit 61dee49ea1931d562df6cf54f59dd72d646d7b44)
* refactor(pxe): migrate FactStore to BaseStagingStore

* refactor(pxe): split staging-store change set ops by DB access

(cherry picked from commit 4a7a2e233528f717e6c22e894526831367d80be3)
@nventuro
nventuro force-pushed the nico/port-node-98-fact-store-staging branch from 80c4954 to 51058af Compare September 1, 2026 15:54
@nventuro
nventuro requested a review from nchamo September 1, 2026 15:55
@nventuro
nventuro added this pull request to the merge queue Sep 1, 2026
@AztecBot

AztecBot commented Sep 1, 2026

Copy link
Copy Markdown
Collaborator

Flakey Tests

🤖 says: This CI run detected 1 tests that failed, but were tolerated due to a .test_patterns.yml entry.

\033FLAKED\033 (8;;http://ci.aztec-labs.com/3c531bc7bad1bc99�3c531bc7bad1bc998;;�):  yarn-project/end-to-end/scripts/run_test.sh simple src/multi-node/slashing/slash_veto_demo.test.ts (177s) (code: 0) group:e2e-p2p-epoch-flakes

Base automatically changed from nico/port-node-100-coordinator-failure-paths to nico/port-node-47-base-staging-store September 1, 2026 19:16
@github-merge-queue
github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Sep 1, 2026
@nventuro
nventuro added this pull request to the merge queue Sep 4, 2026
@github-merge-queue
github-merge-queue Bot removed this pull request from the merge queue due to invalid changes in the merge commit Sep 4, 2026
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.

3 participants