@aztec/prover-client 0.0.1-commit.d431d1c → 0.0.1-commit.d58ff9d0

package/dest/orchestrator/{orchestrator.js → checkpoint-sub-tree-orchestrator.js}

@@ -370,50 +370,49 @@ function applyDecs2203RFactory() {
 function _apply_decs_2203_r(targetClass, memberDecs, classDecs, parentClass) {
     return (_apply_decs_2203_r = applyDecs2203RFactory())(targetClass, memberDecs, classDecs, parentClass);
 }
-var _dec, _dec1, _dec2, _dec3, _dec4, _initProto;
-import { 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';
+var _dec, _dec1, _dec2, _dec3, _initProto;
+import { L1_TO_L2_MSG_SUBTREE_HEIGHT, L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH, NUM_BASE_PARITY_PER_ROOT_PARITY } from '@aztec/constants';
 import { BlockNumber } from '@aztec/foundation/branded-types';
-import { padArrayEnd } from '@aztec/foundation/collection';
-import { Fr } from '@aztec/foundation/curves/bn254';
 import { AbortError } from '@aztec/foundation/error';
-import { 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 { BlockRootEmptyTxFirstRollupPrivateInputs, BlockRootFirstRollupPrivateInputs, BlockRootSingleTxFirstRollupPrivateInputs, BlockRootSingleTxRollupPrivateInputs, CheckpointRootSingleBlockRollupPrivateInputs, PrivateTxBaseRollupPrivateInputs } from '@aztec/stdlib/rollup';
+import { appendL1ToL2MessagesToTree } from '@aztec/stdlib/messaging';
+import { BlockRootEmptyTxFirstRollupPrivateInputs, BlockRootFirstRollupPrivateInputs, BlockRootSingleTxFirstRollupPrivateInputs, BlockRootSingleTxRollupPrivateInputs, PrivateTxBaseRollupPrivateInputs } from '@aztec/stdlib/rollup';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
 import { Attributes, getTelemetryClient, trackSpan, wrapCallbackInSpan } from '@aztec/telemetry-client';
 import { inspect } from 'util';
 import { buildHeaderFromCircuitOutputs, getLastSiblingPath, getPublicChonkVerifierPrivateInputsFromTx, getRootTreeSiblingPath, getSubtreeSiblingPath, getTreeSnapshot, insertSideEffectsAndBuildBaseRollupHints, validatePartialState, validateTx } from './block-building-helpers.js';
-import { EpochProvingState } from './epoch-proving-state.js';
+import { CheckpointProvingState } from './checkpoint-proving-state.js';
 import { ProvingOrchestratorMetrics } from './orchestrator_metrics.js';
+import { ProvingScheduler } from './proving-scheduler.js';
 import { TxProvingState } from './tx-proving-state.js';
-const logger = createLogger('prover-client:orchestrator');
-_dec = trackSpan('ProvingOrchestrator.startNewBlock', (blockNumber)=>({
+_dec = trackSpan('CheckpointSubTreeOrchestrator.startNewBlock', (blockNumber)=>({
         [Attributes.BLOCK_NUMBER]: blockNumber
-    })), _dec1 = trackSpan('ProvingOrchestrator.addTxs', (txs)=>({
+    })), _dec1 = trackSpan('CheckpointSubTreeOrchestrator.addTxs', (txs)=>({
         [Attributes.BLOCK_TXS_COUNT]: txs.length
-    })), _dec2 = trackSpan('ProvingOrchestrator.startChonkVerifierCircuits'), _dec3 = trackSpan('ProvingOrchestrator.setBlockCompleted', (blockNumber)=>({
+    })), _dec2 = trackSpan('CheckpointSubTreeOrchestrator.setBlockCompleted', (blockNumber)=>({
         [Attributes.BLOCK_NUMBER]: blockNumber
-    })), _dec4 = trackSpan('ProvingOrchestrator.prepareBaseRollupInputs', (tx)=>({
+    })), _dec3 = trackSpan('CheckpointSubTreeOrchestrator.prepareBaseRollupInputs', (tx)=>({
         [Attributes.TX_HASH]: tx.hash.toString()
     }));
 /**
- * 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
+ * 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.
  *
- * The proving implementation is determined by the provided prover. This could be for example a local prover or a remote prover pool.
- */ /**
- * The orchestrator, managing the flow of recursive proving operations required to build the rollup proof tree.
- */ export class ProvingOrchestrator {
+ * 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 {
     dbProvider;
     prover;
     proverId;
+    chonkCache;
+    epochNumber;
+    cancelJobsOnStop;
     static{
         ({ e: [_initProto] } = _apply_decs_2203_r(this, [
             [
@@ -429,36 +428,33 @@ _dec = trackSpan('ProvingOrchestrator.startNewBlock', (blockNumber)=>({
             [
                 _dec2,
                 2,
-                "startChonkVerifierCircuits"
-            ],
-            [
-                _dec3,
-                2,
                 "setBlockCompleted"
             ],
             [
-                _dec4,
+                _dec3,
                 2,
                 "prepareBaseRollupInputs"
             ]
         ], []));
     }
-    provingState;
-    pendingProvingJobs;
-    provingPromise;
+    /** The single checkpoint proving state this sub-tree owns. Allocated in the `start` factory. */ provingState;
+    subTreeResult;
     metrics;
-    // eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
     dbs;
-    constructor(dbProvider, prover, proverId, telemetryClient = getTelemetryClient()){
-        this.dbProvider = dbProvider;
-        this.prover = prover;
-        this.proverId = proverId;
-        this.provingState = (_initProto(this), undefined);
-        this.pendingProvingJobs = [];
-        this.provingPromise = undefined;
-        this.dbs = new Map();
-        this.metrics = new ProvingOrchestratorMetrics(telemetryClient, 'ProvingOrchestrator');
+    constructor(dbProvider, prover, proverId, /**
+     * 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.
+     */ chonkCache, /** The epoch this sub-tree proves into. */ epochNumber, cancelJobsOnStop = false, deferredJobQueue, telemetryClient = getTelemetryClient(), bindings){
+        super(deferredJobQueue, 'prover-client:checkpoint-sub-tree-orchestrator', bindings), this.dbProvider = dbProvider, this.prover = prover, this.proverId = proverId, this.chonkCache = chonkCache, this.epochNumber = epochNumber, this.cancelJobsOnStop = cancelJobsOnStop, this.provingState = (_initProto(this), undefined), this.dbs = new Map(), this.cancelled = false;
+        this.metrics = new ProvingOrchestratorMetrics(telemetryClient, 'CheckpointSubTreeOrchestrator');
+        this.subTreeResult = promiseWithResolvers();
+        // 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(()=>{});
     }
+    /** Tracks whether `cancel()` has been called; flows into the checkpoint state's isAlive hook. */ cancelled;
     get tracer() {
         return this.metrics.tracer;
     }
@@ -468,86 +464,90 @@ _dec = trackSpan('ProvingOrchestrator.startNewBlock', (blockNumber)=>({
     getNumActiveForks() {
         return this.dbs.size;
     }
-    stop() {
-        this.cancel();
-        return Promise.resolve();
-    }
-    startNewEpoch(epochNumber, totalNumCheckpoints, finalBlobBatchingChallenges) {
-        if (this.provingState?.verifyState()) {
-            throw new Error(`Cannot start epoch ${epochNumber} when epoch ${this.provingState.epochNumber} is still being processed.`);
-        }
-        const { promise: _promise, resolve, reject } = promiseWithResolvers();
-        const promise = _promise.catch((reason)=>({
-                status: 'failure',
-                reason
-            }));
-        logger.info(`Starting epoch ${epochNumber} with ${totalNumCheckpoints} checkpoints.`);
-        this.provingState = new EpochProvingState(epochNumber, totalNumCheckpoints, finalBlobBatchingChallenges, (provingState)=>this.checkAndEnqueueCheckpointRootRollup(provingState), resolve, reject);
-        this.provingPromise = promise;
+    /** Returns a promise that resolves when block-level proving completes for the checkpoint. */ getSubTreeResult() {
+        return this.subTreeResult.promise;
     }
     /**
-   * 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.
-   */ async startNewCheckpoint(checkpointIndex, constants, l1ToL2Messages, totalNumBlocks, headerOfLastBlockInPreviousCheckpoint) {
+   * 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.
+   */ getPreviousArchiveSiblingPath() {
         if (!this.provingState) {
-            throw new Error('Empty epoch proving state. Call startNewEpoch before starting a checkpoint.');
+            throw new Error('Checkpoint not started; call CheckpointSubTreeOrchestrator.start first.');
         }
-        if (!this.provingState.isAcceptingCheckpoints()) {
-            throw new Error(`Epoch not accepting further checkpoints.`);
+        return this.provingState.getLastArchiveSiblingPath();
+    }
+    /**
+   * 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.
+   */ static async start(dbProvider, prover, proverId, chonkCache, epochNumber, cancelJobsOnStop, deferredJobQueue, checkpointConstants, l1ToL2Messages, totalNumBlocks, headerOfLastBlockInPreviousCheckpoint, telemetryClient = getTelemetryClient(), bindings) {
+        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;
         }
-        // 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);
     }
     /**
-   * Starts off a new block
+   * 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.
+   */ startChonkVerifierCircuits(txs) {
+        if (!this.provingState?.verifyState()) {
+            return Promise.reject(new Error('Sub-tree proving state is not active.'));
+        }
+        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.
    * @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.
    */ async startNewBlock(blockNumber, timestamp, totalNumTxs) {
         if (!this.provingState) {
-            throw new Error('Empty epoch proving state. Call startNewEpoch before starting a block.');
-        }
-        const checkpointProvingState = this.provingState.getCheckpointProvingStateByBlockNumber(blockNumber);
-        if (!checkpointProvingState) {
-            throw new Error(`Checkpoint not started. Call startNewCheckpoint first.`);
+            throw new Error('Empty proving state. The checkpoint sub-tree has not been started.');
         }
-        if (!checkpointProvingState.isAcceptingBlocks()) {
+        if (!this.provingState.isAcceptingBlocks()) {
             throw new Error(`Checkpoint not accepting further blocks.`);
         }
-        const constants = checkpointProvingState.constants;
-        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`.
+        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 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);
         }
-        const db = this.dbs.get(blockNumber);
+        const db = this.getDbForBlock(blockNumber);
         // Get archive snapshot and sibling path before any txs in this block lands.
         const lastArchiveTreeSnapshot = await getTreeSnapshot(MerkleTreeId.ARCHIVE, db);
         const lastArchiveSiblingPath = await getRootTreeSiblingPath(MerkleTreeId.ARCHIVE, db);
-        const blockProvingState = checkpointProvingState.startNewBlock(blockNumber, timestamp, totalNumTxs, lastArchiveTreeSnapshot, lastArchiveSiblingPath);
+        const blockProvingState = this.provingState.startNewBlock(blockNumber, timestamp, totalNumTxs, lastArchiveTreeSnapshot, lastArchiveSiblingPath);
         // 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);
@@ -555,22 +555,19 @@ _dec = trackSpan('ProvingOrchestrator.startNewBlock', (blockNumber)=>({
             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
    */ async addTxs(txs) {
         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.
-            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;
         }
         const blockNumber = BlockNumber(txs[0].globalVariables.blockNumber);
@@ -584,8 +581,8 @@ _dec = trackSpan('ProvingOrchestrator.startNewBlock', (blockNumber)=>({
         if (!provingState.isAcceptingTxs()) {
             throw new Error(`Block ${blockNumber} has been initialized with transactions.`);
         }
-        logger.info(`Adding ${txs.length} transactions to block ${blockNumber}`);
-        const db = this.dbs.get(blockNumber);
+        this.logger.info(`Adding ${txs.length} transactions to block ${blockNumber}`);
+        const db = this.getDbForBlock(blockNumber);
         const lastArchive = provingState.lastArchiveTreeSnapshot;
         const newL1ToL2MessageTreeSnapshot = provingState.newL1ToL2MessageTreeSnapshot;
         const spongeBlobState = provingState.getStartSpongeBlob().clone();
@@ -595,7 +592,7 @@ _dec = trackSpan('ProvingOrchestrator.startNewBlock', (blockNumber)=>({
                     throw new Error(`Invalid proving state when adding a tx`);
                 }
                 validateTx(tx);
-                logger.debug(`Received transaction: ${tx.hash}`);
+                this.logger.debug(`Received transaction: ${tx.hash}`);
                 const startSpongeBlob = spongeBlobState.clone();
                 const [hints, treeSnapshots] = await this.prepareBaseRollupInputs(tx, lastArchive, newL1ToL2MessageTreeSnapshot, startSpongeBlob, db);
                 if (!provingState.verifyState()) {
@@ -606,10 +603,10 @@ _dec = trackSpan('ProvingOrchestrator.startNewBlock', (blockNumber)=>({
                 const txIndex = provingState.addNewTx(txProvingState);
                 if (txProvingState.requireAvmProof) {
                     this.getOrEnqueueChonkVerifier(provingState, txIndex);
-                    logger.debug(`Enqueueing public VM for tx ${txIndex}`);
+                    this.logger.debug(`Enqueueing public VM for tx ${txIndex}`);
                     this.enqueueVM(provingState, txIndex);
                 } else {
-                    logger.debug(`Enqueueing base rollup for private-only tx ${txIndex}`);
+                    this.logger.debug(`Enqueueing base rollup for private-only tx ${txIndex}`);
                     this.enqueueBaseRollup(provingState, txIndex);
                 }
             } catch (err) {
@@ -623,29 +620,6 @@ _dec = trackSpan('ProvingOrchestrator.startNewBlock', (blockNumber)=>({
         const blockEndBlobFields = provingState.getBlockEndBlobFields();
         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.
-   */ startChonkVerifierCircuits(txs) {
-        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();
-            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.
@@ -668,154 +642,70 @@ _dec = trackSpan('ProvingOrchestrator.startNewBlock', (blockNumber)=>({
             throw new Error(`Block ${blockNumber} is still accepting txs. Call setBlockCompleted after all txs have been added.`);
         }
         // Given we've applied every change from this block, now assemble the block header:
-        logger.verbose(`Block ${blockNumber} completed. Assembling header.`);
+        this.logger.verbose(`Block ${blockNumber} completed. Assembling header.`);
         const header = await provingState.buildBlockHeader();
         if (expectedHeader && !header.equals(expectedHeader)) {
-            logger.error(`Block header mismatch: header=${header} expectedHeader=${expectedHeader}`);
+            this.logger.error(`Block header mismatch: header=${header} expectedHeader=${expectedHeader}`);
             throw new Error('Block header mismatch');
         }
-        // Get db for this block
-        const db = this.dbs.get(provingState.blockNumber);
-        // Update the archive tree, so we're ready to start processing the next block:
-        logger.verbose(`Updating archive tree with block ${provingState.blockNumber} header ${(await header.hash()).toString()}`);
-        await db.updateArchive(header);
+        // Get db for this block and remove from map — no other code should use it after this point.
+        const db = this.getDbForBlock(provingState.blockNumber);
+        this.dbs.delete(provingState.blockNumber);
+        // Update the archive tree, capture the snapshot, and close the fork deterministically.
+        try {
+            this.logger.verbose(`Updating archive tree with block ${provingState.blockNumber} header ${(await header.hash()).toString()}`);
+            await db.updateArchive(header);
+            provingState.setBuiltArchive(await getTreeSnapshot(MerkleTreeId.ARCHIVE, db));
+        } finally{
+            await db.close();
+        }
         await this.verifyBuiltBlockAgainstSyncedState(provingState);
         return header;
     }
-    // Flagged as protected to disable in certain unit tests
-    async verifyBuiltBlockAgainstSyncedState(provingState) {
-        const builtBlockHeader = provingState.getBuiltBlockHeader();
-        if (!builtBlockHeader) {
-            logger.debug('Block header not built yet, skipping header check.');
-            return;
-        }
-        const output = provingState.getBlockRootRollupOutput();
-        if (!output) {
-            logger.debug('Block root rollup proof not built yet, skipping header check.');
-            return;
-        }
-        const header = await buildHeaderFromCircuitOutputs(output);
-        if (!(await header.hash()).equals(await builtBlockHeader.hash())) {
-            logger.error(`Block header mismatch.\nCircuit: ${inspect(header)}\nComputed: ${inspect(builtBlockHeader)}`);
-            provingState.reject(`Block header hash mismatch.`);
-            return;
-        }
-        // Get db for this block
-        const blockNumber = provingState.blockNumber;
-        const db = this.dbs.get(blockNumber);
-        const newArchive = await getTreeSnapshot(MerkleTreeId.ARCHIVE, db);
-        const syncedArchive = await getTreeSnapshot(MerkleTreeId.ARCHIVE, this.dbProvider.getSnapshot(blockNumber));
-        if (!syncedArchive.equals(newArchive)) {
-            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)) {
-            logger.error(`New archive mismatch.\nCircuit: ${output.newArchive}\nComputed: ${newArchive}`);
-            provingState.reject(`New archive mismatch.`);
-            return;
-        }
-        // TODO(palla/prover): This closes the fork only on the happy path. If this epoch orchestrator
-        // is aborted and never reaches this point, it will leak the fork. We need to add a global cleanup,
-        // but have to make sure it only runs once all operations are completed, otherwise some function here
-        // will attempt to access the fork after it was closed.
-        void this.cleanupDBFork(blockNumber);
-    }
+    // ---------------- lifecycle ----------------
     /**
-   * Cancel any further proving
+   * 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.
    */ cancel() {
-        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();
-    }
-    /**
-   * Returns the proof for the current epoch.
-   */ async finalizeEpoch() {
-        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;
-    }
-    async cleanupDBFork(blockNumber) {
-        logger.debug(`Cleaning up world state fork for ${blockNumber}`);
-        const fork = this.dbs.get(blockNumber);
-        if (!fork) {
-            return;
-        }
-        try {
-            await fork.close();
-            this.dbs.delete(blockNumber);
-        } catch (err) {
-            logger.error(`Error closing db for block ${blockNumber}`, err);
+        for (const [blockNumber, db] of this.dbs.entries()){
+            void db.close().catch((err)=>this.logger.error(`Error closing db for block ${blockNumber}`, err));
         }
+        this.dbs.clear();
+    }
+    cancelInternal() {
+        this.cancel();
     }
+    // ---------------- 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
-   */ deferredProving(provingState, request, callback) {
-        if (!provingState.verifyState()) {
-            logger.debug(`Not enqueuing job, state no longer valid`);
-            return;
+   * 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.
+   */ async startCheckpoint(constants, l1ToL2Messages, totalNumBlocks, headerOfLastBlockInPreviousCheckpoint) {
+        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()) {
-                    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;
-                }
-                await callback(result);
-            } catch (err) {
-                if (err instanceof AbortError) {
-                    // operation was cancelled, probably because the block was cancelled
-                    // drop this result
-                    return;
-                }
-                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);
-                }
-            }
-        };
-        // let the callstack unwind before adding the job to the queue
-        setImmediate(()=>void safeJob());
+        // 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. Get the states before and after the insertion.
+        const { lastL1ToL2MessageTreeSnapshot, lastL1ToL2MessageSubtreeRootSiblingPath, newL1ToL2MessageTreeSnapshot, newL1ToL2MessageSubtreeRootSiblingPath } = await this.updateL1ToL2MessageTree(l1ToL2Messages, db);
+        this.provingState = new CheckpointProvingState(/* index */ 0, constants, totalNumBlocks, headerOfLastBlockInPreviousCheckpoint, lastArchiveSiblingPath, l1ToL2Messages, lastL1ToL2MessageTreeSnapshot, lastL1ToL2MessageSubtreeRootSiblingPath, newL1ToL2MessageTreeSnapshot, newL1ToL2MessageSubtreeRootSiblingPath, Number(this.epochNumber), /* isAlive */ ()=>!this.cancelled, /* onReject */ (reason)=>this.subTreeResult.reject(new Error(reason)));
     }
+    // ---------------- private: per-block proof orchestration ----------------
     async updateL1ToL2MessageTree(l1ToL2Messages, db) {
-        const l1ToL2MessagesPadded = padArrayEnd(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, 'Too many L1 to L2 messages');
         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(await getSubtreeSiblingPath(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, L1_TO_L2_MSG_SUBTREE_HEIGHT, db), L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH);
         return {
@@ -825,12 +715,15 @@ _dec = trackSpan('ProvingOrchestrator.startNewBlock', (blockNumber)=>({
             newL1ToL2MessageSubtreeRootSiblingPath
         };
     }
-    // Updates the merkle trees for a transaction. The first enqueued job for a transaction
+    // Updates the merkle trees for a transaction. The first enqueued job for a transaction.
     async prepareBaseRollupInputs(tx, lastArchive, newL1ToL2MessageTreeSnapshot, startSpongeBlob, db) {
-        // 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));
-        this.metrics.recordBaseRollupInputs(ms);
+        // 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(performance.now() - start);
         const promises = [
             MerkleTreeId.NOTE_HASH_TREE,
             MerkleTreeId.NULLIFIER_TREE,
@@ -850,32 +743,32 @@ _dec = trackSpan('ProvingOrchestrator.startNewBlock', (blockNumber)=>({
             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.
     enqueueBaseRollup(provingState, txIndex) {
         if (!provingState.verifyState()) {
-            logger.debug('Not running base rollup, state invalid');
+            this.logger.debug('Not running base rollup, state invalid');
             return;
         }
         if (!provingState.tryStartProvingBase(txIndex)) {
-            logger.debug(`Base rollup for tx ${txIndex} already started.`);
+            this.logger.debug(`Base rollup for tx ${txIndex} already started.`);
             return;
         }
         const txProvingState = provingState.getTxProvingState(txIndex);
         const { processedTx } = txProvingState;
         const { rollupType, inputs } = txProvingState.getBaseRollupTypeAndInputs();
-        logger.debug(`Enqueuing deferred proving base rollup for ${processedTx.hash.toString()}`);
-        this.deferredProving(provingState, wrapCallbackInSpan(this.tracer, `ProvingOrchestrator.prover.${inputs instanceof PrivateTxBaseRollupPrivateInputs ? 'getPrivateTxBaseRollupProof' : 'getPublicTxBaseRollupProof'}`, {
-            [Attributes.TX_HASH]: processedTx.hash.toString(),
-            [Attributes.PROTOCOL_CIRCUIT_NAME]: rollupType
-        }, (signal)=>{
+        this.logger.debug(`Enqueuing deferred proving base rollup for ${processedTx.hash.toString()}`);
+        this.deferredProving(provingState, this.wrapCircuitCall(inputs instanceof PrivateTxBaseRollupPrivateInputs ? 'getPrivateTxBaseRollupProof' : 'getPublicTxBaseRollupProof', (signal)=>{
             if (inputs instanceof PrivateTxBaseRollupPrivateInputs) {
                 return this.prover.getPrivateTxBaseRollupProof(inputs, signal, provingState.epochNumber);
             } else {
                 return this.prover.getPublicTxBaseRollupProof(inputs, signal, provingState.epochNumber);
             }
+        }, {
+            [Attributes.TX_HASH]: processedTx.hash.toString(),
+            [Attributes.PROTOCOL_CIRCUIT_NAME]: rollupType
         }), (result)=>{
-            logger.debug(`Completed proof for ${rollupType} for tx ${processedTx.hash.toString()}`);
+            this.logger.debug(`Completed proof for ${rollupType} for tx ${processedTx.hash.toString()}`);
             validatePartialState(result.inputs.endTreeSnapshots, txProvingState.treeSnapshots);
             const leafLocation = provingState.setBaseRollupProof(txIndex, result);
             if (provingState.totalNumTxs === 1) {
@@ -885,78 +778,67 @@ _dec = trackSpan('ProvingOrchestrator.startNewBlock', (blockNumber)=>({
             }
         });
     }
-    // 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.
-    getOrEnqueueChonkVerifier(provingState, txIndex) {
+    /**
+   * 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.
+   */ getOrEnqueueChonkVerifier(provingState, txIndex) {
         if (!provingState.verifyState()) {
-            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)=>{
-            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)) {
-            logger.debug(`Chonk verifier proof already enqueued for tx index: ${txIndex}`, {
-                txHash
-            });
-            void this.provingState.cachedChonkVerifierProofs.get(txHash).then(handleResult);
-            return;
-        }
-        logger.debug(`Enqueuing chonk verifier circuit for tx index: ${txIndex}`);
-        this.doEnqueueChonkVerifier(txHash, txProvingState.getPublicChonkVerifierPrivateInputs(), handleResult);
-    }
-    doEnqueueChonkVerifier(txHash, inputs, handler, provingState = this.provingState) {
-        if (!provingState.verifyState()) {
-            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'
-        }, (signal)=>this.prover.getPublicChonkVerifierProof(inputs, signal, provingState.epochNumber)), handler);
+        const promise = this.chonkCache.getOrCompute(txHash, (signal)=>this.prover.getPublicChonkVerifierProof(txProvingState.getPublicChonkVerifierPrivateInputs(), signal, this.epochNumber));
+        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.
     enqueueMergeRollup(provingState, location) {
         if (!provingState.verifyState()) {
-            logger.debug('Not running merge rollup. State no longer valid.');
+            this.logger.debug('Not running merge rollup. State no longer valid.');
             return;
         }
         if (!provingState.tryStartProvingMerge(location)) {
-            logger.debug('Merge rollup already started.');
+            this.logger.debug('Merge rollup already started.');
             return;
         }
         const inputs = provingState.getMergeRollupInputs(location);
-        this.deferredProving(provingState, wrapCallbackInSpan(this.tracer, 'ProvingOrchestrator.prover.getTxMergeRollupProof', {
+        this.deferredProving(provingState, this.wrapCircuitCall('getTxMergeRollupProof', (signal)=>this.prover.getTxMergeRollupProof(inputs, signal, provingState.epochNumber), {
             [Attributes.PROTOCOL_CIRCUIT_NAME]: 'rollup-tx-merge'
-        }, (signal)=>this.prover.getTxMergeRollupProof(inputs, signal, provingState.epochNumber)), (result)=>{
+        }), (result)=>{
             provingState.setMergeRollupProof(location, result);
             this.checkAndEnqueueNextMergeRollup(provingState, location);
         });
     }
-    // Executes the block root rollup circuit
+    // Executes the block root rollup circuit.
     enqueueBlockRootRollup(provingState) {
         if (!provingState.verifyState()) {
-            logger.debug('Not running block root rollup, state no longer valid');
+            this.logger.debug('Not running block root rollup, state no longer valid');
             return;
         }
         if (!provingState.tryStartProvingBlockRoot()) {
-            logger.debug('Block root rollup already started.');
+            this.logger.debug('Block root rollup already started.');
             return;
         }
         const { rollupType, inputs } = provingState.getBlockRootRollupTypeAndInputs();
-        logger.debug(`Enqueuing ${rollupType} for block ${provingState.blockNumber}.`);
-        this.deferredProving(provingState, wrapCallbackInSpan(this.tracer, 'ProvingOrchestrator.prover.getBlockRootRollupProof', {
-            [Attributes.PROTOCOL_CIRCUIT_NAME]: rollupType
-        }, (signal)=>{
+        this.logger.debug(`Enqueuing ${rollupType} for block ${provingState.blockNumber}.`);
+        this.deferredProving(provingState, this.wrapCircuitCall('getBlockRootRollupProof', (signal)=>{
             if (inputs instanceof BlockRootFirstRollupPrivateInputs) {
                 return this.prover.getBlockRootFirstRollupProof(inputs, signal, provingState.epochNumber);
             } else if (inputs instanceof BlockRootSingleTxFirstRollupPrivateInputs) {
@@ -968,36 +850,40 @@ _dec = trackSpan('ProvingOrchestrator.startNewBlock', (blockNumber)=>({
             } else {
                 return this.prover.getBlockRootRollupProof(inputs, signal, provingState.epochNumber);
             }
+        }, {
+            [Attributes.PROTOCOL_CIRCUIT_NAME]: rollupType
         }), async (result)=>{
-            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;
-            // If the proofs were slower than the block header building, then we need to try validating the block header hashes here.
+            // Verification is called from both here and setBlockCompleted. Whichever runs last
+            // will be the first to see all three pieces (header, proof output, archive) and run the checks.
             await this.verifyBuiltBlockAgainstSyncedState(provingState);
             if (checkpointProvingState.totalNumBlocks === 1) {
-                this.checkAndEnqueueCheckpointRootRollup(checkpointProvingState);
+                this.checkAndEnqueueSubTreeResolution(checkpointProvingState);
             } else {
                 this.checkAndEnqueueNextBlockMergeRollup(checkpointProvingState, leafLocation);
             }
-            // We are finished with the block at this point, ensure the fork is cleaned up
-            void this.cleanupDBFork(provingState.blockNumber);
         });
     }
-    // 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.
     enqueueBaseParityCircuit(checkpointProvingState, provingState, baseParityIndex) {
         if (!provingState.verifyState()) {
-            logger.debug('Not running base parity. State no longer valid.');
+            this.logger.debug('Not running base parity. State no longer valid.');
             return;
         }
         if (!provingState.tryStartProvingBaseParity(baseParityIndex)) {
-            logger.warn(`Base parity ${baseParityIndex} already started.`);
+            this.logger.warn(`Base parity ${baseParityIndex} already started.`);
             return;
         }
         const inputs = checkpointProvingState.getBaseParityInputs(baseParityIndex);
-        this.deferredProving(provingState, wrapCallbackInSpan(this.tracer, 'ProvingOrchestrator.prover.getBaseParityProof', {
+        this.deferredProving(provingState, this.wrapCircuitCall('getBaseParityProof', (signal)=>this.prover.getBaseParityProof(inputs, signal, provingState.epochNumber), {
             [Attributes.PROTOCOL_CIRCUIT_NAME]: 'parity-base'
-        }, (signal)=>this.prover.getBaseParityProof(inputs, signal, provingState.epochNumber)), (provingOutput)=>{
+        }), (provingOutput)=>{
             provingState.setBaseParityProof(baseParityIndex, provingOutput);
             this.checkAndEnqueueRootParityCircuit(provingState);
         });
@@ -1008,135 +894,46 @@ _dec = trackSpan('ProvingOrchestrator.startNewBlock', (blockNumber)=>({
         }
         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.
     enqueueRootParityCircuit(provingState) {
         if (!provingState.verifyState()) {
-            logger.debug('Not running root parity. State no longer valid.');
+            this.logger.debug('Not running root parity. State no longer valid.');
             return;
         }
         if (!provingState.tryStartProvingRootParity()) {
-            logger.debug('Root parity already started.');
+            this.logger.debug('Root parity already started.');
             return;
         }
         const inputs = provingState.getParityRootInputs();
-        this.deferredProving(provingState, wrapCallbackInSpan(this.tracer, 'ProvingOrchestrator.prover.getRootParityProof', {
+        this.deferredProving(provingState, this.wrapCircuitCall('getRootParityProof', (signal)=>this.prover.getRootParityProof(inputs, signal, provingState.epochNumber), {
             [Attributes.PROTOCOL_CIRCUIT_NAME]: 'parity-root'
-        }, (signal)=>this.prover.getRootParityProof(inputs, signal, provingState.epochNumber)), (result)=>{
+        }), (result)=>{
             provingState.setRootParityProof(result);
             this.checkAndEnqueueBlockRootRollup(provingState);
         });
     }
-    // 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.
     enqueueBlockMergeRollup(provingState, location) {
         if (!provingState.verifyState()) {
-            logger.debug('Not running block merge rollup. State no longer valid.');
+            this.logger.debug('Not running block merge rollup. State no longer valid.');
             return;
         }
         if (!provingState.tryStartProvingBlockMerge(location)) {
-            logger.debug('Block merge rollup already started.');
+            this.logger.debug('Block merge rollup already started.');
             return;
         }
         const inputs = provingState.getBlockMergeRollupInputs(location);
-        this.deferredProving(provingState, wrapCallbackInSpan(this.tracer, 'ProvingOrchestrator.prover.getBlockMergeRollupProof', {
+        this.deferredProving(provingState, this.wrapCircuitCall('getBlockMergeRollupProof', (signal)=>this.prover.getBlockMergeRollupProof(inputs, signal, provingState.epochNumber), {
             [Attributes.PROTOCOL_CIRCUIT_NAME]: 'rollup-block-merge'
-        }, (signal)=>this.prover.getBlockMergeRollupProof(inputs, signal, provingState.epochNumber)), (result)=>{
-            provingState.setBlockMergeRollupProof(location, result);
-            this.checkAndEnqueueNextBlockMergeRollup(provingState, location);
-        });
-    }
-    enqueueCheckpointRootRollup(provingState) {
-        if (!provingState.verifyState()) {
-            logger.debug('Not running checkpoint root rollup. State no longer valid.');
-            return;
-        }
-        if (!provingState.tryStartProvingCheckpointRoot()) {
-            logger.debug('Checkpoint root rollup already started.');
-            return;
-        }
-        const rollupType = provingState.getCheckpointRootRollupType();
-        logger.debug(`Enqueuing ${rollupType} for checkpoint ${provingState.index}.`);
-        const inputs = 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)) {
-                logger.error(`Blob accumulator state mismatch.\nCircuit: ${inspect(circuitEndBlobAccumulatorState)}\nComputed: ${inspect(computedEndBlobAccumulatorState)}`);
-                provingState.reject(`Blob accumulator state mismatch.`);
-                return;
-            }
-            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);
-            }
-        });
-    }
-    enqueueCheckpointMergeRollup(provingState, location) {
-        if (!provingState.verifyState()) {
-            logger.debug('Not running checkpoint merge rollup. State no longer valid.');
-            return;
-        }
-        if (!provingState.tryStartProvingCheckpointMerge(location)) {
-            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'
-        }, (signal)=>this.prover.getCheckpointMergeRollupProof(inputs, signal, provingState.epochNumber)), (result)=>{
-            logger.debug('Completed proof for checkpoint merge rollup.');
-            provingState.setCheckpointMergeRollupProof(location, result);
-            this.checkAndEnqueueNextCheckpointMergeRollup(provingState, location);
-        });
-    }
-    enqueueEpochPadding(provingState) {
-        if (!provingState.verifyState()) {
-            logger.debug('Not running epoch padding. State no longer valid.');
-            return;
-        }
-        if (!provingState.tryStartProvingPaddingCheckpoint()) {
-            logger.debug('Padding checkpoint already started.');
-            return;
-        }
-        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'
-        }, (signal)=>this.prover.getCheckpointPaddingRollupProof(inputs, signal, provingState.epochNumber)), (result)=>{
-            logger.debug('Completed proof for padding checkpoint.');
-            provingState.setCheckpointPaddingProof(result);
-            this.checkAndEnqueueRootRollup(provingState);
-        });
-    }
-    // Executes the root rollup circuit
-    enqueueRootRollup(provingState) {
-        if (!provingState.verifyState()) {
-            logger.debug('Not running root rollup, state no longer valid');
-            return;
-        }
-        logger.debug(`Preparing root rollup`);
-        const inputs = provingState.getRootRollupInputs();
-        this.deferredProving(provingState, wrapCallbackInSpan(this.tracer, 'ProvingOrchestrator.prover.getRootRollupProof', {
-            [Attributes.PROTOCOL_CIRCUIT_NAME]: 'rollup-root'
-        }, (signal)=>this.prover.getRootRollupProof(inputs, signal, provingState.epochNumber)), (result)=>{
-            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);
         });
     }
     checkAndEnqueueNextMergeRollup(provingState, currentLocation) {
@@ -1152,7 +949,7 @@ _dec = trackSpan('ProvingOrchestrator.startNewBlock', (blockNumber)=>({
     }
     checkAndEnqueueBlockRootRollup(provingState) {
         if (!provingState.isReadyForBlockRootRollup()) {
-            logger.debug('Not ready for block root rollup');
+            this.logger.debug('Not ready for block root rollup');
             return;
         }
         this.enqueueBlockRootRollup(provingState);
@@ -1163,54 +960,43 @@ _dec = trackSpan('ProvingOrchestrator.startNewBlock', (blockNumber)=>({
         }
         const parentLocation = provingState.getParentLocation(currentLocation);
         if (parentLocation.level === 0) {
-            this.checkAndEnqueueCheckpointRootRollup(provingState);
+            this.checkAndEnqueueSubTreeResolution(provingState);
         } else {
             this.enqueueBlockMergeRollup(provingState, parentLocation);
         }
     }
-    checkAndEnqueueCheckpointRootRollup(provingState) {
-        if (!provingState.isReadyForCheckpointRoot()) {
-            return;
-        }
-        this.enqueueCheckpointRootRollup(provingState);
-    }
-    checkAndEnqueueNextCheckpointMergeRollup(provingState, currentLocation) {
-        if (!provingState.isReadyForCheckpointMerge(currentLocation)) {
-            return;
-        }
-        const parentLocation = provingState.getParentLocation(currentLocation);
-        if (parentLocation.level === 0) {
-            this.checkAndEnqueueRootRollup(provingState);
-        } else {
-            this.enqueueCheckpointMergeRollup(provingState, parentLocation);
-        }
-    }
-    checkAndEnqueueRootRollup(provingState) {
-        if (!provingState.isReadyForRootRollup()) {
-            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.
+   */ checkAndEnqueueSubTreeResolution(provingState) {
+        const proofs = provingState.getSubTreeOutputProofs();
+        const nonEmpty = proofs.filter((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.
    */ enqueueVM(provingState, txIndex) {
         if (!provingState.verifyState()) {
-            logger.debug(`Not running VM circuit as state is no longer valid`);
+            this.logger.debug(`Not running VM circuit as state is no longer valid`);
             return;
         }
         const txProvingState = provingState.getTxProvingState(txIndex);
-        const doAvmProving = wrapCallbackInSpan(this.tracer, 'ProvingOrchestrator.prover.getAvmProof', {
-            [Attributes.TX_HASH]: txProvingState.processedTx.hash.toString()
-        }, async (signal)=>{
+        this.deferredProving(provingState, this.wrapCircuitCall('getAvmProof', async (signal)=>{
             const inputs = txProvingState.getAvmInputs();
             return await this.prover.getAvmProof(inputs, signal, provingState.epochNumber);
-        });
-        this.deferredProving(provingState, doAvmProving, (proof)=>{
-            logger.debug(`Proven VM for tx index: ${txIndex}`);
+        }, {
+            [Attributes.TX_HASH]: txProvingState.processedTx.hash.toString()
+        }), (proof)=>{
+            this.logger.debug(`Proven VM for tx index: ${txIndex}`);
             txProvingState.setAvmProof(proof);
             this.checkAndEnqueueBaseRollup(provingState, txIndex);
         });
@@ -1220,8 +1006,61 @@ _dec = trackSpan('ProvingOrchestrator.startNewBlock', (blockNumber)=>({
         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.
-        logger.debug(`Public functions completed for tx ${txIndex} enqueueing 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.
+    async verifyBuiltBlockAgainstSyncedState(provingState) {
+        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;
+        }
+    }
+    getDbForBlock(blockNumber) {
+        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.
+   */ wrapCircuitCall(circuitName, fn, attributes = {}) {
+        return wrapCallbackInSpan(this.tracer, `CheckpointSubTreeOrchestrator.prover.${circuitName}`, {
+            [Attributes.PROTOCOL_CIRCUIT_NAME]: circuitName,
+            ...attributes
+        }, fn);
+    }
 }