@aztec/prover-client 0.0.1-commit.f504929 → 0.0.1-commit.f5a9928

package/src/orchestrator/{orchestrator.ts → checkpoint-sub-tree-orchestrator.ts}

@@ -1,43 +1,38 @@
-import { BatchedBlob, FinalBlobBatchingChallenges, SpongeBlob } from '@aztec/blob-lib/types';
+import type { SpongeBlob } from '@aztec/blob-lib/types';
 import {
+  type ARCHIVE_HEIGHT,
   L1_TO_L2_MSG_SUBTREE_HEIGHT,
   L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH,
   NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH,
-  NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
   NUM_BASE_PARITY_PER_ROOT_PARITY,
 } from '@aztec/constants';
-import { BlockNumber, EpochNumber } from '@aztec/foundation/branded-types';
-import { padArrayEnd } from '@aztec/foundation/collection';
+import { BlockNumber, type EpochNumber } from '@aztec/foundation/branded-types';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { AbortError } from '@aztec/foundation/error';
-import { type Logger, type LoggerBindings, createLogger } from '@aztec/foundation/log';
-import { promiseWithResolvers } from '@aztec/foundation/promise';
-import { assertLength } from '@aztec/foundation/serialize';
-import { pushTestData } from '@aztec/foundation/testing';
-import { elapsed } from '@aztec/foundation/timer';
+import type { LoggerBindings } from '@aztec/foundation/log';
+import { type PromiseWithResolvers, promiseWithResolvers } from '@aztec/foundation/promise';
+import type { SerialQueue } from '@aztec/foundation/queue';
+import { type Tuple, assertLength } from '@aztec/foundation/serialize';
 import type { TreeNodeLocation } from '@aztec/foundation/trees';
 import { EthAddress } from '@aztec/stdlib/block';
 import type {
-  EpochProver,
   ForkMerkleTreeOperations,
   MerkleTreeWriteOperations,
   PublicInputsAndRecursiveProof,
   ReadonlyWorldStateAccess,
   ServerCircuitProver,
 } from '@aztec/stdlib/interfaces/server';
-import type { Proof } from '@aztec/stdlib/proofs';
+import { appendL1ToL2MessagesToTree } from '@aztec/stdlib/messaging';
 import {
   type BaseRollupHints,
+  type BlockRollupPublicInputs,
   BlockRootEmptyTxFirstRollupPrivateInputs,
   BlockRootFirstRollupPrivateInputs,
   BlockRootSingleTxFirstRollupPrivateInputs,
   BlockRootSingleTxRollupPrivateInputs,
   CheckpointConstantData,
-  CheckpointRootSingleBlockRollupPrivateInputs,
   PrivateTxBaseRollupPrivateInputs,
-  PublicChonkVerifierPrivateInputs,
-  PublicChonkVerifierPublicInputs,
-  RootRollupPublicInputs,
+  type PublicChonkVerifierPublicInputs,
 } from '@aztec/stdlib/rollup';
 import type { CircuitName } from '@aztec/stdlib/stats';
 import { type AppendOnlyTreeSnapshot, MerkleTreeId } from '@aztec/stdlib/trees';
@@ -66,48 +61,90 @@ import {
   validateTx,
 } from './block-building-helpers.js';
 import type { BlockProvingState } from './block-proving-state.js';
-import type { CheckpointProvingState } from './checkpoint-proving-state.js';
-import { EpochProvingState, type ProvingResult, type TreeSnapshots } from './epoch-proving-state.js';
+import { CheckpointProvingState } from './checkpoint-proving-state.js';
+import type { ChonkCache } from './chonk-cache.js';
 import { ProvingOrchestratorMetrics } from './orchestrator_metrics.js';
+import { ProvingScheduler } from './proving-scheduler.js';
 import { TxProvingState } from './tx-proving-state.js';
 
 /**
- * Implements an event driven proving scheduler to build the recursive proof tree. The idea being:
- * 1. Transactions are provided to the scheduler post simulation.
- * 2. Tree insertions are performed as required to generate transaction specific proofs
- * 3. Those transaction specific proofs are generated in the necessary order accounting for dependencies
- * 4. Once a transaction is proven, it will be incorporated into a merge proof
- * 5. Merge proofs are produced at each level of the tree until the root proof is produced
+ * Result of proving a single checkpoint's block-level sub-tree.
  *
- * The proving implementation is determined by the provided prover. This could be for example a local prover or a remote prover pool.
+ * Contains the final block-rollup proof outputs that feed the checkpoint root rollup,
+ * plus the archive sibling path captured before any block in the checkpoint landed
+ * (the top-tree needs this to assemble the checkpoint root rollup hints).
  */
+export type SubTreeResult = {
+  blockProofOutputs: PublicInputsAndRecursiveProof<
+    BlockRollupPublicInputs,
+    typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH
+  >[];
+  previousArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>;
+};
+
+type TreeSnapshots = Map<MerkleTreeId, AppendOnlyTreeSnapshot>;
 
 /**
- * The orchestrator, managing the flow of recursive proving operations required to build the rollup proof tree.
+ * Base rollup hints as produced before proving: `PrivateBaseRollupHints` / `PublicBaseRollupHints`
+ * deliberately carry no recursive proof or verification key. The proof + VK are supplied later, when
+ * `TxProvingState.getBaseRollupTypeAndInputs` wraps these hints into the "with proof + VK" types —
+ * `PrivateTxBaseRollupPrivateInputs` (a `ChonkProofData`) or `PublicTxBaseRollupPrivateInputs` (a
+ * chonk-verifier proof + AVM proof). Those proofs are *required constructor arguments* of the wrapper
+ * types, so the only way to obtain a provable input is to populate them — they cannot be silently
+ * omitted. Naming the proof-less hints type here makes that boundary explicit at `prepareBaseRollupInputs`.
  */
-export class ProvingOrchestrator implements EpochProver {
-  private provingState: EpochProvingState | undefined = undefined;
-  private pendingProvingJobs: AbortController[] = [];
+type BaseRollupHintsWithoutProofAndVK = BaseRollupHints;
 
-  private provingPromise: Promise<ProvingResult> | undefined = undefined;
-  private metrics: ProvingOrchestratorMetrics;
-  // eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
+/**
+ * Orchestrates block-level proving for a single checkpoint, stopping at the boundary
+ * where checkpoint root rollup would otherwise begin. Used by the per-checkpoint
+ * `CheckpointProver` in production; the top-tree orchestrator then composes the
+ * sub-tree's block proofs into the epoch proof.
+ *
+ * Wiring: a single-checkpoint mini-proving session is owned by the constructor. The
+ * canonical way to obtain a fully-started sub-tree is the `start` static factory,
+ * which also drives the single internal `startCheckpoint` call. The sub-tree never
+ * escalates past the checkpoint root boundary; `getSubTreeResult()` resolves once
+ * every block-level proof in the checkpoint's tree is ready.
+ */
+export class CheckpointSubTreeOrchestrator extends ProvingScheduler {
+  /** The single checkpoint proving state this sub-tree owns. Allocated in the `start` factory. */
+  protected provingState: CheckpointProvingState | undefined = undefined;
+  private readonly subTreeResult: PromiseWithResolvers<SubTreeResult>;
+  private readonly metrics: ProvingOrchestratorMetrics;
   private dbs: Map<BlockNumber, MerkleTreeWriteOperations> = new Map();
-  private logger: Logger;
 
   constructor(
-    private dbProvider: ReadonlyWorldStateAccess & ForkMerkleTreeOperations,
-    private prover: ServerCircuitProver,
+    private readonly dbProvider: ReadonlyWorldStateAccess & ForkMerkleTreeOperations,
+    protected readonly prover: ServerCircuitProver,
     private readonly proverId: EthAddress,
+    /**
+     * Shared chonk-verifier proof cache. Every chonk-verifier proof started by this
+     * sub-tree lives on the cache and survives the sub-tree's cancellation, so a tx
+     * whose original checkpoint is reorged out and re-appears in a replacement
+     * checkpoint reuses the cached proof.
+     */
+    private readonly chonkCache: ChonkCache,
+    /** The epoch this sub-tree proves into. */
+    private readonly epochNumber: EpochNumber,
     private readonly cancelJobsOnStop: boolean = false,
+    deferredJobQueue: SerialQueue,
     telemetryClient: TelemetryClient = getTelemetryClient(),
     bindings?: LoggerBindings,
   ) {
-    this.logger = createLogger('prover-client:orchestrator', bindings);
-    this.metrics = new ProvingOrchestratorMetrics(telemetryClient, 'ProvingOrchestrator');
+    super(deferredJobQueue, 'prover-client:checkpoint-sub-tree-orchestrator', bindings);
+    this.metrics = new ProvingOrchestratorMetrics(telemetryClient, 'CheckpointSubTreeOrchestrator');
+
+    this.subTreeResult = promiseWithResolvers<SubTreeResult>();
+    // Mark the rejection branch as observed so a `cancel()` or proving failure does not
+    // surface an unhandled rejection when no consumer awaits getSubTreeResult().
+    this.subTreeResult.promise.catch(() => {});
   }
 
-  get tracer(): Tracer {
+  /** Tracks whether `cancel()` has been called; flows into the checkpoint state's isAlive hook. */
+  private cancelled = false;
+
+  public get tracer(): Tracer {
     return this.metrics.tracer;
   }
 
@@ -115,125 +152,125 @@ export class ProvingOrchestrator implements EpochProver {
     return this.proverId;
   }
 
-  public getNumActiveForks() {
+  public getNumActiveForks(): number {
     return this.dbs.size;
   }
 
-  public stop(): Promise<void> {
-    this.cancel();
-    return Promise.resolve();
+  /** Returns a promise that resolves when block-level proving completes for the checkpoint. */
+  public getSubTreeResult(): Promise<SubTreeResult> {
+    return this.subTreeResult.promise;
   }
 
-  public startNewEpoch(
-    epochNumber: EpochNumber,
-    totalNumCheckpoints: number,
-    finalBlobBatchingChallenges: FinalBlobBatchingChallenges,
-  ) {
-    if (this.provingState?.verifyState()) {
-      throw new Error(
-        `Cannot start epoch ${epochNumber} when epoch ${this.provingState.epochNumber} is still being processed.`,
-      );
+  /**
+   * Returns the archive sibling path captured at the internal checkpoint start.
+   * Available synchronously once `start` has resolved, before block-level proving
+   * completes. The top-tree consumer uses this to assemble checkpoint root rollup hints
+   * up-front so checkpoint root proofs can pipeline against in-flight sub-tree proving.
+   */
+  public getPreviousArchiveSiblingPath(): Tuple<Fr, typeof ARCHIVE_HEIGHT> {
+    if (!this.provingState) {
+      throw new Error('Checkpoint not started; call CheckpointSubTreeOrchestrator.start first.');
     }
-
-    const { promise: _promise, resolve, reject } = promiseWithResolvers<ProvingResult>();
-    const promise = _promise.catch((reason): ProvingResult => ({ status: 'failure', reason }));
-    this.logger.info(`Starting epoch ${epochNumber} with ${totalNumCheckpoints} checkpoints.`);
-    this.provingState = new EpochProvingState(
-      epochNumber,
-      totalNumCheckpoints,
-      finalBlobBatchingChallenges,
-      provingState => this.checkAndEnqueueCheckpointRootRollup(provingState),
-      resolve,
-      reject,
-    );
-    this.provingPromise = promise;
+    return this.provingState.getLastArchiveSiblingPath();
   }
 
   /**
-   * Starts a new checkpoint.
-   * @param checkpointIndex - The index of the checkpoint in the epoch.
-   * @param constants - The constants for this checkpoint.
-   * @param l1ToL2Messages - The set of L1 to L2 messages to be inserted at the beginning of this checkpoint.
-   * @param totalNumBlocks - The total number of blocks expected in the checkpoint (must be at least one).
-   * @param headerOfLastBlockInPreviousCheckpoint - The header of the last block in the previous checkpoint.
+   * Constructs and starts a sub-tree for a single checkpoint. The returned sub-tree
+   * has had its single internal checkpoint state allocated; callers proceed directly
+   * to per-block `startNewBlock` / `addTxs` / `setBlockCompleted`.
+   *
+   * If the internal start rejects, the partially-constructed sub-tree is stopped
+   * before the error propagates, so no broker resources leak.
    */
-  public async startNewCheckpoint(
-    checkpointIndex: number,
-    constants: CheckpointConstantData,
+  public static async start(
+    dbProvider: ReadonlyWorldStateAccess & ForkMerkleTreeOperations,
+    prover: ServerCircuitProver,
+    proverId: EthAddress,
+    chonkCache: ChonkCache,
+    epochNumber: EpochNumber,
+    cancelJobsOnStop: boolean,
+    deferredJobQueue: SerialQueue,
+    checkpointConstants: CheckpointConstantData,
     l1ToL2Messages: Fr[],
     totalNumBlocks: number,
     headerOfLastBlockInPreviousCheckpoint: BlockHeader,
-  ) {
-    if (!this.provingState) {
-      throw new Error('Empty epoch proving state. Call startNewEpoch before starting a checkpoint.');
+    telemetryClient: TelemetryClient = getTelemetryClient(),
+    bindings?: LoggerBindings,
+  ): Promise<CheckpointSubTreeOrchestrator> {
+    const subTree = new CheckpointSubTreeOrchestrator(
+      dbProvider,
+      prover,
+      proverId,
+      chonkCache,
+      epochNumber,
+      cancelJobsOnStop,
+      deferredJobQueue,
+      telemetryClient,
+      bindings,
+    );
+    try {
+      await subTree.startCheckpoint(
+        checkpointConstants,
+        l1ToL2Messages,
+        totalNumBlocks,
+        headerOfLastBlockInPreviousCheckpoint,
+      );
+      return subTree;
+    } catch (err) {
+      await subTree.stop().catch(() => {});
+      throw err;
     }
+  }
 
-    if (!this.provingState.isAcceptingCheckpoints()) {
-      throw new Error(`Epoch not accepting further checkpoints.`);
+  /**
+   * Kickstart chonk-verifier circuits via the shared `ChonkCache`. The cache owns the
+   * broker job lifecycle, so the proof survives this sub-tree's `cancel()` — a tx that
+   * ends up in a replacement checkpoint after a reorg can pick the cached promise up
+   * and skip re-proving.
+   */
+  public startChonkVerifierCircuits(txs: Tx[]): Promise<void> {
+    if (!this.provingState?.verifyState()) {
+      return Promise.reject(new Error('Sub-tree proving state is not active.'));
     }
-
-    // Fork world state at the end of the immediately previous block.
-    const lastBlockNumber = headerOfLastBlockInPreviousCheckpoint.globalVariables.blockNumber;
-    const db = await this.dbProvider.fork(lastBlockNumber);
-
-    const firstBlockNumber = BlockNumber(lastBlockNumber + 1);
-    this.dbs.set(firstBlockNumber, db);
-
-    // Get archive sibling path before any block in this checkpoint lands.
-    const lastArchiveSiblingPath = await getLastSiblingPath(MerkleTreeId.ARCHIVE, db);
-
-    // Insert all the l1 to l2 messages into the db. And get the states before and after the insertion.
-    const {
-      lastL1ToL2MessageTreeSnapshot,
-      lastL1ToL2MessageSubtreeRootSiblingPath,
-      newL1ToL2MessageTreeSnapshot,
-      newL1ToL2MessageSubtreeRootSiblingPath,
-    } = await this.updateL1ToL2MessageTree(l1ToL2Messages, db);
-
-    this.provingState.startNewCheckpoint(
-      checkpointIndex,
-      constants,
-      totalNumBlocks,
-      headerOfLastBlockInPreviousCheckpoint,
-      lastArchiveSiblingPath,
-      l1ToL2Messages,
-      lastL1ToL2MessageTreeSnapshot,
-      lastL1ToL2MessageSubtreeRootSiblingPath,
-      newL1ToL2MessageTreeSnapshot,
-      newL1ToL2MessageSubtreeRootSiblingPath,
-    );
+    const publicTxs = txs.filter(tx => tx.data.forPublic);
+    for (const tx of publicTxs) {
+      const txHash = tx.getTxHash().toString();
+      const inputs = getPublicChonkVerifierPrivateInputsFromTx(tx, this.getProverId().toField());
+      // Fire and forget — getOrEnqueueChonkVerifier later picks up the cached promise
+      // when the tx is processed inside its block.
+      void this.chonkCache.getOrCompute(txHash, signal =>
+        this.prover.getPublicChonkVerifierProof(inputs, signal, this.epochNumber),
+      );
+    }
+    return Promise.resolve();
   }
 
+  // ---------------- per-block driving (called by the per-checkpoint CheckpointProver) ----------------
+
   /**
-   * Starts off a new block
+   * Starts off a new block.
    * @param blockNumber - The block number
-   * @param timestamp - The timestamp of the block. This is only required for constructing the private inputs for the
-   * block that doesn't have any txs.
-   * @param totalNumTxs - The total number of txs in the block
+   * @param timestamp - The timestamp of the block. Required for empty blocks to construct private inputs.
+   * @param totalNumTxs - The total number of txs in the block.
    */
-  @trackSpan('ProvingOrchestrator.startNewBlock', blockNumber => ({
+  @trackSpan('CheckpointSubTreeOrchestrator.startNewBlock', blockNumber => ({
     [Attributes.BLOCK_NUMBER]: blockNumber,
   }))
   public async startNewBlock(blockNumber: BlockNumber, timestamp: UInt64, totalNumTxs: number) {
     if (!this.provingState) {
-      throw new Error('Empty epoch proving state. Call startNewEpoch before starting a block.');
+      throw new Error('Empty proving state. The checkpoint sub-tree has not been started.');
     }
 
-    const checkpointProvingState = this.provingState.getCheckpointProvingStateByBlockNumber(blockNumber);
-    if (!checkpointProvingState) {
-      throw new Error(`Checkpoint not started. Call startNewCheckpoint first.`);
-    }
-
-    if (!checkpointProvingState.isAcceptingBlocks()) {
+    if (!this.provingState.isAcceptingBlocks()) {
       throw new Error(`Checkpoint not accepting further blocks.`);
     }
 
-    const constants = checkpointProvingState.constants;
+    const constants = this.provingState.constants;
     this.logger.info(`Starting block ${blockNumber} for slot ${constants.slotNumber}.`);
 
-    // Fork the db only when it's not already set. The db for the first block is set in `startNewCheckpoint`.
+    // Fork the db only when it's not already set. The db for the first block is set in startCheckpoint.
     if (!this.dbs.has(blockNumber)) {
-      // Fork world state at the end of the immediately previous block
+      // Fork world state at the end of the immediately previous block.
       const db = await this.dbProvider.fork(BlockNumber(blockNumber - 1));
       this.dbs.set(blockNumber, db);
     }
@@ -243,7 +280,7 @@ export class ProvingOrchestrator implements EpochProver {
     const lastArchiveTreeSnapshot = await getTreeSnapshot(MerkleTreeId.ARCHIVE, db);
     const lastArchiveSiblingPath = await getRootTreeSiblingPath(MerkleTreeId.ARCHIVE, db);
 
-    const blockProvingState = checkpointProvingState.startNewBlock(
+    const blockProvingState = this.provingState.startNewBlock(
       blockNumber,
       timestamp,
       totalNumTxs,
@@ -254,12 +291,12 @@ export class ProvingOrchestrator implements EpochProver {
     // Enqueue base parity circuits for the first block in the checkpoint.
     if (blockProvingState.index === 0) {
       for (let i = 0; i < NUM_BASE_PARITY_PER_ROOT_PARITY; i++) {
-        this.enqueueBaseParityCircuit(checkpointProvingState, blockProvingState, i);
+        this.enqueueBaseParityCircuit(this.provingState, blockProvingState, i);
       }
     }
 
-    // Because `addTxs` won't be called for a block without txs, and that's where the sponge blob state is computed.
-    // We need to set its end sponge blob here, which will become the start sponge blob for the next block.
+    // Because `addTxs` won't be called for a block without txs, and that's where the sponge blob state is computed,
+    // set its end sponge blob here. This becomes the start sponge blob for the next block.
     if (totalNumTxs === 0) {
       const endState = await db.getStateReference();
       blockProvingState.setEndState(endState);
@@ -268,29 +305,25 @@ export class ProvingOrchestrator implements EpochProver {
       const blockEndBlobFields = blockProvingState.getBlockEndBlobFields();
       await endSpongeBlob.absorb(blockEndBlobFields);
       blockProvingState.setEndSpongeBlob(endSpongeBlob);
-
-      // Try to accumulate the out hashes and blobs as far as we can:
-      await this.provingState.accumulateCheckpointOutHashes();
-      await this.provingState.setBlobAccumulators();
     }
   }
 
   /**
-   * The interface to add simulated transactions to the scheduler. This can only be called once per block.
+   * The interface to add simulated transactions to the scheduler. Called at most once per block.
    * @param txs - The transactions to be proven
    */
-  @trackSpan('ProvingOrchestrator.addTxs', txs => ({
+  @trackSpan('CheckpointSubTreeOrchestrator.addTxs', txs => ({
     [Attributes.BLOCK_TXS_COUNT]: txs.length,
   }))
   public async addTxs(txs: ProcessedTx[]): Promise<void> {
     if (!this.provingState) {
-      throw new Error(`Empty epoch proving state. Call startNewEpoch before adding txs.`);
+      throw new Error(`Empty proving state. The checkpoint sub-tree has not been started.`);
     }
 
     if (!txs.length) {
-      // To avoid an ugly throw below. If we require an empty block, we can just call setBlockCompleted
-      // on a block with no txs. We cannot do that here because we cannot find the blockNumber without any txs.
-      this.logger.warn(`Provided no txs to orchestrator addTxs.`);
+      // Empty block: setBlockCompleted handles this without addTxs being called. Bail to
+      // avoid the throw below (we cannot find the blockNumber without any txs).
+      this.logger.verbose(`Provided no txs to addTxs.`);
       return;
     }
 
@@ -366,46 +399,13 @@ export class ProvingOrchestrator implements EpochProver {
     await spongeBlobState.absorb(blockEndBlobFields);
 
     provingState.setEndSpongeBlob(spongeBlobState);
-
-    // Txs have been added to the block. Now try to accumulate the out hashes and blobs as far as we can:
-    await this.provingState.accumulateCheckpointOutHashes();
-    await this.provingState.setBlobAccumulators();
-  }
-
-  /**
-   * Kickstarts chonk verifier circuits for the specified txs. These will be used during epoch proving.
-   * Note that if the chonk verifier circuits are not started this way, they will be started nontheless after processing.
-   */
-  @trackSpan('ProvingOrchestrator.startChonkVerifierCircuits')
-  public startChonkVerifierCircuits(txs: Tx[]) {
-    if (!this.provingState?.verifyState()) {
-      throw new Error(`Empty epoch proving state. call startNewEpoch before starting chonk verifier circuits.`);
-    }
-    const publicTxs = txs.filter(tx => tx.data.forPublic);
-    for (const tx of publicTxs) {
-      const txHash = tx.getTxHash().toString();
-      const privateInputs = getPublicChonkVerifierPrivateInputsFromTx(tx, this.proverId.toField());
-      const tubeProof =
-        promiseWithResolvers<
-          PublicInputsAndRecursiveProof<
-            PublicChonkVerifierPublicInputs,
-            typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH
-          >
-        >();
-      this.logger.debug(`Starting chonk verifier circuit for tx ${txHash}`);
-      this.doEnqueueChonkVerifier(txHash, privateInputs, proof => {
-        tubeProof.resolve(proof);
-      });
-      this.provingState.cachedChonkVerifierProofs.set(txHash, tubeProof.promise);
-    }
-    return Promise.resolve();
   }
 
   /**
    * Marks the block as completed.
    * Computes the block header and updates the archive tree.
    */
-  @trackSpan('ProvingOrchestrator.setBlockCompleted', (blockNumber: BlockNumber) => ({
+  @trackSpan('CheckpointSubTreeOrchestrator.setBlockCompleted', (blockNumber: BlockNumber) => ({
     [Attributes.BLOCK_NUMBER]: blockNumber,
   }))
   public async setBlockCompleted(blockNumber: BlockNumber, expectedHeader?: BlockHeader): Promise<BlockHeader> {
@@ -460,66 +460,17 @@ export class ProvingOrchestrator implements EpochProver {
     return header;
   }
 
-  // Flagged as protected to disable in certain unit tests
-  protected async verifyBuiltBlockAgainstSyncedState(provingState: BlockProvingState) {
-    const builtBlockHeader = provingState.getBuiltBlockHeader();
-    if (!builtBlockHeader) {
-      this.logger.debug('Block header not built yet, skipping header check.');
-      return;
-    }
-
-    const output = provingState.getBlockRootRollupOutput();
-    if (!output) {
-      this.logger.debug('Block root rollup proof not built yet, skipping header check.');
-      return;
-    }
-
-    const newArchive = provingState.getBuiltArchive();
-    if (!newArchive) {
-      this.logger.debug('Archive snapshot not yet captured, skipping header check.');
-      return;
-    }
-
-    const header = await buildHeaderFromCircuitOutputs(output);
-
-    if (!(await header.hash()).equals(await builtBlockHeader.hash())) {
-      this.logger.error(`Block header mismatch.\nCircuit: ${inspect(header)}\nComputed: ${inspect(builtBlockHeader)}`);
-      provingState.reject(`Block header hash mismatch.`);
-      return;
-    }
-
-    const blockNumber = provingState.blockNumber;
-    const syncedArchive = await getTreeSnapshot(MerkleTreeId.ARCHIVE, this.dbProvider.getSnapshot(blockNumber));
-    if (!syncedArchive.equals(newArchive)) {
-      this.logger.error(
-        `Archive tree mismatch for block ${blockNumber}: world state synced to ${inspect(
-          syncedArchive,
-        )} but built ${inspect(newArchive)}`,
-      );
-      provingState.reject(`Archive tree mismatch.`);
-      return;
-    }
-
-    const circuitArchive = output.newArchive;
-    if (!newArchive.equals(circuitArchive)) {
-      this.logger.error(`New archive mismatch.\nCircuit: ${output.newArchive}\nComputed: ${newArchive}`);
-      provingState.reject(`New archive mismatch.`);
-      return;
-    }
-  }
+  // ---------------- lifecycle ----------------
 
   /**
-   * Cancel any further proving.
-   * If cancelJobsOnStop is true, aborts all pending jobs with the broker (which marks them as 'Aborted').
-   * If cancelJobsOnStop is false (default), jobs remain in the broker queue and can be reused on restart/reorg.
+   * Cancels any further proving. If `cancelJobsOnStop` was set, aborts all pending broker jobs
+   * (used on reorg). Otherwise jobs remain in the broker queue and can be reused on restart.
    */
   public cancel() {
-    if (this.cancelJobsOnStop) {
-      for (const controller of this.pendingProvingJobs) {
-        controller.abort();
-      }
-    }
-
+    this.cancelled = true;
+    this.resetSchedulerState(this.cancelJobsOnStop);
+    // Reject the proving state (and hence subTreeResult) so anyone awaiting the sub-tree result
+    // is released rather than hanging — matching TopTreeOrchestrator.cancel().
     this.provingState?.cancel();
 
     for (const [blockNumber, db] of this.dbs.entries()) {
@@ -528,121 +479,73 @@ export class ProvingOrchestrator implements EpochProver {
     this.dbs.clear();
   }
 
-  private getDbForBlock(blockNumber: BlockNumber): MerkleTreeWriteOperations {
-    const db = this.dbs.get(blockNumber);
-    if (!db) {
-      throw new Error(`World state fork for block ${blockNumber} not found.`);
-    }
-    return db;
+  protected override cancelInternal(): void {
+    this.cancel();
   }
 
-  /**
-   * Returns the proof for the current epoch.
-   */
-  public async finalizeEpoch(): Promise<{
-    publicInputs: RootRollupPublicInputs;
-    proof: Proof;
-    batchedBlobInputs: BatchedBlob;
-  }> {
-    if (!this.provingState || !this.provingPromise) {
-      throw new Error(`Invalid proving state, an epoch must be proven before it can be finalized`);
-    }
-
-    const result = await this.provingPromise!;
-    if (result.status === 'failure') {
-      throw new Error(`Epoch proving failed: ${result.reason}`);
-    }
-
-    await this.provingState.finalizeBatchedBlob();
-
-    const epochProofResult = this.provingState.getEpochProofResult();
-
-    pushTestData('epochProofResult', {
-      proof: epochProofResult.proof.toString(),
-      publicInputs: epochProofResult.publicInputs.toString(),
-    });
-
-    return epochProofResult;
-  }
+  // ---------------- private: per-checkpoint init ----------------
 
   /**
-   * Enqueue a job to be scheduled
-   * @param provingState - The proving state object being operated on
-   * @param jobType - The type of job to be queued
-   * @param job - The actual job, returns a promise notifying of the job's completion
+   * Internal driver for the single-checkpoint init. Allocates the world-state fork,
+   * inserts L1-to-L2 messages, and creates the per-checkpoint proving state with this
+   * sub-tree as its parent. Only called once, from the `start` factory.
    */
-  private deferredProving<T>(
-    provingState: EpochProvingState | CheckpointProvingState | BlockProvingState,
-    request: (signal: AbortSignal) => Promise<T>,
-    callback: (result: T) => void | Promise<void>,
-  ) {
-    if (!provingState.verifyState()) {
-      this.logger.debug(`Not enqueuing job, state no longer valid`);
-      return;
+  private async startCheckpoint(
+    constants: CheckpointConstantData,
+    l1ToL2Messages: Fr[],
+    totalNumBlocks: number,
+    headerOfLastBlockInPreviousCheckpoint: BlockHeader,
+  ): Promise<void> {
+    if (this.provingState) {
+      throw new Error('Checkpoint sub-tree already started.');
     }
 
-    const controller = new AbortController();
-    this.pendingProvingJobs.push(controller);
-
-    // We use a 'safeJob'. We don't want promise rejections in the proving pool, we want to capture the error here
-    // and reject the proving job whilst keeping the event loop free of rejections
-    const safeJob = async () => {
-      try {
-        // there's a delay between enqueueing this job and it actually running
-        if (controller.signal.aborted) {
-          return;
-        }
-
-        const result = await request(controller.signal);
-        if (!provingState.verifyState()) {
-          this.logger.debug(`State no longer valid, discarding result`);
-          return;
-        }
-
-        // we could have been cancelled whilst waiting for the result
-        // and the prover ignored the signal. Drop the result in that case
-        if (controller.signal.aborted) {
-          return;
-        }
+    // Fork world state at the end of the immediately previous block.
+    const lastBlockNumber = headerOfLastBlockInPreviousCheckpoint.globalVariables.blockNumber;
+    const db = await this.dbProvider.fork(lastBlockNumber);
 
-        await callback(result);
-      } catch (err) {
-        if (err instanceof AbortError) {
-          // operation was cancelled, probably because the block was cancelled
-          // drop this result
-          return;
-        }
+    const firstBlockNumber = BlockNumber(lastBlockNumber + 1);
+    this.dbs.set(firstBlockNumber, db);
 
-        this.logger.error(`Error thrown when proving job`, err);
-        provingState!.reject(`${err}`);
-      } finally {
-        const index = this.pendingProvingJobs.indexOf(controller);
-        if (index > -1) {
-          this.pendingProvingJobs.splice(index, 1);
-        }
-      }
-    };
+    // Get archive sibling path before any block in this checkpoint lands.
+    const lastArchiveSiblingPath = await getLastSiblingPath(MerkleTreeId.ARCHIVE, db);
 
-    // let the callstack unwind before adding the job to the queue
-    setImmediate(() => void safeJob());
-  }
+    // Insert all the l1 to l2 messages into the db. Get the states before and after the insertion.
+    const {
+      lastL1ToL2MessageTreeSnapshot,
+      lastL1ToL2MessageSubtreeRootSiblingPath,
+      newL1ToL2MessageTreeSnapshot,
+      newL1ToL2MessageSubtreeRootSiblingPath,
+    } = await this.updateL1ToL2MessageTree(l1ToL2Messages, db);
 
-  private async updateL1ToL2MessageTree(l1ToL2Messages: Fr[], db: MerkleTreeWriteOperations) {
-    const l1ToL2MessagesPadded = padArrayEnd<Fr, number>(
+    this.provingState = new CheckpointProvingState(
+      /* index */ 0,
+      constants,
+      totalNumBlocks,
+      headerOfLastBlockInPreviousCheckpoint,
+      lastArchiveSiblingPath,
       l1ToL2Messages,
-      Fr.ZERO,
-      NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
-      'Too many L1 to L2 messages',
+      lastL1ToL2MessageTreeSnapshot,
+      lastL1ToL2MessageSubtreeRootSiblingPath,
+      newL1ToL2MessageTreeSnapshot,
+      newL1ToL2MessageSubtreeRootSiblingPath,
+      Number(this.epochNumber),
+      /* isAlive */ () => !this.cancelled,
+      /* onReject */ reason => this.subTreeResult.reject(new Error(reason)),
     );
+  }
+
+  // ---------------- private: per-block proof orchestration ----------------
 
+  private async updateL1ToL2MessageTree(l1ToL2Messages: Fr[], db: MerkleTreeWriteOperations) {
     const lastL1ToL2MessageTreeSnapshot = await getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, db);
     const lastL1ToL2MessageSubtreeRootSiblingPath = assertLength(
       await getSubtreeSiblingPath(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, L1_TO_L2_MSG_SUBTREE_HEIGHT, db),
       L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH,
     );
 
-    // Update the local trees to include the new l1 to l2 messages
-    await db.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, l1ToL2MessagesPadded);
+    // Update the local trees to include the new l1 to l2 messages.
+    await appendL1ToL2MessagesToTree(db, l1ToL2Messages);
 
     const newL1ToL2MessageTreeSnapshot = await getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, db);
     const newL1ToL2MessageSubtreeRootSiblingPath = assertLength(
@@ -658,8 +561,8 @@ export class ProvingOrchestrator implements EpochProver {
     };
   }
 
-  // Updates the merkle trees for a transaction. The first enqueued job for a transaction
-  @trackSpan('ProvingOrchestrator.prepareBaseRollupInputs', tx => ({
+  // Updates the merkle trees for a transaction. The first enqueued job for a transaction.
+  @trackSpan('CheckpointSubTreeOrchestrator.prepareBaseRollupInputs', tx => ({
     [Attributes.TX_HASH]: tx.hash.toString(),
   }))
   private async prepareBaseRollupInputs(
@@ -668,21 +571,21 @@ export class ProvingOrchestrator implements EpochProver {
     newL1ToL2MessageTreeSnapshot: AppendOnlyTreeSnapshot,
     startSpongeBlob: SpongeBlob,
     db: MerkleTreeWriteOperations,
-  ): Promise<[BaseRollupHints, TreeSnapshots]> {
-    // We build the base rollup inputs using a mock proof and verification key.
-    // These will be overwritten later once we have proven the chonk verifier circuit and any public kernels
-    const [ms, hints] = await elapsed(
-      insertSideEffectsAndBuildBaseRollupHints(
-        tx,
-        lastArchive,
-        newL1ToL2MessageTreeSnapshot,
-        startSpongeBlob,
-        this.proverId.toField(),
-        db,
-      ),
+  ): Promise<[BaseRollupHintsWithoutProofAndVK, TreeSnapshots]> {
+    // These hints deliberately carry no recursive proof or verification key — see
+    // BaseRollupHintsWithoutProofAndVK. The tx's proof + VK are attached later in
+    // TxProvingState.getBaseRollupTypeAndInputs from the proven chonk-verifier / kernel / AVM
+    // proofs, which are required there and so cannot be silently omitted.
+    const start = performance.now();
+    const hints = await insertSideEffectsAndBuildBaseRollupHints(
+      tx,
+      lastArchive,
+      newL1ToL2MessageTreeSnapshot,
+      startSpongeBlob,
+      this.proverId.toField(),
+      db,
     );
-
-    this.metrics.recordBaseRollupInputs(ms);
+    this.metrics.recordBaseRollupInputs(performance.now() - start);
 
     const promises = [MerkleTreeId.NOTE_HASH_TREE, MerkleTreeId.NULLIFIER_TREE, MerkleTreeId.PUBLIC_DATA_TREE].map(
       async (id: MerkleTreeId) => {
@@ -694,8 +597,8 @@ export class ProvingOrchestrator implements EpochProver {
     return [hints, treeSnapshots];
   }
 
-  // Executes the base rollup circuit and stored the output as intermediate state for the parent merge/root circuit
-  // Executes the next level of merge if all inputs are available
+  // Executes the base rollup circuit and stores the output as intermediate state for the parent merge/root circuit.
+  // Executes the next level of merge if all inputs are available.
   private enqueueBaseRollup(provingState: BlockProvingState, txIndex: number) {
     if (!provingState.verifyState()) {
       this.logger.debug('Not running base rollup, state invalid');
@@ -715,17 +618,10 @@ export class ProvingOrchestrator implements EpochProver {
 
     this.deferredProving(
       provingState,
-      wrapCallbackInSpan(
-        this.tracer,
-        `ProvingOrchestrator.prover.${
-          inputs instanceof PrivateTxBaseRollupPrivateInputs
-            ? 'getPrivateTxBaseRollupProof'
-            : 'getPublicTxBaseRollupProof'
-        }`,
-        {
-          [Attributes.TX_HASH]: processedTx.hash.toString(),
-          [Attributes.PROTOCOL_CIRCUIT_NAME]: rollupType,
-        },
+      this.wrapCircuitCall(
+        inputs instanceof PrivateTxBaseRollupPrivateInputs
+          ? 'getPrivateTxBaseRollupProof'
+          : 'getPublicTxBaseRollupProof',
         signal => {
           if (inputs instanceof PrivateTxBaseRollupPrivateInputs) {
             return this.prover.getPrivateTxBaseRollupProof(inputs, signal, provingState.epochNumber);
@@ -733,6 +629,7 @@ export class ProvingOrchestrator implements EpochProver {
             return this.prover.getPublicTxBaseRollupProof(inputs, signal, provingState.epochNumber);
           }
         },
+        { [Attributes.TX_HASH]: processedTx.hash.toString(), [Attributes.PROTOCOL_CIRCUIT_NAME]: rollupType },
       ),
       result => {
         this.logger.debug(`Completed proof for ${rollupType} for tx ${processedTx.hash.toString()}`);
@@ -747,72 +644,53 @@ export class ProvingOrchestrator implements EpochProver {
     );
   }
 
-  // Enqueues the public chonk verifier circuit for a given transaction index, or reuses the one already enqueued.
-  // Once completed, will enqueue the the public tx base rollup.
+  /**
+   * Route the tx's chonk-verifier dependency through the per-epoch context: read the
+   * cached promise (or enqueue if missing), then `.then(handleResult)` to progress to
+   * the base rollup once the proof lands.
+   */
   private getOrEnqueueChonkVerifier(provingState: BlockProvingState, txIndex: number) {
     if (!provingState.verifyState()) {
-      this.logger.debug('Not running chonk verifier circuit, state invalid');
       return;
     }
 
     const txProvingState = provingState.getTxProvingState(txIndex);
     const txHash = txProvingState.processedTx.hash.toString();
-    NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH;
+
     const handleResult = (
       result: PublicInputsAndRecursiveProof<
         PublicChonkVerifierPublicInputs,
         typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH
       >,
     ) => {
-      this.logger.debug(`Got chonk verifier proof for tx index: ${txIndex}`, { txHash });
+      if (!provingState.verifyState()) {
+        return;
+      }
       txProvingState.setPublicChonkVerifierProof(result);
-      this.provingState?.cachedChonkVerifierProofs.delete(txHash);
       this.checkAndEnqueueBaseRollup(provingState, txIndex);
     };
 
-    if (this.provingState?.cachedChonkVerifierProofs.has(txHash)) {
-      this.logger.debug(`Chonk verifier proof already enqueued for tx index: ${txIndex}`, { txHash });
-      void this.provingState!.cachedChonkVerifierProofs.get(txHash)!.then(handleResult);
-      return;
-    }
-
-    this.logger.debug(`Enqueuing chonk verifier circuit for tx index: ${txIndex}`);
-    this.doEnqueueChonkVerifier(txHash, txProvingState.getPublicChonkVerifierPrivateInputs(), handleResult);
-  }
-
-  private doEnqueueChonkVerifier(
-    txHash: string,
-    inputs: PublicChonkVerifierPrivateInputs,
-    handler: (
-      result: PublicInputsAndRecursiveProof<
-        PublicChonkVerifierPublicInputs,
-        typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH
-      >,
-    ) => void,
-    provingState: EpochProvingState | BlockProvingState = this.provingState!,
-  ) {
-    if (!provingState.verifyState()) {
-      this.logger.debug('Not running chonk verifier circuit, state invalid');
-      return;
-    }
-
-    this.deferredProving(
-      provingState,
-      wrapCallbackInSpan(
-        this.tracer,
-        'ProvingOrchestrator.prover.getPublicChonkVerifierProof',
-        {
-          [Attributes.TX_HASH]: txHash,
-          [Attributes.PROTOCOL_CIRCUIT_NAME]: 'chonk-verifier-public' satisfies CircuitName,
-        },
-        signal => this.prover.getPublicChonkVerifierProof(inputs, signal, provingState.epochNumber),
+    const promise = this.chonkCache.getOrCompute(txHash, signal =>
+      this.prover.getPublicChonkVerifierProof(
+        txProvingState.getPublicChonkVerifierPrivateInputs(),
+        signal,
+        this.epochNumber,
       ),
-      handler,
     );
+    void promise.then(handleResult).catch(err => {
+      // The cache self-cleans on rejection, so a replacement sub-tree for this tx will see the
+      // miss and re-enqueue. But if this proving state is still active, the failure must abort
+      // it: otherwise the base rollup for this tx is never enqueued and the checkpoint (and
+      // epoch) orchestrators hang forever waiting for a proof that will never arrive.
+      if (err instanceof AbortError || !provingState.verifyState()) {
+        return;
+      }
+      this.logger.error(`Chonk verifier proof failed for tx ${txHash}`, err);
+      provingState.reject(`Chonk verifier proof failed for tx ${txHash}: ${err}`);
+    });
   }
 
-  // Executes the merge rollup circuit and stored the output as intermediate state for the parent merge/block root circuit
-  // Enqueues the next level of merge if all inputs are available
+  // Executes the merge rollup circuit. Enqueues the next level of merge if all inputs are available.
   private enqueueMergeRollup(provingState: BlockProvingState, location: TreeNodeLocation) {
     if (!provingState.verifyState()) {
       this.logger.debug('Not running merge rollup. State no longer valid.');
@@ -828,13 +706,10 @@ export class ProvingOrchestrator implements EpochProver {
 
     this.deferredProving(
       provingState,
-      wrapCallbackInSpan(
-        this.tracer,
-        'ProvingOrchestrator.prover.getTxMergeRollupProof',
-        {
-          [Attributes.PROTOCOL_CIRCUIT_NAME]: 'rollup-tx-merge' satisfies CircuitName,
-        },
+      this.wrapCircuitCall(
+        'getTxMergeRollupProof',
         signal => this.prover.getTxMergeRollupProof(inputs, signal, provingState.epochNumber),
+        { [Attributes.PROTOCOL_CIRCUIT_NAME]: 'rollup-tx-merge' satisfies CircuitName },
       ),
       result => {
         provingState.setMergeRollupProof(location, result);
@@ -843,7 +718,7 @@ export class ProvingOrchestrator implements EpochProver {
     );
   }
 
-  // Executes the block root rollup circuit
+  // Executes the block root rollup circuit.
   private enqueueBlockRootRollup(provingState: BlockProvingState) {
     if (!provingState.verifyState()) {
       this.logger.debug('Not running block root rollup, state no longer valid');
@@ -861,12 +736,8 @@ export class ProvingOrchestrator implements EpochProver {
 
     this.deferredProving(
       provingState,
-      wrapCallbackInSpan(
-        this.tracer,
-        'ProvingOrchestrator.prover.getBlockRootRollupProof',
-        {
-          [Attributes.PROTOCOL_CIRCUIT_NAME]: rollupType,
-        },
+      this.wrapCircuitCall(
+        'getBlockRootRollupProof',
         signal => {
           if (inputs instanceof BlockRootFirstRollupPrivateInputs) {
             return this.prover.getBlockRootFirstRollupProof(inputs, signal, provingState.epochNumber);
@@ -880,9 +751,14 @@ export class ProvingOrchestrator implements EpochProver {
             return this.prover.getBlockRootRollupProof(inputs, signal, provingState.epochNumber);
           }
         },
+        { [Attributes.PROTOCOL_CIRCUIT_NAME]: rollupType },
       ),
       async result => {
-        this.logger.debug(`Completed ${rollupType} proof for block ${provingState.blockNumber}`);
+        this.logger.debug(`Completed ${rollupType} proof for block ${provingState.blockNumber}`, {
+          blockNumber: provingState.blockNumber,
+          checkpointIndex: provingState.parentCheckpoint.index,
+          ...result.inputs.toInspect(),
+        });
 
         const leafLocation = provingState.setBlockRootRollupProof(result);
         const checkpointProvingState = provingState.parentCheckpoint;
@@ -892,16 +768,15 @@ export class ProvingOrchestrator implements EpochProver {
         await this.verifyBuiltBlockAgainstSyncedState(provingState);
 
         if (checkpointProvingState.totalNumBlocks === 1) {
-          await this.checkAndEnqueueCheckpointRootRollup(checkpointProvingState);
+          this.checkAndEnqueueSubTreeResolution(checkpointProvingState);
         } else {
-          await this.checkAndEnqueueNextBlockMergeRollup(checkpointProvingState, leafLocation);
+          this.checkAndEnqueueNextBlockMergeRollup(checkpointProvingState, leafLocation);
         }
       },
     );
   }
 
-  // Executes the base parity circuit and stores the intermediate state for the root parity circuit
-  // Enqueues the root parity circuit if all inputs are available
+  // Executes the base parity circuit. Enqueues the root parity circuit if all inputs are available.
   private enqueueBaseParityCircuit(
     checkpointProvingState: CheckpointProvingState,
     provingState: BlockProvingState,
@@ -921,13 +796,10 @@ export class ProvingOrchestrator implements EpochProver {
 
     this.deferredProving(
       provingState,
-      wrapCallbackInSpan(
-        this.tracer,
-        'ProvingOrchestrator.prover.getBaseParityProof',
-        {
-          [Attributes.PROTOCOL_CIRCUIT_NAME]: 'parity-base' satisfies CircuitName,
-        },
+      this.wrapCircuitCall(
+        'getBaseParityProof',
         signal => this.prover.getBaseParityProof(inputs, signal, provingState.epochNumber),
+        { [Attributes.PROTOCOL_CIRCUIT_NAME]: 'parity-base' satisfies CircuitName },
       ),
       provingOutput => {
         provingState.setBaseParityProof(baseParityIndex, provingOutput);
@@ -940,12 +812,11 @@ export class ProvingOrchestrator implements EpochProver {
     if (!provingState.isReadyForRootParity()) {
       return;
     }
-
     this.enqueueRootParityCircuit(provingState);
   }
 
-  // Runs the root parity circuit ans stored the outputs
-  // Enqueues the root rollup proof if all inputs are available
+  // Runs the root parity circuit and stores the outputs.
+  // Enqueues the block root rollup if all inputs are available.
   private enqueueRootParityCircuit(provingState: BlockProvingState) {
     if (!provingState.verifyState()) {
       this.logger.debug('Not running root parity. State no longer valid.');
@@ -961,13 +832,10 @@ export class ProvingOrchestrator implements EpochProver {
 
     this.deferredProving(
       provingState,
-      wrapCallbackInSpan(
-        this.tracer,
-        'ProvingOrchestrator.prover.getRootParityProof',
-        {
-          [Attributes.PROTOCOL_CIRCUIT_NAME]: 'parity-root' satisfies CircuitName,
-        },
+      this.wrapCircuitCall(
+        'getRootParityProof',
         signal => this.prover.getRootParityProof(inputs, signal, provingState.epochNumber),
+        { [Attributes.PROTOCOL_CIRCUIT_NAME]: 'parity-root' satisfies CircuitName },
       ),
       result => {
         provingState.setRootParityProof(result);
@@ -976,8 +844,7 @@ export class ProvingOrchestrator implements EpochProver {
     );
   }
 
-  // Executes the block merge rollup circuit and stored the output as intermediate state for the parent merge/block root circuit
-  // Enqueues the next level of merge if all inputs are available
+  // Executes the block merge rollup circuit.
   private enqueueBlockMergeRollup(provingState: CheckpointProvingState, location: TreeNodeLocation) {
     if (!provingState.verifyState()) {
       this.logger.debug('Not running block merge rollup. State no longer valid.');
@@ -992,170 +859,19 @@ export class ProvingOrchestrator implements EpochProver {
     const inputs = provingState.getBlockMergeRollupInputs(location);
     this.deferredProving(
       provingState,
-      wrapCallbackInSpan(
-        this.tracer,
-        'ProvingOrchestrator.prover.getBlockMergeRollupProof',
-        {
-          [Attributes.PROTOCOL_CIRCUIT_NAME]: 'rollup-block-merge' satisfies CircuitName,
-        },
+      this.wrapCircuitCall(
+        'getBlockMergeRollupProof',
         signal => this.prover.getBlockMergeRollupProof(inputs, signal, provingState.epochNumber),
-      ),
-      async result => {
-        provingState.setBlockMergeRollupProof(location, result);
-        await this.checkAndEnqueueNextBlockMergeRollup(provingState, location);
-      },
-    );
-  }
-
-  private async enqueueCheckpointRootRollup(provingState: CheckpointProvingState) {
-    if (!provingState.verifyState()) {
-      this.logger.debug('Not running checkpoint root rollup. State no longer valid.');
-      return;
-    }
-
-    if (!provingState.tryStartProvingCheckpointRoot()) {
-      this.logger.debug('Checkpoint root rollup already started.');
-      return;
-    }
-
-    const rollupType = provingState.getCheckpointRootRollupType();
-
-    this.logger.debug(`Enqueuing ${rollupType} for checkpoint ${provingState.index}.`);
-
-    const inputs = await provingState.getCheckpointRootRollupInputs();
-
-    this.deferredProving(
-      provingState,
-      wrapCallbackInSpan(
-        this.tracer,
-        'ProvingOrchestrator.prover.getCheckpointRootRollupProof',
-        {
-          [Attributes.PROTOCOL_CIRCUIT_NAME]: rollupType,
-        },
-        signal => {
-          if (inputs instanceof CheckpointRootSingleBlockRollupPrivateInputs) {
-            return this.prover.getCheckpointRootSingleBlockRollupProof(inputs, signal, provingState.epochNumber);
-          } else {
-            return this.prover.getCheckpointRootRollupProof(inputs, signal, provingState.epochNumber);
-          }
-        },
-      ),
-      result => {
-        const computedEndBlobAccumulatorState = provingState.getEndBlobAccumulator()!.toBlobAccumulator();
-        const circuitEndBlobAccumulatorState = result.inputs.endBlobAccumulator;
-        if (!circuitEndBlobAccumulatorState.equals(computedEndBlobAccumulatorState)) {
-          this.logger.error(
-            `Blob accumulator state mismatch.\nCircuit: ${inspect(circuitEndBlobAccumulatorState)}\nComputed: ${inspect(
-              computedEndBlobAccumulatorState,
-            )}`,
-          );
-          provingState.reject(`Blob accumulator state mismatch.`);
-          return;
-        }
-
-        this.logger.debug(`Completed ${rollupType} proof for checkpoint ${provingState.index}.`);
-
-        const leafLocation = provingState.setCheckpointRootRollupProof(result);
-        const epochProvingState = provingState.parentEpoch;
-
-        if (epochProvingState.totalNumCheckpoints === 1) {
-          this.enqueueEpochPadding(epochProvingState);
-        } else {
-          this.checkAndEnqueueNextCheckpointMergeRollup(epochProvingState, leafLocation);
-        }
-      },
-    );
-  }
-
-  private enqueueCheckpointMergeRollup(provingState: EpochProvingState, location: TreeNodeLocation) {
-    if (!provingState.verifyState()) {
-      this.logger.debug('Not running checkpoint merge rollup. State no longer valid.');
-      return;
-    }
-
-    if (!provingState.tryStartProvingCheckpointMerge(location)) {
-      this.logger.debug('Checkpoint merge rollup already started.');
-      return;
-    }
-
-    const inputs = provingState.getCheckpointMergeRollupInputs(location);
-
-    this.deferredProving(
-      provingState,
-      wrapCallbackInSpan(
-        this.tracer,
-        'ProvingOrchestrator.prover.getCheckpointMergeRollupProof',
-        {
-          [Attributes.PROTOCOL_CIRCUIT_NAME]: 'rollup-checkpoint-merge' satisfies CircuitName,
-        },
-        signal => this.prover.getCheckpointMergeRollupProof(inputs, signal, provingState.epochNumber),
-      ),
-      result => {
-        this.logger.debug('Completed proof for checkpoint merge rollup.');
-        provingState.setCheckpointMergeRollupProof(location, result);
-        this.checkAndEnqueueNextCheckpointMergeRollup(provingState, location);
-      },
-    );
-  }
-
-  private enqueueEpochPadding(provingState: EpochProvingState) {
-    if (!provingState.verifyState()) {
-      this.logger.debug('Not running epoch padding. State no longer valid.');
-      return;
-    }
-
-    if (!provingState.tryStartProvingPaddingCheckpoint()) {
-      this.logger.debug('Padding checkpoint already started.');
-      return;
-    }
-
-    this.logger.debug('Padding epoch proof with a padding block root proof.');
-
-    const inputs = provingState.getPaddingCheckpointInputs();
-
-    this.deferredProving(
-      provingState,
-      wrapCallbackInSpan(
-        this.tracer,
-        'ProvingOrchestrator.prover.getCheckpointPaddingRollupProof',
-        {
-          [Attributes.PROTOCOL_CIRCUIT_NAME]: 'rollup-checkpoint-padding' satisfies CircuitName,
-        },
-        signal => this.prover.getCheckpointPaddingRollupProof(inputs, signal, provingState.epochNumber),
-      ),
-      result => {
-        this.logger.debug('Completed proof for padding checkpoint.');
-        provingState.setCheckpointPaddingProof(result);
-        this.checkAndEnqueueRootRollup(provingState);
-      },
-    );
-  }
-
-  // Executes the root rollup circuit
-  private enqueueRootRollup(provingState: EpochProvingState) {
-    if (!provingState.verifyState()) {
-      this.logger.debug('Not running root rollup, state no longer valid');
-      return;
-    }
-
-    this.logger.debug(`Preparing root rollup`);
-
-    const inputs = provingState.getRootRollupInputs();
-
-    this.deferredProving(
-      provingState,
-      wrapCallbackInSpan(
-        this.tracer,
-        'ProvingOrchestrator.prover.getRootRollupProof',
-        {
-          [Attributes.PROTOCOL_CIRCUIT_NAME]: 'rollup-root' satisfies CircuitName,
-        },
-        signal => this.prover.getRootRollupProof(inputs, signal, provingState.epochNumber),
+        { [Attributes.PROTOCOL_CIRCUIT_NAME]: 'rollup-block-merge' satisfies CircuitName },
       ),
       result => {
-        this.logger.verbose(`Orchestrator completed root rollup for epoch ${provingState.epochNumber}`);
-        provingState.setRootRollupProof(result);
-        provingState.resolve({ status: 'success' });
+        this.logger.debug(`Completed block merge rollup proof for checkpoint ${provingState.index}`, {
+          checkpointIndex: provingState.index,
+          mergeLocation: location,
+          ...result.inputs.toInspect(),
+        });
+        provingState.setBlockMergeRollupProof(location, result);
+        this.checkAndEnqueueNextBlockMergeRollup(provingState, location);
       },
     );
   }
@@ -1164,7 +880,6 @@ export class ProvingOrchestrator implements EpochProver {
     if (!provingState.isReadyForMergeRollup(currentLocation)) {
       return;
     }
-
     const parentLocation = provingState.getParentLocation(currentLocation);
     if (parentLocation.level === 0) {
       this.checkAndEnqueueBlockRootRollup(provingState);
@@ -1178,61 +893,45 @@ export class ProvingOrchestrator implements EpochProver {
       this.logger.debug('Not ready for block root rollup');
       return;
     }
-
     this.enqueueBlockRootRollup(provingState);
   }
 
-  private async checkAndEnqueueNextBlockMergeRollup(
+  private checkAndEnqueueNextBlockMergeRollup(
     provingState: CheckpointProvingState,
     currentLocation: TreeNodeLocation,
-  ) {
+  ): void {
     if (!provingState.isReadyForBlockMerge(currentLocation)) {
       return;
     }
-
     const parentLocation = provingState.getParentLocation(currentLocation);
     if (parentLocation.level === 0) {
-      await this.checkAndEnqueueCheckpointRootRollup(provingState);
+      this.checkAndEnqueueSubTreeResolution(provingState);
     } else {
       this.enqueueBlockMergeRollup(provingState, parentLocation);
     }
   }
 
-  private async checkAndEnqueueCheckpointRootRollup(provingState: CheckpointProvingState) {
-    if (!provingState.isReadyForCheckpointRoot()) {
-      return;
-    }
-
-    await this.enqueueCheckpointRootRollup(provingState);
-  }
-
-  private checkAndEnqueueNextCheckpointMergeRollup(provingState: EpochProvingState, currentLocation: TreeNodeLocation) {
-    if (!provingState.isReadyForCheckpointMerge(currentLocation)) {
-      return;
-    }
-
-    const parentLocation = provingState.getParentLocation(currentLocation);
-    if (parentLocation.level === 0) {
-      this.checkAndEnqueueRootRollup(provingState);
-    } else {
-      this.enqueueCheckpointMergeRollup(provingState, parentLocation);
-    }
-  }
-
-  private checkAndEnqueueRootRollup(provingState: EpochProvingState) {
-    if (!provingState.isReadyForRootRollup()) {
-      this.logger.debug('Not ready for root rollup');
+  /**
+   * Sub-tree analogue of the orchestrator's `checkAndEnqueueCheckpointRootRollup`:
+   * resolves the sub-tree promise with the block-level proof outputs once they're all ready,
+   * instead of escalating to the checkpoint root rollup.
+   */
+  private checkAndEnqueueSubTreeResolution(provingState: CheckpointProvingState): void {
+    const proofs = provingState.getSubTreeOutputProofs();
+    const nonEmpty = proofs.filter((p): p is NonNullable<typeof p> => !!p);
+    if (proofs.length !== nonEmpty.length) {
+      // Block merge tree not fully resolved yet — retried as more block proofs land.
       return;
     }
-
-    this.enqueueRootRollup(provingState);
+    this.subTreeResult.resolve({
+      blockProofOutputs: nonEmpty,
+      previousArchiveSiblingPath: provingState.getLastArchiveSiblingPath(),
+    });
   }
 
   /**
-   * Executes the VM circuit for a public function, will enqueue the corresponding kernel if the
-   * previous kernel is ready
-   * @param provingState - The proving state being operated on
-   * @param txIndex - The index of the transaction being proven
+   * Executes the VM circuit for a public function. Enqueues the base rollup once the
+   * tx's chonk-verifier + VM proofs are both ready.
    */
   private enqueueVM(provingState: BlockProvingState, txIndex: number) {
     if (!provingState.verifyState()) {
@@ -1242,23 +941,22 @@ export class ProvingOrchestrator implements EpochProver {
 
     const txProvingState = provingState.getTxProvingState(txIndex);
 
-    const doAvmProving = wrapCallbackInSpan(
-      this.tracer,
-      'ProvingOrchestrator.prover.getAvmProof',
-      {
-        [Attributes.TX_HASH]: txProvingState.processedTx.hash.toString(),
-      },
-      async (signal: AbortSignal) => {
-        const inputs = txProvingState.getAvmInputs();
-        return await this.prover.getAvmProof(inputs, signal, provingState.epochNumber);
+    this.deferredProving(
+      provingState,
+      this.wrapCircuitCall(
+        'getAvmProof',
+        async (signal: AbortSignal) => {
+          const inputs = txProvingState.getAvmInputs();
+          return await this.prover.getAvmProof(inputs, signal, provingState.epochNumber);
+        },
+        { [Attributes.TX_HASH]: txProvingState.processedTx.hash.toString() },
+      ),
+      proof => {
+        this.logger.debug(`Proven VM for tx index: ${txIndex}`);
+        txProvingState.setAvmProof(proof);
+        this.checkAndEnqueueBaseRollup(provingState, txIndex);
       },
     );
-
-    this.deferredProving(provingState, doAvmProving, proof => {
-      this.logger.debug(`Proven VM for tx index: ${txIndex}`);
-      txProvingState.setAvmProof(proof);
-      this.checkAndEnqueueBaseRollup(provingState, txIndex);
-    });
   }
 
   private checkAndEnqueueBaseRollup(provingState: BlockProvingState, txIndex: number) {
@@ -1266,10 +964,81 @@ export class ProvingOrchestrator implements EpochProver {
     if (!txProvingState.ready()) {
       return;
     }
-
-    // We must have completed all proving (chonk verifier proof and (if required) vm proof are generated), we now move to the base rollup.
+    // All upstream proofs (chonk verifier and, if required, vm) are ready — proceed to the base rollup.
     this.logger.debug(`Public functions completed for tx ${txIndex} enqueueing base rollup`);
-
     this.enqueueBaseRollup(provingState, txIndex);
   }
+
+  // Flagged as protected so unit tests can override.
+  protected async verifyBuiltBlockAgainstSyncedState(provingState: BlockProvingState) {
+    const builtBlockHeader = provingState.getBuiltBlockHeader();
+    if (!builtBlockHeader) {
+      this.logger.debug('Block header not built yet, skipping header check.');
+      return;
+    }
+
+    const output = provingState.getBlockRootRollupOutput();
+    if (!output) {
+      this.logger.debug('Block root rollup proof not built yet, skipping header check.');
+      return;
+    }
+
+    const newArchive = provingState.getBuiltArchive();
+    if (!newArchive) {
+      this.logger.debug('Archive snapshot not yet captured, skipping header check.');
+      return;
+    }
+
+    const header = await buildHeaderFromCircuitOutputs(output);
+
+    if (!(await header.hash()).equals(await builtBlockHeader.hash())) {
+      this.logger.error(`Block header mismatch.\nCircuit: ${inspect(header)}\nComputed: ${inspect(builtBlockHeader)}`);
+      provingState.reject(`Block header hash mismatch.`);
+      return;
+    }
+
+    const blockNumber = provingState.blockNumber;
+    const syncedArchive = await getTreeSnapshot(MerkleTreeId.ARCHIVE, this.dbProvider.getSnapshot(blockNumber));
+    if (!syncedArchive.equals(newArchive)) {
+      this.logger.error(
+        `Archive tree mismatch for block ${blockNumber}: world state synced to ${inspect(
+          syncedArchive,
+        )} but built ${inspect(newArchive)}`,
+      );
+      provingState.reject(`Archive tree mismatch.`);
+      return;
+    }
+
+    const circuitArchive = output.newArchive;
+    if (!newArchive.equals(circuitArchive)) {
+      this.logger.error(`New archive mismatch.\nCircuit: ${output.newArchive}\nComputed: ${newArchive}`);
+      provingState.reject(`New archive mismatch.`);
+      return;
+    }
+  }
+
+  private getDbForBlock(blockNumber: BlockNumber): MerkleTreeWriteOperations {
+    const db = this.dbs.get(blockNumber);
+    if (!db) {
+      throw new Error(`World state fork for block ${blockNumber} not found.`);
+    }
+    return db;
+  }
+
+  /**
+   * Wraps a circuit call with a tracer span and circuit attributes. Replaces the
+   * `ProvingScheduler.wrapCircuitCall` indirection that used to live on the abstract base.
+   */
+  private wrapCircuitCall<T>(
+    circuitName: string,
+    fn: (signal: AbortSignal) => Promise<T>,
+    attributes: Record<string, unknown> = {},
+  ): (signal: AbortSignal) => Promise<T> {
+    return wrapCallbackInSpan(
+      this.tracer,
+      `CheckpointSubTreeOrchestrator.prover.${circuitName}`,
+      { [Attributes.PROTOCOL_CIRCUIT_NAME]: circuitName as CircuitName, ...attributes },
+      fn,
+    );
+  }
 }