@aztec/prover-client 0.69.1 → 0.70.0

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 (94) hide show
  1. package/dest/block_builder/light.d.ts +0 -1
  2. package/dest/block_builder/light.d.ts.map +1 -1
  3. package/dest/block_builder/light.js +3 -13
  4. package/dest/config.d.ts +2 -1
  5. package/dest/config.d.ts.map +1 -1
  6. package/dest/config.js +3 -2
  7. package/dest/mocks/fixtures.d.ts +1 -1
  8. package/dest/mocks/fixtures.d.ts.map +1 -1
  9. package/dest/mocks/fixtures.js +2 -2
  10. package/dest/mocks/test_context.d.ts +1 -1
  11. package/dest/mocks/test_context.d.ts.map +1 -1
  12. package/dest/mocks/test_context.js +3 -3
  13. package/dest/orchestrator/block-building-helpers.d.ts +10 -25
  14. package/dest/orchestrator/block-building-helpers.d.ts.map +1 -1
  15. package/dest/orchestrator/block-building-helpers.js +34 -45
  16. package/dest/orchestrator/block-proving-state.d.ts +40 -44
  17. package/dest/orchestrator/block-proving-state.d.ts.map +1 -1
  18. package/dest/orchestrator/block-proving-state.js +149 -85
  19. package/dest/orchestrator/epoch-proving-state.d.ts +23 -30
  20. package/dest/orchestrator/epoch-proving-state.d.ts.map +1 -1
  21. package/dest/orchestrator/epoch-proving-state.js +92 -65
  22. package/dest/orchestrator/orchestrator.d.ts +16 -47
  23. package/dest/orchestrator/orchestrator.d.ts.map +1 -1
  24. package/dest/orchestrator/orchestrator.js +204 -341
  25. package/dest/orchestrator/tx-proving-state.d.ts +10 -6
  26. package/dest/orchestrator/tx-proving-state.d.ts.map +1 -1
  27. package/dest/orchestrator/tx-proving-state.js +57 -46
  28. package/dest/prover-agent/memory-proving-queue.d.ts +3 -3
  29. package/dest/prover-agent/memory-proving-queue.d.ts.map +1 -1
  30. package/dest/prover-agent/memory-proving-queue.js +4 -4
  31. package/dest/prover-agent/prover-agent.js +4 -4
  32. package/dest/prover-client/prover-client.d.ts.map +1 -1
  33. package/dest/prover-client/prover-client.js +6 -3
  34. package/dest/prover-client/server-epoch-prover.d.ts +25 -0
  35. package/dest/prover-client/server-epoch-prover.d.ts.map +1 -0
  36. package/dest/prover-client/server-epoch-prover.js +40 -0
  37. package/dest/proving_broker/broker_prover_facade.d.ts +15 -4
  38. package/dest/proving_broker/broker_prover_facade.d.ts.map +1 -1
  39. package/dest/proving_broker/broker_prover_facade.js +247 -44
  40. package/dest/proving_broker/config.d.ts +61 -0
  41. package/dest/proving_broker/config.d.ts.map +1 -0
  42. package/dest/proving_broker/config.js +83 -0
  43. package/dest/proving_broker/factory.d.ts +1 -1
  44. package/dest/proving_broker/factory.d.ts.map +1 -1
  45. package/dest/proving_broker/factory.js +2 -5
  46. package/dest/proving_broker/fixtures.d.ts +5 -0
  47. package/dest/proving_broker/fixtures.d.ts.map +1 -0
  48. package/dest/proving_broker/fixtures.js +12 -0
  49. package/dest/proving_broker/index.d.ts +1 -0
  50. package/dest/proving_broker/index.d.ts.map +1 -1
  51. package/dest/proving_broker/index.js +2 -1
  52. package/dest/proving_broker/proving_broker.d.ts +16 -12
  53. package/dest/proving_broker/proving_broker.d.ts.map +1 -1
  54. package/dest/proving_broker/proving_broker.js +306 -273
  55. package/dest/proving_broker/proving_broker_database/memory.d.ts +4 -2
  56. package/dest/proving_broker/proving_broker_database/memory.d.ts.map +1 -1
  57. package/dest/proving_broker/proving_broker_database/memory.js +17 -4
  58. package/dest/proving_broker/proving_broker_database/persisted.d.ts +10 -6
  59. package/dest/proving_broker/proving_broker_database/persisted.d.ts.map +1 -1
  60. package/dest/proving_broker/proving_broker_database/persisted.js +105 -13
  61. package/dest/proving_broker/proving_broker_database.d.ts +7 -3
  62. package/dest/proving_broker/proving_broker_database.d.ts.map +1 -1
  63. package/dest/proving_broker/proving_job_controller.js +4 -4
  64. package/dest/proving_broker/rpc.d.ts.map +1 -1
  65. package/dest/proving_broker/rpc.js +4 -4
  66. package/dest/test/mock_prover.d.ts +7 -7
  67. package/dest/test/mock_prover.d.ts.map +1 -1
  68. package/dest/test/mock_prover.js +6 -6
  69. package/package.json +11 -11
  70. package/src/block_builder/light.ts +1 -20
  71. package/src/config.ts +4 -4
  72. package/src/mocks/fixtures.ts +1 -1
  73. package/src/mocks/test_context.ts +2 -2
  74. package/src/orchestrator/block-building-helpers.ts +45 -119
  75. package/src/orchestrator/block-proving-state.ts +251 -121
  76. package/src/orchestrator/epoch-proving-state.ts +159 -88
  77. package/src/orchestrator/orchestrator.ts +251 -527
  78. package/src/orchestrator/tx-proving-state.ts +30 -18
  79. package/src/prover-agent/memory-proving-queue.ts +11 -15
  80. package/src/prover-agent/prover-agent.ts +4 -4
  81. package/src/prover-client/prover-client.ts +5 -7
  82. package/src/prover-client/server-epoch-prover.ts +44 -0
  83. package/src/proving_broker/broker_prover_facade.ts +321 -64
  84. package/src/proving_broker/config.ts +93 -0
  85. package/src/proving_broker/factory.ts +2 -5
  86. package/src/proving_broker/fixtures.ts +14 -0
  87. package/src/proving_broker/index.ts +1 -0
  88. package/src/proving_broker/proving_broker.ts +114 -71
  89. package/src/proving_broker/proving_broker_database/memory.ts +24 -4
  90. package/src/proving_broker/proving_broker_database/persisted.ts +141 -19
  91. package/src/proving_broker/proving_broker_database.ts +8 -3
  92. package/src/proving_broker/proving_job_controller.ts +5 -5
  93. package/src/proving_broker/rpc.ts +2 -3
  94. package/src/test/mock_prover.ts +9 -14
@@ -1,11 +1,16 @@
1
- import { ProvingRequestType, } from '@aztec/circuit-types';
1
+ import { ProvingRequestType, makeProvingJobId, } from '@aztec/circuit-types';
2
2
  import { sha256 } from '@aztec/foundation/crypto';
3
3
  import { createLogger } from '@aztec/foundation/log';
4
- import { retryUntil } from '@aztec/foundation/retry';
4
+ import { RunningPromise, promiseWithResolvers } from '@aztec/foundation/promise';
5
+ import { SerialQueue } from '@aztec/foundation/queue';
5
6
  import { truncate } from '@aztec/foundation/string';
6
7
  import { InlineProofStore } from './proof_store.js';
7
8
  // 20 minutes, roughly the length of an Aztec epoch. If a proof isn't ready in this amount of time then we've failed to prove the whole epoch
8
9
  const MAX_WAIT_MS = 1200000;
10
+ // Perform a snapshot sync every 30 seconds
11
+ const SNAPSHOT_SYNC_INTERVAL_MS = 30000;
12
+ const MAX_CONCURRENT_JOB_SETTLED_REQUESTS = 10;
13
+ const SNAPSHOT_SYNC_CHECK_MAX_REQUEST_SIZE = 1000;
9
14
  export class BrokerCircuitProverFacade {
10
15
  constructor(broker, proofStore = new InlineProofStore(), waitTimeoutMs = MAX_WAIT_MS, pollIntervalMs = 1000, log = createLogger('prover-client:broker-circuit-prover-facade')) {
11
16
  this.broker = broker;
@@ -13,95 +18,293 @@ export class BrokerCircuitProverFacade {
13
18
  this.waitTimeoutMs = waitTimeoutMs;
14
19
  this.pollIntervalMs = pollIntervalMs;
15
20
  this.log = log;
21
+ this.jobs = new Map();
22
+ this.timeOfLastSnapshotSync = Date.now();
23
+ this.queue = new SerialQueue();
24
+ this.jobsToRetrieve = new Set();
16
25
  }
17
- async enqueueAndWaitForJob(id, type, inputs, epochNumber = 0, signal) {
26
+ enqueueJob(id, type, inputs, epochNumber = 0, signal) {
27
+ if (!this.queue) {
28
+ throw new Error('BrokerCircuitProverFacade not started');
29
+ }
30
+ return this.queue.put(() => this._enqueueJob(id, type, inputs, epochNumber, signal)).then(({ enqueuedPromise }) => enqueuedPromise);
31
+ }
32
+ async _enqueueJob(id, type, inputs, epochNumber = 0, signal) {
33
+ // Check if there is already a promise for this job
34
+ const existingPromise = this.jobs.get(id);
35
+ if (existingPromise) {
36
+ this.log.verbose(`Job already found in facade id=${id} type=${ProvingRequestType[type]}`, {
37
+ provingJobId: id,
38
+ provingJobType: ProvingRequestType[type],
39
+ epochNumber,
40
+ });
41
+ return { enqueuedPromise: existingPromise.promise.promise };
42
+ }
18
43
  const inputsUri = await this.proofStore.saveProofInput(id, type, inputs);
19
- await this.broker.enqueueProvingJob({
44
+ const jobStatus = await this.broker.enqueueProvingJob({
20
45
  id,
21
46
  type,
22
47
  inputsUri,
23
48
  epochNumber,
24
49
  });
25
- this.log.verbose(`Sent proving job to broker id=${id} type=${ProvingRequestType[type]} epochNumber=${epochNumber}`, {
26
- provingJobId: id,
27
- provingJobType: ProvingRequestType[type],
28
- epochNumber,
29
- inputsUri: truncate(inputsUri),
30
- });
31
- // notify broker of cancelled job
50
+ // Create a promise for this job id, regardless of whether it was enqueued at the broker
51
+ // The running promise will monitor for the job to be completed and resolve it either way
52
+ const promise = promiseWithResolvers();
32
53
  const abortFn = async () => {
33
54
  signal?.removeEventListener('abort', abortFn);
34
55
  await this.broker.cancelProvingJob(id);
35
56
  };
36
- signal?.addEventListener('abort', abortFn);
37
- try {
38
- // loop here until the job settles
39
- // NOTE: this could also terminate because the job was cancelled through event listener above
40
- const result = await retryUntil(async () => {
41
- try {
42
- return await this.broker.waitForJobToSettle(id);
57
+ const job = {
58
+ id,
59
+ type,
60
+ promise,
61
+ abortFn,
62
+ signal,
63
+ };
64
+ this.jobs.set(id, job);
65
+ // If we are here then the job was successfully accepted by the broker
66
+ // the returned status is for before any action was performed
67
+ if (jobStatus.status === 'not-found') {
68
+ // Job added for the first time
69
+ // notify the broker if job is aborted
70
+ signal?.addEventListener('abort', abortFn);
71
+ this.log.verbose(`Job enqueued with broker id=${id} type=${ProvingRequestType[type]} epochNumber=${epochNumber}`, {
72
+ provingJobId: id,
73
+ provingJobType: ProvingRequestType[type],
74
+ epochNumber,
75
+ inputsUri: truncate(inputsUri),
76
+ numOutstandingJobs: this.jobs.size,
77
+ });
78
+ }
79
+ else if (jobStatus.status === 'fulfilled' || jobStatus.status === 'rejected') {
80
+ // Job was already completed by the broker
81
+ // No need to notify the broker on aborted job
82
+ job.abortFn = undefined;
83
+ this.log.verbose(`Job already completed when sent to broker id=${id} type=${ProvingRequestType[type]} epochNumber=${epochNumber}`, {
84
+ provingJobId: id,
85
+ provingJobType: ProvingRequestType[type],
86
+ epochNumber,
87
+ inputsUri: truncate(inputsUri),
88
+ });
89
+ // Job was not enqueued. It must be completed already, add to our set of already completed jobs
90
+ this.jobsToRetrieve.add(id);
91
+ }
92
+ else {
93
+ // Job was previously sent to the broker but is not completed
94
+ // notify the broker if job is aborted
95
+ signal?.addEventListener('abort', abortFn);
96
+ this.log.verbose(`Job already in queue or in progress when sent to broker id=${id} type=${ProvingRequestType[type]} epochNumber=${epochNumber}`, {
97
+ provingJobId: id,
98
+ provingJobType: ProvingRequestType[type],
99
+ epochNumber,
100
+ inputsUri: truncate(inputsUri),
101
+ });
102
+ }
103
+ const typedPromise = promise.promise;
104
+ return { enqueuedPromise: typedPromise };
105
+ }
106
+ start() {
107
+ if (this.runningPromise) {
108
+ throw new Error('BrokerCircuitProverFacade already started');
109
+ }
110
+ this.log.verbose('Starting BrokerCircuitProverFacade');
111
+ this.runningPromise = new RunningPromise(() => this.monitorForCompletedJobs(), this.log, this.pollIntervalMs);
112
+ this.runningPromise.start();
113
+ this.queue = new SerialQueue();
114
+ this.queue.start();
115
+ }
116
+ async stop() {
117
+ if (!this.runningPromise) {
118
+ throw new Error('BrokerCircuitProverFacade not started');
119
+ }
120
+ this.log.verbose('Stopping BrokerCircuitProverFacade');
121
+ await this.runningPromise.stop();
122
+ if (this.queue) {
123
+ await this.queue.cancel();
124
+ await this.queue.end();
125
+ }
126
+ // Reject any outstanding promises as stopped
127
+ for (const [_, v] of this.jobs) {
128
+ v.promise.reject(new Error('Broker facade stopped'));
129
+ }
130
+ this.jobs.clear();
131
+ }
132
+ async updateCompletedJobs() {
133
+ // Here we check for completed jobs. If everything works well (there are no service restarts etc) then all we need to do
134
+ // to maintain correct job state is to check for incrementally completed jobs. i.e. call getCompletedJobs with an empty array
135
+ // However, if there are any problems then we may lose sync with the broker's actual set of completed jobs.
136
+ // In this case we need to perform a full snapshot sync. This involves sending all of our outstanding job Ids to the broker
137
+ // and have the broker report on whether they are completed or not.
138
+ // We perform an incremental sync on every call of this function with a full snapshot sync periodically.
139
+ // This should keep us in sync without over-burdening the broker with snapshot sync requests
140
+ const getAllCompletedJobs = async (ids) => {
141
+ // In this function we take whatever set of snapshot ids and we ask the broker for completed job notifications
142
+ // We collect all returned notifications and return them
143
+ const allCompleted = new Set();
144
+ try {
145
+ let numRequests = 0;
146
+ while (ids.length > 0) {
147
+ const slice = ids.splice(0, SNAPSHOT_SYNC_CHECK_MAX_REQUEST_SIZE);
148
+ const completed = await this.broker.getCompletedJobs(slice);
149
+ completed.forEach(id => allCompleted.add(id));
150
+ ++numRequests;
43
151
  }
44
- catch (err) {
45
- // waitForJobToSettle can only fail for network errors
46
- // keep retrying until we time out
152
+ if (numRequests === 0) {
153
+ const final = await this.broker.getCompletedJobs([]);
154
+ final.forEach(id => allCompleted.add(id));
47
155
  }
48
- }, `Proving job=${id} type=${ProvingRequestType[type]}`, this.waitTimeoutMs / 1000, this.pollIntervalMs / 1000);
156
+ }
157
+ catch (err) {
158
+ this.log.error(`Error thrown when requesting completed job notifications from the broker`, err);
159
+ }
160
+ return allCompleted;
161
+ };
162
+ const snapshotSyncIds = [];
163
+ const currentTime = Date.now();
164
+ const secondsSinceLastSnapshotSync = currentTime - this.timeOfLastSnapshotSync;
165
+ if (secondsSinceLastSnapshotSync > SNAPSHOT_SYNC_INTERVAL_MS) {
166
+ this.timeOfLastSnapshotSync = currentTime;
167
+ snapshotSyncIds.push(...this.jobs.keys());
168
+ this.log.trace(`Performing full snapshot sync of completed jobs with ${snapshotSyncIds.length} job(s)`);
169
+ }
170
+ else {
171
+ this.log.trace(`Performing incremental sync of completed jobs`);
172
+ }
173
+ // Now request the notifications from the broker
174
+ const snapshotIdsLength = snapshotSyncIds.length;
175
+ const completedJobs = await getAllCompletedJobs(snapshotSyncIds);
176
+ // We now have an additional set of completed job notifications to add to our cached set giving us the full set of jobs that we have been told are ready
177
+ // We filter this list to what we actually need, in case for any reason it is different and store in our cache
178
+ const allJobsReady = [...completedJobs, ...this.jobsToRetrieve];
179
+ this.jobsToRetrieve = new Set(allJobsReady.filter(id => this.jobs.has(id)));
180
+ if (completedJobs.size > 0) {
181
+ this.log.verbose(`Check for job completion notifications returned ${completedJobs.size} job(s), snapshot ids length: ${snapshotIdsLength}, num outstanding jobs: ${this.jobs.size}, total jobs ready: ${this.jobsToRetrieve.size}`);
182
+ }
183
+ else {
184
+ this.log.trace(`Check for job completion notifications returned 0 jobs, snapshot ids length: ${snapshotIdsLength}, num outstanding jobs: ${this.jobs.size}, total jobs ready: ${this.jobsToRetrieve.size}`);
185
+ }
186
+ }
187
+ async retrieveJobsThatShouldBeReady() {
188
+ const convertJobResult = async (result, jobType) => {
49
189
  if (result.status === 'fulfilled') {
50
190
  const output = await this.proofStore.getProofOutput(result.value);
51
- if (output.type === type) {
52
- return output.result;
191
+ if (output.type === jobType) {
192
+ return { result: output.result, success: true };
53
193
  }
54
194
  else {
55
- throw new Error(`Unexpected proof type: ${output.type}. Expected: ${type}`);
195
+ return { success: false, reason: `Unexpected proof type: ${output.type}. Expected: ${jobType}` };
56
196
  }
57
197
  }
198
+ else if (result.status === 'rejected') {
199
+ return { success: false, reason: result.reason };
200
+ }
201
+ else {
202
+ throw new Error(`Unexpected proving job status ${result.status}`);
203
+ }
204
+ };
205
+ const processJob = async (job) => {
206
+ // First retrieve the settled job from the broker
207
+ this.log.debug(`Received notification of completed job id=${job.id} type=${ProvingRequestType[job.type]}`);
208
+ let settledResult;
209
+ try {
210
+ settledResult = await this.broker.getProvingJobStatus(job.id);
211
+ }
212
+ catch (err) {
213
+ // If an error occurs retrieving the job result then just log it and move on.
214
+ // We will try again on the next iteration
215
+ this.log.error(`Error retrieving job result from broker job id=${job.id} type=${ProvingRequestType[job.type]}`, err);
216
+ return false;
217
+ }
218
+ // Then convert the result and resolve/reject the promise
219
+ let result;
220
+ try {
221
+ result = await convertJobResult(settledResult, job.type);
222
+ }
223
+ catch (err) {
224
+ // If an error occurs retrieving the job result then just log it and move on.
225
+ // We will try again on the next iteration
226
+ this.log.error(`Error processing job result job id=${job.id} type=${ProvingRequestType[job.type]}`, err);
227
+ return false;
228
+ }
229
+ if (result.success) {
230
+ this.log.verbose(`Resolved proving job id=${job.id} type=${ProvingRequestType[job.type]}`);
231
+ job.promise.resolve(result.result);
232
+ }
58
233
  else {
59
- throw new Error(result.reason);
234
+ this.log.error(`Resolving proving job with error id=${job.id} type=${ProvingRequestType[job.type]}`, result.reason);
235
+ job.promise.reject(new Error(result.reason));
236
+ }
237
+ if (job.abortFn && job.signal) {
238
+ job.signal?.removeEventListener('abort', job.abortFn);
60
239
  }
240
+ // Job is now processed removed from our cache
241
+ this.jobs.delete(job.id);
242
+ this.jobsToRetrieve.delete(job.id);
243
+ return true;
244
+ };
245
+ const toBeRetrieved = Array.from(this.jobsToRetrieve.values())
246
+ .map(id => this.jobs.get(id))
247
+ .filter(x => x !== undefined);
248
+ const totalJobsToRetrieve = toBeRetrieved.length;
249
+ let totalJobsRetrieved = 0;
250
+ while (toBeRetrieved.length > 0) {
251
+ const slice = toBeRetrieved.splice(0, MAX_CONCURRENT_JOB_SETTLED_REQUESTS);
252
+ const results = await Promise.all(slice.map(job => processJob(job)));
253
+ totalJobsRetrieved += results.filter(x => x).length;
61
254
  }
62
- finally {
63
- signal?.removeEventListener('abort', abortFn);
255
+ if (totalJobsToRetrieve > 0) {
256
+ this.log.verbose(`Successfully retrieved ${totalJobsRetrieved} of ${totalJobsToRetrieve} jobs that should be ready, total ready jobs is now: ${this.jobsToRetrieve.size}`);
64
257
  }
65
258
  }
259
+ async monitorForCompletedJobs() {
260
+ // Monitoring for completed jobs involves 2 stages.
261
+ // 1. Update our list of completed jobs.
262
+ // We poll the broker for any new job completion notifications and after filtering/deduplication add them to our cached
263
+ // list of jobs that we have been told are ready.
264
+ await this.updateCompletedJobs();
265
+ // 2. Retrieve the jobs that should be ready.
266
+ // We have a list of jobs that we have been told are ready, so we go ahead and ask for their results
267
+ await this.retrieveJobsThatShouldBeReady();
268
+ }
66
269
  getAvmProof(inputs, signal, epochNumber) {
67
- return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.PUBLIC_VM, inputs, epochNumber), ProvingRequestType.PUBLIC_VM, inputs, epochNumber, signal);
270
+ return this.enqueueJob(this.generateId(ProvingRequestType.PUBLIC_VM, inputs, epochNumber), ProvingRequestType.PUBLIC_VM, inputs, epochNumber, signal);
68
271
  }
69
272
  getBaseParityProof(inputs, signal, epochNumber) {
70
- return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.BASE_PARITY, inputs, epochNumber), ProvingRequestType.BASE_PARITY, inputs, epochNumber, signal);
273
+ return this.enqueueJob(this.generateId(ProvingRequestType.BASE_PARITY, inputs, epochNumber), ProvingRequestType.BASE_PARITY, inputs, epochNumber, signal);
71
274
  }
72
275
  getBlockMergeRollupProof(input, signal, epochNumber) {
73
- return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.BLOCK_MERGE_ROLLUP, input, epochNumber), ProvingRequestType.BLOCK_MERGE_ROLLUP, input, epochNumber, signal);
276
+ return this.enqueueJob(this.generateId(ProvingRequestType.BLOCK_MERGE_ROLLUP, input, epochNumber), ProvingRequestType.BLOCK_MERGE_ROLLUP, input, epochNumber, signal);
74
277
  }
75
278
  getBlockRootRollupProof(input, signal, epochNumber) {
76
- return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.BLOCK_ROOT_ROLLUP, input, epochNumber), ProvingRequestType.BLOCK_ROOT_ROLLUP, input, epochNumber, signal);
279
+ return this.enqueueJob(this.generateId(ProvingRequestType.BLOCK_ROOT_ROLLUP, input, epochNumber), ProvingRequestType.BLOCK_ROOT_ROLLUP, input, epochNumber, signal);
77
280
  }
78
- getEmptyBlockRootRollupProof(input, signal, epochNumber) {
79
- return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP, input, epochNumber), ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP, input, epochNumber, signal);
281
+ getSingleTxBlockRootRollupProof(input, signal, epochNumber) {
282
+ return this.enqueueJob(this.generateId(ProvingRequestType.BLOCK_ROOT_ROLLUP, input, epochNumber), ProvingRequestType.SINGLE_TX_BLOCK_ROOT_ROLLUP, input, epochNumber, signal);
80
283
  }
81
- getEmptyPrivateKernelProof(inputs, signal, epochNumber) {
82
- return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.PRIVATE_KERNEL_EMPTY, inputs, epochNumber), ProvingRequestType.PRIVATE_KERNEL_EMPTY, inputs, epochNumber, signal);
284
+ getEmptyBlockRootRollupProof(input, signal, epochNumber) {
285
+ return this.enqueueJob(this.generateId(ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP, input, epochNumber), ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP, input, epochNumber, signal);
83
286
  }
84
287
  getMergeRollupProof(input, signal, epochNumber) {
85
- return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.MERGE_ROLLUP, input, epochNumber), ProvingRequestType.MERGE_ROLLUP, input, epochNumber, signal);
288
+ return this.enqueueJob(this.generateId(ProvingRequestType.MERGE_ROLLUP, input, epochNumber), ProvingRequestType.MERGE_ROLLUP, input, epochNumber, signal);
86
289
  }
87
290
  getPrivateBaseRollupProof(baseRollupInput, signal, epochNumber) {
88
- return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.PRIVATE_BASE_ROLLUP, baseRollupInput, epochNumber), ProvingRequestType.PRIVATE_BASE_ROLLUP, baseRollupInput, epochNumber, signal);
291
+ return this.enqueueJob(this.generateId(ProvingRequestType.PRIVATE_BASE_ROLLUP, baseRollupInput, epochNumber), ProvingRequestType.PRIVATE_BASE_ROLLUP, baseRollupInput, epochNumber, signal);
89
292
  }
90
293
  getPublicBaseRollupProof(inputs, signal, epochNumber) {
91
- return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.PUBLIC_BASE_ROLLUP, inputs, epochNumber), ProvingRequestType.PUBLIC_BASE_ROLLUP, inputs, epochNumber, signal);
294
+ return this.enqueueJob(this.generateId(ProvingRequestType.PUBLIC_BASE_ROLLUP, inputs, epochNumber), ProvingRequestType.PUBLIC_BASE_ROLLUP, inputs, epochNumber, signal);
92
295
  }
93
296
  getRootParityProof(inputs, signal, epochNumber) {
94
- return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.ROOT_PARITY, inputs, epochNumber), ProvingRequestType.ROOT_PARITY, inputs, epochNumber, signal);
297
+ return this.enqueueJob(this.generateId(ProvingRequestType.ROOT_PARITY, inputs, epochNumber), ProvingRequestType.ROOT_PARITY, inputs, epochNumber, signal);
95
298
  }
96
299
  getRootRollupProof(input, signal, epochNumber) {
97
- return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.ROOT_ROLLUP, input, epochNumber), ProvingRequestType.ROOT_ROLLUP, input, epochNumber, signal);
300
+ return this.enqueueJob(this.generateId(ProvingRequestType.ROOT_ROLLUP, input, epochNumber), ProvingRequestType.ROOT_ROLLUP, input, epochNumber, signal);
98
301
  }
99
302
  getTubeProof(tubeInput, signal, epochNumber) {
100
- return this.enqueueAndWaitForJob(this.generateId(ProvingRequestType.TUBE_PROOF, tubeInput, epochNumber), ProvingRequestType.TUBE_PROOF, tubeInput, epochNumber, signal);
303
+ return this.enqueueJob(this.generateId(ProvingRequestType.TUBE_PROOF, tubeInput, epochNumber), ProvingRequestType.TUBE_PROOF, tubeInput, epochNumber, signal);
101
304
  }
102
305
  generateId(type, inputs, epochNumber = 0) {
103
306
  const inputsHash = sha256(inputs.toBuffer());
104
- return `${epochNumber}:${ProvingRequestType[type]}:${inputsHash.toString('hex')}`;
307
+ return makeProvingJobId(epochNumber, type, inputsHash.toString('hex'));
105
308
  }
106
309
  }
107
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnJva2VyX3Byb3Zlcl9mYWNhZGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHJvdmluZ19icm9rZXIvYnJva2VyX3Byb3Zlcl9mYWNhZGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQU1MLGtCQUFrQixHQUduQixNQUFNLHNCQUFzQixDQUFDO0FBMkI5QixPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDbEQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNyRCxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFcEQsT0FBTyxFQUFFLGdCQUFnQixFQUFtQixNQUFNLGtCQUFrQixDQUFDO0FBRXJFLDZJQUE2STtBQUM3SSxNQUFNLFdBQVcsR0FBRyxPQUFTLENBQUM7QUFFOUIsTUFBTSxPQUFPLHlCQUF5QjtJQUNwQyxZQUNVLE1BQTBCLEVBQzFCLGFBQXlCLElBQUksZ0JBQWdCLEVBQUUsRUFDL0MsZ0JBQWdCLFdBQVcsRUFDM0IsaUJBQWlCLElBQUksRUFDckIsTUFBTSxZQUFZLENBQUMsNENBQTRDLENBQUM7UUFKaEUsV0FBTSxHQUFOLE1BQU0sQ0FBb0I7UUFDMUIsZUFBVSxHQUFWLFVBQVUsQ0FBcUM7UUFDL0Msa0JBQWEsR0FBYixhQUFhLENBQWM7UUFDM0IsbUJBQWMsR0FBZCxjQUFjLENBQU87UUFDckIsUUFBRyxHQUFILEdBQUcsQ0FBNkQ7SUFDdkUsQ0FBQztJQUVJLEtBQUssQ0FBQyxvQkFBb0IsQ0FDaEMsRUFBZ0IsRUFDaEIsSUFBTyxFQUNQLE1BQThCLEVBQzlCLFdBQVcsR0FBRyxDQUFDLEVBQ2YsTUFBb0I7UUFFcEIsTUFBTSxTQUFTLEdBQUcsTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLGNBQWMsQ0FBQyxFQUFFLEVBQUUsSUFBSSxF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
310
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"broker_prover_facade.js","sourceRoot":"","sources":["../../src/proving_broker/broker_prover_facade.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,61 @@
1
+ import { ProvingRequestType } from '@aztec/circuit-types';
2
+ import { type ConfigMappingsType } from '@aztec/foundation/config';
3
+ import { type DataStoreConfig } from '@aztec/kv-store/config';
4
+ import { z } from 'zod';
5
+ export declare const ProverBrokerConfig: z.ZodObject<{
6
+ /** If starting a prover broker locally, the max number of retries per proving job */
7
+ proverBrokerJobMaxRetries: z.ZodNumber;
8
+ /** If starting a prover broker locally, the time after which a job times out and gets assigned to a different agent */
9
+ proverBrokerJobTimeoutMs: z.ZodNumber;
10
+ /** If starting a prover broker locally, the interval the broker checks for timed out jobs */
11
+ proverBrokerPollIntervalMs: z.ZodNumber;
12
+ /** If starting a prover broker locally, the directory to store broker data */
13
+ dataDirectory: z.ZodOptional<z.ZodString>;
14
+ /** The size of the data store map */
15
+ dataStoreMapSizeKB: z.ZodNumber;
16
+ }, "strip", z.ZodTypeAny, {
17
+ proverBrokerJobMaxRetries: number;
18
+ proverBrokerJobTimeoutMs: number;
19
+ proverBrokerPollIntervalMs: number;
20
+ dataStoreMapSizeKB: number;
21
+ dataDirectory?: string | undefined;
22
+ }, {
23
+ proverBrokerJobMaxRetries: number;
24
+ proverBrokerJobTimeoutMs: number;
25
+ proverBrokerPollIntervalMs: number;
26
+ dataStoreMapSizeKB: number;
27
+ dataDirectory?: string | undefined;
28
+ }>;
29
+ export type ProverBrokerConfig = z.infer<typeof ProverBrokerConfig> & Pick<DataStoreConfig, 'dataStoreMapSizeKB' | 'dataDirectory'>;
30
+ export declare const proverBrokerConfigMappings: ConfigMappingsType<ProverBrokerConfig>;
31
+ export declare const ProverAgentConfig: z.ZodObject<{
32
+ /** The number of prover agents to start */
33
+ proverAgentCount: z.ZodNumber;
34
+ /** The types of proofs the prover agent can generate */
35
+ proverAgentProofTypes: z.ZodArray<z.ZodNativeEnum<typeof ProvingRequestType>, "many">;
36
+ /** How often the prover agents poll for jobs */
37
+ proverAgentPollIntervalMs: z.ZodNumber;
38
+ /** The URL where this agent takes jobs from */
39
+ proverBrokerUrl: z.ZodOptional<z.ZodString>;
40
+ /** Whether to construct real proofs */
41
+ realProofs: z.ZodBoolean;
42
+ /** Artificial delay to introduce to all operations to the test prover. */
43
+ proverTestDelayMs: z.ZodNumber;
44
+ }, "strip", z.ZodTypeAny, {
45
+ proverAgentCount: number;
46
+ proverAgentProofTypes: ProvingRequestType[];
47
+ proverAgentPollIntervalMs: number;
48
+ realProofs: boolean;
49
+ proverTestDelayMs: number;
50
+ proverBrokerUrl?: string | undefined;
51
+ }, {
52
+ proverAgentCount: number;
53
+ proverAgentProofTypes: ProvingRequestType[];
54
+ proverAgentPollIntervalMs: number;
55
+ realProofs: boolean;
56
+ proverTestDelayMs: number;
57
+ proverBrokerUrl?: string | undefined;
58
+ }>;
59
+ export type ProverAgentConfig = z.infer<typeof ProverAgentConfig>;
60
+ export declare const proverAgentConfigMappings: ConfigMappingsType<ProverAgentConfig>;
61
+ //# sourceMappingURL=config.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/proving_broker/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,KAAK,kBAAkB,EAA2C,MAAM,0BAA0B,CAAC;AAC5G,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AAElF,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,kBAAkB;IAC7B,qFAAqF;;IAErF,uHAAuH;;IAEvH,6FAA6F;;IAE7F,8EAA8E;;IAE9E,qCAAqC;;;;;;;;;;;;;;EAErC,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,GACjE,IAAI,CAAC,eAAe,EAAE,oBAAoB,GAAG,eAAe,CAAC,CAAC;AAEhE,eAAO,MAAM,0BAA0B,EAAE,kBAAkB,CAAC,kBAAkB,CAiB7E,CAAC;AAEF,eAAO,MAAM,iBAAiB;IAC5B,2CAA2C;;IAE3C,wDAAwD;;IAExD,gDAAgD;;IAEhD,+CAA+C;;IAE/C,uCAAuC;;IAEvC,0EAA0E;;;;;;;;;;;;;;;;EAE1E,CAAC;AAEH,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAElE,eAAO,MAAM,yBAAyB,EAAE,kBAAkB,CAAC,iBAAiB,CAkC3E,CAAC"}
@@ -0,0 +1,83 @@
1
+ import { ProvingRequestType } from '@aztec/circuit-types';
2
+ import { booleanConfigHelper, numberConfigHelper } from '@aztec/foundation/config';
3
+ import { dataConfigMappings } from '@aztec/kv-store/config';
4
+ import { z } from 'zod';
5
+ export const ProverBrokerConfig = z.object({
6
+ /** If starting a prover broker locally, the max number of retries per proving job */
7
+ proverBrokerJobMaxRetries: z.number(),
8
+ /** If starting a prover broker locally, the time after which a job times out and gets assigned to a different agent */
9
+ proverBrokerJobTimeoutMs: z.number(),
10
+ /** If starting a prover broker locally, the interval the broker checks for timed out jobs */
11
+ proverBrokerPollIntervalMs: z.number(),
12
+ /** If starting a prover broker locally, the directory to store broker data */
13
+ dataDirectory: z.string().optional(),
14
+ /** The size of the data store map */
15
+ dataStoreMapSizeKB: z.number(),
16
+ });
17
+ export const proverBrokerConfigMappings = {
18
+ proverBrokerJobTimeoutMs: {
19
+ env: 'PROVER_BROKER_JOB_TIMEOUT_MS',
20
+ description: 'Jobs are retried if not kept alive for this long',
21
+ ...numberConfigHelper(30000),
22
+ },
23
+ proverBrokerPollIntervalMs: {
24
+ env: 'PROVER_BROKER_POLL_INTERVAL_MS',
25
+ description: 'The interval to check job health status',
26
+ ...numberConfigHelper(1000),
27
+ },
28
+ proverBrokerJobMaxRetries: {
29
+ env: 'PROVER_BROKER_JOB_MAX_RETRIES',
30
+ description: 'If starting a prover broker locally, the max number of retries per proving job',
31
+ ...numberConfigHelper(3),
32
+ },
33
+ ...dataConfigMappings,
34
+ };
35
+ export const ProverAgentConfig = z.object({
36
+ /** The number of prover agents to start */
37
+ proverAgentCount: z.number(),
38
+ /** The types of proofs the prover agent can generate */
39
+ proverAgentProofTypes: z.array(z.nativeEnum(ProvingRequestType)),
40
+ /** How often the prover agents poll for jobs */
41
+ proverAgentPollIntervalMs: z.number(),
42
+ /** The URL where this agent takes jobs from */
43
+ proverBrokerUrl: z.string().optional(),
44
+ /** Whether to construct real proofs */
45
+ realProofs: z.boolean(),
46
+ /** Artificial delay to introduce to all operations to the test prover. */
47
+ proverTestDelayMs: z.number(),
48
+ });
49
+ export const proverAgentConfigMappings = {
50
+ proverAgentCount: {
51
+ env: 'PROVER_AGENT_COUNT',
52
+ description: 'Whether this prover has a local prover agent',
53
+ ...numberConfigHelper(1),
54
+ },
55
+ proverAgentPollIntervalMs: {
56
+ env: 'PROVER_AGENT_POLL_INTERVAL_MS',
57
+ description: 'The interval agents poll for jobs at',
58
+ ...numberConfigHelper(100),
59
+ },
60
+ proverAgentProofTypes: {
61
+ env: 'PROVER_AGENT_PROOF_TYPES',
62
+ description: 'The types of proofs the prover agent can generate',
63
+ parseEnv: (val) => val
64
+ .split(',')
65
+ .map(v => ProvingRequestType[v])
66
+ .filter(v => typeof v === 'number'),
67
+ },
68
+ proverBrokerUrl: {
69
+ env: 'PROVER_BROKER_HOST',
70
+ description: 'The URL where this agent takes jobs from',
71
+ },
72
+ realProofs: {
73
+ env: 'PROVER_REAL_PROOFS',
74
+ description: 'Whether to construct real proofs',
75
+ ...booleanConfigHelper(false),
76
+ },
77
+ proverTestDelayMs: {
78
+ env: 'PROVER_TEST_DELAY_MS',
79
+ description: 'Artificial delay to introduce to all operations to the test prover.',
80
+ ...numberConfigHelper(0),
81
+ },
82
+ };
83
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Byb3ZpbmdfYnJva2VyL2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUMxRCxPQUFPLEVBQTJCLG1CQUFtQixFQUFFLGtCQUFrQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDNUcsT0FBTyxFQUF3QixrQkFBa0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRWxGLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsTUFBTSxDQUFDLE1BQU0sa0JBQWtCLEdBQUcsQ0FBQyxDQUFDLE1BQU0sQ0FBQztJQUN6QyxxRkFBcUY7SUFDckYseUJBQXlCLEVBQUUsQ0FBQyxDQUFDLE1BQU0sRUFBRTtJQUNyQyx1SEFBdUg7SUFDdkgsd0JBQXdCLEVBQUUsQ0FBQyxDQUFDLE1BQU0sRUFBRTtJQUNwQyw2RkFBNkY7SUFDN0YsMEJBQTBCLEVBQUUsQ0FBQyxDQUFDLE1BQU0sRUFBRTtJQUN0Qyw4RUFBOEU7SUFDOUUsYUFBYSxFQUFFLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDcEMscUNBQXFDO0lBQ3JDLGtCQUFrQixFQUFFLENBQUMsQ0FBQyxNQUFNLEVBQUU7Q0FDL0IsQ0FBQyxDQUFDO0FBS0gsTUFBTSxDQUFDLE1BQU0sMEJBQTBCLEdBQTJDO0lBQ2hGLHdCQUF3QixFQUFFO1FBQ3hCLEdBQUcsRUFBRSw4QkFBOEI7UUFDbkMsV0FBVyxFQUFFLGtEQUFrRDtRQUMvRCxHQUFHLGtCQUFrQixDQUFDLEtBQU0sQ0FBQztLQUM5QjtJQUNELDBCQUEwQixFQUFFO1FBQzFCLEdBQUcsRUFBRSxnQ0FBZ0M7UUFDckMsV0FBVyxFQUFFLHlDQUF5QztRQUN0RCxHQUFHLGtCQUFrQixDQUFDLElBQUssQ0FBQztLQUM3QjtJQUNELHlCQUF5QixFQUFFO1FBQ3pCLEdBQUcsRUFBRSwrQkFBK0I7UUFDcEMsV0FBVyxFQUFFLGdGQUFnRjtRQUM3RixHQUFHLGtCQUFrQixDQUFDLENBQUMsQ0FBQztLQUN6QjtJQUNELEdBQUcsa0JBQWtCO0NBQ3RCLENBQUM7QUFFRixNQUFNLENBQUMsTUFBTSxpQkFBaUIsR0FBRyxDQUFDLENBQUMsTUFBTSxDQUFDO0lBQ3hDLDJDQUEyQztJQUMzQyxnQkFBZ0IsRUFBRSxDQUFDLENBQUMsTUFBTSxFQUFFO0lBQzVCLHdEQUF3RDtJQUN4RCxxQkFBcUIsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsa0JBQWtCLENBQUMsQ0FBQztJQUNoRSxnREFBZ0Q7SUFDaEQseUJBQXlCLEVBQUUsQ0FBQyxDQUFDLE1BQU0sRUFBRTtJQUNyQywrQ0FBK0M7SUFDL0MsZUFBZSxFQUFFLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDdEMsdUNBQXVDO0lBQ3ZDLFVBQVUsRUFBRSxDQUFDLENBQUMsT0FBTyxFQUFFO0lBQ3ZCLDBFQUEwRTtJQUMxRSxpQkFBaUIsRUFBRSxDQUFDLENBQUMsTUFBTSxFQUFFO0NBQzlCLENBQUMsQ0FBQztBQUlILE1BQU0sQ0FBQyxNQUFNLHlCQUF5QixHQUEwQztJQUM5RSxnQkFBZ0IsRUFBRTtRQUNoQixHQUFHLEVBQUUsb0JBQW9CO1FBQ3pCLFdBQVcsRUFBRSw4Q0FBOEM7UUFDM0QsR0FBRyxrQkFBa0IsQ0FBQyxDQUFDLENBQUM7S0FDekI7SUFDRCx5QkFBeUIsRUFBRTtRQUN6QixHQUFHLEVBQUUsK0JBQStCO1FBQ3BDLFdBQVcsRUFBRSxzQ0FBc0M7UUFDbkQsR0FBRyxrQkFBa0IsQ0FBQyxHQUFHLENBQUM7S0FDM0I7SUFDRCxxQkFBcUIsRUFBRTtRQUNyQixHQUFHLEVBQUUsMEJBQTBCO1FBQy9CLFdBQVcsRUFBRSxtREFBbUQ7UUFDaEUsUUFBUSxFQUFFLENBQUMsR0FBVyxFQUFFLEVBQUUsQ0FDeEIsR0FBRzthQUNBLEtBQUssQ0FBQyxHQUFHLENBQUM7YUFDVixHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFRLENBQUMsQ0FBQzthQUN0QyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxPQUFPLENBQUMsS0FBSyxRQUFRLENBQUM7S0FDeEM7SUFDRCxlQUFlLEVBQUU7UUFDZixHQUFHLEVBQUUsb0JBQW9CO1FBQ3pCLFdBQVcsRUFBRSwwQ0FBMEM7S0FDeEQ7SUFDRCxVQUFVLEVBQUU7UUFDVixHQUFHLEVBQUUsb0JBQW9CO1FBQ3pCLFdBQVcsRUFBRSxrQ0FBa0M7UUFDL0MsR0FBRyxtQkFBbUIsQ0FBQyxLQUFLLENBQUM7S0FDOUI7SUFDRCxpQkFBaUIsRUFBRTtRQUNqQixHQUFHLEVBQUUsc0JBQXNCO1FBQzNCLFdBQVcsRUFBRSxxRUFBcUU7UUFDbEYsR0FBRyxrQkFBa0IsQ0FBQyxDQUFDLENBQUM7S0FDekI7Q0FDRixDQUFDIn0=
@@ -1,5 +1,5 @@
1
- import { type ProverBrokerConfig } from '@aztec/circuit-types';
2
1
  import { type TelemetryClient } from '@aztec/telemetry-client';
2
+ import { type ProverBrokerConfig } from './config.js';
3
3
  import { ProvingBroker } from './proving_broker.js';
4
4
  export declare function createAndStartProvingBroker(config: ProverBrokerConfig, client: TelemetryClient): Promise<ProvingBroker>;
5
5
  //# sourceMappingURL=factory.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/proving_broker/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAIpD,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,kBAAkB,EAC1B,MAAM,EAAE,eAAe,GACtB,OAAO,CAAC,aAAa,CAAC,CAaxB"}
1
+ {"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/proving_broker/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,EAAE,KAAK,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,CAWxB"}
@@ -1,11 +1,8 @@
1
- import { AztecLmdbStore } from '@aztec/kv-store/lmdb';
2
1
  import { ProvingBroker } from './proving_broker.js';
3
2
  import { InMemoryBrokerDatabase } from './proving_broker_database/memory.js';
4
3
  import { KVBrokerDatabase } from './proving_broker_database/persisted.js';
5
4
  export async function createAndStartProvingBroker(config, client) {
6
- const database = config.proverBrokerDataDirectory
7
- ? new KVBrokerDatabase(AztecLmdbStore.open(config.proverBrokerDataDirectory), client)
8
- : new InMemoryBrokerDatabase();
5
+ const database = config.dataDirectory ? await KVBrokerDatabase.new(config, client) : new InMemoryBrokerDatabase();
9
6
  const broker = new ProvingBroker(database, client, {
10
7
  jobTimeoutMs: config.proverBrokerJobTimeoutMs,
11
8
  maxRetries: config.proverBrokerJobMaxRetries,
@@ -14,4 +11,4 @@ export async function createAndStartProvingBroker(config, client) {
14
11
  await broker.start();
15
12
  return broker;
16
13
  }
17
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wcm92aW5nX2Jyb2tlci9mYWN0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUd0RCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDcEQsT0FBTyxFQUFFLHNCQUFzQixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFDN0UsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sd0NBQXdDLENBQUM7QUFFMUUsTUFBTSxDQUFDLEtBQUssVUFBVSwyQkFBMkIsQ0FDL0MsTUFBMEIsRUFDMUIsTUFBdUI7SUFFdkIsTUFBTSxRQUFRLEdBQUcsTUFBTSxDQUFDLHlCQUF5QjtRQUMvQyxDQUFDLENBQUMsSUFBSSxnQkFBZ0IsQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyx5QkFBeUIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztRQUNyRixDQUFDLENBQUMsSUFBSSxzQkFBc0IsRUFBRSxDQUFDO0lBRWpDLE1BQU0sTUFBTSxHQUFHLElBQUksYUFBYSxDQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUU7UUFDakQsWUFBWSxFQUFFLE1BQU0sQ0FBQyx3QkFBd0I7UUFDN0MsVUFBVSxFQUFFLE1BQU0sQ0FBQyx5QkFBeUI7UUFDNUMsaUJBQWlCLEVBQUUsTUFBTSxDQUFDLDBCQUEwQjtLQUNyRCxDQUFDLENBQUM7SUFFSCxNQUFNLE1BQU0sQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUNyQixPQUFPLE1BQU0sQ0FBQztBQUNoQixDQUFDIn0=
14
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wcm92aW5nX2Jyb2tlci9mYWN0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNwRCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUM3RSxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx3Q0FBd0MsQ0FBQztBQUUxRSxNQUFNLENBQUMsS0FBSyxVQUFVLDJCQUEyQixDQUMvQyxNQUEwQixFQUMxQixNQUF1QjtJQUV2QixNQUFNLFFBQVEsR0FBRyxNQUFNLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQyxNQUFNLGdCQUFnQixDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksc0JBQXNCLEVBQUUsQ0FBQztJQUVsSCxNQUFNLE1BQU0sR0FBRyxJQUFJLGFBQWEsQ0FBQyxRQUFRLEVBQUUsTUFBTSxFQUFFO1FBQ2pELFlBQVksRUFBRSxNQUFNLENBQUMsd0JBQXdCO1FBQzdDLFVBQVUsRUFBRSxNQUFNLENBQUMseUJBQXlCO1FBQzVDLGlCQUFpQixFQUFFLE1BQU0sQ0FBQywwQkFBMEI7S0FDckQsQ0FBQyxDQUFDO0lBRUgsTUFBTSxNQUFNLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDckIsT0FBTyxNQUFNLENBQUM7QUFDaEIsQ0FBQyJ9
@@ -0,0 +1,5 @@
1
+ import { type ProofUri, type ProvingJobId } from '@aztec/circuit-types';
2
+ export declare function makeRandomProvingJobId(epochNumber?: number): ProvingJobId;
3
+ export declare function makeInputsUri(): ProofUri;
4
+ export declare function makeOutputsUri(): ProofUri;
5
+ //# sourceMappingURL=fixtures.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"fixtures.d.ts","sourceRoot":"","sources":["../../src/proving_broker/fixtures.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,YAAY,EAAwC,MAAM,sBAAsB,CAAC;AAG9G,wBAAgB,sBAAsB,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,YAAY,CAEzE;AAED,wBAAgB,aAAa,IAAI,QAAQ,CAExC;AAED,wBAAgB,cAAc,IAAI,QAAQ,CAEzC"}
@@ -0,0 +1,12 @@
1
+ import { ProvingRequestType, makeProvingJobId } from '@aztec/circuit-types';
2
+ import { randomBytes } from '@aztec/foundation/crypto';
3
+ export function makeRandomProvingJobId(epochNumber) {
4
+ return makeProvingJobId(epochNumber ?? 1, ProvingRequestType.BASE_PARITY, randomBytes(8).toString('hex'));
5
+ }
6
+ export function makeInputsUri() {
7
+ return randomBytes(8).toString('hex');
8
+ }
9
+ export function makeOutputsUri() {
10
+ return randomBytes(8).toString('hex');
11
+ }
12
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZml4dHVyZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHJvdmluZ19icm9rZXIvZml4dHVyZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFvQyxrQkFBa0IsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQzlHLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUV2RCxNQUFNLFVBQVUsc0JBQXNCLENBQUMsV0FBb0I7SUFDekQsT0FBTyxnQkFBZ0IsQ0FBQyxXQUFXLElBQUksQ0FBQyxFQUFFLGtCQUFrQixDQUFDLFdBQVcsRUFBRSxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7QUFDNUcsQ0FBQztBQUVELE1BQU0sVUFBVSxhQUFhO0lBQzNCLE9BQU8sV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQWEsQ0FBQztBQUNwRCxDQUFDO0FBRUQsTUFBTSxVQUFVLGNBQWM7SUFDNUIsT0FBTyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBYSxDQUFDO0FBQ3BELENBQUMifQ==
@@ -6,4 +6,5 @@ export * from './proving_broker_database/memory.js';
6
6
  export * from './proving_broker_database/persisted.js';
7
7
  export * from './proof_store.js';
8
8
  export * from './factory.js';
9
+ export * from './config.js';
9
10
  //# sourceMappingURL=index.d.ts.map