@aztec/prover-client 0.66.0 → 0.67.1

package/dest/proving_broker/caching_broker_facade.js

@@ -1,6 +1,6 @@
 import { ProvingRequestType, } from '@aztec/circuit-types';
 import { sha256 } from '@aztec/foundation/crypto';
-import { createDebugLogger } from '@aztec/foundation/log';
+import { createLogger } from '@aztec/foundation/log';
 import { retryUntil } from '@aztec/foundation/retry';
 import { InlineProofStore } from './proof_store.js';
 import { InMemoryProverCache } from './prover_cache/memory.js';
@@ -10,7 +10,7 @@ const MAX_WAIT_MS = 1200000;
  * A facade around a job broker that generates stable job ids and caches results
  */
 export class CachingBrokerFacade {
-    constructor(broker, cache = new InMemoryProverCache(), proofStore = new InlineProofStore(), waitTimeoutMs = MAX_WAIT_MS, pollIntervalMs = 1000, log = createDebugLogger('aztec:prover-client:caching-prover-broker')) {
+    constructor(broker, cache = new InMemoryProverCache(), proofStore = new InlineProofStore(), waitTimeoutMs = MAX_WAIT_MS, pollIntervalMs = 1000, log = createLogger('prover-client:caching-prover-broker')) {
         this.broker = broker;
         this.cache = cache;
         this.proofStore = proofStore;
@@ -18,7 +18,7 @@ export class CachingBrokerFacade {
         this.pollIntervalMs = pollIntervalMs;
         this.log = log;
     }
-    async enqueueAndWaitForJob(id, type, inputs, signal) {
+    async enqueueAndWaitForJob(id, type, inputs, epochNumber = 0, signal) {
         // first try the cache
         let jobEnqueued = false;
         try {
@@ -56,6 +56,7 @@ export class CachingBrokerFacade {
                     id,
                     type,
                     inputsUri,
+                    epochNumber,
                 });
                 await this.cache.setProvingJobStatus(id, { status: 'in-queue' });
             }
@@ -68,7 +69,7 @@ export class CachingBrokerFacade {
         // notify broker of cancelled job
         const abortFn = async () => {
             signal?.removeEventListener('abort', abortFn);
-            await this.broker.removeAndCancelProvingJob(id);
+            await this.broker.cancelProvingJob(id);
         };
         signal?.addEventListener('abort', abortFn);
         try {
@@ -104,47 +105,49 @@ export class CachingBrokerFacade {
         }
         finally {
             signal?.removeEventListener('abort', abortFn);
+            // we've saved the result in our cache. We can tell the broker to clear its state
+            await this.broker.cleanUpProvingJobState(id);
         }
     }
-    getAvmProof(inputs, signal, _blockNumber) {
-        return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.PUBLIC_VM, inputs), ProvingRequestType.PUBLIC_VM, inputs, signal);
+    getAvmProof(inputs, signal, epochNumber) {
+        return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.PUBLIC_VM, inputs), ProvingRequestType.PUBLIC_VM, inputs, epochNumber, signal);
     }
-    getBaseParityProof(inputs, signal, _epochNumber) {
-        return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.BASE_PARITY, inputs), ProvingRequestType.BASE_PARITY, inputs, signal);
+    getBaseParityProof(inputs, signal, epochNumber) {
+        return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.BASE_PARITY, inputs), ProvingRequestType.BASE_PARITY, inputs, epochNumber, signal);
     }
-    getBlockMergeRollupProof(input, signal, _epochNumber) {
-        return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.BLOCK_MERGE_ROLLUP, input), ProvingRequestType.BLOCK_MERGE_ROLLUP, input, signal);
+    getBlockMergeRollupProof(input, signal, epochNumber) {
+        return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.BLOCK_MERGE_ROLLUP, input), ProvingRequestType.BLOCK_MERGE_ROLLUP, input, epochNumber, signal);
     }
-    getBlockRootRollupProof(input, signal, _epochNumber) {
-        return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.BLOCK_ROOT_ROLLUP, input), ProvingRequestType.BLOCK_ROOT_ROLLUP, input, signal);
+    getBlockRootRollupProof(input, signal, epochNumber) {
+        return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.BLOCK_ROOT_ROLLUP, input), ProvingRequestType.BLOCK_ROOT_ROLLUP, input, epochNumber, signal);
     }
-    getEmptyBlockRootRollupProof(input, signal, _epochNumber) {
-        return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP, input), ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP, input, signal);
+    getEmptyBlockRootRollupProof(input, signal, epochNumber) {
+        return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP, input), ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP, input, epochNumber, signal);
     }
-    getEmptyPrivateKernelProof(inputs, signal, _epochNumber) {
-        return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.PRIVATE_KERNEL_EMPTY, inputs), ProvingRequestType.PRIVATE_KERNEL_EMPTY, inputs, signal);
+    getEmptyPrivateKernelProof(inputs, signal, epochNumber) {
+        return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.PRIVATE_KERNEL_EMPTY, inputs), ProvingRequestType.PRIVATE_KERNEL_EMPTY, inputs, epochNumber, signal);
     }
-    getMergeRollupProof(input, signal, _epochNumber) {
-        return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.MERGE_ROLLUP, input), ProvingRequestType.MERGE_ROLLUP, input, signal);
+    getMergeRollupProof(input, signal, epochNumber) {
+        return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.MERGE_ROLLUP, input), ProvingRequestType.MERGE_ROLLUP, input, epochNumber, signal);
     }
-    getPrivateBaseRollupProof(baseRollupInput, signal, _epochNumber) {
-        return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.PRIVATE_BASE_ROLLUP, baseRollupInput), ProvingRequestType.PRIVATE_BASE_ROLLUP, baseRollupInput, signal);
+    getPrivateBaseRollupProof(baseRollupInput, signal, epochNumber) {
+        return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.PRIVATE_BASE_ROLLUP, baseRollupInput), ProvingRequestType.PRIVATE_BASE_ROLLUP, baseRollupInput, epochNumber, signal);
     }
-    getPublicBaseRollupProof(inputs, signal, _epochNumber) {
-        return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.PUBLIC_BASE_ROLLUP, inputs), ProvingRequestType.PUBLIC_BASE_ROLLUP, inputs, signal);
+    getPublicBaseRollupProof(inputs, signal, epochNumber) {
+        return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.PUBLIC_BASE_ROLLUP, inputs), ProvingRequestType.PUBLIC_BASE_ROLLUP, inputs, epochNumber, signal);
     }
-    getRootParityProof(inputs, signal, _epochNumber) {
-        return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.ROOT_PARITY, inputs), ProvingRequestType.ROOT_PARITY, inputs, signal);
+    getRootParityProof(inputs, signal, epochNumber) {
+        return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.ROOT_PARITY, inputs), ProvingRequestType.ROOT_PARITY, inputs, epochNumber, signal);
     }
-    getRootRollupProof(input, signal, _epochNumber) {
-        return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.ROOT_ROLLUP, input), ProvingRequestType.ROOT_ROLLUP, input, signal);
+    getRootRollupProof(input, signal, epochNumber) {
+        return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.ROOT_ROLLUP, input), ProvingRequestType.ROOT_ROLLUP, input, epochNumber, signal);
     }
-    getTubeProof(tubeInput, signal, _epochNumber) {
-        return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.TUBE_PROOF, tubeInput), ProvingRequestType.TUBE_PROOF, tubeInput, signal);
+    getTubeProof(tubeInput, signal, epochNumber) {
+        return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.TUBE_PROOF, tubeInput), ProvingRequestType.TUBE_PROOF, tubeInput, epochNumber, signal);
     }
     generateId(type, inputs) {
         const inputsHash = sha256(inputs.toBuffer());
         return `${ProvingRequestType[type]}:${inputsHash.toString('hex')}`;
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"caching_broker_facade.js","sourceRoot":"","sources":["../../src/proving_broker/caching_broker_facade.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"caching_broker_facade.js","sourceRoot":"","sources":["../../src/proving_broker/caching_broker_facade.ts"],"names":[],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"proving_agent.d.ts","sourceRoot":"","sources":["../../src/proving_broker/proving_agent.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,kBAAkB,EACvB,KAAK,YAAY,EAEjB,KAAK,oBAAoB,EACzB,kBAAkB,EAClB,KAAK,mBAAmB,EACzB,MAAM,sBAAsB,CAAC;AAI9B,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAInD;;GAEG;AACH,qBAAa,YAAY;IAOrB,iCAAiC;IACjC,OAAO,CAAC,MAAM;IACd,gDAAgD;IAChD,OAAO,CAAC,UAAU;IAClB,iDAAiD;IACjD,OAAO,CAAC,aAAa;IAGrB,oDAAoD;IACpD,OAAO,CAAC,cAAc;IACtB,oCAAoC;IACpC,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,GAAG;IAlBb,OAAO,CAAC,oBAAoB,CAAC,CAAuB;IACpD,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,eAAe,CAA8B;IACrD,OAAO,CAAC,SAAS,CAAoB;;IAGnC,iCAAiC;IACzB,MAAM,EAAE,kBAAkB;IAClC,gDAAgD;IACxC,UAAU,EAAE,UAAU;IAC9B,iDAAiD;IACzC,aAAa,EAAE,mBAAmB;IAC1C,uDAAuD;IACvD,MAAM,EAAE,eAAe;IACvB,oDAAoD;IAC5C,cAAc,GAAE,KAAK,CAAC,kBAAkB,CAAM;IACtD,oCAAoC;IAC5B,cAAc,SAAO,EACrB,GAAG,yCAAyD;IAM/D,gBAAgB,CAAC,aAAa,EAAE,mBAAmB,GAAG,IAAI;IAI1D,SAAS,IAAI,OAAO;IAIpB,KAAK,IAAI,IAAI;IAKP,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAKlC,OAAO,CAAC,QAAQ,CAqEd;IAEF,eAAe,wCACN,YAAY,QACb,CAAC,OACF,KAAK,GAAG,SAAS,UACd,oBAAoB,CAAC,CAAC,CAAC,GAAG,SAAS,mBAc3C;CACH"}
+{"version":3,"file":"proving_agent.d.ts","sourceRoot":"","sources":["../../src/proving_broker/proving_agent.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,kBAAkB,EACvB,KAAK,YAAY,EAEjB,KAAK,oBAAoB,EACzB,kBAAkB,EAClB,KAAK,mBAAmB,EACzB,MAAM,sBAAsB,CAAC;AAI9B,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAInD;;GAEG;AACH,qBAAa,YAAY;IAOrB,iCAAiC;IACjC,OAAO,CAAC,MAAM;IACd,gDAAgD;IAChD,OAAO,CAAC,UAAU;IAClB,iDAAiD;IACjD,OAAO,CAAC,aAAa;IAGrB,oDAAoD;IACpD,OAAO,CAAC,cAAc;IACtB,oCAAoC;IACpC,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,GAAG;IAlBb,OAAO,CAAC,oBAAoB,CAAC,CAAuB;IACpD,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,eAAe,CAA8B;IACrD,OAAO,CAAC,SAAS,CAAoB;;IAGnC,iCAAiC;IACzB,MAAM,EAAE,kBAAkB;IAClC,gDAAgD;IACxC,UAAU,EAAE,UAAU;IAC9B,iDAAiD;IACzC,aAAa,EAAE,mBAAmB;IAC1C,uDAAuD;IACvD,MAAM,EAAE,eAAe;IACvB,oDAAoD;IAC5C,cAAc,GAAE,KAAK,CAAC,kBAAkB,CAAM;IACtD,oCAAoC;IAC5B,cAAc,SAAO,EACrB,GAAG,yCAA8C;IAMpD,gBAAgB,CAAC,aAAa,EAAE,mBAAmB,GAAG,IAAI;IAI1D,SAAS,IAAI,OAAO;IAIpB,KAAK,IAAI,IAAI;IAKP,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAKlC,OAAO,CAAC,QAAQ,CAqEd;IAEF,eAAe,wCACN,YAAY,QACb,CAAC,OACF,KAAK,GAAG,SAAS,UACd,oBAAoB,CAAC,CAAC,CAAC,GAAG,SAAS,mBAc3C;CACH"}

package/dest/proving_broker/proving_agent.js

@@ -1,5 +1,5 @@
 import { ProvingError, ProvingRequestType, } from '@aztec/circuit-types';
-import { createDebugLogger } from '@aztec/foundation/log';
+import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { Timer } from '@aztec/foundation/timer';
 import { ProvingAgentInstrumentation } from './proving_agent_instrumentation.js';
@@ -20,7 +20,7 @@ export class ProvingAgent {
     /** Optional list of allowed proof types to build */
     proofAllowList = [], 
     /** How long to wait between jobs */
-    pollIntervalMs = 1000, log = createDebugLogger('aztec:prover-client:proving-agent')) {
+    pollIntervalMs = 1000, log = createLogger('prover-client:proving-agent')) {
         this.broker = broker;
         this.proofStore = proofStore;
         this.circuitProver = circuitProver;
@@ -110,4 +110,4 @@ export class ProvingAgent {
 function truncateString(str, length = 64) {
     return str.length > length ? str.slice(0, length) + '...' : str;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmluZ19hZ2VudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wcm92aW5nX2Jyb2tlci9wcm92aW5nX2FnZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxZQUFZLEVBTVosa0JBQWtCLEdBRW5CLE1BQU0sc0JBQXNCLENBQUM7QUFDOUIsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDMUQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQ25FLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUloRCxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQUNqRixPQUFPLEVBQUUsb0JBQW9CLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUUvRjs7R0FFRztBQUNILE1BQU0sT0FBTyxZQUFZO0lBTXZCO0lBQ0UsaUNBQWlDO0lBQ3pCLE1BQTBCO0lBQ2xDLGdEQUFnRDtJQUN4QyxVQUFzQjtJQUM5QixpREFBaUQ7SUFDekMsYUFBa0M7SUFDMUMsdURBQXVEO0lBQ3ZELE1BQXVCO0lBQ3ZCLG9EQUFvRDtJQUM1QyxpQkFBNEMsRUFBRTtJQUN0RCxvQ0FBb0M7SUFDNUIsaUJBQWlCLElBQUksRUFDckIsTUFBTSxpQkFBaUIsQ0FBQyxtQ0FBbUMsQ0FBQztRQVg1RCxXQUFNLEdBQU4sTUFBTSxDQUFvQjtRQUUxQixlQUFVLEdBQVYsVUFBVSxDQUFZO1FBRXRCLGtCQUFhLEdBQWIsYUFBYSxDQUFxQjtRQUlsQyxtQkFBYyxHQUFkLGNBQWMsQ0FBZ0M7UUFFOUMsbUJBQWMsR0FBZCxjQUFjLENBQU87UUFDckIsUUFBRyxHQUFILEdBQUcsQ0FBeUQ7UUF3QjlELGFBQVEsR0FBRyxLQUFLLElBQUksRUFBRTtZQUM1QixJQUFJLENBQUM7Z0JBQ0gsd0JBQXdCO2dCQUN4QixtRUFBbUU7Z0JBQ25F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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmluZ19hZ2VudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wcm92aW5nX2Jyb2tlci9wcm92aW5nX2FnZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxZQUFZLEVBTVosa0JBQWtCLEdBRW5CLE1BQU0sc0JBQXNCLENBQUM7QUFDOUIsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUNuRSxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFJaEQsT0FBTyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFDakYsT0FBTyxFQUFFLG9CQUFvQixFQUFFLDBCQUEwQixFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFL0Y7O0dBRUc7QUFDSCxNQUFNLE9BQU8sWUFBWTtJQU12QjtJQUNFLGlDQUFpQztJQUN6QixNQUEwQjtJQUNsQyxnREFBZ0Q7SUFDeEMsVUFBc0I7SUFDOUIsaURBQWlEO0lBQ3pDLGFBQWtDO0lBQzFDLHVEQUF1RDtJQUN2RCxNQUF1QjtJQUN2QixvREFBb0Q7SUFDNUMsaUJBQTRDLEVBQUU7SUFDdEQsb0NBQW9DO0lBQzVCLGlCQUFpQixJQUFJLEVBQ3JCLE1BQU0sWUFBWSxDQUFDLDZCQUE2QixDQUFDO1FBWGpELFdBQU0sR0FBTixNQUFNLENBQW9CO1FBRTFCLGVBQVUsR0FBVixVQUFVLENBQVk7UUFFdEIsa0JBQWEsR0FBYixhQUFhLENBQXFCO1FBSWxDLG1CQUFjLEdBQWQsY0FBYyxDQUFnQztRQUU5QyxtQkFBYyxHQUFkLGNBQWMsQ0FBTztRQUNyQixRQUFHLEdBQUgsR0FBRyxDQUE4QztRQXdCbkQsYUFBUSxHQUFHLEtBQUssSUFBSSxFQUFFO1lBQzVCLElBQUksQ0FBQztnQkFDSCx3QkFBd0I7Z0JBQ3hCLG1FQUFtRTtnQkFDbkUsb0JB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

package/dest/proving_broker/proving_broker.d.ts

@@ -5,6 +5,8 @@ type ProofRequestBrokerConfig = {
     timeoutIntervalMs?: number;
     jobTimeoutMs?: number;
     maxRetries?: number;
+    maxEpochsToKeepResultsFor?: number;
+    maxParallelCleanUps?: number;
 };
 /**
  * A broker that manages proof requests and distributes them to workers based on their priority.
@@ -20,19 +22,33 @@ export declare class ProvingBroker implements ProvingJobProducer, ProvingJobCons
     private inProgress;
     private retries;
     private promises;
-    private timeoutPromise;
-    private timeSource;
+    private cleanupPromise;
+    private msTimeSource;
     private jobTimeoutMs;
     private maxRetries;
     private instrumentation;
-    constructor(database: ProvingBrokerDatabase, client: TelemetryClient, { jobTimeoutMs, timeoutIntervalMs, maxRetries }?: ProofRequestBrokerConfig, logger?: import("@aztec/foundation/log").Logger);
+    private maxParallelCleanUps;
+    /**
+     * 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.
+     * This clean up pass is only done against _settled_ jobs. This pass will not cancel jobs that are in-progress or in-queue.
+     * It is a client responsibility to cancel jobs if they are no longer necessary.
+     * Example:
+     * proving epoch 11 - the broker will wipe all setlled jobs for epochs 9 and lower
+     * finished proving epoch 11 and got first job for epoch 12 -> the broker will wipe all setlled jobs for epochs 10 and lower
+     * reorged back to end of epoch 10 -> epoch 11 is skipped and epoch 12 starts -> the broker will wipe all setlled jobs for epochs 10 and lower
+     */
+    private epochHeight;
+    private maxEpochsToKeepResultsFor;
+    constructor(database: ProvingBrokerDatabase, client: TelemetryClient, { jobTimeoutMs, timeoutIntervalMs, maxRetries, maxEpochsToKeepResultsFor, maxParallelCleanUps, }?: ProofRequestBrokerConfig, logger?: import("@aztec/foundation/log").Logger);
     private measureQueueDepth;
     private countActiveJobs;
     start(): Promise<void>;
     stop(): Promise<void>;
     enqueueProvingJob(job: ProvingJob): Promise<void>;
     waitForJobToSettle(id: ProvingJobId): Promise<ProvingJobSettledResult>;
-    removeAndCancelProvingJob(id: ProvingJobId): Promise<void>;
+    cancelProvingJob(id: ProvingJobId): Promise<void>;
+    cleanUpProvingJobState(id: ProvingJobId): Promise<void>;
     getProvingJobStatus(id: ProvingJobId): Promise<ProvingJobStatus>;
     getProvingJob(filter?: ProvingJobFilter): Promise<{
         job: ProvingJob;
@@ -44,8 +60,11 @@ export declare class ProvingBroker implements ProvingJobProducer, ProvingJobCons
         time: number;
     } | undefined>;
     reportProvingJobSuccess(id: ProvingJobId, value: ProofUri): Promise<void>;
-    private timeoutCheck;
+    private cleanupPass;
+    private cleanupStaleJobs;
+    private reEnqueueExpiredJobs;
     private enqueueJobInternal;
+    private isJobStale;
 }
 export {};
 //# sourceMappingURL=proving_broker.d.ts.map

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,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"}
+{"version":3,"file":"proving_broker.d.ts","sourceRoot":"","sources":["../../src/proving_broker/proving_broker.ts"],"names":[],"mappings":"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"}