@aztec/prover-client 1.0.0-nightly.20250607 → 1.0.0-nightly.20250610

package/dest/orchestrator/epoch-proving-state.js

@@ -19,19 +19,22 @@ var PROVING_STATE_LIFECYCLE = /*#__PURE__*/ function(PROVING_STATE_LIFECYCLE) {
     epochNumber;
     firstBlockNumber;
     totalNumBlocks;
+    finalBlobBatchingChallenges;
     completionCallback;
     rejectionCallback;
     blockRootOrMergeProvingOutputs;
     paddingBlockRootProvingOutput;
     rootRollupProvingOutput;
+    finalBatchedBlob;
     provingStateLifecycle;
     // Map from tx hash to tube proof promise. Used when kickstarting tube proofs before tx processing.
     cachedTubeProofs;
     blocks;
-    constructor(epochNumber, firstBlockNumber, totalNumBlocks, completionCallback, rejectionCallback){
+    constructor(epochNumber, firstBlockNumber, totalNumBlocks, finalBlobBatchingChallenges, completionCallback, rejectionCallback){
         this.epochNumber = epochNumber;
         this.firstBlockNumber = firstBlockNumber;
         this.totalNumBlocks = totalNumBlocks;
+        this.finalBlobBatchingChallenges = finalBlobBatchingChallenges;
         this.completionCallback = completionCallback;
         this.rejectionCallback = rejectionCallback;
         this.provingStateLifecycle = 0;
@@ -41,9 +44,9 @@ var PROVING_STATE_LIFECYCLE = /*#__PURE__*/ function(PROVING_STATE_LIFECYCLE) {
     }
     // Adds a block to the proving state, returns its index
     // Will update the proving life cycle if this is the last block
-    startNewBlock(globalVariables, l1ToL2Messages, l1ToL2MessageSubtreeSiblingPath, l1ToL2MessageTreeSnapshotAfterInsertion, lastArchiveSnapshot, lastArchiveSiblingPath, newArchiveSiblingPath, previousBlockHeader) {
+    startNewBlock(globalVariables, l1ToL2Messages, l1ToL2MessageTreeSnapshot, l1ToL2MessageSubtreeSiblingPath, l1ToL2MessageTreeSnapshotAfterInsertion, lastArchiveSnapshot, lastArchiveSiblingPath, newArchiveSiblingPath, previousBlockHeader) {
         const index = globalVariables.blockNumber.toNumber() - this.firstBlockNumber;
-        const block = new BlockProvingState(index, globalVariables, l1ToL2Messages, l1ToL2MessageSubtreeSiblingPath, l1ToL2MessageTreeSnapshotAfterInsertion, lastArchiveSnapshot, lastArchiveSiblingPath, newArchiveSiblingPath, previousBlockHeader, this);
+        const block = new BlockProvingState(index, globalVariables, l1ToL2Messages, l1ToL2MessageTreeSnapshot, l1ToL2MessageSubtreeSiblingPath, l1ToL2MessageTreeSnapshotAfterInsertion, lastArchiveSnapshot, lastArchiveSiblingPath, newArchiveSiblingPath, previousBlockHeader, this);
         this.blocks[index] = block;
         if (this.blocks.filter((b)=>!!b).length === this.totalNumBlocks) {
             this.provingStateLifecycle = 1;
@@ -70,6 +73,28 @@ var PROVING_STATE_LIFECYCLE = /*#__PURE__*/ function(PROVING_STATE_LIFECYCLE) {
     setPaddingBlockRootProof(proof) {
         this.paddingBlockRootProvingOutput = proof;
     }
+    setFinalBatchedBlob(batchedBlob) {
+        this.finalBatchedBlob = batchedBlob;
+    }
+    async setBlobAccumulators(toBlock) {
+        let previousAccumulator;
+        const end = toBlock ? toBlock - this.firstBlockNumber : this.blocks.length;
+        // Accumulate blobs as far as we can for this epoch.
+        for(let i = 0; i <= end; i++){
+            const block = this.blocks[i];
+            if (!block || !block.block) {
+                break;
+            }
+            if (!block.startBlobAccumulator) {
+                // startBlobAccumulator always exists for firstBlockNumber, so the below should never assign an undefined:
+                block.setStartBlobAccumulator(previousAccumulator);
+            }
+            if (block.startBlobAccumulator && !block.endBlobAccumulator) {
+                await block.accumulateBlobs();
+            }
+            previousAccumulator = block.endBlobAccumulator;
+        }
+    }
     getParentLocation(location) {
         return this.blockRootOrMergeProvingOutputs.getParentLocation(location);
     }
@@ -83,7 +108,7 @@ var PROVING_STATE_LIFECYCLE = /*#__PURE__*/ function(PROVING_STATE_LIFECYCLE) {
             this.#getPreviousRollupData(right)
         ]);
     }
-    getRootRollupInputs(proverId) {
+    getRootRollupInputs() {
         const [left, right] = this.#getChildProofsForRoot();
         if (!left || !right) {
             throw new Error('At lease one child is not ready.');
@@ -92,8 +117,7 @@ var PROVING_STATE_LIFECYCLE = /*#__PURE__*/ function(PROVING_STATE_LIFECYCLE) {
             previousRollupData: [
                 this.#getPreviousRollupData(left),
                 this.#getPreviousRollupData(right)
-            ],
-            proverId
+            ]
         });
     }
     getPaddingBlockRootInputs(proverId) {
@@ -107,12 +131,13 @@ var PROVING_STATE_LIFECYCLE = /*#__PURE__*/ function(PROVING_STATE_LIFECYCLE) {
         return this.blocks.find((block)=>block?.blockNumber === blockNumber);
     }
     getEpochProofResult() {
-        if (!this.rootRollupProvingOutput) {
+        if (!this.rootRollupProvingOutput || !this.finalBatchedBlob) {
             throw new Error('Unable to get epoch proof result. Root rollup is not ready.');
         }
         return {
             proof: this.rootRollupProvingOutput.proof.binaryProof,
-            publicInputs: this.rootRollupProvingOutput.inputs
+            publicInputs: this.rootRollupProvingOutput.inputs,
+            batchedBlobInputs: this.finalBatchedBlob
         };
     }
     isReadyForBlockMerge(location) {

package/dest/orchestrator/orchestrator.d.ts

@@ -1,3 +1,4 @@
+import { FinalBlobBatchingChallenges } from '@aztec/blob-lib';
 import { Fr } from '@aztec/foundation/fields';
 import { L2Block } from '@aztec/stdlib/block';
 import type { EpochProver, ForkMerkleTreeOperations, ServerCircuitProver } from '@aztec/stdlib/interfaces/server';
@@ -30,7 +31,7 @@ export declare class ProvingOrchestrator implements EpochProver {
     get tracer(): Tracer;
     getProverId(): Fr;
     stop(): Promise<void>;
-    startNewEpoch(epochNumber: number, firstBlockNumber: number, totalNumBlocks: number): void;
+    startNewEpoch(epochNumber: number, firstBlockNumber: number, totalNumBlocks: number, finalBlobBatchingChallenges: FinalBlobBatchingChallenges): void;
     /**
      * Starts off a new block
      * @param globalVariables - The global variables for the block
@@ -67,6 +68,7 @@ export declare class ProvingOrchestrator implements EpochProver {
     finaliseEpoch(): Promise<{
         proof: import("@aztec/stdlib/proofs").Proof;
         publicInputs: import("@aztec/stdlib/rollup").RootRollupPublicInputs;
+        batchedBlobInputs: import("@aztec/blob-lib").BatchedBlob;
     }>;
     /**
      * Starts the proving process for the given transaction and adds it to our state

package/dest/orchestrator/orchestrator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../src/orchestrator/orchestrator.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAS9C,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,KAAK,EACV,WAAW,EACX,wBAAwB,EAGxB,mBAAmB,EACpB,MAAM,iCAAiC,CAAC;AAUzC,OAAO,EAAE,KAAK,sBAAsB,EAAgB,MAAM,qBAAqB,CAAC;AAChF,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,eAAe,EAAE,KAAK,WAAW,EAAE,KAAK,EAAE,EAAmB,MAAM,kBAAkB,CAAC;AACtH,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,MAAM,EAIZ,MAAM,yBAAyB,CAAC;AAqBjC;;;;;;;;;GASG;AAEH;;GAEG;AACH,qBAAa,mBAAoB,YAAW,WAAW;IASnD,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAV3B,OAAO,CAAC,YAAY,CAA4C;IAChE,OAAO,CAAC,kBAAkB,CAAyB;IAEnD,OAAO,CAAC,cAAc,CAAiD;IACvE,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,GAAG,CAAqD;gBAGtD,UAAU,EAAE,wBAAwB,EACpC,MAAM,EAAE,mBAAmB,EAClB,QAAQ,EAAE,EAAE,EAC7B,eAAe,GAAE,eAAsC;IAKzD,IAAI,MAAM,IAAI,MAAM,CAEnB;IAEM,WAAW,IAAI,EAAE;IAIjB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAKrB,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM;IAW1F;;;;;OAKG;IAIU,aAAa,CAAC,eAAe,EAAE,eAAe,EAAE,cAAc,EAAE,EAAE,EAAE,EAAE,mBAAmB,EAAE,WAAW;IA2CnH;;;OAGG;IAIU,MAAM,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiDtD;;;OAGG;IAEU,iBAAiB,CAAC,GAAG,EAAE,EAAE,EAAE;IAcxC;;;OAGG;IAIU,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAyBnG,oDAAoD;IAC7C,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;YAQzB,UAAU;cAqCR,kCAAkC,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,sBAAsB;IAWvG;;OAEG;IACI,MAAM;IAQb;;OAEG;IACU,aAAa;;;;IAoB1B;;;;OAIG;YACW,kBAAkB;IAShC;;;;;OAKG;IACH,OAAO,CAAC,eAAe;YAwDT,uBAAuB;YA+BvB,uBAAuB;IAmCrC,OAAO,CAAC,iBAAiB;IA8CzB,OAAO,CAAC,gBAAgB;IA0BxB,OAAO,CAAC,aAAa;IA4BrB,OAAO,CAAC,kBAAkB;YA0BZ,sBAAsB;IAmEpC,OAAO,CAAC,wBAAwB;IAuBhC,OAAO,CAAC,gCAAgC;IAUxC,OAAO,CAAC,wBAAwB;IA2BhC,OAAO,CAAC,uBAAuB;YAyBjB,mBAAmB;IA6BjC,OAAO,CAAC,iBAAiB;YA4BX,8BAA8B;YAa9B,8BAA8B;IAyB5C,OAAO,CAAC,mCAAmC;IAa3C,OAAO,CAAC,yBAAyB;IASjC;;;;;OAKG;IACH,OAAO,CAAC,SAAS;IAmDjB,OAAO,CAAC,4BAA4B;CAWrC"}
+{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../src/orchestrator/orchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;AAU9D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAS9C,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,KAAK,EACV,WAAW,EACX,wBAAwB,EAGxB,mBAAmB,EACpB,MAAM,iCAAiC,CAAC;AAUzC,OAAO,EAAE,KAAK,sBAAsB,EAAgB,MAAM,qBAAqB,CAAC;AAChF,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,eAAe,EAAE,KAAK,WAAW,EAAE,KAAK,EAAE,EAAmB,MAAM,kBAAkB,CAAC;AACtH,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,MAAM,EAIZ,MAAM,yBAAyB,CAAC;AAqBjC;;;;;;;;;GASG;AAEH;;GAEG;AACH,qBAAa,mBAAoB,YAAW,WAAW;IASnD,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAV3B,OAAO,CAAC,YAAY,CAA4C;IAChE,OAAO,CAAC,kBAAkB,CAAyB;IAEnD,OAAO,CAAC,cAAc,CAAiD;IACvE,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,GAAG,CAAqD;gBAGtD,UAAU,EAAE,wBAAwB,EACpC,MAAM,EAAE,mBAAmB,EAClB,QAAQ,EAAE,EAAE,EAC7B,eAAe,GAAE,eAAsC;IAKzD,IAAI,MAAM,IAAI,MAAM,CAEnB;IAEM,WAAW,IAAI,EAAE;IAIjB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAKrB,aAAa,CAClB,WAAW,EAAE,MAAM,EACnB,gBAAgB,EAAE,MAAM,EACxB,cAAc,EAAE,MAAM,EACtB,2BAA2B,EAAE,2BAA2B;IAmB1D;;;;;OAKG;IAIU,aAAa,CAAC,eAAe,EAAE,eAAe,EAAE,cAAc,EAAE,EAAE,EAAE,EAAE,mBAAmB,EAAE,WAAW;IAgDnH;;;OAGG;IAIU,MAAM,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiDtD;;;OAGG;IAEU,iBAAiB,CAAC,GAAG,EAAE,EAAE,EAAE;IAcxC;;;OAGG;IAIU,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IA4BnG,oDAAoD;IAC7C,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;YAQzB,UAAU;cAqCR,kCAAkC,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,sBAAsB;IAWvG;;OAEG;IACI,MAAM;IAQb;;OAEG;IACU,aAAa;;;;;IA6B1B;;;;OAIG;YACW,kBAAkB;IAShC;;;;;OAKG;IACH,OAAO,CAAC,eAAe;YAwDT,uBAAuB;YAkCvB,uBAAuB;IAyCrC,OAAO,CAAC,iBAAiB;IA8CzB,OAAO,CAAC,gBAAgB;IA0BxB,OAAO,CAAC,aAAa;IA4BrB,OAAO,CAAC,kBAAkB;YA0BZ,sBAAsB;IA8EpC,OAAO,CAAC,wBAAwB;IAuBhC,OAAO,CAAC,gCAAgC;IAUxC,OAAO,CAAC,wBAAwB;IA2BhC,OAAO,CAAC,uBAAuB;YAwBjB,mBAAmB;IA6BjC,OAAO,CAAC,iBAAiB;YA4BX,8BAA8B;YAa9B,8BAA8B;IA2B5C,OAAO,CAAC,mCAAmC;IAa3C,OAAO,CAAC,yBAAyB;IASjC;;;;;OAKG;IACH,OAAO,CAAC,SAAS;IAmDjB,OAAO,CAAC,4BAA4B;CAWrC"}

package/dest/orchestrator/orchestrator.js

@@ -67,7 +67,7 @@ const logger = createLogger('prover-client:orchestrator');
         this.cancel();
         return Promise.resolve();
     }
-    startNewEpoch(epochNumber, firstBlockNumber, totalNumBlocks) {
+    startNewEpoch(epochNumber, firstBlockNumber, totalNumBlocks, finalBlobBatchingChallenges) {
         const { promise: _promise, resolve, reject } = promiseWithResolvers();
         const promise = _promise.catch((reason)=>({
                 status: 'failure',
@@ -77,7 +77,7 @@ const logger = createLogger('prover-client:orchestrator');
             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, resolve, reject);
+        this.provingState = new EpochProvingState(epochNumber, firstBlockNumber, totalNumBlocks, finalBlobBatchingChallenges, resolve, reject);
         this.provingPromise = promise;
     }
     /**
@@ -97,12 +97,12 @@ const logger = createLogger('prover-client:orchestrator');
         const db = await this.dbProvider.fork(globalVariables.blockNumber.toNumber() - 1);
         this.dbs.set(globalVariables.blockNumber.toNumber(), db);
         // we start the block by enqueueing all of the base parity circuits
-        const { l1ToL2MessageSubtreeSiblingPath, l1ToL2MessageTreeSnapshotAfterInsertion, baseParityInputs } = await this.prepareBaseParityInputs(l1ToL2Messages, db);
+        const { l1ToL2MessageTreeSnapshot, l1ToL2MessageSubtreeSiblingPath, l1ToL2MessageTreeSnapshotAfterInsertion, baseParityInputs } = await this.prepareBaseParityInputs(l1ToL2Messages, db);
         // Get archive snapshot before this block lands
         const lastArchive = await getTreeSnapshot(MerkleTreeId.ARCHIVE, db);
         const lastArchiveSiblingPath = await getLastSiblingPath(MerkleTreeId.ARCHIVE, db);
         const newArchiveSiblingPath = await getRootTreeSiblingPath(MerkleTreeId.ARCHIVE, db);
-        const blockProvingState = this.provingState.startNewBlock(globalVariables, l1ToL2Messages, l1ToL2MessageSubtreeSiblingPath, l1ToL2MessageTreeSnapshotAfterInsertion, lastArchive, lastArchiveSiblingPath, newArchiveSiblingPath, previousBlockHeader);
+        const blockProvingState = this.provingState.startNewBlock(globalVariables, l1ToL2Messages, l1ToL2MessageTreeSnapshot, l1ToL2MessageSubtreeSiblingPath, l1ToL2MessageTreeSnapshotAfterInsertion, lastArchive, lastArchiveSiblingPath, newArchiveSiblingPath, previousBlockHeader);
         // Enqueue base parity circuits for the block
         for(let i = 0; i < baseParityInputs.length; i++){
             this.enqueueBaseParityCircuit(blockProvingState, baseParityInputs[i], i);
@@ -118,7 +118,7 @@ const logger = createLogger('prover-client:orchestrator');
             logger.warn(`Provided no txs to orchestrator addTxs.`);
             return;
         }
-        const blockNumber = txs[0].constants.globalVariables.blockNumber.toNumber();
+        const blockNumber = txs[0].globalVariables.blockNumber.toNumber();
         const provingState = this.provingState?.getBlockProvingStateByBlockNumber(blockNumber);
         if (!provingState) {
             throw new Error(`Block proving state for ${blockNumber} not found`);
@@ -186,6 +186,8 @@ const logger = createLogger('prover-client:orchestrator');
         // 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;
@@ -216,7 +218,7 @@ const logger = createLogger('prover-client:orchestrator');
         const l2Block = new L2Block(newArchive, header, body);
         await this.verifyBuiltBlockAgainstSyncedState(l2Block, newArchive);
         logger.verbose(`Orchestrator finalised block ${l2Block.number}`);
-        provingState.block = l2Block;
+        provingState.setBlock(l2Block);
     }
     // Flagged as protected to disable in certain unit tests
     async verifyBuiltBlockAgainstSyncedState(l2Block, newArchive) {
@@ -243,6 +245,14 @@ 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 finalise`);
+        }
+        const finalBatchedBlob = await finalBlock.endBlobAccumulator.finalize();
+        this.provingState.setFinalBatchedBlob(finalBatchedBlob);
         const epochProofResult = this.provingState.getEpochProofResult();
         pushTestData('epochProofResult', {
             proof: epochProofResult.proof.toString(),
@@ -314,11 +324,13 @@ const logger = createLogger('prover-client:orchestrator');
     async prepareBaseParityInputs(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);
         // 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);
         return {
+            l1ToL2MessageTreeSnapshot,
             l1ToL2MessageSubtreeSiblingPath,
             l1ToL2MessageTreeSnapshotAfterInsertion,
             baseParityInputs
@@ -333,7 +345,7 @@ const logger = createLogger('prover-client:orchestrator');
         const db = this.dbs.get(provingState.blockNumber);
         // 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, db, provingState.spongeBlobState));
+        const [ms, hints] = await elapsed(insertSideEffectsAndBuildBaseRollupHints(tx, provingState.globalVariables, provingState.l1ToL2MessageTreeSnapshot, db, provingState.spongeBlobState));
         this.metrics.recordBaseRollupInputs(ms);
         const promises = [
             MerkleTreeId.NOTE_HASH_TREE,
@@ -473,6 +485,12 @@ const logger = createLogger('prover-client:orchestrator');
                 logger.error(`New archive root mismatch.\nCircuit: ${result.inputs.newArchive.root}\nComputed: ${dbArchiveRoot}`);
                 provingState.reject(`New archive root mismatch.`);
             }
+            const endBlobAccumulator = provingState.endBlobAccumulator;
+            const circuitEndBlobAccumulatorState = result.inputs.blobPublicInputs.endBlobAccumulator;
+            if (!circuitEndBlobAccumulatorState.equals(endBlobAccumulator.toBlobAccumulatorPublicInputs())) {
+                logger.error(`Blob accumulator state mismatch.\nCircuit: ${inspect(circuitEndBlobAccumulatorState)}\nComputed: ${inspect(endBlobAccumulator.toBlobAccumulatorPublicInputs())}`);
+                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;
@@ -556,7 +574,7 @@ const logger = createLogger('prover-client:orchestrator');
             return;
         }
         logger.debug(`Preparing root rollup`);
-        const inputs = provingState.getRootRollupInputs(this.proverId);
+        const inputs = provingState.getRootRollupInputs();
         this.deferredProving(provingState, wrapCallbackInSpan(this.tracer, 'ProvingOrchestrator.prover.getRootRollupProof', {
             [Attributes.PROTOCOL_CIRCUIT_NAME]: 'root-rollup'
         }, (signal)=>this.prover.getRootRollupProof(inputs, signal, provingState.epochNumber)), (result)=>{
@@ -579,15 +597,17 @@ const logger = createLogger('prover-client:orchestrator');
         }
     }
     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);
         if (!provingState.isReadyForBlockRootRollup()) {
-            logger.debug('Not ready for root rollup');
+            logger.debug('Not ready for block root rollup');
             return;
         }
         if (provingState.blockRootRollupStarted) {
             logger.debug('Block root rollup already started');
             return;
         }
-        const blockNumber = provingState.blockNumber;
         // 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

package/dest/prover-client/prover-client.d.ts

@@ -1,6 +1,6 @@
 import { type ACVMConfig, type BBConfig } from '@aztec/bb-prover';
 import { Fr } from '@aztec/foundation/fields';
-import type { ActualProverConfig, EpochProver, EpochProverManager, ForkMerkleTreeOperations, ProvingJobBroker, ProvingJobConsumer, ServerCircuitProver } from '@aztec/stdlib/interfaces/server';
+import { type ActualProverConfig, type EpochProver, type EpochProverManager, type ForkMerkleTreeOperations, type ProvingJobBroker, type ProvingJobConsumer, type ServerCircuitProver } from '@aztec/stdlib/interfaces/server';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 import type { ProverClientConfig } from '../config.js';
 /** Manages proving of epochs by orchestrating the proving of individual blocks relying on a pool of prover agents. */

package/dest/prover-client/prover-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prover-client.d.ts","sourceRoot":"","sources":["../../src/prover-client/prover-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,QAAQ,EAA2C,MAAM,kBAAkB,CAAC;AAE3G,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAG9C,OAAO,KAAK,EACV,kBAAkB,EAClB,WAAW,EACX,kBAAkB,EAClB,wBAAwB,EACxB,gBAAgB,EAChB,kBAAkB,EAElB,mBAAmB,EACpB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAEnF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAOvD,sHAAsH;AACtH,qBAAa,YAAa,YAAW,kBAAkB;IAQnD,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,WAAW,CAAC;IACpB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,GAAG;IAZb,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,MAAM,CAAsB;IAEpC,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,gBAAgB,CAAyB;IAEjD,OAAO;IAYA,iBAAiB,IAAI,WAAW;IAMhC,WAAW,IAAI,EAAE;IAIlB,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAc5E;;OAEG;IACU,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IASnC;;OAEG;IACU,IAAI;IAQjB;;;;;OAKG;WACiB,GAAG,CACrB,MAAM,EAAE,kBAAkB,EAC1B,UAAU,EAAE,wBAAwB,EACpC,MAAM,EAAE,gBAAgB,EACxB,SAAS,GAAE,eAAsC;IAO5C,mBAAmB,IAAI,kBAAkB;YAQlC,oBAAoB;YA2BpB,UAAU;CAGzB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,kBAAkB,GAAG,UAAU,GAAG,QAAQ,EAClD,SAAS,EAAE,eAAe,GACzB,OAAO,CAAC,mBAAmB,CAAC,CAU9B"}
+{"version":3,"file":"prover-client.d.ts","sourceRoot":"","sources":["../../src/prover-client/prover-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,QAAQ,EAA2C,MAAM,kBAAkB,CAAC;AAE3G,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAG9C,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,WAAW,EAChB,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC7B,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EAEvB,KAAK,mBAAmB,EAEzB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAEnF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAOvD,sHAAsH;AACtH,qBAAa,YAAa,YAAW,kBAAkB;IAQnD,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,WAAW,CAAC;IACpB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,GAAG;IAZb,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,MAAM,CAAsB;IAEpC,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,gBAAgB,CAAyB;IAEjD,OAAO;IAYA,iBAAiB,IAAI,WAAW;IAMhC,WAAW,IAAI,EAAE;IAIlB,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAc5E;;OAEG;IACU,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IASnC;;OAEG;IACU,IAAI;IASjB;;;;;OAKG;WACiB,GAAG,CACrB,MAAM,EAAE,kBAAkB,EAC1B,UAAU,EAAE,wBAAwB,EACpC,MAAM,EAAE,gBAAgB,EACxB,SAAS,GAAE,eAAsC;IAO5C,mBAAmB,IAAI,kBAAkB;YAQlC,oBAAoB;YA2BpB,UAAU;CAGzB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,kBAAkB,GAAG,UAAU,GAAG,QAAQ,EAClD,SAAS,EAAE,eAAe,GACzB,OAAO,CAAC,mBAAmB,CAAC,CAU9B"}

package/dest/prover-client/prover-client.js

@@ -2,6 +2,7 @@ import { BBNativeRollupProver, TestCircuitProver } from '@aztec/bb-prover';
 import { times } from '@aztec/foundation/collection';
 import { createLogger } from '@aztec/foundation/log';
 import { NativeACVMSimulator } from '@aztec/simulator/server';
+import { tryStop } from '@aztec/stdlib/interfaces/server';
 import { getTelemetryClient } from '@aztec/telemetry-client';
 import { ProvingOrchestrator } from '../orchestrator/orchestrator.js';
 import { BrokerCircuitProverFacade } from '../proving_broker/broker_prover_facade.js';
@@ -67,6 +68,7 @@ import { ServerEpochProver } from './server-epoch-prover.js';
         }
         this.running = false;
         await this.stopAgents();
+        await tryStop(this.orchestratorClient);
     }
     /**
    * Creates a new prover client and starts it

package/dest/prover-client/server-epoch-prover.d.ts

@@ -1,3 +1,4 @@
+import type { BatchedBlob, FinalBlobBatchingChallenges } from '@aztec/blob-lib';
 import type { Fr } from '@aztec/foundation/fields';
 import type { L2Block } from '@aztec/stdlib/block';
 import type { EpochProver } from '@aztec/stdlib/interfaces/server';
@@ -11,12 +12,13 @@ export declare class ServerEpochProver implements EpochProver {
     private facade;
     private orchestrator;
     constructor(facade: BrokerCircuitProverFacade, orchestrator: ProvingOrchestrator);
-    startNewEpoch(epochNumber: number, firstBlockNumber: number, totalNumBlocks: number): void;
+    startNewEpoch(epochNumber: number, firstBlockNumber: number, totalNumBlocks: number, finalBlobBatchingChallenges: FinalBlobBatchingChallenges): void;
     startTubeCircuits(txs: Tx[]): Promise<void>;
     setBlockCompleted(blockNumber: number, expectedBlockHeader?: BlockHeader): Promise<L2Block>;
     finaliseEpoch(): Promise<{
         publicInputs: RootRollupPublicInputs;
         proof: Proof;
+        batchedBlobInputs: BatchedBlob;
     }>;
     cancel(): void;
     getProverId(): Fr;

package/dest/prover-client/server-epoch-prover.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-epoch-prover.d.ts","sourceRoot":"","sources":["../../src/prover-client/server-epoch-prover.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAEtF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;AAE3F,kEAAkE;AAClE,qBAAa,iBAAkB,YAAW,WAAW;IAEjD,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,YAAY;gBADZ,MAAM,EAAE,yBAAyB,EACjC,YAAY,EAAE,mBAAmB;IAG3C,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI;IAI1F,iBAAiB,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAG3C,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,mBAAmB,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAG3F,aAAa,IAAI,OAAO,CAAC;QAAE,YAAY,EAAE,sBAAsB,CAAC;QAAC,KAAK,EAAE,KAAK,CAAA;KAAE,CAAC;IAGhF,MAAM,IAAI,IAAI;IAGd,WAAW,IAAI,EAAE;IAGjB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAG1B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B,aAAa,CACX,eAAe,EAAE,eAAe,EAChC,cAAc,EAAE,EAAE,EAAE,EACpB,mBAAmB,EAAE,WAAW,GAC/B,OAAO,CAAC,IAAI,CAAC;IAGhB,MAAM,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAG1C"}
+{"version":3,"file":"server-epoch-prover.d.ts","sourceRoot":"","sources":["../../src/prover-client/server-epoch-prover.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;AAChF,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAEtF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;AAE3F,kEAAkE;AAClE,qBAAa,iBAAkB,YAAW,WAAW;IAEjD,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,YAAY;gBADZ,MAAM,EAAE,yBAAyB,EACjC,YAAY,EAAE,mBAAmB;IAG3C,aAAa,CACX,WAAW,EAAE,MAAM,EACnB,gBAAgB,EAAE,MAAM,EACxB,cAAc,EAAE,MAAM,EACtB,2BAA2B,EAAE,2BAA2B,GACvD,IAAI;IAIP,iBAAiB,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAG3C,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,mBAAmB,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAG3F,aAAa,IAAI,OAAO,CAAC;QAAE,YAAY,EAAE,sBAAsB,CAAC;QAAC,KAAK,EAAE,KAAK,CAAC;QAAC,iBAAiB,EAAE,WAAW,CAAA;KAAE,CAAC;IAGhH,MAAM,IAAI,IAAI;IAGd,WAAW,IAAI,EAAE;IAGjB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAG1B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B,aAAa,CACX,eAAe,EAAE,eAAe,EAChC,cAAc,EAAE,EAAE,EAAE,EACpB,mBAAmB,EAAE,WAAW,GAC/B,OAAO,CAAC,IAAI,CAAC;IAGhB,MAAM,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAG1C"}

package/dest/prover-client/server-epoch-prover.js

@@ -5,8 +5,8 @@
         this.facade = facade;
         this.orchestrator = orchestrator;
     }
-    startNewEpoch(epochNumber, firstBlockNumber, totalNumBlocks) {
-        this.orchestrator.startNewEpoch(epochNumber, firstBlockNumber, totalNumBlocks);
+    startNewEpoch(epochNumber, firstBlockNumber, totalNumBlocks, finalBlobBatchingChallenges) {
+        this.orchestrator.startNewEpoch(epochNumber, firstBlockNumber, totalNumBlocks, finalBlobBatchingChallenges);
         this.facade.start();
     }
     startTubeCircuits(txs) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/prover-client",
-  "version": "1.0.0-nightly.20250607",
+  "version": "1.0.0-nightly.20250610",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -64,19 +64,19 @@
     ]
   },
   "dependencies": {
-    "@aztec/bb-prover": "1.0.0-nightly.20250607",
-    "@aztec/blob-lib": "1.0.0-nightly.20250607",
-    "@aztec/constants": "1.0.0-nightly.20250607",
-    "@aztec/ethereum": "1.0.0-nightly.20250607",
-    "@aztec/foundation": "1.0.0-nightly.20250607",
-    "@aztec/kv-store": "1.0.0-nightly.20250607",
-    "@aztec/noir-protocol-circuits-types": "1.0.0-nightly.20250607",
-    "@aztec/noir-types": "1.0.0-nightly.20250607",
-    "@aztec/protocol-contracts": "1.0.0-nightly.20250607",
-    "@aztec/simulator": "1.0.0-nightly.20250607",
-    "@aztec/stdlib": "1.0.0-nightly.20250607",
-    "@aztec/telemetry-client": "1.0.0-nightly.20250607",
-    "@aztec/world-state": "1.0.0-nightly.20250607",
+    "@aztec/bb-prover": "1.0.0-nightly.20250610",
+    "@aztec/blob-lib": "1.0.0-nightly.20250610",
+    "@aztec/constants": "1.0.0-nightly.20250610",
+    "@aztec/ethereum": "1.0.0-nightly.20250610",
+    "@aztec/foundation": "1.0.0-nightly.20250610",
+    "@aztec/kv-store": "1.0.0-nightly.20250610",
+    "@aztec/noir-protocol-circuits-types": "1.0.0-nightly.20250610",
+    "@aztec/noir-types": "1.0.0-nightly.20250610",
+    "@aztec/protocol-contracts": "1.0.0-nightly.20250610",
+    "@aztec/simulator": "1.0.0-nightly.20250610",
+    "@aztec/stdlib": "1.0.0-nightly.20250610",
+    "@aztec/telemetry-client": "1.0.0-nightly.20250610",
+    "@aztec/world-state": "1.0.0-nightly.20250610",
     "@google-cloud/storage": "^7.15.0",
     "@iarna/toml": "^2.2.5",
     "commander": "^12.1.0",
@@ -86,7 +86,7 @@
     "zod": "^3.23.8"
   },
   "devDependencies": {
-    "@aztec/noir-contracts.js": "1.0.0-nightly.20250607",
+    "@aztec/noir-contracts.js": "1.0.0-nightly.20250610",
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "@types/node": "^22.15.17",

package/src/block-factory/light.ts

@@ -99,8 +99,9 @@ export async function buildBlockWithCleanDB(
   telemetry: TelemetryClient = getTelemetryClient(),
 ) {
   const spongeBlobState = SpongeBlob.init(toNumBlobFields(txs));
+  const l1ToL2MessageTree = await getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, db);
   for (const tx of txs) {
-    await insertSideEffectsAndBuildBaseRollupHints(tx, globalVariables, db, spongeBlobState);
+    await insertSideEffectsAndBuildBaseRollupHints(tx, globalVariables, l1ToL2MessageTree, db, spongeBlobState);
   }
   const builder = new LightweightBlockFactory(db, telemetry);
   await builder.startNewBlock(globalVariables, l1ToL2Messages);

package/src/mocks/test_context.ts

@@ -138,6 +138,10 @@ export class TestContext {
     return blockNumber === 0 ? this.worldState.getCommitted().getInitialHeader() : this.headers.get(blockNumber);
   }
 
+  public setBlockHeader(header: BlockHeader, blockNumber: number) {
+    this.headers.set(blockNumber, header);
+  }
+
   public getPreviousBlockHeader(currentBlockNumber = this.blockNumber): BlockHeader {
     return this.getBlockHeader(currentBlockNumber - 1)!;
   }

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

@@ -1,4 +1,4 @@
-import { Blob, type SpongeBlob } from '@aztec/blob-lib';
+import { BatchedBlobAccumulator, Blob, type SpongeBlob } from '@aztec/blob-lib';
 import {
   ARCHIVE_HEIGHT,
   MAX_CONTRACT_CLASS_LOGS_PER_TX,
@@ -15,7 +15,7 @@ import {
 import { makeTuple } from '@aztec/foundation/array';
 import { padArrayEnd } from '@aztec/foundation/collection';
 import { sha256Trunc } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
+import { BLS12Point, Fr } from '@aztec/foundation/fields';
 import { type Tuple, assertLength, serializeToBuffer, toFriendlyJSON } from '@aztec/foundation/serialize';
 import { MembershipWitness, MerkleTreeCalculator, computeUnbalancedMerkleRoot } from '@aztec/foundation/trees';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
@@ -28,8 +28,8 @@ import { ContractClassLogFields } from '@aztec/stdlib/logs';
 import type { ParityPublicInputs } from '@aztec/stdlib/parity';
 import {
   type BaseOrMergeRollupPublicInputs,
+  BlockConstantData,
   type BlockRootOrBlockMergePublicInputs,
-  ConstantRollupData,
   PrivateBaseRollupHints,
   PrivateBaseStateDiffHints,
   PublicBaseRollupHints,
@@ -71,12 +71,15 @@ export const insertSideEffectsAndBuildBaseRollupHints = runInSpan(
     span: Span,
     tx: ProcessedTx,
     globalVariables: GlobalVariables,
+    // Passing in the snapshot instead of getting it from the db because it might've been updated in the orchestrator
+    // when base parity proof is being generated.
+    l1ToL2MessageTreeSnapshot: AppendOnlyTreeSnapshot,
     db: MerkleTreeWriteOperations,
     startSpongeBlob: SpongeBlob,
   ) => {
     span.setAttribute(Attributes.TX_HASH, tx.hash.toString());
     // Get trees info before any changes hit
-    const constants = await getConstantRollupData(globalVariables, db);
+    const lastArchive = await getTreeSnapshot(MerkleTreeId.ARCHIVE, db);
     const start = new PartialStateReference(
       await getTreeSnapshot(MerkleTreeId.NOTE_HASH_TREE, db),
       await getTreeSnapshot(MerkleTreeId.NULLIFIER_TREE, db),
@@ -144,7 +147,7 @@ export const insertSideEffectsAndBuildBaseRollupHints = runInSpan(
     );
 
     if (tx.avmProvingRequest) {
-      const blockHash = await tx.constants.historicalHeader.hash();
+      const blockHash = await tx.data.constants.historicalHeader.hash();
       const archiveRootMembershipWitness = await getMembershipWitnessFor(
         blockHash,
         MerkleTreeId.ARCHIVE,
@@ -154,9 +157,9 @@ export const insertSideEffectsAndBuildBaseRollupHints = runInSpan(
 
       return PublicBaseRollupHints.from({
         startSpongeBlob: inputSpongeBlob,
+        lastArchive,
         archiveRootMembershipWitness,
         contractClassLogsFields,
-        constants,
       });
     } else {
       if (
@@ -196,7 +199,7 @@ export const insertSideEffectsAndBuildBaseRollupHints = runInSpan(
         feeWriteSiblingPath,
       });
 
-      const blockHash = await tx.constants.historicalHeader.hash();
+      const blockHash = await tx.data.constants.historicalHeader.hash();
       const archiveRootMembershipWitness = await getMembershipWitnessFor(
         blockHash,
         MerkleTreeId.ARCHIVE,
@@ -204,6 +207,14 @@ export const insertSideEffectsAndBuildBaseRollupHints = runInSpan(
         db,
       );
 
+      const constants = BlockConstantData.from({
+        lastArchive,
+        lastL1ToL2: l1ToL2MessageTreeSnapshot,
+        vkTreeRoot: getVKTreeRoot(),
+        protocolContractTreeRoot,
+        globalVariables,
+      });
+
       return PrivateBaseRollupHints.from({
         start,
         startSpongeBlob: inputSpongeBlob,
@@ -243,12 +254,28 @@ export const buildBlobHints = runInSpan(
   async (_span: Span, txEffects: TxEffect[]) => {
     const blobFields = txEffects.flatMap(tx => tx.toBlobFields());
     const blobs = await Blob.getBlobs(blobFields);
-    const blobCommitments = blobs.map(b => b.commitmentToFields());
+    // TODO(#13430): The blobsHash is confusingly similar to blobCommitmentsHash, calculated from below blobCommitments:
+    // - blobsHash := sha256([blobhash_0, ..., blobhash_m]) = a hash of all blob hashes in a block with m+1 blobs inserted into the header, exists so a user can cross check blobs.
+    // - blobCommitmentsHash := sha256( ...sha256(sha256(C_0), C_1) ... C_n) = iteratively calculated hash of all blob commitments in an epoch with n+1 blobs (see calculateBlobCommitmentsHash()),
+    //   exists so we can validate injected commitments to the rollup circuits correspond to the correct real blobs.
+    // We may be able to combine these values e.g. blobCommitmentsHash := sha256( ...sha256(sha256(blobshash_0), blobshash_1) ... blobshash_l) for an epoch with l+1 blocks.
+    const blobCommitments = blobs.map(b => BLS12Point.decompress(b.commitment));
     const blobsHash = new Fr(getBlobsHashFromBlobs(blobs));
     return { blobFields, blobCommitments, blobs, blobsHash };
   },
 );
 
+export const accumulateBlobs = runInSpan(
+  'BlockBuilderHelpers',
+  'accumulateBlobs',
+  async (_span: Span, txs: ProcessedTx[], startBlobAccumulator: BatchedBlobAccumulator) => {
+    const blobFields = txs.flatMap(tx => tx.txEffect.toBlobFields());
+    const blobs = await Blob.getBlobs(blobFields);
+    const endBlobAccumulator = startBlobAccumulator.accumulateBlobs(blobs);
+    return endBlobAccumulator;
+  },
+);
+
 export const buildHeaderFromCircuitOutputs = runInSpan(
   'BlockBuilderHelpers',
   'buildHeaderFromCircuitOutputs',
@@ -257,13 +284,13 @@ export const buildHeaderFromCircuitOutputs = runInSpan(
     previousRollupData: BaseOrMergeRollupPublicInputs[],
     parityPublicInputs: ParityPublicInputs,
     rootRollupOutputs: BlockRootOrBlockMergePublicInputs,
+    blobsHash: Buffer,
     endState: StateReference,
   ) => {
     if (previousRollupData.length > 2) {
       throw new Error(`There can't be more than 2 previous rollups. Received ${previousRollupData.length}.`);
     }
 
-    const blobsHash = rootRollupOutputs.blobPublicInputs[0].getBlobsHash();
     const numTxs = previousRollupData.reduce((sum, d) => sum + d.numTxs, 0);
     const outHash =
       previousRollupData.length === 0
@@ -359,6 +386,7 @@ export function getBlobsHashFromBlobs(inputs: Blob[]): Buffer {
 }
 
 // Validate that the roots of all local trees match the output of the root circuit simulation
+// TODO: does this get called?
 export async function validateBlockRootOutput(
   blockRootOutput: BlockRootOrBlockMergePublicInputs,
   blockHeader: BlockHeader,
@@ -403,19 +431,6 @@ export async function getRootTreeSiblingPath<TID extends MerkleTreeId>(treeId: T
   return padArrayEnd(path.toFields(), Fr.ZERO, getTreeHeight(treeId));
 }
 
-export const getConstantRollupData = runInSpan(
-  'BlockBuilderHelpers',
-  'getConstantRollupData',
-  async (_span, globalVariables: GlobalVariables, db: MerkleTreeReadOperations): Promise<ConstantRollupData> => {
-    return ConstantRollupData.from({
-      vkTreeRoot: getVKTreeRoot(),
-      protocolContractTreeRoot,
-      lastArchive: await getTreeSnapshot(MerkleTreeId.ARCHIVE, db),
-      globalVariables,
-    });
-  },
-);
-
 export async function getTreeSnapshot(id: MerkleTreeId, db: MerkleTreeReadOperations): Promise<AppendOnlyTreeSnapshot> {
   const treeInfo = await db.getTreeInfo(id);
   return new AppendOnlyTreeSnapshot(Fr.fromBuffer(treeInfo.root), Number(treeInfo.size));
@@ -536,17 +551,17 @@ function validateSimulatedTree(
 }
 
 export function validateTx(tx: ProcessedTx) {
-  const txHeader = tx.constants.historicalHeader;
-  if (txHeader.state.l1ToL2MessageTree.isZero()) {
+  const txHeader = tx.data.constants.historicalHeader;
+  if (txHeader.state.l1ToL2MessageTree.isEmpty()) {
     throw new Error(`Empty L1 to L2 messages tree in tx: ${toFriendlyJSON(tx)}`);
   }
-  if (txHeader.state.partial.noteHashTree.isZero()) {
+  if (txHeader.state.partial.noteHashTree.isEmpty()) {
     throw new Error(`Empty note hash tree in tx: ${toFriendlyJSON(tx)}`);
   }
-  if (txHeader.state.partial.nullifierTree.isZero()) {
+  if (txHeader.state.partial.nullifierTree.isEmpty()) {
     throw new Error(`Empty nullifier tree in tx: ${toFriendlyJSON(tx)}`);
   }
-  if (txHeader.state.partial.publicDataTree.isZero()) {
+  if (txHeader.state.partial.publicDataTree.isEmpty()) {
     throw new Error(`Empty public data tree in tx: ${toFriendlyJSON(tx)}`);
   }
 }