@aztec/prover-client 0.0.0-test.1 → 0.0.1-commit.5476d83

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

@@ -1,252 +1,342 @@
-import { SpongeBlob } from '@aztec/blob-lib';
-import { BLOBS_PER_BLOCK, FIELDS_PER_BLOB, NUM_BASE_PARITY_PER_ROOT_PARITY, VK_TREE_HEIGHT } from '@aztec/constants';
-import { padArrayEnd } from '@aztec/foundation/collection';
+import { encodeBlockEndBlobData } from '@aztec/blob-lib';
+import { NUM_BASE_PARITY_PER_ROOT_PARITY } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
-import { MembershipWitness, 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 { BlockRootRollupBlobData, BlockRootRollupData, BlockRootRollupInputs, ConstantRollupData, EmptyBlockRootRollupInputs, MergeRollupInputs, PreviousRollupData, SingleTxBlockRootRollupInputs } from '@aztec/stdlib/rollup';
-import { StateReference } from '@aztec/stdlib/tx';
-import { buildBlobHints, buildHeaderFromCircuitOutputs } from './block-building-helpers.js';
+import { assertLength } from '@aztec/foundation/serialize';
+import { UnbalancedTreeStore } from '@aztec/foundation/trees';
+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;
-    l1ToL2MessageSubtreeSiblingPath;
-    l1ToL2MessageTreeSnapshotAfterInsertion;
-    lastArchiveSnapshot;
-    newArchiveSiblingPath;
-    previousBlockHeader;
-    parentEpoch;
-    baseOrMergeProvingOutputs;
-    baseParityProvingOutputs;
-    rootParityProvingOutput;
-    blockRootProvingOutput;
-    blockRootRollupStarted;
-    block;
-    spongeBlobState;
+    blockNumber;
     totalNumTxs;
+    constants;
+    timestamp;
+    lastArchiveTreeSnapshot;
+    lastArchiveSiblingPath;
+    lastL1ToL2MessageTreeSnapshot;
+    lastL1ToL2MessageSubtreeRootSiblingPath;
+    newL1ToL2MessageTreeSnapshot;
+    headerOfLastBlockInPreviousCheckpoint;
+    startSpongeBlob;
+    parentCheckpoint;
+    baseOrMergeProofs;
+    baseParityProofs;
+    rootParityProof;
+    blockRootProof;
+    builtBlockHeader;
+    endState;
+    endSpongeBlob;
     txs;
+    isFirstBlock;
     error;
-    constructor(index, globalVariables, newL1ToL2Messages, l1ToL2MessageSubtreeSiblingPath, l1ToL2MessageTreeSnapshotAfterInsertion, lastArchiveSnapshot, newArchiveSiblingPath, previousBlockHeader, 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.l1ToL2MessageSubtreeSiblingPath = l1ToL2MessageSubtreeSiblingPath;
-        this.l1ToL2MessageTreeSnapshotAfterInsertion = l1ToL2MessageTreeSnapshotAfterInsertion;
-        this.lastArchiveSnapshot = lastArchiveSnapshot;
-        this.newArchiveSiblingPath = newArchiveSiblingPath;
-        this.previousBlockHeader = previousBlockHeader;
-        this.parentEpoch = parentEpoch;
-        this.baseOrMergeProvingOutputs = new UnbalancedTreeStore(0);
-        this.blockRootRollupStarted = false;
-        this.txs = [];
-        this.baseParityProvingOutputs = Array.from({
+        this.blockNumber = blockNumber;
+        this.totalNumTxs = totalNumTxs;
+        this.constants = constants;
+        this.timestamp = timestamp;
+        this.lastArchiveTreeSnapshot = lastArchiveTreeSnapshot;
+        this.lastArchiveSiblingPath = lastArchiveSiblingPath;
+        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;
-    }
-    get blockNumber() {
-        return this.globalVariables.blockNumber.toNumber();
-    }
-    startNewBlock(numTxs, numBlobFields) {
-        if (this.spongeBlobState) {
-            throw new Error(`Block ${this.blockNumber} already initalised.`);
+        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.baseOrMergeProvingOutputs = new UnbalancedTreeStore(numTxs);
-        // Initialise 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;
+        this.baseOrMergeProofs = new UnbalancedTreeStore(totalNumTxs);
+    }
+    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);
+    }
+    getBlockRootRollupOutput() {
+        return this.blockRootProof?.provingOutput?.inputs;
+    }
+    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;
+    }
+    getStartSpongeBlob() {
+        return this.startSpongeBlob;
+    }
+    setEndSpongeBlob(endSpongeBlob) {
+        this.endSpongeBlob = endSpongeBlob;
+    }
+    getEndSpongeBlob() {
+        return this.endSpongeBlob;
+    }
+    setEndState(endState) {
+        this.endState = endState;
+    }
+    hasEndState() {
+        return !!this.endState;
+    }
+    getBlockEndBlobFields() {
+        return encodeBlockEndBlobData(this.getBlockEndBlobData());
+    }
+    getBlockEndBlobData() {
+        if (!this.endState) {
+            throw new Error('Call `setEndState` first.');
+        }
+        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(proverId) {
-        if (!this.rootParityProvingOutput) {
-            throw new Error('Root parity is not ready.');
-        }
-        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.');
+    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 data = this.#getBlockRootRollupData(proverId);
-        if (this.totalNumTxs === 0) {
-            const constants = ConstantRollupData.from({
-                lastArchive: this.lastArchiveSnapshot,
-                globalVariables: this.globalVariables,
-                vkTreeRoot: getVKTreeRoot(),
-                protocolContractTreeRoot
-            });
-            return {
-                rollupType: 'empty-block-root-rollup',
-                inputs: EmptyBlockRootRollupInputs.from({
-                    data,
-                    constants,
-                    isPadding: false
-                })
-            };
+        const previousRollups = provingOutputs.map((p)=>toProofData(p));
+        if (this.isFirstBlock) {
+            return this.#getFirstBlockRootRollupTypeAndInputs(previousRollups);
         }
-        const previousRollupData = await Promise.all(nonEmptyProofs.map((p)=>this.#getPreviousRollupData(p)));
-        const blobData = await this.#getBlockRootRollupBlobData();
-        if (previousRollupData.length === 1) {
+        const [leftRollup, rightRollup] = previousRollups;
+        if (!rightRollup) {
             return {
-                rollupType: 'single-tx-block-root-rollup',
-                inputs: new SingleTxBlockRootRollupInputs(previousRollupData, data, blobData)
+                rollupType: 'rollup-block-root-single-tx',
+                inputs: new BlockRootSingleTxRollupPrivateInputs(leftRollup, this.lastArchiveSiblingPath)
             };
         } else {
             return {
-                rollupType: 'block-root-rollup',
-                inputs: new BlockRootRollupInputs(previousRollupData, data, blobData)
+                rollupType: 'rollup-block-root',
+                inputs: new BlockRootRollupPrivateInputs([
+                    leftRollup,
+                    rightRollup
+                ], this.lastArchiveSiblingPath)
             };
         }
     }
-    async getPaddingBlockRootInputs(proverId) {
-        if (!this.rootParityProvingOutput) {
+    #getFirstBlockRootRollupTypeAndInputs([leftRollup, rightRollup]) {
+        if (!this.rootParityProof?.provingOutput) {
             throw new Error('Root parity is not ready.');
         }
-        // Use the new block header and archive of the current block as the previous header and archiver of the next padding block.
-        const newBlockHeader = await this.buildHeaderFromProvingOutputs();
-        const newArchive = this.blockRootProvingOutput.inputs.newArchive;
-        const data = BlockRootRollupData.from({
-            l1ToL2Roots: this.#getRootParityData(this.rootParityProvingOutput),
-            l1ToL2MessageSubtreeSiblingPath: this.l1ToL2MessageSubtreeSiblingPath,
-            newArchiveSiblingPath: this.newArchiveSiblingPath,
-            previousBlockHeader: newBlockHeader,
-            proverId
-        });
-        const constants = ConstantRollupData.from({
-            lastArchive: newArchive,
-            globalVariables: this.globalVariables,
-            vkTreeRoot: getVKTreeRoot(),
-            protocolContractTreeRoot
-        });
-        return EmptyBlockRootRollupInputs.from({
-            data,
-            constants,
-            isPadding: true
-        });
+        const l1ToL2Roots = toProofData(this.rootParityProof.provingOutput);
+        if (!leftRollup) {
+            return {
+                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: 'rollup-block-root-first',
+                inputs: new BlockRootFirstRollupPrivateInputs(l1ToL2Roots, [
+                    leftRollup,
+                    rightRollup
+                ], this.lastL1ToL2MessageTreeSnapshot, this.lastL1ToL2MessageSubtreeRootSiblingPath, this.lastArchiveSiblingPath)
+            };
+        }
     }
-    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(logger) {
-        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;
+    async buildHeaderFromProvingOutputs() {
+        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, endState, logger);
+        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 && 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(proverId) {
-        return BlockRootRollupData.from({
-            l1ToL2Roots: this.#getRootParityData(this.rootParityProvingOutput),
-            l1ToL2MessageSubtreeSiblingPath: this.l1ToL2MessageSubtreeSiblingPath,
-            newArchiveSiblingPath: this.newArchiveSiblingPath,
-            previousBlockHeader: this.previousBlockHeader,
-            proverId
-        });
+        this.parentCheckpoint.reject(reason);
     }
-    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, [
-                Fr.ZERO,
-                Fr.ZERO
-            ], BLOBS_PER_BLOCK),
-            blobsHash
-        });
-    }
-    #getChildProofsForBlockRoot() {
+    #getChildProvingOutputsForBlockRoot() {
         if (this.totalNumTxs === 0) {
             return [];
         }
@@ -256,14 +346,29 @@ import { buildBlobHints, buildHeaderFromCircuitOutputs } from './block-building-
         };
         // 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);
-        return new PreviousRollupData(inputs, proof, verificationKey.keyAsFields, new MembershipWitness(VK_TREE_HEIGHT, BigInt(leafIndex), getVKSiblingPath(leafIndex)));
+    #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,62 @@
+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 } from '@aztec/constants';
+import { Fr } from '@aztec/foundation/fields';
+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';
+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 startBlobAccumulator;
+    private endBlobAccumulator;
+    private blobFields;
+    private error;
+    readonly firstBlockNumber: number;
+    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) => void);
+    get epochNumber(): number;
+    startNewBlock(blockNumber: number, 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;
+    accumulateBlobs(startBlobAccumulator: BatchedBlobAccumulator): Promise<BatchedBlobAccumulator | undefined>;
+    getEndBlobAccumulator(): BatchedBlobAccumulator | undefined;
+    getParentLocation(location: TreeNodeLocation): TreeNodeLocation;
+    getBlockMergeRollupInputs(mergeLocation: TreeNodeLocation): BlockMergeRollupPrivateInputs;
+    getCheckpointRootRollupType(): CircuitName;
+    getCheckpointRootRollupInputs(): CheckpointRootRollupPrivateInputs | CheckpointRootSingleBlockRollupPrivateInputs;
+    getBlockProvingStateByBlockNumber(blockNumber: number): BlockProvingState | undefined;
+    isReadyForBlockMerge(location: TreeNodeLocation): boolean;
+    isReadyForCheckpointRoot(): boolean;
+    verifyState(): boolean;
+    getError(): string | undefined;
+    cancel(): void;
+    reject(reason: string): void;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2twb2ludC1wcm92aW5nLXN0YXRlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvb3JjaGVzdHJhdG9yL2NoZWNrcG9pbnQtcHJvdmluZy1zdGF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsc0JBQXNCLEVBQ3RCLEtBQUssMkJBQTJCLEVBR2pDLE1BQU0saUJBQWlCLENBQUM7QUFDekIsT0FBTyxFQUNMLEtBQUssY0FBYyxFQUduQixLQUFLLDZDQUE2QyxFQUNsRCxLQUFLLHlDQUF5QyxFQUUvQyxNQUFNLGtCQUFrQixDQUFDO0FBRTFCLE9BQU8sRUFBYyxFQUFFLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUMxRCxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsS0FBSyxnQkFBZ0IsRUFBdUIsTUFBTSx5QkFBeUIsQ0FBQztBQUNyRixPQUFPLEtBQUssRUFBRSw2QkFBNkIsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3JGLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQy9ELE9BQU8sRUFDTCw2QkFBNkIsRUFDN0IsdUJBQXVCLEVBQ3ZCLHNCQUFzQixFQUN0Qiw0QkFBNEIsRUFFNUIsaUNBQWlDLEVBQ2pDLDRDQUE0QyxFQUM3QyxNQUFNLHNCQUFzQixDQUFDO0FBQzlCLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDbEUsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFHbEQsT0FBTyxFQUFFLGlCQUFpQixFQUFtQixNQUFNLDBCQUEwQixDQUFDO0FBQzlFLE9B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

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

@@ -0,0 +1 @@
+{"version":3,"file":"checkpoint-proving-state.d.ts","sourceRoot":"","sources":["../../src/orchestrator/checkpoint-proving-state.ts"],"names":[],"mappings":"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"}