@aztec/prover-client 0.71.0 → 0.73.0

package/src/proving_broker/broker_prover_facade.ts

@@ -55,7 +55,7 @@ type ProvingJob = {
   type: ProvingRequestType;
   inputsUri: ProofUri;
   promise: PromiseWithResolvers<any>;
-  abortFn?: () => Promise<void>;
+  abortFn?: () => void;
   signal?: AbortSignal;
 };
 
@@ -117,9 +117,9 @@ export class BrokerCircuitProverFacade implements ServerCircuitProver {
     // Create a promise for this job id, regardless of whether it was enqueued at the broker
     // The running promise will monitor for the job to be completed and resolve it either way
     const promise = promiseWithResolvers<ProvingJobResultsMap[T]>();
-    const abortFn = async () => {
+    const abortFn = () => {
       signal?.removeEventListener('abort', abortFn);
-      await this.broker.cancelProvingJob(id);
+      void this.broker.cancelProvingJob(id).catch(err => this.log.warn(`Error cancelling job id=${id}`, err));
     };
     const job: ProvingJob = {
       id,

package/src/proving_broker/proof_store/inline_proof_store.ts

@@ -52,7 +52,7 @@ export class InlineProofStore implements ProofStore {
     return (PREFIX + SEPARATOR + encoded) as ProofUri;
   }
 
-  private decode<T>(uri: ProofUri, schema: ZodFor<T>): T {
+  private decode<T>(uri: ProofUri, schema: ZodFor<T>): Promise<T> {
     const [prefix, data] = uri.split(SEPARATOR);
     if (prefix !== PREFIX) {
       throw new Error('Invalid proof input URI: ' + prefix);

package/src/proving_broker/proving_broker.ts

@@ -147,13 +147,13 @@ export class ProvingBroker implements ProvingJobProducer, ProvingJobConsumer, Tr
     return count;
   };
 
-  public start(): Promise<void> {
+  public async start(): Promise<void> {
     if (this.started) {
       this.logger.info('Proving Broker already started');
       return Promise.resolve();
     }
     this.logger.info('Proving Broker started');
-    for (const [item, result] of this.database.allProvingJobs()) {
+    for await (const [item, result] of this.database.allProvingJobs()) {
       this.logger.info(`Restoring proving job id=${item.id} settled=${!!result}`, {
         provingJobId: item.id,
         status: result ? result.status : 'pending',
@@ -178,8 +178,6 @@ export class ProvingBroker implements ProvingJobProducer, ProvingJobConsumer, Tr
     this.instrumentation.monitorActiveJobs(this.countActiveJobs);
 
     this.started = true;
-
-    return Promise.resolve();
   }
 
   public async stop(): Promise<void> {

package/src/proving_broker/proving_broker_database/memory.ts

@@ -51,8 +51,8 @@ export class InMemoryBrokerDatabase implements ProvingBrokerDatabase {
     return this.deleteProvingJobs(toDelete);
   }
 
-  *allProvingJobs(): Iterable<[ProvingJob, ProvingJobSettledResult | undefined]> {
-    for (const item of this.jobs.values()) {
+  async *allProvingJobs(): AsyncIterableIterator<[ProvingJob, ProvingJobSettledResult | undefined]> {
+    for await (const item of this.jobs.values()) {
       yield [item, this.results.get(item.id)] as const;
     }
   }

package/src/proving_broker/proving_broker_database/persisted.ts

@@ -7,8 +7,8 @@ import {
 } from '@aztec/circuit-types';
 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 type { AztecAsyncKVStore, AztecAsyncMap } from '@aztec/kv-store';
+import { AztecLMDBStoreV2 } from '@aztec/kv-store/lmdb-v2';
 import { Attributes, LmdbMetrics, type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
 
 import { mkdir, readdir } from 'fs/promises';
@@ -18,10 +18,10 @@ import { type ProverBrokerConfig } from '../config.js';
 import { type ProvingBrokerDatabase } from '../proving_broker_database.js';
 
 class SingleEpochDatabase {
-  private jobs: AztecMap<ProvingJobId, string>;
-  private jobResults: AztecMap<ProvingJobId, string>;
+  private jobs: AztecAsyncMap<ProvingJobId, string>;
+  private jobResults: AztecAsyncMap<ProvingJobId, string>;
 
-  constructor(public readonly store: AztecLmdbStore) {
+  constructor(public readonly store: AztecAsyncKVStore) {
     this.jobs = store.openMap('proving_jobs');
     this.jobResults = store.openMap('proving_job_results');
   }
@@ -34,11 +34,11 @@ class SingleEpochDatabase {
     await this.jobs.set(job.id, jsonStringify(job));
   }
 
-  *allProvingJobs(): Iterable<[ProvingJob, ProvingJobSettledResult | undefined]> {
-    for (const jobStr of this.jobs.values()) {
-      const job = jsonParseWithSchema(jobStr, ProvingJob);
-      const resultStr = this.jobResults.get(job.id);
-      const result = resultStr ? jsonParseWithSchema(resultStr, ProvingJobSettledResult) : undefined;
+  async *allProvingJobs(): AsyncIterableIterator<[ProvingJob, ProvingJobSettledResult | undefined]> {
+    for await (const jobStr of this.jobs.valuesAsync()) {
+      const job = await jsonParseWithSchema(jobStr, ProvingJob);
+      const resultStr = await this.jobResults.getAsync(job.id);
+      const result = resultStr ? await jsonParseWithSchema(resultStr, ProvingJobSettledResult) : undefined;
       yield [job, result];
     }
   }
@@ -80,8 +80,8 @@ export class KVBrokerDatabase implements ProvingBrokerDatabase {
     );
   }
 
-  private estimateSize() {
-    const sizes = Array.from(this.epochs.values()).map(x => x.estimateSize());
+  private async estimateSize() {
+    const sizes = await Promise.all(Array.from(this.epochs.values()).map(x => x.estimateSize()));
     return {
       mappingSize: this.config.dataStoreMapSizeKB,
       numItems: sizes.reduce((prev, curr) => prev + curr.numItems, 0),
@@ -110,7 +110,7 @@ export class KVBrokerDatabase implements ProvingBrokerDatabase {
       logger.info(
         `Loading broker database for epoch ${epochNumber} from ${fullDirectory} with map size ${config.dataStoreMapSizeKB}KB`,
       );
-      const db = AztecLmdbStore.open(fullDirectory, config.dataStoreMapSizeKB, false);
+      const db = await AztecLMDBStoreV2.new(fullDirectory, config.dataStoreMapSizeKB);
       const epochDb = new SingleEpochDatabase(db);
       epochs.set(epochNumber, epochDb);
     }
@@ -144,14 +144,14 @@ export class KVBrokerDatabase implements ProvingBrokerDatabase {
       this.logger.info(
         `Creating broker database for epoch ${job.epochNumber} at ${newEpochDirectory} with map size ${this.config.dataStoreMapSizeKB}`,
       );
-      const db = AztecLmdbStore.open(newEpochDirectory, this.config.dataStoreMapSizeKB, false);
+      const db = await AztecLMDBStoreV2.new(newEpochDirectory, this.config.dataStoreMapSizeKB);
       epochDb = new SingleEpochDatabase(db);
       this.epochs.set(job.epochNumber, epochDb);
     }
     await epochDb.addProvingJob(job);
   }
 
-  *allProvingJobs(): Iterable<[ProvingJob, ProvingJobSettledResult | undefined]> {
+  async *allProvingJobs(): AsyncIterableIterator<[ProvingJob, ProvingJobSettledResult | undefined]> {
     const iterators = Array.from(this.epochs.values()).map(x => x.allProvingJobs());
     for (const it of iterators) {
       yield* it;

package/src/proving_broker/proving_broker_database.ts

@@ -19,7 +19,7 @@ export interface ProvingBrokerDatabase {
   /**
    * Returns an iterator over all saved proving jobs
    */
-  allProvingJobs(): Iterable<[ProvingJob, ProvingJobSettledResult | undefined]>;
+  allProvingJobs(): AsyncIterableIterator<[ProvingJob, ProvingJobSettledResult | undefined]>;
 
   /**
    * Saves the result of a proof request

package/src/proving_broker/rpc.ts

@@ -9,9 +9,10 @@ import {
   ProvingJobStatus,
   ProvingRequestType,
 } from '@aztec/circuit-types';
-import { createSafeJsonRpcClient, makeFetch } from '@aztec/foundation/json-rpc/client';
-import { type SafeJsonRpcServer, createSafeJsonRpcServer } from '@aztec/foundation/json-rpc/server';
+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';
+import { createTracedJsonRpcServer, makeTracedFetch } from '@aztec/telemetry-client';
 
 import { z } from 'zod';
 
@@ -47,17 +48,23 @@ export const ProvingJobBrokerSchema: ApiSchemaFor<ProvingJobBroker> = {
 };
 
 export function createProvingBrokerServer(broker: ProvingJobBroker): SafeJsonRpcServer {
-  return createSafeJsonRpcServer(broker, ProvingJobBrokerSchema);
+  return createTracedJsonRpcServer(broker, ProvingJobBrokerSchema);
 }
 
-export function createProvingJobBrokerClient(url: string, fetch = makeFetch([1, 2, 3], false)): ProvingJobBroker {
+export function createProvingJobBrokerClient(url: string, fetch = makeTracedFetch([1, 2, 3], false)): ProvingJobBroker {
   return createSafeJsonRpcClient(url, ProvingJobBrokerSchema, false, 'proverBroker', fetch);
 }
 
-export function createProvingJobProducerClient(url: string, fetch = makeFetch([1, 2, 3], false)): ProvingJobProducer {
+export function createProvingJobProducerClient(
+  url: string,
+  fetch = makeTracedFetch([1, 2, 3], false),
+): ProvingJobProducer {
   return createSafeJsonRpcClient(url, ProvingJobProducerSchema, false, 'provingJobProducer', fetch);
 }
 
-export function createProvingJobConsumerClient(url: string, fetch = makeFetch([1, 2, 3], false)): ProvingJobConsumer {
+export function createProvingJobConsumerClient(
+  url: string,
+  fetch = makeTracedFetch([1, 2, 3], false),
+): ProvingJobConsumer {
   return createSafeJsonRpcClient(url, ProvingJobConsumerSchema, false, 'provingJobConsumer', fetch);
 }