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

package/dest/block/attestation_info.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"attestation_info.d.ts","sourceRoot":"","sources":["../../src/block/attestation_info.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAIhE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAEhF;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,0BAA0B,GAAG,qBAAqB,GAAG,mBAAmB,GAAG,OAAO,CAAC;AAEnH;;GAEG;AACH,MAAM,MAAM,eAAe,GACvB;IACE,+EAA+E;IAC/E,OAAO,CAAC,EAAE,SAAS,CAAC;IACpB,iDAAiD;IACjD,MAAM,EAAE,OAAO,CAAC,iBAAiB,EAAE,mBAAmB,GAAG,OAAO,CAAC,CAAC;CACnE,GACD;IACE,8BAA8B;IAC9B,OAAO,EAAE,UAAU,CAAC;IACpB,iDAAiD;IACjD,MAAM,EAAE,OAAO,CAAC,iBAAiB,EAAE,qBAAqB,GAAG,0BAA0B,CAAC,CAAC;CACxF,CAAC;AAEN;;;GAGG;AACH,wBAAgB,sCAAsC,CAAC,KAAK,EAAE;IAC5D,YAAY,EAAE,oBAAoB,EAAE,CAAC;IACrC,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,eAAe,EAAE,CAwBpB"}

package/dest/block/attestation_info.js

@@ -0,0 +1,39 @@
+import { recoverAddress } from '@aztec/foundation/crypto';
+import { ConsensusPayload } from '../p2p/consensus_payload.js';
+import { SignatureDomainSeparator, getHashedSignaturePayloadEthSignedMessage } from '../p2p/signature_utils.js';
+/**
+ * Extracts attestation information from a published L2 block.
+ * Returns info for each attestation, preserving array indices.
+ */ export function getAttestationInfoFromPublishedL2Block(block) {
+    const payload = ConsensusPayload.fromBlock(block.block);
+    const hashedPayload = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.blockAttestation);
+    return block.attestations.map((attestation)=>{
+        // If signature is empty, check if we have an address directly
+        if (attestation.signature.isEmpty()) {
+            if (attestation.address.isZero()) {
+                // No signature and no address - empty
+                return {
+                    status: 'empty'
+                };
+            }
+            // Address provided without signature
+            return {
+                address: attestation.address,
+                status: 'provided-as-address'
+            };
+        }
+        // Try to recover address from signature
+        try {
+            const recoveredAddress = recoverAddress(hashedPayload, attestation.signature);
+            return {
+                address: recoveredAddress,
+                status: 'recovered-from-signature'
+            };
+        } catch  {
+            // Signature present but recovery failed
+            return {
+                status: 'invalid-signature'
+            };
+        }
+    });
+}

package/dest/block/body.d.ts

@@ -1,8 +1,11 @@
-import type { Fr } from '@aztec/foundation/fields';
+import { createBlockEndMarker } from '@aztec/blob-lib/encoding';
+import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { inspect } from 'util';
 import type { ZodFor } from '../schemas/index.js';
 import { TxEffect } from '../tx/tx_effect.js';
+export { createBlockEndMarker };
+export declare function getBlockBlobFields(txEffects: TxEffect[]): Fr[];
 export declare class Body {
     txEffects: TxEffect[];
     constructor(txEffects: TxEffect[]);

package/dest/block/body.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"body.d.ts","sourceRoot":"","sources":["../../src/block/body.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,YAAY,EAAkC,MAAM,6BAA6B,CAAC;AAE3F,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAG/B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,qBAAa,IAAI;IACI,SAAS,EAAE,QAAQ,EAAE;gBAArB,SAAS,EAAE,QAAQ,EAAE;IAQxC,MAAM,CAAC,KAAK,EAAE,IAAI;IAMlB,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,CAMhC;IAED;;;OAGG;IACH,QAAQ;IAIR;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY;IAM5C;;OAEG;IACH,YAAY;IAgBZ;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,EAAE;IASlC,CAAC,OAAO,CAAC,MAAM,CAAC;WAMH,MAAM,CACjB,WAAW,SAAI,EACf,mBAAmB,SAAI,EACvB,oBAAoB,SAAI,EACxB,UAAU,GAAE,MAAM,GAAG,SAAqB;IAS5C,MAAM,CAAC,KAAK;CAGb"}
+{"version":3,"file":"body.d.ts","sourceRoot":"","sources":["../../src/block/body.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAiD,MAAM,0BAA0B,CAAC;AAE/G,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAkC,MAAM,6BAA6B,CAAC;AAE3F,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAG/B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,OAAO,EAAE,oBAAoB,EAAE,CAAC;AAEhC,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,QAAQ,EAAE,QAIvD;AAED,qBAAa,IAAI;IACI,SAAS,EAAE,QAAQ,EAAE;gBAArB,SAAS,EAAE,QAAQ,EAAE;IAExC,MAAM,CAAC,KAAK,EAAE,IAAI;IAMlB,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,CAMhC;IAED;;;OAGG;IACH,QAAQ;IAIR;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY;IAM5C;;OAEG;IACH,YAAY;IAIZ;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,EAAE;IAqBlC,CAAC,OAAO,CAAC,MAAM,CAAC;WAMH,MAAM,CACjB,WAAW,SAAI,EACf,mBAAmB,SAAI,EACvB,oBAAoB,SAAI,EACxB,UAAU,GAAE,MAAM,GAAG,SAAqB;IAS5C,MAAM,CAAC,KAAK;CAGb"}

package/dest/block/body.js

@@ -1,18 +1,19 @@
-import { BLOBS_PER_BLOCK, FIELDS_PER_BLOB } from '@aztec/constants';
+import { createBlockEndMarker, getNumTxsFromBlockEndMarker, isBlockEndMarker } from '@aztec/blob-lib/encoding';
 import { timesParallel } from '@aztec/foundation/collection';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { inspect } from 'util';
 import { z } from 'zod';
 import { TxEffect } from '../tx/tx_effect.js';
+export { createBlockEndMarker };
+export function getBlockBlobFields(txEffects) {
+    const blobFields = txEffects.flatMap((txEffect)=>txEffect.toBlobFields());
+    blobFields.push(createBlockEndMarker(txEffects.length));
+    return blobFields;
+}
 export class Body {
     txEffects;
     constructor(txEffects){
         this.txEffects = txEffects;
-        txEffects.forEach((txEffect)=>{
-            if (txEffect.isEmpty()) {
-                throw new Error('Empty tx effect not allowed in Body');
-            }
-        });
     }
     equals(other) {
         return this.txEffects.length === other.txEffects.length && this.txEffects.every((te, i)=>te.equals(other.txEffects[i]));
@@ -38,23 +39,24 @@ export class Body {
     /**
    * Returns a flat packed array of fields of all tx effects - used for blobs.
    */ toBlobFields() {
-        let flattened = [];
-        this.txEffects.forEach((effect)=>{
-            flattened = flattened.concat(effect.toBlobFields());
-        });
-        if (flattened.length > BLOBS_PER_BLOCK * FIELDS_PER_BLOB) {
-            throw new Error(`Attempted to overfill block's blobs with ${flattened.length} elements. The maximum is ${BLOBS_PER_BLOCK * FIELDS_PER_BLOB}`);
-        }
-        return flattened;
+        return getBlockBlobFields(this.txEffects);
     }
     /**
    * Decodes a block from blob fields.
    */ static fromBlobFields(fields) {
         const txEffects = [];
-        const reader = new FieldReader(fields);
+        const reader = new FieldReader(fields.slice(0, -1));
         while(!reader.isFinished()){
             txEffects.push(TxEffect.fromBlobFields(reader));
         }
+        // If the fields are from a proven block, or are constructed by calling `toBlobFields`, the following errors should never throw.
+        if (!isBlockEndMarker(fields[fields.length - 1])) {
+            throw new Error('Block end marker not found');
+        }
+        const numTxs = getNumTxsFromBlockEndMarker(fields[fields.length - 1]);
+        if (numTxs !== txEffects.length) {
+            throw new Error(`Expected ${numTxs} txs, but got ${txEffects.length}`);
+        }
         return new this(txEffects);
     }
     [inspect.custom]() {

package/dest/block/in_block.d.ts

@@ -12,21 +12,21 @@ export declare function inBlockSchemaFor<T extends ZodTypeAny>(schema: T): z.Zod
     data: T;
     l2BlockNumber: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
     l2BlockHash: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer<ArrayBuffer>, string>, L2BlockHash, string>;
-}, "strip", ZodTypeAny, { [k in keyof z.objectUtil.addQuestionMarks<z.baseObjectOutputType<{
+}, "strip", ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<{
     data: T;
     l2BlockNumber: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
     l2BlockHash: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer<ArrayBuffer>, string>, L2BlockHash, string>;
-}>, any>]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<{
+}>, any> extends infer T_1 ? { [k in keyof T_1]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<{
     data: T;
     l2BlockNumber: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
     l2BlockHash: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer<ArrayBuffer>, string>, L2BlockHash, string>;
-}>, any>[k]; }, { [k_1 in keyof z.baseObjectInputType<{
+}>, any>[k]; } : never, z.baseObjectInputType<{
     data: T;
     l2BlockNumber: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
     l2BlockHash: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer<ArrayBuffer>, string>, L2BlockHash, string>;
-}>]: z.baseObjectInputType<{
+}> extends infer T_2 ? { [k_1 in keyof T_2]: z.baseObjectInputType<{
     data: T;
     l2BlockNumber: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
     l2BlockHash: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer<ArrayBuffer>, string>, L2BlockHash, string>;
-}>[k_1]; }>;
+}>[k_1]; } : never>;
 //# sourceMappingURL=in_block.d.ts.map

package/dest/block/in_block.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"in_block.d.ts","sourceRoot":"","sources":["../../src/block/in_block.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGzC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAG7C,MAAM,MAAM,OAAO,CAAC,CAAC,IAAI;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,WAAW,CAAC;IACzB,IAAI,EAAE,CAAC,CAAC;CACT,CAAC;AAEF,wBAAgB,aAAa,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAMpD;AAED,wBAAsB,WAAW,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAMjF;AAED,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,UAAU,EAAE,MAAM,EAAE,CAAC;;;;;;;;;;;;;;;;;;;;YAM/D"}
+{"version":3,"file":"in_block.d.ts","sourceRoot":"","sources":["../../src/block/in_block.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGzC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAG7C,MAAM,MAAM,OAAO,CAAC,CAAC,IAAI;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,WAAW,CAAC;IACzB,IAAI,EAAE,CAAC,CAAC;CACT,CAAC;AAEF,wBAAgB,aAAa,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAMpD;AAED,wBAAsB,WAAW,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAMjF;AAED,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,UAAU,EAAE,MAAM,EAAE,CAAC;;;;;;;;;;;;;;;;;;;;oBAM/D"}

package/dest/block/index.d.ts

@@ -1,4 +1,5 @@
 export * from './l2_block.js';
+export * from './l2_block_header.js';
 export * from './l2_block_stream/index.js';
 export * from './in_block.js';
 export * from './body.js';
@@ -7,4 +8,7 @@ export * from './l2_block_source.js';
 export * from './block_hash.js';
 export * from './published_l2_block.js';
 export * from './proposal/index.js';
+export * from './validate_block_result.js';
+export * from './l2_block_info.js';
+export * from './attestation_info.js';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/block/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,eAAe,CAAC;AAC9B,cAAc,WAAW,CAAC;AAC1B,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/block/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,eAAe,CAAC;AAC9B,cAAc,WAAW,CAAC;AAC1B,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC"}

package/dest/block/index.js

@@ -1,4 +1,5 @@
 export * from './l2_block.js';
+export * from './l2_block_header.js';
 export * from './l2_block_stream/index.js';
 export * from './in_block.js';
 export * from './body.js';
@@ -7,3 +8,6 @@ export * from './l2_block_source.js';
 export * from './block_hash.js';
 export * from './published_l2_block.js';
 export * from './proposal/index.js';
+export * from './validate_block_result.js';
+export * from './l2_block_info.js';
+export * from './attestation_info.js';

package/dest/block/l2_block.d.ts

@@ -2,8 +2,10 @@ import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { z } from 'zod';
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
-import { BlockHeader } from '../tx/block_header.js';
+import type { BlockHeader } from '../tx/block_header.js';
 import { Body } from './body.js';
+import { L2BlockHeader } from './l2_block_header.js';
+import type { L2BlockInfo } from './l2_block_info.js';
 /**
  * The data that makes up the rollup proof, with encoder decoder functions.
  */
@@ -11,7 +13,7 @@ export declare class L2Block {
     /** Snapshot of archive tree after the block is applied. */
     archive: AppendOnlyTreeSnapshot;
     /** L2 block header. */
-    header: BlockHeader;
+    header: L2BlockHeader;
     /** L2 block body. */
     body: Body;
     private blockHash;
@@ -19,7 +21,7 @@ export declare class L2Block {
     /** Snapshot of archive tree after the block is applied. */
     archive: AppendOnlyTreeSnapshot, 
     /** L2 block header. */
-    header: BlockHeader, 
+    header: L2BlockHeader, 
     /** L2 block body. */
     body: Body, blockHash?: Fr | undefined);
     static get schema(): z.ZodEffects<z.ZodObject<{
@@ -36,11 +38,11 @@ export declare class L2Block {
             root: string;
             nextAvailableLeafIndex: string | number | bigint;
         }>;
-        header: import("@aztec/foundation/schemas").ZodFor<BlockHeader>;
+        header: import("@aztec/foundation/schemas").ZodFor<L2BlockHeader>;
         body: import("@aztec/foundation/schemas").ZodFor<Body>;
     }, "strip", z.ZodTypeAny, {
         archive: AppendOnlyTreeSnapshot;
-        header: BlockHeader;
+        header: L2BlockHeader;
         body: Body;
     }, {
         archive: {
@@ -101,6 +103,19 @@ export declare class L2Block {
      * @returns The block's hash.
      */
     hash(): Promise<Fr>;
+    /**
+     * @deprecated
+     * This only works when there's one block per checkpoint.
+     * TODO(#17027): Remove this method from L2Block and create a dedicated Checkpoint class.
+     */
+    getCheckpointHeader(): import("../rollup/checkpoint_header.js").CheckpointHeader;
+    getBlockHeader(): BlockHeader;
+    /**
+     * @deprecated
+     * This only works when there's one block per checkpoint.
+     * TODO(#17027): Remove this method from L2Block and create a dedicated Checkpoint class.
+     */
+    getCheckpointBlobFields(): Fr[];
     /**
      * Returns stats used for logging.
      * @returns Stats on tx count, number, and log size and count.
@@ -114,14 +129,7 @@ export declare class L2Block {
         blockNumber: number;
         blockTimestamp: number;
     };
-    toBlockInfo(): BlockInfo;
+    toBlockInfo(): L2BlockInfo;
     equals(other: L2Block): boolean;
 }
-export type BlockInfo = {
-    blockHash?: string;
-    archive: string;
-    blockNumber: number;
-    slotNumber: number;
-    txCount: number;
-};
 //# sourceMappingURL=l2_block.d.ts.map

package/dest/block/l2_block.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l2_block.d.ts","sourceRoot":"","sources":["../../src/block/l2_block.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAG9E,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC;;GAEG;AACH,qBAAa,OAAO;IAEhB,2DAA2D;IACpD,OAAO,EAAE,sBAAsB;IACtC,uBAAuB;IAChB,MAAM,EAAE,WAAW;IAC1B,qBAAqB;IACd,IAAI,EAAE,IAAI;IACjB,OAAO,CAAC,SAAS;;IANjB,2DAA2D;IACpD,OAAO,EAAE,sBAAsB;IACtC,uBAAuB;IAChB,MAAM,EAAE,WAAW;IAC1B,qBAAqB;IACd,IAAI,EAAE,IAAI,EACT,SAAS,GAAE,EAAE,GAAG,SAAqB;IAG/C,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAQhB;IAED;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY;IAS5C;;;OAGG;IACH,QAAQ;IAIR;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAIvC;;;OAGG;IACH,QAAQ,IAAI,MAAM;IAIlB;;;;;;;;OAQG;WACU,MAAM,CACjB,UAAU,EAAE,MAAM,EAClB,WAAW,SAAI,EACf,mBAAmB,SAAI,EACvB,oBAAoB,SAAI,EACxB,MAAM,GAAE,EAAE,GAAG,SAAqB,EAClC,UAAU,GAAE,MAAM,GAAG,SAAqB,EAC1C,UAAU,GAAE,MAAM,GAAG,SAAqB,GACzC,OAAO,CAAC,OAAO,CAAC;IAUnB;;;OAGG;IACH,MAAM,CAAC,KAAK,IAAI,OAAO;IAIvB,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED;;;OAGG;IACU,IAAI,IAAI,OAAO,CAAC,EAAE,CAAC;IAOhC;;;OAGG;IACH,QAAQ;;;;;;;;;IAuBR,WAAW,IAAI,SAAS;IAUxB,MAAM,CAAC,KAAK,EAAE,OAAO;CAGtB;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC"}
+{"version":3,"file":"l2_block.d.ts","sourceRoot":"","sources":["../../src/block/l2_block.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAG9E,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEtD;;GAEG;AACH,qBAAa,OAAO;IAEhB,2DAA2D;IACpD,OAAO,EAAE,sBAAsB;IACtC,uBAAuB;IAChB,MAAM,EAAE,aAAa;IAC5B,qBAAqB;IACd,IAAI,EAAE,IAAI;IACjB,OAAO,CAAC,SAAS;;IANjB,2DAA2D;IACpD,OAAO,EAAE,sBAAsB;IACtC,uBAAuB;IAChB,MAAM,EAAE,aAAa;IAC5B,qBAAqB;IACd,IAAI,EAAE,IAAI,EACT,SAAS,GAAE,EAAE,GAAG,SAAqB;IAG/C,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAQhB;IAED;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY;IAS5C;;;OAGG;IACH,QAAQ;IAIR;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAIvC;;;OAGG;IACH,QAAQ,IAAI,MAAM;IAIlB;;;;;;;;OAQG;WACU,MAAM,CACjB,UAAU,EAAE,MAAM,EAClB,WAAW,SAAI,EACf,mBAAmB,SAAI,EACvB,oBAAoB,SAAI,EACxB,MAAM,GAAE,EAAE,GAAG,SAAqB,EAClC,UAAU,GAAE,MAAM,GAAG,SAAqB,EAC1C,UAAU,GAAE,MAAM,GAAG,SAAqB,GACzC,OAAO,CAAC,OAAO,CAAC;IAUnB;;;OAGG;IACH,MAAM,CAAC,KAAK,IAAI,OAAO;IAIvB,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED;;;OAGG;IACU,IAAI,IAAI,OAAO,CAAC,EAAE,CAAC;IAOhC;;;;OAIG;IACI,mBAAmB;IAKnB,cAAc,IAAI,WAAW;IAIpC;;;;OAIG;IACI,uBAAuB;IAI9B;;;OAGG;IACH,QAAQ;;;;;;;;;IAuBR,WAAW,IAAI,WAAW;IAY1B,MAAM,CAAC,KAAK,EAAE,OAAO;CAGtB"}

package/dest/block/l2_block.js

@@ -1,10 +1,11 @@
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 import { z } from 'zod';
+import { getCheckpointBlobFields } from '../checkpoint/checkpoint_body.js';
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
-import { BlockHeader } from '../tx/block_header.js';
 import { Body } from './body.js';
-import { makeAppendOnlyTreeSnapshot, makeHeader } from './l2_block_code_to_purge.js';
+import { makeAppendOnlyTreeSnapshot, makeL2BlockHeader } from './l2_block_code_to_purge.js';
+import { L2BlockHeader } from './l2_block_header.js';
 /**
  * The data that makes up the rollup proof, with encoder decoder functions.
  */ export class L2Block {
@@ -21,7 +22,7 @@ import { makeAppendOnlyTreeSnapshot, makeHeader } from './l2_block_code_to_purge
     static get schema() {
         return z.object({
             archive: AppendOnlyTreeSnapshot.schema,
-            header: BlockHeader.schema,
+            header: L2BlockHeader.schema,
             body: Body.schema
         }).transform(({ archive, header, body })=>new L2Block(archive, header, body));
     }
@@ -30,7 +31,7 @@ import { makeAppendOnlyTreeSnapshot, makeHeader } from './l2_block_code_to_purge
    * @returns A deserialized L2 block.
    */ static fromBuffer(buf) {
         const reader = BufferReader.asReader(buf);
-        const header = reader.readObject(BlockHeader);
+        const header = reader.readObject(L2BlockHeader);
         const archive = reader.readObject(AppendOnlyTreeSnapshot);
         const body = reader.readObject(Body);
         return new L2Block(archive, header, body);
@@ -64,13 +65,13 @@ import { makeAppendOnlyTreeSnapshot, makeHeader } from './l2_block_code_to_purge
    * @returns The L2 block.
    */ static async random(l2BlockNum, txsPerBlock = 4, numPublicCallsPerTx = 3, numPublicLogsPerCall = 1, inHash = undefined, slotNumber = undefined, maxEffects = undefined) {
         const body = await Body.random(txsPerBlock, numPublicCallsPerTx, numPublicLogsPerCall, maxEffects);
-        return new L2Block(makeAppendOnlyTreeSnapshot(l2BlockNum + 1), makeHeader(0, l2BlockNum, slotNumber ?? l2BlockNum, inHash), body);
+        return new L2Block(makeAppendOnlyTreeSnapshot(l2BlockNum + 1), makeL2BlockHeader(0, l2BlockNum, slotNumber ?? l2BlockNum, {}, inHash), body);
     }
     /**
    * Creates an L2 block containing empty data.
    * @returns The L2 block.
    */ static empty() {
-        return new L2Block(AppendOnlyTreeSnapshot.empty(), BlockHeader.empty(), Body.empty());
+        return new L2Block(AppendOnlyTreeSnapshot.empty(), L2BlockHeader.empty(), Body.empty());
     }
     get number() {
         return this.header.getBlockNumber();
@@ -86,11 +87,31 @@ import { makeAppendOnlyTreeSnapshot, makeHeader } from './l2_block_code_to_purge
    * @returns The block's hash.
    */ async hash() {
         if (this.blockHash === undefined) {
-            this.blockHash = await this.header.hash();
+            this.blockHash = await this.getBlockHeader().hash();
         }
         return this.blockHash;
     }
     /**
+   * @deprecated
+   * This only works when there's one block per checkpoint.
+   * TODO(#17027): Remove this method from L2Block and create a dedicated Checkpoint class.
+   */ getCheckpointHeader() {
+        return this.header.toCheckpointHeader();
+    }
+    // Temporary helper to get the actual block header.
+    getBlockHeader() {
+        return this.header.toBlockHeader();
+    }
+    /**
+   * @deprecated
+   * This only works when there's one block per checkpoint.
+   * TODO(#17027): Remove this method from L2Block and create a dedicated Checkpoint class.
+   */ getCheckpointBlobFields() {
+        return getCheckpointBlobFields([
+            this.body.txEffects
+        ]);
+    }
+    /**
    * Returns stats used for logging.
    * @returns Stats on tx count, number, and log size and count.
    */ getStats() {
@@ -109,11 +130,13 @@ import { makeAppendOnlyTreeSnapshot, makeHeader } from './l2_block_code_to_purge
     }
     toBlockInfo() {
         return {
-            blockHash: this.blockHash?.toString(),
-            archive: this.archive.root.toString(),
+            blockHash: this.blockHash,
+            archive: this.archive.root,
+            lastArchive: this.header.lastArchive.root,
             blockNumber: this.number,
             slotNumber: Number(this.header.getSlot()),
-            txCount: this.body.txEffects.length
+            txCount: this.body.txEffects.length,
+            timestamp: this.header.globalVariables.timestamp
         };
     }
     equals(other) {

package/dest/block/l2_block_code_to_purge.d.ts

@@ -1,23 +1,12 @@
 import { Fr } from '@aztec/foundation/fields';
+import type { FieldsOf } from '@aztec/foundation/types';
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
-import { BlockHeader } from '../tx/block_header.js';
-import { GlobalVariables } from '../tx/global_variables.js';
-/**
- * Makes header.
- */
-export declare function makeHeader(seed?: number, blockNumber?: number, slotNumber?: number, inHash?: Fr): BlockHeader;
+import { L2BlockHeader } from './l2_block_header.js';
+export declare function makeL2BlockHeader(seed?: number, blockNumber?: number, slotNumber?: number, overrides?: Partial<FieldsOf<L2BlockHeader>>, inHash?: Fr): L2BlockHeader;
 /**
  * Makes arbitrary append only tree snapshot.
  * @param seed - The seed to use for generating the append only tree snapshot.
  * @returns An append only tree snapshot.
  */
 export declare function makeAppendOnlyTreeSnapshot(seed?: number): AppendOnlyTreeSnapshot;
-/**
- * Makes global variables.
- * @param seed - The seed to use for generating the global variables.
- * @param blockNumber - The block number to use for generating the global variables.
- * If blockNumber is undefined, it will be set to seed + 2.
- * @returns Global variables.
- */
-export declare function makeGlobalVariables(seed?: number, blockNumber?: number | undefined, slotNumber?: number | undefined): GlobalVariables;
 //# sourceMappingURL=l2_block_code_to_purge.d.ts.map

package/dest/block/l2_block_code_to_purge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l2_block_code_to_purge.d.ts","sourceRoot":"","sources":["../../src/block/l2_block_code_to_purge.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAI9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAI5D;;GAEG;AACH,wBAAgB,UAAU,CAAC,IAAI,SAAI,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,GAAG,WAAW,CASxG;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,SAAI,GAAG,sBAAsB,CAE3E;AA+BD;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,SAAI,EACR,WAAW,GAAE,MAAM,GAAG,SAAqB,EAC3C,UAAU,GAAE,MAAM,GAAG,SAAqB,GACzC,eAAe,CAWjB"}
+{"version":3,"file":"l2_block_code_to_purge.d.ts","sourceRoot":"","sources":["../../src/block/l2_block_code_to_purge.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAIxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAK/E,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,wBAAgB,iBAAiB,CAC/B,IAAI,SAAI,EACR,WAAW,CAAC,EAAE,MAAM,EACpB,UAAU,CAAC,EAAE,MAAM,EACnB,SAAS,GAAE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAM,EAChD,MAAM,CAAC,EAAE,EAAE,iBAcZ;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,SAAI,GAAG,sBAAsB,CAE3E"}

package/dest/block/l2_block_code_to_purge.js

@@ -1,17 +1,23 @@
+import { compact } from '@aztec/foundation/collection';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { AztecAddress } from '../aztec-address/index.js';
 import { GasFees } from '../gas/gas_fees.js';
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
-import { BlockHeader } from '../tx/block_header.js';
 import { ContentCommitment } from '../tx/content_commitment.js';
 import { GlobalVariables } from '../tx/global_variables.js';
 import { PartialStateReference } from '../tx/partial_state_reference.js';
 import { StateReference } from '../tx/state_reference.js';
-/**
- * Makes header.
- */ export function makeHeader(seed = 0, blockNumber, slotNumber, inHash) {
-    return new BlockHeader(makeAppendOnlyTreeSnapshot(seed + 0x100), makeContentCommitment(seed + 0x200, inHash), makeStateReference(seed + 0x600), makeGlobalVariables(seed += 0x700, blockNumber, slotNumber ?? blockNumber), new Fr(seed + 0x800), new Fr(seed + 0x900));
+import { L2BlockHeader } from './l2_block_header.js';
+export function makeL2BlockHeader(seed = 0, blockNumber, slotNumber, overrides = {}, inHash) {
+    return new L2BlockHeader(makeAppendOnlyTreeSnapshot(seed + 0x100), overrides?.contentCommitment ?? makeContentCommitment(seed + 0x200, inHash), overrides?.state ?? makeStateReference(seed + 0x600), makeGlobalVariables(seed += 0x700, {
+        ...blockNumber ? {
+            blockNumber
+        } : {},
+        ...slotNumber ? {
+            slotNumber: new Fr(slotNumber)
+        } : {}
+    }), new Fr(seed + 0x800), new Fr(seed + 0x900), new Fr(seed + 0xa00));
 }
 /**
  * Makes arbitrary append only tree snapshot.
@@ -39,12 +45,16 @@ import { StateReference } from '../tx/state_reference.js';
  */ function makePartialStateReference(seed = 0) {
     return new PartialStateReference(makeAppendOnlyTreeSnapshot(seed), makeAppendOnlyTreeSnapshot(seed + 1), makeAppendOnlyTreeSnapshot(seed + 2));
 }
-/**
- * Makes global variables.
- * @param seed - The seed to use for generating the global variables.
- * @param blockNumber - The block number to use for generating the global variables.
- * If blockNumber is undefined, it will be set to seed + 2.
- * @returns Global variables.
- */ export function makeGlobalVariables(seed = 1, blockNumber = undefined, slotNumber = undefined) {
-    return new GlobalVariables(new Fr(seed), new Fr(seed + 1), blockNumber ?? seed + 2, new Fr(slotNumber ?? seed + 3), BigInt(seed + 4), EthAddress.fromField(new Fr(seed + 5)), AztecAddress.fromField(new Fr(seed + 6)), new GasFees(seed + 7, seed + 8));
+function makeGlobalVariables(seed = 1, overrides = {}) {
+    return GlobalVariables.from({
+        chainId: new Fr(seed),
+        version: new Fr(seed + 1),
+        blockNumber: seed + 2,
+        slotNumber: new Fr(seed + 3),
+        timestamp: BigInt(seed + 4),
+        coinbase: EthAddress.fromField(new Fr(seed + 5)),
+        feeRecipient: AztecAddress.fromField(new Fr(seed + 6)),
+        gasFees: new GasFees(seed + 7, seed + 8),
+        ...compact(overrides)
+    });
 }

package/dest/block/l2_block_header.d.ts

@@ -0,0 +1,100 @@
+import { Fr } from '@aztec/foundation/fields';
+import { type ZodFor } from '@aztec/foundation/schemas';
+import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
+import type { FieldsOf } from '@aztec/foundation/types';
+import { inspect } from 'util';
+import { CheckpointHeader } from '../rollup/checkpoint_header.js';
+import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
+import { BlockHeader, ContentCommitment, GlobalVariables, StateReference } from '../tx/index.js';
+/**
+ * TO BE DELETED
+ *
+ * A header of an L2 block combining the block header and the checkpoint header.
+ * This is a temporary workaround to avoid changing too many things before building in chunks is properly implemented.
+ * This works for now because we only have one block per checkpoint.
+ *
+ * @deprecated Use BlockHeader or CheckpointHeader instead.
+ */
+export declare class L2BlockHeader {
+    /** Snapshot of archive before the block is applied. */
+    lastArchive: AppendOnlyTreeSnapshot;
+    /** Hash of the body of an L2 block. */
+    contentCommitment: ContentCommitment;
+    /** State reference. */
+    state: StateReference;
+    /** Global variables of an L2 block. */
+    globalVariables: GlobalVariables;
+    /** Total fees in the block, computed by the root rollup circuit */
+    totalFees: Fr;
+    /** Total mana used in the block, computed by the root rollup circuit */
+    totalManaUsed: Fr;
+    /** Hash of the sponge blob of the block. */
+    spongeBlobHash: Fr;
+    constructor(
+    /** Snapshot of archive before the block is applied. */
+    lastArchive: AppendOnlyTreeSnapshot, 
+    /** Hash of the body of an L2 block. */
+    contentCommitment: ContentCommitment, 
+    /** State reference. */
+    state: StateReference, 
+    /** Global variables of an L2 block. */
+    globalVariables: GlobalVariables, 
+    /** Total fees in the block, computed by the root rollup circuit */
+    totalFees: Fr, 
+    /** Total mana used in the block, computed by the root rollup circuit */
+    totalManaUsed: Fr, 
+    /** Hash of the sponge blob of the block. */
+    spongeBlobHash: Fr);
+    static get schema(): ZodFor<L2BlockHeader>;
+    static getFields(fields: FieldsOf<L2BlockHeader>): readonly [AppendOnlyTreeSnapshot, ContentCommitment, StateReference, GlobalVariables, Fr, Fr, Fr];
+    static from(fields: FieldsOf<L2BlockHeader>): L2BlockHeader;
+    getSlot(): bigint;
+    getBlockNumber(): number;
+    getSize(): number;
+    toBuffer(): Buffer<ArrayBufferLike>;
+    toFields(): Fr[];
+    clone(): L2BlockHeader;
+    static fromBuffer(buffer: Buffer | BufferReader): L2BlockHeader;
+    static fromFields(fields: Fr[] | FieldReader): L2BlockHeader;
+    static empty(fields?: Partial<FieldsOf<L2BlockHeader>>): L2BlockHeader;
+    isEmpty(): boolean;
+    /**
+     * Serializes this instance into a string.
+     * @returns Encoded string.
+     */
+    toString(): `0x${string}`;
+    static fromString(str: string): L2BlockHeader;
+    toCheckpointHeader(): CheckpointHeader;
+    toBlockHeader(): BlockHeader;
+    toInspect(): {
+        lastArchive: `0x${string}`;
+        contentCommitment: {
+            blobsHash: `0x${string}`;
+            inHash: `0x${string}`;
+            outHash: `0x${string}`;
+        };
+        state: {
+            l1ToL2MessageTree: `0x${string}`;
+            noteHashTree: `0x${string}`;
+            nullifierTree: `0x${string}`;
+            publicDataTree: `0x${string}`;
+        };
+        globalVariables: {
+            chainId: number;
+            version: number;
+            blockNumber: number;
+            slotNumber: number;
+            timestamp: bigint;
+            coinbase: `0x${string}`;
+            feeRecipient: `0x${string}`;
+            feePerDaGas: number;
+            feePerL2Gas: number;
+        };
+        totalFees: bigint;
+        totalManaUsed: bigint;
+        spongeBlobHash: `0x${string}`;
+    };
+    [inspect.custom](): string;
+    equals(other: this): boolean;
+}
+//# sourceMappingURL=l2_block_header.d.ts.map

package/dest/block/l2_block_header.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"l2_block_header.d.ts","sourceRoot":"","sources":["../../src/block/l2_block_header.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAwC,MAAM,6BAA6B,CAAC;AAE9G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAG/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEjG;;;;;;;;GAQG;AACH,qBAAa,aAAa;IAEtB,uDAAuD;IAChD,WAAW,EAAE,sBAAsB;IAC1C,uCAAuC;IAChC,iBAAiB,EAAE,iBAAiB;IAC3C,uBAAuB;IAChB,KAAK,EAAE,cAAc;IAC5B,uCAAuC;IAChC,eAAe,EAAE,eAAe;IACvC,mEAAmE;IAC5D,SAAS,EAAE,EAAE;IACpB,wEAAwE;IACjE,aAAa,EAAE,EAAE;IACxB,4CAA4C;IACrC,cAAc,EAAE,EAAE;;IAbzB,uDAAuD;IAChD,WAAW,EAAE,sBAAsB;IAC1C,uCAAuC;IAChC,iBAAiB,EAAE,iBAAiB;IAC3C,uBAAuB;IAChB,KAAK,EAAE,cAAc;IAC5B,uCAAuC;IAChC,eAAe,EAAE,eAAe;IACvC,mEAAmE;IAC5D,SAAS,EAAE,EAAE;IACpB,wEAAwE;IACjE,aAAa,EAAE,EAAE;IACxB,4CAA4C;IACrC,cAAc,EAAE,EAAE;IAG3B,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,aAAa,CAAC,CAYzC;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,aAAa,CAAC;IAYhD,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,aAAa,CAAC;IAI3C,OAAO;IAIP,cAAc;IAId,OAAO;IAYP,QAAQ;IAIR,QAAQ,IAAI,EAAE,EAAE;IAIhB,KAAK;IAIL,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAc/C,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW;IAc5C,MAAM,CAAC,KAAK,CAAC,MAAM,GAAE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAM;IAa1D,OAAO,IAAI,OAAO;IAYlB;;;OAGG;IACI,QAAQ;IAIf,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,kBAAkB;IAalB,aAAa;IAWb,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAYT,CAAC,OAAO,CAAC,MAAM,CAAC;IAiBT,MAAM,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO;CAWpC"}