@aztec/stdlib 0.0.1-commit.b655e406 → 0.0.1-commit.d1f2d6c

package/dest/block/attestation_info.d.ts

@@ -1,5 +1,6 @@
 import type { EthAddress } from '@aztec/foundation/eth-address';
-import type { L2Block } from './l2_block.js';
+import { Checkpoint } from '../checkpoint/checkpoint.js';
+import { ConsensusPayload } from '../p2p/consensus_payload.js';
 import type { CommitteeAttestation } from './proposal/committee_attestation.js';
 /**
  * Status indicating how the attestation address was determined
@@ -20,11 +21,12 @@ export type AttestationInfo = {
     status: Extract<AttestationStatus, 'provided-as-address' | 'recovered-from-signature'>;
 };
 /**
- * Extracts attestation information from a published L2 block.
+ * Extracts attestation information from a published checkpoint.
  * Returns info for each attestation, preserving array indices.
  */
-export declare function getAttestationInfoFromPublishedL2Block(block: {
+export declare function getAttestationInfoFromPublishedCheckpoint(block: {
     attestations: CommitteeAttestation[];
-    block: L2Block;
+    checkpoint: Checkpoint;
 }): AttestationInfo[];
-//# sourceMappingURL=attestation_info.d.ts.map
+export declare function getAttestationInfoFromPayload(payload: ConsensusPayload, attestations: CommitteeAttestation[]): AttestationInfo[];
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ZXN0YXRpb25faW5mby5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jsb2NrL2F0dGVzdGF0aW9uX2luZm8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFaEUsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ3pELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRS9ELE9BQU8sS0FBSyxFQUFFLG9CQUFvQixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFFaEY7O0dBRUc7QUFDSCxNQUFNLE1BQU0saUJBQWlCLEdBQUcsMEJBQTBCLEdBQUcscUJBQXFCLEdBQUcsbUJBQW1CLEdBQUcsT0FBTyxDQUFDO0FBRW5IOztHQUVHO0FBQ0gsTUFBTSxNQUFNLGVBQWUsR0FDdkI7SUFDRSwrRUFBK0U7SUFDL0UsT0FBTyxDQUFDLEVBQUUsU0FBUyxDQUFDO0lBQ3BCLGlEQUFpRDtJQUNqRCxNQUFNLEVBQUUsT0FBTyxDQUFDLGlCQUFpQixFQUFFLG1CQUFtQixHQUFHLE9BQU8sQ0FBQyxDQUFDO0NBQ25FLEdBQ0Q7SUFDRSw4QkFBOEI7SUFDOUIsT0FBTyxFQUFFLFVBQVUsQ0FBQztJQUNwQixpREFBaUQ7SUFDakQsTUFBTSxFQUFFLE9BQU8sQ0FBQyxpQkFBaUIsRUFBRSxxQkFBcUIsR0FBRywwQkFBMEIsQ0FBQyxDQUFDO0NBQ3hGLENBQUM7QUFFTjs7O0dBR0c7QUFDSCx3QkFBZ0IseUNBQXlDLENBQUMsS0FBSyxFQUFFO0lBQy9ELFlBQVksRUFBRSxvQkFBb0IsRUFBRSxDQUFDO0lBQ3JDLFVBQVUsRUFBRSxVQUFVLENBQUM7Q0FDeEIsR0FBRyxlQUFlLEVBQUUsQ0FHcEI7QUFFRCx3QkFBZ0IsNkJBQTZCLENBQzNDLE9BQU8sRUFBRSxnQkFBZ0IsRUFDekIsWUFBWSxFQUFFLG9CQUFvQixFQUFFLEdBQ25DLGVBQWUsRUFBRSxDQTBCbkIifQ==

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;AAIhE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,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,sCAAsC,CAAC,KAAK,EAAE;IAC5D,YAAY,EAAE,oBAAoB,EAAE,CAAC;IACrC,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,eAAe,EAAE,CAwBpB"}
+{"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"}

package/dest/block/attestation_info.js

@@ -1,13 +1,16 @@
-import { recoverAddress } from '@aztec/foundation/crypto';
+import { recoverAddress } from '@aztec/foundation/crypto/secp256k1-signer';
 import { ConsensusPayload } from '../p2p/consensus_payload.js';
 import { SignatureDomainSeparator, getHashedSignaturePayloadEthSignedMessage } from '../p2p/signature_utils.js';
 /**
- * Extracts attestation information from a published L2 block.
+ * Extracts attestation information from a published checkpoint.
  * Returns info for each attestation, preserving array indices.
- */ export function getAttestationInfoFromPublishedL2Block(block) {
-    const payload = ConsensusPayload.fromBlock(block.block);
-    const hashedPayload = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.blockAttestation);
-    return block.attestations.map((attestation)=>{
+ */ export function getAttestationInfoFromPublishedCheckpoint(block) {
+    const payload = ConsensusPayload.fromCheckpoint(block.checkpoint);
+    return getAttestationInfoFromPayload(payload, block.attestations);
+}
+export function getAttestationInfoFromPayload(payload, attestations) {
+    const hashedPayload = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.checkpointAttestation);
+    return attestations.map((attestation)=>{
         // If signature is empty, check if we have an address directly
         if (attestation.signature.isEmpty()) {
             if (attestation.address.isZero()) {

package/dest/block/block_hash.d.ts

@@ -1,11 +1,17 @@
 import { Buffer32 } from '@aztec/foundation/buffer';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader } from '@aztec/foundation/serialize';
 /** Hash of an L2 block. */
 export declare class L2BlockHash extends Buffer32 {
     constructor(
     /** The buffer containing the hash. */
     hash: Buffer);
+    /**
+     * Type guard that checks if a value is an L2BlockHash instance.
+     * Uses duck typing to handle cases where instanceof fails due to module duplication.
+     * Checks for Buffer32-like structure with a 32-byte buffer.
+     */
+    static isL2BlockHash(value: unknown): value is L2BlockHash;
     static random(): L2BlockHash;
     static fromNumber(num: number): L2BlockHash;
     static fromBuffer(buffer: Buffer | BufferReader): L2BlockHash;
@@ -14,4 +20,4 @@ export declare class L2BlockHash extends Buffer32 {
     static zero(): L2BlockHash;
     static fromField(hash: Fr): L2BlockHash;
 }
-//# sourceMappingURL=block_hash.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfaGFzaC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jsb2NrL2Jsb2NrX2hhc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ3BELE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFJM0QsMkJBQTJCO0FBQzNCLHFCQUFhLFdBQVksU0FBUSxRQUFRO0lBQ3ZDO0lBQ0Usc0NBQXNDO0lBQ3RDLElBQUksRUFBRSxNQUFNLEVBR2I7SUFFRDs7OztPQUlHO0lBQ0gsTUFBTSxDQUFDLGFBQWEsQ0FBQyxLQUFLLEVBQUUsT0FBTyxHQUFHLEtBQUssSUFBSSxXQUFXLENBZXpEO0lBRUQsT0FBZ0IsTUFBTSxnQkFFckI7SUFFRCxPQUFnQixVQUFVLENBQUMsR0FBRyxFQUFFLE1BQU0sR0FBRyxXQUFXLENBRW5EO0lBRUQsT0FBZ0IsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxlQUd2RDtJQUVELE9BQWdCLFVBQVUsQ0FBQyxHQUFHLEVBQUUsTUFBTSxHQUFHLFFBQVEsQ0FFaEQ7SUFFRCxNQUFNLEtBQUssTUFBTSxzTkFFaEI7SUFFRCxNQUFNLENBQUMsSUFBSSxnQkFFVjtJQUVELE9BQWdCLFNBQVMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxlQUVqQztDQUNGIn0=

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,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAI3D,2BAA2B;AAC3B,qBAAa,WAAY,SAAQ,QAAQ;;IAErC,sCAAsC;IACtC,IAAI,EAAE,MAAM;WAKE,MAAM;WAIN,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW;WAIpC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;WAKxC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ;IAIjD,MAAM,KAAK,MAAM,sNAEhB;IAED,MAAM,CAAC,IAAI;WAIK,SAAS,CAAC,IAAI,EAAE,EAAE;CAGnC"}
+{"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;;;;OAIG;IACH,MAAM,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,WAAW,CAezD;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"}

package/dest/block/block_hash.js

@@ -1,11 +1,23 @@
 import { Buffer32 } from '@aztec/foundation/buffer';
-import { Fr } from '@aztec/foundation/fields';
+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){
         super(hash);
     }
+    /**
+   * Type guard that checks if a value is an L2BlockHash instance.
+   * Uses duck typing to handle cases where instanceof fails due to module duplication.
+   * Checks for Buffer32-like structure with a 32-byte buffer.
+   */ static isL2BlockHash(value) {
+        if (value instanceof L2BlockHash) {
+            return true;
+        }
+        // Duck typing fallback: check if it looks like a Buffer32 with a 32-byte buffer
+        // This helps when instanceof fails due to module duplication
+        return typeof value === 'object' && value !== null && 'buffer' in value && Buffer.isBuffer(value.buffer) && value.buffer.length === 32 && 'toBuffer' in value && typeof value.toBuffer === 'function';
+    }
     static random() {
         return new L2BlockHash(Fr.random().toBuffer());
     }

package/dest/block/block_parameter.d.ts

@@ -0,0 +1,6 @@
+import { z } from 'zod';
+import { L2BlockHash } from './block_hash.js';
+export declare const BlockParameterSchema: z.ZodUnion<[z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer<ArrayBuffer>, string>, L2BlockHash, string>, 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 (L2BlockHash), or 'latest' */
+export type BlockParameter = z.infer<typeof BlockParameterSchema>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfcGFyYW1ldGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2svYmxvY2tfcGFyYW1ldGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRTlDLGVBQU8sTUFBTSxvQkFBb0IsNldBQXdFLENBQUM7QUFFMUcsNkZBQTZGO0FBQzdGLE1BQU0sTUFBTSxjQUFjLEdBQUcsQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLG9CQUFvQixDQUFDLENBQUMifQ==

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

@@ -0,0 +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,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,eAAO,MAAM,oBAAoB,6WAAwE,CAAC;AAE1G,6FAA6F;AAC7F,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC"}

package/dest/block/block_parameter.js

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

package/dest/block/body.d.ts

@@ -1,11 +1,8 @@
-import { createBlockEndMarker } from '@aztec/blob-lib/encoding';
-import { Fr } from '@aztec/foundation/fields';
+import type { TxBlobData } from '@aztec/blob-lib/encoding';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { inspect } from 'util';
 import type { ZodFor } from '../schemas/index.js';
 import { TxEffect } from '../tx/tx_effect.js';
-export { createBlockEndMarker };
-export declare function getBlockBlobFields(txEffects: TxEffect[]): Fr[];
 export declare class Body {
     txEffects: TxEffect[];
     constructor(txEffects: TxEffect[]);
@@ -24,13 +21,16 @@ export declare class Body {
     /**
      * Returns a flat packed array of fields of all tx effects - used for blobs.
      */
-    toBlobFields(): Fr[];
+    toTxBlobData(): TxBlobData[];
     /**
      * Decodes a block from blob fields.
      */
-    static fromBlobFields(fields: Fr[]): Body;
+    static fromTxBlobData(txBlobData: TxBlobData[]): Body;
     [inspect.custom](): string;
-    static random(txsPerBlock?: number, numPublicCallsPerTx?: number, numPublicLogsPerCall?: number, maxEffects?: number | undefined): Promise<Body>;
+    static random({ txsPerBlock, makeTxOptions, ...txEffectOptions }?: {
+        txsPerBlock?: number;
+        makeTxOptions?: (txIndex: number) => Partial<Parameters<typeof TxEffect.random>[0]>;
+    } & Partial<Parameters<typeof TxEffect.random>[0]>): Promise<Body>;
     static empty(): Body;
 }
-//# sourceMappingURL=body.d.ts.map
+//# 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,EAAE,oBAAoB,EAAiD,MAAM,0BAA0B,CAAC;AAE/G,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAkC,MAAM,6BAA6B,CAAC;AAE3F,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,OAAO,EAAE,oBAAoB,EAAE,CAAC;AAEhC,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,QAAQ,EAAE,QAIvD;AAED,qBAAa,IAAI;IACI,SAAS,EAAE,QAAQ,EAAE;gBAArB,SAAS,EAAE,QAAQ,EAAE;IAExC,MAAM,CAAC,KAAK,EAAE,IAAI;IAMlB,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,CAMhC;IAED;;;OAGG;IACH,QAAQ;IAIR;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY;IAM5C;;OAEG;IACH,YAAY;IAIZ;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,EAAE;IAqBlC,CAAC,OAAO,CAAC,MAAM,CAAC;WAMH,MAAM,CACjB,WAAW,SAAI,EACf,mBAAmB,SAAI,EACvB,oBAAoB,SAAI,EACxB,UAAU,GAAE,MAAM,GAAG,SAAqB;IAS5C,MAAM,CAAC,KAAK;CAGb"}
+{"version":3,"file":"body.d.ts","sourceRoot":"","sources":["../../src/block/body.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAE3D,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAI/B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,qBAAa,IAAI;IACI,SAAS,EAAE,QAAQ,EAAE;IAAxC,YAAmB,SAAS,EAAE,QAAQ,EAAE,EAAI;IAE5C,MAAM,CAAC,KAAK,EAAE,IAAI,WAIjB;IAED,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,CAMhC;IAED;;;OAGG;IACH,QAAQ,4BAEP;IAED;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,QAI3C;IAED;;OAEG;IACH,YAAY,IAAI,UAAU,EAAE,CAE3B;IAED;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,IAAI,CAGpD;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,WAIf;IAED,OAAa,MAAM,CAAC,EAClB,WAAe,EACf,aAA0B,EAC1B,GAAG,eAAe,EACnB,GAAE;QACD,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACrF,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAM,iBAMtD;IAED,MAAM,CAAC,KAAK,SAEX;CACF"}

package/dest/block/body.js

@@ -1,15 +1,11 @@
-import { createBlockEndMarker, getNumTxsFromBlockEndMarker, isBlockEndMarker } from '@aztec/blob-lib/encoding';
+var _computedKey;
 import { timesParallel } from '@aztec/foundation/collection';
-import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
+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';
-export { createBlockEndMarker };
-export function getBlockBlobFields(txEffects) {
-    const blobFields = txEffects.flatMap((txEffect)=>txEffect.toBlobFields());
-    blobFields.push(createBlockEndMarker(txEffects.length));
-    return blobFields;
-}
+_computedKey = inspect.custom;
 export class Body {
     txEffects;
     constructor(txEffects){
@@ -34,38 +30,29 @@ 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.
-   */ toBlobFields() {
-        return getBlockBlobFields(this.txEffects);
+   */ toTxBlobData() {
+        return this.txEffects.map((txEffect)=>txEffect.toTxBlobData());
     }
     /**
    * Decodes a block from blob fields.
-   */ static fromBlobFields(fields) {
-        const txEffects = [];
-        const reader = new FieldReader(fields.slice(0, -1));
-        while(!reader.isFinished()){
-            txEffects.push(TxEffect.fromBlobFields(reader));
-        }
-        // If the fields are from a proven block, or are constructed by calling `toBlobFields`, the following errors should never throw.
-        if (!isBlockEndMarker(fields[fields.length - 1])) {
-            throw new Error('Block end marker not found');
-        }
-        const numTxs = getNumTxsFromBlockEndMarker(fields[fields.length - 1]);
-        if (numTxs !== txEffects.length) {
-            throw new Error(`Expected ${numTxs} txs, but got ${txEffects.length}`);
-        }
-        return new this(txEffects);
+   */ static fromTxBlobData(txBlobData) {
+        const txEffects = txBlobData.map((data)=>TxEffect.fromTxBlobData(data));
+        return new Body(txEffects);
     }
-    [inspect.custom]() {
+    [_computedKey]() {
         return `Body {
   txEffects: ${inspect(this.txEffects)},
 }`;
     }
-    static async random(txsPerBlock = 4, numPublicCallsPerTx = 3, numPublicLogsPerCall = 1, maxEffects = undefined) {
-        const txEffects = await timesParallel(txsPerBlock, ()=>TxEffect.random(numPublicCallsPerTx, numPublicLogsPerCall, maxEffects));
+    static async random({ txsPerBlock = 4, makeTxOptions = ()=>({}), ...txEffectOptions } = {}) {
+        const txEffects = await timesParallel(txsPerBlock, (txIndex)=>TxEffect.random({
+                ...makeTxOptions(txIndex),
+                ...txEffectOptions
+            }));
         return new Body(txEffects);
     }
     static empty() {

package/dest/block/{published_l2_block.d.ts → checkpointed_l2_block.d.ts}

@@ -1,35 +1,21 @@
+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 } from '../checkpoint/published_checkpoint.js';
 import { L2Block } from './l2_block.js';
 import { CommitteeAttestation } from './proposal/committee_attestation.js';
-export declare class L1PublishedData {
-    blockNumber: bigint;
-    timestamp: bigint;
-    blockHash: string;
-    constructor(blockNumber: bigint, timestamp: bigint, blockHash: string);
-    static get schema(): 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;
-    }>;
-    static random(): L1PublishedData;
-    static fromFields(fields: FieldsOf<L1PublishedData>): L1PublishedData;
-}
-export declare class PublishedL2Block {
+/**
+ * Encapsulates an L2 Block along with the checkpoint data associated with it.
+ */
+export declare class CheckpointedL2Block {
+    checkpointNumber: CheckpointNumber;
     block: L2Block;
     l1: L1PublishedData;
     attestations: CommitteeAttestation[];
-    constructor(block: L2Block, l1: L1PublishedData, attestations: CommitteeAttestation[]);
+    constructor(checkpointNumber: CheckpointNumber, block: L2Block, l1: L1PublishedData, attestations: CommitteeAttestation[]);
     static get schema(): z.ZodEffects<z.ZodObject<{
+        checkpointNumber: z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, CheckpointNumber, string | number | bigint>;
         block: z.ZodEffects<z.ZodObject<{
             archive: z.ZodEffects<z.ZodObject<{
                 root: z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>;
@@ -44,12 +30,20 @@ export declare class PublishedL2Block {
                 root: string;
                 nextAvailableLeafIndex: string | number | bigint;
             }>;
-            header: import("@aztec/foundation/schemas").ZodFor<import("./l2_block_header.js").L2BlockHeader>;
+            header: import("@aztec/foundation/schemas").ZodFor<import("../tx/block_header.js").BlockHeader>;
             body: import("@aztec/foundation/schemas").ZodFor<import("./body.js").Body>;
+            checkpointNumber: z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, CheckpointNumber, string | number | bigint>;
+            indexWithinCheckpoint: z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, import("@aztec/foundation/branded-types").IndexWithinCheckpoint, string | number | bigint>;
         }, "strip", z.ZodTypeAny, {
             archive: import("../trees/append_only_tree_snapshot.js").AppendOnlyTreeSnapshot;
-            header: import("./l2_block_header.js").L2BlockHeader;
+            header: import("../tx/block_header.js").BlockHeader;
             body: import("./body.js").Body;
+            checkpointNumber: number & {
+                _branding: "CheckpointNumber";
+            };
+            indexWithinCheckpoint: number & {
+                _branding: "IndexWithinCheckpoint";
+            };
         }, {
             archive: {
                 root: string;
@@ -57,6 +51,8 @@ export declare class PublishedL2Block {
             };
             header?: any;
             body?: any;
+            checkpointNumber: string | number | bigint;
+            indexWithinCheckpoint: string | number | bigint;
         }>, L2Block, {
             archive: {
                 root: string;
@@ -64,8 +60,10 @@ export declare class PublishedL2Block {
             };
             header?: any;
             body?: any;
+            checkpointNumber: string | number | bigint;
+            indexWithinCheckpoint: string | number | bigint;
         }>;
-        l1: z.ZodObject<{
+        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;
@@ -77,12 +75,16 @@ export declare class PublishedL2Block {
             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/schemas").EthAddress, any, string>;
+            address: z.ZodType<import("@aztec/foundation/eth-address").EthAddress, any, string>;
             signature: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, `0x${string}`, string>, `0x${string}`, string>, import("./proposal/committee_attestation.js").Signature, string>;
         }, "strip", z.ZodTypeAny, {
-            address: import("@aztec/foundation/schemas").EthAddress;
+            address: import("@aztec/foundation/eth-address").EthAddress;
             signature: import("./proposal/committee_attestation.js").Signature;
         }, {
             address: string;
@@ -92,14 +94,14 @@ export declare class PublishedL2Block {
             signature: string;
         }>, "many">;
     }, "strip", z.ZodTypeAny, {
-        block: L2Block;
-        l1: {
-            blockNumber: bigint;
-            timestamp: bigint;
-            blockHash: string;
+        checkpointNumber: number & {
+            _branding: "CheckpointNumber";
         };
+        block: L2Block;
+        l1: L1PublishedData;
         attestations: CommitteeAttestation[];
     }, {
+        checkpointNumber: string | number | bigint;
         block: {
             archive: {
                 root: string;
@@ -107,6 +109,8 @@ export declare class PublishedL2Block {
             };
             header?: any;
             body?: any;
+            checkpointNumber: string | number | bigint;
+            indexWithinCheckpoint: string | number | bigint;
         };
         l1: {
             blockNumber: string | number | bigint;
@@ -117,7 +121,8 @@ export declare class PublishedL2Block {
             address: string;
             signature: string;
         }[];
-    }>, PublishedL2Block, {
+    }>, CheckpointedL2Block, {
+        checkpointNumber: string | number | bigint;
         block: {
             archive: {
                 root: string;
@@ -125,6 +130,8 @@ export declare class PublishedL2Block {
             };
             header?: any;
             body?: any;
+            checkpointNumber: string | number | bigint;
+            indexWithinCheckpoint: string | number | bigint;
         };
         l1: {
             blockNumber: string | number | bigint;
@@ -136,8 +143,8 @@ export declare class PublishedL2Block {
             signature: string;
         }[];
     }>;
-    static fromBuffer(bufferOrReader: Buffer | BufferReader): PublishedL2Block;
-    static fromFields(fields: FieldsOf<PublishedL2Block>): PublishedL2Block;
+    static fromBuffer(bufferOrReader: Buffer | BufferReader): CheckpointedL2Block;
+    static fromFields(fields: FieldsOf<CheckpointedL2Block>): CheckpointedL2Block;
     toBuffer(): Buffer;
 }
-//# sourceMappingURL=published_l2_block.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2twb2ludGVkX2wyX2Jsb2NrLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2svY2hlY2twb2ludGVkX2wyX2Jsb2NrLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBMEIsTUFBTSxpQ0FBaUMsQ0FBQztBQUMzRixPQUFPLEVBQUUsWUFBWSxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBQzlFLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXhELE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBRXhFLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDeEMsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFFM0U7O0dBRUc7QUFDSCxxQkFBYSxtQkFBbUI7SUFFckIsZ0JBQWdCLEVBQUUsZ0JBQWdCO0lBQ2xDLEtBQUssRUFBRSxPQUFPO0lBQ2QsRUFBRSxFQUFFLGVBQWU7SUFDbkIsWUFBWSxFQUFFLG9CQUFvQixFQUFFO0lBSjdDLFlBQ1MsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQ2xDLEtBQUssRUFBRSxPQUFPLEVBQ2QsRUFBRSxFQUFFLGVBQWUsRUFDbkIsWUFBWSxFQUFFLG9CQUFvQixFQUFFLEVBQ3pDO0lBQ0osTUFBTSxLQUFLLE1BQU07Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O09BU2hCO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxjQUFjLEVBQUUsTUFBTSxHQUFHLFlBQVksR0FBRyxtQkFBbUIsQ0FjNUU7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsbUJBQW1CLENBQUMsdUJBT3REO0lBRU0sUUFBUSxJQUFJLE1BQU0sQ0FVeEI7Q0FDRiJ9

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,MAAM,uCAAuC,CAAC;AAExE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAE3E;;GAEG;AACH,qBAAa,mBAAmB;IAErB,gBAAgB,EAAE,gBAAgB;IAClC,KAAK,EAAE,OAAO;IACd,EAAE,EAAE,eAAe;IACnB,YAAY,EAAE,oBAAoB,EAAE;IAJ7C,YACS,gBAAgB,EAAE,gBAAgB,EAClC,KAAK,EAAE,OAAO,EACd,EAAE,EAAE,eAAe,EACnB,YAAY,EAAE,oBAAoB,EAAE,EACzC;IACJ,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAShB;IAED,MAAM,CAAC,UAAU,CAAC,cAAc,EAAE,MAAM,GAAG,YAAY,GAAG,mBAAmB,CAc5E;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,mBAAmB,CAAC,uBAOtD;IAEM,QAAQ,IAAI,MAAM,CAUxB;CACF"}

package/dest/block/checkpointed_l2_block.js

@@ -0,0 +1,46 @@
+// 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 } from '../checkpoint/published_checkpoint.js';
+import { MAX_BLOCK_HASH_STRING_LENGTH, MAX_COMMITTEE_SIZE } from '../deserialization/index.js';
+import { L2Block } from './l2_block.js';
+import { CommitteeAttestation } from './proposal/committee_attestation.js';
+/**
+ * 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: L2Block.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(L2Block);
+        const l1BlockNumber = reader.readBigInt();
+        const l1BlockHash = reader.readString(MAX_BLOCK_HASH_STRING_LENGTH);
+        const l1Timestamp = reader.readBigInt();
+        const attestations = reader.readVector(CommitteeAttestation, MAX_COMMITTEE_SIZE);
+        return new CheckpointedL2Block(CheckpointNumber(checkpointNumber), block, new L1PublishedData(l1BlockNumber, l1Timestamp, l1BlockHash), attestations);
+    }
+    static fromFields(fields) {
+        return new CheckpointedL2Block(CheckpointNumber(fields.checkpointNumber), fields.block, fields.l1, fields.attestations);
+    }
+    toBuffer() {
+        return serializeToBuffer(this.checkpointNumber, this.block, this.l1.blockNumber, this.l1.blockHash, this.l1.timestamp, this.attestations.length, this.attestations);
+    }
+}

package/dest/block/in_block.d.ts

@@ -1,32 +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<{
-    data: T;
-    l2BlockNumber: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
+}, "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>;
-}>, any> extends infer T_1 ? { [k in keyof T_1]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<{
+} & {
     data: T;
-    l2BlockNumber: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
+}, "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>[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>;
-}> extends infer T_2 ? { [k_1 in keyof T_2]: z.baseObjectInputType<{
+} & {
     data: T;
-    l2BlockNumber: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
-    l2BlockHash: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer<ArrayBuffer>, string>, L2BlockHash, string>;
-}>[k_1]; } : never>;
-//# sourceMappingURL=in_block.d.ts.map
+}> extends infer T_2 ? { [k in keyof T_2]: T_2[k]; } : never>;
+//# 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;;;;;;;;;;;;;;;;;;;;oBAM/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

@@ -1,14 +1,13 @@
 export * from './l2_block.js';
-export * from './l2_block_header.js';
 export * from './l2_block_stream/index.js';
 export * from './in_block.js';
 export * from './body.js';
-export * from './l2_block_number.js';
+export * from './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=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ibG9jay9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGVBQWUsQ0FBQztBQUM5QixjQUFjLDRCQUE0QixDQUFDO0FBQzNDLGNBQWMsZUFBZSxDQUFDO0FBQzlCLGNBQWMsV0FBVyxDQUFDO0FBQzFCLGNBQWMsc0JBQXNCLENBQUM7QUFDckMsY0FBYyxzQkFBc0IsQ0FBQztBQUNyQyxjQUFjLGlCQUFpQixDQUFDO0FBQ2hDLGNBQWMsNEJBQTRCLENBQUM7QUFDM0MsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxjQUFjLDRCQUE0QixDQUFDO0FBQzNDLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYyx1QkFBdUIsQ0FBQyJ9

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,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,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"}