@aztec/pxe 0.70.0 → 0.72.1

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

@@ -1 +1 @@
-{"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,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AAClF,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAEpD;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,8CAA8C;IAC9C,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AACD;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,uDAAuD;IACvD,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,MAAM,gBAAgB,GAAG,SAAS,GAAG,kBAAkB,GAAG,cAAc,GAAG,eAAe,CAAC;AAEjG,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,CAyBlE,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,CAUrF,CAAC;AAEF;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,aAAa,GAAG,gBAAgB,CAQnE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,kBAAkB,EAKxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AAClF,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAEpD;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,8CAA8C;IAC9C,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AACD;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,uDAAuD;IACvD,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,MAAM,gBAAgB,GAAG,SAAS,GAAG,kBAAkB,GAAG,cAAc,GAAG,eAAe,CAAC;AAEjG,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,CAyBlE,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,CAUrF,CAAC;AAEF;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,aAAa,GAAG,gBAAgB,CAQnE"}

package/dest/config/index.js

@@ -1,5 +1,5 @@
 import { INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js/constants';
-import { booleanConfigHelper, getConfigFromMappings, numberConfigHelper, } from '@aztec/foundation/config';
+import { booleanConfigHelper, getConfigFromMappings, numberConfigHelper, parseBooleanEnv, } from '@aztec/foundation/config';
 import { dataConfigMappings } from '@aztec/kv-store/config';
 export const pxeConfigMappings = {
     ...dataConfigMappings,
@@ -54,7 +54,7 @@ export const allPxeConfigMappings = {
     ...dataConfigMappings,
     proverEnabled: {
         env: 'PXE_PROVER_ENABLED',
-        parseEnv: (val) => ['1', 'true', 'TRUE'].includes(val) || !!process.env.NETWORK,
+        parseEnv: (val) => parseBooleanEnv(val) || !!process.env.NETWORK,
         description: 'Enable real proofs',
         isBoolean: true,
     },
@@ -71,4 +71,4 @@ export function getCliPXEOptions() {
         proverEnabled: pxeConfig.proverEnabled || !!cliOptions.network,
     };
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29uZmlnL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQ3BFLE9BQU8sRUFFTCxtQkFBbUIsRUFDbkIscUJBQXFCLEVBQ3JCLGtCQUFrQixHQUNuQixNQUFNLDBCQUEwQixDQUFDO0FBQ2xDLE9BQU8sRUFBd0Isa0JBQWtCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQXNDbEYsTUFBTSxDQUFDLE1BQU0saUJBQWlCLEdBQXlDO0lBQ3JFLEdBQUcsa0JBQWtCO0lBQ3JCLGVBQWUsRUFBRTtRQUNmLEdBQUcsRUFBRSx1QkFBdUI7UUFDNUIsR0FBRyxrQkFBa0IsQ0FBQyxvQkFBb0IsQ0FBQztRQUMzQyxXQUFXLEVBQUUsa0RBQWtEO0tBQ2hFO0lBQ0QsWUFBWSxFQUFFO1FBQ1osR0FBRyxFQUFFLGdCQUFnQjtRQUNyQixXQUFXLEVBQUUsdUJBQXVCO0tBQ3JDO0lBQ0Qsa0JBQWtCLEVBQUU7UUFDbEIsR0FBRyxFQUFFLHNCQUFzQjtRQUMzQixXQUFXLEVBQUUscUNBQXFDO0tBQ25EO0lBQ0QsYUFBYSxFQUFFO1FBQ2IsR0FBRyxFQUFFLGlCQUFpQjtRQUN0QixXQUFXLEVBQUUsZ0VBQWdFO1FBQzdFLEdBQUcsbUJBQW1CLEVBQUU7S0FDekI7SUFDRCxhQUFhLEVBQUU7UUFDYixHQUFHLEVBQUUsb0JBQW9CO1FBQ3pCLFdBQVcsRUFBRSxvQkFBb0I7UUFDakMsR0FBRyxtQkFBbUIsRUFBRTtLQUN6QjtDQUNGLENBQUM7QUFFRjs7R0FFRztBQUNILE1BQU0sVUFBVSxtQkFBbUI7SUFDakMsT0FBTyxxQkFBcUIsQ0FBbUIsaUJBQWlCLENBQUMsQ0FBQztBQUNwRSxDQUFDO0FBRUQsTUFBTSxDQUFDLE1BQU0sb0JBQW9CLEdBQXNDO0lBQ3JFLE9BQU8sRUFBRTtRQUNQLEdBQUcsRUFBRSxTQUFTO1FBQ2QsUUFBUSxFQUFFLENBQUMsR0FBVyxFQUFFLEVBQUUsQ0FBQyxHQUFjO1FBQ3pDLFdBQVcsRUFBRSxtREFBbUQ7S0FDakU7SUFDRCxNQUFNLEVBQUU7UUFDTixHQUFHLEVBQUUsU0FBUztRQUNkLFdBQVcsRUFBRSxpREFBaUQ7S0FDL0Q7SUFDRCxPQUFPLEVBQUU7UUFDUCxHQUFHLEVBQUUsZ0JBQWdCO1FBQ3JCLFdBQVcsRUFBRSxxQ0FBcUM7S0FDbkQ7Q0FDRixDQUFDO0FBRUYsTUFBTSxDQUFDLE1BQU0sb0JBQW9CLEdBQXlEO0lBQ3hGLEdBQUcsaUJBQWlCO0lBQ3BCLEdBQUcsb0JBQW9CO0lBQ3ZCLEdBQUcsa0JBQWtCO0lBQ3JCLGFBQWEsRUFBRTtRQUNiLEdBQUcsRUFBRSxvQkFBb0I7UUFDekIsUUFBUSxFQUFFLENBQUMsR0FBVyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEdBQUcsRUFBRSxNQUFNLEVBQUUsTUFBTSxDQUFDLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLE9BQU87UUFDdkYsV0FBVyxFQUFFLG9CQUFvQjtRQUNqQyxTQUFTLEVBQUUsSUFBSTtLQUNoQjtDQUNGLENBQUM7QUFFRjs7R0FFRztBQUNILE1BQU0sVUFBVSxnQkFBZ0I7SUFDOUIsTUFBTSxTQUFTLEdBQUcsbUJBQW1CLEVBQUUsQ0FBQztJQUN4QyxNQUFNLFVBQVUsR0FBRyxxQkFBcUIsQ0FBZ0Isb0JBQW9CLENBQUMsQ0FBQztJQUM5RSxPQUFPO1FBQ0wsR0FBRyxTQUFTO1FBQ1osR0FBRyxVQUFVO1FBQ2IsYUFBYSxFQUFFLFNBQVMsQ0FBQyxhQUFhLElBQUksQ0FBQyxDQUFDLFVBQVUsQ0FBQyxPQUFPO0tBQy9ELENBQUM7QUFDSixDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29uZmlnL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQ3BFLE9BQU8sRUFFTCxtQkFBbUIsRUFDbkIscUJBQXFCLEVBQ3JCLGtCQUFrQixFQUNsQixlQUFlLEdBQ2hCLE1BQU0sMEJBQTBCLENBQUM7QUFDbEMsT0FBTyxFQUF3QixrQkFBa0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBc0NsRixNQUFNLENBQUMsTUFBTSxpQkFBaUIsR0FBeUM7SUFDckUsR0FBRyxrQkFBa0I7SUFDckIsZUFBZSxFQUFFO1FBQ2YsR0FBRyxFQUFFLHVCQUF1QjtRQUM1QixHQUFHLGtCQUFrQixDQUFDLG9CQUFvQixDQUFDO1FBQzNDLFdBQVcsRUFBRSxrREFBa0Q7S0FDaEU7SUFDRCxZQUFZLEVBQUU7UUFDWixHQUFHLEVBQUUsZ0JBQWdCO1FBQ3JCLFdBQVcsRUFBRSx1QkFBdUI7S0FDckM7SUFDRCxrQkFBa0IsRUFBRTtRQUNsQixHQUFHLEVBQUUsc0JBQXNCO1FBQzNCLFdBQVcsRUFBRSxxQ0FBcUM7S0FDbkQ7SUFDRCxhQUFhLEVBQUU7UUFDYixHQUFHLEVBQUUsaUJBQWlCO1FBQ3RCLFdBQVcsRUFBRSxnRUFBZ0U7UUFDN0UsR0FBRyxtQkFBbUIsRUFBRTtLQUN6QjtJQUNELGFBQWEsRUFBRTtRQUNiLEdBQUcsRUFBRSxvQkFBb0I7UUFDekIsV0FBVyxFQUFFLG9CQUFvQjtRQUNqQyxHQUFHLG1CQUFtQixFQUFFO0tBQ3pCO0NBQ0YsQ0FBQztBQUVGOztHQUVHO0FBQ0gsTUFBTSxVQUFVLG1CQUFtQjtJQUNqQyxPQUFPLHFCQUFxQixDQUFtQixpQkFBaUIsQ0FBQyxDQUFDO0FBQ3BFLENBQUM7QUFFRCxNQUFNLENBQUMsTUFBTSxvQkFBb0IsR0FBc0M7SUFDckUsT0FBTyxFQUFFO1FBQ1AsR0FBRyxFQUFFLFNBQVM7UUFDZCxRQUFRLEVBQUUsQ0FBQyxHQUFXLEVBQUUsRUFBRSxDQUFDLEdBQWM7UUFDekMsV0FBVyxFQUFFLG1EQUFtRDtLQUNqRTtJQUNELE1BQU0sRUFBRTtRQUNOLEdBQUcsRUFBRSxTQUFTO1FBQ2QsV0FBVyxFQUFFLGlEQUFpRDtLQUMvRDtJQUNELE9BQU8sRUFBRTtRQUNQLEdBQUcsRUFBRSxnQkFBZ0I7UUFDckIsV0FBVyxFQUFFLHFDQUFxQztLQUNuRDtDQUNGLENBQUM7QUFFRixNQUFNLENBQUMsTUFBTSxvQkFBb0IsR0FBeUQ7SUFDeEYsR0FBRyxpQkFBaUI7SUFDcEIsR0FBRyxvQkFBb0I7SUFDdkIsR0FBRyxrQkFBa0I7SUFDckIsYUFBYSxFQUFFO1FBQ2IsR0FBRyxFQUFFLG9CQUFvQjtRQUN6QixRQUFRLEVBQUUsQ0FBQyxHQUFXLEVBQUUsRUFBRSxDQUFDLGVBQWUsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPO1FBQ3hFLFdBQVcsRUFBRSxvQkFBb0I7UUFDakMsU0FBUyxFQUFFLElBQUk7S0FDaEI7Q0FDRixDQUFDO0FBRUY7O0dBRUc7QUFDSCxNQUFNLFVBQVUsZ0JBQWdCO0lBQzlCLE1BQU0sU0FBUyxHQUFHLG1CQUFtQixFQUFFLENBQUM7SUFDeEMsTUFBTSxVQUFVLEdBQUcscUJBQXFCLENBQWdCLG9CQUFvQixDQUFDLENBQUM7SUFDOUUsT0FBTztRQUNMLEdBQUcsU0FBUztRQUNaLEdBQUcsVUFBVTtRQUNiLGFBQWEsRUFBRSxTQUFTLENBQUMsYUFBYSxJQUFJLENBQUMsQ0FBQyxVQUFVLENBQUMsT0FBTztLQUMvRCxDQUFDO0FBQ0osQ0FBQyJ9

package/dest/database/kv_pxe_database.d.ts

@@ -1,7 +1,7 @@
 import { type InBlock, type NotesFilter } from '@aztec/circuit-types';
-import { AztecAddress, BlockHeader, CompleteAddress, type ContractInstanceWithAddress, type IndexedTaggingSecret, type PublicKey } from '@aztec/circuits.js';
+import { AztecAddress, BlockHeader, CompleteAddress, type ContractInstanceWithAddress, type IndexedTaggingSecret } from '@aztec/circuits.js';
 import { type ContractArtifact } from '@aztec/foundation/abi';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr, type Point } from '@aztec/foundation/fields';
 import { type LogFn } from '@aztec/foundation/log';
 import { type AztecAsyncKVStore } from '@aztec/kv-store';
 import { NoteDao } from './note_dao.js';
@@ -30,7 +30,7 @@ export declare class KVPxeDatabase implements PxeDatabase {
     removeNotesAfter(blockNumber: number): Promise<void>;
     unnullifyNotesAfter(blockNumber: number): Promise<void>;
     getNotes(filter: NotesFilter): Promise<NoteDao[]>;
-    removeNullifiedNotes(nullifiers: InBlock<Fr>[], accountAddressPoint: PublicKey): Promise<NoteDao[]>;
+    removeNullifiedNotes(nullifiers: InBlock<Fr>[], accountAddressPoint: Point): Promise<NoteDao[]>;
     addNullifiedNote(note: NoteDao): Promise<void>;
     setHeader(header: BlockHeader): Promise<void>;
     getBlockNumber(): Promise<number | undefined>;
@@ -47,7 +47,9 @@ export declare class KVPxeDatabase implements PxeDatabase {
     getTaggingSecretsIndexesAsRecipient(appTaggingSecrets: Fr[]): Promise<number[]>;
     getTaggingSecretsIndexesAsSender(appTaggingSecrets: Fr[]): Promise<number[]>;
     resetNoteSyncData(): Promise<void>;
-    store(contract: AztecAddress, key: Fr, values: Fr[]): Promise<void>;
-    load(contract: AztecAddress, key: Fr): Promise<Fr[] | null>;
+    dbStore(contractAddress: AztecAddress, slot: Fr, values: Fr[]): Promise<void>;
+    dbLoad(contractAddress: AztecAddress, slot: Fr): Promise<Fr[] | null>;
+    dbDelete(contractAddress: AztecAddress, slot: Fr): Promise<void>;
+    dbCopy(contractAddress: AztecAddress, srcSlot: Fr, dstSlot: Fr, numEntries: number): Promise<void>;
 }
 //# sourceMappingURL=kv_pxe_database.d.ts.map

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

@@ -221,7 +221,7 @@ export class KVPxeDatabase {
         });
     }
     async getNotes(filter) {
-        const publicKey = filter.owner ? filter.owner.toAddressPoint() : undefined;
+        const publicKey = filter.owner ? await filter.owner.toAddressPoint() : undefined;
         filter.status = filter.status ?? NoteStatus.ACTIVE;
         const candidateNoteSources = [];
         filter.scopes ?? (filter.scopes = (await toArray(__classPrivateFieldGet(this, _KVPxeDatabase_scopes, "f").entriesAsync())).map(addressString => AztecAddress.fromString(addressString)));
@@ -389,7 +389,7 @@ export class KVPxeDatabase {
         return __classPrivateFieldGet(this, _KVPxeDatabase_instances, "m", _KVPxeDatabase_getCompleteAddress).call(this, account);
     }
     async getCompleteAddresses() {
-        return (await toArray(__classPrivateFieldGet(this, _KVPxeDatabase_completeAddresses, "f").valuesAsync())).map(v => CompleteAddress.fromBuffer(v));
+        return await Promise.all((await toArray(__classPrivateFieldGet(this, _KVPxeDatabase_completeAddresses, "f").valuesAsync())).map(v => CompleteAddress.fromBuffer(v)));
     }
     async addSenderAddress(address) {
         if (await __classPrivateFieldGet(this, _KVPxeDatabase_addressBook, "f").hasAsync(address.toString())) {
@@ -435,16 +435,13 @@ export class KVPxeDatabase {
             await Promise.all(senders.map(sender => __classPrivateFieldGet(this, _KVPxeDatabase_taggingSecretIndexesForSenders, "f").delete(sender)));
         });
     }
-    async store(contract, key, values) {
-        const dataKey = `${contract.toString()}:${key.toString()}`;
-        const dataBuffer = Buffer.concat(values.map(value => value.toBuffer()));
-        await __classPrivateFieldGet(this, _KVPxeDatabase_contractStore, "f").set(dataKey, dataBuffer);
+    async dbStore(contractAddress, slot, values) {
+        await __classPrivateFieldGet(this, _KVPxeDatabase_contractStore, "f").set(dbSlotToKey(contractAddress, slot), Buffer.concat(values.map(value => value.toBuffer())));
     }
-    async load(contract, key) {
-        const dataKey = `${contract.toString()}:${key.toString()}`;
-        const dataBuffer = await __classPrivateFieldGet(this, _KVPxeDatabase_contractStore, "f").getAsync(dataKey);
+    async dbLoad(contractAddress, slot) {
+        const dataBuffer = await __classPrivateFieldGet(this, _KVPxeDatabase_contractStore, "f").getAsync(dbSlotToKey(contractAddress, slot));
         if (!dataBuffer) {
-            this.debug(`Data not found for contract ${contract.toString()} and key ${key.toString()}`);
+            this.debug(`Data not found for contract ${contractAddress.toString()} and slot ${slot.toString()}`);
             return null;
         }
         const values = [];
@@ -453,6 +450,28 @@ export class KVPxeDatabase {
         }
         return values;
     }
+    async dbDelete(contractAddress, slot) {
+        await __classPrivateFieldGet(this, _KVPxeDatabase_contractStore, "f").delete(dbSlotToKey(contractAddress, slot));
+    }
+    async dbCopy(contractAddress, srcSlot, dstSlot, numEntries) {
+        // In order to support overlaping source and destination regions we need to check the relative positions of source
+        // and destination. If destination is ahead of source, then by the time we overwrite source elements using forward
+        // indexes we'll have already read those. On the contrary, if source is ahead of destination we need to use backward
+        // indexes to avoid reading elements that've been overwritten.
+        const indexes = Array.from(Array(numEntries).keys());
+        if (srcSlot.lt(dstSlot)) {
+            indexes.reverse();
+        }
+        for (const i of indexes) {
+            const currentSrcSlot = dbSlotToKey(contractAddress, srcSlot.add(new Fr(i)));
+            const currentDstSlot = dbSlotToKey(contractAddress, dstSlot.add(new Fr(i)));
+            const toCopy = await __classPrivateFieldGet(this, _KVPxeDatabase_contractStore, "f").getAsync(currentSrcSlot);
+            if (!toCopy) {
+                throw new Error(`Attempted to copy empty slot ${currentSrcSlot} for contract ${contractAddress.toString()}`);
+            }
+            await __classPrivateFieldGet(this, _KVPxeDatabase_contractStore, "f").set(currentDstSlot, toCopy);
+        }
+    }
 }
 _KVPxeDatabase_synchronizedBlock = new WeakMap(), _KVPxeDatabase_completeAddresses = new WeakMap(), _KVPxeDatabase_completeAddressIndex = new WeakMap(), _KVPxeDatabase_addressBook = new WeakMap(), _KVPxeDatabase_authWitnesses = new WeakMap(), _KVPxeDatabase_capsules = new WeakMap(), _KVPxeDatabase_notes = new WeakMap(), _KVPxeDatabase_nullifiedNotes = new WeakMap(), _KVPxeDatabase_nullifierToNoteId = new WeakMap(), _KVPxeDatabase_nullifiersByBlockNumber = new WeakMap(), _KVPxeDatabase_nullifiedNotesToScope = new WeakMap(), _KVPxeDatabase_nullifiedNotesByContract = new WeakMap(), _KVPxeDatabase_nullifiedNotesByStorageSlot = new WeakMap(), _KVPxeDatabase_nullifiedNotesByTxHash = new WeakMap(), _KVPxeDatabase_nullifiedNotesByAddressPoint = new WeakMap(), _KVPxeDatabase_nullifiedNotesByNullifier = new WeakMap(), _KVPxeDatabase_contractArtifacts = new WeakMap(), _KVPxeDatabase_contractInstances = new WeakMap(), _KVPxeDatabase_db = new WeakMap(), _KVPxeDatabase_scopes = new WeakMap(), _KVPxeDatabase_notesToScope = new WeakMap(), _KVPxeDatabase_notesByContractAndScope = new WeakMap(), _KVPxeDatabase_notesByStorageSlotAndScope = new WeakMap(), _KVPxeDatabase_notesByTxHashAndScope = new WeakMap(), _KVPxeDatabase_notesByAddressPointAndScope = new WeakMap(), _KVPxeDatabase_taggingSecretIndexesForSenders = new WeakMap(), _KVPxeDatabase_taggingSecretIndexesForRecipients = new WeakMap(), _KVPxeDatabase_contractStore = new WeakMap(), _KVPxeDatabase_instances = new WeakSet(), _KVPxeDatabase_addScope = async function _KVPxeDatabase_addScope(scope) {
     const scopeString = scope.toString();
@@ -477,4 +496,7 @@ _KVPxeDatabase_synchronizedBlock = new WeakMap(), _KVPxeDatabase_completeAddress
 }, _KVPxeDatabase_getTaggingSecretsIndexes = function _KVPxeDatabase_getTaggingSecretsIndexes(appTaggingSecrets, storageMap) {
     return Promise.all(appTaggingSecrets.map(async (secret) => (await storageMap.getAsync(`${secret.toString()}`)) ?? 0));
 };
-//# 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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"}
+function dbSlotToKey(contractAddress, slot) {
+    return `${contractAddress.toString()}:${slot.toString()}`;
+}
+//# 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/note_dao.d.ts

@@ -1,11 +1,10 @@
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="node" resolution-mode="require"/>
-import { type L1NotePayload, Note, TxHash } from '@aztec/circuit-types';
+import { Note, TxHash } from '@aztec/circuit-types';
 import { AztecAddress, Fr, type PublicKey } from '@aztec/circuits.js';
 import { NoteSelector } from '@aztec/foundation/abi';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { type NoteData } from '@aztec/simulator/client';
-import { type NoteInfo } from '../note_decryption_utils/index.js';
 /**
  * A Note Data Access Object, representing a note that was comitted to the note hash tree, holding all of the
  * information required to use it during execution and manage its state.
@@ -90,7 +89,6 @@ export declare class NoteDao implements NoteData {
      * TODO: remove
      */
     noteTypeId: NoteSelector);
-    static fromPayloadAndNoteInfo(note: Note, payload: L1NotePayload, noteInfo: NoteInfo, l2BlockNumber: number, l2BlockHash: string, dataStartIndexForTx: number, addressPoint: PublicKey): NoteDao;
     toBuffer(): Buffer;
     static fromBuffer(buffer: Buffer | BufferReader): NoteDao;
     toString(): string;
@@ -100,6 +98,6 @@ export declare class NoteDao implements NoteData {
      * @returns - Its size in bytes.
      */
     getSize(): number;
-    static random({ note, contractAddress, storageSlot, nonce, noteHash, siloedNullifier, txHash, l2BlockNumber, l2BlockHash, index, addressPoint, noteTypeId, }?: Partial<NoteDao>): NoteDao;
+    static random({ note, contractAddress, storageSlot, nonce, noteHash, siloedNullifier, txHash, l2BlockNumber, l2BlockHash, index, addressPoint, noteTypeId, }?: Partial<NoteDao>): Promise<NoteDao>;
 }
 //# sourceMappingURL=note_dao.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"note_dao.d.ts","sourceRoot":"","sources":["../../src/database/note_dao.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,IAAI,EAAE,MAAM,EAAgB,MAAM,sBAAsB,CAAC;AACtF,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,yBAAyB,CAAC;AAExD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAElE;;;GAGG;AACH,qBAAa,OAAQ,YAAW,QAAQ;IAIpC,sFAAsF;IAC/E,IAAI,EAAE,IAAI;IACjB,8GAA8G;IACvG,eAAe,EAAE,YAAY;IACpC;;;SAGK;IACE,WAAW,EAAE,EAAE;IACtB,qFAAqF;IAC9E,KAAK,EAAE,EAAE;IAGhB;;;OAGG;IACI,QAAQ,EAAE,EAAE;IACnB;;;OAGG;IACI,eAAe,EAAE,EAAE;IAG1B;;OAEG;IACI,MAAM,EAAE,MAAM;IACrB;gBACY;IACL,aAAa,EAAE,MAAM;IAC5B;gBACY;IACL,WAAW,EAAE,MAAM;IAC1B,+EAA+E;IACxE,KAAK,EAAE,MAAM;IACpB,gFAAgF;IACzE,YAAY,EAAE,SAAS;IAE9B;;OAEG;IACI,UAAU,EAAE,YAAY;;IA3C/B,sFAAsF;IAC/E,IAAI,EAAE,IAAI;IACjB,8GAA8G;IACvG,eAAe,EAAE,YAAY;IACpC;;;SAGK;IACE,WAAW,EAAE,EAAE;IACtB,qFAAqF;IAC9E,KAAK,EAAE,EAAE;IAGhB;;;OAGG;IACI,QAAQ,EAAE,EAAE;IACnB;;;OAGG;IACI,eAAe,EAAE,EAAE;IAG1B;;OAEG;IACI,MAAM,EAAE,MAAM;IACrB;gBACY;IACL,aAAa,EAAE,MAAM;IAC5B;gBACY;IACL,WAAW,EAAE,MAAM;IAC1B,+EAA+E;IACxE,KAAK,EAAE,MAAM;IACpB,gFAAgF;IACzE,YAAY,EAAE,SAAS;IAE9B;;OAEG;IACI,UAAU,EAAE,YAAY;IAGjC,MAAM,CAAC,sBAAsB,CAC3B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,aAAa,EACtB,QAAQ,EAAE,QAAQ,EAClB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,mBAAmB,EAAE,MAAM,EAC3B,YAAY,EAAE,SAAS;IAmBzB,QAAQ,IAAI,MAAM;IAiBlB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAgC/C,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAK7B;;;OAGG;IACI,OAAO;IAMd,MAAM,CAAC,MAAM,CAAC,EACZ,IAAoB,EACpB,eAAuC,EACvC,WAAyB,EACzB,KAAmB,EACnB,QAAsB,EACtB,eAA6B,EAC7B,MAAuB,EACvB,aAAgD,EAChD,WAAoC,EACpC,KAA8B,EAC9B,YAA6B,EAC7B,UAAkC,GACnC,GAAE,OAAO,CAAC,OAAO,CAAM;CAgBzB"}
+{"version":3,"file":"note_dao.d.ts","sourceRoot":"","sources":["../../src/database/note_dao.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAgB,MAAM,sBAAsB,CAAC;AAClE,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,yBAAyB,CAAC;AAExD;;;GAGG;AACH,qBAAa,OAAQ,YAAW,QAAQ;IAIpC,sFAAsF;IAC/E,IAAI,EAAE,IAAI;IACjB,8GAA8G;IACvG,eAAe,EAAE,YAAY;IACpC;;;SAGK;IACE,WAAW,EAAE,EAAE;IACtB,qFAAqF;IAC9E,KAAK,EAAE,EAAE;IAGhB;;;OAGG;IACI,QAAQ,EAAE,EAAE;IACnB;;;OAGG;IACI,eAAe,EAAE,EAAE;IAG1B;;OAEG;IACI,MAAM,EAAE,MAAM;IACrB;gBACY;IACL,aAAa,EAAE,MAAM;IAC5B;gBACY;IACL,WAAW,EAAE,MAAM;IAC1B,+EAA+E;IACxE,KAAK,EAAE,MAAM;IACpB,gFAAgF;IACzE,YAAY,EAAE,SAAS;IAE9B;;OAEG;IACI,UAAU,EAAE,YAAY;;IA3C/B,sFAAsF;IAC/E,IAAI,EAAE,IAAI;IACjB,8GAA8G;IACvG,eAAe,EAAE,YAAY;IACpC;;;SAGK;IACE,WAAW,EAAE,EAAE;IACtB,qFAAqF;IAC9E,KAAK,EAAE,EAAE;IAGhB;;;OAGG;IACI,QAAQ,EAAE,EAAE;IACnB;;;OAGG;IACI,eAAe,EAAE,EAAE;IAG1B;;OAEG;IACI,MAAM,EAAE,MAAM;IACrB;gBACY;IACL,aAAa,EAAE,MAAM;IAC5B;gBACY;IACL,WAAW,EAAE,MAAM;IAC1B,+EAA+E;IACxE,KAAK,EAAE,MAAM;IACpB,gFAAgF;IACzE,YAAY,EAAE,SAAS;IAE9B;;OAEG;IACI,UAAU,EAAE,YAAY;IAGjC,QAAQ,IAAI,MAAM;IAiBlB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAgC/C,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAK7B;;;OAGG;IACI,OAAO;WAMD,MAAM,CAAC,EAClB,IAAoB,EACpB,eAA2B,EAC3B,WAAyB,EACzB,KAAmB,EACnB,QAAsB,EACtB,eAA6B,EAC7B,MAAuB,EACvB,aAAgD,EAChD,WAAoC,EACpC,KAA8B,EAC9B,YAAwB,EACxB,UAAkC,GACnC,GAAE,OAAO,CAAC,OAAO,CAAM;CAgBzB"}

package/dest/database/note_dao.js

@@ -64,10 +64,6 @@ export class NoteDao {
         this.addressPoint = addressPoint;
         this.noteTypeId = noteTypeId;
     }
-    static fromPayloadAndNoteInfo(note, payload, noteInfo, l2BlockNumber, l2BlockHash, dataStartIndexForTx, addressPoint) {
-        const noteHashIndexInTheWholeTree = BigInt(dataStartIndexForTx + noteInfo.noteHashIndex);
-        return new NoteDao(note, payload.contractAddress, payload.storageSlot, noteInfo.nonce, noteInfo.noteHash, noteInfo.siloedNullifier, noteInfo.txHash, l2BlockNumber, l2BlockHash, noteHashIndexInTheWholeTree, addressPoint, payload.noteTypeId);
-    }
     toBuffer() {
         return serializeToBuffer([
             this.note,
@@ -116,8 +112,8 @@ export class NoteDao {
         const noteSize = 4 + this.note.items.length * Fr.SIZE_IN_BYTES;
         return noteSize + AztecAddress.SIZE_IN_BYTES + Fr.SIZE_IN_BYTES * 4 + TxHash.SIZE + Point.SIZE_IN_BYTES + indexSize;
     }
-    static random({ note = Note.random(), contractAddress = AztecAddress.random(), storageSlot = Fr.random(), nonce = Fr.random(), noteHash = Fr.random(), siloedNullifier = Fr.random(), txHash = randomTxHash(), l2BlockNumber = Math.floor(Math.random() * 1000), l2BlockHash = Fr.random().toString(), index = Fr.random().toBigInt(), addressPoint = Point.random(), noteTypeId = NoteSelector.random(), } = {}) {
-        return new NoteDao(note, contractAddress, storageSlot, nonce, noteHash, siloedNullifier, txHash, l2BlockNumber, l2BlockHash, index, addressPoint, noteTypeId);
+    static async random({ note = Note.random(), contractAddress = undefined, storageSlot = Fr.random(), nonce = Fr.random(), noteHash = Fr.random(), siloedNullifier = Fr.random(), txHash = randomTxHash(), l2BlockNumber = Math.floor(Math.random() * 1000), l2BlockHash = Fr.random().toString(), index = Fr.random().toBigInt(), addressPoint = undefined, noteTypeId = NoteSelector.random(), } = {}) {
+        return new NoteDao(note, contractAddress ?? (await AztecAddress.random()), storageSlot, nonce, noteHash, siloedNullifier, txHash, l2BlockNumber, l2BlockHash, index, addressPoint ?? (await Point.random()), noteTypeId);
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm90ZV9kYW8uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZGF0YWJhc2Uvbm90ZV9kYW8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFzQixJQUFJLEVBQUUsTUFBTSxFQUFFLFlBQVksRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3RGLE9BQU8sRUFBRSxZQUFZLEVBQUUsRUFBRSxFQUFFLEtBQUssRUFBa0IsTUFBTSxvQkFBb0IsQ0FBQztBQUM3RSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDckQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzdELE9BQU8sRUFBRSxZQUFZLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUs5RTs7O0dBR0c7QUFDSCxNQUFNLE9BQU8sT0FBTztJQUNsQjtJQUNFLG1CQUFtQjtJQUVuQixzRkFBc0Y7SUFDL0UsSUFBVTtJQUNqQiw4R0FBOEc7SUFDdkcsZUFBNkI7SUFDcEM7OztTQUdLO0lBQ0UsV0FBZTtJQUN0QixxRkFBcUY7SUFDOUUsS0FBUztJQUVoQixrQkFBa0I7SUFDbEI7OztPQUdHO0lBQ0ksUUFBWTtJQUNuQjs7O09BR0c7SUFDSSxlQUFtQjtJQUUxQixXQUFXO0lBQ1g7O09BRUc7SUFDSSxNQUFjO0lBQ3JCO2dCQUNZO0lBQ0wsYUFBcUI7SUFDNUI7Z0JBQ1k7SUFDTCxXQUFtQjtJQUMxQiwrRUFBK0U7SUFDeEUsS0FBYTtJQUNwQixnRkFBZ0Y7SUFDekUsWUFBdUI7SUFFOUI7O09BRUc7SUFDSSxVQUF3QjtRQTFDeEIsU0FBSSxHQUFKLElBQUksQ0FBTTtRQUVWLG9CQUFlLEdBQWYsZUFBZSxDQUFjO1FBSzdCLGdCQUFXLEdBQVgsV0FBVyxDQUFJO1FBRWYsVUFBSyxHQUFMLEtBQUssQ0FBSTtRQU9ULGFBQVEsR0FBUixRQUFRLENBQUk7UUFLWixvQkFBZSxHQUFmLGVBQWUsQ0FBSTtRQU1uQixXQUFNLEdBQU4sTUFBTSxDQUFRO1FBR2Qsa0JBQWEsR0FBYixhQUFhLENBQVE7UUFHckIsZ0JBQVcsR0FBWCxXQUFXLENBQVE7UUFFbkIsVUFBSyxHQUFMLEtBQUssQ0FBUTtRQUViLGlCQUFZLEdBQVosWUFBWSxDQUFXO1FBS3ZCLGVBQVUsR0FBVixVQUFVLENBQWM7SUFDOUIsQ0FBQztJQUVKLE1BQU0sQ0FBQyxzQkFBc0IsQ0FDM0IsSUFBVSxFQUNWLE9BQXNCLEVBQ3RCLFFBQWtCLEVBQ2xCLGFBQXFCLEVBQ3JCLFdBQW1CLEVBQ25CLG1CQUEyQixFQUMzQixZQUF1QjtRQUV2QixNQUFNLDJCQUEyQixHQUFHLE1BQU0sQ0FBQyxtQkFBbUIsR0FBRyxRQUFRLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDekYsT0FBTyxJQUFJLE9BQU8sQ0FDaEIsSUFBSSxFQUNKLE9BQU8sQ0FBQyxlQUFlLEVBQ3ZCLE9BQU8sQ0FBQyxXQUFXLEVBQ25CLFFBQVEsQ0FBQyxLQUFLLEVBQ2QsUUFBUSxDQUFDLFFBQVEsRUFDakIsUUFBUSxDQUFDLGVBQWUsRUFDeEIsUUFBUSxDQUFDLE1BQU0sRUFDZixhQUFhLEVBQ2IsV0FBVyxFQUNYLDJCQUEyQixFQUMzQixZQUFZLEVBQ1osT0FBTyxDQUFDLFVBQVUsQ0FDbkIsQ0FBQztJQUNKLENBQUM7SUFFRCxRQUFRO1FBQ04sT0FBTyxpQkFBaUIsQ0FBQztZQUN2QixJQUFJLENBQUMsSUFBSTtZQUNULElBQUksQ0FBQyxlQUFlO1lBQ3BCLElBQUksQ0FBQyxXQUFXO1lBQ2hCLElBQUksQ0FBQyxLQUFLO1lBQ1YsSUFBSSxDQUFDLFFBQVE7WUFDYixJQUFJLENBQUMsZUFBZTtZQUNwQixJQUFJLENBQUMsTUFBTTtZQUNYLElBQUksQ0FBQyxhQUFhO1lBQ2xCLEVBQUUsQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQztZQUNsQyxJQUFJLENBQUMsS0FBSztZQUNWLElBQUksQ0FBQyxZQUFZO1lBQ2pCLElBQUksQ0FBQyxVQUFVO1NBQ2hCLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQTZCO1FBQzdDLE1BQU0sTUFBTSxHQUFHLFlBQVksQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUM7UUFFN0MsTUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUNyQyxNQUFNLGVBQWUsR0FBRyxZQUFZLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ3hELE1BQU0sV0FBVyxHQUFHLEVBQUUsQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDMUMsTUFBTSxLQUFLLEdBQUcsRUFBRSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUNwQyxNQUFNLFFBQVEsR0FBRyxFQUFFLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ3ZDLE1BQU0sZUFBZSxHQUFHLEVBQUUsQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDOUMsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUN6QyxNQUFNLGFBQWEsR0FBRyxNQUFNLENBQUMsVUFBVSxFQUFFLENBQUM7UUFDMUMsTUFBTSxXQUFXLEdBQUcsRUFBRSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUNyRCxNQUFNLEtBQUssR0FBRyxVQUFVLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQy9DLE1BQU0sU0FBUyxHQUFHLEtBQUssQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDM0MsTUFBTSxVQUFVLEdBQUcsTUFBTSxDQUFDLFVBQVUsQ0FBQyxZQUFZLENBQUMsQ0FBQztRQUVuRCxPQUFPLElBQUksT0FBTyxDQUNoQixJQUFJLEVBQ0osZUFBZSxFQUNmLFdBQVcsRUFDWCxLQUFLLEVBQ0wsUUFBUSxFQUNSLGVBQWUsRUFDZixNQUFNLEVBQ04sYUFBYSxFQUNiLFdBQVcsRUFDWCxLQUFLLEVBQ0wsU0FBUyxFQUNULFVBQVUsQ0FDWCxDQUFDO0lBQ0osQ0FBQztJQUVELFFBQVE7UUFDTixPQUFPLElBQUksR0FBRyxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ2hELENBQUM7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQVc7UUFDM0IsTUFBTSxHQUFHLEdBQUcsR0FBRyxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDbkMsT0FBTyxPQUFPLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLEtBQUssQ0FBQyxDQUFDLENBQUM7SUFDckQsQ0FBQztJQUVEOzs7T0FHRztJQUNJLE9BQU87UUFDWixNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDM0QsTUFBTSxRQUFRLEdBQUcsQ0FBQyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sR0FBRyxFQUFFLENBQUMsYUFBYSxDQUFDO1FBQy9ELE9BQU8sUUFBUSxHQUFHLFlBQVksQ0FBQyxhQUFhLEdBQUcsRUFBRSxDQUFDLGFBQWEsR0FBRyxDQUFDLEdBQUcsTUFBTSxDQUFDLElBQUksR0FBRyxLQUFLLENBQUMsYUFBYSxHQUFHLFNBQVMsQ0FBQztJQUN0SCxDQUFDO0lBRUQsTUFBTSxDQUFDLE1BQU0sQ0FBQyxFQUNaLElBQUksR0FBRyxJQUFJLENBQUMsTUFBTSxFQUFFLEVBQ3BCLGVBQWUsR0FBRyxZQUFZLENBQUMsTUFBTSxFQUFFLEVBQ3ZDLFdBQVcsR0FBRyxFQUFFLENBQUMsTUFBTSxFQUFFLEVBQ3pCLEtBQUssR0FBRyxFQUFFLENBQUMsTUFBTSxFQUFFLEVBQ25CLFFBQVEsR0FBRyxFQUFFLENBQUMsTUFBTSxFQUFFLEVBQ3RCLGVBQWUsR0FBRyxFQUFFLENBQUMsTUFBTSxFQUFFLEVBQzdCLE1BQU0sR0FBRyxZQUFZLEVBQUUsRUFDdkIsYUFBYSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxHQUFHLElBQUksQ0FBQyxFQUNoRCxXQUFXLEdBQUcsRUFBRSxDQUFDLE1BQU0sRUFBRSxDQUFDLFFBQVEsRUFBRSxFQUNwQyxLQUFLLEdBQUcsRUFBRSxDQUFDLE1BQU0sRUFBRSxDQUFDLFFBQVEsRUFBRSxFQUM5QixZQUFZLEdBQUcsS0FBSyxDQUFDLE1BQU0sRUFBRSxFQUM3QixVQUFVLEdBQUcsWUFBWSxDQUFDLE1BQU0sRUFBRSxNQUNkLEVBQUU7UUFDdEIsT0FBTyxJQUFJLE9BQU8sQ0FDaEIsSUFBSSxFQUNKLGVBQWUsRUFDZixXQUFXLEVBQ1gsS0FBSyxFQUNMLFFBQVEsRUFDUixlQUFlLEVBQ2YsTUFBTSxFQUNOLGFBQWEsRUFDYixXQUFXLEVBQ1gsS0FBSyxFQUNMLFlBQVksRUFDWixVQUFVLENBQ1gsQ0FBQztJQUNKLENBQUM7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm90ZV9kYW8uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZGF0YWJhc2Uvbm90ZV9kYW8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsWUFBWSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDbEUsT0FBTyxFQUFFLFlBQVksRUFBRSxFQUFFLEVBQUUsS0FBSyxFQUFrQixNQUFNLG9CQUFvQixDQUFDO0FBQzdFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNyRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDN0QsT0FBTyxFQUFFLFlBQVksRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRzlFOzs7R0FHRztBQUNILE1BQU0sT0FBTyxPQUFPO0lBQ2xCO0lBQ0UsbUJBQW1CO0lBRW5CLHNGQUFzRjtJQUMvRSxJQUFVO0lBQ2pCLDhHQUE4RztJQUN2RyxlQUE2QjtJQUNwQzs7O1NBR0s7SUFDRSxXQUFlO0lBQ3RCLHFGQUFxRjtJQUM5RSxLQUFTO0lBRWhCLGtCQUFrQjtJQUNsQjs7O09BR0c7SUFDSSxRQUFZO0lBQ25COzs7T0FHRztJQUNJLGVBQW1CO0lBRTFCLFdBQVc7SUFDWDs7T0FFRztJQUNJLE1BQWM7SUFDckI7Z0JBQ1k7SUFDTCxhQUFxQjtJQUM1QjtnQkFDWTtJQUNMLFdBQW1CO0lBQzFCLCtFQUErRTtJQUN4RSxLQUFhO0lBQ3BCLGdGQUFnRjtJQUN6RSxZQUF1QjtJQUU5Qjs7T0FFRztJQUNJLFVBQXdCO1FBMUN4QixTQUFJLEdBQUosSUFBSSxDQUFNO1FBRVYsb0JBQWUsR0FBZixlQUFlLENBQWM7UUFLN0IsZ0JBQVcsR0FBWCxXQUFXLENBQUk7UUFFZixVQUFLLEdBQUwsS0FBSyxDQUFJO1FBT1QsYUFBUSxHQUFSLFFBQVEsQ0FBSTtRQUtaLG9CQUFlLEdBQWYsZUFBZSxDQUFJO1FB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

package/dest/database/outgoing_note_dao.d.ts

@@ -1,10 +1,9 @@
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="node" resolution-mode="require"/>
-import { type L1NotePayload, Note, TxHash } from '@aztec/circuit-types';
+import { Note, TxHash } from '@aztec/circuit-types';
 import { AztecAddress, Fr, type PublicKey } from '@aztec/circuits.js';
 import { NoteSelector } from '@aztec/foundation/abi';
 import { BufferReader } from '@aztec/foundation/serialize';
-import { type NoteInfo } from '../note_decryption_utils/index.js';
 /**
  * A note with contextual data which was decrypted as outgoing.
  */
@@ -60,7 +59,6 @@ export declare class OutgoingNoteDao {
     index: bigint, 
     /** The public key with which the note was encrypted. */
     ovpkM: PublicKey);
-    static fromPayloadAndNoteInfo(note: Note, payload: L1NotePayload, noteInfo: NoteInfo, l2BlockNumber: number, l2BlockHash: string, dataStartIndexForTx: number, ovpkM: PublicKey): OutgoingNoteDao;
     toBuffer(): Buffer;
     static fromBuffer(buffer: Buffer | BufferReader): OutgoingNoteDao;
     toString(): string;
@@ -70,6 +68,6 @@ export declare class OutgoingNoteDao {
      * @returns - Its size in bytes.
      */
     getSize(): number;
-    static random({ note, contractAddress, txHash, storageSlot, noteTypeId, nonce, l2BlockNumber, l2BlockHash, noteHash, index, ovpkM, }?: Partial<OutgoingNoteDao>): OutgoingNoteDao;
+    static random({ note, contractAddress, txHash, storageSlot, noteTypeId, nonce, l2BlockNumber, l2BlockHash, noteHash, index, ovpkM, }?: Partial<OutgoingNoteDao>): Promise<OutgoingNoteDao>;
 }
 //# sourceMappingURL=outgoing_note_dao.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"outgoing_note_dao.d.ts","sourceRoot":"","sources":["../../src/database/outgoing_note_dao.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,IAAI,EAAE,MAAM,EAAgB,MAAM,sBAAsB,CAAC;AACtF,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;AAE9E,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAElE;;GAEG;AACH,qBAAa,eAAe;IAExB,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,uEAAuE;IAChE,aAAa,EAAE,MAAM;IAC5B,qEAAqE;IAC9D,WAAW,EAAE,MAAM;IAC1B,6BAA6B;IACtB,KAAK,EAAE,EAAE;IAChB;;;OAGG;IACI,QAAQ,EAAE,EAAE;IACnB,+DAA+D;IACxD,KAAK,EAAE,MAAM;IACpB,wDAAwD;IACjD,KAAK,EAAE,SAAS;;IAxBvB,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,uEAAuE;IAChE,aAAa,EAAE,MAAM;IAC5B,qEAAqE;IAC9D,WAAW,EAAE,MAAM;IAC1B,6BAA6B;IACtB,KAAK,EAAE,EAAE;IAChB;;;OAGG;IACI,QAAQ,EAAE,EAAE;IACnB,+DAA+D;IACxD,KAAK,EAAE,MAAM;IACpB,wDAAwD;IACjD,KAAK,EAAE,SAAS;IAGzB,MAAM,CAAC,sBAAsB,CAC3B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,aAAa,EACtB,QAAQ,EAAE,QAAQ,EAClB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,mBAAmB,EAAE,MAAM,EAC3B,KAAK,EAAE,SAAS;IAkBlB,QAAQ,IAAI,MAAM;IAelB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IA8B/C,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAK7B;;;OAGG;IACI,OAAO;IAKd,MAAM,CAAC,MAAM,CAAC,EACZ,IAAoB,EACpB,eAAuC,EACvC,MAAuB,EACvB,WAAyB,EACzB,UAAkC,EAClC,KAAmB,EACnB,aAAgD,EAChD,WAAoC,EACpC,QAAsB,EACtB,KAA8B,EAC9B,KAAsB,GACvB,GAAE,OAAO,CAAC,eAAe,CAAM;CAejC"}
+{"version":3,"file":"outgoing_note_dao.d.ts","sourceRoot":"","sources":["../../src/database/outgoing_note_dao.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAgB,MAAM,sBAAsB,CAAC;AAClE,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;AAE9E;;GAEG;AACH,qBAAa,eAAe;IAExB,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,uEAAuE;IAChE,aAAa,EAAE,MAAM;IAC5B,qEAAqE;IAC9D,WAAW,EAAE,MAAM;IAC1B,6BAA6B;IACtB,KAAK,EAAE,EAAE;IAChB;;;OAGG;IACI,QAAQ,EAAE,EAAE;IACnB,+DAA+D;IACxD,KAAK,EAAE,MAAM;IACpB,wDAAwD;IACjD,KAAK,EAAE,SAAS;;IAxBvB,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,uEAAuE;IAChE,aAAa,EAAE,MAAM;IAC5B,qEAAqE;IAC9D,WAAW,EAAE,MAAM;IAC1B,6BAA6B;IACtB,KAAK,EAAE,EAAE;IAChB;;;OAGG;IACI,QAAQ,EAAE,EAAE;IACnB,+DAA+D;IACxD,KAAK,EAAE,MAAM;IACpB,wDAAwD;IACjD,KAAK,EAAE,SAAS;IAGzB,QAAQ,IAAI,MAAM;IAelB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IA8B/C,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAK7B;;;OAGG;IACI,OAAO;WAKD,MAAM,CAAC,EAClB,IAAoB,EACpB,eAA2B,EAC3B,MAAuB,EACvB,WAAyB,EACzB,UAAkC,EAClC,KAAmB,EACnB,aAAgD,EAChD,WAAoC,EACpC,QAAsB,EACtB,KAA8B,EAC9B,KAAiB,GAClB,GAAE,OAAO,CAAC,eAAe,CAAM;CAejC"}

package/dest/database/outgoing_note_dao.js

@@ -45,10 +45,6 @@ export class OutgoingNoteDao {
         this.index = index;
         this.ovpkM = ovpkM;
     }
-    static fromPayloadAndNoteInfo(note, payload, noteInfo, l2BlockNumber, l2BlockHash, dataStartIndexForTx, ovpkM) {
-        const noteHashIndexInTheWholeTree = BigInt(dataStartIndexForTx + noteInfo.noteHashIndex);
-        return new OutgoingNoteDao(note, payload.contractAddress, payload.storageSlot, payload.noteTypeId, noteInfo.txHash, l2BlockNumber, l2BlockHash, noteInfo.nonce, noteInfo.noteHash, noteHashIndexInTheWholeTree, ovpkM);
-    }
     toBuffer() {
         return serializeToBuffer([
             this.note,
@@ -94,8 +90,8 @@ export class OutgoingNoteDao {
         const noteSize = 4 + this.note.items.length * Fr.SIZE_IN_BYTES;
         return noteSize + AztecAddress.SIZE_IN_BYTES + Fr.SIZE_IN_BYTES * 2 + TxHash.SIZE + Point.SIZE_IN_BYTES;
     }
-    static random({ note = Note.random(), contractAddress = AztecAddress.random(), txHash = randomTxHash(), storageSlot = Fr.random(), noteTypeId = NoteSelector.random(), nonce = Fr.random(), l2BlockNumber = Math.floor(Math.random() * 1000), l2BlockHash = Fr.random().toString(), noteHash = Fr.random(), index = Fr.random().toBigInt(), ovpkM = Point.random(), } = {}) {
-        return new OutgoingNoteDao(note, contractAddress, storageSlot, noteTypeId, txHash, l2BlockNumber, l2BlockHash, nonce, noteHash, index, ovpkM);
+    static async random({ note = Note.random(), contractAddress = undefined, txHash = randomTxHash(), storageSlot = Fr.random(), noteTypeId = NoteSelector.random(), nonce = Fr.random(), l2BlockNumber = Math.floor(Math.random() * 1000), l2BlockHash = Fr.random().toString(), noteHash = Fr.random(), index = Fr.random().toBigInt(), ovpkM = undefined, } = {}) {
+        return new OutgoingNoteDao(note, contractAddress ?? (await AztecAddress.random()), storageSlot, noteTypeId, txHash, l2BlockNumber, l2BlockHash, nonce, noteHash, index, ovpkM ?? (await Point.random()));
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3V0Z29pbmdfbm90ZV9kYW8uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZGF0YWJhc2Uvb3V0Z29pbmdfbm90ZV9kYW8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFzQixJQUFJLEVBQUUsTUFBTSxFQUFFLFlBQVksRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3RGLE9BQU8sRUFBRSxZQUFZLEVBQUUsRUFBRSxFQUFFLEtBQUssRUFBa0IsTUFBTSxvQkFBb0IsQ0FBQztBQUM3RSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDckQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzdELE9BQU8sRUFBRSxZQUFZLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUk5RTs7R0FFRztBQUNILE1BQU0sT0FBTyxlQUFlO0lBQzFCO0lBQ0Usa0RBQWtEO0lBQzNDLElBQVU7SUFDakIsb0RBQW9EO0lBQzdDLGVBQTZCO0lBQ3BDLGlFQUFpRTtJQUMxRCxXQUFlO0lBQ3RCLGlEQUFpRDtJQUMxQyxVQUF3QjtJQUMvQixrREFBa0Q7SUFDM0MsTUFBYztJQUNyQix1RUFBdUU7SUFDaEUsYUFBcUI7SUFDNUIscUVBQXFFO0lBQzlELFdBQW1CO0lBQzFCLDZCQUE2QjtJQUN0QixLQUFTO0lBQ2hCOzs7T0FHRztJQUNJLFFBQVk7SUFDbkIsK0RBQStEO0lBQ3hELEtBQWE7SUFDcEIsd0RBQXdEO0lBQ2pELEtBQWdCO1FBdkJoQixTQUFJLEdBQUosSUFBSSxDQUFNO1FBRVYsb0JBQWUsR0FBZixlQUFlLENBQWM7UUFFN0IsZ0JBQVcsR0FBWCxXQUFXLENBQUk7UUFFZixlQUFVLEdBQVYsVUFBVSxDQUFjO1FBRXhCLFdBQU0sR0FBTixNQUFNLENBQVE7UUFFZCxrQkFBYSxHQUFiLGFBQWEsQ0FBUTtRQUVyQixnQkFBVyxHQUFYLFdBQVcsQ0FBUTtRQUVuQixV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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3V0Z29pbmdfbm90ZV9kYW8uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZGF0YWJhc2Uvb3V0Z29pbmdfbm90ZV9kYW8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsWUFBWSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDbEUsT0FBTyxFQUFFLFlBQVksRUFBRSxFQUFFLEVBQUUsS0FBSyxFQUFrQixNQUFNLG9CQUFvQixDQUFDO0FBQzdFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNyRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDN0QsT0FBTyxFQUFFLFlBQVksRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRTlFOztHQUVHO0FBQ0gsTUFBTSxPQUFPLGVBQWU7SUFDMUI7SUFDRSxrREFBa0Q7SUFDM0MsSUFBVTtJQUNqQixvREFBb0Q7SUFDN0MsZUFBNkI7SUFDcEMsaUVBQWlFO0lBQzFELFdBQWU7SUFDdEIsaURBQWlEO0lBQzFDLFVBQXdCO0lBQy9CLGtEQUFrRDtJQUMzQyxNQUFjO0lBQ3JCLHVFQUF1RTtJQUNoRSxhQUFxQjtJQUM1QixxRUFBcUU7SUFDOUQsV0FBbUI7SUFDMUIsNkJBQTZCO0lBQ3RCLEtBQVM7SUFDaEI7OztPQUdHO0lBQ0ksUUFBWTtJQUNuQiwrREFBK0Q7SUFDeEQsS0FBYTtJQUNwQix3REFBd0Q7SUFDakQsS0FBZ0I7UUF2QmhCLFNBQUksR0FBSixJQUFJLENBQU07UUFFVixvQkFBZSxHQUFmLGVBQWUsQ0FBYztRQUU3QixnQkFBVyxHQUFYLFdBQVcsQ0FBSTtRQUVmLGVBQVUsR0FBVixVQUFVLENBQWM7UUFFeEIsV0FBTSxHQUFOLE1BQU0sQ0FBUTtRQUVkLGtCQUFhLEdBQWIsYUFBYSxDQUFRO1FBRXJCLGdCQUFXLEdBQVgsV0FBVyxDQUFRO1FBRW5CLFVB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

package/dest/database/pxe_database.d.ts

@@ -180,20 +180,37 @@ export interface PxeDatabase extends ContractArtifactDatabase, ContractInstanceD
      */
     resetNoteSyncData(): Promise<void>;
     /**
-     * Used by contracts during execution to store arbitrary data in the local PXE database. The data is siloed/scoped
-     * to a specific `contract`.
-     * @param contract - An address of a contract that is requesting to store the data.
-     * @param key - A field element representing the key to store the data under.
-     * @param values - An array of field elements representing the data to store.
+     * Stores arbitrary information in a per-contract non-volatile database, which can later be retrieved with `dbLoad`.
+     * If data was already stored at this slot, it is overwrriten.
+     * @param contractAddress - The contract address to scope the data under.
+     * @param slot - The slot in the database in which to store the value. Slots need not be contiguous.
+     * @param values - The data to store.
      */
-    store(contract: AztecAddress, key: Fr, values: Fr[]): Promise<void>;
+    dbStore(contractAddress: AztecAddress, slot: Fr, values: Fr[]): Promise<void>;
     /**
-     * Used by contracts during execution to load arbitrary data from the local PXE database. The data is siloed/scoped
-     * to a specific `contract`.
-     * @param contract - An address of a contract that is requesting to load the data.
-     * @param key - A field element representing the key under which to load the data..
-     * @returns An array of field elements representing the stored data or `null` if no data is stored under the key.
+     * Returns data previously stored via `dbStore` in the per-contract non-volatile database.
+     * @param contractAddress - The contract address under which the data is scoped.
+     * @param slot - The slot in the database to read.
+     * @returns The stored data or `null` if no data is stored under the slot.
      */
-    load(contract: AztecAddress, key: Fr): Promise<Fr[] | null>;
+    dbLoad(contractAddress: AztecAddress, slot: Fr): Promise<Fr[] | null>;
+    /**
+     * Deletes data in the per-contract non-volatile database. Does nothing if no data was present.
+     * @param contractAddress - The contract address under which the data is scoped.
+     * @param slot - The slot in the database to delete.
+     */
+    dbDelete(contractAddress: AztecAddress, slot: Fr): Promise<void>;
+    /**
+     * Copies a number of contiguous entries in the per-contract non-volatile database. This allows for efficient data
+     * structures by avoiding repeated calls to `dbLoad` and `dbStore`.
+     * Supports overlapping source and destination regions (which will result in the overlapped source values being
+     * overwritten). All copied slots must exist in the database (i.e. have been stored and not deleted)
+     *
+     * @param contractAddress - The contract address under which the data is scoped.
+     * @param srcSlot - The first slot to copy from.
+     * @param dstSlot - The first slot to copy to.
+     * @param numEntries - The number of entries to copy.
+     */
+    dbCopy(contractAddress: AztecAddress, srcSlot: Fr, dstSlot: Fr, numEntries: number): Promise<void>;
 }
 //# sourceMappingURL=pxe_database.d.ts.map

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"pxe_database_test_suite.d.ts","sourceRoot":"","sources":["../../src/database/pxe_database_test_suite.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,WAAW,QA+bjE"}
+{"version":3,"file":"pxe_database_test_suite.d.ts","sourceRoot":"","sources":["../../src/database/pxe_database_test_suite.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,WAAW,QA8iBjE"}