@aztec/stdlib 0.0.1-commit.fcb71a6 → 0.0.1-commit.ff7989d6c

package/dest/block/block_hash.js

@@ -1,31 +1,33 @@
-import { Buffer32 } from '@aztec/foundation/buffer';
+var _computedKey;
 import { Fr } from '@aztec/foundation/curves/bn254';
-import { BufferReader } from '@aztec/foundation/serialize';
-import { schemas } from '../schemas/schemas.js';
-/** Hash of an L2 block. */ export class L2BlockHash extends Buffer32 {
-    constructor(/** The buffer containing the hash. */ hash){
+import { inspect } from 'util';
+import { hexSchemaFor } from '../schemas/schemas.js';
+const BLOCK_HASH_BRAND = Symbol.for('aztec.BlockHash');
+_computedKey = inspect.custom;
+/** Hash of an L2 block. */ export class BlockHash extends Fr {
+    [BLOCK_HASH_BRAND] = true;
+    constructor(hash){
         super(hash);
     }
-    static random() {
-        return new L2BlockHash(Fr.random().toBuffer());
+    [_computedKey]() {
+        return `BlockHash<${this.toString()}>`;
+    }
+    toFr() {
+        return new Fr(this.toBigInt());
     }
-    static fromNumber(num) {
-        return new L2BlockHash(super.fromNumber(num).toBuffer());
+    /**
+   * Type guard that checks if a value is a BlockHash instance.
+   * Uses Symbol.for to ensure cross-module compatibility.
+   */ static isBlockHash(value) {
+        return typeof value === 'object' && value !== null && BLOCK_HASH_BRAND in value;
     }
-    static fromBuffer(buffer) {
-        const reader = BufferReader.asReader(buffer);
-        return new L2BlockHash(reader.readBytes(L2BlockHash.SIZE));
+    static random() {
+        return new BlockHash(Fr.random());
     }
     static fromString(str) {
-        return new L2BlockHash(super.fromString(str).toBuffer());
+        return new BlockHash(Fr.fromString(str));
     }
     static get schema() {
-        return schemas.BufferHex.transform((value)=>new L2BlockHash(value));
-    }
-    static zero() {
-        return new L2BlockHash(Buffer32.ZERO.toBuffer());
-    }
-    static fromField(hash) {
-        return new L2BlockHash(hash.toBuffer());
+        return hexSchemaFor(BlockHash);
     }
 }

package/dest/block/block_parameter.d.ts

@@ -1,5 +1,6 @@
 import { z } from 'zod';
-export declare const BlockParameterSchema: z.ZodUnion<[z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, import("@aztec/foundation/branded-types").BlockNumber, string | number | bigint>, z.ZodLiteral<"latest">]>;
-/** Block parameter - either a specific BlockNumber or 'latest' */
+import { BlockHash } from './block_hash.js';
+export declare const BlockParameterSchema: z.ZodUnion<[import("@aztec/foundation/schemas").ZodFor<BlockHash>, z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, import("@aztec/foundation/branded-types").BlockNumber, string | number | bigint>, z.ZodLiteral<"latest">]>;
+/** Block parameter - either a specific BlockNumber, block hash (BlockHash), or 'latest' */
 export type BlockParameter = z.infer<typeof BlockParameterSchema>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfcGFyYW1ldGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2svYmxvY2tfcGFyYW1ldGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsZUFBTyxNQUFNLG9CQUFvQixzTkFBb0QsQ0FBQztBQUV0RixrRUFBa0U7QUFDbEUsTUFBTSxNQUFNLGNBQWMsR0FBRyxDQUFDLENBQUMsS0FBSyxDQUFDLE9BQU8sb0JBQW9CLENBQUMsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfcGFyYW1ldGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2svYmxvY2tfcGFyYW1ldGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRTVDLGVBQU8sTUFBTSxvQkFBb0IsNlFBQXNFLENBQUM7QUFFeEcsMkZBQTJGO0FBQzNGLE1BQU0sTUFBTSxjQUFjLEdBQUcsQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLG9CQUFvQixDQUFDLENBQUMifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"block_parameter.d.ts","sourceRoot":"","sources":["../../src/block/block_parameter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,oBAAoB,sNAAoD,CAAC;AAEtF,kEAAkE;AAClE,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC"}
+{"version":3,"file":"block_parameter.d.ts","sourceRoot":"","sources":["../../src/block/block_parameter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,eAAO,MAAM,oBAAoB,6QAAsE,CAAC;AAExG,2FAA2F;AAC3F,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC"}

package/dest/block/block_parameter.js

@@ -1,6 +1,8 @@
 import { BlockNumberSchema } from '@aztec/foundation/branded-types';
 import { z } from 'zod';
+import { BlockHash } from './block_hash.js';
 export const BlockParameterSchema = z.union([
+    BlockHash.schema,
     BlockNumberSchema,
     z.literal('latest')
 ]);

package/dest/block/body.d.ts

@@ -33,4 +33,4 @@ export declare class Body {
     } & Partial<Parameters<typeof TxEffect.random>[0]>): Promise<Body>;
     static empty(): Body;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYm9keS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jsb2NrL2JvZHkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFM0QsT0FBTyxFQUFFLFlBQVksRUFBcUIsTUFBTSw2QkFBNkIsQ0FBQztBQUU5RSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBRy9CLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ2xELE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUU5QyxxQkFBYSxJQUFJO0lBQ0ksU0FBUyxFQUFFLFFBQVEsRUFBRTtJQUF4QyxZQUFtQixTQUFTLEVBQUUsUUFBUSxFQUFFLEVBQUk7SUFFNUMsTUFBTSxDQUFDLEtBQUssRUFBRSxJQUFJLFdBSWpCO0lBRUQsTUFBTSxLQUFLLE1BQU0sSUFBSSxNQUFNLENBQUMsSUFBSSxDQUFDLENBTWhDO0lBRUQ7OztPQUdHO0lBQ0gsUUFBUSw0QkFFUDtJQUVEOzs7T0FHRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsR0FBRyxFQUFFLE1BQU0sR0FBRyxZQUFZLFFBSTNDO0lBRUQ7O09BRUc7SUFDSCxZQUFZLElBQUksVUFBVSxFQUFFLENBRTNCO0lBRUQ7O09BRUc7SUFDSCxNQUFNLENBQUMsY0FBYyxDQUFDLFVBQVUsRUFBRSxVQUFVLEVBQUUsR0FBRyxJQUFJLENBR3BEO0lBRUQsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLFdBSWY7SUFFRCxPQUFhLE1BQU0sQ0FBQyxFQUNsQixXQUFlLEVBQ2YsYUFBMEIsRUFDMUIsR0FBRyxlQUFlLEVBQ25CLEdBQUU7UUFDRCxXQUFXLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDckIsYUFBYSxDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUUsTUFBTSxLQUFLLE9BQU8sQ0FBQyxVQUFVLENBQUMsT0FBTyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztLQUNyRixHQUFHLE9BQU8sQ0FBQyxVQUFVLENBQUMsT0FBTyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQU0saUJBTXREO0lBRUQsTUFBTSxDQUFDLEtBQUssU0FFWDtDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYm9keS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jsb2NrL2JvZHkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFM0QsT0FBTyxFQUFFLFlBQVksRUFBcUIsTUFBTSw2QkFBNkIsQ0FBQztBQUU5RSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBSS9CLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ2xELE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUU5QyxxQkFBYSxJQUFJO0lBQ0ksU0FBUyxFQUFFLFFBQVEsRUFBRTtJQUF4QyxZQUFtQixTQUFTLEVBQUUsUUFBUSxFQUFFLEVBQUk7SUFFNUMsTUFBTSxDQUFDLEtBQUssRUFBRSxJQUFJLFdBSWpCO0lBRUQsTUFBTSxLQUFLLE1BQU0sSUFBSSxNQUFNLENBQUMsSUFBSSxDQUFDLENBTWhDO0lBRUQ7OztPQUdHO0lBQ0gsUUFBUSw0QkFFUDtJQUVEOzs7T0FHRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsR0FBRyxFQUFFLE1BQU0sR0FBRyxZQUFZLFFBSTNDO0lBRUQ7O09BRUc7SUFDSCxZQUFZLElBQUksVUFBVSxFQUFFLENBRTNCO0lBRUQ7O09BRUc7SUFDSCxNQUFNLENBQUMsY0FBYyxDQUFDLFVBQVUsRUFBRSxVQUFVLEVBQUUsR0FBRyxJQUFJLENBR3BEO0lBRUQsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLFdBSWY7SUFFRCxPQUFhLE1BQU0sQ0FBQyxFQUNsQixXQUFlLEVBQ2YsYUFBMEIsRUFDMUIsR0FBRyxlQUFlLEVBQ25CLEdBQUU7UUFDRCxXQUFXLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDckIsYUFBYSxDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUUsTUFBTSxLQUFLLE9BQU8sQ0FBQyxVQUFVLENBQUMsT0FBTyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztLQUNyRixHQUFHLE9BQU8sQ0FBQyxVQUFVLENBQUMsT0FBTyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQU0saUJBTXREO0lBRUQsTUFBTSxDQUFDLEtBQUssU0FFWDtDQUNGIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"body.d.ts","sourceRoot":"","sources":["../../src/block/body.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAE3D,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,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;IAAxC,YAAmB,SAAS,EAAE,QAAQ,EAAE,EAAI;IAE5C,MAAM,CAAC,KAAK,EAAE,IAAI,WAIjB;IAED,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,CAMhC;IAED;;;OAGG;IACH,QAAQ,4BAEP;IAED;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,QAI3C;IAED;;OAEG;IACH,YAAY,IAAI,UAAU,EAAE,CAE3B;IAED;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,IAAI,CAGpD;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,WAIf;IAED,OAAa,MAAM,CAAC,EAClB,WAAe,EACf,aAA0B,EAC1B,GAAG,eAAe,EACnB,GAAE;QACD,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACrF,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAM,iBAMtD;IAED,MAAM,CAAC,KAAK,SAEX;CACF"}
+{"version":3,"file":"body.d.ts","sourceRoot":"","sources":["../../src/block/body.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAE3D,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAI/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;IAAxC,YAAmB,SAAS,EAAE,QAAQ,EAAE,EAAI;IAE5C,MAAM,CAAC,KAAK,EAAE,IAAI,WAIjB;IAED,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,CAMhC;IAED;;;OAGG;IACH,QAAQ,4BAEP;IAED;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,QAI3C;IAED;;OAEG;IACH,YAAY,IAAI,UAAU,EAAE,CAE3B;IAED;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,IAAI,CAGpD;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,WAIf;IAED,OAAa,MAAM,CAAC,EAClB,WAAe,EACf,aAA0B,EAC1B,GAAG,eAAe,EACnB,GAAE;QACD,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACrF,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAM,iBAMtD;IAED,MAAM,CAAC,KAAK,SAEX;CACF"}

package/dest/block/body.js

@@ -1,8 +1,11 @@
+var _computedKey;
 import { timesParallel } from '@aztec/foundation/collection';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { inspect } from 'util';
 import { z } from 'zod';
+import { MAX_TX_EFFECTS_PER_BODY } from '../deserialization/index.js';
 import { TxEffect } from '../tx/tx_effect.js';
+_computedKey = inspect.custom;
 export class Body {
     txEffects;
     constructor(txEffects){
@@ -27,7 +30,7 @@ export class Body {
    * @returns A deserialized L2 block.
    */ static fromBuffer(buf) {
         const reader = BufferReader.asReader(buf);
-        return new this(reader.readVector(TxEffect));
+        return new this(reader.readVector(TxEffect, MAX_TX_EFFECTS_PER_BODY));
     }
     /**
    * Returns a flat packed array of fields of all tx effects - used for blobs.
@@ -40,7 +43,7 @@ export class Body {
         const txEffects = txBlobData.map((data)=>TxEffect.fromTxBlobData(data));
         return new Body(txEffects);
     }
-    [inspect.custom]() {
+    [_computedKey]() {
         return `Body {
   txEffects: ${inspect(this.txEffects)},
 }`;

package/dest/block/checkpointed_l2_block.d.ts

@@ -2,27 +2,26 @@ import { CheckpointNumber } from '@aztec/foundation/branded-types';
 import { BufferReader } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { z } from 'zod';
-import { L1PublishedData, PublishedCheckpoint } from '../checkpoint/published_checkpoint.js';
+import { L1PublishedData } from '../checkpoint/published_checkpoint.js';
 import { L2Block } from './l2_block.js';
-import { L2BlockNew } from './l2_block_new.js';
 import { CommitteeAttestation } from './proposal/committee_attestation.js';
 /**
  * Encapsulates an L2 Block along with the checkpoint data associated with it.
  */
 export declare class CheckpointedL2Block {
     checkpointNumber: CheckpointNumber;
-    block: L2BlockNew;
+    block: L2Block;
     l1: L1PublishedData;
     attestations: CommitteeAttestation[];
-    constructor(checkpointNumber: CheckpointNumber, block: L2BlockNew, l1: L1PublishedData, attestations: CommitteeAttestation[]);
+    constructor(checkpointNumber: CheckpointNumber, block: L2Block, l1: L1PublishedData, attestations: CommitteeAttestation[]);
     static get schema(): z.ZodEffects<z.ZodObject<{
         checkpointNumber: z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, CheckpointNumber, string | number | bigint>;
         block: z.ZodEffects<z.ZodObject<{
             archive: z.ZodEffects<z.ZodObject<{
-                root: z.ZodType<import("../../../foundation/dest/schemas/schemas.js").Fr, any, string>;
+                root: z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>;
                 nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
             }, "strip", z.ZodTypeAny, {
-                root: import("../../../foundation/dest/schemas/schemas.js").Fr;
+                root: import("@aztec/foundation/schemas").Fr;
                 nextAvailableLeafIndex: number;
             }, {
                 root: string;
@@ -31,10 +30,10 @@ export declare class CheckpointedL2Block {
                 root: string;
                 nextAvailableLeafIndex: string | number | bigint;
             }>;
-            header: import("../schemas/schemas.js").ZodFor<import("../tx/block_header.js").BlockHeader>;
-            body: import("../schemas/schemas.js").ZodFor<import("./body.js").Body>;
+            header: import("@aztec/foundation/schemas").ZodFor<import("../tx/block_header.js").BlockHeader>;
+            body: import("@aztec/foundation/schemas").ZodFor<import("./body.js").Body>;
             checkpointNumber: z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, CheckpointNumber, string | number | bigint>;
-            indexWithinCheckpoint: z.ZodNumber;
+            indexWithinCheckpoint: z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, import("@aztec/foundation/branded-types").IndexWithinCheckpoint, string | number | bigint>;
         }, "strip", z.ZodTypeAny, {
             archive: import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot;
             header: import("../tx/block_header.js").BlockHeader;
@@ -42,7 +41,9 @@ export declare class CheckpointedL2Block {
             checkpointNumber: number & {
                 _branding: "CheckpointNumber";
             };
-            indexWithinCheckpoint: number;
+            indexWithinCheckpoint: number & {
+                _branding: "IndexWithinCheckpoint";
+            };
         }, {
             archive: {
                 root: string;
@@ -51,8 +52,8 @@ export declare class CheckpointedL2Block {
             header?: any;
             body?: any;
             checkpointNumber: string | number | bigint;
-            indexWithinCheckpoint: number;
-        }>, L2BlockNew, {
+            indexWithinCheckpoint: string | number | bigint;
+        }>, L2Block, {
             archive: {
                 root: string;
                 nextAvailableLeafIndex: string | number | bigint;
@@ -60,7 +61,7 @@ export declare class CheckpointedL2Block {
             header?: any;
             body?: any;
             checkpointNumber: string | number | bigint;
-            indexWithinCheckpoint: number;
+            indexWithinCheckpoint: string | number | bigint;
         }>;
         l1: z.ZodEffects<z.ZodObject<{
             blockNumber: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
@@ -80,10 +81,10 @@ export declare class CheckpointedL2Block {
             blockHash: string;
         }>;
         attestations: z.ZodArray<z.ZodEffects<z.ZodObject<{
-            address: z.ZodType<import("./proposal/committee_attestation.js").EthAddress, any, string>;
+            address: z.ZodType<import("@aztec/foundation/eth-address").EthAddress, any, string>;
             signature: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, `0x${string}`, string>, `0x${string}`, string>, import("./proposal/committee_attestation.js").Signature, string>;
         }, "strip", z.ZodTypeAny, {
-            address: import("./proposal/committee_attestation.js").EthAddress;
+            address: import("@aztec/foundation/eth-address").EthAddress;
             signature: import("./proposal/committee_attestation.js").Signature;
         }, {
             address: string;
@@ -96,7 +97,7 @@ export declare class CheckpointedL2Block {
         checkpointNumber: number & {
             _branding: "CheckpointNumber";
         };
-        block: L2BlockNew;
+        block: L2Block;
         l1: L1PublishedData;
         attestations: CommitteeAttestation[];
     }, {
@@ -109,7 +110,7 @@ export declare class CheckpointedL2Block {
             header?: any;
             body?: any;
             checkpointNumber: string | number | bigint;
-            indexWithinCheckpoint: number;
+            indexWithinCheckpoint: string | number | bigint;
         };
         l1: {
             blockNumber: string | number | bigint;
@@ -130,7 +131,7 @@ export declare class CheckpointedL2Block {
             header?: any;
             body?: any;
             checkpointNumber: string | number | bigint;
-            indexWithinCheckpoint: number;
+            indexWithinCheckpoint: string | number | bigint;
         };
         l1: {
             blockNumber: string | number | bigint;
@@ -146,122 +147,4 @@ export declare class CheckpointedL2Block {
     static fromFields(fields: FieldsOf<CheckpointedL2Block>): CheckpointedL2Block;
     toBuffer(): Buffer;
 }
-export declare class PublishedL2Block {
-    block: L2Block;
-    l1: L1PublishedData;
-    attestations: CommitteeAttestation[];
-    constructor(block: L2Block, l1: L1PublishedData, attestations: CommitteeAttestation[]);
-    static get schema(): z.ZodEffects<z.ZodObject<{
-        block: z.ZodEffects<z.ZodObject<{
-            archive: z.ZodEffects<z.ZodObject<{
-                root: z.ZodType<import("../../../foundation/dest/schemas/schemas.js").Fr, any, string>;
-                nextAvailableLeafIndex: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
-            }, "strip", z.ZodTypeAny, {
-                root: import("../../../foundation/dest/schemas/schemas.js").Fr;
-                nextAvailableLeafIndex: number;
-            }, {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            }>, import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot, {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            }>;
-            header: import("../schemas/schemas.js").ZodFor<import("./l2_block_header.js").L2BlockHeader>;
-            body: import("../schemas/schemas.js").ZodFor<import("./body.js").Body>;
-        }, "strip", z.ZodTypeAny, {
-            archive: import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot;
-            header: import("./l2_block_header.js").L2BlockHeader;
-            body: import("./body.js").Body;
-        }, {
-            archive: {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            };
-            header?: any;
-            body?: any;
-        }>, L2Block, {
-            archive: {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            };
-            header?: any;
-            body?: any;
-        }>;
-        l1: z.ZodEffects<z.ZodObject<{
-            blockNumber: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
-            timestamp: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
-            blockHash: z.ZodString;
-        }, "strip", z.ZodTypeAny, {
-            blockNumber: bigint;
-            timestamp: bigint;
-            blockHash: string;
-        }, {
-            blockNumber: string | number | bigint;
-            timestamp: string | number | bigint;
-            blockHash: string;
-        }>, L1PublishedData, {
-            blockNumber: string | number | bigint;
-            timestamp: string | number | bigint;
-            blockHash: string;
-        }>;
-        attestations: z.ZodArray<z.ZodEffects<z.ZodObject<{
-            address: z.ZodType<import("./proposal/committee_attestation.js").EthAddress, any, string>;
-            signature: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, `0x${string}`, string>, `0x${string}`, string>, import("./proposal/committee_attestation.js").Signature, string>;
-        }, "strip", z.ZodTypeAny, {
-            address: import("./proposal/committee_attestation.js").EthAddress;
-            signature: import("./proposal/committee_attestation.js").Signature;
-        }, {
-            address: string;
-            signature: string;
-        }>, CommitteeAttestation, {
-            address: string;
-            signature: string;
-        }>, "many">;
-    }, "strip", z.ZodTypeAny, {
-        block: L2Block;
-        l1: L1PublishedData;
-        attestations: CommitteeAttestation[];
-    }, {
-        block: {
-            archive: {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            };
-            header?: any;
-            body?: any;
-        };
-        l1: {
-            blockNumber: string | number | bigint;
-            timestamp: string | number | bigint;
-            blockHash: string;
-        };
-        attestations: {
-            address: string;
-            signature: string;
-        }[];
-    }>, PublishedL2Block, {
-        block: {
-            archive: {
-                root: string;
-                nextAvailableLeafIndex: string | number | bigint;
-            };
-            header?: any;
-            body?: any;
-        };
-        l1: {
-            blockNumber: string | number | bigint;
-            timestamp: string | number | bigint;
-            blockHash: string;
-        };
-        attestations: {
-            address: string;
-            signature: string;
-        }[];
-    }>;
-    static fromBuffer(bufferOrReader: Buffer | BufferReader): PublishedL2Block;
-    static fromFields(fields: FieldsOf<PublishedL2Block>): PublishedL2Block;
-    toBuffer(): Buffer;
-    toPublishedCheckpoint(): PublishedCheckpoint;
-    static fromPublishedCheckpoint(checkpoint: PublishedCheckpoint): PublishedL2Block;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2twb2ludGVkX2wyX2Jsb2NrLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2svY2hlY2twb2ludGVkX2wyX2Jsb2NrLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBMEIsTUFBTSxpQ0FBaUMsQ0FBQztBQUMzRixPQUFPLEVBQUUsWUFBWSxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBQzlFLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXhELE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLGVBQWUsRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBQzdGLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDeEMsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQy9DLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBRTNFOztHQUVHO0FBQ0gscUJBQWEsbUJBQW1CO0lBRXJCLGdCQUFnQixFQUFFLGdCQUFnQjtJQUNsQyxLQUFLLEVBQUUsVUFBVTtJQUNqQixFQUFFLEVBQUUsZUFBZTtJQUNuQixZQUFZLEVBQUUsb0JBQW9CLEVBQUU7SUFKN0MsWUFDUyxnQkFBZ0IsRUFBRSxnQkFBZ0IsRUFDbEMsS0FBSyxFQUFFLFVBQVUsRUFDakIsRUFBRSxFQUFFLGVBQWUsRUFDbkIsWUFBWSxFQUFFLG9CQUFvQixFQUFFLEVBQ3pDO0lBQ0osTUFBTSxLQUFLLE1BQU07Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztPQVNoQjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsY0FBYyxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsbUJBQW1CLENBYzVFO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLG1CQUFtQixDQUFDLHVCQU90RDtJQUVNLFFBQVEsSUFBSSxNQUFNLENBU3hCO0NBQ0Y7QUFFRCxxQkFBYSxnQkFBZ0I7SUFFbEIsS0FBSyxFQUFFLE9BQU87SUFDZCxFQUFFLEVBQUUsZUFBZTtJQUNuQixZQUFZLEVBQUUsb0JBQW9CLEVBQUU7SUFIN0MsWUFDUyxLQUFLLEVBQUUsT0FBTyxFQUNkLEVBQUUsRUFBRSxlQUFlLEVBQ25CLFlBQVksRUFBRSxvQkFBb0IsRUFBRSxFQUN6QztJQUVKLE1BQU0sS0FBSyxNQUFNOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O09BUWhCO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxjQUFjLEVBQUUsTUFBTSxHQUFHLFlBQVksR0FBRyxnQkFBZ0IsQ0FRekU7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsZ0JBQWdCLENBQUMsb0JBRW5EO0lBRU0sUUFBUSxJQUFJLE1BQU0sQ0FTeEI7SUFFTSxxQkFBcUIsd0JBRTNCO0lBRUQsTUFBTSxDQUFDLHVCQUF1QixDQUFDLFVBQVUsRUFBRSxtQkFBbUIsb0JBRTdEO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2twb2ludGVkX2wyX2Jsb2NrLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2svY2hlY2twb2ludGVkX2wyX2Jsb2NrLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBMEIsTUFBTSxpQ0FBaUMsQ0FBQztBQUMzRixPQUFPLEVBQUUsWUFBWSxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBQzlFLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXhELE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBRXhFLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDeEMsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFFM0U7O0dBRUc7QUFDSCxxQkFBYSxtQkFBbUI7SUFFckIsZ0JBQWdCLEVBQUUsZ0JBQWdCO0lBQ2xDLEtBQUssRUFBRSxPQUFPO0lBQ2QsRUFBRSxFQUFFLGVBQWU7SUFDbkIsWUFBWSxFQUFFLG9CQUFvQixFQUFFO0lBSjdDLFlBQ1MsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQ2xDLEtBQUssRUFBRSxPQUFPLEVBQ2QsRUFBRSxFQUFFLGVBQWUsRUFDbkIsWUFBWSxFQUFFLG9CQUFvQixFQUFFLEVBQ3pDO0lBQ0osTUFBTSxLQUFLLE1BQU07Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O09BU2hCO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxjQUFjLEVBQUUsTUFBTSxHQUFHLFlBQVksR0FBRyxtQkFBbUIsQ0FjNUU7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsbUJBQW1CLENBQUMsdUJBT3REO0lBRU0sUUFBUSxJQUFJLE1BQU0sQ0FVeEI7Q0FDRiJ9

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

@@ -1 +1 @@
-{"version":3,"file":"checkpointed_l2_block.d.ts","sourceRoot":"","sources":["../../src/block/checkpointed_l2_block.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAA0B,MAAM,iCAAiC,CAAC;AAC3F,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAC7F,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAE3E;;GAEG;AACH,qBAAa,mBAAmB;IAErB,gBAAgB,EAAE,gBAAgB;IAClC,KAAK,EAAE,UAAU;IACjB,EAAE,EAAE,eAAe;IACnB,YAAY,EAAE,oBAAoB,EAAE;IAJ7C,YACS,gBAAgB,EAAE,gBAAgB,EAClC,KAAK,EAAE,UAAU,EACjB,EAAE,EAAE,eAAe,EACnB,YAAY,EAAE,oBAAoB,EAAE,EACzC;IACJ,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAShB;IAED,MAAM,CAAC,UAAU,CAAC,cAAc,EAAE,MAAM,GAAG,YAAY,GAAG,mBAAmB,CAc5E;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,mBAAmB,CAAC,uBAOtD;IAEM,QAAQ,IAAI,MAAM,CASxB;CACF;AAED,qBAAa,gBAAgB;IAElB,KAAK,EAAE,OAAO;IACd,EAAE,EAAE,eAAe;IACnB,YAAY,EAAE,oBAAoB,EAAE;IAH7C,YACS,KAAK,EAAE,OAAO,EACd,EAAE,EAAE,eAAe,EACnB,YAAY,EAAE,oBAAoB,EAAE,EACzC;IAEJ,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAQhB;IAED,MAAM,CAAC,UAAU,CAAC,cAAc,EAAE,MAAM,GAAG,YAAY,GAAG,gBAAgB,CAQzE;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAC,oBAEnD;IAEM,QAAQ,IAAI,MAAM,CASxB;IAEM,qBAAqB,wBAE3B;IAED,MAAM,CAAC,uBAAuB,CAAC,UAAU,EAAE,mBAAmB,oBAE7D;CACF"}
+{"version":3,"file":"checkpointed_l2_block.d.ts","sourceRoot":"","sources":["../../src/block/checkpointed_l2_block.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAA0B,MAAM,iCAAiC,CAAC;AAC3F,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAExE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAE3E;;GAEG;AACH,qBAAa,mBAAmB;IAErB,gBAAgB,EAAE,gBAAgB;IAClC,KAAK,EAAE,OAAO;IACd,EAAE,EAAE,eAAe;IACnB,YAAY,EAAE,oBAAoB,EAAE;IAJ7C,YACS,gBAAgB,EAAE,gBAAgB,EAClC,KAAK,EAAE,OAAO,EACd,EAAE,EAAE,eAAe,EACnB,YAAY,EAAE,oBAAoB,EAAE,EACzC;IACJ,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAShB;IAED,MAAM,CAAC,UAAU,CAAC,cAAc,EAAE,MAAM,GAAG,YAAY,GAAG,mBAAmB,CAc5E;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,mBAAmB,CAAC,uBAOtD;IAEM,QAAQ,IAAI,MAAM,CAUxB;CACF"}

package/dest/block/checkpointed_l2_block.js

@@ -2,9 +2,9 @@
 import { CheckpointNumber, CheckpointNumberSchema } from '@aztec/foundation/branded-types';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { z } from 'zod';
-import { L1PublishedData, PublishedCheckpoint } from '../checkpoint/published_checkpoint.js';
+import { L1PublishedData } from '../checkpoint/published_checkpoint.js';
+import { MAX_BLOCK_HASH_STRING_LENGTH, MAX_COMMITTEE_SIZE } from '../deserialization/index.js';
 import { L2Block } from './l2_block.js';
-import { L2BlockNew } from './l2_block_new.js';
 import { CommitteeAttestation } from './proposal/committee_attestation.js';
 /**
  * Encapsulates an L2 Block along with the checkpoint data associated with it.
@@ -22,7 +22,7 @@ import { CommitteeAttestation } from './proposal/committee_attestation.js';
     static get schema() {
         return z.object({
             checkpointNumber: CheckpointNumberSchema,
-            block: L2BlockNew.schema,
+            block: L2Block.schema,
             l1: L1PublishedData.schema,
             attestations: z.array(CommitteeAttestation.schema)
         }).transform((obj)=>CheckpointedL2Block.fromFields(obj));
@@ -30,55 +30,17 @@ import { CommitteeAttestation } from './proposal/committee_attestation.js';
     static fromBuffer(bufferOrReader) {
         const reader = BufferReader.asReader(bufferOrReader);
         const checkpointNumber = reader.readNumber();
-        const block = reader.readObject(L2BlockNew);
+        const block = reader.readObject(L2Block);
         const l1BlockNumber = reader.readBigInt();
-        const l1BlockHash = reader.readString();
+        const l1BlockHash = reader.readString(MAX_BLOCK_HASH_STRING_LENGTH);
         const l1Timestamp = reader.readBigInt();
-        const attestations = reader.readVector(CommitteeAttestation);
+        const attestations = reader.readVector(CommitteeAttestation, MAX_COMMITTEE_SIZE);
         return new CheckpointedL2Block(CheckpointNumber(checkpointNumber), block, new L1PublishedData(l1BlockNumber, l1Timestamp, l1BlockHash), attestations);
     }
     static fromFields(fields) {
         return new CheckpointedL2Block(CheckpointNumber(fields.checkpointNumber), fields.block, fields.l1, fields.attestations);
     }
     toBuffer() {
-        return serializeToBuffer(this.block, this.l1.blockNumber, this.l1.blockHash, this.l1.timestamp, this.attestations.length, this.attestations);
-    }
-}
-export class PublishedL2Block {
-    block;
-    l1;
-    attestations;
-    constructor(block, l1, attestations){
-        this.block = block;
-        this.l1 = l1;
-        this.attestations = attestations;
-    }
-    static get schema() {
-        return z.object({
-            block: L2Block.schema,
-            l1: L1PublishedData.schema,
-            attestations: z.array(CommitteeAttestation.schema)
-        }).transform((obj)=>PublishedL2Block.fromFields(obj));
-    }
-    static fromBuffer(bufferOrReader) {
-        const reader = BufferReader.asReader(bufferOrReader);
-        const block = reader.readObject(L2Block);
-        const l1BlockNumber = reader.readBigInt();
-        const l1BlockHash = reader.readString();
-        const l1Timestamp = reader.readBigInt();
-        const attestations = reader.readVector(CommitteeAttestation);
-        return new PublishedL2Block(block, new L1PublishedData(l1BlockNumber, l1Timestamp, l1BlockHash), attestations);
-    }
-    static fromFields(fields) {
-        return new PublishedL2Block(fields.block, fields.l1, fields.attestations);
-    }
-    toBuffer() {
-        return serializeToBuffer(this.block, this.l1.blockNumber, this.l1.blockHash, this.l1.timestamp, this.attestations.length, this.attestations);
-    }
-    toPublishedCheckpoint() {
-        return new PublishedCheckpoint(this.block.toCheckpoint(), this.l1, this.attestations);
-    }
-    static fromPublishedCheckpoint(checkpoint) {
-        return new PublishedL2Block(L2Block.fromCheckpoint(checkpoint.checkpoint), checkpoint.l1, checkpoint.attestations);
+        return serializeToBuffer(this.checkpointNumber, this.block, this.l1.blockNumber, this.l1.blockHash, this.l1.timestamp, this.attestations.length, this.attestations);
     }
 }

package/dest/block/in_block.d.ts

@@ -1,10 +1,10 @@
 import { BlockNumber } from '@aztec/foundation/branded-types';
 import { type ZodTypeAny, z } from 'zod';
-import { L2BlockHash } from './block_hash.js';
+import { BlockHash } from './block_hash.js';
 import type { L2Block } from './l2_block.js';
 export type InBlock = {
     l2BlockNumber: BlockNumber;
-    l2BlockHash: L2BlockHash;
+    l2BlockHash: BlockHash;
 };
 export type DataInBlock<T> = {
     data: T;
@@ -14,30 +14,30 @@ export declare function randomDataInBlock<T>(data: T): DataInBlock<T>;
 export declare function wrapDataInBlock<T>(data: T, block: L2Block): Promise<DataInBlock<T>>;
 export declare function inBlockSchema(): z.ZodObject<{
     l2BlockNumber: z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, BlockNumber, string | number | bigint>;
-    l2BlockHash: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer<ArrayBuffer>, string>, L2BlockHash, string>;
+    l2BlockHash: import("@aztec/foundation/schemas").ZodFor<BlockHash>;
 }, "strip", ZodTypeAny, {
     l2BlockNumber: number & {
         _branding: "BlockNumber";
     };
-    l2BlockHash: L2BlockHash;
+    l2BlockHash: BlockHash;
 }, {
     l2BlockNumber: string | number | bigint;
-    l2BlockHash: string;
+    l2BlockHash?: any;
 }>;
 export declare function dataInBlockSchemaFor<T extends ZodTypeAny>(schema: T): z.ZodObject<{
     l2BlockNumber: z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, BlockNumber, string | number | bigint>;
-    l2BlockHash: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer<ArrayBuffer>, string>, L2BlockHash, string>;
+    l2BlockHash: import("@aztec/foundation/schemas").ZodFor<BlockHash>;
 } & {
     data: T;
 }, "strip", ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<{
     l2BlockNumber: z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, BlockNumber, string | number | bigint>;
-    l2BlockHash: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer<ArrayBuffer>, string>, L2BlockHash, string>;
+    l2BlockHash: import("@aztec/foundation/schemas").ZodFor<BlockHash>;
 } & {
     data: T;
 }>, any> extends infer T_1 ? { [k in keyof T_1]: T_1[k]; } : never, z.baseObjectInputType<{
     l2BlockNumber: z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, BlockNumber, string | number | bigint>;
-    l2BlockHash: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer<ArrayBuffer>, string>, L2BlockHash, string>;
+    l2BlockHash: import("@aztec/foundation/schemas").ZodFor<BlockHash>;
 } & {
     data: T;
 }> extends infer T_2 ? { [k in keyof T_2]: T_2[k]; } : never>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5fYmxvY2suZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ibG9jay9pbl9ibG9jay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFxQixNQUFNLGlDQUFpQyxDQUFDO0FBRWpGLE9BQU8sRUFBRSxLQUFLLFVBQVUsRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFekMsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQzlDLE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUU3QyxNQUFNLE1BQU0sT0FBTyxHQUFHO0lBQ3BCLGFBQWEsRUFBRSxXQUFXLENBQUM7SUFDM0IsV0FBVyxFQUFFLFdBQVcsQ0FBQztDQUMxQixDQUFDO0FBR0YsTUFBTSxNQUFNLFdBQVcsQ0FBQyxDQUFDLElBQUk7SUFDM0IsSUFBSSxFQUFFLENBQUMsQ0FBQztDQUNULEdBQUcsT0FBTyxDQUFDO0FBRVosd0JBQWdCLGFBQWEsSUFBSSxPQUFPLENBS3ZDO0FBRUQsd0JBQWdCLGlCQUFpQixDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxHQUFHLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FLNUQ7QUFFRCx3QkFBc0IsZUFBZSxDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxFQUFFLEtBQUssRUFBRSxPQUFPLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQU16RjtBQUVELHdCQUFnQixhQUFhOzs7Ozs7Ozs7OztHQUs1QjtBQUVELHdCQUFnQixvQkFBb0IsQ0FBQyxDQUFDLFNBQVMsVUFBVSxFQUFFLE1BQU0sRUFBRSxDQUFDOzs7Ozs7Ozs7Ozs7Ozs7OERBRW5FIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5fYmxvY2suZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ibG9jay9pbl9ibG9jay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFxQixNQUFNLGlDQUFpQyxDQUFDO0FBRWpGLE9BQU8sRUFBRSxLQUFLLFVBQVUsRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFekMsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQzVDLE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUU3QyxNQUFNLE1BQU0sT0FBTyxHQUFHO0lBQ3BCLGFBQWEsRUFBRSxXQUFXLENBQUM7SUFDM0IsV0FBVyxFQUFFLFNBQVMsQ0FBQztDQUN4QixDQUFDO0FBR0YsTUFBTSxNQUFNLFdBQVcsQ0FBQyxDQUFDLElBQUk7SUFDM0IsSUFBSSxFQUFFLENBQUMsQ0FBQztDQUNULEdBQUcsT0FBTyxDQUFDO0FBRVosd0JBQWdCLGFBQWEsSUFBSSxPQUFPLENBS3ZDO0FBRUQsd0JBQWdCLGlCQUFpQixDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxHQUFHLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FLNUQ7QUFFRCx3QkFBc0IsZUFBZSxDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxFQUFFLEtBQUssRUFBRSxPQUFPLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQU16RjtBQUVELHdCQUFnQixhQUFhOzs7Ozs7Ozs7OztHQUs1QjtBQUVELHdCQUFnQixvQkFBb0IsQ0FBQyxDQUFDLFNBQVMsVUFBVSxFQUFFLE1BQU0sRUFBRSxDQUFDOzs7Ozs7Ozs7Ozs7Ozs7OERBRW5FIn0=

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,WAAW,EAAqB,MAAM,iCAAiC,CAAC;AAEjF,OAAO,EAAE,KAAK,UAAU,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAEzC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,MAAM,OAAO,GAAG;IACpB,aAAa,EAAE,WAAW,CAAC;IAC3B,WAAW,EAAE,WAAW,CAAC;CAC1B,CAAC;AAGF,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;IAC3B,IAAI,EAAE,CAAC,CAAC;CACT,GAAG,OAAO,CAAC;AAEZ,wBAAgB,aAAa,IAAI,OAAO,CAKvC;AAED,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAK5D;AAED,wBAAsB,eAAe,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAMzF;AAED,wBAAgB,aAAa;;;;;;;;;;;GAK5B;AAED,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,UAAU,EAAE,MAAM,EAAE,CAAC;;;;;;;;;;;;;;;8DAEnE"}
+{"version":3,"file":"in_block.d.ts","sourceRoot":"","sources":["../../src/block/in_block.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAqB,MAAM,iCAAiC,CAAC;AAEjF,OAAO,EAAE,KAAK,UAAU,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAEzC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,MAAM,OAAO,GAAG;IACpB,aAAa,EAAE,WAAW,CAAC;IAC3B,WAAW,EAAE,SAAS,CAAC;CACxB,CAAC;AAGF,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;IAC3B,IAAI,EAAE,CAAC,CAAC;CACT,GAAG,OAAO,CAAC;AAEZ,wBAAgB,aAAa,IAAI,OAAO,CAKvC;AAED,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAK5D;AAED,wBAAsB,eAAe,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAMzF;AAED,wBAAgB,aAAa;;;;;;;;;;;GAK5B;AAED,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,UAAU,EAAE,MAAM,EAAE,CAAC;;;;;;;;;;;;;;;8DAEnE"}

package/dest/block/in_block.js

@@ -1,10 +1,10 @@
 import { BlockNumber, BlockNumberSchema } from '@aztec/foundation/branded-types';
 import { z } from 'zod';
-import { L2BlockHash } from './block_hash.js';
+import { BlockHash } from './block_hash.js';
 export function randomInBlock() {
     return {
-        l2BlockNumber: BlockNumber(Math.floor(Math.random() * 1000)),
-        l2BlockHash: L2BlockHash.random()
+        l2BlockNumber: BlockNumber(Math.floor(Math.random() * 1000) + 1),
+        l2BlockHash: BlockHash.random()
     };
 }
 export function randomDataInBlock(data) {
@@ -17,13 +17,13 @@ export async function wrapDataInBlock(data, block) {
     return {
         data,
         l2BlockNumber: block.number,
-        l2BlockHash: L2BlockHash.fromField(await block.hash())
+        l2BlockHash: await block.hash()
     };
 }
 export function inBlockSchema() {
     return z.object({
         l2BlockNumber: BlockNumberSchema,
-        l2BlockHash: L2BlockHash.schema
+        l2BlockHash: BlockHash.schema
     });
 }
 export function dataInBlockSchemaFor(schema) {

package/dest/block/index.d.ts

@@ -1,6 +1,5 @@
+export * from './block_data.js';
 export * from './l2_block.js';
-export * from './l2_block_new.js';
-export * from './l2_block_header.js';
 export * from './l2_block_stream/index.js';
 export * from './in_block.js';
 export * from './body.js';
@@ -12,4 +11,4 @@ export * from './proposal/index.js';
 export * from './validate_block_result.js';
 export * from './l2_block_info.js';
 export * from './attestation_info.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ibG9jay9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGVBQWUsQ0FBQztBQUM5QixjQUFjLG1CQUFtQixDQUFDO0FBQ2xDLGNBQWMsc0JBQXNCLENBQUM7QUFDckMsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLGVBQWUsQ0FBQztBQUM5QixjQUFjLFdBQVcsQ0FBQztBQUMxQixjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMsc0JBQXNCLENBQUM7QUFDckMsY0FBYyxpQkFBaUIsQ0FBQztBQUNoQyxjQUFjLDRCQUE0QixDQUFDO0FBQzNDLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLG9CQUFvQixDQUFDO0FBQ25DLGNBQWMsdUJBQXVCLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ibG9jay9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGlCQUFpQixDQUFDO0FBQ2hDLGNBQWMsZUFBZSxDQUFDO0FBQzlCLGNBQWMsNEJBQTRCLENBQUM7QUFDM0MsY0FBYyxlQUFlLENBQUM7QUFDOUIsY0FBYyxXQUFXLENBQUM7QUFDMUIsY0FBYyxzQkFBc0IsQ0FBQztBQUNyQyxjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMsaUJBQWlCLENBQUM7QUFDaEMsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsNEJBQTRCLENBQUM7QUFDM0MsY0FBYyxvQkFBb0IsQ0FBQztBQUNuQyxjQUFjLHVCQUF1QixDQUFDIn0=

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,mBAAmB,CAAC;AAClC,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,4BAA4B,CAAC;AAC3C,cAAc,qBAAqB,CAAC;AACpC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/block/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,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,4BAA4B,CAAC;AAC3C,cAAc,qBAAqB,CAAC;AACpC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC"}

package/dest/block/index.js

@@ -1,6 +1,5 @@
+export * from './block_data.js';
 export * from './l2_block.js';
-export * from './l2_block_new.js';
-export * from './l2_block_header.js';
 export * from './l2_block_stream/index.js';
 export * from './in_block.js';
 export * from './body.js';