@aztec/prover-client 0.0.1-fake-ceab37513c → 0.0.6-commit.a2d1860fe9

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

@@ -1,268 +1,349 @@
-import { BatchedBlobAccumulator, BlobAccumulatorPublicInputs, SpongeBlob } from '@aztec/blob-lib';
-import { BLOBS_PER_BLOCK, FIELDS_PER_BLOB, NUM_BASE_PARITY_PER_ROOT_PARITY } from '@aztec/constants';
-import { padArrayEnd } from '@aztec/foundation/collection';
-import { BLS12Point, Fr } from '@aztec/foundation/fields';
+import { encodeBlockEndBlobData } from '@aztec/blob-lib';
+import { NUM_BASE_PARITY_PER_ROOT_PARITY } from '@aztec/constants';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { assertLength } from '@aztec/foundation/serialize';
 import { UnbalancedTreeStore } from '@aztec/foundation/trees';
-import { getVKIndex, getVKSiblingPath, getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
-import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
-import { RootParityInput, RootParityInputs } from '@aztec/stdlib/parity';
-import { BlockConstantData, BlockRootRollupBlobData, BlockRootRollupData, BlockRootRollupInputs, EmptyBlockRootRollupInputs, EpochConstantData, MergeRollupInputs, PaddingBlockRootRollupInputs, PreviousRollupData, SingleTxBlockRootRollupInputs } from '@aztec/stdlib/rollup';
-import { StateReference } from '@aztec/stdlib/tx';
-import { VkData } from '@aztec/stdlib/vks';
-import { accumulateBlobs, buildBlobHints, buildHeaderFromCircuitOutputs, getEmptyBlockBlobsHash } from './block-building-helpers.js';
+import { ParityRootPrivateInputs } from '@aztec/stdlib/parity';
+import { BlockRootEmptyTxFirstRollupPrivateInputs, BlockRootFirstRollupPrivateInputs, BlockRootRollupPrivateInputs, BlockRootSingleTxFirstRollupPrivateInputs, BlockRootSingleTxRollupPrivateInputs, TxMergeRollupPrivateInputs } from '@aztec/stdlib/rollup';
+import { BlockHeader, GlobalVariables } from '@aztec/stdlib/tx';
+import { buildHeaderFromCircuitOutputs, toProofData } from './block-building-helpers.js';
 /**
  * The current state of the proving schedule for a given block. Managed by ProvingState.
  * Contains the raw inputs and intermediate state to generate every constituent proof in the tree.
  */ export class BlockProvingState {
     index;
-    globalVariables;
-    newL1ToL2Messages;
-    l1ToL2MessageTreeSnapshot;
-    l1ToL2MessageSubtreeSiblingPath;
-    l1ToL2MessageTreeSnapshotAfterInsertion;
-    lastArchiveSnapshot;
-    lastArchiveSiblingPath;
-    newArchiveSiblingPath;
-    previousBlockHeader;
-    proverId;
-    parentEpoch;
-    baseOrMergeProvingOutputs;
-    baseParityProvingOutputs;
-    rootParityProvingOutput;
-    blockRootProvingOutput;
-    blockRootRollupStarted;
-    block;
-    spongeBlobState;
-    startBlobAccumulator;
-    endBlobAccumulator;
-    blobsHash;
+    blockNumber;
     totalNumTxs;
+    constants;
+    timestamp;
+    lastArchiveTreeSnapshot;
+    lastArchiveSiblingPath;
+    lastL1ToL2MessageTreeSnapshot;
+    lastL1ToL2MessageSubtreeRootSiblingPath;
+    newL1ToL2MessageTreeSnapshot;
+    headerOfLastBlockInPreviousCheckpoint;
+    startSpongeBlob;
+    parentCheckpoint;
+    baseOrMergeProofs;
+    baseParityProofs;
+    rootParityProof;
+    blockRootProof;
+    builtBlockHeader;
+    builtArchive;
+    endState;
+    endSpongeBlob;
     txs;
+    isFirstBlock;
     error;
-    constructor(index, globalVariables, newL1ToL2Messages, l1ToL2MessageTreeSnapshot, l1ToL2MessageSubtreeSiblingPath, l1ToL2MessageTreeSnapshotAfterInsertion, lastArchiveSnapshot, lastArchiveSiblingPath, newArchiveSiblingPath, previousBlockHeader, proverId, parentEpoch){
+    constructor(index, blockNumber, totalNumTxs, constants, timestamp, lastArchiveTreeSnapshot, lastArchiveSiblingPath, lastL1ToL2MessageTreeSnapshot, lastL1ToL2MessageSubtreeRootSiblingPath, newL1ToL2MessageTreeSnapshot, headerOfLastBlockInPreviousCheckpoint, startSpongeBlob, parentCheckpoint){
         this.index = index;
-        this.globalVariables = globalVariables;
-        this.newL1ToL2Messages = newL1ToL2Messages;
-        this.l1ToL2MessageTreeSnapshot = l1ToL2MessageTreeSnapshot;
-        this.l1ToL2MessageSubtreeSiblingPath = l1ToL2MessageSubtreeSiblingPath;
-        this.l1ToL2MessageTreeSnapshotAfterInsertion = l1ToL2MessageTreeSnapshotAfterInsertion;
-        this.lastArchiveSnapshot = lastArchiveSnapshot;
+        this.blockNumber = blockNumber;
+        this.totalNumTxs = totalNumTxs;
+        this.constants = constants;
+        this.timestamp = timestamp;
+        this.lastArchiveTreeSnapshot = lastArchiveTreeSnapshot;
         this.lastArchiveSiblingPath = lastArchiveSiblingPath;
-        this.newArchiveSiblingPath = newArchiveSiblingPath;
-        this.previousBlockHeader = previousBlockHeader;
-        this.proverId = proverId;
-        this.parentEpoch = parentEpoch;
-        this.baseOrMergeProvingOutputs = new UnbalancedTreeStore(0);
-        this.blockRootRollupStarted = false;
-        this.txs = [];
-        this.baseParityProvingOutputs = Array.from({
+        this.lastL1ToL2MessageTreeSnapshot = lastL1ToL2MessageTreeSnapshot;
+        this.lastL1ToL2MessageSubtreeRootSiblingPath = lastL1ToL2MessageSubtreeRootSiblingPath;
+        this.newL1ToL2MessageTreeSnapshot = newL1ToL2MessageTreeSnapshot;
+        this.headerOfLastBlockInPreviousCheckpoint = headerOfLastBlockInPreviousCheckpoint;
+        this.startSpongeBlob = startSpongeBlob;
+        this.parentCheckpoint = parentCheckpoint;
+        this.baseOrMergeProofs = new UnbalancedTreeStore(0);
+        this.baseParityProofs = Array.from({
             length: NUM_BASE_PARITY_PER_ROOT_PARITY
         }).map((_)=>undefined);
-        this.totalNumTxs = 0;
-        if (this.blockNumber == parentEpoch.firstBlockNumber) {
-            this.startBlobAccumulator = BatchedBlobAccumulator.newWithChallenges(parentEpoch.finalBlobBatchingChallenges);
+        this.txs = [];
+        this.isFirstBlock = index === 0;
+        if (!totalNumTxs && !this.isFirstBlock) {
+            throw new Error(`Cannot create a block with 0 txs, unless it's the first block.`);
         }
+        this.baseOrMergeProofs = new UnbalancedTreeStore(totalNumTxs);
     }
-    get blockNumber() {
-        return this.globalVariables.blockNumber;
-    }
-    startNewBlock(numTxs, numBlobFields) {
-        if (this.spongeBlobState) {
-            throw new Error(`Block ${this.blockNumber} already initalised.`);
-        }
-        this.baseOrMergeProvingOutputs = new UnbalancedTreeStore(numTxs);
-        // Initialize the sponge which will eventually absorb all tx effects to be added to the blob.
-        // Like l1 to l2 messages, we need to know beforehand how many effects will be absorbed.
-        this.spongeBlobState = SpongeBlob.init(numBlobFields);
-        this.totalNumTxs = numTxs;
+    get epochNumber() {
+        return this.parentCheckpoint.epochNumber;
     }
     // Adds a transaction to the proving state, returns it's index
     addNewTx(tx) {
-        if (!this.spongeBlobState) {
-            throw new Error(`Invalid block proving state, call startNewBlock before adding transactions.`);
+        if (!this.isAcceptingTxs()) {
+            throw new Error(`Cannot add more txs to block ${this.blockNumber}.`);
         }
         const txIndex = this.txs.length;
         this.txs[txIndex] = tx;
         return txIndex;
     }
+    isAcceptingTxs() {
+        return this.txs.length < this.totalNumTxs;
+    }
+    getProcessedTxs() {
+        return this.txs.map((t)=>t.processedTx);
+    }
+    tryStartProvingBase(txIndex) {
+        if (this.baseOrMergeProofs.getLeaf(txIndex)?.isProving) {
+            return false;
+        } else {
+            this.baseOrMergeProofs.setLeaf(txIndex, {
+                isProving: true
+            });
+            return true;
+        }
+    }
     setBaseRollupProof(txIndex, provingOutput) {
-        return this.baseOrMergeProvingOutputs.setLeaf(txIndex, provingOutput);
+        return this.baseOrMergeProofs.setLeaf(txIndex, {
+            provingOutput
+        });
+    }
+    tryStartProvingMerge(location) {
+        if (this.baseOrMergeProofs.getNode(location)?.isProving) {
+            return false;
+        } else {
+            this.baseOrMergeProofs.setNode(location, {
+                isProving: true
+            });
+            return true;
+        }
     }
     setMergeRollupProof(location, provingOutput) {
-        this.baseOrMergeProvingOutputs.setNode(location, provingOutput);
+        this.baseOrMergeProofs.setNode(location, {
+            provingOutput
+        });
+    }
+    tryStartProvingBaseParity(index) {
+        if (this.baseParityProofs[index]?.isProving) {
+            return false;
+        } else {
+            this.baseParityProofs[index] = {
+                isProving: true
+            };
+            return true;
+        }
     }
     // Stores a set of root parity inputs at the given index
     setBaseParityProof(index, provingOutput) {
         if (index >= NUM_BASE_PARITY_PER_ROOT_PARITY) {
             throw new Error(`Unable to set a base parity proofs at index ${index}. Expected at most ${NUM_BASE_PARITY_PER_ROOT_PARITY} proofs.`);
         }
-        this.baseParityProvingOutputs[index] = provingOutput;
+        this.baseParityProofs[index] = {
+            provingOutput
+        };
+    }
+    tryStartProvingRootParity() {
+        if (this.rootParityProof?.isProving) {
+            return false;
+        } else {
+            this.rootParityProof = {
+                isProving: true
+            };
+            return true;
+        }
     }
     setRootParityProof(provingOutput) {
-        this.rootParityProvingOutput = provingOutput;
+        this.rootParityProof = {
+            provingOutput
+        };
+    }
+    tryStartProvingBlockRoot() {
+        if (this.blockRootProof?.isProving) {
+            return false;
+        } else {
+            this.blockRootProof = {
+                isProving: true
+            };
+            return true;
+        }
     }
     setBlockRootRollupProof(provingOutput) {
-        this.blockRootProvingOutput = provingOutput;
+        this.blockRootProof = {
+            provingOutput
+        };
+        return this.parentCheckpoint.setBlockRootRollupProof(this.index, provingOutput);
     }
-    setBlock(block) {
-        this.block = block;
+    getBlockRootRollupOutput() {
+        return this.blockRootProof?.provingOutput?.inputs;
     }
-    setStartBlobAccumulator(accumulator) {
-        this.startBlobAccumulator = accumulator;
+    async buildBlockHeader() {
+        if (this.isAcceptingTxs()) {
+            throw new Error('All txs must be added to the block before building the header.');
+        }
+        if (!this.endState) {
+            throw new Error('Call `setEndState` first.');
+        }
+        if (!this.endSpongeBlob) {
+            throw new Error('Call `setEndSpongeBlob` first.');
+        }
+        const endSpongeBlob = this.endSpongeBlob.clone();
+        const endSpongeBlobHash = await endSpongeBlob.squeeze();
+        this.builtBlockHeader = new BlockHeader(this.lastArchiveTreeSnapshot, this.endState, endSpongeBlobHash, this.#getGlobalVariables(), this.#getTotalFees(), new Fr(this.#getTotalManaUsed()));
+        return this.builtBlockHeader;
+    }
+    getBuiltBlockHeader() {
+        return this.builtBlockHeader;
+    }
+    setBuiltArchive(archive) {
+        this.builtArchive = archive;
+    }
+    getBuiltArchive() {
+        return this.builtArchive;
+    }
+    getStartSpongeBlob() {
+        return this.startSpongeBlob;
+    }
+    setEndSpongeBlob(endSpongeBlob) {
+        this.endSpongeBlob = endSpongeBlob;
+    }
+    getEndSpongeBlob() {
+        return this.endSpongeBlob;
+    }
+    setEndState(endState) {
+        this.endState = endState;
     }
-    setEndBlobAccumulator(accumulator) {
-        this.endBlobAccumulator = accumulator;
+    hasEndState() {
+        return !!this.endState;
     }
-    async accumulateBlobs() {
-        if (!this.block || !this.startBlobAccumulator) {
-            // We only want to accumulate once we have all txs, so we wait until the block is set.
-            return;
+    getBlockEndBlobFields() {
+        return encodeBlockEndBlobData(this.getBlockEndBlobData());
+    }
+    getBlockEndBlobData() {
+        if (!this.endState) {
+            throw new Error('Call `setEndState` first.');
         }
-        const endBlobAccumulator = await accumulateBlobs(this.allTxs.map((t)=>t.processedTx), this.startBlobAccumulator);
-        this.setEndBlobAccumulator(endBlobAccumulator);
+        const partial = this.endState.partial;
+        return {
+            blockEndMarker: {
+                numTxs: this.totalNumTxs,
+                timestamp: this.timestamp,
+                blockNumber: this.blockNumber
+            },
+            blockEndStateField: {
+                l1ToL2MessageNextAvailableLeafIndex: this.newL1ToL2MessageTreeSnapshot.nextAvailableLeafIndex,
+                noteHashNextAvailableLeafIndex: partial.noteHashTree.nextAvailableLeafIndex,
+                nullifierNextAvailableLeafIndex: partial.nullifierTree.nextAvailableLeafIndex,
+                publicDataNextAvailableLeafIndex: partial.publicDataTree.nextAvailableLeafIndex,
+                totalManaUsed: this.#getTotalManaUsed()
+            },
+            lastArchiveRoot: this.lastArchiveTreeSnapshot.root,
+            noteHashRoot: partial.noteHashTree.root,
+            nullifierRoot: partial.nullifierTree.root,
+            publicDataRoot: partial.publicDataTree.root,
+            l1ToL2MessageRoot: this.isFirstBlock ? this.newL1ToL2MessageTreeSnapshot.root : undefined
+        };
     }
-    // Returns the complete set of transaction proving state objects
-    get allTxs() {
-        return this.txs;
+    getBlockBlobData() {
+        return {
+            ...this.getBlockEndBlobData(),
+            txs: this.getTxEffects().map((t)=>t.toTxBlobData())
+        };
     }
-    /** Returns the block number as an epoch number. Used for prioritizing proof requests. */ get epochNumber() {
-        return this.parentEpoch.epochNumber;
+    getTxEffects() {
+        return this.txs.map((t)=>t.processedTx.txEffect);
     }
     getParentLocation(location) {
-        return this.baseOrMergeProvingOutputs.getParentLocation(location);
+        return this.baseOrMergeProofs.getParentLocation(location);
     }
     getMergeRollupInputs(mergeLocation) {
-        const [left, right] = this.baseOrMergeProvingOutputs.getChildren(mergeLocation);
+        const [left, right] = this.baseOrMergeProofs.getChildren(mergeLocation).map((c)=>c?.provingOutput);
         if (!left || !right) {
-            throw new Error('At lease one child is not ready.');
+            throw new Error('At least one child is not ready for the merge rollup.');
         }
-        return new MergeRollupInputs([
-            this.#getPreviousRollupData(left),
-            this.#getPreviousRollupData(right)
+        return new TxMergeRollupPrivateInputs([
+            toProofData(left),
+            toProofData(right)
         ]);
     }
-    async getBlockRootRollupTypeAndInputs() {
-        if (!this.rootParityProvingOutput) {
-            throw new Error('Root parity is not ready.');
+    getBlockRootRollupTypeAndInputs() {
+        const provingOutputs = this.#getChildProvingOutputsForBlockRoot();
+        if (!provingOutputs.every((p)=>!!p)) {
+            throw new Error('At least one child is not ready for the block root rollup.');
         }
-        const proofs = this.#getChildProofsForBlockRoot();
-        const nonEmptyProofs = proofs.filter((p)=>!!p);
-        if (proofs.length !== nonEmptyProofs.length) {
-            throw new Error('At lease one child is not ready for the block root.');
+        const previousRollups = provingOutputs.map((p)=>toProofData(p));
+        if (this.isFirstBlock) {
+            return this.#getFirstBlockRootRollupTypeAndInputs(previousRollups);
         }
-        const data = this.#getBlockRootRollupData();
-        if (this.totalNumTxs === 0) {
-            const constants = BlockConstantData.from({
-                lastArchive: this.lastArchiveSnapshot,
-                newL1ToL2: this.l1ToL2MessageTreeSnapshotAfterInsertion,
-                globalVariables: this.globalVariables,
-                vkTreeRoot: getVKTreeRoot(),
-                protocolContractTreeRoot
-            });
-            this.blobsHash = await getEmptyBlockBlobsHash();
+        const [leftRollup, rightRollup] = previousRollups;
+        if (!rightRollup) {
             return {
-                rollupType: 'empty-block-root-rollup',
-                inputs: EmptyBlockRootRollupInputs.from({
-                    data,
-                    constants
-                })
+                rollupType: 'rollup-block-root-single-tx',
+                inputs: new BlockRootSingleTxRollupPrivateInputs(leftRollup, this.lastArchiveSiblingPath)
             };
+        } else {
+            return {
+                rollupType: 'rollup-block-root',
+                inputs: new BlockRootRollupPrivateInputs([
+                    leftRollup,
+                    rightRollup
+                ], this.lastArchiveSiblingPath)
+            };
+        }
+    }
+    #getFirstBlockRootRollupTypeAndInputs([leftRollup, rightRollup]) {
+        if (!this.rootParityProof?.provingOutput) {
+            throw new Error('Root parity is not ready.');
         }
-        const previousRollupData = await Promise.all(nonEmptyProofs.map((p)=>this.#getPreviousRollupData(p)));
-        const blobData = await this.#getBlockRootRollupBlobData();
-        this.blobsHash = blobData.blobsHash;
-        if (previousRollupData.length === 1) {
+        const l1ToL2Roots = toProofData(this.rootParityProof.provingOutput);
+        if (!leftRollup) {
             return {
-                rollupType: 'single-tx-block-root-rollup',
-                inputs: new SingleTxBlockRootRollupInputs(previousRollupData, data, blobData)
+                rollupType: 'rollup-block-root-first-empty-tx',
+                inputs: new BlockRootEmptyTxFirstRollupPrivateInputs(l1ToL2Roots, this.lastArchiveTreeSnapshot, this.headerOfLastBlockInPreviousCheckpoint.state, this.constants, this.timestamp, this.lastL1ToL2MessageSubtreeRootSiblingPath, this.lastArchiveSiblingPath)
+            };
+        } else if (!rightRollup) {
+            return {
+                rollupType: 'rollup-block-root-first-single-tx',
+                inputs: new BlockRootSingleTxFirstRollupPrivateInputs(l1ToL2Roots, leftRollup, this.lastL1ToL2MessageTreeSnapshot, this.lastL1ToL2MessageSubtreeRootSiblingPath, this.lastArchiveSiblingPath)
             };
         } else {
             return {
-                rollupType: 'block-root-rollup',
-                inputs: new BlockRootRollupInputs(previousRollupData, data, blobData)
+                rollupType: 'rollup-block-root-first',
+                inputs: new BlockRootFirstRollupPrivateInputs(l1ToL2Roots, [
+                    leftRollup,
+                    rightRollup
+                ], this.lastL1ToL2MessageTreeSnapshot, this.lastL1ToL2MessageSubtreeRootSiblingPath, this.lastArchiveSiblingPath)
             };
         }
     }
-    getPaddingBlockRootInputs() {
-        const constants = EpochConstantData.from({
-            vkTreeRoot: getVKTreeRoot(),
-            protocolContractTreeRoot,
-            proverId: this.proverId.toField()
-        });
-        return PaddingBlockRootRollupInputs.from({
-            constants
-        });
-    }
-    getRootParityInputs() {
-        if (!this.baseParityProvingOutputs.every((p)=>!!p)) {
+    getParityRootInputs() {
+        const baseParityProvingOutputs = this.baseParityProofs.filter((p)=>!!p?.provingOutput).map((p)=>p.provingOutput);
+        if (baseParityProvingOutputs.length !== this.baseParityProofs.length) {
             throw new Error('At lease one base parity is not ready.');
         }
-        const children = this.baseParityProvingOutputs.map((p)=>this.#getRootParityData(p));
-        return new RootParityInputs(children);
+        const children = baseParityProvingOutputs.map((p)=>toProofData(p));
+        return new ParityRootPrivateInputs(assertLength(children, NUM_BASE_PARITY_PER_ROOT_PARITY));
     }
     // Returns a specific transaction proving state
     getTxProvingState(txIndex) {
         return this.txs[txIndex];
     }
     async buildHeaderFromProvingOutputs() {
-        const previousRollupData = this.totalNumTxs === 0 ? [] : await Promise.all(this.#getChildProofsForBlockRoot().map((p)=>this.#getPreviousRollupData(p)));
-        let endPartialState = this.previousBlockHeader.state.partial;
-        if (this.totalNumTxs !== 0) {
-            const previousRollupData = this.#getChildProofsForBlockRoot();
-            const lastRollup = previousRollupData[previousRollupData.length - 1];
-            if (!lastRollup) {
-                throw new Error('End state of the block is not available. Last rollup is not ready yet.');
-            }
-            endPartialState = lastRollup.inputs.end;
+        if (!this.blockRootProof?.provingOutput) {
+            throw new Error('Block root rollup is not ready.');
         }
-        const endState = new StateReference(this.l1ToL2MessageTreeSnapshotAfterInsertion, endPartialState);
-        return buildHeaderFromCircuitOutputs(previousRollupData.map((d)=>d.baseOrMergeRollupPublicInputs), this.rootParityProvingOutput.inputs, this.blockRootProvingOutput.inputs, this.blobsHash, endState);
+        return await buildHeaderFromCircuitOutputs(this.blockRootProof.provingOutput.inputs);
     }
     isReadyForMergeRollup(location) {
-        return this.baseOrMergeProvingOutputs.getSibling(location) !== undefined;
+        return !!this.baseOrMergeProofs.getSibling(location)?.provingOutput;
     }
     // Returns true if we have sufficient inputs to execute the block root rollup
     isReadyForBlockRootRollup() {
-        const childProofs = this.#getChildProofsForBlockRoot();
-        return this.block !== undefined && this.rootParityProvingOutput !== undefined && this.endBlobAccumulator !== undefined && childProofs.every((p)=>!!p);
+        const childProofs = this.#getChildProvingOutputsForBlockRoot();
+        return (!this.isFirstBlock || !!this.rootParityProof?.provingOutput) && childProofs.every((p)=>!!p);
     }
     // Returns true if we have sufficient root parity inputs to execute the root parity circuit
     isReadyForRootParity() {
-        return this.baseParityProvingOutputs.every((p)=>!!p);
+        return this.baseParityProofs.every((p)=>!!p?.provingOutput);
     }
     isComplete() {
-        return !!this.blockRootProvingOutput;
+        return !!this.blockRootProof;
     }
-    // Returns whether the proving state is still valid
     verifyState() {
-        return this.parentEpoch.verifyState();
+        return this.parentCheckpoint.verifyState();
+    }
+    getError() {
+        return this.error;
     }
     reject(reason) {
         this.error = reason;
-        this.parentEpoch.reject(reason);
-    }
-    #getBlockRootRollupData() {
-        return BlockRootRollupData.from({
-            l1ToL2Roots: this.#getRootParityData(this.rootParityProvingOutput),
-            l1ToL2MessageSubtreeSiblingPath: this.l1ToL2MessageSubtreeSiblingPath,
-            previousArchiveSiblingPath: this.lastArchiveSiblingPath,
-            newArchiveSiblingPath: this.newArchiveSiblingPath,
-            previousBlockHeader: this.previousBlockHeader,
-            startBlobAccumulator: BlobAccumulatorPublicInputs.fromBatchedBlobAccumulator(this.startBlobAccumulator),
-            finalBlobChallenges: this.startBlobAccumulator.finalBlobChallenges,
-            proverId: this.proverId.toField()
-        });
-    }
-    async #getBlockRootRollupBlobData() {
-        const txEffects = this.txs.map((txProvingState)=>txProvingState.processedTx.txEffect);
-        const { blobFields, blobCommitments, blobsHash } = await buildBlobHints(txEffects);
-        return BlockRootRollupBlobData.from({
-            blobFields: padArrayEnd(blobFields, Fr.ZERO, FIELDS_PER_BLOB * BLOBS_PER_BLOCK),
-            blobCommitments: padArrayEnd(blobCommitments, BLS12Point.ZERO, BLOBS_PER_BLOCK),
-            blobsHash
-        });
+        this.parentCheckpoint.reject(reason);
     }
-    #getChildProofsForBlockRoot() {
+    #getChildProvingOutputsForBlockRoot() {
         if (this.totalNumTxs === 0) {
             return [];
         }
@@ -272,15 +353,29 @@ import { accumulateBlobs, buildBlobHints, buildHeaderFromCircuitOutputs, getEmpt
         };
         // If there's only 1 tx, its base rollup proof will be stored at the root.
         return this.totalNumTxs === 1 ? [
-            this.baseOrMergeProvingOutputs.getNode(rootLocation)
-        ] : this.baseOrMergeProvingOutputs.getChildren(rootLocation);
+            this.baseOrMergeProofs.getNode(rootLocation)?.provingOutput
+        ] : this.baseOrMergeProofs.getChildren(rootLocation).map((c)=>c?.provingOutput);
+    }
+    #getGlobalVariables() {
+        if (this.txs.length) {
+            return this.txs[0].processedTx.globalVariables;
+        }
+        const constants = this.constants;
+        return GlobalVariables.from({
+            chainId: constants.chainId,
+            version: constants.version,
+            blockNumber: this.blockNumber,
+            slotNumber: constants.slotNumber,
+            timestamp: this.timestamp,
+            coinbase: constants.coinbase,
+            feeRecipient: constants.feeRecipient,
+            gasFees: constants.gasFees
+        });
     }
-    #getPreviousRollupData({ inputs, proof, verificationKey }) {
-        const leafIndex = getVKIndex(verificationKey.keyAsFields);
-        const vkData = new VkData(verificationKey, leafIndex, getVKSiblingPath(leafIndex));
-        return new PreviousRollupData(inputs, proof, vkData);
+    #getTotalFees() {
+        return this.txs.reduce((acc, tx)=>acc.add(tx.processedTx.txEffect.transactionFee), Fr.ZERO);
     }
-    #getRootParityData({ inputs, proof, verificationKey }) {
-        return new RootParityInput(proof, verificationKey.keyAsFields, getVKSiblingPath(getVKIndex(verificationKey)), inputs);
+    #getTotalManaUsed() {
+        return this.txs.reduce((acc, tx)=>acc + BigInt(tx.processedTx.gasUsed.billedGas.l2Gas), 0n);
     }
 }

package/dest/orchestrator/checkpoint-proving-state.d.ts

@@ -0,0 +1,76 @@
+import { BatchedBlobAccumulator, type FinalBlobBatchingChallenges } from '@aztec/blob-lib';
+import { type ARCHIVE_HEIGHT, type L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH, type NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, OUT_HASH_TREE_HEIGHT } from '@aztec/constants';
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import type { Tuple } from '@aztec/foundation/serialize';
+import { type TreeNodeLocation } from '@aztec/foundation/trees';
+import type { PublicInputsAndRecursiveProof } from '@aztec/stdlib/interfaces/server';
+import { ParityBasePrivateInputs } from '@aztec/stdlib/parity';
+import { BlockMergeRollupPrivateInputs, BlockRollupPublicInputs, CheckpointConstantData, CheckpointRollupPublicInputs, CheckpointRootRollupPrivateInputs, CheckpointRootSingleBlockRollupPrivateInputs } from '@aztec/stdlib/rollup';
+import type { CircuitName } from '@aztec/stdlib/stats';
+import type { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
+import type { BlockHeader } from '@aztec/stdlib/tx';
+import type { UInt64 } from '@aztec/stdlib/types';
+import { BlockProvingState } from './block-proving-state.js';
+import type { EpochProvingState } from './epoch-proving-state.js';
+type OutHashHint = {
+    treeSnapshot: AppendOnlyTreeSnapshot;
+    siblingPath: Tuple<Fr, typeof OUT_HASH_TREE_HEIGHT>;
+};
+export declare class CheckpointProvingState {
+    #private;
+    readonly index: number;
+    readonly constants: CheckpointConstantData;
+    readonly totalNumBlocks: number;
+    private readonly finalBlobBatchingChallenges;
+    private readonly headerOfLastBlockInPreviousCheckpoint;
+    private readonly lastArchiveSiblingPath;
+    private readonly l1ToL2Messages;
+    private readonly lastL1ToL2MessageTreeSnapshot;
+    private readonly lastL1ToL2MessageSubtreeRootSiblingPath;
+    private readonly newL1ToL2MessageTreeSnapshot;
+    private readonly newL1ToL2MessageSubtreeRootSiblingPath;
+    parentEpoch: EpochProvingState;
+    private onBlobAccumulatorSet;
+    private blockProofs;
+    private checkpointRootProof;
+    private blocks;
+    private previousOutHashHint;
+    private outHash;
+    private newOutHashHint;
+    private startBlobAccumulator;
+    private endBlobAccumulator;
+    private blobFields;
+    private error;
+    readonly firstBlockNumber: BlockNumber;
+    constructor(index: number, constants: CheckpointConstantData, totalNumBlocks: number, finalBlobBatchingChallenges: FinalBlobBatchingChallenges, headerOfLastBlockInPreviousCheckpoint: BlockHeader, lastArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>, l1ToL2Messages: Fr[], lastL1ToL2MessageTreeSnapshot: AppendOnlyTreeSnapshot, lastL1ToL2MessageSubtreeRootSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH>, newL1ToL2MessageTreeSnapshot: AppendOnlyTreeSnapshot, newL1ToL2MessageSubtreeRootSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH>, parentEpoch: EpochProvingState, onBlobAccumulatorSet: (checkpoint: CheckpointProvingState) => Promise<void>);
+    get epochNumber(): number;
+    startNewBlock(blockNumber: BlockNumber, timestamp: UInt64, totalNumTxs: number, lastArchiveTreeSnapshot: AppendOnlyTreeSnapshot, lastArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>): BlockProvingState;
+    isAcceptingBlocks(): boolean;
+    setBlockRootRollupProof(blockIndex: number, provingOutput: PublicInputsAndRecursiveProof<BlockRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>): TreeNodeLocation;
+    tryStartProvingBlockMerge(location: TreeNodeLocation): boolean;
+    setBlockMergeRollupProof(location: TreeNodeLocation, provingOutput: PublicInputsAndRecursiveProof<BlockRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>): void;
+    tryStartProvingCheckpointRoot(): boolean;
+    setCheckpointRootRollupProof(provingOutput: PublicInputsAndRecursiveProof<CheckpointRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>): TreeNodeLocation;
+    getBaseParityInputs(baseParityIndex: number): ParityBasePrivateInputs;
+    setOutHashHint(hint: OutHashHint): void;
+    getOutHashHint(): OutHashHint | undefined;
+    accumulateBlockOutHashes(): Fr | undefined;
+    setOutHashHintForNextCheckpoint(hint: OutHashHint): void;
+    getOutHashHintForNextCheckpoint(): OutHashHint | undefined;
+    accumulateBlobs(startBlobAccumulator: BatchedBlobAccumulator): Promise<BatchedBlobAccumulator | undefined>;
+    getEndBlobAccumulator(): BatchedBlobAccumulator | undefined;
+    getParentLocation(location: TreeNodeLocation): TreeNodeLocation;
+    getBlockMergeRollupInputs(mergeLocation: TreeNodeLocation): BlockMergeRollupPrivateInputs;
+    getCheckpointRootRollupType(): CircuitName;
+    getCheckpointRootRollupInputs(): Promise<CheckpointRootRollupPrivateInputs | CheckpointRootSingleBlockRollupPrivateInputs>;
+    getBlockProvingStateByBlockNumber(blockNumber: BlockNumber): BlockProvingState | undefined;
+    isReadyForBlockMerge(location: TreeNodeLocation): boolean;
+    isReadyForCheckpointRoot(): boolean;
+    verifyState(): boolean;
+    getError(): string | undefined;
+    cancel(): void;
+    reject(reason: string): void;
+}
+export {};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2twb2ludC1wcm92aW5nLXN0YXRlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvb3JjaGVzdHJhdG9yL2NoZWNrcG9pbnQtcHJvdmluZy1zdGF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsc0JBQXNCLEVBQ3RCLEtBQUssMkJBQTJCLEVBR2pDLE1BQU0saUJBQWlCLENBQUM7QUFDekIsT0FBTyxFQUNMLEtBQUssY0FBYyxFQUduQixLQUFLLDZDQUE2QyxFQUNsRCxLQUFLLHlDQUF5QyxFQUU5QyxvQkFBb0IsRUFDckIsTUFBTSxrQkFBa0IsQ0FBQztBQUMxQixPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFHOUQsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ3pELE9BQU8sRUFBRSxLQUFLLGdCQUFnQixFQUF1QixNQUFNLHlCQUF5QixDQUFDO0FBQ3JGLE9BQU8sS0FBSyxFQUFFLDZCQUE2QixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFckYsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDL0QsT0FBTyxFQUNMLDZCQUE2QixFQUM3Qix1QkFBdUIsRUFDdkIsc0JBQXNCLEVBQ3RCLDRCQUE0QixFQUU1QixpQ0FBaUMsRUFDakMsNENBQTRDLEVBQzdDLE1BQU0sc0JBQXNCLENBQUM7QUFDOUIsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDdkQsT0FBTyxLQUFLLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNsRSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FB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