@aztec/stdlib 0.0.1-commit.e588bc7e5 → 0.0.1-commit.e5a3663dd

package/dest/block/block_data.d.ts

@@ -1,23 +1,25 @@
 import type { CheckpointNumber, IndexWithinCheckpoint } from '@aztec/foundation/branded-types';
-import type { Fr } from '@aztec/foundation/curves/bn254';
 import { z } from 'zod';
+import { L1PublishedData } from '../checkpoint/published_checkpoint.js';
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
 import { BlockHeader } from '../tx/block_header.js';
+import { BlockHash } from './block_hash.js';
+import { CommitteeAttestation } from './proposal/committee_attestation.js';
 /** L2Block metadata. Equivalent to L2Block but without block body containing tx data. */
 export type BlockData = {
     header: BlockHeader;
     archive: AppendOnlyTreeSnapshot;
-    blockHash: Fr;
+    blockHash: BlockHash;
     checkpointNumber: CheckpointNumber;
     indexWithinCheckpoint: IndexWithinCheckpoint;
 };
 export declare const BlockDataSchema: z.ZodObject<{
     header: import("@aztec/foundation/schemas").ZodFor<BlockHeader>;
     archive: z.ZodEffects<z.ZodObject<{
-        root: z.ZodType<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: Fr;
+        root: import("@aztec/foundation/schemas").Fr;
         nextAvailableLeafIndex: number;
     }, {
         root: string;
@@ -26,13 +28,13 @@ export declare const BlockDataSchema: z.ZodObject<{
         root: string;
         nextAvailableLeafIndex: string | number | bigint;
     }>;
-    blockHash: z.ZodType<Fr, any, string>;
+    blockHash: import("@aztec/foundation/schemas").ZodFor<BlockHash>;
     checkpointNumber: z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, CheckpointNumber, string | number | bigint>;
     indexWithinCheckpoint: z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, IndexWithinCheckpoint, string | number | bigint>;
 }, "strip", z.ZodTypeAny, {
     header: BlockHeader;
     archive: AppendOnlyTreeSnapshot;
-    blockHash: Fr;
+    blockHash: BlockHash;
     checkpointNumber: number & {
         _branding: "CheckpointNumber";
     };
@@ -45,8 +47,295 @@ export declare const BlockDataSchema: z.ZodObject<{
         root: string;
         nextAvailableLeafIndex: string | number | bigint;
     };
-    blockHash: string;
+    blockHash?: any;
     checkpointNumber: string | number | bigint;
     indexWithinCheckpoint: string | number | bigint;
 }>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfZGF0YS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jsb2NrL2Jsb2NrX2RhdGEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUMvRixPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUd6RCxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBQy9FLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVwRCx5RkFBeUY7QUFDekYsTUFBTSxNQUFNLFNBQVMsR0FBRztJQUN0QixNQUFNLEVBQUUsV0FBVyxDQUFDO0lBQ3BCLE9BQU8sRUFBRSxzQkFBc0IsQ0FBQztJQUNoQyxTQUFTLEVBQUUsRUFBRSxDQUFDO0lBQ2QsZ0JBQWdCLEVBQUUsZ0JBQWdCLENBQUM7SUFDbkMscUJBQXFCLEVBQUUscUJBQXFCLENBQUM7Q0FDOUMsQ0FBQztBQUVGLGVBQU8sTUFBTSxlQUFlOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0VBTTFCLENBQUMifQ==
+export declare const BlockDataWithCheckpointContextSchema: z.ZodEffects<z.ZodObject<{
+    data: z.ZodObject<{
+        header: import("@aztec/foundation/schemas").ZodFor<BlockHeader>;
+        archive: z.ZodEffects<z.ZodObject<{
+            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("@aztec/foundation/schemas").Fr;
+            nextAvailableLeafIndex: number;
+        }, {
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
+        }>, AppendOnlyTreeSnapshot, {
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
+        }>;
+        blockHash: import("@aztec/foundation/schemas").ZodFor<BlockHash>;
+        checkpointNumber: z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, CheckpointNumber, string | number | bigint>;
+        indexWithinCheckpoint: z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, IndexWithinCheckpoint, string | number | bigint>;
+    }, "strip", z.ZodTypeAny, {
+        header: BlockHeader;
+        archive: AppendOnlyTreeSnapshot;
+        blockHash: BlockHash;
+        checkpointNumber: number & {
+            _branding: "CheckpointNumber";
+        };
+        indexWithinCheckpoint: number & {
+            _branding: "IndexWithinCheckpoint";
+        };
+    }, {
+        header?: any;
+        archive: {
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
+        };
+        blockHash?: any;
+        checkpointNumber: string | number | bigint;
+        indexWithinCheckpoint: string | number | bigint;
+    }>;
+    checkpoint: z.ZodOptional<z.ZodEffects<z.ZodObject<{
+        checkpointNumber: z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, CheckpointNumber, string | number | bigint>;
+        header: import("@aztec/foundation/schemas").ZodFor<import("../rollup/checkpoint_header.js").CheckpointHeader>;
+        archive: z.ZodEffects<z.ZodObject<{
+            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("@aztec/foundation/schemas").Fr;
+            nextAvailableLeafIndex: number;
+        }, {
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
+        }>, AppendOnlyTreeSnapshot, {
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
+        }>;
+        checkpointOutHash: z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>;
+        startBlock: z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, import("@aztec/foundation/branded-types").BlockNumber, string | number | bigint>;
+        blockCount: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
+        feeAssetPriceModifier: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+        attestations: z.ZodArray<z.ZodEffects<z.ZodObject<{
+            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("@aztec/foundation/eth-address").EthAddress;
+            signature: import("./proposal/committee_attestation.js").Signature;
+        }, {
+            address: string;
+            signature: string;
+        }>, CommitteeAttestation, {
+            address: string;
+            signature: string;
+        }>, "many">;
+        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;
+        }>;
+    }, "strip", z.ZodTypeAny, {
+        checkpointNumber: number & {
+            _branding: "CheckpointNumber";
+        };
+        header: import("../rollup/checkpoint_header.js").CheckpointHeader;
+        archive: AppendOnlyTreeSnapshot;
+        checkpointOutHash: import("@aztec/foundation/schemas").Fr;
+        startBlock: number & {
+            _branding: "BlockNumber";
+        };
+        blockCount: number;
+        feeAssetPriceModifier: bigint;
+        attestations: CommitteeAttestation[];
+        l1: L1PublishedData;
+    }, {
+        checkpointNumber: string | number | bigint;
+        header?: any;
+        archive: {
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
+        };
+        checkpointOutHash: string;
+        startBlock: string | number | bigint;
+        blockCount: string | number | bigint;
+        feeAssetPriceModifier: string | number | bigint;
+        attestations: {
+            address: string;
+            signature: string;
+        }[];
+        l1: {
+            blockNumber: string | number | bigint;
+            timestamp: string | number | bigint;
+            blockHash: string;
+        };
+    }>, import("../checkpoint/checkpoint_data.js").CheckpointData, {
+        checkpointNumber: string | number | bigint;
+        header?: any;
+        archive: {
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
+        };
+        checkpointOutHash: string;
+        startBlock: string | number | bigint;
+        blockCount: string | number | bigint;
+        feeAssetPriceModifier: string | number | bigint;
+        attestations: {
+            address: string;
+            signature: string;
+        }[];
+        l1: {
+            blockNumber: string | number | bigint;
+            timestamp: string | number | bigint;
+            blockHash: string;
+        };
+    }>>;
+    l1: z.ZodOptional<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("@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("@aztec/foundation/eth-address").EthAddress;
+        signature: import("./proposal/committee_attestation.js").Signature;
+    }, {
+        address: string;
+        signature: string;
+    }>, CommitteeAttestation, {
+        address: string;
+        signature: string;
+    }>, "many">;
+}, "strip", z.ZodTypeAny, {
+    data: {
+        header: BlockHeader;
+        archive: AppendOnlyTreeSnapshot;
+        blockHash: BlockHash;
+        checkpointNumber: number & {
+            _branding: "CheckpointNumber";
+        };
+        indexWithinCheckpoint: number & {
+            _branding: "IndexWithinCheckpoint";
+        };
+    };
+    checkpoint?: import("../checkpoint/checkpoint_data.js").CheckpointData | undefined;
+    l1?: L1PublishedData | undefined;
+    attestations: CommitteeAttestation[];
+}, {
+    data: {
+        header?: any;
+        archive: {
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
+        };
+        blockHash?: any;
+        checkpointNumber: string | number | bigint;
+        indexWithinCheckpoint: string | number | bigint;
+    };
+    checkpoint?: {
+        checkpointNumber: string | number | bigint;
+        header?: any;
+        archive: {
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
+        };
+        checkpointOutHash: string;
+        startBlock: string | number | bigint;
+        blockCount: string | number | bigint;
+        feeAssetPriceModifier: string | number | bigint;
+        attestations: {
+            address: string;
+            signature: string;
+        }[];
+        l1: {
+            blockNumber: string | number | bigint;
+            timestamp: string | number | bigint;
+            blockHash: string;
+        };
+    } | undefined;
+    l1?: {
+        blockNumber: string | number | bigint;
+        timestamp: string | number | bigint;
+        blockHash: string;
+    } | undefined;
+    attestations: {
+        address: string;
+        signature: string;
+    }[];
+}>, {
+    data: {
+        header: BlockHeader;
+        archive: AppendOnlyTreeSnapshot;
+        blockHash: BlockHash;
+        checkpointNumber: number & {
+            _branding: "CheckpointNumber";
+        };
+        indexWithinCheckpoint: number & {
+            _branding: "IndexWithinCheckpoint";
+        };
+    };
+    checkpoint: import("../checkpoint/checkpoint_data.js").CheckpointData | undefined;
+    l1: L1PublishedData | undefined;
+    attestations: CommitteeAttestation[];
+}, {
+    data: {
+        header?: any;
+        archive: {
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
+        };
+        blockHash?: any;
+        checkpointNumber: string | number | bigint;
+        indexWithinCheckpoint: string | number | bigint;
+    };
+    checkpoint?: {
+        checkpointNumber: string | number | bigint;
+        header?: any;
+        archive: {
+            root: string;
+            nextAvailableLeafIndex: string | number | bigint;
+        };
+        checkpointOutHash: string;
+        startBlock: string | number | bigint;
+        blockCount: string | number | bigint;
+        feeAssetPriceModifier: string | number | bigint;
+        attestations: {
+            address: string;
+            signature: string;
+        }[];
+        l1: {
+            blockNumber: string | number | bigint;
+            timestamp: string | number | bigint;
+            blockHash: string;
+        };
+    } | undefined;
+    l1?: {
+        blockNumber: string | number | bigint;
+        timestamp: string | number | bigint;
+        blockHash: string;
+    } | undefined;
+    attestations: {
+        address: string;
+        signature: string;
+    }[];
+}>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfZGF0YS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jsb2NrL2Jsb2NrX2RhdGEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUUvRixPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBR3hCLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUN4RSxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUMvRSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQzVDLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBRTNFLHlGQUF5RjtBQUN6RixNQUFNLE1BQU0sU0FBUyxHQUFHO0lBQ3RCLE1BQU0sRUFBRSxXQUFXLENBQUM7SUFDcEIsT0FBTyxFQUFFLHNCQUFzQixDQUFDO0lBQ2hDLFNBQVMsRUFBRSxTQUFTLENBQUM7SUFDckIsZ0JBQWdCLEVBQUUsZ0JBQWdCLENBQUM7SUFDbkMscUJBQXFCLEVBQUUscUJBQXFCLENBQUM7Q0FDOUMsQ0FBQztBQUVGLGVBQU8sTUFBTSxlQUFlOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0VBTTFCLENBQUM7QUFFSCxlQUFPLE1BQU0sb0NBQW9DOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0VBWTVDLENBQUMifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"block_data.d.ts","sourceRoot":"","sources":["../../src/block/block_data.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC/F,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAGzD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD,yFAAyF;AACzF,MAAM,MAAM,SAAS,GAAG;IACtB,MAAM,EAAE,WAAW,CAAC;IACpB,OAAO,EAAE,sBAAsB,CAAC;IAChC,SAAS,EAAE,EAAE,CAAC;IACd,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,qBAAqB,EAAE,qBAAqB,CAAC;CAC9C,CAAC;AAEF,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAM1B,CAAC"}
+{"version":3,"file":"block_data.d.ts","sourceRoot":"","sources":["../../src/block/block_data.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAE/F,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAE3E,yFAAyF;AACzF,MAAM,MAAM,SAAS,GAAG;IACtB,MAAM,EAAE,WAAW,CAAC;IACpB,OAAO,EAAE,sBAAsB,CAAC;IAChC,SAAS,EAAE,SAAS,CAAC;IACrB,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,qBAAqB,EAAE,qBAAqB,CAAC;CAC9C,CAAC;AAEF,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAM1B,CAAC;AAEH,eAAO,MAAM,oCAAoC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAY5C,CAAC"}

package/dest/block/block_data.js

@@ -1,12 +1,26 @@
 import { CheckpointNumberSchema, IndexWithinCheckpointSchema } from '@aztec/foundation/branded-types';
-import { schemas } from '@aztec/foundation/schemas';
 import { z } from 'zod';
+import { CheckpointDataSchema } from '../checkpoint/checkpoint_data.js';
+import { L1PublishedData } from '../checkpoint/published_checkpoint.js';
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
 import { BlockHeader } from '../tx/block_header.js';
+import { BlockHash } from './block_hash.js';
+import { CommitteeAttestation } from './proposal/committee_attestation.js';
 export const BlockDataSchema = z.object({
     header: BlockHeader.schema,
     archive: AppendOnlyTreeSnapshot.schema,
-    blockHash: schemas.Fr,
+    blockHash: BlockHash.schema,
     checkpointNumber: CheckpointNumberSchema,
     indexWithinCheckpoint: IndexWithinCheckpointSchema
 });
+export const BlockDataWithCheckpointContextSchema = z.object({
+    data: BlockDataSchema,
+    checkpoint: CheckpointDataSchema.optional(),
+    l1: L1PublishedData.schema.optional(),
+    attestations: z.array(CommitteeAttestation.schema)
+}).transform((obj)=>({
+        data: obj.data,
+        checkpoint: obj.checkpoint,
+        l1: obj.l1,
+        attestations: obj.attestations
+    }));

package/dest/block/block_hash.d.ts

@@ -1,21 +1,22 @@
-import { Fr } from '@aztec/foundation/curves/bn254';
+import { BaseFr, Fr } from '@aztec/foundation/curves/bn254';
 import type { ZodFor } from '@aztec/foundation/schemas';
+import type { BufferReader } from '@aztec/foundation/serialize';
 import { inspect } from 'util';
-declare const BLOCK_HASH_BRAND: unique symbol;
 /** Hash of an L2 block. */
-export declare class BlockHash extends Fr {
-    readonly [BLOCK_HASH_BRAND]: true;
+export declare class BlockHash extends BaseFr {
+    /** Branding for nominal typing. */
+    private readonly _branding;
+    static ZERO: BlockHash;
     constructor(hash: Fr);
     [inspect.custom](): string;
     toFr(): Fr;
-    /**
-     * Type guard that checks if a value is a BlockHash instance.
-     * Uses Symbol.for to ensure cross-module compatibility.
-     */
+    /** Type guard that checks if a value is a BlockHash instance. */
     static isBlockHash(value: unknown): value is BlockHash;
     static random(): BlockHash;
+    static fromBuffer(buffer: Buffer | BufferReader): BlockHash;
     static fromString(str: string): BlockHash;
     static get schema(): ZodFor<BlockHash>;
 }
-export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfaGFzaC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jsb2NrL2Jsb2NrX2hhc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRXhELE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFJL0IsUUFBQSxNQUFNLGdCQUFnQixlQUFnQyxDQUFDO0FBRXZELDJCQUEyQjtBQUMzQixxQkFBYSxTQUFVLFNBQVEsRUFBRTtJQUMvQixRQUFRLENBQUMsQ0FBQyxnQkFBZ0IsQ0FBQyxPQUFpQjtJQUU1QyxZQUFZLElBQUksRUFBRSxFQUFFLEVBRW5CO0lBRVEsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLFdBRXhCO0lBRUQsSUFBSSxJQUFJLEVBQUUsQ0FFVDtJQUVEOzs7T0FHRztJQUNILE1BQU0sQ0FBQyxXQUFXLENBQUMsS0FBSyxFQUFFLE9BQU8sR0FBRyxLQUFLLElBQUksU0FBUyxDQUVyRDtJQUVELE9BQWdCLE1BQU0sY0FFckI7SUFFRCxPQUFnQixVQUFVLENBQUMsR0FBRyxFQUFFLE1BQU0sR0FBRyxTQUFTLENBRWpEO0lBRUQsV0FBb0IsTUFBTSxzQkFFekI7Q0FDRiJ9
+/** The block header hash for the genesis block (block 0). */
+export declare const GENESIS_BLOCK_HEADER_HASH: BlockHash;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfaGFzaC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jsb2NrL2Jsb2NrX2hhc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN4RCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUVoRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBSS9CLDJCQUEyQjtBQUMzQixxQkFBYSxTQUFVLFNBQVEsTUFBTTtJQUNuQyxtQ0FBbUM7SUFDbkMsaUJBQXlCLFNBQVMsQ0FBYztJQUVoRCxNQUFNLENBQUMsSUFBSSxZQUEwQjtJQUVyQyxZQUFZLElBQUksRUFBRSxFQUFFLEVBRW5CO0lBRUQsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLFdBRWY7SUFFRCxJQUFJLElBQUksRUFBRSxDQUVUO0lBRUQsaUVBQWlFO0lBQ2pFLE1BQU0sQ0FBQyxXQUFXLENBQUMsS0FBSyxFQUFFLE9BQU8sR0FBRyxLQUFLLElBQUksU0FBUyxDQUVyRDtJQUVELE1BQU0sQ0FBQyxNQUFNLGNBRVo7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxHQUFHLFNBQVMsQ0FFMUQ7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsU0FBUyxDQUV4QztJQUVELE1BQU0sS0FBSyxNQUFNLHNCQUVoQjtDQUNGO0FBRUQsNkRBQTZEO0FBQzdELGVBQU8sTUFBTSx5QkFBeUIsRUFBRSxTQUF1RCxDQUFDIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"block_hash.d.ts","sourceRoot":"","sources":["../../src/block/block_hash.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAI/B,QAAA,MAAM,gBAAgB,eAAgC,CAAC;AAEvD,2BAA2B;AAC3B,qBAAa,SAAU,SAAQ,EAAE;IAC/B,QAAQ,CAAC,CAAC,gBAAgB,CAAC,OAAiB;IAE5C,YAAY,IAAI,EAAE,EAAE,EAEnB;IAEQ,CAAC,OAAO,CAAC,MAAM,CAAC,WAExB;IAED,IAAI,IAAI,EAAE,CAET;IAED;;;OAGG;IACH,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,SAAS,CAErD;IAED,OAAgB,MAAM,cAErB;IAED,OAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAEjD;IAED,WAAoB,MAAM,sBAEzB;CACF"}
+{"version":3,"file":"block_hash.d.ts","sourceRoot":"","sources":["../../src/block/block_hash.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAI/B,2BAA2B;AAC3B,qBAAa,SAAU,SAAQ,MAAM;IACnC,mCAAmC;IACnC,iBAAyB,SAAS,CAAc;IAEhD,MAAM,CAAC,IAAI,YAA0B;IAErC,YAAY,IAAI,EAAE,EAAE,EAEnB;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,WAEf;IAED,IAAI,IAAI,EAAE,CAET;IAED,iEAAiE;IACjE,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,SAAS,CAErD;IAED,MAAM,CAAC,MAAM,cAEZ;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAE1D;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAExC;IAED,MAAM,KAAK,MAAM,sBAEhB;CACF;AAED,6DAA6D;AAC7D,eAAO,MAAM,yBAAyB,EAAE,SAAuD,CAAC"}

package/dest/block/block_hash.js

@@ -1,11 +1,11 @@
 var _computedKey;
-import { Fr } from '@aztec/foundation/curves/bn254';
+import { GENESIS_BLOCK_HEADER_HASH as GENESIS_BLOCK_HEADER_HASH_FR } from '@aztec/constants';
+import { BaseFr, Fr } from '@aztec/foundation/curves/bn254';
 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;
+/** Hash of an L2 block. */ export class BlockHash extends BaseFr {
+    static ZERO = new BlockHash(Fr.ZERO);
     constructor(hash){
         super(hash);
     }
@@ -15,15 +15,15 @@ _computedKey = inspect.custom;
     toFr() {
         return new Fr(this.toBigInt());
     }
-    /**
-   * 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;
+    /** Type guard that checks if a value is a BlockHash instance. */ static isBlockHash(value) {
+        return value instanceof BlockHash;
     }
     static random() {
         return new BlockHash(Fr.random());
     }
+    static fromBuffer(buffer) {
+        return new BlockHash(Fr.fromBuffer(buffer));
+    }
     static fromString(str) {
         return new BlockHash(Fr.fromString(str));
     }
@@ -31,3 +31,4 @@ _computedKey = inspect.custom;
         return hexSchemaFor(BlockHash);
     }
 }
+/** The block header hash for the genesis block (block 0). */ export const GENESIS_BLOCK_HEADER_HASH = new BlockHash(GENESIS_BLOCK_HEADER_HASH_FR);

package/dest/block/block_parameter.d.ts

@@ -1,6 +1,33 @@
 import { z } from 'zod';
 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' */
+/**
+ * Selector for a block in RPC calls.
+ *
+ * Accepts a block number, a {@link BlockHash}, a chain-tip name (e.g. `'proven'`, `'checkpointed'`),
+ * `'latest'` (alias for `'proposed'`), or the explicit object variants `{ number }`, `{ hash }`,
+ * and `{ archive }`.
+ */
+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.ZodUnion<[z.ZodLiteral<"proposed">, z.ZodLiteral<"checkpointed">, z.ZodLiteral<"proven">, z.ZodLiteral<"finalized">]>, z.ZodLiteral<"latest">, z.ZodObject<{
+    number: z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, import("@aztec/foundation/branded-types").BlockNumber, string | number | bigint>;
+}, "strip", z.ZodTypeAny, {
+    number: number & {
+        _branding: "BlockNumber";
+    };
+}, {
+    number: string | number | bigint;
+}>, z.ZodObject<{
+    hash: import("@aztec/foundation/schemas").ZodFor<BlockHash>;
+}, "strip", z.ZodTypeAny, {
+    hash: BlockHash;
+}, {
+    hash?: any;
+}>, z.ZodObject<{
+    archive: z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>;
+}, "strip", z.ZodTypeAny, {
+    archive: import("@aztec/foundation/schemas").Fr;
+}, {
+    archive: string;
+}>]>;
 export type BlockParameter = z.infer<typeof BlockParameterSchema>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfcGFyYW1ldGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2svYmxvY2tfcGFyYW1ldGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRTVDLGVBQU8sTUFBTSxvQkFBb0IsNlFBQXNFLENBQUM7QUFFeEcsMkZBQTJGO0FBQzNGLE1BQU0sTUFBTSxjQUFjLEdBQUcsQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLG9CQUFvQixDQUFDLENBQUMifQ==
+export declare function inspectBlockParameter(param: BlockParameter): string;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfcGFyYW1ldGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2svYmxvY2tfcGFyYW1ldGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUlBLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFHeEIsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRTVDOzs7Ozs7R0FNRztBQUNILGVBQU8sTUFBTSxvQkFBb0I7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0lBUS9CLENBQUM7QUFFSCxNQUFNLE1BQU0sY0FBYyxHQUFHLENBQUMsQ0FBQyxLQUFLLENBQUMsT0FBTyxvQkFBb0IsQ0FBQyxDQUFDO0FBRWxFLHdCQUFnQixxQkFBcUIsQ0FBQyxLQUFLLEVBQUUsY0FBYyxVQWMxRCJ9

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,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"}
+{"version":3,"file":"block_parameter.d.ts","sourceRoot":"","sources":["../../src/block/block_parameter.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;IAQ/B,CAAC;AAEH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAElE,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,cAAc,UAc1D"}

package/dest/block/block_parameter.js

@@ -1,8 +1,42 @@
 import { BlockNumberSchema } from '@aztec/foundation/branded-types';
+import { jsonStringify } from '@aztec/foundation/json-rpc';
+import { schemas } from '@aztec/foundation/schemas';
 import { z } from 'zod';
+import { ChainTipSchema } from '../interfaces/chain_tips.js';
 import { BlockHash } from './block_hash.js';
-export const BlockParameterSchema = z.union([
+/**
+ * Selector for a block in RPC calls.
+ *
+ * Accepts a block number, a {@link BlockHash}, a chain-tip name (e.g. `'proven'`, `'checkpointed'`),
+ * `'latest'` (alias for `'proposed'`), or the explicit object variants `{ number }`, `{ hash }`,
+ * and `{ archive }`.
+ */ export const BlockParameterSchema = z.union([
     BlockHash.schema,
     BlockNumberSchema,
-    z.literal('latest')
+    ChainTipSchema,
+    z.literal('latest'),
+    z.object({
+        number: BlockNumberSchema
+    }),
+    z.object({
+        hash: BlockHash.schema
+    }),
+    z.object({
+        archive: schemas.Fr
+    })
 ]);
+export function inspectBlockParameter(param) {
+    if (typeof param === 'number') {
+        return param.toString();
+    } else if (typeof param === 'string') {
+        return param;
+    } else if ('number' in param) {
+        return `number=${param.number.toString()}`;
+    } else if ('hash' in param) {
+        return `hash=${param.hash.toString()}`;
+    } else if ('archive' in param) {
+        return `archive=${param.archive.toString()}`;
+    } else {
+        return jsonStringify(param);
+    }
+}

package/dest/block/l2_block_info.d.ts

@@ -2,8 +2,9 @@ import { BlockNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { z } from 'zod';
+import { BlockHash } from './block_hash.js';
 export type L2BlockInfo = {
-    blockHash?: Fr;
+    blockHash?: BlockHash;
     archive: Fr;
     lastArchive: Fr;
     blockNumber: BlockNumber;
@@ -13,7 +14,7 @@ export type L2BlockInfo = {
 };
 export declare function randomBlockInfo(blockNumber?: BlockNumber | number): L2BlockInfo;
 export declare const BlockInfoSchema: z.ZodObject<{
-    blockHash: z.ZodOptional<z.ZodType<Fr, any, string>>;
+    blockHash: z.ZodOptional<import("@aztec/foundation/schemas").ZodFor<BlockHash>>;
     archive: z.ZodType<Fr, any, string>;
     lastArchive: z.ZodType<Fr, any, string>;
     blockNumber: z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, BlockNumber, string | number | bigint>;
@@ -21,7 +22,7 @@ export declare const BlockInfoSchema: z.ZodObject<{
     txCount: z.ZodNumber;
     timestamp: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
 }, "strip", z.ZodTypeAny, {
-    blockHash?: Fr | undefined;
+    blockHash?: BlockHash | undefined;
     archive: Fr;
     lastArchive: Fr;
     blockNumber: number & {
@@ -33,7 +34,7 @@ export declare const BlockInfoSchema: z.ZodObject<{
     txCount: number;
     timestamp: bigint;
 }, {
-    blockHash?: string | undefined;
+    blockHash?: any;
     archive: string;
     lastArchive: string;
     blockNumber: string | number | bigint;
@@ -43,4 +44,4 @@ export declare const BlockInfoSchema: z.ZodObject<{
 }>;
 export declare function serializeBlockInfo(blockInfo: L2BlockInfo): Buffer;
 export declare function deserializeBlockInfo(buffer: Buffer | BufferReader): L2BlockInfo;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfYmxvY2tfaW5mby5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jsb2NrL2wyX2Jsb2NrX2luZm8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBcUIsVUFBVSxFQUFvQixNQUFNLGlDQUFpQyxDQUFDO0FBQy9HLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUVwRCxPQUFPLEVBQUUsWUFBWSxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBRTlFLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsTUFBTSxNQUFNLFdBQVcsR0FBRztJQUN4QixTQUFTLENBQUMsRUFBRSxFQUFFLENBQUM7SUFDZixPQUFPLEVBQUUsRUFBRSxDQUFDO0lBQ1osV0FBVyxFQUFFLEVBQUUsQ0FBQztJQUNoQixXQUFXLEVBQUUsV0FBVyxDQUFDO0lBQ3pCLFVBQVUsRUFBRSxVQUFVLENBQUM7SUFDdkIsT0FBTyxFQUFFLE1BQU0sQ0FBQztJQUNoQixTQUFTLEVBQUUsTUFBTSxDQUFDO0NBQ25CLENBQUM7QUFFRix3QkFBZ0IsZUFBZSxDQUFDLFdBQVcsQ0FBQyxFQUFFLFdBQVcsR0FBRyxNQUFNLEdBQUcsV0FBVyxDQVUvRTtBQUVELGVBQU8sTUFBTSxlQUFlOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0VBUTFCLENBQUM7QUFFSCx3QkFBZ0Isa0JBQWtCLENBQUMsU0FBUyxFQUFFLFdBQVcsR0FBRyxNQUFNLENBVWpFO0FBRUQsd0JBQWdCLG9CQUFvQixDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxHQUFHLFdBQVcsQ0FZL0UifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfYmxvY2tfaW5mby5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jsb2NrL2wyX2Jsb2NrX2luZm8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBcUIsVUFBVSxFQUFvQixNQUFNLGlDQUFpQyxDQUFDO0FBQy9HLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUVwRCxPQUFPLEVBQUUsWUFBWSxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBRTlFLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRTVDLE1BQU0sTUFBTSxXQUFXLEdBQUc7SUFDeEIsU0FBUyxDQUFDLEVBQUUsU0FBUyxDQUFDO0lBQ3RCLE9BQU8sRUFBRSxFQUFFLENBQUM7SUFDWixXQUFXLEVBQUUsRUFBRSxDQUFDO0lBQ2hCLFdBQVcsRUFBRSxXQUFXLENBQUM7SUFDekIsVUFBVSxFQUFFLFVBQVUsQ0FBQztJQUN2QixPQUFPLEVBQUUsTUFBTSxDQUFDO0lBQ2hCLFNBQVMsRUFBRSxNQUFNLENBQUM7Q0FDbkIsQ0FBQztBQUVGLHdCQUFnQixlQUFlLENBQUMsV0FBVyxDQUFDLEVBQUUsV0FBVyxHQUFHLE1BQU0sR0FBRyxXQUFXLENBVS9FO0FBRUQsZUFBTyxNQUFNLGVBQWU7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7RUFRMUIsQ0FBQztBQUVILHdCQUFnQixrQkFBa0IsQ0FBQyxTQUFTLEVBQUUsV0FBVyxHQUFHLE1BQU0sQ0FVakU7QUFFRCx3QkFBZ0Isb0JBQW9CLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsV0FBVyxDQVkvRSJ9

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

@@ -1 +1 @@
-{"version":3,"file":"l2_block_info.d.ts","sourceRoot":"","sources":["../../src/block/l2_block_info.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAqB,UAAU,EAAoB,MAAM,iCAAiC,CAAC;AAC/G,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,MAAM,WAAW,GAAG;IACxB,SAAS,CAAC,EAAE,EAAE,CAAC;IACf,OAAO,EAAE,EAAE,CAAC;IACZ,WAAW,EAAE,EAAE,CAAC;IAChB,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,wBAAgB,eAAe,CAAC,WAAW,CAAC,EAAE,WAAW,GAAG,MAAM,GAAG,WAAW,CAU/E;AAED,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAQ1B,CAAC;AAEH,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,WAAW,GAAG,MAAM,CAUjE;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,WAAW,CAY/E"}
+{"version":3,"file":"l2_block_info.d.ts","sourceRoot":"","sources":["../../src/block/l2_block_info.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAqB,UAAU,EAAoB,MAAM,iCAAiC,CAAC;AAC/G,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,MAAM,MAAM,WAAW,GAAG;IACxB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,OAAO,EAAE,EAAE,CAAC;IACZ,WAAW,EAAE,EAAE,CAAC;IAChB,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,wBAAgB,eAAe,CAAC,WAAW,CAAC,EAAE,WAAW,GAAG,MAAM,GAAG,WAAW,CAU/E;AAED,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAQ1B,CAAC;AAEH,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,WAAW,GAAG,MAAM,CAUjE;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,WAAW,CAY/E"}

package/dest/block/l2_block_info.js

@@ -3,9 +3,10 @@ import { Fr } from '@aztec/foundation/curves/bn254';
 import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { z } from 'zod';
+import { BlockHash } from './block_hash.js';
 export function randomBlockInfo(blockNumber) {
     return {
-        blockHash: Fr.random(),
+        blockHash: BlockHash.random(),
         archive: Fr.random(),
         lastArchive: Fr.random(),
         blockNumber: BlockNumber(blockNumber ?? Math.floor(Math.random() * 100000) + 1),
@@ -15,7 +16,7 @@ export function randomBlockInfo(blockNumber) {
     };
 }
 export const BlockInfoSchema = z.object({
-    blockHash: schemas.Fr.optional(),
+    blockHash: BlockHash.schema.optional(),
     archive: schemas.Fr,
     lastArchive: schemas.Fr,
     blockNumber: BlockNumberSchema,
@@ -24,13 +25,13 @@ export const BlockInfoSchema = z.object({
     timestamp: schemas.BigInt
 });
 export function serializeBlockInfo(blockInfo) {
-    return serializeToBuffer(blockInfo.blockHash ?? Fr.ZERO, blockInfo.archive, blockInfo.lastArchive, blockInfo.blockNumber, blockInfo.slotNumber, blockInfo.txCount, blockInfo.timestamp);
+    return serializeToBuffer(blockInfo.blockHash ?? BlockHash.ZERO, blockInfo.archive, blockInfo.lastArchive, blockInfo.blockNumber, blockInfo.slotNumber, blockInfo.txCount, blockInfo.timestamp);
 }
 export function deserializeBlockInfo(buffer) {
     const reader = BufferReader.asReader(buffer);
-    const blockHash = reader.readObject(Fr);
+    const blockHash = BlockHash.fromBuffer(reader);
     return {
-        blockHash: blockHash.equals(Fr.ZERO) ? undefined : blockHash,
+        blockHash: blockHash.equals(BlockHash.ZERO) ? undefined : blockHash,
         archive: reader.readObject(Fr),
         lastArchive: reader.readObject(Fr),
         blockNumber: BlockNumber(reader.readNumber()),