@aztec/prover-client 0.70.0 → 0.71.0

package/src/orchestrator/orchestrator.ts

@@ -49,7 +49,14 @@ import { pushTestData } from '@aztec/foundation/testing';
 import { elapsed } from '@aztec/foundation/timer';
 import { type TreeNodeLocation } from '@aztec/foundation/trees';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vks';
-import { Attributes, type TelemetryClient, type Tracer, trackSpan, wrapCallbackInSpan } from '@aztec/telemetry-client';
+import {
+  Attributes,
+  type TelemetryClient,
+  type Tracer,
+  getTelemetryClient,
+  trackSpan,
+  wrapCallbackInSpan,
+} from '@aztec/telemetry-client';
 
 import { inspect } from 'util';
 
@@ -94,8 +101,8 @@ export class ProvingOrchestrator implements EpochProver {
   constructor(
     private dbProvider: ForkMerkleTreeOperations,
     private prover: ServerCircuitProver,
-    telemetryClient: TelemetryClient,
     private readonly proverId: Fr = Fr.ZERO,
+    telemetryClient: TelemetryClient = getTelemetryClient(),
   ) {
     this.metrics = new ProvingOrchestratorMetrics(telemetryClient, 'ProvingOrchestrator');
   }
@@ -263,11 +270,6 @@ export class ProvingOrchestrator implements EpochProver {
 
         logger.info(`Received transaction: ${tx.hash}`);
 
-        if (tx.isEmpty) {
-          logger.warn(`Ignoring empty transaction ${tx.hash} - it will not be added to this block`);
-          continue;
-        }
-
         const [hints, treeSnapshots] = await this.prepareTransaction(tx, provingState);
         const txProvingState = new TxProvingState(tx, hints, treeSnapshots);
         const txIndex = provingState.addNewTx(txProvingState);
@@ -521,9 +523,7 @@ export class ProvingOrchestrator implements EpochProver {
       buildBaseRollupHints(tx, provingState.globalVariables, db, provingState.spongeBlobState),
     );
 
-    if (!tx.isEmpty) {
-      this.metrics.recordBaseRollupInputs(ms);
-    }
+    this.metrics.recordBaseRollupInputs(ms);
 
     const promises = [MerkleTreeId.NOTE_HASH_TREE, MerkleTreeId.NULLIFIER_TREE, MerkleTreeId.PUBLIC_DATA_TREE].map(
       async (id: MerkleTreeId) => {
@@ -551,11 +551,7 @@ export class ProvingOrchestrator implements EpochProver {
     const { processedTx } = txProvingState;
     const { rollupType, inputs } = txProvingState.getBaseRollupTypeAndInputs();
 
-    logger.debug(
-      `Enqueuing deferred proving base rollup${
-        processedTx.isEmpty ? ' with padding tx' : ''
-      } for ${processedTx.hash.toString()}`,
-    );
+    logger.debug(`Enqueuing deferred proving base rollup for ${processedTx.hash.toString()}`);
 
     this.deferredProving(
       provingState,

package/src/prover-agent/memory-proving-queue.ts

@@ -40,7 +40,7 @@ import { type PromiseWithResolvers, RunningPromise, promiseWithResolvers } from
 import { PriorityMemoryQueue } from '@aztec/foundation/queue';
 import { type TelemetryClient, type Tracer, trackSpan } from '@aztec/telemetry-client';
 
-import { InlineProofStore, type ProofStore } from '../proving_broker/proof_store.js';
+import { InlineProofStore, type ProofStore } from '../proving_broker/proof_store/index.js';
 import { ProvingQueueMetrics } from './queue_metrics.js';
 
 type ProvingJobWithResolvers<T extends ProvingRequestType = ProvingRequestType> = ProvingJob &

package/src/prover-agent/prover-agent.ts

@@ -11,10 +11,16 @@ import {
 import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { elapsed } from '@aztec/foundation/timer';
-import { Attributes, type TelemetryClient, type Traceable, type Tracer, trackSpan } from '@aztec/telemetry-client';
-import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
+import {
+  Attributes,
+  type TelemetryClient,
+  type Traceable,
+  type Tracer,
+  getTelemetryClient,
+  trackSpan,
+} from '@aztec/telemetry-client';
 
-import { InlineProofStore } from '../proving_broker/proof_store.js';
+import { InlineProofStore } from '../proving_broker/proof_store/index.js';
 
 const PRINT_THRESHOLD_NS = 6e10; // 60 seconds
 
@@ -42,7 +48,7 @@ export class ProverAgent implements ProverAgentApi, Traceable {
     /** How long to wait between jobs */
     private pollIntervalMs = 100,
     /** Telemetry client */
-    private telemetry: TelemetryClient = new NoopTelemetryClient(),
+    telemetry: TelemetryClient = getTelemetryClient(),
     /** Logger */
     private log = createLogger('prover-client:prover-agent'),
   ) {

package/src/prover-client/factory.ts

@@ -1,6 +1,5 @@
 import { type ForkMerkleTreeOperations, type ProvingJobBroker } from '@aztec/circuit-types';
-import { type TelemetryClient } from '@aztec/telemetry-client';
-import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
+import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
 
 import { type ProverClientConfig } from '../config.js';
 import { ProverClient } from './prover-client.js';
@@ -9,7 +8,7 @@ export function createProverClient(
   config: ProverClientConfig,
   worldState: ForkMerkleTreeOperations,
   broker: ProvingJobBroker,
-  telemetry: TelemetryClient = new NoopTelemetryClient(),
+  telemetry: TelemetryClient = getTelemetryClient(),
 ) {
   return ProverClient.new(config, worldState, broker, telemetry);
 }

package/src/prover-client/prover-client.ts

@@ -13,12 +13,12 @@ import { Fr } from '@aztec/circuits.js';
 import { times } from '@aztec/foundation/collection';
 import { createLogger } from '@aztec/foundation/log';
 import { NativeACVMSimulator } from '@aztec/simulator/server';
-import { type TelemetryClient } from '@aztec/telemetry-client';
+import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
 
 import { type ProverClientConfig } from '../config.js';
 import { ProvingOrchestrator } from '../orchestrator/orchestrator.js';
 import { BrokerCircuitProverFacade } from '../proving_broker/broker_prover_facade.js';
-import { InlineProofStore } from '../proving_broker/proof_store.js';
+import { InlineProofStore, type ProofStore, createProofStore } from '../proving_broker/proof_store/index.js';
 import { ProvingAgent } from '../proving_broker/proving_agent.js';
 import { ServerEpochProver } from './server-epoch-prover.js';
 
@@ -27,21 +27,24 @@ export class ProverClient implements EpochProverManager {
   private running = false;
   private agents: ProvingAgent[] = [];
 
+  private proofStore: ProofStore;
+  private failedProofStore: ProofStore | undefined;
+
   private constructor(
     private config: ProverClientConfig,
     private worldState: ForkMerkleTreeOperations,
-    private telemetry: TelemetryClient,
     private orchestratorClient: ProvingJobProducer,
     private agentClient?: ProvingJobConsumer,
+    private telemetry: TelemetryClient = getTelemetryClient(),
     private log = createLogger('prover-client:tx-prover'),
   ) {
-    // TODO(palla/prover-node): Cache the paddingTx here, and not in each proving orchestrator,
-    // so it can be reused across multiple ones and not recomputed every time.
+    this.proofStore = new InlineProofStore();
+    this.failedProofStore = this.config.failedProofStore ? createProofStore(this.config.failedProofStore) : undefined;
   }
 
   public createEpochProver(): EpochProver {
-    const facade = new BrokerCircuitProverFacade(this.orchestratorClient);
-    const orchestrator = new ProvingOrchestrator(this.worldState, facade, this.telemetry, this.config.proverId);
+    const facade = new BrokerCircuitProverFacade(this.orchestratorClient, this.proofStore, this.failedProofStore);
+    const orchestrator = new ProvingOrchestrator(this.worldState, facade, this.config.proverId, this.telemetry);
     return new ServerEpochProver(facade, orchestrator);
   }
 
@@ -60,10 +63,6 @@ export class ProverClient implements EpochProverManager {
       await this.createAndStartAgents();
     }
 
-    if (!this.config.realProofs && newConfig.realProofs) {
-      // TODO(palla/prover-node): Reset padding tx here once we cache it at this class
-    }
-
     this.config = newConfig;
   }
 
@@ -100,9 +99,9 @@ export class ProverClient implements EpochProverManager {
     config: ProverClientConfig,
     worldState: ForkMerkleTreeOperations,
     broker: ProvingJobBroker,
-    telemetry: TelemetryClient,
+    telemetry: TelemetryClient = getTelemetryClient(),
   ) {
-    const prover = new ProverClient(config, worldState, telemetry, broker, broker);
+    const prover = new ProverClient(config, worldState, broker, broker, telemetry);
     await prover.start();
     return prover;
   }
@@ -133,9 +132,9 @@ export class ProverClient implements EpochProverManager {
           this.agentClient!,
           proofStore,
           prover,
-          this.telemetry,
           [],
           this.config.proverAgentPollIntervalMs,
+          this.telemetry,
         ),
     );
 
@@ -159,5 +158,5 @@ export function buildServerCircuitProver(
     ? new NativeACVMSimulator(config.acvmWorkingDirectory, config.acvmBinaryPath)
     : undefined;
 
-  return Promise.resolve(new TestCircuitProver(telemetry, simulationProvider, config));
+  return Promise.resolve(new TestCircuitProver(simulationProvider, config, telemetry));
 }

package/src/proving_broker/broker_prover_facade.ts

@@ -1,5 +1,6 @@
 import {
   type ProofAndVerificationKey,
+  type ProofUri,
   type ProvingJobId,
   type ProvingJobInputsMap,
   type ProvingJobProducer,
@@ -41,10 +42,7 @@ import { RunningPromise, promiseWithResolvers } from '@aztec/foundation/promise'
 import { SerialQueue } from '@aztec/foundation/queue';
 import { truncate } from '@aztec/foundation/string';
 
-import { InlineProofStore, type ProofStore } from './proof_store.js';
-
-// 20 minutes, roughly the length of an Aztec epoch. If a proof isn't ready in this amount of time then we've failed to prove the whole epoch
-const MAX_WAIT_MS = 1_200_000;
+import { InlineProofStore, type ProofStore } from './proof_store/index.js';
 
 // Perform a snapshot sync every 30 seconds
 const SNAPSHOT_SYNC_INTERVAL_MS = 30_000;
@@ -55,6 +53,7 @@ const SNAPSHOT_SYNC_CHECK_MAX_REQUEST_SIZE = 1000;
 type ProvingJob = {
   id: ProvingJobId;
   type: ProvingRequestType;
+  inputsUri: ProofUri;
   promise: PromiseWithResolvers<any>;
   abortFn?: () => Promise<void>;
   signal?: AbortSignal;
@@ -70,7 +69,7 @@ export class BrokerCircuitProverFacade implements ServerCircuitProver {
   constructor(
     private broker: ProvingJobProducer,
     private proofStore: ProofStore = new InlineProofStore(),
-    private waitTimeoutMs = MAX_WAIT_MS,
+    private failedProofStore?: ProofStore,
     private pollIntervalMs = 1000,
     private log = createLogger('prover-client:broker-circuit-prover-facade'),
   ) {}
@@ -125,6 +124,7 @@ export class BrokerCircuitProverFacade implements ServerCircuitProver {
     const job: ProvingJob = {
       id,
       type,
+      inputsUri,
       promise,
       abortFn,
       signal,
@@ -335,6 +335,9 @@ export class BrokerCircuitProverFacade implements ServerCircuitProver {
           `Resolving proving job with error id=${job.id} type=${ProvingRequestType[job.type]}`,
           result.reason,
         );
+        if (result.reason !== 'Aborted') {
+          void this.backupFailedProofInputs(job);
+        }
         job.promise.reject(new Error(result.reason));
       }
 
@@ -365,6 +368,26 @@ export class BrokerCircuitProverFacade implements ServerCircuitProver {
     }
   }
 
+  private async backupFailedProofInputs(job: ProvingJob) {
+    try {
+      if (!this.failedProofStore) {
+        return;
+      }
+      const inputs = await this.proofStore.getProofInput(job.inputsUri);
+      const uri = await this.failedProofStore.saveProofInput(job.id, inputs.type, inputs.inputs);
+      this.log.info(`Stored proof inputs for failed job id=${job.id} type=${ProvingRequestType[job.type]} at ${uri}`, {
+        id: job.id,
+        type: job.type,
+        uri,
+      });
+    } catch (err) {
+      this.log.error(
+        `Error backing up proof inputs for failed job id=${job.id} type=${ProvingRequestType[job.type]}`,
+        err,
+      );
+    }
+  }
+
   private async monitorForCompletedJobs() {
     // Monitoring for completed jobs involves 2 stages.
 

package/src/proving_broker/factory.ts

@@ -11,11 +11,15 @@ export async function createAndStartProvingBroker(
 ): Promise<ProvingBroker> {
   const database = config.dataDirectory ? await KVBrokerDatabase.new(config, client) : new InMemoryBrokerDatabase();
 
-  const broker = new ProvingBroker(database, client, {
-    jobTimeoutMs: config.proverBrokerJobTimeoutMs,
-    maxRetries: config.proverBrokerJobMaxRetries,
-    timeoutIntervalMs: config.proverBrokerPollIntervalMs,
-  });
+  const broker = new ProvingBroker(
+    database,
+    {
+      jobTimeoutMs: config.proverBrokerJobTimeoutMs,
+      maxRetries: config.proverBrokerJobMaxRetries,
+      timeoutIntervalMs: config.proverBrokerPollIntervalMs,
+    },
+    client,
+  );
 
   await broker.start();
   return broker;

package/src/proving_broker/index.ts

@@ -4,6 +4,6 @@ export * from './rpc.js';
 export * from './proving_broker_database.js';
 export * from './proving_broker_database/memory.js';
 export * from './proving_broker_database/persisted.js';
-export * from './proof_store.js';
+export * from './proof_store/index.js';
 export * from './factory.js';
 export * from './config.js';

package/src/proving_broker/proof_store/factory.ts

@@ -0,0 +1,42 @@
+import { createLogger } from '@aztec/foundation/log';
+
+import { GoogleCloudStorageProofStore } from './gcs_proof_store.js';
+import { InlineProofStore } from './inline_proof_store.js';
+import { type ProofStore } from './proof_store.js';
+
+export function createProofStore(config: string | undefined, logger = createLogger('prover-client:proof-store')) {
+  if (config === undefined) {
+    logger.info('Creating inline proof store');
+    return new InlineProofStore();
+  } else if (config.startsWith('gs://')) {
+    try {
+      const url = new URL(config);
+      const bucket = url.host;
+      const path = url.pathname.replace(/^\/+/, '');
+      logger.info(`Creating google cloud proof store at ${bucket}`, { bucket, path });
+      return new GoogleCloudStorageProofStore(bucket, path);
+    } catch (err) {
+      throw new Error(
+        `Invalid google cloud proof store definition: '${config}'. Supported values are 'gs://bucket-name/path/to/store'.`,
+      );
+    }
+  } else {
+    throw new Error(`Unknown proof store config: '${config}'. Supported values are 'gs://bucket-name/path/to/store'.`);
+  }
+}
+
+export function createProofStoreForUri(
+  uri: string,
+  logger = createLogger('prover-client:proof-store'),
+): Pick<ProofStore, 'getProofInput' | 'getProofOutput'> {
+  if (uri.startsWith('data://')) {
+    return createProofStore(undefined, logger);
+  } else if (uri.startsWith('gs://')) {
+    const url = new URL(uri);
+    const basePath = url.pathname.replace(/^\/+/, '').split('/').slice(0, -3);
+    url.pathname = basePath.join('/');
+    return createProofStore(uri, logger);
+  } else {
+    throw new Error(`Unknown proof store config: '${uri}'. Supported protocols are 'data://' and 'gs://'.`);
+  }
+}

package/src/proving_broker/proof_store/gcs_proof_store.ts

@@ -0,0 +1,72 @@
+import {
+  type ProofUri,
+  type ProvingJobId,
+  type ProvingJobInputs,
+  type ProvingJobInputsMap,
+  type ProvingJobResult,
+  type ProvingJobResultsMap,
+  ProvingRequestType,
+  getProvingJobInputClassFor,
+} from '@aztec/circuit-types';
+
+import { Storage } from '@google-cloud/storage';
+import { join } from 'path';
+
+import { type ProofStore } from './proof_store.js';
+
+const INPUTS_PATH = 'inputs';
+
+export class GoogleCloudStorageProofStore implements ProofStore {
+  private readonly storage: Storage;
+
+  constructor(private readonly bucketName: string, private readonly path: string) {
+    this.storage = new Storage();
+  }
+
+  public async saveProofInput<T extends ProvingRequestType>(
+    id: ProvingJobId,
+    type: T,
+    inputs: ProvingJobInputsMap[T],
+  ): Promise<ProofUri> {
+    const path = join(this.path, INPUTS_PATH, ProvingRequestType[type], id);
+    const file = this.storage.bucket(this.bucketName).file(path);
+    await file.save(inputs.toBuffer());
+    return file.cloudStorageURI.toString() as ProofUri;
+  }
+
+  saveProofOutput<T extends ProvingRequestType>(
+    _id: ProvingJobId,
+    _type: T,
+    _result: ProvingJobResultsMap[T],
+  ): Promise<ProofUri> {
+    throw new Error('Not implemented');
+  }
+
+  public async getProofInput(uri: ProofUri): Promise<ProvingJobInputs> {
+    try {
+      const url = new URL(uri);
+      const bucket = this.storage.bucket(url.host);
+      const path = url.pathname.replace(/^\/+/, '');
+      const file = bucket.file(path);
+      if (!(await file.exists())) {
+        throw new Error(`File at ${uri} does not exist`);
+      }
+
+      const typeString = path.split('/').at(-2);
+      const type = typeString ? ProvingRequestType[typeString as keyof typeof ProvingRequestType] : undefined;
+      if (type === undefined) {
+        throw new Error(`Unrecognized proof type ${type} in path ${path}`);
+      }
+
+      const contents = await file.download();
+      const inputs = getProvingJobInputClassFor(type).fromBuffer(contents[0]);
+      return { inputs, type } as ProvingJobInputs;
+    } catch (err) {
+      throw new Error(`Error getting proof input at ${uri}: ${err}`);
+    }
+  }
+
+  getProofOutput(_uri: ProofUri): Promise<ProvingJobResult> {
+    throw new Error('Not implemented');
+  }
+}

package/src/proving_broker/proof_store/index.ts

@@ -0,0 +1,3 @@
+export * from './proof_store.js';
+export * from './inline_proof_store.js';
+export * from './factory.js';

package/src/proving_broker/{proof_store.ts → proof_store/inline_proof_store.ts}

@@ -10,50 +10,7 @@ import {
 import { jsonParseWithSchema, jsonStringify } from '@aztec/foundation/json-rpc';
 import { type ZodFor } from '@aztec/foundation/schemas';
 
-/**
- * A database for storing proof inputs and outputs.
- */
-export interface ProofStore {
-  /**
-   * Save a proof input to the database.
-   * @param jobId - The ID of the job the proof input is associated with.
-   * @param type - The type of the proving request.
-   * @param inputs - The proof input to save.
-   * @returns The URI of the saved proof input.
-   */
-  saveProofInput<T extends ProvingRequestType>(
-    jobId: ProvingJobId,
-    type: T,
-    inputs: ProvingJobInputsMap[T],
-  ): Promise<ProofUri>;
-
-  /**
-   * Save a proof output to the database.
-   * @param jobId - The ID of the job the proof input is associated with.
-   * @param type - The type of the proving request.
-   * @param result - The proof output to save.
-   * @returns The URI of the saved proof output.
-   */
-  saveProofOutput<T extends ProvingRequestType>(
-    id: ProvingJobId,
-    type: T,
-    result: ProvingJobResultsMap[T],
-  ): Promise<ProofUri>;
-
-  /**
-   * Retrieve a proof input from the database.
-   * @param uri - The URI of the proof input to retrieve.
-   * @returns The proof input.
-   */
-  getProofInput(uri: ProofUri): Promise<ProvingJobInputs>;
-
-  /**
-   * Retrieve a proof output from the database.
-   * @param uri - The URI of the proof output to retrieve.
-   * @returns The proof output.
-   */
-  getProofOutput(uri: ProofUri): Promise<ProvingJobResult>;
-}
+import { type ProofStore } from './proof_store.js';
 
 // use an ASCII encoded data uri https://datatracker.ietf.org/doc/html/rfc2397#section-2
 // we do this to avoid double encoding to base64 (since the inputs already serialize to a base64 string)

package/src/proving_broker/proof_store/proof_store.ts

@@ -0,0 +1,54 @@
+import {
+  type ProofUri,
+  type ProvingJobId,
+  type ProvingJobInputs,
+  type ProvingJobInputsMap,
+  type ProvingJobResult,
+  type ProvingJobResultsMap,
+  type ProvingRequestType,
+} from '@aztec/circuit-types';
+
+/**
+ * A database for storing proof inputs and outputs.
+ */
+export interface ProofStore {
+  /**
+   * Save a proof input to the database.
+   * @param jobId - The ID of the job the proof input is associated with.
+   * @param type - The type of the proving request.
+   * @param inputs - The proof input to save.
+   * @returns The URI of the saved proof input.
+   */
+  saveProofInput<T extends ProvingRequestType>(
+    jobId: ProvingJobId,
+    type: T,
+    inputs: ProvingJobInputsMap[T],
+  ): Promise<ProofUri>;
+
+  /**
+   * Save a proof output to the database.
+   * @param jobId - The ID of the job the proof input is associated with.
+   * @param type - The type of the proving request.
+   * @param result - The proof output to save.
+   * @returns The URI of the saved proof output.
+   */
+  saveProofOutput<T extends ProvingRequestType>(
+    id: ProvingJobId,
+    type: T,
+    result: ProvingJobResultsMap[T],
+  ): Promise<ProofUri>;
+
+  /**
+   * Retrieve a proof input from the database.
+   * @param uri - The URI of the proof input to retrieve.
+   * @returns The proof input.
+   */
+  getProofInput(uri: ProofUri): Promise<ProvingJobInputs>;
+
+  /**
+   * Retrieve a proof output from the database.
+   * @param uri - The URI of the proof output to retrieve.
+   * @returns The proof output.
+   */
+  getProofOutput(uri: ProofUri): Promise<ProvingJobResult>;
+}

package/src/proving_broker/proving_agent.ts

@@ -12,9 +12,15 @@ import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { truncate } from '@aztec/foundation/string';
 import { Timer } from '@aztec/foundation/timer';
-import { type TelemetryClient, type Traceable, type Tracer, trackSpan } from '@aztec/telemetry-client';
-
-import { type ProofStore } from './proof_store.js';
+import {
+  type TelemetryClient,
+  type Traceable,
+  type Tracer,
+  getTelemetryClient,
+  trackSpan,
+} from '@aztec/telemetry-client';
+
+import { type ProofStore } from './proof_store/index.js';
 import { ProvingAgentInstrumentation } from './proving_agent_instrumentation.js';
 import { ProvingJobController, ProvingJobControllerStatus } from './proving_job_controller.js';
 
@@ -36,12 +42,12 @@ export class ProvingAgent implements Traceable {
     private proofStore: ProofStore,
     /** The prover implementation to defer jobs to */
     private circuitProver: ServerCircuitProver,
-    /** A telemetry client through which to emit metrics */
-    client: TelemetryClient,
     /** Optional list of allowed proof types to build */
     private proofAllowList: Array<ProvingRequestType> = [],
     /** How long to wait between jobs */
     private pollIntervalMs = 1000,
+    /** A telemetry client through which to emit metrics */
+    client: TelemetryClient = getTelemetryClient(),
     private log = createLogger('prover-client:proving-agent'),
   ) {
     this.tracer = client.getTracer('ProvingAgent');

package/src/proving_broker/proving_broker.ts

@@ -13,7 +13,13 @@ import { createLogger } from '@aztec/foundation/log';
 import { type PromiseWithResolvers, RunningPromise, promiseWithResolvers } from '@aztec/foundation/promise';
 import { PriorityMemoryQueue, SerialQueue } from '@aztec/foundation/queue';
 import { Timer } from '@aztec/foundation/timer';
-import { type TelemetryClient, type Traceable, type Tracer, trackSpan } from '@aztec/telemetry-client';
+import {
+  type TelemetryClient,
+  type Traceable,
+  type Tracer,
+  getTelemetryClient,
+  trackSpan,
+} from '@aztec/telemetry-client';
 
 import assert from 'assert';
 
@@ -108,13 +114,13 @@ export class ProvingBroker implements ProvingJobProducer, ProvingJobConsumer, Tr
 
   public constructor(
     private database: ProvingBrokerDatabase,
-    client: TelemetryClient,
     {
       jobTimeoutMs = 30_000,
       timeoutIntervalMs = 10_000,
       maxRetries = 3,
       maxEpochsToKeepResultsFor = 1,
     }: ProofRequestBrokerConfig = {},
+    client: TelemetryClient = getTelemetryClient(),
     private logger = createLogger('prover-client:proving-broker'),
   ) {
     this.tracer = client.getTracer('ProvingBroker');

package/src/proving_broker/proving_broker_database/persisted.ts

@@ -9,7 +9,7 @@ import { jsonParseWithSchema, jsonStringify } from '@aztec/foundation/json-rpc';
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import { type AztecMap } from '@aztec/kv-store';
 import { AztecLmdbStore } from '@aztec/kv-store/lmdb';
-import { Attributes, LmdbMetrics, type TelemetryClient } from '@aztec/telemetry-client';
+import { Attributes, LmdbMetrics, type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
 
 import { mkdir, readdir } from 'fs/promises';
 import { join } from 'path';
@@ -68,7 +68,7 @@ export class KVBrokerDatabase implements ProvingBrokerDatabase {
   private constructor(
     private epochs: Map<number, SingleEpochDatabase>,
     private config: ProverBrokerConfig,
-    client: TelemetryClient,
+    client: TelemetryClient = getTelemetryClient(),
     private logger: Logger,
   ) {
     this.metrics = new LmdbMetrics(
@@ -91,7 +91,7 @@ export class KVBrokerDatabase implements ProvingBrokerDatabase {
 
   public static async new(
     config: ProverBrokerConfig,
-    client: TelemetryClient,
+    client: TelemetryClient = getTelemetryClient(),
     logger = createLogger('prover-client:proving-broker-database'),
   ) {
     const epochs: Map<number, SingleEpochDatabase> = new Map<number, SingleEpochDatabase>();

package/src/test/mock_prover.ts

@@ -43,15 +43,14 @@ import {
   makeRootRollupPublicInputs,
 } from '@aztec/circuits.js/testing';
 import { times } from '@aztec/foundation/collection';
-import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
 
-import { InlineProofStore, type ProofStore } from '../proving_broker/proof_store.js';
+import { InlineProofStore, type ProofStore } from '../proving_broker/proof_store/index.js';
 import { ProvingAgent } from '../proving_broker/proving_agent.js';
 import { ProvingBroker } from '../proving_broker/proving_broker.js';
 import { InMemoryBrokerDatabase } from '../proving_broker/proving_broker_database/memory.js';
 
 export class TestBroker implements ProvingJobProducer {
-  private broker = new ProvingBroker(new InMemoryBrokerDatabase(), new NoopTelemetryClient());
+  private broker = new ProvingBroker(new InMemoryBrokerDatabase());
   private agents: ProvingAgent[];
 
   constructor(
@@ -62,7 +61,7 @@ export class TestBroker implements ProvingJobProducer {
   ) {
     this.agents = times(
       agentCount,
-      () => new ProvingAgent(this.broker, proofStore, prover, new NoopTelemetryClient(), undefined, agentPollInterval),
+      () => new ProvingAgent(this.broker, proofStore, prover, undefined, agentPollInterval),
     );
   }
 

package/dest/proving_broker/proof_store.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"proof_store.d.ts","sourceRoot":"","sources":["../../src/proving_broker/proof_store.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,YAAY,EACjB,gBAAgB,EAChB,KAAK,mBAAmB,EACxB,gBAAgB,EAChB,KAAK,oBAAoB,EACzB,KAAK,kBAAkB,EACxB,MAAM,sBAAsB,CAAC;AAI9B;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB;;;;;;OAMG;IACH,cAAc,CAAC,CAAC,SAAS,kBAAkB,EACzC,KAAK,EAAE,YAAY,EACnB,IAAI,EAAE,CAAC,EACP,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAAC,GAC7B,OAAO,CAAC,QAAQ,CAAC,CAAC;IAErB;;;;;;OAMG;IACH,eAAe,CAAC,CAAC,SAAS,kBAAkB,EAC1C,EAAE,EAAE,YAAY,EAChB,IAAI,EAAE,CAAC,EACP,MAAM,EAAE,oBAAoB,CAAC,CAAC,CAAC,GAC9B,OAAO,CAAC,QAAQ,CAAC,CAAC;IAErB;;;;OAIG;IACH,aAAa,CAAC,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAExD;;;;OAIG;IACH,cAAc,CAAC,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;CAC1D;AAOD;;GAEG;AACH,qBAAa,gBAAiB,YAAW,UAAU;IACjD,cAAc,CAAC,CAAC,SAAS,kBAAkB,EACzC,GAAG,EAAE,YAAY,EACjB,IAAI,EAAE,CAAC,EACP,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAAC,GAC7B,OAAO,CAAC,QAAQ,CAAC;IAKpB,eAAe,CAAC,CAAC,SAAS,kBAAkB,EAC1C,GAAG,EAAE,YAAY,EACjB,IAAI,EAAE,CAAC,EACP,MAAM,EAAE,oBAAoB,CAAC,CAAC,CAAC,GAC9B,OAAO,CAAC,QAAQ,CAAC;IAKpB,aAAa,CAAC,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAIvD,cAAc,CAAC,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAIxD,OAAO,CAAC,MAAM;IAKd,OAAO,CAAC,MAAM;CAQf"}