@aztec/pxe 0.47.1 → 0.48.0

package/dest/config/index.d.ts

@@ -1,3 +1,5 @@
+import { type ConfigMappingsType } from '@aztec/foundation/config';
+import { type Network } from '@aztec/types/network';
 /**
  * Temporary configuration until WASM can be used instead of native
  */
@@ -24,10 +26,25 @@ export interface PXEConfig {
     dataDirectory?: string;
 }
 export type PXEServiceConfig = PXEConfig & KernelProverConfig & BBProverConfig;
+export type CliPXEOptions = {
+    /** External Aztec network to connect to. e.g. devnet */
+    network?: Network;
+    /** API Key required by the external network's node */
+    apiKey?: string;
+    /** Custom Aztec Node URL to connect to  */
+    nodeUrl?: string;
+};
+export declare const pxeConfigMappings: ConfigMappingsType<PXEServiceConfig>;
 /**
  * Creates an instance of PXEServiceConfig out of environment variables using sensible defaults for integration testing if not set.
  */
 export declare function getPXEServiceConfig(): PXEServiceConfig;
+export declare const pxeCliConfigMappings: ConfigMappingsType<CliPXEOptions>;
+export declare const allPxeConfigMappings: ConfigMappingsType<CliPXEOptions & PXEServiceConfig>;
+/**
+ * Creates an instance of CliPxeOptions out of environment variables
+ */
+export declare function getCliPXEOptions(): CliPXEOptions & PXEServiceConfig;
 /**
  * Returns package name and version.
  */

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAMA;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,8CAA8C;IAC9C,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AACD;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,2DAA2D;IAC3D,wBAAwB,EAAE,MAAM,CAAC;IACjC,uDAAuD;IACvD,eAAe,EAAE,MAAM,CAAC;IACxB,gEAAgE;IAChE,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,MAAM,gBAAgB,GAAG,SAAS,GAAG,kBAAkB,GAAG,cAAc,CAAC;AAE/E;;GAEG;AACH,wBAAgB,mBAAmB,IAAI,gBAAgB,CAkBtD;AAED;;GAEG;AACH,wBAAgB,cAAc;;;EAK7B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAMpD;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,8CAA8C;IAC9C,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AACD;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,2DAA2D;IAC3D,wBAAwB,EAAE,MAAM,CAAC;IACjC,uDAAuD;IACvD,eAAe,EAAE,MAAM,CAAC;IACxB,gEAAgE;IAChE,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,MAAM,gBAAgB,GAAG,SAAS,GAAG,kBAAkB,GAAG,cAAc,CAAC;AAE/E,MAAM,MAAM,aAAa,GAAG;IAC1B,wDAAwD;IACxD,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,sDAAsD;IACtD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,2CAA2C;IAC3C,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,kBAAkB,CAAC,gBAAgB,CA4BlE,CAAC;AAEF;;GAEG;AACH,wBAAgB,mBAAmB,IAAI,gBAAgB,CAEtD;AAED,eAAO,MAAM,oBAAoB,EAAE,kBAAkB,CAAC,aAAa,CAclE,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,kBAAkB,CAAC,aAAa,GAAG,gBAAgB,CASrF,CAAC;AAEF;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,aAAa,GAAG,gBAAgB,CAQnE;AAED;;GAEG;AACH,wBAAgB,cAAc;;;EAK7B"}

package/dest/config/index.js

@@ -1,19 +1,78 @@
 import { INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js/constants';
+import { booleanConfigHelper, getConfigFromMappings, numberConfigHelper, } from '@aztec/foundation/config';
 import { readFileSync } from 'fs';
 import { dirname, resolve } from 'path';
 import { fileURLToPath } from 'url';
+export const pxeConfigMappings = {
+    l2BlockPollingIntervalMS: {
+        env: 'PXE_BLOCK_POLLING_INTERVAL_MS',
+        description: 'The interval to wait between polling for new blocks.',
+        ...numberConfigHelper(1000),
+    },
+    l2StartingBlock: {
+        env: 'PXE_L2_STARTING_BLOCK',
+        ...numberConfigHelper(INITIAL_L2_BLOCK_NUM),
+        description: 'L2 block to start scanning from for new accounts',
+    },
+    dataDirectory: {
+        env: 'PXE_DATA_DIRECTORY',
+        description: 'Where to store PXE data. If not set, will store in memory',
+    },
+    bbBinaryPath: {
+        env: 'BB_BINARY_PATH',
+        description: 'Path to the BB binary',
+    },
+    bbWorkingDirectory: {
+        env: 'BB_WORKING_DIRECTORY',
+        description: 'Working directory for the BB binary',
+    },
+    proverEnabled: {
+        env: 'PXE_PROVER_ENABLED',
+        description: 'Enable real proofs',
+        ...booleanConfigHelper(),
+    },
+};
 /**
  * Creates an instance of PXEServiceConfig out of environment variables using sensible defaults for integration testing if not set.
  */
 export function getPXEServiceConfig() {
-    const { PXE_BLOCK_POLLING_INTERVAL_MS, PXE_L2_STARTING_BLOCK, PXE_DATA_DIRECTORY, BB_BINARY_PATH, BB_WORKING_DIRECTORY, PXE_PROVER_ENABLED, } = process.env;
+    return getConfigFromMappings(pxeConfigMappings);
+}
+export const pxeCliConfigMappings = {
+    network: {
+        env: 'NETWORK',
+        parseEnv: (val) => val,
+        description: 'External Aztec network to connect to. e.g. devnet',
+    },
+    apiKey: {
+        env: 'API_KEY',
+        description: "API Key required by the external network's node",
+    },
+    nodeUrl: {
+        env: 'AZTEC_NODE_URL',
+        description: 'Custom Aztec Node URL to connect to',
+    },
+};
+export const allPxeConfigMappings = {
+    ...pxeConfigMappings,
+    ...pxeCliConfigMappings,
+    proverEnabled: {
+        env: 'PXE_PROVER_ENABLED',
+        parseEnv: (val) => ['1', 'true', 'TRUE'].includes(val) || !!process.env.NETWORK,
+        description: 'Enable real proofs',
+        isBoolean: true,
+    },
+};
+/**
+ * Creates an instance of CliPxeOptions out of environment variables
+ */
+export function getCliPXEOptions() {
+    const pxeConfig = getPXEServiceConfig();
+    const cliOptions = getConfigFromMappings(pxeCliConfigMappings);
     return {
-        l2BlockPollingIntervalMS: PXE_BLOCK_POLLING_INTERVAL_MS ? +PXE_BLOCK_POLLING_INTERVAL_MS : 1000,
-        l2StartingBlock: PXE_L2_STARTING_BLOCK ? +PXE_L2_STARTING_BLOCK : INITIAL_L2_BLOCK_NUM,
-        dataDirectory: PXE_DATA_DIRECTORY,
-        bbBinaryPath: BB_BINARY_PATH,
-        bbWorkingDirectory: BB_WORKING_DIRECTORY,
-        proverEnabled: ['1', 'true'].includes(PXE_PROVER_ENABLED),
+        ...pxeConfig,
+        ...cliOptions,
+        proverEnabled: pxeConfig.proverEnabled || !!cliOptions.network,
     };
 }
 /**
@@ -24,4 +83,4 @@ export function getPackageInfo() {
     const { version, name } = JSON.parse(readFileSync(packageJsonPath).toString());
     return { version, name };
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29uZmlnL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBRXBFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxJQUFJLENBQUM7QUFDbEMsT0FBTyxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDeEMsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLEtBQUssQ0FBQztBQStCcEM7O0dBRUc7QUFDSCxNQUFNLFVBQVUsbUJBQW1CO0lBQ2pDLE1BQU0sRUFDSiw2QkFBNkIsRUFDN0IscUJBQXFCLEVBQ3JCLGtCQUFrQixFQUNsQixjQUFjLEVBQ2Qsb0JBQW9CLEVBQ3BCLGtCQUFrQixHQUNuQixHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUM7SUFFaEIsT0FBTztRQUNMLHdCQUF3QixFQUFFLDZCQUE2QixDQUFDLENBQUMsQ0FBQyxDQUFDLDZCQUE2QixDQUFDLENBQUMsQ0FBQyxJQUFJO1FBQy9GLGVBQWUsRUFBRSxxQkFBcUIsQ0FBQyxDQUFDLENBQUMsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDLENBQUMsb0JBQW9CO1FBQ3RGLGFBQWEsRUFBRSxrQkFBa0I7UUFDakMsWUFBWSxFQUFFLGNBQWM7UUFDNUIsa0JBQWtCLEVBQUUsb0JBQW9CO1FBQ3hDLGFBQWEsRUFBRSxDQUFDLEdBQUcsRUFBRSxNQUFNLENBQUMsQ0FBQyxRQUFRLENBQUMsa0JBQW1CLENBQUM7S0FDM0QsQ0FBQztBQUNKLENBQUM7QUFFRDs7R0FFRztBQUNILE1BQU0sVUFBVSxjQUFjO0lBQzVCLE1BQU0sZUFBZSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsYUFBYSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxvQkFBb0IsQ0FBQyxDQUFDO0lBQy9GLE1BQU0sRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsZUFBZSxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztJQUUvRSxPQUFPLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxDQUFDO0FBQzNCLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29uZmlnL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQ3BFLE9BQU8sRUFFTCxtQkFBbUIsRUFDbkIscUJBQXFCLEVBQ3JCLGtCQUFrQixHQUNuQixNQUFNLDBCQUEwQixDQUFDO0FBR2xDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxJQUFJLENBQUM7QUFDbEMsT0FBTyxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDeEMsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLEtBQUssQ0FBQztBQXdDcEMsTUFBTSxDQUFDLE1BQU0saUJBQWlCLEdBQXlDO0lBQ3JFLHdCQUF3QixFQUFFO1FBQ3hCLEdBQUcsRUFBRSwrQkFBK0I7UUFDcEMsV0FBVyxFQUFFLHNEQUFzRDtRQUNuRSxHQUFHLGtCQUFrQixDQUFDLElBQUssQ0FBQztLQUM3QjtJQUNELGVBQWUsRUFBRTtRQUNmLEdBQUcsRUFBRSx1QkFBdUI7UUFDNUIsR0FBRyxrQkFBa0IsQ0FBQyxvQkFBb0IsQ0FBQztRQUMzQyxXQUFXLEVBQUUsa0RBQWtEO0tBQ2hFO0lBQ0QsYUFBYSxFQUFFO1FBQ2IsR0FBRyxFQUFFLG9CQUFvQjtRQUN6QixXQUFXLEVBQUUsMkRBQTJEO0tBQ3pFO0lBQ0QsWUFBWSxFQUFFO1FBQ1osR0FBRyxFQUFFLGdCQUFnQjtRQUNyQixXQUFXLEVBQUUsdUJBQXVCO0tBQ3JDO0lBQ0Qsa0JBQWtCLEVBQUU7UUFDbEIsR0FBRyxFQUFFLHNCQUFzQjtRQUMzQixXQUFXLEVBQUUscUNBQXFDO0tBQ25EO0lBQ0QsYUFBYSxFQUFFO1FBQ2IsR0FBRyxFQUFFLG9CQUFvQjtRQUN6QixXQUFXLEVBQUUsb0JBQW9CO1FBQ2pDLEdBQUcsbUJBQW1CLEVBQUU7S0FDekI7Q0FDRixDQUFDO0FBRUY7O0dBRUc7QUFDSCxNQUFNLFVBQVUsbUJBQW1CO0lBQ2pDLE9BQU8scUJBQXFCLENBQW1CLGlCQUFpQixDQUFDLENBQUM7QUFDcEUsQ0FBQztBQUVELE1BQU0sQ0FBQyxNQUFNLG9CQUFvQixHQUFzQztJQUNyRSxPQUFPLEVBQUU7UUFDUCxHQUFHLEVBQUUsU0FBUztRQUNkLFFBQVEsRUFBRSxDQUFDLEdBQVcsRUFBRSxFQUFFLENBQUMsR0FBYztRQUN6QyxXQUFXLEVBQUUsbURBQW1EO0tBQ2pFO0lBQ0QsTUFBTSxFQUFFO1FBQ04sR0FBRyxFQUFFLFNBQVM7UUFDZCxXQUFXLEVBQUUsaURBQWlEO0tBQy9EO0lBQ0QsT0FBTyxFQUFFO1FBQ1AsR0FBRyxFQUFFLGdCQUFnQjtRQUNyQixXQUFXLEVBQUUscUNBQXFDO0tBQ25EO0NBQ0YsQ0FBQztBQUVGLE1BQU0sQ0FBQyxNQUFNLG9CQUFvQixHQUF5RDtJQUN4RixHQUFHLGlCQUFpQjtJQUNwQixHQUFHLG9CQUFvQjtJQUN2QixhQUFhLEVBQUU7UUFDYixHQUFHLEVBQUUsb0JBQW9CO1FBQ3pCLFFBQVEsRUFBRSxDQUFDLEdBQVcsRUFBRSxFQUFFLENBQUMsQ0FBQyxHQUFHLEVBQUUsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPO1FBQ3ZGLFdBQVcsRUFBRSxvQkFBb0I7UUFDakMsU0FBUyxFQUFFLElBQUk7S0FDaEI7Q0FDRixDQUFDO0FBRUY7O0dBRUc7QUFDSCxNQUFNLFVBQVUsZ0JBQWdCO0lBQzlCLE1BQU0sU0FBUyxHQUFHLG1CQUFtQixFQUFFLENBQUM7SUFDeEMsTUFBTSxVQUFVLEdBQUcscUJBQXFCLENBQWdCLG9CQUFvQixDQUFDLENBQUM7SUFDOUUsT0FBTztRQUNMLEdBQUcsU0FBUztRQUNaLEdBQUcsVUFBVTtRQUNiLGFBQWEsRUFBRSxTQUFTLENBQUMsYUFBYSxJQUFJLENBQUMsQ0FBQyxVQUFVLENBQUMsT0FBTztLQUMvRCxDQUFDO0FBQ0osQ0FBQztBQUVEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLGNBQWM7SUFDNUIsTUFBTSxlQUFlLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLG9CQUFvQixDQUFDLENBQUM7SUFDL0YsTUFBTSxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLFlBQVksQ0FBQyxlQUFlLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO0lBRS9FLE9BQU8sRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLENBQUM7QUFDM0IsQ0FBQyJ9

package/dest/database/incoming_note_dao.d.ts

@@ -21,10 +21,10 @@ export declare class IncomingNoteDao implements NoteData {
     /** The nonce of the note. */
     nonce: Fr;
     /**
-     * Inner note hash of the note. This is customizable by the app circuit.
+     * A hash of the note. This is customizable by the app circuit.
      * We can use this value to compute siloedNoteHash and uniqueSiloedNoteHash.
      */
-    innerNoteHash: Fr;
+    noteHash: Fr;
     /**
      * The nullifier of the note (siloed by contract address).
      * Note: Might be set as 0 if the note was added to PXE as nullified.
@@ -48,10 +48,10 @@ export declare class IncomingNoteDao implements NoteData {
     /** The nonce of the note. */
     nonce: Fr, 
     /**
-     * Inner note hash of the note. This is customizable by the app circuit.
+     * A hash of the note. This is customizable by the app circuit.
      * We can use this value to compute siloedNoteHash and uniqueSiloedNoteHash.
      */
-    innerNoteHash: Fr, 
+    noteHash: Fr, 
     /**
      * The nullifier of the note (siloed by contract address).
      * Note: Might be set as 0 if the note was added to PXE as nullified.

package/dest/database/incoming_note_dao.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"incoming_note_dao.d.ts","sourceRoot":"","sources":["../../src/database/incoming_note_dao.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,EAAE,EAAS,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEjD;;GAEG;AACH,qBAAa,eAAgB,YAAW,QAAQ;IAE5C,kDAAkD;IAC3C,IAAI,EAAE,IAAI;IACjB,oDAAoD;IAC7C,eAAe,EAAE,YAAY;IACpC,iEAAiE;IAC1D,WAAW,EAAE,EAAE;IACtB,iDAAiD;IAC1C,UAAU,EAAE,YAAY;IAC/B,kDAAkD;IAC3C,MAAM,EAAE,MAAM;IACrB,6BAA6B;IACtB,KAAK,EAAE,EAAE;IAChB;;;OAGG;IACI,aAAa,EAAE,EAAE;IACxB;;;OAGG;IACI,eAAe,EAAE,EAAE;IAC1B,+DAA+D;IACxD,KAAK,EAAE,MAAM;IACpB,wDAAwD;IACjD,KAAK,EAAE,SAAS;;IAzBvB,kDAAkD;IAC3C,IAAI,EAAE,IAAI;IACjB,oDAAoD;IAC7C,eAAe,EAAE,YAAY;IACpC,iEAAiE;IAC1D,WAAW,EAAE,EAAE;IACtB,iDAAiD;IAC1C,UAAU,EAAE,YAAY;IAC/B,kDAAkD;IAC3C,MAAM,EAAE,MAAM;IACrB,6BAA6B;IACtB,KAAK,EAAE,EAAE;IAChB;;;OAGG;IACI,aAAa,EAAE,EAAE;IACxB;;;OAGG;IACI,eAAe,EAAE,EAAE;IAC1B,+DAA+D;IACxD,KAAK,EAAE,MAAM;IACpB,wDAAwD;IACjD,KAAK,EAAE,SAAS;IAGzB,QAAQ,IAAI,MAAM;IAclB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IA4B/C,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAK7B;;;OAGG;IACI,OAAO;CAKf"}
+{"version":3,"file":"incoming_note_dao.d.ts","sourceRoot":"","sources":["../../src/database/incoming_note_dao.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,EAAE,EAAS,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEjD;;GAEG;AACH,qBAAa,eAAgB,YAAW,QAAQ;IAE5C,kDAAkD;IAC3C,IAAI,EAAE,IAAI;IACjB,oDAAoD;IAC7C,eAAe,EAAE,YAAY;IACpC,iEAAiE;IAC1D,WAAW,EAAE,EAAE;IACtB,iDAAiD;IAC1C,UAAU,EAAE,YAAY;IAC/B,kDAAkD;IAC3C,MAAM,EAAE,MAAM;IACrB,6BAA6B;IACtB,KAAK,EAAE,EAAE;IAChB;;;OAGG;IACI,QAAQ,EAAE,EAAE;IACnB;;;OAGG;IACI,eAAe,EAAE,EAAE;IAC1B,+DAA+D;IACxD,KAAK,EAAE,MAAM;IACpB,wDAAwD;IACjD,KAAK,EAAE,SAAS;;IAzBvB,kDAAkD;IAC3C,IAAI,EAAE,IAAI;IACjB,oDAAoD;IAC7C,eAAe,EAAE,YAAY;IACpC,iEAAiE;IAC1D,WAAW,EAAE,EAAE;IACtB,iDAAiD;IAC1C,UAAU,EAAE,YAAY;IAC/B,kDAAkD;IAC3C,MAAM,EAAE,MAAM;IACrB,6BAA6B;IACtB,KAAK,EAAE,EAAE;IAChB;;;OAGG;IACI,QAAQ,EAAE,EAAE;IACnB;;;OAGG;IACI,eAAe,EAAE,EAAE;IAC1B,+DAA+D;IACxD,KAAK,EAAE,MAAM;IACpB,wDAAwD;IACjD,KAAK,EAAE,SAAS;IAGzB,QAAQ,IAAI,MAAM;IAclB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IA4B/C,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAK7B;;;OAGG;IACI,OAAO;CAKf"}

package/dest/database/incoming_note_dao.js

@@ -21,10 +21,10 @@ export class IncomingNoteDao {
     /** The nonce of the note. */
     nonce, 
     /**
-     * Inner note hash of the note. This is customizable by the app circuit.
+     * A hash of the note. This is customizable by the app circuit.
      * We can use this value to compute siloedNoteHash and uniqueSiloedNoteHash.
      */
-    innerNoteHash, 
+    noteHash, 
     /**
      * The nullifier of the note (siloed by contract address).
      * Note: Might be set as 0 if the note was added to PXE as nullified.
@@ -40,7 +40,7 @@ export class IncomingNoteDao {
         this.noteTypeId = noteTypeId;
         this.txHash = txHash;
         this.nonce = nonce;
-        this.innerNoteHash = innerNoteHash;
+        this.noteHash = noteHash;
         this.siloedNullifier = siloedNullifier;
         this.index = index;
         this.ivpkM = ivpkM;
@@ -53,7 +53,7 @@ export class IncomingNoteDao {
             this.noteTypeId,
             this.txHash.buffer,
             this.nonce,
-            this.innerNoteHash,
+            this.noteHash,
             this.siloedNullifier,
             this.index,
             this.ivpkM,
@@ -67,11 +67,11 @@ export class IncomingNoteDao {
         const noteTypeId = reader.readObject(NoteSelector);
         const txHash = reader.readObject(TxHash);
         const nonce = Fr.fromBuffer(reader);
-        const innerNoteHash = Fr.fromBuffer(reader);
+        const noteHash = Fr.fromBuffer(reader);
         const siloedNullifier = Fr.fromBuffer(reader);
         const index = toBigIntBE(reader.readBytes(32));
         const publicKey = Point.fromBuffer(reader);
-        return new IncomingNoteDao(note, contractAddress, storageSlot, noteTypeId, txHash, nonce, innerNoteHash, siloedNullifier, index, publicKey);
+        return new IncomingNoteDao(note, contractAddress, storageSlot, noteTypeId, txHash, nonce, noteHash, siloedNullifier, index, publicKey);
     }
     toString() {
         return '0x' + this.toBuffer().toString('hex');
@@ -90,4 +90,4 @@ export class IncomingNoteDao {
         return noteSize + AztecAddress.SIZE_IN_BYTES + Fr.SIZE_IN_BYTES * 4 + TxHash.SIZE + Point.SIZE_IN_BYTES + indexSize;
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5jb21pbmdfbm90ZV9kYW8uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZGF0YWJhc2UvaW5jb21pbmdfbm90ZV9kYW8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNwRCxPQUFPLEVBQUUsWUFBWSxFQUFFLEVBQUUsRUFBRSxLQUFLLEVBQWtCLE1BQU0sb0JBQW9CLENBQUM7QUFDN0UsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM3RCxPQUFPLEVBQUUsWUFBWSxFQUFFLGlCQUFpQixFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFHOUU7O0dBRUc7QUFDSCxNQUFNLE9BQU8sZUFBZTtJQUMxQjtJQUNFLGtEQUFrRDtJQUMzQyxJQUFVO0lBQ2pCLG9EQUFvRDtJQUM3QyxlQUE2QjtJQUNwQyxpRUFBaUU7SUFDMUQsV0FBZTtJQUN0QixpREFBaUQ7SUFDMUMsVUFBd0I7SUFDL0Isa0RBQWtEO0lBQzNDLE1BQWM7SUFDckIsNkJBQTZCO0lBQ3RCLEtBQVM7SUFDaEI7OztPQUdHO0lBQ0ksYUFBaUI7SUFDeEI7OztPQUdHO0lBQ0ksZUFBbUI7SUFDMUIsK0RBQStEO0lBQ3hELEtBQWE7SUFDcEIsd0RBQXdEO0lBQ2pELEtBQWdCO1FBeEJoQixTQUFJLEdBQUosSUFBSSxDQUFNO1FBRVYsb0JBQWUsR0FBZixlQUFlLENBQWM7UUFFN0IsZ0JBQVcsR0FBWCxXQUFXLENBQUk7UUFFZixlQUFVLEdBQVYsVUFBVSxDQUFjO1FBRXhCLFdBQU0sR0FBTixNQUFNLENBQVE7UUFFZCxVQUFLLEdBQUwsS0FBSyxDQUFJO1FBS1Qsa0JBQWEsR0FBYixhQUFhLENBQUk7UUFLakIsb0JBQWUsR0FBZixlQUFlLENBQUk7UUFFbkIsVUFBSyxHQUFMLEtB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5jb21pbmdfbm90ZV9kYW8uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZGF0YWJhc2UvaW5jb21pbmdfbm90ZV9kYW8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNwRCxPQUFPLEVBQUUsWUFBWSxFQUFFLEVBQUUsRUFBRSxLQUFLLEVBQWtCLE1BQU0sb0JBQW9CLENBQUM7QUFDN0UsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM3RCxPQUFPLEVBQUUsWUFBWSxFQUFFLGlCQUFpQixFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFHOUU7O0dBRUc7QUFDSCxNQUFNLE9BQU8sZUFBZTtJQUMxQjtJQUNFLGtEQUFrRDtJQUMzQyxJQUFVO0lBQ2pCLG9EQUFvRDtJQUM3QyxlQUE2QjtJQUNwQyxpRUFBaUU7SUFDMUQsV0FBZTtJQUN0QixpREFBaUQ7SUFDMUMsVUFBd0I7SUFDL0Isa0RBQWtEO0lBQzNDLE1BQWM7SUFDckIsNkJBQTZCO0lBQ3RCLEtBQVM7SUFDaEI7OztPQUdHO0lBQ0ksUUFBWTtJQUNuQjs7O09BR0c7SUFDSSxlQUFtQjtJQUMxQiwrREFBK0Q7SUFDeEQsS0FBYTtJQUNwQix3REFBd0Q7SUFDakQsS0FBZ0I7UUF4QmhCLFNBQUksR0FBSixJQUFJLENBQU07UUFFVixvQkFBZSxHQUFmLGVBQWUsQ0FBYztRQUU3QixnQkFBVyxHQUFYLFdBQVcsQ0FBSTtRQUVmLGVBQVUsR0FBVixVQUFVLENBQWM7UUFFeEIsV0FBTSxHQUFOLE1BQU0sQ0FBUTtRQUVkLFVBQUssR0FBTCxLQUFLLENBQUk7UUFLVCxhQUFRLEdBQVIsUUFBUSxDQUFJO1FBS1osb0JBQWUsR0FBZixlQUFlLENBQUk7UUFFbkIsVUFBSyxHQUFMLEtBQUss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

package/dest/database/kv_pxe_database.d.ts

@@ -25,8 +25,8 @@ export declare class KVPxeDatabase implements PxeDatabase {
     getAuthWitness(messageHash: Fr): Promise<Fr[] | undefined>;
     addCapsule(capsule: Fr[]): Promise<void>;
     popCapsule(): Promise<Fr[] | undefined>;
-    addNote(note: IncomingNoteDao): Promise<void>;
-    addNotes(incomingNotes: IncomingNoteDao[], outgoingNotes: OutgoingNoteDao[]): Promise<void>;
+    addNote(note: IncomingNoteDao, scope?: AztecAddress): Promise<void>;
+    addNotes(incomingNotes: IncomingNoteDao[], outgoingNotes: OutgoingNoteDao[], scope?: AztecAddress): Promise<void>;
     addDeferredNotes(deferredNotes: DeferredNoteDao[]): Promise<void>;
     getDeferredNotesByContract(contractAddress: AztecAddress): Promise<DeferredNoteDao[]>;
     /**
@@ -37,7 +37,7 @@ export declare class KVPxeDatabase implements PxeDatabase {
     removeDeferredNotesByContract(contractAddress: AztecAddress): Promise<DeferredNoteDao[]>;
     getIncomingNotes(filter: IncomingNotesFilter): Promise<IncomingNoteDao[]>;
     getOutgoingNotes(filter: OutgoingNotesFilter): Promise<OutgoingNoteDao[]>;
-    removeNullifiedNotes(nullifiers: Fr[], account: PublicKey): Promise<IncomingNoteDao[]>;
+    removeNullifiedNotes(nullifiers: Fr[], accountIvpkM: PublicKey): Promise<IncomingNoteDao[]>;
     addNullifiedNote(note: IncomingNoteDao): Promise<void>;
     setHeader(header: Header): Promise<void>;
     getBlockNumber(): number | undefined;

package/dest/database/kv_pxe_database.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"kv_pxe_database.d.ts","sourceRoot":"","sources":["../../src/database/kv_pxe_database.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"kv_pxe_database.d.ts","sourceRoot":"","sources":["../../src/database/kv_pxe_database.ts"],"names":[],"mappings":"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"}

package/dest/database/kv_pxe_database.js

@@ -1,4 +1,4 @@
-var _KVPxeDatabase_instances, _KVPxeDatabase_synchronizedBlock, _KVPxeDatabase_addresses, _KVPxeDatabase_addressIndex, _KVPxeDatabase_authWitnesses, _KVPxeDatabase_capsules, _KVPxeDatabase_notes, _KVPxeDatabase_nullifiedNotes, _KVPxeDatabase_nullifierToNoteId, _KVPxeDatabase_notesByContract, _KVPxeDatabase_notesByStorageSlot, _KVPxeDatabase_notesByTxHash, _KVPxeDatabase_notesByIvpkM, _KVPxeDatabase_nullifiedNotesByContract, _KVPxeDatabase_nullifiedNotesByStorageSlot, _KVPxeDatabase_nullifiedNotesByTxHash, _KVPxeDatabase_nullifiedNotesByIvpkM, _KVPxeDatabase_deferredNotes, _KVPxeDatabase_deferredNotesByContract, _KVPxeDatabase_syncedBlockPerPublicKey, _KVPxeDatabase_contractArtifacts, _KVPxeDatabase_contractInstances, _KVPxeDatabase_db, _KVPxeDatabase_outgoingNotes, _KVPxeDatabase_outgoingNotesByContract, _KVPxeDatabase_outgoingNotesByStorageSlot, _KVPxeDatabase_outgoingNotesByTxHash, _KVPxeDatabase_outgoingNotesByOvpkM, _KVPxeDatabase_getCompleteAddress;
+var _KVPxeDatabase_instances, _KVPxeDatabase_synchronizedBlock, _KVPxeDatabase_addresses, _KVPxeDatabase_addressIndex, _KVPxeDatabase_authWitnesses, _KVPxeDatabase_capsules, _KVPxeDatabase_notes, _KVPxeDatabase_nullifiedNotes, _KVPxeDatabase_nullifierToNoteId, _KVPxeDatabase_nullifiedNotesByContract, _KVPxeDatabase_nullifiedNotesByStorageSlot, _KVPxeDatabase_nullifiedNotesByTxHash, _KVPxeDatabase_nullifiedNotesByIvpkM, _KVPxeDatabase_deferredNotes, _KVPxeDatabase_deferredNotesByContract, _KVPxeDatabase_syncedBlockPerPublicKey, _KVPxeDatabase_contractArtifacts, _KVPxeDatabase_contractInstances, _KVPxeDatabase_db, _KVPxeDatabase_outgoingNotes, _KVPxeDatabase_outgoingNotesByContract, _KVPxeDatabase_outgoingNotesByStorageSlot, _KVPxeDatabase_outgoingNotesByTxHash, _KVPxeDatabase_outgoingNotesByOvpkM, _KVPxeDatabase_scopes, _KVPxeDatabase_notesByContractAndScope, _KVPxeDatabase_notesByStorageSlotAndScope, _KVPxeDatabase_notesByTxHashAndScope, _KVPxeDatabase_notesByIvpkMAndScope, _KVPxeDatabase_addScope, _KVPxeDatabase_getCompleteAddress;
 import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
 import { MerkleTreeId, NoteStatus, } from '@aztec/circuit-types';
 import { AztecAddress, CompleteAddress, Header } from '@aztec/circuits.js';
@@ -24,10 +24,6 @@ export class KVPxeDatabase {
         _KVPxeDatabase_notes.set(this, void 0);
         _KVPxeDatabase_nullifiedNotes.set(this, void 0);
         _KVPxeDatabase_nullifierToNoteId.set(this, void 0);
-        _KVPxeDatabase_notesByContract.set(this, void 0);
-        _KVPxeDatabase_notesByStorageSlot.set(this, void 0);
-        _KVPxeDatabase_notesByTxHash.set(this, void 0);
-        _KVPxeDatabase_notesByIvpkM.set(this, void 0);
         _KVPxeDatabase_nullifiedNotesByContract.set(this, void 0);
         _KVPxeDatabase_nullifiedNotesByStorageSlot.set(this, void 0);
         _KVPxeDatabase_nullifiedNotesByTxHash.set(this, void 0);
@@ -43,6 +39,11 @@ export class KVPxeDatabase {
         _KVPxeDatabase_outgoingNotesByStorageSlot.set(this, void 0);
         _KVPxeDatabase_outgoingNotesByTxHash.set(this, void 0);
         _KVPxeDatabase_outgoingNotesByOvpkM.set(this, void 0);
+        _KVPxeDatabase_scopes.set(this, void 0);
+        _KVPxeDatabase_notesByContractAndScope.set(this, void 0);
+        _KVPxeDatabase_notesByStorageSlotAndScope.set(this, void 0);
+        _KVPxeDatabase_notesByTxHashAndScope.set(this, void 0);
+        _KVPxeDatabase_notesByIvpkMAndScope.set(this, void 0);
         __classPrivateFieldSet(this, _KVPxeDatabase_db, db, "f");
         __classPrivateFieldSet(this, _KVPxeDatabase_addresses, db.openArray('addresses'), "f");
         __classPrivateFieldSet(this, _KVPxeDatabase_addressIndex, db.openMap('address_index'), "f");
@@ -55,10 +56,6 @@ export class KVPxeDatabase {
         __classPrivateFieldSet(this, _KVPxeDatabase_notes, db.openMap('notes'), "f");
         __classPrivateFieldSet(this, _KVPxeDatabase_nullifiedNotes, db.openMap('nullified_notes'), "f");
         __classPrivateFieldSet(this, _KVPxeDatabase_nullifierToNoteId, db.openMap('nullifier_to_note'), "f");
-        __classPrivateFieldSet(this, _KVPxeDatabase_notesByContract, db.openMultiMap('notes_by_contract'), "f");
-        __classPrivateFieldSet(this, _KVPxeDatabase_notesByStorageSlot, db.openMultiMap('notes_by_storage_slot'), "f");
-        __classPrivateFieldSet(this, _KVPxeDatabase_notesByTxHash, db.openMultiMap('notes_by_tx_hash'), "f");
-        __classPrivateFieldSet(this, _KVPxeDatabase_notesByIvpkM, db.openMultiMap('notes_by_ivpk_m'), "f");
         __classPrivateFieldSet(this, _KVPxeDatabase_nullifiedNotesByContract, db.openMultiMap('nullified_notes_by_contract'), "f");
         __classPrivateFieldSet(this, _KVPxeDatabase_nullifiedNotesByStorageSlot, db.openMultiMap('nullified_notes_by_storage_slot'), "f");
         __classPrivateFieldSet(this, _KVPxeDatabase_nullifiedNotesByTxHash, db.openMultiMap('nullified_notes_by_tx_hash'), "f");
@@ -70,6 +67,17 @@ export class KVPxeDatabase {
         __classPrivateFieldSet(this, _KVPxeDatabase_outgoingNotesByStorageSlot, db.openMultiMap('outgoing_notes_by_storage_slot'), "f");
         __classPrivateFieldSet(this, _KVPxeDatabase_outgoingNotesByTxHash, db.openMultiMap('outgoing_notes_by_tx_hash'), "f");
         __classPrivateFieldSet(this, _KVPxeDatabase_outgoingNotesByOvpkM, db.openMultiMap('outgoing_notes_by_ovpk_m'), "f");
+        __classPrivateFieldSet(this, _KVPxeDatabase_scopes, db.openSet('scopes'), "f");
+        __classPrivateFieldSet(this, _KVPxeDatabase_notesByContractAndScope, new Map(), "f");
+        __classPrivateFieldSet(this, _KVPxeDatabase_notesByStorageSlotAndScope, new Map(), "f");
+        __classPrivateFieldSet(this, _KVPxeDatabase_notesByTxHashAndScope, new Map(), "f");
+        __classPrivateFieldSet(this, _KVPxeDatabase_notesByIvpkMAndScope, new Map(), "f");
+        for (const scope of __classPrivateFieldGet(this, _KVPxeDatabase_scopes, "f").entries()) {
+            __classPrivateFieldGet(this, _KVPxeDatabase_notesByContractAndScope, "f").set(scope, db.openMultiMap(`${scope}:notes_by_contract`));
+            __classPrivateFieldGet(this, _KVPxeDatabase_notesByStorageSlotAndScope, "f").set(scope, db.openMultiMap(`${scope}:notes_by_storage_slot`));
+            __classPrivateFieldGet(this, _KVPxeDatabase_notesByTxHashAndScope, "f").set(scope, db.openMultiMap(`${scope}:notes_by_tx_hash`));
+            __classPrivateFieldGet(this, _KVPxeDatabase_notesByIvpkMAndScope, "f").set(scope, db.openMultiMap(`${scope}:notes_by_ivpk_m`));
+        }
     }
     async getContract(address) {
         const instance = await this.getContractInstance(address);
@@ -111,10 +119,13 @@ export class KVPxeDatabase {
         const val = await __classPrivateFieldGet(this, _KVPxeDatabase_capsules, "f").pop();
         return val?.map(b => Fr.fromBuffer(b));
     }
-    async addNote(note) {
-        await this.addNotes([note], []);
+    async addNote(note, scope) {
+        await this.addNotes([note], [], scope);
     }
-    addNotes(incomingNotes, outgoingNotes) {
+    async addNotes(incomingNotes, outgoingNotes, scope = AztecAddress.ZERO) {
+        if (!__classPrivateFieldGet(this, _KVPxeDatabase_scopes, "f").has(scope.toString())) {
+            await __classPrivateFieldGet(this, _KVPxeDatabase_instances, "m", _KVPxeDatabase_addScope).call(this, scope);
+        }
         return this.db.transaction(() => {
             for (const dao of incomingNotes) {
                 // store notes by their index in the notes hash tree
@@ -124,10 +135,10 @@ export class KVPxeDatabase {
                 const noteIndex = toBufferBE(dao.index, 32).toString('hex');
                 void __classPrivateFieldGet(this, _KVPxeDatabase_notes, "f").set(noteIndex, dao.toBuffer());
                 void __classPrivateFieldGet(this, _KVPxeDatabase_nullifierToNoteId, "f").set(dao.siloedNullifier.toString(), noteIndex);
-                void __classPrivateFieldGet(this, _KVPxeDatabase_notesByContract, "f").set(dao.contractAddress.toString(), noteIndex);
-                void __classPrivateFieldGet(this, _KVPxeDatabase_notesByStorageSlot, "f").set(dao.storageSlot.toString(), noteIndex);
-                void __classPrivateFieldGet(this, _KVPxeDatabase_notesByTxHash, "f").set(dao.txHash.toString(), noteIndex);
-                void __classPrivateFieldGet(this, _KVPxeDatabase_notesByIvpkM, "f").set(dao.ivpkM.toString(), noteIndex);
+                void __classPrivateFieldGet(this, _KVPxeDatabase_notesByContractAndScope, "f").get(scope.toString()).set(dao.contractAddress.toString(), noteIndex);
+                void __classPrivateFieldGet(this, _KVPxeDatabase_notesByStorageSlotAndScope, "f").get(scope.toString()).set(dao.storageSlot.toString(), noteIndex);
+                void __classPrivateFieldGet(this, _KVPxeDatabase_notesByTxHashAndScope, "f").get(scope.toString()).set(dao.txHash.toString(), noteIndex);
+                void __classPrivateFieldGet(this, _KVPxeDatabase_notesByIvpkMAndScope, "f").get(scope.toString()).set(dao.ivpkM.toString(), noteIndex);
             }
             for (const dao of outgoingNotes) {
                 const noteIndex = toBufferBE(dao.index, 32).toString('hex');
@@ -188,16 +199,25 @@ export class KVPxeDatabase {
             : undefined;
         filter.status = filter.status ?? NoteStatus.ACTIVE;
         const candidateNoteSources = [];
-        candidateNoteSources.push({
-            ids: publicKey
-                ? __classPrivateFieldGet(this, _KVPxeDatabase_notesByIvpkM, "f").getValues(publicKey.toString())
+        filter.scopes ?? (filter.scopes = [...__classPrivateFieldGet(this, _KVPxeDatabase_scopes, "f").entries()].map(addressString => AztecAddress.fromString(addressString)));
+        const activeNoteIdsPerScope = [];
+        for (const scope of new Set(filter.scopes)) {
+            const formattedScopeString = scope.toString();
+            if (!__classPrivateFieldGet(this, _KVPxeDatabase_scopes, "f").has(formattedScopeString)) {
+                throw new Error('Trying to get incoming notes of an scope that is not in the PXE database');
+            }
+            activeNoteIdsPerScope.push(publicKey
+                ? __classPrivateFieldGet(this, _KVPxeDatabase_notesByIvpkMAndScope, "f").get(formattedScopeString).getValues(publicKey.toString())
                 : filter.txHash
-                    ? __classPrivateFieldGet(this, _KVPxeDatabase_notesByTxHash, "f").getValues(filter.txHash.toString())
+                    ? __classPrivateFieldGet(this, _KVPxeDatabase_notesByTxHashAndScope, "f").get(formattedScopeString).getValues(filter.txHash.toString())
                     : filter.contractAddress
-                        ? __classPrivateFieldGet(this, _KVPxeDatabase_notesByContract, "f").getValues(filter.contractAddress.toString())
+                        ? __classPrivateFieldGet(this, _KVPxeDatabase_notesByContractAndScope, "f").get(formattedScopeString).getValues(filter.contractAddress.toString())
                         : filter.storageSlot
-                            ? __classPrivateFieldGet(this, _KVPxeDatabase_notesByStorageSlot, "f").getValues(filter.storageSlot.toString())
-                            : __classPrivateFieldGet(this, _KVPxeDatabase_notes, "f").keys(),
+                            ? __classPrivateFieldGet(this, _KVPxeDatabase_notesByStorageSlotAndScope, "f").get(formattedScopeString).getValues(filter.storageSlot.toString())
+                            : __classPrivateFieldGet(this, _KVPxeDatabase_notesByIvpkMAndScope, "f").get(formattedScopeString).values());
+        }
+        candidateNoteSources.push({
+            ids: new Set(activeNoteIdsPerScope.flatMap(iterableIterator => [...iterableIterator])),
             notes: __classPrivateFieldGet(this, _KVPxeDatabase_notes, "f"),
         });
         if (filter.status == NoteStatus.ACTIVE_OR_NULLIFIED) {
@@ -283,7 +303,7 @@ export class KVPxeDatabase {
         }
         return Promise.resolve(notes);
     }
-    removeNullifiedNotes(nullifiers, account) {
+    removeNullifiedNotes(nullifiers, accountIvpkM) {
         if (nullifiers.length === 0) {
             return Promise.resolve([]);
         }
@@ -300,16 +320,18 @@ export class KVPxeDatabase {
                     continue;
                 }
                 const note = IncomingNoteDao.fromBuffer(noteBuffer);
-                if (!note.ivpkM.equals(account)) {
+                if (!note.ivpkM.equals(accountIvpkM)) {
                     // tried to nullify someone else's note
                     continue;
                 }
                 nullifiedNotes.push(note);
                 void __classPrivateFieldGet(this, _KVPxeDatabase_notes, "f").delete(noteIndex);
-                void __classPrivateFieldGet(this, _KVPxeDatabase_notesByIvpkM, "f").deleteValue(account.toString(), noteIndex);
-                void __classPrivateFieldGet(this, _KVPxeDatabase_notesByTxHash, "f").deleteValue(note.txHash.toString(), noteIndex);
-                void __classPrivateFieldGet(this, _KVPxeDatabase_notesByContract, "f").deleteValue(note.contractAddress.toString(), noteIndex);
-                void __classPrivateFieldGet(this, _KVPxeDatabase_notesByStorageSlot, "f").deleteValue(note.storageSlot.toString(), noteIndex);
+                for (const scope in __classPrivateFieldGet(this, _KVPxeDatabase_scopes, "f").entries()) {
+                    void __classPrivateFieldGet(this, _KVPxeDatabase_notesByIvpkMAndScope, "f").get(scope).deleteValue(accountIvpkM.toString(), noteIndex);
+                    void __classPrivateFieldGet(this, _KVPxeDatabase_notesByTxHashAndScope, "f").get(scope).deleteValue(note.txHash.toString(), noteIndex);
+                    void __classPrivateFieldGet(this, _KVPxeDatabase_notesByContractAndScope, "f").get(scope).deleteValue(note.contractAddress.toString(), noteIndex);
+                    void __classPrivateFieldGet(this, _KVPxeDatabase_notesByStorageSlotAndScope, "f").get(scope).deleteValue(note.storageSlot.toString(), noteIndex);
+                }
                 void __classPrivateFieldGet(this, _KVPxeDatabase_nullifiedNotes, "f").set(noteIndex, note.toBuffer());
                 void __classPrivateFieldGet(this, _KVPxeDatabase_nullifiedNotesByContract, "f").set(note.contractAddress.toString(), noteIndex);
                 void __classPrivateFieldGet(this, _KVPxeDatabase_nullifiedNotesByStorageSlot, "f").set(note.storageSlot.toString(), noteIndex);
@@ -387,7 +409,18 @@ export class KVPxeDatabase {
         return incomingNotesSize + outgoingNotesSize + treeRootsSize + authWitsSize + addressesSize;
     }
 }
-_KVPxeDatabase_synchronizedBlock = new WeakMap(), _KVPxeDatabase_addresses = new WeakMap(), _KVPxeDatabase_addressIndex = new WeakMap(), _KVPxeDatabase_authWitnesses = new WeakMap(), _KVPxeDatabase_capsules = new WeakMap(), _KVPxeDatabase_notes = new WeakMap(), _KVPxeDatabase_nullifiedNotes = new WeakMap(), _KVPxeDatabase_nullifierToNoteId = new WeakMap(), _KVPxeDatabase_notesByContract = new WeakMap(), _KVPxeDatabase_notesByStorageSlot = new WeakMap(), _KVPxeDatabase_notesByTxHash = new WeakMap(), _KVPxeDatabase_notesByIvpkM = new WeakMap(), _KVPxeDatabase_nullifiedNotesByContract = new WeakMap(), _KVPxeDatabase_nullifiedNotesByStorageSlot = new WeakMap(), _KVPxeDatabase_nullifiedNotesByTxHash = new WeakMap(), _KVPxeDatabase_nullifiedNotesByIvpkM = new WeakMap(), _KVPxeDatabase_deferredNotes = new WeakMap(), _KVPxeDatabase_deferredNotesByContract = new WeakMap(), _KVPxeDatabase_syncedBlockPerPublicKey = new WeakMap(), _KVPxeDatabase_contractArtifacts = new WeakMap(), _KVPxeDatabase_contractInstances = new WeakMap(), _KVPxeDatabase_db = new WeakMap(), _KVPxeDatabase_outgoingNotes = new WeakMap(), _KVPxeDatabase_outgoingNotesByContract = new WeakMap(), _KVPxeDatabase_outgoingNotesByStorageSlot = new WeakMap(), _KVPxeDatabase_outgoingNotesByTxHash = new WeakMap(), _KVPxeDatabase_outgoingNotesByOvpkM = new WeakMap(), _KVPxeDatabase_instances = new WeakSet(), _KVPxeDatabase_getCompleteAddress = function _KVPxeDatabase_getCompleteAddress(address) {
+_KVPxeDatabase_synchronizedBlock = new WeakMap(), _KVPxeDatabase_addresses = new WeakMap(), _KVPxeDatabase_addressIndex = new WeakMap(), _KVPxeDatabase_authWitnesses = new WeakMap(), _KVPxeDatabase_capsules = new WeakMap(), _KVPxeDatabase_notes = new WeakMap(), _KVPxeDatabase_nullifiedNotes = new WeakMap(), _KVPxeDatabase_nullifierToNoteId = new WeakMap(), _KVPxeDatabase_nullifiedNotesByContract = new WeakMap(), _KVPxeDatabase_nullifiedNotesByStorageSlot = new WeakMap(), _KVPxeDatabase_nullifiedNotesByTxHash = new WeakMap(), _KVPxeDatabase_nullifiedNotesByIvpkM = new WeakMap(), _KVPxeDatabase_deferredNotes = new WeakMap(), _KVPxeDatabase_deferredNotesByContract = new WeakMap(), _KVPxeDatabase_syncedBlockPerPublicKey = new WeakMap(), _KVPxeDatabase_contractArtifacts = new WeakMap(), _KVPxeDatabase_contractInstances = new WeakMap(), _KVPxeDatabase_db = new WeakMap(), _KVPxeDatabase_outgoingNotes = new WeakMap(), _KVPxeDatabase_outgoingNotesByContract = new WeakMap(), _KVPxeDatabase_outgoingNotesByStorageSlot = new WeakMap(), _KVPxeDatabase_outgoingNotesByTxHash = new WeakMap(), _KVPxeDatabase_outgoingNotesByOvpkM = new WeakMap(), _KVPxeDatabase_scopes = new WeakMap(), _KVPxeDatabase_notesByContractAndScope = new WeakMap(), _KVPxeDatabase_notesByStorageSlotAndScope = new WeakMap(), _KVPxeDatabase_notesByTxHashAndScope = new WeakMap(), _KVPxeDatabase_notesByIvpkMAndScope = new WeakMap(), _KVPxeDatabase_instances = new WeakSet(), _KVPxeDatabase_addScope = async function _KVPxeDatabase_addScope(scope) {
+    const scopeString = scope.toString();
+    if (__classPrivateFieldGet(this, _KVPxeDatabase_scopes, "f").has(scopeString)) {
+        return false;
+    }
+    await __classPrivateFieldGet(this, _KVPxeDatabase_scopes, "f").add(scopeString);
+    __classPrivateFieldGet(this, _KVPxeDatabase_notesByContractAndScope, "f").set(scopeString, __classPrivateFieldGet(this, _KVPxeDatabase_db, "f").openMultiMap(`${scopeString}:notes_by_contract`));
+    __classPrivateFieldGet(this, _KVPxeDatabase_notesByStorageSlotAndScope, "f").set(scopeString, __classPrivateFieldGet(this, _KVPxeDatabase_db, "f").openMultiMap(`${scopeString}:notes_by_storage_slot`));
+    __classPrivateFieldGet(this, _KVPxeDatabase_notesByTxHashAndScope, "f").set(scopeString, __classPrivateFieldGet(this, _KVPxeDatabase_db, "f").openMultiMap(`${scopeString}:notes_by_tx_hash`));
+    __classPrivateFieldGet(this, _KVPxeDatabase_notesByIvpkMAndScope, "f").set(scopeString, __classPrivateFieldGet(this, _KVPxeDatabase_db, "f").openMultiMap(`${scopeString}:notes_by_ivpk_m`));
+    return true;
+}, _KVPxeDatabase_getCompleteAddress = function _KVPxeDatabase_getCompleteAddress(address) {
     const index = __classPrivateFieldGet(this, _KVPxeDatabase_addressIndex, "f").get(address.toString());
     if (typeof index === 'undefined') {
         return undefined;
@@ -395,4 +428,4 @@ _KVPxeDatabase_synchronizedBlock = new WeakMap(), _KVPxeDatabase_addresses = new
     const value = __classPrivateFieldGet(this, _KVPxeDatabase_addresses, "f").at(index);
     return value ? CompleteAddress.fromBuffer(value) : undefined;
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"kv_pxe_database.js","sourceRoot":"","sources":["../../src/database/kv_pxe_database.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"kv_pxe_database.js","sourceRoot":"","sources":["../../src/database/kv_pxe_database.ts"],"names":[],"mappings":"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"}

package/dest/database/outgoing_note_dao.d.ts

@@ -20,10 +20,10 @@ export declare class OutgoingNoteDao {
     /** The nonce of the note. */
     nonce: Fr;
     /**
-     * Inner note hash of the note. This is customizable by the app circuit.
-     * We can use this value to compute siloedNoteHash and uniqueSiloedNoteHash.
+     * A hash of the note. This is customizable by the app circuit.
+     * We can use this value to compute unique note hash and then siloed note hash.
      */
-    innerNoteHash: Fr;
+    noteHash: Fr;
     /** The location of the relevant note in the note hash tree. */
     index: bigint;
     /** The public key with which the note was encrypted. */
@@ -42,10 +42,10 @@ export declare class OutgoingNoteDao {
     /** The nonce of the note. */
     nonce: Fr, 
     /**
-     * Inner note hash of the note. This is customizable by the app circuit.
-     * We can use this value to compute siloedNoteHash and uniqueSiloedNoteHash.
+     * A hash of the note. This is customizable by the app circuit.
+     * We can use this value to compute unique note hash and then siloed note hash.
      */
-    innerNoteHash: Fr, 
+    noteHash: Fr, 
     /** The location of the relevant note in the note hash tree. */
     index: bigint, 
     /** The public key with which the note was encrypted. */