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

package/dest/aztec-address/index.d.ts

@@ -1,12 +1,8 @@
-import { Fr, Point } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { Point } from '@aztec/foundation/curves/grumpkin';
 import { type ZodFor } from '@aztec/foundation/schemas';
-import { type BufferReader, FieldReader } from '@aztec/foundation/serialize';
+import { type BufferReader, type BufferSink, FieldReader } from '@aztec/foundation/serialize';
 import { inspect } from 'util';
-/** Branding to ensure fields are not interchangeable types. */
-export interface AztecAddress {
-    /** Brand. */
-    _branding: 'AztecAddress';
-}
 /**
  * AztecAddress represents a 32-byte address in the Aztec Protocol. It provides methods to create, manipulate, and
  * compare addresses, as well as conversion to and from strings, buffers, and other formats.
@@ -17,12 +13,16 @@ export interface AztecAddress {
  * wild.
  */
 export declare class AztecAddress {
+    /** Branding for nominal typing. */
+    private readonly _branding;
     private xCoord;
     constructor(buffer: Buffer | Fr);
     [inspect.custom](): string;
     static isAddress(str: string): boolean;
     static SIZE_IN_BYTES: number;
     static ZERO: AztecAddress;
+    /** Null msg sender address. Not part of the protocol contracts tree. */
+    static NULL_MSG_SENDER: AztecAddress;
     static zero(): AztecAddress;
     static fromField(fr: Fr): AztecAddress;
     static fromBuffer(buffer: Buffer | BufferReader): AztecAddress;
@@ -30,6 +30,15 @@ export declare class AztecAddress {
     static fromBigInt(value: bigint): AztecAddress;
     static fromNumber(value: number): AztecAddress;
     static fromString(buf: string): AztecAddress;
+    /**
+     * Creates an AztecAddress from a plain object without Zod validation.
+     * This method is optimized for performance and skips validation, making it suitable
+     * for deserializing trusted data (e.g., from C++ via MessagePack).
+     * Handles buffers, strings, or existing instances.
+     * @param obj - Plain object, buffer, string, or AztecAddress instance
+     * @returns An AztecAddress instance
+     */
+    static fromPlainObject(obj: any): AztecAddress;
     /**
      * @returns a random valid address (i.e. one that can be encrypted to).
      */
@@ -45,11 +54,12 @@ export declare class AztecAddress {
      * @returns the Point from which the address is derived. Throws if the address is invalid.
      */
     toAddressPoint(): Promise<Point>;
-    toBuffer(): Buffer<ArrayBufferLike>;
+    toBuffer(): Buffer;
+    toBuffer(sink: BufferSink): void;
     toBigInt(): bigint;
     toField(): Fr;
     toString(): `0x${string}`;
     toJSON(): `0x${string}`;
     static get schema(): ZodFor<AztecAddress>;
 }
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9henRlYy1hZGRyZXNzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxFQUFFLEVBQWMsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNoRSxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDMUQsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFpQyxNQUFNLDJCQUEyQixDQUFDO0FBQ3ZGLE9BQU8sRUFBRSxLQUFLLFlBQVksRUFBRSxLQUFLLFVBQVUsRUFBRSxXQUFXLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUc5RixPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBRy9COzs7Ozs7OztHQVFHO0FBQ0gscUJBQWEsWUFBWTtJQUN2QixtQ0FBbUM7SUFDbkMsaUJBQXlCLFNBQVMsQ0FBaUI7SUFFbkQsT0FBTyxDQUFDLE1BQU0sQ0FBSztJQUVuQixZQUFZLE1BQU0sRUFBRSxNQUFNLEdBQUcsRUFBRSxFQUs5QjtJQUVELENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxXQUVmO0lBRUQsTUFBTSxDQUFDLFNBQVMsQ0FBQyxHQUFHLEVBQUUsTUFBTSxXQUUzQjtJQUVELE1BQU0sQ0FBQyxhQUFhLFNBQW9CO0lBRXhDLE1BQU0sQ0FBQyxJQUFJLGVBQXlDO0lBRXBELHdFQUF3RTtJQUN4RSxNQUFNLENBQUMsZUFBZSxlQUE2RDtJQUVuRixNQUFNLENBQUMsSUFBSSxJQUFJLFlBQVksQ0FFMUI7SUFFRCxNQUFNLENBQUMsU0FBUyxDQUFDLEVBQUUsRUFBRSxFQUFFLGdCQUV0QjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLGdCQUU5QztJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLFdBQVcsZ0JBRzNDO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxLQUFLLEVBQUUsTUFBTSxnQkFFOUI7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLEtBQUssRUFBRSxNQUFNLGdCQUU5QjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsR0FBRyxFQUFFLE1BQU0sZ0JBRTVCO0lBRUQ7Ozs7Ozs7T0FPRztJQUNILE1BQU0sQ0FBQyxlQUFlLENBQUMsR0FBRyxFQUFFLEdBQUcsR0FBRyxZQUFZLENBUTdDO0lBRUQ7O09BRUc7SUFDSCxPQUFhLE1BQU0sMEJBUWxCO0lBRUQsSUFBSSxJQUFJLFdBRVA7SUFFRCxNQUFNLENBQUMsS0FBSyxFQUFFLFlBQVksV0FFekI7SUFFRCxNQUFNLFlBRUw7SUFFRDs7T0FFRztJQUNHLE9BQU8scUJBUVo7SUFFRDs7T0FFRztJQUNILGNBQWMsSUFBSSxPQUFPLENBQUMsS0FBSyxDQUFDLENBRS9CO0lBRUQsUUFBUSxJQUFJLE1BQU0sQ0FBQztJQUNuQixRQUFRLENBQUMsSUFBSSxFQUFFLFVBQVUsR0FBRyxJQUFJLENBQUM7SUFRakMsUUFBUSxXQUVQO0lBRUQsT0FBTyxPQUVOO0lBRUQsUUFBUSxrQkFFUDtJQUVELE1BQU0sa0JBRUw7SUFFRCxNQUFNLEtBQUssTUFBTSxJQUFJLE1BQU0sQ0FBQyxZQUFZLENBQUMsQ0FPeEM7Q0FDRiJ9

package/dest/aztec-address/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/aztec-address/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,KAAK,EAAc,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,KAAK,YAAY,EAAE,WAAW,EAAgB,MAAM,6BAA6B,CAAC;AAG3F,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,+DAA+D;AAC/D,MAAM,WAAW,YAAY;IAC3B,aAAa;IACb,SAAS,EAAE,cAAc,CAAC;CAC3B;AACD;;;;;;;;GAQG;AACH,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAK;gBAEP,MAAM,EAAE,MAAM,GAAG,EAAE;IAO/B,CAAC,OAAO,CAAC,MAAM,CAAC;IAIhB,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM;IAI5B,MAAM,CAAC,aAAa,SAAoB;IAExC,MAAM,CAAC,IAAI,eAAyC;IAEpD,MAAM,CAAC,IAAI,IAAI,YAAY;IAI3B,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE;IAIvB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAI/C,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW;IAK5C,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM;IAI/B,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM;IAI/B,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B;;OAEG;WACU,MAAM;IAUnB,IAAI,IAAI,WAEP;IAED,MAAM,CAAC,KAAK,EAAE,YAAY;IAI1B,MAAM;IAIN;;OAEG;IACG,OAAO;IAUb;;OAEG;IACH,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC;IAIhC,QAAQ;IAIR,QAAQ;IAIR,OAAO;IAIP,QAAQ;IAIR,MAAM;IAIN,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,YAAY,CAAC,CAExC;CACF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/aztec-address/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAc,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAC1D,OAAO,EAAE,KAAK,MAAM,EAAiC,MAAM,2BAA2B,CAAC;AACvF,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,UAAU,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAG9F,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAG/B;;;;;;;;GAQG;AACH,qBAAa,YAAY;IACvB,mCAAmC;IACnC,iBAAyB,SAAS,CAAiB;IAEnD,OAAO,CAAC,MAAM,CAAK;IAEnB,YAAY,MAAM,EAAE,MAAM,GAAG,EAAE,EAK9B;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,WAEf;IAED,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,WAE3B;IAED,MAAM,CAAC,aAAa,SAAoB;IAExC,MAAM,CAAC,IAAI,eAAyC;IAEpD,wEAAwE;IACxE,MAAM,CAAC,eAAe,eAA6D;IAEnF,MAAM,CAAC,IAAI,IAAI,YAAY,CAE1B;IAED,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,gBAEtB;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,gBAE9C;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,gBAG3C;IAED,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,gBAE9B;IAED,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,gBAE9B;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,gBAE5B;IAED;;;;;;;OAOG;IACH,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,YAAY,CAQ7C;IAED;;OAEG;IACH,OAAa,MAAM,0BAQlB;IAED,IAAI,IAAI,WAEP;IAED,MAAM,CAAC,KAAK,EAAE,YAAY,WAEzB;IAED,MAAM,YAEL;IAED;;OAEG;IACG,OAAO,qBAQZ;IAED;;OAEG;IACH,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC,CAE/B;IAED,QAAQ,IAAI,MAAM,CAAC;IACnB,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC;IAQjC,QAAQ,WAEP;IAED,OAAO,OAEN;IAED,QAAQ,kBAEP;IAED,MAAM,kBAEL;IAED,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,YAAY,CAAC,CAOxC;CACF"}

package/dest/aztec-address/index.js

@@ -1,8 +1,13 @@
-/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */ import { Fr, Point, fromBuffer } from '@aztec/foundation/fields';
-import { hexSchemaFor } from '@aztec/foundation/schemas';
-import { FieldReader, TypeRegistry } from '@aztec/foundation/serialize';
+var _computedKey;
+import { NULL_MSG_SENDER_CONTRACT_ADDRESS } from '@aztec/constants';
+import { Fr, fromBuffer } from '@aztec/foundation/curves/bn254';
+import { Point } from '@aztec/foundation/curves/grumpkin';
+import { bufferSchemaFor, hexSchemaFor } from '@aztec/foundation/schemas';
+import { FieldReader } from '@aztec/foundation/serialize';
 import { hexToBuffer } from '@aztec/foundation/string';
 import { inspect } from 'util';
+import { z } from 'zod';
+_computedKey = inspect.custom;
 /**
  * AztecAddress represents a 32-byte address in the Aztec Protocol. It provides methods to create, manipulate, and
  * compare addresses, as well as conversion to and from strings, buffers, and other formats.
@@ -19,7 +24,7 @@ import { inspect } from 'util';
         }
         this.xCoord = new Fr(buffer);
     }
-    [inspect.custom]() {
+    [_computedKey]() {
         return `AztecAddress<${this.toString()}>`;
     }
     static isAddress(str) {
@@ -27,6 +32,7 @@ import { inspect } from 'util';
     }
     static SIZE_IN_BYTES = Fr.SIZE_IN_BYTES;
     static ZERO = new AztecAddress(Buffer.alloc(32, 0));
+    /** Null msg sender address. Not part of the protocol contracts tree. */ static NULL_MSG_SENDER = AztecAddress.fromBigInt(NULL_MSG_SENDER_CONTRACT_ADDRESS);
     static zero() {
         return AztecAddress.ZERO;
     }
@@ -50,6 +56,22 @@ import { inspect } from 'util';
         return new AztecAddress(hexToBuffer(buf));
     }
     /**
+   * Creates an AztecAddress from a plain object without Zod validation.
+   * This method is optimized for performance and skips validation, making it suitable
+   * for deserializing trusted data (e.g., from C++ via MessagePack).
+   * Handles buffers, strings, or existing instances.
+   * @param obj - Plain object, buffer, string, or AztecAddress instance
+   * @returns An AztecAddress instance
+   */ static fromPlainObject(obj) {
+        if (obj instanceof AztecAddress) {
+            return obj;
+        }
+        if (obj instanceof Buffer || Buffer.isBuffer(obj)) {
+            return new AztecAddress(obj);
+        }
+        return AztecAddress.fromString(obj);
+    }
+    /**
    * @returns a random valid address (i.e. one that can be encrypted to).
    */ static async random() {
         // About half of random field elements result in invalid addresses, so we loop until we get a valid one.
@@ -85,8 +107,11 @@ import { inspect } from 'util';
    */ toAddressPoint() {
         return Point.fromXAndSign(this.xCoord, true);
     }
-    toBuffer() {
-        return this.xCoord.toBuffer();
+    toBuffer(sink) {
+        if (!sink) {
+            return this.xCoord.toBuffer();
+        }
+        this.xCoord.toBuffer(sink);
     }
     toBigInt() {
         return this.xCoord.toBigInt();
@@ -101,8 +126,11 @@ import { inspect } from 'util';
         return this.toString();
     }
     static get schema() {
-        return hexSchemaFor(AztecAddress, AztecAddress.isAddress);
+        return z.union([
+            // Serialization from hex string.
+            hexSchemaFor(AztecAddress, AztecAddress.isAddress),
+            // Serialization from buffer.
+            bufferSchemaFor(AztecAddress, (buf)=>buf.length === 32)
+        ]);
     }
 }
-// For deserializing JSON.
-TypeRegistry.register('AztecAddress', AztecAddress);

package/dest/block/attestation_info.d.ts

@@ -1,5 +1,7 @@
 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 CoordinationSignatureContext } from '../p2p/signature_utils.js';
 import type { CommitteeAttestation } from './proposal/committee_attestation.js';
 /**
  * Status indicating how the attestation address was determined
@@ -20,11 +22,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;
-}): AttestationInfo[];
-//# sourceMappingURL=attestation_info.d.ts.map
+    checkpoint: Checkpoint;
+}, signatureContext: CoordinationSignatureContext): AttestationInfo[];
+export declare function getAttestationInfoFromPayload(payload: ConsensusPayload, attestations: CommitteeAttestation[]): AttestationInfo[];
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ZXN0YXRpb25faW5mby5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jsb2NrL2F0dGVzdGF0aW9uX2luZm8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFaEUsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ3pELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQy9ELE9BQU8sRUFBRSxLQUFLLDRCQUE0QixFQUFzQyxNQUFNLDJCQUEyQixDQUFDO0FBQ2xILE9BQU8sS0FBSyxFQUFFLG9CQUFvQixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFFaEY7O0dBRUc7QUFDSCxNQUFNLE1BQU0saUJBQWlCLEdBQUcsMEJBQTBCLEdBQUcscUJBQXFCLEdBQUcsbUJBQW1CLEdBQUcsT0FBTyxDQUFDO0FBRW5IOztHQUVHO0FBQ0gsTUFBTSxNQUFNLGVBQWUsR0FDdkI7SUFDRSwrRUFBK0U7SUFDL0UsT0FBTyxDQUFDLEVBQUUsU0FBUyxDQUFDO0lBQ3BCLGlEQUFpRDtJQUNqRCxNQUFNLEVBQUUsT0FBTyxDQUFDLGlCQUFpQixFQUFFLG1CQUFtQixHQUFHLE9BQU8sQ0FBQyxDQUFDO0NBQ25FLEdBQ0Q7SUFDRSw4QkFBOEI7SUFDOUIsT0FBTyxFQUFFLFVBQVUsQ0FBQztJQUNwQixpREFBaUQ7SUFDakQsTUFBTSxFQUFFLE9BQU8sQ0FBQyxpQkFBaUIsRUFBRSxxQkFBcUIsR0FBRywwQkFBMEIsQ0FBQyxDQUFDO0NBQ3hGLENBQUM7QUFFTjs7O0dBR0c7QUFDSCx3QkFBZ0IseUNBQXlDLENBQ3ZELEtBQUssRUFBRTtJQUNMLFlBQVksRUFBRSxvQkFBb0IsRUFBRSxDQUFDO0lBQ3JDLFVBQVUsRUFBRSxVQUFVLENBQUM7Q0FDeEIsRUFDRCxnQkFBZ0IsRUFBRSw0QkFBNEIsR0FDN0MsZUFBZSxFQUFFLENBR25CO0FBRUQsd0JBQWdCLDZCQUE2QixDQUMzQyxPQUFPLEVBQUUsZ0JBQWdCLEVBQ3pCLFlBQVksRUFBRSxvQkFBb0IsRUFBRSxHQUNuQyxlQUFlLEVBQUUsQ0F1Qm5CIn0=

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;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,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';
+import { getHashedSignaturePayloadTypedData } 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, signatureContext) {
+    const payload = ConsensusPayload.fromCheckpoint(block.checkpoint, signatureContext);
+    return getAttestationInfoFromPayload(payload, block.attestations);
+}
+export function getAttestationInfoFromPayload(payload, attestations) {
+    const hashedPayload = getHashedSignaturePayloadTypedData(payload);
+    return attestations.map((attestation)=>{
         // If signature is empty, check if we have an address directly
         if (attestation.signature.isEmpty()) {
             if (attestation.address.isZero()) {
@@ -24,7 +27,9 @@ import { SignatureDomainSeparator, getHashedSignaturePayloadEthSignedMessage } f
         }
         // 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/fields';
-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=block_hash.d.ts.map
+/** 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,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":"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/fields';
-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

@@ -0,0 +1,39 @@
+import { type BlockNumber } from '@aztec/foundation/branded-types';
+import type { Fr } from '@aztec/foundation/curves/bn254';
+import { z } from 'zod';
+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

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

@@ -0,0 +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([
+    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

@@ -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() {