@aztec/prover-client 0.76.0 → 0.76.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.
- package/dest/proving_broker/config.d.ts +8 -0
- package/dest/proving_broker/config.d.ts.map +1 -1
- package/dest/proving_broker/config.js +15 -1
- package/dest/proving_broker/proving_broker.d.ts +0 -1
- package/dest/proving_broker/proving_broker.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker.js +16 -19
- package/dest/proving_broker/proving_broker_database/memory.d.ts +1 -1
- package/dest/proving_broker/proving_broker_database/memory.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker_database/memory.js +3 -3
- package/dest/proving_broker/proving_broker_database/persisted.d.ts +4 -0
- package/dest/proving_broker/proving_broker_database/persisted.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker_database/persisted.js +42 -25
- package/dest/proving_broker/proving_broker_database.d.ts +2 -2
- package/dest/proving_broker/proving_broker_database.d.ts.map +1 -1
- package/package.json +12 -12
- package/src/proving_broker/config.ts +14 -0
- package/src/proving_broker/proving_broker.ts +16 -20
- package/src/proving_broker/proving_broker_database/memory.ts +2 -2
- package/src/proving_broker/proving_broker_database/persisted.ts +56 -26
- package/src/proving_broker/proving_broker_database.ts +2 -2
|
@@ -13,17 +13,25 @@ export declare const ProverBrokerConfig: z.ZodObject<{
|
|
|
13
13
|
dataDirectory: z.ZodOptional<z.ZodString>;
|
|
14
14
|
/** The size of the data store map */
|
|
15
15
|
dataStoreMapSizeKB: z.ZodNumber;
|
|
16
|
+
/** The prover broker may batch jobs together before writing to the database */
|
|
17
|
+
proverBrokerBatchSize: z.ZodNumber;
|
|
18
|
+
/** How often the job batches get flushed */
|
|
19
|
+
proverBrokerBatchIntervalMs: z.ZodNumber;
|
|
16
20
|
}, "strip", z.ZodTypeAny, {
|
|
17
21
|
proverBrokerJobMaxRetries: number;
|
|
18
22
|
proverBrokerJobTimeoutMs: number;
|
|
19
23
|
proverBrokerPollIntervalMs: number;
|
|
20
24
|
dataStoreMapSizeKB: number;
|
|
25
|
+
proverBrokerBatchSize: number;
|
|
26
|
+
proverBrokerBatchIntervalMs: number;
|
|
21
27
|
dataDirectory?: string | undefined;
|
|
22
28
|
}, {
|
|
23
29
|
proverBrokerJobMaxRetries: number;
|
|
24
30
|
proverBrokerJobTimeoutMs: number;
|
|
25
31
|
proverBrokerPollIntervalMs: number;
|
|
26
32
|
dataStoreMapSizeKB: number;
|
|
33
|
+
proverBrokerBatchSize: number;
|
|
34
|
+
proverBrokerBatchIntervalMs: number;
|
|
27
35
|
dataDirectory?: string | undefined;
|
|
28
36
|
}>;
|
|
29
37
|
export type ProverBrokerConfig = z.infer<typeof ProverBrokerConfig> & Pick<DataStoreConfig, 'dataStoreMapSizeKB' | 'dataDirectory'>;
|
|
@@ -1 +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
|
|
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;;IAErC,+EAA+E;;IAE/E,4CAA4C;;;;;;;;;;;;;;;;;;EAE5C,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,CA2B7E,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"}
|
|
@@ -13,6 +13,10 @@ export const ProverBrokerConfig = z.object({
|
|
|
13
13
|
dataDirectory: z.string().optional(),
|
|
14
14
|
/** The size of the data store map */
|
|
15
15
|
dataStoreMapSizeKB: z.number(),
|
|
16
|
+
/** The prover broker may batch jobs together before writing to the database */
|
|
17
|
+
proverBrokerBatchSize: z.number(),
|
|
18
|
+
/** How often the job batches get flushed */
|
|
19
|
+
proverBrokerBatchIntervalMs: z.number(),
|
|
16
20
|
});
|
|
17
21
|
export const proverBrokerConfigMappings = {
|
|
18
22
|
proverBrokerJobTimeoutMs: {
|
|
@@ -30,6 +34,16 @@ export const proverBrokerConfigMappings = {
|
|
|
30
34
|
description: 'If starting a prover broker locally, the max number of retries per proving job',
|
|
31
35
|
...numberConfigHelper(3),
|
|
32
36
|
},
|
|
37
|
+
proverBrokerBatchSize: {
|
|
38
|
+
env: 'PROVER_BROKER_BATCH_SIZE',
|
|
39
|
+
description: 'The prover broker writes jobs to disk in batches',
|
|
40
|
+
...numberConfigHelper(100),
|
|
41
|
+
},
|
|
42
|
+
proverBrokerBatchIntervalMs: {
|
|
43
|
+
env: 'PROVER_BROKER_BATCH_INTERVAL_MS',
|
|
44
|
+
description: 'How often to flush batches to disk',
|
|
45
|
+
...numberConfigHelper(50),
|
|
46
|
+
},
|
|
33
47
|
...dataConfigMappings,
|
|
34
48
|
};
|
|
35
49
|
export const ProverAgentConfig = z.object({
|
|
@@ -80,4 +94,4 @@ export const proverAgentConfigMappings = {
|
|
|
80
94
|
...numberConfigHelper(0),
|
|
81
95
|
},
|
|
82
96
|
};
|
|
83
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
97
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Byb3ZpbmdfYnJva2VyL2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUMxRCxPQUFPLEVBQTJCLG1CQUFtQixFQUFFLGtCQUFrQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDNUcsT0FBTyxFQUF3QixrQkFBa0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRWxGLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsTUFBTSxDQUFDLE1BQU0sa0JBQWtCLEdBQUcsQ0FBQyxDQUFDLE1BQU0sQ0FBQztJQUN6QyxxRkFBcUY7SUFDckYseUJBQXlCLEVBQUUsQ0FBQyxDQUFDLE1BQU0sRUFBRTtJQUNyQyx1SEFBdUg7SUFDdkgsd0JBQXdCLEVBQUUsQ0FBQyxDQUFDLE1BQU0sRUFBRTtJQUNwQyw2RkFBNkY7SUFDN0YsMEJBQTBCLEVBQUUsQ0FBQyxDQUFDLE1BQU0sRUFBRTtJQUN0Qyw4RUFBOEU7SUFDOUUsYUFBYSxFQUFFLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDcEMscUNBQXFDO0lBQ3JDLGtCQUFrQixFQUFFLENBQUMsQ0FBQyxNQUFNLEVBQUU7SUFDOUIsK0VBQStFO0lBQy9FLHFCQUFxQixFQUFFLENBQUMsQ0FBQyxNQUFNLEVBQUU7SUFDakMsNENBQTRDO0lBQzVDLDJCQUEyQixFQUFFLENBQUMsQ0FBQyxNQUFNLEVBQUU7Q0FDeEMsQ0FBQyxDQUFDO0FBS0gsTUFBTSxDQUFDLE1BQU0sMEJBQTBCLEdBQTJDO0lBQ2hGLHdCQUF3QixFQUFFO1FBQ3hCLEdBQUcsRUFBRSw4QkFBOEI7UUFDbkMsV0FBVyxFQUFFLGtEQUFrRDtRQUMvRCxHQUFHLGtCQUFrQixDQUFDLEtBQU0sQ0FBQztLQUM5QjtJQUNELDBCQUEwQixFQUFF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
|
|
@@ -42,7 +42,6 @@ export declare class ProvingBroker implements ProvingJobProducer, ProvingJobCons
|
|
|
42
42
|
*/
|
|
43
43
|
private epochHeight;
|
|
44
44
|
private maxEpochsToKeepResultsFor;
|
|
45
|
-
private requestQueue;
|
|
46
45
|
private started;
|
|
47
46
|
constructor(database: ProvingBrokerDatabase, { jobTimeoutMs, timeoutIntervalMs, maxRetries, maxEpochsToKeepResultsFor, }?: ProofRequestBrokerConfig, client?: TelemetryClient, logger?: import("@aztec/foundation/log").Logger);
|
|
48
47
|
private measureQueueDepth;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proving_broker.d.ts","sourceRoot":"","sources":["../../src/proving_broker/proving_broker.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,QAAQ,EACb,KAAK,UAAU,EACf,KAAK,kBAAkB,EACvB,KAAK,gBAAgB,EACrB,KAAK,YAAY,EACjB,KAAK,kBAAkB,EAEvB,KAAK,gBAAgB,EAEtB,MAAM,sBAAsB,CAAC;AAK9B,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,SAAS,EACd,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAIjC,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAS1E,KAAK,wBAAwB,GAAG;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAIF;;;GAGG;AACH,qBAAa,aAAc,YAAW,kBAAkB,EAAE,kBAAkB,EAAE,SAAS;;
|
|
1
|
+
{"version":3,"file":"proving_broker.d.ts","sourceRoot":"","sources":["../../src/proving_broker/proving_broker.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { __classPrivateFieldGet, __esDecorate, __runInitializers } from "tslib";
|
|
|
2
2
|
import { ProvingRequestType, } from '@aztec/circuit-types';
|
|
3
3
|
import { createLogger } from '@aztec/foundation/log';
|
|
4
4
|
import { RunningPromise, promiseWithResolvers } from '@aztec/foundation/promise';
|
|
5
|
-
import { PriorityMemoryQueue
|
|
5
|
+
import { PriorityMemoryQueue } from '@aztec/foundation/queue';
|
|
6
6
|
import { Timer } from '@aztec/foundation/timer';
|
|
7
7
|
import { getTelemetryClient, trackSpan, } from '@aztec/telemetry-client';
|
|
8
8
|
import assert from 'assert';
|
|
@@ -64,7 +64,6 @@ let ProvingBroker = (() => {
|
|
|
64
64
|
*/
|
|
65
65
|
this.epochHeight = 0;
|
|
66
66
|
this.maxEpochsToKeepResultsFor = 1;
|
|
67
|
-
this.requestQueue = new SerialQueue();
|
|
68
67
|
this.started = false;
|
|
69
68
|
this.measureQueueDepth = (type) => {
|
|
70
69
|
return this.queues[type].length();
|
|
@@ -108,7 +107,6 @@ let ProvingBroker = (() => {
|
|
|
108
107
|
}
|
|
109
108
|
}
|
|
110
109
|
this.cleanupPromise.start();
|
|
111
|
-
this.requestQueue.start();
|
|
112
110
|
this.instrumentation.monitorQueueDepth(this.measureQueueDepth);
|
|
113
111
|
this.instrumentation.monitorActiveJobs(this.countActiveJobs);
|
|
114
112
|
this.started = true;
|
|
@@ -118,32 +116,31 @@ let ProvingBroker = (() => {
|
|
|
118
116
|
this.logger.warn('ProvingBroker not started');
|
|
119
117
|
return Promise.resolve();
|
|
120
118
|
}
|
|
121
|
-
await this.requestQueue.cancel();
|
|
122
119
|
await this.cleanupPromise.stop();
|
|
123
120
|
}
|
|
124
121
|
enqueueProvingJob(job) {
|
|
125
|
-
return
|
|
122
|
+
return __classPrivateFieldGet(this, _ProvingBroker_instances, "m", _ProvingBroker_enqueueProvingJob).call(this, job);
|
|
126
123
|
}
|
|
127
124
|
cancelProvingJob(id) {
|
|
128
|
-
return
|
|
125
|
+
return __classPrivateFieldGet(this, _ProvingBroker_instances, "m", _ProvingBroker_cancelProvingJob).call(this, id);
|
|
129
126
|
}
|
|
130
127
|
getProvingJobStatus(id) {
|
|
131
|
-
return
|
|
128
|
+
return Promise.resolve(__classPrivateFieldGet(this, _ProvingBroker_instances, "m", _ProvingBroker_getProvingJobStatus).call(this, id));
|
|
132
129
|
}
|
|
133
130
|
getCompletedJobs(ids) {
|
|
134
|
-
return
|
|
131
|
+
return __classPrivateFieldGet(this, _ProvingBroker_instances, "m", _ProvingBroker_getCompletedJobs).call(this, ids);
|
|
135
132
|
}
|
|
136
133
|
getProvingJob(filter) {
|
|
137
|
-
return
|
|
134
|
+
return Promise.resolve(__classPrivateFieldGet(this, _ProvingBroker_instances, "m", _ProvingBroker_getProvingJob).call(this, filter));
|
|
138
135
|
}
|
|
139
136
|
reportProvingJobSuccess(id, value, filter) {
|
|
140
|
-
return
|
|
137
|
+
return __classPrivateFieldGet(this, _ProvingBroker_instances, "m", _ProvingBroker_reportProvingJobSuccess).call(this, id, value, filter);
|
|
141
138
|
}
|
|
142
139
|
reportProvingJobError(id, err, retry = false, filter) {
|
|
143
|
-
return
|
|
140
|
+
return __classPrivateFieldGet(this, _ProvingBroker_instances, "m", _ProvingBroker_reportProvingJobError).call(this, id, err, retry, filter);
|
|
144
141
|
}
|
|
145
142
|
reportProvingJobProgress(id, startedAt, filter) {
|
|
146
|
-
return
|
|
143
|
+
return Promise.resolve(__classPrivateFieldGet(this, _ProvingBroker_instances, "m", _ProvingBroker_reportProvingJobProgress).call(this, id, startedAt, filter));
|
|
147
144
|
}
|
|
148
145
|
cleanUpProvingJobState(ids) {
|
|
149
146
|
for (const id of ids) {
|
|
@@ -159,7 +156,7 @@ let ProvingBroker = (() => {
|
|
|
159
156
|
this.reEnqueueExpiredJobs();
|
|
160
157
|
const oldestEpochToKeep = this.oldestEpochToKeep();
|
|
161
158
|
if (oldestEpochToKeep > 0) {
|
|
162
|
-
await this.
|
|
159
|
+
await this.database.deleteAllProvingJobsOlderThanEpoch(oldestEpochToKeep);
|
|
163
160
|
this.logger.trace(`Deleted all epochs older than ${oldestEpochToKeep}`);
|
|
164
161
|
}
|
|
165
162
|
}
|
|
@@ -217,14 +214,14 @@ let ProvingBroker = (() => {
|
|
|
217
214
|
_ProvingBroker_instances = new WeakSet(),
|
|
218
215
|
_ProvingBroker_enqueueProvingJob = async function _ProvingBroker_enqueueProvingJob(job) {
|
|
219
216
|
// We return the job status at the start of this call
|
|
220
|
-
const jobStatus =
|
|
217
|
+
const jobStatus = __classPrivateFieldGet(this, _ProvingBroker_instances, "m", _ProvingBroker_getProvingJobStatus).call(this, job.id);
|
|
221
218
|
if (this.jobsCache.has(job.id)) {
|
|
222
219
|
const existing = this.jobsCache.get(job.id);
|
|
223
220
|
assert.deepStrictEqual(job, existing, 'Duplicate proving job ID');
|
|
224
221
|
this.logger.debug(`Duplicate proving job id=${job.id} epochNumber=${job.epochNumber}. Ignoring`, {
|
|
225
222
|
provingJobId: job.id,
|
|
226
223
|
});
|
|
227
|
-
return jobStatus;
|
|
224
|
+
return Promise.resolve(jobStatus);
|
|
228
225
|
}
|
|
229
226
|
if (this.isJobStale(job)) {
|
|
230
227
|
this.logger.warn(`Tried enqueueing stale proving job id=${job.id} epochNumber=${job.epochNumber}`, {
|
|
@@ -260,15 +257,15 @@ let ProvingBroker = (() => {
|
|
|
260
257
|
_ProvingBroker_getProvingJobStatus = function _ProvingBroker_getProvingJobStatus(id) {
|
|
261
258
|
const result = this.resultsCache.get(id);
|
|
262
259
|
if (result) {
|
|
263
|
-
return
|
|
260
|
+
return result;
|
|
264
261
|
}
|
|
265
262
|
else {
|
|
266
263
|
// no result yet, check if we know the item
|
|
267
264
|
const item = this.jobsCache.get(id);
|
|
268
265
|
if (!item) {
|
|
269
|
-
return
|
|
266
|
+
return { status: 'not-found' };
|
|
270
267
|
}
|
|
271
|
-
return
|
|
268
|
+
return { status: this.inProgress.has(id) ? 'in-progress' : 'in-queue' };
|
|
272
269
|
}
|
|
273
270
|
},
|
|
274
271
|
_ProvingBroker_getCompletedJobs = function _ProvingBroker_getCompletedJobs(ids) {
|
|
@@ -526,4 +523,4 @@ const PROOF_TYPES_IN_PRIORITY_ORDER = [
|
|
|
526
523
|
ProvingRequestType.BASE_PARITY,
|
|
527
524
|
ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP,
|
|
528
525
|
];
|
|
529
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"proving_broker.js","sourceRoot":"","sources":["../../src/proving_broker/proving_broker.ts"],"names":[],"mappings":"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"}
|
|
526
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"proving_broker.js","sourceRoot":"","sources":["../../src/proving_broker/proving_broker.ts"],"names":[],"mappings":";AAAA,OAAO,EAUL,kBAAkB,GACnB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAA6B,cAAc,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAC5G,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAIL,kBAAkB,EAClB,SAAS,GACV,MAAM,yBAAyB,CAAC;AAEjC,OAAO,MAAM,MAAM,QAAQ,CAAC;AAG5B,OAAO,EAAwB,4BAA4B,EAAE,MAAM,qCAAqC,CAAC;AAkBzG;;;GAGG;IACU,aAAa;;;;sBAAb,aAAa;YAiExB,YACU,QAA+B,EACvC,EACE,YAAY,GAAG,KAAM,EACrB,iBAAiB,GAAG,KAAM,EAC1B,UAAU,GAAG,CAAC,EACd,yBAAyB,GAAG,CAAC,MACD,EAAE,EAChC,SAA0B,kBAAkB,EAAE,EACtC,SAAS,YAAY,CAAC,8BAA8B,CAAC;;gBARrD,aAAQ,IAlEP,mDAAa,EAkEd,QAAQ,EAAuB;gBAQ/B,WAAM,GAAN,MAAM,CAA+C;gBAzEvD,WAAM,GAAkB;oBAC9B,CAAC,kBAAkB,CAAC,SAAS,CAAC,EAAE,IAAI,mBAAmB,CAAqB,oBAAoB,CAAC;oBACjG,CAAC,kBAAkB,CAAC,UAAU,CAAC,EAAE,IAAI,mBAAmB,CAAqB,oBAAoB,CAAC;oBAElG,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,EAAE,IAAI,mBAAmB,CAAqB,oBAAoB,CAAC;oBAC3G,CAAC,kBAAkB,CAAC,kBAAkB,CAAC,EAAE,IAAI,mBAAmB,CAAqB,oBAAoB,CAAC;oBAC1G,CAAC,kBAAkB,CAAC,YAAY,CAAC,EAAE,IAAI,mBAAmB,CAAqB,oBAAoB,CAAC;oBACpG,CAAC,kBAAkB,CAAC,WAAW,CAAC,EAAE,IAAI,mBAAmB,CAAqB,oBAAoB,CAAC;oBAEnG,CAAC,kBAAkB,CAAC,kBAAkB,CAAC,EAAE,IAAI,mBAAmB,CAAqB,oBAAoB,CAAC;oBAC1G,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,EAAE,IAAI,mBAAmB,CAAqB,oBAAoB,CAAC;oBACzG,CAAC,kBAAkB,CAAC,2BAA2B,CAAC,EAAE,IAAI,mBAAmB,CAAqB,oBAAoB,CAAC;oBACnH,CAAC,kBAAkB,CAAC,uBAAuB,CAAC,EAAE,IAAI,mBAAmB,CAAqB,oBAAoB,CAAC;oBAE/G,CAAC,kBAAkB,CAAC,WAAW,CAAC,EAAE,IAAI,mBAAmB,CAAqB,oBAAoB,CAAC;oBACnG,CAAC,kBAAkB,CAAC,WAAW,CAAC,EAAE,IAAI,mBAAmB,CAAqB,oBAAoB,CAAC;iBACpG,CAAC;gBAEF,8EAA8E;gBAC9E,gFAAgF;gBACxE,cAAS,GAAG,IAAI,GAAG,EAA4B,CAAC;gBACxD,4BAA4B;gBACpB,iBAAY,GAAG,IAAI,GAAG,EAAyC,CAAC;gBAExE,oCAAoC;gBAC5B,eAAU,GAAG,IAAI,GAAG,EAAuB,CAAC;gBAEpD,0DAA0D;gBAC1D,kEAAkE;gBAClE,uEAAuE;gBACvE,kCAAkC;gBAC1B,eAAU,GAAG,IAAI,GAAG,EAAoC,CAAC;gBAEjE,mDAAmD;gBAC3C,YAAO,GAAG,IAAI,GAAG,EAAwB,CAAC;gBAElD,gEAAgE;gBACxD,aAAQ,GAAG,IAAI,GAAG,EAA+D,CAAC;gBAGlF,iBAAY,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;gBAOhC,8BAAyB,GAAmB,EAAE,CAAC;gBAEvD;;;;;;;;;mBASG;gBACK,gBAAW,GAAG,CAAC,CAAC;gBAChB,8BAAyB,GAAG,CAAC,CAAC;gBAE9B,YAAO,GAAG,KAAK,CAAC;gBAqBhB,sBAAiB,GAAoB,CAAC,IAAwB,EAAE,EAAE;oBACxE,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;gBACpC,CAAC,CAAC;gBAEM,oBAAe,GAAoB,CAAC,IAAwB,EAAE,EAAE;oBACtE,IAAI,KAAK,GAAG,CAAC,CAAC;oBACd,KAAK,MAAM,EAAE,EAAE,EAAE,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC;wBAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;wBACnC,IAAI,GAAG,EAAE,IAAI,KAAK,IAAI,EAAE,CAAC;4BACvB,KAAK,EAAE,CAAC;wBACV,CAAC;oBACH,CAAC;oBAED,OAAO,KAAK,CAAC;gBACf,CAAC,CAAC;gBAtBA,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;gBAChD,IAAI,CAAC,eAAe,GAAG,IAAI,4BAA4B,CAAC,MAAM,CAAC,CAAC;gBAChE,IAAI,CAAC,cAAc,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;gBACtG,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;gBACjC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;gBAC7B,IAAI,CAAC,yBAAyB,GAAG,yBAAyB,CAAC;YAC7D,CAAC;YAkBM,KAAK,CAAC,KAAK;gBAChB,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;oBACjB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;oBACnD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;gBAC3B,CAAC;gBACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;gBAC3C,IAAI,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,EAAE,CAAC;oBAClE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,4BAA4B,IAAI,CAAC,EAAE,YAAY,CAAC,CAAC,MAAM,EAAE,EAAE;wBAC1E,YAAY,EAAE,IAAI,CAAC,EAAE;wBACrB,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;qBAC3C,CAAC,CAAC;oBAEH,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;oBAClC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,oBAAoB,EAAE,CAAC,CAAC;oBAEnD,IAAI,MAAM,EAAE,CAAC;wBACX,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;wBAC5C,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;oBACzC,CAAC;yBAAM,CAAC;wBACN,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;oBAChC,CAAC;gBACH,CAAC;gBAED,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;gBAE5B,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;gBAC/D,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;gBAE7D,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YACtB,CAAC;YAEM,KAAK,CAAC,IAAI;gBACf,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;oBAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;oBAC9C,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;gBAC3B,CAAC;gBACD,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;YACnC,CAAC;YAEM,iBAAiB,CAAC,GAAe;gBACtC,OAAO,uBAAA,IAAI,kEAAmB,MAAvB,IAAI,EAAoB,GAAG,CAAC,CAAC;YACtC,CAAC;YAEM,gBAAgB,CAAC,EAAgB;gBACtC,OAAO,uBAAA,IAAI,iEAAkB,MAAtB,IAAI,EAAmB,EAAE,CAAC,CAAC;YACpC,CAAC;YAEM,mBAAmB,CAAC,EAAgB;gBACzC,OAAO,OAAO,CAAC,OAAO,CAAC,uBAAA,IAAI,oEAAqB,MAAzB,IAAI,EAAsB,EAAE,CAAC,CAAC,CAAC;YACxD,CAAC;YAEM,gBAAgB,CAAC,GAAmB;gBACzC,OAAO,uBAAA,IAAI,iEAAkB,MAAtB,IAAI,EAAmB,GAAG,CAAC,CAAC;YACrC,CAAC;YAEM,aAAa,CAAC,MAAyB;gBAC5C,OAAO,OAAO,CAAC,OAAO,CAAC,uBAAA,IAAI,8DAAe,MAAnB,IAAI,EAAgB,MAAM,CAAC,CAAC,CAAC;YACtD,CAAC;YAEM,uBAAuB,CAC5B,EAAgB,EAChB,KAAe,EACf,MAAyB;gBAEzB,OAAO,uBAAA,IAAI,wEAAyB,MAA7B,IAAI,EAA0B,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;YAC1D,CAAC;YAEM,qBAAqB,CAC1B,EAAgB,EAChB,GAAW,EACX,KAAK,GAAG,KAAK,EACb,MAAyB;gBAEzB,OAAO,uBAAA,IAAI,sEAAuB,MAA3B,IAAI,EAAwB,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;YAC7D,CAAC;YAEM,wBAAwB,CAC7B,EAAgB,EAChB,SAAiB,EACjB,MAAyB;gBAEzB,OAAO,OAAO,CAAC,OAAO,CAAC,uBAAA,IAAI,yEAA0B,MAA9B,IAAI,EAA2B,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;YAChF,CAAC;YAgDO,sBAAsB,CAAC,GAAmB;gBAChD,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;oBACrB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;oBAC1B,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;oBACzB,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;oBAC7B,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;oBAC3B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAC1B,CAAC;YACH,CAAC;YAqQO,KAAK,CAAC,WAAW;gBACvB,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACxB,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAC5B,MAAM,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBACnD,IAAI,iBAAiB,GAAG,CAAC,EAAE,CAAC;oBAC1B,MAAM,IAAI,CAAC,QAAQ,CAAC,kCAAkC,CAAC,iBAAiB,CAAC,CAAC;oBAC1E,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iCAAiC,iBAAiB,EAAE,CAAC,CAAC;gBAC1E,CAAC;YACH,CAAC;YAEO,gBAAgB;gBACtB,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;gBACjD,MAAM,WAAW,GAAmB,EAAE,CAAC;gBACvC,KAAK,MAAM,EAAE,IAAI,MAAM,EAAE,CAAC;oBACxB,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAE,CAAC;oBACpC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;wBACzB,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBACvB,CAAC;gBACH,CAAC;gBAED,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC3B,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC;oBACzC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;gBAC5D,CAAC;YACH,CAAC;YAEO,oBAAoB;gBAC1B,MAAM,iBAAiB,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC;gBAChE,KAAK,MAAM,CAAC,EAAE,EAAE,QAAQ,CAAC,IAAI,iBAAiB,EAAE,CAAC;oBAC/C,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oBACpC,IAAI,CAAC,IAAI,EAAE,CAAC;wBACV,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAE,yCAAyC,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC;wBACtG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;wBAC3B,SAAS;oBACX,CAAC;oBAED,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;oBAChC,MAAM,iBAAiB,GAAG,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC;oBACvD,IAAI,iBAAiB,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;wBAC3C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAE,0CAA0C,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC;wBACvG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;wBAC3B,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;wBAC9B,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAClD,CAAC;gBACH,CAAC;YACH,CAAC;YAEO,kBAAkB,CAAC,GAAe;gBACxC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;oBAC/B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,oBAAoB,EAAE,CAAC,CAAC;gBACpD,CAAC;gBACD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC;oBACxB,WAAW,EAAE,GAAG,CAAC,WAAW;oBAC5B,EAAE,EAAE,GAAG,CAAC,EAAE;iBACX,CAAC,CAAC;gBACH,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,KAAK,EAAE,CAAC,CAAC;gBACzC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;YACjE,CAAC;YAEO,UAAU,CAAC,GAAe;gBAChC,OAAO,GAAG,CAAC,WAAW,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACpD,CAAC;YAEO,iBAAiB;gBACvB,OAAO,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,yBAAyB,CAAC;YAC3D,CAAC;;;2CA5XD,KAAK,2CAAoB,GAAe;YACtC,qDAAqD;YACrD,MAAM,SAAS,GAAG,uBAAA,IAAI,oEAAqB,MAAzB,IAAI,EAAsB,GAAG,CAAC,EAAE,CAAC,CAAC;YACpD,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;gBAC/B,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBAC5C,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,QAAQ,EAAE,0BAA0B,CAAC,CAAC;gBAClE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,GAAG,CAAC,EAAE,gBAAgB,GAAG,CAAC,WAAW,YAAY,EAAE;oBAC/F,YAAY,EAAE,GAAG,CAAC,EAAE;iBACrB,CAAC,CAAC;gBACH,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YACpC,CAAC;YAED,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBACzB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yCAAyC,GAAG,CAAC,EAAE,gBAAgB,GAAG,CAAC,WAAW,EAAE,EAAE;oBACjG,YAAY,EAAE,GAAG,CAAC,EAAE;iBACrB,CAAC,CAAC;gBACH,MAAM,IAAI,KAAK,CAAC,4BAA4B,GAAG,CAAC,WAAW,oBAAoB,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;YACrG,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,GAAG,CAAC,EAAE,gBAAgB,GAAG,CAAC,WAAW,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;YAC1G,IAAI,CAAC;gBACH,6HAA6H;gBAC7H,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;gBAChC,MAAM,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;gBACvC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;YAC/B,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iCAAiC,GAAG,CAAC,EAAE,KAAK,GAAG,EAAE,EAAE,GAAG,EAAE,EAAE,YAAY,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;gBACpG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBAC9B,MAAM,GAAG,CAAC;YACZ,CAAC;YACD,OAAO,SAAS,CAAC;QACnB,CAAC;0CAED,KAAK,0CAAmB,EAAgB;YACtC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;gBAC5B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,4CAA4C,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC;gBACzF,OAAO;YACT,CAAC;YAED,uCAAuC;YACvC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;gBAC/B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC;gBAClE,MAAM,uBAAA,IAAI,sEAAuB,MAA3B,IAAI,EAAwB,EAAE,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;YAC1D,CAAC;QACH,CAAC;yFAYoB,EAAgB;YACnC,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACzC,IAAI,MAAM,EAAE,CAAC;gBACX,OAAO,MAAM,CAAC;YAChB,CAAC;iBAAM,CAAC;gBACN,2CAA2C;gBAC3C,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBAEpC,IAAI,CAAC,IAAI,EAAE,CAAC;oBACV,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;gBACjC,CAAC;gBAED,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC;YAC1E,CAAC;QACH,CAAC;mFAEiB,GAAmB;YACnC,MAAM,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;YAClE,MAAM,aAAa,GAAG,IAAI,CAAC,yBAAyB,CAAC;YACrD,IAAI,CAAC,yBAAyB,GAAG,EAAE,CAAC;YACpC,OAAO,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC;QAC9D,CAAC;6EAGc,SAA2B,EAAE,SAAS,EAAE,EAAE,EAAE;YACzD,MAAM,aAAa,GACjB,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC;gBAC5D,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC;gBACvB,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAA2B,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC;YACtG,aAAa,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;YAExC,KAAK,MAAM,SAAS,IAAI,aAAa,EAAE,CAAC;gBACtC,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;gBACrC,IAAI,WAA2C,CAAC;gBAChD,qFAAqF;gBACrF,gCAAgC;gBAChC,qDAAqD;gBACrD,0GAA0G;gBAC1G,OAAO,CAAC,WAAW,GAAG,KAAK,CAAC,YAAY,EAAE,CAAC,EAAE,CAAC;oBAC5C,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;oBAC/C,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE,CAAC;wBAC1F,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;wBACjC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE;4BAC1B,EAAE,EAAE,GAAG,CAAC,EAAE;4BACV,SAAS,EAAE,IAAI;4BACf,aAAa,EAAE,IAAI;yBACpB,CAAC,CAAC;wBACH,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;wBAC/C,IAAI,UAAU,EAAE,CAAC;4BACf,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;wBAC3D,CAAC;wBAED,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;oBACvB,CAAC;gBACH,CAAC;YACH,CAAC;YAED,OAAO,SAAS,CAAC;QACnB,CAAC;+CAED,KAAK,+CACH,EAAgB,EAChB,GAAW,EACX,KAAK,GAAG,KAAK,EACb,MAAyB;YAEzB,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACrC,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACpC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;YAE1C,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6CAA6C,EAAE,QAAQ,GAAG,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC;gBACpG,OAAO;YACT,CAAC;YAED,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAE,SAAS,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,6BAA6B,EAAE;oBACxG,YAAY,EAAE,EAAE;iBACjB,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAC7B,CAAC;YAED,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;gBAC9B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAE,qCAAqC,GAAG,EAAE,EAAE;oBAC/E,YAAY,EAAE,EAAE;iBACjB,CAAC,CAAC;gBACH,OAAO,uBAAA,IAAI,8DAAe,MAAnB,IAAI,EAAgB,MAAM,CAAC,CAAC;YACrC,CAAC;YAED,IAAI,KAAK,IAAI,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;gBACrE,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,2BAA2B,EAAE,SAAS,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,OAAO,GAAG,CAAC,QAAQ,GAAG,EAAE,EACrG;oBACE,YAAY,EAAE,EAAE;iBACjB,CACF,CAAC;gBAEF,mCAAmC;gBACnC,gEAAgE;gBAChE,MAAM,eAAe,GAAG,uBAAA,IAAI,8DAAe,MAAnB,IAAI,EAAgB,MAAM,CAAC,CAAC;gBAEpD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,GAAG,CAAC,CAAC,CAAC;gBAClC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;gBAC9B,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAE/C,OAAO,eAAe,CAAC;YACzB,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,oCAAoC,EAAE,SAAS,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,kBAC1E,OAAO,GAAG,CACZ,QAAQ,GAAG,EAAE,EACb;gBACE,YAAY,EAAE,EAAE;aACjB,CACF,CAAC;YAEF,oEAAoE;YACpE,sFAAsF;YACtF,MAAM,MAAM,GAA4B,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;YACpF,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;YAClC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACvC,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAExC,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAChD,IAAI,IAAI,EAAE,CAAC;gBACT,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC;gBACtD,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAC9D,CAAC;YAED,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;YAClD,CAAC;YAAC,OAAO,OAAO,EAAE,CAAC;gBACjB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8CAA8C,EAAE,WAAW,GAAG,EAAE,EAAE,OAAO,EAAE;oBAC3F,YAAY,EAAE,EAAE;iBACjB,CAAC,CAAC;gBAEH,MAAM,OAAO,CAAC;YAChB,CAAC;YAED,OAAO,uBAAA,IAAI,8DAAe,MAAnB,IAAI,EAAgB,MAAM,CAAC,CAAC;QACrC,CAAC;mGAGC,EAAgB,EAChB,SAAiB,EACjB,MAAyB;YAEzB,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACnC,IAAI,CAAC,GAAG,EAAE,CAAC;gBACT,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAE,iBAAiB,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC;gBAC9E,OAAO,uBAAA,IAAI,8DAAe,MAAnB,IAAI,EAAgB,MAAM,CAAC,CAAC;YACrC,CAAC;YAED,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;gBAC9B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAE,6BAA6B,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC;gBAC1F,OAAO,uBAAA,IAAI,8DAAe,MAAnB,IAAI,EAAgB,MAAM,CAAC,CAAC;YACrC,CAAC;YAED,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACzC,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;YAChC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,kBAAkB,EAAE,SAAS,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,gDAAgD,EACzG,EAAE,YAAY,EAAE,EAAE,EAAE,CACrB,CAAC;gBACF,uDAAuD;gBACvD,kFAAkF;gBAClF,mCAAmC;gBACnC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE;oBACtB,EAAE;oBACF,SAAS;oBACT,aAAa,EAAE,IAAI,CAAC,YAAY,EAAE;iBACnC,CAAC,CAAC;gBACH,OAAO,SAAS,CAAC;YACnB,CAAC;iBAAM,IAAI,SAAS,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC;gBAC3C,IAAI,SAAS,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;oBACnC,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,kBAAkB,EAAE,SAAS,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,SAAS,4BAA4B,EAC5G,EAAE,YAAY,EAAE,EAAE,EAAE,CACrB,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,EAAE,SAAS,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC;gBACjH,CAAC;gBACD,QAAQ,CAAC,SAAS,GAAG,SAAS,CAAC;gBAC/B,QAAQ,CAAC,aAAa,GAAG,GAAG,CAAC;gBAC7B,OAAO,SAAS,CAAC;YACnB,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,kBAAkB,EAAE,SAClB,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAC7B,4DAA4D,EAC5D,EAAE,YAAY,EAAE,EAAE,EAAE,CACrB,CAAC;YAEF,OAAO,uBAAA,IAAI,8DAAe,MAAnB,IAAI,EAAgB,MAAM,CAAC,CAAC;QACrC,CAAC;iDAED,KAAK,iDACH,EAAgB,EAChB,KAAe,EACf,MAAyB;YAEzB,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACrC,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACpC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;YAC1C,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAE,YAAY,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC;gBACzE,OAAO;YACT,CAAC;YAED,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAE,SAAS,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,6BAA6B,EAAE;oBACxG,YAAY,EAAE,EAAE;iBACjB,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAC7B,CAAC;YAED,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;gBAC9B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAE,mCAAmC,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC;gBAChG,OAAO;YACT,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,2BAA2B,EAAE,SAAS,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,OAAO,GAAG,CAAC,EAAE,EAClG,EAAE,YAAY,EAAE,EAAE,EAAE,CACrB,CAAC;YAEF,oDAAoD;YACpD,4EAA4E;YAC5E,mGAAmG;YACnG,MAAM,MAAM,GAA4B,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;YACvE,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;YAClC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACvC,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAExC,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAChD,IAAI,IAAI,EAAE,CAAC;gBACT,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC;gBACtD,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAC9D,CAAC;YAED,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;YACrD,CAAC;YAAC,OAAO,OAAO,EAAE,CAAC;gBACjB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wCAAwC,EAAE,EAAE,EAAE,OAAO,EAAE;oBACvE,YAAY,EAAE,EAAE;iBACjB,CAAC,CAAC;gBAEH,MAAM,OAAO,CAAC;YAChB,CAAC;YAED,OAAO,uBAAA,IAAI,8DAAe,MAAnB,IAAI,EAAgB,MAAM,CAAC,CAAC;QACrC,CAAC;;;uCAEA,SAAS,CAAC,2BAA2B,CAAC;YACvC,kLAAc,WAAW,6DAQxB;;;;;SA3fU,aAAa;AA2jB1B;;;;;GAKG;AACH,SAAS,oBAAoB,CAAC,CAAqB,EAAE,CAAqB;IACxE,IAAI,CAAC,CAAC,WAAW,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;QAClC,OAAO,CAAC,CAAC,CAAC;IACZ,CAAC;SAAM,IAAI,CAAC,CAAC,WAAW,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;QACzC,OAAO,CAAC,CAAC;IACX,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,CAAC;IACX,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,mBAAmB,CAAC,CAAqB,EAAE,CAAqB;IACvE,MAAM,QAAQ,GAAG,6BAA6B,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,6BAA6B,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAC1D,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAC1B,OAAO,CAAC,CAAC;IACX,CAAC;SAAM,IAAI,QAAQ,KAAK,CAAC,CAAC,EAAE,CAAC;QAC3B,yDAAyD;QACzD,+CAA+C;QAC/C,OAAO,CAAC,CAAC;IACX,CAAC;SAAM,IAAI,QAAQ,KAAK,CAAC,CAAC,EAAE,CAAC;QAC3B,yCAAyC;QACzC,OAAO,CAAC,CAAC,CAAC;IACZ,CAAC;SAAM,IAAI,QAAQ,GAAG,QAAQ,EAAE,CAAC;QAC/B,OAAO,CAAC,CAAC,CAAC;IACZ,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,CAAC;IACX,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACH,MAAM,6BAA6B,GAAyB;IAC1D,kBAAkB,CAAC,iBAAiB;IACpC,kBAAkB,CAAC,2BAA2B;IAC9C,kBAAkB,CAAC,kBAAkB;IACrC,kBAAkB,CAAC,WAAW;IAC9B,kBAAkB,CAAC,YAAY;IAC/B,kBAAkB,CAAC,kBAAkB;IACrC,kBAAkB,CAAC,mBAAmB;IACtC,kBAAkB,CAAC,SAAS;IAC5B,kBAAkB,CAAC,UAAU;IAC7B,kBAAkB,CAAC,WAAW;IAC9B,kBAAkB,CAAC,WAAW;IAC9B,kBAAkB,CAAC,uBAAuB;CAC3C,CAAC"}
|
|
@@ -5,7 +5,7 @@ export declare class InMemoryBrokerDatabase implements ProvingBrokerDatabase {
|
|
|
5
5
|
private results;
|
|
6
6
|
getProvingJob(id: ProvingJobId): ProvingJob | undefined;
|
|
7
7
|
getProvingJobResult(id: ProvingJobId): ProvingJobSettledResult | undefined;
|
|
8
|
-
addProvingJob(
|
|
8
|
+
addProvingJob(job: ProvingJob): Promise<void>;
|
|
9
9
|
setProvingJobResult(id: ProvingJobId, value: ProofUri): Promise<void>;
|
|
10
10
|
setProvingJobError(id: ProvingJobId, reason: string): Promise<void>;
|
|
11
11
|
deleteProvingJobs(ids: ProvingJobId[]): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory.d.ts","sourceRoot":"","sources":["../../../src/proving_broker/proving_broker_database/memory.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,UAAU,EACf,KAAK,YAAY,EACjB,KAAK,uBAAuB,EAE7B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAE3E,qBAAa,sBAAuB,YAAW,qBAAqB;IAClE,OAAO,CAAC,IAAI,CAAuC;IACnD,OAAO,CAAC,OAAO,CAAoD;IAEnE,aAAa,CAAC,EAAE,EAAE,YAAY,GAAG,UAAU,GAAG,SAAS;IAIvD,mBAAmB,CAAC,EAAE,EAAE,YAAY,GAAG,uBAAuB,GAAG,SAAS;IAI1E,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"memory.d.ts","sourceRoot":"","sources":["../../../src/proving_broker/proving_broker_database/memory.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,UAAU,EACf,KAAK,YAAY,EACjB,KAAK,uBAAuB,EAE7B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAE3E,qBAAa,sBAAuB,YAAW,qBAAqB;IAClE,OAAO,CAAC,IAAI,CAAuC;IACnD,OAAO,CAAC,OAAO,CAAoD;IAEnE,aAAa,CAAC,EAAE,EAAE,YAAY,GAAG,UAAU,GAAG,SAAS;IAIvD,mBAAmB,CAAC,EAAE,EAAE,YAAY,GAAG,uBAAuB,GAAG,SAAS;IAI1E,aAAa,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7C,mBAAmB,CAAC,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAKrE,kBAAkB,CAAC,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKnE,iBAAiB,CAAC,GAAG,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAQrD,kCAAkC,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ/D,cAAc,IAAI,qBAAqB,CAAC,CAAC,UAAU,EAAE,uBAAuB,GAAG,SAAS,CAAC,CAAC;IAMjG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAGvB"}
|
|
@@ -10,8 +10,8 @@ export class InMemoryBrokerDatabase {
|
|
|
10
10
|
getProvingJobResult(id) {
|
|
11
11
|
return this.results.get(id);
|
|
12
12
|
}
|
|
13
|
-
addProvingJob(
|
|
14
|
-
this.jobs.set(
|
|
13
|
+
addProvingJob(job) {
|
|
14
|
+
this.jobs.set(job.id, job);
|
|
15
15
|
return Promise.resolve();
|
|
16
16
|
}
|
|
17
17
|
setProvingJobResult(id, value) {
|
|
@@ -45,4 +45,4 @@ export class InMemoryBrokerDatabase {
|
|
|
45
45
|
return Promise.resolve();
|
|
46
46
|
}
|
|
47
47
|
}
|
|
48
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
48
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtb3J5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3Byb3ZpbmdfYnJva2VyL3Byb3ZpbmdfYnJva2VyX2RhdGFiYXNlL21lbW9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBS0wsd0JBQXdCLEdBQ3pCLE1BQU0sc0JBQXNCLENBQUM7QUFJOUIsTUFBTSxPQUFPLHNCQUFzQjtJQUFuQztRQUNVLFNBQUksR0FBRyxJQUFJLEdBQUcsRUFBNEIsQ0FBQztRQUMzQyxZQUFPLEdBQUcsSUFBSSxHQUFHLEVBQXlDLENBQUM7SUFrRHJFLENBQUM7SUFoREMsYUFBYSxDQUFDLEVBQWdCO1FBQzVCLE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLENBQUM7SUFDM0IsQ0FBQztJQUVELG1CQUFtQixDQUFDLEVBQWdCO1FBQ2xDLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLENBQUM7SUFDOUIsQ0FBQztJQUVELGFBQWEsQ0FBQyxHQUFlO1FBQzNCLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxFQUFFLEVBQUUsR0FBRyxDQUFDLENBQUM7UUFDM0IsT0FBTyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDM0IsQ0FBQztJQUVELG1CQUFtQixDQUFDLEVBQWdCLEVBQUUsS0FBZTtRQUNuRCxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFLEVBQUUsRUFBRSxNQUFNLEVBQUUsV0FBVyxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUM7UUFDckQsT0FBTyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDM0IsQ0FBQztJQUVELGtCQUFrQixDQUFDLEVBQWdCLEVBQUUsTUFBYztRQUNqRCxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFLEVBQUUsRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSxDQUFDLENBQUM7UUFDckQsT0FBTyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDM0IsQ0FBQztJQUVELGlCQUFpQixDQUFDLEdBQW1CO1FBQ25DLEtBQUssTUFBTSxFQUFFLElBQUksR0FBRyxFQUFFLENBQUM7WUFDckIsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLENBQUM7WUFDckIsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDMUIsQ0FBQztRQUNELE9BQU8sT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQzNCLENBQUM7SUFFRCxrQ0FBa0MsQ0FBQyxXQUFtQjtRQUNwRCxNQUFNLFFBQVEsR0FBRztZQUNmLEdBQUcsS0FBSyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsd0JBQXdCLENBQUMsQ0FBQyxDQUFDLEdBQUcsV0FBVyxDQUFDO1lBQ3RGLEdBQUcsS0FBSyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsd0JBQXdCLENBQUMsQ0FBQyxDQUFDLEdBQUcsV0FBVyxDQUFDO1NBQzFGLENBQUM7UUFDRixPQUFPLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUMxQyxDQUFDO0lBRUQsS0FBSyxDQUFDLENBQUMsY0FBYztRQUNuQixJQUFJLEtBQUssRUFBRSxNQUFNLElBQUksSUFBSSxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUM7WUFDNUMsTUFBTSxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQVUsQ0FBQztRQUNuRCxDQUFDO0lBQ0gsQ0FBQztJQUVELEtBQUs7UUFDSCxPQUFPLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUMzQixDQUFDO0NBQ0YifQ==
|
|
@@ -8,14 +8,18 @@ export declare class KVBrokerDatabase implements ProvingBrokerDatabase {
|
|
|
8
8
|
private config;
|
|
9
9
|
private logger;
|
|
10
10
|
private metrics;
|
|
11
|
+
private batchQueue;
|
|
11
12
|
private constructor();
|
|
13
|
+
commitWrites(items: Array<ProvingJob | [ProvingJobId, ProvingJobSettledResult]>, epochNumber: number): Promise<void>;
|
|
12
14
|
private estimateSize;
|
|
13
15
|
static new(config: ProverBrokerConfig, client?: TelemetryClient, logger?: Logger): Promise<KVBrokerDatabase>;
|
|
16
|
+
private start;
|
|
14
17
|
close(): Promise<void>;
|
|
15
18
|
deleteAllProvingJobsOlderThanEpoch(epochNumber: number): Promise<void>;
|
|
16
19
|
addProvingJob(job: ProvingJob): Promise<void>;
|
|
17
20
|
allProvingJobs(): AsyncIterableIterator<[ProvingJob, ProvingJobSettledResult | undefined]>;
|
|
18
21
|
setProvingJobError(id: ProvingJobId, reason: string): Promise<void>;
|
|
19
22
|
setProvingJobResult(id: ProvingJobId, value: ProofUri): Promise<void>;
|
|
23
|
+
private getEpochDatabase;
|
|
20
24
|
}
|
|
21
25
|
//# sourceMappingURL=persisted.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"persisted.d.ts","sourceRoot":"","sources":["../../../src/proving_broker/proving_broker_database/persisted.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,QAAQ,EACb,UAAU,EACV,KAAK,YAAY,EACjB,uBAAuB,EAExB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"persisted.d.ts","sourceRoot":"","sources":["../../../src/proving_broker/proving_broker_database/persisted.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,QAAQ,EACb,UAAU,EACV,KAAK,YAAY,EACjB,uBAAuB,EAExB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAIlE,OAAO,EAA2B,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAK5G,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAsD3E,qBAAa,gBAAiB,YAAW,qBAAqB;IAM1D,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IAEd,OAAO,CAAC,MAAM;IARhB,OAAO,CAAC,OAAO,CAAc;IAE7B,OAAO,CAAC,UAAU,CAA2E;IAE7F,OAAO;IAuBM,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,GAAG,CAAC,YAAY,EAAE,uBAAuB,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM;YAQnG,YAAY;WASN,GAAG,CACrB,MAAM,EAAE,kBAAkB,EAC1B,MAAM,GAAE,eAAsC,EAC9C,MAAM,SAAwD;IA2BhE,OAAO,CAAC,KAAK;IAIP,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAOtB,kCAAkC,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAa5E,aAAa,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAItC,cAAc,IAAI,qBAAqB,CAAC,CAAC,UAAU,EAAE,uBAAuB,GAAG,SAAS,CAAC,CAAC;IAOjG,kBAAkB,CAAC,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAInE,mBAAmB,CAAC,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;YAIvD,gBAAgB;CAe/B"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { ProvingJob, ProvingJobSettledResult, getEpochFromProvingJobId, } from '@aztec/circuit-types';
|
|
2
2
|
import { jsonParseWithSchema, jsonStringify } from '@aztec/foundation/json-rpc';
|
|
3
3
|
import { createLogger } from '@aztec/foundation/log';
|
|
4
|
+
import { BatchQueue } from '@aztec/foundation/queue';
|
|
4
5
|
import { AztecLMDBStoreV2 } from '@aztec/kv-store/lmdb-v2';
|
|
5
6
|
import { Attributes, LmdbMetrics, getTelemetryClient } from '@aztec/telemetry-client';
|
|
6
7
|
import { mkdir, readdir } from 'fs/promises';
|
|
@@ -14,8 +15,15 @@ class SingleEpochDatabase {
|
|
|
14
15
|
estimateSize() {
|
|
15
16
|
return this.store.estimateSize();
|
|
16
17
|
}
|
|
17
|
-
async
|
|
18
|
-
await this.
|
|
18
|
+
async batchWrite(jobs, results) {
|
|
19
|
+
await this.store.transactionAsync(async () => {
|
|
20
|
+
for (const job of jobs) {
|
|
21
|
+
await this.jobs.set(job.id, jsonStringify(job));
|
|
22
|
+
}
|
|
23
|
+
for (const [id, result] of results) {
|
|
24
|
+
await this.jobResults.set(id, jsonStringify(result));
|
|
25
|
+
}
|
|
26
|
+
});
|
|
19
27
|
}
|
|
20
28
|
async *allProvingJobs() {
|
|
21
29
|
for await (const jobStr of this.jobs.valuesAsync()) {
|
|
@@ -48,6 +56,14 @@ export class KVBrokerDatabase {
|
|
|
48
56
|
this.metrics = new LmdbMetrics(client.getMeter('KVBrokerDatabase'), {
|
|
49
57
|
[Attributes.DB_DATA_TYPE]: 'prover-broker',
|
|
50
58
|
}, () => this.estimateSize());
|
|
59
|
+
this.batchQueue = new BatchQueue((items, key) => this.commitWrites(items, key), config.proverBrokerBatchSize, config.proverBrokerJobTimeoutMs, createLogger('proving-client:proving-broker-database:batch-queue'));
|
|
60
|
+
}
|
|
61
|
+
// exposed for testing
|
|
62
|
+
async commitWrites(items, epochNumber) {
|
|
63
|
+
const jobsToAdd = items.filter((item) => 'id' in item);
|
|
64
|
+
const resultsToAdd = items.filter((item) => Array.isArray(item));
|
|
65
|
+
const db = await this.getEpochDatabase(epochNumber);
|
|
66
|
+
await db.batchWrite(jobsToAdd, resultsToAdd);
|
|
51
67
|
}
|
|
52
68
|
async estimateSize() {
|
|
53
69
|
const sizes = await Promise.all(Array.from(this.epochs.values()).map(x => x.estimateSize()));
|
|
@@ -76,9 +92,15 @@ export class KVBrokerDatabase {
|
|
|
76
92
|
const epochDb = new SingleEpochDatabase(db);
|
|
77
93
|
epochs.set(epochNumber, epochDb);
|
|
78
94
|
}
|
|
79
|
-
|
|
95
|
+
const db = new KVBrokerDatabase(epochs, config, client, logger);
|
|
96
|
+
db.start();
|
|
97
|
+
return db;
|
|
98
|
+
}
|
|
99
|
+
start() {
|
|
100
|
+
this.batchQueue.start();
|
|
80
101
|
}
|
|
81
102
|
async close() {
|
|
103
|
+
await this.batchQueue.stop();
|
|
82
104
|
for (const [_, v] of this.epochs) {
|
|
83
105
|
await v.close();
|
|
84
106
|
}
|
|
@@ -95,17 +117,8 @@ export class KVBrokerDatabase {
|
|
|
95
117
|
this.epochs.delete(old);
|
|
96
118
|
}
|
|
97
119
|
}
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
if (!epochDb) {
|
|
101
|
-
const newEpochDirectory = join(this.config.dataDirectory, job.epochNumber.toString());
|
|
102
|
-
await mkdir(newEpochDirectory, { recursive: true });
|
|
103
|
-
this.logger.info(`Creating broker database for epoch ${job.epochNumber} at ${newEpochDirectory} with map size ${this.config.dataStoreMapSizeKB}`);
|
|
104
|
-
const db = await AztecLMDBStoreV2.new(newEpochDirectory, this.config.dataStoreMapSizeKB);
|
|
105
|
-
epochDb = new SingleEpochDatabase(db);
|
|
106
|
-
this.epochs.set(job.epochNumber, epochDb);
|
|
107
|
-
}
|
|
108
|
-
await epochDb.addProvingJob(job);
|
|
120
|
+
addProvingJob(job) {
|
|
121
|
+
return this.batchQueue.put(job, job.epochNumber);
|
|
109
122
|
}
|
|
110
123
|
async *allProvingJobs() {
|
|
111
124
|
const iterators = Array.from(this.epochs.values()).map(x => x.allProvingJobs());
|
|
@@ -113,19 +126,23 @@ export class KVBrokerDatabase {
|
|
|
113
126
|
yield* it;
|
|
114
127
|
}
|
|
115
128
|
}
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
if (!epochDb) {
|
|
119
|
-
return;
|
|
120
|
-
}
|
|
121
|
-
await epochDb.setProvingJobError(id, reason);
|
|
129
|
+
setProvingJobError(id, reason) {
|
|
130
|
+
return this.batchQueue.put([id, { status: 'rejected', reason }], getEpochFromProvingJobId(id));
|
|
122
131
|
}
|
|
123
|
-
|
|
124
|
-
|
|
132
|
+
setProvingJobResult(id, value) {
|
|
133
|
+
return this.batchQueue.put([id, { status: 'fulfilled', value }], getEpochFromProvingJobId(id));
|
|
134
|
+
}
|
|
135
|
+
async getEpochDatabase(epochNumber) {
|
|
136
|
+
let epochDb = this.epochs.get(epochNumber);
|
|
125
137
|
if (!epochDb) {
|
|
126
|
-
|
|
138
|
+
const newEpochDirectory = join(this.config.dataDirectory, epochNumber.toString());
|
|
139
|
+
await mkdir(newEpochDirectory, { recursive: true });
|
|
140
|
+
this.logger.info(`Creating broker database for epoch ${epochNumber} at ${newEpochDirectory} with map size ${this.config.dataStoreMapSizeKB}`);
|
|
141
|
+
const db = await AztecLMDBStoreV2.new(newEpochDirectory, this.config.dataStoreMapSizeKB);
|
|
142
|
+
epochDb = new SingleEpochDatabase(db);
|
|
143
|
+
this.epochs.set(epochNumber, epochDb);
|
|
127
144
|
}
|
|
128
|
-
|
|
145
|
+
return epochDb;
|
|
129
146
|
}
|
|
130
147
|
}
|
|
131
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
148
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"persisted.js","sourceRoot":"","sources":["../../../src/proving_broker/proving_broker_database/persisted.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,9 +5,9 @@ import { type ProofUri, type ProvingJob, type ProvingJobId, type ProvingJobSettl
|
|
|
5
5
|
export interface ProvingBrokerDatabase {
|
|
6
6
|
/**
|
|
7
7
|
* Saves a proof request so it can be retrieved later
|
|
8
|
-
* @param
|
|
8
|
+
* @param job - The proof request to save
|
|
9
9
|
*/
|
|
10
|
-
addProvingJob(
|
|
10
|
+
addProvingJob(job: ProvingJob): Promise<void>;
|
|
11
11
|
/**
|
|
12
12
|
* Deletes all proving jobs belonging to epochs older than the given epoch
|
|
13
13
|
* @param epochNumber - The epoch number beyond which jobs should be deleted
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proving_broker_database.d.ts","sourceRoot":"","sources":["../../src/proving_broker/proving_broker_database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,UAAU,EAAE,KAAK,YAAY,EAAE,KAAK,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAEvH;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC;;;OAGG;IACH,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"proving_broker_database.d.ts","sourceRoot":"","sources":["../../src/proving_broker/proving_broker_database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,UAAU,EAAE,KAAK,YAAY,EAAE,KAAK,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAEvH;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC;;;OAGG;IACH,aAAa,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9C;;;OAGG;IACH,kCAAkC,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvE;;OAEG;IACH,cAAc,IAAI,qBAAqB,CAAC,CAAC,UAAU,EAAE,uBAAuB,GAAG,SAAS,CAAC,CAAC,CAAC;IAE3F;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtE;;;;;OAKG;IACH,kBAAkB,CAAC,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjE;;OAEG;IACH,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/prover-client",
|
|
3
|
-
"version": "0.76.
|
|
3
|
+
"version": "0.76.2",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
@@ -66,17 +66,17 @@
|
|
|
66
66
|
]
|
|
67
67
|
},
|
|
68
68
|
"dependencies": {
|
|
69
|
-
"@aztec/bb-prover": "0.76.
|
|
70
|
-
"@aztec/blob-lib": "0.76.
|
|
71
|
-
"@aztec/circuit-types": "0.76.
|
|
72
|
-
"@aztec/circuits.js": "0.76.
|
|
73
|
-
"@aztec/foundation": "0.76.
|
|
74
|
-
"@aztec/kv-store": "0.76.
|
|
75
|
-
"@aztec/noir-protocol-circuits-types": "0.76.
|
|
76
|
-
"@aztec/protocol-contracts": "0.76.
|
|
77
|
-
"@aztec/simulator": "0.76.
|
|
78
|
-
"@aztec/telemetry-client": "0.76.
|
|
79
|
-
"@aztec/world-state": "0.76.
|
|
69
|
+
"@aztec/bb-prover": "0.76.2",
|
|
70
|
+
"@aztec/blob-lib": "0.76.2",
|
|
71
|
+
"@aztec/circuit-types": "0.76.2",
|
|
72
|
+
"@aztec/circuits.js": "0.76.2",
|
|
73
|
+
"@aztec/foundation": "0.76.2",
|
|
74
|
+
"@aztec/kv-store": "0.76.2",
|
|
75
|
+
"@aztec/noir-protocol-circuits-types": "0.76.2",
|
|
76
|
+
"@aztec/protocol-contracts": "0.76.2",
|
|
77
|
+
"@aztec/simulator": "0.76.2",
|
|
78
|
+
"@aztec/telemetry-client": "0.76.2",
|
|
79
|
+
"@aztec/world-state": "0.76.2",
|
|
80
80
|
"@google-cloud/storage": "^7.15.0",
|
|
81
81
|
"@iarna/toml": "^2.2.5",
|
|
82
82
|
"@noir-lang/types": "portal:../../noir/packages/types",
|
|
@@ -15,6 +15,10 @@ export const ProverBrokerConfig = z.object({
|
|
|
15
15
|
dataDirectory: z.string().optional(),
|
|
16
16
|
/** The size of the data store map */
|
|
17
17
|
dataStoreMapSizeKB: z.number(),
|
|
18
|
+
/** The prover broker may batch jobs together before writing to the database */
|
|
19
|
+
proverBrokerBatchSize: z.number(),
|
|
20
|
+
/** How often the job batches get flushed */
|
|
21
|
+
proverBrokerBatchIntervalMs: z.number(),
|
|
18
22
|
});
|
|
19
23
|
|
|
20
24
|
export type ProverBrokerConfig = z.infer<typeof ProverBrokerConfig> &
|
|
@@ -36,6 +40,16 @@ export const proverBrokerConfigMappings: ConfigMappingsType<ProverBrokerConfig>
|
|
|
36
40
|
description: 'If starting a prover broker locally, the max number of retries per proving job',
|
|
37
41
|
...numberConfigHelper(3),
|
|
38
42
|
},
|
|
43
|
+
proverBrokerBatchSize: {
|
|
44
|
+
env: 'PROVER_BROKER_BATCH_SIZE',
|
|
45
|
+
description: 'The prover broker writes jobs to disk in batches',
|
|
46
|
+
...numberConfigHelper(100),
|
|
47
|
+
},
|
|
48
|
+
proverBrokerBatchIntervalMs: {
|
|
49
|
+
env: 'PROVER_BROKER_BATCH_INTERVAL_MS',
|
|
50
|
+
description: 'How often to flush batches to disk',
|
|
51
|
+
...numberConfigHelper(50),
|
|
52
|
+
},
|
|
39
53
|
...dataConfigMappings,
|
|
40
54
|
};
|
|
41
55
|
|
|
@@ -12,7 +12,7 @@ import {
|
|
|
12
12
|
} from '@aztec/circuit-types';
|
|
13
13
|
import { createLogger } from '@aztec/foundation/log';
|
|
14
14
|
import { type PromiseWithResolvers, RunningPromise, promiseWithResolvers } from '@aztec/foundation/promise';
|
|
15
|
-
import { PriorityMemoryQueue
|
|
15
|
+
import { PriorityMemoryQueue } from '@aztec/foundation/queue';
|
|
16
16
|
import { Timer } from '@aztec/foundation/timer';
|
|
17
17
|
import {
|
|
18
18
|
type TelemetryClient,
|
|
@@ -110,7 +110,6 @@ export class ProvingBroker implements ProvingJobProducer, ProvingJobConsumer, Tr
|
|
|
110
110
|
private epochHeight = 0;
|
|
111
111
|
private maxEpochsToKeepResultsFor = 1;
|
|
112
112
|
|
|
113
|
-
private requestQueue: SerialQueue = new SerialQueue();
|
|
114
113
|
private started = false;
|
|
115
114
|
|
|
116
115
|
public constructor(
|
|
@@ -173,8 +172,6 @@ export class ProvingBroker implements ProvingJobProducer, ProvingJobConsumer, Tr
|
|
|
173
172
|
|
|
174
173
|
this.cleanupPromise.start();
|
|
175
174
|
|
|
176
|
-
this.requestQueue.start();
|
|
177
|
-
|
|
178
175
|
this.instrumentation.monitorQueueDepth(this.measureQueueDepth);
|
|
179
176
|
this.instrumentation.monitorActiveJobs(this.countActiveJobs);
|
|
180
177
|
|
|
@@ -186,28 +183,27 @@ export class ProvingBroker implements ProvingJobProducer, ProvingJobConsumer, Tr
|
|
|
186
183
|
this.logger.warn('ProvingBroker not started');
|
|
187
184
|
return Promise.resolve();
|
|
188
185
|
}
|
|
189
|
-
await this.requestQueue.cancel();
|
|
190
186
|
await this.cleanupPromise.stop();
|
|
191
187
|
}
|
|
192
188
|
|
|
193
189
|
public enqueueProvingJob(job: ProvingJob): Promise<ProvingJobStatus> {
|
|
194
|
-
return this
|
|
190
|
+
return this.#enqueueProvingJob(job);
|
|
195
191
|
}
|
|
196
192
|
|
|
197
193
|
public cancelProvingJob(id: ProvingJobId): Promise<void> {
|
|
198
|
-
return this
|
|
194
|
+
return this.#cancelProvingJob(id);
|
|
199
195
|
}
|
|
200
196
|
|
|
201
197
|
public getProvingJobStatus(id: ProvingJobId): Promise<ProvingJobStatus> {
|
|
202
|
-
return
|
|
198
|
+
return Promise.resolve(this.#getProvingJobStatus(id));
|
|
203
199
|
}
|
|
204
200
|
|
|
205
201
|
public getCompletedJobs(ids: ProvingJobId[]): Promise<ProvingJobId[]> {
|
|
206
|
-
return this
|
|
202
|
+
return this.#getCompletedJobs(ids);
|
|
207
203
|
}
|
|
208
204
|
|
|
209
205
|
public getProvingJob(filter?: ProvingJobFilter): Promise<GetProvingJobResponse | undefined> {
|
|
210
|
-
return
|
|
206
|
+
return Promise.resolve(this.#getProvingJob(filter));
|
|
211
207
|
}
|
|
212
208
|
|
|
213
209
|
public reportProvingJobSuccess(
|
|
@@ -215,7 +211,7 @@ export class ProvingBroker implements ProvingJobProducer, ProvingJobConsumer, Tr
|
|
|
215
211
|
value: ProofUri,
|
|
216
212
|
filter?: ProvingJobFilter,
|
|
217
213
|
): Promise<GetProvingJobResponse | undefined> {
|
|
218
|
-
return this
|
|
214
|
+
return this.#reportProvingJobSuccess(id, value, filter);
|
|
219
215
|
}
|
|
220
216
|
|
|
221
217
|
public reportProvingJobError(
|
|
@@ -224,7 +220,7 @@ export class ProvingBroker implements ProvingJobProducer, ProvingJobConsumer, Tr
|
|
|
224
220
|
retry = false,
|
|
225
221
|
filter?: ProvingJobFilter,
|
|
226
222
|
): Promise<GetProvingJobResponse | undefined> {
|
|
227
|
-
return this
|
|
223
|
+
return this.#reportProvingJobError(id, err, retry, filter);
|
|
228
224
|
}
|
|
229
225
|
|
|
230
226
|
public reportProvingJobProgress(
|
|
@@ -232,19 +228,19 @@ export class ProvingBroker implements ProvingJobProducer, ProvingJobConsumer, Tr
|
|
|
232
228
|
startedAt: number,
|
|
233
229
|
filter?: ProvingJobFilter,
|
|
234
230
|
): Promise<{ job: ProvingJob; time: number } | undefined> {
|
|
235
|
-
return
|
|
231
|
+
return Promise.resolve(this.#reportProvingJobProgress(id, startedAt, filter));
|
|
236
232
|
}
|
|
237
233
|
|
|
238
234
|
async #enqueueProvingJob(job: ProvingJob): Promise<ProvingJobStatus> {
|
|
239
235
|
// We return the job status at the start of this call
|
|
240
|
-
const jobStatus =
|
|
236
|
+
const jobStatus = this.#getProvingJobStatus(job.id);
|
|
241
237
|
if (this.jobsCache.has(job.id)) {
|
|
242
238
|
const existing = this.jobsCache.get(job.id);
|
|
243
239
|
assert.deepStrictEqual(job, existing, 'Duplicate proving job ID');
|
|
244
240
|
this.logger.debug(`Duplicate proving job id=${job.id} epochNumber=${job.epochNumber}. Ignoring`, {
|
|
245
241
|
provingJobId: job.id,
|
|
246
242
|
});
|
|
247
|
-
return jobStatus;
|
|
243
|
+
return Promise.resolve(jobStatus);
|
|
248
244
|
}
|
|
249
245
|
|
|
250
246
|
if (this.isJobStale(job)) {
|
|
@@ -291,19 +287,19 @@ export class ProvingBroker implements ProvingJobProducer, ProvingJobConsumer, Tr
|
|
|
291
287
|
}
|
|
292
288
|
}
|
|
293
289
|
|
|
294
|
-
#getProvingJobStatus(id: ProvingJobId):
|
|
290
|
+
#getProvingJobStatus(id: ProvingJobId): ProvingJobStatus {
|
|
295
291
|
const result = this.resultsCache.get(id);
|
|
296
292
|
if (result) {
|
|
297
|
-
return
|
|
293
|
+
return result;
|
|
298
294
|
} else {
|
|
299
295
|
// no result yet, check if we know the item
|
|
300
296
|
const item = this.jobsCache.get(id);
|
|
301
297
|
|
|
302
298
|
if (!item) {
|
|
303
|
-
return
|
|
299
|
+
return { status: 'not-found' };
|
|
304
300
|
}
|
|
305
301
|
|
|
306
|
-
return
|
|
302
|
+
return { status: this.inProgress.has(id) ? 'in-progress' : 'in-queue' };
|
|
307
303
|
}
|
|
308
304
|
}
|
|
309
305
|
|
|
@@ -555,7 +551,7 @@ export class ProvingBroker implements ProvingJobProducer, ProvingJobConsumer, Tr
|
|
|
555
551
|
this.reEnqueueExpiredJobs();
|
|
556
552
|
const oldestEpochToKeep = this.oldestEpochToKeep();
|
|
557
553
|
if (oldestEpochToKeep > 0) {
|
|
558
|
-
await this.
|
|
554
|
+
await this.database.deleteAllProvingJobsOlderThanEpoch(oldestEpochToKeep);
|
|
559
555
|
this.logger.trace(`Deleted all epochs older than ${oldestEpochToKeep}`);
|
|
560
556
|
}
|
|
561
557
|
}
|
|
@@ -20,8 +20,8 @@ export class InMemoryBrokerDatabase implements ProvingBrokerDatabase {
|
|
|
20
20
|
return this.results.get(id);
|
|
21
21
|
}
|
|
22
22
|
|
|
23
|
-
addProvingJob(
|
|
24
|
-
this.jobs.set(
|
|
23
|
+
addProvingJob(job: ProvingJob): Promise<void> {
|
|
24
|
+
this.jobs.set(job.id, job);
|
|
25
25
|
return Promise.resolve();
|
|
26
26
|
}
|
|
27
27
|
|
|
@@ -7,6 +7,7 @@ import {
|
|
|
7
7
|
} from '@aztec/circuit-types';
|
|
8
8
|
import { jsonParseWithSchema, jsonStringify } from '@aztec/foundation/json-rpc';
|
|
9
9
|
import { type Logger, createLogger } from '@aztec/foundation/log';
|
|
10
|
+
import { BatchQueue } from '@aztec/foundation/queue';
|
|
10
11
|
import type { AztecAsyncKVStore, AztecAsyncMap } from '@aztec/kv-store';
|
|
11
12
|
import { AztecLMDBStoreV2 } from '@aztec/kv-store/lmdb-v2';
|
|
12
13
|
import { Attributes, LmdbMetrics, type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
|
|
@@ -30,8 +31,15 @@ class SingleEpochDatabase {
|
|
|
30
31
|
return this.store.estimateSize();
|
|
31
32
|
}
|
|
32
33
|
|
|
33
|
-
async
|
|
34
|
-
await this.
|
|
34
|
+
async batchWrite(jobs: ProvingJob[], results: Array<[ProvingJobId, ProvingJobSettledResult]>) {
|
|
35
|
+
await this.store.transactionAsync(async () => {
|
|
36
|
+
for (const job of jobs) {
|
|
37
|
+
await this.jobs.set(job.id, jsonStringify(job));
|
|
38
|
+
}
|
|
39
|
+
for (const [id, result] of results) {
|
|
40
|
+
await this.jobResults.set(id, jsonStringify(result));
|
|
41
|
+
}
|
|
42
|
+
});
|
|
35
43
|
}
|
|
36
44
|
|
|
37
45
|
async *allProvingJobs(): AsyncIterableIterator<[ProvingJob, ProvingJobSettledResult | undefined]> {
|
|
@@ -65,6 +73,8 @@ class SingleEpochDatabase {
|
|
|
65
73
|
export class KVBrokerDatabase implements ProvingBrokerDatabase {
|
|
66
74
|
private metrics: LmdbMetrics;
|
|
67
75
|
|
|
76
|
+
private batchQueue: BatchQueue<ProvingJob | [ProvingJobId, ProvingJobSettledResult], number>;
|
|
77
|
+
|
|
68
78
|
private constructor(
|
|
69
79
|
private epochs: Map<number, SingleEpochDatabase>,
|
|
70
80
|
private config: ProverBrokerConfig,
|
|
@@ -78,6 +88,22 @@ export class KVBrokerDatabase implements ProvingBrokerDatabase {
|
|
|
78
88
|
},
|
|
79
89
|
() => this.estimateSize(),
|
|
80
90
|
);
|
|
91
|
+
|
|
92
|
+
this.batchQueue = new BatchQueue(
|
|
93
|
+
(items, key) => this.commitWrites(items, key),
|
|
94
|
+
config.proverBrokerBatchSize,
|
|
95
|
+
config.proverBrokerJobTimeoutMs,
|
|
96
|
+
createLogger('proving-client:proving-broker-database:batch-queue'),
|
|
97
|
+
);
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
// exposed for testing
|
|
101
|
+
public async commitWrites(items: Array<ProvingJob | [ProvingJobId, ProvingJobSettledResult]>, epochNumber: number) {
|
|
102
|
+
const jobsToAdd = items.filter((item): item is ProvingJob => 'id' in item);
|
|
103
|
+
const resultsToAdd = items.filter((item): item is [ProvingJobId, ProvingJobSettledResult] => Array.isArray(item));
|
|
104
|
+
|
|
105
|
+
const db = await this.getEpochDatabase(epochNumber);
|
|
106
|
+
await db.batchWrite(jobsToAdd, resultsToAdd);
|
|
81
107
|
}
|
|
82
108
|
|
|
83
109
|
private async estimateSize() {
|
|
@@ -114,10 +140,17 @@ export class KVBrokerDatabase implements ProvingBrokerDatabase {
|
|
|
114
140
|
const epochDb = new SingleEpochDatabase(db);
|
|
115
141
|
epochs.set(epochNumber, epochDb);
|
|
116
142
|
}
|
|
117
|
-
|
|
143
|
+
const db = new KVBrokerDatabase(epochs, config, client, logger);
|
|
144
|
+
db.start();
|
|
145
|
+
return db;
|
|
146
|
+
}
|
|
147
|
+
|
|
148
|
+
private start(): void {
|
|
149
|
+
this.batchQueue.start();
|
|
118
150
|
}
|
|
119
151
|
|
|
120
152
|
async close(): Promise<void> {
|
|
153
|
+
await this.batchQueue.stop();
|
|
121
154
|
for (const [_, v] of this.epochs) {
|
|
122
155
|
await v.close();
|
|
123
156
|
}
|
|
@@ -136,19 +169,8 @@ export class KVBrokerDatabase implements ProvingBrokerDatabase {
|
|
|
136
169
|
}
|
|
137
170
|
}
|
|
138
171
|
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
if (!epochDb) {
|
|
142
|
-
const newEpochDirectory = join(this.config.dataDirectory!, job.epochNumber.toString());
|
|
143
|
-
await mkdir(newEpochDirectory, { recursive: true });
|
|
144
|
-
this.logger.info(
|
|
145
|
-
`Creating broker database for epoch ${job.epochNumber} at ${newEpochDirectory} with map size ${this.config.dataStoreMapSizeKB}`,
|
|
146
|
-
);
|
|
147
|
-
const db = await AztecLMDBStoreV2.new(newEpochDirectory, this.config.dataStoreMapSizeKB);
|
|
148
|
-
epochDb = new SingleEpochDatabase(db);
|
|
149
|
-
this.epochs.set(job.epochNumber, epochDb);
|
|
150
|
-
}
|
|
151
|
-
await epochDb.addProvingJob(job);
|
|
172
|
+
addProvingJob(job: ProvingJob): Promise<void> {
|
|
173
|
+
return this.batchQueue.put(job, job.epochNumber);
|
|
152
174
|
}
|
|
153
175
|
|
|
154
176
|
async *allProvingJobs(): AsyncIterableIterator<[ProvingJob, ProvingJobSettledResult | undefined]> {
|
|
@@ -158,19 +180,27 @@ export class KVBrokerDatabase implements ProvingBrokerDatabase {
|
|
|
158
180
|
}
|
|
159
181
|
}
|
|
160
182
|
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
if (!epochDb) {
|
|
164
|
-
return;
|
|
165
|
-
}
|
|
166
|
-
await epochDb.setProvingJobError(id, reason);
|
|
183
|
+
setProvingJobError(id: ProvingJobId, reason: string): Promise<void> {
|
|
184
|
+
return this.batchQueue.put([id, { status: 'rejected', reason }], getEpochFromProvingJobId(id));
|
|
167
185
|
}
|
|
168
186
|
|
|
169
|
-
|
|
170
|
-
|
|
187
|
+
setProvingJobResult(id: ProvingJobId, value: ProofUri): Promise<void> {
|
|
188
|
+
return this.batchQueue.put([id, { status: 'fulfilled', value }], getEpochFromProvingJobId(id));
|
|
189
|
+
}
|
|
190
|
+
|
|
191
|
+
private async getEpochDatabase(epochNumber: number): Promise<SingleEpochDatabase> {
|
|
192
|
+
let epochDb = this.epochs.get(epochNumber);
|
|
171
193
|
if (!epochDb) {
|
|
172
|
-
|
|
194
|
+
const newEpochDirectory = join(this.config.dataDirectory!, epochNumber.toString());
|
|
195
|
+
await mkdir(newEpochDirectory, { recursive: true });
|
|
196
|
+
this.logger.info(
|
|
197
|
+
`Creating broker database for epoch ${epochNumber} at ${newEpochDirectory} with map size ${this.config.dataStoreMapSizeKB}`,
|
|
198
|
+
);
|
|
199
|
+
const db = await AztecLMDBStoreV2.new(newEpochDirectory, this.config.dataStoreMapSizeKB);
|
|
200
|
+
epochDb = new SingleEpochDatabase(db);
|
|
201
|
+
this.epochs.set(epochNumber, epochDb);
|
|
173
202
|
}
|
|
174
|
-
|
|
203
|
+
|
|
204
|
+
return epochDb;
|
|
175
205
|
}
|
|
176
206
|
}
|
|
@@ -6,9 +6,9 @@ import { type ProofUri, type ProvingJob, type ProvingJobId, type ProvingJobSettl
|
|
|
6
6
|
export interface ProvingBrokerDatabase {
|
|
7
7
|
/**
|
|
8
8
|
* Saves a proof request so it can be retrieved later
|
|
9
|
-
* @param
|
|
9
|
+
* @param job - The proof request to save
|
|
10
10
|
*/
|
|
11
|
-
addProvingJob(
|
|
11
|
+
addProvingJob(job: ProvingJob): Promise<void>;
|
|
12
12
|
|
|
13
13
|
/**
|
|
14
14
|
* Deletes all proving jobs belonging to epochs older than the given epoch
|