@aztec/prover-client 0.69.0-devnet → 0.69.1-devnet

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

@@ -1,75 +1,71 @@
-import { type L2Block, type MerkleTreeId } from '@aztec/circuit-types';
-import { type ARCHIVE_HEIGHT, type AppendOnlyTreeSnapshot, type Fr, type GlobalVariables, type L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, type NESTED_RECURSIVE_PROOF_LENGTH, type NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, type NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, type Proof, type RECURSIVE_PROOF_LENGTH, type RecursiveProof, type RootParityInput, type VerificationKeyAsFields } from '@aztec/circuits.js';
+import { type L2Block, type MerkleTreeId, type PublicInputsAndRecursiveProof } from '@aztec/circuit-types';
+import { type ARCHIVE_HEIGHT, type AppendOnlyTreeSnapshot, type BlockHeader, Fr, type GlobalVariables, type L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, type NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, type NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, type ParityPublicInputs, RootParityInput, RootParityInputs } from '@aztec/circuits.js';
 import { SpongeBlob } from '@aztec/circuits.js/blobs';
-import { type BaseOrMergeRollupPublicInputs, type BlockRootOrBlockMergePublicInputs } from '@aztec/circuits.js/rollup';
+import { type BaseOrMergeRollupPublicInputs, type BlockRootOrBlockMergePublicInputs, BlockRootRollupInputs, EmptyBlockRootRollupInputs, MergeRollupInputs, SingleTxBlockRootRollupInputs } from '@aztec/circuits.js/rollup';
+import { type Logger } from '@aztec/foundation/log';
 import { type Tuple } from '@aztec/foundation/serialize';
+import { type TreeNodeLocation } from '@aztec/foundation/trees';
 import { type EpochProvingState } from './epoch-proving-state.js';
 import { type TxProvingState } from './tx-proving-state.js';
-export type MergeRollupInputData = {
-    inputs: [BaseOrMergeRollupPublicInputs | undefined, BaseOrMergeRollupPublicInputs | undefined];
-    proofs: [
-        RecursiveProof<typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH> | undefined,
-        RecursiveProof<typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH> | undefined
-    ];
-    verificationKeys: [VerificationKeyAsFields | undefined, VerificationKeyAsFields | undefined];
-};
 export type TreeSnapshots = Map<MerkleTreeId, AppendOnlyTreeSnapshot>;
 /**
  * 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 declare class BlockProvingState {
+    #private;
     readonly index: number;
     readonly globalVariables: GlobalVariables;
     readonly newL1ToL2Messages: Tuple<Fr, typeof NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP>;
-    readonly messageTreeSnapshot: AppendOnlyTreeSnapshot;
-    readonly messageTreeRootSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH>;
-    readonly messageTreeSnapshotAfterInsertion: AppendOnlyTreeSnapshot;
-    readonly archiveTreeSnapshot: AppendOnlyTreeSnapshot;
-    readonly archiveTreeRootSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>;
-    readonly previousBlockHash: Fr;
+    private readonly messageTreeSnapshot;
+    private readonly messageTreeRootSiblingPath;
+    private readonly messageTreeSnapshotAfterInsertion;
+    private readonly archiveTreeSnapshot;
+    private readonly archiveTreeRootSiblingPath;
+    private readonly previousBlockHeader;
+    private readonly previousBlockHash;
     private readonly parentEpoch;
-    private mergeRollupInputs;
-    private rootParityInputs;
-    private finalRootParityInputs;
-    blockRootRollupPublicInputs: BlockRootOrBlockMergePublicInputs | undefined;
+    private baseOrMergeProvingOutputs;
+    private baseParityProvingOutputs;
+    private rootParityProvingOutput;
+    private blockRootProvingOutput;
     blockRootRollupStarted: boolean;
-    finalProof: Proof | undefined;
     block: L2Block | undefined;
     spongeBlobState: SpongeBlob | undefined;
     totalNumTxs: number;
     private txs;
     error: string | undefined;
-    constructor(index: number, globalVariables: GlobalVariables, newL1ToL2Messages: Tuple<Fr, typeof NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP>, messageTreeSnapshot: AppendOnlyTreeSnapshot, messageTreeRootSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH>, messageTreeSnapshotAfterInsertion: AppendOnlyTreeSnapshot, archiveTreeSnapshot: AppendOnlyTreeSnapshot, archiveTreeRootSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>, previousBlockHash: Fr, parentEpoch: EpochProvingState);
+    constructor(index: number, globalVariables: GlobalVariables, newL1ToL2Messages: Tuple<Fr, typeof NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP>, messageTreeSnapshot: AppendOnlyTreeSnapshot, messageTreeRootSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH>, messageTreeSnapshotAfterInsertion: AppendOnlyTreeSnapshot, archiveTreeSnapshot: AppendOnlyTreeSnapshot, archiveTreeRootSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>, previousBlockHeader: BlockHeader, previousBlockHash: Fr, parentEpoch: EpochProvingState);
     get blockNumber(): number;
-    get numMergeLevels(): bigint;
-    findMergeLevel(currentLevel: bigint, currentIndex: bigint): bigint[];
     startNewBlock(numTxs: number, numBlobFields: number): void;
     addNewTx(tx: TxProvingState): number;
-    get transactionsReceived(): number;
-    get finalRootParityInput(): RootParityInput<typeof NESTED_RECURSIVE_PROOF_LENGTH> | undefined;
-    set finalRootParityInput(input: RootParityInput<typeof NESTED_RECURSIVE_PROOF_LENGTH> | undefined);
-    get rootParityInput(): (RootParityInput<459> | undefined)[];
+    setBaseRollupProof(txIndex: number, provingOutput: PublicInputsAndRecursiveProof<BaseOrMergeRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>): TreeNodeLocation;
+    setMergeRollupProof(location: TreeNodeLocation, provingOutput: PublicInputsAndRecursiveProof<BaseOrMergeRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>): void;
+    setBaseParityProof(index: number, provingOutput: PublicInputsAndRecursiveProof<ParityPublicInputs>): void;
+    setRootParityProof(provingOutput: PublicInputsAndRecursiveProof<ParityPublicInputs>): void;
+    setBlockRootRollupProof(provingOutput: PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>): void;
     get allTxs(): TxProvingState[];
     /** Returns the block number as an epoch number. Used for prioritizing proof requests. */
     get epochNumber(): number;
-    /**
-     * Stores the inputs to a merge circuit and determines if the circuit is ready to be executed
-     * @param mergeInputs - The inputs to store
-     * @param indexWithinMerge - The index in the set of inputs to this merge circuit
-     * @param indexOfMerge - The global index of this merge circuit
-     * @returns True if the merge circuit is ready to be executed, false otherwise
-     */
-    storeMergeInputs(mergeInputs: [
-        BaseOrMergeRollupPublicInputs,
-        RecursiveProof<typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>,
-        VerificationKeyAsFields
-    ], indexWithinMerge: number, indexOfMerge: number): boolean;
+    getParentLocation(location: TreeNodeLocation): TreeNodeLocation;
+    getMergeRollupInputs(mergeLocation: TreeNodeLocation): MergeRollupInputs;
+    getBlockRootRollupTypeAndInputs(proverId: Fr): {
+        rollupType: string;
+        inputs: EmptyBlockRootRollupInputs;
+    } | {
+        rollupType: string;
+        inputs: SingleTxBlockRootRollupInputs;
+    } | {
+        rollupType: string;
+        inputs: BlockRootRollupInputs;
+    };
+    getRootParityInputs(): RootParityInputs;
+    getL1ToL2Roots(): RootParityInput<459>;
     getTxProvingState(txIndex: number): TxProvingState;
-    getMergeInputs(indexOfMerge: number): MergeRollupInputData;
+    buildHeaderFromProvingOutputs(logger?: Logger): BlockHeader;
+    isReadyForMergeRollup(location: TreeNodeLocation): boolean;
     isReadyForBlockRootRollup(): boolean;
-    setRootParityInputs(inputs: RootParityInput<typeof RECURSIVE_PROOF_LENGTH>, index: number): void;
-    areRootParityInputsReady(): boolean;
+    isReadyForRootParity(): boolean;
     verifyState(): boolean;
     reject(reason: string): void;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"block-proving-state.d.ts","sourceRoot":"","sources":["../../src/orchestrator/block-proving-state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,sBAAsB,EAC3B,KAAK,EAAE,EACP,KAAK,eAAe,EACpB,KAAK,wCAAwC,EAC7C,KAAK,6BAA6B,EAClC,KAAK,yCAAyC,EAC9C,KAAK,mCAAmC,EAExC,KAAK,KAAK,EACV,KAAK,sBAAsB,EAC3B,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,uBAAuB,EAC7B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,KAAK,6BAA6B,EAAE,KAAK,iCAAiC,EAAE,MAAM,2BAA2B,CAAC;AACvH,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAEzD,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,EAAE,CAAC,6BAA6B,GAAG,SAAS,EAAE,6BAA6B,GAAG,SAAS,CAAC,CAAC;IAC/F,MAAM,EAAE;QACN,cAAc,CAAC,OAAO,yCAAyC,CAAC,GAAG,SAAS;QAC5E,cAAc,CAAC,OAAO,yCAAyC,CAAC,GAAG,SAAS;KAC7E,CAAC;IACF,gBAAgB,EAAE,CAAC,uBAAuB,GAAG,SAAS,EAAE,uBAAuB,GAAG,SAAS,CAAC,CAAC;CAC9F,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,GAAG,CAAC,YAAY,EAAE,sBAAsB,CAAC,CAAC;AAEtE;;;GAGG;AACH,qBAAa,iBAAiB;aAcV,KAAK,EAAE,MAAM;aACb,eAAe,EAAE,eAAe;aAChC,iBAAiB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,mCAAmC,CAAC;aACxE,mBAAmB,EAAE,sBAAsB;aAC3C,0BAA0B,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,wCAAwC,CAAC;aACtF,iCAAiC,EAAE,sBAAsB;aACzD,mBAAmB,EAAE,sBAAsB;aAC3C,0BAA0B,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,cAAc,CAAC;aAC5D,iBAAiB,EAAE,EAAE;IACrC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAtB9B,OAAO,CAAC,iBAAiB,CAA8B;IACvD,OAAO,CAAC,gBAAgB,CAAyE;IACjG,OAAO,CAAC,qBAAqB,CAAoE;IAC1F,2BAA2B,EAAE,iCAAiC,GAAG,SAAS,CAAC;IAC3E,sBAAsB,EAAE,OAAO,CAAS;IACxC,UAAU,EAAE,KAAK,GAAG,SAAS,CAAC;IAC9B,KAAK,EAAE,OAAO,GAAG,SAAS,CAAC;IAC3B,eAAe,EAAE,UAAU,GAAG,SAAS,CAAC;IACxC,WAAW,EAAE,MAAM,CAAC;IAC3B,OAAO,CAAC,GAAG,CAAwB;IAC5B,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;gBAGf,KAAK,EAAE,MAAM,EACb,eAAe,EAAE,eAAe,EAChC,iBAAiB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,mCAAmC,CAAC,EACxE,mBAAmB,EAAE,sBAAsB,EAC3C,0BAA0B,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,wCAAwC,CAAC,EACtF,iCAAiC,EAAE,sBAAsB,EACzD,mBAAmB,EAAE,sBAAsB,EAC3C,0BAA0B,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,cAAc,CAAC,EAC5D,iBAAiB,EAAE,EAAE,EACpB,WAAW,EAAE,iBAAiB;IAMjD,IAAW,WAAW,WAErB;IAGD,IAAW,cAAc,WAExB;IAIM,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;IAwBzD,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;IAWnD,QAAQ,CAAC,EAAE,EAAE,cAAc;IASlC,IAAW,oBAAoB,WAE9B;IAGD,IAAW,oBAAoB,IAKQ,eAAe,CAAC,OAAO,6BAA6B,CAAC,GAAG,SAAS,CAHvG;IAGD,IAAW,oBAAoB,CAAC,KAAK,EAAE,eAAe,CAAC,OAAO,6BAA6B,CAAC,GAAG,SAAS,EAEvG;IAGD,IAAW,eAAe,yCAEzB;IAGD,IAAW,MAAM,qBAEhB;IAED,yFAAyF;IACzF,IAAW,WAAW,IAAI,MAAM,CAE/B;IAED;;;;;;OAMG;IACI,gBAAgB,CACrB,WAAW,EAAE;QACX,6BAA6B;QAC7B,cAAc,CAAC,OAAO,yCAAyC,CAAC;QAChE,uBAAuB;KACxB,EACD,gBAAgB,EAAE,MAAM,EACxB,YAAY,EAAE,MAAM;IAsBf,iBAAiB,CAAC,OAAO,EAAE,MAAM;IAKjC,cAAc,CAAC,YAAY,EAAE,MAAM;IAKnC,yBAAyB;IAUzB,mBAAmB,CAAC,MAAM,EAAE,eAAe,CAAC,OAAO,sBAAsB,CAAC,EAAE,KAAK,EAAE,MAAM;IAKzF,wBAAwB;IAKxB,WAAW;IAIX,MAAM,CAAC,MAAM,EAAE,MAAM;CAI7B"}
+{"version":3,"file":"block-proving-state.d.ts","sourceRoot":"","sources":["../../src/orchestrator/block-proving-state.ts"],"names":[],"mappings":"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"}

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

@@ -1,11 +1,20 @@
-import { NUM_BASE_PARITY_PER_ROOT_PARITY, } from '@aztec/circuits.js';
+var _BlockProvingState_instances, _BlockProvingState_getEmptyBlockRootInputs, _BlockProvingState_getBlockRootRollupData, _BlockProvingState_getChildProofsForBlockRoot, _BlockProvingState_getPreviousRollupData, _BlockProvingState_getRootParityInputFromProvingOutput;
+import { __classPrivateFieldGet } from "tslib";
+import { BLOBS_PER_BLOCK, FIELDS_PER_BLOB, Fr, MembershipWitness, NUM_BASE_PARITY_PER_ROOT_PARITY, RootParityInput, RootParityInputs, StateReference, VK_TREE_HEIGHT, } from '@aztec/circuits.js';
 import { SpongeBlob } from '@aztec/circuits.js/blobs';
+import { BlockRootRollupData, BlockRootRollupInputs, ConstantRollupData, EmptyBlockRootRollupInputs, MergeRollupInputs, PreviousRollupData, SingleTxBlockRootRollupInputs, } from '@aztec/circuits.js/rollup';
+import { padArrayEnd } from '@aztec/foundation/collection';
+import { UnbalancedTreeStore } from '@aztec/foundation/trees';
+import { getVKIndex, getVKSiblingPath, getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vks';
+import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
+import { buildBlobHints, buildHeaderFromCircuitOutputs } 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 {
-    constructor(index, globalVariables, newL1ToL2Messages, messageTreeSnapshot, messageTreeRootSiblingPath, messageTreeSnapshotAfterInsertion, archiveTreeSnapshot, archiveTreeRootSiblingPath, previousBlockHash, parentEpoch) {
+    constructor(index, globalVariables, newL1ToL2Messages, messageTreeSnapshot, messageTreeRootSiblingPath, messageTreeSnapshotAfterInsertion, archiveTreeSnapshot, archiveTreeRootSiblingPath, previousBlockHeader, previousBlockHash, parentEpoch) {
+        _BlockProvingState_instances.add(this);
         this.index = index;
         this.globalVariables = globalVariables;
         this.newL1ToL2Messages = newL1ToL2Messages;
@@ -14,51 +23,23 @@ export class BlockProvingState {
         this.messageTreeSnapshotAfterInsertion = messageTreeSnapshotAfterInsertion;
         this.archiveTreeSnapshot = archiveTreeSnapshot;
         this.archiveTreeRootSiblingPath = archiveTreeRootSiblingPath;
+        this.previousBlockHeader = previousBlockHeader;
         this.previousBlockHash = previousBlockHash;
         this.parentEpoch = parentEpoch;
-        this.mergeRollupInputs = [];
-        this.rootParityInputs = [];
+        this.baseOrMergeProvingOutputs = new UnbalancedTreeStore(0);
         this.blockRootRollupStarted = false;
         this.txs = [];
-        this.rootParityInputs = Array.from({ length: NUM_BASE_PARITY_PER_ROOT_PARITY }).map(_ => undefined);
+        this.baseParityProvingOutputs = Array.from({ length: NUM_BASE_PARITY_PER_ROOT_PARITY }).map(_ => undefined);
         this.totalNumTxs = 0;
     }
     get blockNumber() {
         return this.globalVariables.blockNumber.toNumber();
     }
-    // Returns the number of levels of merge rollups
-    get numMergeLevels() {
-        return BigInt(Math.ceil(Math.log2(this.totalNumTxs)) - 1);
-    }
-    // Calculates the index and level of the parent rollup circuit
-    // Based on tree implementation in unbalanced_tree.ts -> batchInsert()
-    findMergeLevel(currentLevel, currentIndex) {
-        const moveUpMergeLevel = (levelSize, index, nodeToShift) => {
-            levelSize /= 2;
-            if (levelSize & 1) {
-                [levelSize, nodeToShift] = nodeToShift ? [levelSize + 1, false] : [levelSize - 1, true];
-            }
-            index >>= 1n;
-            return { thisLevelSize: levelSize, thisIndex: index, shiftUp: nodeToShift };
-        };
-        let [thisLevelSize, shiftUp] = this.totalNumTxs & 1 ? [this.totalNumTxs - 1, true] : [this.totalNumTxs, false];
-        const maxLevel = this.numMergeLevels + 1n;
-        let placeholder = currentIndex;
-        for (let i = 0; i < maxLevel - currentLevel; i++) {
-            ({ thisLevelSize, thisIndex: placeholder, shiftUp } = moveUpMergeLevel(thisLevelSize, placeholder, shiftUp));
-        }
-        let thisIndex = currentIndex;
-        let mergeLevel = currentLevel;
-        while (thisIndex >= thisLevelSize && mergeLevel != 0n) {
-            mergeLevel -= 1n;
-            ({ thisLevelSize, thisIndex, shiftUp } = moveUpMergeLevel(thisLevelSize, thisIndex, shiftUp));
-        }
-        return [mergeLevel - 1n, thisIndex >> 1n, thisIndex & 1n];
-    }
     startNewBlock(numTxs, numBlobFields) {
         if (this.spongeBlobState) {
             throw new Error(`Block ${this.blockNumber} already initalised.`);
         }
+        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);
@@ -69,24 +50,28 @@ export class BlockProvingState {
         if (!this.spongeBlobState) {
             throw new Error(`Invalid block proving state, call startNewBlock before adding transactions.`);
         }
-        this.txs.push(tx);
-        return this.txs.length - 1;
+        const txIndex = this.txs.length;
+        this.txs[txIndex] = tx;
+        return txIndex;
+    }
+    setBaseRollupProof(txIndex, provingOutput) {
+        return this.baseOrMergeProvingOutputs.setLeaf(txIndex, provingOutput);
     }
-    // Returns the number of received transactions
-    get transactionsReceived() {
-        return this.txs.length;
+    setMergeRollupProof(location, provingOutput) {
+        this.baseOrMergeProvingOutputs.setNode(location, provingOutput);
     }
-    // Returns the final set of root parity inputs
-    get finalRootParityInput() {
-        return this.finalRootParityInputs;
+    // 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;
     }
-    // Sets the final set of root parity inputs
-    set finalRootParityInput(input) {
-        this.finalRootParityInputs = input;
+    setRootParityProof(provingOutput) {
+        this.rootParityProvingOutput = provingOutput;
     }
-    // Returns the set of root parity inputs
-    get rootParityInput() {
-        return this.rootParityInputs;
+    setBlockRootRollupProof(provingOutput) {
+        this.blockRootProvingOutput = provingOutput;
     }
     // Returns the complete set of transaction proving state objects
     get allTxs() {
@@ -96,54 +81,85 @@ export class BlockProvingState {
     get epochNumber() {
         return this.parentEpoch.epochNumber;
     }
-    /**
-     * Stores the inputs to a merge circuit and determines if the circuit is ready to be executed
-     * @param mergeInputs - The inputs to store
-     * @param indexWithinMerge - The index in the set of inputs to this merge circuit
-     * @param indexOfMerge - The global index of this merge circuit
-     * @returns True if the merge circuit is ready to be executed, false otherwise
-     */
-    storeMergeInputs(mergeInputs, indexWithinMerge, indexOfMerge) {
-        if (!this.mergeRollupInputs[indexOfMerge]) {
-            const mergeInputData = {
-                inputs: [undefined, undefined],
-                proofs: [undefined, undefined],
-                verificationKeys: [undefined, undefined],
+    getParentLocation(location) {
+        return this.baseOrMergeProvingOutputs.getParentLocation(location);
+    }
+    getMergeRollupInputs(mergeLocation) {
+        const [left, right] = this.baseOrMergeProvingOutputs.getChildren(mergeLocation);
+        if (!left || !right) {
+            throw new Error('At lease one child is not ready.');
+        }
+        return new MergeRollupInputs([__classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getPreviousRollupData).call(this, left), __classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getPreviousRollupData).call(this, right)]);
+    }
+    getBlockRootRollupTypeAndInputs(proverId) {
+        if (this.totalNumTxs === 0) {
+            return {
+                rollupType: 'empty-block-root-rollup',
+                inputs: __classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getEmptyBlockRootInputs).call(this, proverId),
+            };
+        }
+        const proofs = __classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getChildProofsForBlockRoot).call(this);
+        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 previousRollupData = nonEmptyProofs.map(p => __classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getPreviousRollupData).call(this, p));
+        const data = __classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getBlockRootRollupData).call(this, proverId);
+        if (previousRollupData.length === 1) {
+            return {
+                rollupType: 'single-tx-block-root-rollup',
+                inputs: new SingleTxBlockRootRollupInputs(previousRollupData, data),
+            };
+        }
+        else {
+            return {
+                rollupType: 'block-root-rollup',
+                inputs: new BlockRootRollupInputs(previousRollupData, data),
             };
-            mergeInputData.inputs[indexWithinMerge] = mergeInputs[0];
-            mergeInputData.proofs[indexWithinMerge] = mergeInputs[1];
-            mergeInputData.verificationKeys[indexWithinMerge] = mergeInputs[2];
-            this.mergeRollupInputs[indexOfMerge] = mergeInputData;
-            return false;
         }
-        const mergeInputData = this.mergeRollupInputs[indexOfMerge];
-        mergeInputData.inputs[indexWithinMerge] = mergeInputs[0];
-        mergeInputData.proofs[indexWithinMerge] = mergeInputs[1];
-        mergeInputData.verificationKeys[indexWithinMerge] = mergeInputs[2];
-        return true;
+    }
+    getRootParityInputs() {
+        if (!this.baseParityProvingOutputs.every(p => !!p)) {
+            throw new Error('At lease one base parity is not ready.');
+        }
+        const children = this.baseParityProvingOutputs.map(p => __classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getRootParityInputFromProvingOutput).call(this, p));
+        return new RootParityInputs(children);
+    }
+    getL1ToL2Roots() {
+        if (!this.rootParityProvingOutput) {
+            throw new Error('Root parity is not ready.');
+        }
+        return __classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getRootParityInputFromProvingOutput).call(this, this.rootParityProvingOutput);
     }
     // Returns a specific transaction proving state
     getTxProvingState(txIndex) {
         return this.txs[txIndex];
     }
-    // Returns a set of merge rollup inputs
-    getMergeInputs(indexOfMerge) {
-        return this.mergeRollupInputs[indexOfMerge];
+    buildHeaderFromProvingOutputs(logger) {
+        const previousRollupData = this.totalNumTxs === 0 ? [] : __classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getChildProofsForBlockRoot).call(this).map(p => __classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getPreviousRollupData).call(this, p));
+        let endPartialState = this.previousBlockHeader.state.partial;
+        if (this.totalNumTxs !== 0) {
+            const previousRollupData = __classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getChildProofsForBlockRoot).call(this);
+            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;
+        }
+        const endState = new StateReference(this.messageTreeSnapshotAfterInsertion, endPartialState);
+        return buildHeaderFromCircuitOutputs(previousRollupData.map(d => d.baseOrMergeRollupPublicInputs), this.rootParityProvingOutput.inputs, this.blockRootProvingOutput.inputs, endState, logger);
+    }
+    isReadyForMergeRollup(location) {
+        return this.baseOrMergeProvingOutputs.getSibling(location) !== undefined;
     }
     // Returns true if we have sufficient inputs to execute the block root rollup
     isReadyForBlockRootRollup() {
-        return !(this.block === undefined ||
-            this.mergeRollupInputs[0] === undefined ||
-            this.finalRootParityInput === undefined ||
-            this.mergeRollupInputs[0].inputs.findIndex(p => !p) !== -1);
-    }
-    // Stores a set of root parity inputs at the given index
-    setRootParityInputs(inputs, index) {
-        this.rootParityInputs[index] = inputs;
+        const childProofs = __classPrivateFieldGet(this, _BlockProvingState_instances, "m", _BlockProvingState_getChildProofsForBlockRoot).call(this);
+        return this.block !== undefined && this.rootParityProvingOutput !== undefined && childProofs.every(p => !!p);
     }
     // Returns true if we have sufficient root parity inputs to execute the root parity circuit
-    areRootParityInputsReady() {
-        return this.rootParityInputs.findIndex(p => !p) === -1;
+    isReadyForRootParity() {
+        return this.baseParityProvingOutputs.every(p => !!p);
     }
     // Returns whether the proving state is still valid
     verifyState() {
@@ -154,4 +170,52 @@ export class BlockProvingState {
         this.parentEpoch.reject(reason);
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2stcHJvdmluZy1zdGF0ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9vcmNoZXN0cmF0b3IvYmxvY2stcHJvdmluZy1zdGF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBU0wsK0JBQStCLEdBTWhDLE1BQU0sb0JBQW9CLENBQUM7QUFDNUIsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBa0J0RDs7O0dBR0c7QUFDSCxNQUFNLE9BQU8saUJBQWlCO0lBYTVCLFlBQ2tCLEtBQWEsRUFDYixlQUFnQyxFQUNoQyxpQkFBd0UsRUFDeEUsbUJBQTJDLEVBQzNDLDBCQUFzRixFQUN0RixpQ0FBeUQsRUFDekQsbUJBQTJDLEVBQzNDLDBCQUE0RCxFQUM1RCxpQkFBcUIsRUFDcEIsV0FBOEI7UUFUL0IsVUFBSyxHQUFMLEtBQUssQ0FBUTtRQUNiLG9CQUFlLEdBQWYsZUFBZSxDQUFpQjtRQUNoQyxzQkFBaUIsR0FBakIsaUJBQWlCLENBQXVEO1FBQ3hFLHdCQUFtQixHQUFuQixtQkFBbUIsQ0FBd0I7UUFDM0MsK0JBQTBCLEdBQTFCLDBCQUEwQixDQUE0RDtRQUN0RixzQ0FBaUMsR0FBakMsaUNBQWlDLENBQXdCO1FBQ3pELHdCQUFtQixHQUFuQixtQkFBbUIsQ0FBd0I7UUFDM0MsK0JBQTBCLEdBQTFCLDBCQUEwQixDQUFrQztRQUM1RCxzQkFBaUIsR0FBakIsaUJBQWlCLENBQUk7UUFDcEIsZ0JBQVcsR0FBWCxXQUFXLENBQW1CO1FBdEJ6QyxzQkFBaUIsR0FBMkIsRUFBRSxDQUFDO1FBQy9DLHFCQUFnQixHQUFzRSxFQUFFLENBQUM7UUFHMUYsMkJBQXNCLEdBQVksS0FBSyxDQUFDO1FBS3ZDLFFBQUcsR0FBcUIsRUFBRSxDQUFDO1FBZWpDLElBQUksQ0FBQyxnQkFBZ0IsR0FBRyxLQUFLLENBQUMsSUFBSSxDQUFDLEVBQUUsTUFBTSxFQUFFLCtCQUErQixFQUFFLENBQUMsQ0FB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
+_BlockProvingState_instances = new WeakSet(), _BlockProvingState_getEmptyBlockRootInputs = function _BlockProvingState_getEmptyBlockRootInputs(proverId) {
+    const l1ToL2Roots = this.getL1ToL2Roots();
+    const constants = ConstantRollupData.from({
+        lastArchive: this.archiveTreeSnapshot,
+        globalVariables: this.globalVariables,
+        vkTreeRoot: getVKTreeRoot(),
+        protocolContractTreeRoot,
+    });
+    return EmptyBlockRootRollupInputs.from({
+        l1ToL2Roots,
+        newL1ToL2MessageTreeRootSiblingPath: this.messageTreeRootSiblingPath,
+        startL1ToL2MessageTreeSnapshot: this.messageTreeSnapshot,
+        newArchiveSiblingPath: this.archiveTreeRootSiblingPath,
+        previousBlockHash: this.previousBlockHash,
+        previousPartialState: this.previousBlockHeader.state.partial,
+        constants,
+        proverId,
+        isPadding: false,
+    });
+}, _BlockProvingState_getBlockRootRollupData = function _BlockProvingState_getBlockRootRollupData(proverId) {
+    const txEffects = this.txs.map(txProvingState => txProvingState.processedTx.txEffect);
+    const { blobFields, blobCommitments, blobsHash } = buildBlobHints(txEffects);
+    return BlockRootRollupData.from({
+        l1ToL2Roots: this.getL1ToL2Roots(),
+        newL1ToL2MessageTreeRootSiblingPath: this.messageTreeRootSiblingPath,
+        startL1ToL2MessageTreeSnapshot: this.messageTreeSnapshot,
+        newArchiveSiblingPath: this.archiveTreeRootSiblingPath,
+        previousBlockHash: this.previousBlockHash,
+        proverId,
+        blobFields: padArrayEnd(blobFields, Fr.ZERO, FIELDS_PER_BLOB * BLOBS_PER_BLOCK),
+        blobCommitments: padArrayEnd(blobCommitments, [Fr.ZERO, Fr.ZERO], BLOBS_PER_BLOCK),
+        blobsHash,
+    });
+}, _BlockProvingState_getChildProofsForBlockRoot = function _BlockProvingState_getChildProofsForBlockRoot() {
+    if (this.totalNumTxs === 0) {
+        return [];
+    }
+    const rootLocation = { level: 0, index: 0 };
+    // 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);
+}, _BlockProvingState_getPreviousRollupData = function _BlockProvingState_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)));
+}, _BlockProvingState_getRootParityInputFromProvingOutput = function _BlockProvingState_getRootParityInputFromProvingOutput({ inputs, proof, verificationKey, }) {
+    return new RootParityInput(proof, verificationKey.keyAsFields, getVKSiblingPath(getVKIndex(verificationKey)), inputs);
+};
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"block-proving-state.js","sourceRoot":"","sources":["../../src/orchestrator/block-proving-state.ts"],"names":[],"mappings":"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"}

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

@@ -1,17 +1,10 @@
-import { type MerkleTreeId } from '@aztec/circuit-types';
-import { type ARCHIVE_HEIGHT, type AppendOnlyTreeSnapshot, Fr, type GlobalVariables, type L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, type NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, type Proof, type RecursiveProof, type VerificationKeyAsFields } from '@aztec/circuits.js';
-import { type BlockRootOrBlockMergePublicInputs, type RootRollupPublicInputs } from '@aztec/circuits.js/rollup';
+import { type MerkleTreeId, type ProofAndVerificationKey, type PublicInputsAndRecursiveProof } from '@aztec/circuit-types';
+import { ARCHIVE_HEIGHT, AppendOnlyTreeSnapshot, type BlockHeader, Fr, type GlobalVariables, L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, type NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH } from '@aztec/circuits.js';
+import { BlockMergeRollupInputs, type BlockRootOrBlockMergePublicInputs, EmptyBlockRootRollupInputs, RootRollupInputs, type RootRollupPublicInputs } from '@aztec/circuits.js/rollup';
 import { type Tuple } from '@aztec/foundation/serialize';
+import { type TreeNodeLocation } from '@aztec/foundation/trees';
 import { BlockProvingState } from './block-proving-state.js';
 export type TreeSnapshots = Map<MerkleTreeId, AppendOnlyTreeSnapshot>;
-export type BlockMergeRollupInputData = {
-    inputs: [BlockRootOrBlockMergePublicInputs | undefined, BlockRootOrBlockMergePublicInputs | undefined];
-    proofs: [
-        RecursiveProof<typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH> | undefined,
-        RecursiveProof<typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH> | undefined
-    ];
-    verificationKeys: [VerificationKeyAsFields | undefined, VerificationKeyAsFields | undefined];
-};
 export type ProvingResult = {
     status: 'success';
 } | {
@@ -25,36 +18,36 @@ export type ProvingResult = {
  * Captures resolve and reject callbacks to provide a promise base interface to the consumer of our proving.
  */
 export declare class EpochProvingState {
+    #private;
     readonly epochNumber: number;
     readonly firstBlockNumber: number;
     readonly totalNumBlocks: number;
     private completionCallback;
     private rejectionCallback;
+    private blockRootOrMergeProvingOutputs;
+    private paddingBlockRootProvingOutput;
+    private rootRollupProvingOutput;
     private provingStateLifecycle;
-    private mergeRollupInputs;
-    rootRollupPublicInputs: RootRollupPublicInputs | undefined;
-    finalProof: Proof | undefined;
+    readonly cachedTubeProofs: Map<string, Promise<ProofAndVerificationKey<534>>>;
     blocks: (BlockProvingState | undefined)[];
     constructor(epochNumber: number, firstBlockNumber: number, totalNumBlocks: number, completionCallback: (result: ProvingResult) => void, rejectionCallback: (reason: string) => void);
-    get numMergeLevels(): bigint;
-    findMergeLevel(currentLevel: bigint, currentIndex: bigint): bigint[];
-    startNewBlock(globalVariables: GlobalVariables, l1ToL2Messages: Fr[], messageTreeSnapshot: AppendOnlyTreeSnapshot, messageTreeRootSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH>, messageTreeSnapshotAfterInsertion: AppendOnlyTreeSnapshot, archiveTreeSnapshot: AppendOnlyTreeSnapshot, archiveTreeRootSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>, previousBlockHash: Fr): BlockProvingState;
+    startNewBlock(globalVariables: GlobalVariables, l1ToL2Messages: Fr[], messageTreeSnapshot: AppendOnlyTreeSnapshot, messageTreeRootSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH>, messageTreeSnapshotAfterInsertion: AppendOnlyTreeSnapshot, archiveTreeSnapshot: AppendOnlyTreeSnapshot, archiveTreeRootSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>, previousBlockHeader: BlockHeader, previousBlockHash: Fr): BlockProvingState;
     verifyState(): boolean;
     isAcceptingBlocks(): boolean;
-    /**
-     * Stores the inputs to a merge circuit and determines if the circuit is ready to be executed
-     * @param mergeInputs - The inputs to store
-     * @param indexWithinMerge - The index in the set of inputs to this merge circuit
-     * @param indexOfMerge - The global index of this merge circuit
-     * @returns True if the merge circuit is ready to be executed, false otherwise
-     */
-    storeMergeInputs(mergeInputs: [
-        BlockRootOrBlockMergePublicInputs,
-        RecursiveProof<typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>,
-        VerificationKeyAsFields
-    ], indexWithinMerge: number, indexOfMerge: number): boolean;
+    setBlockRootRollupProof(blockIndex: number, proof: PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>): TreeNodeLocation;
+    setBlockMergeRollupProof(location: TreeNodeLocation, proof: PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>): void;
+    setRootRollupProof(proof: PublicInputsAndRecursiveProof<RootRollupPublicInputs>): void;
+    setPaddingBlockRootProof(proof: PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>): void;
+    getParentLocation(location: TreeNodeLocation): TreeNodeLocation;
+    getBlockMergeRollupInputs(mergeLocation: TreeNodeLocation): BlockMergeRollupInputs;
+    getRootRollupInputs(proverId: Fr): RootRollupInputs;
+    getPaddingBlockRootInputs(proverId: Fr): EmptyBlockRootRollupInputs;
     getBlockProvingStateByBlockNumber(blockNumber: number): BlockProvingState | undefined;
-    getMergeInputs(indexOfMerge: number): BlockMergeRollupInputData;
+    getEpochProofResult(): {
+        proof: import("@aztec/circuits.js").Proof;
+        publicInputs: RootRollupPublicInputs;
+    };
+    isReadyForBlockMerge(location: TreeNodeLocation): boolean;
     isReadyForRootRollup(): boolean;
     cancel(): void;
     reject(reason: string): void;

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

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