@aztec/pxe 0.66.0 → 0.67.1-devnet

package/dest/synchronizer/synchronizer.d.ts

@@ -3,57 +3,27 @@ import { type L2TipsStore } from '@aztec/kv-store/stores';
 import { type PXEConfig } from '../config/index.js';
 import { type PxeDatabase } from '../database/index.js';
 /**
- * The Synchronizer class manages the synchronization of note processors and interacts with the Aztec node
- * to obtain encrypted logs, blocks, and other necessary information for the accounts.
- * It provides methods to start or stop the synchronization process, add new accounts, retrieve account
- * details, and fetch transactions by hash. The Synchronizer ensures that it maintains the note processors
- * in sync with the blockchain while handling retries and errors gracefully.
+ * The Synchronizer class manages the synchronization with the aztec node, allowing PXE to retrieve the
+ * latest block header and handle reorgs.
+ * It provides methods to trigger a sync and get the block number we are syncec to
+ * details, and fetch transactions by hash.
  */
 export declare class Synchronizer implements L2BlockStreamEventHandler {
     private node;
     private db;
     private l2TipsStore;
-    private running;
     private initialSyncBlockNumber;
     private log;
     protected readonly blockStream: L2BlockStream;
-    constructor(node: AztecNode, db: PxeDatabase, l2TipsStore: L2TipsStore, config?: Partial<Pick<PXEConfig, 'l2BlockPollingIntervalMS' | 'l2StartingBlock'>>, logSuffix?: string);
-    protected createBlockStream(config: Partial<Pick<PXEConfig, 'l2BlockPollingIntervalMS' | 'l2StartingBlock'>>): L2BlockStream;
+    constructor(node: AztecNode, db: PxeDatabase, l2TipsStore: L2TipsStore, config?: Partial<Pick<PXEConfig, 'l2StartingBlock'>>, logSuffix?: string);
+    protected createBlockStream(config: Partial<Pick<PXEConfig, 'l2StartingBlock'>>): L2BlockStream;
     /** Handle events emitted by the block stream. */
     handleBlockStreamEvent(event: L2BlockStreamEvent): Promise<void>;
     /**
-     * Starts the synchronization process by fetching encrypted logs and blocks from a specified position.
-     * Continuously processes the fetched data for all note processors until stopped. If there is no data
-     * available, it retries after a specified interval.
-     *
-     * @param limit - The maximum number of encrypted, unencrypted logs and blocks to fetch in each iteration.
-     * @param retryInterval - The time interval (in ms) to wait before retrying if no data is available.
+     * Syncs PXE and the node by dowloading the metadata of the latest blocks, allowing simulations to use
+     * recent data (e.g. notes), and handling any reorgs that might have occurred.
      */
-    start(): Promise<void>;
-    /**
-     * Stops the synchronizer gracefully, interrupting any ongoing sleep and waiting for the current
-     * iteration to complete before setting the running state to false. Once stopped, the synchronizer
-     * will no longer process blocks or encrypted logs and must be restarted using the start method.
-     *
-     * @returns A promise that resolves when the synchronizer has successfully stopped.
-     */
-    stop(): Promise<void>;
-    /** Triggers a single run. */
-    trigger(): Promise<void>;
-    private getSynchedBlockNumber;
-    /**
-     * Checks whether all the blocks were processed (tree roots updated, txs updated with block info, etc.).
-     * @returns True if there are no outstanding blocks to be synched.
-     * @remarks This indicates that blocks and transactions are synched even if notes are not.
-     * @remarks Compares local block number with the block number from aztec node.
-     */
-    isGlobalStateSynchronized(): Promise<boolean>;
-    /**
-     * Returns the latest block that has been synchronized by the synchronizer and each account.
-     * @returns The latest block synchronized for blocks, and the latest block synched for notes for each public key being tracked.
-     */
-    getSyncStatus(): {
-        blocks: number;
-    };
+    sync(): Promise<void>;
+    getSynchedBlockNumber(): Promise<number>;
 }
 //# sourceMappingURL=synchronizer.d.ts.map

package/dest/synchronizer/synchronizer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"synchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/synchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,SAAS,EACd,aAAa,EACb,KAAK,kBAAkB,EACvB,KAAK,yBAAyB,EAC/B,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE1D,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD;;;;;;GAMG;AACH,qBAAa,YAAa,YAAW,yBAAyB;IAO1D,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,WAAW;IARrB,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,sBAAsB,CAA4B;IAC1D,OAAO,CAAC,GAAG,CAAc;IACzB,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC;gBAGpC,IAAI,EAAE,SAAS,EACf,EAAE,EAAE,WAAW,EACf,WAAW,EAAE,WAAW,EAChC,MAAM,GAAE,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,0BAA0B,GAAG,iBAAiB,CAAC,CAAM,EACrF,SAAS,CAAC,EAAE,MAAM;IAMpB,SAAS,CAAC,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,0BAA0B,GAAG,iBAAiB,CAAC,CAAC;IAO5G,iDAAiD;IACpC,sBAAsB,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAsB7E;;;;;;;OAOG;IACU,KAAK;IAelB;;;;;;OAMG;IACU,IAAI;IAMjB,6BAA6B;IAChB,OAAO;IAIpB,OAAO,CAAC,qBAAqB;IAI7B;;;;;OAKG;IACU,yBAAyB;IAKtC;;;OAGG;IACI,aAAa;;;CAMrB"}
+{"version":3,"file":"synchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/synchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,SAAS,EACd,aAAa,EACb,KAAK,kBAAkB,EACvB,KAAK,yBAAyB,EAC/B,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE1D,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD;;;;;GAKG;AACH,qBAAa,YAAa,YAAW,yBAAyB;IAM1D,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,WAAW;IAPrB,OAAO,CAAC,sBAAsB,CAA4B;IAC1D,OAAO,CAAC,GAAG,CAAS;IACpB,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC;gBAGpC,IAAI,EAAE,SAAS,EACf,EAAE,EAAE,WAAW,EACf,WAAW,EAAE,WAAW,EAChC,MAAM,GAAE,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAM,EACxD,SAAS,CAAC,EAAE,MAAM;IAMpB,SAAS,CAAC,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;IAM/E,iDAAiD;IACpC,sBAAsB,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IA6B7E;;;OAGG;IACU,IAAI;IAeJ,qBAAqB;CAGnC"}

package/dest/synchronizer/synchronizer.js

@@ -1,26 +1,23 @@
 import { L2BlockStream, } from '@aztec/circuit-types';
 import { INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js';
-import { createDebugLogger } from '@aztec/foundation/log';
+import { createLogger } from '@aztec/foundation/log';
 /**
- * The Synchronizer class manages the synchronization of note processors and interacts with the Aztec node
- * to obtain encrypted logs, blocks, and other necessary information for the accounts.
- * It provides methods to start or stop the synchronization process, add new accounts, retrieve account
- * details, and fetch transactions by hash. The Synchronizer ensures that it maintains the note processors
- * in sync with the blockchain while handling retries and errors gracefully.
+ * The Synchronizer class manages the synchronization with the aztec node, allowing PXE to retrieve the
+ * latest block header and handle reorgs.
+ * It provides methods to trigger a sync and get the block number we are syncec to
+ * details, and fetch transactions by hash.
  */
 export class Synchronizer {
     constructor(node, db, l2TipsStore, config = {}, logSuffix) {
         this.node = node;
         this.db = db;
         this.l2TipsStore = l2TipsStore;
-        this.running = false;
         this.initialSyncBlockNumber = INITIAL_L2_BLOCK_NUM - 1;
-        this.log = createDebugLogger(logSuffix ? `aztec:pxe_synchronizer_${logSuffix}` : 'aztec:pxe_synchronizer');
+        this.log = createLogger(logSuffix ? `pxe:synchronizer:${logSuffix}` : 'pxe:synchronizer');
         this.blockStream = this.createBlockStream(config);
     }
     createBlockStream(config) {
-        return new L2BlockStream(this.node, this.l2TipsStore, this, {
-            pollIntervalMS: config.l2BlockPollingIntervalMS,
+        return new L2BlockStream(this.node, this.l2TipsStore, this, createLogger('pxe:block_stream'), {
             startingBlock: config.l2StartingBlock,
         });
     }
@@ -28,12 +25,18 @@ export class Synchronizer {
     async handleBlockStreamEvent(event) {
         await this.l2TipsStore.handleBlockStreamEvent(event);
         switch (event.type) {
-            case 'blocks-added':
-                this.log.verbose(`Processing blocks ${event.blocks[0].number} to ${event.blocks.at(-1).number}`);
-                await this.db.setHeader(event.blocks.at(-1).header);
+            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.db.setHeader(lastBlock.header);
                 break;
-            case 'chain-pruned':
-                this.log.info(`Pruning data after block ${event.blockNumber} due to reorg`);
+            }
+            case 'chain-pruned': {
+                this.log.warn(`Pruning data after block ${event.blockNumber} due to reorg`);
                 // We first unnullify and then remove so that unnullified notes that were created after the block number end up deleted.
                 await this.db.unnullifyNotesAfter(event.blockNumber);
                 await this.db.removeNotesAfter(event.blockNumber);
@@ -43,66 +46,29 @@ export class Synchronizer {
                 // Update the header to the last block.
                 await this.db.setHeader(await this.node.getBlockHeader(event.blockNumber));
                 break;
+            }
         }
     }
     /**
-     * Starts the synchronization process by fetching encrypted logs and blocks from a specified position.
-     * Continuously processes the fetched data for all note processors until stopped. If there is no data
-     * available, it retries after a specified interval.
-     *
-     * @param limit - The maximum number of encrypted, unencrypted logs and blocks to fetch in each iteration.
-     * @param retryInterval - The time interval (in ms) to wait before retrying if no data is available.
+     * Syncs PXE and the node by dowloading the metadata of the latest blocks, allowing simulations to use
+     * recent data (e.g. notes), and handling any reorgs that might have occurred.
      */
-    async start() {
-        if (this.running) {
-            return;
+    async sync() {
+        let currentHeader;
+        try {
+            currentHeader = await this.db.getBlockHeader();
+        }
+        catch (e) {
+            this.log.debug('Header is not set, requesting from the node');
+        }
+        if (!currentHeader) {
+            // REFACTOR: We should know the header of the genesis block without having to request it from the node.
+            await this.db.setHeader(await this.node.getBlockHeader(0));
         }
-        this.running = true;
-        // REFACTOR: We should know the header of the genesis block without having to request it from the node.
-        await this.db.setHeader(await this.node.getBlockHeader(0));
-        await this.trigger();
-        this.log.info('Initial sync complete');
-        this.blockStream.start();
-        this.log.debug('Started loop');
-    }
-    /**
-     * Stops the synchronizer gracefully, interrupting any ongoing sleep and waiting for the current
-     * iteration to complete before setting the running state to false. Once stopped, the synchronizer
-     * will no longer process blocks or encrypted logs and must be restarted using the start method.
-     *
-     * @returns A promise that resolves when the synchronizer has successfully stopped.
-     */
-    async stop() {
-        this.running = false;
-        await this.blockStream.stop();
-        this.log.info('Stopped');
-    }
-    /** Triggers a single run. */
-    async trigger() {
         await this.blockStream.sync();
     }
-    getSynchedBlockNumber() {
-        return this.db.getBlockNumber() ?? this.initialSyncBlockNumber;
-    }
-    /**
-     * Checks whether all the blocks were processed (tree roots updated, txs updated with block info, etc.).
-     * @returns True if there are no outstanding blocks to be synched.
-     * @remarks This indicates that blocks and transactions are synched even if notes are not.
-     * @remarks Compares local block number with the block number from aztec node.
-     */
-    async isGlobalStateSynchronized() {
-        const latest = await this.node.getBlockNumber();
-        return latest <= this.getSynchedBlockNumber();
-    }
-    /**
-     * Returns the latest block that has been synchronized by the synchronizer and each account.
-     * @returns The latest block synchronized for blocks, and the latest block synched for notes for each public key being tracked.
-     */
-    getSyncStatus() {
-        const lastBlockNumber = this.getSynchedBlockNumber();
-        return {
-            blocks: lastBlockNumber,
-        };
+    async getSynchedBlockNumber() {
+        return (await this.db.getBlockNumber()) ?? this.initialSyncBlockNumber;
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3luY2hyb25pemVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3N5bmNocm9uaXplci9zeW5jaHJvbml6ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUVMLGFBQWEsR0FHZCxNQUFNLHNCQUFzQixDQUFDO0FBQzlCLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQzFELE9BQU8sRUFBb0IsaUJBQWlCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQU01RTs7Ozs7O0dBTUc7QUFDSCxNQUFNLE9BQU8sWUFBWTtJQU12QixZQUNVLElBQWUsRUFDZixFQUFlLEVBQ2YsV0FBd0IsRUFDaEMsU0FBbUYsRUFBRSxFQUNyRixTQUFrQjtRQUpWLFNBQUksR0FBSixJQUFJLENBQVc7UUFDZixPQUFFLEdBQUYsRUFBRSxDQUFhO1FBQ2YsZ0JBQVcsR0FBWCxXQUFXLENBQWE7UUFSMUIsWUFBTyxHQUFHLEtBQUssQ0FBQztRQUNoQiwyQkFBc0IsR0FBRyxvQkFBb0IsR0FBRyxDQUFDLENBQUM7UUFXeEQsSUFBSSxDQUFDLEdBQUcsR0FBRyxpQkFBaUIsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLDBCQUEwQixTQUFTLEVBQUUsQ0FBQyxDQUFDLENBQUMsd0JBQXdCLENBQUMsQ0FBQztRQUMzRyxJQUFJLENBQUMsV0FBVyxHQUFHLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUNwRCxDQUFDO0lBRVMsaUJBQWlCLENBQUMsTUFBZ0Y7UUFDMUcsT0FBTyxJQUFJLGFBQWEsQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxXQUFXLEVBQUUsSUFBSSxFQUFFO1lBQzFELGNBQWMsRUFBRSxNQUFNLENBQUMsd0JBQXdCO1lBQy9DLGFBQWEsRUFBRSxNQUFNLENBQUMsZUFBZTtTQUN0QyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsaURBQWlEO0lBQzFDLEtBQUss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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3luY2hyb25pemVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3N5bmNocm9uaXplci9zeW5jaHJvbml6ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUVMLGFBQWEsR0FHZCxNQUFNLHNCQUFzQixDQUFDO0FBQzlCLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQzFELE9BQU8sRUFBZSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQU1sRTs7Ozs7R0FLRztBQUNILE1BQU0sT0FBTyxZQUFZO0lBS3ZCLFlBQ1UsSUFBZSxFQUNmLEVBQWUsRUFDZixXQUF3QixFQUNoQyxTQUFzRCxFQUFFLEVBQ3hELFNBQWtCO1FBSlYsU0FBSSxHQUFKLElBQUksQ0FBVztRQUNmLE9BQUUsR0FBRixFQUFFLENBQWE7UUFDZixnQkFBVyxHQUFYLFdBQVcsQ0FBYTtRQVAxQiwyQkFBc0IsR0FBRyxvQkFBb0IsR0FBRyxDQUFDLENBQUM7UUFXeEQsSUFBSSxDQUFDLEdBQUcsR0FBRyxZQUFZLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxvQkFBb0IsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLENBQUM7UUFDMUYsSUFBSSxDQUFDLFdBQVcsR0FBRyxJQUFJLENBQUMsaUJBQWlCLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDcEQsQ0FBQztJQUVTLGlCQUFpQixDQUFDLE1BQW1EO1FBQzdFLE9BQU8sSUFBSSxhQUFhLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsV0FBVyxFQUFFLElBQUksRUFBRSxZQUFZLENBQUMsa0JBQWtCLENBQUMsRUFBRTtZQUM1RixhQUFhLEVBQUUsTUFBTSxDQUFDLGVBQWU7U0FDdEMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELGlEQUFpRDtJQUMxQyxLQUFLLENBQUMsc0JBQXNCLENBQUMsS0FBeUI7UUFDM0QsTUFBTSxJQUFJLENBQUMsV0FBVyxDQUFDLHNCQUFzQixDQUFDLEtBQUssQ0FBQyxDQUFDO1FBRXJELFFBQVEsS0FBSyxDQUFDLElBQUksRUFBRSxDQUFDO1lBQ25CLEtBQUssY0FBYyxDQUFDLENBQUMsQ0FBQztnQkFDcEIsTUFBTSxTQUFTLEdBQUcsS0FBSyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUUsQ0FBQztnQkFDdkMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsNkJBQTZCLFNBQVMsQ0FBQyxNQUFNLEVBQUUsRUFBRTtvQkFDaEUsU0FBUyxFQUFFLFNBQVMsQ0FBQyxJQUFJLEVBQUU7b0JBQzNCLE9BQU8sRUFBRSxTQUFTLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUU7b0JBQzFDLE1BQU0sRUFBRSxTQUFTLENBQUMsTUFBTSxDQUFDLFNBQVMsRUFBRTtpQkFDckMsQ0FBQyxDQUFDO2dCQUNILE1BQU0sSUFBSSxDQUFDLEVBQUUsQ0FBQyxTQUFTLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxDQUFDO2dCQUMxQyxNQUFNO1lBQ1IsQ0FBQztZQUNELEtBQUssY0FBYyxDQUFDLENBQUMsQ0FBQztnQkFDcEIsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsNEJBQTRCLEtBQUssQ0FBQyxXQUFXLGVBQWUsQ0FBQyxDQUFDO2dCQUM1RSx3SEFBd0g7Z0JBQ3hILE1BQU0sSUFBSSxDQUFDLEVBQUUsQ0FBQyxtQkFBbUIsQ0FBQyxLQUFLLENBQUMsV0FBVyxDQUFDLENBQUM7Z0JBQ3JELE1BQU0sSUFBSSxDQUFDLEVBQUUsQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLENBQUMsV0FBVyxDQUFDLENBQUM7Z0JBQ2xELHNHQUFzRztnQkFDdEcsK0RBQStEO2dCQUMvRCxNQUFNLElBQUksQ0FBQyxFQUFFLENBQUMsaUJBQWlCLEVBQUUsQ0FBQztnQkFDbEMsdUNBQXVDO2dCQUN2QyxNQUFNLElBQUksQ0FBQyxFQUFFLENBQUMsU0FBUyxDQUFDLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxjQUFjLENBQUMsS0FBSyxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUM7Z0JBQzNFLE1BQU07WUFDUixDQUFDO1FBQ0gsQ0FBQztJQUNILENBQUM7SUFFRDs7O09BR0c7SUFDSSxLQUFLLENBQUMsSUFBSTtRQUNmLElBQUksYUFBYSxDQUFDO1FBRWxCLElBQUksQ0FBQztZQUNILGFBQWEsR0FBRyxNQUFNLElBQUksQ0FBQyxFQUFFLENBQUMsY0FBYyxFQUFFLENBQUM7UUFDakQsQ0FBQztRQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUM7WUFDWCxJQUFJLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyw2Q0FBNkMsQ0FBQyxDQUFDO1FBQ2hFLENBQUM7UUFDRCxJQUFJLENBQUMsYUFBYSxFQUFFLENBQUM7WUFDbkIsdUdBQXVHO1lBQ3ZHLE1BQU0sSUFBSSxDQUFDLEVBQUUsQ0FBQyxTQUFTLENBQUMsTUFBTSxJQUFJLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzdELENBQUM7UUFDRCxNQUFNLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDaEMsQ0FBQztJQUVNLEtBQUssQ0FBQyxxQkFBcUI7UUFDaEMsT0FBTyxDQUFDLE1BQU0sSUFBSSxDQUFDLEVBQUUsQ0FBQyxjQUFjLEVBQUUsQ0FBQyxJQUFJLElBQUksQ0FBQyxzQkFBc0IsQ0FBQztJQUN6RSxDQUFDO0NBQ0YifQ==

package/dest/{pxe_service → utils}/create_pxe_service.d.ts

@@ -1,6 +1,6 @@
 import { type AztecNode, type PrivateKernelProver } from '@aztec/circuit-types';
 import { type PXEServiceConfig } from '../config/index.js';
-import { PXEService } from './pxe_service.js';
+import { PXEService } from '../pxe_service/pxe_service.js';
 /**
  * Create and start an PXEService instance with the given AztecNode.
  * If no keyStore or database is provided, it will use KeyStore and MemoryDB as default values.

package/dest/utils/create_pxe_service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"create_pxe_service.d.ts","sourceRoot":"","sources":["../../src/utils/create_pxe_service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAOhF,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAG3D,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D;;;;;;;;;;GAUG;AACH,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,gBAAgB,EACxB,YAAY,GAAE,MAAM,GAAG,OAAO,GAAG,SAAqB,EACtD,YAAY,CAAC,EAAE,mBAAmB,uBAwBnC"}

package/dest/utils/create_pxe_service.js

@@ -0,0 +1,52 @@
+import { BBNativePrivateKernelProver } from '@aztec/bb-prover';
+import { BBWasmPrivateKernelProver } from '@aztec/bb-prover/wasm';
+import { randomBytes } from '@aztec/foundation/crypto';
+import { createLogger } from '@aztec/foundation/log';
+import { KeyStore } from '@aztec/key-store';
+import { createStore } from '@aztec/kv-store/lmdb';
+import { L2TipsStore } from '@aztec/kv-store/stores';
+import { KVPxeDatabase } from '../database/kv_pxe_database.js';
+import { TestPrivateKernelProver } from '../kernel_prover/test/test_circuit_prover.js';
+import { PXEService } from '../pxe_service/pxe_service.js';
+/**
+ * Create and start an PXEService instance with the given AztecNode.
+ * If no keyStore or database is provided, it will use KeyStore and MemoryDB as default values.
+ * Returns a Promise that resolves to the started PXEService instance.
+ *
+ * @param aztecNode - The AztecNode instance to be used by the server.
+ * @param config - The PXE Service Config to use
+ * @param options - (Optional) Optional information for creating an PXEService.
+ * @param proofCreator - An optional proof creator to use in place of any other configuration
+ * @returns A Promise that resolves to the started PXEService instance.
+ */
+export async function createPXEService(aztecNode, config, useLogSuffix = undefined, proofCreator) {
+    const logSuffix = typeof useLogSuffix === 'boolean' ? (useLogSuffix ? randomBytes(3).toString('hex') : undefined) : useLogSuffix;
+    const l1Contracts = await aztecNode.getL1ContractAddresses();
+    const configWithContracts = {
+        ...config,
+        l1Contracts,
+    };
+    const keyStore = new KeyStore(await createStore('pxe_key_store', configWithContracts, createLogger('pxe:keystore:lmdb')));
+    const store = await createStore('pxe_data', configWithContracts, createLogger('pxe:data:lmdb'));
+    const db = await KVPxeDatabase.create(store);
+    const tips = new L2TipsStore(store, 'pxe');
+    const prover = proofCreator ?? (await createProver(config, logSuffix));
+    const pxe = new PXEService(keyStore, aztecNode, db, tips, prover, config, logSuffix);
+    await pxe.init();
+    return pxe;
+}
+function createProver(config, logSuffix) {
+    if (!config.proverEnabled) {
+        return new TestPrivateKernelProver();
+    }
+    // (@PhilWindle) Temporary validation until WASM is implemented
+    if (!config.bbBinaryPath || !config.bbWorkingDirectory) {
+        return new BBWasmPrivateKernelProver(16);
+    }
+    else {
+        const bbConfig = config;
+        const log = createLogger('pxe:bb-native-prover' + (logSuffix ? `:${logSuffix}` : ''));
+        return BBNativePrivateKernelProver.new({ bbSkipCleanup: false, ...bbConfig }, log);
+    }
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlX3B4ZV9zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL2NyZWF0ZV9weGVfc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUMvRCxPQUFPLEVBQUUseUJBQXlCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVsRSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDdkQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUM1QyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDbkQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBR3JELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUMvRCxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSw4Q0FBOEMsQ0FBQztBQUN2RixPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFM0Q7Ozs7Ozs7Ozs7R0FVRztBQUNILE1BQU0sQ0FBQyxLQUFLLFVBQVUsZ0JBQWdCLENBQ3BDLFNBQW9CLEVBQ3BCLE1BQXdCLEVBQ3hCLGVBQTZDLFNBQVMsRUFDdEQsWUFBa0M7SUFFbEMsTUFBTSxTQUFTLEdBQ2IsT0FBTyxZQUFZLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDLFlBQVksQ0FBQztJQUVqSCxNQUFNLFdBQVcsR0FBRyxNQUFNLFNBQVMsQ0FBQyxzQkFBc0IsRUFBRSxDQUFDO0lBQzdELE1BQU0sbUJBQW1CLEdBQUc7UUFDMUIsR0FBRyxNQUFNO1FBQ1QsV0FBVztLQUNRLENBQUM7SUFFdEIsTUFBTSxRQUFRLEdBQUcsSUFBSSxRQUFRLENBQzNCLE1BQU0sV0FBVyxDQUFDLGVBQWUsRUFBRSxtQkFBbUIsRUFBRSxZQUFZLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxDQUMzRixDQUFDO0lBRUYsTUFBTSxLQUFLLEdBQUcsTUFBTSxXQUFXLENBQUMsVUFBVSxFQUFFLG1CQUFtQixFQUFFLFlBQVksQ0FBQyxlQUFlLENBQUMsQ0FBQyxDQUFDO0lBRWhHLE1BQU0sRUFBRSxHQUFHLE1BQU0sYUFBYSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUM3QyxNQUFNLElBQUksR0FBRyxJQUFJLFdBQVcsQ0FBQyxLQUFLLEVBQUUsS0FBSyxDQUFDLENBQUM7SUFFM0MsTUFBTSxNQUFNLEdBQUcsWUFBWSxJQUFJLENBQUMsTUFBTSxZQUFZLENBQUMsTUFBTSxFQUFFLFNBQVMsQ0FBQyxDQUFDLENBQUM7SUFDdkUsTUFBTSxHQUFHLEdBQUcsSUFBSSxVQUFVLENBQUMsUUFBUSxFQUFFLFNBQVMsRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFDckYsTUFBTSxHQUFHLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDakIsT0FBTyxHQUFHLENBQUM7QUFDYixDQUFDO0FBRUQsU0FBUyxZQUFZLENBQUMsTUFBd0IsRUFBRSxTQUFrQjtJQUNoRSxJQUFJLENBQUMsTUFBTSxDQUFDLGFBQWEsRUFBRSxDQUFDO1FBQzFCLE9BQU8sSUFBSSx1QkFBdUIsRUFBRSxDQUFDO0lBQ3ZDLENBQUM7SUFFRCwrREFBK0Q7SUFDL0QsSUFBSSxDQUFDLE1BQU0sQ0FBQyxZQUFZLElBQUksQ0FBQyxNQUFNLENBQUMsa0JBQWtCLEVBQUUsQ0FBQztRQUN2RCxPQUFPLElBQUkseUJBQXlCLENBQUMsRUFBRSxDQUFDLENBQUM7SUFDM0MsQ0FBQztTQUFNLENBQUM7UUFDTixNQUFNLFFBQVEsR0FBRyxNQUNDLENBQUM7UUFDbkIsTUFBTSxHQUFHLEdBQUcsWUFBWSxDQUFDLHNCQUFzQixHQUFHLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxJQUFJLFNBQVMsRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ3RGLE9BQU8sMkJBQTJCLENBQUMsR0FBRyxDQUFDLEVBQUUsYUFBYSxFQUFFLEtBQUssRUFBRSxHQUFHLFFBQVEsRUFBRSxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQ3JGLENBQUM7QUFDSCxDQUFDIn0=

package/package.json

@@ -1,8 +1,14 @@
 {
   "name": "@aztec/pxe",
-  "version": "0.66.0",
+  "version": "0.67.1-devnet",
   "type": "module",
-  "exports": "./dest/index.js",
+  "exports": {
+    ".": "./dest/index.js",
+    "./service": "./dest/pxe_service/index.js",
+    "./config": "./dest/config/index.js",
+    "./database": "./dest/database/index.js",
+    "./kernel_prover": "./dest/kernel_prover/index.js"
+  },
   "bin": "./dest/bin/index.js",
   "typedocOptions": {
     "entryPoints": [
@@ -12,16 +18,18 @@
     "tsconfig": "./tsconfig.json"
   },
   "scripts": {
-    "build": "yarn clean && tsc -b",
+    "build": "yarn clean && yarn generate && tsc -b",
     "build:dev": "tsc -b --watch",
-    "clean": "rm -rf ./dest .tsbuildinfo",
+    "clean": "rm -rf ./dest .tsbuildinfo ./src/config/package_info.ts",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests",
-    "start": "DEBUG='aztec:*' && node ./dest/bin/index.js"
+    "start": "LOG_LEVEL=${LOG_LEVEL:-debug} && node ./dest/bin/index.js",
+    "generate": "node ./scripts/generate_package_info.js"
   },
   "inherits": [
-    "../package.common.json"
+    "../package.common.json",
+    "./package.local.json"
   ],
   "jest": {
     "moduleNameMapper": {
@@ -56,22 +64,26 @@
           "summaryThreshold": 9999
         }
       ]
+    ],
+    "testTimeout": 30000,
+    "setupFiles": [
+      "../../foundation/src/jest/setup.mjs"
     ]
   },
   "dependencies": {
-    "@aztec/bb-prover": "0.66.0",
-    "@aztec/bb.js": "0.66.0",
-    "@aztec/builder": "0.66.0",
-    "@aztec/circuit-types": "0.66.0",
-    "@aztec/circuits.js": "0.66.0",
-    "@aztec/ethereum": "0.66.0",
-    "@aztec/foundation": "0.66.0",
-    "@aztec/key-store": "0.66.0",
-    "@aztec/kv-store": "0.66.0",
-    "@aztec/noir-protocol-circuits-types": "0.66.0",
-    "@aztec/protocol-contracts": "0.66.0",
-    "@aztec/simulator": "0.66.0",
-    "@aztec/types": "0.66.0",
+    "@aztec/bb-prover": "0.67.1-devnet",
+    "@aztec/bb.js": "0.67.1-devnet",
+    "@aztec/builder": "0.67.1-devnet",
+    "@aztec/circuit-types": "0.67.1-devnet",
+    "@aztec/circuits.js": "0.67.1-devnet",
+    "@aztec/ethereum": "0.67.1-devnet",
+    "@aztec/foundation": "0.67.1-devnet",
+    "@aztec/key-store": "0.67.1-devnet",
+    "@aztec/kv-store": "0.67.1-devnet",
+    "@aztec/noir-protocol-circuits-types": "0.67.1-devnet",
+    "@aztec/protocol-contracts": "0.67.1-devnet",
+    "@aztec/simulator": "0.67.1-devnet",
+    "@aztec/types": "0.67.1-devnet",
     "@msgpack/msgpack": "^3.0.0-beta2",
     "@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi",
     "@noir-lang/types": "workspace:*",

package/src/bin/index.ts

@@ -1,15 +1,15 @@
 #!/usr/bin/env -S node --no-warnings
 import { createAztecNodeClient } from '@aztec/circuit-types';
 import { init } from '@aztec/foundation/crypto';
-import { createDebugLogger } from '@aztec/foundation/log';
+import { createLogger } from '@aztec/foundation/log';
 
 import { getPXEServiceConfig } from '../config/index.js';
 import { startPXEHttpServer } from '../pxe_http/index.js';
-import { createPXEService } from '../pxe_service/index.js';
+import { createPXEService } from '../utils/create_pxe_service.js';
 
 const { PXE_PORT = 8080, AZTEC_NODE_URL = 'http://localhost:8079' } = process.env;
 
-const logger = createDebugLogger('aztec:pxe_service');
+const logger = createLogger('pxe:service');
 
 /**
  * Create and start a new PXE HTTP Server
@@ -23,9 +23,8 @@ async function main() {
   const nodeRpcClient = createAztecNodeClient(AZTEC_NODE_URL);
   const pxeService = await createPXEService(nodeRpcClient, pxeConfig);
 
-  const shutdown = async () => {
+  const shutdown = () => {
     logger.info('Shutting down...');
-    await pxeService.stop();
     process.exit(0);
   };
 

package/src/config/index.ts

@@ -8,10 +8,6 @@ import {
 import { type DataStoreConfig, dataConfigMappings } from '@aztec/kv-store/config';
 import { type Network } from '@aztec/types/network';
 
-import { readFileSync } from 'fs';
-import { dirname, resolve } from 'path';
-import { fileURLToPath } from 'url';
-
 /**
  * Temporary configuration until WASM can be used instead of native
  */
@@ -32,8 +28,6 @@ export interface KernelProverConfig {
  * Configuration settings for the PXE.
  */
 export interface PXEConfig {
-  /** The interval to wait between polling for new blocks. */
-  l2BlockPollingIntervalMS: number;
   /** L2 block to start scanning from for new accounts */
   l2StartingBlock: number;
 }
@@ -51,11 +45,6 @@ export type CliPXEOptions = {
 
 export const pxeConfigMappings: ConfigMappingsType<PXEServiceConfig> = {
   ...dataConfigMappings,
-  l2BlockPollingIntervalMS: {
-    env: 'PXE_BLOCK_POLLING_INTERVAL_MS',
-    description: 'The interval to wait between polling for new blocks.',
-    ...numberConfigHelper(1_000),
-  },
   l2StartingBlock: {
     env: 'PXE_L2_STARTING_BLOCK',
     ...numberConfigHelper(INITIAL_L2_BLOCK_NUM),
@@ -128,13 +117,3 @@ export function getCliPXEOptions(): CliPXEOptions & PXEServiceConfig {
     proverEnabled: pxeConfig.proverEnabled || !!cliOptions.network,
   };
 }
-
-/**
- * Returns package name and version.
- */
-export function getPackageInfo() {
-  const packageJsonPath = resolve(dirname(fileURLToPath(import.meta.url)), '../../package.json');
-  const { version, name } = JSON.parse(readFileSync(packageJsonPath).toString());
-
-  return { version, name };
-}

package/src/config/package_info.ts

@@ -0,0 +1,3 @@
+export function getPackageInfo() {
+  return { version: '0.1.0', name: '@aztec/pxe' };
+}

package/src/contract_data_oracle/index.ts

@@ -7,7 +7,7 @@ import {
   getFunctionDebugMetadata,
 } from '@aztec/foundation/abi';
 import { type Fr } from '@aztec/foundation/fields';
-import { ContractClassNotFoundError, ContractNotFoundError } from '@aztec/simulator';
+import { ContractClassNotFoundError, ContractNotFoundError } from '@aztec/simulator/client';
 
 import { type ContractArtifactDatabase } from '../database/contracts/contract_artifact_db.js';
 import { type ContractInstanceDatabase } from '../database/contracts/contract_instance_db.js';

package/src/database/incoming_note_dao.ts

@@ -3,7 +3,7 @@ import { AztecAddress, Fr, Point, type PublicKey } from '@aztec/circuits.js';
 import { NoteSelector } from '@aztec/foundation/abi';
 import { toBigIntBE } from '@aztec/foundation/bigint-buffer';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-import { type NoteData } from '@aztec/simulator';
+import { type NoteData } from '@aztec/simulator/acvm';
 
 import { type NoteInfo } from '../note_decryption_utils/index.js';
 
@@ -78,7 +78,7 @@ export class IncomingNoteDao implements NoteData {
       this.noteTypeId,
       this.txHash.buffer,
       this.l2BlockNumber,
-      Fr.fromString(this.l2BlockHash),
+      Fr.fromHexString(this.l2BlockHash),
       this.nonce,
       this.noteHash,
       this.siloedNullifier,