@aztec/prover-client 0.0.1-commit.9593d84 → 0.0.1-commit.96bb3f7

package/package.json

@@ -1,13 +1,15 @@
 {
   "name": "@aztec/prover-client",
-  "version": "0.0.1-commit.9593d84",
+  "version": "0.0.1-commit.96bb3f7",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
     "./block-factory": "./dest/block-factory/index.js",
     "./broker": "./dest/proving_broker/index.js",
+    "./broker/config": "./dest/proving_broker/config.js",
     "./orchestrator": "./dest/orchestrator/index.js",
     "./helpers": "./dest/orchestrator/block-building-helpers.js",
+    "./light": "./dest/light/index.js",
     "./config": "./dest/config.js"
   },
   "typedocOptions": {
@@ -22,8 +24,8 @@
     "./package.local.json"
   ],
   "scripts": {
-    "build": "yarn clean && tsgo -b",
-    "build:dev": "tsgo -b --watch",
+    "build": "yarn clean && ../scripts/tsc.sh",
+    "build:dev": "../scripts/tsc.sh --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
     "bb": "node --no-warnings ./dest/bb/index.js",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=3500000 --forceExit",
@@ -67,19 +69,19 @@
     ]
   },
   "dependencies": {
-    "@aztec/bb-prover": "0.0.1-commit.9593d84",
-    "@aztec/blob-lib": "0.0.1-commit.9593d84",
-    "@aztec/constants": "0.0.1-commit.9593d84",
-    "@aztec/ethereum": "0.0.1-commit.9593d84",
-    "@aztec/foundation": "0.0.1-commit.9593d84",
-    "@aztec/kv-store": "0.0.1-commit.9593d84",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.9593d84",
-    "@aztec/noir-types": "0.0.1-commit.9593d84",
-    "@aztec/protocol-contracts": "0.0.1-commit.9593d84",
-    "@aztec/simulator": "0.0.1-commit.9593d84",
-    "@aztec/stdlib": "0.0.1-commit.9593d84",
-    "@aztec/telemetry-client": "0.0.1-commit.9593d84",
-    "@aztec/world-state": "0.0.1-commit.9593d84",
+    "@aztec/bb-prover": "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/kv-store": "0.0.1-commit.96bb3f7",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.96bb3f7",
+    "@aztec/noir-types": "0.0.1-commit.96bb3f7",
+    "@aztec/protocol-contracts": "0.0.1-commit.96bb3f7",
+    "@aztec/simulator": "0.0.1-commit.96bb3f7",
+    "@aztec/stdlib": "0.0.1-commit.96bb3f7",
+    "@aztec/telemetry-client": "0.0.1-commit.96bb3f7",
+    "@aztec/world-state": "0.0.1-commit.96bb3f7",
     "@google-cloud/storage": "^7.15.0",
     "@iarna/toml": "^2.2.5",
     "commander": "^12.1.0",
@@ -89,7 +91,7 @@
     "zod": "^3.23.8"
   },
   "devDependencies": {
-    "@aztec/noir-contracts.js": "0.0.1-commit.9593d84",
+    "@aztec/noir-contracts.js": "0.0.1-commit.96bb3f7",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/node": "^22.15.17",

package/src/block-factory/light.ts

@@ -1,13 +1,13 @@
 import { SpongeBlob, computeBlobsHashFromBlobs, encodeCheckpointEndMarker, getBlobsPerL1Block } from '@aztec/blob-lib';
 import { NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/constants';
 import { padArrayEnd } from '@aztec/foundation/collection';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { createLogger } from '@aztec/foundation/log';
 import { L2Block, L2BlockHeader } from '@aztec/stdlib/block';
 import type { IBlockFactory, MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
-import { computeBlockOutHash, computeInHashFromL1ToL2Messages } from '@aztec/stdlib/messaging';
+import { computeInHashFromL1ToL2Messages } from '@aztec/stdlib/messaging';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
-import { ContentCommitment, type GlobalVariables, type ProcessedTx } from '@aztec/stdlib/tx';
+import type { GlobalVariables, ProcessedTx } from '@aztec/stdlib/tx';
 import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
 
 import {
@@ -87,17 +87,16 @@ export class LightweightBlockFactory implements IBlockFactory {
     await this.db.updateArchive(header);
     const newArchive = await getTreeSnapshot(MerkleTreeId.ARCHIVE, this.db);
 
-    const outHash = computeBlockOutHash(txs.map(tx => tx.txEffect.l2ToL1Msgs));
     const inHash = computeInHashFromL1ToL2Messages(this.l1ToL2Messages!);
     const numBlobFields = blockBlobFields.length + 1;
     const blobFields = blockBlobFields.concat([encodeCheckpointEndMarker({ numBlobFields })]);
     const blobsHash = computeBlobsHashFromBlobs(getBlobsPerL1Block(blobFields));
     const blockHeaderHash = await header.hash();
-    const contentCommitment = new ContentCommitment(blobsHash, inHash, outHash);
     const l2BlockHeader = L2BlockHeader.from({
       ...header,
       blockHeadersHash: blockHeaderHash,
-      contentCommitment,
+      blobsHash,
+      inHash,
     });
 
     const block = new L2Block(newArchive, l2BlockHeader, body);

package/src/config.ts

@@ -5,7 +5,7 @@ import {
   getConfigFromMappings,
   numberConfigHelper,
 } from '@aztec/foundation/config';
-import { type ProverConfig, proverConfigMappings } from '@aztec/stdlib/interfaces/server';
+import { type ProverConfig, proverConfigMappings } from '@aztec/stdlib/interfaces/prover-config';
 
 import {
   type ProverAgentConfig,

package/src/light/index.ts

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

package/src/light/lightweight_checkpoint_builder.ts

@@ -1,15 +1,21 @@
 import { SpongeBlob, computeBlobsHashFromBlobs, encodeCheckpointEndMarker, getBlobsPerL1Block } from '@aztec/blob-lib';
 import { NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/constants';
+import type { CheckpointNumber } from '@aztec/foundation/branded-types';
 import { padArrayEnd } from '@aztec/foundation/collection';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { createLogger } from '@aztec/foundation/log';
 import { L2BlockNew } from '@aztec/stdlib/block';
 import { Checkpoint } from '@aztec/stdlib/checkpoint';
 import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
-import { computeCheckpointOutHash, computeInHashFromL1ToL2Messages } from '@aztec/stdlib/messaging';
-import { CheckpointConstantData, CheckpointHeader, computeBlockHeadersHash } from '@aztec/stdlib/rollup';
+import { computeInHashFromL1ToL2Messages } from '@aztec/stdlib/messaging';
+import { CheckpointHeader, computeBlockHeadersHash } from '@aztec/stdlib/rollup';
 import { AppendOnlyTreeSnapshot, MerkleTreeId } from '@aztec/stdlib/trees';
-import { ContentCommitment, type GlobalVariables, type ProcessedTx, StateReference } from '@aztec/stdlib/tx';
+import {
+  type CheckpointGlobalVariables,
+  type GlobalVariables,
+  type ProcessedTx,
+  StateReference,
+} from '@aztec/stdlib/tx';
 
 import {
   buildHeaderAndBodyFromTxs,
@@ -20,29 +26,30 @@ import {
 /**
  * Builds a checkpoint and its header and the blocks in it from a set of processed tx without running any circuits.
  *
- * It updates the l1-to-l2 message tree when starting a new checkpoint, inserts the side effects to note hash,
- * nullifier, and public data trees, then updates the archive tree when a block is added.
+ * It updates the l1-to-l2 message tree when starting a new checkpoint, and then updates the archive tree when each block is added.
+ * Finally completes the checkpoint by computing its header.
  */
 export class LightweightCheckpointBuilder {
   private readonly logger = createLogger('lightweight-checkpoint-builder');
+
   private lastArchives: AppendOnlyTreeSnapshot[] = [];
   private spongeBlob: SpongeBlob;
   private blocks: L2BlockNew[] = [];
   private blobFields: Fr[] = [];
 
   constructor(
-    private checkpointNumber: number,
-    private constants: CheckpointConstantData,
-    private l1ToL2Messages: Fr[],
-    private db: MerkleTreeWriteOperations,
+    public readonly checkpointNumber: CheckpointNumber,
+    public readonly constants: CheckpointGlobalVariables,
+    public readonly l1ToL2Messages: Fr[],
+    public readonly db: MerkleTreeWriteOperations,
   ) {
     this.spongeBlob = SpongeBlob.init();
-    this.logger.debug('Starting new checkpoint', { constants: constants.toInspect(), l1ToL2Messages });
+    this.logger.debug('Starting new checkpoint', { constants, l1ToL2Messages });
   }
 
   static async startNewCheckpoint(
-    checkpointNumber: number,
-    constants: CheckpointConstantData,
+    checkpointNumber: CheckpointNumber,
+    constants: CheckpointGlobalVariables,
     l1ToL2Messages: Fr[],
     db: MerkleTreeWriteOperations,
   ): Promise<LightweightCheckpointBuilder> {
@@ -55,16 +62,99 @@ export class LightweightCheckpointBuilder {
     return new LightweightCheckpointBuilder(checkpointNumber, constants, l1ToL2Messages, db);
   }
 
-  async addBlock(globalVariables: GlobalVariables, endState: StateReference, txs: ProcessedTx[]): Promise<L2BlockNew> {
+  /**
+   * Resumes building a checkpoint from existing blocks. This is used for validator re-execution
+   * where blocks have already been built and their effects are already in the database.
+   * Unlike startNewCheckpoint, this does NOT append l1ToL2Messages to the tree since they
+   * were already added when the blocks were originally built.
+   */
+  static async resumeCheckpoint(
+    checkpointNumber: CheckpointNumber,
+    constants: CheckpointGlobalVariables,
+    l1ToL2Messages: Fr[],
+    db: MerkleTreeWriteOperations,
+    existingBlocks: L2BlockNew[],
+  ): Promise<LightweightCheckpointBuilder> {
+    const builder = new LightweightCheckpointBuilder(checkpointNumber, constants, l1ToL2Messages, db);
+
+    builder.logger.debug('Resuming checkpoint from existing blocks', {
+      checkpointNumber,
+      numExistingBlocks: existingBlocks.length,
+      blockNumbers: existingBlocks.map(b => b.header.getBlockNumber()),
+    });
+
+    // Validate block order and consistency
+    for (let i = 1; i < existingBlocks.length; i++) {
+      const prev = existingBlocks[i - 1];
+      const curr = existingBlocks[i];
+      if (curr.number !== prev.number + 1) {
+        throw new Error(`Non-sequential block numbers in resumeCheckpoint: ${prev.number} -> ${curr.number}`);
+      }
+      if (!prev.archive.root.equals(curr.header.lastArchive.root)) {
+        throw new Error(`Archive root mismatch between blocks ${prev.number} and ${curr.number}`);
+      }
+    }
+
+    for (let i = 0; i < existingBlocks.length; i++) {
+      const block = existingBlocks[i];
+      const isFirstBlock = i === 0;
+
+      if (isFirstBlock) {
+        builder.lastArchives.push(block.header.lastArchive);
+      }
+
+      builder.lastArchives.push(block.archive);
+
+      const blockBlobFields = block.toBlobFields();
+      await builder.spongeBlob.absorb(blockBlobFields);
+      builder.blobFields.push(...blockBlobFields);
+
+      builder.blocks.push(block);
+    }
+
+    return builder;
+  }
+
+  /**
+   * Adds a new block to the checkpoint. The tx effects must have already been inserted into the db if
+   * this is called after tx processing, if that's not the case, then set `insertTxsEffects` to true.
+   */
+  public async addBlock(
+    globalVariables: GlobalVariables,
+    txs: ProcessedTx[],
+    opts: { insertTxsEffects?: boolean; expectedEndState?: StateReference } = {},
+  ): Promise<L2BlockNew> {
     const isFirstBlock = this.blocks.length === 0;
+
+    // Empty blocks are only allowed as the first block in a checkpoint
+    if (!isFirstBlock && txs.length === 0) {
+      throw new Error('Cannot add empty block that is not the first block in the checkpoint.');
+    }
+
     if (isFirstBlock) {
       this.lastArchives.push(await getTreeSnapshot(MerkleTreeId.ARCHIVE, this.db));
     }
 
     const lastArchive = this.lastArchives.at(-1)!;
 
-    for (const tx of txs) {
-      await insertSideEffects(tx, this.db);
+    if (opts.insertTxsEffects) {
+      this.logger.debug(
+        `Inserting side effects for ${txs.length} txs for block ${globalVariables.blockNumber} into db`,
+        { txs: txs.map(tx => tx.hash.toString()) },
+      );
+      for (const tx of txs) {
+        await insertSideEffects(tx, this.db);
+      }
+    }
+
+    const endState = await this.db.getStateReference();
+    if (opts.expectedEndState && !endState.equals(opts.expectedEndState)) {
+      this.logger.error('End state after processing txs does not match expected end state', {
+        globalVariables: globalVariables.toInspect(),
+        expectedEndState: opts.expectedEndState.toInspect(),
+        actualEndState: endState.toInspect(),
+      });
+      throw new Error(`End state does not match expected end state when building block ${globalVariables.blockNumber}`);
     }
 
     const { header, body, blockBlobFields } = await buildHeaderAndBodyFromTxs(
@@ -76,11 +166,14 @@ export class LightweightCheckpointBuilder {
       isFirstBlock,
     );
 
+    header.state.validate();
+
     await this.db.updateArchive(header);
     const newArchive = await getTreeSnapshot(MerkleTreeId.ARCHIVE, this.db);
     this.lastArchives.push(newArchive);
 
-    const block = new L2BlockNew(newArchive, header, body);
+    const indexWithinCheckpoint = this.blocks.length;
+    const block = new L2BlockNew(newArchive, header, body, this.checkpointNumber, indexWithinCheckpoint);
     this.blocks.push(block);
 
     await this.spongeBlob.absorb(blockBlobFields);
@@ -99,7 +192,7 @@ export class LightweightCheckpointBuilder {
 
   async completeCheckpoint(): Promise<Checkpoint> {
     if (!this.blocks.length) {
-      throw new Error('No blocks added to checkpoint.');
+      throw new Error('Cannot complete a checkpoint with no blocks');
     }
 
     const numBlobFields = this.blobFields.length + 1; // +1 for the checkpoint end marker.
@@ -116,10 +209,9 @@ export class LightweightCheckpointBuilder {
 
     const inHash = computeInHashFromL1ToL2Messages(this.l1ToL2Messages);
 
-    const outHash = computeCheckpointOutHash(blocks.map(block => block.body.txEffects.map(tx => tx.l2ToL1Msgs)));
-
-    const constants = this.constants!;
+    const { slotNumber, coinbase, feeRecipient, gasFees } = this.constants;
 
+    // TODO(palla/mbps): Should we source this from the constants instead?
     // timestamp of a checkpoint is the timestamp of the last block in the checkpoint.
     const timestamp = blocks[blocks.length - 1].timestamp;
 
@@ -127,16 +219,31 @@ export class LightweightCheckpointBuilder {
 
     const header = CheckpointHeader.from({
       lastArchiveRoot: this.lastArchives[0].root,
+      blobsHash,
+      inHash,
       blockHeadersHash,
-      contentCommitment: new ContentCommitment(blobsHash, inHash, outHash),
-      slotNumber: constants.slotNumber,
+      slotNumber,
       timestamp,
-      coinbase: constants.coinbase,
-      feeRecipient: constants.feeRecipient,
-      gasFees: constants.gasFees,
+      coinbase,
+      feeRecipient,
+      gasFees,
       totalManaUsed,
     });
 
     return new Checkpoint(newArchive, header, blocks, this.checkpointNumber);
   }
+
+  clone() {
+    const clone = new LightweightCheckpointBuilder(
+      this.checkpointNumber,
+      this.constants,
+      [...this.l1ToL2Messages],
+      this.db,
+    );
+    clone.lastArchives = [...this.lastArchives];
+    clone.spongeBlob = this.spongeBlob.clone();
+    clone.blocks = [...this.blocks];
+    clone.blobFields = [...this.blobFields];
+    return clone;
+  }
 }

package/src/mocks/fixtures.ts

@@ -1,7 +1,7 @@
-import { SlotNumber } from '@aztec/foundation/branded-types';
-import { randomBytes } from '@aztec/foundation/crypto';
+import { BlockNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import { randomBytes } from '@aztec/foundation/crypto/random';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { Fr } from '@aztec/foundation/fields';
 import type { Logger } from '@aztec/foundation/log';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { fileURLToPath } from '@aztec/foundation/url';
@@ -93,7 +93,7 @@ export const makeGlobals = (
   return GlobalVariables.from({
     chainId: checkpointConstants.chainId,
     version: checkpointConstants.version,
-    blockNumber /** block number */,
+    blockNumber: BlockNumber(blockNumber) /** block number */,
     slotNumber: SlotNumber(slotNumber) /** slot number */,
     timestamp: BigInt(blockNumber * 123) /** block number * 123 as pseudo-timestamp for testing */,
     coinbase: checkpointConstants.coinbase,

package/src/mocks/test_context.ts

@@ -1,8 +1,9 @@
 import type { BBProverConfig } from '@aztec/bb-prover';
 import { TestCircuitProver } from '@aztec/bb-prover';
 import { NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/constants';
+import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
 import { padArrayEnd, times, timesAsync } from '@aztec/foundation/collection';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import type { Logger } from '@aztec/foundation/log';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
@@ -44,6 +45,7 @@ export class TestContext {
   private headers: Map<number, BlockHeader> = new Map();
   private checkpoints: Checkpoint[] = [];
   private nextCheckpointIndex = 0;
+  private nextCheckpointNumber = CheckpointNumber(1);
   private nextBlockNumber = 1;
   private epochNumber = 1;
   private feePayerBalance: Fr;
@@ -186,7 +188,8 @@ export class TestContext {
     }
 
     const checkpointIndex = this.nextCheckpointIndex++;
-    const checkpointNumber = checkpointIndex + 1;
+    const checkpointNumber = this.nextCheckpointNumber;
+    this.nextCheckpointNumber++;
     const slotNumber = checkpointNumber * 15; // times an arbitrary number to make it different to the checkpoint number
 
     const constants = makeCheckpointConstants(slotNumber, constantOpts);
@@ -202,7 +205,9 @@ export class TestContext {
     const newL1ToL2Snapshot = await getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, fork);
 
     const startBlockNumber = this.nextBlockNumber;
-    const previousBlockHeader = this.getBlockHeader(startBlockNumber - 1);
+    const previousBlockHeader = this.getBlockHeader(BlockNumber(startBlockNumber - 1));
+    // All blocks in the same slot/checkpoint share the same timestamp.
+    const timestamp = BigInt(slotNumber * 26);
 
     // Build global variables.
     const blockGlobalVariables = times(numBlocks, i =>
@@ -210,6 +215,7 @@ export class TestContext {
         coinbase: constants.coinbase,
         feeRecipient: constants.feeRecipient,
         gasFees: constants.gasFees,
+        timestamp,
       }),
     );
     this.nextBlockNumber += numBlocks;
@@ -249,17 +255,19 @@ export class TestContext {
     // Add tx effects to db and build block headers.
     const blocks = [];
     for (let i = 0; i < numBlocks; i++) {
-      const isFirstBlock = i === 0;
       const txs = blockTxs[i];
       const state = blockEndStates[i];
 
-      const block = await builder.addBlock(blockGlobalVariables[i], state, txs);
+      const block = await builder.addBlock(blockGlobalVariables[i], txs, {
+        expectedEndState: state,
+        insertTxsEffects: true,
+      });
 
       const header = block.header;
       this.headers.set(block.number, header);
 
-      const blockMsgs = isFirstBlock ? l1ToL2Messages : [];
-      await this.worldState.handleL2BlockAndMessages(block, blockMsgs, isFirstBlock);
+      const blockMsgs = block.indexWithinCheckpoint === 0 ? l1ToL2Messages : [];
+      await this.worldState.handleL2BlockAndMessages(block, blockMsgs);
 
       blocks.push({ header, txs });
     }
@@ -296,11 +304,13 @@ export class TestContext {
     return tx;
   }
 
-  private getBlockHeader(blockNumber: number): BlockHeader {
-    if (blockNumber > 0 && blockNumber >= this.nextBlockNumber) {
+  private getBlockHeader(blockNumber: BlockNumber): BlockHeader {
+    if (Number(blockNumber) > 0 && Number(blockNumber) >= this.nextBlockNumber) {
       throw new Error(`Block header not built for block number ${blockNumber}.`);
     }
-    return blockNumber === 0 ? this.worldState.getCommitted().getInitialHeader() : this.headers.get(blockNumber)!;
+    return Number(blockNumber) === 0
+      ? this.worldState.getCommitted().getInitialHeader()
+      : this.headers.get(Number(blockNumber))!;
   }
 
   private async updateTrees(txs: ProcessedTx[], fork: MerkleTreeWriteOperations) {

package/src/orchestrator/block-building-helpers.ts

@@ -20,8 +20,9 @@ import {
   PUBLIC_DATA_TREE_HEIGHT,
 } from '@aztec/constants';
 import { makeTuple } from '@aztec/foundation/array';
+import { BlockNumber } from '@aztec/foundation/branded-types';
 import { padArrayEnd } from '@aztec/foundation/collection';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { type Bufferable, assertLength, toFriendlyJSON } from '@aztec/foundation/serialize';
 import { MembershipWitness } from '@aztec/foundation/trees';
 import { getVkData } from '@aztec/noir-protocol-circuits-types/server/vks';
@@ -280,8 +281,8 @@ export const buildHeaderFromCircuitOutputs = runInSpan(
     const globalVariables = GlobalVariables.from({
       chainId: constants.chainId,
       version: constants.version,
-      blockNumber: blockRootRollupOutput.previousArchive.nextAvailableLeafIndex,
-      timestamp: blockRootRollupOutput.endTimestamp,
+      blockNumber: BlockNumber(blockRootRollupOutput.previousArchive.nextAvailableLeafIndex),
+      timestamp: blockRootRollupOutput.timestamp,
       slotNumber: constants.slotNumber,
       coinbase: constants.coinbase,
       feeRecipient: constants.feeRecipient,

package/src/orchestrator/block-proving-state.ts

@@ -6,7 +6,8 @@ import {
   type NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH,
   NUM_BASE_PARITY_PER_ROOT_PARITY,
 } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { type Tuple, assertLength } from '@aztec/foundation/serialize';
 import { type TreeNodeLocation, UnbalancedTreeStore } from '@aztec/foundation/trees';
 import type { PublicInputsAndRecursiveProof } from '@aztec/stdlib/interfaces/server';
@@ -62,7 +63,7 @@ export class BlockProvingState {
 
   constructor(
     public readonly index: number,
-    public readonly blockNumber: number,
+    public readonly blockNumber: BlockNumber,
     public readonly totalNumTxs: number,
     private readonly constants: CheckpointConstantData,
     private readonly timestamp: UInt64,

package/src/orchestrator/checkpoint-proving-state.ts

@@ -12,8 +12,10 @@ import {
   type NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH,
   NUM_MSGS_PER_BASE_PARITY,
 } from '@aztec/constants';
+import { BlockNumber } from '@aztec/foundation/branded-types';
 import { padArrayEnd } from '@aztec/foundation/collection';
-import { BLS12Point, Fr } from '@aztec/foundation/fields';
+import { BLS12Point } from '@aztec/foundation/curves/bls12';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import type { Tuple } from '@aztec/foundation/serialize';
 import { type TreeNodeLocation, UnbalancedTreeStore } from '@aztec/foundation/trees';
 import type { PublicInputsAndRecursiveProof } from '@aztec/stdlib/interfaces/server';
@@ -48,7 +50,7 @@ export class CheckpointProvingState {
   private endBlobAccumulator: BatchedBlobAccumulator | undefined;
   private blobFields: Fr[] | undefined;
   private error: string | undefined;
-  public readonly firstBlockNumber: number;
+  public readonly firstBlockNumber: BlockNumber;
 
   constructor(
     public readonly index: number,
@@ -74,7 +76,7 @@ export class CheckpointProvingState {
     private onBlobAccumulatorSet: (checkpoint: CheckpointProvingState) => void,
   ) {
     this.blockProofs = new UnbalancedTreeStore(totalNumBlocks);
-    this.firstBlockNumber = headerOfLastBlockInPreviousCheckpoint.globalVariables.blockNumber + 1;
+    this.firstBlockNumber = BlockNumber(headerOfLastBlockInPreviousCheckpoint.globalVariables.blockNumber + 1);
   }
 
   public get epochNumber(): number {
@@ -82,13 +84,13 @@ export class CheckpointProvingState {
   }
 
   public startNewBlock(
-    blockNumber: number,
+    blockNumber: BlockNumber,
     timestamp: UInt64,
     totalNumTxs: number,
     lastArchiveTreeSnapshot: AppendOnlyTreeSnapshot,
     lastArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>,
   ): BlockProvingState {
-    const index = blockNumber - this.firstBlockNumber;
+    const index = Number(blockNumber) - Number(this.firstBlockNumber);
     if (index >= this.totalNumBlocks) {
       throw new Error(`Unable to start a new block at index ${index}. Expected at most ${this.totalNumBlocks} blocks.`);
     }
@@ -260,8 +262,8 @@ export class CheckpointProvingState {
       : new CheckpointRootRollupPrivateInputs([left, right], hints);
   }
 
-  public getBlockProvingStateByBlockNumber(blockNumber: number) {
-    const index = blockNumber - this.firstBlockNumber;
+  public getBlockProvingStateByBlockNumber(blockNumber: BlockNumber) {
+    const index = Number(blockNumber) - Number(this.firstBlockNumber);
     return this.blocks[index];
   }
 

package/src/orchestrator/epoch-proving-state.ts

@@ -5,8 +5,8 @@ import type {
   NESTED_RECURSIVE_PROOF_LENGTH,
   NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH,
 } from '@aztec/constants';
-import { EpochNumber } from '@aztec/foundation/branded-types';
-import type { Fr } from '@aztec/foundation/fields';
+import { BlockNumber, EpochNumber } from '@aztec/foundation/branded-types';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import type { Tuple } from '@aztec/foundation/serialize';
 import { type TreeNodeLocation, UnbalancedTreeStore } from '@aztec/foundation/trees';
 import type { PublicInputsAndRecursiveProof } from '@aztec/stdlib/interfaces/server';
@@ -126,13 +126,16 @@ export class EpochProvingState {
     return this.checkpoints[index];
   }
 
-  public getCheckpointProvingStateByBlockNumber(blockNumber: number) {
+  public getCheckpointProvingStateByBlockNumber(blockNumber: BlockNumber) {
     return this.checkpoints.find(
-      c => c && blockNumber >= c.firstBlockNumber && blockNumber < c.firstBlockNumber + c.totalNumBlocks,
+      c =>
+        c &&
+        Number(blockNumber) >= Number(c.firstBlockNumber) &&
+        Number(blockNumber) < Number(c.firstBlockNumber) + c.totalNumBlocks,
     );
   }
 
-  public getBlockProvingStateByBlockNumber(blockNumber: number) {
+  public getBlockProvingStateByBlockNumber(blockNumber: BlockNumber) {
     return this.getCheckpointProvingStateByBlockNumber(blockNumber)?.getBlockProvingStateByBlockNumber(blockNumber);
   }