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

package/dest/storage/index.d.ts

@@ -1,9 +1,9 @@
-export * from './address_data_provider/index.js';
-export * from './capsule_data_provider/index.js';
-export * from './contract_data_provider/index.js';
-export * from './note_data_provider/index.js';
-export * from './sync_data_provider/index.js';
-export * from './tagging_data_provider/index.js';
+export * from './address_store/index.js';
+export * from './capsule_store/index.js';
+export * from './contract_store/index.js';
+export * from './note_store/index.js';
+export * from './anchor_block_store/index.js';
+export * from './tagging_store/index.js';
 export * from './metadata.js';
-export * from './private_event_data_provider/private_event_data_provider.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdG9yYWdlL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsa0NBQWtDLENBQUM7QUFDakQsY0FBYyxrQ0FBa0MsQ0FBQztBQUNqRCxjQUFjLG1DQUFtQyxDQUFDO0FBQ2xELGNBQWMsK0JBQStCLENBQUM7QUFDOUMsY0FBYywrQkFBK0IsQ0FBQztBQUM5QyxjQUFjLGtDQUFrQyxDQUFDO0FBQ2pELGNBQWMsZUFBZSxDQUFDO0FBQzlCLGNBQWMsOERBQThELENBQUMifQ==
+export * from './private_event_store/private_event_store.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdG9yYWdlL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsMEJBQTBCLENBQUM7QUFDekMsY0FBYywwQkFBMEIsQ0FBQztBQUN6QyxjQUFjLDJCQUEyQixDQUFDO0FBQzFDLGNBQWMsdUJBQXVCLENBQUM7QUFDdEMsY0FBYywrQkFBK0IsQ0FBQztBQUM5QyxjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsZUFBZSxDQUFDO0FBQzlCLGNBQWMsOENBQThDLENBQUMifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/storage/index.ts"],"names":[],"mappings":"AAAA,cAAc,kCAAkC,CAAC;AACjD,cAAc,kCAAkC,CAAC;AACjD,cAAc,mCAAmC,CAAC;AAClD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,kCAAkC,CAAC;AACjD,cAAc,eAAe,CAAC;AAC9B,cAAc,8DAA8D,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/storage/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AACzC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,uBAAuB,CAAC;AACtC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,0BAA0B,CAAC;AACzC,cAAc,eAAe,CAAC;AAC9B,cAAc,8CAA8C,CAAC"}

package/dest/storage/index.js

@@ -1,8 +1,8 @@
-export * from './address_data_provider/index.js';
-export * from './capsule_data_provider/index.js';
-export * from './contract_data_provider/index.js';
-export * from './note_data_provider/index.js';
-export * from './sync_data_provider/index.js';
-export * from './tagging_data_provider/index.js';
+export * from './address_store/index.js';
+export * from './capsule_store/index.js';
+export * from './contract_store/index.js';
+export * from './note_store/index.js';
+export * from './anchor_block_store/index.js';
+export * from './tagging_store/index.js';
 export * from './metadata.js';
-export * from './private_event_data_provider/private_event_data_provider.js';
+export * from './private_event_store/private_event_store.js';

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

@@ -0,0 +1,3 @@
+export { NoteDao } from '@aztec/stdlib/note';
+export { NoteStore } from './note_store.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdG9yYWdlL25vdGVfc3RvcmUvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQzdDLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQyJ9

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/storage/note_store/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC"}

package/dest/storage/note_store/index.js

@@ -0,0 +1,2 @@
+export { NoteDao } from '@aztec/stdlib/note';
+export { NoteStore } from './note_store.js';

package/dest/storage/{note_data_provider/note_data_provider.d.ts → note_store/note_store.d.ts}

@@ -1,28 +1,28 @@
-import type { Fr } from '@aztec/foundation/fields';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import { 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';
 /**
- * NoteDataProvider manages the storage and retrieval of notes.
+ * 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.
  **/
-export declare class NoteDataProvider {
+export declare class NoteStore {
     #private;
     private constructor();
     /**
-     * Creates and initializes a new NoteDataProvider instance.
+     * Creates and initializes a new NoteStore instance.
      *
-     * This factory method creates a NoteDataProvider and restores any existing
+     * This factory method creates a NoteStore and restores any existing
      * scope-specific indexes from the database.
      *
      * @param store - The key-value store to use for persistence
-     * @returns Promise resolving to a fully initialized NoteDataProvider instance
+     * @returns Promise resolving to a fully initialized NoteStore instance
      */
-    static create(store: AztecAsyncKVStore): Promise<NoteDataProvider>;
+    static create(store: AztecAsyncKVStore): Promise<NoteStore>;
     /**
      * Adds a new scope to the note data provider.
      *
@@ -36,9 +36,8 @@ export declare class NoteDataProvider {
     /**
      * Adds multiple notes to the data provider under the specified scope.
      *
-     * Notes are stored using their index from the notes hash tree as the key, which provides
-     * uniqueness and maintains creation order. Each note is indexed by multiple criteria
-     * for efficient retrieval.
+     * Notes are stored using their siloedNullifier as the key, which provides uniqueness. Each note is indexed
+     * by multiple criteria for efficient retrieval.
      *
      * @param notes - Notes to store
      * @param scope - The scope (user/account) under which to store the notes
@@ -51,10 +50,12 @@ export declare class NoteDataProvider {
      * 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.
      *
@@ -63,7 +64,8 @@ export declare class NoteDataProvider {
      *
      * @param filter - Filter criteria including contractAddress (required), and optional
      *                 owner, storageSlot, status, scopes, and siloedNullifier.
-     * @returns Promise resolving to array of NoteDao objects matching the filter
+     * @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[]>;
@@ -80,4 +82,4 @@ export declare class NoteDataProvider {
      */
     applyNullifiers(nullifiers: DataInBlock<Fr>[]): Promise<NoteDao[]>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm90ZV9kYXRhX3Byb3ZpZGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc3RvcmFnZS9ub3RlX2RhdGFfcHJvdmlkZXIvbm90ZV9kYXRhX3Byb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRW5ELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFxQyxNQUFNLGlCQUFpQixDQUFDO0FBQzVGLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUMzRCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUN2RCxPQUFPLEVBQWMsS0FBSyxXQUFXLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNsRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFN0M7Ozs7O0lBS0k7QUFDSixxQkFBYSxnQkFBZ0I7O0lBaUIzQixPQUFPLGVBZ0JOO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDSCxPQUFvQixNQUFNLENBQUMsS0FBSyxFQUFFLGlCQUFpQixHQUFHLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQU85RTtJQUVEOzs7Ozs7OztPQVFHO0lBQ1UsUUFBUSxDQUFDLEtBQUssRUFBRSxZQUFZLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQVkzRDtJQUVEOzs7Ozs7Ozs7T0FTRztJQUNILFFBQVEsQ0FBQyxLQUFLLEVBQUUsT0FBTyxFQUFFLEVBQUUsS0FBSyxFQUFFLFlBQVksR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBZ0I3RDtJQUVEOzs7Ozs7Ozs7T0FTRztJQUNVLDBCQUEwQixDQUFDLFdBQVcsRUFBRSxNQUFNLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FHdEc7SUF1RkQ7Ozs7Ozs7Ozs7T0FVRztJQUNHLFFBQVEsQ0FBQyxNQUFNLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQWdHdEQ7SUFFRDs7Ozs7Ozs7OztPQVVHO0lBQ0gsZUFBZSxDQUFDLFVBQVUsRUFBRSxXQUFXLENBQUMsRUFBRSxDQUFDLEVBQUUsR0FBRyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUMsQ0E4RGpFO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm90ZV9zdG9yZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3N0b3JhZ2Uvbm90ZV9zdG9yZS9ub3RlX3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXpELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFxQyxNQUFNLGlCQUFpQixDQUFDO0FBQzVGLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUMzRCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUN2RCxPQUFPLEVBQWMsS0FBSyxXQUFXLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNsRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFN0M7Ozs7O0lBS0k7QUFDSixxQkFBYSxTQUFTOztJQTRCcEIsT0FBTyxlQWNOO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDSCxPQUFvQixNQUFNLENBQUMsS0FBSyxFQUFFLGlCQUFpQixHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FPdkU7SUFFRDs7Ozs7Ozs7T0FRRztJQUNVLFFBQVEsQ0FBQyxLQUFLLEVBQUUsWUFBWSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FZM0Q7SUFFRDs7Ozs7Ozs7T0FRRztJQUNILFFBQVEsQ0FBQyxLQUFLLEVBQUUsT0FBTyxFQUFFLEVBQUUsS0FBSyxFQUFFLFlBQVksR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBZTdEO0lBRUQ7Ozs7Ozs7Ozs7O09BV0c7SUFDVSxRQUFRLENBQUMsV0FBVyxFQUFFLE1BQU0sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUdwRjtJQWlGRDs7Ozs7Ozs7Ozs7T0FXRztJQUNHLFFBQVEsQ0FBQyxNQUFNLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQW1IdEQ7SUFFRDs7Ozs7Ozs7OztPQVVHO0lBQ0gsZUFBZSxDQUFDLFVBQVUsRUFBRSxXQUFXLENBQUMsRUFBRSxDQUFDLEVBQUUsR0FBRyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FvRGpFO0NBQ0YifQ==

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

@@ -0,0 +1 @@
+{"version":3,"file":"note_store.d.ts","sourceRoot":"","sources":["../../../src/storage/note_store/note_store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD,OAAO,KAAK,EAAE,iBAAiB,EAAqC,MAAM,iBAAiB,CAAC;AAC5F,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAc,KAAK,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C;;;;;IAKI;AACJ,qBAAa,SAAS;;IA4BpB,OAAO,eAcN;IAED;;;;;;;;OAQG;IACH,OAAoB,MAAM,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,SAAS,CAAC,CAOvE;IAED;;;;;;;;OAQG;IACU,QAAQ,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,CAY3D;IAED;;;;;;;;OAQG;IACH,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAe7D;IAED;;;;;;;;;;;OAWG;IACU,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAGpF;IAiFD;;;;;;;;;;;OAWG;IACG,QAAQ,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAmHtD;IAED;;;;;;;;;;OAUG;IACH,eAAe,CAAC,UAAU,EAAE,WAAW,CAAC,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAoDjE;CACF"}

package/dest/storage/{note_data_provider/note_data_provider.js → note_store/note_store.js}

@@ -1,52 +1,48 @@
-import { toBufferBE } from '@aztec/foundation/bigint-buffer';
 import { toArray } from '@aztec/foundation/iterable';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { NoteStatus } from '@aztec/stdlib/note';
 import { NoteDao } from '@aztec/stdlib/note';
 /**
- * NoteDataProvider manages the storage and retrieval of notes.
+ * 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.
- **/ export class NoteDataProvider {
+ **/ export class NoteStore {
     #store;
-    #notes;
-    #nullifiedNotes;
-    #nullifierToNoteId;
-    #nullifiersByBlockNumber;
-    #nullifiedNotesToScope;
-    #nullifiedNotesByContract;
-    #nullifiedNotesByStorageSlot;
-    #nullifiedNotesByNullifier;
-    #scopes;
-    #notesToScope;
-    #notesByContractAndScope;
-    #notesByStorageSlotAndScope;
+    // Note that we use the siloedNullifier as the note id in the store as it's guaranteed to be unique.
+    /** noteId (siloedNullifier) -> NoteDao (serialized) */ #notes;
+    /** noteId (siloedNullifier) -> NoteDao (serialized) */ #nullifiedNotes;
+    /** blockNumber -> siloedNullifier */ #nullifiersByBlockNumber;
+    /** noteId (siloedNullifier) -> scope */ #nullifiedNotesToScope;
+    /** contractAddress -> noteId (siloedNullifier) */ #nullifiedNotesByContract;
+    /** storageSlot -> noteId (siloedNullifier) */ #nullifiedNotesByStorageSlot;
+    /** scope (AztecAddress) -> true */ #scopes;
+    /** noteId (siloedNullifier) -> scope */ #notesToScope;
+    /** scope -> MultiMap(contractAddress -> noteId) */ #notesByContractAndScope;
+    /** scope -> MultiMap(storageSlot -> noteId) */ #notesByStorageSlotAndScope;
     constructor(store){
         this.#store = store;
         this.#notes = store.openMap('notes');
         this.#nullifiedNotes = store.openMap('nullified_notes');
-        this.#nullifierToNoteId = store.openMap('nullifier_to_note');
         this.#nullifiersByBlockNumber = store.openMultiMap('nullifier_to_block_number');
         this.#nullifiedNotesToScope = store.openMultiMap('nullified_notes_to_scope');
         this.#nullifiedNotesByContract = store.openMultiMap('nullified_notes_by_contract');
         this.#nullifiedNotesByStorageSlot = store.openMultiMap('nullified_notes_by_storage_slot');
-        this.#nullifiedNotesByNullifier = store.openMap('nullified_notes_by_nullifier');
         this.#scopes = store.openMap('scopes');
         this.#notesToScope = store.openMultiMap('notes_to_scope');
         this.#notesByContractAndScope = new Map();
         this.#notesByStorageSlotAndScope = new Map();
     }
     /**
-   * Creates and initializes a new NoteDataProvider instance.
+   * Creates and initializes a new NoteStore instance.
    *
-   * This factory method creates a NoteDataProvider and restores any existing
+   * This factory method creates a NoteStore and restores any existing
    * scope-specific indexes from the database.
    *
    * @param store - The key-value store to use for persistence
-   * @returns Promise resolving to a fully initialized NoteDataProvider instance
+   * @returns Promise resolving to a fully initialized NoteStore instance
    */ static async create(store) {
-        const pxeDB = new NoteDataProvider(store);
+        const pxeDB = new NoteStore(store);
         for await (const scope of pxeDB.#scopes.keysAsync()){
             pxeDB.#notesByContractAndScope.set(scope, store.openMultiMap(`${scope}:notes_by_contract`));
             pxeDB.#notesByStorageSlotAndScope.set(scope, store.openMultiMap(`${scope}:notes_by_storage_slot`));
@@ -74,9 +70,8 @@ import { NoteDao } from '@aztec/stdlib/note';
     /**
    * Adds multiple notes to the data provider under the specified scope.
    *
-   * Notes are stored using their index from the notes hash tree as the key, which provides
-   * uniqueness and maintains creation order. Each note is indexed by multiple criteria
-   * for efficient retrieval.
+   * Notes are stored using their siloedNullifier as the key, which provides uniqueness. Each note is indexed
+   * by multiple criteria for efficient retrieval.
    *
    * @param notes - Notes to store
    * @param scope - The scope (user/account) under which to store the notes
@@ -86,12 +81,11 @@ import { NoteDao } from '@aztec/stdlib/note';
                 await this.addScope(scope);
             }
             for (const dao of notes){
-                const noteIndex = toBufferBE(dao.index, 32).toString('hex');
-                await this.#notes.set(noteIndex, dao.toBuffer());
-                await this.#notesToScope.set(noteIndex, scope.toString());
-                await this.#nullifierToNoteId.set(dao.siloedNullifier.toString(), noteIndex);
-                await this.#notesByContractAndScope.get(scope.toString()).set(dao.contractAddress.toString(), noteIndex);
-                await this.#notesByStorageSlotAndScope.get(scope.toString()).set(dao.storageSlot.toString(), noteIndex);
+                const noteId = dao.siloedNullifier.toString();
+                await this.#notes.set(noteId, dao.toBuffer());
+                await this.#notesToScope.set(noteId, scope.toString());
+                await this.#notesByContractAndScope.get(scope.toString()).set(dao.contractAddress.toString(), noteId);
+                await this.#notesByStorageSlotAndScope.get(scope.toString()).set(dao.storageSlot.toString(), noteId);
             }
         });
     }
@@ -102,9 +96,11 @@ import { NoteDao } from '@aztec/stdlib/note';
    * 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.
-   */ async rollbackNotesAndNullifiers(blockNumber, synchedBlockNumber) {
+   */ async rollback(blockNumber, synchedBlockNumber) {
         await this.#rewindNullifiersAfterBlock(blockNumber, synchedBlockNumber);
         await this.#deleteActiveNotesAfterBlock(blockNumber);
     }
@@ -115,24 +111,21 @@ import { NoteDao } from '@aztec/stdlib/note';
    * Note: This only affects #notes (active notes), not #nullifiedNotes.
    *
    * @param blockNumber - Notes created after this block number will be deleted
-   */ #deleteActiveNotesAfterBlock(blockNumber) {
-        return this.#store.transactionAsync(async ()=>{
-            const notes = await toArray(this.#notes.valuesAsync());
-            for (const note of notes){
-                const noteDao = NoteDao.fromBuffer(note);
-                if (noteDao.l2BlockNumber > blockNumber) {
-                    const noteIndex = toBufferBE(noteDao.index, 32).toString('hex');
-                    await this.#notes.delete(noteIndex);
-                    await this.#notesToScope.delete(noteIndex);
-                    await this.#nullifierToNoteId.delete(noteDao.siloedNullifier.toString());
-                    const scopes = await toArray(this.#scopes.keysAsync());
-                    for (const scope of scopes){
-                        await this.#notesByContractAndScope.get(scope).deleteValue(noteDao.contractAddress.toString(), noteIndex);
-                        await this.#notesByStorageSlotAndScope.get(scope).deleteValue(noteDao.storageSlot.toString(), noteIndex);
-                    }
+   */ async #deleteActiveNotesAfterBlock(blockNumber) {
+        const notes = await toArray(this.#notes.valuesAsync());
+        for (const note of notes){
+            const noteDao = NoteDao.fromBuffer(note);
+            if (noteDao.l2BlockNumber > blockNumber) {
+                const noteId = noteDao.siloedNullifier.toString();
+                await this.#notes.delete(noteId);
+                await this.#notesToScope.delete(noteId);
+                const scopes = await toArray(this.#scopes.keysAsync());
+                for (const scope of scopes){
+                    await this.#notesByContractAndScope.get(scope).deleteValue(noteDao.contractAddress.toString(), noteId);
+                    await this.#notesByStorageSlotAndScope.get(scope).deleteValue(noteDao.storageSlot.toString(), noteId);
                 }
             }
-        });
+        }
     }
     /**
    * Rewinds nullifications after a given block number.
@@ -144,39 +137,38 @@ import { NoteDao } from '@aztec/stdlib/note';
    * @param blockNumber - Revert nullifications that occurred after this block
    * @param synchedBlockNumber - Upper bound for the block range to process
    */ async #rewindNullifiersAfterBlock(blockNumber, synchedBlockNumber) {
-        await this.#store.transactionAsync(async ()=>{
-            const nullifiersToUndo = [];
-            const currentBlockNumber = blockNumber + 1;
-            for(let i = currentBlockNumber; i <= synchedBlockNumber; i++){
-                nullifiersToUndo.push(...await toArray(this.#nullifiersByBlockNumber.getValuesAsync(i)));
+        const noteIdsToReinsert = [];
+        const currentBlockNumber = blockNumber + 1;
+        for(let i = currentBlockNumber; i <= synchedBlockNumber; i++){
+            // noteId === siloedNullifier.toString(), so we can use nullifiers directly as noteIds
+            noteIdsToReinsert.push(...await toArray(this.#nullifiersByBlockNumber.getValuesAsync(i)));
+        }
+        const nullifiedNoteBuffers = await Promise.all(noteIdsToReinsert.map((noteId)=>this.#nullifiedNotes.getAsync(noteId)));
+        const noteDaos = nullifiedNoteBuffers.filter((buffer)=>buffer != undefined).map((buffer)=>NoteDao.fromBuffer(buffer));
+        for (const dao of noteDaos){
+            const noteId = dao.siloedNullifier.toString();
+            const scopes = await toArray(this.#nullifiedNotesToScope.getValuesAsync(noteId));
+            if (scopes.length === 0) {
+                // We should never run into this error because notes always have a scope assigned to them - either on initial
+                // insertion via `addNotes` or when removing their nullifiers.
+                throw new Error(`No scopes found for nullified note with nullifier ${noteId}`);
             }
-            const notesIndexesToReinsert = await Promise.all(nullifiersToUndo.map((nullifier)=>this.#nullifiedNotesByNullifier.getAsync(nullifier)));
-            const notNullNoteIndexes = notesIndexesToReinsert.filter((noteIndex)=>noteIndex != undefined);
-            const nullifiedNoteBuffers = await Promise.all(notNullNoteIndexes.map((noteIndex)=>this.#nullifiedNotes.getAsync(noteIndex)));
-            const noteDaos = nullifiedNoteBuffers.filter((buffer)=>buffer != undefined).map((buffer)=>NoteDao.fromBuffer(buffer));
-            for (const dao of noteDaos){
-                const noteIndex = toBufferBE(dao.index, 32).toString('hex');
-                await this.#notes.set(noteIndex, dao.toBuffer());
-                await this.#nullifierToNoteId.set(dao.siloedNullifier.toString(), noteIndex);
-                const scopes = await toArray(this.#nullifiedNotesToScope.getValuesAsync(noteIndex));
-                if (scopes.length === 0) {
-                    // We should never run into this error because notes always have a scope assigned to them - either on initial
-                    // insertion via `addNotes` or when removing their nullifiers.
-                    throw new Error(`No scopes found for nullified note with index ${noteIndex}`);
-                }
-                for (const scope of scopes){
-                    await this.#notesByContractAndScope.get(scope.toString()).set(dao.contractAddress.toString(), noteIndex);
-                    await this.#notesByStorageSlotAndScope.get(scope.toString()).set(dao.storageSlot.toString(), noteIndex);
-                    await this.#notesToScope.set(noteIndex, scope);
-                }
-                await this.#nullifiedNotes.delete(noteIndex);
-                await this.#nullifiedNotesToScope.delete(noteIndex);
-                await this.#nullifiersByBlockNumber.deleteValue(dao.l2BlockNumber, dao.siloedNullifier.toString());
-                await this.#nullifiedNotesByContract.deleteValue(dao.contractAddress.toString(), noteIndex);
-                await this.#nullifiedNotesByStorageSlot.deleteValue(dao.storageSlot.toString(), noteIndex);
-                await this.#nullifiedNotesByNullifier.delete(dao.siloedNullifier.toString());
+            for (const scope of scopes){
+                await Promise.all([
+                    this.#notesByContractAndScope.get(scope.toString()).set(dao.contractAddress.toString(), noteId),
+                    this.#notesByStorageSlotAndScope.get(scope.toString()).set(dao.storageSlot.toString(), noteId),
+                    this.#notesToScope.set(noteId, scope)
+                ]);
             }
-        });
+            await Promise.all([
+                this.#notes.set(noteId, dao.toBuffer()),
+                this.#nullifiedNotes.delete(noteId),
+                this.#nullifiedNotesToScope.delete(noteId),
+                this.#nullifiersByBlockNumber.deleteValue(dao.l2BlockNumber, dao.siloedNullifier.toString()),
+                this.#nullifiedNotesByContract.deleteValue(dao.contractAddress.toString(), noteId),
+                this.#nullifiedNotesByStorageSlot.deleteValue(dao.storageSlot.toString(), noteId)
+            ]);
+        }
     }
     /**
    * Retrieves notes based on the provided filter criteria.
@@ -186,7 +178,8 @@ import { NoteDao } from '@aztec/stdlib/note';
    *
    * @param filter - Filter criteria including contractAddress (required), and optional
    *                 owner, storageSlot, status, scopes, and siloedNullifier.
-   * @returns Promise resolving to array of NoteDao objects matching the filter
+   * @returns Filtered and deduplicated notes (a note might be present in multiple scopes - we ensure it is only
+   * returned once if this is the case)
    * @throws If filtering by an empty scopes array. Scopes have to be set to undefined or to a non-empty array.
    */ async getNotes(filter) {
         filter.status = filter.status ?? NoteStatus.ACTIVE;
@@ -249,7 +242,24 @@ import { NoteDao } from '@aztec/stdlib/note';
                 result.push(note);
             }
         }
-        return result;
+        // A note might be present in multiple scopes - we ensure it is only returned once
+        const deduplicated = [];
+        for (const note of result){
+            if (!deduplicated.some((existing)=>existing.equals(note))) {
+                deduplicated.push(note);
+            }
+        }
+        // Sort by block number, then by tx index within block, then by note index within tx
+        deduplicated.sort((a, b)=>{
+            if (a.l2BlockNumber !== b.l2BlockNumber) {
+                return a.l2BlockNumber - b.l2BlockNumber;
+            }
+            if (a.txIndexInBlock !== b.txIndexInBlock) {
+                return a.txIndexInBlock - b.txIndexInBlock;
+            }
+            return a.noteIndexInTx - b.noteIndexInTx;
+        });
+        return deduplicated;
     }
     /**
    * Transitions notes from "active" to "nullified" state.
@@ -269,21 +279,16 @@ import { NoteDao } from '@aztec/stdlib/note';
             const nullifiedNotes = [];
             for (const blockScopedNullifier of nullifiers){
                 const { data: nullifier, l2BlockNumber: blockNumber } = blockScopedNullifier;
-                const nullifierKey = nullifier.toString();
-                const noteIndex = await this.#nullifierToNoteId.getAsync(nullifierKey);
-                if (!noteIndex) {
-                    // Check if already nullified?
-                    const alreadyNullified = await this.#nullifiedNotesByNullifier.getAsync(nullifierKey);
-                    if (alreadyNullified) {
+                const noteId = nullifier.toString();
+                const noteBuffer = await this.#notes.getAsync(noteId);
+                if (!noteBuffer) {
+                    // Check if already nullified (noteId === siloedNullifier, so we can check #nullifiedNotes directly)
+                    if (await this.#nullifiedNotes.hasAsync(noteId)) {
                         throw new Error(`Nullifier already applied in applyNullifiers`);
                     }
                     throw new Error('Nullifier not found in applyNullifiers');
                 }
-                const noteBuffer = noteIndex ? await this.#notes.getAsync(noteIndex) : undefined;
-                if (!noteBuffer) {
-                    throw new Error('Note not found in applyNullifiers');
-                }
-                const noteScopes = await toArray(this.#notesToScope.getValuesAsync(noteIndex));
+                const noteScopes = await toArray(this.#notesToScope.getValuesAsync(noteId));
                 if (noteScopes.length === 0) {
                     // We should never run into this error because notes always have a scope assigned to them - either on initial
                     // insertion via `addNotes` or when removing their nullifiers.
@@ -291,22 +296,20 @@ import { NoteDao } from '@aztec/stdlib/note';
                 }
                 const note = NoteDao.fromBuffer(noteBuffer);
                 nullifiedNotes.push(note);
-                await this.#notes.delete(noteIndex);
-                await this.#notesToScope.delete(noteIndex);
+                await this.#notes.delete(noteId);
+                await this.#notesToScope.delete(noteId);
                 const scopes = await toArray(this.#scopes.keysAsync());
                 for (const scope of scopes){
-                    await this.#notesByContractAndScope.get(scope).deleteValue(note.contractAddress.toString(), noteIndex);
-                    await this.#notesByStorageSlotAndScope.get(scope).deleteValue(note.storageSlot.toString(), noteIndex);
+                    await this.#notesByContractAndScope.get(scope).deleteValue(note.contractAddress.toString(), noteId);
+                    await this.#notesByStorageSlotAndScope.get(scope).deleteValue(note.storageSlot.toString(), noteId);
                 }
                 for (const scope of noteScopes){
-                    await this.#nullifiedNotesToScope.set(noteIndex, scope);
+                    await this.#nullifiedNotesToScope.set(noteId, scope);
                 }
-                await this.#nullifiedNotes.set(noteIndex, note.toBuffer());
-                await this.#nullifiersByBlockNumber.set(blockNumber, nullifier.toString());
-                await this.#nullifiedNotesByContract.set(note.contractAddress.toString(), noteIndex);
-                await this.#nullifiedNotesByStorageSlot.set(note.storageSlot.toString(), noteIndex);
-                await this.#nullifiedNotesByNullifier.set(nullifier.toString(), noteIndex);
-                await this.#nullifierToNoteId.delete(nullifier.toString());
+                await this.#nullifiedNotes.set(noteId, note.toBuffer());
+                await this.#nullifiersByBlockNumber.set(blockNumber, noteId);
+                await this.#nullifiedNotesByContract.set(note.contractAddress.toString(), noteId);
+                await this.#nullifiedNotesByStorageSlot.set(note.storageSlot.toString(), noteId);
             }
             return nullifiedNotes;
         });

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

@@ -0,0 +1,78 @@
+import { Fr } from '@aztec/foundation/curves/bn254';
+import type { AztecAsyncKVStore } from '@aztec/kv-store';
+import type { EventSelector } from '@aztec/stdlib/abi';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { type InTx, TxHash } from '@aztec/stdlib/tx';
+import type { StagedStore } from '../../job_coordinator/job_coordinator.js';
+import type { PackedPrivateEvent } from '../../pxe.js';
+export type PrivateEventStoreFilter = {
+    contractAddress: AztecAddress;
+    fromBlock: number;
+    toBlock: number;
+    scopes: AztecAddress[];
+    txHash?: TxHash;
+};
+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 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 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, 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.
+     * @param filter - Filtering criteria:
+     *  contractAddress: The address of the contract to get events from.
+     *  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 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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9ldmVudF9zdG9yZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3N0b3JhZ2UvcHJpdmF0ZV9ldmVudF9zdG9yZS9wcml2YXRlX2V2ZW50X3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUdwRCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBcUMsTUFBTSxpQkFBaUIsQ0FBQztBQUM1RixPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUN2RCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUVoRSxPQUFPLEVBQUUsS0FBSyxJQUFJLEVBQUUsTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFckQsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sMENBQTBDLENBQUM7QUFDNUUsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFdkQsTUFBTSxNQUFNLHVCQUF1QixHQUFHO0lBQ3BDLGVBQWUsRUFBRSxZQUFZLENBQUM7SUFDOUIsU0FBUyxFQUFFLE1BQU0sQ0FBQztJQUNsQixPQUFPLEVBQUUsTUFBTSxDQUFDO0lBQ2hCLE1BQU0sRUFBRSxZQUFZLEVBQUUsQ0FBQztJQUN2QixNQUFNLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDakIsQ0FBQztBQWdCRixLQUFLLG9CQUFvQixHQUFHLElBQUksR0FBRztJQUNqQyxlQUFlLEVBQUUsWUFBWSxDQUFDO0lBQzlCLEtBQUssRUFBRSxZQUFZLENBQUM7SUFDcEIsMkNBQTJDO0lBQzNDLGNBQWMsRUFBRSxNQUFNLENBQUM7SUFDdkIseUVBQXlFO0lBQ3pFLGNBQWMsRUFBRSxNQUFNLENBQUM7Q0FDeEIsQ0FBQztBQUVGOztHQUVHO0FBQ0gscUJBQWEsaUJBQWtCLFlBQVcsV0FBVzs7SUFDbkQsUUFBUSxDQUFDLFNBQVMsRUFBRSxNQUFNLENBQW1CO0lBZTdDLE1BQU0seUNBQXVDO0lBRTdDLFlBQVksS0FBSyxFQUFFLGlCQUFpQixFQVFuQztJQU1LLE1BQU0sQ0FBQyxLQUFLLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FlekM7SUFFRCxhQUFhLENBQUMsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBRzFDO0lBb0REOzs7Ozs7Ozs7OztPQVdHO0lBQ0gsb0JBQW9CLENBQ2xCLGFBQWEsRUFBRSxhQUFhLEVBQzVCLFVBQVUsRUFBRSxFQUFFLEVBQ2QsVUFBVSxFQUFFLEVBQUUsRUFBRSxFQUNoQixxQkFBcUIsRUFBRSxFQUFFLEVBQ3pCLFFBQVEsRUFBRSxvQkFBb0IsRUFDOUIsS0FBSyxFQUFFLE1BQU0sR0FDWixPQUFPLENBQUMsSUFBSSxDQUFDLENBa0NmO0lBRUQ7Ozs7Ozs7Ozs7T0FVRztJQUNVLGdCQUFnQixDQUMzQixhQUFhLEVBQUUsYUFBYSxFQUM1QixNQUFNLEVBQUUsdUJBQXVCLEdBQzlCLE9BQU8sQ0FBQyxrQkFBa0IsRUFBRSxDQUFDLENBdUQvQjtJQUVEOzs7Ozs7Ozs7Ozs7Ozs7O09BZ0JHO0lBQ1UsUUFBUSxDQUFDLFdBQVcsRUFBRSxNQUFNLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0E0QnBGO0NBQ0YifQ==

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

@@ -0,0 +1 @@
+{"version":3,"file":"private_event_store.d.ts","sourceRoot":"","sources":["../../../src/storage/private_event_store/private_event_store.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAGpD,OAAO,KAAK,EAAE,iBAAiB,EAAqC,MAAM,iBAAiB,CAAC;AAC5F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEvD,MAAM,MAAM,uBAAuB,GAAG;IACpC,eAAe,EAAE,YAAY,CAAC;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,YAAY,EAAE,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAgBF,KAAK,oBAAoB,GAAG,IAAI,GAAG;IACjC,eAAe,EAAE,YAAY,CAAC;IAC9B,KAAK,EAAE,YAAY,CAAC;IACpB,2CAA2C;IAC3C,cAAc,EAAE,MAAM,CAAC;IACvB,yEAAyE;IACzE,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF;;GAEG;AACH,qBAAa,iBAAkB,YAAW,WAAW;;IACnD,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAmB;IAe7C,MAAM,yCAAuC;IAE7C,YAAY,KAAK,EAAE,iBAAiB,EAQnC;IAMK,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAezC;IAED,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG1C;IAoDD;;;;;;;;;;;OAWG;IACH,oBAAoB,CAClB,aAAa,EAAE,aAAa,EAC5B,UAAU,EAAE,EAAE,EACd,UAAU,EAAE,EAAE,EAAE,EAChB,qBAAqB,EAAE,EAAE,EACzB,QAAQ,EAAE,oBAAoB,EAC9B,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC,CAkCf;IAED;;;;;;;;;;OAUG;IACU,gBAAgB,CAC3B,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,uBAAuB,GAC9B,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAuD/B;IAED;;;;;;;;;;;;;;;;OAgBG;IACU,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA4BpF;CACF"}