@aztec/bb-prover 0.62.0 → 0.63.1

package/src/test/test_circuit_prover.ts

@@ -19,14 +19,13 @@ import {
   type KernelCircuitPublicInputs,
   type MergeRollupInputs,
   NESTED_RECURSIVE_PROOF_LENGTH,
+  type ParityPublicInputs,
   type PrivateBaseRollupInputs,
   type PrivateKernelEmptyInputData,
   PrivateKernelEmptyInputs,
   type Proof,
   type PublicBaseRollupInputs,
   RECURSIVE_PROOF_LENGTH,
-  type RecursiveProof,
-  RootParityInput,
   type RootParityInputs,
   type RootRollupInputs,
   type RootRollupPublicInputs,
@@ -40,7 +39,6 @@ import { createDebugLogger } from '@aztec/foundation/log';
 import { sleep } from '@aztec/foundation/sleep';
 import { Timer } from '@aztec/foundation/timer';
 import {
-  ProtocolCircuitVkIndexes,
   ProtocolCircuitVks,
   type ServerProtocolArtifact,
   SimulatedServerCircuitArtifacts,
@@ -55,7 +53,6 @@ import {
   convertMergeRollupInputsToWitnessMap,
   convertMergeRollupOutputsFromWitnessMap,
   convertPrivateKernelEmptyInputsToWitnessMap,
-  convertPrivateKernelEmptyOutputsFromWitnessMap,
   convertRootParityInputsToWitnessMap,
   convertRootParityOutputsFromWitnessMap,
   convertRootRollupInputsToWitnessMap,
@@ -65,7 +62,6 @@ import {
   convertSimulatedPrivateKernelEmptyOutputsFromWitnessMap,
   convertSimulatedPublicBaseRollupInputsToWitnessMap,
   convertSimulatedPublicBaseRollupOutputsFromWitnessMap,
-  getVKSiblingPath,
 } from '@aztec/noir-protocol-circuits-types';
 import { type SimulationProvider, WASMSimulator, emitCircuitSimulationStats } from '@aztec/simulator';
 import { type TelemetryClient, trackSpan } from '@aztec/telemetry-client';
@@ -121,52 +117,22 @@ export class TestCircuitProver implements ServerCircuitProver {
     );
   }
 
-  public async getEmptyTubeProof(
-    inputs: PrivateKernelEmptyInputData,
-  ): Promise<PublicInputsAndRecursiveProof<KernelCircuitPublicInputs>> {
-    const emptyNested = new EmptyNestedData(
-      makeRecursiveProof(RECURSIVE_PROOF_LENGTH),
-      ProtocolCircuitVks['EmptyNestedArtifact'].keyAsFields,
-    );
-    const kernelInputs = new PrivateKernelEmptyInputs(
-      emptyNested,
-      inputs.header,
-      inputs.chainId,
-      inputs.version,
-      inputs.vkTreeRoot,
-      inputs.protocolContractTreeRoot,
-    );
-
-    return await this.simulate(
-      kernelInputs,
-      'EmptyNestedArtifact',
-      NESTED_RECURSIVE_PROOF_LENGTH,
-      convertPrivateKernelEmptyInputsToWitnessMap,
-      convertPrivateKernelEmptyOutputsFromWitnessMap,
-    );
-  }
-
   /**
    * Simulates the base parity circuit from its inputs.
    * @param inputs - Inputs to the circuit.
    * @returns The public inputs of the parity circuit.
    */
   @trackSpan('TestCircuitProver.getBaseParityProof')
-  public async getBaseParityProof(inputs: BaseParityInputs): Promise<RootParityInput<typeof RECURSIVE_PROOF_LENGTH>> {
-    const result = await this.simulate(
+  public async getBaseParityProof(
+    inputs: BaseParityInputs,
+  ): Promise<PublicInputsAndRecursiveProof<ParityPublicInputs, typeof RECURSIVE_PROOF_LENGTH>> {
+    return await this.simulate(
       inputs,
       'BaseParityArtifact',
       RECURSIVE_PROOF_LENGTH,
       convertBaseParityInputsToWitnessMap,
       convertBaseParityOutputsFromWitnessMap,
     );
-
-    return new RootParityInput(
-      result.proof,
-      result.verificationKey.keyAsFields,
-      getVKSiblingPath(ProtocolCircuitVkIndexes['BaseParityArtifact']),
-      result.inputs,
-    );
   }
 
   /**
@@ -177,26 +143,17 @@ export class TestCircuitProver implements ServerCircuitProver {
   @trackSpan('TestCircuitProver.getRootParityProof')
   public async getRootParityProof(
     inputs: RootParityInputs,
-  ): Promise<RootParityInput<typeof NESTED_RECURSIVE_PROOF_LENGTH>> {
-    const result = await this.simulate(
+  ): Promise<PublicInputsAndRecursiveProof<ParityPublicInputs, typeof NESTED_RECURSIVE_PROOF_LENGTH>> {
+    return await this.simulate(
       inputs,
       'RootParityArtifact',
       NESTED_RECURSIVE_PROOF_LENGTH,
       convertRootParityInputsToWitnessMap,
       convertRootParityOutputsFromWitnessMap,
     );
-
-    return new RootParityInput(
-      result.proof,
-      result.verificationKey.keyAsFields,
-      getVKSiblingPath(ProtocolCircuitVkIndexes['RootParityArtifact']),
-      result.inputs,
-    );
   }
 
-  public async getTubeProof(
-    _tubeInput: TubeInputs,
-  ): Promise<ProofAndVerificationKey<RecursiveProof<typeof TUBE_PROOF_LENGTH>>> {
+  public async getTubeProof(_tubeInput: TubeInputs): Promise<ProofAndVerificationKey<typeof TUBE_PROOF_LENGTH>> {
     await this.delay();
     return makeProofAndVerificationKey(makeEmptyRecursiveProof(TUBE_PROOF_LENGTH), VerificationKeyData.makeFakeHonk());
   }
@@ -319,7 +276,7 @@ export class TestCircuitProver implements ServerCircuitProver {
 
   public async getAvmProof(
     _inputs: AvmCircuitInputs,
-  ): Promise<ProofAndVerificationKey<RecursiveProof<typeof AVM_PROOF_LENGTH_IN_FIELDS>>> {
+  ): Promise<ProofAndVerificationKey<typeof AVM_PROOF_LENGTH_IN_FIELDS>> {
     // We can't simulate the AVM because we don't have enough context to do so (e.g., DBs).
     // We just return an empty proof and VK data.
     this.logger.debug('Skipping AVM simulation in TestCircuitProver.');

package/src/verification_key/verification_key_data.ts

@@ -4,7 +4,7 @@ import {
   VerificationKeyAsFields,
   VerificationKeyData,
 } from '@aztec/circuits.js';
-import { hashVk } from '@aztec/noir-protocol-circuits-types';
+import { hashVK } from '@aztec/circuits.js/hash';
 
 import { strict as assert } from 'assert';
 import * as fs from 'fs/promises';
@@ -25,7 +25,7 @@ export async function extractVkData(vkDirectoryPath: string): Promise<Verificati
   const fieldsJson = JSON.parse(rawFields);
   const fields = fieldsJson.map(Fr.fromString);
   // The hash is not included in the BB response
-  const vkHash = hashVk(fields);
+  const vkHash = hashVK(fields);
   const vkAsFields = new VerificationKeyAsFields(fields, vkHash);
   return new VerificationKeyData(vkAsFields, rawBinary);
 }

package/src/verifier/bb_verifier.ts

@@ -23,7 +23,7 @@ import {
 } from '../bb/execute.js';
 import { type BBConfig } from '../config.js';
 import { type UltraKeccakHonkProtocolArtifact, getUltraHonkFlavorForCircuit } from '../honk.js';
-import { mapProtocolArtifactNameToCircuitName } from '../stats.js';
+import { isProtocolArtifactRecursive, mapProtocolArtifactNameToCircuitName } from '../stats.js';
 import { extractVkData } from '../verification_key/verification_key_data.js';
 
 export class BBCircuitVerifier implements ClientProtocolCircuitVerifier {
@@ -63,6 +63,7 @@ export class BBCircuitVerifier implements ClientProtocolCircuitVerifier {
       workingDirectory,
       circuit,
       ProtocolCircuitArtifacts[circuit],
+      isProtocolArtifactRecursive(circuit),
       getUltraHonkFlavorForCircuit(circuit),
       logFn,
     ).then(result => {