@aztec/stdlib 0.0.1-commit.96bb3f7 → 0.0.1-commit.9d2bcf6d

package/dest/zkpassport/index.d.ts

@@ -1,14 +1,13 @@
 import { Buffer32 } from '@aztec/foundation/buffer';
 import { Fr } from '@aztec/foundation/curves/bn254';
 export type ViemZkPassportProofParams = {
+    version: `0x${string}`;
     proofVerificationData: {
         vkeyHash: `0x${string}`;
         proof: `0x${string}`;
         publicInputs: `0x${string}`[];
     };
-    commitments: {
-        committedInputs: `0x${string}`;
-    };
+    committedInputs: `0x${string}`;
     serviceConfig: {
         validityPeriodInSeconds: bigint;
         domain: string;
@@ -32,4 +31,4 @@ export declare class ZkPassportProofParams {
     static fromViem(params: ViemZkPassportProofParams): ZkPassportProofParams;
     toViem(): ViemZkPassportProofParams;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy96a3Bhc3Nwb3J0L2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUVwRCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFJcEQsTUFBTSxNQUFNLHlCQUF5QixHQUFHO0lBQ3RDLHFCQUFxQixFQUFFO1FBQ3JCLFFBQVEsRUFBRSxLQUFLLE1BQU0sRUFBRSxDQUFDO1FBQ3hCLEtBQUssRUFBRSxLQUFLLE1BQU0sRUFBRSxDQUFDO1FBQ3JCLFlBQVksRUFBRSxLQUFLLE1BQU0sRUFBRSxFQUFFLENBQUM7S0FDL0IsQ0FBQztJQUNGLFdBQVcsRUFBRTtRQUNYLGVBQWUsRUFBRSxLQUFLLE1BQU0sRUFBRSxDQUFDO0tBQ2hDLENBQUM7SUFDRixhQUFhLEVBQUU7UUFDYix1QkFBdUIsRUFBRSxNQUFNLENBQUM7UUFDaEMsTUFBTSxFQUFFLE1BQU0sQ0FBQztRQUNmLEtBQUssRUFBRSxNQUFNLENBQUM7UUFDZCxPQUFPLEVBQUUsT0FBTyxDQUFDO0tBQ2xCLENBQUM7Q0FDSCxDQUFDO0FBSUYscUJBQWEscUJBQXFCO0lBRXZCLE9BQU8sRUFBRSxPQUFPO0lBQ2hCLFFBQVEsRUFBRSxRQUFRO0lBQ2xCLEtBQUssRUFBRSxNQUFNO0lBQ2IsWUFBWSxFQUFFLEVBQUUsRUFBRTtJQUNsQixlQUFlLEVBQUUsTUFBTTtJQUN2Qix1QkFBdUIsRUFBRSxNQUFNO0lBQy9CLE1BQU0sRUFBRSxNQUFNO0lBQ2QsS0FBSyxFQUFFLE1BQU07SUFSdEIsWUFDUyxPQUFPLEVBQUUsT0FBTyxFQUNoQixRQUFRLEVBQUUsUUFBUSxFQUNsQixLQUFLLEVBQUUsTUFBTSxFQUNiLFlBQVksRUFBRSxFQUFFLEVBQUUsRUFDbEIsZUFBZSxFQUFFLE1BQU0sRUFDdkIsdUJBQXVCLEVBQUUsTUFBTSxFQUMvQixNQUFNLEVBQUUsTUFBTSxFQUNkLEtBQUssRUFBRSxNQUFNLEVBQ2xCO0lBRUosUUFBUSw0QkFjUDtJQUVELE1BQU0sQ0FBQyxNQUFNLDBCQWtCWjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0seUJBWS9CO0lBRUQsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLEVBQUUseUJBQXlCLHlCQVdoRDtJQUVELE1BQU0sSUFBSSx5QkFBeUIsQ0FpQmxDO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy96a3Bhc3Nwb3J0L2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUVwRCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFJcEQsTUFBTSxNQUFNLHlCQUF5QixHQUFHO0lBQ3RDLE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBRSxDQUFDO0lBQ3ZCLHFCQUFxQixFQUFFO1FBQ3JCLFFBQVEsRUFBRSxLQUFLLE1BQU0sRUFBRSxDQUFDO1FBQ3hCLEtBQUssRUFBRSxLQUFLLE1BQU0sRUFBRSxDQUFDO1FBQ3JCLFlBQVksRUFBRSxLQUFLLE1BQU0sRUFBRSxFQUFFLENBQUM7S0FDL0IsQ0FBQztJQUNGLGVBQWUsRUFBRSxLQUFLLE1BQU0sRUFBRSxDQUFDO0lBQy9CLGFBQWEsRUFBRTtRQUNiLHVCQUF1QixFQUFFLE1BQU0sQ0FBQztRQUNoQyxNQUFNLEVBQUUsTUFBTSxDQUFDO1FBQ2YsS0FBSyxFQUFFLE1BQU0sQ0FBQztRQUNkLE9BQU8sRUFBRSxPQUFPLENBQUM7S0FDbEIsQ0FBQztDQUNILENBQUM7QUFJRixxQkFBYSxxQkFBcUI7SUFFdkIsT0FBTyxFQUFFLE9BQU87SUFDaEIsUUFBUSxFQUFFLFFBQVE7SUFDbEIsS0FBSyxFQUFFLE1BQU07SUFDYixZQUFZLEVBQUUsRUFBRSxFQUFFO0lBQ2xCLGVBQWUsRUFBRSxNQUFNO0lBQ3ZCLHVCQUF1QixFQUFFLE1BQU07SUFDL0IsTUFBTSxFQUFFLE1BQU07SUFDZCxLQUFLLEVBQUUsTUFBTTtJQVJ0QixZQUNTLE9BQU8sRUFBRSxPQUFPLEVBQ2hCLFFBQVEsRUFBRSxRQUFRLEVBQ2xCLEtBQUssRUFBRSxNQUFNLEVBQ2IsWUFBWSxFQUFFLEVBQUUsRUFBRSxFQUNsQixlQUFlLEVBQUUsTUFBTSxFQUN2Qix1QkFBdUIsRUFBRSxNQUFNLEVBQy9CLE1BQU0sRUFBRSxNQUFNLEVBQ2QsS0FBSyxFQUFFLE1BQU0sRUFDbEI7SUFFSixRQUFRLDRCQWNQO0lBRUQsTUFBTSxDQUFDLE1BQU0sMEJBa0JaO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSx5QkFZL0I7SUFFRCxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRSx5QkFBeUIseUJBV2hEO0lBRUQsTUFBTSxJQUFJLHlCQUF5QixDQWlCbEM7Q0FDRiJ9

package/dest/zkpassport/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/zkpassport/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEpD,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAIpD,MAAM,MAAM,yBAAyB,GAAG;IACtC,qBAAqB,EAAE;QACrB,QAAQ,EAAE,KAAK,MAAM,EAAE,CAAC;QACxB,KAAK,EAAE,KAAK,MAAM,EAAE,CAAC;QACrB,YAAY,EAAE,KAAK,MAAM,EAAE,EAAE,CAAC;KAC/B,CAAC;IACF,WAAW,EAAE;QACX,eAAe,EAAE,KAAK,MAAM,EAAE,CAAC;KAChC,CAAC;IACF,aAAa,EAAE;QACb,uBAAuB,EAAE,MAAM,CAAC;QAChC,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,OAAO,CAAC;KAClB,CAAC;CACH,CAAC;AAIF,qBAAa,qBAAqB;IAEvB,OAAO,EAAE,OAAO;IAChB,QAAQ,EAAE,QAAQ;IAClB,KAAK,EAAE,MAAM;IACb,YAAY,EAAE,EAAE,EAAE;IAClB,eAAe,EAAE,MAAM;IACvB,uBAAuB,EAAE,MAAM;IAC/B,MAAM,EAAE,MAAM;IACd,KAAK,EAAE,MAAM;IARtB,YACS,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,EAAE,EAAE,EAClB,eAAe,EAAE,MAAM,EACvB,uBAAuB,EAAE,MAAM,EAC/B,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EAClB;IAEJ,QAAQ,4BAcP;IAED,MAAM,CAAC,MAAM,0BAkBZ;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,yBAY/B;IAED,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,yBAAyB,yBAWhD;IAED,MAAM,IAAI,yBAAyB,CAiBlC;CACF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/zkpassport/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEpD,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAIpD,MAAM,MAAM,yBAAyB,GAAG;IACtC,OAAO,EAAE,KAAK,MAAM,EAAE,CAAC;IACvB,qBAAqB,EAAE;QACrB,QAAQ,EAAE,KAAK,MAAM,EAAE,CAAC;QACxB,KAAK,EAAE,KAAK,MAAM,EAAE,CAAC;QACrB,YAAY,EAAE,KAAK,MAAM,EAAE,EAAE,CAAC;KAC/B,CAAC;IACF,eAAe,EAAE,KAAK,MAAM,EAAE,CAAC;IAC/B,aAAa,EAAE;QACb,uBAAuB,EAAE,MAAM,CAAC;QAChC,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,OAAO,CAAC;KAClB,CAAC;CACH,CAAC;AAIF,qBAAa,qBAAqB;IAEvB,OAAO,EAAE,OAAO;IAChB,QAAQ,EAAE,QAAQ;IAClB,KAAK,EAAE,MAAM;IACb,YAAY,EAAE,EAAE,EAAE;IAClB,eAAe,EAAE,MAAM;IACvB,uBAAuB,EAAE,MAAM;IAC/B,MAAM,EAAE,MAAM;IACd,KAAK,EAAE,MAAM;IARtB,YACS,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,EAAE,EAAE,EAClB,eAAe,EAAE,MAAM,EACvB,uBAAuB,EAAE,MAAM,EAC/B,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EAClB;IAEJ,QAAQ,4BAcP;IAED,MAAM,CAAC,MAAM,0BAkBZ;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,yBAY/B;IAED,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,yBAAyB,yBAWhD;IAED,MAAM,IAAI,yBAAyB,CAiBlC;CACF"}

package/dest/zkpassport/index.js

@@ -59,23 +59,23 @@ export class ZkPassportProofParams {
         return new ZkPassportProofParams(reader.readBoolean(), reader.readObject(Buffer32), reader.readBuffer(), reader.readVector(Fr), reader.readBuffer(), reader.readUInt256(), reader.readString(), reader.readString());
     }
     static fromViem(params) {
-        return new ZkPassportProofParams(params.serviceConfig.devMode, Buffer32.fromString(params.proofVerificationData.vkeyHash), Buffer.from(withoutHexPrefix(params.proofVerificationData.proof), 'hex'), params.proofVerificationData.publicInputs.map((input)=>Fr.fromString(input)), Buffer.from(withoutHexPrefix(params.commitments.committedInputs), 'hex'), params.serviceConfig.validityPeriodInSeconds, params.serviceConfig.domain, params.serviceConfig.scope);
+        return new ZkPassportProofParams(params.serviceConfig.devMode, Buffer32.fromString(params.proofVerificationData.vkeyHash), Buffer.from(withoutHexPrefix(params.proofVerificationData.proof), 'hex'), params.proofVerificationData.publicInputs.map((input)=>Fr.fromString(input)), Buffer.from(withoutHexPrefix(params.committedInputs), 'hex'), params.serviceConfig.validityPeriodInSeconds, params.serviceConfig.domain, params.serviceConfig.scope);
     }
     toViem() {
+        // Version is set to bytes32(0) as per zkpassport library convention
         return {
-            serviceConfig: {
-                devMode: this.devMode,
-                validityPeriodInSeconds: this.validityPeriodInSeconds,
-                domain: this.domain,
-                scope: this.scope
-            },
+            version: '0x0000000000000000000000000000000000000000000000000000000000000000',
             proofVerificationData: {
                 vkeyHash: this.vkeyHash.toString(),
                 proof: `0x${this.proof.toString('hex')}`,
                 publicInputs: this.publicInputs.map((input)=>input.toString())
             },
-            commitments: {
-                committedInputs: `0x${this.committedInputs.toString('hex')}`
+            committedInputs: `0x${this.committedInputs.toString('hex')}`,
+            serviceConfig: {
+                devMode: this.devMode,
+                validityPeriodInSeconds: this.validityPeriodInSeconds,
+                domain: this.domain,
+                scope: this.scope
             }
         };
     }

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@aztec/stdlib",
-  "version": "0.0.1-commit.96bb3f7",
+  "version": "0.0.1-commit.9d2bcf6d",
   "type": "module",
   "inherits": [
     "../package.common.json",
     "./package.local.json"
   ],
   "exports": {
+    "./deserialization": "./dest/deserialization/index.js",
     "./aztec-address": "./dest/aztec-address/index.js",
     "./abi": "./dest/abi/index.js",
     "./abi/function-selector": "./dest/abi/function_selector.js",
@@ -51,7 +52,8 @@
     "./epoch-helpers": "./dest/epoch-helpers/index.js",
     "./config": "./dest/config/index.js",
     "./testing/jest": "./dest/tests/jest.js",
-    "./database-version": "./dest/database-version/index.js",
+    "./database-version/version": "./dest/database-version/database_version.js",
+    "./database-version/manager": "./dest/database-version/version_manager.js",
     "./validators": "./dest/validators/index.js",
     "./file-store": "./dest/file-store/index.js",
     "./snapshots": "./dest/snapshots/index.js",
@@ -69,7 +71,7 @@
     "tsconfig": "./tsconfig.json"
   },
   "scripts": {
-    "build": "yarn clean && yarn generate && tsgo -b",
+    "build": "yarn clean && yarn generate && ../scripts/tsc.sh",
     "generate": "./scripts/copy-contracts.sh",
     "build:dev": "../scripts/tsc.sh --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
@@ -77,13 +79,14 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.892.0",
-    "@aztec/bb.js": "0.0.1-commit.96bb3f7",
-    "@aztec/blob-lib": "0.0.1-commit.96bb3f7",
-    "@aztec/constants": "0.0.1-commit.96bb3f7",
-    "@aztec/ethereum": "0.0.1-commit.96bb3f7",
-    "@aztec/foundation": "0.0.1-commit.96bb3f7",
-    "@aztec/l1-artifacts": "0.0.1-commit.96bb3f7",
-    "@aztec/noir-noirc_abi": "0.0.1-commit.96bb3f7",
+    "@aztec/bb.js": "0.0.1-commit.9d2bcf6d",
+    "@aztec/blob-lib": "0.0.1-commit.9d2bcf6d",
+    "@aztec/constants": "0.0.1-commit.9d2bcf6d",
+    "@aztec/ethereum": "0.0.1-commit.9d2bcf6d",
+    "@aztec/foundation": "0.0.1-commit.9d2bcf6d",
+    "@aztec/l1-artifacts": "0.0.1-commit.9d2bcf6d",
+    "@aztec/noir-noirc_abi": "0.0.1-commit.9d2bcf6d",
+    "@aztec/validator-ha-signer": "0.0.1-commit.9d2bcf6d",
     "@google-cloud/storage": "^7.15.0",
     "axios": "^1.12.0",
     "json-stringify-deterministic": "1.0.12",
@@ -108,7 +111,7 @@
     "@types/lodash.times": "^4.3.9",
     "@types/node": "^22.15.17",
     "@types/pako": "^2.0.3",
-    "@typescript/native-preview": "7.0.0-dev.20251126.1",
+    "@typescript/native-preview": "7.0.0-dev.20260113.1",
     "eslint": "^9.26.0",
     "jest": "^30.0.0",
     "jest-mock-extended": "^4.0.0",

package/src/abi/utils.ts

@@ -49,6 +49,23 @@ export function isWrappedFieldStruct(abiType: AbiType) {
   );
 }
 
+/**
+ * Returns whether the ABI type is a PublicKeys struct from Aztec.nr.
+ * @param abiType - Type to check.
+ * @returns A boolean indicating whether the ABI type is a PublicKeys struct.
+ */
+export function isPublicKeysStruct(abiType: AbiType) {
+  return (
+    abiType.kind === 'struct' &&
+    abiType.path === 'aztec::protocol_types::public_keys::PublicKeys' &&
+    abiType.fields.length === 4 &&
+    abiType.fields[0].name === 'npk_m' &&
+    abiType.fields[1].name === 'ivpk_m' &&
+    abiType.fields[2].name === 'ovpk_m' &&
+    abiType.fields[3].name === 'tpk_m'
+  );
+}
+
 /**
  * Returns whether the ABI type is a BoundedVec struct from Noir's std::collections::bounded_vec.
  * @param abiType - Type to check.

package/src/block/block_hash.ts

@@ -1,44 +1,45 @@
-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 { schemas } from '../schemas/schemas.js';
+import { inspect } from 'util';
+
+import { hexSchemaFor } from '../schemas/schemas.js';
+
+const BLOCK_HASH_BRAND = Symbol.for('aztec.BlockHash');
 
 /** Hash of an L2 block. */
-export class L2BlockHash extends Buffer32 {
-  constructor(
-    /** The buffer containing the hash. */
-    hash: Buffer,
-  ) {
-    super(hash);
-  }
+export class BlockHash extends Fr {
+  readonly [BLOCK_HASH_BRAND] = true as const;
 
-  static override random() {
-    return new L2BlockHash(Fr.random().toBuffer());
+  constructor(hash: Fr) {
+    super(hash);
   }
 
-  static override fromNumber(num: number): L2BlockHash {
-    return new L2BlockHash(super.fromNumber(num).toBuffer());
+  override [inspect.custom]() {
+    return `BlockHash<${this.toString()}>`;
   }
 
-  static override fromBuffer(buffer: Buffer | BufferReader) {
-    const reader = BufferReader.asReader(buffer);
-    return new L2BlockHash(reader.readBytes(L2BlockHash.SIZE));
+  toFr(): Fr {
+    return new Fr(this.toBigInt());
   }
 
-  static override fromString(str: string): Buffer32 {
-    return new L2BlockHash(super.fromString(str).toBuffer());
+  /**
+   * Type guard that checks if a value is a BlockHash instance.
+   * Uses Symbol.for to ensure cross-module compatibility.
+   */
+  static isBlockHash(value: unknown): value is BlockHash {
+    return typeof value === 'object' && value !== null && BLOCK_HASH_BRAND in value;
   }
 
-  static get schema() {
-    return schemas.BufferHex.transform(value => new L2BlockHash(value));
+  static override random() {
+    return new BlockHash(Fr.random());
   }
 
-  static zero() {
-    return new L2BlockHash(Buffer32.ZERO.toBuffer());
+  static override fromString(str: string): BlockHash {
+    return new BlockHash(Fr.fromString(str));
   }
 
-  static override fromField(hash: Fr) {
-    return new L2BlockHash(hash.toBuffer());
+  static override get schema() {
+    return hexSchemaFor(BlockHash) as ZodFor<BlockHash>;
   }
 }

package/src/block/block_parameter.ts

@@ -2,7 +2,9 @@ import { BlockNumberSchema } from '@aztec/foundation/branded-types';
 
 import { z } from 'zod';
 
-export const BlockParameterSchema = z.union([BlockNumberSchema, z.literal('latest')]);
+import { BlockHash } from './block_hash.js';
 
-/** Block parameter - either a specific BlockNumber or 'latest' */
+export const BlockParameterSchema = z.union([BlockHash.schema, BlockNumberSchema, z.literal('latest')]);
+
+/** Block parameter - either a specific BlockNumber, block hash (BlockHash), or 'latest' */
 export type BlockParameter = z.infer<typeof BlockParameterSchema>;

package/src/block/body.ts

@@ -5,6 +5,7 @@ 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 type { ZodFor } from '../schemas/index.js';
 import { TxEffect } from '../tx/tx_effect.js';
 
@@ -40,7 +41,7 @@ export class Body {
   static fromBuffer(buf: Buffer | BufferReader) {
     const reader = BufferReader.asReader(buf);
 
-    return new this(reader.readVector(TxEffect));
+    return new this(reader.readVector(TxEffect, MAX_TX_EFFECTS_PER_BODY));
   }
 
   /**

package/src/block/checkpointed_l2_block.ts

@@ -5,9 +5,9 @@ import type { FieldsOf } from '@aztec/foundation/types';
 
 import { z } from 'zod';
 
-import { L1PublishedData, PublishedCheckpoint } from '../checkpoint/published_checkpoint.js';
+import { L1PublishedData } from '../checkpoint/published_checkpoint.js';
+import { MAX_BLOCK_HASH_STRING_LENGTH, MAX_COMMITTEE_SIZE } from '../deserialization/index.js';
 import { L2Block } from './l2_block.js';
-import { L2BlockNew } from './l2_block_new.js';
 import { CommitteeAttestation } from './proposal/committee_attestation.js';
 
 /**
@@ -16,7 +16,7 @@ import { CommitteeAttestation } from './proposal/committee_attestation.js';
 export class CheckpointedL2Block {
   constructor(
     public checkpointNumber: CheckpointNumber,
-    public block: L2BlockNew,
+    public block: L2Block,
     public l1: L1PublishedData,
     public attestations: CommitteeAttestation[],
   ) {}
@@ -24,7 +24,7 @@ export class CheckpointedL2Block {
     return z
       .object({
         checkpointNumber: CheckpointNumberSchema,
-        block: L2BlockNew.schema,
+        block: L2Block.schema,
         l1: L1PublishedData.schema,
         attestations: z.array(CommitteeAttestation.schema),
       })
@@ -34,11 +34,11 @@ export class CheckpointedL2Block {
   static fromBuffer(bufferOrReader: Buffer | BufferReader): CheckpointedL2Block {
     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();
+    const l1BlockHash = reader.readString(MAX_BLOCK_HASH_STRING_LENGTH);
     const l1Timestamp = reader.readBigInt();
-    const attestations = reader.readVector(CommitteeAttestation);
+    const attestations = reader.readVector(CommitteeAttestation, MAX_COMMITTEE_SIZE);
     return new CheckpointedL2Block(
       CheckpointNumber(checkpointNumber),
       block,
@@ -58,6 +58,7 @@ export class CheckpointedL2Block {
 
   public toBuffer(): Buffer {
     return serializeToBuffer(
+      this.checkpointNumber,
       this.block,
       this.l1.blockNumber,
       this.l1.blockHash,
@@ -67,54 +68,3 @@ export class CheckpointedL2Block {
     );
   }
 }
-
-export class PublishedL2Block {
-  constructor(
-    public block: L2Block,
-    public l1: L1PublishedData,
-    public attestations: CommitteeAttestation[],
-  ) {}
-
-  static get schema() {
-    return z
-      .object({
-        block: L2Block.schema,
-        l1: L1PublishedData.schema,
-        attestations: z.array(CommitteeAttestation.schema),
-      })
-      .transform(obj => PublishedL2Block.fromFields(obj));
-  }
-
-  static fromBuffer(bufferOrReader: Buffer | BufferReader): PublishedL2Block {
-    const reader = BufferReader.asReader(bufferOrReader);
-    const block = reader.readObject(L2Block);
-    const l1BlockNumber = reader.readBigInt();
-    const l1BlockHash = reader.readString();
-    const l1Timestamp = reader.readBigInt();
-    const attestations = reader.readVector(CommitteeAttestation);
-    return new PublishedL2Block(block, new L1PublishedData(l1BlockNumber, l1Timestamp, l1BlockHash), attestations);
-  }
-
-  static fromFields(fields: FieldsOf<PublishedL2Block>) {
-    return new PublishedL2Block(fields.block, fields.l1, fields.attestations);
-  }
-
-  public toBuffer(): Buffer {
-    return serializeToBuffer(
-      this.block,
-      this.l1.blockNumber,
-      this.l1.blockHash,
-      this.l1.timestamp,
-      this.attestations.length,
-      this.attestations,
-    );
-  }
-
-  public toPublishedCheckpoint() {
-    return new PublishedCheckpoint(this.block.toCheckpoint(), this.l1, this.attestations);
-  }
-
-  static fromPublishedCheckpoint(checkpoint: PublishedCheckpoint) {
-    return new PublishedL2Block(L2Block.fromCheckpoint(checkpoint.checkpoint), checkpoint.l1, checkpoint.attestations);
-  }
-}

package/src/block/in_block.ts

@@ -2,12 +2,12 @@ import { BlockNumber, BlockNumberSchema } from '@aztec/foundation/branded-types'
 
 import { type ZodTypeAny, z } from 'zod';
 
-import { L2BlockHash } from './block_hash.js';
+import { BlockHash } from './block_hash.js';
 import type { L2Block } from './l2_block.js';
 
 export type InBlock = {
   l2BlockNumber: BlockNumber;
-  l2BlockHash: L2BlockHash;
+  l2BlockHash: BlockHash;
 };
 
 // Note: If you expand this type with indexInBlock, then delete `IndexedTxEffect` and use this type instead.
@@ -18,7 +18,7 @@ export type DataInBlock<T> = {
 export function randomInBlock(): InBlock {
   return {
     l2BlockNumber: BlockNumber(Math.floor(Math.random() * 1000)),
-    l2BlockHash: L2BlockHash.random(),
+    l2BlockHash: BlockHash.random(),
   };
 }
 
@@ -33,14 +33,14 @@ export async function wrapDataInBlock<T>(data: T, block: L2Block): Promise<DataI
   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,
   });
 }
 

package/src/block/index.ts

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