@aztec/prover-client 0.65.1 → 0.65.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (98) hide show
  1. package/dest/config.d.ts +4 -10
  2. package/dest/config.d.ts.map +1 -1
  3. package/dest/config.js +8 -7
  4. package/dest/index.d.ts +1 -0
  5. package/dest/index.d.ts.map +1 -1
  6. package/dest/index.js +2 -1
  7. package/dest/mocks/test_context.js +3 -2
  8. package/dest/orchestrator/block-building-helpers.d.ts.map +1 -1
  9. package/dest/orchestrator/block-building-helpers.js +10 -18
  10. package/dest/orchestrator/block-proving-state.js +2 -2
  11. package/dest/prover-agent/memory-proving-queue.d.ts +10 -8
  12. package/dest/prover-agent/memory-proving-queue.d.ts.map +1 -1
  13. package/dest/prover-agent/memory-proving-queue.js +35 -35
  14. package/dest/prover-agent/prover-agent.d.ts +1 -0
  15. package/dest/prover-agent/prover-agent.d.ts.map +1 -1
  16. package/dest/prover-agent/prover-agent.js +12 -9
  17. package/dest/proving_broker/caching_broker_facade.d.ts +30 -0
  18. package/dest/proving_broker/caching_broker_facade.d.ts.map +1 -0
  19. package/dest/proving_broker/caching_broker_facade.js +150 -0
  20. package/dest/proving_broker/factory.d.ts +4 -0
  21. package/dest/proving_broker/factory.d.ts.map +1 -0
  22. package/dest/proving_broker/factory.js +17 -0
  23. package/dest/proving_broker/index.d.ts +9 -0
  24. package/dest/proving_broker/index.d.ts.map +1 -0
  25. package/dest/proving_broker/index.js +9 -0
  26. package/dest/proving_broker/proof_store.d.ts +46 -0
  27. package/dest/proving_broker/proof_store.d.ts.map +1 -0
  28. package/dest/proving_broker/proof_store.js +37 -0
  29. package/dest/proving_broker/prover_cache/memory.d.ts +9 -0
  30. package/dest/proving_broker/prover_cache/memory.d.ts.map +1 -0
  31. package/dest/proving_broker/prover_cache/memory.js +16 -0
  32. package/dest/proving_broker/proving_agent.d.ts +11 -6
  33. package/dest/proving_broker/proving_agent.d.ts.map +1 -1
  34. package/dest/proving_broker/proving_agent.js +48 -20
  35. package/dest/proving_broker/proving_broker.d.ts +17 -16
  36. package/dest/proving_broker/proving_broker.d.ts.map +1 -1
  37. package/dest/proving_broker/proving_broker.js +44 -23
  38. package/dest/proving_broker/proving_broker_database/memory.d.ts +14 -0
  39. package/dest/proving_broker/proving_broker_database/memory.d.ts.map +1 -0
  40. package/dest/proving_broker/proving_broker_database/memory.js +35 -0
  41. package/dest/proving_broker/proving_broker_database/persisted.d.ts +15 -0
  42. package/dest/proving_broker/proving_broker_database/persisted.d.ts.map +1 -0
  43. package/dest/proving_broker/proving_broker_database/persisted.js +35 -0
  44. package/dest/proving_broker/{proving_job_database.d.ts → proving_broker_database.d.ts} +8 -8
  45. package/dest/proving_broker/proving_broker_database.d.ts.map +1 -0
  46. package/dest/proving_broker/proving_broker_database.js +2 -0
  47. package/dest/proving_broker/proving_job_controller.d.ts +13 -8
  48. package/dest/proving_broker/proving_job_controller.d.ts.map +1 -1
  49. package/dest/proving_broker/proving_job_controller.js +43 -43
  50. package/dest/proving_broker/rpc.d.ts +11 -0
  51. package/dest/proving_broker/rpc.d.ts.map +1 -0
  52. package/dest/proving_broker/rpc.js +44 -0
  53. package/dest/test/mock_prover.d.ts +15 -1
  54. package/dest/test/mock_prover.d.ts.map +1 -1
  55. package/dest/test/mock_prover.js +36 -1
  56. package/dest/tx-prover/factory.d.ts +2 -1
  57. package/dest/tx-prover/factory.d.ts.map +1 -1
  58. package/dest/tx-prover/factory.js +3 -3
  59. package/dest/tx-prover/tx-prover.d.ts +13 -7
  60. package/dest/tx-prover/tx-prover.d.ts.map +1 -1
  61. package/dest/tx-prover/tx-prover.js +52 -35
  62. package/package.json +14 -12
  63. package/src/config.ts +17 -16
  64. package/src/index.ts +1 -0
  65. package/src/mocks/test_context.ts +2 -2
  66. package/src/orchestrator/block-building-helpers.ts +22 -33
  67. package/src/orchestrator/block-proving-state.ts +1 -1
  68. package/src/prover-agent/memory-proving-queue.ts +43 -44
  69. package/src/prover-agent/prover-agent.ts +16 -20
  70. package/src/proving_broker/caching_broker_facade.ts +312 -0
  71. package/src/proving_broker/factory.ts +21 -0
  72. package/src/proving_broker/index.ts +8 -0
  73. package/src/proving_broker/proof_store.ts +106 -0
  74. package/src/proving_broker/prover_cache/memory.ts +20 -0
  75. package/src/proving_broker/proving_agent.ts +75 -20
  76. package/src/proving_broker/proving_broker.ts +98 -65
  77. package/src/proving_broker/proving_broker_database/memory.ts +43 -0
  78. package/src/proving_broker/proving_broker_database/persisted.ts +45 -0
  79. package/src/proving_broker/{proving_job_database.ts → proving_broker_database.ts} +7 -12
  80. package/src/proving_broker/proving_job_controller.ts +54 -46
  81. package/src/proving_broker/rpc.ts +64 -0
  82. package/src/test/mock_prover.ts +51 -0
  83. package/src/tx-prover/factory.ts +7 -2
  84. package/src/tx-prover/tx-prover.ts +78 -46
  85. package/dest/proving_broker/proving_broker_interface.d.ts +0 -61
  86. package/dest/proving_broker/proving_broker_interface.d.ts.map +0 -1
  87. package/dest/proving_broker/proving_broker_interface.js +0 -2
  88. package/dest/proving_broker/proving_job_database/memory.d.ts +0 -14
  89. package/dest/proving_broker/proving_job_database/memory.d.ts.map +0 -1
  90. package/dest/proving_broker/proving_job_database/memory.js +0 -35
  91. package/dest/proving_broker/proving_job_database/persisted.d.ts +0 -15
  92. package/dest/proving_broker/proving_job_database/persisted.d.ts.map +0 -1
  93. package/dest/proving_broker/proving_job_database/persisted.js +0 -35
  94. package/dest/proving_broker/proving_job_database.d.ts.map +0 -1
  95. package/dest/proving_broker/proving_job_database.js +0 -2
  96. package/src/proving_broker/proving_broker_interface.ts +0 -74
  97. package/src/proving_broker/proving_job_database/memory.ts +0 -43
  98. package/src/proving_broker/proving_job_database/persisted.ts +0 -45
@@ -1,53 +1,68 @@
1
1
  import {
2
+ type ProvingJobId,
3
+ type ProvingJobInputs,
4
+ type ProvingJobResultsMap,
2
5
  ProvingRequestType,
3
6
  type ServerCircuitProver,
4
- type V2ProofOutput,
5
- type V2ProvingJob,
6
- type V2ProvingJobId,
7
7
  } from '@aztec/circuit-types';
8
8
 
9
- export enum ProvingJobStatus {
9
+ export enum ProvingJobControllerStatus {
10
10
  IDLE = 'idle',
11
11
  PROVING = 'proving',
12
12
  DONE = 'done',
13
+ ABORTED = 'aborted',
13
14
  }
14
15
 
15
- type ProvingJobCompletionCallback = (
16
- error: Error | undefined,
17
- result: V2ProofOutput | undefined,
18
- ) => void | Promise<void>;
16
+ interface ProvingJobCompletionCallback<T extends ProvingRequestType = ProvingRequestType> {
17
+ (
18
+ jobId: ProvingJobId,
19
+ type: T,
20
+ error: Error | undefined,
21
+ result: ProvingJobResultsMap[T] | undefined,
22
+ ): void | Promise<void>;
23
+ }
19
24
 
20
25
  export class ProvingJobController {
21
- private status: ProvingJobStatus = ProvingJobStatus.IDLE;
26
+ private status: ProvingJobControllerStatus = ProvingJobControllerStatus.IDLE;
22
27
  private promise?: Promise<void>;
23
28
  private abortController = new AbortController();
24
29
 
25
30
  constructor(
26
- private job: V2ProvingJob,
31
+ private jobId: ProvingJobId,
32
+ private inputs: ProvingJobInputs,
27
33
  private startedAt: number,
28
34
  private circuitProver: ServerCircuitProver,
29
35
  private onComplete: ProvingJobCompletionCallback,
30
36
  ) {}
31
37
 
32
38
  public start(): void {
33
- if (this.status !== ProvingJobStatus.IDLE) {
39
+ if (this.status !== ProvingJobControllerStatus.IDLE) {
34
40
  return;
35
41
  }
36
42
 
37
- this.status = ProvingJobStatus.PROVING;
43
+ this.status = ProvingJobControllerStatus.PROVING;
38
44
  this.promise = this.generateProof()
39
45
  .then(
40
46
  result => {
41
- this.status = ProvingJobStatus.DONE;
42
- return this.onComplete(undefined, result);
47
+ if (this.status === ProvingJobControllerStatus.ABORTED) {
48
+ return;
49
+ }
50
+
51
+ this.status = ProvingJobControllerStatus.DONE;
52
+ return this.onComplete(this.jobId, this.inputs.type, undefined, result);
43
53
  },
44
54
  error => {
45
- this.status = ProvingJobStatus.DONE;
55
+ if (this.status === ProvingJobControllerStatus.ABORTED) {
56
+ return;
57
+ }
58
+
46
59
  if (error.name === 'AbortError') {
47
60
  // Ignore abort errors
48
61
  return;
49
62
  }
50
- return this.onComplete(error, undefined);
63
+
64
+ this.status = ProvingJobControllerStatus.DONE;
65
+ return this.onComplete(this.jobId, this.inputs.type, error, undefined);
51
66
  },
52
67
  )
53
68
  .catch(_ => {
@@ -55,88 +70,81 @@ export class ProvingJobController {
55
70
  });
56
71
  }
57
72
 
58
- public getStatus(): ProvingJobStatus {
73
+ public getStatus(): ProvingJobControllerStatus {
59
74
  return this.status;
60
75
  }
61
76
 
62
77
  public abort(): void {
63
- if (this.status !== ProvingJobStatus.PROVING) {
78
+ if (this.status !== ProvingJobControllerStatus.PROVING) {
64
79
  return;
65
80
  }
66
81
 
82
+ this.status = ProvingJobControllerStatus.ABORTED;
67
83
  this.abortController.abort();
68
84
  }
69
85
 
70
- public getJobId(): V2ProvingJobId {
71
- return this.job.id;
86
+ public getJobId(): ProvingJobId {
87
+ return this.jobId;
72
88
  }
73
89
 
74
90
  public getStartedAt(): number {
75
91
  return this.startedAt;
76
92
  }
77
93
 
78
- private async generateProof(): Promise<V2ProofOutput> {
79
- const { type, inputs } = this.job;
94
+ public getProofTypeName(): string {
95
+ return ProvingRequestType[this.inputs.type];
96
+ }
97
+
98
+ private async generateProof(): Promise<ProvingJobResultsMap[ProvingRequestType]> {
99
+ const { type, inputs } = this.inputs;
80
100
  const signal = this.abortController.signal;
81
101
  switch (type) {
82
102
  case ProvingRequestType.PUBLIC_VM: {
83
- const value = await this.circuitProver.getAvmProof(inputs, signal);
84
- return { type, value };
103
+ return await this.circuitProver.getAvmProof(inputs, signal);
85
104
  }
86
105
 
87
106
  case ProvingRequestType.PRIVATE_BASE_ROLLUP: {
88
- const value = await this.circuitProver.getPrivateBaseRollupProof(inputs, signal);
89
- return { type, value };
107
+ return await this.circuitProver.getPrivateBaseRollupProof(inputs, signal);
90
108
  }
91
109
 
92
110
  case ProvingRequestType.PUBLIC_BASE_ROLLUP: {
93
- const value = await this.circuitProver.getPublicBaseRollupProof(inputs, signal);
94
- return { type, value };
111
+ return await this.circuitProver.getPublicBaseRollupProof(inputs, signal);
95
112
  }
96
113
 
97
114
  case ProvingRequestType.MERGE_ROLLUP: {
98
- const value = await this.circuitProver.getMergeRollupProof(inputs, signal);
99
- return { type, value };
115
+ return await this.circuitProver.getMergeRollupProof(inputs, signal);
100
116
  }
101
117
 
102
118
  case ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP: {
103
- const value = await this.circuitProver.getEmptyBlockRootRollupProof(inputs, signal);
104
- return { type, value };
119
+ return await this.circuitProver.getEmptyBlockRootRollupProof(inputs, signal);
105
120
  }
106
121
 
107
122
  case ProvingRequestType.BLOCK_ROOT_ROLLUP: {
108
- const value = await this.circuitProver.getBlockRootRollupProof(inputs, signal);
109
- return { type, value };
123
+ return await this.circuitProver.getBlockRootRollupProof(inputs, signal);
110
124
  }
111
125
 
112
126
  case ProvingRequestType.BLOCK_MERGE_ROLLUP: {
113
- const value = await this.circuitProver.getBlockMergeRollupProof(inputs, signal);
114
- return { type, value };
127
+ return await this.circuitProver.getBlockMergeRollupProof(inputs, signal);
115
128
  }
116
129
 
117
130
  case ProvingRequestType.ROOT_ROLLUP: {
118
- const value = await this.circuitProver.getRootRollupProof(inputs, signal);
119
- return { type, value };
131
+ return await this.circuitProver.getRootRollupProof(inputs, signal);
120
132
  }
121
133
 
122
134
  case ProvingRequestType.BASE_PARITY: {
123
- const value = await this.circuitProver.getBaseParityProof(inputs, signal);
124
- return { type, value };
135
+ return await this.circuitProver.getBaseParityProof(inputs, signal);
125
136
  }
126
137
 
127
138
  case ProvingRequestType.ROOT_PARITY: {
128
- const value = await this.circuitProver.getRootParityProof(inputs, signal);
129
- return { type, value };
139
+ return await this.circuitProver.getRootParityProof(inputs, signal);
130
140
  }
131
141
 
132
142
  case ProvingRequestType.PRIVATE_KERNEL_EMPTY: {
133
- const value = await this.circuitProver.getEmptyPrivateKernelProof(inputs, signal);
134
- return { type, value };
143
+ return await this.circuitProver.getEmptyPrivateKernelProof(inputs, signal);
135
144
  }
136
145
 
137
146
  case ProvingRequestType.TUBE_PROOF: {
138
- const value = await this.circuitProver.getTubeProof(inputs, signal);
139
- return { type, value };
147
+ return await this.circuitProver.getTubeProof(inputs, signal);
140
148
  }
141
149
 
142
150
  default: {
@@ -0,0 +1,64 @@
1
+ import {
2
+ type GetProvingJobResponse,
3
+ ProofUri,
4
+ ProvingJob,
5
+ type ProvingJobBroker,
6
+ type ProvingJobConsumer,
7
+ ProvingJobId,
8
+ type ProvingJobProducer,
9
+ ProvingJobSettledResult,
10
+ ProvingJobStatus,
11
+ ProvingRequestType,
12
+ } from '@aztec/circuit-types';
13
+ import { createSafeJsonRpcClient, makeFetch } from '@aztec/foundation/json-rpc/client';
14
+ import { type SafeJsonRpcServer, createSafeJsonRpcServer } from '@aztec/foundation/json-rpc/server';
15
+ import { type ApiSchemaFor, optional } from '@aztec/foundation/schemas';
16
+
17
+ import { z } from 'zod';
18
+
19
+ const ProvingJobFilterSchema = z.object({
20
+ allowList: z.array(z.nativeEnum(ProvingRequestType)),
21
+ });
22
+
23
+ const GetProvingJobResponse = z.object({
24
+ job: ProvingJob,
25
+ time: z.number(),
26
+ });
27
+
28
+ export const ProvingJobProducerSchema: ApiSchemaFor<ProvingJobProducer> = {
29
+ enqueueProvingJob: z.function().args(ProvingJob).returns(z.void()),
30
+ getProvingJobStatus: z.function().args(ProvingJobId).returns(ProvingJobStatus),
31
+ removeAndCancelProvingJob: z.function().args(ProvingJobId).returns(z.void()),
32
+ waitForJobToSettle: z.function().args(ProvingJobId).returns(ProvingJobSettledResult),
33
+ };
34
+
35
+ export const ProvingJobConsumerSchema: ApiSchemaFor<ProvingJobConsumer> = {
36
+ getProvingJob: z.function().args(optional(ProvingJobFilterSchema)).returns(GetProvingJobResponse.optional()),
37
+ reportProvingJobError: z.function().args(ProvingJobId, z.string(), optional(z.boolean())).returns(z.void()),
38
+ reportProvingJobProgress: z
39
+ .function()
40
+ .args(ProvingJobId, z.number(), optional(ProvingJobFilterSchema))
41
+ .returns(GetProvingJobResponse.optional()),
42
+ reportProvingJobSuccess: z.function().args(ProvingJobId, ProofUri).returns(z.void()),
43
+ };
44
+
45
+ export const ProvingJobBrokerSchema: ApiSchemaFor<ProvingJobBroker> = {
46
+ ...ProvingJobConsumerSchema,
47
+ ...ProvingJobProducerSchema,
48
+ };
49
+
50
+ export function createProvingBrokerServer(broker: ProvingJobBroker): SafeJsonRpcServer {
51
+ return createSafeJsonRpcServer(broker, ProvingJobBrokerSchema);
52
+ }
53
+
54
+ export function createProvingJobBrokerClient(url: string, fetch = makeFetch([1, 2, 3], false)): ProvingJobBroker {
55
+ return createSafeJsonRpcClient(url, ProvingJobBrokerSchema, false, 'proverBroker', fetch);
56
+ }
57
+
58
+ export function createProvingJobProducerClient(url: string, fetch = makeFetch([1, 2, 3], false)): ProvingJobProducer {
59
+ return createSafeJsonRpcClient(url, ProvingJobProducerSchema, false, 'provingJobProducer', fetch);
60
+ }
61
+
62
+ export function createProvingJobConsumerClient(url: string, fetch = makeFetch([1, 2, 3], false)): ProvingJobConsumer {
63
+ return createSafeJsonRpcClient(url, ProvingJobConsumerSchema, false, 'provingJobConsumer', fetch);
64
+ }
@@ -1,5 +1,10 @@
1
1
  import {
2
2
  type ProofAndVerificationKey,
3
+ type ProvingJob,
4
+ type ProvingJobId,
5
+ type ProvingJobProducer,
6
+ type ProvingJobSettledResult,
7
+ type ProvingJobStatus,
3
8
  type PublicInputsAndRecursiveProof,
4
9
  type ServerCircuitProver,
5
10
  makeProofAndVerificationKey,
@@ -37,6 +42,52 @@ import {
37
42
  makeParityPublicInputs,
38
43
  makeRootRollupPublicInputs,
39
44
  } from '@aztec/circuits.js/testing';
45
+ import { times } from '@aztec/foundation/collection';
46
+
47
+ import { InlineProofStore, type ProofStore } from '../proving_broker/proof_store.js';
48
+ import { ProvingAgent } from '../proving_broker/proving_agent.js';
49
+ import { ProvingBroker } from '../proving_broker/proving_broker.js';
50
+ import { InMemoryBrokerDatabase } from '../proving_broker/proving_broker_database/memory.js';
51
+
52
+ export class TestBroker implements ProvingJobProducer {
53
+ private broker = new ProvingBroker(new InMemoryBrokerDatabase());
54
+ private agents: ProvingAgent[];
55
+
56
+ constructor(
57
+ agentCount: number,
58
+ prover: ServerCircuitProver,
59
+ private proofStore: ProofStore = new InlineProofStore(),
60
+ ) {
61
+ this.agents = times(agentCount, () => new ProvingAgent(this.broker, proofStore, prover));
62
+ }
63
+
64
+ public async start() {
65
+ await this.broker.start();
66
+ this.agents.forEach(agent => agent.start());
67
+ }
68
+
69
+ public async stop() {
70
+ await Promise.all(this.agents.map(agent => agent.stop()));
71
+ await this.broker.stop();
72
+ }
73
+
74
+ public getProofStore(): ProofStore {
75
+ return this.proofStore;
76
+ }
77
+
78
+ enqueueProvingJob(job: ProvingJob): Promise<void> {
79
+ return this.broker.enqueueProvingJob(job);
80
+ }
81
+ getProvingJobStatus(id: ProvingJobId): Promise<ProvingJobStatus> {
82
+ return this.broker.getProvingJobStatus(id);
83
+ }
84
+ removeAndCancelProvingJob(id: ProvingJobId): Promise<void> {
85
+ return this.broker.removeAndCancelProvingJob(id);
86
+ }
87
+ waitForJobToSettle(id: ProvingJobId): Promise<ProvingJobSettledResult> {
88
+ return this.broker.waitForJobToSettle(id);
89
+ }
90
+ }
40
91
 
41
92
  export class MockProver implements ServerCircuitProver {
42
93
  constructor() {}
@@ -1,9 +1,14 @@
1
+ import { type ProvingJobBroker } from '@aztec/circuit-types';
1
2
  import { type TelemetryClient } from '@aztec/telemetry-client';
2
3
  import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
3
4
 
4
5
  import { type ProverClientConfig } from '../config.js';
5
6
  import { TxProver } from './tx-prover.js';
6
7
 
7
- export function createProverClient(config: ProverClientConfig, telemetry: TelemetryClient = new NoopTelemetryClient()) {
8
- return TxProver.new(config, telemetry);
8
+ export function createProverClient(
9
+ config: ProverClientConfig,
10
+ broker: ProvingJobBroker,
11
+ telemetry: TelemetryClient = new NoopTelemetryClient(),
12
+ ) {
13
+ return TxProver.new(config, broker, telemetry);
9
14
  }
@@ -1,40 +1,59 @@
1
- import { BBNativeRollupProver, TestCircuitProver } from '@aztec/bb-prover';
1
+ import { type ACVMConfig, type BBConfig, BBNativeRollupProver, TestCircuitProver } from '@aztec/bb-prover';
2
2
  import {
3
+ type ActualProverConfig,
3
4
  type EpochProver,
4
5
  type EpochProverManager,
5
6
  type MerkleTreeWriteOperations,
6
- type ProvingJobSource,
7
+ type ProverCache,
8
+ type ProvingJobBroker,
9
+ type ProvingJobConsumer,
10
+ type ProvingJobProducer,
7
11
  type ServerCircuitProver,
8
12
  } from '@aztec/circuit-types/interfaces';
9
13
  import { Fr } from '@aztec/circuits.js';
14
+ import { times } from '@aztec/foundation/collection';
15
+ import { createDebugLogger } from '@aztec/foundation/log';
10
16
  import { NativeACVMSimulator } from '@aztec/simulator';
11
17
  import { type TelemetryClient } from '@aztec/telemetry-client';
12
18
 
19
+ import { join } from 'path';
20
+
13
21
  import { type ProverClientConfig } from '../config.js';
14
22
  import { ProvingOrchestrator } from '../orchestrator/orchestrator.js';
15
- import { MemoryProvingQueue } from '../prover-agent/memory-proving-queue.js';
16
- import { ProverAgent } from '../prover-agent/prover-agent.js';
23
+ import { CachingBrokerFacade } from '../proving_broker/caching_broker_facade.js';
24
+ import { InlineProofStore } from '../proving_broker/proof_store.js';
25
+ import { InMemoryProverCache } from '../proving_broker/prover_cache/memory.js';
26
+ import { ProvingAgent } from '../proving_broker/proving_agent.js';
17
27
 
18
28
  /**
19
29
  * A prover factory.
20
30
  * TODO(palla/prover-node): Rename this class
21
31
  */
22
32
  export class TxProver implements EpochProverManager {
23
- private queue: MemoryProvingQueue;
24
33
  private running = false;
34
+ private agents: ProvingAgent[] = [];
35
+
36
+ private cacheDir?: string;
25
37
 
26
38
  private constructor(
27
39
  private config: ProverClientConfig,
28
40
  private telemetry: TelemetryClient,
29
- private agent?: ProverAgent,
41
+ private orchestratorClient: ProvingJobProducer,
42
+ private agentClient?: ProvingJobConsumer,
43
+ private log = createDebugLogger('aztec:prover-client:tx-prover'),
30
44
  ) {
31
45
  // TODO(palla/prover-node): Cache the paddingTx here, and not in each proving orchestrator,
32
46
  // so it can be reused across multiple ones and not recomputed every time.
33
- this.queue = new MemoryProvingQueue(telemetry, config.proverJobTimeoutMs, config.proverJobPollIntervalMs);
47
+ this.cacheDir = this.config.cacheDir ? join(this.config.cacheDir, `tx_prover_${this.config.proverId}`) : undefined;
34
48
  }
35
49
 
36
- public createEpochProver(db: MerkleTreeWriteOperations): EpochProver {
37
- return new ProvingOrchestrator(db, this.queue, this.telemetry, this.config.proverId);
50
+ public createEpochProver(db: MerkleTreeWriteOperations, cache: ProverCache = new InMemoryProverCache()): EpochProver {
51
+ return new ProvingOrchestrator(
52
+ db,
53
+ new CachingBrokerFacade(this.orchestratorClient, cache),
54
+ this.telemetry,
55
+ this.config.proverId,
56
+ );
38
57
  }
39
58
 
40
59
  public getProverId(): Fr {
@@ -44,13 +63,12 @@ export class TxProver implements EpochProverManager {
44
63
  async updateProverConfig(config: Partial<ProverClientConfig>): Promise<void> {
45
64
  const newConfig = { ...this.config, ...config };
46
65
 
47
- if (newConfig.realProofs !== this.config.realProofs && this.agent) {
48
- const circuitProver = await TxProver.buildCircuitProver(newConfig, this.telemetry);
49
- this.agent.setCircuitProver(circuitProver);
50
- }
51
-
52
- if (this.config.proverAgentConcurrency !== newConfig.proverAgentConcurrency) {
53
- await this.agent?.setMaxConcurrency(newConfig.proverAgentConcurrency);
66
+ if (
67
+ newConfig.realProofs !== this.config.realProofs ||
68
+ newConfig.proverAgentCount !== this.config.proverAgentCount
69
+ ) {
70
+ await this.stopAgents();
71
+ await this.createAndStartAgents();
54
72
  }
55
73
 
56
74
  if (!this.config.realProofs && newConfig.realProofs) {
@@ -63,15 +81,13 @@ export class TxProver implements EpochProverManager {
63
81
  /**
64
82
  * Starts the prover instance
65
83
  */
66
- public start() {
84
+ public async start(): Promise<void> {
67
85
  if (this.running) {
68
86
  return Promise.resolve();
69
87
  }
70
88
 
71
89
  this.running = true;
72
- this.queue.start();
73
- this.agent?.start(this.queue);
74
- return Promise.resolve();
90
+ await this.createAndStartAgents();
75
91
  }
76
92
 
77
93
  /**
@@ -82,10 +98,7 @@ export class TxProver implements EpochProverManager {
82
98
  return;
83
99
  }
84
100
  this.running = false;
85
-
86
- // TODO(palla/prover-node): Keep a reference to all proving orchestrators that are alive and stop them?
87
- await this.agent?.stop();
88
- await this.queue.stop();
101
+ await this.stopAgents();
89
102
  }
90
103
 
91
104
  /**
@@ -95,36 +108,55 @@ export class TxProver implements EpochProverManager {
95
108
  * @param worldStateSynchronizer - An instance of the world state
96
109
  * @returns An instance of the prover, constructed and started.
97
110
  */
98
- public static async new(config: ProverClientConfig, telemetry: TelemetryClient) {
99
- const agent = config.proverAgentEnabled
100
- ? new ProverAgent(
101
- await TxProver.buildCircuitProver(config, telemetry),
102
- config.proverAgentConcurrency,
103
- config.proverAgentPollInterval,
104
- )
105
- : undefined;
106
-
107
- const prover = new TxProver(config, telemetry, agent);
111
+ public static async new(config: ProverClientConfig, broker: ProvingJobBroker, telemetry: TelemetryClient) {
112
+ const prover = new TxProver(config, telemetry, broker, broker);
108
113
  await prover.start();
109
114
  return prover;
110
115
  }
111
116
 
112
- private static async buildCircuitProver(
113
- config: ProverClientConfig,
114
- telemetry: TelemetryClient,
115
- ): Promise<ServerCircuitProver> {
116
- if (config.realProofs) {
117
- return await BBNativeRollupProver.new(config, telemetry);
117
+ public getProvingJobSource(): ProvingJobConsumer {
118
+ if (!this.agentClient) {
119
+ throw new Error('Agent client not provided');
120
+ }
121
+
122
+ return this.agentClient;
123
+ }
124
+
125
+ private async createAndStartAgents(): Promise<void> {
126
+ if (this.agents.length > 0) {
127
+ throw new Error('Agents already started');
128
+ }
129
+
130
+ if (!this.agentClient) {
131
+ throw new Error('Agent client not provided');
118
132
  }
119
133
 
120
- const simulationProvider = config.acvmBinaryPath
121
- ? new NativeACVMSimulator(config.acvmWorkingDirectory, config.acvmBinaryPath)
122
- : undefined;
134
+ const proofStore = new InlineProofStore();
135
+ const prover = await buildServerCircuitProver(this.config, this.telemetry);
136
+ this.agents = times(
137
+ this.config.proverAgentCount,
138
+ () => new ProvingAgent(this.agentClient!, proofStore, prover, [], this.config.proverAgentPollIntervalMs),
139
+ );
140
+
141
+ await Promise.all(this.agents.map(agent => agent.start()));
142
+ }
123
143
 
124
- return new TestCircuitProver(telemetry, simulationProvider, config);
144
+ private async stopAgents() {
145
+ await Promise.all(this.agents.map(agent => agent.stop()));
125
146
  }
147
+ }
126
148
 
127
- public getProvingJobSource(): ProvingJobSource {
128
- return this.queue;
149
+ export function buildServerCircuitProver(
150
+ config: ActualProverConfig & ACVMConfig & BBConfig,
151
+ telemetry: TelemetryClient,
152
+ ): Promise<ServerCircuitProver> {
153
+ if (config.realProofs) {
154
+ return BBNativeRollupProver.new(config, telemetry);
129
155
  }
156
+
157
+ const simulationProvider = config.acvmBinaryPath
158
+ ? new NativeACVMSimulator(config.acvmWorkingDirectory, config.acvmBinaryPath)
159
+ : undefined;
160
+
161
+ return Promise.resolve(new TestCircuitProver(telemetry, simulationProvider, config));
130
162
  }
@@ -1,61 +0,0 @@
1
- import { type ProvingRequestType, type V2ProofOutput, type V2ProvingJob, type V2ProvingJobId, type V2ProvingJobStatus } from '@aztec/circuit-types';
2
- /**
3
- * An interface for the proving orchestrator. The producer uses this to enqueue jobs for agents
4
- */
5
- export interface ProvingJobProducer {
6
- /**
7
- * Enqueues a proving job
8
- * @param job - The job to enqueue
9
- */
10
- enqueueProvingJob(job: V2ProvingJob): Promise<void>;
11
- /**
12
- * Cancels a proving job and clears all of its
13
- * @param id - The ID of the job to cancel
14
- */
15
- removeAndCancelProvingJob(id: V2ProvingJobId): Promise<void>;
16
- /**
17
- * Returns the current status fof the proving job
18
- * @param id - The ID of the job to get the status of
19
- */
20
- getProvingJobStatus(id: V2ProvingJobId): Promise<V2ProvingJobStatus>;
21
- }
22
- export interface ProvingJobFilter<T extends ProvingRequestType[]> {
23
- allowList?: T;
24
- }
25
- /**
26
- * An interface for proving agents to request jobs and report results
27
- */
28
- export interface ProvingJobConsumer {
29
- /**
30
- * Gets a proving job to work on
31
- * @param filter - Optional filter for the type of job to get
32
- */
33
- getProvingJob<T extends ProvingRequestType[]>(filter?: ProvingJobFilter<T>): Promise<{
34
- job: V2ProvingJob;
35
- time: number;
36
- } | undefined>;
37
- /**
38
- * Marks a proving job as successful
39
- * @param id - The ID of the job to report success for
40
- * @param result - The result of the job
41
- */
42
- reportProvingJobSuccess(id: V2ProvingJobId, result: V2ProofOutput): Promise<void>;
43
- /**
44
- * Marks a proving job as errored
45
- * @param id - The ID of the job to report an error for
46
- * @param err - The error that occurred while processing the job
47
- * @param retry - Whether to retry the job
48
- */
49
- reportProvingJobError(id: V2ProvingJobId, err: Error, retry?: boolean): Promise<void>;
50
- /**
51
- * Sends a heartbeat to the broker to indicate that the agent is still working on the given proving job
52
- * @param id - The ID of the job to report progress for
53
- * @param startedAt - The unix epoch when the job was started
54
- * @param filter - Optional filter for the type of job to get
55
- */
56
- reportProvingJobProgress<F extends ProvingRequestType[]>(id: V2ProvingJobId, startedAt: number, filter?: ProvingJobFilter<F>): Promise<{
57
- job: V2ProvingJob;
58
- time: number;
59
- } | undefined>;
60
- }
61
- //# sourceMappingURL=proving_broker_interface.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"proving_broker_interface.d.ts","sourceRoot":"","sources":["../../src/proving_broker/proving_broker_interface.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,cAAc,EACnB,KAAK,kBAAkB,EACxB,MAAM,sBAAsB,CAAC;AAE9B;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;OAGG;IACH,iBAAiB,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEpD;;;OAGG;IACH,yBAAyB,CAAC,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7D;;;OAGG;IACH,mBAAmB,CAAC,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;CACtE;AAED,MAAM,WAAW,gBAAgB,CAAC,CAAC,SAAS,kBAAkB,EAAE;IAC9D,SAAS,CAAC,EAAE,CAAC,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;OAGG;IACH,aAAa,CAAC,CAAC,SAAS,kBAAkB,EAAE,EAC1C,MAAM,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAC3B,OAAO,CAAC;QAAE,GAAG,EAAE,YAAY,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC,CAAC;IAE5D;;;;OAIG;IACH,uBAAuB,CAAC,EAAE,EAAE,cAAc,EAAE,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAElF;;;;;OAKG;IACH,qBAAqB,CAAC,EAAE,EAAE,cAAc,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtF;;;;;OAKG;IACH,wBAAwB,CAAC,CAAC,SAAS,kBAAkB,EAAE,EACrD,EAAE,EAAE,cAAc,EAClB,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAC3B,OAAO,CAAC;QAAE,GAAG,EAAE,YAAY,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC,CAAC;CAC7D"}
@@ -1,2 +0,0 @@
1
- export {};
2
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmluZ19icm9rZXJfaW50ZXJmYWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Byb3ZpbmdfYnJva2VyL3Byb3ZpbmdfYnJva2VyX2ludGVyZmFjZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIn0=
@@ -1,14 +0,0 @@
1
- import type { V2ProofOutput, V2ProvingJob, V2ProvingJobId, V2ProvingJobResult } from '@aztec/circuit-types';
2
- import { type ProvingJobDatabase } from '../proving_job_database.js';
3
- export declare class InMemoryDatabase implements ProvingJobDatabase {
4
- private jobs;
5
- private results;
6
- getProvingJob(id: V2ProvingJobId): V2ProvingJob | undefined;
7
- getProvingJobResult(id: V2ProvingJobId): V2ProvingJobResult | undefined;
8
- addProvingJob(request: V2ProvingJob): Promise<void>;
9
- setProvingJobResult(id: V2ProvingJobId, value: V2ProofOutput): Promise<void>;
10
- setProvingJobError(id: V2ProvingJobId, error: Error): Promise<void>;
11
- deleteProvingJobAndResult(id: V2ProvingJobId): Promise<void>;
12
- allProvingJobs(): Iterable<[V2ProvingJob, V2ProvingJobResult | undefined]>;
13
- }
14
- //# sourceMappingURL=memory.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"memory.d.ts","sourceRoot":"","sources":["../../../src/proving_broker/proving_job_database/memory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE5G,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAErE,qBAAa,gBAAiB,YAAW,kBAAkB;IACzD,OAAO,CAAC,IAAI,CAA2C;IACvD,OAAO,CAAC,OAAO,CAAiD;IAEhE,aAAa,CAAC,EAAE,EAAE,cAAc,GAAG,YAAY,GAAG,SAAS;IAI3D,mBAAmB,CAAC,EAAE,EAAE,cAAc,GAAG,kBAAkB,GAAG,SAAS;IAIvE,aAAa,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAKnD,mBAAmB,CAAC,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAK5E,kBAAkB,CAAC,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAKnE,yBAAyB,CAAC,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAM3D,cAAc,IAAI,QAAQ,CAAC,CAAC,YAAY,EAAE,kBAAkB,GAAG,SAAS,CAAC,CAAC;CAK5E"}
@@ -1,35 +0,0 @@
1
- export class InMemoryDatabase {
2
- constructor() {
3
- this.jobs = new Map();
4
- this.results = new Map();
5
- }
6
- getProvingJob(id) {
7
- return this.jobs.get(id);
8
- }
9
- getProvingJobResult(id) {
10
- return this.results.get(id);
11
- }
12
- addProvingJob(request) {
13
- this.jobs.set(request.id, request);
14
- return Promise.resolve();
15
- }
16
- setProvingJobResult(id, value) {
17
- this.results.set(id, { value });
18
- return Promise.resolve();
19
- }
20
- setProvingJobError(id, error) {
21
- this.results.set(id, { error: String(error) });
22
- return Promise.resolve();
23
- }
24
- deleteProvingJobAndResult(id) {
25
- this.jobs.delete(id);
26
- this.results.delete(id);
27
- return Promise.resolve();
28
- }
29
- *allProvingJobs() {
30
- for (const item of this.jobs.values()) {
31
- yield [item, this.results.get(item.id)];
32
- }
33
- }
34
- }
35
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtb3J5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3Byb3ZpbmdfYnJva2VyL3Byb3Zpbmdfam9iX2RhdGFiYXNlL21lbW9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFJQSxNQUFNLE9BQU8sZ0JBQWdCO0lBQTdCO1FBQ1UsU0FBSSxHQUFHLElBQUksR0FBRyxFQUFnQyxDQUFDO1FBQy9DLFlBQU8sR0FBRyxJQUFJLEdBQUcsRUFBc0MsQ0FBQztJQW9DbEUsQ0FBQztJQWxDQyxhQUFhLENBQUMsRUFBa0I7UUFDOUIsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUMzQixDQUFDO0lBRUQsbUJBQW1CLENBQUMsRUFBa0I7UUFDcEMsT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUM5QixDQUFDO0lBRUQsYUFBYSxDQUFDLE9BQXFCO1FBQ2pDLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxFQUFFLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDbkMsT0FBTyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDM0IsQ0FBQztJQUVELG1CQUFtQixDQUFDLEVBQWtCLEVBQUUsS0FBb0I7UUFDMUQsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsRUFBRSxFQUFFLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQztRQUNoQyxPQUFPLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUMzQixDQUFDO0lBRUQsa0JBQWtCLENBQUMsRUFBa0IsRUFBRSxLQUFZO1FBQ2pELElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLEVBQUUsRUFBRSxFQUFFLEtBQUssRUFBRSxNQUFNLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBQy9DLE9BQU8sT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQzNCLENBQUM7SUFFRCx5QkFBeUIsQ0FBQyxFQUFrQjtRQUMxQyxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUNyQixJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUN4QixPQUFPLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUMzQixDQUFDO0lBRUQsQ0FBQyxjQUFjO1FBQ2IsS0FBSyxNQUFNLElBQUksSUFBSSxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUM7WUFDdEMsTUFBTSxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQVUsQ0FBQztRQUNuRCxDQUFDO0lBQ0gsQ0FBQztDQUNGIn0=