@aztec/prover-client 3.0.0-nightly.20250917 → 3.0.0-nightly.20250919

package/dest/test/mock_prover.js

@@ -2,7 +2,7 @@ import { AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED, AVM_V2_VERIFICATION_KEY_LENGTH_IN
 import { times } from '@aztec/foundation/collection';
 import { makeProofAndVerificationKey, makePublicInputsAndRecursiveProof } from '@aztec/stdlib/interfaces/server';
 import { makeEmptyRecursiveProof, makeRecursiveProof } from '@aztec/stdlib/proofs';
-import { makeBaseOrMergeRollupPublicInputs, makeBlockRootOrBlockMergeRollupPublicInputs, makeParityPublicInputs, makePrivateToPublicKernelCircuitPublicInputs, makeRootRollupPublicInputs } from '@aztec/stdlib/testing';
+import { makeBlockRollupPublicInputs, makeCheckpointRollupPublicInputs, makeParityPublicInputs, makePrivateToPublicKernelCircuitPublicInputs, makeRootRollupPublicInputs, makeTxRollupPublicInputs } from '@aztec/stdlib/testing';
 import { VerificationKeyData } from '@aztec/stdlib/vks';
 import { InlineProofStore } from '../proving_broker/proof_store/index.js';
 import { ProvingAgent } from '../proving_broker/proving_agent.js';
@@ -55,29 +55,44 @@ export class MockProver {
     getPublicTubeProof(_inputs, _signal, _epochNumber) {
         return Promise.resolve(makePublicInputsAndRecursiveProof(makePrivateToPublicKernelCircuitPublicInputs(), makeRecursiveProof(NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), VerificationKeyData.makeFakeRollupHonk()));
     }
-    getPrivateBaseRollupProof(_baseRollupInput, _signal, _epochNumber) {
-        return Promise.resolve(makePublicInputsAndRecursiveProof(makeBaseOrMergeRollupPublicInputs(), makeRecursiveProof(NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), VerificationKeyData.makeFakeRollupHonk()));
+    getPrivateTxBaseRollupProof(_baseRollupInput, _signal, _epochNumber) {
+        return Promise.resolve(makePublicInputsAndRecursiveProof(makeTxRollupPublicInputs(), makeRecursiveProof(NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), VerificationKeyData.makeFakeRollupHonk()));
     }
-    getPublicBaseRollupProof(_inputs, _signal, _epochNumber) {
-        return Promise.resolve(makePublicInputsAndRecursiveProof(makeBaseOrMergeRollupPublicInputs(), makeRecursiveProof(NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), VerificationKeyData.makeFakeRollupHonk()));
+    getPublicTxBaseRollupProof(_inputs, _signal, _epochNumber) {
+        return Promise.resolve(makePublicInputsAndRecursiveProof(makeTxRollupPublicInputs(), makeRecursiveProof(NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), VerificationKeyData.makeFakeRollupHonk()));
     }
-    getMergeRollupProof(_input, _signal, _epochNumber) {
-        return Promise.resolve(makePublicInputsAndRecursiveProof(makeBaseOrMergeRollupPublicInputs(), makeRecursiveProof(NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), VerificationKeyData.makeFakeRollupHonk()));
+    getTxMergeRollupProof(_input, _signal, _epochNumber) {
+        return Promise.resolve(makePublicInputsAndRecursiveProof(makeTxRollupPublicInputs(), makeRecursiveProof(NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), VerificationKeyData.makeFakeRollupHonk()));
     }
-    getBlockMergeRollupProof(_input, _signal, _epochNumber) {
-        return Promise.resolve(makePublicInputsAndRecursiveProof(makeBlockRootOrBlockMergeRollupPublicInputs(), makeRecursiveProof(NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), VerificationKeyData.makeFakeRollupHonk()));
+    getBlockRootFirstRollupProof(_input, _signal, _epochNumber) {
+        return Promise.resolve(makePublicInputsAndRecursiveProof(makeBlockRollupPublicInputs(), makeRecursiveProof(NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), VerificationKeyData.makeFakeRollupHonk()));
     }
-    getEmptyBlockRootRollupProof(_input, _signal, _epochNumber) {
-        return Promise.resolve(makePublicInputsAndRecursiveProof(makeBlockRootOrBlockMergeRollupPublicInputs(), makeRecursiveProof(NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), VerificationKeyData.makeFakeRollupHonk()));
+    getBlockRootSingleTxFirstRollupProof(_input, _signal, _epochNumber) {
+        return Promise.resolve(makePublicInputsAndRecursiveProof(makeBlockRollupPublicInputs(), makeRecursiveProof(NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), VerificationKeyData.makeFakeHonk()));
     }
-    getPaddingBlockRootRollupProof(_input, _signal, _epochNumber) {
-        return Promise.resolve(makePublicInputsAndRecursiveProof(makeBlockRootOrBlockMergeRollupPublicInputs(), makeRecursiveProof(NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), VerificationKeyData.makeFakeRollupHonk()));
+    getBlockRootEmptyTxFirstRollupProof(_input, _signal, _epochNumber) {
+        return Promise.resolve(makePublicInputsAndRecursiveProof(makeBlockRollupPublicInputs(), makeRecursiveProof(NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), VerificationKeyData.makeFakeRollupHonk()));
     }
     getBlockRootRollupProof(_input, _signal, _epochNumber) {
-        return Promise.resolve(makePublicInputsAndRecursiveProof(makeBlockRootOrBlockMergeRollupPublicInputs(), makeRecursiveProof(NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), VerificationKeyData.makeFakeRollupHonk()));
+        return Promise.resolve(makePublicInputsAndRecursiveProof(makeBlockRollupPublicInputs(), makeRecursiveProof(NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), VerificationKeyData.makeFakeRollupHonk()));
+    }
+    getBlockRootSingleTxRollupProof(_input, _signal, _epochNumber) {
+        return Promise.resolve(makePublicInputsAndRecursiveProof(makeBlockRollupPublicInputs(), makeRecursiveProof(NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), VerificationKeyData.makeFakeHonk()));
+    }
+    getBlockMergeRollupProof(_input, _signal, _epochNumber) {
+        return Promise.resolve(makePublicInputsAndRecursiveProof(makeBlockRollupPublicInputs(), makeRecursiveProof(NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), VerificationKeyData.makeFakeRollupHonk()));
+    }
+    getCheckpointRootRollupProof(_input, _signal, _epochNumber) {
+        return Promise.resolve(makePublicInputsAndRecursiveProof(makeCheckpointRollupPublicInputs(), makeRecursiveProof(NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), VerificationKeyData.makeFakeRollupHonk()));
+    }
+    getCheckpointRootSingleBlockRollupProof(_input, _signal, _epochNumber) {
+        return Promise.resolve(makePublicInputsAndRecursiveProof(makeCheckpointRollupPublicInputs(), makeRecursiveProof(NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), VerificationKeyData.makeFakeRollupHonk()));
+    }
+    getCheckpointMergeRollupProof(_input, _signal, _epochNumber) {
+        return Promise.resolve(makePublicInputsAndRecursiveProof(makeCheckpointRollupPublicInputs(), makeRecursiveProof(NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), VerificationKeyData.makeFakeRollupHonk()));
     }
-    getSingleTxBlockRootRollupProof(_input, _signal, _epochNumber) {
-        return Promise.resolve(makePublicInputsAndRecursiveProof(makeBlockRootOrBlockMergeRollupPublicInputs(), makeRecursiveProof(NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), VerificationKeyData.makeFakeHonk()));
+    getCheckpointPaddingRollupProof(_input, _signal, _epochNumber) {
+        return Promise.resolve(makePublicInputsAndRecursiveProof(makeCheckpointRollupPublicInputs(), makeRecursiveProof(NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH), VerificationKeyData.makeFakeRollupHonk()));
     }
     getRootRollupProof(_input, _signal, _epochNumber) {
         return Promise.resolve(makePublicInputsAndRecursiveProof(makeRootRollupPublicInputs(), makeRecursiveProof(RECURSIVE_PROOF_LENGTH), VerificationKeyData.makeFakeHonk()));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/prover-client",
-  "version": "3.0.0-nightly.20250917",
+  "version": "3.0.0-nightly.20250919",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -27,8 +27,7 @@
     "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",
-    "test:debug": "LOG_LEVEL=debug NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=1500000 --forceExit --testNamePattern prover/bb_prover/parity",
-    "get-proof-inputs": "node --no-warnings ./dest/bin/get-proof-inputs.js"
+    "test:debug": "LOG_LEVEL=debug NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=1500000 --forceExit --testNamePattern prover/bb_prover/parity"
   },
   "jest": {
     "moduleNameMapper": {
@@ -68,19 +67,19 @@
     ]
   },
   "dependencies": {
-    "@aztec/bb-prover": "3.0.0-nightly.20250917",
-    "@aztec/blob-lib": "3.0.0-nightly.20250917",
-    "@aztec/constants": "3.0.0-nightly.20250917",
-    "@aztec/ethereum": "3.0.0-nightly.20250917",
-    "@aztec/foundation": "3.0.0-nightly.20250917",
-    "@aztec/kv-store": "3.0.0-nightly.20250917",
-    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20250917",
-    "@aztec/noir-types": "3.0.0-nightly.20250917",
-    "@aztec/protocol-contracts": "3.0.0-nightly.20250917",
-    "@aztec/simulator": "3.0.0-nightly.20250917",
-    "@aztec/stdlib": "3.0.0-nightly.20250917",
-    "@aztec/telemetry-client": "3.0.0-nightly.20250917",
-    "@aztec/world-state": "3.0.0-nightly.20250917",
+    "@aztec/bb-prover": "3.0.0-nightly.20250919",
+    "@aztec/blob-lib": "3.0.0-nightly.20250919",
+    "@aztec/constants": "3.0.0-nightly.20250919",
+    "@aztec/ethereum": "3.0.0-nightly.20250919",
+    "@aztec/foundation": "3.0.0-nightly.20250919",
+    "@aztec/kv-store": "3.0.0-nightly.20250919",
+    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20250919",
+    "@aztec/noir-types": "3.0.0-nightly.20250919",
+    "@aztec/protocol-contracts": "3.0.0-nightly.20250919",
+    "@aztec/simulator": "3.0.0-nightly.20250919",
+    "@aztec/stdlib": "3.0.0-nightly.20250919",
+    "@aztec/telemetry-client": "3.0.0-nightly.20250919",
+    "@aztec/world-state": "3.0.0-nightly.20250919",
     "@google-cloud/storage": "^7.15.0",
     "@iarna/toml": "^2.2.5",
     "commander": "^12.1.0",
@@ -90,7 +89,7 @@
     "zod": "^3.23.8"
   },
   "devDependencies": {
-    "@aztec/noir-contracts.js": "3.0.0-nightly.20250917",
+    "@aztec/noir-contracts.js": "3.0.0-nightly.20250919",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/node": "^22.15.17",

package/src/block-factory/light.ts

@@ -6,7 +6,7 @@ import { createLogger } from '@aztec/foundation/log';
 import { L2Block } from '@aztec/stdlib/block';
 import type { IBlockFactory, MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
-import { type GlobalVariables, type ProcessedTx, toNumBlobFields } from '@aztec/stdlib/tx';
+import type { GlobalVariables, ProcessedTx } from '@aztec/stdlib/tx';
 import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
 
 import {
@@ -30,7 +30,7 @@ import {
 export class LightweightBlockFactory implements IBlockFactory {
   private globalVariables?: GlobalVariables;
   private l1ToL2Messages?: Fr[];
-
+  private startSpongeBlob?: SpongeBlob;
   private txs: ProcessedTx[] | undefined;
 
   private readonly logger = createLogger('lightweight-block-factory');
@@ -40,12 +40,19 @@ export class LightweightBlockFactory implements IBlockFactory {
     private telemetry: TelemetryClient = getTelemetryClient(),
   ) {}
 
-  async startNewBlock(globalVariables: GlobalVariables, l1ToL2Messages: Fr[]): Promise<void> {
+  async startNewBlock(
+    globalVariables: GlobalVariables,
+    l1ToL2Messages: Fr[],
+    // Must be provided to generate the correct spongeBlobHash for the block header if there's more than one block in the checkpoint.
+    startSpongeBlob?: SpongeBlob,
+    // Only insert l1 to l2 messages for the first block in a checkpoint.
+    isFirstBlock = true,
+  ): Promise<void> {
     this.logger.debug('Starting new block', { globalVariables: globalVariables.toInspect(), l1ToL2Messages });
     this.globalVariables = globalVariables;
-    this.l1ToL2Messages = padArrayEnd(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
+    this.l1ToL2Messages = isFirstBlock ? padArrayEnd(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP) : [];
+    this.startSpongeBlob = startSpongeBlob;
     this.txs = undefined;
-
     // Update L1 to L2 tree
     await this.db.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, this.l1ToL2Messages!);
   }
@@ -71,14 +78,17 @@ export class LightweightBlockFactory implements IBlockFactory {
       this.globalVariables!,
       this.l1ToL2Messages!,
       this.db,
+      this.startSpongeBlob,
     );
 
     header.state.validate();
 
-    await this.db.updateArchive(header);
+    const blockHeader = header.toBlockHeader();
+    await this.db.updateArchive(blockHeader);
     const newArchive = await getTreeSnapshot(MerkleTreeId.ARCHIVE, this.db);
 
     const block = new L2Block(newArchive, header, body);
+
     this.logger.debug(`Built block ${block.number}`, {
       globalVariables: this.globalVariables?.toInspect(),
       archiveRoot: newArchive.root.toString(),
@@ -100,15 +110,29 @@ export async function buildBlockWithCleanDB(
   globalVariables: GlobalVariables,
   l1ToL2Messages: Fr[],
   db: MerkleTreeWriteOperations,
+  startSpongeBlob?: SpongeBlob,
+  isFirstBlock = true,
   telemetry: TelemetryClient = getTelemetryClient(),
 ) {
-  const spongeBlobState = SpongeBlob.init(toNumBlobFields(txs));
+  const lastArchive = await getTreeSnapshot(MerkleTreeId.ARCHIVE, db);
   const builder = new LightweightBlockFactory(db, telemetry);
-  await builder.startNewBlock(globalVariables, l1ToL2Messages);
+  await builder.startNewBlock(globalVariables, l1ToL2Messages, startSpongeBlob, isFirstBlock);
   const l1ToL2MessageTree = await getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, db);
+
   for (const tx of txs) {
-    await insertSideEffectsAndBuildBaseRollupHints(tx, globalVariables, l1ToL2MessageTree, db, spongeBlobState);
+    // startSpongeBlob and proverId are only used for constructing private inputs of the base rollup.
+    // Their values don't matter here because we are not using the return private inputs to build the block.
+    const proverId = Fr.ZERO;
+    await insertSideEffectsAndBuildBaseRollupHints(
+      tx,
+      lastArchive,
+      l1ToL2MessageTree,
+      startSpongeBlob?.clone() ?? SpongeBlob.init(0),
+      proverId,
+      db,
+    );
   }
   await builder.addTxs(txs);
+
   return await builder.setBlockCompleted();
 }

package/src/mocks/fixtures.ts

@@ -5,10 +5,13 @@ import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import type { Logger } from '@aztec/foundation/log';
 import { fileURLToPath } from '@aztec/foundation/url';
+import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
+import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
 import { type CircuitSimulator, NativeACVMSimulator, WASMSimulatorWithBlobs } from '@aztec/simulator/server';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { GasFees } from '@aztec/stdlib/gas';
 import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
+import { CheckpointConstantData } from '@aztec/stdlib/rollup';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
 import type { ProcessedTx } from '@aztec/stdlib/tx';
 import { GlobalVariables } from '@aztec/stdlib/tx';
@@ -103,15 +106,30 @@ export const updateExpectedTreesFromTxs = async (db: MerkleTreeWriteOperations,
   }
 };
 
-export const makeGlobals = (blockNumber: number) => {
+export const makeGlobals = (blockNumber: number, slotNumber = blockNumber) => {
+  const checkpointConstants = makeCheckpointConstants(slotNumber);
   return new GlobalVariables(
-    Fr.ZERO,
-    Fr.ZERO,
+    checkpointConstants.chainId,
+    checkpointConstants.version,
     blockNumber /** block number */,
-    new Fr(blockNumber) /** slot number */,
+    new Fr(slotNumber) /** slot number */,
     BigInt(blockNumber) /** block number as pseudo-timestamp for testing */,
-    EthAddress.ZERO,
-    AztecAddress.ZERO,
-    GasFees.empty(),
+    checkpointConstants.coinbase,
+    checkpointConstants.feeRecipient,
+    checkpointConstants.gasFees,
   );
 };
+
+export const makeCheckpointConstants = (slotNumber: number) => {
+  return CheckpointConstantData.from({
+    chainId: Fr.ZERO,
+    version: Fr.ZERO,
+    vkTreeRoot: getVKTreeRoot(),
+    protocolContractTreeRoot,
+    proverId: Fr.ZERO,
+    slotNumber: new Fr(slotNumber),
+    coinbase: EthAddress.ZERO,
+    feeRecipient: AztecAddress.ZERO,
+    gasFees: GasFees.empty(),
+  });
+};

package/src/mocks/test_context.ts

@@ -1,4 +1,5 @@
 import type { BBProverConfig } from '@aztec/bb-prover';
+import { SpongeBlob } from '@aztec/blob-lib';
 import { NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/constants';
 import { padArrayEnd, times, timesParallel } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/fields';
@@ -11,10 +12,11 @@ import { SimpleContractDataSource } from '@aztec/simulator/public/fixtures';
 import { PublicProcessorFactory } from '@aztec/simulator/server';
 import { PublicDataWrite } from '@aztec/stdlib/avm';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { EthAddress, type L2Block } from '@aztec/stdlib/block';
+import { EthAddress, getBlockBlobFields } from '@aztec/stdlib/block';
 import type { ServerCircuitProver } from '@aztec/stdlib/interfaces/server';
+import type { CheckpointConstantData } from '@aztec/stdlib/rollup';
 import { makeBloatedProcessedTx } from '@aztec/stdlib/testing';
-import { type AppendOnlyTreeSnapshot, MerkleTreeId, PublicDataTreeLeaf } from '@aztec/stdlib/trees';
+import { MerkleTreeId, PublicDataTreeLeaf } from '@aztec/stdlib/trees';
 import { type BlockHeader, type GlobalVariables, type ProcessedTx, TreeSnapshots, type Tx } from '@aztec/stdlib/tx';
 import type { MerkleTreeAdminDatabase } from '@aztec/world-state';
 import { NativeWorldStateService } from '@aztec/world-state/native';
@@ -26,10 +28,17 @@ import { promises as fs } from 'fs';
 import { TestCircuitProver } from '../../../bb-prover/src/test/test_circuit_prover.js';
 import { buildBlockWithCleanDB } from '../block-factory/light.js';
 import { getTreeSnapshot } from '../orchestrator/block-building-helpers.js';
+import type { BlockProvingState } from '../orchestrator/block-proving-state.js';
 import { ProvingOrchestrator } from '../orchestrator/index.js';
 import { BrokerCircuitProverFacade } from '../proving_broker/broker_prover_facade.js';
 import { TestBroker } from '../test/mock_prover.js';
-import { getEnvironmentConfig, getSimulator, makeGlobals, updateExpectedTreesFromTxs } from './fixtures.js';
+import {
+  getEnvironmentConfig,
+  getSimulator,
+  makeCheckpointConstants,
+  makeGlobals,
+  updateExpectedTreesFromTxs,
+} from './fixtures.js';
 
 export class TestContext {
   private headers: Map<number, BlockHeader> = new Map();
@@ -37,6 +46,7 @@ export class TestContext {
 
   constructor(
     public worldState: MerkleTreeAdminDatabase,
+    public firstCheckpointNumber: Fr,
     public globalVariables: GlobalVariables,
     public prover: ServerCircuitProver,
     public broker: TestBroker,
@@ -55,20 +65,27 @@ export class TestContext {
     return this.orchestrator;
   }
 
+  public getCheckpointConstants(checkpointIndex = 0): CheckpointConstantData {
+    return makeCheckpointConstants(this.firstCheckpointNumber.toNumber() + checkpointIndex);
+  }
+
   static async new(
     logger: Logger,
     {
       proverCount = 4,
       createProver = async (bbConfig: BBProverConfig) => new TestCircuitProver(await getSimulator(bbConfig, logger)),
+      slotNumber = 1,
       blockNumber = 1,
     }: {
       proverCount?: number;
       createProver?: (bbConfig: BBProverConfig) => Promise<ServerCircuitProver>;
+      slotNumber?: number;
       blockNumber?: number;
     } = {},
   ) {
     const directoriesToCleanup: string[] = [];
-    const globalVariables = makeGlobals(blockNumber);
+    const firstCheckpointNumber = new Fr(slotNumber);
+    const globalVariables = makeGlobals(blockNumber, slotNumber);
 
     const feePayer = AztecAddress.fromNumber(42222);
     const initialFeePayerBalance = new Fr(10n ** 20n);
@@ -112,6 +129,7 @@ export class TestContext {
 
     return new this(
       ws,
+      firstCheckpointNumber,
       globalVariables,
       localProver,
       broker,
@@ -131,14 +149,10 @@ export class TestContext {
 
   public getBlockHeader(blockNumber: 0): BlockHeader;
   public getBlockHeader(blockNumber: number): BlockHeader | undefined;
-  public getBlockHeader(blockNumber = 0) {
+  public getBlockHeader(blockNumber = 0): BlockHeader | undefined {
     return blockNumber === 0 ? this.worldState.getCommitted().getInitialHeader() : this.headers.get(blockNumber);
   }
 
-  public setBlockHeader(header: BlockHeader, blockNumber: number) {
-    this.headers.set(blockNumber, header);
-  }
-
   public getPreviousBlockHeader(currentBlockNumber = this.blockNumber): BlockHeader {
     return this.getBlockHeader(currentBlockNumber - 1)!;
   }
@@ -155,9 +169,9 @@ export class TestContext {
     }
   }
 
-  private async makeProcessedTx(opts?: Parameters<typeof makeBloatedProcessedTx>[0]): Promise<ProcessedTx> {
+  async makeProcessedTx(opts?: Parameters<typeof makeBloatedProcessedTx>[0]): Promise<ProcessedTx> {
     const blockNum = (opts?.globalVariables ?? this.globalVariables).blockNumber;
-    const header = this.getBlockHeader(blockNum - 1);
+    const header = opts?.header ?? this.getBlockHeader(blockNum - 1);
     const tx = await makeBloatedProcessedTx({
       header,
       vkTreeRoot: getVKTreeRoot(),
@@ -177,11 +191,20 @@ export class TestContext {
   /** Creates a block with the given number of txs and adds it to world-state */
   public async makePendingBlock(
     numTxs: number,
-    numL1ToL2Messages: number = 0,
-    blockNumOrGlobals: GlobalVariables | number = this.globalVariables,
-    makeProcessedTxOpts: (index: number) => Partial<Parameters<typeof makeBloatedProcessedTx>[0]> = () => ({}),
+    {
+      checkpointIndex = 0,
+      numL1ToL2Messages = 0,
+      blockNumber = this.blockNumber,
+      makeProcessedTxOpts = () => ({}),
+    }: {
+      checkpointIndex?: number;
+      numL1ToL2Messages?: number;
+      blockNumber?: number;
+      makeProcessedTxOpts?: (index: number) => Partial<Parameters<typeof makeBloatedProcessedTx>[0]>;
+    } = {},
   ) {
-    const globalVariables = typeof blockNumOrGlobals === 'number' ? makeGlobals(blockNumOrGlobals) : blockNumOrGlobals;
+    const slotNumber = this.firstCheckpointNumber.toNumber() + checkpointIndex;
+    const globalVariables = makeGlobals(blockNumber, slotNumber);
     const blockNum = globalVariables.blockNumber;
     const db = await this.worldState.fork();
     const l1ToL2Messages = times(numL1ToL2Messages, i => new Fr(blockNum * 100 + i));
@@ -202,11 +225,83 @@ export class TestContext {
     await this.setTreeRoots(txs);
 
     const block = await buildBlockWithCleanDB(txs, globalVariables, l1ToL2Messages, db);
-    this.headers.set(blockNum, block.header);
+    this.headers.set(blockNum, block.getBlockHeader());
     await this.worldState.handleL2BlockAndMessages(block, l1ToL2Messages);
     return { block, txs, l1ToL2Messages };
   }
 
+  public async makePendingBlocksInCheckpoint(
+    numBlocks: number,
+    {
+      checkpointIndex = 0,
+      numTxsPerBlock = 1,
+      numL1ToL2Messages = 0,
+      firstBlockNumber = this.blockNumber + checkpointIndex * numBlocks,
+      makeProcessedTxOpts = () => ({}),
+    }: {
+      checkpointIndex?: number;
+      numTxsPerBlock?: number | number[];
+      numL1ToL2Messages?: number;
+      firstBlockNumber?: number;
+      makeProcessedTxOpts?: (index: number) => Partial<Parameters<typeof makeBloatedProcessedTx>[0]>;
+    } = {},
+  ) {
+    const slotNumber = this.firstCheckpointNumber.toNumber() + checkpointIndex;
+    const l1ToL2Messages = times(numL1ToL2Messages, i => new Fr(slotNumber * 100 + i));
+    const merkleTrees = await this.worldState.fork();
+    await merkleTrees.appendLeaves(
+      MerkleTreeId.L1_TO_L2_MESSAGE_TREE,
+      padArrayEnd(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP),
+    );
+    const newL1ToL2Snapshot = await getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, merkleTrees);
+
+    const blockGlobalVariables = times(numBlocks, i => makeGlobals(firstBlockNumber + i, slotNumber));
+    let totalTxs = 0;
+    const blockTxs = await timesParallel(numBlocks, blockIndex => {
+      const txIndexOffset = totalTxs;
+      const numTxs = typeof numTxsPerBlock === 'number' ? numTxsPerBlock : numTxsPerBlock[blockIndex];
+      totalTxs += numTxs;
+      return timesParallel(numTxs, txIndex =>
+        this.makeProcessedTx({
+          seed: (txIndexOffset + txIndex + 1) * 321 + (checkpointIndex + 1) * 123456,
+          globalVariables: blockGlobalVariables[blockIndex],
+          header: this.getBlockHeader(firstBlockNumber - 1),
+          newL1ToL2Snapshot,
+          ...makeProcessedTxOpts(txIndexOffset + txIndex),
+        }),
+      );
+    });
+
+    const blockBlobFields = blockTxs.map(txs => getBlockBlobFields(txs.map(tx => tx.txEffect)));
+    const totalNumBlobFields = blockBlobFields.reduce((acc, curr) => acc + curr.length, 0);
+    const spongeBlobState = SpongeBlob.init(totalNumBlobFields);
+
+    const blocks: { header: BlockHeader; txs: ProcessedTx[] }[] = [];
+    for (let i = 0; i < numBlocks; i++) {
+      const isFirstBlock = i === 0;
+      const blockNumber = firstBlockNumber + i;
+      const globalVariables = blockGlobalVariables[i];
+      const txs = blockTxs[i];
+
+      await this.setTreeRoots(txs);
+
+      const fork = await this.worldState.fork();
+      const blockMsgs = isFirstBlock ? l1ToL2Messages : [];
+      const block = await buildBlockWithCleanDB(txs, globalVariables, blockMsgs, fork, spongeBlobState, isFirstBlock);
+
+      const header = block.getBlockHeader();
+      this.headers.set(blockNumber, header);
+
+      await this.worldState.handleL2BlockAndMessages(block, blockMsgs, isFirstBlock);
+
+      await spongeBlobState.absorb(blockBlobFields[i]);
+
+      blocks.push({ header, txs });
+    }
+
+    return { blocks, l1ToL2Messages, blobFields: blockBlobFields.flat() };
+  }
+
   public async processPublicFunctions(
     txs: Tx[],
     {
@@ -265,12 +360,9 @@ class TestProvingOrchestrator extends ProvingOrchestrator {
 
   // Disable this check by default, since it requires seeding world state with the block being built
   // This is only enabled in some tests with multiple blocks that populate the pending chain via makePendingBlock
-  protected override verifyBuiltBlockAgainstSyncedState(
-    l2Block: L2Block,
-    newArchive: AppendOnlyTreeSnapshot,
-  ): Promise<void> {
+  protected override verifyBuiltBlockAgainstSyncedState(provingState: BlockProvingState): Promise<void> {
     if (this.isVerifyBuiltBlockAgainstSyncedStateEnabled) {
-      return super.verifyBuiltBlockAgainstSyncedState(l2Block, newArchive);
+      return super.verifyBuiltBlockAgainstSyncedState(provingState);
     }
     return Promise.resolve();
   }