@aztec/pxe 0.0.1-commit.96bb3f7 → 0.0.1-commit.a072138

package/dest/storage/capsule_store/capsule_store.d.ts

@@ -2,34 +2,49 @@ import { Fr } from '@aztec/foundation/curves/bn254';
 import { type Logger } from '@aztec/foundation/log';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-export declare class CapsuleStore {
+import type { StagedStore } from '../../job_coordinator/job_coordinator.js';
+export declare class CapsuleStore implements StagedStore {
     #private;
+    readonly storeName = "capsule";
     logger: Logger;
     constructor(store: AztecAsyncKVStore);
+    /**
+     * Commits staged data to main 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 deadlock on IndexedDB).
+     * @param jobId - The jobId identifying which staged data to commit
+     */
+    commit(jobId: string): Promise<void>;
+    /**
+     * Discards staged data without committing.
+     */
+    discardStaged(jobId: string): Promise<void>;
     /**
      * Stores arbitrary information in a per-contract non-volatile database, which can later be retrieved with `loadCapsule`.
      * * If data was already stored at this slot, it is overwritten.
      * @param contractAddress - The contract address to scope the data under.
      * @param slot - The slot in the database in which to store the value. Slots need not be contiguous.
      * @param capsule - An array of field elements representing the capsule.
+     * @param jobId - The context in which this store will be visible until PXE decides to persist it to underlying KV store
      * @remarks A capsule is a "blob" of data that is passed to the contract through an oracle. It works similarly
      * to public contract storage in that it's indexed by the contract address and storage slot but instead of the global
      * network state it's backed by local PXE db.
      */
-    storeCapsule(contractAddress: AztecAddress, slot: Fr, capsule: Fr[]): Promise<void>;
+    storeCapsule(contractAddress: AztecAddress, slot: Fr, capsule: Fr[], jobId: string): void;
     /**
      * Returns data previously stored via `storeCapsule` in the per-contract non-volatile database.
      * @param contractAddress - The contract address under which the data is scoped.
      * @param slot - The slot in the database to read.
      * @returns The stored data or `null` if no data is stored under the slot.
      */
-    loadCapsule(contractAddress: AztecAddress, slot: Fr): Promise<Fr[] | null>;
+    loadCapsule(contractAddress: AztecAddress, slot: Fr, jobId: string): Promise<Fr[] | null>;
     /**
      * Deletes data in the per-contract non-volatile database. Does nothing if no data was present.
      * @param contractAddress - The contract address under which the data is scoped.
      * @param slot - The slot in the database to delete.
      */
-    deleteCapsule(contractAddress: AztecAddress, slot: Fr): Promise<void>;
+    deleteCapsule(contractAddress: AztecAddress, slot: Fr, jobId: string): void;
     /**
      * Copies a number of contiguous entries in the per-contract non-volatile database. This allows for efficient data
      * structures by avoiding repeated calls to `loadCapsule` and `storeCapsule`.
@@ -41,7 +56,7 @@ export declare class CapsuleStore {
      * @param dstSlot - The first slot to copy to.
      * @param numEntries - The number of entries to copy.
      */
-    copyCapsule(contractAddress: AztecAddress, srcSlot: Fr, dstSlot: Fr, numEntries: number): Promise<void>;
+    copyCapsule(contractAddress: AztecAddress, srcSlot: Fr, dstSlot: Fr, numEntries: number, jobId: string): Promise<void>;
     /**
      * Appends multiple capsules to a capsule array stored at the base slot.
      * The array length is stored at the base slot, and elements are stored in consecutive slots after it.
@@ -50,8 +65,8 @@ export declare class CapsuleStore {
      * @param baseSlot - The slot where the array length is stored
      * @param content - Array of capsule data to append
      */
-    appendToCapsuleArray(contractAddress: AztecAddress, baseSlot: Fr, content: Fr[][]): Promise<void>;
-    readCapsuleArray(contractAddress: AztecAddress, baseSlot: Fr): Promise<Fr[][]>;
-    setCapsuleArray(contractAddress: AztecAddress, baseSlot: Fr, content: Fr[][]): Promise<void>;
+    appendToCapsuleArray(contractAddress: AztecAddress, baseSlot: Fr, content: Fr[][], jobId: string): Promise<void>;
+    readCapsuleArray(contractAddress: AztecAddress, baseSlot: Fr, jobId: string): Promise<Fr[][]>;
+    setCapsuleArray(contractAddress: AztecAddress, baseSlot: Fr, content: Fr[][], jobId: string): Promise<void>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2Fwc3VsZV9zdG9yZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3N0b3JhZ2UvY2Fwc3VsZV9zdG9yZS9jYXBzdWxlX3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFDbEUsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQWlCLE1BQU0saUJBQWlCLENBQUM7QUFDeEUsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFaEUscUJBQWEsWUFBWTs7SUFNdkIsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUVmLFlBQVksS0FBSyxFQUFFLGlCQUFpQixFQU1uQztJQUVEOzs7Ozs7Ozs7T0FTRztJQUNHLFlBQVksQ0FBQyxlQUFlLEVBQUUsWUFBWSxFQUFFLElBQUksRUFBRSxFQUFFLEVBQUUsT0FBTyxFQUFFLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFeEY7SUFFRDs7Ozs7T0FLRztJQUNHLFdBQVcsQ0FBQyxlQUFlLEVBQUUsWUFBWSxFQUFFLElBQUksRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLEVBQUUsRUFBRSxHQUFHLElBQUksQ0FBQyxDQVcvRTtJQUVEOzs7O09BSUc7SUFDRyxhQUFhLENBQUMsZUFBZSxFQUFFLFlBQVksRUFBRSxJQUFJLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFMUU7SUFFRDs7Ozs7Ozs7OztPQVVHO0lBQ0gsV0FBVyxDQUFDLGVBQWUsRUFBRSxZQUFZLEVBQUUsT0FBTyxFQUFFLEVBQUUsRUFBRSxPQUFPLEVBQUUsRUFBRSxFQUFFLFVBQVUsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQXdCdEc7SUFFRDs7Ozs7OztPQU9HO0lBQ0gsb0JBQW9CLENBQUMsZUFBZSxFQUFFLFlBQVksRUFBRSxRQUFRLEVBQUUsRUFBRSxFQUFFLE9BQU8sRUFBRSxFQUFFLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FnQmhHO0lBRUQsZ0JBQWdCLENBQUMsZUFBZSxFQUFFLFlBQVksRUFBRSxRQUFRLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDLENBc0I3RTtJQUVELGVBQWUsQ0FBQyxlQUFlLEVBQUUsWUFBWSxFQUFFLFFBQVEsRUFBRSxFQUFFLEVBQUUsT0FBTyxFQUFFLEVBQUUsRUFBRSxFQUFFLGlCQW1CM0U7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2Fwc3VsZV9zdG9yZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3N0b3JhZ2UvY2Fwc3VsZV9zdG9yZS9jYXBzdWxlX3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFDbEUsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQWlCLE1BQU0saUJBQWlCLENBQUM7QUFDeEUsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFaEUsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sMENBQTBDLENBQUM7QUFFNUUscUJBQWEsWUFBYSxZQUFXLFdBQVc7O0lBQzlDLFFBQVEsQ0FBQyxTQUFTLGFBQWE7SUFZL0IsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUVmLFlBQVksS0FBSyxFQUFFLGlCQUFpQixFQVFuQztJQStERDs7Ozs7O09BTUc7SUFDRyxNQUFNLENBQUMsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBZXpDO0lBRUQ7O09BRUc7SUFDSCxhQUFhLENBQUMsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBRzFDO0lBRUQ7Ozs7Ozs7Ozs7T0FVRztJQUNILFlBQVksQ0FBQyxlQUFlLEVBQUUsWUFBWSxFQUFFLElBQUksRUFBRSxFQUFFLEVBQUUsT0FBTyxFQUFFLEVBQUUsRUFBRSxFQUFFLEtBQUssRUFBRSxNQUFNLFFBS2pGO0lBRUQ7Ozs7O09BS0c7SUFDRyxXQUFXLENBQUMsZUFBZSxFQUFFLFlBQVksRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLEtBQUssRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLEVBQUUsRUFBRSxHQUFHLElBQUksQ0FBQyxDQVc5RjtJQUVEOzs7O09BSUc7SUFDSCxhQUFhLENBQUMsZUFBZSxFQUFFLFlBQVksRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLEtBQUssRUFBRSxNQUFNLFFBR25FO0lBRUQ7Ozs7Ozs7Ozs7T0FVRztJQUNILFdBQVcsQ0FDVCxlQUFlLEVBQUUsWUFBWSxFQUM3QixPQUFPLEVBQUUsRUFBRSxFQUNYLE9BQU8sRUFBRSxFQUFFLEVBQ1gsVUFBVSxFQUFFLE1BQU0sRUFDbEIsS0FBSyxFQUFFLE1BQU0sR0FDWixPQUFPLENBQUMsSUFBSSxDQUFDLENBMkJmO0lBRUQ7Ozs7Ozs7T0FPRztJQUNILG9CQUFvQixDQUFDLGVBQWUsRUFBRSxZQUFZLEVBQUUsUUFBUSxFQUFFLEVBQUUsRUFBRSxPQUFPLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxLQUFLLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FxQi9HO0lBRUQsZ0JBQWdCLENBQUMsZUFBZSxFQUFFLFlBQVksRUFBRSxRQUFRLEVBQUUsRUFBRSxFQUFFLEtBQUssRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0EyQjVGO0lBRUQsZUFBZSxDQUFDLGVBQWUsRUFBRSxZQUFZLEVBQUUsUUFBUSxFQUFFLEVBQUUsRUFBRSxPQUFPLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxLQUFLLEVBQUUsTUFBTSxpQkEyQjFGO0NBQ0YifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"capsule_store.d.ts","sourceRoot":"","sources":["../../../src/storage/capsule_store/capsule_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,qBAAa,YAAY;;IAMvB,MAAM,EAAE,MAAM,CAAC;IAEf,YAAY,KAAK,EAAE,iBAAiB,EAMnC;IAED;;;;;;;;;OASG;IACG,YAAY,CAAC,eAAe,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAExF;IAED;;;;;OAKG;IACG,WAAW,CAAC,eAAe,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,CAW/E;IAED;;;;OAIG;IACG,aAAa,CAAC,eAAe,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAE1E;IAED;;;;;;;;;;OAUG;IACH,WAAW,CAAC,eAAe,EAAE,YAAY,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAwBtG;IAED;;;;;;;OAOG;IACH,oBAAoB,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBhG;IAED,gBAAgB,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,CAsB7E;IAED,eAAe,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,iBAmB3E;CACF"}
+{"version":3,"file":"capsule_store.d.ts","sourceRoot":"","sources":["../../../src/storage/capsule_store/capsule_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AAE5E,qBAAa,YAAa,YAAW,WAAW;;IAC9C,QAAQ,CAAC,SAAS,aAAa;IAY/B,MAAM,EAAE,MAAM,CAAC;IAEf,YAAY,KAAK,EAAE,iBAAiB,EAQnC;IA+DD;;;;;;OAMG;IACG,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAezC;IAED;;OAEG;IACH,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG1C;IAED;;;;;;;;;;OAUG;IACH,YAAY,CAAC,eAAe,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,QAKjF;IAED;;;;;OAKG;IACG,WAAW,CAAC,eAAe,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,CAW9F;IAED;;;;OAIG;IACH,aAAa,CAAC,eAAe,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,QAGnE;IAED;;;;;;;;;;OAUG;IACH,WAAW,CACT,eAAe,EAAE,YAAY,EAC7B,OAAO,EAAE,EAAE,EACX,OAAO,EAAE,EAAE,EACX,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC,CA2Bf;IAED;;;;;;;OAOG;IACH,oBAAoB,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAqB/G;IAED,gBAAgB,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,CA2B5F;IAED,eAAe,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,iBA2B1F;CACF"}

package/dest/storage/capsule_store/capsule_store.js

@@ -1,34 +1,118 @@
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { createLogger } from '@aztec/foundation/log';
 export class CapsuleStore {
+    storeName = 'capsule';
     #store;
     // Arbitrary data stored by contracts. Key is computed as `${contractAddress}:${key}`
     #capsules;
+    // jobId => `${contractAddress}:${key}` => capsule data
+    // when `#stagedCapsules.get('some-job-id').get('${some-contract-address:some-key') === null`,
+    // it signals that the capsule was deleted during the job, so it needs to be deleted on commit
+    #stagedCapsules;
     logger;
     constructor(store){
         this.#store = store;
         this.#capsules = this.#store.openMap('capsules');
+        this.#stagedCapsules = new Map();
         this.logger = createLogger('pxe:capsule-data-provider');
     }
     /**
+   * Given a job denoted by `jobId`, it returns the
+   * capsules that said job has interacted with.
+   *
+   * Capsules that haven't been committed to persistence KV storage
+   * are kept in-memory in `#stagedCapsules`, this method provides a convenient
+   * way to access that in-memory collection of data.
+   *
+   * @param jobId
+   * @returns
+   */ #getJobStagedCapsules(jobId) {
+        let jobStagedCapsules = this.#stagedCapsules.get(jobId);
+        if (!jobStagedCapsules) {
+            jobStagedCapsules = new Map();
+            this.#stagedCapsules.set(jobId, jobStagedCapsules);
+        }
+        return jobStagedCapsules;
+    }
+    /**
+   * Reads a capsule's slot from the staged version of the data associated to the given jobId.
+   *
+   * If it is not there, it reads it from the KV store.
+   */ async #getFromStage(jobId, dbSlotKey) {
+        const jobStagedCapsules = this.#getJobStagedCapsules(jobId);
+        const staged = jobStagedCapsules.get(dbSlotKey);
+        // Always issue DB read to keep IndexedDB transaction alive, even if the value is in the job staged data. This
+        // keeps IndexedDB transactions 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 (including null for deletions).
+        const dbValue = await this.#loadCapsuleFromDb(dbSlotKey);
+        return staged !== undefined ? staged : dbValue;
+    }
+    /**
+   * Writes a capsule to the stage of a job.
+   */ #setOnStage(jobId, dbSlotKey, capsuleData) {
+        this.#getJobStagedCapsules(jobId).set(dbSlotKey, capsuleData);
+    }
+    /**
+   * Deletes a capsule on the stage of a job. Note the capsule will still
+   * exist in storage until the job is committed.
+   */ #deleteOnStage(jobId, dbSlotKey) {
+        this.#getJobStagedCapsules(jobId).set(dbSlotKey, null);
+    }
+    async #loadCapsuleFromDb(dbSlotKey) {
+        const dataBuffer = await this.#capsules.getAsync(dbSlotKey);
+        if (!dataBuffer) {
+            return null;
+        }
+        return dataBuffer;
+    }
+    /**
+   * Commits staged data to main 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 deadlock on IndexedDB).
+   * @param jobId - The jobId identifying which staged data to commit
+   */ async commit(jobId) {
+        const jobStagedCapsules = this.#getJobStagedCapsules(jobId);
+        for (const [key, value] of jobStagedCapsules){
+            // In the write stage, we represent deleted capsules with null
+            // (as opposed to undefined, which denotes there was never a capsule there to begin with).
+            // So we delete from actual KV store here.
+            if (value === null) {
+                await this.#capsules.delete(key);
+            } else {
+                await this.#capsules.set(key, value);
+            }
+        }
+        this.#stagedCapsules.delete(jobId);
+    }
+    /**
+   * Discards staged data without committing.
+   */ discardStaged(jobId) {
+        this.#stagedCapsules.delete(jobId);
+        return Promise.resolve();
+    }
+    /**
    * Stores arbitrary information in a per-contract non-volatile database, which can later be retrieved with `loadCapsule`.
    * * If data was already stored at this slot, it is overwritten.
    * @param contractAddress - The contract address to scope the data under.
    * @param slot - The slot in the database in which to store the value. Slots need not be contiguous.
    * @param capsule - An array of field elements representing the capsule.
+   * @param jobId - The context in which this store will be visible until PXE decides to persist it to underlying KV store
    * @remarks A capsule is a "blob" of data that is passed to the contract through an oracle. It works similarly
    * to public contract storage in that it's indexed by the contract address and storage slot but instead of the global
    * network state it's backed by local PXE db.
-   */ async storeCapsule(contractAddress, slot, capsule) {
-        await this.#capsules.set(dbSlotToKey(contractAddress, slot), Buffer.concat(capsule.map((value)=>value.toBuffer())));
+   */ storeCapsule(contractAddress, slot, capsule, jobId) {
+        const dbSlotKey = dbSlotToKey(contractAddress, slot);
+        // A store overrides any pre-existing data on the slot
+        this.#setOnStage(jobId, dbSlotKey, Buffer.concat(capsule.map((value)=>value.toBuffer())));
     }
     /**
    * Returns data previously stored via `storeCapsule` in the per-contract non-volatile database.
    * @param contractAddress - The contract address under which the data is scoped.
    * @param slot - The slot in the database to read.
    * @returns The stored data or `null` if no data is stored under the slot.
-   */ async loadCapsule(contractAddress, slot) {
-        const dataBuffer = await this.#capsules.getAsync(dbSlotToKey(contractAddress, slot));
+   */ async loadCapsule(contractAddress, slot, jobId) {
+        const dataBuffer = await this.#getFromStage(jobId, dbSlotToKey(contractAddress, slot));
         if (!dataBuffer) {
             this.logger.trace(`Data not found for contract ${contractAddress.toString()} and slot ${slot.toString()}`);
             return null;
@@ -43,8 +127,9 @@ export class CapsuleStore {
    * Deletes data in the per-contract non-volatile database. Does nothing if no data was present.
    * @param contractAddress - The contract address under which the data is scoped.
    * @param slot - The slot in the database to delete.
-   */ async deleteCapsule(contractAddress, slot) {
-        await this.#capsules.delete(dbSlotToKey(contractAddress, slot));
+   */ deleteCapsule(contractAddress, slot, jobId) {
+        // When we commit this, we will interpret null as a deletion, so we'll propagate the delete to the KV store
+        this.#deleteOnStage(jobId, dbSlotToKey(contractAddress, slot));
     }
     /**
    * Copies a number of contiguous entries in the per-contract non-volatile database. This allows for efficient data
@@ -56,7 +141,11 @@ export class CapsuleStore {
    * @param srcSlot - The first slot to copy from.
    * @param dstSlot - The first slot to copy to.
    * @param numEntries - The number of entries to copy.
-   */ copyCapsule(contractAddress, srcSlot, dstSlot, numEntries) {
+   */ copyCapsule(contractAddress, srcSlot, dstSlot, numEntries, jobId) {
+        // This transactional context gives us "copy atomicity":
+        // there shouldn't be concurrent writes to what's being copied here.
+        // Equally important: this in practice is expected to perform thousands of DB operations
+        // and not using a transaction here would heavily impact performance.
         return this.#store.transactionAsync(async ()=>{
             // In order to support overlapping source and destination regions, we need to check the relative positions of source
             // and destination. If destination is ahead of source, then by the time we overwrite source elements using forward
@@ -69,11 +158,11 @@ export class CapsuleStore {
             for (const i of indexes){
                 const currentSrcSlot = dbSlotToKey(contractAddress, srcSlot.add(new Fr(i)));
                 const currentDstSlot = dbSlotToKey(contractAddress, dstSlot.add(new Fr(i)));
-                const toCopy = await this.#capsules.getAsync(currentSrcSlot);
+                const toCopy = await this.#getFromStage(jobId, currentSrcSlot);
                 if (!toCopy) {
                     throw new Error(`Attempted to copy empty slot ${currentSrcSlot} for contract ${contractAddress.toString()}`);
                 }
-                await this.#capsules.set(currentDstSlot, toCopy);
+                this.#setOnStage(jobId, currentDstSlot, toCopy);
             }
         });
     }
@@ -84,32 +173,42 @@ export class CapsuleStore {
    * @param contractAddress - The contract address that owns the capsule array
    * @param baseSlot - The slot where the array length is stored
    * @param content - Array of capsule data to append
-   */ appendToCapsuleArray(contractAddress, baseSlot, content) {
+   */ appendToCapsuleArray(contractAddress, baseSlot, content, jobId) {
+        // We wrap this in a transaction to serialize concurrent calls from Promise.all.
+        // Without this, concurrent appends to the same array could race: both read length=0,
+        // both write at the same slots, one overwrites the other.
+        // Equally important: this in practice is expected to perform thousands of DB operations
+        // and not using a transaction here would heavily impact performance.
         return this.#store.transactionAsync(async ()=>{
             // Load current length, defaulting to 0 if not found
-            const lengthData = await this.loadCapsule(contractAddress, baseSlot);
+            const lengthData = await this.loadCapsule(contractAddress, baseSlot, jobId);
             const currentLength = lengthData ? lengthData[0].toNumber() : 0;
             // Store each capsule at consecutive slots after baseSlot + 1 + currentLength
             for(let i = 0; i < content.length; i++){
                 const nextSlot = arraySlot(baseSlot, currentLength + i);
-                await this.storeCapsule(contractAddress, nextSlot, content[i]);
+                this.storeCapsule(contractAddress, nextSlot, content[i], jobId);
             }
             // Update length to include all new capsules
             const newLength = currentLength + content.length;
-            await this.storeCapsule(contractAddress, baseSlot, [
+            this.storeCapsule(contractAddress, baseSlot, [
                 new Fr(newLength)
-            ]);
+            ], jobId);
         });
     }
-    readCapsuleArray(contractAddress, baseSlot) {
+    readCapsuleArray(contractAddress, baseSlot, jobId) {
+        // I'm leaving this transactional context here though because I'm assuming this
+        // gives us "read array atomicity": there shouldn't be concurrent writes to what's being copied
+        // here.
+        // This is one point we should revisit in the future if we want to relax the concurrency
+        // of jobs: different calls running concurrently on the same contract may cause trouble.
         return this.#store.transactionAsync(async ()=>{
             // Load length, defaulting to 0 if not found
-            const maybeLength = await this.loadCapsule(contractAddress, baseSlot);
+            const maybeLength = await this.loadCapsule(contractAddress, baseSlot, jobId);
             const length = maybeLength ? maybeLength[0].toBigInt() : 0n;
             const values = [];
             // Read each capsule at consecutive slots after baseSlot
             for(let i = 0; i < length; i++){
-                const currentValue = await this.loadCapsule(contractAddress, arraySlot(baseSlot, i));
+                const currentValue = await this.loadCapsule(contractAddress, arraySlot(baseSlot, i), jobId);
                 if (currentValue == undefined) {
                     throw new Error(`Expected non-empty value at capsule array in base slot ${baseSlot} at index ${i} for contract ${contractAddress}`);
                 }
@@ -118,22 +217,30 @@ export class CapsuleStore {
             return values;
         });
     }
-    setCapsuleArray(contractAddress, baseSlot, content) {
+    setCapsuleArray(contractAddress, baseSlot, content, jobId) {
+        // This transactional context in theory isn't so critical now because we aren't
+        // writing to DB so if there's exceptions midway and it blows up, no visible impact
+        // to persistent storage will happen.
+        // I'm leaving this transactional context here though because I'm assuming this
+        // gives us "write array atomicity": there shouldn't be concurrent writes to what's being copied
+        // here.
+        // This is one point we should revisit in the future if we want to relax the concurrency
+        // of jobs: different calls running concurrently on the same contract may cause trouble.
         return this.#store.transactionAsync(async ()=>{
             // Load current length, defaulting to 0 if not found
-            const maybeLength = await this.loadCapsule(contractAddress, baseSlot);
+            const maybeLength = await this.loadCapsule(contractAddress, baseSlot, jobId);
             const originalLength = maybeLength ? maybeLength[0].toNumber() : 0;
             // Set the new length
-            await this.storeCapsule(contractAddress, baseSlot, [
+            this.storeCapsule(contractAddress, baseSlot, [
                 new Fr(content.length)
-            ]);
+            ], jobId);
             // Store the new content, possibly overwriting existing values
             for(let i = 0; i < content.length; i++){
-                await this.storeCapsule(contractAddress, arraySlot(baseSlot, i), content[i]);
+                this.storeCapsule(contractAddress, arraySlot(baseSlot, i), content[i], jobId);
             }
             // Clear any stragglers
             for(let i = content.length; i < originalLength; i++){
-                await this.deleteCapsule(contractAddress, arraySlot(baseSlot, i));
+                this.deleteCapsule(contractAddress, arraySlot(baseSlot, i), jobId);
             }
         });
     }

package/dest/storage/contract_store/contract_store.d.ts

@@ -62,6 +62,5 @@ export declare class ContractStore {
     getDebugContractName(contractAddress: AztecAddress): Promise<string | undefined>;
     getDebugFunctionName(contractAddress: AztecAddress, selector: FunctionSelector): Promise<string>;
     getFunctionCall(functionName: string, args: any[], to: AztecAddress): Promise<FunctionCall>;
-    syncPrivateState(contractAddress: AztecAddress, functionToInvokeAfterSync: FunctionSelector | null, utilityExecutor: (privateSyncCall: FunctionCall) => Promise<any>): Promise<any>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3Rfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdG9yYWdlL2NvbnRyYWN0X3N0b3JlL2NvbnRyYWN0X3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDN0QsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFFekQsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNqRSxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBaUIsTUFBTSxpQkFBaUIsQ0FBQztBQUV4RSxPQUFPLEVBQ0wsS0FBSyxnQkFBZ0IsRUFDckIsS0FBSyxXQUFXLEVBRWhCLEtBQUssZ0NBQWdDLEVBQ3JDLFlBQVksRUFDWixLQUFLLHFCQUFxQixFQUMxQixnQkFBZ0IsRUFNakIsTUFBTSxtQkFBbUIsQ0FBQztBQUMzQixPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDM0QsT0FBTyxFQUNMLEtBQUssYUFBYSxFQUNsQixLQUFLLDJCQUEyQixFQUdqQyxNQUFNLHdCQUF3QixDQUFDO0FBSWhDOzs7Ozs7R0FNRztBQUNILHFCQUFhLGFBQWE7O0lBV3hCLFlBQVksS0FBSyxFQUFFLGlCQUFpQixFQUduQztJQUlZLG1CQUFtQixDQUFDLEVBQUUsRUFBRSxFQUFFLEVBQUUsUUFBUSxFQUFFLGdCQUFnQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FrQmxGO0lBRUssbUJBQW1CLENBQUMsUUFBUSxFQUFFLDJCQUEyQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FPOUU7SUE0Q0sscUJBQXFCLElBQUksT0FBTyxDQUFDLFlBQVksRUFBRSxDQUFDLENBR3JEO0lBRUQsNEVBQTRFO0lBQy9ELG1CQUFtQixDQUFDLGVBQWUsRUFBRSxZQUFZLEdBQUcsT0FBTyxDQUFDLDJCQUEyQixHQUFHLFNBQVMsQ0FBQyxDQUdoSDtJQUVZLG1CQUFtQixDQUFDLGVBQWUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixHQUFHLFNBQVMsQ0FBQyxDQUkzRjtJQUVELDBFQUEwRTtJQUM3RCxnQkFBZ0IsQ0FBQyxlQUFlLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxhQUFhLEdBQUcsU0FBUyxDQUFDLENBR3JGO0lBRVksV0FBVyxDQUN0QixPQUFPLEVBQUUsWUFBWSxHQUNwQixPQUFPLENBQUMsQ0FBQywyQkFBMkIsR0FBRyxnQkFBZ0IsQ0FBQyxHQUFHLFNBQVMsQ0FBQyxDQVV2RTtJQUVEOzs7Ozs7OztPQVFHO0lBQ1UsbUJBQW1CLENBQzlCLGVBQWUsRUFBRSxZQUFZLEVBQzdCLFFBQVEsRUFBRSxnQkFBZ0IsR0FDekIsT0FBTyxDQUFDLGdDQUFnQyxHQUFHLFNBQVMsQ0FBQyxDQUl2RDtJQUVZLG9DQUFvQyxDQUMvQyxlQUFlLEVBQUUsWUFBWSxFQUM3QixRQUFRLEVBQUUsZ0JBQWdCLEdBQ3pCLE9BQU8sQ0FBQyxnQ0FBZ0MsQ0FBQyxDQVUzQztJQUVZLHlCQUF5QixDQUNwQyxlQUFlLEVBQUUsWUFBWSxHQUM1QixPQUFPLENBQUMsZ0NBQWdDLEdBQUcsU0FBUyxDQUFDLENBSXZEO0lBRVksY0FBYyxDQUN6QixlQUFlLEVBQUUsWUFBWSxFQUM3QixRQUFRLEVBQUUsZ0JBQWdCLEdBQ3pCLE9BQU8sQ0FBQyxXQUFXLEdBQUcsU0FBUyxDQUFDLENBR2xDO0lBRUQ7Ozs7Ozs7OztPQVNHO0lBQ1Usd0JBQXdCLENBQ25DLGVBQWUsRUFBRSxZQUFZLEVBQzdCLFFBQVEsRUFBRSxnQkFBZ0IsR0FDekIsT0FBTyxDQUFDLHFCQUFxQixHQUFHLFNBQVMsQ0FBQyxDQUk1QztJQUVZLDhCQUE4QixDQUN6QyxlQUFlLEVBQUUsWUFBWSxHQUM1QixPQUFPLENBQUMscUJBQXFCLEdBQUcsU0FBUyxDQUFDLENBSTVDO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDVSw0QkFBNEIsQ0FDdkMsZUFBZSxFQUFFLEVBQUUsRUFDbkIsUUFBUSxFQUFFLGdCQUFnQixHQUN6QixPQUFPLENBQUMsaUJBQWlCLENBQUMsT0FBTyxvQkFBb0IsQ0FBQyxHQUFHLFNBQVMsQ0FBQyxDQUdyRTtJQUVZLG9CQUFvQixDQUFDLGVBQWUsRUFBRSxZQUFZLCtCQUc5RDtJQUVZLG9CQUFvQixDQUFDLGVBQWUsRUFBRSxZQUFZLEVBQUUsUUFBUSxFQUFFLGdCQUFnQixtQkFJMUY7SUE4QlksZUFBZSxDQUFDLFlBQVksRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLEdBQUcsRUFBRSxFQUFFLEVBQUUsRUFBRSxZQUFZLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQXVCdkc7SUFHWSxnQkFBZ0IsQ0FDM0IsZUFBZSxFQUFFLFlBQVksRUFDN0IseUJBQXlCLEVBQUUsZ0JBQWdCLEdBQUcsSUFBSSxFQUNsRCxlQUFlLEVBQUUsQ0FBQyxlQUFlLEVBQUUsWUFBWSxLQUFLLE9BQU8sQ0FBQyxHQUFHLENBQUMsZ0JBYWpFO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3Rfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdG9yYWdlL2NvbnRyYWN0X3N0b3JlL2NvbnRyYWN0X3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDN0QsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFFekQsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNqRSxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBaUIsTUFBTSxpQkFBaUIsQ0FBQztBQUN4RSxPQUFPLEVBQ0wsS0FBSyxnQkFBZ0IsRUFDckIsS0FBSyxXQUFXLEVBRWhCLEtBQUssZ0NBQWdDLEVBQ3JDLFlBQVksRUFDWixLQUFLLHFCQUFxQixFQUMxQixnQkFBZ0IsRUFNakIsTUFBTSxtQkFBbUIsQ0FBQztBQUMzQixPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDM0QsT0FBTyxFQUNMLEtBQUssYUFBYSxFQUNsQixLQUFLLDJCQUEyQixFQUdqQyxNQUFNLHdCQUF3QixDQUFDO0FBSWhDOzs7Ozs7R0FNRztBQUNILHFCQUFhLGFBQWE7O0lBWXhCLFlBQVksS0FBSyxFQUFFLGlCQUFpQixFQUluQztJQUlZLG1CQUFtQixDQUFDLEVBQUUsRUFBRSxFQUFFLEVBQUUsUUFBUSxFQUFFLGdCQUFnQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FxQmxGO0lBRUssbUJBQW1CLENBQUMsUUFBUSxFQUFFLDJCQUEyQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FPOUU7SUE0Q0QscUJBQXFCLElBQUksT0FBTyxDQUFDLFlBQVksRUFBRSxDQUFDLENBSy9DO0lBRUQsNEVBQTRFO0lBQ3JFLG1CQUFtQixDQUFDLGVBQWUsRUFBRSxZQUFZLEdBQUcsT0FBTyxDQUFDLDJCQUEyQixHQUFHLFNBQVMsQ0FBQyxDQUsxRztJQUVNLG1CQUFtQixDQUFDLGVBQWUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixHQUFHLFNBQVMsQ0FBQyxDQU1yRjtJQUVELDBFQUEwRTtJQUM3RCxnQkFBZ0IsQ0FBQyxlQUFlLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxhQUFhLEdBQUcsU0FBUyxDQUFDLENBR3JGO0lBRVksV0FBVyxDQUN0QixPQUFPLEVBQUUsWUFBWSxHQUNwQixPQUFPLENBQUMsQ0FBQywyQkFBMkIsR0FBRyxnQkFBZ0IsQ0FBQyxHQUFHLFNBQVMsQ0FBQyxDQVV2RTtJQUVEOzs7Ozs7OztPQVFHO0lBQ1UsbUJBQW1CLENBQzlCLGVBQWUsRUFBRSxZQUFZLEVBQzdCLFFBQVEsRUFBRSxnQkFBZ0IsR0FDekIsT0FBTyxDQUFDLGdDQUFnQyxHQUFHLFNBQVMsQ0FBQyxDQUl2RDtJQUVZLG9DQUFvQyxDQUMvQyxlQUFlLEVBQUUsWUFBWSxFQUM3QixRQUFRLEVBQUUsZ0JBQWdCLEdBQ3pCLE9BQU8sQ0FBQyxnQ0FBZ0MsQ0FBQyxDQVUzQztJQUVZLHlCQUF5QixDQUNwQyxlQUFlLEVBQUUsWUFBWSxHQUM1QixPQUFPLENBQUMsZ0NBQWdDLEdBQUcsU0FBUyxDQUFDLENBSXZEO0lBRVksY0FBYyxDQUN6QixlQUFlLEVBQUUsWUFBWSxFQUM3QixRQUFRLEVBQUUsZ0JBQWdCLEdBQ3pCLE9BQU8sQ0FBQyxXQUFXLEdBQUcsU0FBUyxDQUFDLENBR2xDO0lBRUQ7Ozs7Ozs7OztPQVNHO0lBQ1Usd0JBQXdCLENBQ25DLGVBQWUsRUFBRSxZQUFZLEVBQzdCLFFBQVEsRUFBRSxnQkFBZ0IsR0FDekIsT0FBTyxDQUFDLHFCQUFxQixHQUFHLFNBQVMsQ0FBQyxDQUk1QztJQUVZLDhCQUE4QixDQUN6QyxlQUFlLEVBQUUsWUFBWSxHQUM1QixPQUFPLENBQUMscUJBQXFCLEdBQUcsU0FBUyxDQUFDLENBSTVDO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDVSw0QkFBNEIsQ0FDdkMsZUFBZSxFQUFFLEVBQUUsRUFDbkIsUUFBUSxFQUFFLGdCQUFnQixHQUN6QixPQUFPLENBQUMsaUJBQWlCLENBQUMsT0FBTyxvQkFBb0IsQ0FBQyxHQUFHLFNBQVMsQ0FBQyxDQUdyRTtJQUVZLG9CQUFvQixDQUFDLGVBQWUsRUFBRSxZQUFZLCtCQUc5RDtJQUVZLG9CQUFvQixDQUFDLGVBQWUsRUFBRSxZQUFZLEVBQUUsUUFBUSxFQUFFLGdCQUFnQixtQkFJMUY7SUE4QlksZUFBZSxDQUFDLFlBQVksRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLEdBQUcsRUFBRSxFQUFFLEVBQUUsRUFBRSxZQUFZLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQXVCdkc7Q0FDRiJ9

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

@@ -1 +1 @@
-{"version":3,"file":"contract_store.d.ts","sourceRoot":"","sources":["../../../src/storage/contract_store/contract_store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AAExE,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAEhB,KAAK,gCAAgC,EACrC,YAAY,EACZ,KAAK,qBAAqB,EAC1B,gBAAgB,EAMjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,2BAA2B,EAGjC,MAAM,wBAAwB,CAAC;AAIhC;;;;;;GAMG;AACH,qBAAa,aAAa;;IAWxB,YAAY,KAAK,EAAE,iBAAiB,EAGnC;IAIY,mBAAmB,CAAC,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBlF;IAEK,mBAAmB,CAAC,QAAQ,EAAE,2BAA2B,GAAG,OAAO,CAAC,IAAI,CAAC,CAO9E;IA4CK,qBAAqB,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC,CAGrD;IAED,4EAA4E;IAC/D,mBAAmB,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC,CAGhH;IAEY,mBAAmB,CAAC,eAAe,EAAE,EAAE,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAI3F;IAED,0EAA0E;IAC7D,gBAAgB,CAAC,eAAe,EAAE,EAAE,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAGrF;IAEY,WAAW,CACtB,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,CAAC,2BAA2B,GAAG,gBAAgB,CAAC,GAAG,SAAS,CAAC,CAUvE;IAED;;;;;;;;OAQG;IACU,mBAAmB,CAC9B,eAAe,EAAE,YAAY,EAC7B,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,gCAAgC,GAAG,SAAS,CAAC,CAIvD;IAEY,oCAAoC,CAC/C,eAAe,EAAE,YAAY,EAC7B,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,gCAAgC,CAAC,CAU3C;IAEY,yBAAyB,CACpC,eAAe,EAAE,YAAY,GAC5B,OAAO,CAAC,gCAAgC,GAAG,SAAS,CAAC,CAIvD;IAEY,cAAc,CACzB,eAAe,EAAE,YAAY,EAC7B,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAGlC;IAED;;;;;;;;;OASG;IACU,wBAAwB,CACnC,eAAe,EAAE,YAAY,EAC7B,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAI5C;IAEY,8BAA8B,CACzC,eAAe,EAAE,YAAY,GAC5B,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAI5C;IAED;;;;;;;;OAQG;IACU,4BAA4B,CACvC,eAAe,EAAE,EAAE,EACnB,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,iBAAiB,CAAC,OAAO,oBAAoB,CAAC,GAAG,SAAS,CAAC,CAGrE;IAEY,oBAAoB,CAAC,eAAe,EAAE,YAAY,+BAG9D;IAEY,oBAAoB,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,mBAI1F;IA8BY,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CAuBvG;IAGY,gBAAgB,CAC3B,eAAe,EAAE,YAAY,EAC7B,yBAAyB,EAAE,gBAAgB,GAAG,IAAI,EAClD,eAAe,EAAE,CAAC,eAAe,EAAE,YAAY,KAAK,OAAO,CAAC,GAAG,CAAC,gBAajE;CACF"}
+{"version":3,"file":"contract_store.d.ts","sourceRoot":"","sources":["../../../src/storage/contract_store/contract_store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAEhB,KAAK,gCAAgC,EACrC,YAAY,EACZ,KAAK,qBAAqB,EAC1B,gBAAgB,EAMjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,2BAA2B,EAGjC,MAAM,wBAAwB,CAAC;AAIhC;;;;;;GAMG;AACH,qBAAa,aAAa;;IAYxB,YAAY,KAAK,EAAE,iBAAiB,EAInC;IAIY,mBAAmB,CAAC,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAqBlF;IAEK,mBAAmB,CAAC,QAAQ,EAAE,2BAA2B,GAAG,OAAO,CAAC,IAAI,CAAC,CAO9E;IA4CD,qBAAqB,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC,CAK/C;IAED,4EAA4E;IACrE,mBAAmB,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC,CAK1G;IAEM,mBAAmB,CAAC,eAAe,EAAE,EAAE,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAMrF;IAED,0EAA0E;IAC7D,gBAAgB,CAAC,eAAe,EAAE,EAAE,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAGrF;IAEY,WAAW,CACtB,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,CAAC,2BAA2B,GAAG,gBAAgB,CAAC,GAAG,SAAS,CAAC,CAUvE;IAED;;;;;;;;OAQG;IACU,mBAAmB,CAC9B,eAAe,EAAE,YAAY,EAC7B,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,gCAAgC,GAAG,SAAS,CAAC,CAIvD;IAEY,oCAAoC,CAC/C,eAAe,EAAE,YAAY,EAC7B,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,gCAAgC,CAAC,CAU3C;IAEY,yBAAyB,CACpC,eAAe,EAAE,YAAY,GAC5B,OAAO,CAAC,gCAAgC,GAAG,SAAS,CAAC,CAIvD;IAEY,cAAc,CACzB,eAAe,EAAE,YAAY,EAC7B,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAGlC;IAED;;;;;;;;;OASG;IACU,wBAAwB,CACnC,eAAe,EAAE,YAAY,EAC7B,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAI5C;IAEY,8BAA8B,CACzC,eAAe,EAAE,YAAY,GAC5B,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAI5C;IAED;;;;;;;;OAQG;IACU,4BAA4B,CACvC,eAAe,EAAE,EAAE,EACnB,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,iBAAiB,CAAC,OAAO,oBAAoB,CAAC,GAAG,SAAS,CAAC,CAGrE;IAEY,oBAAoB,CAAC,eAAe,EAAE,YAAY,+BAG9D;IAEY,oBAAoB,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,mBAI1F;IA8BY,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CAuBvG;CACF"}

package/dest/storage/contract_store/contract_store.js

@@ -1,5 +1,4 @@
 import { toArray } from '@aztec/foundation/iterable';
-import { isProtocolContract } from '@aztec/protocol-contracts';
 import { FunctionSelector, FunctionType, contractArtifactFromBuffer, contractArtifactToBuffer, encodeArguments, getFunctionDebugMetadata } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { SerializableContractInstance, getContractClassFromArtifact } from '@aztec/stdlib/contract';
@@ -14,20 +13,23 @@ import { PrivateFunctionsTree } from './private_functions_tree.js';
     /** Map from contract class id to private function tree. */ // TODO: Update it to be LRU cache so that it doesn't keep all the data all the time.
     #privateFunctionTrees = new Map();
     /** Map from contract address to contract class id */ #contractClassIdMap = new Map();
+    #store;
     #contractArtifacts;
     #contractInstances;
     constructor(store){
+        this.#store = store;
         this.#contractArtifacts = store.openMap('contract_artifacts');
         this.#contractInstances = store.openMap('contracts_instances');
     }
     // Setters
     async addContractArtifact(id, contract) {
+        // Validation outside transactionAsync - these are not DB operations
         const privateFunctions = contract.functions.filter((functionArtifact)=>functionArtifact.functionType === FunctionType.PRIVATE);
         const privateSelectors = await Promise.all(privateFunctions.map(async (privateFunctionArtifact)=>(await FunctionSelector.fromNameAndParameters(privateFunctionArtifact.name, privateFunctionArtifact.parameters)).toString()));
         if (privateSelectors.length !== new Set(privateSelectors).size) {
             throw new Error('Repeated function selectors of private functions');
         }
-        await this.#contractArtifacts.set(id.toString(), contractArtifactToBuffer(contract));
+        await this.#store.transactionAsync(()=>this.#contractArtifacts.set(id.toString(), contractArtifactToBuffer(contract)));
     }
     async addContractInstance(contract) {
         this.#contractClassIdMap.set(contract.address.toString(), contract.currentContractClassId);
@@ -69,18 +71,24 @@ import { PrivateFunctionsTree } from './private_functions_tree.js';
         return contractClassId && this.getContractArtifact(contractClassId);
     }
     // Public getters
-    async getContractsAddresses() {
-        const keys = await toArray(this.#contractInstances.keysAsync());
-        return keys.map(AztecAddress.fromString);
-    }
-    /** Returns a contract instance for a given address. Throws if not found. */ async getContractInstance(contractAddress) {
-        const contract = await this.#contractInstances.getAsync(contractAddress.toString());
-        return contract && SerializableContractInstance.fromBuffer(contract).withAddress(contractAddress);
-    }
-    async getContractArtifact(contractClassId) {
-        const contract = await this.#contractArtifacts.getAsync(contractClassId.toString());
-        // TODO(@spalladino): AztecAsyncMap lies and returns Uint8Arrays instead of Buffers, hence the extra Buffer.from.
-        return contract && contractArtifactFromBuffer(Buffer.from(contract));
+    getContractsAddresses() {
+        return this.#store.transactionAsync(async ()=>{
+            const keys = await toArray(this.#contractInstances.keysAsync());
+            return keys.map(AztecAddress.fromString);
+        });
+    }
+    /** Returns a contract instance for a given address. Throws if not found. */ getContractInstance(contractAddress) {
+        return this.#store.transactionAsync(async ()=>{
+            const contract = await this.#contractInstances.getAsync(contractAddress.toString());
+            return contract && SerializableContractInstance.fromBuffer(contract).withAddress(contractAddress);
+        });
+    }
+    getContractArtifact(contractClassId) {
+        return this.#store.transactionAsync(async ()=>{
+            const contract = await this.#contractArtifacts.getAsync(contractClassId.toString());
+            // TODO(@spalladino): AztecAsyncMap lies and returns Uint8Arrays instead of Buffers, hence the extra Buffer.from.
+            return contract && contractArtifactFromBuffer(Buffer.from(contract));
+        });
     }
     /** Returns a contract class for a given class id. Throws if not found. */ async getContractClass(contractClassId) {
         const artifact = await this.getContractArtifact(contractClassId);
@@ -222,15 +230,4 @@ import { PrivateFunctionsTree } from './private_functions_tree.js';
             returnTypes: functionDao.returnTypes
         };
     }
-    // Synchronize target contract data
-    async syncPrivateState(contractAddress, functionToInvokeAfterSync, utilityExecutor) {
-        // Protocol contracts don't have private state to sync
-        if (!isProtocolContract(contractAddress)) {
-            const syncPrivateStateFunctionCall = await this.getFunctionCall('sync_private_state', [], contractAddress);
-            if (functionToInvokeAfterSync && functionToInvokeAfterSync.equals(syncPrivateStateFunctionCall.selector)) {
-                throw new Error('Forbidden `sync_private_state` invocation. `sync_private_state` can only be invoked by PXE, manual execution can lead to inconsistencies.');
-            }
-            return utilityExecutor(syncPrivateStateFunctionCall);
-        }
-    }
 }

package/dest/storage/metadata.d.ts

@@ -1,2 +1,2 @@
-export declare const PXE_DATA_SCHEMA_VERSION = 2;
+export declare const PXE_DATA_SCHEMA_VERSION = 3;
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWV0YWRhdGEuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdG9yYWdlL21ldGFkYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGVBQU8sTUFBTSx1QkFBdUIsSUFBSSxDQUFDIn0=

package/dest/storage/metadata.js

@@ -1 +1 @@
-export const PXE_DATA_SCHEMA_VERSION = 2;
+export const PXE_DATA_SCHEMA_VERSION = 3;

package/dest/storage/note_store/note_store.d.ts

@@ -1,84 +1,83 @@
-import type { Fr } from '@aztec/foundation/curves/bn254';
+import type { Fr } from '@aztec/foundation/schemas';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
-import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { DataInBlock } from '@aztec/stdlib/block';
-import { type NotesFilter } from '@aztec/stdlib/note';
-import { NoteDao } from '@aztec/stdlib/note';
+import { NoteDao, type NotesFilter } from '@aztec/stdlib/note';
+import type { StagedStore } from '../../job_coordinator/job_coordinator.js';
 /**
  * NoteStore manages the storage and retrieval of notes.
  *
- * Notes can be active or nullified. This class processes new notes, nullifications,
- * and performs rollback handling in the case of a reorg.
+ * Notes can be active or nullified. This class processes new notes, nullifications, and performs rollback handling in
+ * the case of a reorg.
  **/
-export declare class NoteStore {
+export declare class NoteStore implements StagedStore {
     #private;
-    private constructor();
+    readonly storeName: string;
+    constructor(store: AztecAsyncKVStore);
     /**
-     * Creates and initializes a new NoteStore instance.
+     * Adds multiple notes to the notes store under the specified scope.
      *
-     * This factory method creates a NoteStore and restores any existing
-     * scope-specific indexes from the database.
+     * Notes are stored using their siloedNullifier as the key, which provides uniqueness. Each note is indexed by
+     * multiple criteria for efficient retrieval.
      *
-     * @param store - The key-value store to use for persistence
-     * @returns Promise resolving to a fully initialized NoteStore instance
+     * @param notes - Notes to store
+     * @param scope - The scope (user/account) under which to store the notes
+     * @param jobId - The job context for staged writes
      */
-    static create(store: AztecAsyncKVStore): Promise<NoteStore>;
+    addNotes(notes: NoteDao[], scope: AztecAddress, jobId: string): Promise<void[]>;
     /**
-     * Adds a new scope to the note data provider.
+     * Retrieves notes based on the provided filter criteria.
      *
-     * Scopes provide privacy isolation by creating separate indexes for each user.
-     * Each scope gets its own set of indexes for efficient note retrieval by various criteria.
+     * This method queries both active and optionally nullified notes based on the filter parameters.
      *
-     * @param scope - The AztecAddress representing the scope/user to add
-     * @returns Promise resolving to true if scope was added, false if it already existed
+     * @param filter - Filter criteria including contractAddress (required), and optional owner,
+     *                 storageSlot, status, scopes, and siloedNullifier.
+     * @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.
      */
-    addScope(scope: AztecAddress): Promise<boolean>;
+    getNotes(filter: NotesFilter, jobId: string): Promise<NoteDao[]>;
     /**
-     * Adds multiple notes to the data provider under the specified scope.
+     * Transitions notes from "active" to "nullified" state.
      *
-     * Notes are stored using their index from the notes hash tree as the key, which provides
-     * uniqueness and maintains creation order. Each note is indexed by multiple criteria
-     * for efficient retrieval.
+     * This operation processes a batch of nullifiers to mark the corresponding notes as spent/nullified.
+     * The operation is atomic - if any nullifier is not found, the entire operation fails and no notes are modified.
      *
-     * @param notes - Notes to store
-     * @param scope - The scope (user/account) under which to store the notes
+     * applyNullifiers is idempotent: the same nullifier can be applied multiple times without error.
+     * This relaxes constraints on usage of NoteService#validateAndStoreNote, which can then be run concurrently in a Promise.all
+     * context without risking unnecessarily defensive checks failing.
+     *
+     * @param nullifiers - Array of nullifiers with their block numbers to process
+     * @param jobId - The job context for staged writes
+     * @returns Array of NoteDao objects that were nullified
+     * @throws Error if any nullifier is not found in this notes store
      */
-    addNotes(notes: NoteDao[], scope: AztecAddress): Promise<void>;
+    applyNullifiers(nullifiers: DataInBlock<Fr>[], jobId: string): Promise<NoteDao[]>;
     /**
      * Synchronizes notes and nullifiers to a specific block number.
      *
-     * This method ensures that the state of notes and nullifiers is consistent with the
-     * specified block number. It restores any notes that were nullified after the given block
-     * and deletes any active notes created after that block.
+     * This method ensures that the state of notes and nullifiers is consistent with the specified block number.
+     * It restores any notes that were nullified after the given block and deletes any active notes created after that
+     * block.
+     *
+     * IMPORTANT: This method must be called within a transaction to ensure atomicity.
      *
      * @param blockNumber - The new chain tip after a reorg
      * @param synchedBlockNumber - The block number up to which PXE managed to sync before the reorg happened.
      */
-    rollbackNotesAndNullifiers(blockNumber: number, synchedBlockNumber: number): Promise<void>;
+    rollback(blockNumber: number, synchedBlockNumber: number): Promise<void>;
     /**
-     * Retrieves notes based on the provided filter criteria.
-     *
-     * This method queries both active and optionally nullified notes based on the filter
-     * parameters.
+     * Commits in memory job data to persistent storage.
      *
-     * @param filter - Filter criteria including contractAddress (required), and optional
-     *                 owner, storageSlot, status, scopes, and siloedNullifier.
-     * @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.
-     */
-    getNotes(filter: NotesFilter): Promise<NoteDao[]>;
-    /**
-     * Transitions notes from "active" to "nullified" state.
+     * Called by JobCoordinator when a job completes successfully.
      *
-     * This operation processes a batch of nullifiers to mark the corresponding notes
-     * as spent/nullified.  The operation is atomic - if any nullifier is not found,
-     * the entire operation fails and no notes are modified.
+     * 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 nullifiers - Array of nullifiers with their block numbers to process
-     * @returns Promise resolving to array of nullified NoteDao objects
-     * @throws Error if any nullifier is not found in the active notes
+     * @param jobId - The jobId identifying which staged data to commit
      */
-    applyNullifiers(nullifiers: DataInBlock<Fr>[]): Promise<NoteDao[]>;
+    commit(jobId: string): Promise<void>;
+    discardStaged(jobId: string): Promise<void>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm90ZV9zdG9yZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3N0b3JhZ2Uvbm90ZV9zdG9yZS9ub3RlX3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXpELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFxQyxNQUFNLGlCQUFpQixDQUFDO0FBQzVGLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUMzRCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUN2RCxPQUFPLEVBQWMsS0FBSyxXQUFXLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNsRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFN0M7Ozs7O0lBS0k7QUFDSixxQkFBYSxTQUFTOztJQWlCcEIsT0FBTyxlQWdCTjtJQUVEOzs7Ozs7OztPQVFHO0lBQ0gsT0FBb0IsTUFBTSxDQUFDLEtBQUssRUFBRSxpQkFBaUIsR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLENBT3ZFO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDVSxRQUFRLENBQUMsS0FBSyxFQUFFLFlBQVksR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBWTNEO0lBRUQ7Ozs7Ozs7OztPQVNHO0lBQ0gsUUFBUSxDQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsRUFBRSxLQUFLLEVBQUUsWUFBWSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FnQjdEO0lBRUQ7Ozs7Ozs7OztPQVNHO0lBQ1UsMEJBQTBCLENBQUMsV0FBVyxFQUFFLE1BQU0sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUd0RztJQXVGRDs7Ozs7Ozs7Ozs7T0FXRztJQUNHLFFBQVEsQ0FBQyxNQUFNLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQXdHdEQ7SUFFRDs7Ozs7Ozs7OztPQVVHO0lBQ0gsZUFBZSxDQUFDLFVBQVUsRUFBRSxXQUFXLENBQUMsRUFBRSxDQUFDLEVBQUUsR0FBRyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUMsQ0E4RGpFO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm90ZV9zdG9yZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3N0b3JhZ2Uvbm90ZV9zdG9yZS9ub3RlX3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFxQyxNQUFNLGlCQUFpQixDQUFDO0FBQzVGLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3ZELE9BQU8sRUFBRSxPQUFPLEVBQWMsS0FBSyxXQUFXLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUUzRSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSwwQ0FBMEMsQ0FBQztBQUc1RTs7Ozs7SUFLSTtBQUNKLHFCQUFhLFNBQVUsWUFBVyxXQUFXOztJQUMzQyxRQUFRLENBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBVTtJQStCcEMsWUFBWSxLQUFLLEVBQUUsaUJBQWlCLEVBUW5DO0lBRUQ7Ozs7Ozs7OztPQVNHO0lBQ0ksUUFBUSxDQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsRUFBRSxLQUFLLEVBQUUsWUFBWSxFQUFFLEtBQUssRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksRUFBRSxDQUFDLENBYXJGO0lBY0Q7Ozs7Ozs7Ozs7O09BV0c7SUFDSCxRQUFRLENBQUMsTUFBTSxFQUFFLFdBQVcsRUFBRSxLQUFLLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQTZGL0Q7SUFFRDs7Ozs7Ozs7Ozs7Ozs7T0FjRztJQUNILGVBQWUsQ0FBQyxVQUFVLEVBQUUsV0FBVyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUUsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FxQ2hGO0lBRUQ7Ozs7Ozs7Ozs7O09BV0c7SUFDVSxRQUFRLENBQUMsV0FBVyxFQUFFLE1BQU0sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQU1wRjtJQTZFRDs7Ozs7Ozs7O09BU0c7SUFDRyxNQUFNLENBQUMsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBVXpDO0lBRUQsYUFBYSxDQUFDLEtBQUssRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUcxQztDQWtDRiJ9