@aztec/bb-prover 0.43.0 → 0.45.0

package/src/test/test_circuit_prover.ts

@@ -57,7 +57,9 @@ import {
   convertSimulatedPublicTailOutputFromWitnessMap,
 } from '@aztec/noir-protocol-circuits-types';
 import { type SimulationProvider, WASMSimulator, emitCircuitSimulationStats } from '@aztec/simulator';
+import { type TelemetryClient, trackSpan } from '@aztec/telemetry-client';
 
+import { ProverInstrumentation } from '../instrumentation.js';
 import { SimulatedPublicKernelArtifactMapping } from '../mappings/mappings.js';
 import { mapPublicKernelToCircuitName } from '../stats.js';
 
@@ -81,11 +83,19 @@ const VERIFICATION_KEYS: Record<ServerProtocolArtifact, VerificationKeyAsFields>
  */
 export class TestCircuitProver implements ServerCircuitProver {
   private wasmSimulator = new WASMSimulator();
+  private instrumentation: ProverInstrumentation;
 
   constructor(
+    telemetry: TelemetryClient,
     private simulationProvider?: SimulationProvider,
     private logger = createDebugLogger('aztec:test-prover'),
-  ) {}
+  ) {
+    this.instrumentation = new ProverInstrumentation(telemetry, 'TestCircuitProver');
+  }
+
+  get tracer() {
+    return this.instrumentation.tracer;
+  }
 
   public async getEmptyPrivateKernelProof(
     inputs: PrivateKernelEmptyInputData,
@@ -111,6 +121,7 @@ export class TestCircuitProver implements ServerCircuitProver {
    * @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 timer = new Timer();
     const witnessMap = convertBaseParityInputsToWitnessMap(inputs);
@@ -125,6 +136,8 @@ export class TestCircuitProver implements ServerCircuitProver {
       result,
     );
 
+    this.instrumentation.recordDuration('simulationDuration', 'base-parity', timer);
+
     emitCircuitSimulationStats(
       'base-parity',
       timer.ms(),
@@ -141,6 +154,7 @@ export class TestCircuitProver implements ServerCircuitProver {
    * @param inputs - Inputs to the circuit.
    * @returns The public inputs of the parity circuit.
    */
+  @trackSpan('TestCircuitProver.getRootParityProof')
   public async getRootParityProof(
     inputs: RootParityInputs,
   ): Promise<RootParityInput<typeof NESTED_RECURSIVE_PROOF_LENGTH>> {
@@ -158,6 +172,7 @@ export class TestCircuitProver implements ServerCircuitProver {
       result,
     );
 
+    this.instrumentation.recordDuration('simulationDuration', 'root-parity', timer);
     emitCircuitSimulationStats(
       'root-parity',
       timer.ms(),
@@ -174,6 +189,7 @@ export class TestCircuitProver implements ServerCircuitProver {
    * @param input - Inputs to the circuit.
    * @returns The public inputs as outputs of the simulation.
    */
+  @trackSpan('TestCircuitProver.getBaseRollupProof')
   public async getBaseRollupProof(
     input: BaseRollupInputs,
   ): Promise<PublicInputsAndRecursiveProof<BaseOrMergeRollupPublicInputs>> {
@@ -185,6 +201,7 @@ export class TestCircuitProver implements ServerCircuitProver {
 
     const result = convertSimulatedBaseRollupOutputsFromWitnessMap(witness);
 
+    this.instrumentation.recordDuration('simulationDuration', 'base-rollup', timer);
     emitCircuitSimulationStats(
       'base-rollup',
       timer.ms(),
@@ -203,6 +220,7 @@ export class TestCircuitProver implements ServerCircuitProver {
    * @param input - Inputs to the circuit.
    * @returns The public inputs as outputs of the simulation.
    */
+  @trackSpan('TestCircuitProver.getMergeRollupProof')
   public async getMergeRollupProof(
     input: MergeRollupInputs,
   ): Promise<PublicInputsAndRecursiveProof<BaseOrMergeRollupPublicInputs>> {
@@ -214,6 +232,7 @@ export class TestCircuitProver implements ServerCircuitProver {
 
     const result = convertMergeRollupOutputsFromWitnessMap(witness);
 
+    this.instrumentation.recordDuration('simulationDuration', 'merge-rollup', timer);
     emitCircuitSimulationStats(
       'merge-rollup',
       timer.ms(),
@@ -233,6 +252,7 @@ export class TestCircuitProver implements ServerCircuitProver {
    * @param input - Inputs to the circuit.
    * @returns The public inputs as outputs of the simulation.
    */
+  @trackSpan('TestCircuitProver.getRootRollupProof')
   public async getRootRollupProof(
     input: RootRollupInputs,
   ): Promise<PublicInputsAndRecursiveProof<RootRollupPublicInputs>> {
@@ -244,6 +264,7 @@ export class TestCircuitProver implements ServerCircuitProver {
 
     const result = convertRootRollupOutputsFromWitnessMap(witness);
 
+    this.instrumentation.recordDuration('simulationDuration', 'root-rollup', timer);
     emitCircuitSimulationStats(
       'root-rollup',
       timer.ms(),
@@ -258,6 +279,7 @@ export class TestCircuitProver implements ServerCircuitProver {
     );
   }
 
+  @trackSpan('TestCircuitProver.getPublicKernelProof')
   public async getPublicKernelProof(
     kernelRequest: PublicKernelNonTailRequest,
   ): Promise<PublicInputsAndRecursiveProof<PublicKernelCircuitPublicInputs>> {
@@ -274,8 +296,10 @@ export class TestCircuitProver implements ServerCircuitProver {
     );
 
     const result = kernelOps.convertOutputs(witness);
+    const circuitName = mapPublicKernelToCircuitName(kernelRequest.type);
+    this.instrumentation.recordDuration('simulationDuration', circuitName, timer);
     emitCircuitSimulationStats(
-      mapPublicKernelToCircuitName(kernelRequest.type),
+      circuitName,
       timer.ms(),
       kernelRequest.inputs.toBuffer().length,
       result.toBuffer().length,
@@ -289,6 +313,7 @@ export class TestCircuitProver implements ServerCircuitProver {
     );
   }
 
+  @trackSpan('TestCircuitProver.getPublicTailProof')
   public async getPublicTailProof(
     kernelRequest: PublicKernelTailRequest,
   ): Promise<PublicInputsAndRecursiveProof<KernelCircuitPublicInputs>> {
@@ -301,6 +326,7 @@ export class TestCircuitProver implements ServerCircuitProver {
     );
 
     const result = convertSimulatedPublicTailOutputFromWitnessMap(witness);
+    this.instrumentation.recordDuration('simulationDuration', 'public-kernel-tail', timer);
     emitCircuitSimulationStats(
       'public-kernel-tail',
       timer.ms(),

package/src/verifier/bb_verifier.ts

@@ -129,9 +129,10 @@ export class BBCircuitVerifier implements ClientProtocolCircuitVerifier {
   }
 
   async verifyProof(tx: Tx): Promise<boolean> {
-    const { proof, enqueuedPublicFunctionCalls } = tx;
-    const expectedCircuit: ClientProtocolArtifact =
-      enqueuedPublicFunctionCalls.length > 0 ? 'PrivateKernelTailToPublicArtifact' : 'PrivateKernelTailArtifact';
+    const { proof, data } = tx;
+    const expectedCircuit: ClientProtocolArtifact = data.forPublic
+      ? 'PrivateKernelTailToPublicArtifact'
+      : 'PrivateKernelTailArtifact';
 
     try {
       await this.verifyProofForCircuit(expectedCircuit, proof);