@aztec/pxe 0.0.1-commit.e61ad554 → 0.0.1-commit.ec5f612

package/dest/storage/note_store/note_store.js

@@ -1,4 +1,3 @@
-import { toArray } from '@aztec/foundation/iterable';
 import { Semaphore } from '@aztec/foundation/queue';
 import { NoteStatus } from '@aztec/stdlib/note';
 import { StoredNote } from './stored_note.js';
@@ -49,26 +48,18 @@ import { StoredNote } from './stored_note.js';
    * @param scope - The scope (user/account) under which to store the notes
    * @param jobId - The job context for staged writes
    */ addNotes(notes, scope, jobId) {
-        return this.#withJobLock(jobId, ()=>Promise.all(notes.map((noteDao)=>this.#addNote(noteDao, scope, jobId))));
-    }
-    async #addNote(note, scope, jobId) {
-        const noteForJob = await this.#readNote(note.siloedNullifier.toString(), jobId) ?? new StoredNote(note, new Set());
-        // Make sure the note is linked to the scope and staged for this job
-        noteForJob.addScope(scope.toString());
-        this.#writeNote(noteForJob, jobId);
+        return this.#withJobLock(jobId, ()=>this.#store.transactionAsync(()=>Promise.all(notes.map(async (note)=>{
+                    const noteForJob = await this.#readNote(note.siloedNullifier.toString(), jobId) ?? new StoredNote(note, new Set());
+                    noteForJob.addScope(scope.toString());
+                    this.#writeNote(noteForJob, jobId);
+                }))));
     }
     async #readNote(nullifier, jobId) {
-        // First check staged notes for this job
-        const noteForJob = this.#getNotesForJob(jobId).get(nullifier);
-        if (noteForJob) {
-            return noteForJob;
-        }
-        // Then check persistent storage
+        // Always issue DB read to keep IndexedDB transaction alive (they auto-commit when a new micro-task starts and there
+        // are no pending read requests). The staged value still takes precedence if it exists.
         const noteBuffer = await this.#notes.getAsync(nullifier);
-        if (noteBuffer) {
-            return StoredNote.fromBuffer(noteBuffer);
-        }
-        return undefined;
+        const noteForJob = this.#getNotesForJob(jobId).get(nullifier);
+        return noteForJob ?? (noteBuffer ? StoredNote.fromBuffer(noteBuffer) : undefined);
     }
     #writeNote(note, jobId) {
         this.#getNotesForJob(jobId).set(note.noteDao.siloedNullifier.toString(), note);
@@ -83,49 +74,84 @@ import { StoredNote } from './stored_note.js';
    * @params jobId - the job context to read from.
    * @returns Filtered and deduplicated notes (a note might be present in multiple scopes - we ensure it is only
    * returned once if this is the case)
-   * @throws If filtering by an empty scopes array. Scopes have to be set to undefined or to a non-empty array.
-   */ async getNotes(filter, jobId) {
-        if (filter.scopes !== undefined && filter.scopes.length === 0) {
-            throw new Error('Trying to get notes with an empty scopes array');
+   */ getNotes(filter, jobId) {
+        if (filter.scopes !== 'ALL_SCOPES' && filter.scopes.length === 0) {
+            return Promise.resolve([]);
         }
-        const targetStatus = filter.status ?? NoteStatus.ACTIVE;
-        const foundNotes = new Map();
-        const nullifiersOfContract = await this.#nullifiersOfContract(filter.contractAddress, jobId);
-        for (const nullifier of nullifiersOfContract){
-            const note = await this.#readNote(nullifier, jobId);
-            // Defensive: hitting this case means we're mishandling contract indices or in-memory job data
-            if (!note) {
-                throw new Error('PXE note database is corrupted.');
-            }
-            // Apply filters
-            if (targetStatus === NoteStatus.ACTIVE && note.isNullified()) {
-                continue;
-            }
-            if (filter.owner && !note.noteDao.owner.equals(filter.owner)) {
-                continue;
-            }
-            if (filter.storageSlot && !note.noteDao.storageSlot.equals(filter.storageSlot)) {
-                continue;
-            }
-            if (filter.siloedNullifier && !note.noteDao.siloedNullifier.equals(filter.siloedNullifier)) {
-                continue;
-            }
-            if (filter.scopes && note.scopes.intersection(new Set(filter.scopes.map((s)=>s.toString()))).size === 0) {
-                continue;
+        return this.#store.transactionAsync(async ()=>{
+            const targetStatus = filter.status ?? NoteStatus.ACTIVE;
+            // The code below might read a bit unnatural, the reason is that we need to be careful in how we use `await` inside
+            // `transactionAsync`, otherwise browsers might choose to auto-commit the IndexedDB transaction forcing us to
+            // explicitly handle that condition. The rule we need to honor is: do not await unless you generate a database
+            // read or write or you're done using the DB for the remainder of the transaction. The following sequence is
+            // unsafe in IndexedDB:
+            //
+            // 1. start transactionAsync()
+            // 2. await readDb() <-- OK, transaction alive because we issued DB ops
+            // 3. run a bunch of computations (no await involved) <-- OK, tx alive because we are in the same microtask
+            // 4. await doSthNotInDb() <-- no DB ops issued in this task, browser's free to decide to commit the tx
+            // 5. await readDb() <-- BOOM, TransactionInactiveError
+            //
+            // Note that the real issue is in step number 5: we try to continue using a transaction that the browser might
+            // have already committed.
+            //
+            // We need to read candidate notes which are either indexed by contract address in the DB (in
+            // #nullifiersByContractAddress), or lie in memory for the not yet committed `jobId`.
+            // So we collect promises based on both sources without awaiting for them.
+            const noteReadPromises = new Map();
+            // Awaiting the getValuesAsync iterator is fine because it's reading from the DB
+            for await (const nullifier of this.#nullifiersByContractAddress.getValuesAsync(filter.contractAddress.toString())){
+                // Each #readNote will perform a DB read
+                noteReadPromises.set(nullifier, this.#readNote(nullifier, jobId));
             }
-            foundNotes.set(note.noteDao.siloedNullifier.toString(), note.noteDao);
-        }
-        // Sort by block number, then by tx index within block, then by note index within tx
-        return [
-            ...foundNotes.values()
-        ].sort((a, b)=>{
-            if (a.l2BlockNumber !== b.l2BlockNumber) {
-                return a.l2BlockNumber - b.l2BlockNumber;
+            // Add staged nullifiers from job, no awaits involved, so we are fine
+            for (const storedNote of this.#getNotesForJob(jobId).values()){
+                if (storedNote.noteDao.contractAddress.equals(filter.contractAddress)) {
+                    const nullifier = storedNote.noteDao.siloedNullifier.toString();
+                    if (!noteReadPromises.has(nullifier)) {
+                        noteReadPromises.set(nullifier, Promise.resolve(storedNote));
+                    }
+                }
             }
-            if (a.txIndexInBlock !== b.txIndexInBlock) {
-                return a.txIndexInBlock - b.txIndexInBlock;
+            // By now we have pending DB requests from all the #readNote calls. Await them all together.
+            const notes = await Promise.all(noteReadPromises.values());
+            // The rest of the function is await-free, and just deals with filtering and sorting our findings.
+            const foundNotes = new Map();
+            for (const note of notes){
+                // Defensive: hitting this case means we're mishandling contract indices or in-memory job data
+                if (!note) {
+                    throw new Error('PXE note database is corrupted.');
+                }
+                // Apply filters
+                if (targetStatus === NoteStatus.ACTIVE && note.isNullified()) {
+                    continue;
+                }
+                if (filter.owner && !note.noteDao.owner.equals(filter.owner)) {
+                    continue;
+                }
+                if (filter.storageSlot && !note.noteDao.storageSlot.equals(filter.storageSlot)) {
+                    continue;
+                }
+                if (filter.siloedNullifier && !note.noteDao.siloedNullifier.equals(filter.siloedNullifier)) {
+                    continue;
+                }
+                if (filter.scopes !== 'ALL_SCOPES' && note.scopes.intersection(new Set(filter.scopes.map((s)=>s.toString()))).size === 0) {
+                    continue;
+                }
+                foundNotes.set(note.noteDao.siloedNullifier.toString(), note.noteDao);
             }
-            return a.noteIndexInTx - b.noteIndexInTx;
+            // Sort by block number, then by tx index within block, then by note index within tx
+            return [
+                ...foundNotes.values()
+            ].sort((a, b)=>{
+                if (a.l2BlockNumber !== b.l2BlockNumber) {
+                    return a.l2BlockNumber - b.l2BlockNumber;
+                }
+                if (a.txIndexInBlock !== b.txIndexInBlock) {
+                    return a.txIndexInBlock - b.txIndexInBlock;
+                }
+                return a.noteIndexInTx - b.noteIndexInTx;
+            });
         });
     }
     /**
@@ -143,10 +169,13 @@ import { StoredNote } from './stored_note.js';
    * @returns Array of NoteDao objects that were nullified
    * @throws Error if any nullifier is not found in this notes store
    */ applyNullifiers(nullifiers, jobId) {
+        if (nullifiers.length === 0) {
+            return Promise.resolve([]);
+        }
+        if (nullifiers.some((n)=>n.l2BlockNumber === 0)) {
+            return Promise.reject(new Error('applyNullifiers: nullifiers cannot have been emitted at block 0'));
+        }
         return this.#withJobLock(jobId, ()=>this.#store.transactionAsync(async ()=>{
-                if (nullifiers.length === 0) {
-                    return [];
-                }
                 const notesToNullify = await Promise.all(nullifiers.map(async (nullifierInBlock)=>{
                     const nullifier = nullifierInBlock.data.toString();
                     const storedNote = await this.#readNote(nullifier, jobId);
@@ -154,13 +183,12 @@ import { StoredNote } from './stored_note.js';
                         throw new Error(`Attempted to mark a note as nullified which does not exist in PXE DB`);
                     }
                     return {
-                        storedNote: await this.#readNote(nullifier, jobId),
+                        storedNote,
                         blockNumber: nullifierInBlock.l2BlockNumber
                     };
                 }));
                 const notesNullifiedInThisCall = new Map();
                 for (const noteToNullify of notesToNullify){
-                    // Safe to coerce (!) because we throw if we find any undefined above
                     const note = noteToNullify.storedNote;
                     // Skip already nullified notes
                     if (note.isNullified()) {
@@ -200,15 +228,22 @@ import { StoredNote } from './stored_note.js';
    *
    * @param blockNumber - Notes created after this block number will be deleted
    */ async #deleteActiveNotesAfterBlock(blockNumber) {
-        const notes = await toArray(this.#notes.valuesAsync());
-        for (const noteBuffer of notes){
+        // Collect notes to delete during iteration to keep IndexedDB transaction alive.
+        const notesToDelete = [];
+        for await (const noteBuffer of this.#notes.valuesAsync()){
             const storedNote = StoredNote.fromBuffer(noteBuffer);
             if (storedNote.noteDao.l2BlockNumber > blockNumber) {
-                const noteNullifier = storedNote.noteDao.siloedNullifier.toString();
-                await this.#notes.delete(noteNullifier);
-                await this.#nullifiersByContractAddress.deleteValue(storedNote.noteDao.contractAddress.toString(), noteNullifier);
+                notesToDelete.push({
+                    nullifier: storedNote.noteDao.siloedNullifier.toString(),
+                    contractAddress: storedNote.noteDao.contractAddress.toString()
+                });
             }
         }
+        // Delete all collected notes. Each delete is a DB operation that keeps the transaction alive.
+        for (const { nullifier, contractAddress } of notesToDelete){
+            await this.#notes.delete(nullifier);
+            await this.#nullifiersByContractAddress.deleteValue(contractAddress, nullifier);
+        }
     }
     /**
    * Rewinds nullifications after a given block number.
@@ -219,47 +254,62 @@ import { StoredNote } from './stored_note.js';
    * @param blockNumber - Revert nullifications that occurred after this block
    * @param anchorBlockNumber - Upper bound for the block range to process
    */ async #rewindNullifiedNotesAfterBlock(blockNumber, anchorBlockNumber) {
-        const currentBlockNumber = blockNumber + 1;
-        for(let i = currentBlockNumber; i <= anchorBlockNumber; i++){
-            const noteNullifiersToReinsert = await toArray(this.#nullifiersByNullificationBlockNumber.getValuesAsync(i));
-            const nullifiedNoteBuffers = await Promise.all(noteNullifiersToReinsert.map(async (noteNullifier)=>{
-                const note = await this.#notes.getAsync(noteNullifier);
-                if (!note) {
-                    throw new Error(`PXE DB integrity error: no note found with nullifier ${noteNullifier}`);
+        // First pass: collect all nullifiers for all blocks, starting reads during iteration to keep tx alive.
+        const nullifiersByBlock = new Map();
+        for(let i = blockNumber + 1; i <= anchorBlockNumber; i++){
+            const blockNullifiers = [];
+            for await (const nullifier of this.#nullifiersByNullificationBlockNumber.getValuesAsync(i)){
+                // Start read immediately during iteration to keep IndexedDB transaction alive
+                blockNullifiers.push({
+                    nullifier,
+                    noteReadPromise: this.#notes.getAsync(nullifier)
+                });
+            }
+            if (blockNullifiers.length > 0) {
+                nullifiersByBlock.set(i, blockNullifiers);
+            }
+        }
+        // Second pass: await reads and perform writes
+        for (const [block, nullifiers] of nullifiersByBlock){
+            for (const { nullifier, noteReadPromise } of nullifiers){
+                const noteBuffer = await noteReadPromise;
+                if (!noteBuffer) {
+                    throw new Error(`PXE DB integrity error: no note found with nullifier ${nullifier}`);
                 }
-                return note;
-            }));
-            const storedNotes = nullifiedNoteBuffers.map((buffer)=>StoredNote.fromBuffer(buffer));
-            for (const storedNote of storedNotes){
-                const noteNullifier = storedNote.noteDao.siloedNullifier.toString();
-                const scopes = storedNote.scopes;
-                if (scopes.size === 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(`No scopes found for nullified note with nullifier ${noteNullifier}`);
+                const storedNote = StoredNote.fromBuffer(noteBuffer);
+                if (storedNote.scopes.size === 0) {
+                    throw new Error(`No scopes found for nullified note with nullifier ${nullifier}`);
                 }
                 storedNote.markAsActive();
                 await Promise.all([
-                    this.#notes.set(noteNullifier, storedNote.toBuffer()),
-                    this.#nullifiersByNullificationBlockNumber.deleteValue(i, noteNullifier)
+                    this.#notes.set(nullifier, storedNote.toBuffer()),
+                    this.#nullifiersByNullificationBlockNumber.deleteValue(block, nullifier)
                 ]);
             }
         }
     }
-    commit(jobId) {
-        return this.#withJobLock(jobId, async ()=>{
-            for (const [nullifier, storedNote] of this.#getNotesForJob(jobId)){
-                await this.#notes.set(nullifier, storedNote.toBuffer());
-                await this.#nullifiersByContractAddress.set(storedNote.noteDao.contractAddress.toString(), nullifier);
-                if (storedNote.nullifiedAt !== undefined) {
-                    await this.#nullifiersByNullificationBlockNumber.set(storedNote.nullifiedAt, nullifier);
-                }
+    /**
+   * Commits in memory job data to persistent storage.
+   *
+   * Called by JobCoordinator when a job completes successfully.
+   *
+   * Note: JobCoordinator wraps all commits in a single transaction, so we don't need our own transactionAsync here
+   * (and using one would throw on IndexedDB as it does not support nested txs).
+   *
+   * @param jobId - The jobId identifying which staged data to commit
+   */ async commit(jobId) {
+        for (const [nullifier, storedNote] of this.#getNotesForJob(jobId)){
+            await this.#notes.set(nullifier, storedNote.toBuffer());
+            await this.#nullifiersByContractAddress.set(storedNote.noteDao.contractAddress.toString(), nullifier);
+            if (storedNote.nullifiedAt !== undefined) {
+                await this.#nullifiersByNullificationBlockNumber.set(storedNote.nullifiedAt, nullifier);
             }
-            this.#clearJobData(jobId);
-        });
+        }
+        this.#clearJobData(jobId);
     }
     discardStaged(jobId) {
-        return this.#withJobLock(jobId, ()=>Promise.resolve(this.#clearJobData(jobId)));
+        this.#clearJobData(jobId);
+        return Promise.resolve();
     }
     #clearJobData(jobId) {
         this.#notesForJob.delete(jobId);
@@ -290,14 +340,4 @@ import { StoredNote } from './stored_note.js';
         }
         return notesForJob;
     }
-    async #nullifiersOfContract(contractAddress, jobId) {
-        // Collect persisted nullifiers for this contract
-        const persistedNullifiers = await toArray(this.#nullifiersByContractAddress.getValuesAsync(contractAddress.toString()));
-        // Collect staged nullifiers from the job where the note's contract matches
-        const stagedNullifiers = this.#getNotesForJob(jobId).values().filter((storedNote)=>storedNote.noteDao.contractAddress.equals(contractAddress)).map((storedNote)=>storedNote.noteDao.siloedNullifier.toString());
-        return new Set([
-            ...persistedNullifiers,
-            ...stagedNullifiers
-        ]);
-    }
 }

package/dest/storage/private_event_store/private_event_store.d.ts

@@ -88,4 +88,4 @@ export declare class PrivateEventStore implements StagedStore {
     discardStaged(jobId: string): Promise<void>;
 }
 export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9ldmVudF9zdG9yZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3N0b3JhZ2UvcHJpdmF0ZV9ldmVudF9zdG9yZS9wcml2YXRlX2V2ZW50X3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUlwRCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBcUMsTUFBTSxpQkFBaUIsQ0FBQztBQUM1RixPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUN2RCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFckQsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sMENBQTBDLENBQUM7QUFDNUUsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFHdkQsTUFBTSxNQUFNLHVCQUF1QixHQUFHO0lBQ3BDLGVBQWUsRUFBRSxZQUFZLENBQUM7SUFDOUIsU0FBUyxFQUFFLE1BQU0sQ0FBQztJQUNsQixPQUFPLEVBQUUsTUFBTSxDQUFDO0lBQ2hCLE1BQU0sRUFBRSxZQUFZLEVBQUUsQ0FBQztJQUN2QixNQUFNLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDakIsQ0FBQztBQUVGLEtBQUssb0JBQW9CLEdBQUcsSUFBSSxHQUFHO0lBQ2pDLGVBQWUsRUFBRSxZQUFZLENBQUM7SUFDOUIsS0FBSyxFQUFFLFlBQVksQ0FBQztJQUNwQiwyQ0FBMkM7SUFDM0MsY0FBYyxFQUFFLE1BQU0sQ0FBQztJQUN2Qix5RUFBeUU7SUFDekUsY0FBYyxFQUFFLE1BQU0sQ0FBQztDQUN4QixDQUFDO0FBRUY7O0dBRUc7QUFDSCxxQkFBYSxpQkFBa0IsWUFBVyxXQUFXOztJQUNuRCxRQUFRLENBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBbUI7SUFnQjdDLE1BQU0seUNBQXVDO0lBRTdDLFlBQVksS0FBSyxFQUFFLGlCQUFpQixFQVFuQztJQUVEOzs7Ozs7Ozs7OztPQVdHO0lBQ0gsb0JBQW9CLENBQ2xCLGFBQWEsRUFBRSxhQUFhLEVBQzVCLFVBQVUsRUFBRSxFQUFFLEVBQ2QsVUFBVSxFQUFFLEVBQUUsRUFBRSxFQUNoQixxQkFBcUIsRUFBRSxFQUFFLEVBQ3pCLFFBQVEsRUFBRSxvQkFBb0IsRUFDOUIsS0FBSyxFQUFFLE1BQU0saUJBdUNkO0lBRUQ7Ozs7Ozs7Ozs7T0FVRztJQUNJLGdCQUFnQixDQUNyQixhQUFhLEVBQUUsYUFBYSxFQUM1QixNQUFNLEVBQUUsdUJBQXVCLEdBQzlCLE9BQU8sQ0FBQyxrQkFBa0IsRUFBRSxDQUFDLENBcUUvQjtJQUVEOzs7Ozs7Ozs7Ozs7Ozs7O09BZ0JHO0lBQ1UsUUFBUSxDQUFDLFdBQVcsRUFBRSxNQUFNLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0E0QnBGO0lBRUQ7Ozs7Ozs7OztPQVNHO0lBQ0gsTUFBTSxDQUFDLEtBQUssRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQWVuQztJQUVEOztPQUVHO0lBQ0gsYUFBYSxDQUFDLEtBQUssRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUUxQztDQTRFRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9ldmVudF9zdG9yZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3N0b3JhZ2UvcHJpdmF0ZV9ldmVudF9zdG9yZS9wcml2YXRlX2V2ZW50X3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUdwRCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBcUMsTUFBTSxpQkFBaUIsQ0FBQztBQUM1RixPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUN2RCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFckQsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sMENBQTBDLENBQUM7QUFDNUUsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFHdkQsTUFBTSxNQUFNLHVCQUF1QixHQUFHO0lBQ3BDLGVBQWUsRUFBRSxZQUFZLENBQUM7SUFDOUIsU0FBUyxFQUFFLE1BQU0sQ0FBQztJQUNsQixPQUFPLEVBQUUsTUFBTSxDQUFDO0lBQ2hCLE1BQU0sRUFBRSxZQUFZLEVBQUUsQ0FBQztJQUN2QixNQUFNLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDakIsQ0FBQztBQUVGLEtBQUssb0JBQW9CLEdBQUcsSUFBSSxHQUFHO0lBQ2pDLGVBQWUsRUFBRSxZQUFZLENBQUM7SUFDOUIsS0FBSyxFQUFFLFlBQVksQ0FBQztJQUNwQiwyQ0FBMkM7SUFDM0MsY0FBYyxFQUFFLE1BQU0sQ0FBQztJQUN2Qix5RUFBeUU7SUFDekUsY0FBYyxFQUFFLE1BQU0sQ0FBQztDQUN4QixDQUFDO0FBRUY7O0dBRUc7QUFDSCxxQkFBYSxpQkFBa0IsWUFBVyxXQUFXOztJQUNuRCxRQUFRLENBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBbUI7SUFnQjdDLE1BQU0seUNBQXVDO0lBRTdDLFlBQVksS0FBSyxFQUFFLGlCQUFpQixFQVFuQztJQUVEOzs7Ozs7Ozs7OztPQVdHO0lBQ0gsb0JBQW9CLENBQ2xCLGFBQWEsRUFBRSxhQUFhLEVBQzVCLFVBQVUsRUFBRSxFQUFFLEVBQ2QsVUFBVSxFQUFFLEVBQUUsRUFBRSxFQUNoQixxQkFBcUIsRUFBRSxFQUFFLEVBQ3pCLFFBQVEsRUFBRSxvQkFBb0IsRUFDOUIsS0FBSyxFQUFFLE1BQU0saUJBeUNkO0lBRUQ7Ozs7Ozs7Ozs7T0FVRztJQUNJLGdCQUFnQixDQUNyQixhQUFhLEVBQUUsYUFBYSxFQUM1QixNQUFNLEVBQUUsdUJBQXVCLEdBQzlCLE9BQU8sQ0FBQyxrQkFBa0IsRUFBRSxDQUFDLENBK0UvQjtJQUVEOzs7Ozs7Ozs7Ozs7Ozs7O09BZ0JHO0lBQ1UsUUFBUSxDQUFDLFdBQVcsRUFBRSxNQUFNLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FzQ3BGO0lBRUQ7Ozs7Ozs7OztPQVNHO0lBQ0csTUFBTSxDQUFDLEtBQUssRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQWdCekM7SUFFRDs7T0FFRztJQUNILGFBQWEsQ0FBQyxLQUFLLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FHMUM7Q0EwRUYifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"private_event_store.d.ts","sourceRoot":"","sources":["../../../src/storage/private_event_store/private_event_store.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAIpD,OAAO,KAAK,EAAE,iBAAiB,EAAqC,MAAM,iBAAiB,CAAC;AAC5F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAGvD,MAAM,MAAM,uBAAuB,GAAG;IACpC,eAAe,EAAE,YAAY,CAAC;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,YAAY,EAAE,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,KAAK,oBAAoB,GAAG,IAAI,GAAG;IACjC,eAAe,EAAE,YAAY,CAAC;IAC9B,KAAK,EAAE,YAAY,CAAC;IACpB,2CAA2C;IAC3C,cAAc,EAAE,MAAM,CAAC;IACvB,yEAAyE;IACzE,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF;;GAEG;AACH,qBAAa,iBAAkB,YAAW,WAAW;;IACnD,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAmB;IAgB7C,MAAM,yCAAuC;IAE7C,YAAY,KAAK,EAAE,iBAAiB,EAQnC;IAED;;;;;;;;;;;OAWG;IACH,oBAAoB,CAClB,aAAa,EAAE,aAAa,EAC5B,UAAU,EAAE,EAAE,EACd,UAAU,EAAE,EAAE,EAAE,EAChB,qBAAqB,EAAE,EAAE,EACzB,QAAQ,EAAE,oBAAoB,EAC9B,KAAK,EAAE,MAAM,iBAuCd;IAED;;;;;;;;;;OAUG;IACI,gBAAgB,CACrB,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,uBAAuB,GAC9B,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAqE/B;IAED;;;;;;;;;;;;;;;;OAgBG;IACU,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA4BpF;IAED;;;;;;;;;OASG;IACH,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAenC;IAED;;OAEG;IACH,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE1C;CA4EF"}
+{"version":3,"file":"private_event_store.d.ts","sourceRoot":"","sources":["../../../src/storage/private_event_store/private_event_store.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAGpD,OAAO,KAAK,EAAE,iBAAiB,EAAqC,MAAM,iBAAiB,CAAC;AAC5F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAGvD,MAAM,MAAM,uBAAuB,GAAG;IACpC,eAAe,EAAE,YAAY,CAAC;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,YAAY,EAAE,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,KAAK,oBAAoB,GAAG,IAAI,GAAG;IACjC,eAAe,EAAE,YAAY,CAAC;IAC9B,KAAK,EAAE,YAAY,CAAC;IACpB,2CAA2C;IAC3C,cAAc,EAAE,MAAM,CAAC;IACvB,yEAAyE;IACzE,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF;;GAEG;AACH,qBAAa,iBAAkB,YAAW,WAAW;;IACnD,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAmB;IAgB7C,MAAM,yCAAuC;IAE7C,YAAY,KAAK,EAAE,iBAAiB,EAQnC;IAED;;;;;;;;;;;OAWG;IACH,oBAAoB,CAClB,aAAa,EAAE,aAAa,EAC5B,UAAU,EAAE,EAAE,EACd,UAAU,EAAE,EAAE,EAAE,EAChB,qBAAqB,EAAE,EAAE,EACzB,QAAQ,EAAE,oBAAoB,EAC9B,KAAK,EAAE,MAAM,iBAyCd;IAED;;;;;;;;;;OAUG;IACI,gBAAgB,CACrB,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,uBAAuB,GAC9B,OAAO,CAAC,kBAAkB,EAAE,CAAC,CA+E/B;IAED;;;;;;;;;;;;;;;;OAgBG;IACU,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAsCpF;IAED;;;;;;;;;OASG;IACG,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBzC;IAED;;OAEG;IACH,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG1C;CA0EF"}

package/dest/storage/private_event_store/private_event_store.js

@@ -1,5 +1,4 @@
 import { BlockNumber } from '@aztec/foundation/branded-types';
-import { toArray } from '@aztec/foundation/iterable';
 import { createLogger } from '@aztec/foundation/log';
 import { Semaphore } from '@aztec/foundation/queue';
 import { StoredPrivateEvent } from './stored_private_event.js';
@@ -34,27 +33,27 @@ import { StoredPrivateEvent } from './stored_private_event.js';
    *  txHash - The transaction hash of the event log.
    *  blockNumber - The block number in which the event was emitted.
    */ storePrivateEventLog(eventSelector, randomness, msgContent, siloedEventCommitment, metadata, jobId) {
-        return this.#withJobLock(jobId, async ()=>{
-            const { contractAddress, scope, txHash, l2BlockNumber, l2BlockHash, txIndexInBlock, eventIndexInTx } = metadata;
-            const eventId = siloedEventCommitment.toString();
-            this.logger.verbose('storing private event log (job stage)', {
-                eventId,
-                contractAddress,
-                scope,
-                msgContent,
-                l2BlockNumber
-            });
-            const existing = await this.#readEvent(eventId, jobId);
-            if (existing) {
-                // If we already stored this event, we still want to make sure to track it for the given scope
-                existing.addScope(scope.toString());
-                this.#writeEvent(eventId, existing, jobId);
-            } else {
-                this.#writeEvent(eventId, new StoredPrivateEvent(randomness, msgContent, l2BlockNumber, l2BlockHash, txHash, txIndexInBlock, eventIndexInTx, contractAddress, eventSelector, new Set([
-                    scope.toString()
-                ])), jobId);
-            }
-        });
+        return this.#withJobLock(jobId, ()=>this.#store.transactionAsync(async ()=>{
+                const { contractAddress, scope, txHash, l2BlockNumber, l2BlockHash, txIndexInBlock, eventIndexInTx } = metadata;
+                const eventId = siloedEventCommitment.toString();
+                this.logger.verbose('storing private event log (job stage)', {
+                    eventId,
+                    contractAddress,
+                    scope,
+                    msgContent,
+                    l2BlockNumber
+                });
+                const existing = await this.#readEvent(eventId, jobId);
+                if (existing) {
+                    // If we already stored this event, we still want to make sure to track it for the given scope
+                    existing.addScope(scope.toString());
+                    this.#writeEvent(eventId, existing, jobId);
+                } else {
+                    this.#writeEvent(eventId, new StoredPrivateEvent(randomness, msgContent, l2BlockNumber, l2BlockHash, txHash, txIndexInBlock, eventIndexInTx, contractAddress, eventSelector, new Set([
+                        scope.toString()
+                    ])), jobId);
+                }
+            }));
     }
     /**
    * Returns the private events given search parameters.
@@ -68,12 +67,22 @@ import { StoredPrivateEvent } from './stored_private_event.js';
    * included.
    */ getPrivateEvents(eventSelector, filter) {
         return this.#store.transactionAsync(async ()=>{
-            const events = [];
             const key = this.#keyFor(filter.contractAddress, eventSelector);
             const targetScopes = new Set(filter.scopes.map((s)=>s.toString()));
-            const eventIds = await toArray(this.#eventsByContractAndEventSelector.getValuesAsync(key));
-            for (const eventId of eventIds){
-                const eventBuffer = await this.#events.getAsync(eventId);
+            // Map from eventId to the promise that reads the event buffer.
+            // We start reads during iteration to keep DB requests pending and avoid IndexedDB auto-commit.
+            const eventReadPromises = new Map();
+            for await (const eventId of this.#eventsByContractAndEventSelector.getValuesAsync(key)){
+                eventReadPromises.set(eventId, this.#events.getAsync(eventId));
+            }
+            const eventIds = [
+                ...eventReadPromises.keys()
+            ];
+            const eventBuffers = await Promise.all(eventReadPromises.values());
+            const events = [];
+            for(let i = 0; i < eventIds.length; i++){
+                const eventId = eventIds[i];
+                const eventBuffer = eventBuffers[i];
                 // Defensive, if it happens, there's a problem with how we're handling #eventsByContractAndEventSelector
                 if (!eventBuffer) {
                     this.logger.verbose(`EventId ${eventId} does not exist in main index but it is referenced from contract event selector index`);
@@ -135,21 +144,34 @@ import { StoredPrivateEvent } from './stored_private_event.js';
    *
    * IMPORTANT: This method must be called within a transaction to ensure atomicity.
    */ async rollback(blockNumber, synchedBlockNumber) {
-        let removedCount = 0;
+        // First pass: collect all event IDs for all blocks, starting reads during iteration to keep tx alive.
+        const eventsByBlock = new Map();
         for(let block = blockNumber + 1; block <= synchedBlockNumber; block++){
-            const eventIds = await toArray(this.#eventsByBlockNumber.getValuesAsync(block));
-            if (eventIds.length > 0) {
-                await this.#eventsByBlockNumber.delete(block);
-                for (const eventId of eventIds){
-                    const buffer = await this.#events.getAsync(eventId);
-                    if (!buffer) {
-                        throw new Error(`Event not found for eventId ${eventId}`);
-                    }
-                    const entry = StoredPrivateEvent.fromBuffer(buffer);
-                    await this.#events.delete(eventId);
-                    await this.#eventsByContractAndEventSelector.deleteValue(this.#keyFor(entry.contractAddress, entry.eventSelector), eventId);
-                    removedCount++;
+            const blockEvents = [];
+            for await (const eventId of this.#eventsByBlockNumber.getValuesAsync(block)){
+                // Start read immediately during iteration to keep IndexedDB transaction alive
+                blockEvents.push({
+                    eventId,
+                    eventReadPromise: this.#events.getAsync(eventId)
+                });
+            }
+            if (blockEvents.length > 0) {
+                eventsByBlock.set(block, blockEvents);
+            }
+        }
+        // Second pass: await reads and perform deletes
+        let removedCount = 0;
+        for (const [block, events] of eventsByBlock){
+            await this.#eventsByBlockNumber.delete(block);
+            for (const { eventId, eventReadPromise } of events){
+                const buffer = await eventReadPromise;
+                if (!buffer) {
+                    throw new Error(`Event not found for eventId ${eventId}`);
                 }
+                const entry = StoredPrivateEvent.fromBuffer(buffer);
+                await this.#events.delete(eventId);
+                await this.#eventsByContractAndEventSelector.deleteValue(this.#keyFor(entry.contractAddress, entry.eventSelector), eventId);
+                removedCount++;
             }
         }
         this.logger.verbose(`Rolled back ${removedCount} private events after block ${blockNumber}`);
@@ -163,39 +185,40 @@ import { StoredPrivateEvent } from './stored_private_event.js';
    * (and using one would throw on IndexedDB as it does not support nested txs).
    *
    * @param jobId - The jobId identifying which staged data to commit
-   */ commit(jobId) {
-        return this.#withJobLock(jobId, async ()=>{
-            for (const [eventId, entry] of this.#getEventsForJob(jobId).entries()){
-                const lookupKey = this.#keyFor(entry.contractAddress, entry.eventSelector);
-                this.logger.verbose('storing private event log', {
-                    eventId,
-                    lookupKey
-                });
-                await Promise.all([
-                    this.#events.set(eventId, entry.toBuffer()),
-                    this.#eventsByContractAndEventSelector.set(lookupKey, eventId),
-                    this.#eventsByBlockNumber.set(entry.l2BlockNumber, eventId)
-                ]);
-            }
-            this.#clearJobData(jobId);
-        });
+   */ async commit(jobId) {
+        // Note: Don't use #withJobLock here - commit runs within JobCoordinator's transactionAsync,
+        // and awaiting the lock would create a microtask boundary with no pending DB request,
+        // causing IndexedDB to auto-commit the transaction.
+        for (const [eventId, entry] of this.#getEventsForJob(jobId).entries()){
+            const lookupKey = this.#keyFor(entry.contractAddress, entry.eventSelector);
+            this.logger.verbose('storing private event log', {
+                eventId,
+                lookupKey
+            });
+            await Promise.all([
+                this.#events.set(eventId, entry.toBuffer()),
+                this.#eventsByContractAndEventSelector.set(lookupKey, eventId),
+                this.#eventsByBlockNumber.set(entry.l2BlockNumber, eventId)
+            ]);
+        }
+        this.#clearJobData(jobId);
     }
     /**
    * Discards in memory job data without persisting it.
    */ discardStaged(jobId) {
-        return this.#withJobLock(jobId, ()=>Promise.resolve(this.#clearJobData(jobId)));
+        this.#clearJobData(jobId);
+        return Promise.resolve();
     }
     /**
    * Reads an event from in-memory job data first, falling back to persistent storage if not found.
    *
    * Returns undefined if the event does not exist in the store overall.
    */ async #readEvent(eventId, jobId) {
-        const eventForJob = this.#getEventsForJob(jobId).get(eventId);
-        if (eventForJob) {
-            return eventForJob;
-        }
+        // Always issue DB read to keep IndexedDB transaction alive (they auto-commit when a new micro-task starts and there
+        // are no pending read requests). The staged value still takes precedence if it exists.
         const buffer = await this.#events.getAsync(eventId);
-        return buffer ? StoredPrivateEvent.fromBuffer(buffer) : undefined;
+        const eventForJob = this.#getEventsForJob(jobId).get(eventId);
+        return eventForJob ?? (buffer ? StoredPrivateEvent.fromBuffer(buffer) : undefined);
     }
     /**
    * Writes an event to in-memory job data.

package/dest/storage/private_event_store/stored_private_event.d.ts

@@ -1,23 +1,23 @@
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { EventSelector } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { L2BlockHash } from '@aztec/stdlib/block';
+import { BlockHash } from '@aztec/stdlib/block';
 import { TxHash } from '@aztec/stdlib/tx';
 /** Serializable private event entry with scope tracking. */
 export declare class StoredPrivateEvent {
     readonly randomness: Fr;
     readonly msgContent: Fr[];
     readonly l2BlockNumber: number;
-    readonly l2BlockHash: L2BlockHash;
+    readonly l2BlockHash: BlockHash;
     readonly txHash: TxHash;
     readonly txIndexInBlock: number;
     readonly eventIndexInTx: number;
     readonly contractAddress: AztecAddress;
     readonly eventSelector: EventSelector;
     readonly scopes: Set<string>;
-    constructor(randomness: Fr, msgContent: Fr[], l2BlockNumber: number, l2BlockHash: L2BlockHash, txHash: TxHash, txIndexInBlock: number, eventIndexInTx: number, contractAddress: AztecAddress, eventSelector: EventSelector, scopes: Set<string>);
+    constructor(randomness: Fr, msgContent: Fr[], l2BlockNumber: number, l2BlockHash: BlockHash, txHash: TxHash, txIndexInBlock: number, eventIndexInTx: number, contractAddress: AztecAddress, eventSelector: EventSelector, scopes: Set<string>);
     addScope(scope: string): void;
     toBuffer(): Buffer;
     static fromBuffer(buffer: Buffer): StoredPrivateEvent;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RvcmVkX3ByaXZhdGVfZXZlbnQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdG9yYWdlL3ByaXZhdGVfZXZlbnRfc3RvcmUvc3RvcmVkX3ByaXZhdGVfZXZlbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNsRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDM0QsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ2xELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUUxQyw0REFBNEQ7QUFDNUQscUJBQWEsa0JBQWtCO0lBRTNCLFFBQVEsQ0FBQyxVQUFVLEVBQUUsRUFBRTtJQUN2QixRQUFRLENBQUMsVUFBVSxFQUFFLEVBQUUsRUFBRTtJQUN6QixRQUFRLENBQUMsYUFBYSxFQUFFLE1BQU07SUFDOUIsUUFBUSxDQUFDLFdBQVcsRUFBRSxXQUFXO0lBQ2pDLFFBQVEsQ0FBQyxNQUFNLEVBQUUsTUFBTTtJQUN2QixRQUFRLENBQUMsY0FBYyxFQUFFLE1BQU07SUFDL0IsUUFBUSxDQUFDLGNBQWMsRUFBRSxNQUFNO0lBQy9CLFFBQVEsQ0FBQyxlQUFlLEVBQUUsWUFBWTtJQUN0QyxRQUFRLENBQUMsYUFBYSxFQUFFLGFBQWE7SUFDckMsUUFBUSxDQUFDLE1BQU0sRUFBRSxHQUFHLENBQUMsTUFBTSxDQUFDO0lBVjlCLFlBQ1csVUFBVSxFQUFFLEVBQUUsRUFDZCxVQUFVLEVBQUUsRUFBRSxFQUFFLEVBQ2hCLGFBQWEsRUFBRSxNQUFNLEVBQ3JCLFdBQVcsRUFBRSxXQUFXLEVBQ3hCLE1BQU0sRUFBRSxNQUFNLEVBQ2QsY0FBYyxFQUFFLE1BQU0sRUFDdEIsY0FBYyxFQUFFLE1BQU0sRUFDdEIsZUFBZSxFQUFFLFlBQVksRUFDN0IsYUFBYSxFQUFFLGFBQWEsRUFDNUIsTUFBTSxFQUFFLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFDMUI7SUFFSixRQUFRLENBQUMsS0FBSyxFQUFFLE1BQU0sUUFFckI7SUFFRCxRQUFRLElBQUksTUFBTSxDQWdCakI7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsa0JBQWtCLENBMkJwRDtDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RvcmVkX3ByaXZhdGVfZXZlbnQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdG9yYWdlL3ByaXZhdGVfZXZlbnRfc3RvcmUvc3RvcmVkX3ByaXZhdGVfZXZlbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNsRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDM0QsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ2hELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUUxQyw0REFBNEQ7QUFDNUQscUJBQWEsa0JBQWtCO0lBRTNCLFFBQVEsQ0FBQyxVQUFVLEVBQUUsRUFBRTtJQUN2QixRQUFRLENBQUMsVUFBVSxFQUFFLEVBQUUsRUFBRTtJQUN6QixRQUFRLENBQUMsYUFBYSxFQUFFLE1BQU07SUFDOUIsUUFBUSxDQUFDLFdBQVcsRUFBRSxTQUFTO0lBQy9CLFFBQVEsQ0FBQyxNQUFNLEVBQUUsTUFBTTtJQUN2QixRQUFRLENBQUMsY0FBYyxFQUFFLE1BQU07SUFDL0IsUUFBUSxDQUFDLGNBQWMsRUFBRSxNQUFNO0lBQy9CLFFBQVEsQ0FBQyxlQUFlLEVBQUUsWUFBWTtJQUN0QyxRQUFRLENBQUMsYUFBYSxFQUFFLGFBQWE7SUFDckMsUUFBUSxDQUFDLE1BQU0sRUFBRSxHQUFHLENBQUMsTUFBTSxDQUFDO0lBVjlCLFlBQ1csVUFBVSxFQUFFLEVBQUUsRUFDZCxVQUFVLEVBQUUsRUFBRSxFQUFFLEVBQ2hCLGFBQWEsRUFBRSxNQUFNLEVBQ3JCLFdBQVcsRUFBRSxTQUFTLEVBQ3RCLE1BQU0sRUFBRSxNQUFNLEVBQ2QsY0FBYyxFQUFFLE1BQU0sRUFDdEIsY0FBYyxFQUFFLE1BQU0sRUFDdEIsZUFBZSxFQUFFLFlBQVksRUFDN0IsYUFBYSxFQUFFLGFBQWEsRUFDNUIsTUFBTSxFQUFFLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFDMUI7SUFFSixRQUFRLENBQUMsS0FBSyxFQUFFLE1BQU0sUUFFckI7SUFFRCxRQUFRLElBQUksTUFBTSxDQWdCakI7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsa0JBQWtCLENBMkJwRDtDQUNGIn0=

package/dest/storage/private_event_store/stored_private_event.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stored_private_event.d.ts","sourceRoot":"","sources":["../../../src/storage/private_event_store/stored_private_event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,4DAA4D;AAC5D,qBAAa,kBAAkB;IAE3B,QAAQ,CAAC,UAAU,EAAE,EAAE;IACvB,QAAQ,CAAC,UAAU,EAAE,EAAE,EAAE;IACzB,QAAQ,CAAC,aAAa,EAAE,MAAM;IAC9B,QAAQ,CAAC,WAAW,EAAE,WAAW;IACjC,QAAQ,CAAC,MAAM,EAAE,MAAM;IACvB,QAAQ,CAAC,cAAc,EAAE,MAAM;IAC/B,QAAQ,CAAC,cAAc,EAAE,MAAM;IAC/B,QAAQ,CAAC,eAAe,EAAE,YAAY;IACtC,QAAQ,CAAC,aAAa,EAAE,aAAa;IACrC,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC;IAV9B,YACW,UAAU,EAAE,EAAE,EACd,UAAU,EAAE,EAAE,EAAE,EAChB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,eAAe,EAAE,YAAY,EAC7B,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,EAC1B;IAEJ,QAAQ,CAAC,KAAK,EAAE,MAAM,QAErB;IAED,QAAQ,IAAI,MAAM,CAgBjB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,kBAAkB,CA2BpD;CACF"}
+{"version":3,"file":"stored_private_event.d.ts","sourceRoot":"","sources":["../../../src/storage/private_event_store/stored_private_event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,4DAA4D;AAC5D,qBAAa,kBAAkB;IAE3B,QAAQ,CAAC,UAAU,EAAE,EAAE;IACvB,QAAQ,CAAC,UAAU,EAAE,EAAE,EAAE;IACzB,QAAQ,CAAC,aAAa,EAAE,MAAM;IAC9B,QAAQ,CAAC,WAAW,EAAE,SAAS;IAC/B,QAAQ,CAAC,MAAM,EAAE,MAAM;IACvB,QAAQ,CAAC,cAAc,EAAE,MAAM;IAC/B,QAAQ,CAAC,cAAc,EAAE,MAAM;IAC/B,QAAQ,CAAC,eAAe,EAAE,YAAY;IACtC,QAAQ,CAAC,aAAa,EAAE,aAAa;IACrC,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC;IAV9B,YACW,UAAU,EAAE,EAAE,EACd,UAAU,EAAE,EAAE,EAAE,EAChB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,SAAS,EACtB,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EACtB,eAAe,EAAE,YAAY,EAC7B,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,EAC1B;IAEJ,QAAQ,CAAC,KAAK,EAAE,MAAM,QAErB;IAED,QAAQ,IAAI,MAAM,CAgBjB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,kBAAkB,CA2BpD;CACF"}

package/dest/storage/private_event_store/stored_private_event.js

@@ -2,7 +2,7 @@ import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { EventSelector } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { L2BlockHash } from '@aztec/stdlib/block';
+import { BlockHash } from '@aztec/stdlib/block';
 import { TxHash } from '@aztec/stdlib/tx';
 /** Serializable private event entry with scope tracking. */ export class StoredPrivateEvent {
     randomness;
@@ -42,7 +42,7 @@ import { TxHash } from '@aztec/stdlib/tx';
         const msgContentLength = reader.readNumber();
         const msgContent = reader.readArray(msgContentLength, Fr);
         const l2BlockNumber = reader.readNumber();
-        const l2BlockHash = L2BlockHash.fromBuffer(reader);
+        const l2BlockHash = new BlockHash(Fr.fromBuffer(reader));
         const txHash = TxHash.fromBuffer(reader);
         const txIndexInBlock = reader.readNumber();
         const eventIndexInTx = reader.readNumber();