@aztec/pxe 0.0.1-commit.96bb3f7 → 0.0.1-commit.993d240

package/dest/bin/check_oracle_version.d.ts

@@ -1,2 +1,12 @@
-export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2tfb3JhY2xlX3ZlcnNpb24uZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9iaW4vY2hlY2tfb3JhY2xlX3ZlcnNpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9
+/**
+ * Extracts method signatures from TypeScript classes or interfaces and returns a deterministic string representation.
+ *
+ * This is used to detect when an oracle interface changes so that the oracle version can be bumped. It works with both
+ * class declarations (e.g. PXE's `Oracle` class) and interface declarations (e.g. TXE's `IAvmExecutionOracle`).
+ *
+ * @param sourcePath - Absolute path to the TypeScript source file to parse.
+ * @param targets - Names of classes or interfaces to extract methods from.
+ * @param excludedMembers - Method names to skip (e.g. non-oracle helpers like `constructor`).
+ */
+export declare function getOracleInterfaceSignature(sourcePath: string, targets: string[], excludedMembers: string[]): string;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2tfb3JhY2xlX3ZlcnNpb24uZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9iaW4vY2hlY2tfb3JhY2xlX3ZlcnNpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBZ0RBOzs7Ozs7Ozs7R0FTRztBQUNILHdCQUFnQiwyQkFBMkIsQ0FBQyxVQUFVLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFBRSxlQUFlLEVBQUUsTUFBTSxFQUFFLEdBQUcsTUFBTSxDQXdEcEgifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"check_oracle_version.d.ts","sourceRoot":"","sources":["../../src/bin/check_oracle_version.ts"],"names":[],"mappings":""}
+{"version":3,"file":"check_oracle_version.d.ts","sourceRoot":"","sources":["../../src/bin/check_oracle_version.ts"],"names":[],"mappings":"AAgDA;;;;;;;;;GASG;AACH,wBAAgB,2BAA2B,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,MAAM,CAwDpH"}

package/dest/bin/check_oracle_version.js

@@ -1,4 +1,4 @@
-import { keccak256String } from '@aztec/foundation/crypto/keccak';
+/* eslint-disable import-x/no-named-as-default-member */ import { keccak256String } from '@aztec/foundation/crypto/keccak';
 import { readFileSync } from 'fs';
 import { dirname, join } from 'path';
 import ts from 'typescript';
@@ -9,24 +9,10 @@ import { ORACLE_INTERFACE_HASH } from '../oracle_version.js';
  *
  * 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).
+ * changed and the oracle version needs to be bumped:
+ *   - If the change is backward-breaking (e.g. removing/renaming an oracle), 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);
-    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.`);
-    }
-}
-/**
- * Constructs a signature of the Oracle interface while ignoring methods that are not foreign call handlers.
- */ function getOracleInterfaceSignature() {
     const excludedProps = [
         'handler',
         'constructor',
@@ -42,20 +28,40 @@ import { ORACLE_INTERFACE_HASH } from '../oracle_version.js';
     // 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');
+    const oracleInterfaceSignature = getOracleInterfaceSignature(oracleSourcePath, [
+        'Oracle'
+    ], excludedProps);
+    // We use keccak256 here just because we already have it in the dependencies.
+    const oracleInterfaceHash = keccak256String(oracleInterfaceSignature);
+    if (oracleInterfaceHash !== ORACLE_INTERFACE_HASH) {
+        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).`);
+    }
+}
+/**
+ * Extracts method signatures from TypeScript classes or interfaces and returns a deterministic string representation.
+ *
+ * This is used to detect when an oracle interface changes so that the oracle version can be bumped. It works with both
+ * class declarations (e.g. PXE's `Oracle` class) and interface declarations (e.g. TXE's `IAvmExecutionOracle`).
+ *
+ * @param sourcePath - Absolute path to the TypeScript source file to parse.
+ * @param targets - Names of classes or interfaces to extract methods from.
+ * @param excludedMembers - Method names to skip (e.g. non-oracle helpers like `constructor`).
+ */ export function getOracleInterfaceSignature(sourcePath, targets, excludedMembers) {
     // 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 sourceCode = readFileSync(sourcePath, 'utf-8');
+    const sourceFile = ts.createSourceFile(sourcePath, sourceCode, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
+    // Extract method signatures from the target classes/interfaces
     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
+        // Look for class or interface declarations matching the target names
+        const isTarget = (ts.isClassDeclaration(node) || ts.isInterfaceDeclaration(node)) && targets.includes(node.name?.text ?? '');
+        if (isTarget) {
+            // Visit all members of the class/interface
             node.members.forEach((member)=>{
-                if (ts.isMethodDeclaration(member) && member.name && ts.isIdentifier(member.name)) {
+                if ((ts.isMethodDeclaration(member) || ts.isMethodSignature(member)) && member.name && ts.isIdentifier(member.name)) {
                     const methodName = member.name.text;
                     // Skip excluded methods
-                    if (excludedProps.includes(methodName)) {
+                    if (excludedMembers.includes(methodName)) {
                         return;
                     }
                     // Extract parameter signatures

package/dest/bin/index.d.ts

@@ -0,0 +1,2 @@
+export { getOracleInterfaceSignature } from './check_oracle_version.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9iaW4vaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sMkJBQTJCLENBQUMifQ==

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,2BAA2B,EAAE,MAAM,2BAA2B,CAAC"}

package/dest/bin/index.js

@@ -0,0 +1 @@
+export { getOracleInterfaceSignature } from './check_oracle_version.js';

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;
+ * `getCheckpoints` requests blocks + L1 info + attestations so that `PublishedCheckpoint`
+ * instances are fully populated.
+ */
+export declare function blockStreamSourceFromAztecNode(node: AztecNode): Pick<L2BlockSource, 'getBlocks' | 'getBlockData' | 'getL2Tips' | 'getCheckpoints'>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfc3RyZWFtX3NvdXJjZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jsb2NrX3N5bmNocm9uaXplci9ibG9ja19zdHJlYW1fc291cmNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFNTCxLQUFLLGFBQWEsRUFDbkIsTUFBTSxxQkFBcUIsQ0FBQztBQUU3QixPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRTs7Ozs7R0FLRztBQUNILHdCQUFnQiw4QkFBOEIsQ0FDNUMsSUFBSSxFQUFFLFNBQVMsR0FDZCxJQUFJLENBQUMsYUFBYSxFQUFFLFdBQVcsR0FBRyxjQUFjLEdBQUcsV0FBVyxHQUFHLGdCQUFnQixDQUFDLENBNERwRiJ9

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":"AACA,OAAO,EAML,KAAK,aAAa,EACnB,MAAM,qBAAqB,CAAC;AAE7B,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,GAAG,gBAAgB,CAAC,CA4DpF"}

package/dest/block_synchronizer/block_stream_source.js

@@ -0,0 +1,62 @@
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { L2Block } from '@aztec/stdlib/block';
+import { Checkpoint, L1PublishedData, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
+/**
+ * Lifts an {@link AztecNode} RPC client into the shape {@link L2BlockStream} expects.
+ * `getBlocks` requests transaction bodies so that real `L2Block` instances can be constructed;
+ * `getCheckpoints` requests blocks + L1 info + attestations so that `PublishedCheckpoint`
+ * instances are fully populated.
+ */ export function blockStreamSourceFromAztecNode(node) {
+    return {
+        getL2Tips: async ()=>{
+            const tips = await node.getChainTips();
+            return {
+                ...tips,
+                proposedCheckpoint: tips.checkpointed
+            };
+        },
+        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));
+        },
+        async getCheckpoints (query) {
+            if (!('from' in query)) {
+                throw new Error('getCheckpoints with epoch query not supported via AztecNode RPC');
+            }
+            const { from, limit } = query;
+            const responses = await node.getCheckpoints(from, limit, {
+                includeBlocks: true,
+                includeTransactions: true,
+                includeL1PublishInfo: true,
+                includeAttestations: true
+            });
+            return responses.map((r)=>{
+                const checkpoint = new Checkpoint(r.archive, r.header, r.blocks.map((b)=>new L2Block(b.archive, b.header, b.body, b.checkpointNumber, b.indexWithinCheckpoint)), r.number, r.feeAssetPriceModifier);
+                const l1 = r.l1?.published === true ? new L1PublishedData(r.l1.blockNumber, r.l1.timestamp, r.l1.blockHash) : new L1PublishedData(0n, 0n, Fr.ZERO.toString());
+                return new PublishedCheckpoint(checkpoint, l1, r.attestations ?? []);
+            });
+        }
+    };
+}

package/dest/block_synchronizer/block_synchronizer.d.ts

@@ -1,8 +1,10 @@
-import { type Logger } from '@aztec/foundation/log';
+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 { PXEConfig } from '../config/index.js';
+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 { PrivateEventStore } from '../storage/private_event_store/private_event_store.js';
@@ -13,17 +15,23 @@ import type { PrivateEventStore } from '../storage/private_event_store/private_e
  */
 export declare class BlockSynchronizer implements L2BlockStreamEventHandler {
     private node;
+    private store;
     private anchorBlockStore;
     private noteStore;
     private privateEventStore;
     private l2TipsStore;
+    private contractSyncService;
+    private config;
     private log;
     private isSyncing;
+    private readonly eventQueue;
     protected readonly blockStream: L2BlockStream;
-    constructor(node: AztecNode, anchorBlockStore: AnchorBlockStore, noteStore: NoteStore, privateEventStore: PrivateEventStore, l2TipsStore: L2TipsKVStore, config?: Partial<Pick<PXEConfig, 'l2BlockBatchSize'>>, loggerOrSuffix?: string | Logger);
-    protected createBlockStream(config: Partial<Pick<PXEConfig, 'l2BlockBatchSize'>>): L2BlockStream;
-    /** Handle events emitted by the block stream. */
+    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. 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
      * recent data (e.g. notes), and handling any reorgs that might have occurred.
@@ -34,6 +42,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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfc3luY2hyb25pemVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2tfc3luY2hyb25pemVyL2Jsb2NrX3N5bmNocm9uaXplci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFDbEUsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDNUQsT0FBTyxFQUFFLGFBQWEsRUFBRSxLQUFLLGtCQUFrQixFQUFFLEtBQUsseUJBQXlCLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUM3RyxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHFEQUFxRCxDQUFDO0FBQzVGLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBQ3JFLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sdURBQXVELENBQUM7QUFFL0Y7Ozs7R0FJRztBQUNILHFCQUFhLGlCQUFrQixZQUFXLHlCQUF5QjtJQU0vRCxPQUFPLENBQUMsSUFBSTtJQUNaLE9BQU8sQ0FBQyxnQkFBZ0I7SUFDeEIsT0FBTyxDQUFDLFNBQVM7SUFDakIsT0FBTyxDQUFDLGlCQUFpQjtJQUN6QixPQUFPLENBQUMsV0FBVztJQVRyQixPQUFPLENBQUMsR0FBRyxDQUFTO0lBQ3BCLE9BQU8sQ0FBQyxTQUFTLENBQTRCO0lBQzdDLFNBQVMsQ0FBQyxRQUFRLENBQUMsV0FBVyxFQUFFLGFBQWEsQ0FBQztJQUU5QyxZQUNVLElBQUksRUFBRSxTQUFTLEVBQ2YsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQ2xDLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLGlCQUFpQixFQUFFLGlCQUFpQixFQUNwQyxXQUFXLEVBQUUsYUFBYSxFQUNsQyxNQUFNLEdBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsa0JBQWtCLENBQUMsQ0FBTSxFQUN6RCxjQUFjLENBQUMsRUFBRSxNQUFNLEdBQUcsTUFBTSxFQU9qQztJQUVELFNBQVMsQ0FBQyxpQkFBaUIsQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsa0JBQWtCLENBQUMsQ0FBQyxpQkFPL0U7SUFFRCxpREFBaUQ7SUFDcEMsc0JBQXNCLENBQUMsS0FBSyxFQUFFLGtCQUFrQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0E4QjVFO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDVSxJQUFJLGtCQWVoQjtZQUVhLE1BQU07Q0FjckIifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfc3luY2hyb25pemVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2tfc3luY2hyb25pemVyL2Jsb2NrX3N5bmNocm9uaXplci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQWUsS0FBSyxjQUFjLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFFdkYsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM1RCxPQUFPLEVBQWEsYUFBYSxFQUFFLEtBQUssa0JBQWtCLEVBQUUsS0FBSyx5QkFBeUIsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3hILE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBR2pFLE9BQU8sS0FBSyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDbEUsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUNyRixPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHFEQUFxRCxDQUFDO0FBQzVGLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBQ3JFLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sdURBQXVELENBQUM7QUFHL0Y7Ozs7R0FJRztBQUNILHFCQUFhLGlCQUFrQixZQUFXLHlCQUF5QjtJQU8vRCxPQUFPLENBQUMsSUFBSTtJQUNaLE9BQU8sQ0FBQyxLQUFLO0lBQ2IsT0FBTyxDQUFDLGdCQUFnQjtJQUN4QixPQUFPLENBQUMsU0FBUztJQUNqQixPQUFPLENBQUMsaUJBQWlCO0lBQ3pCLE9BQU8sQ0FBQyxXQUFXO0lBQ25CLE9BQU8sQ0FBQyxtQkFBbUI7SUFDM0IsT0FBTyxDQUFDLE1BQU07SUFiaEIsT0FBTyxDQUFDLEdBQUcsQ0FBUztJQUNwQixPQUFPLENBQUMsU0FBUyxDQUE0QjtJQUM3QyxPQUFPLENBQUMsUUFBUSxDQUFDLFVBQVUsQ0FBcUI7SUFDaEQsU0FBUyxDQUFDLFFBQVEsQ0FBQyxXQUFXLEVBQUUsYUFBYSxDQUFDO0lBRTlDLFlBQ1UsSUFBSSxFQUFFLFNBQVMsRUFDZixLQUFLLEVBQUUsaUJBQWlCLEVBQ3hCLGdCQUFnQixFQUFFLGdCQUFnQixFQUNsQyxTQUFTLEVBQUUsU0FBUyxFQUNwQixpQkFBaUIsRUFBRSxpQkFBaUIsRUFDcEMsV0FBVyxFQUFFLGFBQWEsRUFDMUIsbUJBQW1CLEVBQUUsbUJBQW1CLEVBQ3hDLE1BQU0sR0FBRSxPQUFPLENBQUMsdUJBQXVCLENBQU0sRUFDckQsUUFBUSxDQUFDLEVBQUUsY0FBYyxFQUsxQjtJQUVELFNBQVMsQ0FBQyxpQkFBaUIsQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLHVCQUF1QixDQUFDLEdBQUcsYUFBYSxDQWFuRjtJQUVELDZHQUE2RztJQUN0RyxzQkFBc0IsQ0FBQyxLQUFLLEVBQUUsa0JBQWtCLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUV0RTtZQUVhLHdCQUF3QjtZQThFeEIsdUJBQXVCO0lBU3JDOzs7Ozs7OztPQVFHO0lBQ1UsSUFBSSxrQkFpQmhCO0lBRUQsb0dBQW9HO0lBQ3ZGLElBQUksa0JBSWhCO1lBRWEsTUFBTTtDQWNyQiJ9

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,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,KAAK,kBAAkB,EAAE,KAAK,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAC7G,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAEjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,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,gBAAgB;IACxB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,WAAW;IATrB,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,SAAS,CAA4B;IAC7C,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC;IAE9C,YACU,IAAI,EAAE,SAAS,EACf,gBAAgB,EAAE,gBAAgB,EAClC,SAAS,EAAE,SAAS,EACpB,iBAAiB,EAAE,iBAAiB,EACpC,WAAW,EAAE,aAAa,EAClC,MAAM,GAAE,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAM,EACzD,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM,EAOjC;IAED,SAAS,CAAC,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC,iBAO/E;IAED,iDAAiD;IACpC,sBAAsB,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CA8B5E;IAED;;;;;;;;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;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;AAG/F;;;;GAIG;AACH,qBAAa,iBAAkB,YAAW,yBAAyB;IAO/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;IAbhB,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,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,EAK1B;IAED,SAAS,CAAC,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,uBAAuB,CAAC,GAAG,aAAa,CAanF;IAED,6GAA6G;IACtG,sBAAsB,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAEtE;YAEa,wBAAwB;YA8ExB,uBAAuB;IASrC;;;;;;;;OAQG;IACU,IAAI,kBAiBhB;IAED,oGAAoG;IACvF,IAAI,kBAIhB;YAEa,MAAM;CAcrB"}

package/dest/block_synchronizer/block_synchronizer.js

@@ -1,68 +1,132 @@
 import { BlockNumber } from '@aztec/foundation/branded-types';
 import { createLogger } from '@aztec/foundation/log';
-import { L2BlockStream } from '@aztec/stdlib/block';
+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
  * for querying sync status.
  */ export class BlockSynchronizer {
     node;
+    store;
     anchorBlockStore;
     noteStore;
     privateEventStore;
     l2TipsStore;
+    contractSyncService;
+    config;
     log;
     isSyncing;
+    eventQueue;
     blockStream;
-    constructor(node, anchorBlockStore, noteStore, privateEventStore, l2TipsStore, config = {}, loggerOrSuffix){
+    constructor(node, store, anchorBlockStore, noteStore, privateEventStore, l2TipsStore, contractSyncService, config = {}, bindings){
         this.node = node;
+        this.store = store;
         this.anchorBlockStore = anchorBlockStore;
         this.noteStore = noteStore;
         this.privateEventStore = privateEventStore;
         this.l2TipsStore = l2TipsStore;
-        this.log = !loggerOrSuffix || typeof loggerOrSuffix === 'string' ? createLogger(loggerOrSuffix ? `pxe:block_synchronizer:${loggerOrSuffix}` : `pxe:block_synchronizer`) : loggerOrSuffix;
+        this.contractSyncService = contractSyncService;
+        this.config = config;
+        this.eventQueue = new SerialQueue();
+        this.log = createLogger('pxe:block_synchronizer', bindings);
         this.blockStream = this.createBlockStream(config);
+        this.eventQueue.start();
     }
     createBlockStream(config) {
-        return new L2BlockStream(this.node, this.l2TipsStore, this, createLogger('pxe:block_stream'), {
+        return new L2BlockStream(blockStreamSourceFromAztecNode(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
         });
     }
-    /** Handle events emitted by the block stream. */ async 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) {
         await this.l2TipsStore.handleBlockStreamEvent(event);
         switch(event.type){
             case 'blocks-added':
                 {
-                    const lastBlock = event.blocks.at(-1);
-                    this.log.verbose(`Updated pxe last block to ${lastBlock.number}`, {
-                        blockHash: lastBlock.hash(),
-                        archive: lastBlock.archive.root.toString(),
-                        header: lastBlock.header.toInspect()
-                    });
-                    await this.anchorBlockStore.setHeader(lastBlock.header);
+                    if (this.config.syncChainTip === undefined || this.config.syncChainTip === 'proposed') {
+                        const lastBlock = event.blocks.at(-1);
+                        await this.updateAnchorBlockHeader(lastBlock.header);
+                    }
+                    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);
+                    }
+                    break;
+                }
+            case 'chain-proven':
+                {
+                    if (this.config.syncChainTip === 'proven') {
+                        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;
+                }
+            case 'chain-finalized':
+                {
+                    if (this.config.syncChainTip === 'finalized') {
+                        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;
                 }
             case 'chain-pruned':
                 {
+                    const currentAnchorBlockHeader = await this.anchorBlockStore.getBlockHeader();
+                    const currentAnchorBlockNumber = currentAnchorBlockHeader.getBlockNumber();
+                    if (currentAnchorBlockNumber <= event.block.number) {
+                        this.log.verbose(`Ignoring prune event to block ${event.block.number} greater than current anchor block ${currentAnchorBlockNumber}`, {
+                            pruneEvent: event,
+                            currentAnchorBlockHeader: currentAnchorBlockHeader.toInspect()
+                        });
+                        return;
+                    }
                     this.log.warn(`Pruning data after block ${event.block.number} due to reorg`);
-                    // We first unnullify and then remove so that unnullified notes that were created after the block number end up deleted.
-                    const lastSynchedBlockNumber = (await this.anchorBlockStore.getBlockHeader()).getBlockNumber();
-                    await this.noteStore.rollbackNotesAndNullifiers(event.block.number, lastSynchedBlockNumber);
-                    await this.privateEventStore.rollbackEventsAfterBlock(event.block.number, lastSynchedBlockNumber);
-                    // Update the header to the last block.
-                    const newHeader = await this.node.getBlockHeader(event.block.number);
-                    if (!newHeader) {
-                        this.log.error(`Block header not found for block number ${event.block.number} during chain prune`);
-                    } else {
-                        await this.anchorBlockStore.setHeader(newHeader);
+                    // 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 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.updateAnchorBlockHeader(newAnchorBlockHeader);
+                    });
                     break;
                 }
         }
     }
+    /** 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();
+        this.log.verbose(`Updated pxe last block to ${blockHeader.getBlockNumber()}`, blockHeader.toInspect());
+        await this.anchorBlockStore.setHeader(blockHeader);
+    }
     /**
    * Syncs PXE and the node by downloading the metadata of the latest blocks, allowing simulations to use
    * recent data (e.g. notes), and handling any reorgs that might have occurred.
@@ -78,6 +142,8 @@ import { 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 {
@@ -86,6 +152,11 @@ import { 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 {
@@ -95,7 +166,7 @@ import { 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();
     }

package/dest/config/index.d.ts

@@ -1,6 +1,6 @@
 import { type ConfigMappingsType } from '@aztec/foundation/config';
-import { type DataStoreConfig } from '@aztec/kv-store/config';
 import { type ChainConfig } from '@aztec/stdlib/config';
+import { type DataStoreConfig } from '@aztec/stdlib/kv-store';
 export { getPackageInfo } from './package_info.js';
 /**
  * Configuration settings for the prover factory
@@ -15,6 +15,14 @@ export interface KernelProverConfig {
 export interface BlockSynchronizerConfig {
     /** Maximum amount of blocks to pull from the stream in one request when synchronizing */
     l2BlockBatchSize: number;
+    /** Which chain tip to sync to (proposed, checkpointed, proven, finalized) */
+    syncChainTip?: 'proposed' | 'checkpointed' | 'proven' | 'finalized';
+    /**
+     * Whether PXE should automatically sync with the node before each operation (simulate, prove, profile,
+     * execute utility, get private events, update contract). When disabled, callers (e.g. wallets) are
+     * responsible for calling `pxe.sync()` explicitly
+     */
+    autoSync: boolean;
 }
 export type PXEConfig = KernelProverConfig & DataStoreConfig & ChainConfig & BlockSynchronizerConfig;
 export type CliPXEOptions = {
@@ -32,4 +40,4 @@ export declare const allPxeConfigMappings: ConfigMappingsType<CliPXEOptions & PX
  * Creates an instance of CliPxeOptions out of environment variables
  */
 export declare function getCliPXEOptions(): CliPXEOptions & PXEConfig;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb25maWcvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUNMLEtBQUssa0JBQWtCLEVBS3hCLE1BQU0sMEJBQTBCLENBQUM7QUFDbEMsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFzQixNQUFNLHdCQUF3QixDQUFDO0FBQ2xGLE9BQU8sRUFBRSxLQUFLLFdBQVcsRUFBdUIsTUFBTSxzQkFBc0IsQ0FBQztBQUU3RSxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFbkQ7O0dBRUc7QUFDSCxNQUFNLFdBQVcsa0JBQWtCO0lBQ2pDLDhDQUE4QztJQUM5QyxhQUFhLENBQUMsRUFBRSxPQUFPLENBQUM7Q0FDekI7QUFFRDs7R0FFRztBQUNILE1BQU0sV0FBVyx1QkFBdUI7SUFDdEMseUZBQXlGO0lBQ3pGLGdCQUFnQixFQUFFLE1BQU0sQ0FBQztDQUMxQjtBQUVELE1BQU0sTUFBTSxTQUFTLEdBQUcsa0JBQWtCLEdBQUcsZUFBZSxHQUFHLFdBQVcsR0FBRyx1QkFBdUIsQ0FBQztBQUVyRyxNQUFNLE1BQU0sYUFBYSxHQUFHO0lBQzFCLDJDQUEyQztJQUMzQyxPQUFPLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDbEIsQ0FBQztBQUVGLGVBQU8sTUFBTSxpQkFBaUIsRUFBRSxrQkFBa0IsQ0FBQyxTQUFTLENBb0IzRCxDQUFDO0FBRUY7O0dBRUc7QUFDSCx3QkFBZ0IsWUFBWSxJQUFJLFNBQVMsQ0FFeEM7QUFFRCxlQUFPLE1BQU0sb0JBQW9CLEVBQUUsa0JBQWtCLENBQUMsYUFBYSxDQUtsRSxDQUFDO0FBRUYsZUFBTyxNQUFNLG9CQUFvQixFQUFFLGtCQUFrQixDQUFDLGFBQWEsR0FBRyxTQUFTLENBVzlFLENBQUM7QUFFRjs7R0FFRztBQUNILHdCQUFnQixnQkFBZ0IsSUFBSSxhQUFhLEdBQUcsU0FBUyxDQVE1RCJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb25maWcvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUNMLEtBQUssa0JBQWtCLEVBTXhCLE1BQU0sMEJBQTBCLENBQUM7QUFDbEMsT0FBTyxFQUFFLEtBQUssV0FBVyxFQUF1QixNQUFNLHNCQUFzQixDQUFDO0FBQzdFLE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBc0IsTUFBTSx3QkFBd0IsQ0FBQztBQUVsRixPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFbkQ7O0dBRUc7QUFDSCxNQUFNLFdBQVcsa0JBQWtCO0lBQ2pDLDhDQUE4QztJQUM5QyxhQUFhLENBQUMsRUFBRSxPQUFPLENBQUM7Q0FDekI7QUFFRDs7R0FFRztBQUNILE1BQU0sV0FBVyx1QkFBdUI7SUFDdEMseUZBQXlGO0lBQ3pGLGdCQUFnQixFQUFFLE1BQU0sQ0FBQztJQUN6Qiw2RUFBNkU7SUFDN0UsWUFBWSxDQUFDLEVBQUUsVUFBVSxHQUFHLGNBQWMsR0FBRyxRQUFRLEdBQUcsV0FBVyxDQUFDO0lBQ3BFOzs7O09BSUc7SUFDSCxRQUFRLEVBQUUsT0FBTyxDQUFDO0NBQ25CO0FBRUQsTUFBTSxNQUFNLFNBQVMsR0FBRyxrQkFBa0IsR0FBRyxlQUFlLEdBQUcsV0FBVyxHQUFHLHVCQUF1QixDQUFDO0FBRXJHLE1BQU0sTUFBTSxhQUFhLEdBQUc7SUFDMUIsMkNBQTJDO0lBQzNDLE9BQU8sQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUNsQixDQUFDO0FBRUYsZUFBTyxNQUFNLGlCQUFpQixFQUFFLGtCQUFrQixDQUFDLFNBQVMsQ0ErQjNELENBQUM7QUFFRjs7R0FFRztBQUNILHdCQUFnQixZQUFZLElBQUksU0FBUyxDQUV4QztBQUVELGVBQU8sTUFBTSxvQkFBb0IsRUFBRSxrQkFBa0IsQ0FBQyxhQUFhLENBS2xFLENBQUM7QUFFRixlQUFPLE1BQU0sb0JBQW9CLEVBQUUsa0JBQWtCLENBQUMsYUFBYSxHQUFHLFNBQVMsQ0FXOUUsQ0FBQztBQUVGOztHQUVHO0FBQ0gsd0JBQWdCLGdCQUFnQixJQUFJLGFBQWEsR0FBRyxTQUFTLENBUTVEIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EAKxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AAClF,OAAO,EAAE,KAAK,WAAW,EAAuB,MAAM,sBAAsB,CAAC;AAE7E,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,8CAA8C;IAC9C,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,yFAAyF;IACzF,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,MAAM,SAAS,GAAG,kBAAkB,GAAG,eAAe,GAAG,WAAW,GAAG,uBAAuB,CAAC;AAErG,MAAM,MAAM,aAAa,GAAG;IAC1B,2CAA2C;IAC3C,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,kBAAkB,CAAC,SAAS,CAoB3D,CAAC;AAEF;;GAEG;AACH,wBAAgB,YAAY,IAAI,SAAS,CAExC;AAED,eAAO,MAAM,oBAAoB,EAAE,kBAAkB,CAAC,aAAa,CAKlE,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,kBAAkB,CAAC,aAAa,GAAG,SAAS,CAW9E,CAAC;AAEF;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,aAAa,GAAG,SAAS,CAQ5D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EAMxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,KAAK,WAAW,EAAuB,MAAM,sBAAsB,CAAC;AAC7E,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AAElF,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,8CAA8C;IAC9C,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,yFAAyF;IACzF,gBAAgB,EAAE,MAAM,CAAC;IACzB,6EAA6E;IAC7E,YAAY,CAAC,EAAE,UAAU,GAAG,cAAc,GAAG,QAAQ,GAAG,WAAW,CAAC;IACpE;;;;OAIG;IACH,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,MAAM,SAAS,GAAG,kBAAkB,GAAG,eAAe,GAAG,WAAW,GAAG,uBAAuB,CAAC;AAErG,MAAM,MAAM,aAAa,GAAG;IAC1B,2CAA2C;IAC3C,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,kBAAkB,CAAC,SAAS,CA+B3D,CAAC;AAEF;;GAEG;AACH,wBAAgB,YAAY,IAAI,SAAS,CAExC;AAED,eAAO,MAAM,oBAAoB,EAAE,kBAAkB,CAAC,aAAa,CAKlE,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,kBAAkB,CAAC,aAAa,GAAG,SAAS,CAW9E,CAAC;AAEF;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,aAAa,GAAG,SAAS,CAQ5D"}

package/dest/config/index.js

@@ -1,6 +1,6 @@
-import { booleanConfigHelper, getConfigFromMappings, numberConfigHelper, parseBooleanEnv } from '@aztec/foundation/config';
-import { dataConfigMappings } from '@aztec/kv-store/config';
+import { booleanConfigHelper, enumConfigHelper, getConfigFromMappings, numberConfigHelper, parseBooleanEnv } from '@aztec/foundation/config';
 import { chainConfigMappings } from '@aztec/stdlib/config';
+import { dataConfigMappings } from '@aztec/stdlib/kv-store';
 export { getPackageInfo } from './package_info.js';
 export const pxeConfigMappings = {
     ...dataConfigMappings,
@@ -21,6 +21,21 @@ export const pxeConfigMappings = {
         env: 'PXE_PROVER_ENABLED',
         description: 'Enable real proofs',
         ...booleanConfigHelper(true)
+    },
+    syncChainTip: {
+        env: 'PXE_SYNC_CHAIN_TIP',
+        description: 'Which chain tip to sync to (proposed, checkpointed, proven, finalized)',
+        ...enumConfigHelper([
+            'proposed',
+            'checkpointed',
+            'proven',
+            'finalized'
+        ], 'proposed')
+    },
+    autoSync: {
+        env: 'PXE_AUTO_SYNC',
+        description: 'Whether PXE syncs with the node automatically before each operation. Disable to let the caller (e.g. a wallet) drive syncs explicitly via pxe.sync().',
+        ...booleanConfigHelper(true)
     }
 };
 /**

package/dest/config/package_info.js

@@ -1,6 +1,6 @@
 export function getPackageInfo() {
     return {
-        version: '4.0.0',
+        version: '5.0.0',
         name: '@aztec/pxe'
     };
 }

package/dest/contract_function_simulator/benchmarked_node.d.ts

@@ -0,0 +1,9 @@
+import type { AztecNode } from '@aztec/stdlib/interfaces/client';
+import type { NodeStats } from '@aztec/stdlib/tx';
+export type BenchmarkedNode = AztecNode & {
+    getStats(): NodeStats;
+};
+export declare class BenchmarkedNodeFactory {
+    static create(node: AztecNode): BenchmarkedNode;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmVuY2htYXJrZWRfbm9kZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0X2Z1bmN0aW9uX3NpbXVsYXRvci9iZW5jaG1hcmtlZF9ub2RlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2pFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBa0IsTUFBTSxrQkFBa0IsQ0FBQztBQWlCbEUsTUFBTSxNQUFNLGVBQWUsR0FBRyxTQUFTLEdBQUc7SUFBRSxRQUFRLElBQUksU0FBUyxDQUFBO0NBQUUsQ0FBQztBQUVwRSxxQkFBYSxzQkFBc0I7SUFDakMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsU0FBUyxHQUFHLGVBQWUsQ0ErRTlDO0NBQ0YifQ==

package/dest/contract_function_simulator/benchmarked_node.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"benchmarked_node.d.ts","sourceRoot":"","sources":["../../src/contract_function_simulator/benchmarked_node.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAkB,MAAM,kBAAkB,CAAC;AAiBlE,MAAM,MAAM,eAAe,GAAG,SAAS,GAAG;IAAE,QAAQ,IAAI,SAAS,CAAA;CAAE,CAAC;AAEpE,qBAAa,sBAAsB;IACjC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,SAAS,GAAG,eAAe,CA+E9C;CACF"}

package/dest/contract_function_simulator/benchmarked_node.js

@@ -0,0 +1,77 @@
+import { Timer } from '@aztec/foundation/timer';
+export class BenchmarkedNodeFactory {
+    static create(node) {
+        // Per-method call stats
+        const perMethod = {};
+        // Round trip tracking
+        let inFlightCount = 0;
+        let currentRoundTripTimer = null;
+        let currentRoundTripMethods = [];
+        const roundTrips = {
+            roundTrips: 0,
+            totalBlockingTime: 0,
+            roundTripDurations: [],
+            roundTripMethods: []
+        };
+        return new Proxy(node, {
+            get (target, prop) {
+                if (prop === 'getStats') {
+                    return ()=>{
+                        return {
+                            perMethod,
+                            roundTrips
+                        };
+                    };
+                } else {
+                    return function(...args) {
+                        // Track per-method stats
+                        if (!perMethod[prop]) {
+                            perMethod[prop] = {
+                                times: []
+                            };
+                        }
+                        // Start of a new round trip batch?
+                        if (inFlightCount === 0) {
+                            roundTrips.roundTrips++;
+                            currentRoundTripTimer = new Timer();
+                            currentRoundTripMethods = [];
+                        }
+                        inFlightCount++;
+                        currentRoundTripMethods.push(prop);
+                        const callTimer = new Timer();
+                        const result = target[prop].apply(target, args);
+                        // Handle completion - called when the call finishes (after Promise resolves)
+                        const handleCompletion = ()=>{
+                            const callTime = callTimer.ms();
+                            perMethod[prop].times.push(callTime);
+                            inFlightCount--;
+                            // End of round trip batch - all concurrent calls completed
+                            if (inFlightCount === 0 && currentRoundTripTimer) {
+                                const roundTripTime = currentRoundTripTimer.ms();
+                                roundTrips.totalBlockingTime += roundTripTime;
+                                roundTrips.roundTripDurations.push(roundTripTime);
+                                roundTrips.roundTripMethods.push(currentRoundTripMethods);
+                                currentRoundTripTimer = null;
+                                currentRoundTripMethods = [];
+                            }
+                        };
+                        // If the result is a Promise, chain the completion handler
+                        if (result && typeof result.then === 'function') {
+                            return result.then((value)=>{
+                                handleCompletion();
+                                return value;
+                            }, (error)=>{
+                                handleCompletion();
+                                throw error;
+                            });
+                        } else {
+                            // Synchronous method - handle completion immediately
+                            handleCompletion();
+                            return result;
+                        }
+                    };
+                }
+            }
+        });
+    }
+}