@aztec/prover-client 3.0.0-nightly.20250925 → 3.0.0-nightly.20250927

package/src/orchestrator/orchestrator.ts

@@ -1,7 +1,7 @@
 import { BatchedBlob, BlobAccumulatorPublicInputs, FinalBlobBatchingChallenges, SpongeBlob } from '@aztec/blob-lib';
 import {
   L1_TO_L2_MSG_SUBTREE_HEIGHT,
-  L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH,
+  L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH,
   NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH,
   NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
   NUM_BASE_PARITY_PER_ROOT_PARITY,
@@ -24,7 +24,6 @@ import type {
   PublicInputsAndRecursiveProof,
   ServerCircuitProver,
 } from '@aztec/stdlib/interfaces/server';
-import type { PrivateToPublicKernelCircuitPublicInputs } from '@aztec/stdlib/kernel';
 import type { Proof } from '@aztec/stdlib/proofs';
 import {
   type BaseRollupHints,
@@ -36,6 +35,7 @@ import {
   CheckpointRootSingleBlockRollupPrivateInputs,
   PrivateTxBaseRollupPrivateInputs,
   PublicTubePrivateInputs,
+  PublicTubePublicInputs,
   RootRollupPublicInputs,
 } from '@aztec/stdlib/rollup';
 import type { CircuitName } from '@aztec/stdlib/stats';
@@ -171,9 +171,9 @@ export class ProvingOrchestrator implements EpochProver {
     // Insert all the l1 to l2 messages into the db. And get the states before and after the insertion.
     const {
       lastL1ToL2MessageTreeSnapshot,
-      lastL1ToL2MessageSubtreeSiblingPath,
+      lastL1ToL2MessageSubtreeRootSiblingPath,
       newL1ToL2MessageTreeSnapshot,
-      newL1ToL2MessageSubtreeSiblingPath,
+      newL1ToL2MessageSubtreeRootSiblingPath,
     } = await this.updateL1ToL2MessageTree(l1ToL2Messages, db);
 
     this.provingState.startNewCheckpoint(
@@ -185,9 +185,9 @@ export class ProvingOrchestrator implements EpochProver {
       lastArchiveSiblingPath,
       l1ToL2Messages,
       lastL1ToL2MessageTreeSnapshot,
-      lastL1ToL2MessageSubtreeSiblingPath,
+      lastL1ToL2MessageSubtreeRootSiblingPath,
       newL1ToL2MessageTreeSnapshot,
-      newL1ToL2MessageSubtreeSiblingPath,
+      newL1ToL2MessageSubtreeRootSiblingPath,
     );
   }
 
@@ -324,7 +324,7 @@ export class ProvingOrchestrator implements EpochProver {
 
         await spongeBlobState.absorb(tx.txEffect.toBlobFields());
 
-        const txProvingState = new TxProvingState(tx, hints, treeSnapshots);
+        const txProvingState = new TxProvingState(tx, hints, treeSnapshots, this.proverId.toField());
         const txIndex = provingState.addNewTx(txProvingState);
         if (txProvingState.requireAvmProof) {
           this.getOrEnqueueTube(provingState, txIndex);
@@ -361,13 +361,10 @@ export class ProvingOrchestrator implements EpochProver {
     const publicTxs = txs.filter(tx => tx.data.forPublic);
     for (const tx of publicTxs) {
       const txHash = tx.getTxHash().toString();
-      const privateInputs = getPublicTubePrivateInputsFromTx(tx);
+      const privateInputs = getPublicTubePrivateInputsFromTx(tx, this.proverId.toField());
       const tubeProof =
         promiseWithResolvers<
-          PublicInputsAndRecursiveProof<
-            PrivateToPublicKernelCircuitPublicInputs,
-            typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH
-          >
+          PublicInputsAndRecursiveProof<PublicTubePublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>
         >();
       logger.debug(`Starting tube circuit for tx ${txHash}`);
       this.doEnqueueTube(txHash, privateInputs, proof => {
@@ -612,25 +609,25 @@ export class ProvingOrchestrator implements EpochProver {
     );
 
     const lastL1ToL2MessageTreeSnapshot = await getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, db);
-    const lastL1ToL2MessageSubtreeSiblingPath = assertLength(
+    const lastL1ToL2MessageSubtreeRootSiblingPath = assertLength(
       await getSubtreeSiblingPath(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, L1_TO_L2_MSG_SUBTREE_HEIGHT, db),
-      L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH,
+      L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH,
     );
 
     // Update the local trees to include the new l1 to l2 messages
     await db.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, l1ToL2MessagesPadded);
 
     const newL1ToL2MessageTreeSnapshot = await getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, db);
-    const newL1ToL2MessageSubtreeSiblingPath = assertLength(
+    const newL1ToL2MessageSubtreeRootSiblingPath = assertLength(
       await getSubtreeSiblingPath(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, L1_TO_L2_MSG_SUBTREE_HEIGHT, db),
-      L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH,
+      L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH,
     );
 
     return {
       lastL1ToL2MessageTreeSnapshot,
-      lastL1ToL2MessageSubtreeSiblingPath,
+      lastL1ToL2MessageSubtreeRootSiblingPath,
       newL1ToL2MessageTreeSnapshot,
-      newL1ToL2MessageSubtreeSiblingPath,
+      newL1ToL2MessageSubtreeRootSiblingPath,
     };
   }
 
@@ -712,7 +709,7 @@ export class ProvingOrchestrator implements EpochProver {
       ),
       result => {
         logger.debug(`Completed proof for ${rollupType} for tx ${processedTx.hash.toString()}`);
-        validatePartialState(result.inputs.endPartialState, txProvingState.treeSnapshots);
+        validatePartialState(result.inputs.endTreeSnapshots, txProvingState.treeSnapshots);
         const leafLocation = provingState.setBaseRollupProof(txIndex, result);
         if (provingState.totalNumTxs === 1) {
           this.checkAndEnqueueBlockRootRollup(provingState);
@@ -735,10 +732,7 @@ export class ProvingOrchestrator implements EpochProver {
     const txHash = txProvingState.processedTx.hash.toString();
     NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH;
     const handleResult = (
-      result: PublicInputsAndRecursiveProof<
-        PrivateToPublicKernelCircuitPublicInputs,
-        typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH
-      >,
+      result: PublicInputsAndRecursiveProof<PublicTubePublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>,
     ) => {
       logger.debug(`Got tube proof for tx index: ${txIndex}`, { txHash });
       txProvingState.setPublicTubeProof(result);
@@ -760,10 +754,7 @@ export class ProvingOrchestrator implements EpochProver {
     txHash: string,
     inputs: PublicTubePrivateInputs,
     handler: (
-      result: PublicInputsAndRecursiveProof<
-        PrivateToPublicKernelCircuitPublicInputs,
-        typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH
-      >,
+      result: PublicInputsAndRecursiveProof<PublicTubePublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>,
     ) => void,
     provingState: EpochProvingState | BlockProvingState = this.provingState!,
   ) {

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

@@ -3,18 +3,18 @@ import {
   AVM_VK_INDEX,
   NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH,
 } from '@aztec/constants';
+import type { Fr } from '@aztec/foundation/fields';
 import { getVkData } from '@aztec/noir-protocol-circuits-types/server/vks';
 import { getVKSiblingPath } from '@aztec/noir-protocol-circuits-types/vk-tree';
 import type { AvmCircuitInputs } from '@aztec/stdlib/avm';
 import type { ProofAndVerificationKey, PublicInputsAndRecursiveProof } from '@aztec/stdlib/interfaces/server';
-import type { PrivateToPublicKernelCircuitPublicInputs } from '@aztec/stdlib/kernel';
 import { ProofData } from '@aztec/stdlib/proofs';
 import {
-  AvmProofData,
   type BaseRollupHints,
   PrivateBaseRollupHints,
   PrivateTxBaseRollupPrivateInputs,
   PublicBaseRollupHints,
+  PublicTubePublicInputs,
   PublicTxBaseRollupPrivateInputs,
 } from '@aztec/stdlib/rollup';
 import type { CircuitName } from '@aztec/stdlib/stats';
@@ -31,7 +31,7 @@ import { getCivcProofFromTx, getPublicTubePrivateInputsFromTx, toProofData } fro
  */
 export class TxProvingState {
   private publicTube?: PublicInputsAndRecursiveProof<
-    PrivateToPublicKernelCircuitPublicInputs,
+    PublicTubePublicInputs,
     typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH
   >;
   private avm?: ProofAndVerificationKey<typeof AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED>;
@@ -40,6 +40,7 @@ export class TxProvingState {
     public readonly processedTx: ProcessedTx,
     private readonly baseRollupHints: BaseRollupHints,
     public readonly treeSnapshots: Map<MerkleTreeId, AppendOnlyTreeSnapshot>,
+    private readonly proverId: Fr,
   ) {}
 
   get requireAvmProof() {
@@ -55,7 +56,7 @@ export class TxProvingState {
   }
 
   public getPublicTubePrivateInputs() {
-    return getPublicTubePrivateInputsFromTx(this.processedTx);
+    return getPublicTubePrivateInputsFromTx(this.processedTx, this.proverId);
   }
 
   public getBaseRollupTypeAndInputs() {
@@ -74,7 +75,7 @@ export class TxProvingState {
 
   public setPublicTubeProof(
     publicTubeProofAndVk: PublicInputsAndRecursiveProof<
-      PrivateToPublicKernelCircuitPublicInputs,
+      PublicTubePublicInputs,
       typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH
     >,
   ) {
@@ -115,7 +116,7 @@ export class TxProvingState {
 
     const publicTubeProofData = toProofData(this.publicTube);
 
-    const avmProofData = new AvmProofData(
+    const avmProofData = new ProofData(
       this.processedTx.avmProvingRequest.inputs.publicInputs,
       this.avm.proof,
       this.#getVkData(this.avm!.verificationKey, AVM_VK_INDEX),
@@ -125,6 +126,8 @@ export class TxProvingState {
   }
 
   #getVkData(verificationKey: VerificationKeyData, vkIndex: number) {
+    // TODO(#17162): Add avm vk hash to the tree and call `getVkData('AVM')` instead.
+    // Below will return a path to an empty leaf.
     const vkPath = getVKSiblingPath(vkIndex);
     return new VkData(verificationKey, vkIndex, vkPath);
   }

package/src/proving_broker/broker_prover_facade.ts

@@ -22,7 +22,6 @@ import {
   type ServerCircuitProver,
   makeProvingJobId,
 } from '@aztec/stdlib/interfaces/server';
-import type { PrivateToPublicKernelCircuitPublicInputs } from '@aztec/stdlib/kernel';
 import type { ParityBasePrivateInputs, ParityPublicInputs, ParityRootPrivateInputs } from '@aztec/stdlib/parity';
 import { ProvingRequestType } from '@aztec/stdlib/proofs';
 import type {
@@ -40,6 +39,7 @@ import type {
   CheckpointRootSingleBlockRollupPrivateInputs,
   PrivateTxBaseRollupPrivateInputs,
   PublicTubePrivateInputs,
+  PublicTubePublicInputs,
   PublicTxBaseRollupPrivateInputs,
   RootRollupPrivateInputs,
   RootRollupPublicInputs,
@@ -449,12 +449,7 @@ export class BrokerCircuitProverFacade implements ServerCircuitProver {
     inputs: PublicTubePrivateInputs,
     signal?: AbortSignal,
     epochNumber?: number,
-  ): Promise<
-    PublicInputsAndRecursiveProof<
-      PrivateToPublicKernelCircuitPublicInputs,
-      typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH
-    >
-  > {
+  ): Promise<PublicInputsAndRecursiveProof<PublicTubePublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>> {
     return this.enqueueJob(
       this.generateId(ProvingRequestType.PUBLIC_TUBE, inputs, epochNumber),
       ProvingRequestType.PUBLIC_TUBE,

package/src/test/mock_prover.ts

@@ -17,7 +17,6 @@ import {
   makeProofAndVerificationKey,
   makePublicInputsAndRecursiveProof,
 } from '@aztec/stdlib/interfaces/server';
-import type { PrivateToPublicKernelCircuitPublicInputs } from '@aztec/stdlib/kernel';
 import type { ParityBasePrivateInputs, ParityRootPrivateInputs } from '@aztec/stdlib/parity';
 import { makeEmptyRecursiveProof, makeRecursiveProof } from '@aztec/stdlib/proofs';
 import type {
@@ -35,6 +34,7 @@ import type {
   CheckpointRootSingleBlockRollupPrivateInputs,
   PrivateTxBaseRollupPrivateInputs,
   PublicTubePrivateInputs,
+  PublicTubePublicInputs,
   PublicTxBaseRollupPrivateInputs,
   RootRollupPrivateInputs,
   RootRollupPublicInputs,
@@ -45,7 +45,7 @@ import {
   makeBlockRollupPublicInputs,
   makeCheckpointRollupPublicInputs,
   makeParityPublicInputs,
-  makePrivateToPublicKernelCircuitPublicInputs,
+  makePublicTubePublicInputs,
   makeRootRollupPublicInputs,
   makeTxRollupPublicInputs,
 } from '@aztec/stdlib/testing';
@@ -143,15 +143,10 @@ export class MockProver implements ServerCircuitProver {
     _inputs: PublicTubePrivateInputs,
     _signal?: AbortSignal,
     _epochNumber?: number,
-  ): Promise<
-    PublicInputsAndRecursiveProof<
-      PrivateToPublicKernelCircuitPublicInputs,
-      typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH
-    >
-  > {
+  ): Promise<PublicInputsAndRecursiveProof<PublicTubePublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>> {
     return Promise.resolve(
       makePublicInputsAndRecursiveProof(
-        makePrivateToPublicKernelCircuitPublicInputs(),
+        makePublicTubePublicInputs(),
         makeRecursiveProof(NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH),
         VerificationKeyData.makeFakeRollupHonk(),
       ),