@aztec/prover-client 0.42.0 → 0.44.0

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

@@ -9,6 +9,7 @@ import {
 } from '@aztec/circuit-types/interfaces';
 import { type Fr, type GlobalVariables, type Header, type VerificationKeys } from '@aztec/circuits.js';
 import { NativeACVMSimulator } from '@aztec/simulator';
+import { type TelemetryClient } from '@aztec/telemetry-client';
 import { type WorldStateSynchronizer } from '@aztec/world-state';
 
 import { type ProverClientConfig } from '../config.js';
@@ -21,17 +22,24 @@ import { ProverAgent } from '../prover-agent/prover-agent.js';
  */
 export class TxProver implements ProverClient {
   private orchestrator: ProvingOrchestrator;
-  private queue = new MemoryProvingQueue();
+  private queue: MemoryProvingQueue;
   private running = false;
 
   private constructor(
     private config: ProverClientConfig,
     private worldStateSynchronizer: WorldStateSynchronizer,
     private vks: VerificationKeys,
+    private telemetry: TelemetryClient,
     private agent?: ProverAgent,
     initialHeader?: Header,
   ) {
-    this.orchestrator = new ProvingOrchestrator(worldStateSynchronizer.getLatest(), this.queue, initialHeader);
+    this.queue = new MemoryProvingQueue(config.proverJobTimeoutMs, config.proverJobPollIntervalMs);
+    this.orchestrator = new ProvingOrchestrator(
+      worldStateSynchronizer.getLatest(),
+      this.queue,
+      telemetry,
+      initialHeader,
+    );
   }
 
   async updateProverConfig(config: Partial<ProverClientConfig & { vks: VerificationKeys }>): Promise<void> {
@@ -42,7 +50,7 @@ export class TxProver implements ProverClient {
     }
 
     if (newConfig.realProofs !== this.config.realProofs && this.agent) {
-      const circuitProver = await TxProver.buildCircuitProver(newConfig);
+      const circuitProver = await TxProver.buildCircuitProver(newConfig, this.telemetry);
       this.agent.setCircuitProver(circuitProver);
     }
 
@@ -66,6 +74,7 @@ export class TxProver implements ProverClient {
     }
 
     this.running = true;
+    this.queue.start();
     this.agent?.start(this.queue);
     return Promise.resolve();
   }
@@ -79,6 +88,7 @@ export class TxProver implements ProverClient {
     }
     this.running = false;
     await this.agent?.stop();
+    await this.queue.stop();
   }
 
   /**
@@ -92,31 +102,35 @@ export class TxProver implements ProverClient {
     config: ProverClientConfig,
     vks: VerificationKeys,
     worldStateSynchronizer: WorldStateSynchronizer,
+    telemetry: TelemetryClient,
     initialHeader?: Header,
   ) {
     const agent = config.proverAgentEnabled
       ? new ProverAgent(
-          await TxProver.buildCircuitProver(config),
+          await TxProver.buildCircuitProver(config, telemetry),
           config.proverAgentConcurrency,
           config.proverAgentPollInterval,
         )
       : undefined;
 
-    const prover = new TxProver(config, worldStateSynchronizer, vks, agent, initialHeader);
+    const prover = new TxProver(config, worldStateSynchronizer, vks, telemetry, agent, initialHeader);
     await prover.start();
     return prover;
   }
 
-  private static async buildCircuitProver(config: ProverClientConfig): Promise<ServerCircuitProver> {
+  private static async buildCircuitProver(
+    config: ProverClientConfig,
+    telemetry: TelemetryClient,
+  ): Promise<ServerCircuitProver> {
     if (config.realProofs) {
-      return await BBNativeRollupProver.new(config);
+      return await BBNativeRollupProver.new(config, telemetry);
     }
 
     const simulationProvider = config.acvmBinaryPath
       ? new NativeACVMSimulator(config.acvmWorkingDirectory, config.acvmBinaryPath)
       : undefined;
 
-    return new TestCircuitProver(simulationProvider);
+    return new TestCircuitProver(telemetry, simulationProvider);
   }
 
   /**