@aztec/pxe 0.76.4 → 0.77.0-testnet-ignition.21

package/dest/simulator_oracle/tagging_utils.d.ts

@@ -1,4 +1,5 @@
-import { type Fr, IndexedTaggingSecret } from '@aztec/circuits.js';
+import type { Fr } from '@aztec/foundation/fields';
+import { IndexedTaggingSecret } from '@aztec/stdlib/logs';
 export declare const WINDOW_HALF_SIZE = 10;
 export declare function getIndexedTaggingSecretsForTheWindow(secretsAndWindows: {
     appTaggingSecret: Fr;

package/dest/simulator_oracle/tagging_utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tagging_utils.d.ts","sourceRoot":"","sources":["../../src/simulator_oracle/tagging_utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAGnE,eAAO,MAAM,gBAAgB,KAAK,CAAC;AAEnC,wBAAgB,oCAAoC,CAClD,iBAAiB,EAAE;IAAE,gBAAgB,EAAE,EAAE,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,EAAE,GAC3F,oBAAoB,EAAE,CAQxB;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,qBAAqB,EAAE,oBAAoB,EAAE,GAAG;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAQ3G"}
+{"version":3,"file":"tagging_utils.d.ts","sourceRoot":"","sources":["../../src/simulator_oracle/tagging_utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAG1D,eAAO,MAAM,gBAAgB,KAAK,CAAC;AAEnC,wBAAgB,oCAAoC,CAClD,iBAAiB,EAAE;IAAE,gBAAgB,EAAE,EAAE,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,EAAE,GAC3F,oBAAoB,EAAE,CAQxB;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,qBAAqB,EAAE,oBAAoB,EAAE,GAAG;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAQ3G"}

package/dest/simulator_oracle/tagging_utils.js

@@ -1,10 +1,10 @@
-import { IndexedTaggingSecret } from '@aztec/circuits.js';
+import { IndexedTaggingSecret } from '@aztec/stdlib/logs';
 // Half the size of the window we slide over the tagging secret indexes.
 export const WINDOW_HALF_SIZE = 10;
 export function getIndexedTaggingSecretsForTheWindow(secretsAndWindows) {
     const secrets = [];
-    for (const secretAndWindow of secretsAndWindows) {
-        for (let i = secretAndWindow.leftMostIndex; i <= secretAndWindow.rightMostIndex; i++) {
+    for (const secretAndWindow of secretsAndWindows){
+        for(let i = secretAndWindow.leftMostIndex; i <= secretAndWindow.rightMostIndex; i++){
             secrets.push(new IndexedTaggingSecret(secretAndWindow.appTaggingSecret, i));
         }
     }
@@ -14,12 +14,10 @@ export function getIndexedTaggingSecretsForTheWindow(secretsAndWindows) {
  * Creates a map from app tagging secret to initial index.
  * @param indexedTaggingSecrets - The indexed tagging secrets to get the initial indexes from.
  * @returns The map from app tagging secret to initial index.
- */
-export function getInitialIndexesMap(indexedTaggingSecrets) {
+ */ export function getInitialIndexesMap(indexedTaggingSecrets) {
     const initialIndexes = {};
-    for (const indexedTaggingSecret of indexedTaggingSecrets) {
+    for (const indexedTaggingSecret of indexedTaggingSecrets){
         initialIndexes[indexedTaggingSecret.appTaggingSecret.toString()] = indexedTaggingSecret.index;
     }
     return initialIndexes;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFnZ2luZ191dGlscy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zaW11bGF0b3Jfb3JhY2xlL3RhZ2dpbmdfdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFXLG9CQUFvQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFbkUsd0VBQXdFO0FBQ3hFLE1BQU0sQ0FBQyxNQUFNLGdCQUFnQixHQUFHLEVBQUUsQ0FBQztBQUVuQyxNQUFNLFVBQVUsb0NBQW9DLENBQ2xELGlCQUE0RjtJQUU1RixNQUFNLE9BQU8sR0FBMkIsRUFBRSxDQUFDO0lBQzNDLEtBQUssTUFBTSxlQUFlLElBQUksaUJBQWlCLEVBQUUsQ0FBQztRQUNoRCxLQUFLLElBQUksQ0FBQyxHQUFHLGVBQWUsQ0FBQyxhQUFhLEVBQUUsQ0FBQyxJQUFJLGVBQWUsQ0FBQyxjQUFjLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQztZQUNyRixPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksb0JBQW9CLENBQUMsZUFBZSxDQUFDLGdCQUFnQixFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDOUUsQ0FBQztJQUNILENBQUM7SUFDRCxPQUFPLE9BQU8sQ0FBQztBQUNqQixDQUFDO0FBRUQ7Ozs7R0FJRztBQUNILE1BQU0sVUFBVSxvQkFBb0IsQ0FBQyxxQkFBNkM7SUFDaEYsTUFBTSxjQUFjLEdBQTRCLEVBQUUsQ0FBQztJQUVuRCxLQUFLLE1BQU0sb0JBQW9CLElBQUkscUJBQXFCLEVBQUUsQ0FBQztRQUN6RCxjQUFjLENBQUMsb0JBQW9CLENBQUMsZ0JBQWdCLENBQUMsUUFBUSxFQUFFLENBQUMsR0FBRyxvQkFBb0IsQ0FBQyxLQUFLLENBQUM7SUFDaEcsQ0FBQztJQUVELE9BQU8sY0FBYyxDQUFDO0FBQ3hCLENBQUMifQ==

package/dest/synchronizer/index.js

@@ -1,2 +1 @@
 export * from './synchronizer.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc3luY2hyb25pemVyL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsbUJBQW1CLENBQUMifQ==

package/dest/synchronizer/synchronizer.d.ts

@@ -1,8 +1,9 @@
-import { type AztecNode, L2BlockStream, type L2BlockStreamEvent, type L2BlockStreamEventHandler } from '@aztec/circuit-types';
 import { type Logger } from '@aztec/foundation/log';
-import { type L2TipsStore } from '@aztec/kv-store/stores';
-import { type PXEConfig } from '../config/index.js';
-import { type PxeDatabase } from '../database/index.js';
+import type { L2TipsStore } 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 { PxeDatabase } from '../database/index.js';
 /**
  * The Synchronizer class manages the synchronization with the aztec node, allowing PXE to retrieve the
  * latest block header and handle reorgs.
@@ -15,6 +16,7 @@ export declare class Synchronizer implements L2BlockStreamEventHandler {
     private l2TipsStore;
     private initialSyncBlockNumber;
     private log;
+    private isSyncing;
     protected readonly blockStream: L2BlockStream;
     constructor(node: AztecNode, db: PxeDatabase, l2TipsStore: L2TipsStore, config?: Partial<Pick<PXEConfig, 'l2StartingBlock'>>, loggerOrSuffix?: string | Logger);
     protected createBlockStream(config: Partial<Pick<PXEConfig, 'l2StartingBlock'>>): L2BlockStream;
@@ -25,6 +27,7 @@ export declare class Synchronizer implements L2BlockStreamEventHandler {
      * recent data (e.g. notes), and handling any reorgs that might have occurred.
      */
     sync(): Promise<void>;
+    private doSync;
     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;AAE9B,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,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,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM;IASlC,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"}
+{"version":3,"file":"synchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/synchronizer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,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,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD;;;;;GAKG;AACH,qBAAa,YAAa,YAAW,yBAAyB;IAO1D,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,WAAW;IARrB,OAAO,CAAC,sBAAsB,CAA4B;IAC1D,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,SAAS,CAA4B;IAC7C,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,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM;IASlC,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;IAkC7E;;;OAGG;IACU,IAAI;YAiBH,MAAM;IAeP,qBAAqB;CAGnC"}

package/dest/synchronizer/synchronizer.js

@@ -1,67 +1,89 @@
-import { L2BlockStream, } from '@aztec/circuit-types';
-import { INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js';
+import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
 import { createLogger } from '@aztec/foundation/log';
+import { L2BlockStream } from '@aztec/stdlib/block';
 /**
  * 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 = {}, loggerOrSuffix) {
+ */ export class Synchronizer {
+    node;
+    db;
+    l2TipsStore;
+    initialSyncBlockNumber;
+    log;
+    isSyncing;
+    blockStream;
+    constructor(node, db, l2TipsStore, config = {}, loggerOrSuffix){
         this.node = node;
         this.db = db;
         this.l2TipsStore = l2TipsStore;
         this.initialSyncBlockNumber = INITIAL_L2_BLOCK_NUM - 1;
-        this.log =
-            !loggerOrSuffix || typeof loggerOrSuffix === 'string'
-                ? createLogger(loggerOrSuffix ? `pxe:synchronizer:${loggerOrSuffix}` : `pxe:synchronizer`)
-                : loggerOrSuffix;
+        this.log = !loggerOrSuffix || typeof loggerOrSuffix === 'string' ? createLogger(loggerOrSuffix ? `pxe:synchronizer:${loggerOrSuffix}` : `pxe:synchronizer`) : loggerOrSuffix;
         this.blockStream = this.createBlockStream(config);
     }
     createBlockStream(config) {
         return new L2BlockStream(this.node, this.l2TipsStore, this, createLogger('pxe:block_stream'), {
-            startingBlock: config.l2StartingBlock,
+            startingBlock: config.l2StartingBlock
         });
     }
-    /** Handle events emitted by the block stream. */
-    async handleBlockStreamEvent(event) {
+    /** Handle events emitted by the block stream. */ async handleBlockStreamEvent(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.db.setHeader(lastBlock.header);
-                break;
-            }
-            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);
-                // Remove all note tagging indexes to force a full resync. This is suboptimal, but unless we track the
-                // block number in which each index is used it's all we can do.
-                await this.db.resetNoteSyncData();
-                // Update the header to the last block.
-                await this.db.setHeader(await this.node.getBlockHeader(event.blockNumber));
-                break;
-            }
+        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.db.setHeader(lastBlock.header);
+                    break;
+                }
+            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);
+                    // Remove all note tagging indexes to force a full resync. This is suboptimal, but unless we track the
+                    // block number in which each index is used it's all we can do.
+                    await this.db.resetNoteSyncData();
+                    // Update the header to the last block.
+                    const newHeader = await this.node.getBlockHeader(event.blockNumber);
+                    if (!newHeader) {
+                        this.log.error(`Block header not found for block number ${event.blockNumber} during chain prune`);
+                    } else {
+                        await this.db.setHeader(newHeader);
+                    }
+                    break;
+                }
         }
     }
     /**
-     * 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 sync() {
+   * 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 sync() {
+        if (this.isSyncing !== undefined) {
+            this.log.debug(`Waiting for the ongoing sync to finish`);
+            await this.isSyncing;
+            return;
+        }
+        this.log.debug(`Syncing PXE with the node`);
+        const isSyncing = this.doSync();
+        this.isSyncing = isSyncing;
+        try {
+            await isSyncing;
+        } finally{
+            this.isSyncing = undefined;
+        }
+    }
+    async doSync() {
         let currentHeader;
         try {
             currentHeader = await this.db.getBlockHeader();
-        }
-        catch (e) {
+        } catch (e) {
             this.log.debug('Header is not set, requesting from the node');
         }
         if (!currentHeader) {
@@ -71,7 +93,6 @@ export class Synchronizer {
         await this.blockStream.sync();
     }
     async getSynchedBlockNumber() {
-        return (await this.db.getBlockNumber()) ?? this.initialSyncBlockNumber;
+        return await this.db.getBlockNumber() ?? this.initialSyncBlockNumber;
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3luY2hyb25pemVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3N5bmNocm9uaXplci9zeW5jaHJvbml6ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUVMLGFBQWEsR0FHZCxNQUFNLHNCQUFzQixDQUFDO0FBQzlCLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQzFELE9BQU8sRUFBZSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQU1sRTs7Ozs7R0FLRztBQUNILE1BQU0sT0FBTyxZQUFZO0lBS3ZCLFlBQ1UsSUFBZSxFQUNmLEVBQWUsRUFDZixXQUF3QixFQUNoQyxTQUFzRCxFQUFFLEVBQ3hELGNBQWdDO1FBSnhCLFNBQUksR0FBSixJQUFJLENBQVc7UUFDZixPQUFFLEdBQUYsRUFBRSxDQUFhO1FBQ2YsZ0JBQVcsR0FBWCxXQUFXLENBQWE7UUFQMUIsMkJBQXNCLEdBQUcsb0JBQW9CLEdBQUcsQ0FBQyxDQUFDO1FBV3hELElBQUksQ0FBQyxHQUFHO1lBQ04sQ0FBQyxjQUFjLElBQUksT0FBTyxjQUFjLEtBQUssUUFBUTtnQkFDbkQsQ0FBQyxDQUFDLFlBQVksQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFDLG9CQUFvQixjQUFjLEVBQUUsQ0FBQyxDQUFDLENBQUMsa0JBQWtCLENBQUM7Z0JBQzFGLENBQUMsQ0FBQyxjQUFjLENBQUM7UUFDckIsSUFBSSxDQUFDLFdBQVcsR0FBRyxJQUFJLENBQUMsaUJBQWlCLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDcEQsQ0FBQztJQUVTLGlCQUFpQixDQUFDLE1BQW1EO1FBQzdFLE9BQU8sSUFBSSxhQUFhLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsV0FBVyxFQUFFLElBQUksRUFBRSxZQUFZLENBQUMsa0JBQWtCLENBQUMsRUFBRTtZQUM1RixhQUFhLEVBQUUsTUFBTSxDQUFDLGVBQWU7U0FDdEMsQ0FBQyxD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

package/dest/utils/create_pxe_service.d.ts

@@ -1,5 +1,5 @@
-import { type AztecNode, type PrivateKernelProver } from '@aztec/circuit-types';
-import { type PXEServiceConfig } from '../config/index.js';
+import type { AztecNode, PrivateKernelProver } from '@aztec/stdlib/interfaces/client';
+import type { PXEServiceConfig } from '../config/index.js';
 import { PXEService } from '../pxe_service/pxe_service.js';
 /**
  * Create and start an PXEService instance with the given AztecNode.

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

@@ -1 +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;AAQhF,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,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"}
+{"version":3,"file":"create_pxe_service.d.ts","sourceRoot":"","sources":["../../src/utils/create_pxe_service.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAEtF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,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,uBAmCnC"}

package/dest/utils/create_pxe_service.js

@@ -3,8 +3,9 @@ import { BBWASMBundlePrivateKernelProver } from '@aztec/bb-prover/wasm/bundle';
 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 { createStore } from '@aztec/kv-store/lmdb-v2';
 import { L2TipsStore } from '@aztec/kv-store/stores';
+import { BundledProtocolContractsProvider } from '@aztec/protocol-contracts/providers/bundle';
 import { WASMSimulator } from '@aztec/simulator/client';
 import { KVPxeDatabase } from '../database/kv_pxe_database.js';
 import { PXEService } from '../pxe_service/pxe_service.js';
@@ -18,32 +19,33 @@ import { PXEService } from '../pxe_service/pxe_service.js';
  * @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;
+ */ 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,
+        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 simulationProvider = new WASMSimulator();
-    const prover = proofCreator ?? (await createProver(config, simulationProvider, logSuffix));
-    const pxe = new PXEService(keyStore, aztecNode, db, tips, prover, simulationProvider, config, logSuffix);
+    const prover = proofCreator ?? await createProver(config, simulationProvider, logSuffix);
+    const protocolContractsProvider = new BundledProtocolContractsProvider();
+    const pxe = new PXEService(keyStore, aztecNode, db, tips, prover, simulationProvider, protocolContractsProvider, config, logSuffix);
     await pxe.init();
     return pxe;
 }
 function createProver(config, simulationProvider, logSuffix) {
     if (!config.bbBinaryPath || !config.bbWorkingDirectory) {
         return new BBWASMBundlePrivateKernelProver(simulationProvider, 16);
-    }
-    else {
+    } else {
         const bbConfig = config;
         const log = createLogger('pxe:bb-native-prover' + (logSuffix ? `:${logSuffix}` : ''));
-        return BBNativePrivateKernelProver.new({ bbSkipCleanup: false, ...bbConfig }, simulationProvider, log);
+        return BBNativePrivateKernelProver.new({
+            bbSkipCleanup: false,
+            ...bbConfig
+        }, simulationProvider, log);
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlX3B4ZV9zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL2NyZWF0ZV9weGVfc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUMvRCxPQUFPLEVBQUUsK0JBQStCLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUUvRSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDdkQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUM1QyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDbkQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ3JELE9BQU8sRUFBMkIsYUFBYSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFHakYsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQy9ELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUUzRDs7Ozs7Ozs7OztHQVVHO0FBQ0gsTUFBTSxDQUFDLEtBQUssVUFBVSxnQkFBZ0IsQ0FDcEMsU0FBb0IsRUFDcEIsTUFBd0IsRUFDeEIsZUFBNkMsU0FBUyxFQUN0RCxZQUFrQztJQUVsQyxNQUFNLFNBQVMsR0FDYixPQUFPLFlBQVksS0FBSyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDO0lBRWpILE1BQU0sV0FBVyxHQUFHLE1BQU0sU0FBUyxDQUFDLHNCQUFzQixFQUFFLENBQUM7SUFDN0QsTUFBTSxtQkFBbUIsR0FBRztRQUMxQixHQUFHLE1BQU07UUFDVCxXQUFXO0tBQ1EsQ0FBQztJQUV0QixNQUFNLFFBQVEsR0FBRyxJQUFJLFFBQVEsQ0FDM0IsTUFBTSxXQUFXLENBQUMsZUFBZSxFQUFFLG1CQUFtQixFQUFFLFlBQVksQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLENBQzNGLENBQUM7SUFFRixNQUFNLEtBQUssR0FBRyxNQUFNLFdBQVcsQ0FBQyxVQUFVLEVBQUUsbUJBQW1CLEVBQUUsWUFBWSxDQUFDLGVBQWUsQ0FBQyxDQUFDLENBQUM7SUFFaEcsTUFBTSxFQUFFLEdBQUcsTUFBTSxhQUFhLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQzdDLE1BQU0sSUFBSSxHQUFHLElBQUksV0FBVyxDQUFDLEtBQUssRUFBRSxLQUFLLENBQUMsQ0FBQztJQUMzQyxNQUFNLGtCQUFrQixHQUFHLElBQUksYUFBYSxFQUFFLENBQUM7SUFDL0MsTUFBTSxNQUFNLEdBQUcsWUFBWSxJQUFJLENBQUMsTUFBTSxZQUFZLENBQUMsTUFBTSxFQUFFLGtCQUFrQixFQUFFLFNBQVMsQ0FBQyxDQUFDLENBQUM7SUFDM0YsTUFBTSxHQUFHLEdBQUcsSUFBSSxVQUFVLENBQUMsUUFBUSxFQUFFLFNBQVMsRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFDekcsTUFBTSxHQUFHLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDakIsT0FBTyxHQUFHLENBQUM7QUFDYixDQUFDO0FBRUQsU0FBUyxZQUFZLENBQUMsTUFBd0IsRUFBRSxrQkFBc0MsRUFBRSxTQUFrQjtJQUN4RyxJQUFJLENBQUMsTUFBTSxDQUFDLFlBQVksSUFBSSxDQUFDLE1BQU0sQ0FBQyxrQkFBa0IsRUFBRSxDQUFDO1FBQ3ZELE9BQU8sSUFBSSwrQkFBK0IsQ0FBQyxrQkFBa0IsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUNyRSxDQUFDO1NBQU0sQ0FBQztRQUNOLE1BQU0sUUFBUSxHQUFHLE1BQ0MsQ0FBQztRQUNuQixNQUFNLEdBQUcsR0FBRyxZQUFZLENBQUMsc0JBQXNCLEdBQUcsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLElBQUksU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7UUFDdEYsT0FBTywyQkFBMkIsQ0FBQyxHQUFHLENBQUMsRUFBRSxhQUFhLEVBQUUsS0FBSyxFQUFFLEdBQUcsUUFBUSxFQUFFLEVBQUUsa0JBQWtCLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFDekcsQ0FBQztBQUNILENBQUMifQ==

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/pxe",
-  "version": "0.76.4",
+  "version": "0.77.0-testnet-ignition.21",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -23,7 +23,7 @@
     "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": "HARDWARE_CONCURRENCY=${HARDWARE_CONCURRENCY:-16} RAYON_NUM_THREADS=${RAYON_NUM_THREADS:-4} NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}",
+    "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}",
     "start": "LOG_LEVEL=${LOG_LEVEL:-debug} && node ./dest/bin/index.js",
     "generate": "node ./scripts/generate_package_info.js"
   },
@@ -60,36 +60,35 @@
     "reporters": [
       "default"
     ],
-    "testTimeout": 30000,
+    "testTimeout": 120000,
     "setupFiles": [
       "../../foundation/src/jest/setup.mjs"
     ]
   },
   "dependencies": {
-    "@aztec/bb-prover": "0.76.4",
-    "@aztec/bb.js": "0.76.4",
-    "@aztec/builder": "0.76.4",
-    "@aztec/circuit-types": "0.76.4",
-    "@aztec/circuits.js": "0.76.4",
-    "@aztec/ethereum": "0.76.4",
-    "@aztec/foundation": "0.76.4",
-    "@aztec/key-store": "0.76.4",
-    "@aztec/kv-store": "0.76.4",
-    "@aztec/noir-protocol-circuits-types": "0.76.4",
-    "@aztec/protocol-contracts": "0.76.4",
-    "@aztec/simulator": "0.76.4",
-    "@aztec/types": "0.76.4",
+    "@aztec/bb-prover": "0.77.0-testnet-ignition.21",
+    "@aztec/bb.js": "0.77.0-testnet-ignition.21",
+    "@aztec/builder": "0.77.0-testnet-ignition.21",
+    "@aztec/constants": "0.77.0-testnet-ignition.21",
+    "@aztec/ethereum": "0.77.0-testnet-ignition.21",
+    "@aztec/foundation": "0.77.0-testnet-ignition.21",
+    "@aztec/key-store": "0.77.0-testnet-ignition.21",
+    "@aztec/kv-store": "0.77.0-testnet-ignition.21",
+    "@aztec/noir-protocol-circuits-types": "0.77.0-testnet-ignition.21",
+    "@aztec/protocol-contracts": "0.77.0-testnet-ignition.21",
+    "@aztec/simulator": "0.77.0-testnet-ignition.21",
+    "@aztec/stdlib": "0.77.0-testnet-ignition.21",
     "@msgpack/msgpack": "^3.0.0-beta2",
-    "@noir-lang/types": "1.0.0-beta.1",
     "koa": "^2.14.2",
     "koa-router": "^12.0.0",
     "lodash.omit": "^4.5.0",
     "sha3": "^2.1.4",
     "tslib": "^2.4.0",
-    "viem": "2.22.8"
+    "viem": "2.22.8",
+    "@aztec/noir-types": "0.77.0-testnet-ignition.21"
   },
   "devDependencies": {
-    "@aztec/noir-contracts.js": "workspace:^",
+    "@aztec/noir-contracts.js": "0.77.0-testnet-ignition.21",
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "@types/lodash.omit": "^4.5.7",

package/src/bin/index.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env -S node --no-warnings
-import { createAztecNodeClient } from '@aztec/circuit-types';
 import { createLogger } from '@aztec/foundation/log';
+import { createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
 
 import { getPXEServiceConfig } from '../config/index.js';
 import { startPXEHttpServer } from '../pxe_http/index.js';

package/src/config/index.ts

@@ -1,5 +1,4 @@
-import { type ChainConfig, chainConfigMappings } from '@aztec/circuit-types/config';
-import { INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js/constants';
+import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
 import {
   type ConfigMappingsType,
   booleanConfigHelper,
@@ -8,7 +7,8 @@ import {
   parseBooleanEnv,
 } from '@aztec/foundation/config';
 import { type DataStoreConfig, dataConfigMappings } from '@aztec/kv-store/config';
-import { type Network } from '@aztec/types/network';
+import { type ChainConfig, chainConfigMappings } from '@aztec/stdlib/config';
+import type { Network } from '@aztec/stdlib/network';
 
 /**
  * Temporary configuration until WASM can be used instead of native

package/src/contract_data_oracle/index.ts

@@ -1,16 +1,18 @@
-import { type AztecAddress, type ContractClass, type ContractInstance } from '@aztec/circuits.js';
+import type { Fr } from '@aztec/foundation/fields';
+import type { MembershipWitness } from '@aztec/foundation/trees';
+import { ContractClassNotFoundError, ContractNotFoundError } from '@aztec/simulator/client';
 import {
   type ContractArtifact,
   type FunctionArtifact,
   type FunctionDebugMetadata,
   type FunctionSelector,
   getFunctionDebugMetadata,
-} from '@aztec/foundation/abi';
-import { type Fr } from '@aztec/foundation/fields';
-import { ContractClassNotFoundError, ContractNotFoundError } from '@aztec/simulator/client';
+} from '@aztec/stdlib/abi';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { ContractClass, ContractInstance } from '@aztec/stdlib/contract';
 
-import { type ContractArtifactDatabase } from '../database/contracts/contract_artifact_db.js';
-import { type ContractInstanceDatabase } from '../database/contracts/contract_instance_db.js';
+import type { ContractArtifactDatabase } from '../database/contracts/contract_artifact_db.js';
+import type { ContractInstanceDatabase } from '../database/contracts/contract_instance_db.js';
 import { PrivateFunctionsTree } from './private_functions_tree.js';
 
 /**
@@ -23,21 +25,16 @@ import { PrivateFunctionsTree } from './private_functions_tree.js';
 export class ContractDataOracle {
   /** Map from contract class id to private function tree. */
   private contractClasses: Map<string, PrivateFunctionsTree> = new Map();
-  /** Map from address to contract instance. */
-  private contractInstances: Map<string, ContractInstance> = new Map();
 
   constructor(private db: ContractArtifactDatabase & ContractInstanceDatabase) {}
 
   /** Returns a contract instance for a given address. Throws if not found. */
   public async getContractInstance(contractAddress: AztecAddress): Promise<ContractInstance> {
-    if (!this.contractInstances.has(contractAddress.toString())) {
-      const instance = await this.db.getContractInstance(contractAddress);
-      if (!instance) {
-        throw new ContractNotFoundError(contractAddress.toString());
-      }
-      this.contractInstances.set(contractAddress.toString(), instance);
+    const instance = await this.db.getContractInstance(contractAddress);
+    if (!instance) {
+      throw new ContractNotFoundError(contractAddress.toString());
     }
-    return this.contractInstances.get(contractAddress.toString())!;
+    return instance;
   }
 
   /** Returns a contract class for a given class id. Throws if not found. */
@@ -117,16 +114,19 @@ export class ContractDataOracle {
   }
 
   /**
-   * Retrieve the function membership witness for the given contract address and function selector.
+   * Retrieve the function membership witness for the given contract class and function selector.
    * The function membership witness represents a proof that the function belongs to the specified contract.
    * Throws an error if the contract address or function selector is unknown.
    *
-   * @param contractAddress - The contract address.
+   * @param contractClassId - The id of the class.
    * @param selector - The function selector.
    * @returns A promise that resolves with the MembershipWitness instance for the specified contract's function.
    */
-  public async getFunctionMembershipWitness(contractAddress: AztecAddress, selector: FunctionSelector) {
-    const tree = await this.getTreeForAddress(contractAddress);
+  public async getFunctionMembershipWitness(
+    contractClassId: Fr,
+    selector: FunctionSelector,
+  ): Promise<MembershipWitness<5>> {
+    const tree = await this.getTreeForClassId(contractClassId);
     return tree.getFunctionMembershipWitness(selector);
   }
 
@@ -176,6 +176,6 @@ export class ContractDataOracle {
    */
   private async getTreeForAddress(contractAddress: AztecAddress): Promise<PrivateFunctionsTree> {
     const instance = await this.getContractInstance(contractAddress);
-    return this.getTreeForClassId(instance.contractClassId);
+    return this.getTreeForClassId(instance.currentContractClassId);
   }
 }

package/src/contract_data_oracle/private_functions_tree.ts

@@ -1,15 +1,14 @@
+import { FUNCTION_TREE_HEIGHT } from '@aztec/constants';
+import { Fr } from '@aztec/foundation/fields';
+import { assertLength } from '@aztec/foundation/serialize';
+import { MembershipWitness, type MerkleTree } from '@aztec/foundation/trees';
+import { type ContractArtifact, FunctionSelector } from '@aztec/stdlib/abi';
 import {
   type ContractClassWithId,
-  FUNCTION_TREE_HEIGHT,
-  MembershipWitness,
   computePrivateFunctionLeaf,
   computePrivateFunctionsTree,
   getContractClassFromArtifact,
-} from '@aztec/circuits.js';
-import { type MerkleTree } from '@aztec/circuits.js/merkle';
-import { type ContractArtifact, FunctionSelector } from '@aztec/foundation/abi';
-import { Fr } from '@aztec/foundation/fields';
-import { assertLength } from '@aztec/foundation/serialize';
+} from '@aztec/stdlib/contract';
 
 /**
  * Represents a Merkle tree of functions for a particular Contract Class.

package/src/database/contracts/contract_artifact_db.ts

@@ -1,5 +1,5 @@
-import { type ContractArtifact } from '@aztec/foundation/abi';
-import { type Fr } from '@aztec/foundation/fields';
+import type { Fr } from '@aztec/foundation/fields';
+import type { ContractArtifact } from '@aztec/stdlib/abi';
 
 /**
  * PXE database for managing contract artifacts.

package/src/database/contracts/contract_instance_db.ts

@@ -1,4 +1,5 @@
-import { type AztecAddress, type ContractInstanceWithAddress } from '@aztec/circuits.js';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 
 /**
  * PXE database for managing contract instances.