@aztec/prover-client 0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2 → 0.75.0

package/src/proving_broker/proving_broker.ts

@@ -1,5 +1,4 @@
 import {
-  type GetProvingJobResponse,
   type ProofUri,
   type ProvingJob,
   type ProvingJobConsumer,
@@ -206,25 +205,16 @@ export class ProvingBroker implements ProvingJobProducer, ProvingJobConsumer, Tr
     return this.requestQueue.put(() => this.#getCompletedJobs(ids));
   }
 
-  public getProvingJob(filter?: ProvingJobFilter): Promise<GetProvingJobResponse | undefined> {
+  public getProvingJob(filter?: ProvingJobFilter): Promise<{ job: ProvingJob; time: number } | undefined> {
     return this.requestQueue.put(() => this.#getProvingJob(filter));
   }
 
-  public reportProvingJobSuccess(
-    id: ProvingJobId,
-    value: ProofUri,
-    filter?: ProvingJobFilter,
-  ): Promise<GetProvingJobResponse | undefined> {
-    return this.requestQueue.put(() => this.#reportProvingJobSuccess(id, value, filter));
+  public reportProvingJobSuccess(id: ProvingJobId, value: ProofUri): Promise<void> {
+    return this.requestQueue.put(() => this.#reportProvingJobSuccess(id, value));
   }
 
-  public reportProvingJobError(
-    id: ProvingJobId,
-    err: string,
-    retry = false,
-    filter?: ProvingJobFilter,
-  ): Promise<GetProvingJobResponse | undefined> {
-    return this.requestQueue.put(() => this.#reportProvingJobError(id, err, retry, filter));
+  public reportProvingJobError(id: ProvingJobId, err: string, retry = false): Promise<void> {
+    return this.requestQueue.put(() => this.#reportProvingJobError(id, err, retry));
   }
 
   public reportProvingJobProgress(
@@ -315,7 +305,9 @@ export class ProvingBroker implements ProvingJobProducer, ProvingJobConsumer, Tr
   }
 
   // eslint-disable-next-line require-await
-  #getProvingJob(filter: ProvingJobFilter = { allowList: [] }): { job: ProvingJob; time: number } | undefined {
+  async #getProvingJob(
+    filter: ProvingJobFilter = { allowList: [] },
+  ): Promise<{ job: ProvingJob; time: number } | undefined> {
     const allowedProofs: ProvingRequestType[] =
       Array.isArray(filter.allowList) && filter.allowList.length > 0
         ? [...filter.allowList]
@@ -351,12 +343,7 @@ export class ProvingBroker implements ProvingJobProducer, ProvingJobConsumer, Tr
     return undefined;
   }
 
-  async #reportProvingJobError(
-    id: ProvingJobId,
-    err: string,
-    retry = false,
-    filter?: ProvingJobFilter,
-  ): Promise<GetProvingJobResponse | undefined> {
+  async #reportProvingJobError(id: ProvingJobId, err: string, retry = false): Promise<void> {
     const info = this.inProgress.get(id);
     const item = this.jobsCache.get(id);
     const retries = this.retries.get(id) ?? 0;
@@ -378,7 +365,7 @@ export class ProvingBroker implements ProvingJobProducer, ProvingJobConsumer, Tr
       this.logger.warn(`Proving job id=${id} is already settled, ignoring err=${err}`, {
         provingJobId: id,
       });
-      return this.#getProvingJob(filter);
+      return;
     }
 
     if (retry && retries + 1 < this.maxRetries && !this.isJobStale(item)) {
@@ -388,16 +375,10 @@ export class ProvingBroker implements ProvingJobProducer, ProvingJobConsumer, Tr
           provingJobId: id,
         },
       );
-
-      // assign another job to this agent
-      // do this first, before we put the failed job back in the queue
-      const maybeAnotherJob = this.#getProvingJob(filter);
-
       this.retries.set(id, retries + 1);
       this.enqueueJobInternal(item);
       this.instrumentation.incRetriedJobs(item.type);
-
-      return maybeAnotherJob;
+      return;
     }
 
     this.logger.info(
@@ -431,24 +412,22 @@ export class ProvingBroker implements ProvingJobProducer, ProvingJobConsumer, Tr
 
       throw saveErr;
     }
-
-    return this.#getProvingJob(filter);
   }
 
   #reportProvingJobProgress(
     id: ProvingJobId,
     startedAt: number,
     filter?: ProvingJobFilter,
-  ): { job: ProvingJob; time: number } | undefined {
+  ): Promise<{ job: ProvingJob; time: number } | undefined> {
     const job = this.jobsCache.get(id);
     if (!job) {
       this.logger.warn(`Proving job id=${id} does not exist`, { provingJobId: id });
-      return this.#getProvingJob(filter);
+      return filter ? this.#getProvingJob(filter) : Promise.resolve(undefined);
     }
 
     if (this.resultsCache.has(id)) {
       this.logger.warn(`Proving job id=${id} has already been completed`, { provingJobId: id });
-      return this.#getProvingJob(filter);
+      return filter ? this.#getProvingJob(filter) : Promise.resolve(undefined);
     }
 
     const metadata = this.inProgress.get(id);
@@ -466,7 +445,7 @@ export class ProvingBroker implements ProvingJobProducer, ProvingJobConsumer, Tr
         startedAt,
         lastUpdatedAt: this.msTimeSource(),
       });
-      return undefined;
+      return Promise.resolve(undefined);
     } else if (startedAt <= metadata.startedAt) {
       if (startedAt < metadata.startedAt) {
         this.logger.info(
@@ -478,24 +457,21 @@ export class ProvingBroker implements ProvingJobProducer, ProvingJobConsumer, Tr
       }
       metadata.startedAt = startedAt;
       metadata.lastUpdatedAt = now;
-      return undefined;
+      return Promise.resolve(undefined);
+    } else if (filter) {
+      this.logger.warn(
+        `Proving job id=${id} type=${
+          ProvingRequestType[job.type]
+        } already being worked on by another agent. Sending new one`,
+        { provingJobId: id },
+      );
+      return this.#getProvingJob(filter);
+    } else {
+      return Promise.resolve(undefined);
     }
-
-    this.logger.warn(
-      `Proving job id=${id} type=${
-        ProvingRequestType[job.type]
-      } already being worked on by another agent. Sending new one`,
-      { provingJobId: id },
-    );
-
-    return this.#getProvingJob(filter);
   }
 
-  async #reportProvingJobSuccess(
-    id: ProvingJobId,
-    value: ProofUri,
-    filter?: ProvingJobFilter,
-  ): Promise<GetProvingJobResponse | undefined> {
+  async #reportProvingJobSuccess(id: ProvingJobId, value: ProofUri): Promise<void> {
     const info = this.inProgress.get(id);
     const item = this.jobsCache.get(id);
     const retries = this.retries.get(id) ?? 0;
@@ -545,8 +521,6 @@ export class ProvingBroker implements ProvingJobProducer, ProvingJobConsumer, Tr
 
       throw saveErr;
     }
-
-    return this.#getProvingJob(filter);
   }
 
   @trackSpan('ProvingBroker.cleanupPass')

package/src/proving_broker/rpc.ts

@@ -34,18 +34,12 @@ export const ProvingJobProducerSchema: ApiSchemaFor<ProvingJobProducer> = {
 
 export const ProvingJobConsumerSchema: ApiSchemaFor<ProvingJobConsumer> = {
   getProvingJob: z.function().args(optional(ProvingJobFilterSchema)).returns(GetProvingJobResponse.optional()),
-  reportProvingJobError: z
-    .function()
-    .args(ProvingJobId, z.string(), optional(z.boolean()), optional(ProvingJobFilterSchema))
-    .returns(GetProvingJobResponse.optional()),
+  reportProvingJobError: z.function().args(ProvingJobId, z.string(), optional(z.boolean())).returns(z.void()),
   reportProvingJobProgress: z
     .function()
     .args(ProvingJobId, z.number(), optional(ProvingJobFilterSchema))
     .returns(GetProvingJobResponse.optional()),
-  reportProvingJobSuccess: z
-    .function()
-    .args(ProvingJobId, ProofUri, optional(ProvingJobFilterSchema))
-    .returns(GetProvingJobResponse.optional()),
+  reportProvingJobSuccess: z.function().args(ProvingJobId, ProofUri).returns(z.void()),
 };
 
 export const ProvingJobBrokerSchema: ApiSchemaFor<ProvingJobBroker> = {