@aztec/stdlib 0.87.2 → 0.87.3-nightly.20250528

package/dest/vks/{vk_witness_data.js → vk_data.js}

@@ -4,28 +4,28 @@ import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex } from '@aztec/foundation/string';
 import { VerificationKeyData } from './verification_key.js';
-export class VkWitnessData {
+export class VkData {
     vk;
-    vkIndex;
-    vkPath;
+    leafIndex;
+    siblingPath;
     constructor(vk, /**
      * Index of the vk in the vk tree.
-     */ vkIndex, /**
+     */ leafIndex, /**
      * Sibling path of the vk in the vk tree.
-     */ vkPath){
+     */ siblingPath){
         this.vk = vk;
-        this.vkIndex = vkIndex;
-        this.vkPath = vkPath;
+        this.leafIndex = leafIndex;
+        this.siblingPath = siblingPath;
     }
     static empty() {
-        return new VkWitnessData(VerificationKeyData.empty(), 0, makeTuple(VK_TREE_HEIGHT, Fr.zero));
+        return new VkData(VerificationKeyData.empty(), 0, makeTuple(VK_TREE_HEIGHT, Fr.zero));
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new VkWitnessData(reader.readObject(VerificationKeyData), reader.readNumber(), reader.readArray(VK_TREE_HEIGHT, Fr));
+        return new VkData(reader.readObject(VerificationKeyData), reader.readNumber(), reader.readArray(VK_TREE_HEIGHT, Fr));
     }
     toBuffer() {
-        return serializeToBuffer(this.vk, this.vkIndex, this.vkPath);
+        return serializeToBuffer(this.vk, this.leafIndex, this.siblingPath);
     }
     toString() {
         return bufferToHex(this.toBuffer());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/stdlib",
-  "version": "0.87.2",
+  "version": "0.87.3-nightly.20250528",
   "type": "module",
   "inherits": [
     "../package.common.json",
@@ -67,12 +67,12 @@
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
   "dependencies": {
-    "@aztec/bb.js": "0.87.2",
-    "@aztec/blob-lib": "0.87.2",
-    "@aztec/constants": "0.87.2",
-    "@aztec/ethereum": "0.87.2",
-    "@aztec/foundation": "0.87.2",
-    "@aztec/noir-noirc_abi": "0.87.2",
+    "@aztec/bb.js": "0.87.3-nightly.20250528",
+    "@aztec/blob-lib": "0.87.3-nightly.20250528",
+    "@aztec/constants": "0.87.3-nightly.20250528",
+    "@aztec/ethereum": "0.87.3-nightly.20250528",
+    "@aztec/foundation": "0.87.3-nightly.20250528",
+    "@aztec/noir-noirc_abi": "0.87.3-nightly.20250528",
     "@google-cloud/storage": "^7.15.0",
     "axios": "^1.9.0",
     "json-stringify-deterministic": "1.0.12",

package/src/abi/abi.ts

@@ -533,3 +533,40 @@ export function getInitializer(
     return initializerNameOrArtifact;
   }
 }
+
+export function emptyFunctionAbi(): FunctionAbi {
+  return {
+    name: '',
+    functionType: FunctionType.PRIVATE,
+    isInternal: false,
+    isStatic: false,
+    parameters: [],
+    returnTypes: [],
+    errorTypes: {},
+    isInitializer: false,
+  };
+}
+
+export function emptyFunctionArtifact(): FunctionArtifact {
+  const abi = emptyFunctionAbi();
+  return {
+    ...abi,
+    bytecode: Buffer.from([]),
+    debugSymbols: '',
+  };
+}
+
+export function emptyContractArtifact(): ContractArtifact {
+  return {
+    name: '',
+    functions: [emptyFunctionArtifact()],
+    nonDispatchPublicFunctions: [emptyFunctionAbi()],
+    outputs: {
+      structs: {},
+      globals: {},
+    },
+    storageLayout: {},
+    fileMap: {},
+    notes: {},
+  };
+}

package/src/avm/avm.ts

@@ -5,6 +5,8 @@ import { schemas } from '@aztec/foundation/schemas';
 import { z } from 'zod';
 
 import { AztecAddress } from '../aztec-address/index.js';
+import { Gas } from '../gas/gas.js';
+import { GasSettings } from '../gas/gas_settings.js';
 import { PublicKeys } from '../keys/public_keys.js';
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
 import { MerkleTreeId } from '../trees/merkle_tree_id.js';
@@ -406,6 +408,7 @@ export class AvmTxHint {
   constructor(
     public readonly hash: string,
     public readonly globalVariables: GlobalVariables,
+    public readonly gasSettings: GasSettings,
     public readonly nonRevertibleAccumulatedData: {
       noteHashes: Fr[];
       nullifiers: Fr[];
@@ -421,6 +424,7 @@ export class AvmTxHint {
     // We need this to be null and not undefined because that's what
     // MessagePack expects for an std::optional.
     public readonly teardownEnqueuedCall: AvmEnqueuedCallHint | null,
+    public readonly gasUsedByPrivate: Gas,
   ) {}
 
   static async fromTx(tx: Tx): Promise<AvmTxHint> {
@@ -434,6 +438,7 @@ export class AvmTxHint {
     return new AvmTxHint(
       txHash.hash.toString(),
       tx.data.constants.historicalHeader.globalVariables,
+      tx.data.constants.txContext.gasSettings,
       {
         noteHashes: tx.data.forPublic!.nonRevertibleAccumulatedData.noteHashes.filter(x => !x.isZero()),
         nullifiers: tx.data.forPublic!.nonRevertibleAccumulatedData.nullifiers.filter(x => !x.isZero()),
@@ -468,6 +473,7 @@ export class AvmTxHint {
             teardownCallRequest.request.isStaticCall,
           )
         : null,
+      tx.data.gasUsed,
     );
   }
 
@@ -475,11 +481,13 @@ export class AvmTxHint {
     return new AvmTxHint(
       '',
       GlobalVariables.empty(),
+      GasSettings.empty(),
       { noteHashes: [], nullifiers: [] },
       { noteHashes: [], nullifiers: [] },
       [],
       [],
       null,
+      Gas.empty(),
     );
   }
 
@@ -488,6 +496,7 @@ export class AvmTxHint {
       .object({
         hash: z.string(),
         globalVariables: GlobalVariables.schema,
+        gasSettings: GasSettings.schema,
         nonRevertibleAccumulatedData: z.object({
           noteHashes: schemas.Fr.array(),
           nullifiers: schemas.Fr.array(),
@@ -499,25 +508,30 @@ export class AvmTxHint {
         setupEnqueuedCalls: AvmEnqueuedCallHint.schema.array(),
         appLogicEnqueuedCalls: AvmEnqueuedCallHint.schema.array(),
         teardownEnqueuedCall: AvmEnqueuedCallHint.schema.nullable(),
+        gasUsedByPrivate: Gas.schema,
       })
       .transform(
         ({
           hash,
           globalVariables,
+          gasSettings,
           nonRevertibleAccumulatedData,
           revertibleAccumulatedData,
           setupEnqueuedCalls,
           appLogicEnqueuedCalls,
           teardownEnqueuedCall,
+          gasUsedByPrivate,
         }) =>
           new AvmTxHint(
             hash,
             globalVariables,
+            gasSettings,
             nonRevertibleAccumulatedData,
             revertibleAccumulatedData,
             setupEnqueuedCalls,
             appLogicEnqueuedCalls,
             teardownEnqueuedCall,
+            gasUsedByPrivate,
           ),
       );
   }

package/src/avm/avm_accumulated_data.ts

@@ -185,3 +185,96 @@ export class AvmAccumulatedData {
 }`;
   }
 }
+
+/**
+ * Represents the lengths of arrays in AVM accumulated data
+ */
+export class AvmAccumulatedDataArrayLengths {
+  constructor(
+    /**
+     * Number of note hashes
+     */
+    public noteHashes: number,
+    /**
+     * Number of nullifiers
+     */
+    public nullifiers: number,
+    /**
+     * Number of L2 to L1 messages
+     */
+    public l2ToL1Msgs: number,
+    /**
+     * Number of public logs
+     */
+    public publicLogs: number,
+    /**
+     * Number of public data writes
+     */
+    public publicDataWrites: number,
+  ) {}
+
+  static get schema() {
+    return z
+      .object({
+        noteHashes: z.number(),
+        nullifiers: z.number(),
+        l2ToL1Msgs: z.number(),
+        publicLogs: z.number(),
+        publicDataWrites: z.number(),
+      })
+      .transform(
+        ({ noteHashes, nullifiers, l2ToL1Msgs, publicLogs, publicDataWrites }) =>
+          new AvmAccumulatedDataArrayLengths(noteHashes, nullifiers, l2ToL1Msgs, publicLogs, publicDataWrites),
+      );
+  }
+
+  static fromBuffer(buffer: Buffer | BufferReader) {
+    const reader = BufferReader.asReader(buffer);
+    return new AvmAccumulatedDataArrayLengths(
+      reader.readNumber(),
+      reader.readNumber(),
+      reader.readNumber(),
+      reader.readNumber(),
+      reader.readNumber(),
+    );
+  }
+
+  toBuffer() {
+    return serializeToBuffer(this.noteHashes, this.nullifiers, this.l2ToL1Msgs, this.publicLogs, this.publicDataWrites);
+  }
+
+  static fromFields(fields: Fr[] | FieldReader) {
+    const reader = FieldReader.asReader(fields);
+    return new AvmAccumulatedDataArrayLengths(
+      Number(reader.readField()),
+      Number(reader.readField()),
+      Number(reader.readField()),
+      Number(reader.readField()),
+      Number(reader.readField()),
+    );
+  }
+
+  toFields(): Fr[] {
+    return [
+      new Fr(this.noteHashes),
+      new Fr(this.nullifiers),
+      new Fr(this.l2ToL1Msgs),
+      new Fr(this.publicLogs),
+      new Fr(this.publicDataWrites),
+    ];
+  }
+
+  static empty() {
+    return new AvmAccumulatedDataArrayLengths(0, 0, 0, 0, 0);
+  }
+
+  [inspect.custom]() {
+    return `AvmAccumulatedDataArrayLengths {
+  noteHashes: ${this.noteHashes},
+  nullifiers: ${this.nullifiers},
+  l2ToL1Msgs: ${this.l2ToL1Msgs},
+  publicLogs: ${this.publicLogs},
+  publicDataWrites: ${this.publicDataWrites},
+}`;
+  }
+}

package/src/avm/avm_circuit_public_inputs.ts

@@ -14,10 +14,10 @@ import {
   PrivateToAvmAccumulatedData,
   PrivateToAvmAccumulatedDataArrayLengths,
 } from '../kernel/private_to_avm_accumulated_data.js';
-import { PublicCallRequest } from '../kernel/public_call_request.js';
+import { PublicCallRequest, PublicCallRequestArrayLengths } from '../kernel/public_call_request.js';
 import { GlobalVariables } from '../tx/global_variables.js';
 import { TreeSnapshots } from '../tx/tree_snapshots.js';
-import { AvmAccumulatedData } from './avm_accumulated_data.js';
+import { AvmAccumulatedData, AvmAccumulatedDataArrayLengths } from './avm_accumulated_data.js';
 import { serializeWithMessagePack } from './message_pack.js';
 
 // Note: the {from,to}{Buffer,Fields,String} methods are needed by AvmProofData and PublicBaseRollupInputs.
@@ -31,6 +31,7 @@ export class AvmCircuitPublicInputs {
     public startGasUsed: Gas,
     public gasSettings: GasSettings,
     public feePayer: AztecAddress,
+    public publicCallRequestArrayLengths: PublicCallRequestArrayLengths,
     public publicSetupCallRequests: Tuple<PublicCallRequest, typeof MAX_ENQUEUED_CALLS_PER_TX>,
     public publicAppLogicCallRequests: Tuple<PublicCallRequest, typeof MAX_ENQUEUED_CALLS_PER_TX>,
     public publicTeardownCallRequest: PublicCallRequest,
@@ -42,6 +43,7 @@ export class AvmCircuitPublicInputs {
     // Outputs.
     public endTreeSnapshots: TreeSnapshots,
     public endGasUsed: Gas,
+    public accumulatedDataArrayLengths: AvmAccumulatedDataArrayLengths,
     public accumulatedData: AvmAccumulatedData,
     public transactionFee: Fr,
     public reverted: boolean,
@@ -55,6 +57,7 @@ export class AvmCircuitPublicInputs {
         startGasUsed: Gas.schema,
         gasSettings: GasSettings.schema,
         feePayer: AztecAddress.schema,
+        publicCallRequestArrayLengths: PublicCallRequestArrayLengths.schema,
         publicSetupCallRequests: PublicCallRequest.schema.array().max(MAX_ENQUEUED_CALLS_PER_TX),
         publicAppLogicCallRequests: PublicCallRequest.schema.array().max(MAX_ENQUEUED_CALLS_PER_TX),
         publicTeardownCallRequest: PublicCallRequest.schema,
@@ -64,6 +67,7 @@ export class AvmCircuitPublicInputs {
         previousRevertibleAccumulatedData: PrivateToAvmAccumulatedData.schema,
         endTreeSnapshots: TreeSnapshots.schema,
         endGasUsed: Gas.schema,
+        accumulatedDataArrayLengths: AvmAccumulatedDataArrayLengths.schema,
         accumulatedData: AvmAccumulatedData.schema,
         transactionFee: schemas.Fr,
         reverted: z.boolean(),
@@ -75,6 +79,7 @@ export class AvmCircuitPublicInputs {
           startGasUsed,
           gasSettings,
           feePayer,
+          publicCallRequestArrayLengths,
           publicSetupCallRequests,
           publicAppLogicCallRequests,
           publicTeardownCallRequest,
@@ -84,6 +89,7 @@ export class AvmCircuitPublicInputs {
           previousRevertibleAccumulatedData,
           endTreeSnapshots,
           endGasUsed,
+          accumulatedDataArrayLengths,
           accumulatedData,
           transactionFee,
           reverted,
@@ -94,6 +100,7 @@ export class AvmCircuitPublicInputs {
             startGasUsed,
             gasSettings,
             feePayer,
+            publicCallRequestArrayLengths,
             assertLength(publicSetupCallRequests, MAX_ENQUEUED_CALLS_PER_TX),
             assertLength(publicAppLogicCallRequests, MAX_ENQUEUED_CALLS_PER_TX),
             publicTeardownCallRequest,
@@ -103,6 +110,7 @@ export class AvmCircuitPublicInputs {
             previousRevertibleAccumulatedData,
             endTreeSnapshots,
             endGasUsed,
+            accumulatedDataArrayLengths,
             accumulatedData,
             transactionFee,
             reverted,
@@ -118,6 +126,7 @@ export class AvmCircuitPublicInputs {
       reader.readObject(Gas),
       reader.readObject(GasSettings),
       reader.readObject(AztecAddress),
+      reader.readObject(PublicCallRequestArrayLengths),
       reader.readArray(MAX_ENQUEUED_CALLS_PER_TX, PublicCallRequest),
       reader.readArray(MAX_ENQUEUED_CALLS_PER_TX, PublicCallRequest),
       reader.readObject(PublicCallRequest),
@@ -127,6 +136,7 @@ export class AvmCircuitPublicInputs {
       reader.readObject(PrivateToAvmAccumulatedData),
       reader.readObject(TreeSnapshots),
       reader.readObject(Gas),
+      reader.readObject(AvmAccumulatedDataArrayLengths),
       reader.readObject(AvmAccumulatedData),
       reader.readObject(Fr),
       reader.readBoolean(),
@@ -140,6 +150,7 @@ export class AvmCircuitPublicInputs {
       this.startGasUsed,
       this.gasSettings,
       this.feePayer,
+      this.publicCallRequestArrayLengths,
       this.publicSetupCallRequests,
       this.publicAppLogicCallRequests,
       this.publicTeardownCallRequest,
@@ -149,6 +160,7 @@ export class AvmCircuitPublicInputs {
       this.previousRevertibleAccumulatedData,
       this.endTreeSnapshots,
       this.endGasUsed,
+      this.accumulatedDataArrayLengths,
       this.accumulatedData,
       this.transactionFee,
       this.reverted,
@@ -171,6 +183,7 @@ export class AvmCircuitPublicInputs {
       Gas.fromFields(reader),
       GasSettings.fromFields(reader),
       AztecAddress.fromFields(reader),
+      PublicCallRequestArrayLengths.fromFields(reader),
       reader.readArray(MAX_ENQUEUED_CALLS_PER_TX, PublicCallRequest),
       reader.readArray(MAX_ENQUEUED_CALLS_PER_TX, PublicCallRequest),
       PublicCallRequest.fromFields(reader),
@@ -180,6 +193,7 @@ export class AvmCircuitPublicInputs {
       PrivateToAvmAccumulatedData.fromFields(reader),
       TreeSnapshots.fromFields(reader),
       Gas.fromFields(reader),
+      AvmAccumulatedDataArrayLengths.fromFields(reader),
       AvmAccumulatedData.fromFields(reader),
       reader.readField(),
       reader.readBoolean(),
@@ -193,6 +207,7 @@ export class AvmCircuitPublicInputs {
       ...this.startGasUsed.toFields(),
       ...this.gasSettings.toFields(),
       this.feePayer,
+      ...this.publicCallRequestArrayLengths.toFields(),
       ...this.publicSetupCallRequests.map(request => request.toFields()),
       ...this.publicAppLogicCallRequests.map(request => request.toFields()),
       ...this.publicTeardownCallRequest.toFields(),
@@ -202,6 +217,7 @@ export class AvmCircuitPublicInputs {
       ...this.previousRevertibleAccumulatedData.toFields(),
       ...this.endTreeSnapshots.toFields(),
       ...this.endGasUsed.toFields(),
+      ...this.accumulatedDataArrayLengths.toFields(),
       ...this.accumulatedData.toFields(),
       this.transactionFee,
       this.reverted,
@@ -215,6 +231,7 @@ export class AvmCircuitPublicInputs {
       Gas.empty(),
       GasSettings.empty(),
       AztecAddress.zero(),
+      PublicCallRequestArrayLengths.empty(),
       makeTuple(MAX_ENQUEUED_CALLS_PER_TX, PublicCallRequest.empty),
       makeTuple(MAX_ENQUEUED_CALLS_PER_TX, PublicCallRequest.empty),
       PublicCallRequest.empty(),
@@ -224,6 +241,7 @@ export class AvmCircuitPublicInputs {
       PrivateToAvmAccumulatedData.empty(),
       TreeSnapshots.empty(),
       Gas.empty(),
+      AvmAccumulatedDataArrayLengths.empty(),
       AvmAccumulatedData.empty(),
       Fr.zero(),
       false,
@@ -241,6 +259,7 @@ export class AvmCircuitPublicInputs {
       startGasUsed: ${inspect(this.startGasUsed)},
       gasSettings: ${inspect(this.gasSettings)},
       feePayer: ${inspect(this.feePayer)},
+      publicCallRequestArrayLengths: ${inspect(this.publicCallRequestArrayLengths)},
       publicSetupCallRequests: [${this.publicSetupCallRequests
         .filter(x => !x.isEmpty())
         .map(h => inspect(h))
@@ -258,6 +277,7 @@ export class AvmCircuitPublicInputs {
       previousRevertibleAccumulatedData: ${inspect(this.previousRevertibleAccumulatedData)},
       endTreeSnapshots: ${inspect(this.endTreeSnapshots)},
       endGasUsed: ${inspect(this.endGasUsed)},
+      accumulatedDataArrayLengths: ${inspect(this.accumulatedDataArrayLengths)},
       accumulatedData: ${inspect(this.accumulatedData)},
       transactionFee: ${inspect(this.transactionFee)},
       reverted: ${this.reverted},

package/src/block/body.ts

@@ -87,9 +87,14 @@ export class Body {
 }`;
   }
 
-  static async random(txsPerBlock = 4, numPublicCallsPerTx = 3, numPublicLogsPerCall = 1) {
+  static async random(
+    txsPerBlock = 4,
+    numPublicCallsPerTx = 3,
+    numPublicLogsPerCall = 1,
+    maxEffects: number | undefined = undefined,
+  ) {
     const txEffects = await timesParallel(txsPerBlock, () =>
-      TxEffect.random(numPublicCallsPerTx, numPublicLogsPerCall),
+      TxEffect.random(numPublicCallsPerTx, numPublicLogsPerCall, maxEffects),
     );
 
     return new Body(txEffects);

package/src/block/index.ts

@@ -6,3 +6,4 @@ export * from './l2_block_number.js';
 export * from './l2_block_source.js';
 export * from './block_hash.js';
 export * from './published_l2_block.js';
+export * from './proposal/index.js';

package/src/block/l2_block.ts

@@ -86,8 +86,9 @@ export class L2Block {
     numPublicLogsPerCall = 1,
     inHash: Buffer | undefined = undefined,
     slotNumber: number | undefined = undefined,
+    maxEffects: number | undefined = undefined,
   ): Promise<L2Block> {
-    const body = await Body.random(txsPerBlock, numPublicCallsPerTx, numPublicLogsPerCall);
+    const body = await Body.random(txsPerBlock, numPublicCallsPerTx, numPublicLogsPerCall, maxEffects);
 
     return new L2Block(
       makeAppendOnlyTreeSnapshot(l2BlockNum + 1),

package/src/block/l2_block_source.ts

@@ -1,6 +1,6 @@
 import type { EthAddress } from '@aztec/foundation/eth-address';
+import type { TypedEventEmitter } from '@aztec/foundation/types';
 
-import type { EventEmitter } from 'events';
 import { z } from 'zod';
 
 import type { L1RollupConstants } from '../epoch-helpers/index.js';
@@ -127,7 +127,12 @@ export interface L2BlockSource {
  * L2BlockSource that emits events upon pending / proven chain changes.
  * see L2BlockSourceEvents for the events emitted.
  */
-export interface L2BlockSourceEventEmitter extends L2BlockSource, EventEmitter {}
+
+export type ArchiverEmitter = TypedEventEmitter<{
+  [L2BlockSourceEvents.L2PruneDetected]: (args: L2BlockSourceEvent) => void;
+  [L2BlockSourceEvents.L2BlockProven]: (args: L2BlockSourceEvent) => void;
+}>;
+export interface L2BlockSourceEventEmitter extends L2BlockSource, ArchiverEmitter {}
 
 /**
  * Identifier for L2 block tags.
@@ -171,10 +176,11 @@ export const L2TipsSchema = z.object({
 
 export enum L2BlockSourceEvents {
   L2PruneDetected = 'l2PruneDetected',
+  L2BlockProven = 'l2BlockProven',
 }
 
 export type L2BlockSourceEvent = {
-  type: 'l2PruneDetected';
+  type: 'l2PruneDetected' | 'l2BlockProven';
   blockNumber: bigint;
   slotNumber: bigint;
   epochNumber: bigint;

package/src/block/proposal/committee_attestation.ts

@@ -0,0 +1,70 @@
+import type { ViemCommitteeAttestation } from '@aztec/ethereum';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { Signature } from '@aztec/foundation/eth-signature';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+
+import { z } from 'zod';
+
+export { Signature };
+export { EthAddress };
+
+export class CommitteeAttestation {
+  constructor(
+    public readonly address: EthAddress,
+    public readonly signature: Signature,
+  ) {}
+
+  static get schema() {
+    return z
+      .object({
+        address: EthAddress.schema,
+        signature: Signature.schema,
+      })
+      .transform(({ address, signature }) => new CommitteeAttestation(address, signature));
+  }
+
+  // Create an empty attestation for an address that has not signed
+  static fromAddress(address: EthAddress): CommitteeAttestation {
+    return new CommitteeAttestation(address, Signature.empty());
+  }
+
+  // Create an attestation from an address and a signature
+  static fromAddressAndSignature(address: EthAddress, signature: Signature): CommitteeAttestation {
+    return new CommitteeAttestation(address, signature);
+  }
+
+  static fromViem(viem: ViemCommitteeAttestation): CommitteeAttestation {
+    return new CommitteeAttestation(EthAddress.fromString(viem.addr), Signature.fromViemSignature(viem.signature));
+  }
+
+  static fromBuffer(buffer: Buffer): CommitteeAttestation {
+    const reader = BufferReader.asReader(buffer);
+    const address = reader.readObject(EthAddress);
+    const signature = reader.readObject(Signature);
+    return new CommitteeAttestation(address, signature);
+  }
+
+  static random(): CommitteeAttestation {
+    // note: will be invalid
+    return new CommitteeAttestation(EthAddress.random(), Signature.random());
+  }
+
+  static empty(): CommitteeAttestation {
+    return new CommitteeAttestation(EthAddress.ZERO, Signature.empty());
+  }
+
+  toBuffer(): Buffer {
+    return serializeToBuffer([this.address, this.signature]);
+  }
+
+  equals(other: CommitteeAttestation): boolean {
+    return this.address.equals(other.address) && this.signature.equals(other.signature);
+  }
+
+  toViem(): ViemCommitteeAttestation {
+    return {
+      addr: this.address.toString(),
+      signature: this.signature.toViemSignature(),
+    };
+  }
+}

package/src/block/proposal/index.ts

@@ -0,0 +1 @@
+export * from './committee_attestation.js';

package/src/block/published_l2_block.ts

@@ -1,37 +1,51 @@
-import { Signature } from '@aztec/foundation/eth-signature';
+// Ignoring import issue to fix portable inferred type issue in zod schema
 import { schemas } from '@aztec/foundation/schemas';
-import { L2Block } from '@aztec/stdlib/block';
 
 import { z } from 'zod';
 
 import { BlockAttestation } from '../p2p/block_attestation.js';
 import { ConsensusPayload } from '../p2p/consensus_payload.js';
+import { L2Block } from './l2_block.js';
+import { CommitteeAttestation } from './proposal/committee_attestation.js';
 
-export type L1PublishedData = {
-  blockNumber: bigint;
-  timestamp: bigint;
-  blockHash: string;
-};
+export class L1PublishedData {
+  constructor(
+    public blockNumber: bigint,
+    public timestamp: bigint,
+    public blockHash: string,
+  ) {}
 
-export type PublishedL2Block = {
-  block: L2Block;
-  l1: L1PublishedData;
-  signatures: Signature[];
-};
+  static get schema() {
+    return z.object({
+      blockNumber: schemas.BigInt,
+      timestamp: schemas.BigInt,
+      blockHash: z.string(),
+    });
+  }
+}
+
+export class PublishedL2Block {
+  constructor(
+    public block: L2Block,
+    public l1: L1PublishedData,
+    public attestations: CommitteeAttestation[],
+  ) {}
 
-export const PublishedL2BlockSchema = z.object({
-  block: L2Block.schema,
-  l1: z.object({
-    blockNumber: schemas.BigInt,
-    timestamp: schemas.BigInt,
-    blockHash: z.string(),
-  }),
-  signatures: z.array(Signature.schema),
-});
+  static get schema() {
+    return z.object({
+      block: L2Block.schema,
+      l1: L1PublishedData.schema,
+      attestations: z.array(CommitteeAttestation.schema),
+    });
+  }
+}
 
 export function getAttestationsFromPublishedL2Block(block: PublishedL2Block) {
   const payload = ConsensusPayload.fromBlock(block.block);
-  return block.signatures
-    .filter(sig => !sig.isEmpty)
-    .map(signature => new BlockAttestation(block.block.header.globalVariables.blockNumber, payload, signature));
+  return block.attestations
+    .filter(attestation => !attestation.signature.isEmpty())
+    .map(
+      attestation =>
+        new BlockAttestation(block.block.header.globalVariables.blockNumber, payload, attestation.signature),
+    );
 }