@aztec/prover-client 0.65.0 → 0.65.2

package/dest/tx-prover/tx-prover.js

@@ -1,37 +1,43 @@
 import { BBNativeRollupProver, TestCircuitProver } from '@aztec/bb-prover';
 import { Fr } from '@aztec/circuits.js';
+import { times } from '@aztec/foundation/collection';
+import { createDebugLogger } from '@aztec/foundation/log';
 import { NativeACVMSimulator } from '@aztec/simulator';
+import { join } from 'path';
 import { ProvingOrchestrator } from '../orchestrator/orchestrator.js';
-import { MemoryProvingQueue } from '../prover-agent/memory-proving-queue.js';
-import { ProverAgent } from '../prover-agent/prover-agent.js';
+import { CachingBrokerFacade } from '../proving_broker/caching_broker_facade.js';
+import { InlineProofStore } from '../proving_broker/proof_store.js';
+import { InMemoryProverCache } from '../proving_broker/prover_cache/memory.js';
+import { ProvingAgent } from '../proving_broker/proving_agent.js';
 /**
  * A prover factory.
  * TODO(palla/prover-node): Rename this class
  */
 export class TxProver {
-    constructor(config, telemetry, agent) {
+    constructor(config, telemetry, orchestratorClient, agentClient, log = createDebugLogger('aztec:prover-client:tx-prover')) {
         this.config = config;
         this.telemetry = telemetry;
-        this.agent = agent;
+        this.orchestratorClient = orchestratorClient;
+        this.agentClient = agentClient;
+        this.log = log;
         this.running = false;
+        this.agents = [];
         // TODO(palla/prover-node): Cache the paddingTx here, and not in each proving orchestrator,
         // so it can be reused across multiple ones and not recomputed every time.
-        this.queue = new MemoryProvingQueue(telemetry, config.proverJobTimeoutMs, config.proverJobPollIntervalMs);
+        this.cacheDir = this.config.cacheDir ? join(this.config.cacheDir, `tx_prover_${this.config.proverId}`) : undefined;
     }
-    createEpochProver(db) {
-        return new ProvingOrchestrator(db, this.queue, this.telemetry, this.config.proverId);
+    createEpochProver(db, cache = new InMemoryProverCache()) {
+        return new ProvingOrchestrator(db, new CachingBrokerFacade(this.orchestratorClient, cache), this.telemetry, this.config.proverId);
     }
     getProverId() {
         return this.config.proverId ?? Fr.ZERO;
     }
     async updateProverConfig(config) {
         const newConfig = { ...this.config, ...config };
-        if (newConfig.realProofs !== this.config.realProofs && this.agent) {
-            const circuitProver = await TxProver.buildCircuitProver(newConfig, this.telemetry);
-            this.agent.setCircuitProver(circuitProver);
-        }
-        if (this.config.proverAgentConcurrency !== newConfig.proverAgentConcurrency) {
-            await this.agent?.setMaxConcurrency(newConfig.proverAgentConcurrency);
+        if (newConfig.realProofs !== this.config.realProofs ||
+            newConfig.proverAgentCount !== this.config.proverAgentCount) {
+            await this.stopAgents();
+            await this.createAndStartAgents();
         }
         if (!this.config.realProofs && newConfig.realProofs) {
             // TODO(palla/prover-node): Reset padding tx here once we cache it at this class
@@ -41,14 +47,12 @@ export class TxProver {
     /**
      * Starts the prover instance
      */
-    start() {
+    async start() {
         if (this.running) {
             return Promise.resolve();
         }
         this.running = true;
-        this.queue.start();
-        this.agent?.start(this.queue);
-        return Promise.resolve();
+        await this.createAndStartAgents();
     }
     /**
      * Stops the prover instance
@@ -58,9 +62,7 @@ export class TxProver {
             return;
         }
         this.running = false;
-        // TODO(palla/prover-node): Keep a reference to all proving orchestrators that are alive and stop them?
-        await this.agent?.stop();
-        await this.queue.stop();
+        await this.stopAgents();
     }
     /**
      * Creates a new prover client and starts it
@@ -69,25 +71,40 @@ export class TxProver {
      * @param worldStateSynchronizer - An instance of the world state
      * @returns An instance of the prover, constructed and started.
      */
-    static async new(config, telemetry) {
-        const agent = config.proverAgentEnabled
-            ? new ProverAgent(await TxProver.buildCircuitProver(config, telemetry), config.proverAgentConcurrency, config.proverAgentPollInterval)
-            : undefined;
-        const prover = new TxProver(config, telemetry, agent);
+    static async new(config, broker, telemetry) {
+        const prover = new TxProver(config, telemetry, broker, broker);
         await prover.start();
         return prover;
     }
-    static async buildCircuitProver(config, telemetry) {
-        if (config.realProofs) {
-            return await BBNativeRollupProver.new(config, telemetry);
+    getProvingJobSource() {
+        if (!this.agentClient) {
+            throw new Error('Agent client not provided');
         }
-        const simulationProvider = config.acvmBinaryPath
-            ? new NativeACVMSimulator(config.acvmWorkingDirectory, config.acvmBinaryPath)
-            : undefined;
-        return new TestCircuitProver(telemetry, simulationProvider, config);
+        return this.agentClient;
     }
-    getProvingJobSource() {
-        return this.queue;
+    async createAndStartAgents() {
+        if (this.agents.length > 0) {
+            throw new Error('Agents already started');
+        }
+        if (!this.agentClient) {
+            throw new Error('Agent client not provided');
+        }
+        const proofStore = new InlineProofStore();
+        const prover = await buildServerCircuitProver(this.config, this.telemetry);
+        this.agents = times(this.config.proverAgentCount, () => new ProvingAgent(this.agentClient, proofStore, prover, [], this.config.proverAgentPollIntervalMs));
+        await Promise.all(this.agents.map(agent => agent.start()));
+    }
+    async stopAgents() {
+        await Promise.all(this.agents.map(agent => agent.stop()));
+    }
+}
+export function buildServerCircuitProver(config, telemetry) {
+    if (config.realProofs) {
+        return BBNativeRollupProver.new(config, telemetry);
     }
+    const simulationProvider = config.acvmBinaryPath
+        ? new NativeACVMSimulator(config.acvmWorkingDirectory, config.acvmBinaryPath)
+        : undefined;
+    return Promise.resolve(new TestCircuitProver(telemetry, simulationProvider, config));
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHgtcHJvdmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3R4LXByb3Zlci90eC1wcm92ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLG9CQUFvQixFQUFFLGlCQUFpQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFRM0UsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ3hDLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBSXZELE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3RFLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHlDQUF5QyxDQUFDO0FBQzdFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUU5RDs7O0dBR0c7QUFDSCxNQUFNLE9BQU8sUUFBUTtJQUluQixZQUNVLE1BQTBCLEVBQzFCLFNBQTBCLEVBQzFCLEtBQW1CO1FBRm5CLFdBQU0sR0FBTixNQUFNLENBQW9CO1FBQzFCLGNBQVMsR0FBVCxTQUFTLENBQWlCO1FBQzFCLFVBQUssR0FBTCxLQUFLLENBQWM7UUFMckIsWUFBTyxHQUFHLEtBQUssQ0FBQztRQU90QiwyRkFBMkY7UUFDM0YsMEVBQTBFO1FBQzFFLElBQUksQ0FBQyxLQUFLLEdBQUcsSUFBSSxrQkFBa0IsQ0FBQyxTQUFTLEVBQUUsTUFBTSxDQUFDLGtCQUFrQixFQUFFLE1BQU0sQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDO0lBQzVHLENBQUM7SUFFTSxpQkFBaUIsQ0FBQyxFQUE2QjtRQUNwRCxPQUFPLElBQUksbUJBQW1CLENBQUMsRUFBRSxFQUFFLElBQUksQ0FBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLFNBQVMsRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ3ZGLENBQUM7SUFFTSxXQUFXO1FBQ2hCLE9BQU8sSUFBSSxDQUFDLE1BQU0s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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHgtcHJvdmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3R4LXByb3Zlci90eC1wcm92ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFrQyxvQkFBb0IsRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBWTNHLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUN4QyxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDckQsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDMUQsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFHdkQsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUc1QixPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUN0RSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSw0Q0FBNEMsQ0FBQztBQUNqRixPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUNwRSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwwQ0FBMEMsQ0FBQztBQUMvRSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFFbEU7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLFFBQVE7SUFNbkIsWUFDVSxNQUEwQixFQUMxQixTQUEwQixFQUMxQixrQkFBc0MsRUFDdEMsV0FBZ0MsRUFDaEMsTUFBTSxpQkFBaUIsQ0FBQywrQkFBK0IsQ0FBQztRQUp4RCxXQUFNLEdBQU4sTUFBTSxDQUFvQjtRQUMxQixjQUFTLEdBQVQsU0FBUyxDQUFpQjtRQUMxQix1QkFBa0IsR0FBbEIsa0JBQWtCLENBQW9CO1FBQ3RDLGdCQUFXLEdBQVgsV0FBVyxDQUFxQjtRQUNoQyxRQUFHLEdBQUgsR0FBRyxDQUFxRDtRQVYxRCxZQUFPLEdBQUcsS0FBSyxDQUFDO1FBQ2hCLFdBQU0sR0FBbUIsRUFBRSxDQUFDO1FBV2xDLDJGQUEyRjtRQUMzRiwwRUFBMEU7UUFDMUUsSUFBSSxDQUFDLFFBQVEsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxFQUFFLGFBQWEsSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUM7SUFDckgsQ0FBQztJQUVNLGlCQUFpQixDQUFDLEVBQTZCLEVBQUUsUUFBcUIsSUFBSSxtQkFBbUIsRUFBRTtRQUNwRyxPQUFPLElBQUksbUJBQW1CLENBQzVCLEVBQUUsRUFDRixJQUFJLG1CQUFtQixDQUFDLElBQUksQ0FBQyxrQkFBa0IsRUFBRSxLQUFLLENBQUMsRUFDdkQsSUFBSSxDQUFDLFNBQVMsRUFDZCxJQUFJLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FDckIsQ0FBQztJQUNKLENBQUM7SUFFTSxXQUFXO1FBQ2hCLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLElBQUksRUFBRSxDQUFDLElBQUksQ0FBQztJQUN6QyxDQUFDO0lBRUQsS0FBSyxDQUFDLGtCQUFrQixDQUFDLE1BQW1DO1FBQzFELE1BQU0sU0FBUyxHQUFHLEVBQUUsR0FBRyxJQUFJLENBQUMsTUFBTSxFQUFFLEdBQUcsTUFBTSxFQUFFLENBQUM7UUFFaEQsSUFDRSxTQUFTLENBQUMsVUFBVSxLQUFLLElBQUksQ0FBQyxNQUFNLENBQUMsVUFBVTtZQUMvQyxTQUFTLENBQUMsZ0JBQWdCLEtBQUssSUFBSSxDQUFDLE1BQU0sQ0FBQyxnQkFBZ0IsRUFDM0QsQ0FBQztZQUNELE1BQU0sSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDO1lBQ3hCLE1BQU0sSUFBSSxDQUFDLG9CQUFvQixFQUFFLENBQUM7UUFDcEMsQ0FBQztRQUVELElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLFVBQVUsSUFBSSxTQUFTLENBQUMsVUFBVSxFQUFFLENBQUM7WUFDcEQsZ0ZBQWdGO1FBQ2xGLENBQUM7UUFFRCxJQUFJLENBQUMsTUFBTSxHQUFHLFNBQVMsQ0FBQztJQUMxQixDQUFDO0lBRUQ7O09BRUc7SUFDSSxLQUFLLENBQUMsS0FBSztRQUNoQixJQUFJLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztZQUNqQixPQUFPLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUMzQixDQUFDO1FBRUQsSUFBSSxDQUFDLE9BQU8sR0FBRyxJQUFJLENBQUM7UUFDcEIsTUFBTSxJQUFJLENBQUMsb0JBQW9CLEVBQUUsQ0FBQztJQUNwQyxDQUFDO0lBRUQ7O09BRUc7SUFDSSxLQUFLLENBQUMsSUFBSTtRQUNmLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7WUFDbEIsT0FBTztRQUNULENBQUM7UUFDRCxJQUFJLENBQUMsT0FBTyxHQUFHLEtBQUssQ0FBQztRQUNyQixNQUFNLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQztJQUMxQixDQUFDO0lBRUQ7Ozs7OztPQU1HO0lBQ0ksTUFBTSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsTUFBMEIsRUFBRSxNQUF3QixFQUFFLFNBQTBCO1FBQ3RHLE1BQU0sTUFBTSxHQUFHLElBQUksUUFBUSxDQUFDLE1BQU0sRUFBRSxTQUFTLEVBQUUsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBQy9ELE1BQU0sTUFBTSxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ3JCLE9BQU8sTUFBTSxDQUFDO0lBQ2hCLENBQUM7SUFFTSxtQkFBbUI7UUFDeEIsSUFBSSxDQUFDLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUN0QixNQUFNLElBQUksS0FBSyxDQUFDLDJCQUEyQixDQUFDLENBQUM7UUFDL0MsQ0FBQztRQUVELE9BQU8sSUFBSSxDQUFDLFdBQVcsQ0FBQztJQUMxQixDQUFDO0lBRU8sS0FBSyxDQUFDLG9CQUFvQjtRQUNoQyxJQUFJLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxHQUFHLENBQUMsRUFBRSxDQUFDO1lBQzNCLE1BQU0sSUFBSSxLQUFLLENBQUMsd0JBQXdCLENBQUMsQ0FBQztRQUM1QyxDQUFDO1FBRUQsSUFBSSxDQUFDLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUN0QixNQUFNLElBQUksS0FBSyxDQUFDLDJCQUEyQixDQUFDLENBQUM7UUFDL0MsQ0FBQztRQUVELE1BQU0sVUFBVSxHQUFHLElBQUksZ0JBQWdCLEVBQUUsQ0FBQztRQUMxQyxNQUFNLE1BQU0sR0FBRyxNQUFNLHdCQUF3QixDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQzNFLElBQUksQ0FBQyxNQUFNLEdBQUcsS0FBSyxDQUNqQixJQUFJLENBQUMsTUFBTSxDQUFDLGdCQUFnQixFQUM1QixHQUFHLEVBQUUsQ0FBQyxJQUFJLFlBQVksQ0FBQyxJQUFJLENBQUMsV0FBWSxFQUFFLFVBQVUsRUFBRSxNQUFNLEVBQUUsRUFBRSxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMseUJBQXlCLENBQUMsQ0FDekcsQ0FBQztRQUVGLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUM7SUFDN0QsQ0FBQztJQUVPLEtBQUssQ0FBQyxVQUFVO1FBQ3RCLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUM7SUFDNUQsQ0FBQztDQUNGO0FBRUQsTUFBTSxVQUFVLHdCQUF3QixDQUN0QyxNQUFrRCxFQUNsRCxTQUEwQjtJQUUxQixJQUFJLE1BQU0sQ0FBQyxVQUFVLEVBQUUsQ0FBQztRQUN0QixPQUFPLG9CQUFvQixDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFDckQsQ0FBQztJQUVELE1BQU0sa0JBQWtCLEdBQUcsTUFBTSxDQUFDLGNBQWM7UUFDOUMsQ0FBQyxDQUFDLElBQUksbUJBQW1CLENBQUMsTUFBTSxDQUFDLG9CQUFvQixFQUFFLE1BQU0sQ0FBQyxjQUFjLENBQUM7UUFDN0UsQ0FBQyxDQUFDLFNBQVMsQ0FBQztJQUVkLE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLGlCQUFpQixDQUFDLFNBQVMsRUFBRSxrQkFBa0IsRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDO0FBQ3ZGLENBQUMifQ==

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@aztec/prover-client",
-  "version": "0.65.0",
+  "version": "0.65.2",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
+    "./broker": "./dest/proving_broker/index.js",
     "./prover-agent": "./dest/prover-agent/index.js",
     "./orchestrator": "./dest/orchestrator/index.js",
     "./helpers": "./dest/orchestrator/block-building-helpers.js"
@@ -64,21 +65,22 @@
     ]
   },
   "dependencies": {
-    "@aztec/bb-prover": "0.65.0",
-    "@aztec/circuit-types": "0.65.0",
-    "@aztec/circuits.js": "0.65.0",
-    "@aztec/foundation": "0.65.0",
-    "@aztec/kv-store": "0.65.0",
-    "@aztec/noir-protocol-circuits-types": "0.65.0",
-    "@aztec/protocol-contracts": "0.65.0",
-    "@aztec/simulator": "0.65.0",
-    "@aztec/telemetry-client": "0.65.0",
-    "@aztec/world-state": "0.65.0",
+    "@aztec/bb-prover": "0.65.2",
+    "@aztec/circuit-types": "0.65.2",
+    "@aztec/circuits.js": "0.65.2",
+    "@aztec/foundation": "0.65.2",
+    "@aztec/kv-store": "0.65.2",
+    "@aztec/noir-protocol-circuits-types": "0.65.2",
+    "@aztec/protocol-contracts": "0.65.2",
+    "@aztec/simulator": "0.65.2",
+    "@aztec/telemetry-client": "0.65.2",
+    "@aztec/world-state": "0.65.2",
     "@noir-lang/types": "portal:../../noir/packages/types",
     "commander": "^12.1.0",
     "lodash.chunk": "^4.2.0",
     "source-map-support": "^0.5.21",
-    "tslib": "^2.4.0"
+    "tslib": "^2.4.0",
+    "zod": "^3.23.8"
   },
   "devDependencies": {
     "@jest/globals": "^29.5.0",

package/src/config.ts

@@ -1,25 +1,20 @@
-import { type BBConfig } from '@aztec/bb-prover';
-import { type ProverConfig, proverConfigMappings } from '@aztec/circuit-types';
+import { type ACVMConfig, type BBConfig } from '@aztec/bb-prover';
+import {
+  type ProverAgentConfig,
+  type ProverBrokerConfig,
+  type ProverConfig,
+  proverAgentConfigMappings,
+  proverBrokerConfigMappings,
+  proverConfigMappings,
+} from '@aztec/circuit-types';
 import { type ConfigMappingsType, booleanConfigHelper, getConfigFromMappings } from '@aztec/foundation/config';
 
 /**
  * The prover configuration.
  */
-export type ProverClientConfig = ProverConfig &
-  BBConfig & {
-    /** The URL to the Aztec prover node to take proving jobs from */
-    proverJobSourceUrl?: string;
-    /** The working directory to use for simulation/proving */
-    acvmWorkingDirectory: string;
-    /** The path to the ACVM binary */
-    acvmBinaryPath: string;
-  };
+export type ProverClientConfig = ProverConfig & ProverAgentConfig & ProverBrokerConfig & BBConfig & ACVMConfig;
 
-export const proverClientConfigMappings: ConfigMappingsType<ProverClientConfig> = {
-  proverJobSourceUrl: {
-    env: 'PROVER_JOB_SOURCE_URL',
-    description: 'The URL to the Aztec prover node to take proving jobs from',
-  },
+export const bbConfigMappings: ConfigMappingsType<BBConfig & ACVMConfig> = {
   acvmWorkingDirectory: {
     env: 'ACVM_WORKING_DIRECTORY',
     description: 'The working directory to use for simulation/proving',
@@ -41,7 +36,13 @@ export const proverClientConfigMappings: ConfigMappingsType<ProverClientConfig>
     description: 'Whether to skip cleanup of bb temporary files',
     ...booleanConfigHelper(false),
   },
+};
+
+export const proverClientConfigMappings: ConfigMappingsType<ProverClientConfig> = {
+  ...bbConfigMappings,
   ...proverConfigMappings,
+  ...proverAgentConfigMappings,
+  ...proverBrokerConfigMappings,
 };
 
 /**

package/src/index.ts

@@ -3,3 +3,4 @@ export { EpochProverManager } from '@aztec/circuit-types';
 export * from './tx-prover/tx-prover.js';
 export * from './config.js';
 export * from './tx-prover/factory.js';
+export * from './proving_broker/prover_cache/memory.js';

package/src/mocks/test_context.ts

@@ -9,7 +9,7 @@ import {
   type TxValidator,
 } from '@aztec/circuit-types';
 import { type Gas, type GlobalVariables, Header } from '@aztec/circuits.js';
-import { type Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/fields';
 import { type DebugLogger } from '@aztec/foundation/log';
 import { openTmpStore } from '@aztec/kv-store/utils';
 import {
@@ -118,7 +118,7 @@ export class TestContext {
     }
 
     const queue = new MemoryProvingQueue(telemetry);
-    const orchestrator = new ProvingOrchestrator(proverDb, queue, telemetry);
+    const orchestrator = new ProvingOrchestrator(proverDb, queue, telemetry, Fr.ZERO);
     const agent = new ProverAgent(localProver, proverCount);
 
     queue.start();

package/src/orchestrator/block-building-helpers.ts

@@ -1,5 +1,5 @@
 import {
-  type Body,
+  Body,
   MerkleTreeId,
   type MerkleTreeWriteOperations,
   type ProcessedTx,
@@ -316,6 +316,7 @@ export function buildHeaderFromCircuitOutputs(
     state,
     previousMergeData[0].constants.globalVariables,
     previousMergeData[0].accumulatedFees.add(previousMergeData[1].accumulatedFees),
+    previousMergeData[0].accumulatedManaUsed.add(previousMergeData[1].accumulatedManaUsed),
   );
   if (!header.hash().equals(rootRollupOutputs.endBlockHash)) {
     logger?.error(
@@ -328,8 +329,8 @@ export function buildHeaderFromCircuitOutputs(
   return header;
 }
 
-export async function buildHeaderFromTxEffects(
-  body: Body,
+export async function buildHeaderAndBodyFromTxs(
+  txs: ProcessedTx[],
   globalVariables: GlobalVariables,
   l1ToL2Messages: Fr[],
   db: MerkleTreeReadOperations,
@@ -345,6 +346,9 @@ export async function buildHeaderFromTxEffects(
 
   const previousArchive = await getTreeSnapshot(MerkleTreeId.ARCHIVE, db);
 
+  const nonEmptyTxEffects: TxEffect[] = txs.map(tx => tx.txEffect).filter(txEffect => !txEffect.isEmpty());
+  const body = new Body(nonEmptyTxEffects);
+
   const outHash = computeUnbalancedMerkleRoot(
     body.txEffects.map(tx => tx.txOutHash()),
     TxEffect.empty().txOutHash(),
@@ -365,7 +369,11 @@ export async function buildHeaderFromTxEffects(
   );
 
   const fees = body.txEffects.reduce((acc, tx) => acc.add(tx.transactionFee), Fr.ZERO);
-  return new Header(previousArchive, contentCommitment, stateReference, globalVariables, fees);
+  const manaUsed = txs.reduce((acc, tx) => acc.add(new Fr(tx.gasUsed.totalGas.l2Gas)), Fr.ZERO);
+
+  const header = new Header(previousArchive, contentCommitment, stateReference, globalVariables, fees, manaUsed);
+
+  return { header, body };
 }
 
 // Validate that the roots of all local trees match the output of the root circuit simulation
@@ -484,41 +492,30 @@ async function processPublicDataUpdateRequests(tx: ProcessedTx, db: MerkleTreeWr
     ({ leafSlot, value }) => new PublicDataTreeLeaf(leafSlot, value),
   );
 
-  const lowPublicDataWritesPreimages = [];
-  const lowPublicDataWritesMembershipWitnesses = [];
-  const publicDataWritesSiblingPaths = [];
-
-  for (const write of allPublicDataWrites) {
-    if (write.isEmpty()) {
-      throw new Error(`Empty public data write in tx: ${toFriendlyJSON(tx)}`);
-    }
-
-    // TODO(Alvaro) write a specialized function for this? Internally add_or_update_value uses batch insertion anyway
-    const { lowLeavesWitnessData, newSubtreeSiblingPath } = await db.batchInsert(
-      MerkleTreeId.PUBLIC_DATA_TREE,
-      [write.toBuffer()],
-      // TODO(#3675) remove oldValue from update requests
-      0,
-    );
-
-    if (lowLeavesWitnessData === undefined) {
-      throw new Error(`Could not craft public data batch insertion proofs`);
-    }
-
-    const [lowLeafWitness] = lowLeavesWitnessData;
-    lowPublicDataWritesPreimages.push(lowLeafWitness.leafPreimage as PublicDataTreeLeafPreimage);
-    lowPublicDataWritesMembershipWitnesses.push(
-      MembershipWitness.fromBufferArray<typeof PUBLIC_DATA_TREE_HEIGHT>(
-        lowLeafWitness.index,
-        assertLength(lowLeafWitness.siblingPath.toBufferArray(), PUBLIC_DATA_TREE_HEIGHT),
-      ),
-    );
+  const { lowLeavesWitnessData, insertionWitnessData } = await db.sequentialInsert(
+    MerkleTreeId.PUBLIC_DATA_TREE,
+    allPublicDataWrites.map(write => {
+      if (write.isEmpty()) {
+        throw new Error(`Empty public data write in tx: ${toFriendlyJSON(tx)}`);
+      }
+      return write.toBuffer();
+    }),
+  );
 
-    const insertionSiblingPath = newSubtreeSiblingPath.toFields();
+  const lowPublicDataWritesPreimages = lowLeavesWitnessData.map(
+    lowLeafWitness => lowLeafWitness.leafPreimage as PublicDataTreeLeafPreimage,
+  );
+  const lowPublicDataWritesMembershipWitnesses = lowLeavesWitnessData.map(lowLeafWitness =>
+    MembershipWitness.fromBufferArray<typeof PUBLIC_DATA_TREE_HEIGHT>(
+      lowLeafWitness.index,
+      assertLength(lowLeafWitness.siblingPath.toBufferArray(), PUBLIC_DATA_TREE_HEIGHT),
+    ),
+  );
+  const publicDataWritesSiblingPaths = insertionWitnessData.map(w => {
+    const insertionSiblingPath = w.siblingPath.toFields();
     assertLength(insertionSiblingPath, PUBLIC_DATA_TREE_HEIGHT);
-
-    publicDataWritesSiblingPaths.push(insertionSiblingPath as Tuple<Fr, typeof PUBLIC_DATA_TREE_HEIGHT>);
-  }
+    return insertionSiblingPath as Tuple<Fr, typeof PUBLIC_DATA_TREE_HEIGHT>;
+  });
 
   return {
     lowPublicDataWritesPreimages,

package/src/orchestrator/block-proving-state.ts

@@ -131,7 +131,7 @@ export class BlockProvingState {
 
   /** Returns the block number as an epoch number. Used for prioritizing proof requests. */
   public get epochNumber(): number {
-    return this.globalVariables.blockNumber.toNumber();
+    return this.parentEpoch.epochNumber;
   }
 
   /**

package/src/orchestrator/orchestrator.ts

@@ -1,10 +1,8 @@
 import {
-  Body,
   L2Block,
   MerkleTreeId,
   type ProcessedTx,
   type ServerCircuitProver,
-  type TxEffect,
   makeEmptyProcessedTx,
 } from '@aztec/circuit-types';
 import {
@@ -55,8 +53,8 @@ import { inspect } from 'util';
 
 import {
   buildBaseRollupHints,
+  buildHeaderAndBodyFromTxs,
   buildHeaderFromCircuitOutputs,
-  buildHeaderFromTxEffects,
   createBlockMergeRollupInputs,
   createMergeRollupInputs,
   getPreviousRollupDataFromPublicInputs,
@@ -416,15 +414,12 @@ export class ProvingOrchestrator implements EpochProver {
 
   private async buildBlock(provingState: BlockProvingState, expectedHeader?: Header) {
     // Collect all new nullifiers, commitments, and contracts from all txs in this block to build body
-    const nonEmptyTxEffects: TxEffect[] = provingState!.allTxs
-      .map(txProvingState => txProvingState.processedTx.txEffect)
-      .filter(txEffect => !txEffect.isEmpty());
-    const body = new Body(nonEmptyTxEffects);
+    const txs = provingState!.allTxs.map(a => a.processedTx);
 
     // Given we've applied every change from this block, now assemble the block header
     // and update the archive tree, so we're ready to start processing the next block
-    const header = await buildHeaderFromTxEffects(
-      body,
+    const { header, body } = await buildHeaderAndBodyFromTxs(
+      txs,
       provingState.globalVariables,
       provingState.newL1ToL2Messages,
       this.db,