@aztec/prover-client 0.65.1 → 0.66.0

package/dest/proving_broker/proving_agent.js

@@ -1,21 +1,28 @@
-import { ProvingError, } from '@aztec/circuit-types';
+import { ProvingError, ProvingRequestType, } from '@aztec/circuit-types';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
-import { ProvingJobController, ProvingJobStatus } from './proving_job_controller.js';
+import { Timer } from '@aztec/foundation/timer';
+import { ProvingAgentInstrumentation } from './proving_agent_instrumentation.js';
+import { ProvingJobController, ProvingJobControllerStatus } from './proving_job_controller.js';
 /**
  * A helper class that encapsulates a circuit prover and connects it to a job source.
  */
 export class ProvingAgent {
     constructor(
     /** The source of proving jobs */
-    jobSource, 
+    broker, 
+    /** Database holding proof inputs and outputs */
+    proofStore, 
     /** The prover implementation to defer jobs to */
     circuitProver, 
+    /** A telemetry client through which to emit metrics */
+    client, 
     /** Optional list of allowed proof types to build */
-    proofAllowList, 
+    proofAllowList = [], 
     /** How long to wait between jobs */
-    pollIntervalMs = 1000, log = createDebugLogger('aztec:proving-broker:proving-agent')) {
-        this.jobSource = jobSource;
+    pollIntervalMs = 1000, log = createDebugLogger('aztec:prover-client:proving-agent')) {
+        this.broker = broker;
+        this.proofStore = proofStore;
         this.circuitProver = circuitProver;
         this.proofAllowList = proofAllowList;
         this.pollIntervalMs = pollIntervalMs;
@@ -27,34 +34,62 @@ export class ProvingAgent {
                 // (2) get a new job
                 // If during (1) the broker returns a new job that means we can cancel the current job and start the new one
                 let maybeJob;
-                if (this.currentJobController?.getStatus() === ProvingJobStatus.PROVING) {
-                    maybeJob = await this.jobSource.reportProvingJobProgress(this.currentJobController.getJobId(), this.currentJobController.getStartedAt(), { allowList: this.proofAllowList });
+                if (this.currentJobController?.getStatus() === ProvingJobControllerStatus.PROVING) {
+                    maybeJob = await this.broker.reportProvingJobProgress(this.currentJobController.getJobId(), this.currentJobController.getStartedAt(), { allowList: this.proofAllowList });
                 }
                 else {
-                    maybeJob = await this.jobSource.getProvingJob({ allowList: this.proofAllowList });
+                    maybeJob = await this.broker.getProvingJob({ allowList: this.proofAllowList });
                 }
                 if (!maybeJob) {
                     return;
                 }
-                if (this.currentJobController?.getStatus() === ProvingJobStatus.PROVING) {
+                let abortedProofJobId;
+                let abortedProofName;
+                if (this.currentJobController?.getStatus() === ProvingJobControllerStatus.PROVING) {
+                    abortedProofJobId = this.currentJobController.getJobId();
+                    abortedProofName = this.currentJobController.getProofTypeName();
                     this.currentJobController?.abort();
                 }
                 const { job, time } = maybeJob;
-                this.currentJobController = new ProvingJobController(job, time, this.circuitProver, (err, result) => {
-                    if (err) {
-                        const retry = err.name === ProvingError.NAME ? err.retry : false;
-                        return this.jobSource.reportProvingJobError(job.id, err, retry);
-                    }
-                    else if (result) {
-                        return this.jobSource.reportProvingJobSuccess(job.id, result);
-                    }
-                });
+                let inputs;
+                try {
+                    inputs = await this.proofStore.getProofInput(job.inputsUri);
+                }
+                catch (err) {
+                    await this.broker.reportProvingJobError(job.id, 'Failed to load proof inputs', true);
+                    return;
+                }
+                this.currentJobController = new ProvingJobController(job.id, inputs, time, this.circuitProver, this.handleJobResult);
+                if (abortedProofJobId) {
+                    this.log.info(`Aborting job id=${abortedProofJobId} type=${abortedProofName} to start new job id=${this.currentJobController.getJobId()} type=${this.currentJobController.getProofTypeName()} inputsUri=${truncateString(job.inputsUri)}`);
+                }
+                else {
+                    this.log.info(`Starting job id=${this.currentJobController.getJobId()} type=${this.currentJobController.getProofTypeName()} inputsUri=${truncateString(job.inputsUri)}`);
+                }
+                if (this.idleTimer) {
+                    this.instrumentation.recordIdleTime(this.idleTimer);
+                }
+                this.idleTimer = undefined;
                 this.currentJobController.start();
             }
             catch (err) {
                 this.log.error(`Error in ProvingAgent: ${String(err)}`);
             }
         };
+        this.handleJobResult = async (jobId, type, err, result) => {
+            this.idleTimer = new Timer();
+            if (err) {
+                const retry = err.name === ProvingError.NAME ? err.retry : false;
+                this.log.error(`Job id=${jobId} type=${ProvingRequestType[type]} failed err=${err.message} retry=${retry}`, err);
+                return this.broker.reportProvingJobError(jobId, err.message, retry);
+            }
+            else if (result) {
+                const outputUri = await this.proofStore.saveProofOutput(jobId, type, result);
+                this.log.info(`Job id=${jobId} type=${ProvingRequestType[type]} completed outputUri=${truncateString(outputUri)}`);
+                return this.broker.reportProvingJobSuccess(jobId, outputUri);
+            }
+        };
+        this.instrumentation = new ProvingAgentInstrumentation(client);
         this.runningPromise = new RunningPromise(this.safeWork, this.pollIntervalMs);
     }
     setCircuitProver(circuitProver) {
@@ -64,6 +99,7 @@ export class ProvingAgent {
         return this.runningPromise?.isRunning() ?? false;
     }
     start() {
+        this.idleTimer = new Timer();
         this.runningPromise.start();
     }
     async stop() {
@@ -71,4 +107,7 @@ export class ProvingAgent {
         await this.runningPromise.stop();
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmluZ19hZ2VudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wcm92aW5nX2Jyb2tlci9wcm92aW5nX2FnZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxZQUFZLEdBSWIsTUFBTSxzQkFBc0IsQ0FBQztBQUM5QixPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUMxRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFHbkUsT0FBTyxFQUFFLG9CQUFvQixFQUFFLGdCQUFnQixFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFckY7O0dBRUc7QUFDSCxNQUFNLE9BQU8sWUFBWTtJQUl2QjtJQUNFLGlDQUFpQztJQUN6QixTQUE2QjtJQUNyQyxpREFBaUQ7SUFDekMsYUFBa0M7SUFDMUMsb0RBQW9EO0lBQzVDLGNBQTBDO0lBQ2xELG9DQUFvQztJQUM1QixpQkFBaUIsSUFBSSxFQUNyQixNQUFNLGlCQUFpQixDQUFDLG9DQUFvQyxDQUFDO1FBUDdELGNBQVMsR0FBVCxTQUFTLENBQW9CO1FBRTdCLGtCQUFhLEdBQWIsYUFBYSxDQUFxQjtRQUVsQyxtQkFBYyxHQUFkLGNBQWMsQ0FBNEI7UUFFMUMsbUJBQWMsR0FBZCxjQUFjLENBQU87UUFDckIsUUFBRyxHQUFILEdBQUcsQ0FBMEQ7UUFzQi9ELGFBQVEsR0FBRyxLQUFLLElBQUksRUFBRTtZQUM1QixJQUFJLENBQUM7Z0JBQ0gsd0JBQXdCO2dCQUN4QixtRUFBbUU7Z0JBQ25FLG9CQUFvQjtnQkFDcEIsNEdBQTRHO2dCQUM1RyxJQUFJLFFBQXlELENBQUM7Z0JBQzlELElBQUksSUFBSSxDQUFDLG9CQUFvQixFQUFFLFNBQVMsRUFBRSxLQUFLLGdCQUFnQixDQUFDLE9BQU8sRUFBRSxDQUFDO29CQUN4RSxRQUFRLEdBQUcsTUFBTSxJQUFJLENBQUMsU0FBUyxDQUFDLHdCQUF3QixDQUN0RCxJQUFJLENB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
+function truncateString(str, length = 64) {
+    return str.length > length ? str.slice(0, length) + '...' : str;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmluZ19hZ2VudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wcm92aW5nX2Jyb2tlci9wcm92aW5nX2FnZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxZQUFZLEVBTVosa0JBQWtCLEdBRW5CLE1BQU0sc0JBQXNCLENBQUM7QUFDOUIsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDMUQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQ25FLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUloRCxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQUNqRixPQUFPLEVBQUUsb0JBQW9CLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUUvRjs7R0FFRztBQUNILE1BQU0sT0FBTyxZQUFZO0lBTXZCO0lBQ0UsaUNBQWlDO0lBQ3pCLE1BQTBCO0lBQ2xDLGdEQUFnRDtJQUN4QyxVQUFzQjtJQUM5QixpREFBaUQ7SUFDekMsYUFBa0M7SUFDMUMsdURBQXVEO0lBQ3ZELE1BQXVCO0lBQ3ZCLG9EQUFvRDtJQUM1QyxpQkFBNEMsRUFBRTtJQUN0RCxvQ0FBb0M7SUFDNUIsaUJBQWlCLElBQUksRUFDckIsTUFBTSxpQkFBaUIsQ0FBQyxtQ0FBbUMsQ0FBQztRQVg1RCxXQUFNLEdBQU4sTUFBTSxDQUFvQjtRQUUxQixlQUFVLEdBQVYsVUFBVSxDQUFZO1FBRXRCLGtCQUFhLEdBQWIsYUFBYSxDQUFxQjtRQUlsQyxtQkFBYyxHQUFkLGNBQWMsQ0FBZ0M7UUFFOUMsbUJBQWMsR0FBZCxjQUFjLENBQU87UUFDckIsUUFBRyxHQUFILEdBQUcsQ0FBeUQ7UUF3QjlELGFBQVEsR0FBRyxLQUFLLElBQUksRUFBRTtZQUM1QixJQUFJLENBQUM7Z0JBQ0gsd0JBQXdCO2dCQUN4QixtRUFBbUU7Z0JBQ25F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

package/dest/proving_broker/proving_agent_instrumentation.d.ts

@@ -0,0 +1,8 @@
+import { type Timer } from '@aztec/foundation/timer';
+import { type TelemetryClient } from '@aztec/telemetry-client';
+export declare class ProvingAgentInstrumentation {
+    private idleTime;
+    constructor(client: TelemetryClient, name?: string);
+    recordIdleTime(msOrTimer: Timer | number): void;
+}
+//# sourceMappingURL=proving_agent_instrumentation.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"proving_agent_instrumentation.d.ts","sourceRoot":"","sources":["../../src/proving_broker/proving_agent_instrumentation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAA2B,KAAK,eAAe,EAAa,MAAM,yBAAyB,CAAC;AAEnG,qBAAa,2BAA2B;IACtC,OAAO,CAAC,QAAQ,CAAY;gBAEhB,MAAM,EAAE,eAAe,EAAE,IAAI,SAAiB;IAU1D,cAAc,CAAC,SAAS,EAAE,KAAK,GAAG,MAAM;CAIzC"}

package/dest/proving_broker/proving_agent_instrumentation.js

@@ -0,0 +1,16 @@
+import { Metrics, ValueType } from '@aztec/telemetry-client';
+export class ProvingAgentInstrumentation {
+    constructor(client, name = 'ProvingAgent') {
+        const meter = client.getMeter(name);
+        this.idleTime = meter.createHistogram(Metrics.PROVING_AGENT_IDLE, {
+            description: 'Records how long an agent was idle',
+            unit: 'ms',
+            valueType: ValueType.INT,
+        });
+    }
+    recordIdleTime(msOrTimer) {
+        const duration = typeof msOrTimer === 'number' ? msOrTimer : Math.floor(msOrTimer.ms());
+        this.idleTime.record(duration);
+    }
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmluZ19hZ2VudF9pbnN0cnVtZW50YXRpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHJvdmluZ19icm9rZXIvcHJvdmluZ19hZ2VudF9pbnN0cnVtZW50YXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFrQixPQUFPLEVBQXdCLFNBQVMsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRW5HLE1BQU0sT0FBTywyQkFBMkI7SUFHdEMsWUFBWSxNQUF1QixFQUFFLElBQUksR0FBRyxjQUFjO1FBQ3hELE1BQU0sS0FBSyxHQUFHLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUM7UUFFcEMsSUFBSSxDQUFDLFFBQVEsR0FBRyxLQUFLLENBQUMsZUFBZSxDQUFDLE9BQU8sQ0FBQyxrQkFBa0IsRUFBRTtZQUNoRSxXQUFXLEVBQUUsb0NBQW9DO1lBQ2pELElBQUksRUFBRSxJQUFJO1lBQ1YsU0FBUyxFQUFFLFNBQVMsQ0FBQyxHQUFHO1NBQ3pCLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxjQUFjLENBQUMsU0FBeUI7UUFDdEMsTUFBTSxRQUFRLEdBQUcsT0FBTyxTQUFTLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDeEYsSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDakMsQ0FBQztDQUNGIn0=

package/dest/proving_broker/proving_broker.d.ts

@@ -1,9 +1,9 @@
-import { ProvingRequestType, type V2ProofOutput, type V2ProvingJob, type V2ProvingJobId, type V2ProvingJobStatus } from '@aztec/circuit-types';
-import type { ProvingJobConsumer, ProvingJobFilter, ProvingJobProducer } from './proving_broker_interface.js';
-import { type ProvingJobDatabase } from './proving_job_database.js';
+import { type ProofUri, type ProvingJob, type ProvingJobConsumer, type ProvingJobFilter, type ProvingJobId, type ProvingJobProducer, type ProvingJobSettledResult, type ProvingJobStatus } from '@aztec/circuit-types';
+import { type TelemetryClient } from '@aztec/telemetry-client';
+import { type ProvingBrokerDatabase } from './proving_broker_database.js';
 type ProofRequestBrokerConfig = {
-    timeoutIntervalSec?: number;
-    jobTimeoutSec?: number;
+    timeoutIntervalMs?: number;
+    jobTimeoutMs?: number;
     maxRetries?: number;
 };
 /**
@@ -16,28 +16,34 @@ export declare class ProvingBroker implements ProvingJobProducer, ProvingJobCons
     private queues;
     private jobsCache;
     private resultsCache;
+    private enqueuedAt;
     private inProgress;
     private retries;
+    private promises;
     private timeoutPromise;
     private timeSource;
-    private jobTimeoutSec;
+    private jobTimeoutMs;
     private maxRetries;
-    constructor(database: ProvingJobDatabase, { jobTimeoutSec, timeoutIntervalSec, maxRetries }?: ProofRequestBrokerConfig, logger?: import("@aztec/foundation/log").Logger);
+    private instrumentation;
+    constructor(database: ProvingBrokerDatabase, client: TelemetryClient, { jobTimeoutMs, timeoutIntervalMs, maxRetries }?: ProofRequestBrokerConfig, logger?: import("@aztec/foundation/log").Logger);
+    private measureQueueDepth;
+    private countActiveJobs;
     start(): Promise<void>;
     stop(): Promise<void>;
-    enqueueProvingJob(job: V2ProvingJob): Promise<void>;
-    removeAndCancelProvingJob(id: V2ProvingJobId): Promise<void>;
-    getProvingJobStatus(id: V2ProvingJobId): Promise<V2ProvingJobStatus>;
-    getProvingJob<T extends ProvingRequestType[]>(filter?: ProvingJobFilter<T>): Promise<{
-        job: V2ProvingJob;
+    enqueueProvingJob(job: ProvingJob): Promise<void>;
+    waitForJobToSettle(id: ProvingJobId): Promise<ProvingJobSettledResult>;
+    removeAndCancelProvingJob(id: ProvingJobId): Promise<void>;
+    getProvingJobStatus(id: ProvingJobId): Promise<ProvingJobStatus>;
+    getProvingJob(filter?: ProvingJobFilter): Promise<{
+        job: ProvingJob;
         time: number;
     } | undefined>;
-    reportProvingJobError(id: V2ProvingJobId, err: Error, retry?: boolean): Promise<void>;
-    reportProvingJobProgress<F extends ProvingRequestType[]>(id: V2ProvingJobId, startedAt: number, filter?: ProvingJobFilter<F>): Promise<{
-        job: V2ProvingJob;
+    reportProvingJobError(id: ProvingJobId, err: string, retry?: boolean): Promise<void>;
+    reportProvingJobProgress(id: ProvingJobId, startedAt: number, filter?: ProvingJobFilter): Promise<{
+        job: ProvingJob;
         time: number;
     } | undefined>;
-    reportProvingJobSuccess(id: V2ProvingJobId, value: V2ProofOutput): Promise<void>;
+    reportProvingJobSuccess(id: ProvingJobId, value: ProofUri): Promise<void>;
     private timeoutCheck;
     private enqueueJobInternal;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"proving_broker.d.ts","sourceRoot":"","sources":["../../src/proving_broker/proving_broker.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,cAAc,EAEnB,KAAK,kBAAkB,EACxB,MAAM,sBAAsB,CAAC;AAO9B,OAAO,KAAK,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAC9G,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAQpE,KAAK,wBAAwB,GAAG;IAC9B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;;GAGG;AACH,qBAAa,aAAc,YAAW,kBAAkB,EAAE,kBAAkB;IAwCxE,OAAO,CAAC,QAAQ;IAEhB,OAAO,CAAC,MAAM;IAzChB,OAAO,CAAC,MAAM,CAgBZ;IAIF,OAAO,CAAC,SAAS,CAA2C;IAE5D,OAAO,CAAC,YAAY,CAAiD;IAMrE,OAAO,CAAC,UAAU,CAAiD;IAGnE,OAAO,CAAC,OAAO,CAAqC;IAEpD,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,UAAU,CAAuC;IACzD,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,UAAU,CAAS;gBAGjB,QAAQ,EAAE,kBAAkB,EACpC,EAAE,aAAkB,EAAE,kBAAuB,EAAE,UAAc,EAAE,GAAE,wBAA6B,EACtF,MAAM,yCAAgE;IAQnE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB5B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAIf,iBAAiB,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAYnD,yBAAyB,CAAC,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAW5D,mBAAmB,CAAC,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAoB3E,aAAa,CAAC,CAAC,SAAS,kBAAkB,EAAE,EAChD,MAAM,GAAE,gBAAgB,CAAC,CAAC,CAAM,GAC/B,OAAO,CAAC;QAAE,GAAG,EAAE,YAAY,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;IA8BrD,qBAAqB,CAAC,EAAE,EAAE,cAAc,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IA8BzF,wBAAwB,CAAC,CAAC,SAAS,kBAAkB,EAAE,EACrD,EAAE,EAAE,cAAc,EAClB,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAC3B,OAAO,CAAC;QAAE,GAAG,EAAE,YAAY,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;IA6CrD,uBAAuB,CAAC,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBtF,OAAO,CAAC,YAAY,CAiBlB;IAEF,OAAO,CAAC,kBAAkB;CAI3B"}
+{"version":3,"file":"proving_broker.d.ts","sourceRoot":"","sources":["../../src/proving_broker/proving_broker.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,UAAU,EACf,KAAK,kBAAkB,EACvB,KAAK,gBAAgB,EACrB,KAAK,YAAY,EACjB,KAAK,kBAAkB,EACvB,KAAK,uBAAuB,EAC5B,KAAK,gBAAgB,EAEtB,MAAM,sBAAsB,CAAC;AAK9B,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAI/D,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAS1E,KAAK,wBAAwB,GAAG;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;;GAGG;AACH,qBAAa,aAAc,YAAW,kBAAkB,EAAE,kBAAkB;IAgDxE,OAAO,CAAC,QAAQ;IAGhB,OAAO,CAAC,MAAM;IAlDhB,OAAO,CAAC,MAAM,CAgBZ;IAIF,OAAO,CAAC,SAAS,CAAuC;IAExD,OAAO,CAAC,YAAY,CAAoD;IAGxE,OAAO,CAAC,UAAU,CAAkC;IAMpD,OAAO,CAAC,UAAU,CAA+C;IAGjE,OAAO,CAAC,OAAO,CAAmC;IAGlD,OAAO,CAAC,QAAQ,CAA0E;IAE1F,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,UAAU,CAAuC;IACzD,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,UAAU,CAAS;IAE3B,OAAO,CAAC,eAAe,CAA+B;gBAG5C,QAAQ,EAAE,qBAAqB,EACvC,MAAM,EAAE,eAAe,EACvB,EAAE,YAAqB,EAAE,iBAA0B,EAAE,UAAc,EAAE,GAAE,wBAA6B,EAC5F,MAAM,yCAA0D;IAQ1E,OAAO,CAAC,iBAAiB,CAEvB;IAEF,OAAO,CAAC,eAAe,CAUrB;IAEK,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAwBtB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAIf,iBAAiB,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAYvD,kBAAkB,CAAC,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAQhE,yBAAyB,CAAC,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBhE,mBAAmB,CAAC,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAkBjE,aAAa,CACjB,MAAM,GAAE,gBAAoC,GAC3C,OAAO,CAAC;QAAE,GAAG,EAAE,UAAU,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;IAmCnD,qBAAqB,CAAC,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAwCxF,wBAAwB,CACtB,EAAE,EAAE,YAAY,EAChB,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,gBAAgB,GACxB,OAAO,CAAC;QAAE,GAAG,EAAE,UAAU,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;IA6CnD,uBAAuB,CAAC,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IA2B/E,OAAO,CAAC,YAAY,CAkBlB;IAEF,OAAO,CAAC,kBAAkB;CAQ3B"}

package/dest/proving_broker/proving_broker.js

@@ -1,14 +1,16 @@
 import { ProvingRequestType, } from '@aztec/circuit-types';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { RunningPromise } from '@aztec/foundation/promise';
+import { RunningPromise, promiseWithResolvers } from '@aztec/foundation/promise';
 import { PriorityMemoryQueue } from '@aztec/foundation/queue';
+import { Timer } from '@aztec/foundation/timer';
 import assert from 'assert';
+import { ProvingBrokerInstrumentation } from './proving_broker_instrumentation.js';
 /**
  * A broker that manages proof requests and distributes them to workers based on their priority.
  * It takes a backend that is responsible for storing and retrieving proof requests and results.
  */
 export class ProvingBroker {
-    constructor(database, { jobTimeoutSec = 30, timeoutIntervalSec = 10, maxRetries = 3 } = {}, logger = createDebugLogger('aztec:prover-client:proof-request-broker')) {
+    constructor(database, client, { jobTimeoutMs = 30000, timeoutIntervalMs = 10000, maxRetries = 3 } = {}, logger = createDebugLogger('aztec:prover-client:proving-broker')) {
         this.database = database;
         this.logger = logger;
         this.queues = {
@@ -30,6 +32,8 @@ export class ProvingBroker {
         this.jobsCache = new Map();
         // as above, but for results
         this.resultsCache = new Map();
+        // tracks when each job was enqueued
+        this.enqueuedAt = new Map();
         // keeps track of which jobs are currently being processed
         // in the event of a crash this information is lost, but that's ok
         // the next time the broker starts it will recreate jobsCache and still
@@ -37,7 +41,22 @@ export class ProvingBroker {
         this.inProgress = new Map();
         // keep track of which proving job has been retried
         this.retries = new Map();
+        // a map of promises that will be resolved when a job is settled
+        this.promises = new Map();
         this.timeSource = () => Math.floor(Date.now() / 1000);
+        this.measureQueueDepth = (type) => {
+            return this.queues[type].length();
+        };
+        this.countActiveJobs = (type) => {
+            let count = 0;
+            for (const { id } of this.inProgress.values()) {
+                const job = this.jobsCache.get(id);
+                if (job?.type === type) {
+                    count++;
+                }
+            }
+            return count;
+        };
         this.timeoutCheck = () => {
             const inProgressEntries = Array.from(this.inProgress.entries());
             for (const [id, metadata] of inProgressEntries) {
@@ -47,24 +66,27 @@ export class ProvingBroker {
                     this.inProgress.delete(id);
                     continue;
                 }
-                const secondsSinceLastUpdate = this.timeSource() - metadata.lastUpdatedAt;
-                if (secondsSinceLastUpdate >= this.jobTimeoutSec) {
+                const msSinceLastUpdate = (this.timeSource() - metadata.lastUpdatedAt) * 1000;
+                if (msSinceLastUpdate >= this.jobTimeoutMs) {
                     this.logger.warn(`Proving job id=${id} timed out. Adding it back to the queue.`);
                     this.inProgress.delete(id);
                     this.enqueueJobInternal(item);
+                    this.instrumentation.incTimedOutJobs(item.type);
                 }
             }
         };
-        this.timeoutPromise = new RunningPromise(this.timeoutCheck, timeoutIntervalSec * 1000);
-        this.jobTimeoutSec = jobTimeoutSec;
+        this.instrumentation = new ProvingBrokerInstrumentation(client);
+        this.timeoutPromise = new RunningPromise(this.timeoutCheck, timeoutIntervalMs);
+        this.jobTimeoutMs = jobTimeoutMs;
         this.maxRetries = maxRetries;
     }
-    // eslint-disable-next-line require-await
-    async start() {
+    start() {
         for (const [item, result] of this.database.allProvingJobs()) {
             this.logger.info(`Restoring proving job id=${item.id} settled=${!!result}`);
             this.jobsCache.set(item.id, item);
+            this.promises.set(item.id, promiseWithResolvers());
             if (result) {
+                this.promises.get(item.id).resolve(result);
                 this.resultsCache.set(item.id, result);
             }
             else {
@@ -73,6 +95,9 @@ export class ProvingBroker {
             }
         }
         this.timeoutPromise.start();
+        this.instrumentation.monitorQueueDepth(this.measureQueueDepth);
+        this.instrumentation.monitorActiveJobs(this.countActiveJobs);
+        return Promise.resolve();
     }
     stop() {
         return this.timeoutPromise.stop();
@@ -87,18 +112,32 @@ export class ProvingBroker {
         this.jobsCache.set(job.id, job);
         this.enqueueJobInternal(job);
     }
+    waitForJobToSettle(id) {
+        const promiseWithResolvers = this.promises.get(id);
+        if (!promiseWithResolvers) {
+            return Promise.resolve({ status: 'rejected', reason: `Job ${id} not found` });
+        }
+        return promiseWithResolvers.promise;
+    }
     async removeAndCancelProvingJob(id) {
         this.logger.info(`Cancelling job id=${id}`);
         await this.database.deleteProvingJobAndResult(id);
+        // notify listeners of the cancellation
+        if (!this.resultsCache.has(id)) {
+            this.promises.get(id)?.resolve({ status: 'rejected', reason: 'Aborted' });
+        }
         this.jobsCache.delete(id);
+        this.promises.delete(id);
         this.resultsCache.delete(id);
         this.inProgress.delete(id);
         this.retries.delete(id);
     }
-    // eslint-disable-next-line require-await
-    async getProvingJobStatus(id) {
+    getProvingJobStatus(id) {
         const result = this.resultsCache.get(id);
-        if (!result) {
+        if (result) {
+            return Promise.resolve(result);
+        }
+        else {
             // no result yet, check if we know the item
             const item = this.jobsCache.get(id);
             if (!item) {
@@ -107,16 +146,10 @@ export class ProvingBroker {
             }
             return Promise.resolve({ status: this.inProgress.has(id) ? 'in-progress' : 'in-queue' });
         }
-        else if ('value' in result) {
-            return Promise.resolve({ status: 'resolved', value: result.value });
-        }
-        else {
-            return Promise.resolve({ status: 'rejected', error: result.error });
-        }
     }
     // eslint-disable-next-line require-await
-    async getProvingJob(filter = {}) {
-        const allowedProofs = filter.allowList
+    async getProvingJob(filter = { allowList: [] }) {
+        const allowedProofs = Array.isArray(filter.allowList) && filter.allowList.length > 0
             ? [...filter.allowList]
             : Object.values(ProvingRequestType).filter((x) => typeof x === 'number');
         allowedProofs.sort(proofTypeComparator);
@@ -126,7 +159,7 @@ export class ProvingBroker {
             // exhaust the queue and make sure we're not sending a job that's already in progress
             // or has already been completed
             // this can happen if the broker crashes and restarts
-            // it's possible agents will report progress or results for jobs that are no longer in the queue
+            // it's possible agents will report progress or results for jobs that are in the queue (after the restart)
             while ((job = queue.getImmediate())) {
                 if (!this.inProgress.has(job.id) && !this.resultsCache.has(job.id)) {
                     const time = this.timeSource();
@@ -135,6 +168,10 @@ export class ProvingBroker {
                         startedAt: time,
                         lastUpdatedAt: time,
                     });
+                    const enqueuedAt = this.enqueuedAt.get(job.id);
+                    if (enqueuedAt) {
+                        this.instrumentation.recordJobWait(job.type, enqueuedAt);
+                    }
                     return { job, time };
                 }
             }
@@ -159,11 +196,19 @@ export class ProvingBroker {
             this.logger.info(`Retrying proving job id=${id} type=${ProvingRequestType[item.type]} retry=${retries + 1}`);
             this.retries.set(id, retries + 1);
             this.enqueueJobInternal(item);
+            this.instrumentation.incRetriedJobs(item.type);
             return;
         }
         this.logger.debug(`Marking proving job id=${id} type=${ProvingRequestType[item.type]} totalAttempts=${retries + 1} as failed`);
         await this.database.setProvingJobError(id, err);
-        this.resultsCache.set(id, { error: String(err) });
+        const result = { status: 'rejected', reason: String(err) };
+        this.resultsCache.set(id, result);
+        this.promises.get(id).resolve(result);
+        this.instrumentation.incRejectedJobs(item.type);
+        if (info) {
+            const duration = this.timeSource() - info.startedAt;
+            this.instrumentation.recordJobDuration(item.type, duration * 1000);
+        }
     }
     reportProvingJobProgress(id, startedAt, filter) {
         const job = this.jobsCache.get(id);
@@ -220,10 +265,17 @@ export class ProvingBroker {
         }
         this.logger.debug(`Proving job complete id=${id} type=${ProvingRequestType[item.type]} totalAttempts=${retries + 1}`);
         await this.database.setProvingJobResult(id, value);
-        this.resultsCache.set(id, { value });
+        const result = { status: 'fulfilled', value };
+        this.resultsCache.set(id, result);
+        this.promises.get(id).resolve(result);
+        this.instrumentation.incResolvedJobs(item.type);
     }
     enqueueJobInternal(job) {
+        if (!this.promises.has(job.id)) {
+            this.promises.set(job.id, promiseWithResolvers());
+        }
         this.queues[job.type].put(job);
+        this.enqueuedAt.set(job.id, new Timer());
         this.logger.debug(`Enqueued new proving job id=${job.id}`);
     }
 }
@@ -234,10 +286,12 @@ export class ProvingBroker {
  * @returns A number indicating the relative priority of the two proving jobs
  */
 function provingJobComparator(a, b) {
-    if (a.blockNumber < b.blockNumber) {
+    const aBlockNumber = a.blockNumber ?? 0;
+    const bBlockNumber = b.blockNumber ?? 0;
+    if (aBlockNumber < bBlockNumber) {
         return -1;
     }
-    else if (a.blockNumber > b.blockNumber) {
+    else if (aBlockNumber > bBlockNumber) {
         return 1;
     }
     else {
@@ -295,4 +349,4 @@ const PROOF_TYPES_IN_PRIORITY_ORDER = [
     ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP,
     ProvingRequestType.PRIVATE_KERNEL_EMPTY,
 ];
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"proving_broker.js","sourceRoot":"","sources":["../../src/proving_broker/proving_broker.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"proving_broker.js","sourceRoot":"","sources":["../../src/proving_broker/proving_broker.ts"],"names":[],"mappings":"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"}

package/dest/proving_broker/proving_broker_database/memory.d.ts

@@ -0,0 +1,14 @@
+import type { ProofUri, ProvingJob, ProvingJobId, ProvingJobSettledResult } from '@aztec/circuit-types';
+import { type ProvingBrokerDatabase } from '../proving_broker_database.js';
+export declare class InMemoryBrokerDatabase implements ProvingBrokerDatabase {
+    private jobs;
+    private results;
+    getProvingJob(id: ProvingJobId): ProvingJob | undefined;
+    getProvingJobResult(id: ProvingJobId): ProvingJobSettledResult | undefined;
+    addProvingJob(request: ProvingJob): Promise<void>;
+    setProvingJobResult(id: ProvingJobId, value: ProofUri): Promise<void>;
+    setProvingJobError(id: ProvingJobId, reason: string): Promise<void>;
+    deleteProvingJobAndResult(id: ProvingJobId): Promise<void>;
+    allProvingJobs(): Iterable<[ProvingJob, ProvingJobSettledResult | undefined]>;
+}
+//# sourceMappingURL=memory.d.ts.map

package/dest/proving_broker/proving_broker_database/memory.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"memory.d.ts","sourceRoot":"","sources":["../../../src/proving_broker/proving_broker_database/memory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAExG,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAE3E,qBAAa,sBAAuB,YAAW,qBAAqB;IAClE,OAAO,CAAC,IAAI,CAAuC;IACnD,OAAO,CAAC,OAAO,CAAoD;IAEnE,aAAa,CAAC,EAAE,EAAE,YAAY,GAAG,UAAU,GAAG,SAAS;IAIvD,mBAAmB,CAAC,EAAE,EAAE,YAAY,GAAG,uBAAuB,GAAG,SAAS;IAI1E,aAAa,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjD,mBAAmB,CAAC,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAKrE,kBAAkB,CAAC,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKnE,yBAAyB,CAAC,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAMzD,cAAc,IAAI,QAAQ,CAAC,CAAC,UAAU,EAAE,uBAAuB,GAAG,SAAS,CAAC,CAAC;CAK/E"}

package/dest/proving_broker/proving_broker_database/memory.js

@@ -0,0 +1,35 @@
+export class InMemoryBrokerDatabase {
+    constructor() {
+        this.jobs = new Map();
+        this.results = new Map();
+    }
+    getProvingJob(id) {
+        return this.jobs.get(id);
+    }
+    getProvingJobResult(id) {
+        return this.results.get(id);
+    }
+    addProvingJob(request) {
+        this.jobs.set(request.id, request);
+        return Promise.resolve();
+    }
+    setProvingJobResult(id, value) {
+        this.results.set(id, { status: 'fulfilled', value });
+        return Promise.resolve();
+    }
+    setProvingJobError(id, reason) {
+        this.results.set(id, { status: 'rejected', reason });
+        return Promise.resolve();
+    }
+    deleteProvingJobAndResult(id) {
+        this.jobs.delete(id);
+        this.results.delete(id);
+        return Promise.resolve();
+    }
+    *allProvingJobs() {
+        for (const item of this.jobs.values()) {
+            yield [item, this.results.get(item.id)];
+        }
+    }
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtb3J5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3Byb3ZpbmdfYnJva2VyL3Byb3ZpbmdfYnJva2VyX2RhdGFiYXNlL21lbW9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFJQSxNQUFNLE9BQU8sc0JBQXNCO0lBQW5DO1FBQ1UsU0FBSSxHQUFHLElBQUksR0FBRyxFQUE0QixDQUFDO1FBQzNDLFlBQU8sR0FBRyxJQUFJLEdBQUcsRUFBeUMsQ0FBQztJQW9DckUsQ0FBQztJQWxDQyxhQUFhLENBQUMsRUFBZ0I7UUFDNUIsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUMzQixDQUFDO0lBRUQsbUJBQW1CLENBQUMsRUFBZ0I7UUFDbEMsT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUM5QixDQUFDO0lBRUQsYUFBYSxDQUFDLE9BQW1CO1FBQy9CLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxFQUFFLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDbkMsT0FBTyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDM0IsQ0FBQztJQUVELG1CQUFtQixDQUFDLEVBQWdCLEVBQUUsS0FBZTtRQUNuRCxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFLEVBQUUsRUFBRSxNQUFNLEVBQUUsV0FBVyxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUM7UUFDckQsT0FBTyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDM0IsQ0FBQztJQUVELGtCQUFrQixDQUFDLEVBQWdCLEVBQUUsTUFBYztRQUNqRCxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFLEVBQUUsRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSxDQUFDLENBQUM7UUFDckQsT0FBTyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDM0IsQ0FBQztJQUVELHlCQUF5QixDQUFDLEVBQWdCO1FBQ3hDLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBQ3JCLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBQ3hCLE9BQU8sT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQzNCLENBQUM7SUFFRCxDQUFDLGNBQWM7UUFDYixLQUFLLE1BQU0sSUFBSSxJQUFJLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQztZQUN0QyxNQUFNLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBVSxDQUFDO1FBQ25ELENBQUM7SUFDSCxDQUFDO0NBQ0YifQ==

package/dest/proving_broker/proving_broker_database/persisted.d.ts

@@ -0,0 +1,17 @@
+import { type ProofUri, ProvingJob, type ProvingJobId, ProvingJobSettledResult } from '@aztec/circuit-types';
+import { type AztecKVStore } from '@aztec/kv-store';
+import { type TelemetryClient } from '@aztec/telemetry-client';
+import { type ProvingBrokerDatabase } from '../proving_broker_database.js';
+export declare class KVBrokerDatabase implements ProvingBrokerDatabase {
+    private store;
+    private jobs;
+    private jobResults;
+    private metrics;
+    constructor(store: AztecKVStore, client: TelemetryClient);
+    addProvingJob(job: ProvingJob): Promise<void>;
+    allProvingJobs(): Iterable<[ProvingJob, ProvingJobSettledResult | undefined]>;
+    deleteProvingJobAndResult(id: ProvingJobId): Promise<void>;
+    setProvingJobError(id: ProvingJobId, reason: string): Promise<void>;
+    setProvingJobResult(id: ProvingJobId, value: ProofUri): Promise<void>;
+}
+//# sourceMappingURL=persisted.d.ts.map