@aztec/pxe 0.0.1-commit.f2ce05ee → 0.0.1-commit.f5a9928

package/dest/bin/check_oracle_version.js

@@ -1,129 +1,58 @@
-/* eslint-disable import-x/no-named-as-default-member */ import { keccak256String } from '@aztec/foundation/crypto/keccak';
-import { readFileSync } from 'fs';
+import { keccak256String } from '@aztec/foundation/crypto/keccak';
 import { dirname, join } from 'path';
-import ts from 'typescript';
 import { fileURLToPath } from 'url';
-import { ORACLE_INTERFACE_HASH } from '../oracle_version.js';
+import { ORACLE_REGISTRY } from '../contract_function_simulator/index.js';
+import { ORACLE_INTERFACE_HASH, ORACLE_VERSION_MAJOR } from '../oracle_version.js';
+import { getOracleRegistrySignature, readNumericGlobal } from './oracle_version_helpers.js';
 /**
  * Verifies that the Oracle interface matches the expected interface hash.
  *
  * The Oracle interface needs to be versioned to ensure compatibility between Aztec.nr and PXE. This function computes
- * a hash of the Oracle interface and compares it against a known hash. If they don't match, it means the interface has
- * changed and the ORACLE_VERSION constant needs to be incremented and the ORACLE_INTERFACE_HASH constant needs to be
- * updated.
- *
- * TODO(#16581): The following only takes into consideration changes to the oracles defined in Oracle.ts and omits TXE
- * oracles. Ensure this checks TXE oracles as well. This hasn't been implemented yet since we don't have a clean TXE
- * oracle interface like we do in PXE (i.e., there is no single Oracle class that contains only the oracles).
+ * a hash of `ORACLE_REGISTRY` (where each oracle's parameter names, parameter types, and return type
+ * live) and compares it against a known hash. If they don't match, it means the interface has changed and the oracle
+ * version needs to be bumped:
+ *   - If the change is backward-breaking (e.g. removing/renaming an oracle, or changing its params/return), bump
+ *     ORACLE_VERSION_MAJOR.
+ *   - If the change is an oracle addition (non-breaking), bump ORACLE_VERSION_MINOR.
  */ function assertOracleInterfaceMatches() {
-    const oracleInterfaceSignature = getOracleInterfaceSignature();
     // We use keccak256 here just because we already have it in the dependencies.
-    const oracleInterfaceHash = keccak256String(oracleInterfaceSignature);
+    const oracleInterfaceHash = keccak256String(getOracleRegistrySignature(ORACLE_REGISTRY));
     if (oracleInterfaceHash !== ORACLE_INTERFACE_HASH) {
-        // This check exists only to notify you when you need to update the ORACLE_VERSION constant.
-        throw new Error(`The Oracle interface has changed, which implies a breaking change in the aztec.nr/PXE oracle interface. Update ORACLE_INTERFACE_HASH to ${oracleInterfaceHash} and bump ORACLE_VERSION in pxe/src/oracle_version.ts.`);
+        throw new Error(`The Oracle interface has changed. Update ORACLE_INTERFACE_HASH to ${oracleInterfaceHash} in pxe/src/oracle_version.ts and bump the oracle version (ORACLE_VERSION_MAJOR for breaking changes, ORACLE_VERSION_MINOR for oracle additions).`);
     }
 }
 /**
- * Constructs a signature of the Oracle interface while ignoring methods that are not foreign call handlers.
- */ function getOracleInterfaceSignature() {
-    const excludedProps = [
-        'handler',
-        'constructor',
-        'toACIRCallback',
-        'handlerAsMisc',
-        'handlerAsUtility',
-        'handlerAsPrivate'
-    ];
-    // Get the path to Oracle.ts source file
-    // The script runs from dest/bin/ after compilation, so we need to go up to the package root
-    // then into src/ to find the source file
+ * Verifies that `ORACLE_VERSION_MAJOR` is identical across all of its hand-maintained copies.
+ *
+ * The major version is duplicated across the PXE TypeScript constant and two Noir constants (Aztec.nr and the protocol
+ * contracts' `aztec_sublib`) because those layers can't import each other. This static check fails fast at build time,
+ * naming each file and its value.
+ *
+ * Only the major version is checked: the minor version legitimately diverges under the "environment minor >= contract
+ * minor" tolerance, so asserting minor equality would false-positive.
+ */ function assertContractOracleVersionMajorInSync() {
     const currentDir = dirname(fileURLToPath(import.meta.url));
-    // Go up from dest/bin/ or src/bin/ to the package root (pxe/), then into src/
-    const packageRoot = dirname(dirname(currentDir)); // Go up from bin/ to pxe/
-    const oracleSourcePath = join(packageRoot, 'src/contract_function_simulator/oracle/oracle.ts');
-    // Read and parse the TypeScript source file
-    const sourceCode = readFileSync(oracleSourcePath, 'utf-8');
-    const sourceFile = ts.createSourceFile('oracle.ts', sourceCode, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
-    // Extract method signatures from the Oracle class
-    const methodSignatures = [];
-    function visit(node) {
-        // Look for class declaration named "Oracle"
-        if (ts.isClassDeclaration(node) && node.name?.text === 'Oracle') {
-            // Visit all members of the class
-            node.members.forEach((member)=>{
-                if (ts.isMethodDeclaration(member) && member.name && ts.isIdentifier(member.name)) {
-                    const methodName = member.name.text;
-                    // Skip excluded methods
-                    if (excludedProps.includes(methodName)) {
-                        return;
-                    }
-                    // Extract parameter signatures
-                    const paramSignatures = [];
-                    member.parameters.forEach((param)=>{
-                        const paramName = extractParameterName(param, sourceFile);
-                        const paramType = extractTypeString(param.type, sourceFile);
-                        paramSignatures.push(`${paramName}: ${paramType}`);
-                    });
-                    // Extract return type
-                    const returnType = extractTypeString(member.type, sourceFile);
-                    // Build full signature: methodName(param1: Type1, param2: Type2): ReturnType
-                    const signature = `${methodName}(${paramSignatures.join(', ')}): ${returnType}`;
-                    methodSignatures.push(signature);
-                }
-            });
-        }
-        ts.forEachChild(node, visit);
-    }
-    visit(sourceFile);
-    // Sort signatures alphabetically for consistent hashing
-    methodSignatures.sort();
-    // Create a hashable representation by concatenating all signatures
-    return methodSignatures.join('');
-}
-/**
- * Extracts the parameter name from a parameter node, handling destructured parameters.
- */ function extractParameterName(param, sourceFile) {
-    const name = param.name;
-    if (ts.isIdentifier(name)) {
-        return name.text;
-    }
-    if (ts.isArrayBindingPattern(name)) {
-        // Handle destructured parameters like [blockNumber]: ACVMField[]
-        // Extract the first element name
-        if (name.elements.length > 0) {
-            const element = name.elements[0];
-            if (ts.isBindingElement(element)) {
-                const elementName = element.name;
-                if (ts.isIdentifier(elementName)) {
-                    return elementName.text;
-                }
-                // Nested destructuring - use text representation
-                if (ts.isArrayBindingPattern(elementName) || ts.isObjectBindingPattern(elementName)) {
-                    return elementName.getText(sourceFile);
-                }
-            }
+    // Go up from dest/bin/ or src/bin/ to the package root (pxe/), then up two more to the git root.
+    const packageRoot = dirname(dirname(currentDir));
+    const gitRoot = join(packageRoot, '..', '..');
+    const copies = [
+        {
+            label: 'pxe/src/oracle_version.ts',
+            value: ORACLE_VERSION_MAJOR
+        },
+        {
+            label: 'aztec-nr/aztec/src/oracle/version.nr',
+            value: readNumericGlobal(join(gitRoot, 'noir-projects/aztec-nr/aztec/src/oracle/version.nr'), 'ORACLE_VERSION_MAJOR')
+        },
+        {
+            label: 'aztec_sublib/src/oracle/version.nr',
+            value: readNumericGlobal(join(gitRoot, 'noir-projects/noir-contracts/contracts/protocol/aztec_sublib/src/oracle/version.nr'), 'ORACLE_VERSION_MAJOR')
         }
-        // Fallback: return the text representation
-        return name.getText(sourceFile);
-    }
-    if (ts.isObjectBindingPattern(name)) {
-        // Handle object destructuring
-        return name.getText(sourceFile);
-    }
-    // Fallback for any other case - this should never happen but TypeScript needs it
-    return name.getText(sourceFile);
-}
-/**
- * Extracts the type string from a type node, normalizing whitespace.
- */ function extractTypeString(typeNode, sourceFile) {
-    if (!typeNode) {
-        return 'void';
+    ];
+    if (new Set(copies.map((copy)=>copy.value)).size > 1) {
+        const details = copies.map((copy)=>`${copy.label}=${copy.value}`).join(', ');
+        throw new Error(`ORACLE_VERSION_MAJOR is out of sync: ${details}. Bump all copies together.`);
     }
-    // Get the type text and normalize whitespace
-    let typeText = typeNode.getText(sourceFile);
-    // Normalize whitespace: remove extra spaces, newlines, and tabs
-    typeText = typeText.replace(/\s+/g, ' ').trim();
-    return typeText;
 }
 assertOracleInterfaceMatches();
+assertContractOracleVersionMajorInSync();

package/dest/bin/index.d.ts

@@ -0,0 +1,2 @@
+export { getOracleRegistrySignature, readNumericGlobal } from './oracle_version_helpers.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9iaW4vaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLDBCQUEwQixFQUFFLGlCQUFpQixFQUFFLE1BQU0sNkJBQTZCLENBQUMifQ==

package/dest/bin/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/bin/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC"}

package/dest/bin/index.js

@@ -0,0 +1 @@
+export { getOracleRegistrySignature, readNumericGlobal } from './oracle_version_helpers.js';

package/dest/bin/oracle_version_helpers.d.ts

@@ -0,0 +1,34 @@
+import type { OracleRegistryEntry } from '../contract_function_simulator/index.js';
+/**
+ * Extracts a deterministic signature string from an oracle registry (e.g. PXE's `ORACLE_REGISTRY`).
+ *
+ * Reads the registry where each oracle's wire ABI lives: the ordered parameter names with their `TypeMapping` labels
+ * and the return type. The resulting hash is sensitive to parameter, type, and return changes, not just oracle
+ * additions and removals.
+ *
+ * @example
+ * // Given a registry like:
+ * //   export const ORACLE_REGISTRY = {
+ * //     aztec_utl_foo: makeEntry({ params: [{ name: 'a', type: U32 }], returnType: BOOL }),
+ * //     aztec_prv_bar: makeEntry(),
+ * //   } satisfies Record<string, OracleRegistryEntry>;
+ * //
+ * // Returns (sorted, newline-joined):
+ * //   "aztec_prv_bar(): void\naztec_utl_foo(a: u32): bool"
+ */
+export declare function getOracleRegistrySignature(registry: Record<string, OracleRegistryEntry>): string;
+/**
+ * Reads an integer-valued global constant from a Noir or TypeScript source file.
+ *
+ * Matches both the Noir form (`pub global NAME: Field = N;`) and the TypeScript form (`export const NAME = N;`). This
+ * lets us compare a version constant that is hand-duplicated across the TS and Noir layers (which can't import each
+ * other) without depending on either compiler. Only the assignment form `NAME = N` matches, so later usages of the
+ * constant are ignored regardless of their order in the file.
+ *
+ * @param sourcePath - Absolute path to the source file to read.
+ * @param name - Name of the global constant whose integer value should be extracted.
+ * @returns The integer value assigned to the constant.
+ * @throws If the constant's declaration is not found in the file.
+ */
+export declare function readNumericGlobal(sourcePath: string, name: string): number;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3JhY2xlX3ZlcnNpb25faGVscGVycy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jpbi9vcmFjbGVfdmVyc2lvbl9oZWxwZXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0seUNBQXlDLENBQUM7QUFFbkY7Ozs7Ozs7Ozs7Ozs7Ozs7R0FnQkc7QUFDSCx3QkFBZ0IsMEJBQTBCLENBQUMsUUFBUSxFQUFFLE1BQU0sQ0FBQyxNQUFNLEVBQUUsbUJBQW1CLENBQUMsR0FBRyxNQUFNLENBVWhHO0FBRUQ7Ozs7Ozs7Ozs7OztHQVlHO0FBQ0gsd0JBQWdCLGlCQUFpQixDQUFDLFVBQVUsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLE1BQU0sR0FBRyxNQUFNLENBTzFFIn0=

package/dest/bin/oracle_version_helpers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"oracle_version_helpers.d.ts","sourceRoot":"","sources":["../../src/bin/oracle_version_helpers.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAEnF;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,GAAG,MAAM,CAUhG;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAO1E"}

package/dest/bin/oracle_version_helpers.js

@@ -0,0 +1,46 @@
+import { readFileSync } from 'fs';
+/**
+ * Extracts a deterministic signature string from an oracle registry (e.g. PXE's `ORACLE_REGISTRY`).
+ *
+ * Reads the registry where each oracle's wire ABI lives: the ordered parameter names with their `TypeMapping` labels
+ * and the return type. The resulting hash is sensitive to parameter, type, and return changes, not just oracle
+ * additions and removals.
+ *
+ * @example
+ * // Given a registry like:
+ * //   export const ORACLE_REGISTRY = {
+ * //     aztec_utl_foo: makeEntry({ params: [{ name: 'a', type: U32 }], returnType: BOOL }),
+ * //     aztec_prv_bar: makeEntry(),
+ * //   } satisfies Record<string, OracleRegistryEntry>;
+ * //
+ * // Returns (sorted, newline-joined):
+ * //   "aztec_prv_bar(): void\naztec_utl_foo(a: u32): bool"
+ */ export function getOracleRegistrySignature(registry) {
+    const oracleSignatures = Object.entries(registry).map(([name, entry])=>{
+        const paramSignatures = entry.params.map((p)=>`${p.name}: ${p.type.label}`);
+        const returnType = entry.returnType === undefined ? 'void' : entry.returnType.label;
+        return `${name}(${paramSignatures.join(', ')}): ${returnType}`;
+    });
+    oracleSignatures.sort();
+    return oracleSignatures.join('\n');
+}
+/**
+ * Reads an integer-valued global constant from a Noir or TypeScript source file.
+ *
+ * Matches both the Noir form (`pub global NAME: Field = N;`) and the TypeScript form (`export const NAME = N;`). This
+ * lets us compare a version constant that is hand-duplicated across the TS and Noir layers (which can't import each
+ * other) without depending on either compiler. Only the assignment form `NAME = N` matches, so later usages of the
+ * constant are ignored regardless of their order in the file.
+ *
+ * @param sourcePath - Absolute path to the source file to read.
+ * @param name - Name of the global constant whose integer value should be extracted.
+ * @returns The integer value assigned to the constant.
+ * @throws If the constant's declaration is not found in the file.
+ */ export function readNumericGlobal(sourcePath, name) {
+    const sourceCode = readFileSync(sourcePath, 'utf-8');
+    const match = sourceCode.match(new RegExp(`\\b${name}\\s*(?::\\s*\\w+\\s*)?=\\s*(\\d+)`));
+    if (!match) {
+        throw new Error(`Could not find numeric global '${name}' in ${sourcePath}.`);
+    }
+    return Number(match[1]);
+}

package/dest/block_synchronizer/block_stream_source.d.ts

@@ -0,0 +1,10 @@
+import { type L2BlockSource } from '@aztec/stdlib/block';
+import type { AztecNode } from '@aztec/stdlib/interfaces/client';
+/**
+ * Lifts an {@link AztecNode} RPC client into the shape {@link L2BlockStream} expects.
+ * `getBlocks` requests transaction bodies so that real `L2Block` instances can be constructed. The stream no
+ * longer fetches checkpoint payloads (the `chain-checkpointed` event is a thin tip event), so `getCheckpoints`
+ * is not part of the lifted shape.
+ */
+export declare function blockStreamSourceFromAztecNode(node: AztecNode): Pick<L2BlockSource, 'getBlocks' | 'getBlockData' | 'getL2Tips'>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfc3RyZWFtX3NvdXJjZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jsb2NrX3N5bmNocm9uaXplci9ibG9ja19zdHJlYW1fc291cmNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBOEQsS0FBSyxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNySCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRTs7Ozs7R0FLRztBQUNILHdCQUFnQiw4QkFBOEIsQ0FDNUMsSUFBSSxFQUFFLFNBQVMsR0FDZCxJQUFJLENBQUMsYUFBYSxFQUFFLFdBQVcsR0FBRyxjQUFjLEdBQUcsV0FBVyxDQUFDLENBOEJqRSJ9

package/dest/block_synchronizer/block_stream_source.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"block_stream_source.d.ts","sourceRoot":"","sources":["../../src/block_synchronizer/block_stream_source.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8D,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACrH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAEjE;;;;;GAKG;AACH,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,SAAS,GACd,IAAI,CAAC,aAAa,EAAE,WAAW,GAAG,cAAc,GAAG,WAAW,CAAC,CA8BjE"}

package/dest/block_synchronizer/block_stream_source.js

@@ -0,0 +1,37 @@
+import { L2Block } from '@aztec/stdlib/block';
+/**
+ * Lifts an {@link AztecNode} RPC client into the shape {@link L2BlockStream} expects.
+ * `getBlocks` requests transaction bodies so that real `L2Block` instances can be constructed. The stream no
+ * longer fetches checkpoint payloads (the `chain-checkpointed` event is a thin tip event), so `getCheckpoints`
+ * is not part of the lifted shape.
+ */ export function blockStreamSourceFromAztecNode(node) {
+    return {
+        getL2Tips: ()=>node.getChainTips(),
+        async getBlockData (query) {
+            const response = await node.getBlock(query);
+            if (!response) {
+                return undefined;
+            }
+            return {
+                header: response.header,
+                archive: response.archive,
+                blockHash: response.hash,
+                checkpointNumber: response.checkpointNumber,
+                indexWithinCheckpoint: response.indexWithinCheckpoint
+            };
+        },
+        async getBlocks (query) {
+            // Epoch lookups are not exposed on the public AztecNode RPC; only `from + limit` is.
+            if (!('from' in query)) {
+                throw new Error('getBlocks with epoch query not supported via AztecNode RPC');
+            }
+            if (query.onlyCheckpointed) {
+                throw new Error('getBlocks with onlyCheckpointed not supported via AztecNode RPC');
+            }
+            const responses = await node.getBlocks(query.from, query.limit, {
+                includeTransactions: true
+            });
+            return responses.map((r)=>new L2Block(r.archive, r.header, r.body, r.checkpointNumber, r.indexWithinCheckpoint));
+        }
+    };
+}

package/dest/block_synchronizer/block_synchronizer.d.ts

@@ -2,11 +2,12 @@ import { type LoggerBindings } from '@aztec/foundation/log';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import type { L2TipsKVStore } from '@aztec/kv-store/stores';
 import { L2BlockStream, type L2BlockStreamEvent, type L2BlockStreamEventHandler } from '@aztec/stdlib/block';
-import type { AztecNode } from '@aztec/stdlib/interfaces/client';
 import type { BlockSynchronizerConfig } from '../config/index.js';
-import type { ContractSyncService } from '../contract_sync/contract_sync_service.js';
-import type { AnchorBlockStore } from '../storage/anchor_block_store/anchor_block_store.js';
-import type { NoteStore } from '../storage/note_store/note_store.js';
+import type { ContractSyncService } from '../contract/contract_sync_service.js';
+import type { CachingAztecNode } from '../node/caching_aztec_node.js';
+import type { AnchorBlockStore } from '../storage/anchor_block_store/index.js';
+import type { FactStore } from '../storage/fact_store/fact_store.js';
+import type { NoteStore } from '../storage/note_store/index.js';
 import type { PrivateEventStore } from '../storage/private_event_store/private_event_store.js';
 /**
  * The BlockSynchronizer class orchestrates synchronization between PXE and Aztec node, maintaining an up-to-date
@@ -14,21 +15,24 @@ import type { PrivateEventStore } from '../storage/private_event_store/private_e
  * for querying sync status.
  */
 export declare class BlockSynchronizer implements L2BlockStreamEventHandler {
-    private node;
-    private store;
-    private anchorBlockStore;
-    private noteStore;
-    private privateEventStore;
-    private l2TipsStore;
-    private contractSyncService;
-    private config;
+    private readonly node;
+    private readonly store;
+    private readonly anchorBlockStore;
+    private readonly noteStore;
+    private readonly privateEventStore;
+    private readonly factStore;
+    private readonly l2TipsStore;
+    private readonly contractSyncService;
+    private readonly config;
     private log;
     private isSyncing;
+    private readonly eventQueue;
     protected readonly blockStream: L2BlockStream;
-    constructor(node: AztecNode, store: AztecAsyncKVStore, anchorBlockStore: AnchorBlockStore, noteStore: NoteStore, privateEventStore: PrivateEventStore, l2TipsStore: L2TipsKVStore, contractSyncService: ContractSyncService, config?: Partial<BlockSynchronizerConfig>, bindings?: LoggerBindings);
-    protected createBlockStream(config: Partial<BlockSynchronizerConfig>): L2BlockStream;
-    /** Handle events emitted by the block stream. */
+    constructor(node: CachingAztecNode, store: AztecAsyncKVStore, anchorBlockStore: AnchorBlockStore, noteStore: NoteStore, privateEventStore: PrivateEventStore, factStore: FactStore, l2TipsStore: L2TipsKVStore, contractSyncService: ContractSyncService, config?: Partial<BlockSynchronizerConfig>, bindings?: LoggerBindings);
+    protected createBlockStream(): L2BlockStream;
+    /** Handle events emitted by the block stream. Serialized to prevent concurrent mutations to anchor state. */
     handleBlockStreamEvent(event: L2BlockStreamEvent): Promise<void>;
+    private doHandleBlockStreamEvent;
     private updateAnchorBlockHeader;
     /**
      * Syncs PXE and the node by downloading the metadata of the latest blocks, allowing simulations to use
@@ -40,6 +44,8 @@ export declare class BlockSynchronizer implements L2BlockStreamEventHandler {
      * We do this so PXE can ensure data consistency.
      */
     sync(): Promise<void>;
+    /** Stops the block synchronizer, waiting for any in-progress sync and queued events to complete. */
+    stop(): Promise<void>;
     private doSync;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfc3luY2hyb25pemVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2tfc3luY2hyb25pemVyL2Jsb2NrX3N5bmNocm9uaXplci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQWUsS0FBSyxjQUFjLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFDdkYsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM1RCxPQUFPLEVBQWEsYUFBYSxFQUFFLEtBQUssa0JBQWtCLEVBQUUsS0FBSyx5QkFBeUIsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3hILE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBR2pFLE9BQU8sS0FBSyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDbEUsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUNyRixPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHFEQUFxRCxDQUFDO0FBQzVGLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBQ3JFLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sdURBQXVELENBQUM7QUFFL0Y7Ozs7R0FJRztBQUNILHFCQUFhLGlCQUFrQixZQUFXLHlCQUF5QjtJQU0vRCxPQUFPLENBQUMsSUFBSTtJQUNaLE9BQU8sQ0FBQyxLQUFLO0lBQ2IsT0FBTyxDQUFDLGdCQUFnQjtJQUN4QixPQUFPLENBQUMsU0FBUztJQUNqQixPQUFPLENBQUMsaUJBQWlCO0lBQ3pCLE9BQU8sQ0FBQyxXQUFXO0lBQ25CLE9BQU8sQ0FBQyxtQkFBbUI7SUFDM0IsT0FBTyxDQUFDLE1BQU07SUFaaEIsT0FBTyxDQUFDLEdBQUcsQ0FBUztJQUNwQixPQUFPLENBQUMsU0FBUyxDQUE0QjtJQUM3QyxTQUFTLENBQUMsUUFBUSxDQUFDLFdBQVcsRUFBRSxhQUFhLENBQUM7SUFFOUMsWUFDVSxJQUFJLEVBQUUsU0FBUyxFQUNmLEtBQUssRUFBRSxpQkFBaUIsRUFDeEIsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQ2xDLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLGlCQUFpQixFQUFFLGlCQUFpQixFQUNwQyxXQUFXLEVBQUUsYUFBYSxFQUMxQixtQkFBbUIsRUFBRSxtQkFBbUIsRUFDeEMsTUFBTSxHQUFFLE9BQU8sQ0FBQyx1QkFBdUIsQ0FBTSxFQUNyRCxRQUFRLENBQUMsRUFBRSxjQUFjLEVBSTFCO0lBRUQsU0FBUyxDQUFDLGlCQUFpQixDQUFDLE1BQU0sRUFBRSxPQUFPLENBQUMsdUJBQXVCLENBQUMsR0FBRyxhQUFhLENBYW5GO0lBRUQsaURBQWlEO0lBQ3BDLHNCQUFzQixDQUFDLEtBQUssRUFBRSxrQkFBa0IsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBc0U1RTtZQUdhLHVCQUF1QjtJQVNyQzs7Ozs7Ozs7T0FRRztJQUNVLElBQUksa0JBZWhCO1lBRWEsTUFBTTtDQWNyQiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfc3luY2hyb25pemVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2tfc3luY2hyb25pemVyL2Jsb2NrX3N5bmNocm9uaXplci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQWUsS0FBSyxjQUFjLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFFdkYsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM1RCxPQUFPLEVBQWEsYUFBYSxFQUFFLEtBQUssa0JBQWtCLEVBQUUsS0FBSyx5QkFBeUIsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBR3hILE9BQU8sS0FBSyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDbEUsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQUNoRixPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ3RFLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sd0NBQXdDLENBQUM7QUFDL0UsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFDckUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx1REFBdUQsQ0FBQztBQUcvRjs7OztHQUlHO0FBQ0gscUJBQWEsaUJBQWtCLFlBQVcseUJBQXlCO0lBTy9ELE9BQU8sQ0FBQyxRQUFRLENBQUMsSUFBSTtJQUNyQixPQUFPLENBQUMsUUFBUSxDQUFDLEtBQUs7SUFDdEIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0I7SUFDakMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxTQUFTO0lBQzFCLE9BQU8sQ0FBQyxRQUFRLENBQUMsaUJBQWlCO0lBQ2xDLE9BQU8sQ0FBQyxRQUFRLENBQUMsU0FBUztJQUMxQixPQUFPLENBQUMsUUFBUSxDQUFDLFdBQVc7SUFDNUIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxtQkFBbUI7SUFDcEMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxNQUFNO0lBZHpCLE9BQU8sQ0FBQyxHQUFHLENBQVM7SUFDcEIsT0FBTyxDQUFDLFNBQVMsQ0FBNEI7SUFDN0MsT0FBTyxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQXFCO0lBQ2hELFNBQVMsQ0FBQyxRQUFRLENBQUMsV0FBVyxFQUFFLGFBQWEsQ0FBQztJQUU5QyxZQUNtQixJQUFJLEVBQUUsZ0JBQWdCLEVBQ3RCLEtBQUssRUFBRSxpQkFBaUIsRUFDeEIsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQ2xDLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLGlCQUFpQixFQUFFLGlCQUFpQixFQUNwQyxTQUFTLEVBQUUsU0FBUyxFQUNwQixXQUFXLEVBQUUsYUFBYSxFQUMxQixtQkFBbUIsRUFBRSxtQkFBbUIsRUFDeEMsTUFBTSxHQUFFLE9BQU8sQ0FBQyx1QkFBdUIsQ0FBTSxFQUM5RCxRQUFRLENBQUMsRUFBRSxjQUFjLEVBSzFCO0lBRUQsU0FBUyxDQUFDLGlCQUFpQixJQUFJLGFBQWEsQ0FZM0M7SUFFRCw2R0FBNkc7SUFDdEcsc0JBQXNCLENBQUMsS0FBSyxFQUFFLGtCQUFrQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFdEU7WUFFYSx3QkFBd0I7WUFnR3hCLHVCQUF1QjtJQWNyQzs7Ozs7Ozs7T0FRRztJQUNVLElBQUksa0JBaUJoQjtJQUVELG9HQUFvRztJQUN2RixJQUFJLGtCQUloQjtZQUVhLE1BQU07Q0FjckIifQ==

package/dest/block_synchronizer/block_synchronizer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"block_synchronizer.d.ts","sourceRoot":"","sources":["../../src/block_synchronizer/block_synchronizer.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,KAAK,cAAc,EAAgB,MAAM,uBAAuB,CAAC;AACvF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAa,aAAa,EAAE,KAAK,kBAAkB,EAAE,KAAK,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AACxH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAGjE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AACrF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qDAAqD,CAAC;AAC5F,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uDAAuD,CAAC;AAE/F;;;;GAIG;AACH,qBAAa,iBAAkB,YAAW,yBAAyB;IAM/D,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,MAAM;IAZhB,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,SAAS,CAA4B;IAC7C,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC;IAE9C,YACU,IAAI,EAAE,SAAS,EACf,KAAK,EAAE,iBAAiB,EACxB,gBAAgB,EAAE,gBAAgB,EAClC,SAAS,EAAE,SAAS,EACpB,iBAAiB,EAAE,iBAAiB,EACpC,WAAW,EAAE,aAAa,EAC1B,mBAAmB,EAAE,mBAAmB,EACxC,MAAM,GAAE,OAAO,CAAC,uBAAuB,CAAM,EACrD,QAAQ,CAAC,EAAE,cAAc,EAI1B;IAED,SAAS,CAAC,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,uBAAuB,CAAC,GAAG,aAAa,CAanF;IAED,iDAAiD;IACpC,sBAAsB,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAsE5E;YAGa,uBAAuB;IASrC;;;;;;;;OAQG;IACU,IAAI,kBAehB;YAEa,MAAM;CAcrB"}
+{"version":3,"file":"block_synchronizer.d.ts","sourceRoot":"","sources":["../../src/block_synchronizer/block_synchronizer.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,KAAK,cAAc,EAAgB,MAAM,uBAAuB,CAAC;AAEvF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAa,aAAa,EAAE,KAAK,kBAAkB,EAAE,KAAK,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAGxH,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAChF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC/E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uDAAuD,CAAC;AAG/F;;;;GAIG;AACH,qBAAa,iBAAkB,YAAW,yBAAyB;IAO/D,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,MAAM;IAdzB,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,SAAS,CAA4B;IAC7C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAqB;IAChD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC;IAE9C,YACmB,IAAI,EAAE,gBAAgB,EACtB,KAAK,EAAE,iBAAiB,EACxB,gBAAgB,EAAE,gBAAgB,EAClC,SAAS,EAAE,SAAS,EACpB,iBAAiB,EAAE,iBAAiB,EACpC,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,aAAa,EAC1B,mBAAmB,EAAE,mBAAmB,EACxC,MAAM,GAAE,OAAO,CAAC,uBAAuB,CAAM,EAC9D,QAAQ,CAAC,EAAE,cAAc,EAK1B;IAED,SAAS,CAAC,iBAAiB,IAAI,aAAa,CAY3C;IAED,6GAA6G;IACtG,sBAAsB,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAEtE;YAEa,wBAAwB;YAgGxB,uBAAuB;IAcrC;;;;;;;;OAQG;IACU,IAAI,kBAiBhB;IAED,oGAAoG;IACvF,IAAI,kBAIhB;YAEa,MAAM;CAcrB"}

package/dest/block_synchronizer/block_synchronizer.js

@@ -1,6 +1,8 @@
 import { BlockNumber } from '@aztec/foundation/branded-types';
 import { createLogger } from '@aztec/foundation/log';
+import { SerialQueue } from '@aztec/foundation/queue';
 import { BlockHash, L2BlockStream } from '@aztec/stdlib/block';
+import { blockStreamSourceFromAztecNode } from './block_stream_source.js';
 /**
  * The BlockSynchronizer class orchestrates synchronization between PXE and Aztec node, maintaining an up-to-date
  * view of the L2 chain state. It handles block header retrieval, chain reorganizations, and provides an interface
@@ -11,58 +13,74 @@ import { BlockHash, L2BlockStream } from '@aztec/stdlib/block';
     anchorBlockStore;
     noteStore;
     privateEventStore;
+    factStore;
     l2TipsStore;
     contractSyncService;
     config;
     log;
     isSyncing;
+    eventQueue;
     blockStream;
-    constructor(node, store, anchorBlockStore, noteStore, privateEventStore, l2TipsStore, contractSyncService, config = {}, bindings){
+    constructor(node, store, anchorBlockStore, noteStore, privateEventStore, factStore, l2TipsStore, contractSyncService, config = {}, bindings){
         this.node = node;
         this.store = store;
         this.anchorBlockStore = anchorBlockStore;
         this.noteStore = noteStore;
         this.privateEventStore = privateEventStore;
+        this.factStore = factStore;
         this.l2TipsStore = l2TipsStore;
         this.contractSyncService = contractSyncService;
         this.config = config;
+        this.eventQueue = new SerialQueue();
         this.log = createLogger('pxe:block_synchronizer', bindings);
-        this.blockStream = this.createBlockStream(config);
+        this.blockStream = this.createBlockStream();
+        this.eventQueue.start();
     }
-    createBlockStream(config) {
-        return new L2BlockStream(this.node, this.l2TipsStore, this, createLogger('pxe:block_stream', this.log.getBindings()), {
-            batchSize: config.l2BlockBatchSize,
-            // Skipping finalized blocks makes us sync much faster - we only need to download blocks other than the latest one
-            // in order to detect reorgs, and there can be no reorgs on finalized block, making this safe.
-            skipFinalized: true
+    createBlockStream() {
+        return new L2BlockStream(blockStreamSourceFromAztecNode(this.node), this.l2TipsStore, this, createLogger('pxe:block_stream', this.log.getBindings()), {
+            // PXE only tracks chain tips (it anchors on tip events and never replays payloads), so the stream runs
+            // in tips-only mode: no block downloads, just the tip events that move the anchor and detect reorgs.
+            tipsOnly: true
         });
     }
-    /** Handle events emitted by the block stream. */ async handleBlockStreamEvent(event) {
-        await this.l2TipsStore.handleBlockStreamEvent(event);
+    /** Handle events emitted by the block stream. Serialized to prevent concurrent mutations to anchor state. */ handleBlockStreamEvent(event) {
+        return this.eventQueue.put(()=>this.doHandleBlockStreamEvent(event));
+    }
+    async doHandleBlockStreamEvent(event) {
         switch(event.type){
-            case 'blocks-added':
+            case 'chain-proposed':
                 {
                     if (this.config.syncChainTip === undefined || this.config.syncChainTip === 'proposed') {
-                        const lastBlock = event.blocks.at(-1);
-                        await this.updateAnchorBlockHeader(lastBlock.header);
+                        await this.updateAnchorBlockHeader(event.header);
                     }
                     break;
                 }
+            // Never emitted in tips-only mode; PXE anchors on chain-proposed instead. Kept for union exhaustiveness.
+            case 'blocks-added':
+                break;
             case 'chain-checkpointed':
                 {
                     if (this.config.syncChainTip === 'checkpointed') {
-                        // Get the last block header from the checkpoint
-                        const lastBlock = event.checkpoint.checkpoint.blocks.at(-1);
-                        await this.updateAnchorBlockHeader(lastBlock.header);
+                        // Fetch the checkpointed tip header by hash. By-hash is safer than by-number against a
+                        // same-height reorg; a missing result means the block was reorged out between the event
+                        // and this fetch, so we skip the anchor update and let a later event correct it.
+                        const block = await this.node.getBlockData(BlockHash.fromString(event.block.hash));
+                        if (block) {
+                            await this.updateAnchorBlockHeader(block.header);
+                        } else {
+                            this.log.warn(`Block header not found for checkpointed block ${event.block.number}, skipping anchor update`);
+                        }
                     }
                     break;
                 }
             case 'chain-proven':
                 {
                     if (this.config.syncChainTip === 'proven') {
-                        const blockHeader = await this.node.getBlockHeader(BlockNumber(event.block.number));
-                        if (blockHeader) {
-                            await this.updateAnchorBlockHeader(blockHeader);
+                        const block = await this.node.getBlock(BlockNumber(event.block.number));
+                        if (block) {
+                            await this.updateAnchorBlockHeader(block.header);
+                        } else {
+                            this.log.warn(`Block header not found for proven block ${event.block.number}, skipping anchor update`);
                         }
                     }
                     break;
@@ -70,9 +88,11 @@ import { BlockHash, L2BlockStream } from '@aztec/stdlib/block';
             case 'chain-finalized':
                 {
                     if (this.config.syncChainTip === 'finalized') {
-                        const blockHeader = await this.node.getBlockHeader(BlockNumber(event.block.number));
-                        if (blockHeader) {
-                            await this.updateAnchorBlockHeader(blockHeader);
+                        const block = await this.node.getBlock(BlockNumber(event.block.number));
+                        if (block) {
+                            await this.updateAnchorBlockHeader(block.header);
+                        } else {
+                            this.log.warn(`Block header not found for finalized block ${event.block.number}, skipping anchor update`);
                         }
                     }
                     break;
@@ -86,31 +106,47 @@ import { BlockHash, L2BlockStream } from '@aztec/stdlib/block';
                             pruneEvent: event,
                             currentAnchorBlockHeader: currentAnchorBlockHeader.toInspect()
                         });
-                        return;
+                        break;
                     }
-                    this.log.warn(`Pruning data after block ${event.block.number} due to reorg`);
+                    this.log.warn(`Pruning data after block ${event.block.number} due to reorg`, {
+                        pruneBlock: event.block
+                    });
                     // Note that the following is not necessarily the anchor block that will be used in the transaction - if
                     // the chain has already moved past the reorg, we'll also see blocks-added events that will push the anchor
                     // forward.
-                    const newAnchorBlockHeader = await this.node.getBlockHeader(BlockHash.fromString(event.block.hash));
+                    const newAnchorBlock = await this.node.getBlock(BlockHash.fromString(event.block.hash));
+                    const newAnchorBlockHeader = newAnchorBlock?.header;
                     if (!newAnchorBlockHeader) {
                         throw new Error(`Block header for block number ${event.block.number} and hash ${event.block.hash} not found during chain prune. This likely indicates a bug in the node, as we receive block stream events and fetch block headers from the same node.`);
                     }
                     // Operations are wrapped in a single transaction to ensure atomicity.
                     await this.store.transactionAsync(async ()=>{
-                        await this.noteStore.rollback(event.block.number, currentAnchorBlockNumber);
-                        await this.privateEventStore.rollback(event.block.number, currentAnchorBlockNumber);
+                        await this.noteStore.rollback(event.block.number);
+                        await this.privateEventStore.rollback(event.block.number);
+                        await this.factStore.rollback(event.block.number);
                         await this.updateAnchorBlockHeader(newAnchorBlockHeader);
                     });
                     break;
                 }
+            default:
+                {
+                    const _ = event;
+                    break;
+                }
         }
+        // Advance the tips store cursor only after the anchor update / prune rollback above succeeds. If that work
+        // throws, the cursor stays put and the stream re-emits this event on the next sync pass (at-least-once),
+        // matching the prover-node's handle-first/tips-last ordering. The SerialQueue makes this reorder safe.
+        await this.l2TipsStore.handleBlockStreamEvent(event);
     }
     /** Updates the anchor block header to the target block */ async updateAnchorBlockHeader(blockHeader) {
         // Whenever the anchor block header is updated, we need to synchronize the private state of contracts again.
         // Therefore, we clear the contract synchronization cache here such that the sync is re-triggered upon new
         // execution.
         this.contractSyncService.wipe();
+        // Cached node reads stay correct indefinitely, so this wipe is only about bounding memory growth. An anchor
+        // update is the recurring trigger PXE already has.
+        this.node.wipeCache();
         this.log.verbose(`Updated pxe last block to ${blockHeader.getBlockNumber()}`, blockHeader.toInspect());
         await this.anchorBlockStore.setHeader(blockHeader);
     }
@@ -129,6 +165,8 @@ import { BlockHash, L2BlockStream } from '@aztec/stdlib/block';
             return;
         }
         this.log.debug(`Syncing PXE with the node`);
+        // Capture the promise locally so we always await the exact promise we created, even if this.isSyncing is modified
+        // between assignment and await (e.g. due to future refactors introducing a yield point).
         const isSyncing = this.doSync();
         this.isSyncing = isSyncing;
         try {
@@ -137,6 +175,11 @@ import { BlockHash, L2BlockStream } from '@aztec/stdlib/block';
             this.isSyncing = undefined;
         }
     }
+    /** Stops the block synchronizer, waiting for any in-progress sync and queued events to complete. */ async stop() {
+        await this.isSyncing;
+        await this.blockStream.stop();
+        await this.eventQueue.end();
+    }
     async doSync() {
         let currentHeader;
         try {
@@ -146,7 +189,7 @@ import { BlockHash, L2BlockStream } from '@aztec/stdlib/block';
         }
         if (!currentHeader) {
             // REFACTOR: We should know the header of the genesis block without having to request it from the node.
-            await this.anchorBlockStore.setHeader(await this.node.getBlockHeader(BlockNumber.ZERO));
+            await this.anchorBlockStore.setHeader((await this.node.getBlockData(BlockNumber.ZERO)).header);
         }
         await this.blockStream.sync();
     }