@aztec/prover-client 0.0.0-test.1 → 0.0.1-commit.017a351

package/dest/proving_broker/proving_broker.js

@@ -1,15 +1,11 @@
-function _ts_decorate(decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-}
+import { EpochNumber } from '@aztec/foundation/branded-types';
 import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise, promiseWithResolvers } from '@aztec/foundation/promise';
 import { PriorityMemoryQueue } from '@aztec/foundation/queue';
 import { Timer } from '@aztec/foundation/timer';
+import { tryStop } from '@aztec/stdlib/interfaces/server';
 import { ProvingRequestType } from '@aztec/stdlib/proofs';
-import { getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
+import { getTelemetryClient } from '@aztec/telemetry-client';
 import assert from 'assert';
 import { defaultProverBrokerConfig } from './config.js';
 import { ProvingBrokerInstrumentation } from './proving_broker_instrumentation.js';
@@ -46,7 +42,7 @@ import { ProvingBrokerInstrumentation } from './proving_broker_instrumentation.j
     /**
    * The broker keeps track of the highest epoch its seen.
    * This information is used for garbage collection: once it reaches the next epoch, it can start pruning the database of old state.
-   * It is important that this value is initialised to zero. This ensures that we don't delete any old jobs until the current
+   * It is important that this value is initialized to zero. This ensures that we don't delete any old jobs until the current
    * process instance receives a job request informing it of the actual current highest epoch
    * Example:
    * proving epoch 11 - the broker will wipe all jobs for epochs 9 and lower
@@ -55,22 +51,29 @@ import { ProvingBrokerInstrumentation } from './proving_broker_instrumentation.j
    */ epochHeight;
     maxEpochsToKeepResultsFor;
     started;
-    constructor(database, { proverBrokerJobTimeoutMs, proverBrokerPollIntervalMs, proverBrokerJobMaxRetries, proverBrokerMaxEpochsToKeepResultsFor } = defaultProverBrokerConfig, client = getTelemetryClient(), logger = createLogger('prover-client:proving-broker')){
+    debugReplayEnabled;
+    constructor(database, { proverBrokerJobTimeoutMs, proverBrokerPollIntervalMs, proverBrokerJobMaxRetries, proverBrokerMaxEpochsToKeepResultsFor, proverBrokerDebugReplayEnabled } = defaultProverBrokerConfig, client = getTelemetryClient(), logger = createLogger('prover-client:proving-broker')){
         this.database = database;
         this.logger = logger;
         this.queues = {
             [ProvingRequestType.PUBLIC_VM]: new PriorityMemoryQueue(provingJobComparator),
-            [ProvingRequestType.TUBE_PROOF]: new PriorityMemoryQueue(provingJobComparator),
-            [ProvingRequestType.PRIVATE_BASE_ROLLUP]: new PriorityMemoryQueue(provingJobComparator),
-            [ProvingRequestType.PUBLIC_BASE_ROLLUP]: new PriorityMemoryQueue(provingJobComparator),
-            [ProvingRequestType.MERGE_ROLLUP]: new PriorityMemoryQueue(provingJobComparator),
+            [ProvingRequestType.PUBLIC_CHONK_VERIFIER]: new PriorityMemoryQueue(provingJobComparator),
+            [ProvingRequestType.PRIVATE_TX_BASE_ROLLUP]: new PriorityMemoryQueue(provingJobComparator),
+            [ProvingRequestType.PUBLIC_TX_BASE_ROLLUP]: new PriorityMemoryQueue(provingJobComparator),
+            [ProvingRequestType.TX_MERGE_ROLLUP]: new PriorityMemoryQueue(provingJobComparator),
             [ProvingRequestType.ROOT_ROLLUP]: new PriorityMemoryQueue(provingJobComparator),
             [ProvingRequestType.BLOCK_MERGE_ROLLUP]: new PriorityMemoryQueue(provingJobComparator),
+            [ProvingRequestType.BLOCK_ROOT_FIRST_ROLLUP]: new PriorityMemoryQueue(provingJobComparator),
+            [ProvingRequestType.BLOCK_ROOT_SINGLE_TX_FIRST_ROLLUP]: new PriorityMemoryQueue(provingJobComparator),
+            [ProvingRequestType.BLOCK_ROOT_EMPTY_TX_FIRST_ROLLUP]: new PriorityMemoryQueue(provingJobComparator),
             [ProvingRequestType.BLOCK_ROOT_ROLLUP]: new PriorityMemoryQueue(provingJobComparator),
-            [ProvingRequestType.SINGLE_TX_BLOCK_ROOT_ROLLUP]: new PriorityMemoryQueue(provingJobComparator),
-            [ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP]: new PriorityMemoryQueue(provingJobComparator),
-            [ProvingRequestType.BASE_PARITY]: new PriorityMemoryQueue(provingJobComparator),
-            [ProvingRequestType.ROOT_PARITY]: new PriorityMemoryQueue(provingJobComparator)
+            [ProvingRequestType.BLOCK_ROOT_SINGLE_TX_ROLLUP]: new PriorityMemoryQueue(provingJobComparator),
+            [ProvingRequestType.CHECKPOINT_ROOT_ROLLUP]: new PriorityMemoryQueue(provingJobComparator),
+            [ProvingRequestType.CHECKPOINT_ROOT_SINGLE_BLOCK_ROLLUP]: new PriorityMemoryQueue(provingJobComparator),
+            [ProvingRequestType.CHECKPOINT_MERGE_ROLLUP]: new PriorityMemoryQueue(provingJobComparator),
+            [ProvingRequestType.CHECKPOINT_PADDING_ROLLUP]: new PriorityMemoryQueue(provingJobComparator),
+            [ProvingRequestType.PARITY_BASE]: new PriorityMemoryQueue(provingJobComparator),
+            [ProvingRequestType.PARITY_ROOT]: new PriorityMemoryQueue(provingJobComparator)
         };
         this.jobsCache = new Map();
         this.resultsCache = new Map();
@@ -102,6 +105,7 @@ import { ProvingBrokerInstrumentation } from './proving_broker_instrumentation.j
         this.jobTimeoutMs = proverBrokerJobTimeoutMs;
         this.maxRetries = proverBrokerJobMaxRetries;
         this.maxEpochsToKeepResultsFor = proverBrokerMaxEpochsToKeepResultsFor;
+        this.debugReplayEnabled = proverBrokerDebugReplayEnabled ?? false;
     }
     measureQueueDepth;
     countActiveJobs;
@@ -135,7 +139,7 @@ import { ProvingBrokerInstrumentation } from './proving_broker_instrumentation.j
             this.logger.warn('ProvingBroker not started');
             return Promise.resolve();
         }
-        await this.cleanupPromise.stop();
+        await tryStop(this.cleanupPromise);
     }
     enqueueProvingJob(job) {
         return this.#enqueueProvingJob(job);
@@ -161,6 +165,32 @@ import { ProvingBrokerInstrumentation } from './proving_broker_instrumentation.j
     reportProvingJobProgress(id, startedAt, filter) {
         return Promise.resolve(this.#reportProvingJobProgress(id, startedAt, filter));
     }
+    async replayProvingJob(jobId, type, epochNumber, inputsUri) {
+        if (!this.debugReplayEnabled) {
+            throw new Error('Debug replay not enabled. Set PROVER_BROKER_DEBUG_REPLAY_ENABLED=true');
+        }
+        this.logger.info(`Replaying proving job`, {
+            provingJobId: jobId,
+            epochNumber,
+            inputsUri
+        });
+        // Clear existing state and enqueue
+        this.cleanUpProvingJobState([
+            jobId
+        ]);
+        const job = {
+            id: jobId,
+            type,
+            epochNumber,
+            inputsUri
+        };
+        this.jobsCache.set(jobId, job);
+        await this.database.addProvingJob(job);
+        this.enqueueJobInternal(job);
+        return {
+            status: 'in-queue'
+        };
+    }
     async #enqueueProvingJob(job) {
         // We return the job status at the start of this call
         const jobStatus = this.#getProvingJobStatus(job.id);
@@ -209,17 +239,27 @@ import { ProvingBrokerInstrumentation } from './proving_broker_instrumentation.j
             this.logger.info(`Cancelling job id=${id}`, {
                 provingJobId: id
             });
-            await this.#reportProvingJobError(id, 'Aborted', false);
+            await this.#reportProvingJobError(id, 'Aborted', false, undefined, true);
         }
     }
     cleanUpProvingJobState(ids) {
+        const idsToClean = new Set(ids);
         for (const id of ids){
             this.jobsCache.delete(id);
+            const deferred = this.promises.get(id);
+            if (deferred) {
+                deferred.resolve({
+                    status: 'rejected',
+                    reason: 'Proving job cleaned up'
+                });
+            }
             this.promises.delete(id);
             this.resultsCache.delete(id);
             this.inProgress.delete(id);
             this.retries.delete(id);
+            this.enqueuedAt.delete(id);
         }
+        this.completedJobNotifications = this.completedJobNotifications.filter((id)=>!idsToClean.has(id));
     }
     #getProvingJobStatus(id) {
         const result = this.resultsCache.get(id);
@@ -244,7 +284,6 @@ import { ProvingBrokerInstrumentation } from './proving_broker_instrumentation.j
         this.completedJobNotifications = [];
         return Promise.resolve(notifications.concat(completedJobs));
     }
-    // eslint-disable-next-line require-await
     #getProvingJob(filter = {
         allowList: []
     }) {
@@ -271,6 +310,8 @@ import { ProvingBrokerInstrumentation } from './proving_broker_instrumentation.j
                     const enqueuedAt = this.enqueuedAt.get(job.id);
                     if (enqueuedAt) {
                         this.instrumentation.recordJobWait(job.type, enqueuedAt);
+                        // we can clear this flag now.
+                        this.enqueuedAt.delete(job.id);
                     }
                     return {
                         job,
@@ -281,7 +322,7 @@ import { ProvingBrokerInstrumentation } from './proving_broker_instrumentation.j
         }
         return undefined;
     }
-    async #reportProvingJobError(id, err, retry = false, filter) {
+    async #reportProvingJobError(id, err, retry = false, filter, aborted = false) {
         const info = this.inProgress.get(id);
         const item = this.jobsCache.get(id);
         const retries = this.retries.get(id) ?? 0;
@@ -328,7 +369,11 @@ import { ProvingBrokerInstrumentation } from './proving_broker_instrumentation.j
         this.resultsCache.set(id, result);
         this.promises.get(id).resolve(result);
         this.completedJobNotifications.push(id);
-        this.instrumentation.incRejectedJobs(item.type);
+        if (aborted) {
+            this.instrumentation.incAbortedJobs(item.type);
+        } else {
+            this.instrumentation.incRejectedJobs(item.type);
+        }
         if (info) {
             const duration = this.msTimeSource() - info.startedAt;
             this.instrumentation.recordJobDuration(item.type, duration);
@@ -443,26 +488,26 @@ import { ProvingBrokerInstrumentation } from './proving_broker_instrumentation.j
         return this.#getProvingJob(filter);
     }
     async cleanupPass() {
-        this.cleanupStaleJobs();
         this.reEnqueueExpiredJobs();
         const oldestEpochToKeep = this.oldestEpochToKeep();
         if (oldestEpochToKeep > 0) {
-            await this.database.deleteAllProvingJobsOlderThanEpoch(oldestEpochToKeep);
+            this.cleanupJobsOlderThanEpoch(EpochNumber(oldestEpochToKeep));
+            await this.database.deleteAllProvingJobsOlderThanEpoch(EpochNumber(oldestEpochToKeep));
             this.logger.trace(`Deleted all epochs older than ${oldestEpochToKeep}`);
         }
     }
-    cleanupStaleJobs() {
+    cleanupJobsOlderThanEpoch(epochNumber) {
         const jobIds = Array.from(this.jobsCache.keys());
         const jobsToClean = [];
         for (const id of jobIds){
             const job = this.jobsCache.get(id);
-            if (this.isJobStale(job)) {
+            if (job.epochNumber < epochNumber) {
                 jobsToClean.push(id);
             }
         }
         if (jobsToClean.length > 0) {
             this.cleanUpProvingJobState(jobsToClean);
-            this.logger.info(`Cleaned up jobs=${jobsToClean.length}`);
+            this.logger.verbose(`Cleaned up proving jobs=${jobsToClean.length}`);
         }
     }
     reEnqueueExpiredJobs() {
@@ -479,12 +524,28 @@ import { ProvingBrokerInstrumentation } from './proving_broker_instrumentation.j
             const now = this.msTimeSource();
             const msSinceLastUpdate = now - metadata.lastUpdatedAt;
             if (msSinceLastUpdate >= this.jobTimeoutMs) {
-                this.logger.warn(`Proving job id=${id} timed out. Adding it back to the queue.`, {
-                    provingJobId: id
-                });
                 this.inProgress.delete(id);
-                this.enqueueJobInternal(item);
                 this.instrumentation.incTimedOutJobs(item.type);
+                const retries = this.retries.get(id) ?? 0;
+                if (retries + 1 < this.maxRetries && !this.isJobStale(item)) {
+                    this.logger.warn(`Proving job id=${id} timed out. Re-enqueueing (retry ${retries + 1}/${this.maxRetries}).`, {
+                        provingJobId: id
+                    });
+                    this.retries.set(id, retries + 1);
+                    this.enqueueJobInternal(item);
+                } else {
+                    this.logger.error(`Proving job id=${id} timed out after ${retries + 1} attempts. Marking as failed.`, {
+                        provingJobId: id
+                    });
+                    const result = {
+                        status: 'rejected',
+                        reason: 'Timed out'
+                    };
+                    this.resultsCache.set(id, result);
+                    this.promises.get(id)?.resolve(result);
+                    this.completedJobNotifications.push(id);
+                    this.instrumentation.incRejectedJobs(item.type);
+                }
             }
         }
     }
@@ -506,9 +567,6 @@ import { ProvingBrokerInstrumentation } from './proving_broker_instrumentation.j
         return this.epochHeight - this.maxEpochsToKeepResultsFor;
     }
 }
-_ts_decorate([
-    trackSpan('ProvingBroker.cleanupPass')
-], ProvingBroker.prototype, "cleanupPass", null);
 /**
  * Compares two proving jobs and selects which one's more important
  * @param a - A proving job
@@ -554,17 +612,23 @@ _ts_decorate([
  *
  * The aim is that this will speed up block proving as the closer we get to a block's root proof the more likely it
  * is to get picked up by agents
- */ const PROOF_TYPES_IN_PRIORITY_ORDER = [
+ */ export const PROOF_TYPES_IN_PRIORITY_ORDER = [
+    ProvingRequestType.ROOT_ROLLUP,
+    ProvingRequestType.BLOCK_ROOT_FIRST_ROLLUP,
+    ProvingRequestType.BLOCK_ROOT_SINGLE_TX_FIRST_ROLLUP,
+    ProvingRequestType.BLOCK_ROOT_EMPTY_TX_FIRST_ROLLUP,
     ProvingRequestType.BLOCK_ROOT_ROLLUP,
-    ProvingRequestType.SINGLE_TX_BLOCK_ROOT_ROLLUP,
+    ProvingRequestType.BLOCK_ROOT_SINGLE_TX_ROLLUP,
     ProvingRequestType.BLOCK_MERGE_ROLLUP,
-    ProvingRequestType.ROOT_ROLLUP,
-    ProvingRequestType.MERGE_ROLLUP,
-    ProvingRequestType.PUBLIC_BASE_ROLLUP,
-    ProvingRequestType.PRIVATE_BASE_ROLLUP,
+    ProvingRequestType.CHECKPOINT_ROOT_ROLLUP,
+    ProvingRequestType.CHECKPOINT_ROOT_SINGLE_BLOCK_ROLLUP,
+    ProvingRequestType.CHECKPOINT_MERGE_ROLLUP,
+    ProvingRequestType.CHECKPOINT_PADDING_ROLLUP,
+    ProvingRequestType.TX_MERGE_ROLLUP,
+    ProvingRequestType.PUBLIC_TX_BASE_ROLLUP,
+    ProvingRequestType.PRIVATE_TX_BASE_ROLLUP,
     ProvingRequestType.PUBLIC_VM,
-    ProvingRequestType.TUBE_PROOF,
-    ProvingRequestType.ROOT_PARITY,
-    ProvingRequestType.BASE_PARITY,
-    ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP
+    ProvingRequestType.PUBLIC_CHONK_VERIFIER,
+    ProvingRequestType.PARITY_ROOT,
+    ProvingRequestType.PARITY_BASE
 ];

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

@@ -1,3 +1,4 @@
+import { EpochNumber } from '@aztec/foundation/branded-types';
 import { type ProofUri, type ProvingJob, type ProvingJobId, type ProvingJobSettledResult } from '@aztec/stdlib/interfaces/server';
 import type { ProvingBrokerDatabase } from '../proving_broker_database.js';
 export declare class InMemoryBrokerDatabase implements ProvingBrokerDatabase {
@@ -9,8 +10,8 @@ export declare class InMemoryBrokerDatabase implements ProvingBrokerDatabase {
     setProvingJobResult(id: ProvingJobId, value: ProofUri): Promise<void>;
     setProvingJobError(id: ProvingJobId, reason: string): Promise<void>;
     deleteProvingJobs(ids: ProvingJobId[]): Promise<void>;
-    deleteAllProvingJobsOlderThanEpoch(epochNumber: number): Promise<void>;
+    deleteAllProvingJobsOlderThanEpoch(epochNumber: EpochNumber): Promise<void>;
     allProvingJobs(): AsyncIterableIterator<[ProvingJob, ProvingJobSettledResult | undefined]>;
     close(): Promise<void>;
 }
-//# sourceMappingURL=memory.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtb3J5LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHJvdmluZ19icm9rZXIvcHJvdmluZ19icm9rZXJfZGF0YWJhc2UvbWVtb3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM5RCxPQUFPLEVBQ0wsS0FBSyxRQUFRLEVBQ2IsS0FBSyxVQUFVLEVBQ2YsS0FBSyxZQUFZLEVBQ2pCLEtBQUssdUJBQXVCLEVBRTdCLE1BQU0saUNBQWlDLENBQUM7QUFFekMsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUUzRSxxQkFBYSxzQkFBdUIsWUFBVyxxQkFBcUI7SUFDbEUsT0FBTyxDQUFDLElBQUksQ0FBdUM7SUFDbkQsT0FBTyxDQUFDLE9BQU8sQ0FBb0Q7SUFFbkUsYUFBYSxDQUFDLEVBQUUsRUFBRSxZQUFZLEdBQUcsVUFBVSxHQUFHLFNBQVMsQ0FFdEQ7SUFFRCxtQkFBbUIsQ0FBQyxFQUFFLEVBQUUsWUFBWSxHQUFHLHVCQUF1QixHQUFHLFNBQVMsQ0FFekU7SUFFRCxhQUFhLENBQUMsR0FBRyxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBRzVDO0lBRUQsbUJBQW1CLENBQUMsRUFBRSxFQUFFLFlBQVksRUFBRSxLQUFLLEVBQUUsUUFBUSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FHcEU7SUFFRCxrQkFBa0IsQ0FBQyxFQUFFLEVBQUUsWUFBWSxFQUFFLE1BQU0sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUdsRTtJQUVELGlCQUFpQixDQUFDLEdBQUcsRUFBRSxZQUFZLEVBQUUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBTXBEO0lBRUQsa0NBQWtDLENBQUMsV0FBVyxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBTTFFO0lBRU0sY0FBYyxJQUFJLHFCQUFxQixDQUFDLENBQUMsVUFBVSxFQUFFLHVCQUF1QixHQUFHLFNBQVMsQ0FBQyxDQUFDLENBSWhHO0lBRUQsS0FBSyxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFckI7Q0FDRiJ9

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

@@ -1 +1 @@
-{"version":3,"file":"memory.d.ts","sourceRoot":"","sources":["../../../src/proving_broker/proving_broker_database/memory.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,UAAU,EACf,KAAK,YAAY,EACjB,KAAK,uBAAuB,EAE7B,MAAM,iCAAiC,CAAC;AAEzC,OAAO,KAAK,EAAE,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,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7C,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,iBAAiB,CAAC,GAAG,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAQrD,kCAAkC,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ/D,cAAc,IAAI,qBAAqB,CAAC,CAAC,UAAU,EAAE,uBAAuB,GAAG,SAAS,CAAC,CAAC;IAMjG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAGvB"}
+{"version":3,"file":"memory.d.ts","sourceRoot":"","sources":["../../../src/proving_broker/proving_broker_database/memory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,UAAU,EACf,KAAK,YAAY,EACjB,KAAK,uBAAuB,EAE7B,MAAM,iCAAiC,CAAC;AAEzC,OAAO,KAAK,EAAE,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,CAEtD;IAED,mBAAmB,CAAC,EAAE,EAAE,YAAY,GAAG,uBAAuB,GAAG,SAAS,CAEzE;IAED,aAAa,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAG5C;IAED,mBAAmB,CAAC,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAGpE;IAED,kBAAkB,CAAC,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAGlE;IAED,iBAAiB,CAAC,GAAG,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAMpD;IAED,kCAAkC,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAM1E;IAEM,cAAc,IAAI,qBAAqB,CAAC,CAAC,UAAU,EAAE,uBAAuB,GAAG,SAAS,CAAC,CAAC,CAIhG;IAED,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAErB;CACF"}

package/dest/proving_broker/proving_broker_database/memory.js

@@ -41,7 +41,7 @@ export class InMemoryBrokerDatabase {
         return this.deleteProvingJobs(toDelete);
     }
     async *allProvingJobs() {
-        for await (const item of this.jobs.values()){
+        for (const item of this.jobs.values()){
             yield [
                 item,
                 this.results.get(item.id)

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

@@ -1,6 +1,7 @@
+import { EpochNumber } from '@aztec/foundation/branded-types';
 import { type Logger } from '@aztec/foundation/log';
 import { type ProofUri, ProvingJob, type ProvingJobId, ProvingJobSettledResult } from '@aztec/stdlib/interfaces/server';
-import { type TelemetryClient } from '@aztec/telemetry-client';
+import { type TelemetryClient, type Tracer } from '@aztec/telemetry-client';
 import type { ProverBrokerConfig } from '../config.js';
 import type { ProvingBrokerDatabase } from '../proving_broker_database.js';
 export declare class KVBrokerDatabase implements ProvingBrokerDatabase {
@@ -9,17 +10,18 @@ export declare class KVBrokerDatabase implements ProvingBrokerDatabase {
     private logger;
     private metrics;
     private batchQueue;
+    readonly tracer: Tracer;
     private constructor();
     commitWrites(items: Array<ProvingJob | [ProvingJobId, ProvingJobSettledResult]>, epochNumber: number): Promise<void>;
     private estimateSize;
     static new(config: ProverBrokerConfig, client?: TelemetryClient, logger?: Logger): Promise<KVBrokerDatabase>;
     private start;
     close(): Promise<void>;
-    deleteAllProvingJobsOlderThanEpoch(epochNumber: number): Promise<void>;
+    deleteAllProvingJobsOlderThanEpoch(epochNumber: EpochNumber): Promise<void>;
     addProvingJob(job: ProvingJob): Promise<void>;
     allProvingJobs(): AsyncIterableIterator<[ProvingJob, ProvingJobSettledResult | undefined]>;
     setProvingJobError(id: ProvingJobId, reason: string): Promise<void>;
     setProvingJobResult(id: ProvingJobId, value: ProofUri): Promise<void>;
     private getEpochDatabase;
 }
-//# sourceMappingURL=persisted.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGVyc2lzdGVkLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHJvdmluZ19icm9rZXIvcHJvdmluZ19icm9rZXJfZGF0YWJhc2UvcGVyc2lzdGVkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUU5RCxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFJbEUsT0FBTyxFQUNMLEtBQUssUUFBUSxFQUNiLFVBQVUsRUFDVixLQUFLLFlBQVksRUFDakIsdUJBQXVCLEVBRXhCLE1BQU0saUNBQWlDLENBQUM7QUFDekMsT0FBTyxFQUdMLEtBQUssZUFBZSxFQUNwQixLQUFLLE1BQU0sRUFHWixNQUFNLHlCQUF5QixDQUFDO0FBS2pDLE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sY0FBYyxDQUFDO0FBQ3ZELE9BQU8sS0FBSyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sK0JBQStCLENBQUM7QUF3RDNFLHFCQUFhLGdCQUFpQixZQUFXLHFCQUFxQjtJQVExRCxPQUFPLENBQUMsTUFBTTtJQUNkLE9BQU8sQ0FBQyxNQUFNO0lBRWQsT0FBTyxDQUFDLE1BQU07SUFWaEIsT0FBTyxDQUFDLE9BQU8sQ0FBYztJQUU3QixPQUFPLENBQUMsVUFBVSxDQUEyRTtJQUU3RixTQUFnQixNQUFNLEVBQUUsTUFBTSxDQUFDO0lBRS9CLE9BQU8sZUFzQk47SUFHWSxZQUFZLENBQUMsS0FBSyxFQUFFLEtBQUssQ0FBQyxVQUFVLEdBQUcsQ0FBQyxZQUFZLEVBQUUsdUJBQXVCLENBQUMsQ0FBQyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlCQU1oSDtZQUVhLFlBQVk7SUFVMUIsT0FBb0IsR0FBRyxDQUNyQixNQUFNLEVBQUUsa0JBQWtCLEVBQzFCLE1BQU0sR0FBRSxlQUFzQyxFQUM5QyxNQUFNLFNBQXdELDZCQThCL0Q7SUFFRCxPQUFPLENBQUMsS0FBSztJQUlQLEtBQUssSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBSzNCO0lBS0ssa0NBQWtDLENBQUMsV0FBVyxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBV2hGO0lBRUQsYUFBYSxDQUFDLEdBQUcsRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUU1QztJQUVNLGNBQWMsSUFBSSxxQkFBcUIsQ0FBQyxDQUFDLFVBQVUsRUFBRSx1QkFBdUIsR0FBRyxTQUFTLENBQUMsQ0FBQyxDQUtoRztJQUVELGtCQUFrQixDQUFDLEVBQUUsRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBRWxFO0lBRUQsbUJBQW1CLENBQUMsRUFBRSxFQUFFLFlBQVksRUFBRSxLQUFLLEVBQUUsUUFBUSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFcEU7WUFFYSxnQkFBZ0I7Q0FvQi9CIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"persisted.d.ts","sourceRoot":"","sources":["../../../src/proving_broker/proving_broker_database/persisted.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAIlE,OAAO,EACL,KAAK,QAAQ,EACb,UAAU,EACV,KAAK,YAAY,EACjB,uBAAuB,EAExB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAA2B,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAK5G,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAwD3E,qBAAa,gBAAiB,YAAW,qBAAqB;IAM1D,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IAEd,OAAO,CAAC,MAAM;IARhB,OAAO,CAAC,OAAO,CAAc;IAE7B,OAAO,CAAC,UAAU,CAA2E;IAE7F,OAAO;IAuBM,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,GAAG,CAAC,YAAY,EAAE,uBAAuB,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM;YAQnG,YAAY;WASN,GAAG,CACrB,MAAM,EAAE,kBAAkB,EAC1B,MAAM,GAAE,eAAsC,EAC9C,MAAM,SAAwD;IAgChE,OAAO,CAAC,KAAK;IAIP,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAOtB,kCAAkC,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAa5E,aAAa,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAItC,cAAc,IAAI,qBAAqB,CAAC,CAAC,UAAU,EAAE,uBAAuB,GAAG,SAAS,CAAC,CAAC;IAOjG,kBAAkB,CAAC,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAInE,mBAAmB,CAAC,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;YAIvD,gBAAgB;CAoB/B"}
+{"version":3,"file":"persisted.d.ts","sourceRoot":"","sources":["../../../src/proving_broker/proving_broker_database/persisted.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAE9D,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAIlE,OAAO,EACL,KAAK,QAAQ,EACb,UAAU,EACV,KAAK,YAAY,EACjB,uBAAuB,EAExB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAGL,KAAK,eAAe,EACpB,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAKjC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAwD3E,qBAAa,gBAAiB,YAAW,qBAAqB;IAQ1D,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IAEd,OAAO,CAAC,MAAM;IAVhB,OAAO,CAAC,OAAO,CAAc;IAE7B,OAAO,CAAC,UAAU,CAA2E;IAE7F,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,OAAO,eAsBN;IAGY,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,GAAG,CAAC,YAAY,EAAE,uBAAuB,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,iBAMhH;YAEa,YAAY;IAU1B,OAAoB,GAAG,CACrB,MAAM,EAAE,kBAAkB,EAC1B,MAAM,GAAE,eAAsC,EAC9C,MAAM,SAAwD,6BA8B/D;IAED,OAAO,CAAC,KAAK;IAIP,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAK3B;IAKK,kCAAkC,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAWhF;IAED,aAAa,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAE5C;IAEM,cAAc,IAAI,qBAAqB,CAAC,CAAC,UAAU,EAAE,uBAAuB,GAAG,SAAS,CAAC,CAAC,CAKhG;IAED,kBAAkB,CAAC,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAElE;IAED,mBAAmB,CAAC,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAEpE;YAEa,gBAAgB;CAoB/B"}