@aztec/stdlib 3.0.0-canary.a9708bd → 3.0.0-devnet.2

package/dest/p2p/gossipable.js

@@ -1,28 +1,19 @@
-import { Buffer32 } from '@aztec/foundation/buffer';
-import { BufferReader, bigintToUInt64BE, serializeToBuffer } from '@aztec/foundation/serialize';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 export class P2PMessage {
-    publishTime;
-    id;
     payload;
-    constructor(publishTime, id, payload){
-        this.publishTime = publishTime;
-        this.id = id;
+    constructor(payload){
         this.payload = payload;
     }
-    static async fromGossipable(message) {
-        return new P2PMessage(new Date(), await message.p2pMessageIdentifier(), message.toBuffer());
+    static fromGossipable(message) {
+        return new P2PMessage(message.toBuffer());
     }
     static fromMessageData(messageData) {
         const reader = new BufferReader(messageData);
-        const publishTime = reader.readUInt64();
-        const id = Buffer32.fromBuffer(reader);
         const payload = reader.readBuffer();
-        return new P2PMessage(new Date(Number(publishTime)), id, payload);
+        return new P2PMessage(payload);
     }
     toMessageData() {
         return serializeToBuffer([
-            bigintToUInt64BE(BigInt(this.publishTime.getTime())),
-            this.id,
             serializeToBuffer(this.payload.length, this.payload)
         ]);
     }

package/dest/p2p/signature_utils.d.ts

@@ -1,7 +1,8 @@
 import { Buffer32 } from '@aztec/foundation/buffer';
 export declare enum SignatureDomainSeparator {
     blockProposal = 0,
-    blockAttestation = 1
+    blockAttestation = 1,
+    attestationsAndSigners = 2
 }
 export interface Signable {
     getPayloadToSign(domainSeparator: SignatureDomainSeparator): Buffer;

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

@@ -1 +1 @@
-{"version":3,"file":"signature_utils.d.ts","sourceRoot":"","sources":["../../src/p2p/signature_utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAGpD,oBAAY,wBAAwB;IAClC,aAAa,IAAI;IACjB,gBAAgB,IAAI;CACrB;AAED,MAAM,WAAW,QAAQ;IACvB,gBAAgB,CAAC,eAAe,EAAE,wBAAwB,GAAG,MAAM,CAAC;CACrE;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,CAAC,EAAE,QAAQ,EAAE,eAAe,EAAE,wBAAwB,GAAG,QAAQ,CAE1G;AAED;;;;GAIG;AACH,wBAAgB,yCAAyC,CACvD,CAAC,EAAE,QAAQ,EACX,eAAe,EAAE,wBAAwB,GACxC,QAAQ,CAGV"}
+{"version":3,"file":"signature_utils.d.ts","sourceRoot":"","sources":["../../src/p2p/signature_utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAGpD,oBAAY,wBAAwB;IAClC,aAAa,IAAI;IACjB,gBAAgB,IAAI;IACpB,sBAAsB,IAAI;CAC3B;AAED,MAAM,WAAW,QAAQ;IACvB,gBAAgB,CAAC,eAAe,EAAE,wBAAwB,GAAG,MAAM,CAAC;CACrE;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,CAAC,EAAE,QAAQ,EAAE,eAAe,EAAE,wBAAwB,GAAG,QAAQ,CAE1G;AAED;;;;GAIG;AACH,wBAAgB,yCAAyC,CACvD,CAAC,EAAE,QAAQ,EACX,eAAe,EAAE,wBAAwB,GACxC,QAAQ,CAGV"}

package/dest/p2p/signature_utils.js

@@ -3,6 +3,7 @@ import { keccak256, makeEthSignDigest } from '@aztec/foundation/crypto';
 export var SignatureDomainSeparator = /*#__PURE__*/ function(SignatureDomainSeparator) {
     SignatureDomainSeparator[SignatureDomainSeparator["blockProposal"] = 0] = "blockProposal";
     SignatureDomainSeparator[SignatureDomainSeparator["blockAttestation"] = 1] = "blockAttestation";
+    SignatureDomainSeparator[SignatureDomainSeparator["attestationsAndSigners"] = 2] = "attestationsAndSigners";
     return SignatureDomainSeparator;
 }({});
 /**

package/dest/parity/index.d.ts

@@ -1,5 +1,4 @@
-export * from './base_parity_inputs.js';
+export * from './parity_base_private_inputs.js';
 export * from './parity_public_inputs.js';
-export * from './root_parity_input.js';
-export * from './root_parity_inputs.js';
+export * from './parity_root_private_inputs.js';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/parity/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/parity/index.ts"],"names":[],"mappings":"AAAA,cAAc,iCAAiC,CAAC;AAChD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,iCAAiC,CAAC"}

package/dest/parity/index.js

@@ -1,4 +1,3 @@
-export * from './base_parity_inputs.js';
+export * from './parity_base_private_inputs.js';
 export * from './parity_public_inputs.js';
-export * from './root_parity_input.js';
-export * from './root_parity_inputs.js';
+export * from './parity_root_private_inputs.js';

package/dest/parity/{base_parity_inputs.d.ts → parity_base_private_inputs.d.ts}

@@ -1,7 +1,7 @@
-import { type NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NUM_MSGS_PER_BASE_PARITY } from '@aztec/constants';
+import { NUM_MSGS_PER_BASE_PARITY } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, type Tuple } from '@aztec/foundation/serialize';
-export declare class BaseParityInputs {
+export declare class ParityBasePrivateInputs {
     /** Aggregated proof of all the parity circuit iterations. */
     readonly msgs: Tuple<Fr, typeof NUM_MSGS_PER_BASE_PARITY>;
     /** Root of the VK tree */
@@ -11,7 +11,7 @@ export declare class BaseParityInputs {
     msgs: Tuple<Fr, typeof NUM_MSGS_PER_BASE_PARITY>, 
     /** Root of the VK tree */
     vkTreeRoot: Fr);
-    static fromSlice(array: Tuple<Fr, typeof NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP>, index: number, vkTreeRoot: Fr): BaseParityInputs;
+    static fromSlice(array: Fr[], index: number, vkTreeRoot: Fr): ParityBasePrivateInputs;
     /** Serializes the inputs to a buffer. */
     toBuffer(): Buffer<ArrayBufferLike>;
     /** Serializes the inputs to a hex string. */
@@ -20,16 +20,16 @@ export declare class BaseParityInputs {
      * Deserializes the inputs from a buffer.
      * @param buffer - The buffer to deserialize from.
      */
-    static fromBuffer(buffer: Buffer | BufferReader): BaseParityInputs;
+    static fromBuffer(buffer: Buffer | BufferReader): ParityBasePrivateInputs;
     /**
      * Deserializes the inputs from a hex string.
      * @param str - The hex string to deserialize from.
      * @returns - The deserialized inputs.
      */
-    static fromString(str: string): BaseParityInputs;
+    static fromString(str: string): ParityBasePrivateInputs;
     /** Returns a buffer representation for JSON serialization. */
     toJSON(): Buffer<ArrayBufferLike>;
     /** Creates an instance from a hex string. */
-    static get schema(): import("zod").ZodType<BaseParityInputs, any, string>;
+    static get schema(): import("zod").ZodType<ParityBasePrivateInputs, any, string>;
 }
-//# sourceMappingURL=base_parity_inputs.d.ts.map
+//# sourceMappingURL=parity_base_private_inputs.d.ts.map

package/dest/parity/parity_base_private_inputs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"parity_base_private_inputs.d.ts","sourceRoot":"","sources":["../../src/parity/parity_base_private_inputs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuC,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AACjG,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,KAAK,KAAK,EAAqB,MAAM,6BAA6B,CAAC;AAG1F,qBAAa,uBAAuB;IAEhC,6DAA6D;aAC7C,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,wBAAwB,CAAC;IAChE,0BAA0B;aACV,UAAU,EAAE,EAAE;;IAH9B,6DAA6D;IAC7C,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,wBAAwB,CAAC;IAChE,0BAA0B;IACV,UAAU,EAAE,EAAE;WAGlB,SAAS,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,GAAG,uBAAuB;IAa5F,yCAAyC;IACzC,QAAQ;IAIR,6CAA6C;IAC7C,QAAQ;IAIR;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAK/C;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,8DAA8D;IAC9D,MAAM;IAIN,6CAA6C;IAC7C,MAAM,KAAK,MAAM,gEAEhB;CACF"}

package/dest/parity/{base_parity_inputs.js → parity_base_private_inputs.js}

@@ -1,9 +1,9 @@
-import { NUM_MSGS_PER_BASE_PARITY } from '@aztec/constants';
+import { NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NUM_MSGS_PER_BASE_PARITY } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import { bufferSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
-export class BaseParityInputs {
+export class ParityBasePrivateInputs {
     msgs;
     vkTreeRoot;
     constructor(/** Aggregated proof of all the parity circuit iterations. */ msgs, /** Root of the VK tree */ vkTreeRoot){
@@ -11,10 +11,14 @@ export class BaseParityInputs {
         this.vkTreeRoot = vkTreeRoot;
     }
     static fromSlice(array, index, vkTreeRoot) {
+        // Can't use Tuple<Fr, typeof NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP> due to length
+        if (array.length !== NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP) {
+            throw new Error(`Msgs array length must be NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP=${NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP}`);
+        }
         const start = index * NUM_MSGS_PER_BASE_PARITY;
         const end = start + NUM_MSGS_PER_BASE_PARITY;
         const msgs = array.slice(start, end);
-        return new BaseParityInputs(msgs, vkTreeRoot);
+        return new ParityBasePrivateInputs(msgs, vkTreeRoot);
     }
     /** Serializes the inputs to a buffer. */ toBuffer() {
         return serializeToBuffer(this.msgs, this.vkTreeRoot);
@@ -27,19 +31,19 @@ export class BaseParityInputs {
    * @param buffer - The buffer to deserialize from.
    */ static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new BaseParityInputs(reader.readArray(NUM_MSGS_PER_BASE_PARITY, Fr), Fr.fromBuffer(reader));
+        return new ParityBasePrivateInputs(reader.readArray(NUM_MSGS_PER_BASE_PARITY, Fr), Fr.fromBuffer(reader));
     }
     /**
    * Deserializes the inputs from a hex string.
    * @param str - The hex string to deserialize from.
    * @returns - The deserialized inputs.
    */ static fromString(str) {
-        return BaseParityInputs.fromBuffer(hexToBuffer(str));
+        return ParityBasePrivateInputs.fromBuffer(hexToBuffer(str));
     }
     /** Returns a buffer representation for JSON serialization. */ toJSON() {
         return this.toBuffer();
     }
     /** Creates an instance from a hex string. */ static get schema() {
-        return bufferSchemaFor(BaseParityInputs);
+        return bufferSchemaFor(ParityBasePrivateInputs);
     }
 }

package/dest/parity/parity_root_private_inputs.d.ts

@@ -0,0 +1,39 @@
+import { NUM_BASE_PARITY_PER_ROOT_PARITY } from '@aztec/constants';
+import { BufferReader, type Tuple } from '@aztec/foundation/serialize';
+import { type UltraHonkProofData } from '../proofs/proof_data.js';
+import { ParityPublicInputs } from './parity_public_inputs.js';
+export type ParityBaseProofData = UltraHonkProofData<ParityPublicInputs>;
+export declare class ParityRootPrivateInputs {
+    /** Public inputs of the parity base circuits and their proofs and vk data. */
+    readonly children: Tuple<ParityBaseProofData, typeof NUM_BASE_PARITY_PER_ROOT_PARITY>;
+    constructor(
+    /** Public inputs of the parity base circuits and their proofs and vk data. */
+    children: Tuple<ParityBaseProofData, typeof NUM_BASE_PARITY_PER_ROOT_PARITY>);
+    /**
+     * Serializes the inputs to a buffer.
+     * @returns The inputs serialized to a buffer.
+     */
+    toBuffer(): Buffer<ArrayBufferLike>;
+    /**
+     * Serializes the inputs to a hex string.
+     * @returns The instance serialized to a hex string.
+     */
+    toString(): `0x${string}`;
+    /**
+     * Deserializes the inputs from a buffer.
+     * @param buffer - The buffer to deserialize from.
+     * @returns A new ParityRootPrivateInputs instance.
+     */
+    static fromBuffer(buffer: Buffer | BufferReader): ParityRootPrivateInputs;
+    /**
+     * Deserializes the inputs from a hex string.
+     * @param str - A hex string to deserialize from.
+     * @returns A new ParityRootPrivateInputs instance.
+     */
+    static fromString(str: string): ParityRootPrivateInputs;
+    /** Returns a buffer representation for JSON serialization. */
+    toJSON(): Buffer<ArrayBufferLike>;
+    /** Creates an instance from a hex string. */
+    static get schema(): import("zod").ZodType<ParityRootPrivateInputs, any, string>;
+}
+//# sourceMappingURL=parity_root_private_inputs.d.ts.map

package/dest/parity/parity_root_private_inputs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"parity_root_private_inputs.d.ts","sourceRoot":"","sources":["../../src/parity/parity_root_private_inputs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,+BAA+B,EAAE,MAAM,kBAAkB,CAAC;AAGnE,OAAO,EAAE,YAAY,EAAE,KAAK,KAAK,EAAqB,MAAM,6BAA6B,CAAC;AAG1F,OAAO,EAAa,KAAK,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE/D,MAAM,MAAM,mBAAmB,GAAG,kBAAkB,CAAC,kBAAkB,CAAC,CAAC;AAEzE,qBAAa,uBAAuB;IAEhC,8EAA8E;aAC9D,QAAQ,EAAE,KAAK,CAAC,mBAAmB,EAAE,OAAO,+BAA+B,CAAC;;IAD5F,8EAA8E;IAC9D,QAAQ,EAAE,KAAK,CAAC,mBAAmB,EAAE,OAAO,+BAA+B,CAAC;IAG9F;;;OAGG;IACH,QAAQ;IAIR;;;OAGG;IACH,QAAQ;IAIR;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAO/C;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,8DAA8D;IAC9D,MAAM;IAIN,6CAA6C;IAC7C,MAAM,KAAK,MAAM,gEAEhB;CACF"}

package/dest/parity/{root_parity_inputs.js → parity_root_private_inputs.js}

@@ -1,18 +1,20 @@
-import { NUM_BASE_PARITY_PER_ROOT_PARITY, RECURSIVE_PROOF_LENGTH } from '@aztec/constants';
+import { NUM_BASE_PARITY_PER_ROOT_PARITY } from '@aztec/constants';
+import { makeTuple } from '@aztec/foundation/array';
 import { bufferSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
-import { RootParityInput } from './root_parity_input.js';
-export class RootParityInputs {
+import { ProofData } from '../proofs/proof_data.js';
+import { ParityPublicInputs } from './parity_public_inputs.js';
+export class ParityRootPrivateInputs {
     children;
-    constructor(/** Public inputs of children and their proofs. */ children){
+    constructor(/** Public inputs of the parity base circuits and their proofs and vk data. */ children){
         this.children = children;
     }
     /**
    * Serializes the inputs to a buffer.
    * @returns The inputs serialized to a buffer.
    */ toBuffer() {
-        return serializeToBuffer(...this.children);
+        return serializeToBuffer(this.children);
     }
     /**
    * Serializes the inputs to a hex string.
@@ -23,25 +25,22 @@ export class RootParityInputs {
     /**
    * Deserializes the inputs from a buffer.
    * @param buffer - The buffer to deserialize from.
-   * @returns A new RootParityInputs instance.
+   * @returns A new ParityRootPrivateInputs instance.
    */ static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        const tuple = Array.from({
-            length: NUM_BASE_PARITY_PER_ROOT_PARITY
-        }, ()=>RootParityInput.fromBuffer(reader, RECURSIVE_PROOF_LENGTH));
-        return new RootParityInputs(tuple);
+        return new ParityRootPrivateInputs(makeTuple(NUM_BASE_PARITY_PER_ROOT_PARITY, ()=>ProofData.fromBuffer(reader, ParityPublicInputs)));
     }
     /**
    * Deserializes the inputs from a hex string.
    * @param str - A hex string to deserialize from.
-   * @returns A new RootParityInputs instance.
+   * @returns A new ParityRootPrivateInputs instance.
    */ static fromString(str) {
-        return RootParityInputs.fromBuffer(hexToBuffer(str));
+        return ParityRootPrivateInputs.fromBuffer(hexToBuffer(str));
     }
     /** Returns a buffer representation for JSON serialization. */ toJSON() {
         return this.toBuffer();
     }
     /** Creates an instance from a hex string. */ static get schema() {
-        return bufferSchemaFor(RootParityInputs);
+        return bufferSchemaFor(ParityRootPrivateInputs);
     }
 }

package/dest/proofs/client_ivc_proof.d.ts

@@ -1,18 +1,28 @@
+import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
-/**
- * TODO(https://github.com/AztecProtocol/aztec-packages/issues/7370) refactor this to
- * eventually we read all these VKs from the data tree instead of passing them
- */
 export declare class ClientIvcProof {
-    clientIvcProofBuffer: Buffer;
-    constructor(clientIvcProofBuffer: Buffer);
+    fields: Fr[];
+    constructor(fields: Fr[]);
+    attachPublicInputs(publicInputs: Fr[]): ClientIvcProofWithPublicInputs;
     isEmpty(): boolean;
     static empty(): ClientIvcProof;
-    static fake(fill?: number): ClientIvcProof;
     static random(): ClientIvcProof;
     static get schema(): import("zod").ZodType<ClientIvcProof, any, string>;
     toJSON(): Buffer<ArrayBufferLike>;
     static fromBuffer(buffer: Buffer | BufferReader): ClientIvcProof;
     toBuffer(): Buffer<ArrayBufferLike>;
 }
+export declare class ClientIvcProofWithPublicInputs {
+    fieldsWithPublicInputs: Fr[];
+    constructor(fieldsWithPublicInputs: Fr[]);
+    getPublicInputs(): Fr[];
+    removePublicInputs(): ClientIvcProof;
+    isEmpty(): boolean;
+    static empty(): ClientIvcProofWithPublicInputs;
+    static get schema(): import("zod").ZodType<ClientIvcProofWithPublicInputs, any, string>;
+    toJSON(): Buffer<ArrayBufferLike>;
+    static fromBuffer(buffer: Buffer | BufferReader): ClientIvcProofWithPublicInputs;
+    toBuffer(): Buffer<ArrayBufferLike>;
+    static fromBufferArray(fields: Uint8Array[]): ClientIvcProofWithPublicInputs;
+}
 //# sourceMappingURL=client_ivc_proof.d.ts.map

package/dest/proofs/client_ivc_proof.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client_ivc_proof.d.ts","sourceRoot":"","sources":["../../src/proofs/client_ivc_proof.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAI9E;;;GAGG;AACH,qBAAa,cAAc;IAKhB,oBAAoB,EAAE,MAAM;gBAA5B,oBAAoB,EAAE,MAAM;IAG9B,OAAO;IAId,MAAM,CAAC,KAAK;IAIZ,MAAM,CAAC,IAAI,CAAC,IAAI,SAAkC;IAIlD,MAAM,CAAC,MAAM;IAIb,MAAM,KAAK,MAAM,uDAEhB;IAED,MAAM;IAIN,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,cAAc;IAKzD,QAAQ;CAGhB"}
+{"version":3,"file":"client_ivc_proof.d.ts","sourceRoot":"","sources":["../../src/proofs/client_ivc_proof.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,qBAAa,cAAc;IAKhB,MAAM,EAAE,EAAE,EAAE;gBAAZ,MAAM,EAAE,EAAE,EAAE;IAOd,kBAAkB,CAAC,YAAY,EAAE,EAAE,EAAE;IAIrC,OAAO;IAId,MAAM,CAAC,KAAK;IAIZ,MAAM,CAAC,MAAM;IAWb,MAAM,KAAK,MAAM,uDAEhB;IAGD,MAAM;IAIN,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,cAAc;IAOzD,QAAQ;CAGhB;AAED,qBAAa,8BAA8B;IAIhC,sBAAsB,EAAE,EAAE,EAAE;gBAA5B,sBAAsB,EAAE,EAAE,EAAE;IAO9B,eAAe;IAKf,kBAAkB;IAKlB,OAAO;IAId,MAAM,CAAC,KAAK;IAIZ,MAAM,KAAK,MAAM,uEAEhB;IAGD,MAAM;IAIN,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,8BAA8B;IAOzE,QAAQ;IAKf,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,8BAA8B;CAI7E"}

package/dest/proofs/client_ivc_proof.js

@@ -1,41 +1,100 @@
+import { CIVC_PROOF_LENGTH } from '@aztec/constants';
 import { randomBytes } from '@aztec/foundation/crypto';
+import { Fr } from '@aztec/foundation/fields';
 import { bufferSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-const CLIENT_IVC_PROOF_LENGTH = 172052;
-/**
- * TODO(https://github.com/AztecProtocol/aztec-packages/issues/7370) refactor this to
- * eventually we read all these VKs from the data tree instead of passing them
- */ export class ClientIvcProof {
-    clientIvcProofBuffer;
-    constructor(// produced by the sequencer when making the tube proof
-    // TODO(https://github.com/AztecProtocol/aztec-packages/issues/7370): Need to precompute private kernel tail VK so we can verify this immediately in the tx pool
-    // which parts of these are needed to quickly verify that we have a correct IVC proof
-    clientIvcProofBuffer){
-        this.clientIvcProofBuffer = clientIvcProofBuffer;
+export class ClientIvcProof {
+    fields;
+    constructor(// The proof fields.
+    // For native verification, attach public inputs via `attachPublicInputs(publicInputs)`.
+    // Not using Tuple here due to the length being too high.
+    fields){
+        this.fields = fields;
+        if (fields.length !== CIVC_PROOF_LENGTH) {
+            throw new Error(`Invalid ClientIvcProof length: ${fields.length}`);
+        }
+    }
+    attachPublicInputs(publicInputs) {
+        return new ClientIvcProofWithPublicInputs([
+            ...publicInputs,
+            ...this.fields
+        ]);
     }
     isEmpty() {
-        return this.clientIvcProofBuffer.length === 0;
+        return this.fields.every((field)=>field.isZero());
     }
     static empty() {
-        return new ClientIvcProof(Buffer.from(''));
-    }
-    static fake(fill = Math.floor(Math.random() * 255)) {
-        return new ClientIvcProof(Buffer.alloc(1, fill));
+        return new ClientIvcProof(new Array(CIVC_PROOF_LENGTH).fill(Fr.ZERO));
     }
     static random() {
-        return new ClientIvcProof(Buffer.from(randomBytes(CLIENT_IVC_PROOF_LENGTH)));
+        // NB: Not using Fr.random here because it slows down some tests that require a large number of txs significantly.
+        const reducedFrSize = Fr.SIZE_IN_BYTES - 1;
+        const randomFields = randomBytes(CIVC_PROOF_LENGTH * reducedFrSize);
+        const proof = Array.from({
+            length: CIVC_PROOF_LENGTH
+        }, (_, i)=>new Fr(randomFields.subarray(i * reducedFrSize, (i + 1) * reducedFrSize)));
+        return new ClientIvcProof(proof);
     }
     static get schema() {
         return bufferSchemaFor(ClientIvcProof);
     }
+    // We use this in tandem with the bufferSchemaFor to serialize to base64 strings.
     toJSON() {
         return this.toBuffer();
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new ClientIvcProof(reader.readBuffer());
+        const proofLength = reader.readNumber();
+        const proof = reader.readArray(proofLength, Fr);
+        return new ClientIvcProof(proof);
     }
     toBuffer() {
-        return serializeToBuffer(this.clientIvcProofBuffer.length, this.clientIvcProofBuffer);
+        return serializeToBuffer(this.fields.length, this.fields);
+    }
+}
+export class ClientIvcProofWithPublicInputs {
+    fieldsWithPublicInputs;
+    constructor(// The proof fields with public inputs.
+    // For recursive verification, use without public inputs via `removePublicInputs()`.
+    fieldsWithPublicInputs){
+        this.fieldsWithPublicInputs = fieldsWithPublicInputs;
+        if (fieldsWithPublicInputs.length < CIVC_PROOF_LENGTH) {
+            throw new Error(`Invalid ClientIvcProofWithPublicInputs length: ${fieldsWithPublicInputs.length}`);
+        }
+    }
+    getPublicInputs() {
+        const numPublicInputs = this.fieldsWithPublicInputs.length - CIVC_PROOF_LENGTH;
+        return this.fieldsWithPublicInputs.slice(0, numPublicInputs);
+    }
+    removePublicInputs() {
+        const numPublicInputs = this.fieldsWithPublicInputs.length - CIVC_PROOF_LENGTH;
+        return new ClientIvcProof(this.fieldsWithPublicInputs.slice(numPublicInputs));
+    }
+    isEmpty() {
+        return this.fieldsWithPublicInputs.every((field)=>field.isZero());
+    }
+    static empty() {
+        return ClientIvcProof.empty().attachPublicInputs([]);
+    }
+    static get schema() {
+        return bufferSchemaFor(ClientIvcProofWithPublicInputs);
+    }
+    // We use this in tandem with the bufferSchemaFor to serialize to base64 strings.
+    toJSON() {
+        return this.toBuffer();
+    }
+    static fromBuffer(buffer) {
+        const reader = BufferReader.asReader(buffer);
+        const proofLength = reader.readNumber();
+        const proof = reader.readArray(proofLength, Fr);
+        return new ClientIvcProofWithPublicInputs(proof);
+    }
+    toBuffer() {
+        return serializeToBuffer(this.fieldsWithPublicInputs.length, this.fieldsWithPublicInputs);
+    }
+    // Called when constructing from bb proving results.
+    static fromBufferArray(fields) {
+        const proof = fields.map((field)=>Fr.fromBuffer(Buffer.from(field)));
+        return new ClientIvcProofWithPublicInputs(proof);
     }
 }

package/dest/proofs/index.d.ts

@@ -1,5 +1,6 @@
 export * from './recursive_proof.js';
 export * from './client_ivc_proof.js';
 export * from './proof.js';
+export * from './proof_data.js';
 export * from './proving_request_type.js';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/proofs/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,YAAY,CAAC;AAC3B,cAAc,2BAA2B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/proofs/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC"}

package/dest/proofs/index.js

@@ -1,4 +1,5 @@
 export * from './recursive_proof.js';
 export * from './client_ivc_proof.js';
 export * from './proof.js';
+export * from './proof_data.js';
 export * from './proving_request_type.js';

package/dest/proofs/proof_data.d.ts

@@ -0,0 +1,21 @@
+import type { CIVC_PROOF_LENGTH, RECURSIVE_PROOF_LENGTH, RECURSIVE_ROLLUP_HONK_PROOF_LENGTH } from '@aztec/constants';
+import { BufferReader, type Bufferable } from '@aztec/foundation/serialize';
+import { RecursiveProof } from '../proofs/recursive_proof.js';
+import { VkData } from '../vks/index.js';
+/**
+ * Represents the data of a recursive proof.
+ */
+export declare class ProofData<T extends Bufferable, PROOF_LENGTH extends number> {
+    publicInputs: T;
+    proof: RecursiveProof<PROOF_LENGTH>;
+    vkData: VkData;
+    constructor(publicInputs: T, proof: RecursiveProof<PROOF_LENGTH>, vkData: VkData);
+    toBuffer(): Buffer;
+    static fromBuffer<T extends Bufferable, PROOF_LENGTH extends number>(buffer: Buffer | BufferReader, publicInputs: {
+        fromBuffer: (reader: BufferReader) => T;
+    }): ProofData<T, PROOF_LENGTH>;
+}
+export type CivcProofData<T extends Bufferable> = ProofData<T, typeof CIVC_PROOF_LENGTH>;
+export type UltraHonkProofData<T extends Bufferable> = ProofData<T, typeof RECURSIVE_PROOF_LENGTH>;
+export type RollupHonkProofData<T extends Bufferable> = ProofData<T, typeof RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>;
+//# sourceMappingURL=proof_data.d.ts.map

package/dest/proofs/proof_data.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"proof_data.d.ts","sourceRoot":"","sources":["../../src/proofs/proof_data.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,kCAAkC,EAAE,MAAM,kBAAkB,CAAC;AACtH,OAAO,EAAE,YAAY,EAAE,KAAK,UAAU,EAAqB,MAAM,6BAA6B,CAAC;AAE/F,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC;;GAEG;AACH,qBAAa,SAAS,CAAC,CAAC,SAAS,UAAU,EAAE,YAAY,SAAS,MAAM;IAE7D,YAAY,EAAE,CAAC;IACf,KAAK,EAAE,cAAc,CAAC,YAAY,CAAC;IACnC,MAAM,EAAE,MAAM;gBAFd,YAAY,EAAE,CAAC,EACf,KAAK,EAAE,cAAc,CAAC,YAAY,CAAC,EACnC,MAAM,EAAE,MAAM;IAGhB,QAAQ,IAAI,MAAM;WAIX,UAAU,CAAC,CAAC,SAAS,UAAU,EAAE,YAAY,SAAS,MAAM,EACxE,MAAM,EAAE,MAAM,GAAG,YAAY,EAC7B,YAAY,EAAE;QACZ,UAAU,EAAE,CAAC,MAAM,EAAE,YAAY,KAAK,CAAC,CAAC;KACzC,GACA,SAAS,CAAC,CAAC,EAAE,YAAY,CAAC;CAI9B;AAED,MAAM,MAAM,aAAa,CAAC,CAAC,SAAS,UAAU,IAAI,SAAS,CAAC,CAAC,EAAE,OAAO,iBAAiB,CAAC,CAAC;AAEzF,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,UAAU,IAAI,SAAS,CAAC,CAAC,EAAE,OAAO,sBAAsB,CAAC,CAAC;AAEnG,MAAM,MAAM,mBAAmB,CAAC,CAAC,SAAS,UAAU,IAAI,SAAS,CAAC,CAAC,EAAE,OAAO,kCAAkC,CAAC,CAAC"}

package/dest/proofs/proof_data.js

@@ -0,0 +1,22 @@
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { RecursiveProof } from '../proofs/recursive_proof.js';
+import { VkData } from '../vks/index.js';
+/**
+ * Represents the data of a recursive proof.
+ */ export class ProofData {
+    publicInputs;
+    proof;
+    vkData;
+    constructor(publicInputs, proof, vkData){
+        this.publicInputs = publicInputs;
+        this.proof = proof;
+        this.vkData = vkData;
+    }
+    toBuffer() {
+        return serializeToBuffer(this.publicInputs, this.proof, this.vkData);
+    }
+    static fromBuffer(buffer, publicInputs) {
+        const reader = BufferReader.asReader(buffer);
+        return new ProofData(reader.readObject(publicInputs), RecursiveProof.fromBuffer(reader), reader.readObject(VkData));
+    }
+}

package/dest/proofs/proving_request_type.d.ts

@@ -1,17 +1,21 @@
 export declare enum ProvingRequestType {
     PUBLIC_VM = 0,
-    PRIVATE_BASE_ROLLUP = 1,
-    PUBLIC_BASE_ROLLUP = 2,
-    MERGE_ROLLUP = 3,
-    EMPTY_BLOCK_ROOT_ROLLUP = 4,
-    PADDING_BLOCK_ROOT_ROLLUP = 5,
-    BLOCK_ROOT_ROLLUP = 6,
-    SINGLE_TX_BLOCK_ROOT_ROLLUP = 7,
-    BLOCK_MERGE_ROLLUP = 8,
-    ROOT_ROLLUP = 9,
-    BASE_PARITY = 10,
-    ROOT_PARITY = 11,
-    /** Recursive Client IVC verification to connect private to public or rollup */
-    TUBE_PROOF = 12
+    PUBLIC_TUBE = 1,
+    PRIVATE_TX_BASE_ROLLUP = 2,
+    PUBLIC_TX_BASE_ROLLUP = 3,
+    TX_MERGE_ROLLUP = 4,
+    BLOCK_ROOT_FIRST_ROLLUP = 5,
+    BLOCK_ROOT_SINGLE_TX_FIRST_ROLLUP = 6,
+    BLOCK_ROOT_EMPTY_TX_FIRST_ROLLUP = 7,
+    BLOCK_ROOT_ROLLUP = 8,
+    BLOCK_ROOT_SINGLE_TX_ROLLUP = 9,
+    BLOCK_MERGE_ROLLUP = 10,
+    CHECKPOINT_ROOT_ROLLUP = 11,
+    CHECKPOINT_ROOT_SINGLE_BLOCK_ROLLUP = 12,
+    CHECKPOINT_PADDING_ROLLUP = 13,
+    CHECKPOINT_MERGE_ROLLUP = 14,
+    ROOT_ROLLUP = 15,
+    PARITY_BASE = 16,
+    PARITY_ROOT = 17
 }
 //# sourceMappingURL=proving_request_type.d.ts.map

package/dest/proofs/proving_request_type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proving_request_type.d.ts","sourceRoot":"","sources":["../../src/proofs/proving_request_type.ts"],"names":[],"mappings":"AAAA,oBAAY,kBAAkB;IAC5B,SAAS,IAAA;IAET,mBAAmB,IAAA;IACnB,kBAAkB,IAAA;IAClB,YAAY,IAAA;IACZ,uBAAuB,IAAA;IACvB,yBAAyB,IAAA;IACzB,iBAAiB,IAAA;IACjB,2BAA2B,IAAA;IAC3B,kBAAkB,IAAA;IAClB,WAAW,IAAA;IAEX,WAAW,KAAA;IACX,WAAW,KAAA;IACX,+EAA+E;IAC/E,UAAU,KAAA;CACX"}
+{"version":3,"file":"proving_request_type.d.ts","sourceRoot":"","sources":["../../src/proofs/proving_request_type.ts"],"names":[],"mappings":"AAAA,oBAAY,kBAAkB;IAC5B,SAAS,IAAA;IACT,WAAW,IAAA;IAEX,sBAAsB,IAAA;IACtB,qBAAqB,IAAA;IACrB,eAAe,IAAA;IACf,uBAAuB,IAAA;IACvB,iCAAiC,IAAA;IACjC,gCAAgC,IAAA;IAChC,iBAAiB,IAAA;IACjB,2BAA2B,IAAA;IAC3B,kBAAkB,KAAA;IAClB,sBAAsB,KAAA;IACtB,mCAAmC,KAAA;IACnC,yBAAyB,KAAA;IACzB,uBAAuB,KAAA;IACvB,WAAW,KAAA;IAEX,WAAW,KAAA;IACX,WAAW,KAAA;CACZ"}

package/dest/proofs/proving_request_type.js

@@ -1,16 +1,21 @@
 export var ProvingRequestType = /*#__PURE__*/ function(ProvingRequestType) {
     ProvingRequestType[ProvingRequestType["PUBLIC_VM"] = 0] = "PUBLIC_VM";
-    ProvingRequestType[ProvingRequestType["PRIVATE_BASE_ROLLUP"] = 1] = "PRIVATE_BASE_ROLLUP";
-    ProvingRequestType[ProvingRequestType["PUBLIC_BASE_ROLLUP"] = 2] = "PUBLIC_BASE_ROLLUP";
-    ProvingRequestType[ProvingRequestType["MERGE_ROLLUP"] = 3] = "MERGE_ROLLUP";
-    ProvingRequestType[ProvingRequestType["EMPTY_BLOCK_ROOT_ROLLUP"] = 4] = "EMPTY_BLOCK_ROOT_ROLLUP";
-    ProvingRequestType[ProvingRequestType["PADDING_BLOCK_ROOT_ROLLUP"] = 5] = "PADDING_BLOCK_ROOT_ROLLUP";
-    ProvingRequestType[ProvingRequestType["BLOCK_ROOT_ROLLUP"] = 6] = "BLOCK_ROOT_ROLLUP";
-    ProvingRequestType[ProvingRequestType["SINGLE_TX_BLOCK_ROOT_ROLLUP"] = 7] = "SINGLE_TX_BLOCK_ROOT_ROLLUP";
-    ProvingRequestType[ProvingRequestType["BLOCK_MERGE_ROLLUP"] = 8] = "BLOCK_MERGE_ROLLUP";
-    ProvingRequestType[ProvingRequestType["ROOT_ROLLUP"] = 9] = "ROOT_ROLLUP";
-    ProvingRequestType[ProvingRequestType["BASE_PARITY"] = 10] = "BASE_PARITY";
-    ProvingRequestType[ProvingRequestType["ROOT_PARITY"] = 11] = "ROOT_PARITY";
-    /** Recursive Client IVC verification to connect private to public or rollup */ ProvingRequestType[ProvingRequestType["TUBE_PROOF"] = 12] = "TUBE_PROOF";
+    ProvingRequestType[ProvingRequestType["PUBLIC_TUBE"] = 1] = "PUBLIC_TUBE";
+    ProvingRequestType[ProvingRequestType["PRIVATE_TX_BASE_ROLLUP"] = 2] = "PRIVATE_TX_BASE_ROLLUP";
+    ProvingRequestType[ProvingRequestType["PUBLIC_TX_BASE_ROLLUP"] = 3] = "PUBLIC_TX_BASE_ROLLUP";
+    ProvingRequestType[ProvingRequestType["TX_MERGE_ROLLUP"] = 4] = "TX_MERGE_ROLLUP";
+    ProvingRequestType[ProvingRequestType["BLOCK_ROOT_FIRST_ROLLUP"] = 5] = "BLOCK_ROOT_FIRST_ROLLUP";
+    ProvingRequestType[ProvingRequestType["BLOCK_ROOT_SINGLE_TX_FIRST_ROLLUP"] = 6] = "BLOCK_ROOT_SINGLE_TX_FIRST_ROLLUP";
+    ProvingRequestType[ProvingRequestType["BLOCK_ROOT_EMPTY_TX_FIRST_ROLLUP"] = 7] = "BLOCK_ROOT_EMPTY_TX_FIRST_ROLLUP";
+    ProvingRequestType[ProvingRequestType["BLOCK_ROOT_ROLLUP"] = 8] = "BLOCK_ROOT_ROLLUP";
+    ProvingRequestType[ProvingRequestType["BLOCK_ROOT_SINGLE_TX_ROLLUP"] = 9] = "BLOCK_ROOT_SINGLE_TX_ROLLUP";
+    ProvingRequestType[ProvingRequestType["BLOCK_MERGE_ROLLUP"] = 10] = "BLOCK_MERGE_ROLLUP";
+    ProvingRequestType[ProvingRequestType["CHECKPOINT_ROOT_ROLLUP"] = 11] = "CHECKPOINT_ROOT_ROLLUP";
+    ProvingRequestType[ProvingRequestType["CHECKPOINT_ROOT_SINGLE_BLOCK_ROLLUP"] = 12] = "CHECKPOINT_ROOT_SINGLE_BLOCK_ROLLUP";
+    ProvingRequestType[ProvingRequestType["CHECKPOINT_PADDING_ROLLUP"] = 13] = "CHECKPOINT_PADDING_ROLLUP";
+    ProvingRequestType[ProvingRequestType["CHECKPOINT_MERGE_ROLLUP"] = 14] = "CHECKPOINT_MERGE_ROLLUP";
+    ProvingRequestType[ProvingRequestType["ROOT_ROLLUP"] = 15] = "ROOT_ROLLUP";
+    ProvingRequestType[ProvingRequestType["PARITY_BASE"] = 16] = "PARITY_BASE";
+    ProvingRequestType[ProvingRequestType["PARITY_ROOT"] = 17] = "PARITY_ROOT";
     return ProvingRequestType;
 }({});

package/dest/rollup/avm_proof_data.d.ts

@@ -1,17 +1,7 @@
 import { AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
-import { BufferReader } from '@aztec/foundation/serialize';
 import { AvmCircuitPublicInputs } from '../avm/avm_circuit_public_inputs.js';
-import { RecursiveProof } from '../proofs/recursive_proof.js';
-import { VkData } from '../vks/vk_data.js';
-export declare class AvmProofData {
-    publicInputs: AvmCircuitPublicInputs;
-    proof: RecursiveProof<typeof AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED>;
-    vkData: VkData;
-    constructor(publicInputs: AvmCircuitPublicInputs, proof: RecursiveProof<typeof AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED>, vkData: VkData);
-    static fromBuffer(buffer: Buffer | BufferReader): AvmProofData;
-    toBuffer(): Buffer<ArrayBufferLike>;
-    static empty(): AvmProofData;
-}
+import type { ProofData } from '../proofs/proof_data.js';
+export type AvmProofData = ProofData<AvmCircuitPublicInputs, typeof AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED>;
 export declare function enhanceProofWithPiValidationFlag(proof: Fr[], skipPublicInputsValidation: boolean): Fr[];
 //# sourceMappingURL=avm_proof_data.d.ts.map

package/dest/rollup/avm_proof_data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"avm_proof_data.d.ts","sourceRoot":"","sources":["../../src/rollup/avm_proof_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oCAAoC,EAAE,MAAM,kBAAkB,CAAC;AACxE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,cAAc,EAA2B,MAAM,8BAA8B,CAAC;AACvF,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,qBAAa,YAAY;IAEd,YAAY,EAAE,sBAAsB;IACpC,KAAK,EAAE,cAAc,CAAC,OAAO,oCAAoC,CAAC;IAClE,MAAM,EAAE,MAAM;gBAFd,YAAY,EAAE,sBAAsB,EACpC,KAAK,EAAE,cAAc,CAAC,OAAO,oCAAoC,CAAC,EAClE,MAAM,EAAE,MAAM;IAGvB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAS/C,QAAQ;IAIR,MAAM,CAAC,KAAK;CAOb;AAGD,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,0BAA0B,EAAE,OAAO,GAAG,EAAE,EAAE,CAGvG"}
+{"version":3,"file":"avm_proof_data.d.ts","sourceRoot":"","sources":["../../src/rollup/avm_proof_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oCAAoC,EAAE,MAAM,kBAAkB,CAAC;AACxE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEzD,MAAM,MAAM,YAAY,GAAG,SAAS,CAAC,sBAAsB,EAAE,OAAO,oCAAoC,CAAC,CAAC;AAG1G,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,0BAA0B,EAAE,OAAO,GAAG,EAAE,EAAE,CAGvG"}