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

package/dest/proving_broker/broker_prover_facade.js

@@ -1,4 +1,5 @@
 import { sha256 } from '@aztec/foundation/crypto';
+import { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise, promiseWithResolvers } from '@aztec/foundation/promise';
 import { truncate } from '@aztec/foundation/string';
@@ -49,7 +50,13 @@ export class BrokerCircuitProverFacade {
         }
         // 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
+        // We install an error handler to prevent unhandled rejections in the process before the
+        // job promise is awaited by the caller (see #13166)
         const promise = promiseWithResolvers();
+        promise.promise.catch((err)=>this.log.error(`Job errored with '${err.message ?? err}' id=${id} type=${ProvingRequestType[type]}`, {
+                provingJobId: id,
+                provingJobType: ProvingRequestType[type]
+            }));
         const abortFn = ()=>{
             signal?.removeEventListener('abort', abortFn);
             void this.broker.cancelProvingJob(id).catch((err)=>this.log.warn(`Error cancelling job id=${id}`, err));
@@ -75,23 +82,28 @@ export class BrokerCircuitProverFacade {
         try {
             const inputsUri = await this.proofStore.saveProofInput(id, type, inputs);
             job.inputsUri = inputsUri;
+            // Send the job to the broker
             const jobStatus = await this.broker.enqueueProvingJob({
                 id,
                 type,
                 inputsUri,
                 epochNumber
             });
+            const jobLogText = `id=${id} type=${ProvingRequestType[type]} epochNumber=${epochNumber}`;
+            const jobLogData = {
+                provingJobId: id,
+                provingJobType: ProvingRequestType[type],
+                epochNumber,
+                inputsUri: truncate(inputsUri),
+                status: jobStatus.status,
+                numOutstandingJobs: this.jobs.size
+            };
             // If we are here then the job was successfully accepted by the broker
             // the returned status is for before any action was performed
             if (jobStatus.status === 'fulfilled' || jobStatus.status === 'rejected') {
                 // Job was already completed by the broker
                 // No need to notify the broker on aborted job
-                this.log.verbose(`Job already completed when sent to broker id=${id} type=${ProvingRequestType[type]} epochNumber=${epochNumber}`, {
-                    provingJobId: id,
-                    provingJobType: ProvingRequestType[type],
-                    epochNumber,
-                    inputsUri: truncate(inputsUri)
-                });
+                this.log.verbose(`Job already completed when sent to broker ${jobLogText}`, jobLogData);
                 // Job was not enqueued. It must be completed already, add to our set of already completed jobs
                 this.jobsToRetrieve.add(id);
             } else {
@@ -99,21 +111,10 @@ export class BrokerCircuitProverFacade {
                 signal?.addEventListener('abort', job.abortFn);
                 // Job added for the first time
                 if (jobStatus.status === 'not-found') {
-                    this.log.verbose(`Job enqueued with broker id=${id} type=${ProvingRequestType[type]} epochNumber=${epochNumber}`, {
-                        provingJobId: id,
-                        provingJobType: ProvingRequestType[type],
-                        epochNumber,
-                        inputsUri: truncate(inputsUri),
-                        numOutstandingJobs: this.jobs.size
-                    });
+                    this.log.verbose(`Job enqueued with broker ${jobLogText}`, jobLogData);
                 } else {
                     // Job was previously sent to the broker but is not completed
-                    this.log.verbose(`Job already in queue or in progress when sent to broker id=${id} type=${ProvingRequestType[type]} epochNumber=${epochNumber}`, {
-                        provingJobId: id,
-                        provingJobType: ProvingRequestType[type],
-                        epochNumber,
-                        inputsUri: truncate(inputsUri)
-                    });
+                    this.log.verbose(`Job already in queue or in progress when sent to broker ${jobLogText}`, jobLogData);
                 }
             }
         } catch (err) {
@@ -301,42 +302,66 @@ export class BrokerCircuitProverFacade {
         // We have a list of jobs that we have been told are ready, so we go ahead and ask for their results
         await this.retrieveJobsThatShouldBeReady();
     }
-    getAvmProof(inputs, signal, epochNumber) {
-        return this.enqueueJob(this.generateId(ProvingRequestType.PUBLIC_VM, inputs, epochNumber), ProvingRequestType.PUBLIC_VM, inputs, epochNumber, signal);
+    getAvmProof(inputs, skipPublicInputsValidation, signal, epochNumber) {
+        this.log.info(`getAvmProof() called with skipPublicInputsValidation: ${skipPublicInputsValidation}`);
+        return this.enqueueJob(this.generateId(ProvingRequestType.PUBLIC_VM, inputs, epochNumber), ProvingRequestType.PUBLIC_VM, inputs, epochNumber, signal).then((result)=>{
+            // TODO(#14234)[Unconditional PIs validation]: Remove ".then()".
+            // Override the default value of skipPublicInputsValidation potentially set in BBNativeRollupProver.getAvmProof().
+            result.proof.proof[0] = skipPublicInputsValidation ? new Fr(1) : new Fr(0);
+            return result;
+        });
     }
     getBaseParityProof(inputs, signal, epochNumber) {
-        return this.enqueueJob(this.generateId(ProvingRequestType.BASE_PARITY, inputs, epochNumber), ProvingRequestType.BASE_PARITY, inputs, epochNumber, signal);
+        return this.enqueueJob(this.generateId(ProvingRequestType.PARITY_BASE, inputs, epochNumber), ProvingRequestType.PARITY_BASE, inputs, epochNumber, signal);
     }
-    getBlockMergeRollupProof(input, signal, epochNumber) {
-        return this.enqueueJob(this.generateId(ProvingRequestType.BLOCK_MERGE_ROLLUP, input, epochNumber), ProvingRequestType.BLOCK_MERGE_ROLLUP, input, epochNumber, signal);
+    getTxMergeRollupProof(input, signal, epochNumber) {
+        return this.enqueueJob(this.generateId(ProvingRequestType.TX_MERGE_ROLLUP, input, epochNumber), ProvingRequestType.TX_MERGE_ROLLUP, input, epochNumber, signal);
+    }
+    getPublicChonkVerifierProof(inputs, signal, epochNumber) {
+        return this.enqueueJob(this.generateId(ProvingRequestType.PUBLIC_CHONK_VERIFIER, inputs, epochNumber), ProvingRequestType.PUBLIC_CHONK_VERIFIER, inputs, epochNumber, signal);
+    }
+    getPrivateTxBaseRollupProof(baseRollupInput, signal, epochNumber) {
+        return this.enqueueJob(this.generateId(ProvingRequestType.PRIVATE_TX_BASE_ROLLUP, baseRollupInput, epochNumber), ProvingRequestType.PRIVATE_TX_BASE_ROLLUP, baseRollupInput, epochNumber, signal);
+    }
+    getPublicTxBaseRollupProof(inputs, signal, epochNumber) {
+        return this.enqueueJob(this.generateId(ProvingRequestType.PUBLIC_TX_BASE_ROLLUP, inputs, epochNumber), ProvingRequestType.PUBLIC_TX_BASE_ROLLUP, inputs, epochNumber, signal);
+    }
+    getRootParityProof(inputs, signal, epochNumber) {
+        return this.enqueueJob(this.generateId(ProvingRequestType.PARITY_ROOT, inputs, epochNumber), ProvingRequestType.PARITY_ROOT, inputs, epochNumber, signal);
+    }
+    getBlockRootFirstRollupProof(input, signal, epochNumber) {
+        return this.enqueueJob(this.generateId(ProvingRequestType.BLOCK_ROOT_FIRST_ROLLUP, input, epochNumber), ProvingRequestType.BLOCK_ROOT_FIRST_ROLLUP, input, epochNumber, signal);
+    }
+    getBlockRootSingleTxFirstRollupProof(input, signal, epochNumber) {
+        return this.enqueueJob(this.generateId(ProvingRequestType.BLOCK_ROOT_SINGLE_TX_FIRST_ROLLUP, input, epochNumber), ProvingRequestType.BLOCK_ROOT_SINGLE_TX_FIRST_ROLLUP, input, epochNumber, signal);
+    }
+    getBlockRootEmptyTxFirstRollupProof(input, signal, epochNumber) {
+        return this.enqueueJob(this.generateId(ProvingRequestType.BLOCK_ROOT_EMPTY_TX_FIRST_ROLLUP, input, epochNumber), ProvingRequestType.BLOCK_ROOT_EMPTY_TX_FIRST_ROLLUP, input, epochNumber, signal);
     }
     getBlockRootRollupProof(input, signal, epochNumber) {
         return this.enqueueJob(this.generateId(ProvingRequestType.BLOCK_ROOT_ROLLUP, input, epochNumber), ProvingRequestType.BLOCK_ROOT_ROLLUP, input, epochNumber, signal);
     }
-    getSingleTxBlockRootRollupProof(input, signal, epochNumber) {
-        return this.enqueueJob(this.generateId(ProvingRequestType.BLOCK_ROOT_ROLLUP, input, epochNumber), ProvingRequestType.SINGLE_TX_BLOCK_ROOT_ROLLUP, input, epochNumber, signal);
+    getBlockRootSingleTxRollupProof(input, signal, epochNumber) {
+        return this.enqueueJob(this.generateId(ProvingRequestType.BLOCK_ROOT_SINGLE_TX_ROLLUP, input, epochNumber), ProvingRequestType.BLOCK_ROOT_SINGLE_TX_ROLLUP, input, epochNumber, signal);
     }
-    getEmptyBlockRootRollupProof(input, signal, epochNumber) {
-        return this.enqueueJob(this.generateId(ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP, input, epochNumber), ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP, input, epochNumber, signal);
+    getBlockMergeRollupProof(input, signal, epochNumber) {
+        return this.enqueueJob(this.generateId(ProvingRequestType.BLOCK_MERGE_ROLLUP, input, epochNumber), ProvingRequestType.BLOCK_MERGE_ROLLUP, input, epochNumber, signal);
     }
-    getMergeRollupProof(input, signal, epochNumber) {
-        return this.enqueueJob(this.generateId(ProvingRequestType.MERGE_ROLLUP, input, epochNumber), ProvingRequestType.MERGE_ROLLUP, input, epochNumber, signal);
+    getCheckpointRootRollupProof(input, signal, epochNumber) {
+        return this.enqueueJob(this.generateId(ProvingRequestType.CHECKPOINT_ROOT_ROLLUP, input, epochNumber), ProvingRequestType.CHECKPOINT_ROOT_ROLLUP, input, epochNumber, signal);
     }
-    getPrivateBaseRollupProof(baseRollupInput, signal, epochNumber) {
-        return this.enqueueJob(this.generateId(ProvingRequestType.PRIVATE_BASE_ROLLUP, baseRollupInput, epochNumber), ProvingRequestType.PRIVATE_BASE_ROLLUP, baseRollupInput, epochNumber, signal);
+    getCheckpointRootSingleBlockRollupProof(input, signal, epochNumber) {
+        return this.enqueueJob(this.generateId(ProvingRequestType.CHECKPOINT_ROOT_SINGLE_BLOCK_ROLLUP, input, epochNumber), ProvingRequestType.CHECKPOINT_ROOT_SINGLE_BLOCK_ROLLUP, input, epochNumber, signal);
     }
-    getPublicBaseRollupProof(inputs, signal, epochNumber) {
-        return this.enqueueJob(this.generateId(ProvingRequestType.PUBLIC_BASE_ROLLUP, inputs, epochNumber), ProvingRequestType.PUBLIC_BASE_ROLLUP, inputs, epochNumber, signal);
+    getCheckpointPaddingRollupProof(input, signal, epochNumber) {
+        return this.enqueueJob(this.generateId(ProvingRequestType.CHECKPOINT_PADDING_ROLLUP, input, epochNumber), ProvingRequestType.CHECKPOINT_PADDING_ROLLUP, input, epochNumber, signal);
     }
-    getRootParityProof(inputs, signal, epochNumber) {
-        return this.enqueueJob(this.generateId(ProvingRequestType.ROOT_PARITY, inputs, epochNumber), ProvingRequestType.ROOT_PARITY, inputs, epochNumber, signal);
+    getCheckpointMergeRollupProof(input, signal, epochNumber) {
+        return this.enqueueJob(this.generateId(ProvingRequestType.CHECKPOINT_MERGE_ROLLUP, input, epochNumber), ProvingRequestType.CHECKPOINT_MERGE_ROLLUP, input, epochNumber, signal);
     }
     getRootRollupProof(input, signal, epochNumber) {
         return this.enqueueJob(this.generateId(ProvingRequestType.ROOT_ROLLUP, input, epochNumber), ProvingRequestType.ROOT_ROLLUP, input, epochNumber, signal);
     }
-    getTubeProof(tubeInput, signal, epochNumber) {
-        return this.enqueueJob(this.generateId(ProvingRequestType.TUBE_PROOF, tubeInput, epochNumber), ProvingRequestType.TUBE_PROOF, tubeInput, epochNumber, signal);
-    }
     generateId(type, inputs, epochNumber = 0) {
         const inputsHash = sha256(inputs.toBuffer());
         return makeProvingJobId(epochNumber, type, inputsHash.toString('hex'));

package/dest/proving_broker/config.d.ts

@@ -1,6 +1,7 @@
 import { type L1ReaderConfig } from '@aztec/ethereum';
 import { type ConfigMappingsType } from '@aztec/foundation/config';
 import { type DataStoreConfig } from '@aztec/kv-store/config';
+import { type ChainConfig } from '@aztec/stdlib/config';
 import { ProvingRequestType } from '@aztec/stdlib/proofs';
 import { z } from 'zod';
 export declare const ProverBrokerConfig: z.ZodObject<{
@@ -13,7 +14,9 @@ export declare const ProverBrokerConfig: z.ZodObject<{
     /** If starting a prover broker locally, the directory to store broker data */
     dataDirectory: z.ZodOptional<z.ZodString>;
     /** The size of the data store map */
-    dataStoreMapSizeKB: z.ZodNumber;
+    dataStoreMapSizeKb: z.ZodNumber;
+    /** The size of the prover broker's database. Will override the dataStoreMapSizeKb if set. */
+    proverBrokerStoreMapSizeKb: z.ZodOptional<z.ZodNumber>;
     /** The prover broker may batch jobs together before writing to the database */
     proverBrokerBatchSize: z.ZodNumber;
     /** How often the job batches get flushed */
@@ -24,22 +27,24 @@ export declare const ProverBrokerConfig: z.ZodObject<{
     proverBrokerJobMaxRetries: number;
     proverBrokerJobTimeoutMs: number;
     proverBrokerPollIntervalMs: number;
-    dataStoreMapSizeKB: number;
+    dataStoreMapSizeKb: number;
     proverBrokerBatchSize: number;
     proverBrokerBatchIntervalMs: number;
     proverBrokerMaxEpochsToKeepResultsFor: number;
     dataDirectory?: string | undefined;
+    proverBrokerStoreMapSizeKb?: number | undefined;
 }, {
     proverBrokerJobMaxRetries: number;
     proverBrokerJobTimeoutMs: number;
     proverBrokerPollIntervalMs: number;
-    dataStoreMapSizeKB: number;
+    dataStoreMapSizeKb: number;
     proverBrokerBatchSize: number;
     proverBrokerBatchIntervalMs: number;
     proverBrokerMaxEpochsToKeepResultsFor: number;
     dataDirectory?: string | undefined;
+    proverBrokerStoreMapSizeKb?: number | undefined;
 }>;
-export type ProverBrokerConfig = z.infer<typeof ProverBrokerConfig> & Pick<DataStoreConfig, 'dataStoreMapSizeKB' | 'dataDirectory'> & L1ReaderConfig;
+export type ProverBrokerConfig = z.infer<typeof ProverBrokerConfig> & Pick<DataStoreConfig, 'dataStoreMapSizeKb' | 'dataDirectory'> & L1ReaderConfig & Pick<ChainConfig, 'rollupVersion'>;
 export declare const proverBrokerConfigMappings: ConfigMappingsType<ProverBrokerConfig>;
 export declare const defaultProverBrokerConfig: ProverBrokerConfig;
 export declare const ProverAgentConfig: z.ZodObject<{

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

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/proving_broker/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AAClF,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,kBAAkB;IAC7B,qFAAqF;;IAErF,uHAAuH;;IAEvH,6FAA6F;;IAE7F,8EAA8E;;IAE9E,qCAAqC;;IAErC,+EAA+E;;IAE/E,4CAA4C;;IAE5C,uDAAuD;;;;;;;;;;;;;;;;;;;;EAEvD,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,GACjE,IAAI,CAAC,eAAe,EAAE,oBAAoB,GAAG,eAAe,CAAC,GAC7D,cAAc,CAAC;AAEjB,eAAO,MAAM,0BAA0B,EAAE,kBAAkB,CAAC,kBAAkB,CAiC7E,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,kBAAiE,CAAC;AAE1G,eAAO,MAAM,iBAAiB;IAC5B,2CAA2C;;IAE3C,wDAAwD;;IAExD,gDAAgD;;IAEhD,+CAA+C;;IAE/C,uCAAuC;;IAEvC,gDAAgD;;IAEhD,2DAA2D;;IAE3D,8EAA8E;;;;;;;;;;;;;;;;;;;;EAE9E,CAAC;AAEH,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAElE,eAAO,MAAM,yBAAyB,EAAE,kBAAkB,CAAC,iBAAiB,CA4C3E,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/proving_broker/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AAClF,OAAO,EAAE,KAAK,WAAW,EAAuB,MAAM,sBAAsB,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,kBAAkB;IAC7B,qFAAqF;;IAErF,uHAAuH;;IAEvH,6FAA6F;;IAE7F,8EAA8E;;IAE9E,qCAAqC;;IAErC,6FAA6F;;IAE7F,+EAA+E;;IAE/E,4CAA4C;;IAE5C,uDAAuD;;;;;;;;;;;;;;;;;;;;;;EAEvD,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,GACjE,IAAI,CAAC,eAAe,EAAE,oBAAoB,GAAG,eAAe,CAAC,GAC7D,cAAc,GACd,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;AAErC,eAAO,MAAM,0BAA0B,EAAE,kBAAkB,CAAC,kBAAkB,CAuC7E,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,kBAAiE,CAAC;AAE1G,eAAO,MAAM,iBAAiB;IAC5B,2CAA2C;;IAE3C,wDAAwD;;IAExD,gDAAgD;;IAEhD,+CAA+C;;IAE/C,uCAAuC;;IAEvC,gDAAgD;;IAEhD,2DAA2D;;IAE3D,8EAA8E;;;;;;;;;;;;;;;;;;;;EAE9E,CAAC;AAEH,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAElE,eAAO,MAAM,yBAAyB,EAAE,kBAAkB,CAAC,iBAAiB,CA4C3E,CAAC"}

package/dest/proving_broker/config.js

@@ -1,6 +1,8 @@
 import { l1ReaderConfigMappings } from '@aztec/ethereum';
 import { booleanConfigHelper, getDefaultConfig, numberConfigHelper } from '@aztec/foundation/config';
+import { pickConfigMappings } from '@aztec/foundation/config';
 import { dataConfigMappings } from '@aztec/kv-store/config';
+import { chainConfigMappings } from '@aztec/stdlib/config';
 import { ProvingRequestType } from '@aztec/stdlib/proofs';
 import { z } from 'zod';
 export const ProverBrokerConfig = z.object({
@@ -8,7 +10,8 @@ export const ProverBrokerConfig = z.object({
     /** If starting a prover broker locally, the time after which a job times out and gets assigned to a different agent */ proverBrokerJobTimeoutMs: z.number().int().nonnegative(),
     /** If starting a prover broker locally, the interval the broker checks for timed out jobs */ proverBrokerPollIntervalMs: z.number().int().nonnegative(),
     /** If starting a prover broker locally, the directory to store broker data */ dataDirectory: z.string().optional(),
-    /** The size of the data store map */ dataStoreMapSizeKB: z.number().int().nonnegative(),
+    /** The size of the data store map */ dataStoreMapSizeKb: z.number().int().nonnegative(),
+    /** The size of the prover broker's database. Will override the dataStoreMapSizeKb if set. */ proverBrokerStoreMapSizeKb: z.number().int().nonnegative().optional(),
     /** The prover broker may batch jobs together before writing to the database */ proverBrokerBatchSize: z.number().int().nonnegative(),
     /** How often the job batches get flushed */ proverBrokerBatchIntervalMs: z.number().int().nonnegative(),
     /** The maximum number of epochs to keep results for */ proverBrokerMaxEpochsToKeepResultsFor: z.number().int().nonnegative()
@@ -44,8 +47,16 @@ export const proverBrokerConfigMappings = {
         description: 'The maximum number of epochs to keep results for',
         ...numberConfigHelper(1)
     },
+    proverBrokerStoreMapSizeKb: {
+        env: 'PROVER_BROKER_STORE_MAP_SIZE_KB',
+        parseEnv: (val)=>val ? +val : undefined,
+        description: "The size of the prover broker's database. Will override the dataStoreMapSizeKb if set."
+    },
+    ...dataConfigMappings,
     ...l1ReaderConfigMappings,
-    ...dataConfigMappings
+    ...pickConfigMappings(chainConfigMappings, [
+        'rollupVersion'
+    ])
 };
 export const defaultProverBrokerConfig = getDefaultConfig(proverBrokerConfigMappings);
 export const ProverAgentConfig = z.object({
@@ -70,7 +81,7 @@ export const proverAgentConfigMappings = {
     proverAgentPollIntervalMs: {
         env: 'PROVER_AGENT_POLL_INTERVAL_MS',
         description: 'The interval agents poll for jobs at',
-        ...numberConfigHelper(100)
+        ...numberConfigHelper(1000)
     },
     proverAgentProofTypes: {
         env: 'PROVER_AGENT_PROOF_TYPES',
@@ -84,7 +95,7 @@ export const proverAgentConfigMappings = {
     realProofs: {
         env: 'PROVER_REAL_PROOFS',
         description: 'Whether to construct real proofs',
-        ...booleanConfigHelper(false)
+        ...booleanConfigHelper(true)
     },
     proverTestDelayType: {
         env: 'PROVER_TEST_DELAY_TYPE',

package/dest/proving_broker/factory.d.ts

@@ -1,5 +1,5 @@
 import type { TelemetryClient } from '@aztec/telemetry-client';
 import type { ProverBrokerConfig } from './config.js';
 import { ProvingBroker } from './proving_broker.js';
-export declare function createAndStartProvingBroker(config: ProverBrokerConfig, client: TelemetryClient): Promise<ProvingBroker>;
+export declare function createAndStartProvingBroker(_config: ProverBrokerConfig, client: TelemetryClient): Promise<ProvingBroker>;
 //# sourceMappingURL=factory.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/proving_broker/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAIpD,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,kBAAkB,EAC1B,MAAM,EAAE,eAAe,GACtB,OAAO,CAAC,aAAa,CAAC,CAOxB"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/proving_broker/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAIpD,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,kBAAkB,EAC3B,MAAM,EAAE,eAAe,GACtB,OAAO,CAAC,aAAa,CAAC,CAQxB"}

package/dest/proving_broker/factory.js

@@ -1,7 +1,11 @@
 import { ProvingBroker } from './proving_broker.js';
 import { InMemoryBrokerDatabase } from './proving_broker_database/memory.js';
 import { KVBrokerDatabase } from './proving_broker_database/persisted.js';
-export async function createAndStartProvingBroker(config, client) {
+export async function createAndStartProvingBroker(_config, client) {
+    const config = {
+        ..._config,
+        dataStoreMapSizeKb: _config.proverBrokerStoreMapSizeKb ?? _config.dataStoreMapSizeKb
+    };
     const database = config.dataDirectory ? await KVBrokerDatabase.new(config, client) : new InMemoryBrokerDatabase();
     const broker = new ProvingBroker(database, config, client);
     await broker.start();

package/dest/proving_broker/fixtures.js

@@ -2,7 +2,7 @@ import { randomBytes } from '@aztec/foundation/crypto';
 import { makeProvingJobId } from '@aztec/stdlib/interfaces/server';
 import { ProvingRequestType } from '@aztec/stdlib/proofs';
 export function makeRandomProvingJobId(epochNumber) {
-    return makeProvingJobId(epochNumber ?? 1, ProvingRequestType.BASE_PARITY, randomBytes(8).toString('hex'));
+    return makeProvingJobId(epochNumber ?? 1, ProvingRequestType.PARITY_BASE, randomBytes(8).toString('hex'));
 }
 export function makeInputsUri() {
     return randomBytes(8).toString('hex');

package/dest/proving_broker/proof_store/factory.js

@@ -15,7 +15,7 @@ export function createProofStore(config, logger = createLogger('prover-client:pr
                 path
             });
             return new GoogleCloudStorageProofStore(bucket, path);
-        } catch (err) {
+        } catch  {
             throw new Error(`Invalid google cloud proof store definition: '${config}'. Supported values are 'gs://bucket-name/path/to/store'.`);
         }
     } else {

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

@@ -1 +1 @@
-{"version":3,"file":"gcs_proof_store.d.ts","sourceRoot":"","sources":["../../../src/proving_broker/proof_store/gcs_proof_store.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,YAAY,EACjB,KAAK,gBAAgB,EACrB,KAAK,mBAAmB,EACxB,KAAK,gBAAgB,EACrB,KAAK,oBAAoB,EAE1B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAK1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAInD,qBAAa,4BAA6B,YAAW,UAAU;IAGjD,OAAO,CAAC,QAAQ,CAAC,UAAU;IAAU,OAAO,CAAC,QAAQ,CAAC,IAAI;IAFtE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;gBAEL,UAAU,EAAE,MAAM,EAAmB,IAAI,EAAE,MAAM;IAIjE,cAAc,CAAC,CAAC,SAAS,kBAAkB,EACtD,EAAE,EAAE,YAAY,EAChB,IAAI,EAAE,CAAC,EACP,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAAC,GAC7B,OAAO,CAAC,QAAQ,CAAC;IAOpB,eAAe,CAAC,CAAC,SAAS,kBAAkB,EAC1C,GAAG,EAAE,YAAY,EACjB,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,oBAAoB,CAAC,CAAC,CAAC,GAC/B,OAAO,CAAC,QAAQ,CAAC;IAIP,aAAa,CAAC,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAwBpE,cAAc,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAG1D"}
+{"version":3,"file":"gcs_proof_store.d.ts","sourceRoot":"","sources":["../../../src/proving_broker/proof_store/gcs_proof_store.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,YAAY,EACjB,KAAK,gBAAgB,EACrB,KAAK,mBAAmB,EACxB,KAAK,gBAAgB,EACrB,KAAK,oBAAoB,EAE1B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAK1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAKnD,qBAAa,4BAA6B,YAAW,UAAU;IAI3D,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,IAAI;IAJvB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;gBAGf,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM;IAKlB,cAAc,CAAC,CAAC,SAAS,kBAAkB,EACtD,EAAE,EAAE,YAAY,EAChB,IAAI,EAAE,CAAC,EACP,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAAC,GAC7B,OAAO,CAAC,QAAQ,CAAC;IAOpB,eAAe,CAAC,CAAC,SAAS,kBAAkB,EAC1C,GAAG,EAAE,YAAY,EACjB,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,oBAAoB,CAAC,CAAC,CAAC,GAC/B,OAAO,CAAC,QAAQ,CAAC;IAIP,aAAa,CAAC,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAwBpE,cAAc,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAG1D"}

package/dest/proving_broker/proof_store/gcs_proof_store.js

@@ -3,6 +3,7 @@ import { ProvingRequestType } from '@aztec/stdlib/proofs';
 import { Storage } from '@google-cloud/storage';
 import { join } from 'path';
 const INPUTS_PATH = 'inputs';
+// REFACTOR(#13067): Use the stdlib/file-store instead of referencing google-cloud-storage directly.
 export class GoogleCloudStorageProofStore {
     bucketName;
     path;

package/dest/proving_broker/proof_store/index.d.ts

@@ -1,4 +1,5 @@
 export * from './proof_store.js';
 export * from './inline_proof_store.js';
 export * from './factory.js';
+export * from './gcs_proof_store.js';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/proving_broker/proof_store/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,yBAAyB,CAAC;AACxC,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/proving_broker/proof_store/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,yBAAyB,CAAC;AACxC,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC"}

package/dest/proving_broker/proof_store/index.js

@@ -1,3 +1,4 @@
 export * from './proof_store.js';
 export * from './inline_proof_store.js';
 export * from './factory.js';
+export * from './gcs_proof_store.js';

package/dest/proving_broker/proving_agent.d.ts

@@ -1,4 +1,4 @@
-import type { ProvingJobConsumer, ProvingJobId, ProvingJobResultsMap, ServerCircuitProver } from '@aztec/stdlib/interfaces/server';
+import type { ProverAgentStatus, ProvingJobConsumer, ServerCircuitProver } from '@aztec/stdlib/interfaces/server';
 import { ProvingRequestType } from '@aztec/stdlib/proofs';
 import { type TelemetryClient, type Traceable, type Tracer } from '@aztec/telemetry-client';
 import type { ProofStore } from './proof_store/index.js';
@@ -20,7 +20,6 @@ export declare class ProvingAgent implements Traceable {
     private currentJobController?;
     private runningPromise;
     private instrumentation;
-    private idleTimer;
     readonly tracer: Tracer;
     constructor(
     /** The source of proving jobs */
@@ -39,8 +38,9 @@ export declare class ProvingAgent implements Traceable {
     isRunning(): boolean;
     start(): void;
     stop(): Promise<void>;
+    getStatus(): ProverAgentStatus;
     private work;
     private startJob;
-    handleJobResult: <T extends ProvingRequestType>(jobId: ProvingJobId, type: T, err: Error | undefined, result: ProvingJobResultsMap[T] | undefined) => Promise<void>;
+    private reportResult;
 }
 //# sourceMappingURL=proving_agent.d.ts.map

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":"AAKA,OAAO,KAAK,EAEV,kBAAkB,EAClB,YAAY,EAEZ,oBAAoB,EACpB,mBAAmB,EACpB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,SAAS,EACd,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAIzD;;GAEG;AACH,qBAAa,YAAa,YAAW,SAAS;IAS1C,iCAAiC;IACjC,OAAO,CAAC,MAAM;IACd,gDAAgD;IAChD,OAAO,CAAC,UAAU;IAClB,iDAAiD;IACjD,OAAO,CAAC,aAAa;IACrB,oDAAoD;IACpD,OAAO,CAAC,cAAc;IACtB,oCAAoC;IACpC,OAAO,CAAC,cAAc;IAGtB,OAAO,CAAC,GAAG;IApBb,OAAO,CAAC,oBAAoB,CAAC,CAAuB;IACpD,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,eAAe,CAA8B;IACrD,OAAO,CAAC,SAAS,CAAoB;IAErC,SAAgB,MAAM,EAAE,MAAM,CAAC;;IAG7B,iCAAiC;IACzB,MAAM,EAAE,kBAAkB;IAClC,gDAAgD;IACxC,UAAU,EAAE,UAAU;IAC9B,iDAAiD;IACzC,aAAa,EAAE,mBAAmB;IAC1C,oDAAoD;IAC5C,cAAc,GAAE,KAAK,CAAC,kBAAkB,CAAM;IACtD,oCAAoC;IAC5B,cAAc,SAAO;IAC7B,uDAAuD;IACvD,MAAM,GAAE,eAAsC,EACtC,GAAG,yCAA8C;IAOpD,gBAAgB,CAAC,aAAa,EAAE,mBAAmB,GAAG,IAAI;IAI1D,SAAS,IAAI,OAAO;IAIpB,KAAK,IAAI,IAAI;IAKP,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;YAMpB,IAAI;YA6BJ,QAAQ;IAmDtB,eAAe,wCACN,YAAY,QACb,CAAC,OACF,KAAK,GAAG,SAAS,UACd,oBAAoB,CAAC,CAAC,CAAC,GAAG,SAAS,mBAmB3C;CACH"}
+{"version":3,"file":"proving_agent.d.ts","sourceRoot":"","sources":["../../src/proving_broker/proving_agent.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAEV,iBAAiB,EACjB,kBAAkB,EAIlB,mBAAmB,EACpB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,SAAS,EACd,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAIzD;;GAEG;AACH,qBAAa,YAAa,YAAW,SAAS;IAQ1C,iCAAiC;IACjC,OAAO,CAAC,MAAM;IACd,gDAAgD;IAChD,OAAO,CAAC,UAAU;IAClB,iDAAiD;IACjD,OAAO,CAAC,aAAa;IACrB,oDAAoD;IACpD,OAAO,CAAC,cAAc;IACtB,oCAAoC;IACpC,OAAO,CAAC,cAAc;IAGtB,OAAO,CAAC,GAAG;IAnBb,OAAO,CAAC,oBAAoB,CAAC,CAAuB;IACpD,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,eAAe,CAA8B;IAErD,SAAgB,MAAM,EAAE,MAAM,CAAC;;IAG7B,iCAAiC;IACzB,MAAM,EAAE,kBAAkB;IAClC,gDAAgD;IACxC,UAAU,EAAE,UAAU;IAC9B,iDAAiD;IACzC,aAAa,EAAE,mBAAmB;IAC1C,oDAAoD;IAC5C,cAAc,GAAE,KAAK,CAAC,kBAAkB,CAAM;IACtD,oCAAoC;IAC5B,cAAc,SAAO;IAC7B,uDAAuD;IACvD,MAAM,GAAE,eAAsC,EACtC,GAAG,yCAA8C;IAOpD,gBAAgB,CAAC,aAAa,EAAE,mBAAmB,GAAG,IAAI;IAI1D,SAAS,IAAI,OAAO;IAIpB,KAAK,IAAI,IAAI;IAIP,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAK3B,SAAS,IAAI,iBAAiB;YAcvB,IAAI;YAqDJ,QAAQ;YAuDR,YAAY;CA0B3B"}

package/dest/proving_broker/proving_agent.js

@@ -4,10 +4,10 @@ function _ts_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 { AbortError } from '@aztec/foundation/error';
 import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { truncate } from '@aztec/foundation/string';
-import { Timer } from '@aztec/foundation/timer';
 import { ProvingError } from '@aztec/stdlib/errors';
 import { ProvingRequestType } from '@aztec/stdlib/proofs';
 import { getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
@@ -25,7 +25,6 @@ import { ProvingJobController, ProvingJobControllerStatus } from './proving_job_
     currentJobController;
     runningPromise;
     instrumentation;
-    idleTimer;
     tracer;
     constructor(/** The source of proving jobs */ broker, /** Database holding proof inputs and outputs */ proofStore, /** The prover implementation to defer jobs to */ circuitProver, /** Optional list of allowed proof types to build */ proofAllowList = [], /** How long to wait between jobs */ pollIntervalMs = 1000, /** A telemetry client through which to emit metrics */ client = getTelemetryClient(), log = createLogger('prover-client:proving-agent')){
         this.broker = broker;
@@ -34,28 +33,6 @@ import { ProvingJobController, ProvingJobControllerStatus } from './proving_job_
         this.proofAllowList = proofAllowList;
         this.pollIntervalMs = pollIntervalMs;
         this.log = log;
-        this.handleJobResult = async (jobId, type, err, result)=>{
-            let maybeJob;
-            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);
-                maybeJob = await this.broker.reportProvingJobError(jobId, err.message, retry, {
-                    allowList: this.proofAllowList
-                });
-            } else if (result) {
-                const outputUri = await this.proofStore.saveProofOutput(jobId, type, result);
-                this.log.info(`Job id=${jobId} type=${ProvingRequestType[type]} completed outputUri=${truncate(outputUri)}`);
-                maybeJob = await this.broker.reportProvingJobSuccess(jobId, outputUri, {
-                    allowList: this.proofAllowList
-                });
-            }
-            if (maybeJob) {
-                const { job, time } = maybeJob;
-                await this.startJob(job, time);
-            } else {
-                this.idleTimer = new Timer();
-            }
-        };
         this.tracer = client.getTracer('ProvingAgent');
         this.instrumentation = new ProvingAgentInstrumentation(client);
         this.runningPromise = new RunningPromise(this.work.bind(this), this.log, this.pollIntervalMs);
@@ -67,42 +44,78 @@ import { ProvingJobController, ProvingJobControllerStatus } from './proving_job_
         return this.runningPromise?.isRunning() ?? false;
     }
     start() {
-        this.idleTimer = new Timer();
         this.runningPromise.start();
     }
     async stop() {
         this.currentJobController?.abort();
         await this.runningPromise.stop();
     }
+    getStatus() {
+        if (this.currentJobController) {
+            return {
+                status: 'proving',
+                jobId: this.currentJobController.getJobId(),
+                proofType: this.currentJobController.getProofType(),
+                startedAtISO: new Date(this.currentJobController.getStartedAt()).toISOString()
+            };
+        }
+        return this.runningPromise.isRunning() ? {
+            status: 'running'
+        } : {
+            status: 'stopped'
+        };
+    }
     async work() {
-        // every tick we need to
-        // (1) either do a heartbeat, telling the broker that we're working
-        // (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
+        // every tick we need to take one of the following actions:
+        // 1. send a hearbeat to the broker that we're working on some job
+        // 2. if the job is complete, send its result to the broker
+        // 3. get a job from the broker
+        // Any one of these actions could give us a new job to work on. If that happens we abort the current job.
+        //
+        // This loop gets triggered in one of two ways:
+        // - either on a timer (see pollIntervalMs)
+        // - or when a proof completes
         let maybeJob;
-        if (this.currentJobController?.getStatus() === ProvingJobControllerStatus.PROVING) {
-            maybeJob = await this.broker.reportProvingJobProgress(this.currentJobController.getJobId(), this.currentJobController.getStartedAt(), {
-                allowList: this.proofAllowList
-            });
+        if (this.currentJobController) {
+            const status = this.currentJobController.getStatus();
+            const jobId = this.currentJobController.getJobId();
+            const proofType = this.currentJobController.getProofType();
+            const startedAt = this.currentJobController.getStartedAt();
+            const result = this.currentJobController.getResult();
+            if (status === ProvingJobControllerStatus.RUNNING) {
+                maybeJob = await this.broker.reportProvingJobProgress(jobId, startedAt, {
+                    allowList: this.proofAllowList
+                });
+            } else if (status === ProvingJobControllerStatus.DONE) {
+                if (result) {
+                    maybeJob = await this.reportResult(jobId, proofType, result);
+                } else {
+                    this.log.warn(`Job controller for job ${this.currentJobController.getJobId()} is done but doesn't have a result`, {
+                        jobId
+                    });
+                    maybeJob = await this.reportResult(jobId, proofType, new ProvingError('No result found after proving', undefined, /* retry */ true));
+                }
+                this.currentJobController = undefined;
+            } else {
+                // IDLE status should not be seen because a job is started as soon as it is created
+                this.log.warn(`Idle job controller for job: ${this.currentJobController.getJobId()}. Skipping main loop work`, {
+                    jobId: this.currentJobController.getJobId()
+                });
+                return;
+            }
         } else {
             maybeJob = await this.broker.getProvingJob({
                 allowList: this.proofAllowList
             });
         }
-        if (!maybeJob) {
-            return;
-        }
-        if (this.idleTimer) {
-            this.instrumentation.recordIdleTime(this.idleTimer);
+        if (maybeJob) {
+            await this.startJob(maybeJob);
         }
-        this.idleTimer = undefined;
-        const { job, time } = maybeJob;
-        await this.startJob(job, time);
     }
-    async startJob(job, startedAt) {
+    async startJob({ job, time: startedAt }) {
         let abortedProofJobId;
         let abortedProofName;
-        if (this.currentJobController?.getStatus() === ProvingJobControllerStatus.PROVING) {
+        if (this.currentJobController?.getStatus() === ProvingJobControllerStatus.RUNNING) {
             abortedProofJobId = this.currentJobController.getJobId();
             abortedProofName = this.currentJobController.getProofTypeName();
             this.currentJobController?.abort();
@@ -110,16 +123,20 @@ import { ProvingJobController, ProvingJobControllerStatus } from './proving_job_
         let inputs;
         try {
             inputs = await this.proofStore.getProofInput(job.inputsUri);
-        } catch (err) {
+        } catch  {
             const maybeJob = await this.broker.reportProvingJobError(job.id, 'Failed to load proof inputs', true, {
                 allowList: this.proofAllowList
             });
             if (maybeJob) {
-                return this.startJob(maybeJob.job, maybeJob.time);
+                return this.startJob(maybeJob);
             }
             return;
         }
-        this.currentJobController = new ProvingJobController(job.id, inputs, job.epochNumber, startedAt, this.circuitProver, this.handleJobResult);
+        this.currentJobController = new ProvingJobController(job.id, inputs, job.epochNumber, startedAt, this.circuitProver, ()=>{
+            // trigger a run of the main work loop when proving completes
+            // no need to await this here. The controller will stay alive (in DONE state) until the result is send to the broker
+            void this.runningPromise.trigger();
+        });
         if (abortedProofJobId) {
             this.log.info(`Aborting job id=${abortedProofJobId} type=${abortedProofName} to start new job id=${this.currentJobController.getJobId()} type=${this.currentJobController.getProofTypeName()} inputsUri=${truncate(job.inputsUri)}`);
         } else {
@@ -127,7 +144,26 @@ import { ProvingJobController, ProvingJobControllerStatus } from './proving_job_
         }
         this.currentJobController.start();
     }
-    handleJobResult;
+    async reportResult(jobId, type, result) {
+        let maybeJob;
+        if (result instanceof AbortError) {
+            // no-op
+            this.log.warn(`Job id=${jobId} was aborted. Not reporting result back to broker`, result);
+        } else if (result instanceof Error) {
+            const retry = result.name === ProvingError.NAME ? result.retry : false;
+            this.log.error(`Job id=${jobId} type=${ProvingRequestType[type]} failed err=${result.message} retry=${retry}`, result);
+            maybeJob = await this.broker.reportProvingJobError(jobId, result.message, retry, {
+                allowList: this.proofAllowList
+            });
+        } else {
+            const outputUri = await this.proofStore.saveProofOutput(jobId, type, result);
+            this.log.info(`Job id=${jobId} type=${ProvingRequestType[type]} completed outputUri=${truncate(outputUri)}`);
+            maybeJob = await this.broker.reportProvingJobSuccess(jobId, outputUri, {
+                allowList: this.proofAllowList
+            });
+        }
+        return maybeJob;
+    }
 }
 _ts_decorate([
     trackSpan('ProvingAgent.safeWork')

package/dest/proving_broker/proving_broker.d.ts

@@ -1,4 +1,5 @@
-import type { GetProvingJobResponse, ProofUri, ProvingJob, ProvingJobConsumer, ProvingJobFilter, ProvingJobId, ProvingJobProducer, ProvingJobStatus } from '@aztec/stdlib/interfaces/server';
+import { type GetProvingJobResponse, type ProofUri, type ProvingJob, type ProvingJobConsumer, type ProvingJobFilter, type ProvingJobId, type ProvingJobProducer, type ProvingJobStatus } from '@aztec/stdlib/interfaces/server';
+import { ProvingRequestType } from '@aztec/stdlib/proofs';
 import { type TelemetryClient, type Traceable, type Tracer } from '@aztec/telemetry-client';
 import { type ProverBrokerConfig } from './config.js';
 import type { ProvingBrokerDatabase } from './proving_broker_database.js';
@@ -27,7 +28,7 @@ export declare class ProvingBroker implements ProvingJobProducer, ProvingJobCons
     /**
      * 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
@@ -61,4 +62,12 @@ export declare class ProvingBroker implements ProvingJobProducer, ProvingJobCons
     private isJobStale;
     private oldestEpochToKeep;
 }
+/**
+ * Relative priority of each proof type. Proofs higher up on the list are more important and should be prioritized
+ * over proofs lower on the list.
+ *
+ * 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
+ */
+export declare const PROOF_TYPES_IN_PRIORITY_ORDER: ProvingRequestType[];
 //# sourceMappingURL=proving_broker.d.ts.map