@aztec/stdlib 0.0.1-commit.9593d84 → 0.0.1-commit.96bb3f7

package/dest/block/checkpointed_l2_block.d.ts

@@ -0,0 +1,267 @@
+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 { 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;
+    l1: L1PublishedData;
+    attestations: CommitteeAttestation[];
+    constructor(checkpointNumber: CheckpointNumber, block: L2BlockNew, 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>;
+                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("../tx/block_header.js").BlockHeader>;
+            body: import("../schemas/schemas.js").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;
+        }, "strip", z.ZodTypeAny, {
+            archive: import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot;
+            header: import("../tx/block_header.js").BlockHeader;
+            body: import("./body.js").Body;
+            checkpointNumber: number & {
+                _branding: "CheckpointNumber";
+            };
+            indexWithinCheckpoint: number;
+        }, {
+            archive: {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
+            };
+            header?: any;
+            body?: any;
+            checkpointNumber: string | number | bigint;
+            indexWithinCheckpoint: number;
+        }>, L2BlockNew, {
+            archive: {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
+            };
+            header?: any;
+            body?: any;
+            checkpointNumber: string | number | bigint;
+            indexWithinCheckpoint: number;
+        }>;
+        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, {
+        checkpointNumber: number & {
+            _branding: "CheckpointNumber";
+        };
+        block: L2BlockNew;
+        l1: L1PublishedData;
+        attestations: CommitteeAttestation[];
+    }, {
+        checkpointNumber: string | number | bigint;
+        block: {
+            archive: {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
+            };
+            header?: any;
+            body?: any;
+            checkpointNumber: string | number | bigint;
+            indexWithinCheckpoint: number;
+        };
+        l1: {
+            blockNumber: string | number | bigint;
+            timestamp: string | number | bigint;
+            blockHash: string;
+        };
+        attestations: {
+            address: string;
+            signature: string;
+        }[];
+    }>, CheckpointedL2Block, {
+        checkpointNumber: string | number | bigint;
+        block: {
+            archive: {
+                root: string;
+                nextAvailableLeafIndex: string | number | bigint;
+            };
+            header?: any;
+            body?: any;
+            checkpointNumber: string | number | bigint;
+            indexWithinCheckpoint: number;
+        };
+        l1: {
+            blockNumber: string | number | bigint;
+            timestamp: string | number | bigint;
+            blockHash: string;
+        };
+        attestations: {
+            address: string;
+            signature: string;
+        }[];
+    }>;
+    static fromBuffer(bufferOrReader: Buffer | BufferReader): 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==

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

@@ -0,0 +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"}

package/dest/block/{published_l2_block.js → checkpointed_l2_block.js}

@@ -1,14 +1,50 @@
 // Ignoring import issue to fix portable inferred type issue in zod schema
+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 { L2Block } from './l2_block.js';
+import { L2BlockNew } from './l2_block_new.js';
 import { CommitteeAttestation } from './proposal/committee_attestation.js';
 /**
- * @deprecated `PublishedCheckpoint` is what will be retrieved from L1.
- * L2 blocks do not need to link to L1PublishedData directly.
- * TODO: Create another type (AttestedL2Block?) for an L2 block and its attestations.
- */ export class PublishedL2Block {
+ * Encapsulates an L2 Block along with the checkpoint data associated with it.
+ */ export class CheckpointedL2Block {
+    checkpointNumber;
+    block;
+    l1;
+    attestations;
+    constructor(checkpointNumber, block, l1, attestations){
+        this.checkpointNumber = checkpointNumber;
+        this.block = block;
+        this.l1 = l1;
+        this.attestations = attestations;
+    }
+    static get schema() {
+        return z.object({
+            checkpointNumber: CheckpointNumberSchema,
+            block: L2BlockNew.schema,
+            l1: L1PublishedData.schema,
+            attestations: z.array(CommitteeAttestation.schema)
+        }).transform((obj)=>CheckpointedL2Block.fromFields(obj));
+    }
+    static fromBuffer(bufferOrReader) {
+        const reader = BufferReader.asReader(bufferOrReader);
+        const checkpointNumber = reader.readNumber();
+        const block = reader.readObject(L2BlockNew);
+        const l1BlockNumber = reader.readBigInt();
+        const l1BlockHash = reader.readString();
+        const l1Timestamp = reader.readBigInt();
+        const attestations = reader.readVector(CommitteeAttestation);
+        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;

package/dest/block/in_block.d.ts

@@ -1,24 +1,43 @@
+import { BlockNumber } from '@aztec/foundation/branded-types';
 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;
+export type InBlock = {
+    l2BlockNumber: BlockNumber;
     l2BlockHash: L2BlockHash;
-    data: T;
 };
-export declare function randomInBlock<T>(data: T): InBlock<T>;
-export declare function wrapInBlock<T>(data: T, block: L2Block): Promise<InBlock<T>>;
-export declare function inBlockSchemaFor<T extends ZodTypeAny>(schema: T): z.ZodObject<{
+export type DataInBlock<T> = {
     data: T;
-    l2BlockNumber: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
+} & InBlock;
+export declare function randomInBlock(): InBlock;
+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>;
-}, "strip", ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<{
+}, "strip", ZodTypeAny, {
+    l2BlockNumber: number & {
+        _branding: "BlockNumber";
+    };
+    l2BlockHash: L2BlockHash;
+}, {
+    l2BlockNumber: string | number | bigint;
+    l2BlockHash: string;
+}>;
+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>;
+} & {
     data: T;
-    l2BlockNumber: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
+}, "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>;
-}>, any> extends infer T_1 ? { [k in keyof T_1]: T_1[k]; } : never, z.baseObjectInputType<{
+} & {
     data: T;
-    l2BlockNumber: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
+}>, 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>;
+} & {
+    data: T;
 }> extends infer T_2 ? { [k in keyof T_2]: T_2[k]; } : never>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5fYmxvY2suZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ibG9jay9pbl9ibG9jay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxVQUFVLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBR3pDLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUM5QyxPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFHN0MsTUFBTSxNQUFNLE9BQU8sQ0FBQyxDQUFDLElBQUk7SUFDdkIsYUFBYSxFQUFFLE1BQU0sQ0FBQztJQUN0QixXQUFXLEVBQUUsV0FBVyxDQUFDO0lBQ3pCLElBQUksRUFBRSxDQUFDLENBQUM7Q0FDVCxDQUFDO0FBRUYsd0JBQWdCLGFBQWEsQ0FBQyxDQUFDLEVBQUUsSUFBSSxFQUFFLENBQUMsR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBTXBEO0FBRUQsd0JBQXNCLFdBQVcsQ0FBQyxDQUFDLEVBQUUsSUFBSSxFQUFFLENBQUMsRUFBRSxLQUFLLEVBQUUsT0FBTyxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FNakY7QUFFRCx3QkFBZ0IsZ0JBQWdCLENBQUMsQ0FBQyxTQUFTLFVBQVUsRUFBRSxNQUFNLEVBQUUsQ0FBQzs7Ozs7Ozs7Ozs7OzhEQU0vRCJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5fYmxvY2suZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ibG9jay9pbl9ibG9jay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFxQixNQUFNLGlDQUFpQyxDQUFDO0FBRWpGLE9BQU8sRUFBRSxLQUFLLFVBQVUsRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFekMsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQzlDLE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUU3QyxNQUFNLE1BQU0sT0FBTyxHQUFHO0lBQ3BCLGFBQWEsRUFBRSxXQUFXLENBQUM7SUFDM0IsV0FBVyxFQUFFLFdBQVcsQ0FBQztDQUMxQixDQUFDO0FBR0YsTUFBTSxNQUFNLFdBQVcsQ0FBQyxDQUFDLElBQUk7SUFDM0IsSUFBSSxFQUFFLENBQUMsQ0FBQztDQUNULEdBQUcsT0FBTyxDQUFDO0FBRVosd0JBQWdCLGFBQWEsSUFBSSxPQUFPLENBS3ZDO0FBRUQsd0JBQWdCLGlCQUFpQixDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxHQUFHLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FLNUQ7QUFFRCx3QkFBc0IsZUFBZSxDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxFQUFFLEtBQUssRUFBRSxPQUFPLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQU16RjtBQUVELHdCQUFnQixhQUFhOzs7Ozs7Ozs7OztHQUs1QjtBQUVELHdCQUFnQixvQkFBb0IsQ0FBQyxDQUFDLFNBQVMsVUFBVSxFQUFFLE1BQU0sRUFBRSxDQUFDOzs7Ozs7Ozs7Ozs7Ozs7OERBRW5FIn0=

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;;;;;;;;;;;;8DAM/D"}
+{"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"}

package/dest/block/in_block.js

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

package/dest/block/index.d.ts

@@ -4,12 +4,12 @@ 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 './block_parameter.js';
 export * from './l2_block_source.js';
 export * from './block_hash.js';
-export * from './published_l2_block.js';
+export * from './checkpointed_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=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ibG9jay9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGVBQWUsQ0FBQztBQUM5QixjQUFjLG1CQUFtQixDQUFDO0FBQ2xDLGNBQWMsc0JBQXNCLENBQUM7QUFDckMsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLGVBQWUsQ0FBQztBQUM5QixjQUFjLFdBQVcsQ0FBQztBQUMxQixjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMsc0JBQXNCLENBQUM7QUFDckMsY0FBYyxpQkFBaUIsQ0FBQztBQUNoQyxjQUFjLHlCQUF5QixDQUFDO0FBQ3hDLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLG9CQUFvQixDQUFDO0FBQ25DLGNBQWMsdUJBQXVCLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ibG9jay9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGVBQWUsQ0FBQztBQUM5QixjQUFjLG1CQUFtQixDQUFDO0FBQ2xDLGNBQWMsc0JBQXNCLENBQUM7QUFDckMsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLGVBQWUsQ0FBQztBQUM5QixjQUFjLFdBQVcsQ0FBQztBQUMxQixjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMsc0JBQXNCLENBQUM7QUFDckMsY0FBYyxpQkFBaUIsQ0FBQztBQUNoQyxjQUFjLDRCQUE0QixDQUFDO0FBQzNDLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLG9CQUFvQixDQUFDO0FBQ25DLGNBQWMsdUJBQXVCLENBQUMifQ==

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,yBAAyB,CAAC;AACxC,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,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"}

package/dest/block/index.js

@@ -4,10 +4,10 @@ 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 './block_parameter.js';
 export * from './l2_block_source.js';
 export * from './block_hash.js';
-export * from './published_l2_block.js';
+export * from './checkpointed_l2_block.js';
 export * from './proposal/index.js';
 export * from './validate_block_result.js';
 export * from './l2_block_info.js';

package/dest/block/l2_block.d.ts

@@ -1,6 +1,6 @@
 import { type BlockBlobData } from '@aztec/blob-lib/encoding';
-import { SlotNumber } from '@aztec/foundation/branded-types';
-import { Fr } from '@aztec/foundation/fields';
+import { BlockNumber, CheckpointNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { z } from 'zod';
 import { Checkpoint } from '../checkpoint/checkpoint.js';
@@ -92,13 +92,13 @@ 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?: Fr | undefined, slotNumber?: number | undefined, maxEffects?: number | undefined): Promise<L2Block>;
+    static random(l2BlockNum: BlockNumber, 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 number(): BlockNumber;
     get slot(): SlotNumber;
     get timestamp(): bigint;
     /**
@@ -113,7 +113,10 @@ export declare class L2Block {
      */
     getCheckpointHeader(): import("../rollup/checkpoint_header.js").CheckpointHeader;
     getBlockHeader(): BlockHeader;
-    toL2Block(): L2BlockNew;
+    toL2Block(args?: {
+        checkpointNumber?: CheckpointNumber;
+        indexWithinCheckpoint?: number;
+    }): L2BlockNew;
     toCheckpoint(): Checkpoint;
     static fromCheckpoint(checkpoint: Checkpoint): L2Block;
     /**
@@ -122,8 +125,8 @@ export declare class L2Block {
      * TODO(#17027): Remove this method from L2Block and create a dedicated Checkpoint class.
      */
     getCheckpointBlobFields(): Fr[];
-    toBlobFields(isFirstBlock: boolean): Fr[];
-    toBlockBlobData(isFirstBlock: boolean): BlockBlobData;
+    toBlobFields(): Fr[];
+    toBlockBlobData(): BlockBlobData;
     /**
      * Returns stats used for logging.
      * @returns Stats on tx count, number, and log size and count.
@@ -134,10 +137,10 @@ export declare class L2Block {
         contractClassLogCount: number;
         contractClassLogSize: number;
         txCount: number;
-        blockNumber: number;
+        blockNumber: BlockNumber;
         blockTimestamp: number;
     };
     toBlockInfo(): L2BlockInfo;
     equals(other: L2Block): boolean;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfYmxvY2suZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ibG9jay9sMl9ibG9jay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxhQUFhLEVBQTJELE1BQU0sMEJBQTBCLENBQUM7QUFDdkgsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzdELE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUM5QyxPQUFPLEVBQUUsWUFBWSxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBRzlFLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ3pELE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBQy9FLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3pELE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFFakMsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3JELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ3RELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUUvQzs7OztHQUlHO0FBQ0gscUJBQWEsT0FBTztJQUdULE9BQU8sRUFBRSxzQkFBc0I7SUFFL0IsTUFBTSxFQUFFLGFBQWE7SUFFckIsSUFBSSxFQUFFLElBQUk7SUFDakIsT0FBTyxDQUFDLFNBQVM7SUFQbkI7SUFDRSwyREFBMkQ7SUFDcEQsT0FBTyxFQUFFLHNCQUFzQjtJQUN0Qyx1QkFBdUI7SUFDaEIsTUFBTSxFQUFFLGFBQWE7SUFDNUIscUJBQXFCO0lBQ2QsSUFBSSxFQUFFLElBQUksRUFDVCxTQUFTLEdBQUUsRUFBRSxHQUFHLFNBQXFCLEVBQzNDO0lBRUosTUFBTSxLQUFLLE1BQU07Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7T0FRaEI7SUFFRDs7O09BR0c7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsWUFBWSxXQU8zQztJQUVEOzs7T0FHRztJQUNILFFBQVEsNEJBRVA7SUFFRDs7OztPQUlHO0lBQ0gsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FFdEM7SUFFRDs7O09BR0c7SUFDSCxRQUFRLElBQUksTUFBTSxDQUVqQjtJQUVEOzs7Ozs7OztPQVFHO0lBQ0gsT0FBYSxNQUFNLENBQ2pCLFVBQVUsRUFBRSxNQUFNLEVBQ2xCLFdBQVcsU0FBSSxFQUNmLG1CQUFtQixTQUFJLEVBQ3ZCLG9CQUFvQixTQUFJLEVBQ3hCLE1BQU0sR0FBRSxFQUFFLEdBQUcsU0FBcUIsRUFDbEMsVUFBVSxHQUFFLE1BQU0sR0FBRyxTQUFxQixFQUMxQyxVQUFVLEdBQUUsTUFBTSxHQUFHLFNBQXFCLEdBQ3pDLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FRbEI7SUFFRDs7O09BR0c7SUFDSCxNQUFNLENBQUMsS0FBSyxJQUFJLE9BQU8sQ0FFdEI7SUFFRCxJQUFJLE1BQU0sSUFBSSxNQUFNLENBRW5CO0lBRUQsSUFBSSxJQUFJLElBQUksVUFBVSxDQUVyQjtJQUVELElBQUksU0FBUyxJQUFJLE1BQU0sQ0FFdEI7SUFFRDs7O09BR0c7SUFDVSxJQUFJLElBQUksT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUsvQjtJQUVEOzs7O09BSUc7SUFDSSxtQkFBbUIsOERBRXpCO0lBR00sY0FBYyxJQUFJLFdBQVcsQ0FFbkM7SUFFTSxTQUFTLGVBRWY7SUFFTSxZQUFZLGVBRWxCO0lBRUQsTUFBTSxDQUFDLGNBQWMsQ0FBQyxVQUFVLEVBQUUsVUFBVSxXQWMzQztJQUVEOzs7O09BSUc7SUFDSSx1QkFBdUIsU0FHN0I7SUFFTSxZQUFZLENBQUMsWUFBWSxFQUFFLE9BQU8sR0FBRyxFQUFFLEVBQUUsQ0FHL0M7SUFFTSxlQUFlLENBQUMsWUFBWSxFQUFFLE9BQU8sR0FBRyxhQUFhLENBcUIzRDtJQUVEOzs7T0FHRztJQUNILFFBQVE7Ozs7Ozs7O01BcUJQO0lBRUQsV0FBVyxJQUFJLFdBQVcsQ0FVekI7SUFFRCxNQUFNLENBQUMsS0FBSyxFQUFFLE9BQU8sV0FFcEI7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfYmxvY2suZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ibG9jay9sMl9ibG9jay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxhQUFhLEVBQTJELE1BQU0sMEJBQTBCLENBQUM7QUFDdkgsT0FBTyxFQUFFLFdBQVcsRUFBRSxnQkFBZ0IsRUFBRSxVQUFVLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM1RixPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLFlBQVksRUFBcUIsTUFBTSw2QkFBNkIsQ0FBQztBQUc5RSxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUMvRSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBRWpDLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNyRCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUN0RCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFL0M7Ozs7R0FJRztBQUNILHFCQUFhLE9BQU87SUFHVCxPQUFPLEVBQUUsc0JBQXNCO0lBRS9CLE1BQU0sRUFBRSxhQUFhO0lBRXJCLElBQUksRUFBRSxJQUFJO0lBQ2pCLE9BQU8sQ0FBQyxTQUFTO0lBUG5CO0lBQ0UsMkRBQTJEO0lBQ3BELE9BQU8sRUFBRSxzQkFBc0I7SUFDdEMsdUJBQXVCO0lBQ2hCLE1BQU0sRUFBRSxhQUFhO0lBQzVCLHFCQUFxQjtJQUNkLElBQUksRUFBRSxJQUFJLEVBQ1QsU0FBUyxHQUFFLEVBQUUsR0FBRyxTQUFxQixFQUMzQztJQUVKLE1BQU0sS0FBSyxNQUFNOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O09BUWhCO0lBRUQ7OztPQUdHO0lBQ0gsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUUsTUFBTSxHQUFHLFlBQVksV0FPM0M7SUFFRDs7O09BR0c7SUFDSCxRQUFRLDRCQUVQO0lBRUQ7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsR0FBRyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBRXRDO0lBRUQ7OztPQUdHO0lBQ0gsUUFBUSxJQUFJLE1BQU0sQ0FFakI7SUFFRDs7Ozs7Ozs7T0FRRztJQUNILE9BQWEsTUFBTSxDQUNqQixVQUFVLEVBQUUsV0FBVyxFQUN2QixXQUFXLFNBQUksRUFDZixtQkFBbUIsU0FBSSxFQUN2QixvQkFBb0IsU0FBSSxFQUN4QixNQUFNLEdBQUUsRUFBRSxHQUFHLFNBQXFCLEVBQ2xDLFVBQVUsR0FBRSxNQUFNLEdBQUcsU0FBcUIsRUFDMUMsVUFBVSxHQUFFLE1BQU0sR0FBRyxTQUFxQixHQUN6QyxPQUFPLENBQUMsT0FBTyxDQUFDLENBUWxCO0lBRUQ7OztPQUdHO0lBQ0gsTUFBTSxDQUFDLEtBQUssSUFBSSxPQUFPLENBRXRCO0lBRUQsSUFBSSxNQUFNLElBQUksV0FBVyxDQUV4QjtJQUVELElBQUksSUFBSSxJQUFJLFVBQVUsQ0FFckI7SUFFRCxJQUFJLFNBQVMsSUFBSSxNQUFNLENBRXRCO0lBRUQ7OztPQUdHO0lBQ1UsSUFBSSxJQUFJLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FLL0I7SUFFRDs7OztPQUlHO0lBQ0ksbUJBQW1CLDhEQUV6QjtJQUdNLGNBQWMsSUFBSSxXQUFXLENBRW5DO0lBRU0sU0FBUyxDQUFDLElBQUksR0FBRTtRQUFFLGdCQUFnQixDQUFDLEVBQUUsZ0JBQWdCLENBQUM7UUFBQyxxQkFBcUIsQ0FBQyxFQUFFLE1BQU0sQ0FBQTtLQUFPLEdBQUcsVUFBVSxDQVEvRztJQUVNLFlBQVksZUFPbEI7SUFFRCxNQUFNLENBQUMsY0FBYyxDQUFDLFVBQVUsRUFBRSxVQUFVLFdBZTNDO0lBRUQ7Ozs7T0FJRztJQUNJLHVCQUF1QixTQUc3QjtJQUVNLFlBQVksSUFBSSxFQUFFLEVBQUUsQ0FHMUI7SUFFTSxlQUFlLElBQUksYUFBYSxDQXVCdEM7SUFFRDs7O09BR0c7SUFDSCxRQUFROzs7Ozs7OztNQXFCUDtJQUVELFdBQVcsSUFBSSxXQUFXLENBVXpCO0lBRUQsTUFBTSxDQUFDLEtBQUssRUFBRSxPQUFPLFdBRXBCO0NBQ0YifQ==

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,KAAK,aAAa,EAA2D,MAAM,0BAA0B,CAAC;AACvH,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,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,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,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;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C;;;;GAIG;AACH,qBAAa,OAAO;IAGT,OAAO,EAAE,sBAAsB;IAE/B,MAAM,EAAE,aAAa;IAErB,IAAI,EAAE,IAAI;IACjB,OAAO,CAAC,SAAS;IAPnB;IACE,2DAA2D;IACpD,OAAO,EAAE,sBAAsB;IACtC,uBAAuB;IAChB,MAAM,EAAE,aAAa;IAC5B,qBAAqB;IACd,IAAI,EAAE,IAAI,EACT,SAAS,GAAE,EAAE,GAAG,SAAqB,EAC3C;IAEJ,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAQhB;IAED;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,WAO3C;IAED;;;OAGG;IACH,QAAQ,4BAEP;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEtC;IAED;;;OAGG;IACH,QAAQ,IAAI,MAAM,CAEjB;IAED;;;;;;;;OAQG;IACH,OAAa,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,CAQlB;IAED;;;OAGG;IACH,MAAM,CAAC,KAAK,IAAI,OAAO,CAEtB;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,IAAI,IAAI,IAAI,UAAU,CAErB;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED;;;OAGG;IACU,IAAI,IAAI,OAAO,CAAC,EAAE,CAAC,CAK/B;IAED;;;;OAIG;IACI,mBAAmB,8DAEzB;IAGM,cAAc,IAAI,WAAW,CAEnC;IAEM,SAAS,eAEf;IAEM,YAAY,eAElB;IAED,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,UAAU,WAc3C;IAED;;;;OAIG;IACI,uBAAuB,SAG7B;IAEM,YAAY,CAAC,YAAY,EAAE,OAAO,GAAG,EAAE,EAAE,CAG/C;IAEM,eAAe,CAAC,YAAY,EAAE,OAAO,GAAG,aAAa,CAqB3D;IAED;;;OAGG;IACH,QAAQ;;;;;;;;MAqBP;IAED,WAAW,IAAI,WAAW,CAUzB;IAED,MAAM,CAAC,KAAK,EAAE,OAAO,WAEpB;CACF"}
+{"version":3,"file":"l2_block.d.ts","sourceRoot":"","sources":["../../src/block/l2_block.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAA2D,MAAM,0BAA0B,CAAC;AACvH,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC5F,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAG9E,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,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;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C;;;;GAIG;AACH,qBAAa,OAAO;IAGT,OAAO,EAAE,sBAAsB;IAE/B,MAAM,EAAE,aAAa;IAErB,IAAI,EAAE,IAAI;IACjB,OAAO,CAAC,SAAS;IAPnB;IACE,2DAA2D;IACpD,OAAO,EAAE,sBAAsB;IACtC,uBAAuB;IAChB,MAAM,EAAE,aAAa;IAC5B,qBAAqB;IACd,IAAI,EAAE,IAAI,EACT,SAAS,GAAE,EAAE,GAAG,SAAqB,EAC3C;IAEJ,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAQhB;IAED;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,WAO3C;IAED;;;OAGG;IACH,QAAQ,4BAEP;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEtC;IAED;;;OAGG;IACH,QAAQ,IAAI,MAAM,CAEjB;IAED;;;;;;;;OAQG;IACH,OAAa,MAAM,CACjB,UAAU,EAAE,WAAW,EACvB,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,CAQlB;IAED;;;OAGG;IACH,MAAM,CAAC,KAAK,IAAI,OAAO,CAEtB;IAED,IAAI,MAAM,IAAI,WAAW,CAExB;IAED,IAAI,IAAI,IAAI,UAAU,CAErB;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED;;;OAGG;IACU,IAAI,IAAI,OAAO,CAAC,EAAE,CAAC,CAK/B;IAED;;;;OAIG;IACI,mBAAmB,8DAEzB;IAGM,cAAc,IAAI,WAAW,CAEnC;IAEM,SAAS,CAAC,IAAI,GAAE;QAAE,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QAAC,qBAAqB,CAAC,EAAE,MAAM,CAAA;KAAO,GAAG,UAAU,CAQ/G;IAEM,YAAY,eAOlB;IAED,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,UAAU,WAe3C;IAED;;;;OAIG;IACI,uBAAuB,SAG7B;IAEM,YAAY,IAAI,EAAE,EAAE,CAG1B;IAEM,eAAe,IAAI,aAAa,CAuBtC;IAED;;;OAGG;IACH,QAAQ;;;;;;;;MAqBP;IAED,WAAW,IAAI,WAAW,CAUzB;IAED,MAAM,CAAC,KAAK,EAAE,OAAO,WAEpB;CACF"}

package/dest/block/l2_block.js

@@ -1,4 +1,5 @@
 import { encodeBlockBlobData, encodeCheckpointBlobDataFromBlocks } from '@aztec/blob-lib/encoding';
+import { CheckpointNumber } from '@aztec/foundation/branded-types';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 import { z } from 'zod';
@@ -74,7 +75,9 @@ import { L2BlockNew } from './l2_block_new.js';
             numPublicLogsPerCall,
             maxEffects
         });
-        return new L2Block(makeAppendOnlyTreeSnapshot(l2BlockNum + 1), makeL2BlockHeader(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.
@@ -111,18 +114,18 @@ import { L2BlockNew } from './l2_block_new.js';
     getBlockHeader() {
         return this.header.toBlockHeader();
     }
-    toL2Block() {
-        return new L2BlockNew(this.archive, this.getBlockHeader(), this.body);
+    toL2Block(args = {}) {
+        return new L2BlockNew(this.archive, this.getBlockHeader(), this.body, args?.checkpointNumber ?? CheckpointNumber.fromBlockNumber(this.number), args?.indexWithinCheckpoint ?? 0);
     }
     toCheckpoint() {
         return new Checkpoint(this.archive, this.getCheckpointHeader(), [
             this.toL2Block()
-        ], this.number);
+        ], CheckpointNumber.fromBlockNumber(this.number));
     }
     static fromCheckpoint(checkpoint) {
         const checkpointHeader = checkpoint.header;
         const block = checkpoint.blocks.at(-1);
-        const header = new L2BlockHeader(new AppendOnlyTreeSnapshot(checkpointHeader.lastArchiveRoot, block.number), checkpointHeader.contentCommitment, block.header.state, block.header.globalVariables, block.header.totalFees, checkpointHeader.totalManaUsed, block.header.spongeBlobHash, checkpointHeader.blockHeadersHash);
+        const header = new L2BlockHeader(new AppendOnlyTreeSnapshot(checkpointHeader.lastArchiveRoot, block.number), checkpointHeader.blobsHash, checkpointHeader.inHash, block.header.state, block.header.globalVariables, block.header.totalFees, checkpointHeader.totalManaUsed, block.header.spongeBlobHash, checkpointHeader.blockHeadersHash);
         return new L2Block(checkpoint.archive, header, block.body);
     }
     /**
@@ -130,16 +133,18 @@ import { L2BlockNew } from './l2_block_new.js';
    * This only works when there's one block per checkpoint.
    * TODO(#17027): Remove this method from L2Block and create a dedicated Checkpoint class.
    */ getCheckpointBlobFields() {
-        const blockBlobData = this.toBlockBlobData(true);
+        const blockBlobData = this.toBlockBlobData();
         return encodeCheckpointBlobDataFromBlocks([
             blockBlobData
         ]);
     }
-    toBlobFields(isFirstBlock) {
-        const blockBlobData = this.toBlockBlobData(isFirstBlock);
+    toBlobFields() {
+        const blockBlobData = this.toBlockBlobData();
         return encodeBlockBlobData(blockBlobData);
     }
-    toBlockBlobData(isFirstBlock) {
+    toBlockBlobData() {
+        // There's only one L2Block per checkpoint, so it's always the first block in the checkpoint.
+        const isFirstBlock = true;
         return {
             blockEndMarker: {
                 numTxs: this.body.txEffects.length,
@@ -184,7 +189,7 @@ import { L2BlockNew } from './l2_block_new.js';
             archive: this.archive.root,
             lastArchive: this.header.lastArchive.root,
             blockNumber: this.number,
-            slotNumber: Number(this.header.getSlot()),
+            slotNumber: this.header.getSlot(),
             txCount: this.body.txEffects.length,
             timestamp: this.header.globalVariables.timestamp
         };