@aztec/stdlib 0.0.0-test.1 → 0.0.1-commit.5476d83

package/dest/note/note.d.ts

@@ -1,24 +1,42 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
+import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
-import { Payload } from '../logs/l1_payload/payload.js';
-export declare class Note extends Payload {
-    static get schema(): import("zod").ZodEffects<import("zod").ZodUnion<[import("zod").ZodEffects<import("zod").ZodEffects<import("zod").ZodString, string, string>, Buffer, string>, import("zod").ZodEffects<import("zod").ZodObject<{
-        type: import("zod").ZodLiteral<"Buffer">;
-        data: import("zod").ZodArray<import("zod").ZodNumber, "many">;
-    }, "strip", import("zod").ZodTypeAny, {
-        type: "Buffer";
-        data: number[];
-    }, {
-        type: "Buffer";
-        data: number[];
-    }>, Buffer, {
-        type: "Buffer";
-        data: number[];
-    }>]>, Note, string | {
-        type: "Buffer";
-        data: number[];
-    }>;
+import { Vector } from '../types/shared.js';
+/**
+ * The Note class represents a Note emitted from a Noir contract as a vector of Fr (finite field) elements.
+ * This data also represents a preimage to a note hash.
+ */
+export declare class Note extends Vector<Fr> {
+    toJSON(): Buffer<ArrayBufferLike>;
+    static get schema(): import("zod").ZodEffects<import("../schemas/index.js").ZodFor<Buffer<ArrayBufferLike>>, Note, any>;
+    /**
+     * Create a Note instance from a Buffer or BufferReader.
+     * The input 'buffer' can be either a Buffer containing the serialized Fr elements or a BufferReader instance.
+     * This function reads the Fr elements in the buffer and constructs a Note with them.
+     *
+     * @param buffer - The Buffer or BufferReader containing the serialized Fr elements.
+     * @returns A Note instance containing the deserialized Fr elements.
+     */
     static fromBuffer(buffer: Buffer | BufferReader): Note;
+    /**
+     * Generates a random Note instance with a variable number of items.
+     * The number of items is determined by a random value between 1 and 10 (inclusive).
+     * Each item in the Note is generated using the Fr.random() method.
+     *
+     * @returns A randomly generated Note instance.
+     */
+    static random(): Note;
+    /**
+     * Returns a hex representation of the note.
+     * @returns A hex string with the vector length as first element.
+     */
+    toString(): `0x${string}`;
+    /**
+     * Creates a new Note instance from a hex string.
+     * @param str - Hex representation.
+     * @returns A Note instance.
+     */
+    static fromString(str: string): Note;
+    get length(): number;
+    equals(other: Note): boolean;
 }
-//# sourceMappingURL=note.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm90ZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL25vdGUvbm90ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDOUMsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBSTNELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUU1Qzs7O0dBR0c7QUFDSCxxQkFBYSxJQUFLLFNBQVEsTUFBTSxDQUFDLEVBQUUsQ0FBQztJQUNsQyxNQUFNLDRCQUVMO0lBRUQsTUFBTSxLQUFLLE1BQU0sdUdBRWhCO0lBRUQ7Ozs7Ozs7T0FPRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLFFBRzlDO0lBRUQ7Ozs7OztPQU1HO0lBQ0gsTUFBTSxDQUFDLE1BQU0sU0FJWjtJQUVEOzs7T0FHRztJQUNNLFFBQVEsa0JBRWhCO0lBRUQ7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsR0FBRyxFQUFFLE1BQU0sUUFFNUI7SUFFRCxJQUFJLE1BQU0sV0FFVDtJQUVELE1BQU0sQ0FBQyxLQUFLLEVBQUUsSUFBSSxXQUVqQjtDQUNGIn0=

package/dest/note/note.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"note.d.ts","sourceRoot":"","sources":["../../src/note/note.ts"],"names":[],"mappings":";;AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAExD,qBAAa,IAAK,SAAQ,OAAO;IAC/B,WAAoB,MAAM;;;;;;;;;;;;;;;OAEzB;WAEe,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;CAIzD"}
+{"version":3,"file":"note.d.ts","sourceRoot":"","sources":["../../src/note/note.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAI3D,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C;;;GAGG;AACH,qBAAa,IAAK,SAAQ,MAAM,CAAC,EAAE,CAAC;IAClC,MAAM,4BAEL;IAED,MAAM,KAAK,MAAM,uGAEhB;IAED;;;;;;;OAOG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,QAG9C;IAED;;;;;;OAMG;IACH,MAAM,CAAC,MAAM,SAIZ;IAED;;;OAGG;IACM,QAAQ,kBAEhB;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,QAE5B;IAED,IAAI,MAAM,WAET;IAED,MAAM,CAAC,KAAK,EAAE,IAAI,WAEjB;CACF"}

package/dest/note/note.js

@@ -1,13 +1,60 @@
+import { randomInt } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
-import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader } from '@aztec/foundation/serialize';
-import { Payload } from '../logs/l1_payload/payload.js';
-export class Note extends Payload {
+import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
+import { schemas } from '../schemas/index.js';
+import { Vector } from '../types/shared.js';
+/**
+ * The Note class represents a Note emitted from a Noir contract as a vector of Fr (finite field) elements.
+ * This data also represents a preimage to a note hash.
+ */ export class Note extends Vector {
+    toJSON() {
+        return this.toBuffer();
+    }
     static get schema() {
         return schemas.Buffer.transform(Note.fromBuffer);
     }
-    static fromBuffer(buffer) {
+    /**
+   * Create a Note instance from a Buffer or BufferReader.
+   * The input 'buffer' can be either a Buffer containing the serialized Fr elements or a BufferReader instance.
+   * This function reads the Fr elements in the buffer and constructs a Note with them.
+   *
+   * @param buffer - The Buffer or BufferReader containing the serialized Fr elements.
+   * @returns A Note instance containing the deserialized Fr elements.
+   */ static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
         return new Note(reader.readVector(Fr));
     }
+    /**
+   * Generates a random Note instance with a variable number of items.
+   * The number of items is determined by a random value between 1 and 10 (inclusive).
+   * Each item in the Note is generated using the Fr.random() method.
+   *
+   * @returns A randomly generated Note instance.
+   */ static random() {
+        const numItems = randomInt(10) + 1;
+        const items = Array.from({
+            length: numItems
+        }, ()=>Fr.random());
+        return new Note(items);
+    }
+    /**
+   * Returns a hex representation of the note.
+   * @returns A hex string with the vector length as first element.
+   */ toString() {
+        return bufferToHex(this.toBuffer());
+    }
+    /**
+   * Creates a new Note instance from a hex string.
+   * @param str - Hex representation.
+   * @returns A Note instance.
+   */ static fromString(str) {
+        return Note.fromBuffer(hexToBuffer(str));
+    }
+    get length() {
+        return this.items.length;
+    }
+    equals(other) {
+        return this.items.every((item, index)=>item.equals(other.items[index]));
+    }
 }

package/dest/note/note_dao.d.ts

@@ -0,0 +1,71 @@
+import { Fr } from '@aztec/foundation/fields';
+import { BufferReader } from '@aztec/foundation/serialize';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { Note } from '@aztec/stdlib/note';
+import { TxHash } from '@aztec/stdlib/tx';
+/**
+ * A Note Data Access Object, representing a note that was committed to the note hash tree, holding all of the
+ * information required to use it during execution and manage its state.
+ */
+export declare class NoteDao {
+    note: Note;
+    contractAddress: AztecAddress;
+    storageSlot: Fr;
+    randomness: Fr;
+    noteNonce: Fr;
+    noteHash: Fr;
+    siloedNullifier: Fr;
+    txHash: TxHash;
+    l2BlockNumber: number;
+    l2BlockHash: string;
+    index: bigint;
+    constructor(
+    /** The packed content of the note, as will be returned in the getNotes oracle. */
+    note: Note, 
+    /** The address of the contract that created the note (i.e. the address used by the kernel during siloing). */
+    contractAddress: AztecAddress, 
+    /**
+     * The storage location of the note. This value is not used for anything in PXE, but we do index by storage slot
+     * since contracts typically make queries based on it.
+     */
+    storageSlot: Fr, 
+    /**
+     * The randomness injected to the note.
+     */
+    randomness: Fr, 
+    /** The nonce that was injected into the note hash preimage in order to guarantee uniqueness. */
+    noteNonce: Fr, 
+    /**
+     * The inner hash (non-unique, non-siloed) of the note. Each contract determines how the note is hashed. Can
+     * be used alongside contractAddress and nonce to compute the uniqueNoteHash and the siloedNoteHash.
+     */
+    noteHash: Fr, 
+    /**
+     * The nullifier of the note, siloed by contract address.
+     * Note: Might be set as 0 if the note was added to PXE as nullified.
+     */
+    siloedNullifier: Fr, 
+    /** The hash of the tx in which this note was created. Knowing the tx hash allows for efficient node queries e.g.
+     *  when searching for txEffects.
+     */
+    txHash: TxHash, 
+    /** The L2 block number in which the tx with this note was included. Used for note management while processing
+     * reorgs.*/
+    l2BlockNumber: number, 
+    /** The L2 block hash in which the tx with this note was included. Used for note management while processing
+     * reorgs.*/
+    l2BlockHash: string, 
+    /** The index of the leaf in the global note hash tree the note is stored at */
+    index: bigint);
+    toBuffer(): Buffer;
+    static fromBuffer(buffer: Buffer | BufferReader): NoteDao;
+    toString(): string;
+    static fromString(str: string): NoteDao;
+    /**
+     * Returns the size in bytes of the Note Dao.
+     * @returns - Its size in bytes.
+     */
+    getSize(): number;
+    static random({ note, contractAddress, storageSlot, randomness, noteNonce, noteHash, siloedNullifier, txHash, l2BlockNumber, l2BlockHash, index }?: Partial<NoteDao>): Promise<NoteDao>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm90ZV9kYW8uZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ub3RlL25vdGVfZGFvLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxFQUFFLEVBQVMsTUFBTSwwQkFBMEIsQ0FBQztBQUNyRCxPQUFPLEVBQUUsWUFBWSxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBQzlFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDMUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTFDOzs7R0FHRztBQUNILHFCQUFhLE9BQU87SUFLVCxJQUFJLEVBQUUsSUFBSTtJQUVWLGVBQWUsRUFBRSxZQUFZO0lBSzdCLFdBQVcsRUFBRSxFQUFFO0lBSWYsVUFBVSxFQUFFLEVBQUU7SUFFZCxTQUFTLEVBQUUsRUFBRTtJQU9iLFFBQVEsRUFBRSxFQUFFO0lBS1osZUFBZSxFQUFFLEVBQUU7SUFNbkIsTUFBTSxFQUFFLE1BQU07SUFHZCxhQUFhLEVBQUUsTUFBTTtJQUdyQixXQUFXLEVBQUUsTUFBTTtJQUVuQixLQUFLLEVBQUUsTUFBTTtJQTNDdEI7SUFHRSxrRkFBa0Y7SUFDM0UsSUFBSSxFQUFFLElBQUk7SUFDakIsOEdBQThHO0lBQ3ZHLGVBQWUsRUFBRSxZQUFZO0lBQ3BDOzs7T0FHRztJQUNJLFdBQVcsRUFBRSxFQUFFO0lBQ3RCOztPQUVHO0lBQ0ksVUFBVSxFQUFFLEVBQUU7SUFDckIsZ0dBQWdHO0lBQ3pGLFNBQVMsRUFBRSxFQUFFO0lBR3BCOzs7T0FHRztJQUNJLFFBQVEsRUFBRSxFQUFFO0lBQ25COzs7T0FHRztJQUNJLGVBQWUsRUFBRSxFQUFFO0lBRzFCOztPQUVHO0lBQ0ksTUFBTSxFQUFFLE1BQU07SUFDckI7Z0JBQ1k7SUFDTCxhQUFhLEVBQUUsTUFBTTtJQUM1QjtnQkFDWTtJQUNMLFdBQVcsRUFBRSxNQUFNO0lBQzFCLCtFQUErRTtJQUN4RSxLQUFLLEVBQUUsTUFBTSxFQUNsQjtJQUVKLFFBQVEsSUFBSSxNQUFNLENBY2pCO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksV0E0QjlDO0lBRUQsUUFBUSxXQUVQO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUUsTUFBTSxXQUc1QjtJQUVEOzs7T0FHRztJQUNJLE9BQU8sV0FJYjtJQUVELE9BQWEsTUFBTSxDQUFDLEVBQ2xCLElBQW9CLEVBQ3BCLGVBQTJCLEVBQzNCLFdBQXlCLEVBQ3pCLFVBQXdCLEVBQ3hCLFNBQXVCLEVBQ3ZCLFFBQXNCLEVBQ3RCLGVBQTZCLEVBQzdCLE1BQXdCLEVBQ3hCLGFBQWdELEVBQ2hELFdBQW9DLEVBQ3BDLEtBQThCLEVBQy9CLEdBQUUsT0FBTyxDQUFDLE9BQU8sQ0FBTSxvQkFjdkI7Q0FDRiJ9

package/dest/note/note_dao.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"note_dao.d.ts","sourceRoot":"","sources":["../../src/note/note_dao.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAS,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C;;;GAGG;AACH,qBAAa,OAAO;IAKT,IAAI,EAAE,IAAI;IAEV,eAAe,EAAE,YAAY;IAK7B,WAAW,EAAE,EAAE;IAIf,UAAU,EAAE,EAAE;IAEd,SAAS,EAAE,EAAE;IAOb,QAAQ,EAAE,EAAE;IAKZ,eAAe,EAAE,EAAE;IAMnB,MAAM,EAAE,MAAM;IAGd,aAAa,EAAE,MAAM;IAGrB,WAAW,EAAE,MAAM;IAEnB,KAAK,EAAE,MAAM;IA3CtB;IAGE,kFAAkF;IAC3E,IAAI,EAAE,IAAI;IACjB,8GAA8G;IACvG,eAAe,EAAE,YAAY;IACpC;;;OAGG;IACI,WAAW,EAAE,EAAE;IACtB;;OAEG;IACI,UAAU,EAAE,EAAE;IACrB,gGAAgG;IACzF,SAAS,EAAE,EAAE;IAGpB;;;OAGG;IACI,QAAQ,EAAE,EAAE;IACnB;;;OAGG;IACI,eAAe,EAAE,EAAE;IAG1B;;OAEG;IACI,MAAM,EAAE,MAAM;IACrB;gBACY;IACL,aAAa,EAAE,MAAM;IAC5B;gBACY;IACL,WAAW,EAAE,MAAM;IAC1B,+EAA+E;IACxE,KAAK,EAAE,MAAM,EAClB;IAEJ,QAAQ,IAAI,MAAM,CAcjB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,WA4B9C;IAED,QAAQ,WAEP;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,WAG5B;IAED;;;OAGG;IACI,OAAO,WAIb;IAED,OAAa,MAAM,CAAC,EAClB,IAAoB,EACpB,eAA2B,EAC3B,WAAyB,EACzB,UAAwB,EACxB,SAAuB,EACvB,QAAsB,EACtB,eAA6B,EAC7B,MAAwB,EACxB,aAAgD,EAChD,WAAoC,EACpC,KAA8B,EAC/B,GAAE,OAAO,CAAC,OAAO,CAAM,oBAcvB;CACF"}

package/dest/note/note_dao.js

@@ -0,0 +1,101 @@
+import { toBigIntBE } from '@aztec/foundation/bigint-buffer';
+import { Fr, Point } from '@aztec/foundation/fields';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { Note } from '@aztec/stdlib/note';
+import { TxHash } from '@aztec/stdlib/tx';
+/**
+ * A Note Data Access Object, representing a note that was committed to the note hash tree, holding all of the
+ * information required to use it during execution and manage its state.
+ */ export class NoteDao {
+    note;
+    contractAddress;
+    storageSlot;
+    randomness;
+    noteNonce;
+    noteHash;
+    siloedNullifier;
+    txHash;
+    l2BlockNumber;
+    l2BlockHash;
+    index;
+    constructor(// Note information
+    /** The packed content of the note, as will be returned in the getNotes oracle. */ note, /** The address of the contract that created the note (i.e. the address used by the kernel during siloing). */ contractAddress, /**
+     * The storage location of the note. This value is not used for anything in PXE, but we do index by storage slot
+     * since contracts typically make queries based on it.
+     */ storageSlot, /**
+     * The randomness injected to the note.
+     */ randomness, /** The nonce that was injected into the note hash preimage in order to guarantee uniqueness. */ noteNonce, // Computed values
+    /**
+     * The inner hash (non-unique, non-siloed) of the note. Each contract determines how the note is hashed. Can
+     * be used alongside contractAddress and nonce to compute the uniqueNoteHash and the siloedNoteHash.
+     */ noteHash, /**
+     * The nullifier of the note, siloed by contract address.
+     * Note: Might be set as 0 if the note was added to PXE as nullified.
+     */ siloedNullifier, // Metadata
+    /** The hash of the tx in which this note was created. Knowing the tx hash allows for efficient node queries e.g.
+     *  when searching for txEffects.
+     */ txHash, /** The L2 block number in which the tx with this note was included. Used for note management while processing
+     * reorgs.*/ l2BlockNumber, /** The L2 block hash in which the tx with this note was included. Used for note management while processing
+     * reorgs.*/ l2BlockHash, /** The index of the leaf in the global note hash tree the note is stored at */ index){
+        this.note = note;
+        this.contractAddress = contractAddress;
+        this.storageSlot = storageSlot;
+        this.randomness = randomness;
+        this.noteNonce = noteNonce;
+        this.noteHash = noteHash;
+        this.siloedNullifier = siloedNullifier;
+        this.txHash = txHash;
+        this.l2BlockNumber = l2BlockNumber;
+        this.l2BlockHash = l2BlockHash;
+        this.index = index;
+    }
+    toBuffer() {
+        return serializeToBuffer([
+            this.note,
+            this.contractAddress,
+            this.storageSlot,
+            this.randomness,
+            this.noteNonce,
+            this.noteHash,
+            this.siloedNullifier,
+            this.txHash,
+            this.l2BlockNumber,
+            Fr.fromHexString(this.l2BlockHash),
+            this.index
+        ]);
+    }
+    static fromBuffer(buffer) {
+        const reader = BufferReader.asReader(buffer);
+        const note = Note.fromBuffer(reader);
+        const contractAddress = AztecAddress.fromBuffer(reader);
+        const storageSlot = Fr.fromBuffer(reader);
+        const randomness = Fr.fromBuffer(reader);
+        const noteNonce = Fr.fromBuffer(reader);
+        const noteHash = Fr.fromBuffer(reader);
+        const siloedNullifier = Fr.fromBuffer(reader);
+        const txHash = reader.readObject(TxHash);
+        const l2BlockNumber = reader.readNumber();
+        const l2BlockHash = Fr.fromBuffer(reader).toString();
+        const index = toBigIntBE(reader.readBytes(32));
+        return new NoteDao(note, contractAddress, storageSlot, randomness, noteNonce, noteHash, siloedNullifier, txHash, l2BlockNumber, l2BlockHash, index);
+    }
+    toString() {
+        return '0x' + this.toBuffer().toString('hex');
+    }
+    static fromString(str) {
+        const hex = str.replace(/^0x/, '');
+        return NoteDao.fromBuffer(Buffer.from(hex, 'hex'));
+    }
+    /**
+   * Returns the size in bytes of the Note Dao.
+   * @returns - Its size in bytes.
+   */ getSize() {
+        const indexSize = Math.ceil(Math.log2(Number(this.index)));
+        const noteSize = 4 + this.note.items.length * Fr.SIZE_IN_BYTES;
+        return noteSize + AztecAddress.SIZE_IN_BYTES + Fr.SIZE_IN_BYTES * 4 + TxHash.SIZE + Point.SIZE_IN_BYTES + indexSize;
+    }
+    static async random({ note = Note.random(), contractAddress = undefined, storageSlot = Fr.random(), randomness = Fr.random(), noteNonce = Fr.random(), noteHash = Fr.random(), siloedNullifier = Fr.random(), txHash = TxHash.random(), l2BlockNumber = Math.floor(Math.random() * 1000), l2BlockHash = Fr.random().toString(), index = Fr.random().toBigInt() } = {}) {
+        return new NoteDao(note, contractAddress ?? await AztecAddress.random(), storageSlot, randomness, noteNonce, noteHash, siloedNullifier, txHash, l2BlockNumber, l2BlockHash, index);
+    }
+}

package/dest/note/note_status.d.ts

@@ -5,4 +5,4 @@ export declare enum NoteStatus {
     ACTIVE = 1,
     ACTIVE_OR_NULLIFIED = 2
 }
-//# sourceMappingURL=note_status.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm90ZV9zdGF0dXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ub3RlL25vdGVfc3RhdHVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsb0JBQVksVUFBVTtJQUNwQixNQUFNLElBQUk7SUFDVixtQkFBbUIsSUFBSTtDQUV4QiJ9

package/dest/note/notes_filter.d.ts

@@ -1,21 +1,19 @@
 import type { Fr } from '@aztec/foundation/fields';
 import type { AztecAddress } from '../aztec-address/index.js';
 import { type ZodFor } from '../schemas/index.js';
-import { TxHash } from '../tx/tx_hash.js';
 import { NoteStatus } from './note_status.js';
 /**
  * A filter used to fetch notes.
  * @remarks This filter is applied as an intersection of all its params.
  */
 export type NotesFilter = {
-    /** Hash of a transaction from which to fetch the notes. */
-    txHash?: TxHash;
-    /** The contract address the note belongs to. */
-    contractAddress?: AztecAddress;
+    /**
+     * The contract address the note belongs to.
+     * @remarks Providing a contract address is required as we need that information to trigger private state sync.
+     */
+    contractAddress: AztecAddress;
     /** The specific storage location of the note on the contract. */
     storageSlot?: Fr;
-    /** The owner of the note (whose public key was used to encrypt the note). */
-    owner?: AztecAddress;
     /** The status of the note. Defaults to 'ACTIVE'. */
     status?: NoteStatus;
     /** The siloed nullifier for the note. */
@@ -24,4 +22,4 @@ export type NotesFilter = {
     scopes?: AztecAddress[];
 };
 export declare const NotesFilterSchema: ZodFor<NotesFilter>;
-//# sourceMappingURL=notes_filter.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm90ZXNfZmlsdGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbm90ZS9ub3Rlc19maWx0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFJbkQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDOUQsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFXLE1BQU0scUJBQXFCLENBQUM7QUFDM0QsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTlDOzs7R0FHRztBQUNILE1BQU0sTUFBTSxXQUFXLEdBQUc7SUFDeEI7OztPQUdHO0lBQ0gsZUFBZSxFQUFFLFlBQVksQ0FBQztJQUM5QixpRUFBaUU7SUFDakUsV0FBVyxDQUFDLEVBQUUsRUFBRSxDQUFDO0lBQ2pCLG9EQUFvRDtJQUNwRCxNQUFNLENBQUMsRUFBRSxVQUFVLENBQUM7SUFDcEIseUNBQXlDO0lBQ3pDLGVBQWUsQ0FBQyxFQUFFLEVBQUUsQ0FBQztJQUNyQiwwRUFBMEU7SUFDMUUsTUFBTSxDQUFDLEVBQUUsWUFBWSxFQUFFLENBQUM7Q0FDekIsQ0FBQztBQUVGLGVBQU8sTUFBTSxpQkFBaUIsRUFBRSxNQUFNLENBQUMsV0FBVyxDQU1oRCxDQUFDIn0=

package/dest/note/notes_filter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"notes_filter.d.ts","sourceRoot":"","sources":["../../src/note/notes_filter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAInD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB,2DAA2D;IAC3D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gDAAgD;IAChD,eAAe,CAAC,EAAE,YAAY,CAAC;IAC/B,iEAAiE;IACjE,WAAW,CAAC,EAAE,EAAE,CAAC;IACjB,6EAA6E;IAC7E,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,oDAAoD;IACpD,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,yCAAyC;IACzC,eAAe,CAAC,EAAE,EAAE,CAAC;IACrB,0EAA0E;IAC1E,MAAM,CAAC,EAAE,YAAY,EAAE,CAAC;CACzB,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,WAAW,CAQhD,CAAC"}
+{"version":3,"file":"notes_filter.d.ts","sourceRoot":"","sources":["../../src/note/notes_filter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAInD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB;;;OAGG;IACH,eAAe,EAAE,YAAY,CAAC;IAC9B,iEAAiE;IACjE,WAAW,CAAC,EAAE,EAAE,CAAC;IACjB,oDAAoD;IACpD,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,yCAAyC;IACzC,eAAe,CAAC,EAAE,EAAE,CAAC;IACrB,0EAA0E;IAC1E,MAAM,CAAC,EAAE,YAAY,EAAE,CAAC;CACzB,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,WAAW,CAMhD,CAAC"}

package/dest/note/notes_filter.js

@@ -1,12 +1,9 @@
 import { z } from 'zod';
 import { schemas } from '../schemas/index.js';
-import { TxHash } from '../tx/tx_hash.js';
 import { NoteStatus } from './note_status.js';
 export const NotesFilterSchema = z.object({
-    txHash: TxHash.schema.optional(),
-    contractAddress: schemas.AztecAddress.optional(),
+    contractAddress: schemas.AztecAddress,
     storageSlot: schemas.Fr.optional(),
-    owner: schemas.AztecAddress.optional(),
     status: z.nativeEnum(NoteStatus).optional(),
     siloedNullifier: schemas.Fr.optional(),
     scopes: z.array(schemas.AztecAddress).optional()

package/dest/p2p/attestation_utils.d.ts

@@ -0,0 +1,10 @@
+import type { EthAddress } from '@aztec/foundation/eth-address';
+import { CommitteeAttestation } from '../block/index.js';
+import type { BlockAttestation } from './block_attestation.js';
+/**
+ * Returns attestation signatures in the order of a series of provided ethereum addresses
+ * The rollup smart contract expects attestations to appear in the order of the committee
+ * @todo: perform this logic within the memory attestation store instead?
+ */
+export declare function orderAttestations(attestations: BlockAttestation[], orderAddresses: EthAddress[]): CommitteeAttestation[];
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ZXN0YXRpb25fdXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wMnAvYXR0ZXN0YXRpb25fdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFaEUsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUUvRDs7OztHQUlHO0FBQ0gsd0JBQWdCLGlCQUFpQixDQUMvQixZQUFZLEVBQUUsZ0JBQWdCLEVBQUUsRUFDaEMsY0FBYyxFQUFFLFVBQVUsRUFBRSxHQUMzQixvQkFBb0IsRUFBRSxDQXFCeEIifQ==

package/dest/p2p/attestation_utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"attestation_utils.d.ts","sourceRoot":"","sources":["../../src/p2p/attestation_utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE/D;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,gBAAgB,EAAE,EAChC,cAAc,EAAE,UAAU,EAAE,GAC3B,oBAAoB,EAAE,CAqBxB"}

package/dest/p2p/attestation_utils.js

@@ -0,0 +1,21 @@
+import { CommitteeAttestation } from '../block/index.js';
+/**
+ * Returns attestation signatures in the order of a series of provided ethereum addresses
+ * The rollup smart contract expects attestations to appear in the order of the committee
+ * @todo: perform this logic within the memory attestation store instead?
+ */ export function orderAttestations(attestations, orderAddresses) {
+    // Create a map of sender addresses to BlockAttestations
+    const attestationMap = new Map();
+    for (const attestation of attestations){
+        const sender = attestation.getSender();
+        if (sender) {
+            attestationMap.set(sender.toString(), CommitteeAttestation.fromAddressAndSignature(sender, attestation.signature));
+        }
+    }
+    // Create the ordered array based on the orderAddresses, else return an empty attestation
+    const orderedAttestations = orderAddresses.map((address)=>{
+        const addressString = address.toString();
+        return attestationMap.get(addressString) || CommitteeAttestation.fromAddress(address);
+    });
+    return orderedAttestations;
+}

package/dest/p2p/block_attestation.d.ts

@@ -1,13 +1,13 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
+import { SlotNumber } from '@aztec/foundation/branded-types';
 import { Buffer32 } from '@aztec/foundation/buffer';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import { Signature } from '@aztec/foundation/eth-signature';
-import type { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
 import type { ZodFor } from '../schemas/index.js';
 import { ConsensusPayload } from './consensus_payload.js';
 import { Gossipable } from './gossipable.js';
+import { TopicType } from './topic_type.js';
 export declare class BlockAttestationHash extends Buffer32 {
     constructor(hash: Buffer);
 }
@@ -18,32 +18,63 @@ export declare class BlockAttestationHash extends Buffer32 {
  * will produce a block attestation over the header of the block
  */
 export declare class BlockAttestation extends Gossipable {
-    /** The payload of the message, and what the signature is over */
     readonly payload: ConsensusPayload;
-    /** The signature of the block attester */
     readonly signature: Signature;
-    static p2pTopic: string;
+    readonly proposerSignature: Signature;
+    static p2pTopic: TopicType;
     private sender;
+    private proposer;
     constructor(
     /** The payload of the message, and what the signature is over */
     payload: ConsensusPayload, 
     /** The signature of the block attester */
-    signature: Signature);
+    signature: Signature, 
+    /** The signature from the block proposer */
+    proposerSignature: Signature);
     static get schema(): ZodFor<BlockAttestation>;
-    p2pMessageIdentifier(): Promise<Buffer32>;
+    generateP2PMessageIdentifier(): Promise<Buffer32>;
     get archive(): Fr;
-    get slotNumber(): Fr;
-    get blockNumber(): Fr;
-    /**Get sender
-     *
-     * Lazily evaluate and cache the sender of the attestation
-     * @returns The sender of the attestation
+    get slotNumber(): SlotNumber;
+    /**
+     * Lazily evaluate and cache the signer of the attestation
+     * @returns The signer of the attestation, or undefined if signature recovery fails
+     */
+    getSender(): EthAddress | undefined;
+    /**
+     * Lazily evaluate and cache the proposer of the block
+     * @returns The proposer of the block
      */
-    getSender(): Promise<EthAddress>;
-    getPayload(): Promise<Buffer>;
+    getProposer(): EthAddress | undefined;
+    getPayload(): Buffer;
     toBuffer(): Buffer;
     static fromBuffer(buf: Buffer | BufferReader): BlockAttestation;
     static empty(): BlockAttestation;
+    static random(): BlockAttestation;
     getSize(): number;
+    toInspect(): {
+        payload: {
+            header: {
+                lastArchive: `0x${string}`;
+                blockHeadersHash: `0x${string}`;
+                contentCommitment: {
+                    blobsHash: `0x${string}`;
+                    inHash: `0x${string}`;
+                    outHash: `0x${string}`;
+                };
+                slotNumber: SlotNumber;
+                timestamp: bigint;
+                coinbase: `0x${string}`;
+                feeRecipient: `0x${string}`;
+                gasFees: {
+                    feePerDaGas: bigint;
+                    feePerL2Gas: bigint;
+                };
+                totalManaUsed: bigint;
+            };
+            archive: `0x${string}`;
+        };
+        signature: `0x${string}`;
+        proposerSignature: `0x${string}`;
+    };
 }
-//# sourceMappingURL=block_attestation.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfYXR0ZXN0YXRpb24uZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wMnAvYmxvY2tfYXR0ZXN0YXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzdELE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUVwRCxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUNoRSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDNUQsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQzlDLE9BQU8sRUFBRSxZQUFZLEVBQXFCLE1BQU0sNkJBQTZCLENBQUM7QUFJOUUsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDbEQsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDMUQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRTdDLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUU1QyxxQkFBYSxvQkFBcUIsU0FBUSxRQUFRO0lBQ2hELFlBQVksSUFBSSxFQUFFLE1BQU0sRUFFdkI7Q0FDRjtBQUVEOzs7OztHQUtHO0FBQ0gscUJBQWEsZ0JBQWlCLFNBQVEsVUFBVTthQVE1QixPQUFPLEVBQUUsZ0JBQWdCO2FBR3pCLFNBQVMsRUFBRSxTQUFTO2FBR3BCLGlCQUFpQixFQUFFLFNBQVM7SUFiOUMsT0FBZ0IsUUFBUSxZQUErQjtJQUV2RCxPQUFPLENBQUMsTUFBTSxDQUF5QjtJQUN2QyxPQUFPLENBQUMsUUFBUSxDQUF5QjtJQUV6QztJQUNFLGlFQUFpRTtJQUNqRCxPQUFPLEVBQUUsZ0JBQWdCO0lBRXpDLDBDQUEwQztJQUMxQixTQUFTLEVBQUUsU0FBUztJQUVwQyw0Q0FBNEM7SUFDNUIsaUJBQWlCLEVBQUUsU0FBUyxFQUc3QztJQUVELE1BQU0sS0FBSyxNQUFNLElBQUksTUFBTSxDQUFDLGdCQUFnQixDQUFDLENBUTVDO0lBRVEsNEJBQTRCLElBQUksT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUV6RDtJQUVELElBQUksT0FBTyxJQUFJLEVBQUUsQ0FFaEI7SUFFRCxJQUFJLFVBQVUsSUFBSSxVQUFVLENBRTNCO0lBRUQ7OztPQUdHO0lBQ0gsU0FBUyxJQUFJLFVBQVUsR0FBRyxTQUFTLENBU2xDO0lBRUQ7OztPQUdHO0lBQ0gsV0FBVyxJQUFJLFVBQVUsR0FBRyxTQUFTLENBU3BDO0lBRUQsVUFBVSxJQUFJLE1BQU0sQ0FFbkI7SUFFRCxRQUFRLElBQUksTUFBTSxDQUVqQjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsR0FBRyxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsZ0JBQWdCLENBTzlEO0lBRUQsTUFBTSxDQUFDLEtBQUssSUFBSSxnQkFBZ0IsQ0FFL0I7SUFFRCxNQUFNLENBQUMsTUFBTSxJQUFJLGdCQUFnQixDQUVoQztJQUVELE9BQU8sSUFBSSxNQUFNLENBRWhCO0lBRUQsU0FBUzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O01BTVI7Q0FDRiJ9

package/dest/p2p/block_attestation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"block_attestation.d.ts","sourceRoot":"","sources":["../../src/p2p/block_attestation.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAI9E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAI7C,qBAAa,oBAAqB,SAAQ,QAAQ;gBACpC,IAAI,EAAE,MAAM;CAGzB;AAED;;;;;GAKG;AACH,qBAAa,gBAAiB,SAAQ,UAAU;IAM5C,iEAAiE;aACjD,OAAO,EAAE,gBAAgB;IAEzC,0CAA0C;aAC1B,SAAS,EAAE,SAAS;IATtC,OAAgB,QAAQ,SAAkD;IAE1E,OAAO,CAAC,MAAM,CAAyB;;IAGrC,iEAAiE;IACjD,OAAO,EAAE,gBAAgB;IAEzC,0CAA0C;IAC1B,SAAS,EAAE,SAAS;IAKtC,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,gBAAgB,CAAC,CAO5C;IAEQ,oBAAoB,IAAI,OAAO,CAAC,QAAQ,CAAC;IAIlD,IAAI,OAAO,IAAI,EAAE,CAEhB;IAED,IAAI,UAAU,IAAI,EAAE,CAEnB;IAED,IAAI,WAAW,IAAI,EAAE,CAEpB;IAED;;;;OAIG;IACG,SAAS,IAAI,OAAO,CAAC,UAAU,CAAC;IActC,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAI7B,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,gBAAgB;IAK/D,MAAM,CAAC,KAAK,IAAI,gBAAgB;IAIhC,OAAO,IAAI,MAAM;CAGlB"}
+{"version":3,"file":"block_attestation.d.ts","sourceRoot":"","sources":["../../src/p2p/block_attestation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAI9E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,qBAAa,oBAAqB,SAAQ,QAAQ;IAChD,YAAY,IAAI,EAAE,MAAM,EAEvB;CACF;AAED;;;;;GAKG;AACH,qBAAa,gBAAiB,SAAQ,UAAU;aAQ5B,OAAO,EAAE,gBAAgB;aAGzB,SAAS,EAAE,SAAS;aAGpB,iBAAiB,EAAE,SAAS;IAb9C,OAAgB,QAAQ,YAA+B;IAEvD,OAAO,CAAC,MAAM,CAAyB;IACvC,OAAO,CAAC,QAAQ,CAAyB;IAEzC;IACE,iEAAiE;IACjD,OAAO,EAAE,gBAAgB;IAEzC,0CAA0C;IAC1B,SAAS,EAAE,SAAS;IAEpC,4CAA4C;IAC5B,iBAAiB,EAAE,SAAS,EAG7C;IAED,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,gBAAgB,CAAC,CAQ5C;IAEQ,4BAA4B,IAAI,OAAO,CAAC,QAAQ,CAAC,CAEzD;IAED,IAAI,OAAO,IAAI,EAAE,CAEhB;IAED,IAAI,UAAU,IAAI,UAAU,CAE3B;IAED;;;OAGG;IACH,SAAS,IAAI,UAAU,GAAG,SAAS,CASlC;IAED;;;OAGG;IACH,WAAW,IAAI,UAAU,GAAG,SAAS,CASpC;IAED,UAAU,IAAI,MAAM,CAEnB;IAED,QAAQ,IAAI,MAAM,CAEjB;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,gBAAgB,CAO9D;IAED,MAAM,CAAC,KAAK,IAAI,gBAAgB,CAE/B;IAED,MAAM,CAAC,MAAM,IAAI,gBAAgB,CAEhC;IAED,OAAO,IAAI,MAAM,CAEhB;IAED,SAAS;;;;;;;;;;;;;;;;;;;;;;;;MAMR;CACF"}