@aztec/prover-client 0.45.0 → 0.46.1

package/src/orchestrator/block-building-helpers.ts

@@ -9,7 +9,7 @@ import {
   type GlobalVariables,
   KernelData,
   type L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH,
-  MAX_NEW_NULLIFIERS_PER_TX,
+  MAX_NULLIFIERS_PER_TX,
   MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
   MembershipWitness,
   MergeRollupInputs,
@@ -30,7 +30,6 @@ import {
   PublicDataTreeLeaf,
   type PublicDataTreeLeafPreimage,
   PublicDataUpdateRequest,
-  ROLLUP_VK_TREE_HEIGHT,
   type RecursiveProof,
   type RootParityInput,
   RootRollupInputs,
@@ -45,16 +44,10 @@ import {
 import { assertPermutation, makeTuple } from '@aztec/foundation/array';
 import { padArrayEnd } from '@aztec/foundation/collection';
 import { type Tuple, assertLength, toFriendlyJSON } from '@aztec/foundation/serialize';
+import { getVKIndex, getVKSiblingPath, getVKTreeRoot } from '@aztec/noir-protocol-circuits-types';
 import { HintsBuilder, computeFeePayerBalanceLeafSlot } from '@aztec/simulator';
 import { type MerkleTreeOperations } from '@aztec/world-state';
 
-// Denotes fields that are not used now, but will be in the future
-const FUTURE_FR = new Fr(0n);
-const FUTURE_NUM = 0;
-
-// Denotes fields that should be deleted
-const DELETE_FR = new Fr(0n);
-
 /**
  * Type representing the names of the trees for the base rollup.
  */
@@ -102,8 +95,8 @@ export async function buildBaseRollupInput(
 
   // Update the note hash trees with the new items being inserted to get the new roots
   // that will be used by the next iteration of the base rollup circuit, skipping the empty ones
-  const newNoteHashes = tx.data.end.newNoteHashes;
-  await db.appendLeaves(MerkleTreeId.NOTE_HASH_TREE, newNoteHashes);
+  const noteHashes = tx.data.end.noteHashes;
+  await db.appendLeaves(MerkleTreeId.NOTE_HASH_TREE, noteHashes);
 
   // The read witnesses for a given TX should be generated before the writes of the same TX are applied.
   // All reads that refer to writes in the same tx are transient and can be simplified out.
@@ -112,12 +105,12 @@ export async function buildBaseRollupInput(
   // Update the nullifier tree, capturing the low nullifier info for each individual operation
   const {
     lowLeavesWitnessData: nullifierWitnessLeaves,
-    newSubtreeSiblingPath: newNullifiersSubtreeSiblingPath,
-    sortedNewLeaves: sortedNewNullifiers,
+    newSubtreeSiblingPath: nullifiersSubtreeSiblingPath,
+    sortedNewLeaves: sortednullifiers,
     sortedNewLeavesIndexes,
   } = await db.batchInsert(
     MerkleTreeId.NULLIFIER_TREE,
-    tx.data.end.newNullifiers.map(n => n.toBuffer()),
+    tx.data.end.nullifiers.map(n => n.toBuffer()),
     NULLIFIER_SUBTREE_HEIGHT,
   );
   if (nullifierWitnessLeaves === undefined) {
@@ -130,7 +123,7 @@ export async function buildBaseRollupInput(
       MembershipWitness.fromBufferArray(l.index, assertLength(l.siblingPath.toBufferArray(), NULLIFIER_TREE_HEIGHT)),
     );
 
-  const nullifierSubtreeSiblingPathArray = newNullifiersSubtreeSiblingPath.toFields();
+  const nullifierSubtreeSiblingPathArray = nullifiersSubtreeSiblingPath.toFields();
 
   const nullifierSubtreeSiblingPath = makeTuple(NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH, i =>
     i < nullifierSubtreeSiblingPathArray.length ? nullifierSubtreeSiblingPathArray[i] : Fr.ZERO,
@@ -139,18 +132,18 @@ export async function buildBaseRollupInput(
   const publicDataSiblingPath = txPublicDataUpdateRequestInfo.newPublicDataSubtreeSiblingPath;
 
   const stateDiffHints = StateDiffHints.from({
-    nullifierPredecessorPreimages: makeTuple(MAX_NEW_NULLIFIERS_PER_TX, i =>
+    nullifierPredecessorPreimages: makeTuple(MAX_NULLIFIERS_PER_TX, i =>
       i < nullifierWitnessLeaves.length
         ? (nullifierWitnessLeaves[i].leafPreimage as NullifierLeafPreimage)
         : NullifierLeafPreimage.empty(),
     ),
-    nullifierPredecessorMembershipWitnesses: makeTuple(MAX_NEW_NULLIFIERS_PER_TX, i =>
+    nullifierPredecessorMembershipWitnesses: makeTuple(MAX_NULLIFIERS_PER_TX, i =>
       i < nullifierPredecessorMembershipWitnessesWithoutPadding.length
         ? nullifierPredecessorMembershipWitnessesWithoutPadding[i]
         : makeEmptyMembershipWitness(NULLIFIER_TREE_HEIGHT),
     ),
-    sortedNullifiers: makeTuple(MAX_NEW_NULLIFIERS_PER_TX, i => Fr.fromBuffer(sortedNewNullifiers[i])),
-    sortedNullifierIndexes: makeTuple(MAX_NEW_NULLIFIERS_PER_TX, i => sortedNewLeavesIndexes[i]),
+    sortedNullifiers: makeTuple(MAX_NULLIFIERS_PER_TX, i => Fr.fromBuffer(sortednullifiers[i])),
+    sortedNullifierIndexes: makeTuple(MAX_NULLIFIERS_PER_TX, i => sortedNewLeavesIndexes[i]),
     noteHashSubtreeSiblingPath,
     nullifierSubtreeSiblingPath,
     publicDataSiblingPath,
@@ -267,18 +260,13 @@ export function getPreviousRollupDataFromPublicInputs(
   rollupProof: RecursiveProof<typeof NESTED_RECURSIVE_PROOF_LENGTH>,
   vk: VerificationKeyAsFields,
 ) {
+  const leafIndex = getVKIndex(vk);
+
   return new PreviousRollupData(
     rollupOutput,
     rollupProof,
     vk,
-
-    // MembershipWitness for a VK tree to be implemented in the future
-    FUTURE_NUM,
-    new MembershipWitness(
-      ROLLUP_VK_TREE_HEIGHT,
-      BigInt(FUTURE_NUM),
-      makeTuple(ROLLUP_VK_TREE_HEIGHT, () => FUTURE_FR),
-    ),
+    new MembershipWitness(VK_TREE_HEIGHT, BigInt(leafIndex), getVKSiblingPath(leafIndex)),
   );
 }
 
@@ -287,10 +275,7 @@ export async function getConstantRollupData(
   db: MerkleTreeOperations,
 ): Promise<ConstantRollupData> {
   return ConstantRollupData.from({
-    baseRollupVkHash: DELETE_FR,
-    mergeRollupVkHash: DELETE_FR,
-    privateKernelVkTreeRoot: FUTURE_FR,
-    publicKernelVkTreeRoot: FUTURE_FR,
+    vkTreeRoot: getVKTreeRoot(),
     lastArchive: await getTreeSnapshot(MerkleTreeId.ARCHIVE, db),
     globalVariables,
   });
@@ -303,6 +288,8 @@ export async function getTreeSnapshot(id: MerkleTreeId, db: MerkleTreeOperations
 
 export function getKernelDataFor(tx: ProcessedTx, vk: VerificationKeyData): KernelData {
   const recursiveProof = makeRecursiveProofFromBinary(tx.proof, NESTED_RECURSIVE_PROOF_LENGTH);
+  const leafIndex = getVKIndex(vk);
+
   return new KernelData(
     tx.data,
     recursiveProof,
@@ -310,9 +297,8 @@ export function getKernelDataFor(tx: ProcessedTx, vk: VerificationKeyData): Kern
     // VK for the kernel circuit
     vk,
 
-    // MembershipWitness for a VK tree to be implemented in the future
-    FUTURE_NUM,
-    assertLength(Array(VK_TREE_HEIGHT).fill(FUTURE_FR), VK_TREE_HEIGHT),
+    leafIndex,
+    getVKSiblingPath(leafIndex),
   );
 }
 

package/src/orchestrator/orchestrator.ts

@@ -45,7 +45,6 @@ import {
   RootParityInputs,
   type VerificationKeyAsFields,
   VerificationKeyData,
-  type VerificationKeys,
   makeEmptyProof,
 } from '@aztec/circuits.js';
 import { makeTuple } from '@aztec/foundation/array';
@@ -55,6 +54,7 @@ import { createDebugLogger } from '@aztec/foundation/log';
 import { promiseWithResolvers } from '@aztec/foundation/promise';
 import { BufferReader, type Tuple } from '@aztec/foundation/serialize';
 import { pushTestData } from '@aztec/foundation/testing';
+import { ProtocolCircuitVks, getVKIndex, getVKSiblingPath, getVKTreeRoot } from '@aztec/noir-protocol-circuits-types';
 import { Attributes, type TelemetryClient, type Tracer, trackSpan, wrapCallbackInSpan } from '@aztec/telemetry-client';
 import { type MerkleTreeOperations } from '@aztec/world-state';
 
@@ -128,7 +128,6 @@ export class ProvingOrchestrator {
     numTxs: number,
     globalVariables: GlobalVariables,
     l1ToL2Messages: Fr[],
-    verificationKeys: VerificationKeys,
   ): Promise<ProvingTicket> {
     // Create initial header if not done so yet
     if (!this.initialHeader) {
@@ -150,7 +149,7 @@ export class ProvingOrchestrator {
       throw new Error('Too many L1 to L2 messages');
     }
     baseParityInputs = Array.from({ length: NUM_BASE_PARITY_PER_ROOT_PARITY }, (_, i) =>
-      BaseParityInputs.fromSlice(l1ToL2MessagesPadded, i),
+      BaseParityInputs.fromSlice(l1ToL2MessagesPadded, i, getVKTreeRoot()),
     );
 
     const messageTreeSnapshot = await getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, this.db);
@@ -188,7 +187,6 @@ export class ProvingOrchestrator {
       baseParityInputs.length,
       messageTreeSnapshot,
       newL1ToL2MessageTreeRootSiblingPath,
-      verificationKeys,
     );
 
     for (let i = 0; i < baseParityInputs.length; i++) {
@@ -271,6 +269,7 @@ export class ProvingOrchestrator {
       this.initialHeader ?? (await this.db.buildInitialHeader()),
       this.provingState.globalVariables.chainId,
       this.provingState.globalVariables.version,
+      getVKTreeRoot(),
     );
     const txInputs: Array<{ inputs: BaseRollupInputs; snapshot: TreeSnapshots }> = [];
     for (let i = 0; i < paddingTxCount; i++) {
@@ -318,6 +317,7 @@ export class ProvingOrchestrator {
               chainId: unprovenPaddingTx.data.constants.txContext.chainId,
               version: unprovenPaddingTx.data.constants.txContext.version,
               header: unprovenPaddingTx.data.constants.historicalHeader,
+              vkTreeRoot: getVKTreeRoot(),
             },
             signal,
           ),
@@ -346,6 +346,9 @@ export class ProvingOrchestrator {
     for (let i = 0; i < txInputs.length; i++) {
       txInputs[i].inputs.kernelData.vk = paddingTx.verificationKey;
       txInputs[i].inputs.kernelData.proof = paddingTx.recursiveProof;
+
+      txInputs[i].inputs.kernelData.vkIndex = getVKIndex(paddingTx.verificationKey);
+      txInputs[i].inputs.kernelData.vkPath = getVKSiblingPath(txInputs[i].inputs.kernelData.vkIndex);
       this.enqueueFirstProof(txInputs[i].inputs, txInputs[i].snapshot, paddingTx, provingState);
     }
   }
@@ -448,7 +451,7 @@ export class ProvingOrchestrator {
   private async prepareTransaction(tx: ProcessedTx, provingState: ProvingState) {
     // Pass the private kernel tail vk here as the previous one.
     // If there are public functions then this key will be overwritten once the public tail has been proven
-    const previousKernelVerificationKey = provingState.privateKernelVerificationKeys.privateKernelCircuit;
+    const previousKernelVerificationKey = ProtocolCircuitVks.PrivateKernelTailArtifact;
 
     const txInputs = await this.prepareBaseRollupInputs(provingState, tx, previousKernelVerificationKey);
     if (!txInputs) {
@@ -468,7 +471,7 @@ export class ProvingOrchestrator {
       tx,
       inputs,
       treeSnapshots,
-      provingState.privateKernelVerificationKeys.privateKernelToPublicCircuit,
+      ProtocolCircuitVks.PrivateKernelTailToPublicArtifact,
     );
     const txIndex = provingState.addNewTx(txProvingState);
     const numPublicKernels = txProvingState.getNumPublicKernels();
@@ -982,6 +985,11 @@ export class ProvingOrchestrator {
           // Take the final public tail proof and verification key and pass them to the base rollup
           txProvingState.baseRollupInputs.kernelData.proof = result.proof;
           txProvingState.baseRollupInputs.kernelData.vk = result.verificationKey;
+          txProvingState.baseRollupInputs.kernelData.vkIndex = getVKIndex(result.verificationKey);
+          txProvingState.baseRollupInputs.kernelData.vkPath = getVKSiblingPath(
+            txProvingState.baseRollupInputs.kernelData.vkIndex,
+          );
+
           this.enqueueBaseRollup(provingState, BigInt(txIndex), txProvingState);
           return;
         }

package/src/orchestrator/proving-state.ts

@@ -13,7 +13,6 @@ import {
   type RootParityInput,
   type RootRollupPublicInputs,
   type VerificationKeyAsFields,
-  type VerificationKeys,
 } from '@aztec/circuits.js';
 import { type Tuple } from '@aztec/foundation/serialize';
 
@@ -61,7 +60,6 @@ export class ProvingState {
     numRootParityInputs: number,
     public readonly messageTreeSnapshot: AppendOnlyTreeSnapshot,
     public readonly messageTreeRootSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH>,
-    public readonly privateKernelVerificationKeys: VerificationKeys,
   ) {
     this.rootParityInputs = Array.from({ length: numRootParityInputs }).map(_ => undefined);
   }

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

@@ -7,7 +7,7 @@ import {
   type ProvingTicket,
   type ServerCircuitProver,
 } from '@aztec/circuit-types/interfaces';
-import { type Fr, type GlobalVariables, type Header, type VerificationKeys } from '@aztec/circuits.js';
+import { type Fr, type GlobalVariables, type Header } from '@aztec/circuits.js';
 import { NativeACVMSimulator } from '@aztec/simulator';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 import { type WorldStateSynchronizer } from '@aztec/world-state';
@@ -28,7 +28,6 @@ export class TxProver implements ProverClient {
   private constructor(
     private config: ProverClientConfig,
     private worldStateSynchronizer: WorldStateSynchronizer,
-    private vks: VerificationKeys,
     private telemetry: TelemetryClient,
     private agent?: ProverAgent,
     initialHeader?: Header,
@@ -42,13 +41,9 @@ export class TxProver implements ProverClient {
     );
   }
 
-  async updateProverConfig(config: Partial<ProverClientConfig & { vks: VerificationKeys }>): Promise<void> {
+  async updateProverConfig(config: Partial<ProverClientConfig>): Promise<void> {
     const newConfig = { ...this.config, ...config };
 
-    if (config.vks) {
-      this.vks = config.vks;
-    }
-
     if (newConfig.realProofs !== this.config.realProofs && this.agent) {
       const circuitProver = await TxProver.buildCircuitProver(newConfig, this.telemetry);
       this.agent.setCircuitProver(circuitProver);
@@ -100,7 +95,6 @@ export class TxProver implements ProverClient {
    */
   public static async new(
     config: ProverClientConfig,
-    vks: VerificationKeys,
     worldStateSynchronizer: WorldStateSynchronizer,
     telemetry: TelemetryClient,
     initialHeader?: Header,
@@ -113,7 +107,7 @@ export class TxProver implements ProverClient {
         )
       : undefined;
 
-    const prover = new TxProver(config, worldStateSynchronizer, vks, telemetry, agent, initialHeader);
+    const prover = new TxProver(config, worldStateSynchronizer, telemetry, agent, initialHeader);
     await prover.start();
     return prover;
   }
@@ -146,7 +140,7 @@ export class TxProver implements ProverClient {
   ): Promise<ProvingTicket> {
     const previousBlockNumber = globalVariables.blockNumber.toNumber() - 1;
     await this.worldStateSynchronizer.syncImmediate(previousBlockNumber);
-    return this.orchestrator.startNewBlock(numTxs, globalVariables, newL1ToL2Messages, this.vks);
+    return this.orchestrator.startNewBlock(numTxs, globalVariables, newL1ToL2Messages);
   }
 
   /**