@aztec/pxe 0.0.1-commit.d431d1c → 0.0.1-commit.dbf9cec

package/dest/storage/note_store/stored_note.js

@@ -0,0 +1,43 @@
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { NoteDao } from '@aztec/stdlib/note';
+export class StoredNote {
+    noteDao;
+    scopes;
+    _nullifiedAt;
+    constructor(noteDao, scopes, _nullifiedAt = undefined){
+        this.noteDao = noteDao;
+        this.scopes = scopes;
+        this._nullifiedAt = _nullifiedAt;
+    }
+    static fromBuffer(buffer) {
+        const reader = BufferReader.asReader(buffer);
+        const noteDao = NoteDao.fromBuffer(reader);
+        const scopes = reader.readVector({
+            fromBuffer: (r)=>r.readString()
+        });
+        const nullifiedAtRaw = reader.readNumber();
+        const nullifiedAt = nullifiedAtRaw === 0 ? undefined : nullifiedAtRaw;
+        return new StoredNote(noteDao, new Set(scopes), nullifiedAt);
+    }
+    toBuffer() {
+        const scopesArray = [
+            ...this.scopes
+        ];
+        return serializeToBuffer(this.noteDao, scopesArray.length, ...scopesArray, this._nullifiedAt ?? 0);
+    }
+    addScope(scope) {
+        this.scopes.add(scope);
+    }
+    markAsNullified(blockNumber) {
+        this._nullifiedAt = blockNumber;
+    }
+    markAsActive() {
+        this._nullifiedAt = undefined;
+    }
+    isNullified() {
+        return this._nullifiedAt !== undefined;
+    }
+    get nullifiedAt() {
+        return this._nullifiedAt;
+    }
+}

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

@@ -2,7 +2,7 @@ import { Fr } from '@aztec/foundation/curves/bn254';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import type { EventSelector } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { type InTx, TxHash } from '@aztec/stdlib/tx';
+import type { InTx, TxHash } from '@aztec/stdlib/tx';
 import type { StagedStore } from '../../job_coordinator/job_coordinator.js';
 import type { PackedPrivateEvent } from '../../pxe.js';
 export type PrivateEventStoreFilter = {
@@ -28,8 +28,6 @@ export declare class PrivateEventStore implements StagedStore {
     readonly storeName: string;
     logger: import("@aztec/foundation/log").Logger;
     constructor(store: AztecAsyncKVStore);
-    commit(jobId: string): Promise<void>;
-    discardStaged(jobId: string): Promise<void>;
     /**
      * Store a private event log.
      * @param eventSelector - The event selector of the event.
@@ -73,6 +71,21 @@ export declare class PrivateEventStore implements StagedStore {
      * IMPORTANT: This method must be called within a transaction to ensure atomicity.
      */
     rollback(blockNumber: number, synchedBlockNumber: number): Promise<void>;
+    /**
+     * 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
+     */
+    commit(jobId: string): Promise<void>;
+    /**
+     * Discards in memory job data without persisting it.
+     */
+    discardStaged(jobId: string): Promise<void>;
 }
 export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9ldmVudF9zdG9yZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3N0b3JhZ2UvcHJpdmF0ZV9ldmVudF9zdG9yZS9wcml2YXRlX2V2ZW50X3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUdwRCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBcUMsTUFBTSxpQkFBaUIsQ0FBQztBQUM1RixPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUN2RCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUVoRSxPQUFPLEVBQUUsS0FBSyxJQUFJLEVBQUUsTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFckQsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sMENBQTBDLENBQUM7QUFDNUUsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFdkQsTUFBTSxNQUFNLHVCQUF1QixHQUFHO0lBQ3BDLGVBQWUsRUFBRSxZQUFZLENBQUM7SUFDOUIsU0FBUyxFQUFFLE1BQU0sQ0FBQztJQUNsQixPQUFPLEVBQUUsTUFBTSxDQUFDO0lBQ2hCLE1BQU0sRUFBRSxZQUFZLEVBQUUsQ0FBQztJQUN2QixNQUFNLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDakIsQ0FBQztBQWdCRixLQUFLLG9CQUFvQixHQUFHLElBQUksR0FBRztJQUNqQyxlQUFlLEVBQUUsWUFBWSxDQUFDO0lBQzlCLEtBQUssRUFBRSxZQUFZLENBQUM7SUFDcEIsMkNBQTJDO0lBQzNDLGNBQWMsRUFBRSxNQUFNLENBQUM7SUFDdkIseUVBQXlFO0lBQ3pFLGNBQWMsRUFBRSxNQUFNLENBQUM7Q0FDeEIsQ0FBQztBQUVGOztHQUVHO0FBQ0gscUJBQWEsaUJBQWtCLFlBQVcsV0FBVzs7SUFDbkQsUUFBUSxDQUFDLFNBQVMsRUFBRSxNQUFNLENBQW1CO0lBZTdDLE1BQU0seUNBQXVDO0lBRTdDLFlBQVksS0FBSyxFQUFFLGlCQUFpQixFQVFuQztJQU1LLE1BQU0sQ0FBQyxLQUFLLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FlekM7SUFFRCxhQUFhLENBQUMsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBRzFDO0lBb0REOzs7Ozs7Ozs7OztPQVdHO0lBQ0gsb0JBQW9CLENBQ2xCLGFBQWEsRUFBRSxhQUFhLEVBQzVCLFVBQVUsRUFBRSxFQUFFLEVBQ2QsVUFBVSxFQUFFLEVBQUUsRUFBRSxFQUNoQixxQkFBcUIsRUFBRSxFQUFFLEVBQ3pCLFFBQVEsRUFBRSxvQkFBb0IsRUFDOUIsS0FBSyxFQUFFLE1BQU0sR0FDWixPQUFPLENBQUMsSUFBSSxDQUFDLENBa0NmO0lBRUQ7Ozs7Ozs7Ozs7T0FVRztJQUNVLGdCQUFnQixDQUMzQixhQUFhLEVBQUUsYUFBYSxFQUM1QixNQUFNLEVBQUUsdUJBQXVCLEdBQzlCLE9BQU8sQ0FBQyxrQkFBa0IsRUFBRSxDQUFDLENBdUQvQjtJQUVEOzs7Ozs7Ozs7Ozs7Ozs7O09BZ0JHO0lBQ1UsUUFBUSxDQUFDLFdBQVcsRUFBRSxNQUFNLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0E0QnBGO0NBQ0YifQ==
+//# 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;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;AAEhE,OAAO,EAAE,KAAK,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;AAEvD,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;AAgBF,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;IAe7C,MAAM,yCAAuC;IAE7C,YAAY,KAAK,EAAE,iBAAiB,EAQnC;IAMK,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAezC;IAED,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG1C;IAoDD;;;;;;;;;;;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,GACZ,OAAO,CAAC,IAAI,CAAC,CAkCf;IAED;;;;;;;;;;OAUG;IACU,gBAAgB,CAC3B,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,uBAAuB,GAC9B,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAuD/B;IAED;;;;;;;;;;;;;;;;OAgBG;IACU,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA4BpF;CACF"}
+{"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,86 +1,25 @@
 import { BlockNumber } from '@aztec/foundation/branded-types';
-import { Fr } from '@aztec/foundation/curves/bn254';
 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';
+import { Semaphore } from '@aztec/foundation/queue';
+import { StoredPrivateEvent } from './stored_private_event.js';
 /**
  * Stores decrypted private event logs.
  */ export class PrivateEventStore {
     storeName = 'private_event';
     #store;
-    /** Map storing the actual private event log entries, keyed by siloedEventCommitment */ #eventLogs;
-    /** Multi-map from contractAddress_scope_eventSelector to siloedEventCommitment for efficient lookup */ #eventsByContractScopeSelector;
+    /** Actual private event log entries, keyed by siloedEventCommitment */ #events;
+    /** Multi-map from contractAddress_eventSelector to siloedEventCommitment for efficient lookup */ #eventsByContractAndEventSelector;
     /** Multi-map from block number to siloedEventCommitment for rollback support */ #eventsByBlockNumber;
-    /** Map from siloedEventCommitment to boolean indicating if log has been seen. */ #seenLogs;
-    /** jobId => eventId (event siloed nullifier)  => PrivateEventEntry */ #eventLogsInJobStage;
+    /** jobId => eventId (event siloed nullifier) => StoredPrivateEvent */ #eventsForJob;
+    /** Per-job locks to prevent concurrent writes from affecting each other. */ #jobLocks;
     logger = createLogger('private_event_store');
     constructor(store){
         this.#store = store;
-        this.#eventLogs = this.#store.openMap('private_event_logs');
-        this.#eventsByContractScopeSelector = this.#store.openMultiMap('events_by_contract_scope_selector');
-        this.#seenLogs = this.#store.openMap('seen_logs');
+        this.#events = this.#store.openMap('private_event_logs');
+        this.#eventsByContractAndEventSelector = this.#store.openMultiMap('events_by_contract_selector');
         this.#eventsByBlockNumber = this.#store.openMultiMap('events_by_block_number');
-        this.#eventLogsInJobStage = new Map();
-    }
-    #keyFor(contractAddress, scope, eventSelector) {
-        return `${contractAddress.toString()}_${scope.toString()}_${eventSelector.toString()}`;
-    }
-    async commit(jobId) {
-        await Promise.all([
-            ...this.#getEventLogsInJobStage(jobId).entries()
-        ].map(async ([eventId, eventEntry])=>{
-            this.logger.verbose('storing private event log (KV store)', eventEntry);
-            await Promise.all([
-                this.#eventLogs.set(eventId, eventEntry),
-                this.#eventsByContractScopeSelector.set(eventEntry.lookupKey, eventId),
-                this.#eventsByBlockNumber.set(eventEntry.l2BlockNumber, eventId),
-                this.#seenLogs.set(eventId, true)
-            ]);
-        }));
-        return this.discardStaged(jobId);
-    }
-    discardStaged(jobId) {
-        this.#eventLogsInJobStage.delete(jobId);
-        return Promise.resolve();
-    }
-    #getEventLogsInJobStage(jobId) {
-        let jobStage = this.#eventLogsInJobStage.get(jobId);
-        if (jobStage === undefined) {
-            jobStage = new Map();
-            this.#eventLogsInJobStage.set(jobId, jobStage);
-        }
-        return jobStage;
-    }
-    async #isSeenLog(jobId, eventId) {
-        const eventLogsInJobStage = this.#getEventLogsInJobStage(jobId).get(eventId);
-        return !!eventLogsInJobStage || !!await this.#seenLogs.getAsync(eventId);
-    }
-    #addEventLogToStage(jobId, eventId, eventEntry) {
-        this.#getEventLogsInJobStage(jobId).set(eventId, eventEntry);
-    }
-    async #getEventSiloedNullifiers(contractAddress, scope, eventSelector, jobId) {
-        const key = this.#keyFor(contractAddress, scope, eventSelector);
-        const eventSiloedNullifiersInStorage = [];
-        for await (const eventId of this.#eventsByContractScopeSelector.getValuesAsync(key)){
-            eventSiloedNullifiersInStorage.push(eventId);
-        }
-        if (!jobId) {
-            return eventSiloedNullifiersInStorage;
-        }
-        const eventSiloedNullifiersInJobStage = new Set([
-            ...this.#getEventLogsInJobStage(jobId).entries()
-        ].filter(([_, entry])=>entry.lookupKey === key).map(([idx, _])=>idx));
-        return [
-            ...new Set(eventSiloedNullifiersInStorage).union(eventSiloedNullifiersInJobStage)
-        ];
-    }
-    async #getEventLogBySiloedNullifier(eventId, jobId) {
-        if (jobId) {
-            return this.#getEventLogsInJobStage(jobId).get(eventId) ?? await this.#eventLogs.getAsync(eventId);
-        } else {
-            return await this.#eventLogs.getAsync(eventId);
-        }
+        this.#eventsForJob = new Map();
+        this.#jobLocks = new Map();
     }
     /**
    * Store a private event log.
@@ -94,37 +33,27 @@ import { TxHash } from '@aztec/stdlib/tx';
    *  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) {
-        const { contractAddress, scope, txHash, l2BlockNumber, l2BlockHash, txIndexInBlock, eventIndexInTx } = metadata;
-        return this.#store.transactionAsync(async ()=>{
-            const key = this.#keyFor(contractAddress, scope, eventSelector);
-            // The siloed event commitment is guaranteed to be unique as it's inserted into the nullifier tree. For this
-            // reason we use it as id.
-            const eventId = siloedEventCommitment.toString();
-            const hasBeenSeen = await this.#isSeenLog(jobId, eventId);
-            if (hasBeenSeen) {
-                this.logger.verbose('Ignoring duplicate event log', {
-                    txHash: txHash.toString(),
-                    siloedEventCommitment
+        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
                 });
-                return;
-            }
-            this.logger.verbose('storing private event log (job stage)', {
-                contractAddress,
-                scope,
-                msgContent,
-                l2BlockNumber
-            });
-            this.#addEventLogToStage(jobId, eventId, {
-                randomness,
-                msgContent: serializeToBuffer(msgContent),
-                l2BlockNumber,
-                l2BlockHash: l2BlockHash.toBuffer(),
-                txHash: txHash.toBuffer(),
-                txIndexInBlock,
-                eventIndexInTx,
-                lookupKey: key
-            });
-        });
+                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.
@@ -136,49 +65,67 @@ import { TxHash } from '@aztec/stdlib/tx';
    *  scope: - The addresses that decrypted the logs.
    * @returns - The event log contents, augmented with metadata about the transaction and block in which the event was
    * included.
-   */ async getPrivateEvents(eventSelector, filter) {
-        const events = [];
-        for (const scope of filter.scopes){
-            const eventIds = await this.#getEventSiloedNullifiers(filter.contractAddress, scope, eventSelector);
-            for (const eventId of eventIds){
-                const entry = await this.#getEventLogBySiloedNullifier(eventId);
-                if (!entry || entry.l2BlockNumber < filter.fromBlock || entry.l2BlockNumber >= filter.toBlock) {
+   */ getPrivateEvents(eventSelector, filter) {
+        return this.#store.transactionAsync(async ()=>{
+            const key = this.#keyFor(filter.contractAddress, eventSelector);
+            const targetScopes = new Set(filter.scopes.map((s)=>s.toString()));
+            // 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`);
+                    continue;
+                }
+                const storedPrivateEvent = StoredPrivateEvent.fromBuffer(eventBuffer);
+                // Filter by block range
+                if (storedPrivateEvent.l2BlockNumber < filter.fromBlock || storedPrivateEvent.l2BlockNumber >= filter.toBlock) {
+                    continue;
+                }
+                // Filter by scopes
+                if (storedPrivateEvent.scopes.intersection(targetScopes).size === 0) {
                     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 l2BlockHash = L2BlockHash.fromBuffer(entry.l2BlockHash);
-                if (filter.txHash && !txHash.equals(filter.txHash)) {
+                // Filter by txHash
+                if (filter.txHash && !storedPrivateEvent.txHash.equals(filter.txHash)) {
                     continue;
                 }
                 events.push({
-                    l2BlockNumber: entry.l2BlockNumber,
-                    txIndexInBlock: entry.txIndexInBlock,
-                    eventIndexInTx: entry.eventIndexInTx,
+                    l2BlockNumber: storedPrivateEvent.l2BlockNumber,
+                    txIndexInBlock: storedPrivateEvent.txIndexInBlock,
+                    eventIndexInTx: storedPrivateEvent.eventIndexInTx,
                     event: {
-                        packedEvent: msgContent,
-                        l2BlockNumber: BlockNumber(entry.l2BlockNumber),
-                        txHash,
-                        l2BlockHash,
+                        packedEvent: storedPrivateEvent.msgContent,
+                        l2BlockNumber: BlockNumber(storedPrivateEvent.l2BlockNumber),
+                        txHash: storedPrivateEvent.txHash,
+                        l2BlockHash: storedPrivateEvent.l2BlockHash,
                         eventSelector
                     }
                 });
             }
-        }
-        // Sort by block number, then by tx index within block, then by event index within tx
-        events.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.eventIndexInTx - b.eventIndexInTx;
+            // Sort by block number, then by tx index within block, then by event index within tx
+            events.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.eventIndexInTx - b.eventIndexInTx;
+            });
+            return events.map((ev)=>ev.event);
         });
-        return events.map((ev)=>ev.event);
     }
     /**
    * Rolls back private events that were stored after a given `blockNumber` and up to `synchedBlockNumber` (the block
@@ -197,26 +144,130 @@ import { TxHash } from '@aztec/stdlib/tx';
    *
    * 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 = [];
+            const blockEvents = [];
             for await (const eventId of this.#eventsByBlockNumber.getValuesAsync(block)){
-                eventIds.push(eventId);
+                // Start read immediately during iteration to keep IndexedDB transaction alive
+                blockEvents.push({
+                    eventId,
+                    eventReadPromise: this.#events.getAsync(eventId)
+                });
             }
-            if (eventIds.length > 0) {
-                await this.#eventsByBlockNumber.delete(block);
-                for (const eventId of eventIds){
-                    const entry = await this.#eventLogs.getAsync(eventId);
-                    if (!entry) {
-                        throw new Error(`Event log not found for eventId ${eventId}`);
-                    }
-                    await this.#eventLogs.delete(eventId);
-                    await this.#seenLogs.delete(eventId);
-                    await this.#eventsByContractScopeSelector.deleteValue(entry.lookupKey, eventId);
-                    removedCount++;
+            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}`);
     }
+    /**
+   * 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) {
+        // 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) {
+        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) {
+        // 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);
+        const eventForJob = this.#getEventsForJob(jobId).get(eventId);
+        return eventForJob ?? (buffer ? StoredPrivateEvent.fromBuffer(buffer) : undefined);
+    }
+    /**
+   * Writes an event to in-memory job data.
+   *
+   * Writes are only allowed in a job context. Events modified during a job will only be persisted when `commit` is
+   * called.
+   */ #writeEvent(eventId, entry, jobId) {
+        this.#getEventsForJob(jobId).set(eventId, entry);
+    }
+    /**
+   * Get in-memory data only visible to @param jobId
+   */ #getEventsForJob(jobId) {
+        let eventsForJob = this.#eventsForJob.get(jobId);
+        if (eventsForJob === undefined) {
+            eventsForJob = new Map();
+            this.#eventsForJob.set(jobId, eventsForJob);
+        }
+        return eventsForJob;
+    }
+    /**
+   * Clear data structures supporting a specific job.
+   */ #clearJobData(jobId) {
+        this.#eventsForJob.delete(jobId);
+        this.#jobLocks.delete(jobId);
+    }
+    /**
+   * Ensures a function can only run once it acquires a unique per-job lock, and handles proper lock release after it
+   * runs.
+   *
+   * This primitive allows concurrent writes on this store without risking data corruption due to unsound write
+   * interleaving.
+   */ async #withJobLock(jobId, fn) {
+        let lock = this.#jobLocks.get(jobId);
+        if (!lock) {
+            lock = new Semaphore(1);
+            this.#jobLocks.set(jobId, lock);
+        }
+        await lock.acquire();
+        try {
+            return await fn();
+        } finally{
+            lock.release();
+        }
+    }
+    /**
+   * Returns a string key based on @param contractAddress and @param eventSelector.
+   *
+   * The returned key is meant to be used when interacting with index #eventsByContractAndEventSelector.
+   */ #keyFor(contractAddress, eventSelector) {
+        return `${contractAddress.toString()}_${eventSelector.toString()}`;
+    }
 }

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

@@ -0,0 +1,23 @@
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { EventSelector } from '@aztec/stdlib/abi';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+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: 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: 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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RvcmVkX3ByaXZhdGVfZXZlbnQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdG9yYWdlL3ByaXZhdGVfZXZlbnRfc3RvcmUvc3RvcmVkX3ByaXZhdGVfZXZlbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNsRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDM0QsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ2hELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUUxQyw0REFBNEQ7QUFDNUQscUJBQWEsa0JBQWtCO0lBRTNCLFFBQVEsQ0FBQyxVQUFVLEVBQUUsRUFBRTtJQUN2QixRQUFRLENBQUMsVUFBVSxFQUFFLEVBQUUsRUFBRTtJQUN6QixRQUFRLENBQUMsYUFBYSxFQUFFLE1BQU07SUFDOUIsUUFBUSxDQUFDLFdBQVcsRUFBRSxTQUFTO0lBQy9CLFFBQVEsQ0FBQyxNQUFNLEVBQUUsTUFBTTtJQUN2QixRQUFRLENBQUMsY0FBYyxFQUFFLE1BQU07SUFDL0IsUUFBUSxDQUFDLGNBQWMsRUFBRSxNQUFNO0lBQy9CLFFBQVEsQ0FBQyxlQUFlLEVBQUUsWUFBWTtJQUN0QyxRQUFRLENBQUMsYUFBYSxFQUFFLGFBQWE7SUFDckMsUUFBUSxDQUFDLE1BQU0sRUFBRSxHQUFHLENBQUMsTUFBTSxDQUFDO0lBVjlCLFlBQ1csVUFBVSxFQUFFLEVBQUUsRUFDZCxVQUFVLEVBQUUsRUFBRSxFQUFFLEVBQ2hCLGFBQWEsRUFBRSxNQUFNLEVBQ3JCLFdBQVcsRUFBRSxTQUFTLEVBQ3RCLE1BQU0sRUFBRSxNQUFNLEVBQ2QsY0FBYyxFQUFFLE1BQU0sRUFDdEIsY0FBYyxFQUFFLE1BQU0sRUFDdEIsZUFBZSxFQUFFLFlBQVksRUFDN0IsYUFBYSxFQUFFLGFBQWEsRUFDNUIsTUFBTSxFQUFFLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFDMUI7SUFFSixRQUFRLENBQUMsS0FBSyxFQUFFLE1BQU0sUUFFckI7SUFFRCxRQUFRLElBQUksTUFBTSxDQWdCakI7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsa0JBQWtCLENBMkJwRDtDQUNGIn0=

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

@@ -0,0 +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,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

@@ -0,0 +1,56 @@
+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 { BlockHash } from '@aztec/stdlib/block';
+import { TxHash } from '@aztec/stdlib/tx';
+/** Serializable private event entry with scope tracking. */ export class StoredPrivateEvent {
+    randomness;
+    msgContent;
+    l2BlockNumber;
+    l2BlockHash;
+    txHash;
+    txIndexInBlock;
+    eventIndexInTx;
+    contractAddress;
+    eventSelector;
+    scopes;
+    constructor(randomness, msgContent, l2BlockNumber, l2BlockHash, txHash, txIndexInBlock, eventIndexInTx, contractAddress, eventSelector, scopes){
+        this.randomness = randomness;
+        this.msgContent = msgContent;
+        this.l2BlockNumber = l2BlockNumber;
+        this.l2BlockHash = l2BlockHash;
+        this.txHash = txHash;
+        this.txIndexInBlock = txIndexInBlock;
+        this.eventIndexInTx = eventIndexInTx;
+        this.contractAddress = contractAddress;
+        this.eventSelector = eventSelector;
+        this.scopes = scopes;
+    }
+    addScope(scope) {
+        this.scopes.add(scope);
+    }
+    toBuffer() {
+        const scopesArray = [
+            ...this.scopes
+        ];
+        return serializeToBuffer(this.randomness, this.msgContent.length, ...this.msgContent, this.l2BlockNumber, this.l2BlockHash, this.txHash, this.txIndexInBlock, this.eventIndexInTx, this.contractAddress, this.eventSelector.toBuffer(), scopesArray.length, ...scopesArray);
+    }
+    static fromBuffer(buffer) {
+        const reader = BufferReader.asReader(buffer);
+        const randomness = Fr.fromBuffer(reader);
+        const msgContentLength = reader.readNumber();
+        const msgContent = reader.readArray(msgContentLength, Fr);
+        const l2BlockNumber = reader.readNumber();
+        const l2BlockHash = new BlockHash(Fr.fromBuffer(reader));
+        const txHash = TxHash.fromBuffer(reader);
+        const txIndexInBlock = reader.readNumber();
+        const eventIndexInTx = reader.readNumber();
+        const contractAddress = AztecAddress.fromBuffer(reader);
+        const eventSelector = EventSelector.fromBuffer(reader);
+        const scopes = reader.readVector({
+            fromBuffer: (r)=>r.readString()
+        });
+        return new StoredPrivateEvent(randomness, msgContent, l2BlockNumber, l2BlockHash, txHash, txIndexInBlock, eventIndexInTx, contractAddress, eventSelector, new Set(scopes));
+    }
+}

package/dest/storage/tagging_store/recipient_tagging_store.d.ts

@@ -1,5 +1,5 @@
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
-import type { DirectionalAppTaggingSecret } from '@aztec/stdlib/logs';
+import type { ExtendedDirectionalAppTaggingSecret } from '@aztec/stdlib/logs';
 import type { StagedStore } from '../../job_coordinator/job_coordinator.js';
 /**
  * Data provider of tagging data used when syncing the logs as a recipient. The sender counterpart of this class
@@ -20,9 +20,9 @@ export declare class RecipientTaggingStore implements StagedStore {
      */
     commit(jobId: string): Promise<void>;
     discardStaged(jobId: string): Promise<void>;
-    getHighestAgedIndex(secret: DirectionalAppTaggingSecret, jobId: string): Promise<number | undefined>;
-    updateHighestAgedIndex(secret: DirectionalAppTaggingSecret, index: number, jobId: string): Promise<void>;
-    getHighestFinalizedIndex(secret: DirectionalAppTaggingSecret, jobId: string): Promise<number | undefined>;
-    updateHighestFinalizedIndex(secret: DirectionalAppTaggingSecret, index: number, jobId: string): Promise<void>;
+    getHighestAgedIndex(secret: ExtendedDirectionalAppTaggingSecret, jobId: string): Promise<number | undefined>;
+    updateHighestAgedIndex(secret: ExtendedDirectionalAppTaggingSecret, index: number, jobId: string): Promise<void>;
+    getHighestFinalizedIndex(secret: ExtendedDirectionalAppTaggingSecret, jobId: string): Promise<number | undefined>;
+    updateHighestFinalizedIndex(secret: ExtendedDirectionalAppTaggingSecret, index: number, jobId: string): Promise<void>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVjaXBpZW50X3RhZ2dpbmdfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdG9yYWdlL3RhZ2dpbmdfc3RvcmUvcmVjaXBpZW50X3RhZ2dpbmdfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQWlCLE1BQU0saUJBQWlCLENBQUM7QUFDeEUsT0FBTyxLQUFLLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUV0RSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSwwQ0FBMEMsQ0FBQztBQUU1RTs7Ozs7OztHQU9HO0FBQ0gscUJBQWEscUJBQXNCLFlBQVcsV0FBVzs7SUFDdkQsU0FBUyxFQUFFLE1BQU0sQ0FBdUI7SUFheEMsWUFBWSxLQUFLLEVBQUUsaUJBQWlCLEVBUW5DO0lBc0NEOzs7O09BSUc7SUFDRyxNQUFNLENBQUMsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBZ0J6QztJQUVELGFBQWEsQ0FBQyxLQUFLLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FJMUM7SUFFRCxtQkFBbUIsQ0FBQyxNQUFNLEVBQUUsMkJBQTJCLEVBQUUsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsTUFBTSxHQUFHLFNBQVMsQ0FBQyxDQUVuRztJQUVLLHNCQUFzQixDQUFDLE1BQU0sRUFBRSwyQkFBMkIsRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQU83RztJQUVELHdCQUF3QixDQUFDLE1BQU0sRUFBRSwyQkFBMkIsRUFBRSxLQUFLLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBRXhHO0lBRUssMkJBQTJCLENBQUMsTUFBTSxFQUFFLDJCQUEyQixFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBUWxIO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVjaXBpZW50X3RhZ2dpbmdfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdG9yYWdlL3RhZ2dpbmdfc3RvcmUvcmVjaXBpZW50X3RhZ2dpbmdfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQWlCLE1BQU0saUJBQWlCLENBQUM7QUFDeEUsT0FBTyxLQUFLLEVBQUUsbUNBQW1DLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUU5RSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSwwQ0FBMEMsQ0FBQztBQUU1RTs7Ozs7OztHQU9HO0FBQ0gscUJBQWEscUJBQXNCLFlBQVcsV0FBVzs7SUFDdkQsU0FBUyxFQUFFLE1BQU0sQ0FBdUI7SUFheEMsWUFBWSxLQUFLLEVBQUUsaUJBQWlCLEVBUW5DO0lBNENEOzs7O09BSUc7SUFDRyxNQUFNLENBQUMsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBZ0J6QztJQUVELGFBQWEsQ0FBQyxLQUFLLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FJMUM7SUFFRCxtQkFBbUIsQ0FBQyxNQUFNLEVBQUUsbUNBQW1DLEVBQUUsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsTUFBTSxHQUFHLFNBQVMsQ0FBQyxDQUUzRztJQUVELHNCQUFzQixDQUFDLE1BQU0sRUFBRSxtQ0FBbUMsRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQVMvRztJQUVELHdCQUF3QixDQUFDLE1BQU0sRUFBRSxtQ0FBbUMsRUFBRSxLQUFLLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBRWhIO0lBRUQsMkJBQTJCLENBQ3pCLE1BQU0sRUFBRSxtQ0FBbUMsRUFDM0MsS0FBSyxFQUFFLE1BQU0sRUFDYixLQUFLLEVBQUUsTUFBTSxHQUNaLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FVZjtDQUNGIn0=

package/dest/storage/tagging_store/recipient_tagging_store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"recipient_tagging_store.d.ts","sourceRoot":"","sources":["../../../src/storage/tagging_store/recipient_tagging_store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAEtE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AAE5E;;;;;;;GAOG;AACH,qBAAa,qBAAsB,YAAW,WAAW;;IACvD,SAAS,EAAE,MAAM,CAAuB;IAaxC,YAAY,KAAK,EAAE,iBAAiB,EAQnC;IAsCD;;;;OAIG;IACG,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBzC;IAED,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAI1C;IAED,mBAAmB,CAAC,MAAM,EAAE,2BAA2B,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAEnG;IAEK,sBAAsB,CAAC,MAAM,EAAE,2BAA2B,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAO7G;IAED,wBAAwB,CAAC,MAAM,EAAE,2BAA2B,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAExG;IAEK,2BAA2B,CAAC,MAAM,EAAE,2BAA2B,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAQlH;CACF"}
+{"version":3,"file":"recipient_tagging_store.d.ts","sourceRoot":"","sources":["../../../src/storage/tagging_store/recipient_tagging_store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,oBAAoB,CAAC;AAE9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AAE5E;;;;;;;GAOG;AACH,qBAAa,qBAAsB,YAAW,WAAW;;IACvD,SAAS,EAAE,MAAM,CAAuB;IAaxC,YAAY,KAAK,EAAE,iBAAiB,EAQnC;IA4CD;;;;OAIG;IACG,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBzC;IAED,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAI1C;IAED,mBAAmB,CAAC,MAAM,EAAE,mCAAmC,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE3G;IAED,sBAAsB,CAAC,MAAM,EAAE,mCAAmC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAS/G;IAED,wBAAwB,CAAC,MAAM,EAAE,mCAAmC,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAEhH;IAED,2BAA2B,CACzB,MAAM,EAAE,mCAAmC,EAC3C,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC,CAUf;CACF"}