@aztec/stdlib 0.0.1-commit.f295ac2 → 0.0.1-commit.f2ce05ee

package/dest/abi/function_call.d.ts

@@ -1,5 +1,6 @@
 import type { Fr } from '@aztec/foundation/curves/bn254';
 import type { FieldsOf } from '@aztec/foundation/types';
+import { z } from 'zod';
 import { AztecAddress } from '../aztec-address/index.js';
 import { type AbiType, FunctionType } from './abi.js';
 import { FunctionSelector } from './function_selector.js';
@@ -40,19 +41,48 @@ export declare class FunctionCall {
     returnTypes: AbiType[]);
     static getFields(fields: FieldsOf<FunctionCall>): readonly [string, AztecAddress, FunctionSelector, FunctionType, boolean, boolean, Fr[], AbiType[]];
     static from(fields: FieldsOf<FunctionCall>): FunctionCall;
-    /**
-     * Creates an empty function call.
-     * @returns an empty function call.
-     */
-    static empty(): {
+    static get schema(): z.ZodEffects<z.ZodObject<{
+        name: z.ZodString;
+        to: import("../schemas/index.js").ZodFor<AztecAddress>;
+        selector: import("../schemas/index.js").ZodFor<FunctionSelector>;
+        type: z.ZodNativeEnum<typeof FunctionType>;
+        isStatic: z.ZodBoolean;
+        hideMsgSender: z.ZodBoolean;
+        args: z.ZodArray<import("../schemas/index.js").ZodFor<Fr>, "many">;
+        returnTypes: z.ZodArray<z.ZodType<AbiType, z.ZodTypeDef, AbiType>, "many">;
+    }, "strip", z.ZodTypeAny, {
         name: string;
         to: AztecAddress;
         selector: FunctionSelector;
         type: FunctionType;
+        isStatic: boolean;
+        hideMsgSender: boolean;
+        args: Fr[];
+        returnTypes: AbiType[];
+    }, {
+        name: string;
+        to?: any;
+        selector?: any;
+        type: FunctionType;
+        isStatic: boolean;
         hideMsgSender: boolean;
+        args: any[];
+        returnTypes: AbiType[];
+    }>, FunctionCall, {
+        name: string;
+        to?: any;
+        selector?: any;
+        type: FunctionType;
         isStatic: boolean;
-        args: never[];
-        returnTypes: never[];
-    };
+        hideMsgSender: boolean;
+        args: any[];
+        returnTypes: AbiType[];
+    }>;
+    isPublicStatic(): boolean;
+    /**
+     * Creates an empty function call.
+     * @returns an empty function call.
+     */
+    static empty(): FunctionCall;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnVuY3Rpb25fY2FsbC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FiaS9mdW5jdGlvbl9jYWxsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXhELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsS0FBSyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBQ3RELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRTFELGtEQUFrRDtBQUNsRCxxQkFBYSxZQUFZO0lBRXJCLHVDQUF1QztJQUNoQyxJQUFJLEVBQUUsTUFBTTtJQUNuQiw2QkFBNkI7SUFDdEIsRUFBRSxFQUFFLFlBQVk7SUFDdkIsZ0NBQWdDO0lBQ3pCLFFBQVEsRUFBRSxnQkFBZ0I7SUFDakMsMkJBQTJCO0lBQ3BCLElBQUksRUFBRSxZQUFZO0lBQ3pCLHFRQUFxUTtJQUM5UCxhQUFhLEVBQUUsT0FBTztJQUM3QiwrREFBK0Q7SUFDeEQsUUFBUSxFQUFFLE9BQU87SUFDeEIsdUJBQXVCO0lBQ2hCLElBQUksRUFBRSxFQUFFLEVBQUU7SUFDakIsbUNBQW1DO0lBQzVCLFdBQVcsRUFBRSxPQUFPLEVBQUU7SUFoQi9CO0lBQ0UsdUNBQXVDO0lBQ2hDLElBQUksRUFBRSxNQUFNO0lBQ25CLDZCQUE2QjtJQUN0QixFQUFFLEVBQUUsWUFBWTtJQUN2QixnQ0FBZ0M7SUFDekIsUUFBUSxFQUFFLGdCQUFnQjtJQUNqQywyQkFBMkI7SUFDcEIsSUFBSSxFQUFFLFlBQVk7SUFDekIscVFBQXFRO0lBQzlQLGFBQWEsRUFBRSxPQUFPO0lBQzdCLCtEQUErRDtJQUN4RCxRQUFRLEVBQUUsT0FBTztJQUN4Qix1QkFBdUI7SUFDaEIsSUFBSSxFQUFFLEVBQUUsRUFBRTtJQUNqQixtQ0FBbUM7SUFDNUIsV0FBVyxFQUFFLE9BQU8sRUFBRSxFQUMzQjtJQUVKLE1BQU0sQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxZQUFZLENBQUMsc0dBVzlDO0lBRUQsTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLFlBQVksQ0FBQyxHQUFHLFlBQVksQ0FFeEQ7SUFFRDs7O09BR0c7SUFDSCxPQUFjLEtBQUs7Ozs7Ozs7OztNQVdsQjtDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnVuY3Rpb25fY2FsbC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FiaS9mdW5jdGlvbl9jYWxsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXhELE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRXpELE9BQU8sRUFBRSxLQUFLLE9BQU8sRUFBaUIsWUFBWSxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBQ3JFLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRTFELGtEQUFrRDtBQUNsRCxxQkFBYSxZQUFZO0lBRXJCLHVDQUF1QztJQUNoQyxJQUFJLEVBQUUsTUFBTTtJQUNuQiw2QkFBNkI7SUFDdEIsRUFBRSxFQUFFLFlBQVk7SUFDdkIsZ0NBQWdDO0lBQ3pCLFFBQVEsRUFBRSxnQkFBZ0I7SUFDakMsMkJBQTJCO0lBQ3BCLElBQUksRUFBRSxZQUFZO0lBQ3pCLHFRQUFxUTtJQUM5UCxhQUFhLEVBQUUsT0FBTztJQUM3QiwrREFBK0Q7SUFDeEQsUUFBUSxFQUFFLE9BQU87SUFDeEIsdUJBQXVCO0lBQ2hCLElBQUksRUFBRSxFQUFFLEVBQUU7SUFDakIsbUNBQW1DO0lBQzVCLFdBQVcsRUFBRSxPQUFPLEVBQUU7SUFoQi9CO0lBQ0UsdUNBQXVDO0lBQ2hDLElBQUksRUFBRSxNQUFNO0lBQ25CLDZCQUE2QjtJQUN0QixFQUFFLEVBQUUsWUFBWTtJQUN2QixnQ0FBZ0M7SUFDekIsUUFBUSxFQUFFLGdCQUFnQjtJQUNqQywyQkFBMkI7SUFDcEIsSUFBSSxFQUFFLFlBQVk7SUFDekIscVFBQXFRO0lBQzlQLGFBQWEsRUFBRSxPQUFPO0lBQzdCLCtEQUErRDtJQUN4RCxRQUFRLEVBQUUsT0FBTztJQUN4Qix1QkFBdUI7SUFDaEIsSUFBSSxFQUFFLEVBQUUsRUFBRTtJQUNqQixtQ0FBbUM7SUFDNUIsV0FBVyxFQUFFLE9BQU8sRUFBRSxFQUMzQjtJQUVKLE1BQU0sQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxZQUFZLENBQUMsc0dBVzlDO0lBRUQsTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLFlBQVksQ0FBQyxHQUFHLFlBQVksQ0FFeEQ7SUFFRCxNQUFNLEtBQUssTUFBTTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O09BYWhCO0lBRU0sY0FBYyxJQUFJLE9BQU8sQ0FFL0I7SUFFRDs7O09BR0c7SUFDSCxPQUFjLEtBQUssaUJBV2xCO0NBQ0YifQ==

package/dest/abi/function_call.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"function_call.d.ts","sourceRoot":"","sources":["../../src/abi/function_call.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,KAAK,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1D,kDAAkD;AAClD,qBAAa,YAAY;IAErB,uCAAuC;IAChC,IAAI,EAAE,MAAM;IACnB,6BAA6B;IACtB,EAAE,EAAE,YAAY;IACvB,gCAAgC;IACzB,QAAQ,EAAE,gBAAgB;IACjC,2BAA2B;IACpB,IAAI,EAAE,YAAY;IACzB,qQAAqQ;IAC9P,aAAa,EAAE,OAAO;IAC7B,+DAA+D;IACxD,QAAQ,EAAE,OAAO;IACxB,uBAAuB;IAChB,IAAI,EAAE,EAAE,EAAE;IACjB,mCAAmC;IAC5B,WAAW,EAAE,OAAO,EAAE;IAhB/B;IACE,uCAAuC;IAChC,IAAI,EAAE,MAAM;IACnB,6BAA6B;IACtB,EAAE,EAAE,YAAY;IACvB,gCAAgC;IACzB,QAAQ,EAAE,gBAAgB;IACjC,2BAA2B;IACpB,IAAI,EAAE,YAAY;IACzB,qQAAqQ;IAC9P,aAAa,EAAE,OAAO;IAC7B,+DAA+D;IACxD,QAAQ,EAAE,OAAO;IACxB,uBAAuB;IAChB,IAAI,EAAE,EAAE,EAAE;IACjB,mCAAmC;IAC5B,WAAW,EAAE,OAAO,EAAE,EAC3B;IAEJ,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,sGAW9C;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,GAAG,YAAY,CAExD;IAED;;;OAGG;IACH,OAAc,KAAK;;;;;;;;;MAWlB;CACF"}
+{"version":3,"file":"function_call.d.ts","sourceRoot":"","sources":["../../src/abi/function_call.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,OAAO,EAAE,KAAK,OAAO,EAAiB,YAAY,EAAE,MAAM,UAAU,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1D,kDAAkD;AAClD,qBAAa,YAAY;IAErB,uCAAuC;IAChC,IAAI,EAAE,MAAM;IACnB,6BAA6B;IACtB,EAAE,EAAE,YAAY;IACvB,gCAAgC;IACzB,QAAQ,EAAE,gBAAgB;IACjC,2BAA2B;IACpB,IAAI,EAAE,YAAY;IACzB,qQAAqQ;IAC9P,aAAa,EAAE,OAAO;IAC7B,+DAA+D;IACxD,QAAQ,EAAE,OAAO;IACxB,uBAAuB;IAChB,IAAI,EAAE,EAAE,EAAE;IACjB,mCAAmC;IAC5B,WAAW,EAAE,OAAO,EAAE;IAhB/B;IACE,uCAAuC;IAChC,IAAI,EAAE,MAAM;IACnB,6BAA6B;IACtB,EAAE,EAAE,YAAY;IACvB,gCAAgC;IACzB,QAAQ,EAAE,gBAAgB;IACjC,2BAA2B;IACpB,IAAI,EAAE,YAAY;IACzB,qQAAqQ;IAC9P,aAAa,EAAE,OAAO;IAC7B,+DAA+D;IACxD,QAAQ,EAAE,OAAO;IACxB,uBAAuB;IAChB,IAAI,EAAE,EAAE,EAAE;IACjB,mCAAmC;IAC5B,WAAW,EAAE,OAAO,EAAE,EAC3B;IAEJ,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,sGAW9C;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,GAAG,YAAY,CAExD;IAED,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAahB;IAEM,cAAc,IAAI,OAAO,CAE/B;IAED;;;OAGG;IACH,OAAc,KAAK,iBAWlB;CACF"}

package/dest/abi/function_call.js

@@ -1,5 +1,7 @@
+import { z } from 'zod';
 import { AztecAddress } from '../aztec-address/index.js';
-import { FunctionType } from './abi.js';
+import { schemas } from '../schemas/index.js';
+import { AbiTypeSchema, FunctionType } from './abi.js';
 import { FunctionSelector } from './function_selector.js';
 /** A request to call a function on a contract. */ export class FunctionCall {
     name;
@@ -35,11 +37,26 @@ import { FunctionSelector } from './function_selector.js';
     static from(fields) {
         return new FunctionCall(...FunctionCall.getFields(fields));
     }
+    static get schema() {
+        return z.object({
+            name: z.string(),
+            to: schemas.AztecAddress,
+            selector: schemas.FunctionSelector,
+            type: z.nativeEnum(FunctionType),
+            isStatic: z.boolean(),
+            hideMsgSender: z.boolean(),
+            args: z.array(schemas.Fr),
+            returnTypes: z.array(AbiTypeSchema)
+        }).transform(FunctionCall.from);
+    }
+    isPublicStatic() {
+        return this.type === FunctionType.PUBLIC && this.isStatic;
+    }
     /**
    * Creates an empty function call.
    * @returns an empty function call.
    */ static empty() {
-        return {
+        return FunctionCall.from({
             name: '',
             to: AztecAddress.ZERO,
             selector: FunctionSelector.empty(),
@@ -48,6 +65,6 @@ import { FunctionSelector } from './function_selector.js';
             isStatic: false,
             args: [],
             returnTypes: []
-        };
+        });
     }
 }

package/dest/block/block_hash.d.ts

@@ -1,23 +1,21 @@
-import { Buffer32 } from '@aztec/foundation/buffer';
 import { Fr } from '@aztec/foundation/curves/bn254';
-import { BufferReader } from '@aztec/foundation/serialize';
+import type { ZodFor } from '@aztec/foundation/schemas';
+import { inspect } from 'util';
+declare const BLOCK_HASH_BRAND: unique symbol;
 /** Hash of an L2 block. */
-export declare class L2BlockHash extends Buffer32 {
-    constructor(
-    /** The buffer containing the hash. */
-    hash: Buffer);
+export declare class BlockHash extends Fr {
+    readonly [BLOCK_HASH_BRAND]: true;
+    constructor(hash: Fr);
+    [inspect.custom](): string;
+    toFr(): Fr;
     /**
-     * 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.
+     * Type guard that checks if a value is a BlockHash instance.
+     * Uses Symbol.for to ensure cross-module compatibility.
      */
-    static isL2BlockHash(value: unknown): value is L2BlockHash;
-    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;
+    static isBlockHash(value: unknown): value is BlockHash;
+    static random(): BlockHash;
+    static fromString(str: string): BlockHash;
+    static get schema(): ZodFor<BlockHash>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfaGFzaC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jsb2NrL2Jsb2NrX2hhc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ3BELE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFJM0QsMkJBQTJCO0FBQzNCLHFCQUFhLFdBQVksU0FBUSxRQUFRO0lBQ3ZDO0lBQ0Usc0NBQXNDO0lBQ3RDLElBQUksRUFBRSxNQUFNLEVBR2I7SUFFRDs7OztPQUlHO0lBQ0gsTUFBTSxDQUFDLGFBQWEsQ0FBQyxLQUFLLEVBQUUsT0FBTyxHQUFHLEtBQUssSUFBSSxXQUFXLENBZXpEO0lBRUQsT0FBZ0IsTUFBTSxnQkFFckI7SUFFRCxPQUFnQixVQUFVLENBQUMsR0FBRyxFQUFFLE1BQU0sR0FBRyxXQUFXLENBRW5EO0lBRUQsT0FBZ0IsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxlQUd2RDtJQUVELE9BQWdCLFVBQVUsQ0FBQyxHQUFHLEVBQUUsTUFBTSxHQUFHLFFBQVEsQ0FFaEQ7SUFFRCxNQUFNLEtBQUssTUFBTSxzTkFFaEI7SUFFRCxNQUFNLENBQUMsSUFBSSxnQkFFVjtJQUVELE9BQWdCLFNBQVMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxlQUVqQztDQUNGIn0=
+export {};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfaGFzaC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jsb2NrL2Jsb2NrX2hhc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRXhELE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFJL0IsUUFBQSxNQUFNLGdCQUFnQixlQUFnQyxDQUFDO0FBRXZELDJCQUEyQjtBQUMzQixxQkFBYSxTQUFVLFNBQVEsRUFBRTtJQUMvQixRQUFRLENBQUMsQ0FBQyxnQkFBZ0IsQ0FBQyxPQUFpQjtJQUU1QyxZQUFZLElBQUksRUFBRSxFQUFFLEVBRW5CO0lBRVEsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLFdBRXhCO0lBRUQsSUFBSSxJQUFJLEVBQUUsQ0FFVDtJQUVEOzs7T0FHRztJQUNILE1BQU0sQ0FBQyxXQUFXLENBQUMsS0FBSyxFQUFFLE9BQU8sR0FBRyxLQUFLLElBQUksU0FBUyxDQUVyRDtJQUVELE9BQWdCLE1BQU0sY0FFckI7SUFFRCxPQUFnQixVQUFVLENBQUMsR0FBRyxFQUFFLE1BQU0sR0FBRyxTQUFTLENBRWpEO0lBRUQsV0FBb0IsTUFBTSxzQkFFekI7Q0FDRiJ9

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;;;;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"}
+{"version":3,"file":"block_hash.d.ts","sourceRoot":"","sources":["../../src/block/block_hash.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAI/B,QAAA,MAAM,gBAAgB,eAAgC,CAAC;AAEvD,2BAA2B;AAC3B,qBAAa,SAAU,SAAQ,EAAE;IAC/B,QAAQ,CAAC,CAAC,gBAAgB,CAAC,OAAiB;IAE5C,YAAY,IAAI,EAAE,EAAE,EAEnB;IAEQ,CAAC,OAAO,CAAC,MAAM,CAAC,WAExB;IAED,IAAI,IAAI,EAAE,CAET;IAED;;;OAGG;IACH,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,SAAS,CAErD;IAED,OAAgB,MAAM,cAErB;IAED,OAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAEjD;IAED,WAAoB,MAAM,sBAEzB;CACF"}

package/dest/block/block_hash.js

@@ -1,43 +1,33 @@
-import { Buffer32 } from '@aztec/foundation/buffer';
+var _computedKey;
 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){
+import { inspect } from 'util';
+import { hexSchemaFor } from '../schemas/schemas.js';
+const BLOCK_HASH_BRAND = Symbol.for('aztec.BlockHash');
+_computedKey = inspect.custom;
+/** Hash of an L2 block. */ export class BlockHash extends Fr {
+    [BLOCK_HASH_BRAND] = true;
+    constructor(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';
+    [_computedKey]() {
+        return `BlockHash<${this.toString()}>`;
     }
-    static random() {
-        return new L2BlockHash(Fr.random().toBuffer());
+    toFr() {
+        return new Fr(this.toBigInt());
     }
-    static fromNumber(num) {
-        return new L2BlockHash(super.fromNumber(num).toBuffer());
+    /**
+   * Type guard that checks if a value is a BlockHash instance.
+   * Uses Symbol.for to ensure cross-module compatibility.
+   */ static isBlockHash(value) {
+        return typeof value === 'object' && value !== null && BLOCK_HASH_BRAND in value;
     }
-    static fromBuffer(buffer) {
-        const reader = BufferReader.asReader(buffer);
-        return new L2BlockHash(reader.readBytes(L2BlockHash.SIZE));
+    static random() {
+        return new BlockHash(Fr.random());
     }
     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);
     }
 }

package/dest/block/block_parameter.d.ts

@@ -1,6 +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' */
+import { BlockHash } from './block_hash.js';
+export declare const BlockParameterSchema: z.ZodUnion<[import("@aztec/foundation/schemas").ZodFor<BlockHash>, z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, import("@aztec/foundation/branded-types").BlockNumber, string | number | bigint>, z.ZodLiteral<"latest">]>;
+/** Block parameter - either a specific BlockNumber, block hash (BlockHash), or 'latest' */
 export type BlockParameter = z.infer<typeof BlockParameterSchema>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfcGFyYW1ldGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2svYmxvY2tfcGFyYW1ldGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRTlDLGVBQU8sTUFBTSxvQkFBb0IsNldBQXdFLENBQUM7QUFFMUcsNkZBQTZGO0FBQzdGLE1BQU0sTUFBTSxjQUFjLEdBQUcsQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLG9CQUFvQixDQUFDLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfcGFyYW1ldGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2svYmxvY2tfcGFyYW1ldGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRTVDLGVBQU8sTUFBTSxvQkFBb0IsNlFBQXNFLENBQUM7QUFFeEcsMkZBQTJGO0FBQzNGLE1BQU0sTUFBTSxjQUFjLEdBQUcsQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLG9CQUFvQixDQUFDLENBQUMifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"block_parameter.d.ts","sourceRoot":"","sources":["../../src/block/block_parameter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,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"}
+{"version":3,"file":"block_parameter.d.ts","sourceRoot":"","sources":["../../src/block/block_parameter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,eAAO,MAAM,oBAAoB,6QAAsE,CAAC;AAExG,2FAA2F;AAC3F,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC"}

package/dest/block/block_parameter.js

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

package/dest/block/checkpointed_l2_block.d.ts

@@ -3,17 +3,17 @@ 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 { L2BlockNew } from './l2_block_new.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 declare class CheckpointedL2Block {
     checkpointNumber: CheckpointNumber;
-    block: L2BlockNew;
+    block: L2Block;
     l1: L1PublishedData;
     attestations: CommitteeAttestation[];
-    constructor(checkpointNumber: CheckpointNumber, block: L2BlockNew, 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<{
@@ -53,7 +53,7 @@ export declare class CheckpointedL2Block {
             body?: any;
             checkpointNumber: string | number | bigint;
             indexWithinCheckpoint: string | number | bigint;
-        }>, L2BlockNew, {
+        }>, L2Block, {
             archive: {
                 root: string;
                 nextAvailableLeafIndex: string | number | bigint;
@@ -97,7 +97,7 @@ export declare class CheckpointedL2Block {
         checkpointNumber: number & {
             _branding: "CheckpointNumber";
         };
-        block: L2BlockNew;
+        block: L2Block;
         l1: L1PublishedData;
         attestations: CommitteeAttestation[];
     }, {
@@ -147,4 +147,4 @@ export declare class CheckpointedL2Block {
     static fromFields(fields: FieldsOf<CheckpointedL2Block>): CheckpointedL2Block;
     toBuffer(): Buffer;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2twb2ludGVkX2wyX2Jsb2NrLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2svY2hlY2twb2ludGVkX2wyX2Jsb2NrLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBMEIsTUFBTSxpQ0FBaUMsQ0FBQztBQUMzRixPQUFPLEVBQUUsWUFBWSxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBQzlFLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXhELE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBRXhFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUMvQyxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUUzRTs7R0FFRztBQUNILHFCQUFhLG1CQUFtQjtJQUVyQixnQkFBZ0IsRUFBRSxnQkFBZ0I7SUFDbEMsS0FBSyxFQUFFLFVBQVU7SUFDakIsRUFBRSxFQUFFLGVBQWU7SUFDbkIsWUFBWSxFQUFFLG9CQUFvQixFQUFFO0lBSjdDLFlBQ1MsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQ2xDLEtBQUssRUFBRSxVQUFVLEVBQ2pCLEVBQUUsRUFBRSxlQUFlLEVBQ25CLFlBQVksRUFBRSxvQkFBb0IsRUFBRSxFQUN6QztJQUNKLE1BQU0sS0FBSyxNQUFNOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztPQVNoQjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsY0FBYyxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsbUJBQW1CLENBYzVFO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLG1CQUFtQixDQUFDLHVCQU90RDtJQUVNLFFBQVEsSUFBSSxNQUFNLENBVXhCO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2twb2ludGVkX2wyX2Jsb2NrLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2svY2hlY2twb2ludGVkX2wyX2Jsb2NrLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBMEIsTUFBTSxpQ0FBaUMsQ0FBQztBQUMzRixPQUFPLEVBQUUsWUFBWSxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBQzlFLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXhELE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBRXhFLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDeEMsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFFM0U7O0dBRUc7QUFDSCxxQkFBYSxtQkFBbUI7SUFFckIsZ0JBQWdCLEVBQUUsZ0JBQWdCO0lBQ2xDLEtBQUssRUFBRSxPQUFPO0lBQ2QsRUFBRSxFQUFFLGVBQWU7SUFDbkIsWUFBWSxFQUFFLG9CQUFvQixFQUFFO0lBSjdDLFlBQ1MsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQ2xDLEtBQUssRUFBRSxPQUFPLEVBQ2QsRUFBRSxFQUFFLGVBQWUsRUFDbkIsWUFBWSxFQUFFLG9CQUFvQixFQUFFLEVBQ3pDO0lBQ0osTUFBTSxLQUFLLE1BQU07Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O09BU2hCO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxjQUFjLEVBQUUsTUFBTSxHQUFHLFlBQVksR0FBRyxtQkFBbUIsQ0FjNUU7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsbUJBQW1CLENBQUMsdUJBT3REO0lBRU0sUUFBUSxJQUFJLE1BQU0sQ0FVeEI7Q0FDRiJ9

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

@@ -1 +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,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAE3E;;GAEG;AACH,qBAAa,mBAAmB;IAErB,gBAAgB,EAAE,gBAAgB;IAClC,KAAK,EAAE,UAAU;IACjB,EAAE,EAAE,eAAe;IACnB,YAAY,EAAE,oBAAoB,EAAE;IAJ7C,YACS,gBAAgB,EAAE,gBAAgB,EAClC,KAAK,EAAE,UAAU,EACjB,EAAE,EAAE,eAAe,EACnB,YAAY,EAAE,oBAAoB,EAAE,EACzC;IACJ,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAShB;IAED,MAAM,CAAC,UAAU,CAAC,cAAc,EAAE,MAAM,GAAG,YAAY,GAAG,mBAAmB,CAc5E;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,mBAAmB,CAAC,uBAOtD;IAEM,QAAQ,IAAI,MAAM,CAUxB;CACF"}
+{"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

@@ -4,7 +4,7 @@ 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 { L2BlockNew } from './l2_block_new.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.
@@ -22,7 +22,7 @@ import { CommitteeAttestation } from './proposal/committee_attestation.js';
     static get schema() {
         return z.object({
             checkpointNumber: CheckpointNumberSchema,
-            block: L2BlockNew.schema,
+            block: L2Block.schema,
             l1: L1PublishedData.schema,
             attestations: z.array(CommitteeAttestation.schema)
         }).transform((obj)=>CheckpointedL2Block.fromFields(obj));
@@ -30,7 +30,7 @@ import { CommitteeAttestation } from './proposal/committee_attestation.js';
     static fromBuffer(bufferOrReader) {
         const reader = BufferReader.asReader(bufferOrReader);
         const checkpointNumber = reader.readNumber();
-        const block = reader.readObject(L2BlockNew);
+        const block = reader.readObject(L2Block);
         const l1BlockNumber = reader.readBigInt();
         const l1BlockHash = reader.readString(MAX_BLOCK_HASH_STRING_LENGTH);
         const l1Timestamp = reader.readBigInt();

package/dest/block/in_block.d.ts

@@ -1,43 +1,43 @@
 import { BlockNumber } from '@aztec/foundation/branded-types';
 import { type ZodTypeAny, z } from 'zod';
-import { L2BlockHash } from './block_hash.js';
-import type { L2BlockNew } from './l2_block_new.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;
 } & InBlock;
 export declare function randomInBlock(): InBlock;
 export declare function randomDataInBlock<T>(data: T): DataInBlock<T>;
-export declare function wrapDataInBlock<T>(data: T, block: L2BlockNew): Promise<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>;
+    l2BlockHash: import("@aztec/foundation/schemas").ZodFor<BlockHash>;
 }, "strip", ZodTypeAny, {
     l2BlockNumber: number & {
         _branding: "BlockNumber";
     };
-    l2BlockHash: L2BlockHash;
+    l2BlockHash: BlockHash;
 }, {
     l2BlockNumber: string | number | bigint;
-    l2BlockHash: string;
+    l2BlockHash?: any;
 }>;
 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>;
+    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>;
+    l2BlockHash: import("@aztec/foundation/schemas").ZodFor<BlockHash>;
 } & {
     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>;
+    l2BlockHash: import("@aztec/foundation/schemas").ZodFor<BlockHash>;
 } & {
     data: T;
 }> extends infer T_2 ? { [k in keyof T_2]: T_2[k]; } : never>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5fYmxvY2suZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ibG9jay9pbl9ibG9jay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFxQixNQUFNLGlDQUFpQyxDQUFDO0FBRWpGLE9BQU8sRUFBRSxLQUFLLFVBQVUsRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFekMsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQzlDLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRXBELE1BQU0sTUFBTSxPQUFPLEdBQUc7SUFDcEIsYUFBYSxFQUFFLFdBQVcsQ0FBQztJQUMzQixXQUFXLEVBQUUsV0FBVyxDQUFDO0NBQzFCLENBQUM7QUFHRixNQUFNLE1BQU0sV0FBVyxDQUFDLENBQUMsSUFBSTtJQUMzQixJQUFJLEVBQUUsQ0FBQyxDQUFDO0NBQ1QsR0FBRyxPQUFPLENBQUM7QUFFWix3QkFBZ0IsYUFBYSxJQUFJLE9BQU8sQ0FLdkM7QUFFRCx3QkFBZ0IsaUJBQWlCLENBQUMsQ0FBQyxFQUFFLElBQUksRUFBRSxDQUFDLEdBQUcsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUs1RDtBQUVELHdCQUFzQixlQUFlLENBQUMsQ0FBQyxFQUFFLElBQUksRUFBRSxDQUFDLEVBQUUsS0FBSyxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBTTVGO0FBRUQsd0JBQWdCLGFBQWE7Ozs7Ozs7Ozs7O0dBSzVCO0FBRUQsd0JBQWdCLG9CQUFvQixDQUFDLENBQUMsU0FBUyxVQUFVLEVBQUUsTUFBTSxFQUFFLENBQUM7Ozs7Ozs7Ozs7Ozs7Ozs4REFFbkUifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5fYmxvY2suZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ibG9jay9pbl9ibG9jay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFxQixNQUFNLGlDQUFpQyxDQUFDO0FBRWpGLE9BQU8sRUFBRSxLQUFLLFVBQVUsRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFekMsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQzVDLE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUU3QyxNQUFNLE1BQU0sT0FBTyxHQUFHO0lBQ3BCLGFBQWEsRUFBRSxXQUFXLENBQUM7SUFDM0IsV0FBVyxFQUFFLFNBQVMsQ0FBQztDQUN4QixDQUFDO0FBR0YsTUFBTSxNQUFNLFdBQVcsQ0FBQyxDQUFDLElBQUk7SUFDM0IsSUFBSSxFQUFFLENBQUMsQ0FBQztDQUNULEdBQUcsT0FBTyxDQUFDO0FBRVosd0JBQWdCLGFBQWEsSUFBSSxPQUFPLENBS3ZDO0FBRUQsd0JBQWdCLGlCQUFpQixDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxHQUFHLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FLNUQ7QUFFRCx3QkFBc0IsZUFBZSxDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxFQUFFLEtBQUssRUFBRSxPQUFPLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQU16RjtBQUVELHdCQUFnQixhQUFhOzs7Ozs7Ozs7OztHQUs1QjtBQUVELHdCQUFnQixvQkFBb0IsQ0FBQyxDQUFDLFNBQVMsVUFBVSxFQUFFLE1BQU0sRUFBRSxDQUFDOzs7Ozs7Ozs7Ozs7Ozs7OERBRW5FIn0=

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,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEpD,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,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAM5F;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;;;;;;;;;;;GAK5B;AAED,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,UAAU,EAAE,MAAM,EAAE,CAAC;;;;;;;;;;;;;;;8DAEnE"}

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,4 +1,4 @@
-export * from './l2_block_new.js';
+export * from './l2_block.js';
 export * from './l2_block_stream/index.js';
 export * from './in_block.js';
 export * from './body.js';
@@ -10,4 +10,4 @@ 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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ibG9jay9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLG1CQUFtQixDQUFDO0FBQ2xDLGNBQWMsNEJBQTRCLENBQUM7QUFDM0MsY0FBYyxlQUFlLENBQUM7QUFDOUIsY0FBYyxXQUFXLENBQUM7QUFDMUIsY0FBYyxzQkFBc0IsQ0FBQztBQUNyQyxjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMsaUJBQWlCLENBQUM7QUFDaEMsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsNEJBQTRCLENBQUM7QUFDM0MsY0FBYyxvQkFBb0IsQ0FBQztBQUNuQyxjQUFjLHVCQUF1QixDQUFDIn0=
+//# 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,mBAAmB,CAAC;AAClC,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,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"}

package/dest/block/index.js

@@ -1,4 +1,4 @@
-export * from './l2_block_new.js';
+export * from './l2_block.js';
 export * from './l2_block_stream/index.js';
 export * from './in_block.js';
 export * from './body.js';

package/dest/block/{l2_block_new.d.ts → l2_block.d.ts}

@@ -6,12 +6,13 @@ import { z } from 'zod';
 import type { PrivateLog } from '../logs/private_log.js';
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
 import { BlockHeader } from '../tx/block_header.js';
+import type { BlockHash } from './block_hash.js';
 import { Body } from './body.js';
 import type { L2BlockInfo } from './l2_block_info.js';
 /**
  * An L2 block with a header and a body.
  */
-export declare class L2BlockNew {
+export declare class L2Block {
     /** Snapshot of archive tree after the block is applied. */
     archive: AppendOnlyTreeSnapshot;
     /** Header of the block. */
@@ -73,7 +74,7 @@ export declare class L2BlockNew {
         body?: any;
         checkpointNumber: string | number | bigint;
         indexWithinCheckpoint: string | number | bigint;
-    }>, L2BlockNew, {
+    }>, L2Block, {
         archive: {
             root: string;
             nextAvailableLeafIndex: string | number | bigint;
@@ -87,7 +88,7 @@ export declare class L2BlockNew {
      * Deserializes a block from a buffer
      * @returns A deserialized L2 block.
      */
-    static fromBuffer(buf: Buffer | BufferReader): L2BlockNew;
+    static fromBuffer(buf: Buffer | BufferReader): L2Block;
     /**
      * Serializes a block
      * @returns A serialized L2 block as a Buffer.
@@ -97,7 +98,7 @@ export declare class L2BlockNew {
      * Returns the block's hash (hash of block header).
      * @returns The block's hash.
      */
-    hash(): Promise<Fr>;
+    hash(): Promise<BlockHash>;
     /**
      * Checks if this block equals another block.
      * @param other - The other block to compare with.
@@ -106,7 +107,7 @@ export declare class L2BlockNew {
     equals(other: this): boolean;
     toBlobFields(): Fr[];
     toBlockBlobData(): BlockBlobData;
-    static empty(header?: BlockHeader): L2BlockNew;
+    static empty(header?: BlockHeader): L2Block;
     /**
      * Creates an L2 block containing random data.
      * @param l2BlockNum - The number of the L2 block.
@@ -122,7 +123,7 @@ export declare class L2BlockNew {
         txsPerBlock?: number;
         txOptions?: Partial<Parameters<typeof Body.random>[0]>;
         makeTxOptions?: (txIndex: number) => Partial<Parameters<typeof Body.random>[0]>;
-    } & Partial<Parameters<typeof BlockHeader.random>[0]>): Promise<L2BlockNew>;
+    } & Partial<Parameters<typeof BlockHeader.random>[0]>): Promise<L2Block>;
     /**
      * Returns stats used for logging.
      * @returns Stats on tx count, number, and log size and count.
@@ -139,4 +140,4 @@ export declare class L2BlockNew {
     getPrivateLogs(): PrivateLog[];
     toBlockInfo(): L2BlockInfo;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfYmxvY2tfbmV3LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2svbDJfYmxvY2tfbmV3LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLGFBQWEsRUFBdUIsTUFBTSwwQkFBMEIsQ0FBQztBQUNuRixPQUFPLEVBQ0wsV0FBVyxFQUNYLGdCQUFnQixFQUVoQixxQkFBcUIsRUFFckIsVUFBVSxFQUNYLE1BQU0saUNBQWlDLENBQUM7QUFDekMsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sRUFBRSxZQUFZLEVBQXFCLE1BQU0sNkJBQTZCLENBQUM7QUFFOUUsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUV4QixPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUN6RCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUMvRSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUNqQyxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQU90RDs7R0FFRztBQUNILHFCQUFhLFVBQVU7SUFFbkIsMkRBQTJEO0lBQ3BELE9BQU8sRUFBRSxzQkFBc0I7SUFDdEMsMkJBQTJCO0lBQ3BCLE1BQU0sRUFBRSxXQUFXO0lBQzFCLHFCQUFxQjtJQUNkLElBQUksRUFBRSxJQUFJO0lBQ2pCLDBEQUEwRDtJQUNuRCxnQkFBZ0IsRUFBRSxnQkFBZ0I7SUFDekMsZ0RBQWdEO0lBQ3pDLHFCQUFxQixFQUFFLHFCQUFxQjtJQVZyRDtJQUNFLDJEQUEyRDtJQUNwRCxPQUFPLEVBQUUsc0JBQXNCO0lBQ3RDLDJCQUEyQjtJQUNwQixNQUFNLEVBQUUsV0FBVztJQUMxQixxQkFBcUI7SUFDZCxJQUFJLEVBQUUsSUFBSTtJQUNqQiwwREFBMEQ7SUFDbkQsZ0JBQWdCLEVBQUUsZ0JBQWdCO0lBQ3pDLGdEQUFnRDtJQUN6QyxxQkFBcUIsRUFBRSxxQkFBcUIsRUFDakQ7SUFFSixJQUFJLE1BQU0sSUFBSSxXQUFXLENBRXhCO0lBRUQsSUFBSSxJQUFJLElBQUksVUFBVSxDQUVyQjtJQUVELElBQUksU0FBUyxJQUFJLE1BQU0sQ0FFdEI7SUFFRCxNQUFNLEtBQUssTUFBTTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztPQWFoQjtJQUVEOzs7T0FHRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsR0FBRyxFQUFFLE1BQU0sR0FBRyxZQUFZLGNBUzNDO0lBRUQ7OztPQUdHO0lBQ0gsUUFBUSw0QkFFUDtJQUVEOzs7T0FHRztJQUNJLElBQUksSUFBSSxPQUFPLENBQUMsRUFBRSxDQUFDLENBRXpCO0lBRUQ7Ozs7T0FJRztJQUNJLE1BQU0sQ0FBQyxLQUFLLEVBQUUsSUFBSSxHQUFHLE9BQU8sQ0FRbEM7SUFFTSxZQUFZLElBQUksRUFBRSxFQUFFLENBRzFCO0lBRU0sZUFBZSxJQUFJLGFBQWEsQ0FzQnRDO0lBRUQsTUFBTSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsRUFBRSxXQUFXLGNBUWhDO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDSCxPQUFhLE1BQU0sQ0FDakIsV0FBVyxFQUFFLFdBQVcsRUFDeEIsRUFDRSxnQkFBd0QsRUFDeEQscUJBQWdELEVBQ2hELFdBQWUsRUFDZixTQUFjLEVBQ2QsYUFBYSxFQUNiLEdBQUcsb0JBQW9CLEVBQ3hCLEdBQUU7UUFDRCxnQkFBZ0IsQ0FBQyxFQUFFLGdCQUFnQixDQUFDO1FBQ3BDLHFCQUFxQixDQUFDLEVBQUUscUJBQXFCLENBQUM7UUFDOUMsV0FBVyxDQUFDLEVBQUUsTUFBTSxDQUFDO1FBQ3JCLFNBQVMsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxVQUFVLENBQUMsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUN2RCxhQUFhLENBQUMsRUFBRSxDQUFDLE9BQU8sRUFBRSxNQUFNLEtBQUssT0FBTyxDQUFDLFVBQVUsQ0FBQyxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0tBQ2pGLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FBQyxPQUFPLFdBQVcsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBTSxHQUN6RCxPQUFPLENBQUMsVUFBVSxDQUFDLENBS3JCO0lBRUQ7OztPQUdHO0lBQ0gsUUFBUTs7Ozs7Ozs7TUFxQlA7SUFFRCxjQUFjLElBQUksVUFBVSxFQUFFLENBRTdCO0lBRUQsV0FBVyxJQUFJLFdBQVcsQ0FTekI7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfYmxvY2suZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ibG9jay9sMl9ibG9jay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxhQUFhLEVBQXVCLE1BQU0sMEJBQTBCLENBQUM7QUFDbkYsT0FBTyxFQUNMLFdBQVcsRUFDWCxnQkFBZ0IsRUFFaEIscUJBQXFCLEVBRXJCLFVBQVUsRUFDWCxNQUFNLGlDQUFpQyxDQUFDO0FBQ3pDLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsWUFBWSxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBRTlFLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDekQsT0FBTyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFDL0UsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ2pELE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDakMsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFdEQ7O0dBRUc7QUFDSCxxQkFBYSxPQUFPO0lBRWhCLDJEQUEyRDtJQUNwRCxPQUFPLEVBQUUsc0JBQXNCO0lBQ3RDLDJCQUEyQjtJQUNwQixNQUFNLEVBQUUsV0FBVztJQUMxQixxQkFBcUI7SUFDZCxJQUFJLEVBQUUsSUFBSTtJQUNqQiwwREFBMEQ7SUFDbkQsZ0JBQWdCLEVBQUUsZ0JBQWdCO0lBQ3pDLGdEQUFnRDtJQUN6QyxxQkFBcUIsRUFBRSxxQkFBcUI7SUFWckQ7SUFDRSwyREFBMkQ7SUFDcEQsT0FBTyxFQUFFLHNCQUFzQjtJQUN0QywyQkFBMkI7SUFDcEIsTUFBTSxFQUFFLFdBQVc7SUFDMUIscUJBQXFCO0lBQ2QsSUFBSSxFQUFFLElBQUk7SUFDakIsMERBQTBEO0lBQ25ELGdCQUFnQixFQUFFLGdCQUFnQjtJQUN6QyxnREFBZ0Q7SUFDekMscUJBQXFCLEVBQUUscUJBQXFCLEVBQ2pEO0lBRUosSUFBSSxNQUFNLElBQUksV0FBVyxDQUV4QjtJQUVELElBQUksSUFBSSxJQUFJLFVBQVUsQ0FFckI7SUFFRCxJQUFJLFNBQVMsSUFBSSxNQUFNLENBRXRCO0lBRUQsTUFBTSxLQUFLLE1BQU07Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7T0FhaEI7SUFFRDs7O09BR0c7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsWUFBWSxXQVMzQztJQUVEOzs7T0FHRztJQUNILFFBQVEsNEJBRVA7SUFFRDs7O09BR0c7SUFDSSxJQUFJLElBQUksT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUVoQztJQUVEOzs7O09BSUc7SUFDSSxNQUFNLENBQUMsS0FBSyxFQUFFLElBQUksR0FBRyxPQUFPLENBUWxDO0lBRU0sWUFBWSxJQUFJLEVBQUUsRUFBRSxDQUcxQjtJQUVNLGVBQWUsSUFBSSxhQUFhLENBc0J0QztJQUVELE1BQU0sQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLEVBQUUsV0FBVyxXQVFoQztJQUVEOzs7Ozs7OztPQVFHO0lBQ0gsT0FBYSxNQUFNLENBQ2pCLFdBQVcsRUFBRSxXQUFXLEVBQ3hCLEVBQ0UsZ0JBQXdELEVBQ3hELHFCQUFnRCxFQUNoRCxXQUFlLEVBQ2YsU0FBYyxFQUNkLGFBQWEsRUFDYixHQUFHLG9CQUFvQixFQUN4QixHQUFFO1FBQ0QsZ0JBQWdCLENBQUMsRUFBRSxnQkFBZ0IsQ0FBQztRQUNwQyxxQkFBcUIsQ0FBQyxFQUFFLHFCQUFxQixDQUFDO1FBQzlDLFdBQVcsQ0FBQyxFQUFFLE1BQU0sQ0FBQztRQUNyQixTQUFTLENBQUMsRUFBRSxPQUFPLENBQUMsVUFBVSxDQUFDLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDdkQsYUFBYSxDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUUsTUFBTSxLQUFLLE9BQU8sQ0FBQyxVQUFVLENBQUMsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztLQUNqRixHQUFHLE9BQU8sQ0FBQyxVQUFVLENBQUMsT0FBTyxXQUFXLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQU0sR0FDekQsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUtsQjtJQUVEOzs7T0FHRztJQUNILFFBQVE7Ozs7Ozs7O01BcUJQO0lBRUQsY0FBYyxJQUFJLFVBQVUsRUFBRSxDQUU3QjtJQUVELFdBQVcsSUFBSSxXQUFXLENBU3pCO0NBQ0YifQ==

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

@@ -0,0 +1 @@
+{"version":3,"file":"l2_block.d.ts","sourceRoot":"","sources":["../../src/block/l2_block.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAuB,MAAM,0BAA0B,CAAC;AACnF,OAAO,EACL,WAAW,EACX,gBAAgB,EAEhB,qBAAqB,EAErB,UAAU,EACX,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEtD;;GAEG;AACH,qBAAa,OAAO;IAEhB,2DAA2D;IACpD,OAAO,EAAE,sBAAsB;IACtC,2BAA2B;IACpB,MAAM,EAAE,WAAW;IAC1B,qBAAqB;IACd,IAAI,EAAE,IAAI;IACjB,0DAA0D;IACnD,gBAAgB,EAAE,gBAAgB;IACzC,gDAAgD;IACzC,qBAAqB,EAAE,qBAAqB;IAVrD;IACE,2DAA2D;IACpD,OAAO,EAAE,sBAAsB;IACtC,2BAA2B;IACpB,MAAM,EAAE,WAAW;IAC1B,qBAAqB;IACd,IAAI,EAAE,IAAI;IACjB,0DAA0D;IACnD,gBAAgB,EAAE,gBAAgB;IACzC,gDAAgD;IACzC,qBAAqB,EAAE,qBAAqB,EACjD;IAEJ,IAAI,MAAM,IAAI,WAAW,CAExB;IAED,IAAI,IAAI,IAAI,UAAU,CAErB;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAahB;IAED;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,WAS3C;IAED;;;OAGG;IACH,QAAQ,4BAEP;IAED;;;OAGG;IACI,IAAI,IAAI,OAAO,CAAC,SAAS,CAAC,CAEhC;IAED;;;;OAIG;IACI,MAAM,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO,CAQlC;IAEM,YAAY,IAAI,EAAE,EAAE,CAG1B;IAEM,eAAe,IAAI,aAAa,CAsBtC;IAED,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,WAAW,WAQhC;IAED;;;;;;;;OAQG;IACH,OAAa,MAAM,CACjB,WAAW,EAAE,WAAW,EACxB,EACE,gBAAwD,EACxD,qBAAgD,EAChD,WAAe,EACf,SAAc,EACd,aAAa,EACb,GAAG,oBAAoB,EACxB,GAAE;QACD,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,qBAAqB,CAAC,EAAE,qBAAqB,CAAC;QAC9C,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACvD,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACjF,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAM,GACzD,OAAO,CAAC,OAAO,CAAC,CAKlB;IAED;;;OAGG;IACH,QAAQ;;;;;;;;MAqBP;IAED,cAAc,IAAI,UAAU,EAAE,CAE7B;IAED,WAAW,IAAI,WAAW,CASzB;CACF"}

package/dest/block/{l2_block_new.js → l2_block.js}

@@ -6,13 +6,9 @@ import { z } from 'zod';
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
 import { BlockHeader } from '../tx/block_header.js';
 import { Body } from './body.js';
-// TODO(palla/mbps): Delete the existing `L2Block` class and rename this to `L2Block`.
-// TODO(palla/mbps): Consider moving the checkpointNumber and indexWithinCheckpoint to the header:
-// if the blockNumber is there, why not these as well? Consider whether they should be part of the
-// circuits structs though.
 /**
  * An L2 block with a header and a body.
- */ export class L2BlockNew {
+ */ export class L2Block {
     archive;
     header;
     body;
@@ -41,7 +37,7 @@ import { Body } from './body.js';
             body: Body.schema,
             checkpointNumber: CheckpointNumberSchema,
             indexWithinCheckpoint: IndexWithinCheckpointSchema
-        }).transform(({ archive, header, body, checkpointNumber, indexWithinCheckpoint })=>new L2BlockNew(archive, header, body, checkpointNumber, indexWithinCheckpoint));
+        }).transform(({ archive, header, body, checkpointNumber, indexWithinCheckpoint })=>new L2Block(archive, header, body, checkpointNumber, indexWithinCheckpoint));
     }
     /**
    * Deserializes a block from a buffer
@@ -53,7 +49,7 @@ import { Body } from './body.js';
         const body = reader.readObject(Body);
         const checkpointNumber = CheckpointNumber(reader.readNumber());
         const indexWithinCheckpoint = IndexWithinCheckpoint(reader.readNumber());
-        return new L2BlockNew(archive, header, body, checkpointNumber, indexWithinCheckpoint);
+        return new L2Block(archive, header, body, checkpointNumber, indexWithinCheckpoint);
     }
     /**
    * Serializes a block
@@ -102,7 +98,7 @@ import { Body } from './body.js';
         };
     }
     static empty(header) {
-        return new L2BlockNew(AppendOnlyTreeSnapshot.empty(), header ?? BlockHeader.empty(), Body.empty(), CheckpointNumber(0), IndexWithinCheckpoint(0));
+        return new L2Block(AppendOnlyTreeSnapshot.empty(), header ?? BlockHeader.empty(), Body.empty(), CheckpointNumber(0), IndexWithinCheckpoint(0));
     }
     /**
    * Creates an L2 block containing random data.
@@ -123,7 +119,7 @@ import { Body } from './body.js';
             makeTxOptions,
             ...txOptions
         });
-        return new L2BlockNew(archive, header, body, checkpointNumber, indexWithinCheckpoint);
+        return new L2Block(archive, header, body, checkpointNumber, indexWithinCheckpoint);
     }
     /**
    * Returns stats used for logging.