@aztec/prover-client 0.76.4 → 0.77.0-testnet-ignition.21

package/src/prover-client/factory.ts

@@ -1,7 +1,7 @@
-import { type ForkMerkleTreeOperations, type ProvingJobBroker } from '@aztec/circuit-types';
+import type { ForkMerkleTreeOperations, ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
 import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
 
-import { type ProverClientConfig } from '../config.js';
+import type { ProverClientConfig } from '../config.js';
 import { ProverClient } from './prover-client.js';
 
 export function createProverClient(

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

@@ -1,21 +1,21 @@
 import { type ACVMConfig, type BBConfig, BBNativeRollupProver, TestCircuitProver } from '@aztec/bb-prover';
-import {
-  type ActualProverConfig,
-  type EpochProver,
-  type EpochProverManager,
-  type ForkMerkleTreeOperations,
-  type ProvingJobBroker,
-  type ProvingJobConsumer,
-  type ProvingJobProducer,
-  type ServerCircuitProver,
-} from '@aztec/circuit-types/interfaces';
-import { Fr } from '@aztec/circuits.js';
 import { times } from '@aztec/foundation/collection';
+import { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
 import { NativeACVMSimulator } from '@aztec/simulator/server';
+import type {
+  ActualProverConfig,
+  EpochProver,
+  EpochProverManager,
+  ForkMerkleTreeOperations,
+  ProvingJobBroker,
+  ProvingJobConsumer,
+  ProvingJobProducer,
+  ServerCircuitProver,
+} from '@aztec/stdlib/interfaces/server';
 import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
 
-import { type ProverClientConfig } from '../config.js';
+import type { ProverClientConfig } from '../config.js';
 import { ProvingOrchestrator } from '../orchestrator/orchestrator.js';
 import { BrokerCircuitProverFacade } from '../proving_broker/broker_prover_facade.js';
 import { InlineProofStore, type ProofStore, createProofStore } from '../proving_broker/proof_store/index.js';

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

@@ -1,9 +1,12 @@
-import { type EpochProver, type L2Block, type ProcessedTx, type Tx } from '@aztec/circuit-types';
-import { type BlockHeader, type Fr, type GlobalVariables, type Proof } from '@aztec/circuits.js';
-import { type RootRollupPublicInputs } from '@aztec/circuits.js/rollup';
+import type { Fr } from '@aztec/foundation/fields';
+import type { L2Block } from '@aztec/stdlib/block';
+import type { EpochProver } from '@aztec/stdlib/interfaces/server';
+import type { Proof } from '@aztec/stdlib/proofs';
+import type { RootRollupPublicInputs } from '@aztec/stdlib/rollup';
+import type { BlockHeader, GlobalVariables, ProcessedTx, Tx } from '@aztec/stdlib/tx';
 
-import { type ProvingOrchestrator } from '../orchestrator/orchestrator.js';
-import { type BrokerCircuitProverFacade } from '../proving_broker/broker_prover_facade.js';
+import type { ProvingOrchestrator } from '../orchestrator/orchestrator.js';
+import type { BrokerCircuitProverFacade } from '../proving_broker/broker_prover_facade.js';
 
 /** Encapsulates the proving orchestrator and the broker facade */
 export class ServerEpochProver implements EpochProver {

package/src/proving_broker/broker_prover_facade.ts

@@ -1,3 +1,15 @@
+import type {
+  AVM_PROOF_LENGTH_IN_FIELDS,
+  NESTED_RECURSIVE_PROOF_LENGTH,
+  NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH,
+  RECURSIVE_PROOF_LENGTH,
+  TUBE_PROOF_LENGTH,
+} from '@aztec/constants';
+import { sha256 } from '@aztec/foundation/crypto';
+import { createLogger } from '@aztec/foundation/log';
+import { type PromiseWithResolvers, RunningPromise, promiseWithResolvers } from '@aztec/foundation/promise';
+import { truncate } from '@aztec/foundation/string';
+import type { AvmCircuitInputs } from '@aztec/stdlib/avm';
 import {
   type ProofAndVerificationKey,
   type ProofUri,
@@ -6,40 +18,26 @@ import {
   type ProvingJobProducer,
   type ProvingJobResultsMap,
   type ProvingJobStatus,
-  ProvingRequestType,
   type PublicInputsAndRecursiveProof,
   type ServerCircuitProver,
   makeProvingJobId,
-} from '@aztec/circuit-types';
-import {
-  type AVM_PROOF_LENGTH_IN_FIELDS,
-  type AvmCircuitInputs,
-  type BaseParityInputs,
-  type NESTED_RECURSIVE_PROOF_LENGTH,
-  type NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH,
-  type ParityPublicInputs,
-  type RECURSIVE_PROOF_LENGTH,
-  type RootParityInputs,
-  type TUBE_PROOF_LENGTH,
-} from '@aztec/circuits.js';
-import {
-  type BaseOrMergeRollupPublicInputs,
-  type BlockMergeRollupInputs,
-  type BlockRootOrBlockMergePublicInputs,
-  type BlockRootRollupInputs,
-  type EmptyBlockRootRollupInputs,
-  type MergeRollupInputs,
-  type PrivateBaseRollupInputs,
-  type PublicBaseRollupInputs,
-  type RootRollupInputs,
-  type RootRollupPublicInputs,
-  type SingleTxBlockRootRollupInputs,
-  type TubeInputs,
-} from '@aztec/circuits.js/rollup';
-import { sha256 } from '@aztec/foundation/crypto';
-import { createLogger } from '@aztec/foundation/log';
-import { RunningPromise, promiseWithResolvers } from '@aztec/foundation/promise';
-import { truncate } from '@aztec/foundation/string';
+} from '@aztec/stdlib/interfaces/server';
+import type { BaseParityInputs, ParityPublicInputs, RootParityInputs } from '@aztec/stdlib/parity';
+import { ProvingRequestType } from '@aztec/stdlib/proofs';
+import type {
+  BaseOrMergeRollupPublicInputs,
+  BlockMergeRollupInputs,
+  BlockRootOrBlockMergePublicInputs,
+  BlockRootRollupInputs,
+  EmptyBlockRootRollupInputs,
+  MergeRollupInputs,
+  PrivateBaseRollupInputs,
+  PublicBaseRollupInputs,
+  RootRollupInputs,
+  RootRollupPublicInputs,
+  SingleTxBlockRootRollupInputs,
+  TubeInputs,
+} from '@aztec/stdlib/rollup';
 
 import { InlineProofStore, type ProofStore } from './proof_store/index.js';
 

package/src/proving_broker/config.ts

@@ -1,6 +1,11 @@
-import { ProvingRequestType } from '@aztec/circuit-types';
-import { type ConfigMappingsType, booleanConfigHelper, numberConfigHelper } from '@aztec/foundation/config';
+import {
+  type ConfigMappingsType,
+  booleanConfigHelper,
+  getDefaultConfig,
+  numberConfigHelper,
+} from '@aztec/foundation/config';
 import { type DataStoreConfig, dataConfigMappings } from '@aztec/kv-store/config';
+import { ProvingRequestType } from '@aztec/stdlib/proofs';
 
 import { z } from 'zod';
 
@@ -19,6 +24,8 @@ export const ProverBrokerConfig = z.object({
   proverBrokerBatchSize: z.number(),
   /** How often the job batches get flushed */
   proverBrokerBatchIntervalMs: z.number(),
+  /** The maximum number of epochs to keep results for */
+  proverBrokerMaxEpochsToKeepResultsFor: z.number(),
 });
 
 export type ProverBrokerConfig = z.infer<typeof ProverBrokerConfig> &
@@ -50,9 +57,16 @@ export const proverBrokerConfigMappings: ConfigMappingsType<ProverBrokerConfig>
     description: 'How often to flush batches to disk',
     ...numberConfigHelper(50),
   },
+  proverBrokerMaxEpochsToKeepResultsFor: {
+    env: 'PROVER_BROKER_MAX_EPOCHS_TO_KEEP_RESULTS_FOR',
+    description: 'The maximum number of epochs to keep results for',
+    ...numberConfigHelper(1),
+  },
   ...dataConfigMappings,
 };
 
+export const defaultProverBrokerConfig: ProverBrokerConfig = getDefaultConfig(proverBrokerConfigMappings);
+
 export const ProverAgentConfig = z.object({
   /** The number of prover agents to start */
   proverAgentCount: z.number(),
@@ -64,8 +78,12 @@ export const ProverAgentConfig = z.object({
   proverBrokerUrl: z.string().optional(),
   /** Whether to construct real proofs */
   realProofs: z.boolean(),
-  /** Artificial delay to introduce to all operations to the test prover. */
+  /** The type of artificial delay to introduce */
+  proverTestDelayType: z.enum(['fixed', 'realistic']),
+  /** If using fixed delay, the time each operation takes. */
   proverTestDelayMs: z.number(),
+  /** If using realistic delays, what percentage of realistic times to apply. */
+  proverTestDelayFactor: z.number(),
 });
 
 export type ProverAgentConfig = z.infer<typeof ProverAgentConfig>;
@@ -99,9 +117,19 @@ export const proverAgentConfigMappings: ConfigMappingsType<ProverAgentConfig> =
     description: 'Whether to construct real proofs',
     ...booleanConfigHelper(false),
   },
+  proverTestDelayType: {
+    env: 'PROVER_TEST_DELAY_TYPE',
+    description: 'The type of artificial delay to introduce',
+    defaultValue: 'fixed',
+  },
   proverTestDelayMs: {
     env: 'PROVER_TEST_DELAY_MS',
     description: 'Artificial delay to introduce to all operations to the test prover.',
     ...numberConfigHelper(0),
   },
+  proverTestDelayFactor: {
+    env: 'PROVER_TEST_DELAY_FACTOR',
+    description: 'If using realistic delays, what percentage of realistic times to apply.',
+    ...numberConfigHelper(1),
+  },
 };

package/src/proving_broker/factory.ts

@@ -1,6 +1,6 @@
-import { type TelemetryClient } from '@aztec/telemetry-client';
+import type { TelemetryClient } from '@aztec/telemetry-client';
 
-import { type ProverBrokerConfig } from './config.js';
+import type { ProverBrokerConfig } from './config.js';
 import { ProvingBroker } from './proving_broker.js';
 import { InMemoryBrokerDatabase } from './proving_broker_database/memory.js';
 import { KVBrokerDatabase } from './proving_broker_database/persisted.js';
@@ -11,15 +11,7 @@ export async function createAndStartProvingBroker(
 ): Promise<ProvingBroker> {
   const database = config.dataDirectory ? await KVBrokerDatabase.new(config, client) : new InMemoryBrokerDatabase();
 
-  const broker = new ProvingBroker(
-    database,
-    {
-      jobTimeoutMs: config.proverBrokerJobTimeoutMs,
-      maxRetries: config.proverBrokerJobMaxRetries,
-      timeoutIntervalMs: config.proverBrokerPollIntervalMs,
-    },
-    client,
-  );
+  const broker = new ProvingBroker(database, config, client);
 
   await broker.start();
   return broker;

package/src/proving_broker/fixtures.ts

@@ -1,5 +1,6 @@
-import { type ProofUri, type ProvingJobId, ProvingRequestType, makeProvingJobId } from '@aztec/circuit-types';
 import { randomBytes } from '@aztec/foundation/crypto';
+import { type ProofUri, type ProvingJobId, makeProvingJobId } from '@aztec/stdlib/interfaces/server';
+import { ProvingRequestType } from '@aztec/stdlib/proofs';
 
 export function makeRandomProvingJobId(epochNumber?: number): ProvingJobId {
   return makeProvingJobId(epochNumber ?? 1, ProvingRequestType.BASE_PARITY, randomBytes(8).toString('hex'));

package/src/proving_broker/proof_store/factory.ts

@@ -2,7 +2,7 @@ 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';
+import type { ProofStore } from './proof_store.js';
 
 export function createProofStore(config: string | undefined, logger = createLogger('prover-client:proof-store')) {
   if (config === undefined) {

package/src/proving_broker/proof_store/gcs_proof_store.ts

@@ -5,14 +5,14 @@ import {
   type ProvingJobInputsMap,
   type ProvingJobResult,
   type ProvingJobResultsMap,
-  ProvingRequestType,
   getProvingJobInputClassFor,
-} from '@aztec/circuit-types';
+} from '@aztec/stdlib/interfaces/server';
+import { ProvingRequestType } from '@aztec/stdlib/proofs';
 
 import { Storage } from '@google-cloud/storage';
 import { join } from 'path';
 
-import { type ProofStore } from './proof_store.js';
+import type { ProofStore } from './proof_store.js';
 
 const INPUTS_PATH = 'inputs';
 

package/src/proving_broker/proof_store/inline_proof_store.ts

@@ -1,3 +1,4 @@
+import { jsonParseWithSchema, jsonStringify } from '@aztec/foundation/json-rpc';
 import {
   type ProofUri,
   type ProvingJobId,
@@ -5,12 +6,11 @@ import {
   type ProvingJobInputsMap,
   ProvingJobResult,
   type ProvingJobResultsMap,
-  type ProvingRequestType,
-} from '@aztec/circuit-types';
-import { jsonParseWithSchema, jsonStringify } from '@aztec/foundation/json-rpc';
-import { type ZodFor } from '@aztec/foundation/schemas';
+} from '@aztec/stdlib/interfaces/server';
+import type { ProvingRequestType } from '@aztec/stdlib/proofs';
+import type { ZodFor } from '@aztec/stdlib/schemas';
 
-import { type ProofStore } from './proof_store.js';
+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

@@ -1,12 +1,12 @@
-import {
-  type ProofUri,
-  type ProvingJobId,
-  type ProvingJobInputs,
-  type ProvingJobInputsMap,
-  type ProvingJobResult,
-  type ProvingJobResultsMap,
-  type ProvingRequestType,
-} from '@aztec/circuit-types';
+import type {
+  ProofUri,
+  ProvingJobId,
+  ProvingJobInputs,
+  ProvingJobInputsMap,
+  ProvingJobResult,
+  ProvingJobResultsMap,
+} from '@aztec/stdlib/interfaces/server';
+import type { ProvingRequestType } from '@aztec/stdlib/proofs';
 
 /**
  * A database for storing proof inputs and outputs.

package/src/proving_broker/proving_agent.ts

@@ -1,17 +1,17 @@
-import {
-  ProvingError,
-  type ProvingJob,
-  type ProvingJobConsumer,
-  type ProvingJobId,
-  type ProvingJobInputs,
-  type ProvingJobResultsMap,
-  ProvingRequestType,
-  type ServerCircuitProver,
-} from '@aztec/circuit-types';
 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 { ProvingError } from '@aztec/stdlib/errors';
+import type {
+  ProvingJob,
+  ProvingJobConsumer,
+  ProvingJobId,
+  ProvingJobInputs,
+  ProvingJobResultsMap,
+  ServerCircuitProver,
+} from '@aztec/stdlib/interfaces/server';
+import { ProvingRequestType } from '@aztec/stdlib/proofs';
 import {
   type TelemetryClient,
   type Traceable,
@@ -20,7 +20,7 @@ import {
   trackSpan,
 } from '@aztec/telemetry-client';
 
-import { type ProofStore } from './proof_store/index.js';
+import type { ProofStore } from './proof_store/index.js';
 import { ProvingAgentInstrumentation } from './proving_agent_instrumentation.js';
 import { ProvingJobController, ProvingJobControllerStatus } from './proving_job_controller.js';
 

package/src/proving_broker/proving_agent_instrumentation.ts

@@ -1,4 +1,4 @@
-import { type Timer } from '@aztec/foundation/timer';
+import type { Timer } from '@aztec/foundation/timer';
 import { type Histogram, Metrics, type TelemetryClient, ValueType } from '@aztec/telemetry-client';
 
 export class ProvingAgentInstrumentation {
@@ -9,13 +9,13 @@ export class ProvingAgentInstrumentation {
 
     this.idleTime = meter.createHistogram(Metrics.PROVING_AGENT_IDLE, {
       description: 'Records how long an agent was idle',
-      unit: 'ms',
-      valueType: ValueType.INT,
+      unit: 's',
+      valueType: ValueType.DOUBLE,
     });
   }
 
   recordIdleTime(msOrTimer: Timer | number) {
-    const duration = typeof msOrTimer === 'number' ? msOrTimer : Math.floor(msOrTimer.ms());
-    this.idleTime.record(duration);
+    const duration = typeof msOrTimer === 'number' ? msOrTimer : msOrTimer.ms();
+    this.idleTime.record(duration / 1000);
   }
 }

package/src/proving_broker/proving_broker.ts

@@ -1,19 +1,19 @@
-import {
-  type GetProvingJobResponse,
-  type ProofUri,
-  type ProvingJob,
-  type ProvingJobConsumer,
-  type ProvingJobFilter,
-  type ProvingJobId,
-  type ProvingJobProducer,
-  type ProvingJobSettledResult,
-  type ProvingJobStatus,
-  ProvingRequestType,
-} from '@aztec/circuit-types';
 import { createLogger } from '@aztec/foundation/log';
 import { type PromiseWithResolvers, RunningPromise, promiseWithResolvers } from '@aztec/foundation/promise';
 import { PriorityMemoryQueue } from '@aztec/foundation/queue';
 import { Timer } from '@aztec/foundation/timer';
+import type {
+  GetProvingJobResponse,
+  ProofUri,
+  ProvingJob,
+  ProvingJobConsumer,
+  ProvingJobFilter,
+  ProvingJobId,
+  ProvingJobProducer,
+  ProvingJobSettledResult,
+  ProvingJobStatus,
+} from '@aztec/stdlib/interfaces/server';
+import { ProvingRequestType } from '@aztec/stdlib/proofs';
 import {
   type TelemetryClient,
   type Traceable,
@@ -24,7 +24,8 @@ import {
 
 import assert from 'assert';
 
-import { type ProvingBrokerDatabase } from './proving_broker_database.js';
+import { type ProverBrokerConfig, defaultProverBrokerConfig } from './config.js';
+import type { ProvingBrokerDatabase } from './proving_broker_database.js';
 import { type MonitorCallback, ProvingBrokerInstrumentation } from './proving_broker_instrumentation.js';
 
 type InProgressMetadata = {
@@ -33,14 +34,6 @@ type InProgressMetadata = {
   lastUpdatedAt: number;
 };
 
-type ProofRequestBrokerConfig = {
-  timeoutIntervalMs?: number;
-  jobTimeoutMs?: number;
-  maxRetries?: number;
-  maxEpochsToKeepResultsFor?: number;
-  maxParallelCleanUps?: number;
-};
-
 type EnqueuedProvingJob = Pick<ProvingJob, 'id' | 'epochNumber'>;
 
 /**
@@ -115,20 +108,28 @@ export class ProvingBroker implements ProvingJobProducer, ProvingJobConsumer, Tr
   public constructor(
     private database: ProvingBrokerDatabase,
     {
-      jobTimeoutMs = 30_000,
-      timeoutIntervalMs = 10_000,
-      maxRetries = 3,
-      maxEpochsToKeepResultsFor = 1,
-    }: ProofRequestBrokerConfig = {},
+      proverBrokerJobTimeoutMs,
+      proverBrokerPollIntervalMs,
+      proverBrokerJobMaxRetries,
+      proverBrokerMaxEpochsToKeepResultsFor,
+    }: Required<
+      Pick<
+        ProverBrokerConfig,
+        | 'proverBrokerJobTimeoutMs'
+        | 'proverBrokerPollIntervalMs'
+        | 'proverBrokerJobMaxRetries'
+        | 'proverBrokerMaxEpochsToKeepResultsFor'
+      >
+    > = defaultProverBrokerConfig,
     client: TelemetryClient = getTelemetryClient(),
     private logger = createLogger('prover-client:proving-broker'),
   ) {
     this.tracer = client.getTracer('ProvingBroker');
     this.instrumentation = new ProvingBrokerInstrumentation(client);
-    this.cleanupPromise = new RunningPromise(this.cleanupPass.bind(this), this.logger, timeoutIntervalMs);
-    this.jobTimeoutMs = jobTimeoutMs;
-    this.maxRetries = maxRetries;
-    this.maxEpochsToKeepResultsFor = maxEpochsToKeepResultsFor;
+    this.cleanupPromise = new RunningPromise(this.cleanupPass.bind(this), this.logger, proverBrokerPollIntervalMs);
+    this.jobTimeoutMs = proverBrokerJobTimeoutMs!;
+    this.maxRetries = proverBrokerJobMaxRetries!;
+    this.maxEpochsToKeepResultsFor = proverBrokerMaxEpochsToKeepResultsFor!;
   }
 
   private measureQueueDepth: MonitorCallback = (type: ProvingRequestType) => {
@@ -237,10 +238,11 @@ export class ProvingBroker implements ProvingJobProducer, ProvingJobConsumer, Tr
     if (this.jobsCache.has(job.id)) {
       const existing = this.jobsCache.get(job.id);
       assert.deepStrictEqual(job, existing, 'Duplicate proving job ID');
-      this.logger.debug(`Duplicate proving job id=${job.id} epochNumber=${job.epochNumber}. Ignoring`, {
+      this.logger.warn(`Cached proving job id=${job.id} epochNumber=${job.epochNumber}. Not enqueuing again`, {
         provingJobId: job.id,
       });
-      return Promise.resolve(jobStatus);
+      this.instrumentation.incCachedJobs(job.type);
+      return jobStatus;
     }
 
     if (this.isJobStale(job)) {
@@ -256,6 +258,7 @@ export class ProvingBroker implements ProvingJobProducer, ProvingJobConsumer, Tr
       this.jobsCache.set(job.id, job);
       await this.database.addProvingJob(job);
       this.enqueueJobInternal(job);
+      this.instrumentation.incTotalJobs(job.type);
     } catch (err) {
       this.logger.error(`Failed to save proving job id=${job.id}: ${err}`, err, { provingJobId: job.id });
       this.jobsCache.delete(job.id);

package/src/proving_broker/proving_broker_database/memory.ts

@@ -4,9 +4,9 @@ import {
   type ProvingJobId,
   type ProvingJobSettledResult,
   getEpochFromProvingJobId,
-} from '@aztec/circuit-types';
+} from '@aztec/stdlib/interfaces/server';
 
-import { type ProvingBrokerDatabase } from '../proving_broker_database.js';
+import type { ProvingBrokerDatabase } from '../proving_broker_database.js';
 
 export class InMemoryBrokerDatabase implements ProvingBrokerDatabase {
   private jobs = new Map<ProvingJobId, ProvingJob>();

package/src/proving_broker/proving_broker_database/persisted.ts

@@ -1,22 +1,22 @@
+import { jsonParseWithSchema, jsonStringify } from '@aztec/foundation/json-rpc';
+import { type Logger, createLogger } from '@aztec/foundation/log';
+import { BatchQueue } from '@aztec/foundation/queue';
+import type { AztecAsyncKVStore, AztecAsyncMap } from '@aztec/kv-store';
+import { AztecLMDBStoreV2 } from '@aztec/kv-store/lmdb-v2';
 import {
   type ProofUri,
   ProvingJob,
   type ProvingJobId,
   ProvingJobSettledResult,
   getEpochFromProvingJobId,
-} from '@aztec/circuit-types';
-import { jsonParseWithSchema, jsonStringify } from '@aztec/foundation/json-rpc';
-import { type Logger, createLogger } from '@aztec/foundation/log';
-import { BatchQueue } from '@aztec/foundation/queue';
-import type { AztecAsyncKVStore, AztecAsyncMap } from '@aztec/kv-store';
-import { AztecLMDBStoreV2 } from '@aztec/kv-store/lmdb-v2';
+} from '@aztec/stdlib/interfaces/server';
 import { Attributes, LmdbMetrics, type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
 
 import { mkdir, readdir } from 'fs/promises';
 import { join } from 'path';
 
-import { type ProverBrokerConfig } from '../config.js';
-import { type ProvingBrokerDatabase } from '../proving_broker_database.js';
+import type { ProverBrokerConfig } from '../config.js';
+import type { ProvingBrokerDatabase } from '../proving_broker_database.js';
 
 class SingleEpochDatabase {
   private jobs: AztecAsyncMap<ProvingJobId, string>;

package/src/proving_broker/proving_broker_database.ts

@@ -1,4 +1,4 @@
-import { type ProofUri, type ProvingJob, type ProvingJobId, type ProvingJobSettledResult } from '@aztec/circuit-types';
+import type { ProofUri, ProvingJob, ProvingJobId, ProvingJobSettledResult } from '@aztec/stdlib/interfaces/server';
 
 /**
  * A database for storing proof requests and their results

package/src/proving_broker/proving_broker_instrumentation.ts

@@ -1,5 +1,5 @@
-import { ProvingRequestType } from '@aztec/circuit-types';
-import { type Timer } from '@aztec/foundation/timer';
+import type { Timer } from '@aztec/foundation/timer';
+import { ProvingRequestType } from '@aztec/stdlib/proofs';
 import {
   Attributes,
   type Histogram,
@@ -19,6 +19,8 @@ export class ProvingBrokerInstrumentation {
   private resolvedJobs: UpDownCounter;
   private rejectedJobs: UpDownCounter;
   private timedOutJobs: UpDownCounter;
+  private cachedJobs: UpDownCounter;
+  private totalJobs: UpDownCounter;
   private jobWait: Histogram;
   private jobDuration: Histogram;
   private retriedJobs: UpDownCounter;
@@ -50,6 +52,14 @@ export class ProvingBrokerInstrumentation {
       valueType: ValueType.INT,
     });
 
+    this.cachedJobs = meter.createUpDownCounter(Metrics.PROVING_QUEUE_CACHED_JOBS, {
+      valueType: ValueType.INT,
+    });
+
+    this.totalJobs = meter.createUpDownCounter(Metrics.PROVING_QUEUE_TOTAL_JOBS, {
+      valueType: ValueType.INT,
+    });
+
     this.jobWait = meter.createHistogram(Metrics.PROVING_QUEUE_JOB_WAIT, {
       description: 'Records how long a job sits in the queue',
       unit: 'ms',
@@ -95,6 +105,18 @@ export class ProvingBrokerInstrumentation {
     });
   }
 
+  incCachedJobs(proofType: ProvingRequestType) {
+    this.cachedJobs.add(1, {
+      [Attributes.PROVING_JOB_TYPE]: ProvingRequestType[proofType],
+    });
+  }
+
+  incTotalJobs(proofType: ProvingRequestType) {
+    this.totalJobs.add(1, {
+      [Attributes.PROVING_JOB_TYPE]: ProvingRequestType[proofType],
+    });
+  }
+
   recordJobWait(proofType: ProvingRequestType, msOrTimer: Timer | number) {
     const duration = typeof msOrTimer === 'number' ? msOrTimer : Math.floor(msOrTimer.ms());
     this.jobWait.record(duration, {

package/src/proving_broker/proving_job_controller.ts

@@ -1,10 +1,10 @@
-import {
-  type ProvingJobId,
-  type ProvingJobInputs,
-  type ProvingJobResultsMap,
-  ProvingRequestType,
-  type ServerCircuitProver,
-} from '@aztec/circuit-types';
+import type {
+  ProvingJobId,
+  ProvingJobInputs,
+  ProvingJobResultsMap,
+  ServerCircuitProver,
+} from '@aztec/stdlib/interfaces/server';
+import { ProvingRequestType } from '@aztec/stdlib/proofs';
 
 export enum ProvingJobControllerStatus {
   IDLE = 'idle',

package/src/proving_broker/rpc.ts

@@ -1,5 +1,6 @@
+import { createSafeJsonRpcClient } from '@aztec/foundation/json-rpc/client';
+import type { SafeJsonRpcServer } from '@aztec/foundation/json-rpc/server';
 import {
-  type ComponentsVersions,
   type GetProvingJobResponse,
   ProofUri,
   ProvingJob,
@@ -8,12 +9,10 @@ import {
   ProvingJobId,
   type ProvingJobProducer,
   ProvingJobStatus,
-  ProvingRequestType,
-  getVersioningResponseHandler,
-} from '@aztec/circuit-types';
-import { createSafeJsonRpcClient } from '@aztec/foundation/json-rpc/client';
-import { type SafeJsonRpcServer } from '@aztec/foundation/json-rpc/server';
-import { type ApiSchemaFor, optional } from '@aztec/foundation/schemas';
+} from '@aztec/stdlib/interfaces/server';
+import { ProvingRequestType } from '@aztec/stdlib/proofs';
+import { type ApiSchemaFor, optional } from '@aztec/stdlib/schemas';
+import { type ComponentsVersions, getVersioningResponseHandler } from '@aztec/stdlib/versioning';
 import { createTracedJsonRpcServer, makeTracedFetch } from '@aztec/telemetry-client';
 
 import { z } from 'zod';