@aztec/prover-node 0.69.0 → 0.69.1-devnet
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/config.d.ts +4 -1
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +17 -2
- package/dest/factory.d.ts +2 -0
- package/dest/factory.d.ts.map +1 -1
- package/dest/factory.js +8 -3
- package/dest/job/epoch-proving-job.d.ts +9 -4
- package/dest/job/epoch-proving-job.d.ts.map +1 -1
- package/dest/job/epoch-proving-job.js +72 -25
- package/dest/metrics.d.ts +2 -2
- package/dest/metrics.d.ts.map +1 -1
- package/dest/metrics.js +9 -4
- package/dest/prover-node.d.ts +23 -15
- package/dest/prover-node.d.ts.map +1 -1
- package/dest/prover-node.js +93 -14
- package/dest/test/index.d.ts +10 -0
- package/dest/test/index.d.ts.map +1 -0
- package/dest/test/index.js +4 -0
- package/package.json +20 -18
- package/src/config.ts +24 -6
- package/src/factory.ts +8 -2
- package/src/job/epoch-proving-job.ts +84 -36
- package/src/metrics.ts +9 -4
- package/src/prover-node.ts +130 -25
- package/src/test/index.ts +11 -0
package/dest/prover-node.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
import { __esDecorate, __runInitializers } from "tslib";
|
|
2
|
-
import { EpochProofQuotePayload, tryStop, } from '@aztec/circuit-types';
|
|
2
|
+
import { EpochProofQuotePayload, getTimestampRangeForEpoch, tryStop, } from '@aztec/circuit-types';
|
|
3
|
+
import { asyncPool } from '@aztec/foundation/async-pool';
|
|
3
4
|
import { compact } from '@aztec/foundation/collection';
|
|
5
|
+
import { memoize } from '@aztec/foundation/decorators';
|
|
6
|
+
import { TimeoutError } from '@aztec/foundation/error';
|
|
4
7
|
import { createLogger } from '@aztec/foundation/log';
|
|
8
|
+
import { retryUntil } from '@aztec/foundation/retry';
|
|
5
9
|
import { DateProvider } from '@aztec/foundation/timer';
|
|
6
10
|
import { PublicProcessorFactory } from '@aztec/simulator';
|
|
7
11
|
import { Attributes, trackSpan } from '@aztec/telemetry-client';
|
|
@@ -17,6 +21,8 @@ let ProverNode = (() => {
|
|
|
17
21
|
var _a;
|
|
18
22
|
let _instanceExtraInitializers = [];
|
|
19
23
|
let _createProvingJob_decorators;
|
|
24
|
+
let _getL1Constants_decorators;
|
|
25
|
+
let _gatherEpochData_decorators;
|
|
20
26
|
return _a = class ProverNode {
|
|
21
27
|
constructor(prover, publisher, l2BlockSource, l1ToL2MessageSource, contractDataSource, worldState, coordination, quoteProvider, quoteSigner, claimsMonitor, epochsMonitor, bondManager, telemetryClient, options = {}) {
|
|
22
28
|
this.prover = (__runInitializers(this, _instanceExtraInitializers), prover);
|
|
@@ -35,10 +41,14 @@ let ProverNode = (() => {
|
|
|
35
41
|
this.log = createLogger('prover-node');
|
|
36
42
|
this.dateProvider = new DateProvider();
|
|
37
43
|
this.jobs = new Map();
|
|
44
|
+
this.cachedEpochData = undefined;
|
|
38
45
|
this.options = {
|
|
39
46
|
pollingIntervalMs: 1000,
|
|
40
47
|
maxPendingJobs: 100,
|
|
41
48
|
maxParallelBlocksPerEpoch: 32,
|
|
49
|
+
txGatheringTimeoutMs: 60000,
|
|
50
|
+
txGatheringIntervalMs: 1000,
|
|
51
|
+
txGatheringMaxParallelRequests: 100,
|
|
42
52
|
...compact(options),
|
|
43
53
|
};
|
|
44
54
|
this.metrics = new ProverNodeMetrics(telemetryClient, 'ProverNode');
|
|
@@ -99,12 +109,11 @@ let ProverNode = (() => {
|
|
|
99
109
|
*/
|
|
100
110
|
async handleEpochCompleted(epochNumber) {
|
|
101
111
|
try {
|
|
112
|
+
// Gather data for the epoch
|
|
113
|
+
const epochData = await this.gatherEpochData(epochNumber);
|
|
114
|
+
const { blocks } = epochData;
|
|
115
|
+
this.cachedEpochData = { epochNumber, ...epochData };
|
|
102
116
|
// Construct a quote for the epoch
|
|
103
|
-
const blocks = await this.l2BlockSource.getBlocksForEpoch(epochNumber);
|
|
104
|
-
if (blocks.length === 0) {
|
|
105
|
-
this.log.info(`No blocks found for epoch ${epochNumber}`);
|
|
106
|
-
return;
|
|
107
|
-
}
|
|
108
117
|
const partialQuote = await this.quoteProvider.getQuote(Number(epochNumber), blocks);
|
|
109
118
|
if (!partialQuote) {
|
|
110
119
|
this.log.info(`No quote produced for epoch ${epochNumber}`);
|
|
@@ -198,10 +207,8 @@ let ProverNode = (() => {
|
|
|
198
207
|
throw new Error(`Maximum pending proving jobs ${this.options.maxPendingJobs} reached. Cannot create new job.`);
|
|
199
208
|
}
|
|
200
209
|
// Gather blocks for this epoch
|
|
201
|
-
const
|
|
202
|
-
|
|
203
|
-
throw new Error(`No blocks found for epoch ${epochNumber}`);
|
|
204
|
-
}
|
|
210
|
+
const cachedEpochData = this.cachedEpochData?.epochNumber === epochNumber ? this.cachedEpochData : undefined;
|
|
211
|
+
const { blocks, txs } = cachedEpochData ?? (await this.gatherEpochData(epochNumber));
|
|
205
212
|
const fromBlock = blocks[0].number;
|
|
206
213
|
const toBlock = blocks.at(-1).number;
|
|
207
214
|
// Fast forward world state to right before the target block and get a fork
|
|
@@ -213,13 +220,81 @@ let ProverNode = (() => {
|
|
|
213
220
|
this.jobs.delete(job.getId());
|
|
214
221
|
return Promise.resolve();
|
|
215
222
|
};
|
|
216
|
-
const
|
|
223
|
+
const [_, endTimestamp] = getTimestampRangeForEpoch(epochNumber + 1n, await this.getL1Constants());
|
|
224
|
+
const deadline = new Date(Number(endTimestamp) * 1000);
|
|
225
|
+
const job = this.doCreateEpochProvingJob(epochNumber, deadline, blocks, txs, publicProcessorFactory, cleanUp);
|
|
217
226
|
this.jobs.set(job.getId(), job);
|
|
218
227
|
return job;
|
|
219
228
|
}
|
|
229
|
+
getL1Constants() {
|
|
230
|
+
return this.l2BlockSource.getL1Constants();
|
|
231
|
+
}
|
|
232
|
+
async gatherEpochData(epochNumber) {
|
|
233
|
+
// Gather blocks for this epoch and their txs
|
|
234
|
+
const blocks = await this.gatherBlocks(epochNumber);
|
|
235
|
+
const txs = await this.gatherTxs(epochNumber, blocks);
|
|
236
|
+
return { blocks, txs };
|
|
237
|
+
}
|
|
238
|
+
async gatherBlocks(epochNumber) {
|
|
239
|
+
const blocks = await this.l2BlockSource.getBlocksForEpoch(epochNumber);
|
|
240
|
+
if (blocks.length === 0) {
|
|
241
|
+
throw new Error(`No blocks found for epoch ${epochNumber}`);
|
|
242
|
+
}
|
|
243
|
+
return blocks;
|
|
244
|
+
}
|
|
245
|
+
async gatherTxs(epochNumber, blocks) {
|
|
246
|
+
let txsToFind = [];
|
|
247
|
+
const txHashToBlock = new Map();
|
|
248
|
+
const results = new Map();
|
|
249
|
+
for (const block of blocks) {
|
|
250
|
+
for (const tx of block.body.txEffects) {
|
|
251
|
+
txsToFind.push(tx.txHash);
|
|
252
|
+
txHashToBlock.set(tx.txHash.toString(), block.number);
|
|
253
|
+
}
|
|
254
|
+
}
|
|
255
|
+
const totalTxsRequired = txsToFind.length;
|
|
256
|
+
this.log.info(`Gathering a total of ${totalTxsRequired} txs for epoch=${epochNumber} made up of ${blocks.length} blocks`, { epochNumber });
|
|
257
|
+
let iteration = 0;
|
|
258
|
+
try {
|
|
259
|
+
await retryUntil(async () => {
|
|
260
|
+
const batch = [...txsToFind];
|
|
261
|
+
txsToFind = [];
|
|
262
|
+
const batchResults = await asyncPool(this.options.txGatheringMaxParallelRequests, batch, async (txHash) => {
|
|
263
|
+
const tx = await this.coordination.getTxByHash(txHash);
|
|
264
|
+
return [txHash, tx];
|
|
265
|
+
});
|
|
266
|
+
let found = 0;
|
|
267
|
+
for (const [txHash, maybeTx] of batchResults) {
|
|
268
|
+
if (maybeTx) {
|
|
269
|
+
found++;
|
|
270
|
+
results.set(txHash.toString(), maybeTx);
|
|
271
|
+
}
|
|
272
|
+
else {
|
|
273
|
+
txsToFind.push(txHash);
|
|
274
|
+
}
|
|
275
|
+
}
|
|
276
|
+
this.log.verbose(`Gathered ${found}/${batch.length} txs in iteration ${iteration} for epoch ${epochNumber}. In total ${results.size}/${totalTxsRequired} have been retrieved.`, { epochNumber });
|
|
277
|
+
iteration++;
|
|
278
|
+
// stop when we found all transactions
|
|
279
|
+
return txsToFind.length === 0;
|
|
280
|
+
}, 'Gather txs', this.options.txGatheringTimeoutMs / 1000, this.options.txGatheringIntervalMs / 1000);
|
|
281
|
+
}
|
|
282
|
+
catch (err) {
|
|
283
|
+
if (err && err instanceof TimeoutError) {
|
|
284
|
+
const notFoundList = txsToFind
|
|
285
|
+
.map(txHash => `${txHash.toString()} (block ${txHashToBlock.get(txHash.toString())})`)
|
|
286
|
+
.join(', ');
|
|
287
|
+
throw new Error(`Txs not found for epoch ${epochNumber}: ${notFoundList}`);
|
|
288
|
+
}
|
|
289
|
+
else {
|
|
290
|
+
throw err;
|
|
291
|
+
}
|
|
292
|
+
}
|
|
293
|
+
return Array.from(results.values());
|
|
294
|
+
}
|
|
220
295
|
/** Extracted for testing purposes. */
|
|
221
|
-
doCreateEpochProvingJob(epochNumber, blocks, publicProcessorFactory, cleanUp) {
|
|
222
|
-
return new EpochProvingJob(this.worldState, epochNumber, blocks, this.prover.createEpochProver(), publicProcessorFactory, this.publisher, this.l2BlockSource, this.l1ToL2MessageSource, this.
|
|
296
|
+
doCreateEpochProvingJob(epochNumber, deadline, blocks, txs, publicProcessorFactory, cleanUp) {
|
|
297
|
+
return new EpochProvingJob(this.worldState, epochNumber, blocks, txs, this.prover.createEpochProver(), publicProcessorFactory, this.publisher, this.l2BlockSource, this.l1ToL2MessageSource, this.metrics, deadline, { parallelBlockLimit: this.options.maxParallelBlocksPerEpoch }, cleanUp);
|
|
223
298
|
}
|
|
224
299
|
/** Extracted for testing purposes. */
|
|
225
300
|
async triggerMonitors() {
|
|
@@ -230,10 +305,14 @@ let ProverNode = (() => {
|
|
|
230
305
|
(() => {
|
|
231
306
|
const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
|
|
232
307
|
_createProvingJob_decorators = [trackSpan('ProverNode.createProvingJob', epochNumber => ({ [Attributes.EPOCH_NUMBER]: Number(epochNumber) }))];
|
|
308
|
+
_getL1Constants_decorators = [memoize];
|
|
309
|
+
_gatherEpochData_decorators = [trackSpan('ProverNode.gatherEpochData', epochNumber => ({ [Attributes.EPOCH_NUMBER]: Number(epochNumber) }))];
|
|
233
310
|
__esDecorate(_a, null, _createProvingJob_decorators, { kind: "method", name: "createProvingJob", static: false, private: false, access: { has: obj => "createProvingJob" in obj, get: obj => obj.createProvingJob }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
311
|
+
__esDecorate(_a, null, _getL1Constants_decorators, { kind: "method", name: "getL1Constants", static: false, private: false, access: { has: obj => "getL1Constants" in obj, get: obj => obj.getL1Constants }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
312
|
+
__esDecorate(_a, null, _gatherEpochData_decorators, { kind: "method", name: "gatherEpochData", static: false, private: false, access: { has: obj => "gatherEpochData" in obj, get: obj => obj.gatherEpochData }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
234
313
|
if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
|
|
235
314
|
})(),
|
|
236
315
|
_a;
|
|
237
316
|
})();
|
|
238
317
|
export { ProverNode };
|
|
239
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"prover-node.js","sourceRoot":"","sources":["../src/prover-node.ts"],"names":[],"mappings":"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"}
|
|
318
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"prover-node.js","sourceRoot":"","sources":["../src/prover-node.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { type EpochProverManager } from '@aztec/circuit-types';
|
|
2
|
+
import { type L1Publisher } from '@aztec/sequencer-client';
|
|
3
|
+
import { ProverNode } from '../prover-node.js';
|
|
4
|
+
declare class TestProverNode_ extends ProverNode {
|
|
5
|
+
prover: EpochProverManager;
|
|
6
|
+
publisher: L1Publisher;
|
|
7
|
+
}
|
|
8
|
+
export type TestProverNode = TestProverNode_;
|
|
9
|
+
export {};
|
|
10
|
+
//# sourceMappingURL=index.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,cAAM,eAAgB,SAAQ,UAAU;IACtB,MAAM,EAAG,kBAAkB,CAAC;IAC5B,SAAS,EAAG,WAAW,CAAC;CACzC;AAED,MAAM,MAAM,cAAc,GAAG,eAAe,CAAC"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { ProverNode } from '../prover-node.js';
|
|
2
|
+
class TestProverNode_ extends ProverNode {
|
|
3
|
+
}
|
|
4
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFL0MsTUFBTSxlQUFnQixTQUFRLFVBQVU7Q0FHdkMifQ==
|
package/package.json
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/prover-node",
|
|
3
|
-
"version": "0.69.
|
|
3
|
+
"version": "0.69.1-devnet",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
7
|
-
"./config": "./dest/config.js"
|
|
7
|
+
"./config": "./dest/config.js",
|
|
8
|
+
"./test": "./dest/test/index.js"
|
|
8
9
|
},
|
|
9
10
|
"inherits": [
|
|
10
11
|
"../package.common.json"
|
|
@@ -52,22 +53,23 @@
|
|
|
52
53
|
]
|
|
53
54
|
},
|
|
54
55
|
"dependencies": {
|
|
55
|
-
"@aztec/archiver": "0.69.
|
|
56
|
-
"@aztec/bb-prover": "0.69.
|
|
57
|
-
"@aztec/
|
|
58
|
-
"@aztec/
|
|
59
|
-
"@aztec/
|
|
60
|
-
"@aztec/
|
|
61
|
-
"@aztec/
|
|
62
|
-
"@aztec/
|
|
63
|
-
"@aztec/
|
|
64
|
-
"@aztec/
|
|
65
|
-
"@aztec/
|
|
66
|
-
"@aztec/
|
|
67
|
-
"@aztec/
|
|
68
|
-
"@aztec/
|
|
69
|
-
"@aztec/
|
|
70
|
-
"@aztec/
|
|
56
|
+
"@aztec/archiver": "0.69.1-devnet",
|
|
57
|
+
"@aztec/bb-prover": "0.69.1-devnet",
|
|
58
|
+
"@aztec/blob-sink": "0.69.1-devnet",
|
|
59
|
+
"@aztec/circuit-types": "0.69.1-devnet",
|
|
60
|
+
"@aztec/circuits.js": "0.69.1-devnet",
|
|
61
|
+
"@aztec/epoch-cache": "0.69.1-devnet",
|
|
62
|
+
"@aztec/ethereum": "0.69.1-devnet",
|
|
63
|
+
"@aztec/foundation": "0.69.1-devnet",
|
|
64
|
+
"@aztec/kv-store": "0.69.1-devnet",
|
|
65
|
+
"@aztec/l1-artifacts": "0.69.1-devnet",
|
|
66
|
+
"@aztec/p2p": "0.69.1-devnet",
|
|
67
|
+
"@aztec/prover-client": "0.69.1-devnet",
|
|
68
|
+
"@aztec/sequencer-client": "0.69.1-devnet",
|
|
69
|
+
"@aztec/simulator": "0.69.1-devnet",
|
|
70
|
+
"@aztec/telemetry-client": "0.69.1-devnet",
|
|
71
|
+
"@aztec/types": "0.69.1-devnet",
|
|
72
|
+
"@aztec/world-state": "0.69.1-devnet",
|
|
71
73
|
"source-map-support": "^0.5.21",
|
|
72
74
|
"tslib": "^2.4.0",
|
|
73
75
|
"viem": "^2.7.15"
|
package/src/config.ts
CHANGED
|
@@ -1,11 +1,5 @@
|
|
|
1
1
|
import { type ArchiverConfig, archiverConfigMappings, getArchiverConfigFromEnv } from '@aztec/archiver/config';
|
|
2
2
|
import { type ACVMConfig, type BBConfig } from '@aztec/bb-prover/config';
|
|
3
|
-
import {
|
|
4
|
-
type ProverAgentConfig,
|
|
5
|
-
type ProverBrokerConfig,
|
|
6
|
-
proverAgentConfigMappings,
|
|
7
|
-
proverBrokerConfigMappings,
|
|
8
|
-
} from '@aztec/circuit-types/config';
|
|
9
3
|
import {
|
|
10
4
|
type ConfigMappingsType,
|
|
11
5
|
bigintConfigHelper,
|
|
@@ -14,6 +8,12 @@ import {
|
|
|
14
8
|
} from '@aztec/foundation/config';
|
|
15
9
|
import { type DataStoreConfig, dataConfigMappings, getDataConfigFromEnv } from '@aztec/kv-store/config';
|
|
16
10
|
import { type P2PConfig, getP2PConfigFromEnv, p2pConfigMappings } from '@aztec/p2p/config';
|
|
11
|
+
import {
|
|
12
|
+
type ProverAgentConfig,
|
|
13
|
+
type ProverBrokerConfig,
|
|
14
|
+
proverAgentConfigMappings,
|
|
15
|
+
proverBrokerConfigMappings,
|
|
16
|
+
} from '@aztec/prover-client/broker';
|
|
17
17
|
import {
|
|
18
18
|
type ProverClientConfig,
|
|
19
19
|
bbConfigMappings,
|
|
@@ -53,6 +53,9 @@ type SpecificProverNodeConfig = {
|
|
|
53
53
|
proverNodeMaxPendingJobs: number;
|
|
54
54
|
proverNodePollingIntervalMs: number;
|
|
55
55
|
proverNodeMaxParallelBlocksPerEpoch: number;
|
|
56
|
+
txGatheringTimeoutMs: number;
|
|
57
|
+
txGatheringIntervalMs: number;
|
|
58
|
+
txGatheringMaxParallelRequests: number;
|
|
56
59
|
};
|
|
57
60
|
|
|
58
61
|
export type QuoteProviderConfig = {
|
|
@@ -77,6 +80,21 @@ const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeCon
|
|
|
77
80
|
description: 'The Maximum number of blocks to process in parallel while proving an epoch',
|
|
78
81
|
...numberConfigHelper(32),
|
|
79
82
|
},
|
|
83
|
+
txGatheringTimeoutMs: {
|
|
84
|
+
env: 'PROVER_NODE_TX_GATHERING_TIMEOUT_MS',
|
|
85
|
+
description: 'The maximum amount of time to wait for tx data to be available',
|
|
86
|
+
...numberConfigHelper(60_000),
|
|
87
|
+
},
|
|
88
|
+
txGatheringIntervalMs: {
|
|
89
|
+
env: 'PROVER_NODE_TX_GATHERING_INTERVAL_MS',
|
|
90
|
+
description: 'How often to check that tx data is available',
|
|
91
|
+
...numberConfigHelper(1_000),
|
|
92
|
+
},
|
|
93
|
+
txGatheringMaxParallelRequests: {
|
|
94
|
+
env: 'PROVER_NODE_TX_GATHERING_MAX_PARALLEL_REQUESTS',
|
|
95
|
+
description: 'How many txs to load up a time',
|
|
96
|
+
...numberConfigHelper(100),
|
|
97
|
+
},
|
|
80
98
|
};
|
|
81
99
|
|
|
82
100
|
const quoteProviderConfigMappings: ConfigMappingsType<QuoteProviderConfig> = {
|
package/src/factory.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { type Archiver, createArchiver } from '@aztec/archiver';
|
|
2
|
+
import { type BlobSinkClientInterface, createBlobSinkClient } from '@aztec/blob-sink/client';
|
|
2
3
|
import { type ProverCoordination, type ProvingJobBroker } from '@aztec/circuit-types';
|
|
3
4
|
import { EpochCache } from '@aztec/epoch-cache';
|
|
4
5
|
import { createEthereumChain } from '@aztec/ethereum';
|
|
@@ -34,12 +35,14 @@ export async function createProverNode(
|
|
|
34
35
|
aztecNodeTxProvider?: ProverCoordination;
|
|
35
36
|
archiver?: Archiver;
|
|
36
37
|
publisher?: L1Publisher;
|
|
38
|
+
blobSinkClient?: BlobSinkClientInterface;
|
|
37
39
|
broker?: ProvingJobBroker;
|
|
38
40
|
} = {},
|
|
39
41
|
) {
|
|
40
42
|
const telemetry = deps.telemetry ?? new NoopTelemetryClient();
|
|
43
|
+
const blobSinkClient = deps.blobSinkClient ?? createBlobSinkClient(config.blobSinkUrl);
|
|
41
44
|
const log = deps.log ?? createLogger('prover-node');
|
|
42
|
-
const archiver = deps.archiver ?? (await createArchiver(config, telemetry, { blockUntilSync: true }));
|
|
45
|
+
const archiver = deps.archiver ?? (await createArchiver(config, blobSinkClient, telemetry, { blockUntilSync: true }));
|
|
43
46
|
log.verbose(`Created archiver and synced to block ${await archiver.getBlockNumber()}`);
|
|
44
47
|
|
|
45
48
|
const worldStateConfig = { ...config, worldStateProvenBlocksOnly: false };
|
|
@@ -50,7 +53,7 @@ export async function createProverNode(
|
|
|
50
53
|
const prover = await createProverClient(config, worldStateSynchronizer, broker, telemetry);
|
|
51
54
|
|
|
52
55
|
// REFACTOR: Move publisher out of sequencer package and into an L1-related package
|
|
53
|
-
const publisher = deps.publisher ?? new L1Publisher(config, telemetry);
|
|
56
|
+
const publisher = deps.publisher ?? new L1Publisher(config, { telemetry, blobSinkClient });
|
|
54
57
|
|
|
55
58
|
const epochCache = await EpochCache.create(config.l1Contracts.rollupAddress, config);
|
|
56
59
|
|
|
@@ -71,6 +74,9 @@ export async function createProverNode(
|
|
|
71
74
|
maxPendingJobs: config.proverNodeMaxPendingJobs,
|
|
72
75
|
pollingIntervalMs: config.proverNodePollingIntervalMs,
|
|
73
76
|
maxParallelBlocksPerEpoch: config.proverNodeMaxParallelBlocksPerEpoch,
|
|
77
|
+
txGatheringMaxParallelRequests: config.txGatheringMaxParallelRequests,
|
|
78
|
+
txGatheringIntervalMs: config.txGatheringIntervalMs,
|
|
79
|
+
txGatheringTimeoutMs: config.txGatheringTimeoutMs,
|
|
74
80
|
};
|
|
75
81
|
|
|
76
82
|
const claimsMonitor = new ClaimsMonitor(publisher, telemetry, proverNodeConfig);
|
|
@@ -1,15 +1,13 @@
|
|
|
1
1
|
import {
|
|
2
|
-
EmptyTxValidator,
|
|
3
2
|
type EpochProver,
|
|
4
3
|
type EpochProvingJobState,
|
|
4
|
+
EpochProvingJobTerminalState,
|
|
5
5
|
type ForkMerkleTreeOperations,
|
|
6
6
|
type L1ToL2MessageSource,
|
|
7
7
|
type L2Block,
|
|
8
8
|
type L2BlockSource,
|
|
9
9
|
type ProcessedTx,
|
|
10
|
-
type ProverCoordination,
|
|
11
10
|
type Tx,
|
|
12
|
-
type TxHash,
|
|
13
11
|
} from '@aztec/circuit-types';
|
|
14
12
|
import { asyncPool } from '@aztec/foundation/async-pool';
|
|
15
13
|
import { createLogger } from '@aztec/foundation/log';
|
|
@@ -34,6 +32,7 @@ export class EpochProvingJob implements Traceable {
|
|
|
34
32
|
private uuid: string;
|
|
35
33
|
|
|
36
34
|
private runPromise: Promise<void> | undefined;
|
|
35
|
+
private deadlineTimeoutHandler: NodeJS.Timeout | undefined;
|
|
37
36
|
|
|
38
37
|
public readonly tracer: Tracer;
|
|
39
38
|
|
|
@@ -41,13 +40,14 @@ export class EpochProvingJob implements Traceable {
|
|
|
41
40
|
private dbProvider: ForkMerkleTreeOperations,
|
|
42
41
|
private epochNumber: bigint,
|
|
43
42
|
private blocks: L2Block[],
|
|
43
|
+
private txs: Tx[],
|
|
44
44
|
private prover: EpochProver,
|
|
45
45
|
private publicProcessorFactory: PublicProcessorFactory,
|
|
46
46
|
private publisher: L1Publisher,
|
|
47
47
|
private l2BlockSource: L2BlockSource,
|
|
48
48
|
private l1ToL2MessageSource: L1ToL2MessageSource,
|
|
49
|
-
private coordination: ProverCoordination,
|
|
50
49
|
private metrics: ProverNodeMetrics,
|
|
50
|
+
private deadline: Date | undefined,
|
|
51
51
|
private config: { parallelBlockLimit: number } = { parallelBlockLimit: 32 },
|
|
52
52
|
private cleanUp: (job: EpochProvingJob) => Promise<void> = () => Promise.resolve(),
|
|
53
53
|
) {
|
|
@@ -70,9 +70,11 @@ export class EpochProvingJob implements Traceable {
|
|
|
70
70
|
return { [Attributes.EPOCH_NUMBER]: Number(this.epochNumber) };
|
|
71
71
|
})
|
|
72
72
|
public async run() {
|
|
73
|
+
this.scheduleDeadlineStop();
|
|
74
|
+
|
|
73
75
|
const epochNumber = Number(this.epochNumber);
|
|
74
76
|
const epochSizeBlocks = this.blocks.length;
|
|
75
|
-
const epochSizeTxs = this.blocks.reduce((total, current) => total + current.body.
|
|
77
|
+
const epochSizeTxs = this.blocks.reduce((total, current) => total + current.body.txEffects.length, 0);
|
|
76
78
|
const [fromBlock, toBlock] = [this.blocks[0].number, this.blocks.at(-1)!.number];
|
|
77
79
|
this.log.info(`Starting epoch ${epochNumber} proving job with blocks ${fromBlock} to ${toBlock}`, {
|
|
78
80
|
fromBlock,
|
|
@@ -81,21 +83,22 @@ export class EpochProvingJob implements Traceable {
|
|
|
81
83
|
epochNumber,
|
|
82
84
|
uuid: this.uuid,
|
|
83
85
|
});
|
|
84
|
-
this.state = 'processing';
|
|
85
|
-
const timer = new Timer();
|
|
86
86
|
|
|
87
|
+
this.progressState('processing');
|
|
88
|
+
const timer = new Timer();
|
|
87
89
|
const { promise, resolve } = promiseWithResolvers<void>();
|
|
88
90
|
this.runPromise = promise;
|
|
89
91
|
|
|
90
92
|
try {
|
|
91
93
|
this.prover.startNewEpoch(epochNumber, fromBlock, epochSizeBlocks);
|
|
94
|
+
this.prover.startTubeCircuits(this.txs);
|
|
92
95
|
|
|
93
96
|
await asyncPool(this.config.parallelBlockLimit, this.blocks, async block => {
|
|
97
|
+
this.checkState();
|
|
98
|
+
|
|
94
99
|
const globalVariables = block.header.globalVariables;
|
|
95
|
-
const
|
|
96
|
-
const txCount = block.body.numberOfTxsIncludingPadded;
|
|
100
|
+
const txs = this.getTxs(block);
|
|
97
101
|
const l1ToL2Messages = await this.getL1ToL2Messages(block);
|
|
98
|
-
const txs = await this.getTxs(txHashes, block.number);
|
|
99
102
|
const previousHeader = await this.getBlockHeader(block.number - 1);
|
|
100
103
|
|
|
101
104
|
this.log.verbose(`Starting processing block ${block.number}`, {
|
|
@@ -109,13 +112,14 @@ export class EpochProvingJob implements Traceable {
|
|
|
109
112
|
uuid: this.uuid,
|
|
110
113
|
...globalVariables,
|
|
111
114
|
});
|
|
115
|
+
|
|
112
116
|
// Start block proving
|
|
113
117
|
await this.prover.startNewBlock(globalVariables, l1ToL2Messages);
|
|
114
118
|
|
|
115
119
|
// Process public fns
|
|
116
120
|
const db = await this.dbProvider.fork(block.number - 1);
|
|
117
121
|
const publicProcessor = this.publicProcessorFactory.create(db, previousHeader, globalVariables, true);
|
|
118
|
-
const processed = await this.processTxs(publicProcessor, txs
|
|
122
|
+
const processed = await this.processTxs(publicProcessor, txs);
|
|
119
123
|
await this.prover.addTxs(processed);
|
|
120
124
|
await db.close();
|
|
121
125
|
this.log.verbose(`Processed all ${txs.length} txs for block ${block.number}`, {
|
|
@@ -128,32 +132,76 @@ export class EpochProvingJob implements Traceable {
|
|
|
128
132
|
await this.prover.setBlockCompleted(block.number, block.header);
|
|
129
133
|
});
|
|
130
134
|
|
|
131
|
-
|
|
135
|
+
const executionTime = timer.ms();
|
|
136
|
+
|
|
137
|
+
this.progressState('awaiting-prover');
|
|
132
138
|
const { publicInputs, proof } = await this.prover.finaliseEpoch();
|
|
133
139
|
this.log.info(`Finalised proof for epoch ${epochNumber}`, { epochNumber, uuid: this.uuid, duration: timer.ms() });
|
|
134
140
|
|
|
135
|
-
this.
|
|
136
|
-
await this.publisher.submitEpochProof({ fromBlock, toBlock, epochNumber, publicInputs, proof });
|
|
137
|
-
|
|
141
|
+
this.progressState('publishing-proof');
|
|
142
|
+
const success = await this.publisher.submitEpochProof({ fromBlock, toBlock, epochNumber, publicInputs, proof });
|
|
143
|
+
if (!success) {
|
|
144
|
+
throw new Error('Failed to submit epoch proof to L1');
|
|
145
|
+
}
|
|
138
146
|
|
|
147
|
+
this.log.info(`Submitted proof for epoch`, { epochNumber, uuid: this.uuid });
|
|
139
148
|
this.state = 'completed';
|
|
140
|
-
this.metrics.recordProvingJob(timer, epochSizeBlocks, epochSizeTxs);
|
|
141
|
-
} catch (err) {
|
|
149
|
+
this.metrics.recordProvingJob(executionTime, timer.ms(), epochSizeBlocks, epochSizeTxs);
|
|
150
|
+
} catch (err: any) {
|
|
151
|
+
if (err && err.name === 'HaltExecutionError') {
|
|
152
|
+
this.log.warn(`Halted execution of epoch ${epochNumber} prover job`, { uuid: this.uuid, epochNumber });
|
|
153
|
+
return;
|
|
154
|
+
}
|
|
142
155
|
this.log.error(`Error running epoch ${epochNumber} prover job`, err, { uuid: this.uuid, epochNumber });
|
|
143
156
|
this.state = 'failed';
|
|
144
157
|
} finally {
|
|
158
|
+
clearTimeout(this.deadlineTimeoutHandler);
|
|
145
159
|
await this.cleanUp(this);
|
|
160
|
+
await this.prover.stop();
|
|
146
161
|
resolve();
|
|
147
162
|
}
|
|
148
163
|
}
|
|
149
164
|
|
|
150
|
-
|
|
165
|
+
private progressState(state: EpochProvingJobState) {
|
|
166
|
+
this.checkState();
|
|
167
|
+
this.state = state;
|
|
168
|
+
}
|
|
169
|
+
|
|
170
|
+
private checkState() {
|
|
171
|
+
if (this.state === 'timed-out' || this.state === 'stopped' || this.state === 'failed') {
|
|
172
|
+
throw new HaltExecutionError(this.state);
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
|
|
176
|
+
public async stop(state: EpochProvingJobState = 'stopped') {
|
|
177
|
+
this.state = state;
|
|
151
178
|
this.prover.cancel();
|
|
179
|
+
// TODO(palla/prover): Stop the publisher as well
|
|
152
180
|
if (this.runPromise) {
|
|
153
181
|
await this.runPromise;
|
|
154
182
|
}
|
|
155
183
|
}
|
|
156
184
|
|
|
185
|
+
private scheduleDeadlineStop() {
|
|
186
|
+
const deadline = this.deadline;
|
|
187
|
+
if (deadline) {
|
|
188
|
+
const timeout = deadline.getTime() - Date.now();
|
|
189
|
+
if (timeout <= 0) {
|
|
190
|
+
throw new Error('Cannot start job with deadline in the past');
|
|
191
|
+
}
|
|
192
|
+
|
|
193
|
+
this.deadlineTimeoutHandler = setTimeout(() => {
|
|
194
|
+
if (EpochProvingJobTerminalState.includes(this.state)) {
|
|
195
|
+
return;
|
|
196
|
+
}
|
|
197
|
+
this.log.warn('Stopping job due to deadline hit', { uuid: this.uuid, epochNumber: this.epochNumber });
|
|
198
|
+
this.stop('timed-out').catch(err => {
|
|
199
|
+
this.log.error('Error stopping job', err, { uuid: this.uuid, epochNumber: this.epochNumber });
|
|
200
|
+
});
|
|
201
|
+
}, timeout);
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
|
|
157
205
|
/* Returns the header for the given block number, or undefined for block zero. */
|
|
158
206
|
private getBlockHeader(blockNumber: number) {
|
|
159
207
|
if (blockNumber === 0) {
|
|
@@ -162,38 +210,38 @@ export class EpochProvingJob implements Traceable {
|
|
|
162
210
|
return this.l2BlockSource.getBlockHeader(blockNumber);
|
|
163
211
|
}
|
|
164
212
|
|
|
165
|
-
private
|
|
166
|
-
const
|
|
167
|
-
|
|
168
|
-
);
|
|
169
|
-
const notFound = txs.filter(([_, tx]) => !tx);
|
|
170
|
-
if (notFound.length) {
|
|
171
|
-
throw new Error(
|
|
172
|
-
`Txs not found for block ${blockNumber}: ${notFound.map(([txHash]) => txHash.toString()).join(', ')}`,
|
|
173
|
-
);
|
|
174
|
-
}
|
|
175
|
-
return txs.map(([_, tx]) => tx!);
|
|
213
|
+
private getTxs(block: L2Block): Tx[] {
|
|
214
|
+
const txHashes = block.body.txEffects.map(tx => tx.txHash.toBigInt());
|
|
215
|
+
return this.txs.filter(tx => txHashes.includes(tx.getTxHash().toBigInt()));
|
|
176
216
|
}
|
|
177
217
|
|
|
178
218
|
private getL1ToL2Messages(block: L2Block) {
|
|
179
219
|
return this.l1ToL2MessageSource.getL1ToL2Messages(BigInt(block.number));
|
|
180
220
|
}
|
|
181
221
|
|
|
182
|
-
private async processTxs(
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
totalNumberOfTxs: number,
|
|
186
|
-
): Promise<ProcessedTx[]> {
|
|
187
|
-
const [processedTxs, failedTxs] = await publicProcessor.process(txs, totalNumberOfTxs, new EmptyTxValidator());
|
|
222
|
+
private async processTxs(publicProcessor: PublicProcessor, txs: Tx[]): Promise<ProcessedTx[]> {
|
|
223
|
+
const { deadline } = this;
|
|
224
|
+
const [processedTxs, failedTxs] = await publicProcessor.process(txs, { deadline });
|
|
188
225
|
|
|
189
226
|
if (failedTxs.length) {
|
|
190
227
|
throw new Error(
|
|
191
|
-
`
|
|
228
|
+
`Txs failed processing: ${failedTxs.map(({ tx, error }) => `${tx.getTxHash()} (${error})`).join(', ')}`,
|
|
192
229
|
);
|
|
193
230
|
}
|
|
194
231
|
|
|
232
|
+
if (processedTxs.length !== txs.length) {
|
|
233
|
+
throw new Error(`Failed to process all txs: processed ${processedTxs.length} out of ${txs.length}`);
|
|
234
|
+
}
|
|
235
|
+
|
|
195
236
|
return processedTxs;
|
|
196
237
|
}
|
|
197
238
|
}
|
|
198
239
|
|
|
240
|
+
class HaltExecutionError extends Error {
|
|
241
|
+
constructor(state: EpochProvingJobState) {
|
|
242
|
+
super(`Halted execution due to state ${state}`);
|
|
243
|
+
this.name = 'HaltExecutionError';
|
|
244
|
+
}
|
|
245
|
+
}
|
|
246
|
+
|
|
199
247
|
export { type EpochProvingJobState };
|