@aztec/pxe 0.0.1-commit.b655e406 → 0.0.1-commit.c0b82b2

package/dest/logs/log_service.js

@@ -0,0 +1,118 @@
+import { createLogger } from '@aztec/foundation/log';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { ExtendedDirectionalAppTaggingSecret, PendingTaggedLog, SiloedTag } from '@aztec/stdlib/logs';
+import { LogRetrievalResponse } from '../contract_function_simulator/noir-structs/log_retrieval_response.js';
+import { getAllPrivateLogsByTags, getAllPublicLogsByTagsFromContract, loadPrivateLogsForSenderRecipientPair } from '../tagging/index.js';
+export class LogService {
+    aztecNode;
+    anchorBlockHeader;
+    keyStore;
+    capsuleStore;
+    recipientTaggingStore;
+    senderAddressBookStore;
+    addressStore;
+    jobId;
+    log;
+    constructor(aztecNode, anchorBlockHeader, keyStore, capsuleStore, recipientTaggingStore, senderAddressBookStore, addressStore, jobId, bindings){
+        this.aztecNode = aztecNode;
+        this.anchorBlockHeader = anchorBlockHeader;
+        this.keyStore = keyStore;
+        this.capsuleStore = capsuleStore;
+        this.recipientTaggingStore = recipientTaggingStore;
+        this.senderAddressBookStore = senderAddressBookStore;
+        this.addressStore = addressStore;
+        this.jobId = jobId;
+        this.log = createLogger('pxe:log_service', bindings);
+    }
+    async bulkRetrieveLogs(logRetrievalRequests) {
+        return await Promise.all(logRetrievalRequests.map(async (request)=>{
+            const [publicLog, privateLog] = await Promise.all([
+                this.#getPublicLogByTag(request.tag, request.contractAddress),
+                this.#getPrivateLogByTag(await SiloedTag.computeFromTagAndApp(request.tag, request.contractAddress))
+            ]);
+            if (publicLog !== null && privateLog !== null) {
+                throw new Error(`Found both a public and private log when searching for tag ${request.tag} from contract ${request.contractAddress}`);
+            }
+            return publicLog ?? privateLog;
+        }));
+    }
+    async #getPublicLogByTag(tag, contractAddress) {
+        const anchorBlockHash = await this.anchorBlockHeader.hash();
+        const allLogsPerTag = await getAllPublicLogsByTagsFromContract(this.aztecNode, contractAddress, [
+            tag
+        ], anchorBlockHash);
+        const logsForTag = allLogsPerTag[0];
+        if (logsForTag.length === 0) {
+            return null;
+        } else if (logsForTag.length > 1) {
+            // TODO(#11627): handle this case
+            throw new Error(`Got ${logsForTag.length} logs for tag ${tag} and contract ${contractAddress.toString()}. getPublicLogByTag currently only supports a single log per tag`);
+        }
+        const scopedLog = logsForTag[0];
+        return new LogRetrievalResponse(scopedLog.logData.slice(1), scopedLog.txHash, scopedLog.noteHashes, scopedLog.firstNullifier);
+    }
+    async #getPrivateLogByTag(siloedTag) {
+        const anchorBlockHash = await this.anchorBlockHeader.hash();
+        const allLogsPerTag = await getAllPrivateLogsByTags(this.aztecNode, [
+            siloedTag
+        ], anchorBlockHash);
+        const logsForTag = allLogsPerTag[0];
+        if (logsForTag.length === 0) {
+            return null;
+        } else if (logsForTag.length > 1) {
+            // TODO(#11627): handle this case
+            throw new Error(`Got ${logsForTag.length} logs for tag ${siloedTag}. getPrivateLogByTag currently only supports a single log per tag`);
+        }
+        const scopedLog = logsForTag[0];
+        return new LogRetrievalResponse(scopedLog.logData.slice(1), scopedLog.txHash, scopedLog.noteHashes, scopedLog.firstNullifier);
+    }
+    async fetchTaggedLogs(contractAddress, pendingTaggedLogArrayBaseSlot, scopes) {
+        this.log.verbose(`Fetching tagged logs for ${contractAddress.toString()}`);
+        // We only load logs from block up to and including the anchor block number
+        const anchorBlockNumber = this.anchorBlockHeader.getBlockNumber();
+        const anchorBlockHash = await this.anchorBlockHeader.hash();
+        // Determine recipients: use scopes if provided, otherwise get all accounts
+        const recipients = scopes !== 'ALL_SCOPES' && scopes.length > 0 ? scopes : await this.keyStore.getAccounts();
+        // For each recipient, fetch secrets, load logs, and store them.
+        // We run these per-recipient tasks in parallel so that logs are loaded for all recipients concurrently.
+        await Promise.all(recipients.map(async (recipient)=>{
+            // Get all secrets for this recipient (one per sender)
+            const secrets = await this.#getSecretsForSenders(contractAddress, recipient);
+            // Load logs for all sender-recipient pairs in parallel
+            const logArrays = await Promise.all(secrets.map((secret)=>loadPrivateLogsForSenderRecipientPair(secret, this.aztecNode, this.recipientTaggingStore, anchorBlockNumber, anchorBlockHash, this.jobId)));
+            // Flatten all logs from all secrets
+            const allLogs = logArrays.flat();
+            // Store the logs for this recipient
+            if (allLogs.length > 0) {
+                await this.#storePendingTaggedLogs(contractAddress, pendingTaggedLogArrayBaseSlot, recipient, allLogs);
+            }
+        }));
+    }
+    async #getSecretsForSenders(contractAddress, recipient) {
+        const recipientCompleteAddress = await this.addressStore.getCompleteAddress(recipient);
+        if (!recipientCompleteAddress) {
+            return [];
+        }
+        const recipientIvsk = await this.keyStore.getMasterIncomingViewingSecretKey(recipient);
+        // We implicitly add all PXE accounts as senders, this helps us decrypt tags on notes that we send to ourselves
+        // (recipient = us, sender = us)
+        const allSenders = [
+            ...await this.senderAddressBookStore.getSenders(),
+            ...await this.keyStore.getAccounts()
+        ];
+        // We deduplicate the senders by adding them to a set and then converting the set back to an array
+        const deduplicatedSenders = Array.from(new Set(allSenders.map((sender)=>sender.toString()))).map((sender)=>AztecAddress.fromString(sender));
+        return Promise.all(deduplicatedSenders.map((sender)=>{
+            return ExtendedDirectionalAppTaggingSecret.compute(recipientCompleteAddress, recipientIvsk, sender, contractAddress, recipient);
+        }));
+    }
+    #storePendingTaggedLogs(contractAddress, capsuleArrayBaseSlot, recipient, privateLogs) {
+        // Build all pending tagged logs from the scoped logs
+        const pendingTaggedLogs = privateLogs.map((scopedLog)=>{
+            const pendingTaggedLog = new PendingTaggedLog(scopedLog.logData, scopedLog.txHash, scopedLog.noteHashes, scopedLog.firstNullifier, recipient);
+            return pendingTaggedLog.toFields();
+        });
+        // TODO: This looks like it could belong more at the oracle interface level
+        return this.capsuleStore.appendToCapsuleArray(contractAddress, capsuleArrayBaseSlot, pendingTaggedLogs, this.jobId);
+    }
+}

package/dest/notes/index.d.ts

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/notes/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC"}

package/dest/notes/index.js

@@ -0,0 +1 @@
+export { NoteService } from './note_service.js';

package/dest/notes/note_service.d.ts

@@ -0,0 +1,49 @@
+import { Fr } from '@aztec/foundation/curves/bn254';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { type AztecNode } from '@aztec/stdlib/interfaces/client';
+import { Note, NoteStatus } from '@aztec/stdlib/note';
+import type { BlockHeader, TxHash } from '@aztec/stdlib/tx';
+import type { AccessScopes } from '../access_scopes.js';
+import type { NoteStore } from '../storage/note_store/note_store.js';
+export declare class NoteService {
+    private readonly noteStore;
+    private readonly aztecNode;
+    private readonly anchorBlockHeader;
+    private readonly jobId;
+    constructor(noteStore: NoteStore, aztecNode: AztecNode, anchorBlockHeader: BlockHeader, jobId: string);
+    /**
+     * Retrieves a set of notes stored in the database for a given contract address and storage slot.
+     * The query result is paginated using 'limit' and 'offset' values.
+     * Returns an object containing an array of note data.
+     *
+     * @param owner - The owner of the notes. If undefined, returns notes for all known owners.
+     * @param status - The status of notes to fetch.
+     * @param scopes - The accounts whose notes we can access in this call. Currently optional and will default to all.
+     */
+    getNotes(contractAddress: AztecAddress, owner: AztecAddress | undefined, storageSlot: Fr, status: NoteStatus, scopes: AccessScopes): Promise<{
+        contractAddress: AztecAddress;
+        owner: AztecAddress;
+        storageSlot: Fr;
+        randomness: Fr;
+        noteNonce: Fr;
+        note: Note;
+        noteHash: Fr;
+        isPending: boolean;
+        siloedNullifier: Fr;
+    }[]>;
+    /**
+     * Looks for nullifiers of active contract notes and marks them as nullified if a nullifier is found.
+     *
+     * Fetches notes from the NoteStore and checks which nullifiers are present in the
+     * onchain nullifier Merkle tree - up to the latest locally synced block. We use the
+     * locally synced block instead of querying the chain's 'latest' block to ensure correctness:
+     * notes are only marked nullified once their corresponding nullifier has been included in a
+     * block up to which the PXE has synced.
+     * This allows recent nullifications to be processed even if the node is not an archive node.
+     *
+     * @param contractAddress - The contract whose notes should be checked and nullified.
+     */
+    syncNoteNullifiers(contractAddress: AztecAddress, scopes: AccessScopes): Promise<void>;
+    validateAndStoreNote(contractAddress: AztecAddress, owner: AztecAddress, storageSlot: Fr, randomness: Fr, noteNonce: Fr, content: Fr[], noteHash: Fr, nullifier: Fr, txHash: TxHash, recipient: AztecAddress): Promise<void>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm90ZV9zZXJ2aWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbm90ZXMvbm90ZV9zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUdoRSxPQUFPLEVBQUUsS0FBSyxTQUFTLEVBQWUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM5RSxPQUFPLEVBQUUsSUFBSSxFQUFXLFVBQVUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRS9ELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUU1RCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUN4RCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUVyRSxxQkFBYSxXQUFXO0lBRXBCLE9BQU8sQ0FBQyxRQUFRLENBQUMsU0FBUztJQUMxQixPQUFPLENBQUMsUUFBUSxDQUFDLFNBQVM7SUFDMUIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxpQkFBaUI7SUFDbEMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLO0lBSnhCLFlBQ21CLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLGlCQUFpQixFQUFFLFdBQVcsRUFDOUIsS0FBSyxFQUFFLE1BQU0sRUFDNUI7SUFFSjs7Ozs7Ozs7T0FRRztJQUNVLFFBQVEsQ0FDbkIsZUFBZSxFQUFFLFlBQVksRUFDN0IsS0FBSyxFQUFFLFlBQVksR0FBRyxTQUFTLEVBQy9CLFdBQVcsRUFBRSxFQUFFLEVBQ2YsTUFBTSxFQUFFLFVBQVUsRUFDbEIsTUFBTSxFQUFFLFlBQVk7Ozs7Ozs7Ozs7U0F5QnJCO0lBRUQ7Ozs7Ozs7Ozs7O09BV0c7SUFDVSxrQkFBa0IsQ0FBQyxlQUFlLEVBQUUsWUFBWSxFQUFFLE1BQU0sRUFBRSxZQUFZLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQXNDbEc7SUFFWSxvQkFBb0IsQ0FDL0IsZUFBZSxFQUFFLFlBQVksRUFDN0IsS0FBSyxFQUFFLFlBQVksRUFDbkIsV0FBVyxFQUFFLEVBQUUsRUFDZixVQUFVLEVBQUUsRUFBRSxFQUNkLFNBQVMsRUFBRSxFQUFFLEVBQ2IsT0FBTyxFQUFFLEVBQUUsRUFBRSxFQUNiLFFBQVEsRUFBRSxFQUFFLEVBQ1osU0FBUyxFQUFFLEVBQUUsRUFDYixNQUFNLEVBQUUsTUFBTSxFQUNkLFNBQVMsRUFBRSxZQUFZLEdBQ3RCLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FzRWY7Q0FDRiJ9

package/dest/notes/note_service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"note_service.d.ts","sourceRoot":"","sources":["../../src/notes/note_service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAGhE,OAAO,EAAE,KAAK,SAAS,EAAe,MAAM,iCAAiC,CAAC;AAC9E,OAAO,EAAE,IAAI,EAAW,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAE/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAErE,qBAAa,WAAW;IAEpB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,KAAK;IAJxB,YACmB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,SAAS,EACpB,iBAAiB,EAAE,WAAW,EAC9B,KAAK,EAAE,MAAM,EAC5B;IAEJ;;;;;;;;OAQG;IACU,QAAQ,CACnB,eAAe,EAAE,YAAY,EAC7B,KAAK,EAAE,YAAY,GAAG,SAAS,EAC/B,WAAW,EAAE,EAAE,EACf,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,YAAY;;;;;;;;;;SAyBrB;IAED;;;;;;;;;;;OAWG;IACU,kBAAkB,CAAC,eAAe,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAsClG;IAEY,oBAAoB,CAC/B,eAAe,EAAE,YAAY,EAC7B,KAAK,EAAE,YAAY,EACnB,WAAW,EAAE,EAAE,EACf,UAAU,EAAE,EAAE,EACd,SAAS,EAAE,EAAE,EACb,OAAO,EAAE,EAAE,EAAE,EACb,QAAQ,EAAE,EAAE,EACZ,SAAS,EAAE,EAAE,EACb,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,YAAY,GACtB,OAAO,CAAC,IAAI,CAAC,CAsEf;CACF"}

package/dest/notes/note_service.js

@@ -0,0 +1,148 @@
+import { computeUniqueNoteHash, siloNoteHash, siloNullifier } from '@aztec/stdlib/hash';
+import { MAX_RPC_LEN } from '@aztec/stdlib/interfaces/client';
+import { Note, NoteDao } from '@aztec/stdlib/note';
+import { MerkleTreeId } from '@aztec/stdlib/trees';
+export class NoteService {
+    noteStore;
+    aztecNode;
+    anchorBlockHeader;
+    jobId;
+    constructor(noteStore, aztecNode, anchorBlockHeader, jobId){
+        this.noteStore = noteStore;
+        this.aztecNode = aztecNode;
+        this.anchorBlockHeader = anchorBlockHeader;
+        this.jobId = jobId;
+    }
+    /**
+   * Retrieves a set of notes stored in the database for a given contract address and storage slot.
+   * The query result is paginated using 'limit' and 'offset' values.
+   * Returns an object containing an array of note data.
+   *
+   * @param owner - The owner of the notes. If undefined, returns notes for all known owners.
+   * @param status - The status of notes to fetch.
+   * @param scopes - The accounts whose notes we can access in this call. Currently optional and will default to all.
+   */ async getNotes(contractAddress, owner, storageSlot, status, scopes) {
+        const noteDaos = await this.noteStore.getNotes({
+            contractAddress,
+            owner,
+            storageSlot,
+            status,
+            scopes
+        }, this.jobId);
+        return noteDaos.map(({ contractAddress, owner, storageSlot, randomness, noteNonce, note, noteHash, siloedNullifier })=>({
+                contractAddress,
+                owner,
+                storageSlot,
+                randomness,
+                noteNonce,
+                note,
+                noteHash,
+                isPending: false,
+                siloedNullifier
+            }));
+    }
+    /**
+   * Looks for nullifiers of active contract notes and marks them as nullified if a nullifier is found.
+   *
+   * Fetches notes from the NoteStore and checks which nullifiers are present in the
+   * onchain nullifier Merkle tree - up to the latest locally synced block. We use the
+   * locally synced block instead of querying the chain's 'latest' block to ensure correctness:
+   * notes are only marked nullified once their corresponding nullifier has been included in a
+   * block up to which the PXE has synced.
+   * This allows recent nullifications to be processed even if the node is not an archive node.
+   *
+   * @param contractAddress - The contract whose notes should be checked and nullified.
+   */ async syncNoteNullifiers(contractAddress, scopes) {
+        const anchorBlockHash = await this.anchorBlockHeader.hash();
+        const contractNotes = await this.noteStore.getNotes({
+            contractAddress,
+            scopes
+        }, this.jobId);
+        if (contractNotes.length === 0) {
+            return;
+        }
+        const nullifiersToCheck = contractNotes.map((note)=>note.siloedNullifier);
+        const nullifierBatches = nullifiersToCheck.reduce((acc, nullifier)=>{
+            if (acc[acc.length - 1].length < MAX_RPC_LEN) {
+                acc[acc.length - 1].push(nullifier);
+            } else {
+                acc.push([
+                    nullifier
+                ]);
+            }
+            return acc;
+        }, [
+            []
+        ]);
+        const nullifierIndexes = (await Promise.all(nullifierBatches.map((batch)=>this.aztecNode.findLeavesIndexes(anchorBlockHash, MerkleTreeId.NULLIFIER_TREE, batch)))).flat();
+        const foundNullifiers = nullifiersToCheck.map((nullifier, i)=>{
+            if (nullifierIndexes[i] !== undefined) {
+                return {
+                    ...nullifierIndexes[i],
+                    ...{
+                        data: nullifier
+                    }
+                };
+            }
+        }).filter((nullifier)=>nullifier !== undefined);
+        await this.noteStore.applyNullifiers(foundNullifiers, this.jobId);
+    }
+    async validateAndStoreNote(contractAddress, owner, storageSlot, randomness, noteNonce, content, noteHash, nullifier, txHash, recipient) {
+        // We are going to store the new note in the NoteStore, which will let us later return it via `getNotes`.
+        // There's two things we need to check before we do this however:
+        //  - we must make sure the note does actually exist in the note hash tree
+        //  - we need to check if the note has already been nullified
+        //
+        // Failing to do either of the above would result in circuits getting either non-existent notes and failing to
+        // produce inclusion proofs for them, or getting nullified notes and producing duplicate nullifiers, both of which
+        // are catastrophic failure modes.
+        //
+        // Note that adding a note and removing it is *not* equivalent to never adding it in the first place. A nullifier
+        // emitted in a block that comes after note creation might result in the note being de-nullified by a chain reorg,
+        // so we must store both the note hash and nullifier block information.
+        // We avoid making node queries at 'latest' since we don't want to process notes or nullifiers that only exist ahead
+        // in time of the locally synced state.
+        // Note that while this technically results in historical queries, we perform it at the latest locally synced block
+        // number which *should* be recent enough to be available, even for non-archive nodes.
+        // Also note that the note should never be ahead of the synced block here since `fetchTaggedLogs` only processes
+        // logs up to the synced block making this only an additional safety check.
+        const anchorBlockNumber = this.anchorBlockHeader.getBlockNumber();
+        const anchorBlockHash = await this.anchorBlockHeader.hash();
+        // By computing siloed and unique note hashes ourselves we prevent contracts from interfering with the note storage
+        // of other contracts, which would constitute a security breach.
+        const uniqueNoteHash = await computeUniqueNoteHash(noteNonce, await siloNoteHash(contractAddress, noteHash));
+        const siloedNullifier = await siloNullifier(contractAddress, nullifier);
+        const [txEffect, [nullifierIndex]] = await Promise.all([
+            this.aztecNode.getTxEffect(txHash),
+            this.aztecNode.findLeavesIndexes(anchorBlockHash, MerkleTreeId.NULLIFIER_TREE, [
+                siloedNullifier
+            ])
+        ]);
+        if (!txEffect) {
+            throw new Error(`Could not find tx effect for tx hash ${txHash}`);
+        }
+        if (txEffect.l2BlockNumber > anchorBlockNumber) {
+            throw new Error(`Could not find tx effect for tx hash ${txHash} as of block number ${anchorBlockNumber}`);
+        }
+        // Find the index of the note hash in the noteHashes array to determine note ordering within the tx
+        const noteIndexInTx = txEffect.data.noteHashes.findIndex((nh)=>nh.equals(uniqueNoteHash));
+        if (noteIndexInTx === -1) {
+            throw new Error(`Note hash ${noteHash} (uniqued as ${uniqueNoteHash}) is not present in tx ${txHash}`);
+        }
+        const noteDao = new NoteDao(new Note(content), contractAddress, owner, storageSlot, randomness, noteNonce, noteHash, siloedNullifier, txHash, txEffect.l2BlockNumber, txEffect.l2BlockHash.toString(), txEffect.txIndexInBlock, noteIndexInTx);
+        // The note was found by `recipient`, so we use that as the scope when storing the note.
+        await this.noteStore.addNotes([
+            noteDao
+        ], recipient, this.jobId);
+        if (nullifierIndex !== undefined) {
+            // We found nullifier index which implies that the note has already been nullified.
+            const { data: _, ...blockHashAndNum } = nullifierIndex;
+            await this.noteStore.applyNullifiers([
+                {
+                    data: siloedNullifier,
+                    ...blockHashAndNum
+                }
+            ], this.jobId);
+        }
+    }
+}

package/dest/notes_filter.d.ts

@@ -0,0 +1,25 @@
+import type { Fr } from '@aztec/foundation/curves/bn254';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { NoteStatus } from '@aztec/stdlib/note';
+import type { AccessScopes } from './access_scopes.js';
+/**
+ * A filter used to fetch notes.
+ * @remarks This filter is applied as an intersection of all its params.
+ */
+export type NotesFilter = {
+    /**
+     * The contract address the note belongs to.
+     * @remarks Providing a contract address is required as we need that information to trigger private state sync.
+     */
+    contractAddress: AztecAddress;
+    /** The owner of the note. */
+    owner?: AztecAddress;
+    /** The specific storage location of the note on the contract. */
+    storageSlot?: Fr;
+    /** The status of the note. Defaults to 'ACTIVE'. */
+    status?: NoteStatus;
+    /** The siloed nullifier for the note. */
+    siloedNullifier?: Fr;
+    scopes: AccessScopes;
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm90ZXNfZmlsdGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvbm90ZXNfZmlsdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRXJELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRXZEOzs7R0FHRztBQUNILE1BQU0sTUFBTSxXQUFXLEdBQUc7SUFDeEI7OztPQUdHO0lBQ0gsZUFBZSxFQUFFLFlBQVksQ0FBQztJQUM5Qiw2QkFBNkI7SUFDN0IsS0FBSyxDQUFDLEVBQUUsWUFBWSxDQUFDO0lBQ3JCLGlFQUFpRTtJQUNqRSxXQUFXLENBQUMsRUFBRSxFQUFFLENBQUM7SUFDakIsb0RBQW9EO0lBQ3BELE1BQU0sQ0FBQyxFQUFFLFVBQVUsQ0FBQztJQUNwQix5Q0FBeUM7SUFDekMsZUFBZSxDQUFDLEVBQUUsRUFBRSxDQUFDO0lBQ3JCLE1BQU0sRUFBRSxZQUFZLENBQUM7Q0FDdEIsQ0FBQyJ9

package/dest/notes_filter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"notes_filter.d.ts","sourceRoot":"","sources":["../src/notes_filter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB;;;OAGG;IACH,eAAe,EAAE,YAAY,CAAC;IAC9B,6BAA6B;IAC7B,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,iEAAiE;IACjE,WAAW,CAAC,EAAE,EAAE,CAAC;IACjB,oDAAoD;IACpD,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,yCAAyC;IACzC,eAAe,CAAC,EAAE,EAAE,CAAC;IACrB,MAAM,EAAE,YAAY,CAAC;CACtB,CAAC"}

package/dest/notes_filter.js

@@ -0,0 +1,4 @@
+/**
+ * A filter used to fetch notes.
+ * @remarks This filter is applied as an intersection of all its params.
+ */ export { };

package/dest/oracle_version.d.ts

@@ -1,3 +1,3 @@
-export declare const ORACLE_VERSION = 3;
-export declare const ORACLE_INTERFACE_HASH = "f9168ceb5a2227c148c5021ebffd4e2ca0da99885b87c5be3ee5ac0d8dd3d67c";
-//# sourceMappingURL=oracle_version.d.ts.map
+export declare const ORACLE_VERSION = 12;
+export declare const ORACLE_INTERFACE_HASH = "666a8a7fc697f72b29dbf0ae7464db269cf5afa019acac8861f814543147dbb4";
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3JhY2xlX3ZlcnNpb24uZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9vcmFjbGVfdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFNQSxlQUFPLE1BQU0sY0FBYyxLQUFLLENBQUM7QUFLakMsZUFBTyxNQUFNLHFCQUFxQixxRUFBcUUsQ0FBQyJ9

package/dest/oracle_version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oracle_version.d.ts","sourceRoot":"","sources":["../src/oracle_version.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,cAAc,IAAI,CAAC;AAIhC,eAAO,MAAM,qBAAqB,qEAAqE,CAAC"}
+{"version":3,"file":"oracle_version.d.ts","sourceRoot":"","sources":["../src/oracle_version.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,cAAc,KAAK,CAAC;AAKjC,eAAO,MAAM,qBAAqB,qEAAqE,CAAC"}

package/dest/oracle_version.js

@@ -4,7 +4,8 @@
 ///
 /// @dev Whenever a contract function or Noir test is run, the `utilityAssertCompatibleOracleVersion` oracle is called
 /// and if the oracle version is incompatible an error is thrown.
-export const ORACLE_VERSION = 3;
+export const ORACLE_VERSION = 12;
 /// This hash is computed as by hashing the Oracle interface and it is used to detect when the Oracle interface changes,
-/// which in turn implies that you need to update the ORACLE_VERSION constant.
-export const ORACLE_INTERFACE_HASH = 'f9168ceb5a2227c148c5021ebffd4e2ca0da99885b87c5be3ee5ac0d8dd3d67c';
+/// which in turn implies that you need to update the ORACLE_VERSION constant in this file and in
+/// `noir-projects/aztec-nr/aztec/src/oracle/version.nr`.
+export const ORACLE_INTERFACE_HASH = '666a8a7fc697f72b29dbf0ae7464db269cf5afa019acac8861f814543147dbb4';

package/dest/private_kernel/hints/compute_tx_expiration_timestamp.d.ts

@@ -0,0 +1,4 @@
+import type { PrivateKernelCircuitPublicInputs } from '@aztec/stdlib/kernel';
+import type { UInt64 } from '@aztec/stdlib/types';
+export declare function computeTxExpirationTimestamp(previousKernel: PrivateKernelCircuitPublicInputs, txLifetime?: number): UInt64;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcHV0ZV90eF9leHBpcmF0aW9uX3RpbWVzdGFtcC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3ByaXZhdGVfa2VybmVsL2hpbnRzL2NvbXB1dGVfdHhfZXhwaXJhdGlvbl90aW1lc3RhbXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsZ0NBQWdDLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUM3RSxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQXFCbEQsd0JBQWdCLDRCQUE0QixDQUMxQyxjQUFjLEVBQUUsZ0NBQWdDLEVBQ2hELFVBQVUsU0FBa0IsR0FDM0IsTUFBTSxDQStCUiJ9

package/dest/private_kernel/hints/compute_tx_expiration_timestamp.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"compute_tx_expiration_timestamp.d.ts","sourceRoot":"","sources":["../../../src/private_kernel/hints/compute_tx_expiration_timestamp.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,sBAAsB,CAAC;AAC7E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAqBlD,wBAAgB,4BAA4B,CAC1C,cAAc,EAAE,gCAAgC,EAChD,UAAU,SAAkB,GAC3B,MAAM,CA+BR"}

package/dest/private_kernel/hints/{compute_tx_include_by_timestamp.js → compute_tx_expiration_timestamp.js}

@@ -1,41 +1,41 @@
-import { MAX_INCLUDE_BY_TIMESTAMP_DURATION } from '@aztec/constants';
+import { MAX_TX_LIFETIME } from '@aztec/constants';
 const ROUNDED_DURATIONS = [
     3600,
     1800,
     1
 ];
-function roundTimestamp(blockTimestamp, includeByTimestamp) {
+function roundTimestamp(blockTimestamp, expirationTimestamp) {
     return ROUNDED_DURATIONS.reduce((timestamp, duration)=>{
         if (timestamp <= blockTimestamp) {
             // The timestamp must be greater than the block timestamp.
             // If it is too small, round it down again using a smaller duration.
-            const totalDuration = includeByTimestamp - blockTimestamp;
+            const totalDuration = expirationTimestamp - blockTimestamp;
             const roundedDuration = totalDuration - totalDuration % BigInt(duration);
             return blockTimestamp + roundedDuration;
         }
         return timestamp;
     }, 0n);
 }
-export function computeTxIncludeByTimestamp(previousKernel, maxDuration = MAX_INCLUDE_BY_TIMESTAMP_DURATION) {
-    if (maxDuration > MAX_INCLUDE_BY_TIMESTAMP_DURATION) {
-        throw new Error(`Custom max duration cannot be greater than the max allowed. Max allowed: ${MAX_INCLUDE_BY_TIMESTAMP_DURATION}. Custom value: ${maxDuration}.`);
+export function computeTxExpirationTimestamp(previousKernel, txLifetime = MAX_TX_LIFETIME) {
+    if (txLifetime > MAX_TX_LIFETIME) {
+        throw new Error(`Custom tx lifetime cannot be greater than the max allowed. Max allowed: ${MAX_TX_LIFETIME}. Custom value: ${txLifetime}.`);
     }
     const anchorBlockTimestamp = previousKernel.constants.anchorBlockHeader.globalVariables.timestamp;
-    const maxTimestamp = anchorBlockTimestamp + BigInt(maxDuration);
-    const includeByTimestamp = previousKernel.includeByTimestamp;
-    // If the includeByTimestamp set during the tx execution is greater than or equal to the max allowed duration,
+    const maxTimestamp = anchorBlockTimestamp + BigInt(txLifetime);
+    const expirationTimestamp = previousKernel.expirationTimestamp;
+    // If the expirationTimestamp set during the tx execution is greater than or equal to the max allowed duration,
     // use the maximum allowed timestamp.
     // Note: It shouldn't be larger than the max allowed duration, but we check for it anyway.
-    if (includeByTimestamp >= maxTimestamp) {
+    if (expirationTimestamp >= maxTimestamp) {
         return maxTimestamp;
     }
     // Round it down to the nearest hour/min/second to reduce precision and avoid revealing the exact value.
     // This makes it harder for others to infer what function calls may have been used to produce a specific timestamp.
-    const roundedTimestamp = roundTimestamp(anchorBlockTimestamp, includeByTimestamp);
+    const roundedTimestamp = roundTimestamp(anchorBlockTimestamp, expirationTimestamp);
     // The tx can't be published if the timestamp is the same or less than the anchor block's timestamp.
     // Future blocks will have a greater timestamp, so the tx would never be included.
     if (roundedTimestamp <= anchorBlockTimestamp) {
-        throw new Error(`Include-by timestamp must be greater than the anchor block timestamp. Anchor block timestamp: ${anchorBlockTimestamp}. Include-by timestamp: ${includeByTimestamp}.`);
+        throw new Error(`Include-by timestamp must be greater than the anchor block timestamp. Anchor block timestamp: ${anchorBlockTimestamp}. Include-by timestamp: ${expirationTimestamp}.`);
     }
     return roundedTimestamp;
 }

package/dest/private_kernel/hints/index.d.ts

@@ -1,3 +1,3 @@
-export * from './build_private_kernel_reset_private_inputs.js';
-export * from './compute_tx_include_by_timestamp.js';
-//# sourceMappingURL=index.d.ts.map
+export * from './private_kernel_reset_private_inputs_builder.js';
+export * from './compute_tx_expiration_timestamp.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wcml2YXRlX2tlcm5lbC9oaW50cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGtEQUFrRCxDQUFDO0FBQ2pFLGNBQWMsc0NBQXNDLENBQUMifQ==

package/dest/private_kernel/hints/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/private_kernel/hints/index.ts"],"names":[],"mappings":"AAAA,cAAc,gDAAgD,CAAC;AAC/D,cAAc,sCAAsC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/private_kernel/hints/index.ts"],"names":[],"mappings":"AAAA,cAAc,kDAAkD,CAAC;AACjE,cAAc,sCAAsC,CAAC"}

package/dest/private_kernel/hints/index.js

@@ -1,2 +1,2 @@
-export * from './build_private_kernel_reset_private_inputs.js';
-export * from './compute_tx_include_by_timestamp.js';
+export * from './private_kernel_reset_private_inputs_builder.js';
+export * from './compute_tx_expiration_timestamp.js';

package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.d.ts

@@ -0,0 +1,29 @@
+import { type PrivateKernelCircuitPublicInputs, PrivateKernelResetCircuitPrivateInputs, PrivateKernelResetDimensions, type PrivateKernelSimulateOutput } from '@aztec/stdlib/kernel';
+import { type PrivateCallExecutionResult } from '@aztec/stdlib/tx';
+import type { PrivateKernelOracle } from '../private_kernel_oracle.js';
+export declare class PrivateKernelResetPrivateInputsBuilder {
+    private previousKernelOutput;
+    private executionStack;
+    private noteHashNullifierCounterMap;
+    private splitCounter;
+    private previousKernel;
+    private nextIteration?;
+    private noteHashResetActions;
+    private nullifierResetActions;
+    private numTransientData?;
+    private transientDataSquashingHints;
+    private requestedDimensions;
+    constructor(previousKernelOutput: PrivateKernelSimulateOutput<PrivateKernelCircuitPublicInputs>, executionStack: PrivateCallExecutionResult[], noteHashNullifierCounterMap: Map<number, number>, splitCounter: number);
+    getRequestedDimensions(): PrivateKernelResetDimensions;
+    needsReset(): boolean;
+    build(oracle: PrivateKernelOracle): Promise<PrivateKernelResetCircuitPrivateInputs>;
+    private reduceReadRequestActions;
+    private needsResetNoteHashReadRequests;
+    private needsResetNullifierReadRequests;
+    private needsResetKeyValidationRequests;
+    private needsResetTransientData;
+    private needsSiloNoteHashes;
+    private needsSiloNullifiers;
+    private needsSiloPrivateLogs;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9rZXJuZWxfcmVzZXRfcHJpdmF0ZV9pbnB1dHNfYnVpbGRlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3ByaXZhdGVfa2VybmVsL2hpbnRzL3ByaXZhdGVfa2VybmVsX3Jlc2V0X3ByaXZhdGVfaW5wdXRzX2J1aWxkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBZUEsT0FBTyxFQUtMLEtBQUssZ0NBQWdDLEVBRXJDLHNDQUFzQyxFQUN0Qyw0QkFBNEIsRUFFNUIsS0FBSywyQkFBMkIsRUFhakMsTUFBTSxzQkFBc0IsQ0FBQztBQUM5QixPQUFPLEVBQUUsS0FBSywwQkFBMEIsRUFBaUIsTUFBTSxrQkFBa0IsQ0FBQztBQUdsRixPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBbUN2RSxxQkFBYSxzQ0FBc0M7SUFlL0MsT0FBTyxDQUFDLG9CQUFvQjtJQUM1QixPQUFPLENBQUMsY0FBYztJQUN0QixPQUFPLENBQUMsMkJBQTJCO0lBQ25DLE9BQU8sQ0FBQyxZQUFZO0lBakJ0QixPQUFPLENBQUMsY0FBYyxDQUFtQztJQUV6RCxPQUFPLENBQUMsYUFBYSxDQUFDLENBQTZCO0lBRW5ELE9BQU8sQ0FBQyxvQkFBb0IsQ0FBcUU7SUFDakcsT0FBTyxDQUFDLHFCQUFxQixDQUFxRTtJQUNsRyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0FBUztJQUNsQyxPQUFPLENBQUMsMkJBQTJCLENBR2pDO0lBQ0YsT0FBTyxDQUFDLG1CQUFtQixDQUF3QztJQUVuRSxZQUNVLG9CQUFvQixFQUFFLDJCQUEyQixDQUFDLGdDQUFnQyxDQUFDLEVBQ25GLGNBQWMsRUFBRSwwQkFBMEIsRUFBRSxFQUM1QywyQkFBMkIsRUFBRSxHQUFHLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxFQUNoRCxZQUFZLEVBQUUsTUFBTSxFQUk3QjtJQUVELHNCQUFzQixJQUFJLDRCQUE0QixDQUVyRDtJQUVELFVBQVUsSUFBSSxPQUFPLENBc0JwQjtJQUVLLEtBQUssQ0FBQyxNQUFNLEVBQUUsbUJBQW1CLG1EQThFdEM7SUFFRCxPQUFPLENBQUMsd0JBQXdCO0lBMkJoQyxPQUFPLENBQUMsOEJBQThCO0lBMEV0QyxPQUFPLENBQUMsK0JBQStCO0lBeUV2QyxPQUFPLENBQUMsK0JBQStCO0lBYXZDLE9BQU8sQ0FBQyx1QkFBdUI7SUEwRi9CLE9BQU8sQ0FBQyxtQkFBbUI7SUFpQjNCLE9BQU8sQ0FBQyxtQkFBbUI7SUFpQjNCLE9BQU8sQ0FBQyxvQkFBb0I7Q0FxQjdCIn0=

package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"private_kernel_reset_private_inputs_builder.d.ts","sourceRoot":"","sources":["../../../src/private_kernel/hints/private_kernel_reset_private_inputs_builder.ts"],"names":[],"mappings":"AAeA,OAAO,EAKL,KAAK,gCAAgC,EAErC,sCAAsC,EACtC,4BAA4B,EAE5B,KAAK,2BAA2B,EAajC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,0BAA0B,EAAiB,MAAM,kBAAkB,CAAC;AAGlF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAmCvE,qBAAa,sCAAsC;IAe/C,OAAO,CAAC,oBAAoB;IAC5B,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,2BAA2B;IACnC,OAAO,CAAC,YAAY;IAjBtB,OAAO,CAAC,cAAc,CAAmC;IAEzD,OAAO,CAAC,aAAa,CAAC,CAA6B;IAEnD,OAAO,CAAC,oBAAoB,CAAqE;IACjG,OAAO,CAAC,qBAAqB,CAAqE;IAClG,OAAO,CAAC,gBAAgB,CAAC,CAAS;IAClC,OAAO,CAAC,2BAA2B,CAGjC;IACF,OAAO,CAAC,mBAAmB,CAAwC;IAEnE,YACU,oBAAoB,EAAE,2BAA2B,CAAC,gCAAgC,CAAC,EACnF,cAAc,EAAE,0BAA0B,EAAE,EAC5C,2BAA2B,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAChD,YAAY,EAAE,MAAM,EAI7B;IAED,sBAAsB,IAAI,4BAA4B,CAErD;IAED,UAAU,IAAI,OAAO,CAsBpB;IAEK,KAAK,CAAC,MAAM,EAAE,mBAAmB,mDA8EtC;IAED,OAAO,CAAC,wBAAwB;IA2BhC,OAAO,CAAC,8BAA8B;IA0EtC,OAAO,CAAC,+BAA+B;IAyEvC,OAAO,CAAC,+BAA+B;IAavC,OAAO,CAAC,uBAAuB;IA0F/B,OAAO,CAAC,mBAAmB;IAiB3B,OAAO,CAAC,mBAAmB;IAiB3B,OAAO,CAAC,oBAAoB;CAqB7B"}