@aztec/prover-client 0.0.1-fake-ceab37513c → 0.0.2-commit.217f559981

package/dest/orchestrator/orchestrator.js

@@ -1,33 +1,403 @@
-function _ts_decorate(decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
+function applyDecs2203RFactory() {
+    function createAddInitializerMethod(initializers, decoratorFinishedRef) {
+        return function addInitializer(initializer) {
+            assertNotFinished(decoratorFinishedRef, "addInitializer");
+            assertCallable(initializer, "An initializer");
+            initializers.push(initializer);
+        };
+    }
+    function memberDec(dec, name, desc, initializers, kind, isStatic, isPrivate, metadata, value) {
+        var kindStr;
+        switch(kind){
+            case 1:
+                kindStr = "accessor";
+                break;
+            case 2:
+                kindStr = "method";
+                break;
+            case 3:
+                kindStr = "getter";
+                break;
+            case 4:
+                kindStr = "setter";
+                break;
+            default:
+                kindStr = "field";
+        }
+        var ctx = {
+            kind: kindStr,
+            name: isPrivate ? "#" + name : name,
+            static: isStatic,
+            private: isPrivate,
+            metadata: metadata
+        };
+        var decoratorFinishedRef = {
+            v: false
+        };
+        ctx.addInitializer = createAddInitializerMethod(initializers, decoratorFinishedRef);
+        var get, set;
+        if (kind === 0) {
+            if (isPrivate) {
+                get = desc.get;
+                set = desc.set;
+            } else {
+                get = function() {
+                    return this[name];
+                };
+                set = function(v) {
+                    this[name] = v;
+                };
+            }
+        } else if (kind === 2) {
+            get = function() {
+                return desc.value;
+            };
+        } else {
+            if (kind === 1 || kind === 3) {
+                get = function() {
+                    return desc.get.call(this);
+                };
+            }
+            if (kind === 1 || kind === 4) {
+                set = function(v) {
+                    desc.set.call(this, v);
+                };
+            }
+        }
+        ctx.access = get && set ? {
+            get: get,
+            set: set
+        } : get ? {
+            get: get
+        } : {
+            set: set
+        };
+        try {
+            return dec(value, ctx);
+        } finally{
+            decoratorFinishedRef.v = true;
+        }
+    }
+    function assertNotFinished(decoratorFinishedRef, fnName) {
+        if (decoratorFinishedRef.v) {
+            throw new Error("attempted to call " + fnName + " after decoration was finished");
+        }
+    }
+    function assertCallable(fn, hint) {
+        if (typeof fn !== "function") {
+            throw new TypeError(hint + " must be a function");
+        }
+    }
+    function assertValidReturnValue(kind, value) {
+        var type = typeof value;
+        if (kind === 1) {
+            if (type !== "object" || value === null) {
+                throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0");
+            }
+            if (value.get !== undefined) {
+                assertCallable(value.get, "accessor.get");
+            }
+            if (value.set !== undefined) {
+                assertCallable(value.set, "accessor.set");
+            }
+            if (value.init !== undefined) {
+                assertCallable(value.init, "accessor.init");
+            }
+        } else if (type !== "function") {
+            var hint;
+            if (kind === 0) {
+                hint = "field";
+            } else if (kind === 10) {
+                hint = "class";
+            } else {
+                hint = "method";
+            }
+            throw new TypeError(hint + " decorators must return a function or void 0");
+        }
+    }
+    function applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, initializers, metadata) {
+        var decs = decInfo[0];
+        var desc, init, value;
+        if (isPrivate) {
+            if (kind === 0 || kind === 1) {
+                desc = {
+                    get: decInfo[3],
+                    set: decInfo[4]
+                };
+            } else if (kind === 3) {
+                desc = {
+                    get: decInfo[3]
+                };
+            } else if (kind === 4) {
+                desc = {
+                    set: decInfo[3]
+                };
+            } else {
+                desc = {
+                    value: decInfo[3]
+                };
+            }
+        } else if (kind !== 0) {
+            desc = Object.getOwnPropertyDescriptor(base, name);
+        }
+        if (kind === 1) {
+            value = {
+                get: desc.get,
+                set: desc.set
+            };
+        } else if (kind === 2) {
+            value = desc.value;
+        } else if (kind === 3) {
+            value = desc.get;
+        } else if (kind === 4) {
+            value = desc.set;
+        }
+        var newValue, get, set;
+        if (typeof decs === "function") {
+            newValue = memberDec(decs, name, desc, initializers, kind, isStatic, isPrivate, metadata, value);
+            if (newValue !== void 0) {
+                assertValidReturnValue(kind, newValue);
+                if (kind === 0) {
+                    init = newValue;
+                } else if (kind === 1) {
+                    init = newValue.init;
+                    get = newValue.get || value.get;
+                    set = newValue.set || value.set;
+                    value = {
+                        get: get,
+                        set: set
+                    };
+                } else {
+                    value = newValue;
+                }
+            }
+        } else {
+            for(var i = decs.length - 1; i >= 0; i--){
+                var dec = decs[i];
+                newValue = memberDec(dec, name, desc, initializers, kind, isStatic, isPrivate, metadata, value);
+                if (newValue !== void 0) {
+                    assertValidReturnValue(kind, newValue);
+                    var newInit;
+                    if (kind === 0) {
+                        newInit = newValue;
+                    } else if (kind === 1) {
+                        newInit = newValue.init;
+                        get = newValue.get || value.get;
+                        set = newValue.set || value.set;
+                        value = {
+                            get: get,
+                            set: set
+                        };
+                    } else {
+                        value = newValue;
+                    }
+                    if (newInit !== void 0) {
+                        if (init === void 0) {
+                            init = newInit;
+                        } else if (typeof init === "function") {
+                            init = [
+                                init,
+                                newInit
+                            ];
+                        } else {
+                            init.push(newInit);
+                        }
+                    }
+                }
+            }
+        }
+        if (kind === 0 || kind === 1) {
+            if (init === void 0) {
+                init = function(instance, init) {
+                    return init;
+                };
+            } else if (typeof init !== "function") {
+                var ownInitializers = init;
+                init = function(instance, init) {
+                    var value = init;
+                    for(var i = 0; i < ownInitializers.length; i++){
+                        value = ownInitializers[i].call(instance, value);
+                    }
+                    return value;
+                };
+            } else {
+                var originalInitializer = init;
+                init = function(instance, init) {
+                    return originalInitializer.call(instance, init);
+                };
+            }
+            ret.push(init);
+        }
+        if (kind !== 0) {
+            if (kind === 1) {
+                desc.get = value.get;
+                desc.set = value.set;
+            } else if (kind === 2) {
+                desc.value = value;
+            } else if (kind === 3) {
+                desc.get = value;
+            } else if (kind === 4) {
+                desc.set = value;
+            }
+            if (isPrivate) {
+                if (kind === 1) {
+                    ret.push(function(instance, args) {
+                        return value.get.call(instance, args);
+                    });
+                    ret.push(function(instance, args) {
+                        return value.set.call(instance, args);
+                    });
+                } else if (kind === 2) {
+                    ret.push(value);
+                } else {
+                    ret.push(function(instance, args) {
+                        return value.call(instance, args);
+                    });
+                }
+            } else {
+                Object.defineProperty(base, name, desc);
+            }
+        }
+    }
+    function applyMemberDecs(Class, decInfos, metadata) {
+        var ret = [];
+        var protoInitializers;
+        var staticInitializers;
+        var existingProtoNonFields = new Map();
+        var existingStaticNonFields = new Map();
+        for(var i = 0; i < decInfos.length; i++){
+            var decInfo = decInfos[i];
+            if (!Array.isArray(decInfo)) continue;
+            var kind = decInfo[1];
+            var name = decInfo[2];
+            var isPrivate = decInfo.length > 3;
+            var isStatic = kind >= 5;
+            var base;
+            var initializers;
+            if (isStatic) {
+                base = Class;
+                kind = kind - 5;
+                staticInitializers = staticInitializers || [];
+                initializers = staticInitializers;
+            } else {
+                base = Class.prototype;
+                protoInitializers = protoInitializers || [];
+                initializers = protoInitializers;
+            }
+            if (kind !== 0 && !isPrivate) {
+                var existingNonFields = isStatic ? existingStaticNonFields : existingProtoNonFields;
+                var existingKind = existingNonFields.get(name) || 0;
+                if (existingKind === true || existingKind === 3 && kind !== 4 || existingKind === 4 && kind !== 3) {
+                    throw new Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + name);
+                } else if (!existingKind && kind > 2) {
+                    existingNonFields.set(name, kind);
+                } else {
+                    existingNonFields.set(name, true);
+                }
+            }
+            applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, initializers, metadata);
+        }
+        pushInitializers(ret, protoInitializers);
+        pushInitializers(ret, staticInitializers);
+        return ret;
+    }
+    function pushInitializers(ret, initializers) {
+        if (initializers) {
+            ret.push(function(instance) {
+                for(var i = 0; i < initializers.length; i++){
+                    initializers[i].call(instance);
+                }
+                return instance;
+            });
+        }
+    }
+    function applyClassDecs(targetClass, classDecs, metadata) {
+        if (classDecs.length > 0) {
+            var initializers = [];
+            var newClass = targetClass;
+            var name = targetClass.name;
+            for(var i = classDecs.length - 1; i >= 0; i--){
+                var decoratorFinishedRef = {
+                    v: false
+                };
+                try {
+                    var nextNewClass = classDecs[i](newClass, {
+                        kind: "class",
+                        name: name,
+                        addInitializer: createAddInitializerMethod(initializers, decoratorFinishedRef),
+                        metadata
+                    });
+                } finally{
+                    decoratorFinishedRef.v = true;
+                }
+                if (nextNewClass !== undefined) {
+                    assertValidReturnValue(10, nextNewClass);
+                    newClass = nextNewClass;
+                }
+            }
+            return [
+                defineMetadata(newClass, metadata),
+                function() {
+                    for(var i = 0; i < initializers.length; i++){
+                        initializers[i].call(newClass);
+                    }
+                }
+            ];
+        }
+    }
+    function defineMetadata(Class, metadata) {
+        return Object.defineProperty(Class, Symbol.metadata || Symbol.for("Symbol.metadata"), {
+            configurable: true,
+            enumerable: true,
+            value: metadata
+        });
+    }
+    return function applyDecs2203R(targetClass, memberDecs, classDecs, parentClass) {
+        if (parentClass !== void 0) {
+            var parentMetadata = parentClass[Symbol.metadata || Symbol.for("Symbol.metadata")];
+        }
+        var metadata = Object.create(parentMetadata === void 0 ? null : parentMetadata);
+        var e = applyMemberDecs(targetClass, memberDecs, metadata);
+        if (!classDecs.length) defineMetadata(targetClass, metadata);
+        return {
+            e: e,
+            get c () {
+                return applyClassDecs(targetClass, classDecs, metadata);
+            }
+        };
+    };
+}
+function _apply_decs_2203_r(targetClass, memberDecs, classDecs, parentClass) {
+    return (_apply_decs_2203_r = applyDecs2203RFactory())(targetClass, memberDecs, classDecs, parentClass);
 }
-import { BlobAccumulatorPublicInputs } from '@aztec/blob-lib';
-import { L1_TO_L2_MSG_SUBTREE_HEIGHT, L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NUM_BASE_PARITY_PER_ROOT_PARITY } from '@aztec/constants';
-import { padArrayEnd, times } from '@aztec/foundation/collection';
+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';
+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 { Fr } from '@aztec/foundation/fields';
 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 { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
-import { readAvmMinimalPublicTxInputsFromFile } from '@aztec/simulator/public/fixtures';
-import { L2Block } from '@aztec/stdlib/block';
-import { BaseParityInputs } from '@aztec/stdlib/parity';
-import { EmptyBlockRootRollupInputs, PrivateBaseRollupInputs, SingleTxBlockRootRollupInputs, TubeInputs } from '@aztec/stdlib/rollup';
+import { BlockRootEmptyTxFirstRollupPrivateInputs, BlockRootFirstRollupPrivateInputs, BlockRootSingleTxFirstRollupPrivateInputs, BlockRootSingleTxRollupPrivateInputs, CheckpointRootSingleBlockRollupPrivateInputs, PrivateTxBaseRollupPrivateInputs } from '@aztec/stdlib/rollup';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
-import { toNumBlobFields } from '@aztec/stdlib/tx';
 import { Attributes, getTelemetryClient, trackSpan, wrapCallbackInSpan } from '@aztec/telemetry-client';
 import { inspect } from 'util';
-import { buildHeaderAndBodyFromTxs, getLastSiblingPath, getRootTreeSiblingPath, getSubtreeSiblingPath, getTreeSnapshot, insertSideEffectsAndBuildBaseRollupHints, validatePartialState, validateTx } from './block-building-helpers.js';
+import { buildHeaderFromCircuitOutputs, getLastSiblingPath, getPublicChonkVerifierPrivateInputsFromTx, getRootTreeSiblingPath, getSubtreeSiblingPath, getTreeSnapshot, insertSideEffectsAndBuildBaseRollupHints, validatePartialState, validateTx } from './block-building-helpers.js';
 import { EpochProvingState } from './epoch-proving-state.js';
 import { ProvingOrchestratorMetrics } from './orchestrator_metrics.js';
 import { TxProvingState } from './tx-proving-state.js';
-const logger = createLogger('prover-client:orchestrator');
+_dec = trackSpan('ProvingOrchestrator.startNewBlock', (blockNumber)=>({
+        [Attributes.BLOCK_NUMBER]: blockNumber
+    })), _dec1 = trackSpan('ProvingOrchestrator.addTxs', (txs)=>({
+        [Attributes.BLOCK_TXS_COUNT]: txs.length
+    })), _dec2 = trackSpan('ProvingOrchestrator.startChonkVerifierCircuits'), _dec3 = trackSpan('ProvingOrchestrator.setBlockCompleted', (blockNumber)=>({
+        [Attributes.BLOCK_NUMBER]: blockNumber
+    })), _dec4 = trackSpan('ProvingOrchestrator.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.
@@ -43,19 +413,53 @@ const logger = createLogger('prover-client:orchestrator');
     dbProvider;
     prover;
     proverId;
+    cancelJobsOnStop;
+    static{
+        ({ e: [_initProto] } = _apply_decs_2203_r(this, [
+            [
+                _dec,
+                2,
+                "startNewBlock"
+            ],
+            [
+                _dec1,
+                2,
+                "addTxs"
+            ],
+            [
+                _dec2,
+                2,
+                "startChonkVerifierCircuits"
+            ],
+            [
+                _dec3,
+                2,
+                "setBlockCompleted"
+            ],
+            [
+                _dec4,
+                2,
+                "prepareBaseRollupInputs"
+            ]
+        ], []));
+    }
     provingState;
     pendingProvingJobs;
     provingPromise;
     metrics;
+    // eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
     dbs;
-    constructor(dbProvider, prover, proverId, telemetryClient = getTelemetryClient()){
+    logger;
+    constructor(dbProvider, prover, proverId, cancelJobsOnStop = false, telemetryClient = getTelemetryClient(), bindings){
         this.dbProvider = dbProvider;
         this.prover = prover;
         this.proverId = proverId;
-        this.provingState = undefined;
+        this.cancelJobsOnStop = cancelJobsOnStop;
+        this.provingState = (_initProto(this), undefined);
         this.pendingProvingJobs = [];
         this.provingPromise = undefined;
         this.dbs = new Map();
+        this.logger = createLogger('prover-client:orchestrator', bindings);
         this.metrics = new ProvingOrchestratorMetrics(telemetryClient, 'ProvingOrchestrator');
     }
     get tracer() {
@@ -64,86 +468,152 @@ const logger = createLogger('prover-client:orchestrator');
     getProverId() {
         return this.proverId;
     }
+    getNumActiveForks() {
+        return this.dbs.size;
+    }
     stop() {
         this.cancel();
         return Promise.resolve();
     }
-    startNewEpoch(epochNumber, firstBlockNumber, totalNumBlocks, finalBlobBatchingChallenges) {
+    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
             }));
-        if (totalNumBlocks <= 0 || !Number.isInteger(totalNumBlocks)) {
-            throw new Error(`Invalid number of blocks for epoch (got ${totalNumBlocks})`);
-        }
-        logger.info(`Starting epoch ${epochNumber} with ${totalNumBlocks} blocks`);
-        this.provingState = new EpochProvingState(epochNumber, firstBlockNumber, totalNumBlocks, finalBlobBatchingChallenges, resolve, reject);
+        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;
     }
     /**
-   * Starts off a new block
-   * @param globalVariables - The global variables for the block
-   * @param l1ToL2Messages - The l1 to l2 messages for the block
-   * @returns A proving ticket, containing a promise notifying of proving completion
-   */ async startNewBlock(globalVariables, l1ToL2Messages, previousBlockHeader) {
+   * 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) {
         if (!this.provingState) {
-            throw new Error(`Invalid proving state, call startNewEpoch before starting a block`);
-        }
-        if (!this.provingState?.isAcceptingBlocks()) {
-            throw new Error(`Epoch not accepting further blocks`);
-        }
-        logger.info(`Starting block ${globalVariables.blockNumber} for slot ${globalVariables.slotNumber.toNumber()}`);
-        // Fork world state at the end of the immediately previous block
-        const db = await this.dbProvider.fork(globalVariables.blockNumber - 1);
-        this.dbs.set(globalVariables.blockNumber, db);
-        // we start the block by enqueueing all of the base parity circuits
-        const { l1ToL2MessageTreeSnapshot, l1ToL2MessageSubtreeSiblingPath, l1ToL2MessageTreeSnapshotAfterInsertion, baseParityInputs } = await this.prepareBaseParityInputs(l1ToL2Messages, db);
-        // Get archive snapshot before this block lands
-        const lastArchive = await getTreeSnapshot(MerkleTreeId.ARCHIVE, db);
+            throw new Error('Empty epoch proving state. Call startNewEpoch before starting a checkpoint.');
+        }
+        if (!this.provingState.isAcceptingCheckpoints()) {
+            throw new Error(`Epoch not accepting further checkpoints.`);
+        }
+        // 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);
-        const newArchiveSiblingPath = await getRootTreeSiblingPath(MerkleTreeId.ARCHIVE, db);
-        const blockProvingState = this.provingState.startNewBlock(globalVariables, l1ToL2Messages, l1ToL2MessageTreeSnapshot, l1ToL2MessageSubtreeSiblingPath, l1ToL2MessageTreeSnapshotAfterInsertion, lastArchive, lastArchiveSiblingPath, newArchiveSiblingPath, previousBlockHeader, this.proverId);
-        // Enqueue base parity circuits for the block
-        for(let i = 0; i < baseParityInputs.length; i++){
-            this.enqueueBaseParityCircuit(blockProvingState, baseParityInputs[i], i);
+        // 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
+   * @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
+   */ 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.`);
+        }
+        if (!checkpointProvingState.isAcceptingBlocks()) {
+            throw new Error(`Checkpoint not accepting further blocks.`);
+        }
+        const constants = checkpointProvingState.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`.
+        if (!this.dbs.has(blockNumber)) {
+            // 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.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);
+        // 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);
+            }
+        }
+        // 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.
+        if (totalNumTxs === 0) {
+            const endState = await db.getStateReference();
+            blockProvingState.setEndState(endState);
+            const endSpongeBlob = blockProvingState.getStartSpongeBlob().clone();
+            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.
    * @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.`);
+        }
         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.`);
+            this.logger.warn(`Provided no txs to orchestrator addTxs.`);
             return;
         }
-        const blockNumber = txs[0].globalVariables.blockNumber;
-        const provingState = this.provingState?.getBlockProvingStateByBlockNumber(blockNumber);
+        const blockNumber = BlockNumber(txs[0].globalVariables.blockNumber);
+        const provingState = this.provingState.getBlockProvingStateByBlockNumber(blockNumber);
         if (!provingState) {
-            throw new Error(`Block proving state for ${blockNumber} not found`);
+            throw new Error(`Proving state for block ${blockNumber} not found. Call startNewBlock first.`);
+        }
+        if (provingState.totalNumTxs !== txs.length) {
+            throw new Error(`Block ${blockNumber} should be filled with ${provingState.totalNumTxs} txs. Received ${txs.length} txs.`);
         }
-        if (provingState.totalNumTxs) {
+        if (!provingState.isAcceptingTxs()) {
             throw new Error(`Block ${blockNumber} has been initialized with transactions.`);
         }
-        const numBlobFields = toNumBlobFields(txs);
-        provingState.startNewBlock(txs.length, numBlobFields);
-        logger.info(`Adding ${txs.length} transactions with ${numBlobFields} blob fields to block ${provingState.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();
         for (const tx of txs){
             try {
                 if (!provingState.verifyState()) {
                     throw new Error(`Invalid proving state when adding a tx`);
                 }
                 validateTx(tx);
-                logger.info(`Received transaction: ${tx.hash}`);
-                const [hints, treeSnapshots] = await this.prepareTransaction(tx, provingState);
-                const txProvingState = new TxProvingState(tx, hints, treeSnapshots);
+                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()) {
+                    throw new Error(`Unable to add transaction, preparing base inputs failed`);
+                }
+                await spongeBlobState.absorb(tx.txEffect.toBlobFields());
+                const txProvingState = new TxProvingState(tx, hints, treeSnapshots, this.proverId.toField());
                 const txIndex = provingState.addNewTx(txProvingState);
-                this.getOrEnqueueTube(provingState, txIndex);
                 if (txProvingState.requireAvmProof) {
-                    logger.debug(`Enqueueing public VM for tx ${txIndex}`);
+                    this.getOrEnqueueChonkVerifier(provingState, txIndex);
+                    this.logger.debug(`Enqueueing public VM for tx ${txIndex}`);
                     this.enqueueVM(provingState, txIndex);
+                } else {
+                    this.logger.debug(`Enqueueing base rollup for private-only tx ${txIndex}`);
+                    this.enqueueBaseRollup(provingState, txIndex);
                 }
             } catch (err) {
                 throw new Error(`Error adding transaction ${tx.hash.toString()} to block ${blockNumber}: ${err.message}`, {
@@ -151,21 +621,32 @@ const logger = createLogger('prover-client:orchestrator');
                 });
             }
         }
+        const endState = await db.getStateReference();
+        provingState.setEndState(endState);
+        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 tube circuits for the specified txs. These will be used during epoch proving.
-   * Note that if the tube circuits are not started this way, they will be started nontheless after processing.
-   */ startTubeCircuits(txs) {
+   * 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(`Invalid proving state, call startNewEpoch before starting tube circuits`);
+            throw new Error(`Empty epoch proving state. call startNewEpoch before starting chonk verifier circuits.`);
         }
-        for (const tx of txs){
+        const publicTxs = txs.filter((tx)=>tx.data.forPublic);
+        for (const tx of publicTxs){
             const txHash = tx.getTxHash().toString();
-            const tubeInputs = new TubeInputs(!!tx.data.forPublic, tx.clientIvcProof);
+            const privateInputs = getPublicChonkVerifierPrivateInputsFromTx(tx, this.proverId.toField());
             const tubeProof = promiseWithResolvers();
-            logger.debug(`Starting tube circuit for tx ${txHash}`);
-            this.doEnqueueTube(txHash, tubeInputs, (proof)=>tubeProof.resolve(proof));
-            this.provingState?.cachedTubeProofs.set(txHash, tubeProof.promise);
+            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();
     }
@@ -177,65 +658,98 @@ const logger = createLogger('prover-client:orchestrator');
         if (!provingState) {
             throw new Error(`Block proving state for ${blockNumber} not found`);
         }
-        if (!provingState.spongeBlobState) {
-            // If we are completing an empty block, initialize the provingState.
-            // We will have 0 txs and no blob fields.
-            provingState.startNewBlock(0, 0);
+        // Abort with specific error for the block if there's one.
+        const error = provingState.getError();
+        if (error) {
+            throw new Error(`Block proving failed: ${error}`);
         }
+        // Abort if the proving state is not valid due to errors occurred elsewhere.
         if (!provingState.verifyState()) {
-            throw new Error(`Block proving failed: ${provingState.error}`);
-        }
-        // And build the block header
-        logger.verbose(`Block ${blockNumber} completed. Assembling header.`);
-        await this.buildBlock(provingState, expectedHeader);
-        logger.debug(`Accumulating blobs for ${blockNumber}`);
-        await this.provingState?.setBlobAccumulators(blockNumber);
-        // If the proofs were faster than the block building, then we need to try the block root rollup again here
-        await this.checkAndEnqueueBlockRootRollup(provingState);
-        return provingState.block;
-    }
-    /** Returns the block as built for a given index. */ getBlock(index) {
-        const block = this.provingState?.blocks[index]?.block;
-        if (!block) {
-            throw new Error(`Block at index ${index} not available`);
-        }
-        return block;
-    }
-    async buildBlock(provingState, expectedHeader) {
-        // Collect all new nullifiers, commitments, and contracts from all txs in this block to build body
-        const txs = provingState.allTxs.map((a)=>a.processedTx);
-        // Get db for this block
-        const db = this.dbs.get(provingState.blockNumber);
-        // Given we've applied every change from this block, now assemble the block header
-        // and update the archive tree, so we're ready to start processing the next block
-        const { header, body } = await buildHeaderAndBodyFromTxs(txs, provingState.globalVariables, provingState.newL1ToL2Messages, db);
+            throw new Error(`Invalid proving state when completing block ${blockNumber}.`);
+        }
+        if (provingState.isAcceptingTxs()) {
+            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:
+        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');
         }
-        logger.verbose(`Updating archive tree with block ${provingState.blockNumber} header ${(await header.hash()).toString()}`);
-        await db.updateArchive(header);
-        // Assemble the L2 block
-        const newArchive = await getTreeSnapshot(MerkleTreeId.ARCHIVE, db);
-        const l2Block = new L2Block(newArchive, header, body);
-        await this.verifyBuiltBlockAgainstSyncedState(l2Block, newArchive);
-        logger.verbose(`Orchestrator finalized block ${l2Block.number}`);
-        provingState.setBlock(l2Block);
+        // 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(l2Block, newArchive) {
-        const syncedArchive = await getTreeSnapshot(MerkleTreeId.ARCHIVE, this.dbProvider.getSnapshot(l2Block.number));
+    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)) {
-            throw new Error(`Archive tree mismatch for block ${l2Block.number}: world state synced to ${inspect(syncedArchive)} but built ${inspect(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;
         }
     }
     /**
-   * Cancel any further proving
+   * 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.
    */ cancel() {
-        for (const controller of this.pendingProvingJobs){
-            controller.abort();
+        if (this.cancelJobsOnStop) {
+            for (const controller of this.pendingProvingJobs){
+                controller.abort();
+            }
         }
         this.provingState?.cancel();
+        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();
+    }
+    getDbForBlock(blockNumber) {
+        const db = this.dbs.get(blockNumber);
+        if (!db) {
+            throw new Error(`World state fork for block ${blockNumber} not found.`);
+        }
+        return db;
     }
     /**
    * Returns the proof for the current epoch.
@@ -247,14 +761,7 @@ const logger = createLogger('prover-client:orchestrator');
         if (result.status === 'failure') {
             throw new Error(`Epoch proving failed: ${result.reason}`);
         }
-        // TODO(MW): Move this? Requires async and don't want to force root methods to be async
-        // TODO(MW): EpochProvingState uses this.blocks.filter(b => !!b).length as total blocks, use this below:
-        const finalBlock = this.provingState.blocks[this.provingState.totalNumBlocks - 1];
-        if (!finalBlock || !finalBlock.endBlobAccumulator) {
-            throw new Error(`Epoch's final block not ready for finalize`);
-        }
-        const finalBatchedBlob = await finalBlock.endBlobAccumulator.finalize();
-        this.provingState.setFinalBatchedBlob(finalBatchedBlob);
+        await this.provingState.finalizeBatchedBlob();
         const epochProofResult = this.provingState.getEpochProofResult();
         pushTestData('epochProofResult', {
             proof: epochProofResult.proof.toString(),
@@ -263,25 +770,13 @@ const logger = createLogger('prover-client:orchestrator');
         return epochProofResult;
     }
     /**
-   * Starts the proving process for the given transaction and adds it to our state
-   * @param tx - The transaction whose proving we wish to commence
-   * @param provingState - The proving state being worked on
-   */ async prepareTransaction(tx, provingState) {
-        const txInputs = await this.prepareBaseRollupInputs(provingState, tx);
-        if (!txInputs) {
-            // This should not be possible
-            throw new Error(`Unable to add transaction, preparing base inputs failed`);
-        }
-        return txInputs;
-    }
-    /**
    * 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`);
+        if (!provingState.verifyState()) {
+            this.logger.debug(`Not enqueuing job, state no longer valid`);
             return;
         }
         const controller = new AbortController();
@@ -295,8 +790,8 @@ const logger = createLogger('prover-client:orchestrator');
                     return;
                 }
                 const result = await request(controller.signal);
-                if (!provingState?.verifyState()) {
-                    logger.debug(`State no longer valid, discarding result`);
+                if (!provingState.verifyState()) {
+                    this.logger.debug(`State no longer valid, discarding result`);
                     return;
                 }
                 // we could have been cancelled whilst waiting for the result
@@ -311,7 +806,7 @@ const logger = createLogger('prover-client:orchestrator');
                     // drop this result
                     return;
                 }
-                logger.error(`Error thrown when proving job`, err);
+                this.logger.error(`Error thrown when proving job`, err);
                 provingState.reject(`${err}`);
             } finally{
                 const index = this.pendingProvingJobs.indexOf(controller);
@@ -323,31 +818,26 @@ const logger = createLogger('prover-client:orchestrator');
         // let the callstack unwind before adding the job to the queue
         setImmediate(()=>void safeJob());
     }
-    async prepareBaseParityInputs(l1ToL2Messages, db) {
+    async updateL1ToL2MessageTree(l1ToL2Messages, db) {
         const l1ToL2MessagesPadded = padArrayEnd(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, 'Too many L1 to L2 messages');
-        const baseParityInputs = times(NUM_BASE_PARITY_PER_ROOT_PARITY, (i)=>BaseParityInputs.fromSlice(l1ToL2MessagesPadded, i, getVKTreeRoot()));
-        const l1ToL2MessageTreeSnapshot = await getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, db);
-        const l1ToL2MessageSubtreeSiblingPath = assertLength(await getSubtreeSiblingPath(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, L1_TO_L2_MSG_SUBTREE_HEIGHT, db), L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH);
+        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);
-        const l1ToL2MessageTreeSnapshotAfterInsertion = await getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, db);
+        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 {
-            l1ToL2MessageTreeSnapshot,
-            l1ToL2MessageSubtreeSiblingPath,
-            l1ToL2MessageTreeSnapshotAfterInsertion,
-            baseParityInputs
+            lastL1ToL2MessageTreeSnapshot,
+            lastL1ToL2MessageSubtreeRootSiblingPath,
+            newL1ToL2MessageTreeSnapshot,
+            newL1ToL2MessageSubtreeRootSiblingPath
         };
     }
     // Updates the merkle trees for a transaction. The first enqueued job for a transaction
-    async prepareBaseRollupInputs(provingState, tx) {
-        if (!provingState.verifyState() || !provingState.spongeBlobState) {
-            logger.debug('Not preparing base rollup inputs, state invalid');
-            return;
-        }
-        const db = this.dbs.get(provingState.blockNumber);
+    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 tube circuit and any public kernels
-        const [ms, hints] = await elapsed(insertSideEffectsAndBuildBaseRollupHints(tx, provingState.globalVariables, provingState.l1ToL2MessageTreeSnapshotAfterInsertion, db, provingState.spongeBlobState));
+        // 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);
         const promises = [
             MerkleTreeId.NOTE_HASH_TREE,
@@ -363,10 +853,6 @@ const logger = createLogger('prover-client:orchestrator');
                 obj.key,
                 obj.value
             ]));
-        if (!provingState.verifyState()) {
-            logger.debug(`Discarding proving job, state no longer valid`);
-            return;
-        }
         return [
             hints,
             treeSnapshots
@@ -376,145 +862,150 @@ const logger = createLogger('prover-client:orchestrator');
     // 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)) {
+            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 PrivateBaseRollupInputs ? 'getPrivateBaseRollupProof' : 'getPublicBaseRollupProof'}`, {
+        this.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)=>{
-            if (inputs instanceof PrivateBaseRollupInputs) {
-                return this.prover.getPrivateBaseRollupProof(inputs, signal, provingState.epochNumber);
+            if (inputs instanceof PrivateTxBaseRollupPrivateInputs) {
+                return this.prover.getPrivateTxBaseRollupProof(inputs, signal, provingState.epochNumber);
             } else {
-                return this.prover.getPublicBaseRollupProof(inputs, signal, provingState.epochNumber);
+                return this.prover.getPublicTxBaseRollupProof(inputs, signal, provingState.epochNumber);
             }
-        }), async (result)=>{
-            logger.debug(`Completed proof for ${rollupType} for tx ${processedTx.hash.toString()}`);
-            validatePartialState(result.inputs.end, txProvingState.treeSnapshots);
+        }), (result)=>{
+            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) {
-                await this.checkAndEnqueueBlockRootRollup(provingState);
+                this.checkAndEnqueueBlockRootRollup(provingState);
             } else {
-                await this.checkAndEnqueueNextMergeRollup(provingState, leafLocation);
+                this.checkAndEnqueueNextMergeRollup(provingState, leafLocation);
             }
         });
     }
-    // Enqueues the tube circuit for a given transaction index, or reuses the one already enqueued
-    // Once completed, will enqueue the next circuit, either a public kernel or the base rollup
-    getOrEnqueueTube(provingState, txIndex) {
+    // 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) {
         if (!provingState.verifyState()) {
-            logger.debug('Not running tube circuit, state invalid');
+            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)=>{
-            logger.debug(`Got tube proof for tx index: ${txIndex}`, {
+            this.logger.debug(`Got chonk verifier proof for tx index: ${txIndex}`, {
                 txHash
             });
-            txProvingState.setTubeProof(result);
-            this.provingState?.cachedTubeProofs.delete(txHash);
-            this.checkAndEnqueueNextTxCircuit(provingState, txIndex);
+            txProvingState.setPublicChonkVerifierProof(result);
+            this.provingState?.cachedChonkVerifierProofs.delete(txHash);
+            this.checkAndEnqueueBaseRollup(provingState, txIndex);
         };
-        if (this.provingState?.cachedTubeProofs.has(txHash)) {
-            logger.debug(`Tube proof already enqueued for tx index: ${txIndex}`, {
+        if (this.provingState?.cachedChonkVerifierProofs.has(txHash)) {
+            this.logger.debug(`Chonk verifier proof already enqueued for tx index: ${txIndex}`, {
                 txHash
             });
-            void this.provingState.cachedTubeProofs.get(txHash).then(handleResult);
+            void this.provingState.cachedChonkVerifierProofs.get(txHash).then(handleResult);
             return;
         }
-        logger.debug(`Enqueuing tube circuit for tx index: ${txIndex}`);
-        this.doEnqueueTube(txHash, txProvingState.getTubeInputs(), handleResult);
+        this.logger.debug(`Enqueuing chonk verifier circuit for tx index: ${txIndex}`);
+        this.doEnqueueChonkVerifier(txHash, txProvingState.getPublicChonkVerifierPrivateInputs(), handleResult);
     }
-    doEnqueueTube(txHash, inputs, handler, provingState = this.provingState) {
-        if (!provingState?.verifyState()) {
-            logger.debug('Not running tube circuit, state invalid');
+    doEnqueueChonkVerifier(txHash, inputs, handler, provingState = this.provingState) {
+        if (!provingState.verifyState()) {
+            this.logger.debug('Not running chonk verifier circuit, state invalid');
             return;
         }
-        this.deferredProving(provingState, wrapCallbackInSpan(this.tracer, 'ProvingOrchestrator.prover.getTubeProof', {
+        this.deferredProving(provingState, wrapCallbackInSpan(this.tracer, 'ProvingOrchestrator.prover.getPublicChonkVerifierProof', {
             [Attributes.TX_HASH]: txHash,
-            [Attributes.PROTOCOL_CIRCUIT_NAME]: 'tube-circuit'
-        }, (signal)=>this.prover.getTubeProof(inputs, signal, this.provingState.epochNumber)), handler);
+            [Attributes.PROTOCOL_CIRCUIT_NAME]: 'chonk-verifier-public'
+        }, (signal)=>this.prover.getPublicChonkVerifierProof(inputs, signal, provingState.epochNumber)), handler);
     }
     // 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
     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)) {
+            this.logger.debug('Merge rollup already started.');
             return;
         }
         const inputs = provingState.getMergeRollupInputs(location);
-        this.deferredProving(provingState, wrapCallbackInSpan(this.tracer, 'ProvingOrchestrator.prover.getMergeRollupProof', {
-            [Attributes.PROTOCOL_CIRCUIT_NAME]: 'merge-rollup'
-        }, (signal)=>this.prover.getMergeRollupProof(inputs, signal, provingState.epochNumber)), async (result)=>{
+        this.deferredProving(provingState, wrapCallbackInSpan(this.tracer, 'ProvingOrchestrator.prover.getTxMergeRollupProof', {
+            [Attributes.PROTOCOL_CIRCUIT_NAME]: 'rollup-tx-merge'
+        }, (signal)=>this.prover.getTxMergeRollupProof(inputs, signal, provingState.epochNumber)), (result)=>{
             provingState.setMergeRollupProof(location, result);
-            await this.checkAndEnqueueNextMergeRollup(provingState, location);
+            this.checkAndEnqueueNextMergeRollup(provingState, location);
         });
     }
     // Executes the block root rollup circuit
-    async enqueueBlockRootRollup(provingState) {
+    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()) {
+            this.logger.debug('Block root rollup already started.');
             return;
         }
-        provingState.blockRootRollupStarted = true;
-        const { rollupType, inputs } = await provingState.getBlockRootRollupTypeAndInputs();
-        logger.debug(`Enqueuing ${rollupType} for block ${provingState.blockNumber} with ${provingState.newL1ToL2Messages.length} l1 to l2 msgs.`);
+        const { rollupType, inputs } = provingState.getBlockRootRollupTypeAndInputs();
+        this.logger.debug(`Enqueuing ${rollupType} for block ${provingState.blockNumber}.`);
         this.deferredProving(provingState, wrapCallbackInSpan(this.tracer, 'ProvingOrchestrator.prover.getBlockRootRollupProof', {
             [Attributes.PROTOCOL_CIRCUIT_NAME]: rollupType
         }, (signal)=>{
-            if (inputs instanceof EmptyBlockRootRollupInputs) {
-                return this.prover.getEmptyBlockRootRollupProof(inputs, signal, provingState.epochNumber);
-            } else if (inputs instanceof SingleTxBlockRootRollupInputs) {
-                return this.prover.getSingleTxBlockRootRollupProof(inputs, signal, provingState.epochNumber);
+            if (inputs instanceof BlockRootFirstRollupPrivateInputs) {
+                return this.prover.getBlockRootFirstRollupProof(inputs, signal, provingState.epochNumber);
+            } else if (inputs instanceof BlockRootSingleTxFirstRollupPrivateInputs) {
+                return this.prover.getBlockRootSingleTxFirstRollupProof(inputs, signal, provingState.epochNumber);
+            } else if (inputs instanceof BlockRootEmptyTxFirstRollupPrivateInputs) {
+                return this.prover.getBlockRootEmptyTxFirstRollupProof(inputs, signal, provingState.epochNumber);
+            } else if (inputs instanceof BlockRootSingleTxRollupPrivateInputs) {
+                return this.prover.getBlockRootSingleTxRollupProof(inputs, signal, provingState.epochNumber);
             } else {
                 return this.prover.getBlockRootRollupProof(inputs, signal, provingState.epochNumber);
             }
         }), async (result)=>{
-            provingState.setBlockRootRollupProof(result);
-            const header = await provingState.buildHeaderFromProvingOutputs();
-            if (!(await header.hash()).equals(await provingState.block.header.hash())) {
-                logger.error(`Block header mismatch.\nCircuit: ${inspect(header)}\nComputed: ${inspect(provingState.block.header)}`);
-                provingState.reject(`Block header hash mismatch.`);
-            }
-            const dbArchiveRoot = provingState.block.archive.root;
-            const circuitArchiveRoot = result.inputs.newArchive.root;
-            if (!dbArchiveRoot.equals(circuitArchiveRoot)) {
-                logger.error(`New archive root mismatch.\nCircuit: ${result.inputs.newArchive.root}\nComputed: ${dbArchiveRoot}`);
-                provingState.reject(`New archive root mismatch.`);
-            }
-            const endBlobAccumulatorPublicInputs = BlobAccumulatorPublicInputs.fromBatchedBlobAccumulator(provingState.endBlobAccumulator);
-            const circuitEndBlobAccumulatorState = result.inputs.blobPublicInputs.endBlobAccumulator;
-            if (!circuitEndBlobAccumulatorState.equals(endBlobAccumulatorPublicInputs)) {
-                logger.error(`Blob accumulator state mismatch.\nCircuit: ${inspect(circuitEndBlobAccumulatorState)}\nComputed: ${inspect(endBlobAccumulatorPublicInputs)}`);
-                provingState.reject(`Blob accumulator state mismatch.`);
-            }
-            logger.debug(`Completed ${rollupType} proof for block ${provingState.block.number}`);
-            // validatePartialState(result.inputs.end, tx.treeSnapshots); // TODO(palla/prover)
-            const epochProvingState = this.provingState;
-            const leafLocation = epochProvingState.setBlockRootRollupProof(provingState.index, result);
-            if (epochProvingState.totalNumBlocks === 1) {
-                this.enqueueEpochPadding(epochProvingState);
+            this.logger.debug(`Completed ${rollupType} proof for block ${provingState.blockNumber}`);
+            const leafLocation = provingState.setBlockRootRollupProof(result);
+            const checkpointProvingState = provingState.parentCheckpoint;
+            // 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) {
+                await this.checkAndEnqueueCheckpointRootRollup(checkpointProvingState);
             } else {
-                this.checkAndEnqueueNextBlockMergeRollup(epochProvingState, leafLocation);
+                await 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
-    enqueueBaseParityCircuit(provingState, inputs, index) {
+    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)) {
+            this.logger.warn(`Base parity ${baseParityIndex} already started.`);
             return;
         }
+        const inputs = checkpointProvingState.getBaseParityInputs(baseParityIndex);
         this.deferredProving(provingState, wrapCallbackInSpan(this.tracer, 'ProvingOrchestrator.prover.getBaseParityProof', {
-            [Attributes.PROTOCOL_CIRCUIT_NAME]: 'base-parity'
+            [Attributes.PROTOCOL_CIRCUIT_NAME]: 'parity-base'
         }, (signal)=>this.prover.getBaseParityProof(inputs, signal, provingState.epochNumber)), (provingOutput)=>{
-            provingState.setBaseParityProof(index, provingOutput);
+            provingState.setBaseParityProof(baseParityIndex, provingOutput);
             this.checkAndEnqueueRootParityCircuit(provingState);
         });
     }
@@ -528,110 +1019,182 @@ const logger = createLogger('prover-client:orchestrator');
     // Enqueues the root rollup proof 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()) {
+            this.logger.debug('Root parity already started.');
             return;
         }
-        const inputs = provingState.getRootParityInputs();
+        const inputs = provingState.getParityRootInputs();
         this.deferredProving(provingState, wrapCallbackInSpan(this.tracer, 'ProvingOrchestrator.prover.getRootParityProof', {
-            [Attributes.PROTOCOL_CIRCUIT_NAME]: 'root-parity'
-        }, (signal)=>this.prover.getRootParityProof(inputs, signal, provingState.epochNumber)), async (result)=>{
+            [Attributes.PROTOCOL_CIRCUIT_NAME]: 'parity-root'
+        }, (signal)=>this.prover.getRootParityProof(inputs, signal, provingState.epochNumber)), (result)=>{
             provingState.setRootParityProof(result);
-            await this.checkAndEnqueueBlockRootRollup(provingState);
+            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
     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)) {
+            this.logger.debug('Block merge rollup already started.');
             return;
         }
         const inputs = provingState.getBlockMergeRollupInputs(location);
         this.deferredProving(provingState, wrapCallbackInSpan(this.tracer, 'ProvingOrchestrator.prover.getBlockMergeRollupProof', {
-            [Attributes.PROTOCOL_CIRCUIT_NAME]: 'block-merge-rollup'
-        }, (signal)=>this.prover.getBlockMergeRollupProof(inputs, signal, provingState.epochNumber)), (result)=>{
+            [Attributes.PROTOCOL_CIRCUIT_NAME]: 'rollup-block-merge'
+        }, (signal)=>this.prover.getBlockMergeRollupProof(inputs, signal, provingState.epochNumber)), async (result)=>{
             provingState.setBlockMergeRollupProof(location, result);
-            this.checkAndEnqueueNextBlockMergeRollup(provingState, location);
+            await this.checkAndEnqueueNextBlockMergeRollup(provingState, location);
+        });
+    }
+    async enqueueCheckpointRootRollup(provingState) {
+        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);
+            }
+        });
+    }
+    enqueueCheckpointMergeRollup(provingState, location) {
+        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'
+        }, (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);
         });
     }
     enqueueEpochPadding(provingState) {
         if (!provingState.verifyState()) {
-            logger.debug('Not running epoch padding. State no longer valid.');
+            this.logger.debug('Not running epoch padding. State no longer valid.');
             return;
         }
-        logger.debug('Padding epoch proof with a padding block root proof.');
-        const inputs = provingState.getPaddingBlockRootInputs();
-        this.deferredProving(provingState, wrapCallbackInSpan(this.tracer, 'ProvingOrchestrator.prover.getPaddingBlockRootRollupProof', {
-            [Attributes.PROTOCOL_CIRCUIT_NAME]: 'padding-block-root-rollup'
-        }, (signal)=>this.prover.getPaddingBlockRootRollupProof(inputs, signal, provingState.epochNumber)), (result)=>{
-            logger.debug('Completed proof for padding block root.');
-            provingState.setPaddingBlockRootProof(result);
+        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'
+        }, (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
     enqueueRootRollup(provingState) {
         if (!provingState.verifyState()) {
-            logger.debug('Not running root rollup, state no longer valid');
+            this.logger.debug('Not running root rollup, state no longer valid');
             return;
         }
-        logger.debug(`Preparing root rollup`);
+        this.logger.debug(`Preparing root rollup`);
         const inputs = provingState.getRootRollupInputs();
         this.deferredProving(provingState, wrapCallbackInSpan(this.tracer, 'ProvingOrchestrator.prover.getRootRollupProof', {
-            [Attributes.PROTOCOL_CIRCUIT_NAME]: 'root-rollup'
+            [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}`);
+            this.logger.verbose(`Orchestrator completed root rollup for epoch ${provingState.epochNumber}`);
             provingState.setRootRollupProof(result);
             provingState.resolve({
                 status: 'success'
             });
         });
     }
-    async checkAndEnqueueNextMergeRollup(provingState, currentLocation) {
+    checkAndEnqueueNextMergeRollup(provingState, currentLocation) {
         if (!provingState.isReadyForMergeRollup(currentLocation)) {
             return;
         }
         const parentLocation = provingState.getParentLocation(currentLocation);
         if (parentLocation.level === 0) {
-            await this.checkAndEnqueueBlockRootRollup(provingState);
+            this.checkAndEnqueueBlockRootRollup(provingState);
         } else {
             this.enqueueMergeRollup(provingState, parentLocation);
         }
     }
-    async checkAndEnqueueBlockRootRollup(provingState) {
-        const blockNumber = provingState.blockNumber;
-        // Accumulate as far as we can, in case blocks came in out of order and we are behind:
-        await this.provingState?.setBlobAccumulators(blockNumber);
+    checkAndEnqueueBlockRootRollup(provingState) {
         if (!provingState.isReadyForBlockRootRollup()) {
-            logger.debug('Not ready for block root rollup');
+            this.logger.debug('Not ready for block root rollup');
             return;
         }
-        if (provingState.blockRootRollupStarted) {
-            logger.debug('Block root rollup already started');
+        this.enqueueBlockRootRollup(provingState);
+    }
+    async checkAndEnqueueNextBlockMergeRollup(provingState, currentLocation) {
+        if (!provingState.isReadyForBlockMerge(currentLocation)) {
+            return;
+        }
+        const parentLocation = provingState.getParentLocation(currentLocation);
+        if (parentLocation.level === 0) {
+            await this.checkAndEnqueueCheckpointRootRollup(provingState);
+        } else {
+            this.enqueueBlockMergeRollup(provingState, parentLocation);
+        }
+    }
+    async checkAndEnqueueCheckpointRootRollup(provingState) {
+        if (!provingState.isReadyForCheckpointRoot()) {
             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.
-        logger.debug(`Cleaning up world state fork for ${blockNumber}`);
-        void this.dbs.get(blockNumber)?.close().then(()=>this.dbs.delete(blockNumber)).catch((err)=>logger.error(`Error closing db for block ${blockNumber}`, err));
-        await this.enqueueBlockRootRollup(provingState);
+        await this.enqueueCheckpointRootRollup(provingState);
     }
-    checkAndEnqueueNextBlockMergeRollup(provingState, currentLocation) {
-        if (!provingState.isReadyForBlockMerge(currentLocation)) {
+    checkAndEnqueueNextCheckpointMergeRollup(provingState, currentLocation) {
+        if (!provingState.isReadyForCheckpointMerge(currentLocation)) {
             return;
         }
         const parentLocation = provingState.getParentLocation(currentLocation);
         if (parentLocation.level === 0) {
             this.checkAndEnqueueRootRollup(provingState);
         } else {
-            this.enqueueBlockMergeRollup(provingState, parentLocation);
+            this.enqueueCheckpointMergeRollup(provingState, parentLocation);
         }
     }
     checkAndEnqueueRootRollup(provingState) {
         if (!provingState.isReadyForRootRollup()) {
-            logger.debug('Not ready for root rollup');
+            this.logger.debug('Not ready for root rollup');
             return;
         }
         this.enqueueRootRollup(provingState);
@@ -643,74 +1206,29 @@ const logger = createLogger('prover-client:orchestrator');
    * @param txIndex - The index of the transaction being proven
    */ 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);
-        // This function tries to do AVM proving. If there is a failure, it fakes the proof unless AVM_PROVING_STRICT is defined.
-        // Nothing downstream depends on the AVM proof yet. So having this mode lets us incrementally build the AVM circuit.
         const doAvmProving = wrapCallbackInSpan(this.tracer, 'ProvingOrchestrator.prover.getAvmProof', {
             [Attributes.TX_HASH]: txProvingState.processedTx.hash.toString()
         }, async (signal)=>{
             const inputs = txProvingState.getAvmInputs();
-            try {
-                // TODO(#14234)[Unconditional PIs validation]: Remove the whole try-catch logic and
-                // just keep the next line but removing the second argument (false).
-                return await this.prover.getAvmProof(inputs, false, signal, provingState.epochNumber);
-            } catch (err) {
-                if (process.env.AVM_PROVING_STRICT) {
-                    logger.error(`Error thrown when proving AVM circuit with AVM_PROVING_STRICT on`, err);
-                    throw err;
-                } else {
-                    logger.warn(`Error thrown when proving AVM circuit but AVM_PROVING_STRICT is off. Use snapshotted
-               AVM inputs and carrying on. ${inspect(err)}.`);
-                    try {
-                        this.metrics.incAvmFallback();
-                        const snapshotAvmPrivateInputs = readAvmMinimalPublicTxInputsFromFile();
-                        return await this.prover.getAvmProof(snapshotAvmPrivateInputs, true, signal, provingState.epochNumber);
-                    } catch (err) {
-                        logger.error(`Error thrown when proving snapshotted AVM inputs.`, err);
-                        throw err;
-                    }
-                }
-            }
+            return await this.prover.getAvmProof(inputs, signal, provingState.epochNumber);
         });
-        this.deferredProving(provingState, doAvmProving, (proofAndVk)=>{
-            logger.debug(`Proven VM for tx index: ${txIndex}`);
-            txProvingState.setAvmProof(proofAndVk);
-            this.checkAndEnqueueNextTxCircuit(provingState, txIndex);
+        this.deferredProving(provingState, doAvmProving, (proof)=>{
+            this.logger.debug(`Proven VM for tx index: ${txIndex}`);
+            txProvingState.setAvmProof(proof);
+            this.checkAndEnqueueBaseRollup(provingState, txIndex);
         });
     }
-    checkAndEnqueueNextTxCircuit(provingState, txIndex) {
+    checkAndEnqueueBaseRollup(provingState, txIndex) {
         const txProvingState = provingState.getTxProvingState(txIndex);
         if (!txProvingState.ready()) {
             return;
         }
-        // We must have completed all proving (tube 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`);
+        // We must have completed all proving (chonk verifier proof and (if required) vm proof are generated), we now move to the base rollup.
+        this.logger.debug(`Public functions completed for tx ${txIndex} enqueueing base rollup`);
         this.enqueueBaseRollup(provingState, txIndex);
     }
 }
-_ts_decorate([
-    trackSpan('ProvingOrchestrator.startNewBlock', (globalVariables)=>({
-            [Attributes.BLOCK_NUMBER]: globalVariables.blockNumber
-        }))
-], ProvingOrchestrator.prototype, "startNewBlock", null);
-_ts_decorate([
-    trackSpan('ProvingOrchestrator.addTxs', (txs)=>({
-            [Attributes.BLOCK_TXS_COUNT]: txs.length
-        }))
-], ProvingOrchestrator.prototype, "addTxs", null);
-_ts_decorate([
-    trackSpan('ProvingOrchestrator.startTubeCircuits')
-], ProvingOrchestrator.prototype, "startTubeCircuits", null);
-_ts_decorate([
-    trackSpan('ProvingOrchestrator.setBlockCompleted', (blockNumber)=>({
-            [Attributes.BLOCK_NUMBER]: blockNumber
-        }))
-], ProvingOrchestrator.prototype, "setBlockCompleted", null);
-_ts_decorate([
-    trackSpan('ProvingOrchestrator.prepareBaseRollupInputs', (_, tx)=>({
-            [Attributes.TX_HASH]: tx.hash.toString()
-        }))
-], ProvingOrchestrator.prototype, "prepareBaseRollupInputs", null);