refactor: replace queue with facade over CircuitProver

AztecProtocol · Apr 25, 2024 · 29759db · 29759db
1 parent 7eb164f
commit 29759db
Show file tree

Hide file tree

Showing 19 changed files with 435 additions and 367 deletions.
diff --git a/yarn-project/aztec/tsconfig.json b/yarn-project/aztec/tsconfig.json
@@ -18,6 +18,9 @@
     {
       "path": "../aztec.js"
     },
+    {
+      "path": "../builder"
+    },
     {
       "path": "../circuit-types"
     },
@@ -39,9 +42,6 @@
     {
       "path": "../l1-artifacts"
     },
-    {
-      "path": "../builder"
-    },
     {
       "path": "../noir-contracts.js"
     },

diff --git a/yarn-project/circuit-types/src/interfaces/index.ts b/yarn-project/circuit-types/src/interfaces/index.ts
@@ -6,4 +6,5 @@ export * from './configs.js';
 export * from './nullifier_tree.js';
 export * from './public_data_tree.js';
 export * from './prover-client.js';
+export * from './proving-job.js';
 export * from './block-prover.js';
diff --git a/...client/src/prover-pool/proving-request.ts → ...rcuit-types/src/interfaces/proving-job.ts b/...client/src/prover-pool/proving-request.ts → ...rcuit-types/src/interfaces/proving-job.ts
@@ -1,4 +1,3 @@
-import { type PublicKernelNonTailRequest, type PublicKernelTailRequest } from '@aztec/circuit-types';
 import {
   type BaseOrMergeRollupPublicInputs,
   type BaseParityInputs,
@@ -13,6 +12,13 @@ import {
   type RootRollupPublicInputs,
 } from '@aztec/circuits.js';
 
+import type { PublicKernelNonTailRequest, PublicKernelTailRequest } from '../tx/processed_tx.js';
+
+export type ProvingJob<T extends ProvingRequest> = {
+  id: string;
+  request: T;
+};
+
 export enum ProvingRequestType {
   PUBLIC_VM,
 
@@ -79,3 +85,11 @@ export type ProvingRequestPublicInputs = {
 };
 
 export type ProvingRequestResult<T extends ProvingRequestType> = [ProvingRequestPublicInputs[T], Proof];
+
+export interface ProvingJobSource {
+  getProvingJob(): Promise<ProvingJob<ProvingRequest> | null>;
+
+  resolveProvingJob<T extends ProvingRequestType>(jobId: string, result: ProvingRequestResult<T>): Promise<void>;
+
+  rejectProvingJob(jobId: string, reason: Error): Promise<void>;
+}
diff --git a/yarn-project/end-to-end/package.json b/yarn-project/end-to-end/package.json
@@ -110,7 +110,14 @@
         "@swc/jest"
       ]
     },
-    "reporters": [["default", {"summaryThreshold": 9999}]],
+    "reporters": [
+      [
+        "default",
+        {
+          "summaryThreshold": 9999
+        }
+      ]
+    ],
     "moduleNameMapper": {
       "^(\\.{1,2}/.*)\\.[cm]?js$": "$1"
     },

diff --git a/yarn-project/noir-protocol-circuits-types/tsconfig.json b/yarn-project/noir-protocol-circuits-types/tsconfig.json
@@ -7,13 +7,13 @@
   },
   "references": [
     {
-      "path": "../circuits.js"
+      "path": "../builder"
     },
     {
-      "path": "../foundation"
+      "path": "../circuits.js"
     },
     {
-      "path": "../builder"
+      "path": "../foundation"
     },
     {
       "path": "../types"

diff --git a/yarn-project/prover-client/src/mocks/test_context.ts b/yarn-project/prover-client/src/mocks/test_context.ts
@@ -21,7 +21,8 @@ import * as fs from 'fs/promises';
 import { type MockProxy, mock } from 'jest-mock-extended';
 
 import { ProvingOrchestrator } from '../orchestrator/orchestrator.js';
-import { CircuitProverAgent } from '../prover-pool/circuit-prover-agent.js';
+import { MemoryProvingQueue } from '../prover-pool/memory-proving-queue.js';
+import { ProverAgent } from '../prover-pool/prover-agent.js';
 import { ProverPool } from '../prover-pool/prover-pool.js';
 import { type BBProverConfig } from '../prover/bb_prover.js';
 import { type CircuitProver } from '../prover/interface.js';
@@ -87,10 +88,11 @@ export class TestContext {
       localProver = await createProver(bbConfig);
     }
 
-    const proverPool = new ProverPool(proverCount, i => new CircuitProverAgent(localProver, 10, `${i}`));
-    const orchestrator = new ProvingOrchestrator(actualDb, proverPool.queue);
+    const queue = new MemoryProvingQueue();
+    const proverPool = new ProverPool(proverCount, i => new ProverAgent(localProver, 10, `${i}`));
+    const orchestrator = new ProvingOrchestrator(actualDb, queue);
 
-    await proverPool.start();
+    await proverPool.start(queue);
 
     return new this(
       publicExecutor,