@aztec/prover-client 0.73.0 → 0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2
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.
- package/dest/bin/get-proof-inputs.js +18 -16
- package/dest/block_builder/index.js +0 -1
- package/dest/block_builder/light.js +23 -13
- package/dest/config.js +9 -11
- package/dest/index.js +0 -1
- package/dest/mocks/fixtures.js +28 -26
- package/dest/mocks/test_context.js +55 -31
- package/dest/orchestrator/block-building-helpers.js +90 -90
- package/dest/orchestrator/block-proving-state.js +95 -70
- package/dest/orchestrator/epoch-proving-state.js +53 -40
- package/dest/orchestrator/index.js +0 -1
- package/dest/orchestrator/orchestrator.js +649 -653
- package/dest/orchestrator/orchestrator_metrics.js +4 -3
- package/dest/orchestrator/tx-proving-state.js +52 -51
- package/dest/prover-agent/index.js +0 -1
- package/dest/prover-agent/memory-proving-queue.js +237 -248
- package/dest/prover-agent/prover-agent.js +184 -187
- package/dest/prover-agent/proving-error.js +0 -1
- package/dest/prover-agent/queue_metrics.js +6 -5
- package/dest/prover-agent/rpc.js +6 -4
- package/dest/prover-client/factory.js +0 -1
- package/dest/prover-client/index.js +0 -1
- package/dest/prover-client/prover-client.js +30 -25
- package/dest/prover-client/server-epoch-prover.js +4 -4
- package/dest/proving_broker/broker_prover_facade.js +70 -59
- package/dest/proving_broker/config.js +22 -37
- package/dest/proving_broker/factory.js +1 -2
- package/dest/proving_broker/fixtures.js +0 -1
- package/dest/proving_broker/index.js +0 -1
- package/dest/proving_broker/proof_store/factory.js +9 -12
- package/dest/proving_broker/proof_store/gcs_proof_store.js +11 -7
- package/dest/proving_broker/proof_store/index.js +0 -1
- package/dest/proving_broker/proof_store/inline_proof_store.js +11 -7
- package/dest/proving_broker/proof_store/proof_store.js +3 -2
- package/dest/proving_broker/proving_agent.js +121 -110
- package/dest/proving_broker/proving_agent_instrumentation.js +3 -3
- package/dest/proving_broker/proving_broker.js +491 -451
- package/dest/proving_broker/proving_broker_database/memory.js +19 -13
- package/dest/proving_broker/proving_broker_database/persisted.js +41 -21
- package/dest/proving_broker/proving_broker_database.js +3 -2
- package/dest/proving_broker/proving_broker_instrumentation.js +28 -21
- package/dest/proving_broker/proving_job_controller.js +81 -62
- package/dest/proving_broker/rpc.js +23 -15
- package/dest/test/mock_prover.js +11 -9
- package/package.json +13 -11
- package/src/index.ts +1 -1
- package/src/orchestrator/block-building-helpers.ts +1 -1
- package/src/proving_broker/proving_agent.ts +30 -11
- package/src/proving_broker/proving_broker.ts +53 -27
- package/src/proving_broker/rpc.ts +8 -2
- package/dest/bin/get-proof-inputs.d.ts +0 -2
- package/dest/bin/get-proof-inputs.d.ts.map +0 -1
- package/dest/block_builder/index.d.ts +0 -6
- package/dest/block_builder/index.d.ts.map +0 -1
- package/dest/block_builder/light.d.ts +0 -31
- package/dest/block_builder/light.d.ts.map +0 -1
- package/dest/config.d.ts +0 -17
- package/dest/config.d.ts.map +0 -1
- package/dest/index.d.ts +0 -4
- package/dest/index.d.ts.map +0 -1
- package/dest/mocks/fixtures.d.ts +0 -19
- package/dest/mocks/fixtures.d.ts.map +0 -1
- package/dest/mocks/test_context.d.ts +0 -49
- package/dest/mocks/test_context.d.ts.map +0 -1
- package/dest/orchestrator/block-building-helpers.d.ts +0 -50
- package/dest/orchestrator/block-building-helpers.d.ts.map +0 -1
- package/dest/orchestrator/block-proving-state.d.ts +0 -71
- package/dest/orchestrator/block-proving-state.d.ts.map +0 -1
- package/dest/orchestrator/epoch-proving-state.d.ts +0 -56
- package/dest/orchestrator/epoch-proving-state.d.ts.map +0 -1
- package/dest/orchestrator/index.d.ts +0 -2
- package/dest/orchestrator/index.d.ts.map +0 -1
- package/dest/orchestrator/orchestrator.d.ts +0 -108
- package/dest/orchestrator/orchestrator.d.ts.map +0 -1
- package/dest/orchestrator/orchestrator_metrics.d.ts +0 -8
- package/dest/orchestrator/orchestrator_metrics.d.ts.map +0 -1
- package/dest/orchestrator/tx-proving-state.d.ts +0 -31
- package/dest/orchestrator/tx-proving-state.d.ts.map +0 -1
- package/dest/prover-agent/index.d.ts +0 -4
- package/dest/prover-agent/index.d.ts.map +0 -1
- package/dest/prover-agent/memory-proving-queue.d.ts +0 -82
- package/dest/prover-agent/memory-proving-queue.d.ts.map +0 -1
- package/dest/prover-agent/prover-agent.d.ts +0 -43
- package/dest/prover-agent/prover-agent.d.ts.map +0 -1
- package/dest/prover-agent/proving-error.d.ts +0 -5
- package/dest/prover-agent/proving-error.d.ts.map +0 -1
- package/dest/prover-agent/queue_metrics.d.ts +0 -10
- package/dest/prover-agent/queue_metrics.d.ts.map +0 -1
- package/dest/prover-agent/rpc.d.ts +0 -11
- package/dest/prover-agent/rpc.d.ts.map +0 -1
- package/dest/prover-client/factory.d.ts +0 -6
- package/dest/prover-client/factory.d.ts.map +0 -1
- package/dest/prover-client/index.d.ts +0 -3
- package/dest/prover-client/index.d.ts.map +0 -1
- package/dest/prover-client/prover-client.d.ts +0 -42
- package/dest/prover-client/prover-client.d.ts.map +0 -1
- package/dest/prover-client/server-epoch-prover.d.ts +0 -25
- package/dest/prover-client/server-epoch-prover.d.ts.map +0 -1
- package/dest/proving_broker/broker_prover_facade.d.ts +0 -39
- package/dest/proving_broker/broker_prover_facade.d.ts.map +0 -1
- package/dest/proving_broker/config.d.ts +0 -61
- package/dest/proving_broker/config.d.ts.map +0 -1
- package/dest/proving_broker/factory.d.ts +0 -5
- package/dest/proving_broker/factory.d.ts.map +0 -1
- package/dest/proving_broker/fixtures.d.ts +0 -5
- package/dest/proving_broker/fixtures.d.ts.map +0 -1
- package/dest/proving_broker/index.d.ts +0 -10
- package/dest/proving_broker/index.d.ts.map +0 -1
- package/dest/proving_broker/proof_store/factory.d.ts +0 -6
- package/dest/proving_broker/proof_store/factory.d.ts.map +0 -1
- package/dest/proving_broker/proof_store/gcs_proof_store.d.ts +0 -13
- package/dest/proving_broker/proof_store/gcs_proof_store.d.ts.map +0 -1
- package/dest/proving_broker/proof_store/index.d.ts +0 -4
- package/dest/proving_broker/proof_store/index.d.ts.map +0 -1
- package/dest/proving_broker/proof_store/inline_proof_store.d.ts +0 -14
- package/dest/proving_broker/proof_store/inline_proof_store.d.ts.map +0 -1
- package/dest/proving_broker/proof_store/proof_store.d.ts +0 -35
- package/dest/proving_broker/proof_store/proof_store.d.ts.map +0 -1
- package/dest/proving_broker/proving_agent.d.ts +0 -44
- package/dest/proving_broker/proving_agent.d.ts.map +0 -1
- package/dest/proving_broker/proving_agent_instrumentation.d.ts +0 -8
- package/dest/proving_broker/proving_agent_instrumentation.d.ts.map +0 -1
- package/dest/proving_broker/proving_broker.d.ts +0 -75
- package/dest/proving_broker/proving_broker.d.ts.map +0 -1
- package/dest/proving_broker/proving_broker_database/memory.d.ts +0 -16
- package/dest/proving_broker/proving_broker_database/memory.d.ts.map +0 -1
- package/dest/proving_broker/proving_broker_database/persisted.d.ts +0 -21
- package/dest/proving_broker/proving_broker_database/persisted.d.ts.map +0 -1
- package/dest/proving_broker/proving_broker_database.d.ts +0 -39
- package/dest/proving_broker/proving_broker_database.d.ts.map +0 -1
- package/dest/proving_broker/proving_broker_instrumentation.d.ts +0 -25
- package/dest/proving_broker/proving_broker_instrumentation.d.ts.map +0 -1
- package/dest/proving_broker/proving_job_controller.d.ts +0 -31
- package/dest/proving_broker/proving_job_controller.d.ts.map +0 -1
- package/dest/proving_broker/rpc.d.ts +0 -11
- package/dest/proving_broker/rpc.d.ts.map +0 -1
- package/dest/test/mock_prover.d.ts +0 -33
- package/dest/test/mock_prover.d.ts.map +0 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ProvingRequestType, makeProvingJobId
|
|
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
4
|
import { RunningPromise, promiseWithResolvers } from '@aztec/foundation/promise';
|
|
@@ -6,11 +6,21 @@ import { SerialQueue } from '@aztec/foundation/queue';
|
|
|
6
6
|
import { truncate } from '@aztec/foundation/string';
|
|
7
7
|
import { InlineProofStore } from './proof_store/index.js';
|
|
8
8
|
// Perform a snapshot sync every 30 seconds
|
|
9
|
-
const SNAPSHOT_SYNC_INTERVAL_MS =
|
|
9
|
+
const SNAPSHOT_SYNC_INTERVAL_MS = 30_000;
|
|
10
10
|
const MAX_CONCURRENT_JOB_SETTLED_REQUESTS = 10;
|
|
11
11
|
const SNAPSHOT_SYNC_CHECK_MAX_REQUEST_SIZE = 1000;
|
|
12
12
|
export class BrokerCircuitProverFacade {
|
|
13
|
-
|
|
13
|
+
broker;
|
|
14
|
+
proofStore;
|
|
15
|
+
failedProofStore;
|
|
16
|
+
pollIntervalMs;
|
|
17
|
+
log;
|
|
18
|
+
jobs;
|
|
19
|
+
runningPromise;
|
|
20
|
+
timeOfLastSnapshotSync;
|
|
21
|
+
queue;
|
|
22
|
+
jobsToRetrieve;
|
|
23
|
+
constructor(broker, proofStore = new InlineProofStore(), failedProofStore, pollIntervalMs = 1000, log = createLogger('prover-client:broker-circuit-prover-facade')){
|
|
14
24
|
this.broker = broker;
|
|
15
25
|
this.proofStore = proofStore;
|
|
16
26
|
this.failedProofStore = failedProofStore;
|
|
@@ -25,7 +35,7 @@ export class BrokerCircuitProverFacade {
|
|
|
25
35
|
if (!this.queue) {
|
|
26
36
|
throw new Error('BrokerCircuitProverFacade not started');
|
|
27
37
|
}
|
|
28
|
-
return this.queue.put(()
|
|
38
|
+
return this.queue.put(()=>this._enqueueJob(id, type, inputs, epochNumber, signal)).then(({ enqueuedPromise })=>enqueuedPromise);
|
|
29
39
|
}
|
|
30
40
|
async _enqueueJob(id, type, inputs, epochNumber = 0, signal) {
|
|
31
41
|
// Check if there is already a promise for this job
|
|
@@ -34,23 +44,25 @@ export class BrokerCircuitProverFacade {
|
|
|
34
44
|
this.log.verbose(`Job already found in facade id=${id} type=${ProvingRequestType[type]}`, {
|
|
35
45
|
provingJobId: id,
|
|
36
46
|
provingJobType: ProvingRequestType[type],
|
|
37
|
-
epochNumber
|
|
47
|
+
epochNumber
|
|
38
48
|
});
|
|
39
|
-
return {
|
|
49
|
+
return {
|
|
50
|
+
enqueuedPromise: existingPromise.promise.promise
|
|
51
|
+
};
|
|
40
52
|
}
|
|
41
53
|
const inputsUri = await this.proofStore.saveProofInput(id, type, inputs);
|
|
42
54
|
const jobStatus = await this.broker.enqueueProvingJob({
|
|
43
55
|
id,
|
|
44
56
|
type,
|
|
45
57
|
inputsUri,
|
|
46
|
-
epochNumber
|
|
58
|
+
epochNumber
|
|
47
59
|
});
|
|
48
60
|
// Create a promise for this job id, regardless of whether it was enqueued at the broker
|
|
49
61
|
// The running promise will monitor for the job to be completed and resolve it either way
|
|
50
62
|
const promise = promiseWithResolvers();
|
|
51
|
-
const abortFn = ()
|
|
63
|
+
const abortFn = ()=>{
|
|
52
64
|
signal?.removeEventListener('abort', abortFn);
|
|
53
|
-
void this.broker.cancelProvingJob(id).catch(err
|
|
65
|
+
void this.broker.cancelProvingJob(id).catch((err)=>this.log.warn(`Error cancelling job id=${id}`, err));
|
|
54
66
|
};
|
|
55
67
|
const job = {
|
|
56
68
|
id,
|
|
@@ -58,7 +70,7 @@ export class BrokerCircuitProverFacade {
|
|
|
58
70
|
inputsUri,
|
|
59
71
|
promise,
|
|
60
72
|
abortFn,
|
|
61
|
-
signal
|
|
73
|
+
signal
|
|
62
74
|
};
|
|
63
75
|
this.jobs.set(id, job);
|
|
64
76
|
// If we are here then the job was successfully accepted by the broker
|
|
@@ -72,10 +84,9 @@ export class BrokerCircuitProverFacade {
|
|
|
72
84
|
provingJobType: ProvingRequestType[type],
|
|
73
85
|
epochNumber,
|
|
74
86
|
inputsUri: truncate(inputsUri),
|
|
75
|
-
numOutstandingJobs: this.jobs.size
|
|
87
|
+
numOutstandingJobs: this.jobs.size
|
|
76
88
|
});
|
|
77
|
-
}
|
|
78
|
-
else if (jobStatus.status === 'fulfilled' || jobStatus.status === 'rejected') {
|
|
89
|
+
} else if (jobStatus.status === 'fulfilled' || jobStatus.status === 'rejected') {
|
|
79
90
|
// Job was already completed by the broker
|
|
80
91
|
// No need to notify the broker on aborted job
|
|
81
92
|
job.abortFn = undefined;
|
|
@@ -83,12 +94,11 @@ export class BrokerCircuitProverFacade {
|
|
|
83
94
|
provingJobId: id,
|
|
84
95
|
provingJobType: ProvingRequestType[type],
|
|
85
96
|
epochNumber,
|
|
86
|
-
inputsUri: truncate(inputsUri)
|
|
97
|
+
inputsUri: truncate(inputsUri)
|
|
87
98
|
});
|
|
88
99
|
// Job was not enqueued. It must be completed already, add to our set of already completed jobs
|
|
89
100
|
this.jobsToRetrieve.add(id);
|
|
90
|
-
}
|
|
91
|
-
else {
|
|
101
|
+
} else {
|
|
92
102
|
// Job was previously sent to the broker but is not completed
|
|
93
103
|
// notify the broker if job is aborted
|
|
94
104
|
signal?.addEventListener('abort', abortFn);
|
|
@@ -96,18 +106,20 @@ export class BrokerCircuitProverFacade {
|
|
|
96
106
|
provingJobId: id,
|
|
97
107
|
provingJobType: ProvingRequestType[type],
|
|
98
108
|
epochNumber,
|
|
99
|
-
inputsUri: truncate(inputsUri)
|
|
109
|
+
inputsUri: truncate(inputsUri)
|
|
100
110
|
});
|
|
101
111
|
}
|
|
102
112
|
const typedPromise = promise.promise;
|
|
103
|
-
return {
|
|
113
|
+
return {
|
|
114
|
+
enqueuedPromise: typedPromise
|
|
115
|
+
};
|
|
104
116
|
}
|
|
105
117
|
start() {
|
|
106
118
|
if (this.runningPromise) {
|
|
107
119
|
throw new Error('BrokerCircuitProverFacade already started');
|
|
108
120
|
}
|
|
109
121
|
this.log.verbose('Starting BrokerCircuitProverFacade');
|
|
110
|
-
this.runningPromise = new RunningPromise(()
|
|
122
|
+
this.runningPromise = new RunningPromise(()=>this.monitorForCompletedJobs(), this.log, this.pollIntervalMs);
|
|
111
123
|
this.runningPromise.start();
|
|
112
124
|
this.queue = new SerialQueue();
|
|
113
125
|
this.queue.start();
|
|
@@ -123,7 +135,7 @@ export class BrokerCircuitProverFacade {
|
|
|
123
135
|
await this.queue.end();
|
|
124
136
|
}
|
|
125
137
|
// Reject any outstanding promises as stopped
|
|
126
|
-
for (const [_, v] of this.jobs)
|
|
138
|
+
for (const [_, v] of this.jobs){
|
|
127
139
|
v.promise.reject(new Error('Broker facade stopped'));
|
|
128
140
|
}
|
|
129
141
|
this.jobs.clear();
|
|
@@ -136,24 +148,23 @@ export class BrokerCircuitProverFacade {
|
|
|
136
148
|
// and have the broker report on whether they are completed or not.
|
|
137
149
|
// We perform an incremental sync on every call of this function with a full snapshot sync periodically.
|
|
138
150
|
// This should keep us in sync without over-burdening the broker with snapshot sync requests
|
|
139
|
-
const getAllCompletedJobs = async (ids)
|
|
151
|
+
const getAllCompletedJobs = async (ids)=>{
|
|
140
152
|
// In this function we take whatever set of snapshot ids and we ask the broker for completed job notifications
|
|
141
153
|
// We collect all returned notifications and return them
|
|
142
154
|
const allCompleted = new Set();
|
|
143
155
|
try {
|
|
144
156
|
let numRequests = 0;
|
|
145
|
-
while
|
|
157
|
+
while(ids.length > 0){
|
|
146
158
|
const slice = ids.splice(0, SNAPSHOT_SYNC_CHECK_MAX_REQUEST_SIZE);
|
|
147
159
|
const completed = await this.broker.getCompletedJobs(slice);
|
|
148
|
-
completed.forEach(id
|
|
160
|
+
completed.forEach((id)=>allCompleted.add(id));
|
|
149
161
|
++numRequests;
|
|
150
162
|
}
|
|
151
163
|
if (numRequests === 0) {
|
|
152
164
|
const final = await this.broker.getCompletedJobs([]);
|
|
153
|
-
final.forEach(id
|
|
165
|
+
final.forEach((id)=>allCompleted.add(id));
|
|
154
166
|
}
|
|
155
|
-
}
|
|
156
|
-
catch (err) {
|
|
167
|
+
} catch (err) {
|
|
157
168
|
this.log.error(`Error thrown when requesting completed job notifications from the broker`, err);
|
|
158
169
|
}
|
|
159
170
|
return allCompleted;
|
|
@@ -165,8 +176,7 @@ export class BrokerCircuitProverFacade {
|
|
|
165
176
|
this.timeOfLastSnapshotSync = currentTime;
|
|
166
177
|
snapshotSyncIds.push(...this.jobs.keys());
|
|
167
178
|
this.log.trace(`Performing full snapshot sync of completed jobs with ${snapshotSyncIds.length} job(s)`);
|
|
168
|
-
}
|
|
169
|
-
else {
|
|
179
|
+
} else {
|
|
170
180
|
this.log.trace(`Performing incremental sync of completed jobs`);
|
|
171
181
|
}
|
|
172
182
|
// Now request the notifications from the broker
|
|
@@ -174,41 +184,48 @@ export class BrokerCircuitProverFacade {
|
|
|
174
184
|
const completedJobs = await getAllCompletedJobs(snapshotSyncIds);
|
|
175
185
|
// 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
|
|
176
186
|
// We filter this list to what we actually need, in case for any reason it is different and store in our cache
|
|
177
|
-
const allJobsReady = [
|
|
178
|
-
|
|
187
|
+
const allJobsReady = [
|
|
188
|
+
...completedJobs,
|
|
189
|
+
...this.jobsToRetrieve
|
|
190
|
+
];
|
|
191
|
+
this.jobsToRetrieve = new Set(allJobsReady.filter((id)=>this.jobs.has(id)));
|
|
179
192
|
if (completedJobs.size > 0) {
|
|
180
193
|
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}`);
|
|
181
|
-
}
|
|
182
|
-
else {
|
|
194
|
+
} else {
|
|
183
195
|
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}`);
|
|
184
196
|
}
|
|
185
197
|
}
|
|
186
198
|
async retrieveJobsThatShouldBeReady() {
|
|
187
|
-
const convertJobResult = async (result, jobType)
|
|
199
|
+
const convertJobResult = async (result, jobType)=>{
|
|
188
200
|
if (result.status === 'fulfilled') {
|
|
189
201
|
const output = await this.proofStore.getProofOutput(result.value);
|
|
190
202
|
if (output.type === jobType) {
|
|
191
|
-
return {
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
203
|
+
return {
|
|
204
|
+
result: output.result,
|
|
205
|
+
success: true
|
|
206
|
+
};
|
|
207
|
+
} else {
|
|
208
|
+
return {
|
|
209
|
+
success: false,
|
|
210
|
+
reason: `Unexpected proof type: ${output.type}. Expected: ${jobType}`
|
|
211
|
+
};
|
|
195
212
|
}
|
|
196
|
-
}
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
213
|
+
} else if (result.status === 'rejected') {
|
|
214
|
+
return {
|
|
215
|
+
success: false,
|
|
216
|
+
reason: result.reason
|
|
217
|
+
};
|
|
218
|
+
} else {
|
|
201
219
|
throw new Error(`Unexpected proving job status ${result.status}`);
|
|
202
220
|
}
|
|
203
221
|
};
|
|
204
|
-
const processJob = async (job)
|
|
222
|
+
const processJob = async (job)=>{
|
|
205
223
|
// First retrieve the settled job from the broker
|
|
206
224
|
this.log.debug(`Received notification of completed job id=${job.id} type=${ProvingRequestType[job.type]}`);
|
|
207
225
|
let settledResult;
|
|
208
226
|
try {
|
|
209
227
|
settledResult = await this.broker.getProvingJobStatus(job.id);
|
|
210
|
-
}
|
|
211
|
-
catch (err) {
|
|
228
|
+
} catch (err) {
|
|
212
229
|
// If an error occurs retrieving the job result then just log it and move on.
|
|
213
230
|
// We will try again on the next iteration
|
|
214
231
|
this.log.error(`Error retrieving job result from broker job id=${job.id} type=${ProvingRequestType[job.type]}`, err);
|
|
@@ -218,8 +235,7 @@ export class BrokerCircuitProverFacade {
|
|
|
218
235
|
let result;
|
|
219
236
|
try {
|
|
220
237
|
result = await convertJobResult(settledResult, job.type);
|
|
221
|
-
}
|
|
222
|
-
catch (err) {
|
|
238
|
+
} catch (err) {
|
|
223
239
|
// If an error occurs retrieving the job result then just log it and move on.
|
|
224
240
|
// We will try again on the next iteration
|
|
225
241
|
this.log.error(`Error processing job result job id=${job.id} type=${ProvingRequestType[job.type]}`, err);
|
|
@@ -228,8 +244,7 @@ export class BrokerCircuitProverFacade {
|
|
|
228
244
|
if (result.success) {
|
|
229
245
|
this.log.verbose(`Resolved proving job id=${job.id} type=${ProvingRequestType[job.type]}`);
|
|
230
246
|
job.promise.resolve(result.result);
|
|
231
|
-
}
|
|
232
|
-
else {
|
|
247
|
+
} else {
|
|
233
248
|
this.log.error(`Resolving proving job with error id=${job.id} type=${ProvingRequestType[job.type]}`, result.reason);
|
|
234
249
|
if (result.reason !== 'Aborted') {
|
|
235
250
|
void this.backupFailedProofInputs(job);
|
|
@@ -244,15 +259,13 @@ export class BrokerCircuitProverFacade {
|
|
|
244
259
|
this.jobsToRetrieve.delete(job.id);
|
|
245
260
|
return true;
|
|
246
261
|
};
|
|
247
|
-
const toBeRetrieved = Array.from(this.jobsToRetrieve.values())
|
|
248
|
-
.map(id => this.jobs.get(id))
|
|
249
|
-
.filter(x => x !== undefined);
|
|
262
|
+
const toBeRetrieved = Array.from(this.jobsToRetrieve.values()).map((id)=>this.jobs.get(id)).filter((x)=>x !== undefined);
|
|
250
263
|
const totalJobsToRetrieve = toBeRetrieved.length;
|
|
251
264
|
let totalJobsRetrieved = 0;
|
|
252
|
-
while
|
|
265
|
+
while(toBeRetrieved.length > 0){
|
|
253
266
|
const slice = toBeRetrieved.splice(0, MAX_CONCURRENT_JOB_SETTLED_REQUESTS);
|
|
254
|
-
const results = await Promise.all(slice.map(job
|
|
255
|
-
totalJobsRetrieved += results.filter(x
|
|
267
|
+
const results = await Promise.all(slice.map((job)=>processJob(job)));
|
|
268
|
+
totalJobsRetrieved += results.filter((x)=>x).length;
|
|
256
269
|
}
|
|
257
270
|
if (totalJobsToRetrieve > 0) {
|
|
258
271
|
this.log.verbose(`Successfully retrieved ${totalJobsRetrieved} of ${totalJobsToRetrieve} jobs that should be ready, total ready jobs is now: ${this.jobsToRetrieve.size}`);
|
|
@@ -268,10 +281,9 @@ export class BrokerCircuitProverFacade {
|
|
|
268
281
|
this.log.info(`Stored proof inputs for failed job id=${job.id} type=${ProvingRequestType[job.type]} at ${uri}`, {
|
|
269
282
|
id: job.id,
|
|
270
283
|
type: job.type,
|
|
271
|
-
uri
|
|
284
|
+
uri
|
|
272
285
|
});
|
|
273
|
-
}
|
|
274
|
-
catch (err) {
|
|
286
|
+
} catch (err) {
|
|
275
287
|
this.log.error(`Error backing up proof inputs for failed job id=${job.id} type=${ProvingRequestType[job.type]}`, err);
|
|
276
288
|
}
|
|
277
289
|
}
|
|
@@ -326,4 +338,3 @@ export class BrokerCircuitProverFacade {
|
|
|
326
338
|
return makeProvingJobId(epochNumber, type, inputsHash.toString('hex'));
|
|
327
339
|
}
|
|
328
340
|
}
|
|
329
|
-
//# 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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"}
|
|
@@ -3,81 +3,66 @@ import { booleanConfigHelper, numberConfigHelper } from '@aztec/foundation/confi
|
|
|
3
3
|
import { dataConfigMappings } from '@aztec/kv-store/config';
|
|
4
4
|
import { z } from 'zod';
|
|
5
5
|
export const ProverBrokerConfig = z.object({
|
|
6
|
-
/** If starting a prover broker locally, the max number of retries per proving job */
|
|
7
|
-
|
|
8
|
-
/** If starting a prover broker locally, the
|
|
9
|
-
|
|
10
|
-
/**
|
|
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(),
|
|
6
|
+
/** If starting a prover broker locally, the max number of retries per proving job */ proverBrokerJobMaxRetries: z.number(),
|
|
7
|
+
/** If starting a prover broker locally, the time after which a job times out and gets assigned to a different agent */ proverBrokerJobTimeoutMs: z.number(),
|
|
8
|
+
/** If starting a prover broker locally, the interval the broker checks for timed out jobs */ proverBrokerPollIntervalMs: z.number(),
|
|
9
|
+
/** If starting a prover broker locally, the directory to store broker data */ dataDirectory: z.string().optional(),
|
|
10
|
+
/** The size of the data store map */ dataStoreMapSizeKB: z.number()
|
|
16
11
|
});
|
|
17
12
|
export const proverBrokerConfigMappings = {
|
|
18
13
|
proverBrokerJobTimeoutMs: {
|
|
19
14
|
env: 'PROVER_BROKER_JOB_TIMEOUT_MS',
|
|
20
15
|
description: 'Jobs are retried if not kept alive for this long',
|
|
21
|
-
...numberConfigHelper(
|
|
16
|
+
...numberConfigHelper(30_000)
|
|
22
17
|
},
|
|
23
18
|
proverBrokerPollIntervalMs: {
|
|
24
19
|
env: 'PROVER_BROKER_POLL_INTERVAL_MS',
|
|
25
20
|
description: 'The interval to check job health status',
|
|
26
|
-
...numberConfigHelper(
|
|
21
|
+
...numberConfigHelper(1_000)
|
|
27
22
|
},
|
|
28
23
|
proverBrokerJobMaxRetries: {
|
|
29
24
|
env: 'PROVER_BROKER_JOB_MAX_RETRIES',
|
|
30
25
|
description: 'If starting a prover broker locally, the max number of retries per proving job',
|
|
31
|
-
...numberConfigHelper(3)
|
|
26
|
+
...numberConfigHelper(3)
|
|
32
27
|
},
|
|
33
|
-
...dataConfigMappings
|
|
28
|
+
...dataConfigMappings
|
|
34
29
|
};
|
|
35
30
|
export const ProverAgentConfig = z.object({
|
|
36
|
-
/** The number of prover agents to start */
|
|
37
|
-
|
|
38
|
-
/**
|
|
39
|
-
|
|
40
|
-
/**
|
|
41
|
-
|
|
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(),
|
|
31
|
+
/** The number of prover agents to start */ proverAgentCount: z.number(),
|
|
32
|
+
/** The types of proofs the prover agent can generate */ proverAgentProofTypes: z.array(z.nativeEnum(ProvingRequestType)),
|
|
33
|
+
/** How often the prover agents poll for jobs */ proverAgentPollIntervalMs: z.number(),
|
|
34
|
+
/** The URL where this agent takes jobs from */ proverBrokerUrl: z.string().optional(),
|
|
35
|
+
/** Whether to construct real proofs */ realProofs: z.boolean(),
|
|
36
|
+
/** Artificial delay to introduce to all operations to the test prover. */ proverTestDelayMs: z.number()
|
|
48
37
|
});
|
|
49
38
|
export const proverAgentConfigMappings = {
|
|
50
39
|
proverAgentCount: {
|
|
51
40
|
env: 'PROVER_AGENT_COUNT',
|
|
52
41
|
description: 'Whether this prover has a local prover agent',
|
|
53
|
-
...numberConfigHelper(1)
|
|
42
|
+
...numberConfigHelper(1)
|
|
54
43
|
},
|
|
55
44
|
proverAgentPollIntervalMs: {
|
|
56
45
|
env: 'PROVER_AGENT_POLL_INTERVAL_MS',
|
|
57
46
|
description: 'The interval agents poll for jobs at',
|
|
58
|
-
...numberConfigHelper(100)
|
|
47
|
+
...numberConfigHelper(100)
|
|
59
48
|
},
|
|
60
49
|
proverAgentProofTypes: {
|
|
61
50
|
env: 'PROVER_AGENT_PROOF_TYPES',
|
|
62
51
|
description: 'The types of proofs the prover agent can generate',
|
|
63
|
-
parseEnv: (val)
|
|
64
|
-
.split(',')
|
|
65
|
-
.map(v => ProvingRequestType[v])
|
|
66
|
-
.filter(v => typeof v === 'number'),
|
|
52
|
+
parseEnv: (val)=>val.split(',').map((v)=>ProvingRequestType[v]).filter((v)=>typeof v === 'number')
|
|
67
53
|
},
|
|
68
54
|
proverBrokerUrl: {
|
|
69
55
|
env: 'PROVER_BROKER_HOST',
|
|
70
|
-
description: 'The URL where this agent takes jobs from'
|
|
56
|
+
description: 'The URL where this agent takes jobs from'
|
|
71
57
|
},
|
|
72
58
|
realProofs: {
|
|
73
59
|
env: 'PROVER_REAL_PROOFS',
|
|
74
60
|
description: 'Whether to construct real proofs',
|
|
75
|
-
...booleanConfigHelper(false)
|
|
61
|
+
...booleanConfigHelper(false)
|
|
76
62
|
},
|
|
77
63
|
proverTestDelayMs: {
|
|
78
64
|
env: 'PROVER_TEST_DELAY_MS',
|
|
79
65
|
description: 'Artificial delay to introduce to all operations to the test prover.',
|
|
80
|
-
...numberConfigHelper(0)
|
|
81
|
-
}
|
|
66
|
+
...numberConfigHelper(0)
|
|
67
|
+
}
|
|
82
68
|
};
|
|
83
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Byb3ZpbmdfYnJva2VyL2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUMxRCxPQUFPLEVBQTJCLG1CQUFtQixFQUFFLGtCQUFrQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDNUcsT0FBTyxFQUF3QixrQkFBa0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRWxGLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsTUFBTSxDQUFDLE1BQU0sa0JBQWtCLEdBQUcsQ0FBQyxDQUFDLE1BQU0sQ0FBQztJQUN6QyxxRkFBcUY7SUFDckYseUJBQXlCLEVBQUUsQ0FBQyxDQUFDLE1BQU0sRUFBRTtJQUNyQyx1SEFBdUg7SUFDdkgsd0JBQXdCLEVBQUUsQ0FBQyxDQUFDLE1BQU0sRUFBRTtJQUNwQyw2RkFBNkY7SUFDN0YsMEJBQTBCLEVBQUUsQ0FBQyxDQUFDLE1BQU0sRUFBRTtJQUN0Qyw4RUFBOEU7SUFDOUUsYUFBYSxFQUFFLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDcEMscUNBQXFDO0lBQ3JDLGtCQUFrQixFQUFFLENBQUMsQ0FBQyxNQUFNLEVBQUU7Q0FDL0IsQ0FBQyxDQUFDO0FBS0gsTUFBTSxDQUFDLE1BQU0sMEJBQTBCLEdBQTJDO0lBQ2hGLHdCQUF3QixFQUFFO1FBQ3hCLEdBQUcsRUFBRSw4QkFBOEI7UUFDbkMsV0FBVyxFQUFFLGtEQUFrRDtRQUMvRCxHQUFHLGtCQUFrQixDQUFDLEtBQU0sQ0FBQztLQUM5QjtJQUNELDBCQUEwQixFQUFFO1FBQzFCLEdBQUcsRUFBRSxnQ0FBZ0M7UUFDckMsV0FBVyxFQUFFLHlDQUF5QztRQUN0RCxHQUFHLGtCQUFrQixDQUFDLElBQUssQ0FBQztLQUM3QjtJQUNELHlCQUF5QixFQUFFO1FBQ3pCLEdBQUcsRUFBRSwrQkFBK0I7UUFDcEMsV0FBVyxFQUFFLGdGQUFnRjtRQUM3RixHQUFHLGtCQUFrQixDQUFDLENBQUMsQ0FBQztLQUN6QjtJQUNELEdBQUcsa0JBQWtCO0NBQ3RCLENBQUM7QUFFRixNQUFNLENBQUMsTUFBTSxpQkFBaUIsR0FBRyxDQUFDLENBQUMsTUFBTSxDQUFDO0lBQ3hDLDJDQUEyQztJQUMzQyxnQkFBZ0IsRUFBRSxDQUFDLENBQUMsTUFBTSxFQUFFO0lBQzVCLHdEQUF3RDtJQUN4RCxxQkFBcUIsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsa0JBQWtCLENBQUMsQ0FBQztJQUNoRSxnREFBZ0Q7SUFDaEQseUJBQXlCLEVBQUUsQ0FBQyxDQUFDLE1BQU0sRUFBRTtJQUNyQywrQ0FBK0M7SUFDL0MsZUFBZSxFQUFFLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDdEMsdUNBQXVDO0lBQ3ZDLFVBQVUsRUFBRSxDQUFDLENBQUMsT0FBTyxFQUFFO0lBQ3ZCLDBFQUEwRTtJQUMxRSxpQkFBaUIsRUFBRSxDQUFDLENBQUMsTUFBTSxFQUFFO0NBQzlCLENBQUMsQ0FBQztBQUlILE1BQU0sQ0FBQyxNQUFNLHlCQUF5QixHQUEwQztJQUM5RSxnQkFBZ0IsRUFBRTtRQUNoQixHQUFHLEVBQUUsb0JBQW9CO1FBQ3pCLFdBQVcsRUFBRSw4Q0FBOEM7UUFDM0QsR0FBRyxrQkFBa0IsQ0FBQyxDQUFDLENBQUM7S0FDekI7SUFDRCx5QkFBeUIsRUFBRTtRQUN6QixHQUFHLEVBQUUsK0JBQStCO1FBQ3BDLFdBQVcsRUFBRSxzQ0FBc0M7UUFDbkQsR0FBRyxrQkFBa0IsQ0FBQyxHQUFHLENBQUM7S0FDM0I7SUFDRCxxQkFBcUIsRUFBRTtRQUNyQixHQUFHLEVBQUUsMEJBQTBCO1FBQy9CLFdBQVcsRUFBRSxtREFBbUQ7UUFDaEUsUUFBUSxFQUFFLENBQUMsR0FBVyxFQUFFLEVBQUUsQ0FDeEIsR0FBRzthQUNBLEtBQUssQ0FBQyxHQUFHLENBQUM7YUFDVixHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFRLENBQUMsQ0FBQzthQUN0QyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxPQUFPLENBQUMsS0FBSyxRQUFRLENBQUM7S0FDeEM7SUFDRCxlQUFlLEVBQUU7UUFDZixHQUFHLEVBQUUsb0JBQW9CO1FBQ3pCLFdBQVcsRUFBRSwwQ0FBMEM7S0FDeEQ7SUFDRCxVQUFVLEVBQUU7UUFDVixHQUFHLEVBQUUsb0JBQW9CO1FBQ3pCLFdBQVcsRUFBRSxrQ0FBa0M7UUFDL0MsR0FBRyxtQkFBbUIsQ0FBQyxLQUFLLENBQUM7S0FDOUI7SUFDRCxpQkFBaUIsRUFBRTtRQUNqQixHQUFHLEVBQUUsc0JBQXNCO1FBQzNCLFdBQVcsRUFBRSxxRUFBcUU7UUFDbEYsR0FBRyxrQkFBa0IsQ0FBQyxDQUFDLENBQUM7S0FDekI7Q0FDRixDQUFDIn0=
|
|
@@ -6,9 +6,8 @@ export async function createAndStartProvingBroker(config, client) {
|
|
|
6
6
|
const broker = new ProvingBroker(database, {
|
|
7
7
|
jobTimeoutMs: config.proverBrokerJobTimeoutMs,
|
|
8
8
|
maxRetries: config.proverBrokerJobMaxRetries,
|
|
9
|
-
timeoutIntervalMs: config.proverBrokerPollIntervalMs
|
|
9
|
+
timeoutIntervalMs: config.proverBrokerPollIntervalMs
|
|
10
10
|
}, client);
|
|
11
11
|
await broker.start();
|
|
12
12
|
return broker;
|
|
13
13
|
}
|
|
14
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wcm92aW5nX2Jyb2tlci9mYWN0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNwRCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUM3RSxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx3Q0FBd0MsQ0FBQztBQUUxRSxNQUFNLENBQUMsS0FBSyxVQUFVLDJCQUEyQixDQUMvQyxNQUEwQixFQUMxQixNQUF1QjtJQUV2QixNQUFNLFFBQVEsR0FBRyxNQUFNLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQyxNQUFNLGdCQUFnQixDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksc0JBQXNCLEVBQUUsQ0FBQztJQUVsSCxNQUFNLE1BQU0sR0FBRyxJQUFJLGFBQWEsQ0FDOUIsUUFBUSxFQUNSO1FBQ0UsWUFBWSxFQUFFLE1BQU0sQ0FBQyx3QkFBd0I7UUFDN0MsVUFBVSxFQUFFLE1BQU0sQ0FBQyx5QkFBeUI7UUFDNUMsaUJBQWlCLEVBQUUsTUFBTSxDQUFDLDBCQUEwQjtLQUNyRCxFQUNELE1BQU0sQ0FDUCxDQUFDO0lBRUYsTUFBTSxNQUFNLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDckIsT0FBTyxNQUFNLENBQUM7QUFDaEIsQ0FBQyJ9
|
|
@@ -9,4 +9,3 @@ export function makeInputsUri() {
|
|
|
9
9
|
export function makeOutputsUri() {
|
|
10
10
|
return randomBytes(8).toString('hex');
|
|
11
11
|
}
|
|
12
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZml4dHVyZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHJvdmluZ19icm9rZXIvZml4dHVyZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFvQyxrQkFBa0IsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQzlHLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUV2RCxNQUFNLFVBQVUsc0JBQXNCLENBQUMsV0FBb0I7SUFDekQsT0FBTyxnQkFBZ0IsQ0FBQyxXQUFXLElBQUksQ0FBQyxFQUFFLGtCQUFrQixDQUFDLFdBQVcsRUFBRSxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7QUFDNUcsQ0FBQztBQUVELE1BQU0sVUFBVSxhQUFhO0lBQzNCLE9BQU8sV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQWEsQ0FBQztBQUNwRCxDQUFDO0FBRUQsTUFBTSxVQUFVLGNBQWM7SUFDNUIsT0FBTyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBYSxDQUFDO0FBQ3BELENBQUMifQ==
|
|
@@ -7,4 +7,3 @@ export * from './proving_broker_database/persisted.js';
|
|
|
7
7
|
export * from './proof_store/index.js';
|
|
8
8
|
export * from './factory.js';
|
|
9
9
|
export * from './config.js';
|
|
10
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHJvdmluZ19icm9rZXIvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxvQkFBb0IsQ0FBQztBQUNuQyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsVUFBVSxDQUFDO0FBQ3pCLGNBQWMsOEJBQThCLENBQUM7QUFDN0MsY0FBYyxxQ0FBcUMsQ0FBQztBQUNwRCxjQUFjLHdDQUF3QyxDQUFDO0FBQ3ZELGNBQWMsd0JBQXdCLENBQUM7QUFDdkMsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxhQUFhLENBQUMifQ==
|
|
@@ -5,35 +5,32 @@ export function createProofStore(config, logger = createLogger('prover-client:pr
|
|
|
5
5
|
if (config === undefined) {
|
|
6
6
|
logger.info('Creating inline proof store');
|
|
7
7
|
return new InlineProofStore();
|
|
8
|
-
}
|
|
9
|
-
else if (config.startsWith('gs://')) {
|
|
8
|
+
} else if (config.startsWith('gs://')) {
|
|
10
9
|
try {
|
|
11
10
|
const url = new URL(config);
|
|
12
11
|
const bucket = url.host;
|
|
13
12
|
const path = url.pathname.replace(/^\/+/, '');
|
|
14
|
-
logger.info(`Creating google cloud proof store at ${bucket}`, {
|
|
13
|
+
logger.info(`Creating google cloud proof store at ${bucket}`, {
|
|
14
|
+
bucket,
|
|
15
|
+
path
|
|
16
|
+
});
|
|
15
17
|
return new GoogleCloudStorageProofStore(bucket, path);
|
|
16
|
-
}
|
|
17
|
-
catch (err) {
|
|
18
|
+
} catch (err) {
|
|
18
19
|
throw new Error(`Invalid google cloud proof store definition: '${config}'. Supported values are 'gs://bucket-name/path/to/store'.`);
|
|
19
20
|
}
|
|
20
|
-
}
|
|
21
|
-
else {
|
|
21
|
+
} else {
|
|
22
22
|
throw new Error(`Unknown proof store config: '${config}'. Supported values are 'gs://bucket-name/path/to/store'.`);
|
|
23
23
|
}
|
|
24
24
|
}
|
|
25
25
|
export function createProofStoreForUri(uri, logger = createLogger('prover-client:proof-store')) {
|
|
26
26
|
if (uri.startsWith('data://')) {
|
|
27
27
|
return createProofStore(undefined, logger);
|
|
28
|
-
}
|
|
29
|
-
else if (uri.startsWith('gs://')) {
|
|
28
|
+
} else if (uri.startsWith('gs://')) {
|
|
30
29
|
const url = new URL(uri);
|
|
31
30
|
const basePath = url.pathname.replace(/^\/+/, '').split('/').slice(0, -3);
|
|
32
31
|
url.pathname = basePath.join('/');
|
|
33
32
|
return createProofStore(uri, logger);
|
|
34
|
-
}
|
|
35
|
-
else {
|
|
33
|
+
} else {
|
|
36
34
|
throw new Error(`Unknown proof store config: '${uri}'. Supported protocols are 'data://' and 'gs://'.`);
|
|
37
35
|
}
|
|
38
36
|
}
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wcm92aW5nX2Jyb2tlci9wcm9vZl9zdG9yZS9mYWN0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVyRCxPQUFPLEVBQUUsNEJBQTRCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNwRSxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUczRCxNQUFNLFVBQVUsZ0JBQWdCLENBQUMsTUFBMEIsRUFBRSxNQUFNLEdBQUcsWUFBWSxDQUFDLDJCQUEyQixDQUFDO0lBQzdHLElBQUksTUFBTSxLQUFLLFNBQVMsRUFBRSxDQUFDO1FBQ3pCLE1BQU0sQ0FBQyxJQUFJLENBQUMsNkJBQTZCLENBQUMsQ0FBQztRQUMzQyxPQUFPLElBQUksZ0JBQWdCLEVBQUUsQ0FBQztJQUNoQyxDQUFDO1NBQU0sSUFBSSxNQUFNLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUM7UUFDdEMsSUFBSSxDQUFDO1lBQ0gsTUFBTSxHQUFHLEdBQUcsSUFBSSxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUM7WUFDNUIsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDLElBQUksQ0FBQztZQUN4QixNQUFNLElBQUksR0FBRyxHQUFHLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLENBQUM7WUFDOUMsTUFBTSxDQUFDLElBQUksQ0FBQyx3Q0FBd0MsTUFBTSxFQUFFLEVBQUUsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztZQUNoRixPQUFPLElBQUksNEJBQTRCLENBQUMsTUFBTSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQ3hELENBQUM7UUFBQyxPQUFPLEdBQUcsRUFBRSxDQUFDO1lBQ2IsTUFBTSxJQUFJLEtBQUssQ0FDYixpREFBaUQsTUFBTSwyREFBMkQsQ0FDbkgsQ0FBQztRQUNKLENBQUM7SUFDSCxDQUFDO1NBQU0sQ0FBQztRQUNOLE1BQU0sSUFBSSxLQUFLLENBQUMsZ0NBQWdDLE1BQU0sMkRBQTJELENBQUMsQ0FBQztJQUNySCxDQUFDO0FBQ0gsQ0FBQztBQUVELE1BQU0sVUFBVSxzQkFBc0IsQ0FDcEMsR0FBVyxFQUNYLE1BQU0sR0FBRyxZQUFZLENBQUMsMkJBQTJCLENBQUM7SUFFbEQsSUFBSSxHQUFHLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUM7UUFDOUIsT0FBTyxnQkFBZ0IsQ0FBQyxTQUFTLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDN0MsQ0FBQztTQUFNLElBQUksR0FBRyxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDO1FBQ25DLE1BQU0sR0FBRyxHQUFHLElBQUksR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ3pCLE1BQU0sUUFBUSxHQUFHLEdBQUcsQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzFFLEdBQUcsQ0FBQyxRQUFRLEdBQUcsUUFBUSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNsQyxPQUFPLGdCQUFnQixDQUFDLEdBQUcsRUFBRSxNQUFNLENBQUMsQ0FBQztJQUN2QyxDQUFDO1NBQU0sQ0FBQztRQUNOLE1BQU0sSUFBSSxLQUFLLENBQUMsZ0NBQWdDLEdBQUcsbURBQW1ELENBQUMsQ0FBQztJQUMxRyxDQUFDO0FBQ0gsQ0FBQyJ9
|
|
@@ -1,9 +1,12 @@
|
|
|
1
|
-
import { ProvingRequestType, getProvingJobInputClassFor
|
|
1
|
+
import { ProvingRequestType, getProvingJobInputClassFor } from '@aztec/circuit-types';
|
|
2
2
|
import { Storage } from '@google-cloud/storage';
|
|
3
3
|
import { join } from 'path';
|
|
4
4
|
const INPUTS_PATH = 'inputs';
|
|
5
5
|
export class GoogleCloudStorageProofStore {
|
|
6
|
-
|
|
6
|
+
bucketName;
|
|
7
|
+
path;
|
|
8
|
+
storage;
|
|
9
|
+
constructor(bucketName, path){
|
|
7
10
|
this.bucketName = bucketName;
|
|
8
11
|
this.path = path;
|
|
9
12
|
this.storage = new Storage();
|
|
@@ -23,7 +26,7 @@ export class GoogleCloudStorageProofStore {
|
|
|
23
26
|
const bucket = this.storage.bucket(url.host);
|
|
24
27
|
const path = url.pathname.replace(/^\/+/, '');
|
|
25
28
|
const file = bucket.file(path);
|
|
26
|
-
if (!
|
|
29
|
+
if (!await file.exists()) {
|
|
27
30
|
throw new Error(`File at ${uri} does not exist`);
|
|
28
31
|
}
|
|
29
32
|
const typeString = path.split('/').at(-2);
|
|
@@ -33,9 +36,11 @@ export class GoogleCloudStorageProofStore {
|
|
|
33
36
|
}
|
|
34
37
|
const contents = await file.download();
|
|
35
38
|
const inputs = getProvingJobInputClassFor(type).fromBuffer(contents[0]);
|
|
36
|
-
return {
|
|
37
|
-
|
|
38
|
-
|
|
39
|
+
return {
|
|
40
|
+
inputs,
|
|
41
|
+
type
|
|
42
|
+
};
|
|
43
|
+
} catch (err) {
|
|
39
44
|
throw new Error(`Error getting proof input at ${uri}: ${err}`);
|
|
40
45
|
}
|
|
41
46
|
}
|
|
@@ -43,4 +48,3 @@ export class GoogleCloudStorageProofStore {
|
|
|
43
48
|
throw new Error('Not implemented');
|
|
44
49
|
}
|
|
45
50
|
}
|
|
46
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2NzX3Byb29mX3N0b3JlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3Byb3ZpbmdfYnJva2VyL3Byb29mX3N0b3JlL2djc19wcm9vZl9zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBT0wsa0JBQWtCLEVBQ2xCLDBCQUEwQixHQUMzQixNQUFNLHNCQUFzQixDQUFDO0FBRTlCLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNoRCxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBSTVCLE1BQU0sV0FBVyxHQUFHLFFBQVEsQ0FBQztBQUU3QixNQUFNLE9BQU8sNEJBQTRCO0lBR3ZDLFlBQTZCLFVBQWtCLEVBQW1CLElBQVk7UUFBakQsZUFBVSxHQUFWLFVBQVUsQ0FBUTtRQUFtQixTQUFJLEdBQUosSUFBSSxDQUFRO1FBQzVFLElBQUksQ0FBQyxPQUFPLEdBQUcsSUFBSSxPQUFPLEVBQUUsQ0FBQztJQUMvQixDQUFDO0lBRU0sS0FBSyxDQUFDLGNBQWMsQ0FDekIsRUFBZ0IsRUFDaEIsSUFBTyxFQUNQLE1BQThCO1FBRTlCLE1BQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLFdBQVcsRUFBRSxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztRQUN4RSxNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzdELE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztRQUNuQyxPQUFPLElBQUksQ0FBQyxlQUFlLENBQUMsUUFBUSxFQUFjLENBQUM7SUFDckQsQ0FBQztJQUVELGVBQWUsQ0FDYixHQUFpQixFQUNqQixLQUFRLEVBQ1IsT0FBZ0M7UUFFaEMsTUFBTSxJQUFJLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO0lBQ3JDLENBQUM7SUFFTSxLQUFLLENBQUMsYUFBYSxDQUFDLEdBQWE7UUFDdEMsSUFBSSxDQUFDO1lBQ0gsTUFBTSxHQUFHLEdBQUcsSUFBSSxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDekIsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQzdDLE1BQU0sSUFBSSxHQUFHLEdBQUcsQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUMsQ0FBQztZQUM5QyxNQUFNLElBQUksR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQy9CLElBQUksQ0FBQyxDQUFDLE1BQU0sSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDLEVBQUUsQ0FBQztnQkFDM0IsTUFBTSxJQUFJLEtBQUssQ0FBQyxXQUFXLEdBQUcsaUJBQWlCLENBQUMsQ0FBQztZQUNuRCxDQUFDO1lBRUQsTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUMxQyxNQUFNLElBQUksR0FBRyxVQUFVLENBQUMsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLFVBQTZDLENBQUMsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDO1lBQ3hHLElBQUksSUFBSSxLQUFLLFNBQVMsRUFBRSxDQUFDO2dCQUN2QixNQUFNLElBQUksS0FBSyxDQUFDLDJCQUEyQixJQUFJLFlBQVksSUFBSSxFQUFFLENBQUMsQ0FBQztZQUNyRSxDQUFDO1lBRUQsTUFBTSxRQUFRLEdBQUcsTUFBTSxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUM7WUFDdkMsTUFBTSxNQUFNLEdBQUcsMEJBQTBCLENBQUMsSUFBSSxDQUFDLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ3hFLE9BQU8sRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFzQixDQUFDO1FBQzlDLENBQUM7UUFBQyxPQUFPLEdBQUcsRUFBRSxDQUFDO1lBQ2IsTUFBTSxJQUFJLEtBQUssQ0FBQyxnQ0FBZ0MsR0FBRyxLQUFLLEdBQUcsRUFBRSxDQUFDLENBQUM7UUFDakUsQ0FBQztJQUNILENBQUM7SUFFRCxjQUFjLENBQUMsSUFBYztRQUMzQixNQUFNLElBQUksS0FBSyxDQUFDLGlCQUFpQixDQUFDLENBQUM7SUFDckMsQ0FBQztDQUNGIn0=
|
|
@@ -1,4 +1,3 @@
|
|
|
1
1
|
export * from './proof_store.js';
|
|
2
2
|
export * from './inline_proof_store.js';
|
|
3
3
|
export * from './factory.js';
|
|
4
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHJvdmluZ19icm9rZXIvcHJvb2Zfc3RvcmUvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxrQkFBa0IsQ0FBQztBQUNqQyxjQUFjLHlCQUF5QixDQUFDO0FBQ3hDLGNBQWMsY0FBYyxDQUFDIn0=
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ProvingJobInputs, ProvingJobResult
|
|
1
|
+
import { ProvingJobInputs, ProvingJobResult } from '@aztec/circuit-types';
|
|
2
2
|
import { jsonParseWithSchema, jsonStringify } from '@aztec/foundation/json-rpc';
|
|
3
3
|
// use an ASCII encoded data uri https://datatracker.ietf.org/doc/html/rfc2397#section-2
|
|
4
4
|
// we do this to avoid double encoding to base64 (since the inputs already serialize to a base64 string)
|
|
@@ -6,14 +6,19 @@ const PREFIX = 'data:application/json;charset=utf-8';
|
|
|
6
6
|
const SEPARATOR = ',';
|
|
7
7
|
/**
|
|
8
8
|
* An implementation of a proof input/output database that stores data inline in the URI.
|
|
9
|
-
*/
|
|
10
|
-
export class InlineProofStore {
|
|
9
|
+
*/ export class InlineProofStore {
|
|
11
10
|
saveProofInput(_id, type, inputs) {
|
|
12
|
-
const jobInputs = {
|
|
11
|
+
const jobInputs = {
|
|
12
|
+
type,
|
|
13
|
+
inputs
|
|
14
|
+
};
|
|
13
15
|
return Promise.resolve(this.encode(jobInputs));
|
|
14
16
|
}
|
|
15
17
|
saveProofOutput(_id, type, result) {
|
|
16
|
-
const jobResult = {
|
|
18
|
+
const jobResult = {
|
|
19
|
+
type,
|
|
20
|
+
result
|
|
21
|
+
};
|
|
17
22
|
return Promise.resolve(this.encode(jobResult));
|
|
18
23
|
}
|
|
19
24
|
getProofInput(uri) {
|
|
@@ -24,7 +29,7 @@ export class InlineProofStore {
|
|
|
24
29
|
}
|
|
25
30
|
encode(obj) {
|
|
26
31
|
const encoded = encodeURIComponent(jsonStringify(obj));
|
|
27
|
-
return
|
|
32
|
+
return PREFIX + SEPARATOR + encoded;
|
|
28
33
|
}
|
|
29
34
|
decode(uri, schema) {
|
|
30
35
|
const [prefix, data] = uri.split(SEPARATOR);
|
|
@@ -34,4 +39,3 @@ export class InlineProofStore {
|
|
|
34
39
|
return jsonParseWithSchema(decodeURIComponent(data), schema);
|
|
35
40
|
}
|
|
36
41
|
}
|
|
37
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5saW5lX3Byb29mX3N0b3JlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3Byb3ZpbmdfYnJva2VyL3Byb29mX3N0b3JlL2lubGluZV9wcm9vZl9zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBR0wsZ0JBQWdCLEVBRWhCLGdCQUFnQixHQUdqQixNQUFNLHNCQUFzQixDQUFDO0FBQzlCLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxhQUFhLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUtoRix3RkFBd0Y7QUFDeEYsd0dBQXdHO0FBQ3hHLE1BQU0sTUFBTSxHQUFHLHFDQUFxQyxDQUFDO0FBQ3JELE1BQU0sU0FBUyxHQUFHLEdBQUcsQ0FBQztBQUV0Qjs7R0FFRztBQUNILE1BQU0sT0FBTyxnQkFBZ0I7SUFDM0IsY0FBYyxDQUNaLEdBQWlCLEVBQ2pCLElBQU8sRUFDUCxNQUE4QjtRQUU5QixNQUFNLFNBQVMsR0FBRyxFQUFFLElBQUksRUFBRSxNQUFNLEVBQXNCLENBQUM7UUFDdkQsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQztJQUNqRCxDQUFDO0lBRUQsZUFBZSxDQUNiLEdBQWlCLEVBQ2pCLElBQU8sRUFDUCxNQUErQjtRQUUvQixNQUFNLFNBQVMsR0FBRyxFQUFFLElBQUksRUFBRSxNQUFNLEVBQXNCLENBQUM7UUFDdkQsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQztJQUNqRCxDQUFDO0lBRUQsYUFBYSxDQUFDLEdBQWE7UUFDekIsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxFQUFFLGdCQUFnQixDQUFDLENBQUMsQ0FBQztJQUM3RCxDQUFDO0lBRUQsY0FBYyxDQUFDLEdBQWE7UUFDMUIsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxFQUFFLGdCQUFnQixDQUFDLENBQUMsQ0FBQztJQUM3RCxDQUFDO0lBRU8sTUFBTSxDQUFDLEdBQVc7UUFDeEIsTUFBTSxPQUFPLEdBQUcsa0JBQWtCLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7UUFDdkQsT0FBTyxDQUFDLE1BQU0sR0FBRyxTQUFTLEdBQUcsT0FBTyxDQUFhLENBQUM7SUFDcEQsQ0FBQztJQUVPLE1BQU0sQ0FBSSxHQUFhLEVBQUUsTUFBaUI7UUFDaEQsTUFBTSxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQzVDLElBQUksTUFBTSxLQUFLLE1BQU0sRUFBRSxDQUFDO1lBQ3RCLE1BQU0sSUFBSSxLQUFLLENBQUMsMkJBQTJCLEdBQUcsTUFBTSxDQUFDLENBQUM7UUFDeEQsQ0FBQztRQUVELE9BQU8sbUJBQW1CLENBQUMsa0JBQWtCLENBQUMsSUFBSSxDQUFDLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDL0QsQ0FBQztDQUNGIn0=
|
|
@@ -1,2 +1,3 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
/**
|
|
2
|
+
* A database for storing proof inputs and outputs.
|
|
3
|
+
*/ export { };
|