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

package/src/p2p/block_attestation.ts

@@ -1,3 +1,4 @@
+import { SlotNumber } from '@aztec/foundation/branded-types';
 import { Buffer32 } from '@aztec/foundation/buffer';
 import { keccak256, tryRecoverAddress } from '@aztec/foundation/crypto';
 import type { EthAddress } from '@aztec/foundation/eth-address';
@@ -62,7 +63,7 @@ export class BlockAttestation extends Gossipable {
     return this.payload.archive;
   }
 
-  get slotNumber(): Fr {
+  get slotNumber(): SlotNumber {
     return this.payload.header.slotNumber;
   }
 

package/src/p2p/block_proposal.ts

@@ -1,3 +1,4 @@
+import { SlotNumber } from '@aztec/foundation/branded-types';
 import { Buffer32 } from '@aztec/foundation/buffer';
 import { keccak256, tryRecoverAddress } from '@aztec/foundation/crypto';
 import type { EthAddress } from '@aztec/foundation/eth-address';
@@ -65,13 +66,13 @@ export class BlockProposal extends Gossipable {
     return this.payload.archive;
   }
 
-  get slotNumber(): Fr {
+  get slotNumber(): SlotNumber {
     return this.payload.header.slotNumber;
   }
 
   toBlockInfo(): Omit<L2BlockInfo, 'blockNumber'> {
     return {
-      slotNumber: this.slotNumber.toNumber(),
+      slotNumber: this.slotNumber,
       lastArchive: this.payload.header.lastArchiveRoot,
       timestamp: this.payload.header.timestamp,
       archive: this.archive,

package/src/p2p/consensus_payload.ts

@@ -8,8 +8,8 @@ import { encodeAbiParameters, parseAbiParameters } from 'viem';
 import { z } from 'zod';
 
 import type { L2Block } from '../block/l2_block.js';
+import type { Checkpoint } from '../checkpoint/checkpoint.js';
 import { CheckpointHeader } from '../rollup/checkpoint_header.js';
-import { StateReference } from '../tx/state_reference.js';
 import type { Signable, SignatureDomainSeparator } from './signature_utils.js';
 
 export class ConsensusPayload implements Signable {
@@ -20,8 +20,6 @@ export class ConsensusPayload implements Signable {
     public readonly header: CheckpointHeader,
     /** The archive root after the block is added */
     public readonly archive: Fr,
-    /** The state reference after the block is added */
-    public readonly stateReference: StateReference,
   ) {}
 
   static get schema() {
@@ -29,13 +27,12 @@ export class ConsensusPayload implements Signable {
       .object({
         header: CheckpointHeader.schema,
         archive: schemas.Fr,
-        stateReference: StateReference.schema,
       })
-      .transform(obj => new ConsensusPayload(obj.header, obj.archive, obj.stateReference));
+      .transform(obj => new ConsensusPayload(obj.header, obj.archive));
   }
 
   static getFields(fields: FieldsOf<ConsensusPayload>) {
-    return [fields.header, fields.archive, fields.stateReference] as const;
+    return [fields.header, fields.archive] as const;
   }
 
   getPayloadToSign(domainSeparator: SignatureDomainSeparator): Buffer {
@@ -43,59 +40,53 @@ export class ConsensusPayload implements Signable {
       'uint8, ' + //domainSeperator
         '(' +
         'bytes32, ' + // archive
-        '((bytes32,uint32),((bytes32,uint32),(bytes32,uint32),(bytes32,uint32))), ' + // stateReference
         '(int256), ' + // oracleInput
         'bytes32' + // headerHash
         ')',
     );
     const archiveRoot = this.archive.toString();
-    const stateReference = this.stateReference.toAbi();
 
     const headerHash = this.header.hash().toString();
     const encodedData = encodeAbiParameters(abi, [
       domainSeparator,
-      [archiveRoot, stateReference, [0n] /* @todo See #9963 */, headerHash],
+      [archiveRoot, [0n] /* @todo See #9963 */, headerHash],
     ] as const);
 
     return hexToBuffer(encodedData);
   }
 
   toBuffer(): Buffer {
-    return serializeToBuffer([this.header, this.archive, this.stateReference]);
+    return serializeToBuffer([this.header, this.archive]);
   }
 
   public equals(other: ConsensusPayload): boolean {
-    return (
-      this.header.equals(other.header) &&
-      this.archive.equals(other.archive) &&
-      this.stateReference.equals(other.stateReference)
-    );
+    return this.header.equals(other.header) && this.archive.equals(other.archive);
   }
 
   static fromBuffer(buf: Buffer | BufferReader): ConsensusPayload {
     const reader = BufferReader.asReader(buf);
-    const payload = new ConsensusPayload(
-      reader.readObject(CheckpointHeader),
-      reader.readObject(Fr),
-      reader.readObject(StateReference),
-    );
+    const payload = new ConsensusPayload(reader.readObject(CheckpointHeader), reader.readObject(Fr));
     return payload;
   }
 
   static fromFields(fields: FieldsOf<ConsensusPayload>): ConsensusPayload {
-    return new ConsensusPayload(fields.header, fields.archive, fields.stateReference);
+    return new ConsensusPayload(fields.header, fields.archive);
   }
 
   static fromBlock(block: L2Block): ConsensusPayload {
-    return new ConsensusPayload(block.header.toCheckpointHeader(), block.archive.root, block.header.state);
+    return new ConsensusPayload(block.header.toCheckpointHeader(), block.archive.root);
+  }
+
+  static fromCheckpoint(checkpoint: Checkpoint): ConsensusPayload {
+    return new ConsensusPayload(checkpoint.header, checkpoint.archive.root);
   }
 
   static empty(): ConsensusPayload {
-    return new ConsensusPayload(CheckpointHeader.empty(), Fr.ZERO, StateReference.empty());
+    return new ConsensusPayload(CheckpointHeader.empty(), Fr.ZERO);
   }
 
   static random(): ConsensusPayload {
-    return new ConsensusPayload(CheckpointHeader.random(), Fr.random(), StateReference.random());
+    return new ConsensusPayload(CheckpointHeader.random(), Fr.random());
   }
 
   /**
@@ -115,11 +106,10 @@ export class ConsensusPayload implements Signable {
     return {
       header: this.header.toInspect(),
       archive: this.archive.toString(),
-      stateReference: this.stateReference.toInspect(),
     };
   }
 
   toString() {
-    return `header: ${this.header.toString()}, archive: ${this.archive.toString()}, stateReference: ${this.stateReference.l1ToL2MessageTree.root.toString()}`;
+    return `header: ${this.header.toString()}, archive: ${this.archive.toString()}}`;
   }
 }

package/src/p2p/gossipable.ts

@@ -1,23 +1,32 @@
 import { Buffer32 } from '@aztec/foundation/buffer';
-import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { BufferReader, bigintToUInt64BE, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import type { TopicType } from './topic_type.js';
 
 export class P2PMessage {
-  constructor(public readonly payload: Buffer) {}
+  constructor(
+    public readonly payload: Buffer,
+    public readonly timestamp?: Date,
+  ) {}
 
-  static fromGossipable(message: Gossipable): P2PMessage {
-    return new P2PMessage(message.toBuffer());
+  static fromGossipable(message: Gossipable, instrumentMessages = false): P2PMessage {
+    return new P2PMessage(message.toBuffer(), instrumentMessages ? new Date() : undefined);
   }
 
-  static fromMessageData(messageData: Buffer): P2PMessage {
+  static fromMessageData(messageData: Buffer, instrumentMessages = false): P2PMessage {
     const reader = new BufferReader(messageData);
+    const timestamp = instrumentMessages ? new Date(Number(reader.readUInt64())) : undefined;
     const payload = reader.readBuffer();
-    return new P2PMessage(payload);
+    return new P2PMessage(payload, timestamp);
   }
 
   toMessageData(): Buffer {
-    return serializeToBuffer([serializeToBuffer(this.payload.length, this.payload)]);
+    const arr: Buffer[] = [];
+    if (this.timestamp) {
+      arr.push(bigintToUInt64BE(BigInt(this.timestamp.getTime())));
+    }
+    arr.push(serializeToBuffer(this.payload.length, this.payload));
+    return serializeToBuffer(arr);
   }
 }
 
@@ -35,7 +44,7 @@ export abstract class Gossipable {
    * A digest of the message information **used for logging only**.
    * The identifier used for deduplication is `getMsgIdFn` as defined in `encoding.ts` which is a hash over topic and data.
    */
-  async p2pMessageIdentifier(): Promise<Buffer32> {
+  async p2pMessageLoggingIdentifier(): Promise<Buffer32> {
     if (this.cachedId) {
       return this.cachedId;
     }

package/src/rollup/block_headers_hash.ts

@@ -0,0 +1,12 @@
+import { Fr } from '@aztec/foundation/fields';
+import { computeUnbalancedPoseidonRoot } from '@aztec/foundation/trees';
+
+import type { BlockHeader } from '../tx/block_header.js';
+
+export async function computeBlockHeadersHash(blockHeaders: BlockHeader[]): Promise<Fr> {
+  const blockHeaderHashes = await Promise.all(blockHeaders.map(header => header.hash()));
+  // Must match the implementation in merge_block_rollups.nr, with the **wonky** rollup structure
+  // (see validate_consecutive_block_rollups.nr > assert_rollups_filled_greedily.nr).
+  const blockHeadersHash = await computeUnbalancedPoseidonRoot(blockHeaderHashes.map(hash => hash.toBuffer()));
+  return Fr.fromBuffer(blockHeadersHash);
+}

package/src/rollup/block_rollup_public_inputs.ts

@@ -50,6 +50,12 @@ export class BlockRollupPublicInputs {
      * Timestamp of the last block in this block range.
      */
     public endTimestamp: UInt64,
+    /**
+     * Hash of the headers of all blocks in this block range. It will be combined with the `blockHeadersHash` from
+     * other blocks in the same checkpoint to form a wonky tree. The root of that tree becomes the final hash stored in
+     * the checkpoint header, enabling validation of the blocks included in a checkpoint given their headers.
+     */
+    public blockHeadersHash: Fr,
     /**
      * SHA256 hash of l1 to l2 messages.
      */
@@ -84,6 +90,7 @@ export class BlockRollupPublicInputs {
       Fr.fromBuffer(reader),
       Fr.fromBuffer(reader),
       Fr.fromBuffer(reader),
+      Fr.fromBuffer(reader),
     );
   }
 
@@ -98,6 +105,7 @@ export class BlockRollupPublicInputs {
       this.endSpongeBlob,
       bigintToUInt64BE(this.startTimestamp),
       bigintToUInt64BE(this.endTimestamp),
+      this.blockHeadersHash,
       this.inHash,
       this.outHash,
       this.accumulatedFees,

package/src/rollup/block_root_rollup_private_inputs.ts

@@ -1,4 +1,3 @@
-import { SpongeBlob } from '@aztec/blob-lib/types';
 import { ARCHIVE_HEIGHT, L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import { bufferSchemaFor } from '@aztec/foundation/schemas';
@@ -157,11 +156,6 @@ export class BlockRootEmptyTxFirstRollupPrivateInputs {
      * The constants of the checkpoint.
      */
     public constants: CheckpointConstantData,
-    /**
-     * The start sponge blob of this block. No data has been absorbed into it yet, since it's the first block. But the
-     * number of expected fields must be set to the total number of fields in the entire checkpoint.
-     */
-    public startSpongeBlob: SpongeBlob,
     /**
      * The timestamp of this block.
      */
@@ -186,7 +180,6 @@ export class BlockRootEmptyTxFirstRollupPrivateInputs {
       fields.previousArchive,
       fields.previousState,
       fields.constants,
-      fields.startSpongeBlob,
       fields.timestamp,
       fields.newL1ToL2MessageSubtreeRootSiblingPath,
       fields.newArchiveSiblingPath,
@@ -199,7 +192,6 @@ export class BlockRootEmptyTxFirstRollupPrivateInputs {
       this.previousArchive,
       this.previousState,
       this.constants,
-      this.startSpongeBlob,
       bigintToUInt64BE(this.timestamp),
       this.newL1ToL2MessageSubtreeRootSiblingPath,
       this.newArchiveSiblingPath,
@@ -213,7 +205,6 @@ export class BlockRootEmptyTxFirstRollupPrivateInputs {
       AppendOnlyTreeSnapshot.fromBuffer(reader),
       StateReference.fromBuffer(reader),
       CheckpointConstantData.fromBuffer(reader),
-      SpongeBlob.fromBuffer(reader),
       reader.readUInt64(),
       reader.readArray(L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH, Fr),
       reader.readArray(ARCHIVE_HEIGHT, Fr),

package/src/rollup/checkpoint_constant_data.ts

@@ -1,8 +1,11 @@
+import { SlotNumber } from '@aztec/foundation/branded-types';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
 
+import { inspect } from 'util';
+
 import { AztecAddress } from '../aztec-address/index.js';
 import { GasFees } from '../gas/gas_fees.js';
 
@@ -22,7 +25,7 @@ export class CheckpointConstantData {
     /** Identifier of the prover. */
     public proverId: Fr,
     /** Slot number of the checkpoint. */
-    public slotNumber: Fr,
+    public slotNumber: SlotNumber,
     /** Coinbase address of the rollup. */
     public coinbase: EthAddress,
     /** Address to receive fees. */
@@ -56,7 +59,7 @@ export class CheckpointConstantData {
       Fr.ZERO,
       Fr.ZERO,
       Fr.ZERO,
-      Fr.ZERO,
+      SlotNumber.ZERO,
       EthAddress.ZERO,
       AztecAddress.ZERO,
       GasFees.empty(),
@@ -64,7 +67,17 @@ export class CheckpointConstantData {
   }
 
   toBuffer() {
-    return serializeToBuffer(...CheckpointConstantData.getFields(this));
+    return serializeToBuffer(
+      this.chainId,
+      this.version,
+      this.vkTreeRoot,
+      this.protocolContractsHash,
+      this.proverId,
+      new Fr(this.slotNumber),
+      this.coinbase,
+      this.feeRecipient,
+      this.gasFees,
+    );
   }
 
   static fromBuffer(buffer: Buffer | BufferReader) {
@@ -75,10 +88,36 @@ export class CheckpointConstantData {
       Fr.fromBuffer(reader),
       Fr.fromBuffer(reader),
       Fr.fromBuffer(reader),
-      Fr.fromBuffer(reader),
+      SlotNumber(Fr.fromBuffer(reader).toNumber()),
       reader.readObject(EthAddress),
       reader.readObject(AztecAddress),
       reader.readObject(GasFees),
     );
   }
+
+  /**
+   * Returns the slot number as a SlotNumber branded type.
+   * @deprecated Use slotNumber directly instead.
+   */
+  getSlotNumber(): SlotNumber {
+    return this.slotNumber;
+  }
+
+  toInspect() {
+    return {
+      chainId: this.chainId.toNumber(),
+      version: this.version.toNumber(),
+      vkTreeRoot: this.vkTreeRoot.toString(),
+      protocolContractsHash: this.protocolContractsHash.toString(),
+      proverId: this.proverId.toString(),
+      slotNumber: this.slotNumber,
+      coinbase: this.coinbase.toString(),
+      feeRecipient: this.feeRecipient.toString(),
+      gasFees: this.gasFees.toInspect(),
+    };
+  }
+
+  [inspect.custom]() {
+    return `CheckpointConstantData ${inspect(this.toInspect())}`;
+  }
 }

package/src/rollup/checkpoint_header.ts

@@ -1,4 +1,5 @@
 import type { ViemHeader } from '@aztec/ethereum';
+import { SlotNumber } from '@aztec/foundation/branded-types';
 import { sha256ToField } from '@aztec/foundation/crypto';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
@@ -20,10 +21,12 @@ export class CheckpointHeader {
   constructor(
     /** Root of the archive tree before this block is added. */
     public lastArchiveRoot: Fr,
+    /** Hash of the headers of all blocks in this checkpoint. */
+    public blockHeadersHash: Fr,
     /** Content commitment of the L2 block. */
     public contentCommitment: ContentCommitment,
     /** Slot number of the L2 block */
-    public slotNumber: Fr,
+    public slotNumber: SlotNumber,
     /** Timestamp of the L2 block. */
     public timestamp: UInt64,
     /** Recipient of block reward. */
@@ -40,8 +43,9 @@ export class CheckpointHeader {
     return z
       .object({
         lastArchiveRoot: schemas.Fr,
+        blockHeadersHash: schemas.Fr,
         contentCommitment: ContentCommitment.schema,
-        slotNumber: schemas.Fr,
+        slotNumber: schemas.SlotNumber,
         timestamp: schemas.BigInt,
         coinbase: schemas.EthAddress,
         feeRecipient: schemas.AztecAddress,
@@ -54,6 +58,7 @@ export class CheckpointHeader {
   static getFields(fields: FieldsOf<CheckpointHeader>) {
     return [
       fields.lastArchiveRoot,
+      fields.blockHeadersHash,
       fields.contentCommitment,
       fields.slotNumber,
       fields.timestamp,
@@ -72,9 +77,10 @@ export class CheckpointHeader {
     const reader = BufferReader.asReader(buffer);
 
     return new CheckpointHeader(
+      reader.readObject(Fr),
       reader.readObject(Fr),
       reader.readObject(ContentCommitment),
-      Fr.fromBuffer(reader),
+      SlotNumber(Fr.fromBuffer(reader).toNumber()),
       reader.readUInt64(),
       reader.readObject(EthAddress),
       reader.readObject(AztecAddress),
@@ -86,8 +92,9 @@ export class CheckpointHeader {
   equals(other: CheckpointHeader) {
     return (
       this.lastArchiveRoot.equals(other.lastArchiveRoot) &&
+      this.blockHeadersHash.equals(other.blockHeadersHash) &&
       this.contentCommitment.equals(other.contentCommitment) &&
-      this.slotNumber.equals(other.slotNumber) &&
+      this.slotNumber === other.slotNumber &&
       this.timestamp === other.timestamp &&
       this.coinbase.equals(other.coinbase) &&
       this.feeRecipient.equals(other.feeRecipient) &&
@@ -100,8 +107,9 @@ export class CheckpointHeader {
     // Note: The order here must match the order in the ProposedHeaderLib solidity library.
     return serializeToBuffer([
       this.lastArchiveRoot,
+      this.blockHeadersHash,
       this.contentCommitment,
-      this.slotNumber,
+      new Fr(this.slotNumber),
       bigintToUInt64BE(this.timestamp),
       this.coinbase,
       this.feeRecipient,
@@ -117,8 +125,9 @@ export class CheckpointHeader {
   static empty(fields: Partial<FieldsOf<CheckpointHeader>> = {}) {
     return CheckpointHeader.from({
       lastArchiveRoot: Fr.ZERO,
+      blockHeadersHash: Fr.ZERO,
       contentCommitment: ContentCommitment.empty(),
-      slotNumber: Fr.ZERO,
+      slotNumber: SlotNumber.ZERO,
       timestamp: 0n,
       coinbase: EthAddress.ZERO,
       feeRecipient: AztecAddress.ZERO,
@@ -128,24 +137,29 @@ export class CheckpointHeader {
     });
   }
 
-  static random(): CheckpointHeader {
-    return new CheckpointHeader(
-      Fr.random(),
-      ContentCommitment.random(),
-      new Fr(BigInt(Math.floor(Math.random() * 1000) + 1)),
-      BigInt(Math.floor(Date.now() / 1000)),
-      EthAddress.random(),
-      new AztecAddress(Fr.random()),
-      GasFees.random(),
-      new Fr(BigInt(Math.floor(Math.random() * 1000000))),
-    );
+  static random(
+    overrides: Partial<FieldsOf<CheckpointHeader>> & Partial<FieldsOf<ContentCommitment>> = {},
+  ): CheckpointHeader {
+    return CheckpointHeader.from({
+      lastArchiveRoot: Fr.random(),
+      blockHeadersHash: Fr.random(),
+      contentCommitment: ContentCommitment.random(overrides),
+      slotNumber: SlotNumber(Math.floor(Math.random() * 1000) + 1),
+      timestamp: BigInt(Math.floor(Date.now() / 1000)),
+      coinbase: EthAddress.random(),
+      feeRecipient: new AztecAddress(Fr.random()),
+      gasFees: GasFees.random(),
+      totalManaUsed: new Fr(BigInt(Math.floor(Math.random() * 1000000))),
+      ...overrides,
+    });
   }
 
   isEmpty(): boolean {
     return (
       this.lastArchiveRoot.isZero() &&
+      this.blockHeadersHash.isZero() &&
       this.contentCommitment.isEmpty() &&
-      this.slotNumber.isZero() &&
+      this.slotNumber === 0 &&
       this.timestamp === 0n &&
       this.coinbase.isZero() &&
       this.feeRecipient.isZero() &&
@@ -169,8 +183,9 @@ export class CheckpointHeader {
   static fromViem(header: ViemHeader) {
     return new CheckpointHeader(
       Fr.fromString(header.lastArchiveRoot),
+      Fr.fromString(header.blockHeadersHash),
       ContentCommitment.fromViem(header.contentCommitment),
-      new Fr(header.slotNumber),
+      SlotNumber.fromBigInt(header.slotNumber),
       header.timestamp,
       new EthAddress(hexToBuffer(header.coinbase)),
       new AztecAddress(hexToBuffer(header.feeRecipient)),
@@ -179,11 +194,20 @@ export class CheckpointHeader {
     );
   }
 
+  /**
+   * Returns the slot number as a SlotNumber branded type.
+   * @deprecated Use slotNumber directly instead.
+   */
+  getSlotNumber(): SlotNumber {
+    return this.slotNumber;
+  }
+
   toViem(): ViemHeader {
     return {
       lastArchiveRoot: this.lastArchiveRoot.toString(),
+      blockHeadersHash: this.blockHeadersHash.toString(),
       contentCommitment: this.contentCommitment.toViem(),
-      slotNumber: this.slotNumber.toBigInt(),
+      slotNumber: BigInt(this.slotNumber),
       timestamp: this.timestamp,
       coinbase: this.coinbase.toString(),
       feeRecipient: `0x${this.feeRecipient.toBuffer().toString('hex').padStart(64, '0')}`,
@@ -198,8 +222,9 @@ export class CheckpointHeader {
   toInspect() {
     return {
       lastArchive: this.lastArchiveRoot.toString(),
+      blockHeadersHash: this.blockHeadersHash.toString(),
       contentCommitment: this.contentCommitment.toInspect(),
-      slotNumber: this.slotNumber.toBigInt(),
+      slotNumber: this.slotNumber,
       timestamp: this.timestamp,
       coinbase: this.coinbase.toString(),
       feeRecipient: this.feeRecipient.toString(),
@@ -212,8 +237,9 @@ export class CheckpointHeader {
     const gasfees = `da:${this.gasFees.feePerDaGas}, l2:${this.gasFees.feePerL2Gas}`;
     return `Header {
   lastArchiveRoot: ${this.lastArchiveRoot.toString()},
+  blockHeadersHash: ${this.blockHeadersHash.toString()},
   contentCommitment: ${inspect(this.contentCommitment)},
-  slotNumber: ${this.slotNumber.toBigInt()},
+  slotNumber: ${this.slotNumber},
   timestamp: ${this.timestamp},
   coinbase: ${this.coinbase.toString()},
   feeRecipient: ${this.feeRecipient.toString()},

package/src/rollup/checkpoint_root_rollup_private_inputs.ts

@@ -1,5 +1,5 @@
 import { BlobAccumulator, FinalBlobBatchingChallenges } from '@aztec/blob-lib/types';
-import { ARCHIVE_HEIGHT, BLOBS_PER_BLOCK, FIELDS_PER_BLOB } from '@aztec/constants';
+import { ARCHIVE_HEIGHT, BLOBS_PER_CHECKPOINT, FIELDS_PER_BLOB } from '@aztec/constants';
 import { BLS12Point, Fr } from '@aztec/foundation/fields';
 import { bufferSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize';
@@ -31,13 +31,13 @@ export class CheckpointRootRollupHints {
     /**
      * Flat list of all tx effects which will be added to the blob.
      * Below line gives error 'Type instantiation is excessively deep and possibly infinite. ts(2589)'
-     * Tuple<Fr, FIELDS_PER_BLOB * BLOBS_PER_BLOCK>
+     * Tuple<Fr, FIELDS_PER_BLOB * BLOBS_PER_CHECKPOINT>
      */
     public blobFields: Fr[],
     /**
      * KZG commitments representing the blob (precomputed in ts, injected to use inside circuit).
      */
-    public blobCommitments: Tuple<BLS12Point, typeof BLOBS_PER_BLOCK>,
+    public blobCommitments: Tuple<BLS12Point, typeof BLOBS_PER_CHECKPOINT>,
     /**
      * The hash of eth blob hashes for this block
      * See yarn-project/foundation/src/blob/index.ts or body.ts for calculation
@@ -74,8 +74,8 @@ export class CheckpointRootRollupHints {
       reader.readObject(FinalBlobBatchingChallenges),
       // Below line gives error 'Type instantiation is excessively deep and possibly infinite. ts(2589)'
       // reader.readArray(FIELDS_PER_BLOB, Fr),
-      Array.from({ length: FIELDS_PER_BLOB * BLOBS_PER_BLOCK }, () => Fr.fromBuffer(reader)),
-      reader.readArray(BLOBS_PER_BLOCK, BLS12Point),
+      Array.from({ length: FIELDS_PER_BLOB * BLOBS_PER_CHECKPOINT }, () => Fr.fromBuffer(reader)),
+      reader.readArray(BLOBS_PER_CHECKPOINT, BLS12Point),
       Fr.fromBuffer(reader),
     );
   }

package/src/rollup/index.ts

@@ -1,6 +1,7 @@
 export * from './avm_proof_data.js';
 export * from './base_rollup_hints.js';
 export * from './block_constant_data.js';
+export * from './block_headers_hash.js';
 export * from './block_merge_rollup_private_inputs.js';
 export * from './block_rollup_public_inputs.js';
 export * from './block_root_rollup_private_inputs.js';

package/src/schemas/schemas.ts

@@ -1,3 +1,4 @@
+import type { EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import type { Buffer32 } from '@aztec/foundation/buffer';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { Fq, Fr, Point } from '@aztec/foundation/fields';
@@ -10,6 +11,7 @@ import { EventSelector } from '../abi/event_selector.js';
 import { FunctionSelector } from '../abi/function_selector.js';
 import { NoteSelector } from '../abi/note_selector.js';
 import { AztecAddress } from '../aztec-address/index.js';
+import { Gas } from '../gas/gas.js';
 
 /**
  * Validation schemas for common types. Every schema must match its toJSON.
@@ -63,6 +65,19 @@ export const schemas = {
 
   /** Accepts a hex string. */
   EventSelector: EventSelector.schema,
+
+  /** Accepts a number, bigint, or string and coerces to SlotNumber. */
+  SlotNumber: foundationSchemas.SlotNumber as ZodFor<SlotNumber>,
+
+  /** Accepts a number, bigint, or string and coerces to EpochNumber. */
+  EpochNumber: foundationSchemas.EpochNumber as ZodFor<EpochNumber>,
+
+  GasUsed: z.object({
+    totalGas: Gas.schema,
+    teardownGas: Gas.schema,
+    publicGas: Gas.schema,
+    billedGas: Gas.schema,
+  }),
 };
 
 export const AbiDecodedSchema: ZodFor<AbiDecoded> = z.union([
@@ -73,6 +88,9 @@ export const AbiDecodedSchema: ZodFor<AbiDecoded> = z.union([
   z.record(z.lazy(() => AbiDecodedSchema)),
 ]);
 
+// C++ only supports null values, which we want to convert to undefined.
+export const NullishToUndefined = (schema: ZodFor<any>) => schema.nullish().transform(x => x ?? undefined);
+
 export {
   type ZodFor,
   bufferSchema,