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

package/dest/block/body.js

@@ -1,18 +1,22 @@
-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, serializeToBuffer } from '@aztec/foundation/serialize';
+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]));
     }
     static get schema() {
         return z.object({
@@ -35,29 +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 txEffectsFields = [];
-        let checkedFields = 0;
-        while(checkedFields !== fields.length){
-            if (!TxEffect.isFirstField(fields[checkedFields])) {
-                throw new Error('Invalid fields given to Body.fromBlobFields(): First field invalid.');
-            }
-            const len = TxEffect.decodeFirstField(fields[checkedFields]).length;
-            txEffectsFields.push(fields.slice(checkedFields, checkedFields + len));
-            checkedFields += len;
+        const txEffects = [];
+        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}`);
         }
-        const txEffects = txEffectsFields.filter((effect)=>effect.length).map((effect)=>TxEffect.fromBlobFields(effect));
         return new this(txEffects);
     }
     [inspect.custom]() {
@@ -65,8 +64,8 @@ export class Body {
   txEffects: ${inspect(this.txEffects)},
 }`;
     }
-    static async random(txsPerBlock = 4, numPublicCallsPerTx = 3, numPublicLogsPerCall = 1) {
-        const txEffects = await timesParallel(txsPerBlock, ()=>TxEffect.random(numPublicCallsPerTx, numPublicLogsPerCall));
+    static async random(txsPerBlock = 4, numPublicCallsPerTx = 3, numPublicLogsPerCall = 1, maxEffects = undefined) {
+        const txEffects = await timesParallel(txsPerBlock, ()=>TxEffect.random(numPublicCallsPerTx, numPublicLogsPerCall, maxEffects));
         return new Body(txEffects);
     }
     static empty() {

package/dest/block/in_block.d.ts

@@ -1,8 +1,9 @@
 import { type ZodTypeAny, z } from 'zod';
+import { L2BlockHash } from './block_hash.js';
 import type { L2Block } from './l2_block.js';
 export type InBlock<T> = {
     l2BlockNumber: number;
-    l2BlockHash: string;
+    l2BlockHash: L2BlockHash;
     data: T;
 };
 export declare function randomInBlock<T>(data: T): InBlock<T>;
@@ -10,22 +11,22 @@ export declare function wrapInBlock<T>(data: T, block: L2Block): Promise<InBlock
 export declare function inBlockSchemaFor<T extends ZodTypeAny>(schema: T): z.ZodObject<{
     data: T;
     l2BlockNumber: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
-    l2BlockHash: z.ZodString;
-}, "strip", ZodTypeAny, { [k in keyof z.objectUtil.addQuestionMarks<z.baseObjectOutputType<{
+    l2BlockHash: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer<ArrayBuffer>, string>, L2BlockHash, string>;
+}, "strip", ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<{
     data: T;
     l2BlockNumber: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
-    l2BlockHash: z.ZodString;
-}>, any>]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<{
+    l2BlockHash: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer<ArrayBuffer>, string>, L2BlockHash, string>;
+}>, 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.ZodString;
-}>, any>[k]; }, { [k_1 in keyof z.baseObjectInputType<{
+    l2BlockHash: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer<ArrayBuffer>, string>, L2BlockHash, string>;
+}>, any>[k]; } : never, z.baseObjectInputType<{
     data: T;
     l2BlockNumber: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
-    l2BlockHash: z.ZodString;
-}>]: z.baseObjectInputType<{
+    l2BlockHash: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer<ArrayBuffer>, string>, L2BlockHash, string>;
+}> 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.ZodString;
-}>[k_1]; }>;
+    l2BlockHash: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer<ArrayBuffer>, string>, L2BlockHash, string>;
+}>[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":"AAEA,OAAO,EAAE,KAAK,UAAU,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGzC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,MAAM,OAAO,CAAC,CAAC,IAAI;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,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/in_block.js

@@ -1,24 +1,24 @@
-import { Fr } from '@aztec/foundation/fields';
 import { z } from 'zod';
 import { schemas } from '../schemas/index.js';
+import { L2BlockHash } from './block_hash.js';
 export function randomInBlock(data) {
     return {
         data,
         l2BlockNumber: Math.floor(Math.random() * 1000),
-        l2BlockHash: Fr.random().toString()
+        l2BlockHash: L2BlockHash.random()
     };
 }
 export async function wrapInBlock(data, block) {
     return {
         data,
         l2BlockNumber: block.number,
-        l2BlockHash: (await block.hash()).toString()
+        l2BlockHash: L2BlockHash.fromField(await block.hash())
     };
 }
 export function inBlockSchemaFor(schema) {
     return z.object({
         data: schema,
         l2BlockNumber: schemas.Integer,
-        l2BlockHash: z.string()
+        l2BlockHash: L2BlockHash.schema
     });
 }

package/dest/block/index.d.ts

@@ -1,9 +1,14 @@
 export * from './l2_block.js';
-export * from './l2_block_downloader/index.js';
-export * from './nullifier_with_block_source.js';
+export * from './l2_block_header.js';
+export * from './l2_block_stream/index.js';
 export * from './in_block.js';
 export * from './body.js';
 export * from './l2_block_number.js';
 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,gCAAgC,CAAC;AAC/C,cAAc,kCAAkC,CAAC;AACjD,cAAc,eAAe,CAAC;AAC9B,cAAc,WAAW,CAAC;AAC1B,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,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,8 +1,13 @@
 export * from './l2_block.js';
-export * from './l2_block_downloader/index.js';
-export * from './nullifier_with_block_source.js';
+export * from './l2_block_header.js';
+export * from './l2_block_stream/index.js';
 export * from './in_block.js';
 export * from './body.js';
 export * from './l2_block_number.js';
 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

@@ -1,11 +1,11 @@
-/// <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 { 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.
  */
@@ -13,16 +13,17 @@ 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;
     constructor(
     /** Snapshot of archive tree after the block is applied. */
     archive: AppendOnlyTreeSnapshot, 
     /** L2 block header. */
-    header: BlockHeader, 
+    header: L2BlockHeader, 
     /** L2 block body. */
-    body: Body);
+    body: Body, blockHash?: Fr | undefined);
     static get schema(): z.ZodEffects<z.ZodObject<{
         archive: z.ZodEffects<z.ZodObject<{
             root: z.ZodType<Fr, any, string>;
@@ -37,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, {
-        header: BlockHeader;
         archive: AppendOnlyTreeSnapshot;
+        header: L2BlockHeader;
         body: Body;
     }, {
         archive: {
@@ -67,7 +68,7 @@ export declare class L2Block {
      * Serializes a block
      * @returns A serialized L2 block as a Buffer.
      */
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     /**
      * Deserializes L2 block from a buffer.
      * @param str - A serialized L2 block.
@@ -88,35 +89,33 @@ export declare class L2Block {
      * @param inHash - The hash of the L1 to L2 messages subtree which got inserted in this block.
      * @returns The L2 block.
      */
-    static random(l2BlockNum: number, txsPerBlock?: number, numPublicCallsPerTx?: number, numPublicLogsPerCall?: number, inHash?: Buffer | undefined, slotNumber?: number | undefined): Promise<L2Block>;
+    static random(l2BlockNum: number, txsPerBlock?: number, numPublicCallsPerTx?: number, numPublicLogsPerCall?: number, inHash?: Fr | undefined, slotNumber?: number | undefined, maxEffects?: number | undefined): Promise<L2Block>;
     /**
      * Creates an L2 block containing empty data.
      * @returns The L2 block.
      */
     static empty(): L2Block;
     get number(): number;
+    get slot(): bigint;
+    get timestamp(): bigint;
     /**
      * Returns the block's hash (hash of block header).
      * @returns The block's hash.
      */
     hash(): Promise<Fr>;
     /**
-     * Computes the public inputs hash for the L2 block.
-     * The same output as the hash of RootRollupPublicInputs.
-     * TODO(Miranda): Check where/if this is used (v diff now with epochs and blobs)
-     * @returns The public input hash for the L2 block as a field element.
+     * @deprecated
+     * This only works when there's one block per checkpoint.
+     * TODO(#17027): Remove this method from L2Block and create a dedicated Checkpoint class.
      */
-    getPublicInputsHash(): Fr;
+    getCheckpointHeader(): import("../rollup/checkpoint_header.js").CheckpointHeader;
+    getBlockHeader(): BlockHeader;
     /**
-     * Computes the start state hash (should equal contract data before block).
-     * @returns The start state hash for the L2 block.
+     * @deprecated
+     * This only works when there's one block per checkpoint.
+     * TODO(#17027): Remove this method from L2Block and create a dedicated Checkpoint class.
      */
-    getStartStateHash(): Buffer;
-    /**
-     * Computes the end state hash (should equal contract data after block).
-     * @returns The end state hash for the L2 block.
-     */
-    getEndStateHash(): Buffer;
+    getCheckpointBlobFields(): Fr[];
     /**
      * Returns stats used for logging.
      * @returns Stats on tx count, number, and log size and count.
@@ -130,5 +129,7 @@ export declare class L2Block {
         blockNumber: number;
         blockTimestamp: number;
     };
+    toBlockInfo(): L2BlockInfo;
+    equals(other: L2Block): boolean;
 }
 //# 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":";;AACA,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;;IALjB,2DAA2D;IACpD,OAAO,EAAE,sBAAsB;IACtC,uBAAuB;IAChB,MAAM,EAAE,WAAW;IAC1B,qBAAqB;IACd,IAAI,EAAE,IAAI;IAGnB,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,MAAM,GAAG,SAAqB,EACtC,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;;;OAGG;IACI,IAAI,IAAI,OAAO,CAAC,EAAE,CAAC;IAI1B;;;;;OAKG;IAEH,mBAAmB,IAAI,EAAE;IAkBzB;;;OAGG;IAEH,iBAAiB;IAYjB;;;OAGG;IAEH,eAAe;IAYf;;;OAGG;IACH,QAAQ;;;;;;;;;CAsBT"}
+{"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,27 +1,28 @@
-import { sha256, sha256ToField } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
 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 {
     archive;
     header;
     body;
-    constructor(/** Snapshot of archive tree after the block is applied. */ archive, /** L2 block header. */ header, /** L2 block body. */ body){
+    blockHash;
+    constructor(/** Snapshot of archive tree after the block is applied. */ archive, /** L2 block header. */ header, /** L2 block body. */ body, blockHash = undefined){
         this.archive = archive;
         this.header = header;
         this.body = body;
+        this.blockHash = blockHash;
     }
     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);
@@ -62,62 +63,53 @@ import { makeAppendOnlyTreeSnapshot, makeHeader } from './l2_block_code_to_purge
    * @param numPublicLogsPerCall - The number of public logs per 1 public function invocation.
    * @param inHash - The hash of the L1 to L2 messages subtree which got inserted in this block.
    * @returns The L2 block.
-   */ static async random(l2BlockNum, txsPerBlock = 4, numPublicCallsPerTx = 3, numPublicLogsPerCall = 1, inHash = undefined, slotNumber = undefined) {
-        const body = await Body.random(txsPerBlock, numPublicCallsPerTx, numPublicLogsPerCall);
-        return new L2Block(makeAppendOnlyTreeSnapshot(l2BlockNum + 1), makeHeader(0, txsPerBlock, l2BlockNum, slotNumber ?? l2BlockNum, inHash), body);
+   */ 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), makeL2BlockHeader(0, l2BlockNum, slotNumber ?? l2BlockNum, {}, inHash), body);
     }
     /**
    * Creates an L2 block containing empty data.
    * @returns The L2 block.
    */ static empty() {
-        return new L2Block(AppendOnlyTreeSnapshot.zero(), BlockHeader.empty(), Body.empty());
+        return new L2Block(AppendOnlyTreeSnapshot.empty(), L2BlockHeader.empty(), Body.empty());
     }
     get number() {
-        return Number(this.header.globalVariables.blockNumber.toBigInt());
+        return this.header.getBlockNumber();
+    }
+    get slot() {
+        return this.header.getSlot();
+    }
+    get timestamp() {
+        return this.header.globalVariables.timestamp;
     }
     /**
    * Returns the block's hash (hash of block header).
    * @returns The block's hash.
-   */ hash() {
-        return this.header.hash();
+   */ async hash() {
+        if (this.blockHash === undefined) {
+            this.blockHash = await this.getBlockHeader().hash();
+        }
+        return this.blockHash;
     }
     /**
-   * Computes the public inputs hash for the L2 block.
-   * The same output as the hash of RootRollupPublicInputs.
-   * TODO(Miranda): Check where/if this is used (v diff now with epochs and blobs)
-   * @returns The public input hash for the L2 block as a field element.
-   */ // TODO(#4844)
-    getPublicInputsHash() {
-        const preimage = [
-            this.header.globalVariables,
-            AppendOnlyTreeSnapshot.zero(),
-            AppendOnlyTreeSnapshot.zero(),
-            AppendOnlyTreeSnapshot.zero(),
-            AppendOnlyTreeSnapshot.zero(),
-            this.header.lastArchive,
-            this.header.state.partial.noteHashTree,
-            this.header.state.partial.nullifierTree,
-            this.header.state.partial.publicDataTree,
-            this.header.state.l1ToL2MessageTree,
-            this.archive
-        ];
-        return sha256ToField(preimage);
+   * @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();
     }
-    /**
-   * Computes the start state hash (should equal contract data before block).
-   * @returns The start state hash for the L2 block.
-   */ // TODO(#4844)
-    getStartStateHash() {
-        const inputValue = serializeToBuffer(new Fr(Number(this.header.globalVariables.blockNumber.toBigInt()) - 1), AppendOnlyTreeSnapshot.zero(), AppendOnlyTreeSnapshot.zero(), AppendOnlyTreeSnapshot.zero(), AppendOnlyTreeSnapshot.zero(), this.header.lastArchive);
-        return sha256(inputValue);
+    // Temporary helper to get the actual block header.
+    getBlockHeader() {
+        return this.header.toBlockHeader();
     }
     /**
-   * Computes the end state hash (should equal contract data after block).
-   * @returns The end state hash for the L2 block.
-   */ // TODO(#4844)
-    getEndStateHash() {
-        const inputValue = serializeToBuffer(this.header.globalVariables.blockNumber, this.header.state.partial.noteHashTree, this.header.state.partial.nullifierTree, this.header.state.partial.publicDataTree, this.header.state.l1ToL2MessageTree, this.archive);
-        return sha256(inputValue);
+   * @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.
@@ -127,13 +119,27 @@ import { makeAppendOnlyTreeSnapshot, makeHeader } from './l2_block_code_to_purge
             privateLogCount: this.body.txEffects.reduce((logCount, txEffect)=>logCount + txEffect.privateLogs.length, 0),
             publicLogCount: this.body.txEffects.reduce((logCount, txEffect)=>logCount + txEffect.publicLogs.length, 0),
             contractClassLogCount: this.body.txEffects.reduce((logCount, txEffect)=>logCount + txEffect.contractClassLogs.length, 0),
-            contractClassLogSize: this.body.txEffects.reduce((totalLogSize, txEffect)=>totalLogSize + txEffect.contractClassLogs.reduce((logSize, log)=>logSize + log.getEmittedLength(), 0), 0)
+            contractClassLogSize: this.body.txEffects.reduce((totalLogSize, txEffect)=>totalLogSize + txEffect.contractClassLogs.reduce((acc, log)=>acc + log.emittedLength, 0), 0)
         };
         return {
             txCount: this.body.txEffects.length,
             blockNumber: this.number,
-            blockTimestamp: this.header.globalVariables.timestamp.toNumber(),
+            blockTimestamp: Number(this.header.globalVariables.timestamp),
             ...logsStats
         };
     }
+    toBlockInfo() {
+        return {
+            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,
+            timestamp: this.header.globalVariables.timestamp
+        };
+    }
+    equals(other) {
+        return this.archive.equals(other.archive) && this.header.equals(other.header) && this.body.equals(other.body);
+    }
 }

package/dest/block/l2_block_code_to_purge.d.ts

@@ -1,24 +1,12 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
+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, numTxs?: number | undefined, blockNumber?: number | undefined, slotNumber?: number | undefined, inHash?: Buffer | undefined): 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":";;AAMA,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,CACxB,IAAI,SAAI,EACR,MAAM,GAAE,MAAM,GAAG,SAAqB,EACtC,WAAW,GAAE,MAAM,GAAG,SAAqB,EAC3C,UAAU,GAAE,MAAM,GAAG,SAAqB,EAC1C,MAAM,GAAE,MAAM,GAAG,SAAqB,GACrC,WAAW,CASb;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,SAAI,GAAG,sBAAsB,CAE3E;AAwCD;;;;;;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,18 +1,23 @@
-import { toBufferBE } from '@aztec/foundation/bigint-buffer';
+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, NUM_BYTES_PER_SHA256 } from '../tx/content_commitment.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, numTxs = undefined, blockNumber = undefined, slotNumber = undefined, inHash = undefined) {
-    return new BlockHeader(makeAppendOnlyTreeSnapshot(seed + 0x100), makeContentCommitment(seed + 0x200, numTxs, 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.
@@ -23,8 +28,8 @@ import { StateReference } from '../tx/state_reference.js';
 }
 /**
  * Makes content commitment
- */ function makeContentCommitment(seed = 0, numTxs = undefined, inHash = undefined) {
-    return new ContentCommitment(numTxs ? new Fr(numTxs) : new Fr(seed), toBufferBE(BigInt(seed + 0x100), NUM_BYTES_PER_SHA256), inHash ?? toBufferBE(BigInt(seed + 0x200), NUM_BYTES_PER_SHA256), toBufferBE(BigInt(seed + 0x300), NUM_BYTES_PER_SHA256));
+ */ function makeContentCommitment(seed = 0, inHash) {
+    return new ContentCommitment(new Fr(seed + 0x100), inHash ?? new Fr(seed + 0x200), new Fr(seed + 0x300));
 }
 /**
  * Makes arbitrary state reference.
@@ -40,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), new Fr(blockNumber ?? seed + 2), new Fr(slotNumber ?? seed + 3), new Fr(seed + 4), EthAddress.fromField(new Fr(seed + 5)), AztecAddress.fromField(new Fr(seed + 6)), new GasFees(new Fr(seed + 7), new Fr(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)
+    });
 }