@aztec/pxe 0.0.0-test.1 → 0.0.1-commit.5476d83

package/dest/storage/note_data_provider/note_data_provider.js

@@ -2,8 +2,13 @@ import { toBufferBE } from '@aztec/foundation/bigint-buffer';
 import { toArray } from '@aztec/foundation/iterable';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { NoteStatus } from '@aztec/stdlib/note';
-import { NoteDao } from './note_dao.js';
-export class NoteDataProvider {
+import { NoteDao } from '@aztec/stdlib/note';
+/**
+ * NoteDataProvider manages the storage and retrieval of notes.
+ *
+ * Notes can be active or nullified. This class processes new notes, nullifications,
+ * and performs rollback handling in the case of a reorg.
+ **/ export class NoteDataProvider {
     #store;
     #notes;
     #nullifiedNotes;
@@ -12,15 +17,11 @@ export class NoteDataProvider {
     #nullifiedNotesToScope;
     #nullifiedNotesByContract;
     #nullifiedNotesByStorageSlot;
-    #nullifiedNotesByTxHash;
-    #nullifiedNotesByAddressPoint;
     #nullifiedNotesByNullifier;
     #scopes;
     #notesToScope;
     #notesByContractAndScope;
     #notesByStorageSlotAndScope;
-    #notesByTxHashAndScope;
-    #notesByAddressPointAndScope;
     constructor(store){
         this.#store = store;
         this.#notes = store.openMap('notes');
@@ -30,27 +31,37 @@ export class NoteDataProvider {
         this.#nullifiedNotesToScope = store.openMultiMap('nullified_notes_to_scope');
         this.#nullifiedNotesByContract = store.openMultiMap('nullified_notes_by_contract');
         this.#nullifiedNotesByStorageSlot = store.openMultiMap('nullified_notes_by_storage_slot');
-        this.#nullifiedNotesByTxHash = store.openMultiMap('nullified_notes_by_tx_hash');
-        this.#nullifiedNotesByAddressPoint = store.openMultiMap('nullified_notes_by_address_point');
         this.#nullifiedNotesByNullifier = store.openMap('nullified_notes_by_nullifier');
         this.#scopes = store.openMap('scopes');
         this.#notesToScope = store.openMultiMap('notes_to_scope');
         this.#notesByContractAndScope = new Map();
         this.#notesByStorageSlotAndScope = new Map();
-        this.#notesByTxHashAndScope = new Map();
-        this.#notesByAddressPointAndScope = new Map();
     }
-    static async create(store) {
+    /**
+   * Creates and initializes a new NoteDataProvider instance.
+   *
+   * This factory method creates a NoteDataProvider and restores any existing
+   * scope-specific indexes from the database.
+   *
+   * @param store - The key-value store to use for persistence
+   * @returns Promise resolving to a fully initialized NoteDataProvider instance
+   */ static async create(store) {
         const pxeDB = new NoteDataProvider(store);
         for await (const scope of pxeDB.#scopes.keysAsync()){
             pxeDB.#notesByContractAndScope.set(scope, store.openMultiMap(`${scope}:notes_by_contract`));
             pxeDB.#notesByStorageSlotAndScope.set(scope, store.openMultiMap(`${scope}:notes_by_storage_slot`));
-            pxeDB.#notesByTxHashAndScope.set(scope, store.openMultiMap(`${scope}:notes_by_tx_hash`));
-            pxeDB.#notesByAddressPointAndScope.set(scope, store.openMultiMap(`${scope}:notes_by_address_point`));
         }
         return pxeDB;
     }
-    async addScope(scope) {
+    /**
+   * Adds a new scope to the note data provider.
+   *
+   * Scopes provide privacy isolation by creating separate indexes for each user.
+   * Each scope gets its own set of indexes for efficient note retrieval by various criteria.
+   *
+   * @param scope - The AztecAddress representing the scope/user to add
+   * @returns Promise resolving to true if scope was added, false if it already existed
+   */ async addScope(scope) {
         const scopeString = scope.toString();
         if (await this.#scopes.hasAsync(scopeString)) {
             return false;
@@ -58,32 +69,53 @@ export class NoteDataProvider {
         await this.#scopes.set(scopeString, true);
         this.#notesByContractAndScope.set(scopeString, this.#store.openMultiMap(`${scopeString}:notes_by_contract`));
         this.#notesByStorageSlotAndScope.set(scopeString, this.#store.openMultiMap(`${scopeString}:notes_by_storage_slot`));
-        this.#notesByTxHashAndScope.set(scopeString, this.#store.openMultiMap(`${scopeString}:notes_by_tx_hash`));
-        this.#notesByAddressPointAndScope.set(scopeString, this.#store.openMultiMap(`${scopeString}:notes_by_address_point`));
         return true;
     }
-    async addNotes(notes, scope = AztecAddress.ZERO) {
-        if (!await this.#scopes.hasAsync(scope.toString())) {
-            await this.addScope(scope);
-        }
+    /**
+   * Adds multiple notes to the data provider under the specified scope.
+   *
+   * Notes are stored using their index from the notes hash tree as the key, which provides
+   * uniqueness and maintains creation order. Each note is indexed by multiple criteria
+   * for efficient retrieval.
+   *
+   * @param notes - Notes to store
+   * @param scope - The scope (user/account) under which to store the notes
+   */ addNotes(notes, scope) {
         return this.#store.transactionAsync(async ()=>{
+            if (!await this.#scopes.hasAsync(scope.toString())) {
+                await this.addScope(scope);
+            }
             for (const dao of notes){
-                // store notes by their index in the notes hash tree
-                // this provides the uniqueness we need to store individual notes
-                // and should also return notes in the order that they were created.
-                // Had we stored them by their nullifier, they would be returned in random order
                 const noteIndex = toBufferBE(dao.index, 32).toString('hex');
                 await this.#notes.set(noteIndex, dao.toBuffer());
                 await this.#notesToScope.set(noteIndex, scope.toString());
                 await this.#nullifierToNoteId.set(dao.siloedNullifier.toString(), noteIndex);
                 await this.#notesByContractAndScope.get(scope.toString()).set(dao.contractAddress.toString(), noteIndex);
                 await this.#notesByStorageSlotAndScope.get(scope.toString()).set(dao.storageSlot.toString(), noteIndex);
-                await this.#notesByTxHashAndScope.get(scope.toString()).set(dao.txHash.toString(), noteIndex);
-                await this.#notesByAddressPointAndScope.get(scope.toString()).set(dao.addressPoint.toString(), noteIndex);
             }
         });
     }
-    removeNotesAfter(blockNumber) {
+    /**
+   * Synchronizes notes and nullifiers to a specific block number.
+   *
+   * This method ensures that the state of notes and nullifiers is consistent with the
+   * specified block number. It restores any notes that were nullified after the given block
+   * and deletes any active notes created after that block.
+   *
+   * @param blockNumber - The new chain tip after a reorg
+   * @param synchedBlockNumber - The block number up to which PXE managed to sync before the reorg happened.
+   */ async rollbackNotesAndNullifiers(blockNumber, synchedBlockNumber) {
+        await this.#rewindNullifiersAfterBlock(blockNumber, synchedBlockNumber);
+        await this.#deleteActiveNotesAfterBlock(blockNumber);
+    }
+    /**
+   * Deletes (removes) all active notes created after the specified block number.
+   *
+   * Permanently delete notes from the active notes store, e.g. during a reorg.
+   * Note: This only affects #notes (active notes), not #nullifiedNotes.
+   *
+   * @param blockNumber - Notes created after this block number will be deleted
+   */ #deleteActiveNotesAfterBlock(blockNumber) {
         return this.#store.transactionAsync(async ()=>{
             const notes = await toArray(this.#notes.valuesAsync());
             for (const note of notes){
@@ -95,8 +127,6 @@ export class NoteDataProvider {
                     await this.#nullifierToNoteId.delete(noteDao.siloedNullifier.toString());
                     const scopes = await toArray(this.#scopes.keysAsync());
                     for (const scope of scopes){
-                        await this.#notesByAddressPointAndScope.get(scope).deleteValue(noteDao.addressPoint.toString(), noteIndex);
-                        await this.#notesByTxHashAndScope.get(scope).deleteValue(noteDao.txHash.toString(), noteIndex);
                         await this.#notesByContractAndScope.get(scope).deleteValue(noteDao.contractAddress.toString(), noteIndex);
                         await this.#notesByStorageSlotAndScope.get(scope).deleteValue(noteDao.storageSlot.toString(), noteIndex);
                     }
@@ -104,33 +134,39 @@ export class NoteDataProvider {
             }
         });
     }
-    async unnullifyNotesAfter(blockNumber, synchedBlockNumber) {
-        const nullifiersToUndo = [];
-        const currentBlockNumber = blockNumber + 1;
-        const maxBlockNumber = synchedBlockNumber ?? currentBlockNumber;
-        for(let i = currentBlockNumber; i <= maxBlockNumber; i++){
-            nullifiersToUndo.push(...await toArray(this.#nullifiersByBlockNumber.getValuesAsync(i)));
-        }
-        const notesIndexesToReinsert = await Promise.all(nullifiersToUndo.map((nullifier)=>this.#nullifiedNotesByNullifier.getAsync(nullifier)));
-        const notNullNoteIndexes = notesIndexesToReinsert.filter((noteIndex)=>noteIndex != undefined);
-        const nullifiedNoteBuffers = await Promise.all(notNullNoteIndexes.map((noteIndex)=>this.#nullifiedNotes.getAsync(noteIndex)));
-        const noteDaos = nullifiedNoteBuffers.filter((buffer)=>buffer != undefined).map((buffer)=>NoteDao.fromBuffer(buffer));
+    /**
+   * Rewinds nullifications after a given block number.
+   *
+   * This operation "unnullifies" notes, rolling back nullifications that occurred
+   * in orphaned blocks, e.g. during a reorg.  The notes are restored to the
+   * active notes store and removed from the nullified store.
+   *
+   * @param blockNumber - Revert nullifications that occurred after this block
+   * @param synchedBlockNumber - Upper bound for the block range to process
+   */ async #rewindNullifiersAfterBlock(blockNumber, synchedBlockNumber) {
         await this.#store.transactionAsync(async ()=>{
+            const nullifiersToUndo = [];
+            const currentBlockNumber = blockNumber + 1;
+            for(let i = currentBlockNumber; i <= synchedBlockNumber; i++){
+                nullifiersToUndo.push(...await toArray(this.#nullifiersByBlockNumber.getValuesAsync(i)));
+            }
+            const notesIndexesToReinsert = await Promise.all(nullifiersToUndo.map((nullifier)=>this.#nullifiedNotesByNullifier.getAsync(nullifier)));
+            const notNullNoteIndexes = notesIndexesToReinsert.filter((noteIndex)=>noteIndex != undefined);
+            const nullifiedNoteBuffers = await Promise.all(notNullNoteIndexes.map((noteIndex)=>this.#nullifiedNotes.getAsync(noteIndex)));
+            const noteDaos = nullifiedNoteBuffers.filter((buffer)=>buffer != undefined).map((buffer)=>NoteDao.fromBuffer(buffer));
             for (const dao of noteDaos){
                 const noteIndex = toBufferBE(dao.index, 32).toString('hex');
                 await this.#notes.set(noteIndex, dao.toBuffer());
                 await this.#nullifierToNoteId.set(dao.siloedNullifier.toString(), noteIndex);
-                let scopes = await toArray(this.#nullifiedNotesToScope.getValuesAsync(noteIndex)) ?? [];
+                const scopes = await toArray(this.#nullifiedNotesToScope.getValuesAsync(noteIndex));
                 if (scopes.length === 0) {
-                    scopes = [
-                        new AztecAddress(dao.addressPoint.x).toString()
-                    ];
+                    // We should never run into this error because notes always have a scope assigned to them - either on initial
+                    // insertion via `addNotes` or when removing their nullifiers.
+                    throw new Error(`No scopes found for nullified note with index ${noteIndex}`);
                 }
                 for (const scope of scopes){
                     await this.#notesByContractAndScope.get(scope.toString()).set(dao.contractAddress.toString(), noteIndex);
                     await this.#notesByStorageSlotAndScope.get(scope.toString()).set(dao.storageSlot.toString(), noteIndex);
-                    await this.#notesByTxHashAndScope.get(scope.toString()).set(dao.txHash.toString(), noteIndex);
-                    await this.#notesByAddressPointAndScope.get(scope.toString()).set(dao.addressPoint.toString(), noteIndex);
                     await this.#notesToScope.set(noteIndex, scope);
                 }
                 await this.#nullifiedNotes.delete(noteIndex);
@@ -138,34 +174,57 @@ export class NoteDataProvider {
                 await this.#nullifiersByBlockNumber.deleteValue(dao.l2BlockNumber, dao.siloedNullifier.toString());
                 await this.#nullifiedNotesByContract.deleteValue(dao.contractAddress.toString(), noteIndex);
                 await this.#nullifiedNotesByStorageSlot.deleteValue(dao.storageSlot.toString(), noteIndex);
-                await this.#nullifiedNotesByTxHash.deleteValue(dao.txHash.toString(), noteIndex);
-                await this.#nullifiedNotesByAddressPoint.deleteValue(dao.addressPoint.toString(), noteIndex);
                 await this.#nullifiedNotesByNullifier.delete(dao.siloedNullifier.toString());
             }
         });
     }
-    async getNotes(filter) {
-        const publicKey = filter.owner ? await filter.owner.toAddressPoint() : undefined;
+    /**
+   * Retrieves notes based on the provided filter criteria.
+   *
+   * This method queries both active and optionally nullified notes based on the filter
+   * parameters.
+   *
+   * @param filter - Filter criteria including contractAddress (required), and optional
+   *                 storageSlot, status, scopes and siloedNullifier.
+   * @returns Promise resolving to array of NoteDao objects matching the filter
+   * @throws If filtering by an empty scopes array. Scopes have to be set to undefined or to a non-empty array.
+   */ async getNotes(filter) {
         filter.status = filter.status ?? NoteStatus.ACTIVE;
+        // throw early if scopes is an empty array
+        if (filter.scopes !== undefined && filter.scopes.length === 0) {
+            throw new Error('Trying to get notes with an empty scopes array. Scopes have to be set to undefined if intending on not filtering by scopes.');
+        }
         const candidateNoteSources = [];
         filter.scopes ??= (await toArray(this.#scopes.keysAsync())).map((addressString)=>AztecAddress.fromString(addressString));
         const activeNoteIdsPerScope = [];
         for (const scope of new Set(filter.scopes)){
             const formattedScopeString = scope.toString();
             if (!await this.#scopes.hasAsync(formattedScopeString)) {
-                throw new Error('Trying to get incoming notes of an scope that is not in the PXE database');
+                throw new Error('Trying to get incoming notes of a scope that is not in the PXE database');
             }
-            activeNoteIdsPerScope.push(publicKey ? await toArray(this.#notesByAddressPointAndScope.get(formattedScopeString).getValuesAsync(publicKey.toString())) : filter.txHash ? await toArray(this.#notesByTxHashAndScope.get(formattedScopeString).getValuesAsync(filter.txHash.toString())) : filter.contractAddress ? await toArray(this.#notesByContractAndScope.get(formattedScopeString).getValuesAsync(filter.contractAddress.toString())) : filter.storageSlot ? await toArray(this.#notesByStorageSlotAndScope.get(formattedScopeString).getValuesAsync(filter.storageSlot.toString())) : await toArray(this.#notesByAddressPointAndScope.get(formattedScopeString).valuesAsync()));
+            activeNoteIdsPerScope.push(filter.storageSlot ? await toArray(this.#notesByStorageSlotAndScope.get(formattedScopeString).getValuesAsync(filter.storageSlot.toString())) : await toArray(this.#notesByContractAndScope.get(formattedScopeString).getValuesAsync(filter.contractAddress.toString())));
         }
         candidateNoteSources.push({
             ids: new Set(activeNoteIdsPerScope.flat()),
             notes: this.#notes
         });
-        if (filter.status == NoteStatus.ACTIVE_OR_NULLIFIED) {
-            candidateNoteSources.push({
-                ids: publicKey ? await toArray(this.#nullifiedNotesByAddressPoint.getValuesAsync(publicKey.toString())) : filter.txHash ? await toArray(this.#nullifiedNotesByTxHash.getValuesAsync(filter.txHash.toString())) : filter.contractAddress ? await toArray(this.#nullifiedNotesByContract.getValuesAsync(filter.contractAddress.toString())) : filter.storageSlot ? await toArray(this.#nullifiedNotesByStorageSlot.getValuesAsync(filter.storageSlot.toString())) : await toArray(this.#nullifiedNotes.keysAsync()),
-                notes: this.#nullifiedNotes
-            });
+        // If status is ACTIVE_OR_NULLIFIED we add nullified notes as candidates on top of the default active ones.
+        if (filter.status === NoteStatus.ACTIVE_OR_NULLIFIED) {
+            const nullifiedIds = filter.storageSlot ? await toArray(this.#nullifiedNotesByStorageSlot.getValuesAsync(filter.storageSlot.toString())) : await toArray(this.#nullifiedNotesByContract.getValuesAsync(filter.contractAddress.toString()));
+            const setOfScopes = new Set(filter.scopes.map((s)=>s.toString()));
+            const filteredNullifiedIds = new Set();
+            for (const noteId of nullifiedIds){
+                const scopeList = await toArray(this.#nullifiedNotesToScope.getValuesAsync(noteId));
+                if (scopeList.some((scope)=>setOfScopes.has(scope))) {
+                    filteredNullifiedIds.add(noteId);
+                }
+            }
+            if (filteredNullifiedIds.size > 0) {
+                candidateNoteSources.push({
+                    ids: filteredNullifiedIds,
+                    notes: this.#nullifiedNotes
+                });
+            }
         }
         const result = [];
         for (const { ids, notes } of candidateNoteSources){
@@ -175,18 +234,12 @@ export class NoteDataProvider {
                     continue;
                 }
                 const note = NoteDao.fromBuffer(serializedNote);
-                if (filter.contractAddress && !note.contractAddress.equals(filter.contractAddress)) {
-                    continue;
-                }
-                if (filter.txHash && !note.txHash.equals(filter.txHash)) {
+                if (!note.contractAddress.equals(filter.contractAddress)) {
                     continue;
                 }
                 if (filter.storageSlot && !note.storageSlot.equals(filter.storageSlot)) {
                     continue;
                 }
-                if (publicKey && !note.addressPoint.equals(publicKey)) {
-                    continue;
-                }
                 if (filter.siloedNullifier && !note.siloedNullifier.equals(filter.siloedNullifier)) {
                     continue;
                 }
@@ -195,7 +248,17 @@ export class NoteDataProvider {
         }
         return result;
     }
-    removeNullifiedNotes(nullifiers, accountAddressPoint) {
+    /**
+   * Transitions notes from "active" to "nullified" state.
+   *
+   * This operation processes a batch of nullifiers to mark the corresponding notes
+   * as spent/nullified.  The operation is atomic - if any nullifier is not found,
+   * the entire operation fails and no notes are modified.
+   *
+   * @param nullifiers - Array of nullifiers with their block numbers to process
+   * @returns Promise resolving to array of nullified NoteDao objects
+   * @throws Error if any nullifier is not found in the active notes
+   */ applyNullifiers(nullifiers) {
         if (nullifiers.length === 0) {
             return Promise.resolve([]);
         }
@@ -203,47 +266,46 @@ export class NoteDataProvider {
             const nullifiedNotes = [];
             for (const blockScopedNullifier of nullifiers){
                 const { data: nullifier, l2BlockNumber: blockNumber } = blockScopedNullifier;
-                const noteIndex = await this.#nullifierToNoteId.getAsync(nullifier.toString());
+                const nullifierKey = nullifier.toString();
+                const noteIndex = await this.#nullifierToNoteId.getAsync(nullifierKey);
                 if (!noteIndex) {
-                    continue;
+                    // Check if already nullified?
+                    const alreadyNullified = await this.#nullifiedNotesByNullifier.getAsync(nullifierKey);
+                    if (alreadyNullified) {
+                        throw new Error(`Nullifier already applied in applyNullifiers`);
+                    }
+                    throw new Error('Nullifier not found in applyNullifiers');
                 }
                 const noteBuffer = noteIndex ? await this.#notes.getAsync(noteIndex) : undefined;
                 if (!noteBuffer) {
-                    continue;
+                    throw new Error('Note not found in applyNullifiers');
                 }
-                const noteScopes = await toArray(this.#notesToScope.getValuesAsync(noteIndex)) ?? [];
-                const note = NoteDao.fromBuffer(noteBuffer);
-                if (!note.addressPoint.equals(accountAddressPoint)) {
-                    continue;
+                const noteScopes = await toArray(this.#notesToScope.getValuesAsync(noteIndex));
+                if (noteScopes.length === 0) {
+                    // We should never run into this error because notes always have a scope assigned to them - either on initial
+                    // insertion via `addNotes` or when removing their nullifiers.
+                    throw new Error('Note scopes are missing in applyNullifiers');
                 }
+                const note = NoteDao.fromBuffer(noteBuffer);
                 nullifiedNotes.push(note);
                 await this.#notes.delete(noteIndex);
                 await this.#notesToScope.delete(noteIndex);
                 const scopes = await toArray(this.#scopes.keysAsync());
                 for (const scope of scopes){
-                    await this.#notesByAddressPointAndScope.get(scope).deleteValue(accountAddressPoint.toString(), noteIndex);
-                    await this.#notesByTxHashAndScope.get(scope).deleteValue(note.txHash.toString(), noteIndex);
                     await this.#notesByContractAndScope.get(scope).deleteValue(note.contractAddress.toString(), noteIndex);
                     await this.#notesByStorageSlotAndScope.get(scope).deleteValue(note.storageSlot.toString(), noteIndex);
                 }
-                if (noteScopes !== undefined) {
-                    for (const scope of noteScopes){
-                        await this.#nullifiedNotesToScope.set(noteIndex, scope);
-                    }
+                for (const scope of noteScopes){
+                    await this.#nullifiedNotesToScope.set(noteIndex, scope);
                 }
                 await this.#nullifiedNotes.set(noteIndex, note.toBuffer());
                 await this.#nullifiersByBlockNumber.set(blockNumber, nullifier.toString());
                 await this.#nullifiedNotesByContract.set(note.contractAddress.toString(), noteIndex);
                 await this.#nullifiedNotesByStorageSlot.set(note.storageSlot.toString(), noteIndex);
-                await this.#nullifiedNotesByTxHash.set(note.txHash.toString(), noteIndex);
-                await this.#nullifiedNotesByAddressPoint.set(note.addressPoint.toString(), noteIndex);
                 await this.#nullifiedNotesByNullifier.set(nullifier.toString(), noteIndex);
                 await this.#nullifierToNoteId.delete(nullifier.toString());
             }
             return nullifiedNotes;
         });
     }
-    async getSize() {
-        return (await this.getNotes({})).reduce((sum, note)=>sum + note.getSize(), 0);
-    }
 }

package/dest/storage/private_event_data_provider/private_event_data_provider.d.ts

@@ -0,0 +1,37 @@
+import { Fr } from '@aztec/foundation/fields';
+import type { AztecAsyncKVStore } from '@aztec/kv-store';
+import type { EventSelector } from '@aztec/stdlib/abi';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { L2BlockHash } from '@aztec/stdlib/block';
+import { TxHash } from '@aztec/stdlib/tx';
+import type { PrivateEvent } from '../../pxe.js';
+/**
+ * Stores decrypted private event logs.
+ */
+export declare class PrivateEventDataProvider {
+    #private;
+    logger: import("@aztec/foundation/log").Logger;
+    constructor(store: AztecAsyncKVStore);
+    /**
+     * Store a private event log.
+     * @param contractAddress - The address of the contract that emitted the event.
+     * @param recipient - The recipient of the event.
+     * @param eventSelector - The event selector of the event.
+     * @param msgContent - The content of the event.
+     * @param txHash - The transaction hash of the event log.
+     * @param eventCommitmentIndex - The index of the event commitment in the nullifier tree.
+     * @param blockNumber - The block number in which the event was emitted.
+     */
+    storePrivateEventLog(contractAddress: AztecAddress, recipient: AztecAddress, eventSelector: EventSelector, msgContent: Fr[], txHash: TxHash, eventCommitmentIndex: number, blockNumber: number, blockHash: L2BlockHash): Promise<void>;
+    /**
+     * Returns the private events given search parameters.
+     * @param contractAddress - The address of the contract to get events from.
+     * @param from - The block number to search from.
+     * @param numBlocks - The amount of blocks to search.
+     * @param recipients - The addresses that decrypted the logs.
+     * @param eventSelector - The event selector to filter by.
+     * @returns - The event log contents.
+     */
+    getPrivateEvents(contractAddress: AztecAddress, from: number, numBlocks: number, recipients: AztecAddress[], eventSelector: EventSelector): Promise<PrivateEvent[]>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9ldmVudF9kYXRhX3Byb3ZpZGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc3RvcmFnZS9wcml2YXRlX2V2ZW50X2RhdGFfcHJvdmlkZXIvcHJpdmF0ZV9ldmVudF9kYXRhX3Byb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUc5QyxPQUFPLEtBQUssRUFBbUIsaUJBQWlCLEVBQWlCLE1BQU0saUJBQWlCLENBQUM7QUFDekYsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDdkQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDaEUsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ2xELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUUxQyxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFVakQ7O0dBRUc7QUFDSCxxQkFBYSx3QkFBd0I7O0lBU25DLE1BQU0seUNBQStDO0lBRXJELFlBQVksS0FBSyxFQUFFLGlCQUFpQixFQUtuQztJQUVEOzs7Ozs7Ozs7T0FTRztJQUNILG9CQUFvQixDQUNsQixlQUFlLEVBQUUsWUFBWSxFQUM3QixTQUFTLEVBQUUsWUFBWSxFQUN2QixhQUFhLEVBQUUsYUFBYSxFQUM1QixVQUFVLEVBQUUsRUFBRSxFQUFFLEVBQ2hCLE1BQU0sRUFBRSxNQUFNLEVBQ2Qsb0JBQW9CLEVBQUUsTUFBTSxFQUM1QixXQUFXLEVBQUUsTUFBTSxFQUNuQixTQUFTLEVBQUUsV0FBVyxHQUNyQixPQUFPLENBQUMsSUFBSSxDQUFDLENBNEJmO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDVSxnQkFBZ0IsQ0FDM0IsZUFBZSxFQUFFLFlBQVksRUFDN0IsSUFBSSxFQUFFLE1BQU0sRUFDWixTQUFTLEVBQUUsTUFBTSxFQUNqQixVQUFVLEVBQUUsWUFBWSxFQUFFLEVBQzFCLGFBQWEsRUFBRSxhQUFhLEdBQzNCLE9BQU8sQ0FBQyxZQUFZLEVBQUUsQ0FBQyxDQXFDekI7Q0FDRiJ9

package/dest/storage/private_event_data_provider/private_event_data_provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"private_event_data_provider.d.ts","sourceRoot":"","sources":["../../../src/storage/private_event_data_provider/private_event_data_provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAG9C,OAAO,KAAK,EAAmB,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACzF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAUjD;;GAEG;AACH,qBAAa,wBAAwB;;IASnC,MAAM,yCAA+C;IAErD,YAAY,KAAK,EAAE,iBAAiB,EAKnC;IAED;;;;;;;;;OASG;IACH,oBAAoB,CAClB,eAAe,EAAE,YAAY,EAC7B,SAAS,EAAE,YAAY,EACvB,aAAa,EAAE,aAAa,EAC5B,UAAU,EAAE,EAAE,EAAE,EAChB,MAAM,EAAE,MAAM,EACd,oBAAoB,EAAE,MAAM,EAC5B,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,WAAW,GACrB,OAAO,CAAC,IAAI,CAAC,CA4Bf;IAED;;;;;;;;OAQG;IACU,gBAAgB,CAC3B,eAAe,EAAE,YAAY,EAC7B,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,YAAY,EAAE,EAC1B,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,YAAY,EAAE,CAAC,CAqCzB;CACF"}

package/dest/storage/private_event_data_provider/private_event_data_provider.js

@@ -0,0 +1,105 @@
+import { Fr } from '@aztec/foundation/fields';
+import { createLogger } from '@aztec/foundation/log';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { L2BlockHash } from '@aztec/stdlib/block';
+import { TxHash } from '@aztec/stdlib/tx';
+/**
+ * Stores decrypted private event logs.
+ */ export class PrivateEventDataProvider {
+    #store;
+    /** Array storing the actual private event log entries containing the log content and block number */ #eventLogs;
+    /** Map from contract_address_recipient_eventSelector to array of indices into #eventLogs for efficient lookup */ #eventLogIndex;
+    /** Map from eventCommitmentIndex to boolean indicating if log has been seen. */ #seenLogs;
+    logger = createLogger('private_event_data_provider');
+    constructor(store){
+        this.#store = store;
+        this.#eventLogs = this.#store.openArray('private_event_logs');
+        this.#eventLogIndex = this.#store.openMap('private_event_log_index');
+        this.#seenLogs = this.#store.openMap('seen_logs');
+    }
+    /**
+   * Store a private event log.
+   * @param contractAddress - The address of the contract that emitted the event.
+   * @param recipient - The recipient of the event.
+   * @param eventSelector - The event selector of the event.
+   * @param msgContent - The content of the event.
+   * @param txHash - The transaction hash of the event log.
+   * @param eventCommitmentIndex - The index of the event commitment in the nullifier tree.
+   * @param blockNumber - The block number in which the event was emitted.
+   */ storePrivateEventLog(contractAddress, recipient, eventSelector, msgContent, txHash, eventCommitmentIndex, blockNumber, blockHash) {
+        return this.#store.transactionAsync(async ()=>{
+            const key = `${contractAddress.toString()}_${recipient.toString()}_${eventSelector.toString()}`;
+            // Check if this exact log has already been stored using eventCommitmentIndex as unique identifier
+            const hasBeenSeen = await this.#seenLogs.getAsync(eventCommitmentIndex);
+            if (hasBeenSeen) {
+                this.logger.verbose('Ignoring duplicate event log', {
+                    txHash: txHash.toString(),
+                    eventCommitmentIndex
+                });
+                return;
+            }
+            this.logger.verbose('storing private event log', {
+                contractAddress,
+                recipient,
+                msgContent,
+                blockNumber
+            });
+            const index = await this.#eventLogs.lengthAsync();
+            await this.#eventLogs.push({
+                msgContent: serializeToBuffer(msgContent),
+                blockNumber,
+                blockHash: blockHash.toBuffer(),
+                eventCommitmentIndex,
+                txHash: txHash.toBuffer()
+            });
+            const existingIndices = await this.#eventLogIndex.getAsync(key) || [];
+            await this.#eventLogIndex.set(key, [
+                ...existingIndices,
+                index
+            ]);
+            // Mark this log as seen using eventCommitmentIndex
+            await this.#seenLogs.set(eventCommitmentIndex, true);
+        });
+    }
+    /**
+   * Returns the private events given search parameters.
+   * @param contractAddress - The address of the contract to get events from.
+   * @param from - The block number to search from.
+   * @param numBlocks - The amount of blocks to search.
+   * @param recipients - The addresses that decrypted the logs.
+   * @param eventSelector - The event selector to filter by.
+   * @returns - The event log contents.
+   */ async getPrivateEvents(contractAddress, from, numBlocks, recipients, eventSelector) {
+        const events = [];
+        for (const recipient of recipients){
+            const key = `${contractAddress.toString()}_${recipient.toString()}_${eventSelector.toString()}`;
+            const indices = await this.#eventLogIndex.getAsync(key) || [];
+            for (const index of indices){
+                const entry = await this.#eventLogs.atAsync(index);
+                if (!entry || entry.blockNumber < from || entry.blockNumber >= from + numBlocks) {
+                    continue;
+                }
+                // Convert buffer back to Fr array
+                const reader = BufferReader.asReader(entry.msgContent);
+                const numFields = entry.msgContent.length / Fr.SIZE_IN_BYTES;
+                const msgContent = reader.readArray(numFields, Fr);
+                const txHash = TxHash.fromBuffer(entry.txHash);
+                const blockHash = L2BlockHash.fromBuffer(entry.blockHash);
+                events.push({
+                    eventCommitmentIndex: entry.eventCommitmentIndex,
+                    event: {
+                        packedEvent: msgContent,
+                        blockNumber: entry.blockNumber,
+                        recipient,
+                        txHash,
+                        blockHash,
+                        eventSelector
+                    }
+                });
+            }
+        }
+        // Sort by eventCommitmentIndex only
+        events.sort((a, b)=>a.eventCommitmentIndex - b.eventCommitmentIndex);
+        return events.map((ev)=>ev.event);
+    }
+}

package/dest/storage/sync_data_provider/index.d.ts

@@ -1,2 +1,2 @@
 export { SyncDataProvider } from './sync_data_provider.js';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdG9yYWdlL3N5bmNfZGF0YV9wcm92aWRlci9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQyJ9

package/dest/storage/sync_data_provider/sync_data_provider.d.ts

@@ -1,12 +1,10 @@
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import { BlockHeader } from '@aztec/stdlib/tx';
-import type { DataProvider } from '../data_provider.js';
-export declare class SyncDataProvider implements DataProvider {
+export declare class SyncDataProvider {
     #private;
     constructor(store: AztecAsyncKVStore);
     setHeader(header: BlockHeader): Promise<void>;
-    getBlockNumber(): Promise<number | undefined>;
+    getBlockNumber(): Promise<number>;
     getBlockHeader(): Promise<BlockHeader>;
-    getSize(): Promise<number>;
 }
-//# sourceMappingURL=sync_data_provider.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3luY19kYXRhX3Byb3ZpZGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc3RvcmFnZS9zeW5jX2RhdGFfcHJvdmlkZXIvc3luY19kYXRhX3Byb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUF1QixNQUFNLGlCQUFpQixDQUFDO0FBQzlFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUUvQyxxQkFBYSxnQkFBZ0I7O0lBSTNCLFlBQVksS0FBSyxFQUFFLGlCQUFpQixFQUduQztJQUVLLFNBQVMsQ0FBQyxNQUFNLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFbEQ7SUFFSyxjQUFjLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQU90QztJQUVLLGNBQWMsSUFBSSxPQUFPLENBQUMsV0FBVyxDQUFDLENBTzNDO0NBQ0YifQ==

package/dest/storage/sync_data_provider/sync_data_provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync_data_provider.d.ts","sourceRoot":"","sources":["../../../src/storage/sync_data_provider/sync_data_provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAuB,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,qBAAa,gBAAiB,YAAW,YAAY;;gBAIvC,KAAK,EAAE,iBAAiB;IAK9B,SAAS,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAI7C,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAS7C,cAAc,IAAI,OAAO,CAAC,WAAW,CAAC;IAStC,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;CAGjC"}
+{"version":3,"file":"sync_data_provider.d.ts","sourceRoot":"","sources":["../../../src/storage/sync_data_provider/sync_data_provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAuB,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,qBAAa,gBAAgB;;IAI3B,YAAY,KAAK,EAAE,iBAAiB,EAGnC;IAEK,SAAS,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAElD;IAEK,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC,CAOtC;IAEK,cAAc,IAAI,OAAO,CAAC,WAAW,CAAC,CAO3C;CACF"}

package/dest/storage/sync_data_provider/sync_data_provider.js

@@ -12,9 +12,9 @@ export class SyncDataProvider {
     async getBlockNumber() {
         const headerBuffer = await this.#synchronizedHeader.getAsync();
         if (!headerBuffer) {
-            return undefined;
+            throw new Error(`Trying to get block number with a not-yet-synchronized PXE - this should never happen`);
         }
-        return Number(BlockHeader.fromBuffer(headerBuffer).globalVariables.blockNumber.toBigInt());
+        return BlockHeader.fromBuffer(headerBuffer).globalVariables.blockNumber;
     }
     async getBlockHeader() {
         const headerBuffer = await this.#synchronizedHeader.getAsync();
@@ -23,7 +23,4 @@ export class SyncDataProvider {
         }
         return BlockHeader.fromBuffer(headerBuffer);
     }
-    async getSize() {
-        return (await this.#synchronizedHeader.getAsync())?.length ?? 0;
-    }
 }

package/dest/storage/tagging_data_provider/index.d.ts

@@ -1,2 +1,2 @@
 export { TaggingDataProvider } from './tagging_data_provider.js';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdG9yYWdlL3RhZ2dpbmdfZGF0YV9wcm92aWRlci9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQyJ9

package/dest/storage/tagging_data_provider/tagging_data_provider.d.ts

@@ -1,18 +1,40 @@
-import type { Fr } from '@aztec/foundation/fields';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { IndexedTaggingSecret } from '@aztec/stdlib/logs';
+import type { DirectionalAppTaggingSecret, PreTag } from '@aztec/stdlib/logs';
 export declare class TaggingDataProvider {
     #private;
     constructor(store: AztecAsyncKVStore);
-    setTaggingSecretsIndexesAsSender(indexedSecrets: IndexedTaggingSecret[]): Promise<void>;
-    setTaggingSecretsIndexesAsRecipient(indexedSecrets: IndexedTaggingSecret[]): Promise<void>;
-    getTaggingSecretsIndexesAsRecipient(appTaggingSecrets: Fr[]): Promise<number[]>;
-    getTaggingSecretsIndexesAsSender(appTaggingSecrets: Fr[]): Promise<number[]>;
+    /**
+     * Sets the last used indexes when sending a log.
+     * @param preTags - The pre tags containing the directional app tagging secrets and the indexes that are to be
+     * updated in the db.
+     * @throws If any two pre tags contain the same directional app tagging secret
+     */
+    setLastUsedIndexesAsSender(preTags: PreTag[]): Promise<void[]>;
+    /**
+     * Sets the last used indexes when looking for logs.
+     * @param preTags - The pre tags containing the directional app tagging secrets and the indexes that are to be
+     * updated in the db.
+     * @throws If any two pre tags contain the same directional app tagging secret
+     */
+    setLastUsedIndexesAsRecipient(preTags: PreTag[]): Promise<void[]>;
+    /**
+     * Returns the last used index when sending a log with a given secret.
+     * @param secret - The directional app tagging secret.
+     * @returns The last used index for the given directional app tagging secret, or undefined if not found.
+     */
+    getLastUsedIndexesAsSender(secret: DirectionalAppTaggingSecret): Promise<number | undefined>;
+    /**
+     * Returns the last used indexes when looking for logs as a recipient.
+     * @param secrets - The directional app tagging secrets to obtain the indexes for.
+     * @returns The last used indexes for the given directional app tagging secrets, or undefined if have never yet found
+     * a log for a given secret.
+     */
+    getLastUsedIndexesAsRecipient(secrets: DirectionalAppTaggingSecret[]): Promise<(number | undefined)[]>;
     resetNoteSyncData(): Promise<void>;
     addSenderAddress(address: AztecAddress): Promise<boolean>;
     getSenderAddresses(): Promise<AztecAddress[]>;
     removeSenderAddress(address: AztecAddress): Promise<boolean>;
     getSize(): Promise<number>;
 }
-//# sourceMappingURL=tagging_data_provider.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFnZ2luZ19kYXRhX3Byb3ZpZGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc3RvcmFnZS90YWdnaW5nX2RhdGFfcHJvdmlkZXIvdGFnZ2luZ19kYXRhX3Byb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFpQixNQUFNLGlCQUFpQixDQUFDO0FBQ3hFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUMzRCxPQUFPLEtBQUssRUFBRSwyQkFBMkIsRUFBRSxNQUFNLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUU5RSxxQkFBYSxtQkFBbUI7O0lBUzlCLFlBQVksS0FBSyxFQUFFLGlCQUFpQixFQU9uQztJQUVEOzs7OztPQUtHO0lBQ0gsMEJBQTBCLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxtQkFNM0M7SUFFRDs7Ozs7T0FLRztJQUNILDZCQUE2QixDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsbUJBTTlDO0lBYUQ7Ozs7T0FJRztJQUNHLDBCQUEwQixDQUFDLE1BQU0sRUFBRSwyQkFBMkIsR0FBRyxPQUFPLENBQUMsTUFBTSxHQUFHLFNBQVMsQ0FBQyxDQUVqRztJQUVEOzs7OztPQUtHO0lBQ0gsNkJBQTZCLENBQUMsT0FBTyxFQUFFLDJCQUEyQixFQUFFLEdBQUcsT0FBTyxDQUFDLENBQUMsTUFBTSxHQUFHLFNBQVMsQ0FBQyxFQUFFLENBQUMsQ0FFckc7SUFFRCxpQkFBaUIsSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBT2pDO0lBRUssZ0JBQWdCLENBQUMsT0FBTyxFQUFFLFlBQVksR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBUTlEO0lBRUssa0JBQWtCLElBQUksT0FBTyxDQUFDLFlBQVksRUFBRSxDQUFDLENBRWxEO0lBRUssbUJBQW1CLENBQUMsT0FBTyxFQUFFLFlBQVksR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBUWpFO0lBRUssT0FBTyxvQkFJWjtDQUNGIn0=