@aztec/stdlib 0.0.1-commit.96bb3f7 → 0.0.1-commit.993d240

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

@@ -1 +1 @@
-{"version":3,"file":"attestation_info.d.ts","sourceRoot":"","sources":["../../src/block/attestation_info.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAEhF;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,0BAA0B,GAAG,qBAAqB,GAAG,mBAAmB,GAAG,OAAO,CAAC;AAEnH;;GAEG;AACH,MAAM,MAAM,eAAe,GACvB;IACE,+EAA+E;IAC/E,OAAO,CAAC,EAAE,SAAS,CAAC;IACpB,iDAAiD;IACjD,MAAM,EAAE,OAAO,CAAC,iBAAiB,EAAE,mBAAmB,GAAG,OAAO,CAAC,CAAC;CACnE,GACD;IACE,8BAA8B;IAC9B,OAAO,EAAE,UAAU,CAAC;IACpB,iDAAiD;IACjD,MAAM,EAAE,OAAO,CAAC,iBAAiB,EAAE,qBAAqB,GAAG,0BAA0B,CAAC,CAAC;CACxF,CAAC;AAEN;;;GAGG;AACH,wBAAgB,yCAAyC,CAAC,KAAK,EAAE;IAC/D,YAAY,EAAE,oBAAoB,EAAE,CAAC;IACrC,UAAU,EAAE,UAAU,CAAC;CACxB,GAAG,eAAe,EAAE,CAGpB;AAED,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,gBAAgB,EACzB,YAAY,EAAE,oBAAoB,EAAE,GACnC,eAAe,EAAE,CA0BnB"}
+{"version":3,"file":"attestation_info.d.ts","sourceRoot":"","sources":["../../src/block/attestation_info.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,KAAK,4BAA4B,EAAsC,MAAM,2BAA2B,CAAC;AAClH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAEhF;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,0BAA0B,GAAG,qBAAqB,GAAG,mBAAmB,GAAG,OAAO,CAAC;AAEnH;;GAEG;AACH,MAAM,MAAM,eAAe,GACvB;IACE,+EAA+E;IAC/E,OAAO,CAAC,EAAE,SAAS,CAAC;IACpB,iDAAiD;IACjD,MAAM,EAAE,OAAO,CAAC,iBAAiB,EAAE,mBAAmB,GAAG,OAAO,CAAC,CAAC;CACnE,GACD;IACE,8BAA8B;IAC9B,OAAO,EAAE,UAAU,CAAC;IACpB,iDAAiD;IACjD,MAAM,EAAE,OAAO,CAAC,iBAAiB,EAAE,qBAAqB,GAAG,0BAA0B,CAAC,CAAC;CACxF,CAAC;AAEN;;;GAGG;AACH,wBAAgB,yCAAyC,CACvD,KAAK,EAAE;IACL,YAAY,EAAE,oBAAoB,EAAE,CAAC;IACrC,UAAU,EAAE,UAAU,CAAC;CACxB,EACD,gBAAgB,EAAE,4BAA4B,GAC7C,eAAe,EAAE,CAGnB;AAED,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,gBAAgB,EACzB,YAAY,EAAE,oBAAoB,EAAE,GACnC,eAAe,EAAE,CAuBnB"}

package/dest/block/attestation_info.js

@@ -1,15 +1,15 @@
 import { recoverAddress } from '@aztec/foundation/crypto/secp256k1-signer';
 import { ConsensusPayload } from '../p2p/consensus_payload.js';
-import { SignatureDomainSeparator, getHashedSignaturePayloadEthSignedMessage } from '../p2p/signature_utils.js';
+import { getHashedSignaturePayloadTypedData } from '../p2p/signature_utils.js';
 /**
  * Extracts attestation information from a published checkpoint.
  * Returns info for each attestation, preserving array indices.
- */ export function getAttestationInfoFromPublishedCheckpoint(block) {
-    const payload = ConsensusPayload.fromCheckpoint(block.checkpoint);
+ */ export function getAttestationInfoFromPublishedCheckpoint(block, signatureContext) {
+    const payload = ConsensusPayload.fromCheckpoint(block.checkpoint, signatureContext);
     return getAttestationInfoFromPayload(payload, block.attestations);
 }
 export function getAttestationInfoFromPayload(payload, attestations) {
-    const hashedPayload = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.checkpointAttestation);
+    const hashedPayload = getHashedSignaturePayloadTypedData(payload);
     return attestations.map((attestation)=>{
         // If signature is empty, check if we have an address directly
         if (attestation.signature.isEmpty()) {
@@ -27,7 +27,9 @@ export function getAttestationInfoFromPayload(payload, attestations) {
         }
         // Try to recover address from signature
         try {
-            const recoveredAddress = recoverAddress(hashedPayload, attestation.signature);
+            const recoveredAddress = recoverAddress(hashedPayload, attestation.signature, {
+                allowYParityAsV: true
+            });
             return {
                 address: recoveredAddress,
                 status: 'recovered-from-signature'

package/dest/block/block_data.d.ts

@@ -0,0 +1,27 @@
+import type { CheckpointNumber, IndexWithinCheckpoint } from '@aztec/foundation/branded-types';
+import { z } from 'zod';
+import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
+import { BlockHeader } from '../tx/block_header.js';
+import { BlockHash } from './block_hash.js';
+/** L2Block metadata. Equivalent to L2Block but without block body containing tx data. */
+export type BlockData = {
+    header: BlockHeader;
+    archive: AppendOnlyTreeSnapshot;
+    blockHash: BlockHash;
+    checkpointNumber: CheckpointNumber;
+    indexWithinCheckpoint: IndexWithinCheckpoint;
+};
+export declare const BlockDataSchema: z.ZodObject<{
+    header: import("@aztec/foundation/schemas").ZodFor<BlockHeader>;
+    archive: z.ZodPipe<z.ZodObject<{
+        root: z.ZodType<import("@aztec/foundation/schemas").Fr, string, z.core.$ZodTypeInternals<import("@aztec/foundation/schemas").Fr, string>>;
+        nextAvailableLeafIndex: z.ZodPipe<z.ZodUnion<readonly [z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodCoercedNumber<string | number | bigint>>;
+    }, z.core.$strip>, z.ZodTransform<AppendOnlyTreeSnapshot, {
+        root: import("@aztec/foundation/schemas").Fr;
+        nextAvailableLeafIndex: number;
+    }>>;
+    blockHash: import("@aztec/foundation/schemas").ZodFor<BlockHash>;
+    checkpointNumber: z.ZodPipe<z.ZodPipe<z.ZodUnion<readonly [z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodCoercedNumber<string | number | bigint>>, z.ZodTransform<CheckpointNumber, number>>;
+    indexWithinCheckpoint: z.ZodPipe<z.ZodPipe<z.ZodUnion<readonly [z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodCoercedNumber<string | number | bigint>>, z.ZodTransform<IndexWithinCheckpoint, number>>;
+}, z.core.$strip>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfZGF0YS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jsb2NrL2Jsb2NrX2RhdGEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUUvRixPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBQy9FLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNwRCxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFNUMseUZBQXlGO0FBQ3pGLE1BQU0sTUFBTSxTQUFTLEdBQUc7SUFDdEIsTUFBTSxFQUFFLFdBQVcsQ0FBQztJQUNwQixPQUFPLEVBQUUsc0JBQXNCLENBQUM7SUFDaEMsU0FBUyxFQUFFLFNBQVMsQ0FBQztJQUNyQixnQkFBZ0IsRUFBRSxnQkFBZ0IsQ0FBQztJQUNuQyxxQkFBcUIsRUFBRSxxQkFBcUIsQ0FBQztDQUM5QyxDQUFDO0FBRUYsZUFBTyxNQUFNLGVBQWU7Ozs7Ozs7Ozs7OztpQkFNMUIsQ0FBQyJ9

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

@@ -0,0 +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;AAE/F,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,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;;;;;;;;;;;;iBAM1B,CAAC"}

package/dest/block/block_data.js

@@ -0,0 +1,12 @@
+import { CheckpointNumberSchema, IndexWithinCheckpointSchema } from '@aztec/foundation/branded-types';
+import { z } from 'zod';
+import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
+import { BlockHeader } from '../tx/block_header.js';
+import { BlockHash } from './block_hash.js';
+export const BlockDataSchema = z.object({
+    header: BlockHeader.schema,
+    archive: AppendOnlyTreeSnapshot.schema,
+    blockHash: BlockHash.schema,
+    checkpointNumber: CheckpointNumberSchema,
+    indexWithinCheckpoint: IndexWithinCheckpointSchema
+});

package/dest/block/block_hash.d.ts

@@ -1,17 +1,22 @@
-import { Buffer32 } from '@aztec/foundation/buffer';
-import { Fr } from '@aztec/foundation/curves/bn254';
-import { BufferReader } from '@aztec/foundation/serialize';
+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';
 /** Hash of an L2 block. */
-export declare class L2BlockHash extends Buffer32 {
-    constructor(
-    /** The buffer containing the hash. */
-    hash: Buffer);
-    static random(): L2BlockHash;
-    static fromNumber(num: number): L2BlockHash;
-    static fromBuffer(buffer: Buffer | BufferReader): L2BlockHash;
-    static fromString(str: string): Buffer32;
-    static get schema(): import("zod").ZodEffects<import("zod").ZodEffects<import("zod").ZodEffects<import("zod").ZodEffects<import("zod").ZodString, string, string>, string, string>, Buffer<ArrayBuffer>, string>, L2BlockHash, string>;
-    static zero(): L2BlockHash;
-    static fromField(hash: Fr): L2BlockHash;
+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. */
+    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>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfaGFzaC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jsb2NrL2Jsb2NrX2hhc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ3BELE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFJM0QsMkJBQTJCO0FBQzNCLHFCQUFhLFdBQVksU0FBUSxRQUFRO0lBQ3ZDO0lBQ0Usc0NBQXNDO0lBQ3RDLElBQUksRUFBRSxNQUFNLEVBR2I7SUFFRCxPQUFnQixNQUFNLGdCQUVyQjtJQUVELE9BQWdCLFVBQVUsQ0FBQyxHQUFHLEVBQUUsTUFBTSxHQUFHLFdBQVcsQ0FFbkQ7SUFFRCxPQUFnQixVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLGVBR3ZEO0lBRUQsT0FBZ0IsVUFBVSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsUUFBUSxDQUVoRDtJQUVELE1BQU0sS0FBSyxNQUFNLHNOQUVoQjtJQUVELE1BQU0sQ0FBQyxJQUFJLGdCQUVWO0lBRUQsT0FBZ0IsU0FBUyxDQUFDLElBQUksRUFBRSxFQUFFLGVBRWpDO0NBQ0YifQ==
+/** 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,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAI3D,2BAA2B;AAC3B,qBAAa,WAAY,SAAQ,QAAQ;IACvC;IACE,sCAAsC;IACtC,IAAI,EAAE,MAAM,EAGb;IAED,OAAgB,MAAM,gBAErB;IAED,OAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAEnD;IAED,OAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,eAGvD;IAED,OAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAEhD;IAED,MAAM,KAAK,MAAM,sNAEhB;IAED,MAAM,CAAC,IAAI,gBAEV;IAED,OAAgB,SAAS,CAAC,IAAI,EAAE,EAAE,eAEjC;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,31 +1,34 @@
-import { Buffer32 } from '@aztec/foundation/buffer';
-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){
+var _computedKey;
+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';
+_computedKey = inspect.custom;
+/** Hash of an L2 block. */ export class BlockHash extends BaseFr {
+    static ZERO = new BlockHash(Fr.ZERO);
+    constructor(hash){
         super(hash);
     }
-    static random() {
-        return new L2BlockHash(Fr.random().toBuffer());
+    [_computedKey]() {
+        return `BlockHash<${this.toString()}>`;
+    }
+    toFr() {
+        return new Fr(this.toBigInt());
+    }
+    /** Type guard that checks if a value is a BlockHash instance. */ static isBlockHash(value) {
+        return value instanceof BlockHash;
     }
-    static fromNumber(num) {
-        return new L2BlockHash(super.fromNumber(num).toBuffer());
+    static random() {
+        return new BlockHash(Fr.random());
     }
     static fromBuffer(buffer) {
-        const reader = BufferReader.asReader(buffer);
-        return new L2BlockHash(reader.readBytes(L2BlockHash.SIZE));
+        return new BlockHash(Fr.fromBuffer(buffer));
     }
     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);
     }
 }
+/** 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,5 +1,39 @@
+import { type BlockNumber } from '@aztec/foundation/branded-types';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 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' */
-export type BlockParameter = z.infer<typeof BlockParameterSchema>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfcGFyYW1ldGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2svYmxvY2tfcGFyYW1ldGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsZUFBTyxNQUFNLG9CQUFvQixzTkFBb0QsQ0FBQztBQUV0RixrRUFBa0U7QUFDbEUsTUFBTSxNQUFNLGNBQWMsR0FBRyxDQUFDLENBQUMsS0FBSyxDQUFDLE9BQU8sb0JBQW9CLENBQUMsQ0FBQyJ9
+import { BlockHash } from './block_hash.js';
+export declare const BlockTag: readonly ["latest", "proposed", "checkpointed", "proven", "finalized"];
+/**
+ * Tag identifying a block by its position in the chain rather than by an absolute identifier.
+ * - `latest` / `proposed`: Latest L2 block proposed (not necessarily checkpointed/proven yet).
+ * - `checkpointed`: Latest L2 block whose enclosing checkpoint has been published on L1.
+ * - `proven`: Latest L2 block whose enclosing checkpoint has been proven on L1.
+ * - `finalized`: Latest L2 block whose proving L1 transaction has reached L1 finality.
+ */
+export type BlockTag = (typeof BlockTag)[number];
+export declare const BlockTagWithoutLatestSchema: z.ZodUnion<readonly [z.ZodLiteral<"proposed">, z.ZodLiteral<"checkpointed">, z.ZodLiteral<"proven">, z.ZodLiteral<"finalized">]>;
+export declare const BlockTagSchema: z.ZodType<BlockTag>;
+/**
+ * Object-only form of {@link BlockParameter}. Used as the building block for {@link BlockQuery}.
+ */
+export type NormalizedBlockParameter = {
+    number: BlockNumber;
+} | {
+    hash: BlockHash;
+} | {
+    archive: Fr;
+} | {
+    tag: Exclude<BlockTag, 'latest'>;
+};
+export declare const NormalizedBlockParameterSchema: z.ZodType<NormalizedBlockParameter, unknown>;
+/**
+ * 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 any of the {@link NormalizedBlockParameter} object variants
+ * (`{ number }`, `{ hash }`, `{ archive }`, `{ tag }`).
+ */
+export type BlockParameter = NormalizedBlockParameter | BlockNumber | BlockHash | BlockTag;
+export declare const BlockParameterSchema: z.ZodType<BlockParameter, unknown>;
+export declare function inspectBlockParameter(param: BlockParameter): string;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfcGFyYW1ldGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2svYmxvY2tfcGFyYW1ldGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLFdBQVcsRUFBcUIsTUFBTSxpQ0FBaUMsQ0FBQztBQUN0RixPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUl6RCxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUU1QyxlQUFPLE1BQU0sUUFBUSx3RUFBeUUsQ0FBQztBQUUvRjs7Ozs7O0dBTUc7QUFDSCxNQUFNLE1BQU0sUUFBUSxHQUFHLENBQUMsT0FBTyxRQUFRLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUVqRCxlQUFPLE1BQU0sMkJBQTJCLGtJQUt0QyxDQUFDO0FBRUgsZUFBTyxNQUFNLGNBQWMsRUFBRSxDQUFDLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBK0QsQ0FBQztBQUUvRzs7R0FFRztBQUNILE1BQU0sTUFBTSx3QkFBd0IsR0FDaEM7SUFBRSxNQUFNLEVBQUUsV0FBVyxDQUFBO0NBQUUsR0FDdkI7SUFBRSxJQUFJLEVBQUUsU0FBUyxDQUFBO0NBQUUsR0FDbkI7SUFBRSxPQUFPLEVBQUUsRUFBRSxDQUFBO0NBQUUsR0FDZjtJQUFFLEdBQUcsRUFBRSxPQUFPLENBQUMsUUFBUSxFQUFFLFFBQVEsQ0FBQyxDQUFBO0NBQUUsQ0FBQztBQUV6QyxlQUFPLE1BQU0sOEJBQThCLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyx3QkFBd0IsRUFBRSxPQUFPLENBS3RGLENBQUM7QUFFSDs7Ozs7O0dBTUc7QUFDSCxNQUFNLE1BQU0sY0FBYyxHQUFHLHdCQUF3QixHQUFHLFdBQVcsR0FBRyxTQUFTLEdBQUcsUUFBUSxDQUFDO0FBRTNGLGVBQU8sTUFBTSxvQkFBb0IsRUFBRSxDQUFDLENBQUMsT0FBTyxDQUFDLGNBQWMsRUFBRSxPQUFPLENBS2xFLENBQUM7QUFFSCx3QkFBZ0IscUJBQXFCLENBQUMsS0FBSyxFQUFFLGNBQWMsVUFnQjFEIn0=

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":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAqB,MAAM,iCAAiC,CAAC;AACtF,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAIzD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,eAAO,MAAM,QAAQ,wEAAyE,CAAC;AAE/F;;;;;;GAMG;AACH,MAAM,MAAM,QAAQ,GAAG,CAAC,OAAO,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;AAEjD,eAAO,MAAM,2BAA2B,kIAKtC,CAAC;AAEH,eAAO,MAAM,cAAc,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAA+D,CAAC;AAE/G;;GAEG;AACH,MAAM,MAAM,wBAAwB,GAChC;IAAE,MAAM,EAAE,WAAW,CAAA;CAAE,GACvB;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,GACnB;IAAE,OAAO,EAAE,EAAE,CAAA;CAAE,GACf;IAAE,GAAG,EAAE,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;CAAE,CAAC;AAEzC,eAAO,MAAM,8BAA8B,EAAE,CAAC,CAAC,OAAO,CAAC,wBAAwB,EAAE,OAAO,CAKtF,CAAC;AAEH;;;;;;GAMG;AACH,MAAM,MAAM,cAAc,GAAG,wBAAwB,GAAG,WAAW,GAAG,SAAS,GAAG,QAAQ,CAAC;AAE3F,eAAO,MAAM,oBAAoB,EAAE,CAAC,CAAC,OAAO,CAAC,cAAc,EAAE,OAAO,CAKlE,CAAC;AAEH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,cAAc,UAgB1D"}

package/dest/block/block_parameter.js

@@ -1,6 +1,59 @@
 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 { BlockHash } from './block_hash.js';
+export const BlockTag = [
+    'latest',
+    'proposed',
+    'checkpointed',
+    'proven',
+    'finalized'
+];
+export const BlockTagWithoutLatestSchema = z.union([
+    z.literal('proposed'),
+    z.literal('checkpointed'),
+    z.literal('proven'),
+    z.literal('finalized')
+]);
+export const BlockTagSchema = z.union([
+    z.literal('latest'),
+    BlockTagWithoutLatestSchema
+]);
+export const NormalizedBlockParameterSchema = z.union([
+    z.object({
+        number: BlockNumberSchema
+    }).strict(),
+    z.object({
+        hash: BlockHash.schema
+    }).strict(),
+    z.object({
+        archive: schemas.Fr
+    }).strict(),
+    z.object({
+        tag: BlockTagWithoutLatestSchema
+    }).strict()
+]);
 export const BlockParameterSchema = z.union([
-    BlockNumberSchema,
-    z.literal('latest')
+    NormalizedBlockParameterSchema,
+    BlockHash.schema,
+    BlockTagSchema,
+    BlockNumberSchema
 ]);
+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 if ('tag' in param) {
+        return `tag=${param.tag}`;
+    } else {
+        return jsonStringify(param);
+    }
+}

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

@@ -3,6 +3,7 @@ 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 {
@@ -29,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.

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;
@@ -13,31 +13,12 @@ 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, {
-    l2BlockNumber: number & {
-        _branding: "BlockNumber";
-    };
-    l2BlockHash: L2BlockHash;
-}, {
-    l2BlockNumber: string | number | bigint;
-    l2BlockHash: string;
-}>;
+    l2BlockNumber: z.ZodPipe<z.ZodUnion<readonly [z.ZodNumber, z.ZodPipe<z.ZodBigInt, z.ZodTransform<number, bigint>>, z.ZodPipe<z.ZodString, z.ZodTransform<number, string>>]>, z.ZodTransform<BlockNumber, number>>;
+    l2BlockHash: import("@aztec/foundation/schemas").ZodFor<BlockHash>;
+}, z.core.$strip>;
 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>;
-} & {
+    l2BlockNumber: z.ZodPipe<z.ZodUnion<readonly [z.ZodNumber, z.ZodPipe<z.ZodBigInt, z.ZodTransform<number, bigint>>, z.ZodPipe<z.ZodString, z.ZodTransform<number, string>>]>, z.ZodTransform<BlockNumber, number>>;
+    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>;
-} & {
-    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>;
-} & {
-    data: T;
-}> extends infer T_2 ? { [k in keyof T_2]: T_2[k]; } : never>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5fYmxvY2suZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ibG9jay9pbl9ibG9jay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFxQixNQUFNLGlDQUFpQyxDQUFDO0FBRWpGLE9BQU8sRUFBRSxLQUFLLFVBQVUsRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFekMsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQzlDLE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUU3QyxNQUFNLE1BQU0sT0FBTyxHQUFHO0lBQ3BCLGFBQWEsRUFBRSxXQUFXLENBQUM7SUFDM0IsV0FBVyxFQUFFLFdBQVcsQ0FBQztDQUMxQixDQUFDO0FBR0YsTUFBTSxNQUFNLFdBQVcsQ0FBQyxDQUFDLElBQUk7SUFDM0IsSUFBSSxFQUFFLENBQUMsQ0FBQztDQUNULEdBQUcsT0FBTyxDQUFDO0FBRVosd0JBQWdCLGFBQWEsSUFBSSxPQUFPLENBS3ZDO0FBRUQsd0JBQWdCLGlCQUFpQixDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxHQUFHLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FLNUQ7QUFFRCx3QkFBc0IsZUFBZSxDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxFQUFFLEtBQUssRUFBRSxPQUFPLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQU16RjtBQUVELHdCQUFnQixhQUFhOzs7Ozs7Ozs7OztHQUs1QjtBQUVELHdCQUFnQixvQkFBb0IsQ0FBQyxDQUFDLFNBQVMsVUFBVSxFQUFFLE1BQU0sRUFBRSxDQUFDOzs7Ozs7Ozs7Ozs7Ozs7OERBRW5FIn0=
+}, z.core.$strip>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5fYmxvY2suZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ibG9jay9pbl9ibG9jay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFxQixNQUFNLGlDQUFpQyxDQUFDO0FBRWpGLE9BQU8sRUFBRSxLQUFLLFVBQVUsRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFekMsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQzVDLE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUU3QyxNQUFNLE1BQU0sT0FBTyxHQUFHO0lBQ3BCLGFBQWEsRUFBRSxXQUFXLENBQUM7SUFDM0IsV0FBVyxFQUFFLFNBQVMsQ0FBQztDQUN4QixDQUFDO0FBR0YsTUFBTSxNQUFNLFdBQVcsQ0FBQyxDQUFDLElBQUk7SUFDM0IsSUFBSSxFQUFFLENBQUMsQ0FBQztDQUNULEdBQUcsT0FBTyxDQUFDO0FBRVosd0JBQWdCLGFBQWEsSUFBSSxPQUFPLENBS3ZDO0FBRUQsd0JBQWdCLGlCQUFpQixDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxHQUFHLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FLNUQ7QUFFRCx3QkFBc0IsZUFBZSxDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxFQUFFLEtBQUssRUFBRSxPQUFPLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQU16RjtBQUVELHdCQUFnQixhQUFhOzs7a0JBSzVCO0FBRUQsd0JBQWdCLG9CQUFvQixDQUFDLENBQUMsU0FBUyxVQUFVLEVBQUUsTUFBTSxFQUFFLENBQUM7Ozs7a0JBRW5FIn0=

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;;;kBAK5B;AAED,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,UAAU,EAAE,MAAM,EAAE,CAAC;;;;kBAEnE"}

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,15 +1,13 @@
+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';
 export * from './block_parameter.js';
 export * from './l2_block_source.js';
 export * from './block_hash.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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ibG9jay9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGVBQWUsQ0FBQztBQUM5QixjQUFjLG1CQUFtQixDQUFDO0FBQ2xDLGNBQWMsc0JBQXNCLENBQUM7QUFDckMsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLGVBQWUsQ0FBQztBQUM5QixjQUFjLFdBQVcsQ0FBQztBQUMxQixjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMsc0JBQXNCLENBQUM7QUFDckMsY0FBYyxpQkFBaUIsQ0FBQztBQUNoQyxjQUFjLDRCQUE0QixDQUFDO0FBQzNDLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLG9CQUFvQixDQUFDO0FBQ25DLGNBQWMsdUJBQXVCLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ibG9jay9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGlCQUFpQixDQUFDO0FBQ2hDLGNBQWMsZUFBZSxDQUFDO0FBQzlCLGNBQWMsNEJBQTRCLENBQUM7QUFDM0MsY0FBYyxlQUFlLENBQUM7QUFDOUIsY0FBYyxXQUFXLENBQUM7QUFDMUIsY0FBYyxzQkFBc0IsQ0FBQztBQUNyQyxjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMsaUJBQWlCLENBQUM7QUFDaEMsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxjQUFjLDRCQUE0QixDQUFDO0FBQzNDLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYyx1QkFBdUIsQ0FBQyJ9

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,qBAAqB,CAAC;AACpC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC"}

package/dest/block/index.js

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