@aztec/pxe 0.0.1-commit.c7c42ec → 0.0.1-commit.f295ac2

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

@@ -3,6 +3,7 @@ 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 { StagedStore } from '../../job_coordinator/job_coordinator.js';
 import type { PackedPrivateEvent } from '../../pxe.js';
 export type PrivateEventStoreFilter = {
     contractAddress: AztecAddress;
@@ -14,26 +15,34 @@ export type PrivateEventStoreFilter = {
 type PrivateEventMetadata = InTx & {
     contractAddress: AztecAddress;
     scope: AztecAddress;
+    /** The index of the tx within the block */
+    txIndexInBlock: number;
+    /** The index of the event within the tx (based on nullifier position) */
+    eventIndexInTx: number;
 };
 /**
  * Stores decrypted private event logs.
  */
-export declare class PrivateEventStore {
+export declare class PrivateEventStore implements StagedStore {
     #private;
+    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.
+     * @param randomness - The randomness used for the event commitment.
      * @param msgContent - The content of the event.
-     * @param eventCommitmentIndex - The index of the event commitment in the nullifier tree.
+     * @param siloedEventCommitment - The siloed event commitment (used as unique identifier).
      * @param metadata
      *  contractAddress - The address of the contract that emitted the event.
      *  scope - The address to which the event is scoped.
      *  txHash - The transaction hash of the event log.
      *  blockNumber - The block number in which the event was emitted.
      */
-    storePrivateEventLog(eventSelector: EventSelector, msgContent: Fr[], eventCommitmentIndex: number, metadata: PrivateEventMetadata): Promise<void>;
+    storePrivateEventLog(eventSelector: EventSelector, randomness: Fr, msgContent: Fr[], siloedEventCommitment: Fr, metadata: PrivateEventMetadata, jobId: string): Promise<void>;
     /**
      * Returns the private events given search parameters.
      * @param eventSelector - The event selector to filter by.
@@ -42,10 +51,28 @@ export declare class PrivateEventStore {
      *  fromBlock: The block number to search from (inclusive).
      *  toBlock: The block number to search upto (exclusive).
      *  scope: - The addresses that decrypted the logs.
-     * @returns - The event log contents, augmented with metadata about
-     *  the transaction and block it the event was included in .
+     * @returns - The event log contents, augmented with metadata about the transaction and block in which the event was
+     * included.
      */
     getPrivateEvents(eventSelector: EventSelector, filter: PrivateEventStoreFilter): Promise<PackedPrivateEvent[]>;
+    /**
+     * Rolls back private events that were stored after a given `blockNumber` and up to `synchedBlockNumber` (the block
+     * number up to which PXE managed to sync before the reorg happened).
+     *
+     * We don't need staged writes for a rollback since it's handled in the context of a blockchain rewind.
+     *
+     * Rollbacks are handled by the BlockSynchronizer, which runs a DB transaction across stores when it detects a
+     * re-org, including setting the new anchor block after rolling back.
+     *
+     * So if anything fails in the process of rolling back any store, all DB changes occurring during rollbacks will be
+     * lost and the anchor block will not be updated; which means this code will eventually need to run again
+     * (i.e.: PXE will detect it's basing it work on an invalid block hash, then which re-triggers rewind).
+     *
+     * For further details, refer to `BlockSynchronizer#handleBlockStreamEvent`.
+     *
+     * IMPORTANT: This method must be called within a transaction to ensure atomicity.
+     */
+    rollback(blockNumber: number, synchedBlockNumber: number): Promise<void>;
 }
 export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9ldmVudF9zdG9yZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3N0b3JhZ2UvcHJpdmF0ZV9ldmVudF9zdG9yZS9wcml2YXRlX2V2ZW50X3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUdwRCxPQUFPLEtBQUssRUFBbUIsaUJBQWlCLEVBQWlCLE1BQU0saUJBQWlCLENBQUM7QUFDekYsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDdkQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFaEUsT0FBTyxFQUFFLEtBQUssSUFBSSxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRXJELE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sY0FBYyxDQUFDO0FBRXZELE1BQU0sTUFBTSx1QkFBdUIsR0FBRztJQUNwQyxlQUFlLEVBQUUsWUFBWSxDQUFDO0lBQzlCLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsT0FBTyxFQUFFLE1BQU0sQ0FBQztJQUNoQixNQUFNLEVBQUUsWUFBWSxFQUFFLENBQUM7SUFDdkIsTUFBTSxDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ2pCLENBQUM7QUFVRixLQUFLLG9CQUFvQixHQUFHLElBQUksR0FBRztJQUNqQyxlQUFlLEVBQUUsWUFBWSxDQUFDO0lBQzlCLEtBQUssRUFBRSxZQUFZLENBQUM7Q0FDckIsQ0FBQztBQUVGOztHQUVHO0FBQ0gscUJBQWEsaUJBQWlCOztJQVM1QixNQUFNLHlDQUF1QztJQUU3QyxZQUFZLEtBQUssRUFBRSxpQkFBaUIsRUFLbkM7SUFNRDs7Ozs7Ozs7OztPQVVHO0lBQ0gsb0JBQW9CLENBQ2xCLGFBQWEsRUFBRSxhQUFhLEVBQzVCLFVBQVUsRUFBRSxFQUFFLEVBQUUsRUFDaEIsb0JBQW9CLEVBQUUsTUFBTSxFQUM1QixRQUFRLEVBQUUsb0JBQW9CLEdBQzdCLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0E4QmY7SUFFRDs7Ozs7Ozs7OztPQVVHO0lBQ1UsZ0JBQWdCLENBQzNCLGFBQWEsRUFBRSxhQUFhLEVBQzVCLE1BQU0sRUFBRSx1QkFBdUIsR0FDOUIsT0FBTyxDQUFDLGtCQUFrQixFQUFFLENBQUMsQ0F3Qy9CO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9ldmVudF9zdG9yZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3N0b3JhZ2UvcHJpdmF0ZV9ldmVudF9zdG9yZS9wcml2YXRlX2V2ZW50X3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUdwRCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBcUMsTUFBTSxpQkFBaUIsQ0FBQztBQUM1RixPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUN2RCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUVoRSxPQUFPLEVBQUUsS0FBSyxJQUFJLEVBQUUsTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFckQsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sMENBQTBDLENBQUM7QUFDNUUsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFdkQsTUFBTSxNQUFNLHVCQUF1QixHQUFHO0lBQ3BDLGVBQWUsRUFBRSxZQUFZLENBQUM7SUFDOUIsU0FBUyxFQUFFLE1BQU0sQ0FBQztJQUNsQixPQUFPLEVBQUUsTUFBTSxDQUFDO0lBQ2hCLE1BQU0sRUFBRSxZQUFZLEVBQUUsQ0FBQztJQUN2QixNQUFNLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDakIsQ0FBQztBQWdCRixLQUFLLG9CQUFvQixHQUFHLElBQUksR0FBRztJQUNqQyxlQUFlLEVBQUUsWUFBWSxDQUFDO0lBQzlCLEtBQUssRUFBRSxZQUFZLENBQUM7SUFDcEIsMkNBQTJDO0lBQzNDLGNBQWMsRUFBRSxNQUFNLENBQUM7SUFDdkIseUVBQXlFO0lBQ3pFLGNBQWMsRUFBRSxNQUFNLENBQUM7Q0FDeEIsQ0FBQztBQUVGOztHQUVHO0FBQ0gscUJBQWEsaUJBQWtCLFlBQVcsV0FBVzs7SUFDbkQsUUFBUSxDQUFDLFNBQVMsRUFBRSxNQUFNLENBQW1CO0lBZTdDLE1BQU0seUNBQXVDO0lBRTdDLFlBQVksS0FBSyxFQUFFLGlCQUFpQixFQVFuQztJQU1LLE1BQU0sQ0FBQyxLQUFLLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FlekM7SUFFRCxhQUFhLENBQUMsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBRzFDO0lBb0REOzs7Ozs7Ozs7OztPQVdHO0lBQ0gsb0JBQW9CLENBQ2xCLGFBQWEsRUFBRSxhQUFhLEVBQzVCLFVBQVUsRUFBRSxFQUFFLEVBQ2QsVUFBVSxFQUFFLEVBQUUsRUFBRSxFQUNoQixxQkFBcUIsRUFBRSxFQUFFLEVBQ3pCLFFBQVEsRUFBRSxvQkFBb0IsRUFDOUIsS0FBSyxFQUFFLE1BQU0sR0FDWixPQUFPLENBQUMsSUFBSSxDQUFDLENBa0NmO0lBRUQ7Ozs7Ozs7Ozs7T0FVRztJQUNVLGdCQUFnQixDQUMzQixhQUFhLEVBQUUsYUFBYSxFQUM1QixNQUFNLEVBQUUsdUJBQXVCLEdBQzlCLE9BQU8sQ0FBQyxrQkFBa0IsRUFBRSxDQUFDLENBdUQvQjtJQUVEOzs7Ozs7Ozs7Ozs7Ozs7O09BZ0JHO0lBQ1UsUUFBUSxDQUFDLFdBQVcsRUFBRSxNQUFNLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0E0QnBGO0NBQ0YifQ==

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,EAAmB,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACzF,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,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;AAUF,KAAK,oBAAoB,GAAG,IAAI,GAAG;IACjC,eAAe,EAAE,YAAY,CAAC;IAC9B,KAAK,EAAE,YAAY,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,qBAAa,iBAAiB;;IAS5B,MAAM,yCAAuC;IAE7C,YAAY,KAAK,EAAE,iBAAiB,EAKnC;IAMD;;;;;;;;;;OAUG;IACH,oBAAoB,CAClB,aAAa,EAAE,aAAa,EAC5B,UAAU,EAAE,EAAE,EAAE,EAChB,oBAAoB,EAAE,MAAM,EAC5B,QAAQ,EAAE,oBAAoB,GAC7B,OAAO,CAAC,IAAI,CAAC,CA8Bf;IAED;;;;;;;;;;OAUG;IACU,gBAAgB,CAC3B,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,uBAAuB,GAC9B,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAwC/B;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;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"}

package/dest/storage/private_event_store/private_event_store.js

@@ -7,64 +7,123 @@ import { TxHash } from '@aztec/stdlib/tx';
 /**
  * Stores decrypted private event logs.
  */ export class PrivateEventStore {
+    storeName = 'private_event';
     #store;
-    /** Array storing the actual private event log entries containing the log content and block number */ #eventLogs;
-    /** Map from contract_address_scope_eventSelector to array of indices into #eventLogs for efficient lookup */ #eventLogIndex;
-    /** Map from eventCommitmentIndex to boolean indicating if log has been seen. */ #seenLogs;
+    /** Map storing the actual private event log entries, keyed by siloedEventCommitment */ #eventLogs;
+    /** Multi-map from contractAddress_scope_eventSelector to siloedEventCommitment for efficient lookup */ #eventsByContractScopeSelector;
+    /** 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;
     logger = createLogger('private_event_store');
     constructor(store){
         this.#store = store;
-        this.#eventLogs = this.#store.openArray('private_event_logs');
-        this.#eventLogIndex = this.#store.openMap('private_event_log_index');
+        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.#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);
+        }
+    }
     /**
    * Store a private event log.
    * @param eventSelector - The event selector of the event.
+   * @param randomness - The randomness used for the event commitment.
    * @param msgContent - The content of the event.
-   * @param eventCommitmentIndex - The index of the event commitment in the nullifier tree.
+   * @param siloedEventCommitment - The siloed event commitment (used as unique identifier).
    * @param metadata
    *  contractAddress - The address of the contract that emitted the event.
    *  scope - The address to which the event is scoped.
    *  txHash - The transaction hash of the event log.
    *  blockNumber - The block number in which the event was emitted.
-   */ storePrivateEventLog(eventSelector, msgContent, eventCommitmentIndex, metadata) {
-        const { contractAddress, scope, txHash, l2BlockNumber, l2BlockHash } = metadata;
+   */ 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);
-            // Check if this exact log has already been stored using eventCommitmentIndex as unique identifier
-            const hasBeenSeen = await this.#seenLogs.getAsync(eventCommitmentIndex);
+            // 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(),
-                    eventCommitmentIndex
+                    siloedEventCommitment
                 });
                 return;
             }
-            this.logger.verbose('storing private event log', {
+            this.logger.verbose('storing private event log (job stage)', {
                 contractAddress,
                 scope,
                 msgContent,
                 l2BlockNumber
             });
-            const index = await this.#eventLogs.lengthAsync();
-            await this.#eventLogs.push({
+            this.#addEventLogToStage(jobId, eventId, {
+                randomness,
                 msgContent: serializeToBuffer(msgContent),
                 l2BlockNumber,
                 l2BlockHash: l2BlockHash.toBuffer(),
-                eventCommitmentIndex,
-                txHash: txHash.toBuffer()
+                txHash: txHash.toBuffer(),
+                txIndexInBlock,
+                eventIndexInTx,
+                lookupKey: key
             });
-            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);
         });
     }
     /**
@@ -75,15 +134,14 @@ import { TxHash } from '@aztec/stdlib/tx';
    *  fromBlock: The block number to search from (inclusive).
    *  toBlock: The block number to search upto (exclusive).
    *  scope: - The addresses that decrypted the logs.
-   * @returns - The event log contents, augmented with metadata about
-   *  the transaction and block it the event was included in .
+   * @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 key = this.#keyFor(filter.contractAddress, scope, eventSelector);
-            const indices = await this.#eventLogIndex.getAsync(key) || [];
-            for (const index of indices){
-                const entry = await this.#eventLogs.atAsync(index);
+            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) {
                     continue;
                 }
@@ -97,7 +155,9 @@ import { TxHash } from '@aztec/stdlib/tx';
                     continue;
                 }
                 events.push({
-                    eventCommitmentIndex: entry.eventCommitmentIndex,
+                    l2BlockNumber: entry.l2BlockNumber,
+                    txIndexInBlock: entry.txIndexInBlock,
+                    eventIndexInTx: entry.eventIndexInTx,
                     event: {
                         packedEvent: msgContent,
                         l2BlockNumber: BlockNumber(entry.l2BlockNumber),
@@ -108,8 +168,55 @@ import { TxHash } from '@aztec/stdlib/tx';
                 });
             }
         }
-        // Sort by eventCommitmentIndex only
-        events.sort((a, b)=>a.eventCommitmentIndex - b.eventCommitmentIndex);
+        // 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);
     }
+    /**
+   * Rolls back private events that were stored after a given `blockNumber` and up to `synchedBlockNumber` (the block
+   * number up to which PXE managed to sync before the reorg happened).
+   *
+   * We don't need staged writes for a rollback since it's handled in the context of a blockchain rewind.
+   *
+   * Rollbacks are handled by the BlockSynchronizer, which runs a DB transaction across stores when it detects a
+   * re-org, including setting the new anchor block after rolling back.
+   *
+   * So if anything fails in the process of rolling back any store, all DB changes occurring during rollbacks will be
+   * lost and the anchor block will not be updated; which means this code will eventually need to run again
+   * (i.e.: PXE will detect it's basing it work on an invalid block hash, then which re-triggers rewind).
+   *
+   * For further details, refer to `BlockSynchronizer#handleBlockStreamEvent`.
+   *
+   * IMPORTANT: This method must be called within a transaction to ensure atomicity.
+   */ async rollback(blockNumber, synchedBlockNumber) {
+        let removedCount = 0;
+        for(let block = blockNumber + 1; block <= synchedBlockNumber; block++){
+            const eventIds = [];
+            for await (const eventId of this.#eventsByBlockNumber.getValuesAsync(block)){
+                eventIds.push(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++;
+                }
+            }
+        }
+        this.logger.verbose(`Rolled back ${removedCount} private events after block ${blockNumber}`);
+    }
 }

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

@@ -1,5 +1,6 @@
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import type { DirectionalAppTaggingSecret } 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
  * is called SenderTaggingStore. We have the providers separate for the sender and recipient because
@@ -7,15 +8,21 @@ import type { DirectionalAppTaggingSecret } from '@aztec/stdlib/logs';
  *
  * @dev Chain reorgs do not need to be handled here because both the finalized and aged indexes refer to finalized
  * blocks, which by definition cannot be affected by reorgs.
- *
- * TODO(benesjan): Relocate to yarn-project/pxe/src/storage/tagging_store
  */
-export declare class RecipientTaggingStore {
+export declare class RecipientTaggingStore implements StagedStore {
     #private;
+    storeName: string;
     constructor(store: AztecAsyncKVStore);
-    getHighestAgedIndex(secret: DirectionalAppTaggingSecret): Promise<number | undefined>;
-    updateHighestAgedIndex(secret: DirectionalAppTaggingSecret, index: number): Promise<void>;
-    getHighestFinalizedIndex(secret: DirectionalAppTaggingSecret): Promise<number | undefined>;
-    updateHighestFinalizedIndex(secret: DirectionalAppTaggingSecret, index: number): Promise<void>;
+    /**
+     * Writes all job-specific in-memory data to persistent storage.
+     *
+     * @remark This method must run in a DB transaction context. It's designed to be called from JobCoordinator#commitJob.
+     */
+    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>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVjaXBpZW50X3RhZ2dpbmdfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdG9yYWdlL3RhZ2dpbmdfc3RvcmUvcmVjaXBpZW50X3RhZ2dpbmdfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQWlCLE1BQU0saUJBQWlCLENBQUM7QUFDeEUsT0FBTyxLQUFLLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUV0RTs7Ozs7Ozs7O0dBU0c7QUFDSCxxQkFBYSxxQkFBcUI7O0lBTWhDLFlBQVksS0FBSyxFQUFFLGlCQUFpQixFQUtuQztJQUVELG1CQUFtQixDQUFDLE1BQU0sRUFBRSwyQkFBMkIsR0FBRyxPQUFPLENBQUMsTUFBTSxHQUFHLFNBQVMsQ0FBQyxDQUVwRjtJQUVLLHNCQUFzQixDQUFDLE1BQU0sRUFBRSwyQkFBMkIsRUFBRSxLQUFLLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FPOUY7SUFFRCx3QkFBd0IsQ0FBQyxNQUFNLEVBQUUsMkJBQTJCLEdBQUcsT0FBTyxDQUFDLE1BQU0sR0FBRyxTQUFTLENBQUMsQ0FFekY7SUFFSywyQkFBMkIsQ0FBQyxNQUFNLEVBQUUsMkJBQTJCLEVBQUUsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBUW5HO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVjaXBpZW50X3RhZ2dpbmdfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdG9yYWdlL3RhZ2dpbmdfc3RvcmUvcmVjaXBpZW50X3RhZ2dpbmdfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQWlCLE1BQU0saUJBQWlCLENBQUM7QUFDeEUsT0FBTyxLQUFLLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUV0RSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSwwQ0FBMEMsQ0FBQztBQUU1RTs7Ozs7OztHQU9HO0FBQ0gscUJBQWEscUJBQXNCLFlBQVcsV0FBVzs7SUFDdkQsU0FBUyxFQUFFLE1BQU0sQ0FBdUI7SUFheEMsWUFBWSxLQUFLLEVBQUUsaUJBQWlCLEVBUW5DO0lBc0NEOzs7O09BSUc7SUFDRyxNQUFNLENBQUMsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBZ0J6QztJQUVELGFBQWEsQ0FBQyxLQUFLLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FJMUM7SUFFRCxtQkFBbUIsQ0FBQyxNQUFNLEVBQUUsMkJBQTJCLEVBQUUsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsTUFBTSxHQUFHLFNBQVMsQ0FBQyxDQUVuRztJQUVLLHNCQUFzQixDQUFDLE1BQU0sRUFBRSwyQkFBMkIsRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQU83RztJQUVELHdCQUF3QixDQUFDLE1BQU0sRUFBRSwyQkFBMkIsRUFBRSxLQUFLLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBRXhHO0lBRUssMkJBQTJCLENBQUMsTUFBTSxFQUFFLDJCQUEyQixFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBUWxIO0NBQ0YifQ==

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;;;;;;;;;GASG;AACH,qBAAa,qBAAqB;;IAMhC,YAAY,KAAK,EAAE,iBAAiB,EAKnC;IAED,mBAAmB,CAAC,MAAM,EAAE,2BAA2B,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAEpF;IAEK,sBAAsB,CAAC,MAAM,EAAE,2BAA2B,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAO9F;IAED,wBAAwB,CAAC,MAAM,EAAE,2BAA2B,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAEzF;IAEK,2BAA2B,CAAC,MAAM,EAAE,2BAA2B,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAQnG;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,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"}

package/dest/storage/tagging_store/recipient_tagging_store.js

@@ -5,38 +5,95 @@
  *
  * @dev Chain reorgs do not need to be handled here because both the finalized and aged indexes refer to finalized
  * blocks, which by definition cannot be affected by reorgs.
- *
- * TODO(benesjan): Relocate to yarn-project/pxe/src/storage/tagging_store
  */ export class RecipientTaggingStore {
+    storeName = 'recipient_tagging';
     #store;
     #highestAgedIndex;
     #highestFinalizedIndex;
+    // jobId => secret => number
+    #highestAgedIndexForJob;
+    // jobId => secret => number
+    #highestFinalizedIndexForJob;
     constructor(store){
         this.#store = store;
         this.#highestAgedIndex = this.#store.openMap('highest_aged_index');
         this.#highestFinalizedIndex = this.#store.openMap('highest_finalized_index');
+        this.#highestAgedIndexForJob = new Map();
+        this.#highestFinalizedIndexForJob = new Map();
+    }
+    #getHighestAgedIndexForJob(jobId) {
+        let highestAgedIndexForJob = this.#highestAgedIndexForJob.get(jobId);
+        if (!highestAgedIndexForJob) {
+            highestAgedIndexForJob = new Map();
+            this.#highestAgedIndexForJob.set(jobId, highestAgedIndexForJob);
+        }
+        return highestAgedIndexForJob;
+    }
+    async #readHighestAgedIndex(jobId, secret) {
+        return this.#getHighestAgedIndexForJob(jobId).get(secret) ?? await this.#highestAgedIndex.getAsync(secret);
+    }
+    #writeHighestAgedIndex(jobId, secret, index) {
+        this.#getHighestAgedIndexForJob(jobId).set(secret, index);
+    }
+    #getHighestFinalizedIndexForJob(jobId) {
+        let jobStagedHighestFinalizedIndex = this.#highestFinalizedIndexForJob.get(jobId);
+        if (!jobStagedHighestFinalizedIndex) {
+            jobStagedHighestFinalizedIndex = new Map();
+            this.#highestFinalizedIndexForJob.set(jobId, jobStagedHighestFinalizedIndex);
+        }
+        return jobStagedHighestFinalizedIndex;
+    }
+    async #readHighestFinalizedIndex(jobId, secret) {
+        return this.#getHighestFinalizedIndexForJob(jobId).get(secret) ?? await this.#highestFinalizedIndex.getAsync(secret);
+    }
+    #writeHighestFinalizedIndex(jobId, secret, index) {
+        this.#getHighestFinalizedIndexForJob(jobId).set(secret, index);
+    }
+    /**
+   * Writes all job-specific in-memory data to persistent storage.
+   *
+   * @remark This method must run in a DB transaction context. It's designed to be called from JobCoordinator#commitJob.
+   */ async commit(jobId) {
+        const highestAgedIndexForJob = this.#highestAgedIndexForJob.get(jobId);
+        if (highestAgedIndexForJob) {
+            for (const [secret, index] of highestAgedIndexForJob.entries()){
+                await this.#highestAgedIndex.set(secret, index);
+            }
+        }
+        const highestFinalizedIndexForJob = this.#highestFinalizedIndexForJob.get(jobId);
+        if (highestFinalizedIndexForJob) {
+            for (const [secret, index] of highestFinalizedIndexForJob.entries()){
+                await this.#highestFinalizedIndex.set(secret, index);
+            }
+        }
+        return this.discardStaged(jobId);
+    }
+    discardStaged(jobId) {
+        this.#highestAgedIndexForJob.delete(jobId);
+        this.#highestFinalizedIndexForJob.delete(jobId);
+        return Promise.resolve();
     }
-    getHighestAgedIndex(secret) {
-        return this.#highestAgedIndex.getAsync(secret.toString());
+    getHighestAgedIndex(secret, jobId) {
+        return this.#readHighestAgedIndex(jobId, secret.toString());
     }
-    async updateHighestAgedIndex(secret, index) {
-        const currentIndex = await this.#highestAgedIndex.getAsync(secret.toString());
+    async updateHighestAgedIndex(secret, index, jobId) {
+        const currentIndex = await this.#readHighestAgedIndex(jobId, secret.toString());
         if (currentIndex !== undefined && index <= currentIndex) {
             // Log sync should never set a lower highest aged index.
             throw new Error(`New highest aged index (${index}) must be higher than the current one (${currentIndex})`);
         }
-        await this.#highestAgedIndex.set(secret.toString(), index);
+        this.#writeHighestAgedIndex(jobId, secret.toString(), index);
     }
-    getHighestFinalizedIndex(secret) {
-        return this.#highestFinalizedIndex.getAsync(secret.toString());
+    getHighestFinalizedIndex(secret, jobId) {
+        return this.#readHighestFinalizedIndex(jobId, secret.toString());
     }
-    async updateHighestFinalizedIndex(secret, index) {
-        const currentIndex = await this.#highestFinalizedIndex.getAsync(secret.toString());
+    async updateHighestFinalizedIndex(secret, index, jobId) {
+        const currentIndex = await this.#readHighestFinalizedIndex(jobId, secret.toString());
         if (currentIndex !== undefined && index < currentIndex) {
             // Log sync should never set a lower highest finalized index but it can happen that it would try to set the same
             // one because we are loading logs from highest aged index + 1 and not from the highest finalized index.
             throw new Error(`New highest finalized index (${index}) must be higher than the current one (${currentIndex})`);
         }
-        await this.#highestFinalizedIndex.set(secret.toString(), index);
+        this.#writeHighestFinalizedIndex(jobId, secret.toString(), index);
     }
 }

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

@@ -1,14 +1,23 @@
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import type { DirectionalAppTaggingSecret, PreTag } from '@aztec/stdlib/logs';
 import { TxHash } from '@aztec/stdlib/tx';
+import type { StagedStore } from '../../job_coordinator/job_coordinator.js';
 /**
  * Data provider of tagging data used when syncing the sender tagging indexes. The recipient counterpart of this class
- * is called RecipientTaggingStore. We have the providers separate for the sender and recipient because
+ * is called RecipientTaggingStore. We have the data stores separate for sender and recipient because
  * the algorithms are completely disjoint and there is not data reuse between the two.
  */
-export declare class SenderTaggingStore {
+export declare class SenderTaggingStore implements StagedStore {
     #private;
+    readonly storeName = "sender_tagging";
     constructor(store: AztecAsyncKVStore);
+    /**
+     * Writes all job-specific in-memory data to persistent storage.
+     *
+     * @remark This method must run in a DB transaction context. It's designed to be called from JobCoordinator#commitJob.
+     */
+    commit(jobId: string): Promise<void>;
+    discardStaged(jobId: string): Promise<void>;
     /**
      * Stores pending indexes.
      * @remarks Ignores the index if the same preTag + txHash combination already exists in the db with the same index.
@@ -17,6 +26,7 @@ export declare class SenderTaggingStore {
      * @param preTags - The pre-tags containing the directional app tagging secrets and the indexes that are to be
      * stored in the db.
      * @param txHash - The tx in which the pretags were used in private logs.
+     * @param jobId - job context for staged writes to this store. See `JobCoordinator` for more details.
      * @throws If any two pre-tags contain the same directional app tagging secret. This is enforced because we care
      * only about the highest index for a given secret that was used in the tx. Hence this check is a good way to catch
      * bugs.
@@ -30,7 +40,7 @@ export declare class SenderTaggingStore {
      * This is enforced because this should never happen if the syncing is done correctly as we look for logs from higher
      * indexes than finalized ones.
      */
-    storePendingIndexes(preTags: PreTag[], txHash: TxHash): Promise<void>;
+    storePendingIndexes(preTags: PreTag[], txHash: TxHash, jobId: string): Promise<void>;
     /**
      * Returns the transaction hashes of all pending transactions that contain indexes within a specified range
      * for a given directional app tagging secret.
@@ -40,28 +50,28 @@ export declare class SenderTaggingStore {
      * @returns An array of unique transaction hashes for pending transactions that contain indexes in the range
      * [startIndex, endIndex). Returns an empty array if no pending indexes exist in the range.
      */
-    getTxHashesOfPendingIndexes(secret: DirectionalAppTaggingSecret, startIndex: number, endIndex: number): Promise<TxHash[]>;
+    getTxHashesOfPendingIndexes(secret: DirectionalAppTaggingSecret, startIndex: number, endIndex: number, jobId: string): Promise<TxHash[]>;
     /**
      * Returns the last (highest) finalized index for a given secret.
      * @param secret - The secret to get the last finalized index for.
      * @returns The last (highest) finalized index for the given secret.
      */
-    getLastFinalizedIndex(secret: DirectionalAppTaggingSecret): Promise<number | undefined>;
+    getLastFinalizedIndex(secret: DirectionalAppTaggingSecret, jobId: string): Promise<number | undefined>;
     /**
      * Returns the last used index for a given directional app tagging secret, considering both finalized and pending
      * indexes.
      * @param secret - The directional app tagging secret to query the last used index for.
      * @returns The last used index.
      */
-    getLastUsedIndex(secret: DirectionalAppTaggingSecret): Promise<number | undefined>;
+    getLastUsedIndex(secret: DirectionalAppTaggingSecret, jobId: string): Promise<number | undefined>;
     /**
      * Drops all pending indexes corresponding to the given transaction hashes.
      */
-    dropPendingIndexes(txHashes: TxHash[]): Promise<void>;
+    dropPendingIndexes(txHashes: TxHash[], jobId: string): Promise<void>;
     /**
      * Updates pending indexes corresponding to the given transaction hashes to be finalized and prunes any lower pending
      * indexes.
      */
-    finalizePendingIndexes(txHashes: TxHash[]): Promise<void>;
+    finalizePendingIndexes(txHashes: TxHash[], jobId: string): Promise<void>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VuZGVyX3RhZ2dpbmdfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdG9yYWdlL3RhZ2dpbmdfc3RvcmUvc2VuZGVyX3RhZ2dpbmdfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQWlCLE1BQU0saUJBQWlCLENBQUM7QUFDeEUsT0FBTyxLQUFLLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDOUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBSTFDOzs7O0dBSUc7QUFDSCxxQkFBYSxrQkFBa0I7O0lBa0I3QixZQUFZLEtBQUssRUFBRSxpQkFBaUIsRUFLbkM7SUFFRDs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7T0FvQkc7SUFDRyxtQkFBbUIsQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUUsTUFBTSxFQUFFLE1BQU0saUJBaUQxRDtJQUVEOzs7Ozs7OztPQVFHO0lBQ0csMkJBQTJCLENBQy9CLE1BQU0sRUFBRSwyQkFBMkIsRUFDbkMsVUFBVSxFQUFFLE1BQU0sRUFDbEIsUUFBUSxFQUFFLE1BQU0sR0FDZixPQUFPLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FNbkI7SUFFRDs7OztPQUlHO0lBQ0gscUJBQXFCLENBQUMsTUFBTSxFQUFFLDJCQUEyQixHQUFHLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBRXRGO0lBRUQ7Ozs7O09BS0c7SUFDRyxnQkFBZ0IsQ0FBQyxNQUFNLEVBQUUsMkJBQTJCLEdBQUcsT0FBTyxDQUFDLE1BQU0sR0FBRyxTQUFTLENBQUMsQ0FZdkY7SUFFRDs7T0FFRztJQUNHLGtCQUFrQixDQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUUsaUJBcUIxQztJQUVEOzs7T0FHRztJQUNHLHNCQUFzQixDQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUUsaUJBcUQ5QztDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VuZGVyX3RhZ2dpbmdfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdG9yYWdlL3RhZ2dpbmdfc3RvcmUvc2VuZGVyX3RhZ2dpbmdfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQWlCLE1BQU0saUJBQWlCLENBQUM7QUFDeEUsT0FBTyxLQUFLLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDOUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTFDLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLDBDQUEwQyxDQUFDO0FBRzVFOzs7O0dBSUc7QUFDSCxxQkFBYSxrQkFBbUIsWUFBVyxXQUFXOztJQUNwRCxRQUFRLENBQUMsU0FBUyxvQkFBb0I7SUE2QnRDLFlBQVksS0FBSyxFQUFFLGlCQUFpQixFQVFuQztJQW9ERDs7OztPQUlHO0lBQ0csTUFBTSxDQUFDLEtBQUssRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQW9CekM7SUFFRCxhQUFhLENBQUMsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBSTFDO0lBRUQ7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztPQXFCRztJQUNHLG1CQUFtQixDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxNQUFNLGlCQWlEekU7SUFFRDs7Ozs7Ozs7T0FRRztJQUNHLDJCQUEyQixDQUMvQixNQUFNLEVBQUUsMkJBQTJCLEVBQ25DLFVBQVUsRUFBRSxNQUFNLEVBQ2xCLFFBQVEsRUFBRSxNQUFNLEVBQ2hCLEtBQUssRUFBRSxNQUFNLEdBQ1osT0FBTyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBTW5CO0lBRUQ7Ozs7T0FJRztJQUNILHFCQUFxQixDQUFDLE1BQU0sRUFBRSwyQkFBMkIsRUFBRSxLQUFLLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBRXJHO0lBRUQ7Ozs7O09BS0c7SUFDRyxnQkFBZ0IsQ0FBQyxNQUFNLEVBQUUsMkJBQTJCLEVBQUUsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsTUFBTSxHQUFHLFNBQVMsQ0FBQyxDQVl0RztJQUVEOztPQUVHO0lBQ0csa0JBQWtCLENBQUMsUUFBUSxFQUFFLE1BQU0sRUFBRSxFQUFFLEtBQUssRUFBRSxNQUFNLGlCQXFCekQ7SUFFRDs7O09BR0c7SUFDRyxzQkFBc0IsQ0FBQyxRQUFRLEVBQUUsTUFBTSxFQUFFLEVBQUUsS0FBSyxFQUFFLE1BQU0saUJBcUQ3RDtDQUNGIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"sender_tagging_store.d.ts","sourceRoot":"","sources":["../../../src/storage/tagging_store/sender_tagging_store.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAI1C;;;;GAIG;AACH,qBAAa,kBAAkB;;IAkB7B,YAAY,KAAK,EAAE,iBAAiB,EAKnC;IAED;;;;;;;;;;;;;;;;;;;;OAoBG;IACG,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,iBAiD1D;IAED;;;;;;;;OAQG;IACG,2BAA2B,CAC/B,MAAM,EAAE,2BAA2B,EACnC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,EAAE,CAAC,CAMnB;IAED;;;;OAIG;IACH,qBAAqB,CAAC,MAAM,EAAE,2BAA2B,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAEtF;IAED;;;;;OAKG;IACG,gBAAgB,CAAC,MAAM,EAAE,2BAA2B,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAYvF;IAED;;OAEG;IACG,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,iBAqB1C;IAED;;;OAGG;IACG,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,iBAqD9C;CACF"}
+{"version":3,"file":"sender_tagging_store.d.ts","sourceRoot":"","sources":["../../../src/storage/tagging_store/sender_tagging_store.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AAG5E;;;;GAIG;AACH,qBAAa,kBAAmB,YAAW,WAAW;;IACpD,QAAQ,CAAC,SAAS,oBAAoB;IA6BtC,YAAY,KAAK,EAAE,iBAAiB,EAQnC;IAoDD;;;;OAIG;IACG,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBzC;IAED,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAI1C;IAED;;;;;;;;;;;;;;;;;;;;;OAqBG;IACG,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,iBAiDzE;IAED;;;;;;;;OAQG;IACG,2BAA2B,CAC/B,MAAM,EAAE,2BAA2B,EACnC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,MAAM,EAAE,CAAC,CAMnB;IAED;;;;OAIG;IACH,qBAAqB,CAAC,MAAM,EAAE,2BAA2B,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAErG;IAED;;;;;OAKG;IACG,gBAAgB,CAAC,MAAM,EAAE,2BAA2B,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAYtG;IAED;;OAEG;IACG,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,iBAqBzD;IAED;;;OAGG;IACG,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,iBAqD7D;CACF"}