@aztec/pxe 0.60.0 → 0.62.0

package/dest/database/pxe_database_test_suite.js

@@ -1,5 +1,5 @@
 import { NoteStatus, randomTxHash } from '@aztec/circuit-types';
-import { AztecAddress, CompleteAddress, INITIAL_L2_BLOCK_NUM, PublicKeys, SerializableContractInstance, } from '@aztec/circuits.js';
+import { AztecAddress, CompleteAddress, INITIAL_L2_BLOCK_NUM, PublicKeys, SerializableContractInstance, computePoint, } from '@aztec/circuits.js';
 import { makeHeader } from '@aztec/circuits.js/testing';
 import { randomInt } from '@aztec/foundation/crypto';
 import { Fr, Point } from '@aztec/foundation/fields';
@@ -73,7 +73,7 @@ export function describePxeDatabase(getDatabase) {
                 [() => ({ txHash: randomTxHash() }), () => []],
                 [
                     () => ({ owner: owners[0].address }),
-                    () => notes.filter(note => note.ivpkM.equals(owners[0].publicKeys.masterIncomingViewingPublicKey)),
+                    () => notes.filter(note => note.addressPoint.equals(computePoint(owners[0].address))),
                 ],
                 [
                     () => ({ contractAddress: contractAddresses[0], storageSlot: storageSlots[0] }),
@@ -88,7 +88,7 @@ export function describePxeDatabase(getDatabase) {
                 notes = Array.from({ length: 10 }).map((_, i) => randomIncomingNoteDao({
                     contractAddress: contractAddresses[i % contractAddresses.length],
                     storageSlot: storageSlots[i % storageSlots.length],
-                    ivpkM: owners[i % owners.length].publicKeys.masterIncomingViewingPublicKey,
+                    addressPoint: computePoint(owners[i % owners.length].address),
                     index: BigInt(i),
                 }));
                 for (const owner of owners) {
@@ -111,17 +111,17 @@ export function describePxeDatabase(getDatabase) {
                 await database.addNotes(notes, []);
                 // Nullify all notes and use the same filter as other test cases
                 for (const owner of owners) {
-                    const notesToNullify = notes.filter(note => note.ivpkM.equals(owner.publicKeys.masterIncomingViewingPublicKey));
+                    const notesToNullify = notes.filter(note => note.addressPoint.equals(computePoint(owner.address)));
                     const nullifiers = notesToNullify.map(note => note.siloedNullifier);
-                    await expect(database.removeNullifiedNotes(nullifiers, owner.publicKeys.masterIncomingViewingPublicKey)).resolves.toEqual(notesToNullify);
+                    await expect(database.removeNullifiedNotes(nullifiers, computePoint(owner.address))).resolves.toEqual(notesToNullify);
                 }
                 await expect(database.getIncomingNotes({ ...getFilter(), status: NoteStatus.ACTIVE_OR_NULLIFIED })).resolves.toEqual(getExpected());
             });
             it('skips nullified notes by default or when requesting active', async () => {
                 await database.addNotes(notes, []);
-                const notesToNullify = notes.filter(note => note.ivpkM.equals(owners[0].publicKeys.masterIncomingViewingPublicKey));
+                const notesToNullify = notes.filter(note => note.addressPoint.equals(computePoint(owners[0].address)));
                 const nullifiers = notesToNullify.map(note => note.siloedNullifier);
-                await expect(database.removeNullifiedNotes(nullifiers, notesToNullify[0].ivpkM)).resolves.toEqual(notesToNullify);
+                await expect(database.removeNullifiedNotes(nullifiers, notesToNullify[0].addressPoint)).resolves.toEqual(notesToNullify);
                 const actualNotesWithDefault = await database.getIncomingNotes({});
                 const actualNotesWithActive = await database.getIncomingNotes({ status: NoteStatus.ACTIVE });
                 expect(actualNotesWithDefault).toEqual(actualNotesWithActive);
@@ -129,9 +129,9 @@ export function describePxeDatabase(getDatabase) {
             });
             it('returns active and nullified notes when requesting either', async () => {
                 await database.addNotes(notes, []);
-                const notesToNullify = notes.filter(note => note.ivpkM.equals(owners[0].publicKeys.masterIncomingViewingPublicKey));
+                const notesToNullify = notes.filter(note => note.addressPoint.equals(computePoint(owners[0].address)));
                 const nullifiers = notesToNullify.map(note => note.siloedNullifier);
-                await expect(database.removeNullifiedNotes(nullifiers, notesToNullify[0].ivpkM)).resolves.toEqual(notesToNullify);
+                await expect(database.removeNullifiedNotes(nullifiers, notesToNullify[0].addressPoint)).resolves.toEqual(notesToNullify);
                 const result = await database.getIncomingNotes({
                     status: NoteStatus.ACTIVE_OR_NULLIFIED,
                 });
@@ -168,7 +168,7 @@ export function describePxeDatabase(getDatabase) {
                 await expect(database.getIncomingNotes({
                     scopes: [owners[1].address],
                 })).resolves.toEqual([notes[0]]);
-                await expect(database.removeNullifiedNotes([notes[0].siloedNullifier], owners[0].publicKeys.masterIncomingViewingPublicKey)).resolves.toEqual([notes[0]]);
+                await expect(database.removeNullifiedNotes([notes[0].siloedNullifier], computePoint(owners[0].address))).resolves.toEqual([notes[0]]);
                 await expect(database.getIncomingNotes({
                     scopes: [owners[0].address],
                 })).resolves.toEqual([]);
@@ -283,4 +283,4 @@ export function describePxeDatabase(getDatabase) {
         });
     });
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"pxe_database_test_suite.js","sourceRoot":"","sources":["../../src/database/pxe_database_test_suite.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"pxe_database_test_suite.js","sourceRoot":"","sources":["../../src/database/pxe_database_test_suite.ts"],"names":[],"mappings":"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"}

package/dest/index.d.ts

@@ -2,7 +2,7 @@ export * from './pxe_service/index.js';
 export * from './pxe_http/index.js';
 export * from './config/index.js';
 export { Tx, TxHash } from '@aztec/circuit-types';
-export { TxRequest, PartialAddress } from '@aztec/circuits.js';
+export { TxRequest } from '@aztec/circuits.js';
 export * from '@aztec/foundation/fields';
 export * from '@aztec/foundation/eth-address';
 export * from '@aztec/foundation/aztec-address';

package/dest/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAElC,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC/D,cAAc,0BAA0B,CAAC;AACzC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC;AAChD,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kDAAkD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAElC,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,cAAc,0BAA0B,CAAC;AACzC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC;AAChD,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kDAAkD,CAAC"}

package/dest/index.js

@@ -10,4 +10,4 @@ export * from '@aztec/key-store';
 export * from './database/index.js';
 export { ContractDataOracle } from './contract_data_oracle/index.js';
 export { PrivateFunctionsTree } from './contract_data_oracle/private_functions_tree.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyx3QkFBd0IsQ0FBQztBQUN2QyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsbUJBQW1CLENBQUM7QUFFbEMsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUVsRCxPQUFPLEVBQUUsU0FBUyxFQUFrQixNQUFNLG9CQUFvQixDQUFDO0FBQy9ELGNBQWMsMEJBQTBCLENBQUM7QUFDekMsY0FBYywrQkFBK0IsQ0FBQztBQUM5QyxjQUFjLGlDQUFpQyxDQUFDO0FBQ2hELGNBQWMsa0JBQWtCLENBQUM7QUFDakMsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNyRSxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxrREFBa0QsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyx3QkFBd0IsQ0FBQztBQUN2QyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsbUJBQW1CLENBQUM7QUFFbEMsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUVsRCxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDL0MsY0FBYywwQkFBMEIsQ0FBQztBQUN6QyxjQUFjLCtCQUErQixDQUFDO0FBQzlDLGNBQWMsaUNBQWlDLENBQUM7QUFDaEQsY0FBYyxrQkFBa0IsQ0FBQztBQUNqQyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3JFLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLGtEQUFrRCxDQUFDIn0=

package/dest/note_processor/note_processor.d.ts

@@ -15,10 +15,6 @@ import { type OutgoingNoteDao } from '../database/outgoing_note_dao.js';
  */
 export declare class NoteProcessor {
     readonly account: CompleteAddress;
-    /** The public counterpart to the secret key to be used in the decryption of incoming note logs. */
-    private readonly ivpkM;
-    /** The public counterpart to the secret key to be used in the decryption of outgoing note logs. */
-    private readonly ovpkM;
     private keyStore;
     private db;
     private node;
@@ -30,7 +26,7 @@ export declare class NoteProcessor {
     /** Stats accumulated for this processor. */
     readonly stats: NoteProcessorStats;
     private constructor();
-    static create(account: CompleteAddress, keyStore: KeyStore, db: PxeDatabase, node: AztecNode, startingBlock?: number, simulator?: AcirSimulator, log?: Logger): Promise<NoteProcessor>;
+    static create(account: CompleteAddress, keyStore: KeyStore, db: PxeDatabase, node: AztecNode, startingBlock?: number, simulator?: AcirSimulator, log?: Logger): NoteProcessor;
     /**
      * Check if the NoteProcessor is synchronized with the remote block number.
      * The function queries the remote block number from the AztecNode and compares it with the syncedToBlock value in the NoteProcessor.

package/dest/note_processor/note_processor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"note_processor.d.ts","sourceRoot":"","sources":["../../src/note_processor/note_processor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAiB,KAAK,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACnF,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAE,KAAK,eAAe,EAAgE,MAAM,oBAAoB,CAAC;AAExH,OAAO,EAAE,KAAK,MAAM,EAAqB,MAAM,uBAAuB,CAAC;AACvE,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEtD,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAgBxE;;;GAGG;AACH,qBAAa,aAAa;aAiBN,OAAO,EAAE,eAAe;IACxC,mGAAmG;IACnG,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,mGAAmG;IACnG,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,GAAG;IA1Bb,mEAAmE;IACnE,SAAgB,KAAK,EAAE,KAAK,CAAe;IAE3C,4CAA4C;IAC5C,SAAgB,KAAK,EAAE,kBAAkB,CASvC;IAEF,OAAO;WAca,MAAM,CACxB,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,QAAQ,EAClB,EAAE,EAAE,WAAW,EACf,IAAI,EAAE,SAAS,EACf,aAAa,GAAE,MAA6B,EAC5C,SAAS,gBAAuC,EAChD,GAAG,SAA4C;IAQjD;;;;;;OAMG;IACU,cAAc;IAK3B;;OAEG;IACH,IAAW,MAAM;;MAEhB;IAED,OAAO,CAAC,gBAAgB;IAIxB;;;;;OAKG;IACU,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA4GtD;;;;;;;;OAQG;YACW,qBAAqB;IA8BnC;;;;;OAKG;YACW,oBAAoB;IAuBlC;;;;;;;;OAQG;IACU,mBAAmB,CAAC,gBAAgB,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;QAC7E,aAAa,EAAE,eAAe,EAAE,CAAC;QACjC,aAAa,EAAE,eAAe,EAAE,CAAC;KAClC,CAAC;CA2DH"}
+{"version":3,"file":"note_processor.d.ts","sourceRoot":"","sources":["../../src/note_processor/note_processor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAiB,KAAK,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACnF,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EACL,KAAK,eAAe,EAKrB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,KAAK,MAAM,EAAqB,MAAM,uBAAuB,CAAC;AACvE,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEtD,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAgBxE;;;GAGG;AACH,qBAAa,aAAa;aAiBN,OAAO,EAAE,eAAe;IACxC,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,GAAG;IAtBb,mEAAmE;IACnE,SAAgB,KAAK,EAAE,KAAK,CAAe;IAE3C,4CAA4C;IAC5C,SAAgB,KAAK,EAAE,kBAAkB,CASvC;IAEF,OAAO;WAUO,MAAM,CAClB,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,QAAQ,EAClB,EAAE,EAAE,WAAW,EACf,IAAI,EAAE,SAAS,EACf,aAAa,GAAE,MAA6B,EAC5C,SAAS,gBAAuC,EAChD,GAAG,SAA4C;IAKjD;;;;;;OAMG;IACU,cAAc;IAK3B;;OAEG;IACH,IAAW,MAAM;;MAEhB;IAED,OAAO,CAAC,gBAAgB;IAIxB;;;;;OAKG;IACU,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA4HtD;;;;;;;;OAQG;YACW,qBAAqB;IA8BnC;;;;;OAKG;YACW,oBAAoB;IAuBlC;;;;;;;;OAQG;IACU,mBAAmB,CAAC,gBAAgB,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;QAC7E,aAAa,EAAE,eAAe,EAAE,CAAC;QACjC,aAAa,EAAE,eAAe,EAAE,CAAC;KAClC,CAAC;CAgDH"}

package/dest/note_processor/note_processor.js

@@ -1,5 +1,5 @@
 import { L1NotePayload } from '@aztec/circuit-types';
-import { INITIAL_L2_BLOCK_NUM, MAX_NOTE_HASHES_PER_TX } from '@aztec/circuits.js';
+import { INITIAL_L2_BLOCK_NUM, MAX_NOTE_HASHES_PER_TX, computeAddressSecret, computePoint, } from '@aztec/circuits.js';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
 import { getAcirSimulator } from '../simulator/index.js';
@@ -9,14 +9,8 @@ import { produceNoteDaos } from './utils/produce_note_daos.js';
  * before storing them against their owner.
  */
 export class NoteProcessor {
-    constructor(account, 
-    /** The public counterpart to the secret key to be used in the decryption of incoming note logs. */
-    ivpkM, 
-    /** The public counterpart to the secret key to be used in the decryption of outgoing note logs. */
-    ovpkM, keyStore, db, node, startingBlock, simulator, log) {
+    constructor(account, keyStore, db, node, startingBlock, simulator, log) {
         this.account = account;
-        this.ivpkM = ivpkM;
-        this.ovpkM = ovpkM;
         this.keyStore = keyStore;
         this.db = db;
         this.node = node;
@@ -37,10 +31,8 @@ export class NoteProcessor {
             txs: 0,
         };
     }
-    static async create(account, keyStore, db, node, startingBlock = INITIAL_L2_BLOCK_NUM, simulator = getAcirSimulator(db, node, keyStore), log = createDebugLogger('aztec:note_processor')) {
-        const ivpkM = await keyStore.getMasterIncomingViewingPublicKey(account.address);
-        const ovpkM = await keyStore.getMasterOutgoingViewingPublicKey(account.address);
-        return new NoteProcessor(account, ivpkM, ovpkM, keyStore, db, node, startingBlock, simulator, log);
+    static create(account, keyStore, db, node, startingBlock = INITIAL_L2_BLOCK_NUM, simulator = getAcirSimulator(db, node, keyStore), log = createDebugLogger('aztec:note_processor')) {
+        return new NoteProcessor(account, keyStore, db, node, startingBlock, simulator, log);
     }
     /**
      * Check if the NoteProcessor is synchronized with the remote block number.
@@ -60,7 +52,7 @@ export class NoteProcessor {
         return { syncedToBlock: this.getSyncedToBlock() };
     }
     getSyncedToBlock() {
-        return this.db.getSynchedBlockNumberForPublicKey(this.ivpkM) ?? this.startingBlock - 1;
+        return this.db.getSynchedBlockNumberForAccount(this.account.address) ?? this.startingBlock - 1;
     }
     /**
      * Extracts new user-relevant notes from the information contained in the provided L2 blocks and encrypted logs.
@@ -76,12 +68,14 @@ export class NoteProcessor {
         // Keep track of notes that we couldn't process because the contract was not found.
         const deferredIncomingNotes = [];
         const deferredOutgoingNotes = [];
-        const ivskM = await this.keyStore.getMasterSecretKey(this.ivpkM);
-        const ovskM = await this.keyStore.getMasterSecretKey(this.ovpkM);
+        const ivskM = await this.keyStore.getMasterSecretKey(this.account.publicKeys.masterIncomingViewingPublicKey);
+        const addressSecret = computeAddressSecret(this.account.getPreaddress(), ivskM);
+        const ovskM = await this.keyStore.getMasterSecretKey(this.account.publicKeys.masterOutgoingViewingPublicKey);
         // Iterate over both blocks and encrypted logs.
         for (const block of blocks) {
             this.stats.blocks++;
-            const { txLogs } = block.body.noteEncryptedLogs;
+            const { txLogs: encryptedTxLogs } = block.body.noteEncryptedLogs;
+            const { txLogs: unencryptedTxLogs } = block.body.unencryptedLogs;
             const dataStartIndexForBlock = block.header.state.partial.noteHashTree.nextAvailableLeafIndex -
                 block.body.numberOfTxsIncludingPadded * MAX_NOTE_HASHES_PER_TX;
             // We are using set for `userPertainingTxIndices` to avoid duplicates. This would happen in case there were
@@ -89,44 +83,50 @@ export class NoteProcessor {
             const incomingNotes = [];
             const outgoingNotes = [];
             // Iterate over all the encrypted logs and try decrypting them. If successful, store the note.
-            for (let indexOfTxInABlock = 0; indexOfTxInABlock < txLogs.length; ++indexOfTxInABlock) {
+            for (let indexOfTxInABlock = 0; indexOfTxInABlock < encryptedTxLogs.length; ++indexOfTxInABlock) {
                 this.stats.txs++;
                 const dataStartIndexForTx = dataStartIndexForBlock + indexOfTxInABlock * MAX_NOTE_HASHES_PER_TX;
                 const noteHashes = block.body.txEffects[indexOfTxInABlock].noteHashes;
                 // Note: Each tx generates a `TxL2Logs` object and for this reason we can rely on its index corresponding
                 //       to the index of a tx in a block.
-                const txFunctionLogs = txLogs[indexOfTxInABlock].functionLogs;
+                const encryptedTxFunctionLogs = encryptedTxLogs[indexOfTxInABlock].functionLogs;
+                const unencryptedTxFunctionLogs = unencryptedTxLogs[indexOfTxInABlock].functionLogs;
                 const excludedIndices = new Set();
-                for (const functionLogs of txFunctionLogs) {
-                    for (const log of functionLogs.logs) {
-                        this.stats.seen++;
-                        const incomingNotePayload = L1NotePayload.decryptAsIncoming(log, ivskM);
-                        const outgoingNotePayload = L1NotePayload.decryptAsOutgoing(log, ovskM);
-                        if (incomingNotePayload || outgoingNotePayload) {
-                            if (incomingNotePayload && outgoingNotePayload && !incomingNotePayload.equals(outgoingNotePayload)) {
-                                throw new Error(`Incoming and outgoing note payloads do not match. Incoming: ${JSON.stringify(incomingNotePayload)}, Outgoing: ${JSON.stringify(outgoingNotePayload)}`);
-                            }
-                            const payload = incomingNotePayload || outgoingNotePayload;
-                            const txEffect = block.body.txEffects[indexOfTxInABlock];
-                            const { incomingNote, outgoingNote, incomingDeferredNote, outgoingDeferredNote } = await produceNoteDaos(this.simulator, this.db, incomingNotePayload ? this.ivpkM : undefined, outgoingNotePayload ? this.ovpkM : undefined, payload, txEffect.txHash, noteHashes, dataStartIndexForTx, excludedIndices, this.log, txEffect.unencryptedLogs);
-                            if (incomingNote) {
-                                incomingNotes.push(incomingNote);
-                                this.stats.decryptedIncoming++;
-                            }
-                            if (outgoingNote) {
-                                outgoingNotes.push(outgoingNote);
-                                this.stats.decryptedOutgoing++;
-                            }
-                            if (incomingDeferredNote) {
-                                deferredIncomingNotes.push(incomingDeferredNote);
-                                this.stats.deferredIncoming++;
-                            }
-                            if (outgoingDeferredNote) {
-                                deferredOutgoingNotes.push(outgoingDeferredNote);
-                                this.stats.deferredOutgoing++;
-                            }
-                            if (incomingNote == undefined && outgoingNote == undefined && incomingDeferredNote == undefined) {
-                                this.stats.failed++;
+                // We iterate over both encrypted and unencrypted logs to decrypt the notes since partial notes are passed
+                // via the unencrypted logs stream.
+                for (const txFunctionLogs of [encryptedTxFunctionLogs, unencryptedTxFunctionLogs]) {
+                    const isFromPublic = txFunctionLogs === unencryptedTxFunctionLogs;
+                    for (const functionLogs of txFunctionLogs) {
+                        for (const unprocessedLog of functionLogs.logs) {
+                            this.stats.seen++;
+                            const incomingNotePayload = L1NotePayload.decryptAsIncoming(unprocessedLog.data, addressSecret, isFromPublic);
+                            const outgoingNotePayload = L1NotePayload.decryptAsOutgoing(unprocessedLog.data, ovskM, isFromPublic);
+                            if (incomingNotePayload || outgoingNotePayload) {
+                                if (incomingNotePayload && outgoingNotePayload && !incomingNotePayload.equals(outgoingNotePayload)) {
+                                    throw new Error(`Incoming and outgoing note payloads do not match. Incoming: ${JSON.stringify(incomingNotePayload)}, Outgoing: ${JSON.stringify(outgoingNotePayload)}`);
+                                }
+                                const payload = incomingNotePayload || outgoingNotePayload;
+                                const txEffect = block.body.txEffects[indexOfTxInABlock];
+                                const { incomingNote, outgoingNote, incomingDeferredNote, outgoingDeferredNote } = await produceNoteDaos(this.simulator, this.db, incomingNotePayload ? computePoint(this.account.address) : undefined, outgoingNotePayload ? this.account.publicKeys.masterOutgoingViewingPublicKey : undefined, payload, txEffect.txHash, noteHashes, dataStartIndexForTx, excludedIndices, this.log, txEffect.unencryptedLogs);
+                                if (incomingNote) {
+                                    incomingNotes.push(incomingNote);
+                                    this.stats.decryptedIncoming++;
+                                }
+                                if (outgoingNote) {
+                                    outgoingNotes.push(outgoingNote);
+                                    this.stats.decryptedOutgoing++;
+                                }
+                                if (incomingDeferredNote) {
+                                    deferredIncomingNotes.push(incomingDeferredNote);
+                                    this.stats.deferredIncoming++;
+                                }
+                                if (outgoingDeferredNote) {
+                                    deferredOutgoingNotes.push(outgoingDeferredNote);
+                                    this.stats.deferredOutgoing++;
+                                }
+                                if (incomingNote == undefined && outgoingNote == undefined && incomingDeferredNote == undefined) {
+                                    this.stats.failed++;
+                                }
                             }
                         }
                     }
@@ -141,7 +141,7 @@ export class NoteProcessor {
         await this.processBlocksAndNotes(blocksAndNotes);
         await this.processDeferredNotes(deferredIncomingNotes, deferredOutgoingNotes);
         const syncedToBlock = blocks[blocks.length - 1].number;
-        await this.db.setSynchedBlockNumberForPublicKey(this.ivpkM, syncedToBlock);
+        await this.db.setSynchedBlockNumberForAccount(this.account.address, syncedToBlock);
         this.log.debug(`Synched block ${syncedToBlock}`);
     }
     /**
@@ -166,7 +166,7 @@ export class NoteProcessor {
             });
         }
         const nullifiers = blocksAndNotes.flatMap(b => b.block.body.txEffects.flatMap(txEffect => txEffect.nullifiers));
-        const removedNotes = await this.db.removeNullifiedNotes(nullifiers, this.ivpkM);
+        const removedNotes = await this.db.removeNullifiedNotes(nullifiers, computePoint(this.account.address));
         removedNotes.forEach(noteDao => {
             this.log.verbose(`Removed note for contract ${noteDao.contractAddress} at slot ${noteDao.storageSlot} with nullifier ${noteDao.siloedNullifier.toString()}`);
         });
@@ -181,10 +181,10 @@ export class NoteProcessor {
         if (deferredIncomingNotes.length || deferredOutgoingNotes.length) {
             await this.db.addDeferredNotes([...deferredIncomingNotes, ...deferredOutgoingNotes]);
             deferredIncomingNotes.forEach(noteDao => {
-                this.log.verbose(`Deferred incoming note for contract ${noteDao.contractAddress} at slot ${noteDao.storageSlot} in tx ${noteDao.txHash.toString()}`);
+                this.log.verbose(`Deferred incoming note for contract ${noteDao.payload.contractAddress} at slot ${noteDao.payload.storageSlot} in tx ${noteDao.txHash.toString()}`);
             });
             deferredOutgoingNotes.forEach(noteDao => {
-                this.log.verbose(`Deferred outgoing note for contract ${noteDao.contractAddress} at slot ${noteDao.storageSlot} in tx ${noteDao.txHash.toString()}`);
+                this.log.verbose(`Deferred outgoing note for contract ${noteDao.payload.contractAddress} at slot ${noteDao.payload.storageSlot} in tx ${noteDao.txHash.toString()}`);
             });
         }
     }
@@ -202,15 +202,14 @@ export class NoteProcessor {
         const incomingNotes = [];
         const outgoingNotes = [];
         for (const deferredNote of deferredNoteDaos) {
-            const { publicKey, note, contractAddress, storageSlot, noteTypeId, txHash, noteHashes, dataStartIndexForTx, unencryptedLogs, } = deferredNote;
-            const payload = new L1NotePayload(note, contractAddress, storageSlot, noteTypeId);
-            const isIncoming = publicKey.equals(this.ivpkM);
-            const isOutgoing = publicKey.equals(this.ovpkM);
+            const { publicKey, payload, txHash, noteHashes, dataStartIndexForTx, unencryptedLogs } = deferredNote;
+            const isIncoming = publicKey.equals(computePoint(this.account.address));
+            const isOutgoing = publicKey.equals(this.account.publicKeys.masterOutgoingViewingPublicKey);
             if (!isIncoming && !isOutgoing) {
                 // The note does not belong to this note processor
                 continue;
             }
-            const { incomingNote, outgoingNote } = await produceNoteDaos(this.simulator, this.db, isIncoming ? this.ivpkM : undefined, isOutgoing ? this.ovpkM : undefined, payload, txHash, noteHashes, dataStartIndexForTx, excludedIndices, this.log, unencryptedLogs);
+            const { incomingNote, outgoingNote } = await produceNoteDaos(this.simulator, this.db, isIncoming ? computePoint(this.account.address) : undefined, isOutgoing ? this.account.publicKeys.masterOutgoingViewingPublicKey : undefined, payload, txHash, noteHashes, dataStartIndexForTx, excludedIndices, this.log, unencryptedLogs);
             if (isIncoming) {
                 if (!incomingNote) {
                     throw new Error('Deferred incoming note could not be decoded');
@@ -229,4 +228,4 @@ export class NoteProcessor {
         return { incomingNotes, outgoingNotes };
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"note_processor.js","sourceRoot":"","sources":["../../src/note_processor/note_processor.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"note_processor.js","sourceRoot":"","sources":["../../src/note_processor/note_processor.ts"],"names":[],"mappings":"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"}

package/dest/note_processor/utils/add_public_values_to_payload.d.ts

@@ -0,0 +1,10 @@
+import { type L1NotePayload, Note } from '@aztec/circuit-types';
+import { type PxeDatabase } from '../../database/pxe_database.js';
+/**
+ * Merges privately and publicly delivered note values.
+ * @param db - PXE database used to fetch contract instance and artifact.
+ * @param payload - Payload corresponding to the note.
+ * @returns Note payload with public fields added.
+ */
+export declare function getOrderedNoteItems(db: PxeDatabase, { contractAddress, noteTypeId, privateNoteValues, publicNoteValues }: L1NotePayload): Promise<Note>;
+//# sourceMappingURL=add_public_values_to_payload.d.ts.map

package/dest/note_processor/utils/add_public_values_to_payload.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"add_public_values_to_payload.d.ts","sourceRoot":"","sources":["../../../src/note_processor/utils/add_public_values_to_payload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAGhE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAElE;;;;;GAKG;AACH,wBAAsB,mBAAmB,CACvC,EAAE,EAAE,WAAW,EACf,EAAE,eAAe,EAAE,UAAU,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,EAAE,aAAa,GAClF,OAAO,CAAC,IAAI,CAAC,CAgDf"}

package/dest/note_processor/utils/add_public_values_to_payload.js

@@ -0,0 +1,48 @@
+import { Note } from '@aztec/circuit-types';
+import { ContractNotFoundError } from '@aztec/simulator';
+/**
+ * Merges privately and publicly delivered note values.
+ * @param db - PXE database used to fetch contract instance and artifact.
+ * @param payload - Payload corresponding to the note.
+ * @returns Note payload with public fields added.
+ */
+export async function getOrderedNoteItems(db, { contractAddress, noteTypeId, privateNoteValues, publicNoteValues }) {
+    if (publicNoteValues.length === 0) {
+        return new Note(privateNoteValues);
+    }
+    const instance = await db.getContractInstance(contractAddress);
+    if (!instance) {
+        throw new ContractNotFoundError(`Could not find instance for ${contractAddress.toString()}. This should never happen here as the partial notes flow should be triggered only for non-deferred notes.`);
+    }
+    const artifact = await db.getContractArtifact(instance.contractClassId);
+    if (!artifact) {
+        throw new Error(`Could not find artifact for contract class ${instance.contractClassId.toString()}. This should never happen here as the partial notes flow should be triggered only for non-deferred notes.`);
+    }
+    const noteFields = Object.values(artifact.notes).find(note => note.id.equals(noteTypeId))?.fields;
+    if (!noteFields) {
+        throw new Error(`Could not find note fields for note type ${noteTypeId.toString()}.`);
+    }
+    // We sort note fields by index so that we can iterate over them in order.
+    noteFields.sort((a, b) => a.index - b.index);
+    // Now we insert the public fields into the note based on its indices defined in the ABI.
+    const modifiedNoteItems = privateNoteValues;
+    let indexInPublicValues = 0;
+    for (let i = 0; i < noteFields.length; i++) {
+        const noteField = noteFields[i];
+        if (noteField.nullable) {
+            if (i == noteFields.length - 1) {
+                // We are processing the last field so we simply insert the rest of the public fields at the end
+                modifiedNoteItems.push(...publicNoteValues.slice(indexInPublicValues));
+            }
+            else {
+                const noteFieldLength = noteFields[i + 1].index - noteField.index;
+                const publicValuesToInsert = publicNoteValues.slice(indexInPublicValues, indexInPublicValues + noteFieldLength);
+                indexInPublicValues += noteFieldLength;
+                // Now we insert the public fields at the note field index
+                modifiedNoteItems.splice(noteField.index, 0, ...publicValuesToInsert);
+            }
+        }
+    }
+    return new Note(modifiedNoteItems);
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWRkX3B1YmxpY192YWx1ZXNfdG9fcGF5bG9hZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9ub3RlX3Byb2Nlc3Nvci91dGlscy9hZGRfcHVibGljX3ZhbHVlc190b19wYXlsb2FkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBc0IsSUFBSSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDaEUsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFJekQ7Ozs7O0dBS0c7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLG1CQUFtQixDQUN2QyxFQUFlLEVBQ2YsRUFBRSxlQUFlLEVBQUUsVUFBVSxFQUFFLGlCQUFpQixFQUFFLGdCQUFnQixFQUFpQjtJQUVuRixJQUFJLGdCQUFnQixDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUUsQ0FBQztRQUNsQyxPQUFPLElBQUksSUFBSSxDQUFDLGlCQUFpQixDQUFDLENBQUM7SUFDckMsQ0FBQztJQUVELE1BQU0sUUFBUSxHQUFHLE1BQU0sRUFBRSxDQUFDLG1CQUFtQixDQUFDLGVBQWUsQ0FBQyxDQUFDO0lBQy9ELElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUNkLE1BQU0sSUFBSSxxQkFBcUIsQ0FDN0IsK0JBQStCLGVBQWUsQ0FBQyxRQUFRLEVBQUUsNEdBQTRHLENBQ3RLLENBQUM7SUFDSixDQUFDO0lBRUQsTUFBTSxRQUFRLEdBQUcsTUFBTSxFQUFFLENBQUMsbUJBQW1CLENBQUMsUUFBUSxDQUFDLGVBQWUsQ0FBQyxDQUFDO0lBQ3hFLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUNkLE1BQU0sSUFBSSxLQUFLLENBQ2IsOENBQThDLFFBQVEsQ0FBQyxlQUFlLENBQUMsUUFBUSxFQUFFLDRHQUE0RyxDQUM5TCxDQUFDO0lBQ0osQ0FBQztJQUVELE1BQU0sVUFBVSxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBRWxHLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQztRQUNoQixNQUFNLElBQUksS0FBSyxDQUFDLDRDQUE0QyxVQUFVLENBQUMsUUFBUSxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQ3hGLENBQUM7SUFFRCwwRUFBMEU7SUFDMUUsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxLQUFLLEdBQUcsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBRTdDLHlGQUF5RjtJQUN6RixNQUFNLGlCQUFpQixHQUFHLGlCQUFpQixDQUFDO0lBQzVDLElBQUksbUJBQW1CLEdBQUcsQ0FBQyxDQUFDO0lBQzVCLEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxVQUFVLENBQUMsTUFBTSxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUM7UUFDM0MsTUFBTSxTQUFTLEdBQUcsVUFBVSxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ2hDLElBQUksU0FBUyxDQUFDLFFBQVEsRUFBRSxDQUFDO1lBQ3ZCLElBQUksQ0FBQyxJQUFJLFVBQVUsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFLENBQUM7Z0JBQy9CLGdHQUFnRztnQkFDaEcsaUJBQWlCLENBQUMsSUFBSSxDQUFDLEdBQUcsZ0JBQWdCLENBQUMsS0FBSyxDQUFDLG1CQUFtQixDQUFDLENBQUMsQ0FBQztZQUN6RSxDQUFDO2lCQUFNLENBQUM7Z0JBQ04sTUFBTSxlQUFlLEdBQUcsVUFBVSxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxLQUFLLEdBQUcsU0FBUyxDQUFDLEtBQUssQ0FBQztnQkFDbEUsTUFBTSxvQkFBb0IsR0FBRyxnQkFBZ0IsQ0FBQyxLQUFLLENBQUMsbUJBQW1CLEVBQUUsbUJBQW1CLEdBQUcsZUFBZSxDQUFDLENBQUM7Z0JBQ2hILG1CQUFtQixJQUFJLGVBQWUsQ0FBQztnQkFDdkMsMERBQTBEO2dCQUMxRCxpQkFBaUIsQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLEtBQUssRUFBRSxDQUFDLEVBQUUsR0FBRyxvQkFBb0IsQ0FBQyxDQUFDO1lBQ3hFLENBQUM7UUFDSCxDQUFDO0lBQ0gsQ0FBQztJQUVELE9BQU8sSUFBSSxJQUFJLENBQUMsaUJBQWlCLENBQUMsQ0FBQztBQUNyQyxDQUFDIn0=

package/dest/note_processor/utils/brute_force_note_info.d.ts

@@ -1,4 +1,6 @@
-import { type L1NotePayload, type TxHash } from '@aztec/circuit-types';
+import { type Note, type TxHash } from '@aztec/circuit-types';
+import { type AztecAddress } from '@aztec/circuits.js';
+import { type NoteSelector } from '@aztec/foundation/abi';
 import { Fr } from '@aztec/foundation/fields';
 import { type AcirSimulator } from '@aztec/simulator';
 export interface NoteInfo {
@@ -15,12 +17,15 @@ export interface NoteInfo {
  * @remarks This method assists in identifying spent notes in the note hash tree.
  * @param siloedNoteHashes - Note hashes in the tx. One of them should correspond to the note we are looking for
  * @param txHash - Hash of a tx the note was emitted in.
- * @param l1NotePayload - The note payload.
+ * @param contractAddress - Address of the contract the note was emitted in.
+ * @param storageSlot - Storage slot of the note.
+ * @param noteTypeId - Type of the note.
+ * @param note - Note items.
  * @param excludedIndices - Indices that have been assigned a note in the same tx. Notes in a tx can have the same
  * l1NotePayload. We need to find a different index for each replicate.
  * @param computeNullifier - A flag indicating whether to compute the nullifier or just return 0.
  * @returns Nonce, index, inner hash and siloed nullifier for a given note.
  * @throws If cannot find the nonce for the note.
  */
-export declare function bruteForceNoteInfo(simulator: AcirSimulator, siloedNoteHashes: Fr[], txHash: TxHash, { contractAddress, storageSlot, noteTypeId, note }: L1NotePayload, excludedIndices: Set<number>, computeNullifier: boolean): Promise<NoteInfo>;
+export declare function bruteForceNoteInfo(simulator: AcirSimulator, siloedNoteHashes: Fr[], txHash: TxHash, contractAddress: AztecAddress, storageSlot: Fr, noteTypeId: NoteSelector, note: Note, excludedIndices: Set<number>, computeNullifier: boolean): Promise<NoteInfo>;
 //# sourceMappingURL=brute_force_note_info.d.ts.map

package/dest/note_processor/utils/brute_force_note_info.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"brute_force_note_info.d.ts","sourceRoot":"","sources":["../../../src/note_processor/utils/brute_force_note_info.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAEvE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEtD,MAAM,WAAW,QAAQ;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,EAAE,CAAC;IACV,QAAQ,EAAE,EAAE,CAAC;IACb,eAAe,EAAE,EAAE,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,kBAAkB,CACtC,SAAS,EAAE,aAAa,EACxB,gBAAgB,EAAE,EAAE,EAAE,EACtB,MAAM,EAAE,MAAM,EACd,EAAE,eAAe,EAAE,WAAW,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,aAAa,EACjE,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,EAC5B,gBAAgB,EAAE,OAAO,GACxB,OAAO,CAAC,QAAQ,CAAC,CA+CnB"}
+{"version":3,"file":"brute_force_note_info.d.ts","sourceRoot":"","sources":["../../../src/note_processor/utils/brute_force_note_info.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAE,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEtD,MAAM,WAAW,QAAQ;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,EAAE,CAAC;IACV,QAAQ,EAAE,EAAE,CAAC;IACb,eAAe,EAAE,EAAE,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,kBAAkB,CACtC,SAAS,EAAE,aAAa,EACxB,gBAAgB,EAAE,EAAE,EAAE,EACtB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,YAAY,EAC7B,WAAW,EAAE,EAAE,EACf,UAAU,EAAE,YAAY,EACxB,IAAI,EAAE,IAAI,EACV,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,EAC5B,gBAAgB,EAAE,OAAO,GACxB,OAAO,CAAC,QAAQ,CAAC,CA+CnB"}