@aztec/prover-client 0.55.1 → 0.57.0

package/src/orchestrator/tx-proving-state.ts

@@ -3,8 +3,8 @@ import {
   type AvmProvingRequest,
   type MerkleTreeId,
   type ProcessedTx,
+  ProvingRequestType,
   type PublicKernelRequest,
-  PublicKernelType,
 } from '@aztec/circuit-types';
 import {
   type AppendOnlyTreeSnapshot,
@@ -14,6 +14,7 @@ import {
   type RECURSIVE_PROOF_LENGTH,
   type RecursiveProof,
   type VerificationKeyData,
+  makeEmptyProof,
 } from '@aztec/circuits.js';
 
 export enum TX_PROVING_CODE {
@@ -25,7 +26,7 @@ export enum TX_PROVING_CODE {
 export type PublicFunction = {
   vmRequest: AvmProvingRequest | undefined;
   vmProof: Proof | undefined;
-  previousProofType: PublicKernelType;
+  previousProofType: ProvingRequestType;
   previousKernelProven: boolean;
   publicKernelRequest: PublicKernelRequest;
 };
@@ -35,6 +36,7 @@ export type PublicFunction = {
 export type TxProvingInstruction = {
   code: TX_PROVING_CODE;
   function: PublicFunction | undefined;
+  functionIndex?: number;
 };
 
 /**
@@ -50,20 +52,38 @@ export class TxProvingState {
     public readonly baseRollupInputs: BaseRollupInputs,
     public readonly treeSnapshots: Map<MerkleTreeId, AppendOnlyTreeSnapshot>,
   ) {
-    let previousProofType = PublicKernelType.NON_PUBLIC;
+    let previousProofType = ProvingRequestType.TUBE_PROOF;
     for (let i = 0; i < processedTx.publicProvingRequests.length; i++) {
       const provingRequest = processedTx.publicProvingRequests[i];
-      const kernelRequest = provingRequest.type === AVM_REQUEST ? provingRequest.kernelRequest : provingRequest;
+      const publicKernelRequest = provingRequest.type === AVM_REQUEST ? provingRequest.kernelRequest : provingRequest;
       const vmRequest = provingRequest.type === AVM_REQUEST ? provingRequest : undefined;
+      // TODO(#7124): Remove this temporary hack.
+      // There's no previous kernel for the first inner kernel in a chain of AvmProvingRequests.
+      // Setting its previousKernelProven to be true so that it will be ready once the vm proof is generated.
+      const previousKernelProven = !!vmRequest && previousProofType !== ProvingRequestType.PUBLIC_KERNEL_INNER;
+      const vmProof = provingRequest.type === ProvingRequestType.PUBLIC_KERNEL_TAIL ? makeEmptyProof() : undefined;
       const publicFunction: PublicFunction = {
         vmRequest,
-        vmProof: undefined,
+        vmProof,
         previousProofType,
-        previousKernelProven: false,
-        publicKernelRequest: kernelRequest,
+        previousKernelProven,
+        publicKernelRequest: {
+          type: publicKernelRequest.type,
+          // We take a deep copy (clone) of the inputs to be modified here and passed to the prover.
+          // bb-prover will also modify the inputs by reference.
+          inputs: publicKernelRequest.inputs.clone(),
+        } as PublicKernelRequest,
       };
       this.publicFunctions.push(publicFunction);
-      previousProofType = kernelRequest.type;
+      previousProofType = publicKernelRequest.type;
+    }
+
+    if (this.publicFunctions.length > 0) {
+      // The first merge kernel takes the tube proof.
+      const firstKernelIndex = this.publicFunctions.findIndex(
+        fn => fn.publicKernelRequest.type === ProvingRequestType.PUBLIC_KERNEL_MERGE,
+      );
+      this.publicFunctions[firstKernelIndex].previousProofType = ProvingRequestType.TUBE_PROOF;
     }
   }
 
@@ -75,29 +95,44 @@ export class TxProvingState {
     verificationKey: VerificationKeyData,
   ): TxProvingInstruction {
     const kernelRequest = this.getPublicFunctionState(provenIndex).publicKernelRequest;
-    const nextKernelIndex = provenIndex + 1;
-    if (nextKernelIndex >= this.publicFunctions.length) {
+    const provenIsInner = kernelRequest.type === ProvingRequestType.PUBLIC_KERNEL_INNER;
+    // If the proven request is not an inner kernel, its next kernel should not be an inner kernel either.
+    const nextFunctionIndex = provenIsInner
+      ? provenIndex + 1
+      : this.publicFunctions.findIndex(
+          (fn, i) => i > provenIndex && fn.publicKernelRequest.type !== ProvingRequestType.PUBLIC_KERNEL_INNER,
+        );
+    if (nextFunctionIndex >= this.publicFunctions.length || nextFunctionIndex === -1) {
       // The next kernel index is greater than our set of functions, we are done!
       return { code: TX_PROVING_CODE.COMPLETED, function: undefined };
     }
 
     // There is more work to do, are we ready?
-    const nextFunction = this.publicFunctions[nextKernelIndex];
-
-    // pass both the proof and verification key forward to the next circuit
-    nextFunction.publicKernelRequest.inputs.previousKernel.proof = proof;
-    nextFunction.publicKernelRequest.inputs.previousKernel.vk = verificationKey;
+    const nextFunction = this.publicFunctions[nextFunctionIndex];
+
+    if (provenIsInner && nextFunction.publicKernelRequest.type !== ProvingRequestType.PUBLIC_KERNEL_INNER) {
+      // TODO(#7124): Remove this temporary hack.
+      // If the proven request is inner (with vm proof) and the next one is regular kernel, set the vmProof to be
+      // not undefined.
+      // This should eventually be a real vm proof of the entire enqueued call.
+      nextFunction.vmProof = makeEmptyProof();
+    } else {
+      // pass both the proof and verification key forward to the next circuit
+      nextFunction.publicKernelRequest.inputs.previousKernel.proof = proof;
+      nextFunction.publicKernelRequest.inputs.previousKernel.vk = verificationKey;
+
+      // We need to update this so the state machine knows this proof is ready
+      nextFunction.previousKernelProven = true;
+      nextFunction.previousProofType = kernelRequest.type;
+    }
 
-    // We need to update this so the state machine knows this proof is ready
-    nextFunction.previousKernelProven = true;
-    nextFunction.previousProofType = kernelRequest.type;
-    if (nextFunction.vmProof === undefined) {
+    if (nextFunction.vmProof === undefined || !nextFunction.previousKernelProven) {
       // The VM proof for the next function is not ready
       return { code: TX_PROVING_CODE.NOT_READY, function: undefined };
     }
 
     // The VM proof is ready, we can continue
-    return { code: TX_PROVING_CODE.READY, function: nextFunction };
+    return { code: TX_PROVING_CODE.READY, function: nextFunction, functionIndex: nextFunctionIndex };
   }
 
   // Updates the transaction's proving state after completion of a tube proof
@@ -106,14 +141,16 @@ export class TxProvingState {
     proof: RecursiveProof<typeof RECURSIVE_PROOF_LENGTH>,
     verificationKey: VerificationKeyData,
   ): TxProvingInstruction {
-    const nextKernelIndex = 0;
-    if (nextKernelIndex >= this.publicFunctions.length) {
-      // The next kernel index is greater than our set of functions, we are done!
+    const nextFunctionIndex = this.publicFunctions.findIndex(
+      (fn, i) => i > 0 && fn.previousProofType === ProvingRequestType.TUBE_PROOF,
+    );
+    if (nextFunctionIndex === -1) {
+      // There are no public functions to be processed, we are done!
       return { code: TX_PROVING_CODE.COMPLETED, function: undefined };
     }
 
     // There is more work to do, are we ready?
-    const nextFunction = this.publicFunctions[nextKernelIndex];
+    const nextFunction = this.publicFunctions[nextFunctionIndex];
 
     // pass both the proof and verification key forward to the next circuit
     nextFunction.publicKernelRequest.inputs.previousKernel.proof = proof;
@@ -121,14 +158,13 @@ export class TxProvingState {
 
     // We need to update this so the state machine knows this proof is ready
     nextFunction.previousKernelProven = true;
-    nextFunction.previousProofType = PublicKernelType.NON_PUBLIC;
     if (nextFunction.vmProof === undefined) {
       // The VM proof for the next function is not ready
       return { code: TX_PROVING_CODE.NOT_READY, function: undefined };
     }
 
     // The VM proof is ready, we can continue
-    return { code: TX_PROVING_CODE.READY, function: nextFunction };
+    return { code: TX_PROVING_CODE.READY, function: nextFunction, functionIndex: nextFunctionIndex };
   }
 
   // Updates the transaction's proving state after completion of a VM proof
@@ -142,7 +178,7 @@ export class TxProvingState {
       return { code: TX_PROVING_CODE.NOT_READY, function: undefined };
     }
     // The previous kernel is ready so we can prove this kernel
-    return { code: TX_PROVING_CODE.READY, function: provenFunction };
+    return { code: TX_PROVING_CODE.READY, function: provenFunction, functionIndex: provenIndex };
   }
 
   // Returns the public function state at the given index

package/src/prover-agent/memory-proving-queue.ts

@@ -6,8 +6,6 @@ import {
   type ProvingRequestResult,
   ProvingRequestType,
   type PublicInputsAndRecursiveProof,
-  type PublicKernelNonTailRequest,
-  type PublicKernelTailRequest,
   type ServerCircuitProver,
 } from '@aztec/circuit-types';
 import type {
@@ -18,11 +16,15 @@ import type {
   BlockMergeRollupInputs,
   BlockRootOrBlockMergePublicInputs,
   BlockRootRollupInputs,
+  EmptyBlockRootRollupInputs,
   KernelCircuitPublicInputs,
   MergeRollupInputs,
   NESTED_RECURSIVE_PROOF_LENGTH,
   PrivateKernelEmptyInputData,
+  PublicKernelCircuitPrivateInputs,
   PublicKernelCircuitPublicInputs,
+  PublicKernelInnerCircuitPrivateInputs,
+  PublicKernelTailCircuitPrivateInputs,
   RECURSIVE_PROOF_LENGTH,
   RecursiveProof,
   RootParityInput,
@@ -30,6 +32,7 @@ import type {
   RootRollupInputs,
   RootRollupPublicInputs,
   TubeInputs,
+  VMCircuitPublicInputs,
   VerificationKeyData,
 } from '@aztec/circuits.js';
 import { randomBytes } from '@aztec/foundation/crypto';
@@ -349,6 +352,14 @@ export class MemoryProvingQueue implements ServerCircuitProver, ProvingJobSource
     return this.enqueue({ type: ProvingRequestType.BLOCK_ROOT_ROLLUP, inputs: input }, signal, epochNumber);
   }
 
+  getEmptyBlockRootRollupProof(
+    input: EmptyBlockRootRollupInputs,
+    signal?: AbortSignal,
+    epochNumber?: number,
+  ): Promise<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs>> {
+    return this.enqueue({ type: ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP, inputs: input }, signal, epochNumber);
+  }
+
   /**
    * Creates a proof for the given input.
    * @param input - Input to the circuit.
@@ -374,19 +385,27 @@ export class MemoryProvingQueue implements ServerCircuitProver, ProvingJobSource
   }
 
   /**
-   * Create a public kernel proof.
+   * Create a public kernel inner proof.
+   * @param kernelRequest - Object containing the details of the proof required
+   */
+  getPublicKernelInnerProof(
+    inputs: PublicKernelInnerCircuitPrivateInputs,
+    signal?: AbortSignal,
+    epochNumber?: number,
+  ): Promise<PublicInputsAndRecursiveProof<VMCircuitPublicInputs>> {
+    return this.enqueue({ type: ProvingRequestType.PUBLIC_KERNEL_INNER, inputs }, signal, epochNumber);
+  }
+
+  /**
+   * Create a public kernel merge proof.
    * @param kernelRequest - Object containing the details of the proof required
    */
-  getPublicKernelProof(
-    kernelRequest: PublicKernelNonTailRequest,
+  getPublicKernelMergeProof(
+    inputs: PublicKernelCircuitPrivateInputs,
     signal?: AbortSignal,
     epochNumber?: number,
   ): Promise<PublicInputsAndRecursiveProof<PublicKernelCircuitPublicInputs>> {
-    return this.enqueue(
-      { type: ProvingRequestType.PUBLIC_KERNEL_NON_TAIL, kernelType: kernelRequest.type, inputs: kernelRequest.inputs },
-      signal,
-      epochNumber,
-    );
+    return this.enqueue({ type: ProvingRequestType.PUBLIC_KERNEL_MERGE, inputs }, signal, epochNumber);
   }
 
   /**
@@ -394,15 +413,11 @@ export class MemoryProvingQueue implements ServerCircuitProver, ProvingJobSource
    * @param kernelRequest - Object containing the details of the proof required
    */
   getPublicTailProof(
-    kernelRequest: PublicKernelTailRequest,
+    inputs: PublicKernelTailCircuitPrivateInputs,
     signal?: AbortSignal,
     epochNumber?: number,
   ): Promise<PublicInputsAndRecursiveProof<KernelCircuitPublicInputs>> {
-    return this.enqueue(
-      { type: ProvingRequestType.PUBLIC_KERNEL_TAIL, kernelType: kernelRequest.type, inputs: kernelRequest.inputs },
-      signal,
-      epochNumber,
-    );
+    return this.enqueue({ type: ProvingRequestType.PUBLIC_KERNEL_TAIL, inputs }, signal, epochNumber);
   }
 
   /**

package/src/prover-agent/prover-agent.ts

@@ -161,18 +161,16 @@ export class ProverAgent {
         return this.circuitProver.getAvmProof(inputs);
       }
 
-      case ProvingRequestType.PUBLIC_KERNEL_NON_TAIL: {
-        return this.circuitProver.getPublicKernelProof({
-          type: request.kernelType,
-          inputs,
-        });
+      case ProvingRequestType.PUBLIC_KERNEL_INNER: {
+        return this.circuitProver.getPublicKernelInnerProof(inputs);
+      }
+
+      case ProvingRequestType.PUBLIC_KERNEL_MERGE: {
+        return this.circuitProver.getPublicKernelMergeProof(inputs);
       }
 
       case ProvingRequestType.PUBLIC_KERNEL_TAIL: {
-        return this.circuitProver.getPublicTailProof({
-          type: request.kernelType,
-          inputs,
-        });
+        return this.circuitProver.getPublicTailProof(inputs);
       }
 
       case ProvingRequestType.BASE_ROLLUP: {
@@ -183,6 +181,10 @@ export class ProverAgent {
         return this.circuitProver.getMergeRollupProof(inputs);
       }
 
+      case ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP: {
+        return this.circuitProver.getEmptyBlockRootRollupProof(inputs);
+      }
+
       case ProvingRequestType.BLOCK_ROOT_ROLLUP: {
         return this.circuitProver.getBlockRootRollupProof(inputs);
       }

package/src/prover-agent/rpc.ts

@@ -9,6 +9,7 @@ import {
   BlockMergeRollupInputs,
   BlockRootOrBlockMergePublicInputs,
   BlockRootRollupInputs,
+  EmptyBlockRootRollupInputs,
   EthAddress,
   Fr,
   Header,
@@ -19,6 +20,7 @@ import {
   Proof,
   PublicKernelCircuitPrivateInputs,
   PublicKernelCircuitPublicInputs,
+  PublicKernelInnerCircuitPrivateInputs,
   PublicKernelTailCircuitPrivateInputs,
   RecursiveProof,
   RootParityInput,
@@ -26,6 +28,7 @@ import {
   RootRollupInputs,
   RootRollupPublicInputs,
   TubeInputs,
+  VMCircuitPublicInputs,
   VerificationKeyData,
 } from '@aztec/circuits.js';
 import { createJsonRpcClient, makeFetch } from '@aztec/foundation/json-rpc/client';
@@ -51,6 +54,8 @@ export function createProvingJobSourceServer(queue: ProvingJobSource): JsonRpcSe
       Proof,
       ProvingError,
       PrivateKernelEmptyInputData,
+      VMCircuitPublicInputs,
+      PublicKernelInnerCircuitPrivateInputs,
       PublicKernelCircuitPrivateInputs,
       PublicKernelCircuitPublicInputs,
       PublicKernelTailCircuitPrivateInputs,
@@ -64,6 +69,7 @@ export function createProvingJobSourceServer(queue: ProvingJobSource): JsonRpcSe
       BlockRootOrBlockMergePublicInputs,
       BlockMergeRollupInputs,
       BlockRootRollupInputs,
+      EmptyBlockRootRollupInputs,
     },
     {},
   );
@@ -90,6 +96,8 @@ export function createProvingJobSourceClient(
       Proof,
       ProvingError,
       PrivateKernelEmptyInputData,
+      VMCircuitPublicInputs,
+      PublicKernelInnerCircuitPrivateInputs,
       PublicKernelCircuitPrivateInputs,
       PublicKernelCircuitPublicInputs,
       PublicKernelTailCircuitPrivateInputs,
@@ -103,6 +111,7 @@ export function createProvingJobSourceClient(
       BlockRootOrBlockMergePublicInputs,
       BlockMergeRollupInputs,
       BlockRootRollupInputs,
+      EmptyBlockRootRollupInputs,
     },
     {},
     false,

package/src/test/mock_prover.ts

@@ -13,6 +13,7 @@ import {
   RECURSIVE_PROOF_LENGTH,
   type RecursiveProof,
   type RootRollupPublicInputs,
+  type VMCircuitPublicInputs,
   VerificationKeyData,
   makeEmptyProof,
   makeRecursiveProof,
@@ -24,6 +25,7 @@ import {
   makePublicKernelCircuitPublicInputs,
   makeRootParityInput,
   makeRootRollupPublicInputs,
+  makeVMCircuitPublicInputs,
 } from '@aztec/circuits.js/testing';
 
 export class MockProver implements ServerCircuitProver {
@@ -76,6 +78,16 @@ export class MockProver implements ServerCircuitProver {
     );
   }
 
+  getEmptyBlockRootRollupProof(): Promise<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs>> {
+    return Promise.resolve(
+      makePublicInputsAndRecursiveProof(
+        makeBlockRootOrBlockMergeRollupPublicInputs(),
+        makeRecursiveProof(RECURSIVE_PROOF_LENGTH),
+        VerificationKeyData.makeFake(),
+      ),
+    );
+  }
+
   getBlockRootRollupProof(): Promise<PublicInputsAndRecursiveProof<BlockRootOrBlockMergePublicInputs>> {
     return Promise.resolve(
       makePublicInputsAndRecursiveProof(
@@ -106,7 +118,17 @@ export class MockProver implements ServerCircuitProver {
     );
   }
 
-  getPublicKernelProof(): Promise<PublicInputsAndRecursiveProof<PublicKernelCircuitPublicInputs>> {
+  getPublicKernelInnerProof(): Promise<PublicInputsAndRecursiveProof<VMCircuitPublicInputs>> {
+    return Promise.resolve(
+      makePublicInputsAndRecursiveProof(
+        makeVMCircuitPublicInputs(),
+        makeRecursiveProof(RECURSIVE_PROOF_LENGTH),
+        VerificationKeyData.makeFake(),
+      ),
+    );
+  }
+
+  getPublicKernelMergeProof(): Promise<PublicInputsAndRecursiveProof<PublicKernelCircuitPublicInputs>> {
     return Promise.resolve(
       makePublicInputsAndRecursiveProof(
         makePublicKernelCircuitPublicInputs(),

package/src/tx-prover/tx-prover.ts

@@ -1,7 +1,7 @@
 import { BBNativeRollupProver, TestCircuitProver } from '@aztec/bb-prover';
 import {
-  type BlockProver,
-  type ProverClient,
+  type EpochProver,
+  type EpochProverManager,
   type ProvingJobSource,
   type ServerCircuitProver,
 } from '@aztec/circuit-types/interfaces';
@@ -19,7 +19,7 @@ import { ProverAgent } from '../prover-agent/prover-agent.js';
  * A prover factory.
  * TODO(palla/prover-node): Rename this class
  */
-export class TxProver implements ProverClient {
+export class TxProver implements EpochProverManager {
   private queue: MemoryProvingQueue;
   private running = false;
 
@@ -33,7 +33,7 @@ export class TxProver implements ProverClient {
     this.queue = new MemoryProvingQueue(telemetry, config.proverJobTimeoutMs, config.proverJobPollIntervalMs);
   }
 
-  public createBlockProver(db: MerkleTreeOperations): BlockProver {
+  public createEpochProver(db: MerkleTreeOperations): EpochProver {
     return new ProvingOrchestrator(db, this.queue, this.telemetry, this.config.proverId);
   }
 

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

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

package/dest/orchestrator/proving-state.js

@@ -1,170 +0,0 @@
-var PROVING_STATE_LIFECYCLE;
-(function (PROVING_STATE_LIFECYCLE) {
-    PROVING_STATE_LIFECYCLE[PROVING_STATE_LIFECYCLE["PROVING_STATE_CREATED"] = 0] = "PROVING_STATE_CREATED";
-    PROVING_STATE_LIFECYCLE[PROVING_STATE_LIFECYCLE["PROVING_STATE_FULL"] = 1] = "PROVING_STATE_FULL";
-    PROVING_STATE_LIFECYCLE[PROVING_STATE_LIFECYCLE["PROVING_STATE_RESOLVED"] = 2] = "PROVING_STATE_RESOLVED";
-    PROVING_STATE_LIFECYCLE[PROVING_STATE_LIFECYCLE["PROVING_STATE_REJECTED"] = 3] = "PROVING_STATE_REJECTED";
-})(PROVING_STATE_LIFECYCLE || (PROVING_STATE_LIFECYCLE = {}));
-/**
- * The current state of the proving schedule. Contains the raw inputs (txs) and intermediate state to generate every constituent proof in the tree.
- * Carries an identifier so we can identify if the proving state is discarded and a new one started.
- * Captures resolve and reject callbacks to provide a promise base interface to the consumer of our proving.
- */
-export class ProvingState {
-    constructor(totalNumTxs, completionCallback, rejectionCallback, globalVariables, newL1ToL2Messages, numRootParityInputs, messageTreeSnapshot, messageTreeRootSiblingPath) {
-        this.totalNumTxs = totalNumTxs;
-        this.completionCallback = completionCallback;
-        this.rejectionCallback = rejectionCallback;
-        this.globalVariables = globalVariables;
-        this.newL1ToL2Messages = newL1ToL2Messages;
-        this.messageTreeSnapshot = messageTreeSnapshot;
-        this.messageTreeRootSiblingPath = messageTreeRootSiblingPath;
-        this.provingStateLifecycle = PROVING_STATE_LIFECYCLE.PROVING_STATE_CREATED;
-        this.mergeRollupInputs = [];
-        this.rootParityInputs = [];
-        this.txs = [];
-        this.rootParityInputs = Array.from({ length: numRootParityInputs }).map(_ => undefined);
-    }
-    // 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];
-    }
-    // Adds a transaction to the proving state, returns it's index
-    // Will update the proving life cycle if this is the last transaction
-    addNewTx(tx) {
-        this.txs.push(tx);
-        if (this.txs.length === this.totalNumTxs) {
-            this.provingStateLifecycle = PROVING_STATE_LIFECYCLE.PROVING_STATE_FULL;
-        }
-        return this.txs.length - 1;
-    }
-    // Returns the number of received transactions
-    get transactionsReceived() {
-        return this.txs.length;
-    }
-    // Returns the final set of root parity inputs
-    get finalRootParityInput() {
-        return this.finalRootParityInputs;
-    }
-    // Sets the final set of root parity inputs
-    set finalRootParityInput(input) {
-        this.finalRootParityInputs = input;
-    }
-    // Returns the set of root parity inputs
-    get rootParityInput() {
-        return this.rootParityInputs;
-    }
-    // Returns true if this proving state is still valid, false otherwise
-    verifyState() {
-        return (this.provingStateLifecycle === PROVING_STATE_LIFECYCLE.PROVING_STATE_CREATED ||
-            this.provingStateLifecycle === PROVING_STATE_LIFECYCLE.PROVING_STATE_FULL);
-    }
-    // Returns true if we are still able to accept transactions, false otherwise
-    isAcceptingTransactions() {
-        return this.provingStateLifecycle === PROVING_STATE_LIFECYCLE.PROVING_STATE_CREATED;
-    }
-    // Returns the complete set of transaction proving state objects
-    get allTxs() {
-        return this.txs;
-    }
-    /** Returns the block number as an epoch number. Used for prioritizing proof requests. */
-    get epochNumber() {
-        return this.globalVariables.blockNumber.toNumber();
-    }
-    /**
-     * 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],
-            };
-            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;
-    }
-    // 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];
-    }
-    // Returns true if we have sufficient inputs to execute the block root rollup
-    isReadyForBlockRootRollup() {
-        return !(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;
-    }
-    // Returns true if we have sufficient root parity inputs to execute the root parity circuit
-    areRootParityInputsReady() {
-        return this.rootParityInputs.findIndex(p => !p) === -1;
-    }
-    // Attempts to reject the proving state promise with a reason of 'cancelled'
-    cancel() {
-        this.reject('Proving cancelled');
-    }
-    // Attempts to reject the proving state promise with the given reason
-    // Does nothing if not in a valid state
-    reject(reason) {
-        if (!this.verifyState()) {
-            return;
-        }
-        this.provingStateLifecycle = PROVING_STATE_LIFECYCLE.PROVING_STATE_REJECTED;
-        this.rejectionCallback(reason);
-    }
-    // Attempts to resolve the proving state promise with the given result
-    // Does nothing if not in a valid state
-    resolve(result) {
-        if (!this.verifyState()) {
-            return;
-        }
-        this.provingStateLifecycle = PROVING_STATE_LIFECYCLE.PROVING_STATE_RESOLVED;
-        this.completionCallback(result);
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmluZy1zdGF0ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9vcmNoZXN0cmF0b3IvcHJvdmluZy1zdGF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUErQkEsSUFBSyx1QkFLSjtBQUxELFdBQUssdUJBQXVCO0lBQzFCLHVHQUFxQixDQUFBO0lBQ3JCLGlHQUFrQixDQUFBO0lBQ2xCLHlHQUFzQixDQUFBO0lBQ3RCLHlHQUFzQixDQUFBO0FBQ3hCLENBQUMsRUFMSSx1QkFBdUIsS0FBdkIsdUJBQXVCLFFBSzNCO0FBRUQ7Ozs7R0FJRztBQUNILE1BQU0sT0FBTyxZQUFZO0lBU3ZCLFlBQ2tCLFdBQW1CLEVBQzNCLGtCQUFtRCxFQUNuRCxpQkFBMkMsRUFDbkMsZUFBZ0MsRUFDaEMsaUJBQXdFLEVBQ3hGLG1CQUEyQixFQUNYLG1CQUEyQyxFQUMzQywwQkFBc0Y7UUFQdEYsZ0JBQVcsR0FBWCxXQUFXLENBQVE7UUFDM0IsdUJBQWtCLEdBQWxCLGtCQUFrQixDQUFpQztRQUNuRCxzQkFBaUIsR0FBakIsaUJBQWlCLENBQTBCO1FBQ25DLG9CQUFlLEdBQWYsZUFBZSxDQUFpQjtRQUNoQyxzQkFBaUIsR0FBakIsaUJBQWlCLENBQXVEO1FBRXhFLHdCQUFtQixHQUFuQixtQkFBbUIsQ0FBd0I7UUFDM0MsK0JBQTBCLEdBQTFCLDBCQUEwQixDQUE0RDtRQWhCaEcsMEJBQXFCLEdBQUcsdUJBQXVCLENBQUMscUJBQXFCLENBQUM7UUFDdEUsc0JBQWlCLEdBQTJCLEVBQUUsQ0FBQztRQUMvQyxxQkFBZ0IsR0FBc0UsRUFBRSxDQUFDO1FBS3pGLFFBQUcsR0FBcUIsRUFBRSxDQUFDO1FBV2pDLElBQUksQ0FBQyxnQkFBZ0IsR0FBRyxLQUFLLENBQUMsSUFBSSxDQUFDLEVBQUUsTUFBTSxFQUFFLG1CQUFtQixFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUMxRixD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