@aztec/prover-node 0.0.0-test.0 → 0.0.1-commit.03f7ef2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (82) hide show
  1. package/dest/actions/download-epoch-proving-job.d.ts +18 -0
  2. package/dest/actions/download-epoch-proving-job.d.ts.map +1 -0
  3. package/dest/actions/download-epoch-proving-job.js +37 -0
  4. package/dest/actions/index.d.ts +3 -0
  5. package/dest/actions/index.d.ts.map +1 -0
  6. package/dest/actions/index.js +2 -0
  7. package/dest/actions/rerun-epoch-proving-job.d.ts +11 -0
  8. package/dest/actions/rerun-epoch-proving-job.d.ts.map +1 -0
  9. package/dest/actions/rerun-epoch-proving-job.js +40 -0
  10. package/dest/actions/upload-epoch-proof-failure.d.ts +15 -0
  11. package/dest/actions/upload-epoch-proof-failure.d.ts.map +1 -0
  12. package/dest/actions/upload-epoch-proof-failure.js +78 -0
  13. package/dest/bin/run-failed-epoch.d.ts +2 -0
  14. package/dest/bin/run-failed-epoch.d.ts.map +1 -0
  15. package/dest/bin/run-failed-epoch.js +67 -0
  16. package/dest/config.d.ts +15 -11
  17. package/dest/config.d.ts.map +1 -1
  18. package/dest/config.js +83 -15
  19. package/dest/factory.d.ts +16 -12
  20. package/dest/factory.d.ts.map +1 -1
  21. package/dest/factory.js +100 -32
  22. package/dest/index.d.ts +2 -2
  23. package/dest/index.d.ts.map +1 -1
  24. package/dest/index.js +1 -1
  25. package/dest/job/epoch-proving-job-data.d.ts +18 -0
  26. package/dest/job/epoch-proving-job-data.d.ts.map +1 -0
  27. package/dest/job/epoch-proving-job-data.js +59 -0
  28. package/dest/job/epoch-proving-job.d.ts +26 -18
  29. package/dest/job/epoch-proving-job.d.ts.map +1 -1
  30. package/dest/job/epoch-proving-job.js +193 -84
  31. package/dest/metrics.d.ts +30 -5
  32. package/dest/metrics.d.ts.map +1 -1
  33. package/dest/metrics.js +147 -35
  34. package/dest/monitors/epoch-monitor.d.ts +5 -2
  35. package/dest/monitors/epoch-monitor.d.ts.map +1 -1
  36. package/dest/monitors/epoch-monitor.js +17 -3
  37. package/dest/monitors/index.d.ts +1 -1
  38. package/dest/prover-node-publisher.d.ts +14 -15
  39. package/dest/prover-node-publisher.d.ts.map +1 -1
  40. package/dest/prover-node-publisher.js +86 -81
  41. package/dest/prover-node.d.ts +49 -44
  42. package/dest/prover-node.d.ts.map +1 -1
  43. package/dest/prover-node.js +186 -112
  44. package/dest/prover-publisher-factory.d.ts +23 -0
  45. package/dest/prover-publisher-factory.d.ts.map +1 -0
  46. package/dest/prover-publisher-factory.js +26 -0
  47. package/dest/test/index.d.ts +5 -3
  48. package/dest/test/index.d.ts.map +1 -1
  49. package/dest/test/index.js +1 -3
  50. package/package.json +39 -33
  51. package/src/actions/download-epoch-proving-job.ts +44 -0
  52. package/src/actions/index.ts +2 -0
  53. package/src/actions/rerun-epoch-proving-job.ts +61 -0
  54. package/src/actions/upload-epoch-proof-failure.ts +88 -0
  55. package/src/bin/run-failed-epoch.ts +77 -0
  56. package/src/config.ts +111 -25
  57. package/src/factory.ts +167 -44
  58. package/src/index.ts +1 -1
  59. package/src/job/epoch-proving-job-data.ts +82 -0
  60. package/src/job/epoch-proving-job.ts +255 -83
  61. package/src/metrics.ts +147 -37
  62. package/src/monitors/epoch-monitor.ts +19 -7
  63. package/src/prover-node-publisher.ts +132 -115
  64. package/src/prover-node.ts +223 -142
  65. package/src/prover-publisher-factory.ts +39 -0
  66. package/src/test/index.ts +7 -4
  67. package/dest/http.d.ts +0 -8
  68. package/dest/http.d.ts.map +0 -1
  69. package/dest/http.js +0 -9
  70. package/dest/prover-coordination/config.d.ts +0 -7
  71. package/dest/prover-coordination/config.d.ts.map +0 -1
  72. package/dest/prover-coordination/config.js +0 -11
  73. package/dest/prover-coordination/factory.d.ts +0 -22
  74. package/dest/prover-coordination/factory.d.ts.map +0 -1
  75. package/dest/prover-coordination/factory.js +0 -42
  76. package/dest/prover-coordination/index.d.ts +0 -3
  77. package/dest/prover-coordination/index.d.ts.map +0 -1
  78. package/dest/prover-coordination/index.js +0 -2
  79. package/src/http.ts +0 -13
  80. package/src/prover-coordination/config.ts +0 -17
  81. package/src/prover-coordination/factory.ts +0 -72
  82. package/src/prover-coordination/index.ts +0 -2
@@ -4,134 +4,181 @@ function _ts_decorate(decorators, target, key, desc) {
4
4
  else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
5
5
  return c > 3 && r && Object.defineProperty(target, key, r), r;
6
6
  }
7
- import { compact } from '@aztec/foundation/collection';
7
+ import { BlockNumber } from '@aztec/foundation/branded-types';
8
+ import { assertRequired, compact, pick, sum } from '@aztec/foundation/collection';
8
9
  import { memoize } from '@aztec/foundation/decorators';
9
10
  import { createLogger } from '@aztec/foundation/log';
10
- import { RunningPromise } from '@aztec/foundation/running-promise';
11
11
  import { DateProvider } from '@aztec/foundation/timer';
12
12
  import { PublicProcessorFactory } from '@aztec/simulator/server';
13
- import { getTimestampRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
13
+ import { getProofSubmissionDeadlineTimestamp } from '@aztec/stdlib/epoch-helpers';
14
14
  import { EpochProvingJobTerminalState, tryStop } from '@aztec/stdlib/interfaces/server';
15
15
  import { Attributes, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
16
+ import { uploadEpochProofFailure } from './actions/upload-epoch-proof-failure.js';
16
17
  import { EpochProvingJob } from './job/epoch-proving-job.js';
17
- import { ProverNodeMetrics } from './metrics.js';
18
+ import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
18
19
  /**
19
- * An Aztec Prover Node is a standalone process that monitors the unfinalised chain on L1 for unproven blocks,
20
- * submits bids for proving them, and monitors if they are accepted. If so, the prover node fetches the txs
21
- * from a tx source in the p2p network or an external node, re-executes their public functions, creates a rollup
20
+ * An Aztec Prover Node is a standalone process that monitors the unfinalized chain on L1 for unproven epochs,
21
+ * fetches their txs from the p2p network or external nodes, re-executes their public functions, creates a rollup
22
22
  * proof for the epoch, and submits it to L1.
23
23
  */ export class ProverNode {
24
24
  prover;
25
- publisher;
25
+ publisherFactory;
26
26
  l2BlockSource;
27
27
  l1ToL2MessageSource;
28
28
  contractDataSource;
29
29
  worldState;
30
- coordination;
30
+ p2pClient;
31
31
  epochsMonitor;
32
+ rollupContract;
33
+ l1Metrics;
32
34
  telemetryClient;
33
35
  log;
34
36
  dateProvider;
35
- latestEpochWeAreProving;
36
37
  jobs;
37
- cachedEpochData;
38
- options;
39
- metrics;
40
- txFetcher;
41
- lastBlockNumber;
38
+ config;
39
+ jobMetrics;
40
+ rewardsMetrics;
42
41
  tracer;
43
- constructor(prover, publisher, l2BlockSource, l1ToL2MessageSource, contractDataSource, worldState, coordination, epochsMonitor, options = {}, telemetryClient = getTelemetryClient()){
42
+ publisher;
43
+ constructor(prover, publisherFactory, l2BlockSource, l1ToL2MessageSource, contractDataSource, worldState, p2pClient, epochsMonitor, rollupContract, l1Metrics, config = {}, telemetryClient = getTelemetryClient()){
44
44
  this.prover = prover;
45
- this.publisher = publisher;
45
+ this.publisherFactory = publisherFactory;
46
46
  this.l2BlockSource = l2BlockSource;
47
47
  this.l1ToL2MessageSource = l1ToL2MessageSource;
48
48
  this.contractDataSource = contractDataSource;
49
49
  this.worldState = worldState;
50
- this.coordination = coordination;
50
+ this.p2pClient = p2pClient;
51
51
  this.epochsMonitor = epochsMonitor;
52
+ this.rollupContract = rollupContract;
53
+ this.l1Metrics = l1Metrics;
52
54
  this.telemetryClient = telemetryClient;
53
55
  this.log = createLogger('prover-node');
54
56
  this.dateProvider = new DateProvider();
55
57
  this.jobs = new Map();
56
- this.cachedEpochData = undefined;
57
- this.options = {
58
- pollingIntervalMs: 1_000,
59
- maxPendingJobs: 100,
60
- maxParallelBlocksPerEpoch: 32,
61
- txGatheringTimeoutMs: 60_000,
58
+ this.config = {
59
+ proverNodePollingIntervalMs: 1_000,
60
+ proverNodeMaxPendingJobs: 100,
61
+ proverNodeMaxParallelBlocksPerEpoch: 32,
62
62
  txGatheringIntervalMs: 1_000,
63
- txGatheringMaxParallelRequests: 100,
64
- ...compact(options)
63
+ txGatheringBatchSize: 10,
64
+ txGatheringMaxParallelRequestsPerNode: 100,
65
+ txGatheringTimeoutMs: 120_000,
66
+ proverNodeFailedEpochStore: undefined,
67
+ proverNodeEpochProvingDelayMs: undefined,
68
+ ...compact(config)
65
69
  };
66
- this.metrics = new ProverNodeMetrics(telemetryClient, 'ProverNode');
70
+ this.validateConfig();
71
+ const meter = telemetryClient.getMeter('ProverNode');
67
72
  this.tracer = telemetryClient.getTracer('ProverNode');
68
- this.txFetcher = new RunningPromise(()=>this.checkForTxs(), this.log, this.options.txGatheringIntervalMs);
73
+ this.jobMetrics = new ProverNodeJobMetrics(meter, telemetryClient.getTracer('EpochProvingJob'));
74
+ this.rewardsMetrics = new ProverNodeRewardsMetrics(meter, this.prover.getProverId(), rollupContract);
69
75
  }
70
76
  getProverId() {
71
77
  return this.prover.getProverId();
72
78
  }
73
79
  getP2P() {
74
- const asP2PClient = this.coordination;
75
- if (typeof asP2PClient.isP2PClient === 'function' && asP2PClient.isP2PClient()) {
76
- return asP2PClient;
77
- }
78
- return undefined;
80
+ return this.p2pClient;
79
81
  }
80
82
  /**
81
83
  * Handles an epoch being completed by starting a proof for it if there are no active jobs for it.
82
84
  * @param epochNumber - The epoch number that was just completed.
85
+ * @returns false if there is an error, true otherwise
83
86
  */ async handleEpochReadyToProve(epochNumber) {
84
87
  try {
85
- this.log.debug('jobs', JSON.stringify(this.jobs, null, 2));
88
+ this.log.debug(`Running jobs as ${epochNumber} is ready to prove`, {
89
+ jobs: Array.from(this.jobs.values()).map((job)=>`${job.getEpochNumber()}:${job.getId()}`)
90
+ });
86
91
  const activeJobs = await this.getActiveJobsForEpoch(epochNumber);
87
92
  if (activeJobs.length > 0) {
88
- this.log.info(`Not starting proof for ${epochNumber} since there are active jobs`);
89
- return;
93
+ this.log.warn(`Not starting proof for ${epochNumber} since there are active jobs for the epoch`, {
94
+ activeJobs: activeJobs.map((job)=>job.uuid)
95
+ });
96
+ return true;
90
97
  }
91
- // TODO: we probably want to skip starting a proof if we are too far into the current epoch
92
98
  await this.startProof(epochNumber);
99
+ return true;
93
100
  } catch (err) {
94
101
  if (err instanceof EmptyEpochError) {
95
102
  this.log.info(`Not starting proof for ${epochNumber} since no blocks were found`);
96
103
  } else {
97
104
  this.log.error(`Error handling epoch completed`, err);
98
105
  }
106
+ return false;
99
107
  }
100
108
  }
101
109
  /**
102
- * Starts the prover node so it periodically checks for unproven epochs in the unfinalised chain from L1 and
110
+ * Starts the prover node so it periodically checks for unproven epochs in the unfinalized chain from L1 and
103
111
  * starts proving jobs for them.
104
- */ start() {
105
- this.txFetcher.start();
112
+ */ async start() {
106
113
  this.epochsMonitor.start(this);
107
- this.log.info('Started ProverNode', this.options);
114
+ await this.publisherFactory.start();
115
+ this.publisher = await this.publisherFactory.create();
116
+ await this.rewardsMetrics.start();
117
+ this.l1Metrics.start();
118
+ this.log.info(`Started Prover Node with prover id ${this.prover.getProverId().toString()}`, this.config);
108
119
  }
109
120
  /**
110
121
  * Stops the prover node and all its dependencies.
111
122
  */ async stop() {
112
123
  this.log.info('Stopping ProverNode');
113
- await this.txFetcher.stop();
114
124
  await this.epochsMonitor.stop();
115
125
  await this.prover.stop();
126
+ await tryStop(this.p2pClient);
116
127
  await tryStop(this.l2BlockSource);
117
- this.publisher.interrupt();
128
+ await tryStop(this.publisherFactory);
129
+ this.publisher?.interrupt();
118
130
  await Promise.all(Array.from(this.jobs.values()).map((job)=>job.stop()));
119
131
  await this.worldState.stop();
120
- await tryStop(this.coordination);
132
+ this.rewardsMetrics.stop();
133
+ this.l1Metrics.stop();
121
134
  await this.telemetryClient.stop();
122
135
  this.log.info('Stopped ProverNode');
123
136
  }
124
- /**
125
- * Creates a proof for a block range. Returns once the proof has been submitted to L1.
126
- */ async prove(epochNumber) {
127
- const job = await this.createProvingJob(BigInt(epochNumber));
128
- return job.run();
137
+ /** Returns world state status. */ async getWorldStateSyncStatus() {
138
+ const { syncSummary } = await this.worldState.status();
139
+ return syncSummary;
140
+ }
141
+ /** Returns archiver status. */ getL2Tips() {
142
+ return this.l2BlockSource.getL2Tips();
129
143
  }
130
144
  /**
131
145
  * Starts a proving process and returns immediately.
132
146
  */ async startProof(epochNumber) {
133
- const job = await this.createProvingJob(BigInt(epochNumber));
134
- void job.run().catch((err)=>this.log.error(`Error proving epoch ${epochNumber}`, err));
147
+ const job = await this.createProvingJob(epochNumber, {
148
+ skipEpochCheck: true
149
+ });
150
+ void this.runJob(job);
151
+ }
152
+ async runJob(job) {
153
+ const epochNumber = job.getEpochNumber();
154
+ const ctx = {
155
+ id: job.getId(),
156
+ epochNumber,
157
+ state: undefined
158
+ };
159
+ try {
160
+ await job.run();
161
+ const state = job.getState();
162
+ ctx.state = state;
163
+ if (state === 'reorg') {
164
+ this.log.warn(`Running new job for epoch ${epochNumber} due to reorg`, ctx);
165
+ await this.createProvingJob(epochNumber);
166
+ } else if (state === 'failed') {
167
+ this.log.error(`Job for ${epochNumber} exited with state ${state}`, ctx);
168
+ await this.tryUploadEpochFailure(job);
169
+ } else {
170
+ this.log.verbose(`Job for ${epochNumber} exited with state ${state}`, ctx);
171
+ }
172
+ } catch (err) {
173
+ this.log.error(`Error proving epoch ${epochNumber}`, err, ctx);
174
+ } finally{
175
+ this.jobs.delete(job.getId());
176
+ }
177
+ }
178
+ async tryUploadEpochFailure(job) {
179
+ if (this.config.proverNodeFailedEpochStore) {
180
+ return await uploadEpochProofFailure(this.config.proverNodeFailedEpochStore, job.getId(), job.getProvingData(), this.l2BlockSource, this.worldState, assertRequired(pick(this.config, 'l1ChainId', 'rollupVersion', 'dataDirectory')), this.log);
181
+ }
135
182
  }
136
183
  /**
137
184
  * Returns the prover instance.
@@ -144,110 +191,137 @@ import { ProverNodeMetrics } from './metrics.js';
144
191
  return Promise.resolve(Array.from(this.jobs.entries()).map(([uuid, job])=>({
145
192
  uuid,
146
193
  status: job.getState(),
147
- epochNumber: Number(job.getEpochNumber())
194
+ epochNumber: job.getEpochNumber()
148
195
  })));
149
196
  }
150
- async getActiveJobsForEpoch(epochBigInt) {
197
+ async getActiveJobsForEpoch(epochNumber) {
151
198
  const jobs = await this.getJobs();
152
- const epochNumber = Number(epochBigInt);
153
199
  return jobs.filter((job)=>job.epochNumber === epochNumber && !EpochProvingJobTerminalState.includes(job.status));
154
200
  }
155
201
  checkMaximumPendingJobs() {
156
- const { maxPendingJobs } = this.options;
157
- return maxPendingJobs === 0 || this.jobs.size < maxPendingJobs;
158
- }
159
- async createProvingJob(epochNumber) {
160
- if (!this.checkMaximumPendingJobs()) {
161
- throw new Error(`Maximum pending proving jobs ${this.options.maxPendingJobs} reached. Cannot create new job.`);
202
+ const { proverNodeMaxPendingJobs: maxPendingJobs } = this.config;
203
+ if (maxPendingJobs > 0 && this.jobs.size >= maxPendingJobs) {
204
+ throw new Error(`Maximum pending proving jobs ${maxPendingJobs} reached. Cannot create new job.`);
162
205
  }
163
- // Gather blocks for this epoch
164
- const cachedEpochData = this.cachedEpochData?.epochNumber === epochNumber ? this.cachedEpochData : undefined;
165
- const { blocks, txs } = cachedEpochData ?? await this.gatherEpochData(epochNumber);
166
- const fromBlock = blocks[0].number;
167
- const toBlock = blocks.at(-1).number;
206
+ }
207
+ async createProvingJob(epochNumber, opts = {}) {
208
+ this.checkMaximumPendingJobs();
209
+ this.publisher = await this.publisherFactory.create();
210
+ // Gather all data for this epoch
211
+ const epochData = await this.gatherEpochData(epochNumber);
212
+ const fromCheckpoint = epochData.checkpoints[0].number;
213
+ const toCheckpoint = epochData.checkpoints.at(-1).number;
214
+ const fromBlock = epochData.checkpoints[0].blocks[0].number;
215
+ const toBlock = epochData.checkpoints.at(-1).blocks.at(-1).number;
216
+ this.log.verbose(`Creating proving job for epoch ${epochNumber} for checkpoint range ${fromCheckpoint} to ${toCheckpoint} and block range ${fromBlock} to ${toBlock}`);
168
217
  // Fast forward world state to right before the target block and get a fork
169
- this.log.verbose(`Creating proving job for epoch ${epochNumber} for block range ${fromBlock} to ${toBlock}`);
170
218
  await this.worldState.syncImmediate(toBlock);
171
- // Create a processor using the forked world state
219
+ // Create a processor factory
172
220
  const publicProcessorFactory = new PublicProcessorFactory(this.contractDataSource, this.dateProvider, this.telemetryClient);
173
- const cleanUp = ()=>{
174
- this.jobs.delete(job.getId());
175
- return Promise.resolve();
176
- };
177
- const [_, endTimestamp] = getTimestampRangeForEpoch(epochNumber + 1n, await this.getL1Constants());
178
- const deadline = new Date(Number(endTimestamp) * 1000);
179
- const job = this.doCreateEpochProvingJob(epochNumber, deadline, blocks, txs, publicProcessorFactory, cleanUp);
221
+ // Set deadline for this job to run. It will abort if it takes too long.
222
+ const deadlineTs = getProofSubmissionDeadlineTimestamp(epochNumber, await this.getL1Constants());
223
+ const deadline = new Date(Number(deadlineTs) * 1000);
224
+ const job = this.doCreateEpochProvingJob(epochData, deadline, publicProcessorFactory, this.publisher, opts);
180
225
  this.jobs.set(job.getId(), job);
181
226
  return job;
182
227
  }
183
228
  getL1Constants() {
184
229
  return this.l2BlockSource.getL1Constants();
185
230
  }
186
- /** Monitors for new blocks and requests their txs from the p2p layer to ensure they are available for proving. */ async checkForTxs() {
187
- const blockNumber = await this.l2BlockSource.getBlockNumber();
188
- if (this.lastBlockNumber === undefined || blockNumber > this.lastBlockNumber) {
189
- const block = await this.l2BlockSource.getBlock(blockNumber);
190
- if (!block) {
191
- return;
192
- }
193
- const txHashes = block.body.txEffects.map((tx)=>tx.txHash);
194
- this.log.verbose(`Fetching ${txHashes.length} tx hashes for block number ${blockNumber} from coordination`);
195
- await this.coordination.getTxsByHash(txHashes); // This stores the txs in the tx pool, no need to persist them here
196
- this.lastBlockNumber = blockNumber;
197
- }
198
- }
199
231
  async gatherEpochData(epochNumber) {
200
- // Gather blocks for this epoch and their txs
201
- const blocks = await this.gatherBlocks(epochNumber);
202
- const txs = await this.gatherTxs(epochNumber, blocks);
232
+ const checkpoints = await this.gatherCheckpoints(epochNumber);
233
+ const txArray = await this.gatherTxs(epochNumber, checkpoints);
234
+ const txs = new Map(txArray.map((tx)=>[
235
+ tx.getTxHash().toString(),
236
+ tx
237
+ ]));
238
+ const l1ToL2Messages = await this.gatherMessages(epochNumber, checkpoints);
239
+ const [firstBlock] = checkpoints[0].blocks;
240
+ const previousBlockHeader = await this.gatherPreviousBlockHeader(epochNumber, firstBlock.number - 1);
241
+ const [lastPublishedCheckpoint] = await this.l2BlockSource.getPublishedCheckpoints(checkpoints.at(-1).number, 1);
242
+ const attestations = lastPublishedCheckpoint?.attestations ?? [];
203
243
  return {
204
- blocks,
205
- txs
244
+ checkpoints,
245
+ txs,
246
+ l1ToL2Messages,
247
+ epochNumber,
248
+ previousBlockHeader,
249
+ attestations
206
250
  };
207
251
  }
208
- async gatherBlocks(epochNumber) {
209
- const blocks = await this.l2BlockSource.getBlocksForEpoch(epochNumber);
210
- if (blocks.length === 0) {
252
+ async gatherCheckpoints(epochNumber) {
253
+ const checkpoints = await this.l2BlockSource.getCheckpointsForEpoch(epochNumber);
254
+ if (checkpoints.length === 0) {
211
255
  throw new EmptyEpochError(epochNumber);
212
256
  }
213
- return blocks;
257
+ return checkpoints;
214
258
  }
215
- async gatherTxs(epochNumber, blocks) {
216
- const txsToFind = blocks.flatMap((block)=>block.body.txEffects.map((tx)=>tx.txHash));
217
- const txs = await this.coordination.getTxsByHash(txsToFind);
218
- if (txs.length === txsToFind.length) {
259
+ async gatherTxs(epochNumber, checkpoints) {
260
+ const deadline = new Date(this.dateProvider.now() + this.config.txGatheringTimeoutMs);
261
+ const txProvider = this.p2pClient.getTxProvider();
262
+ const blocks = checkpoints.flatMap((checkpoint)=>checkpoint.blocks);
263
+ const txsByBlock = await Promise.all(blocks.map((block)=>txProvider.getTxsForBlock(block, {
264
+ deadline
265
+ })));
266
+ const txs = txsByBlock.map(({ txs })=>txs).flat();
267
+ const missingTxs = txsByBlock.map(({ missingTxs })=>missingTxs).flat();
268
+ if (missingTxs.length === 0) {
219
269
  this.log.verbose(`Gathered all ${txs.length} txs for epoch ${epochNumber}`, {
220
270
  epochNumber
221
271
  });
222
272
  return txs;
223
273
  }
224
- const txHashesFound = await Promise.all(txs.map((tx)=>tx.getTxHash()));
225
- const missingTxHashes = txsToFind.filter((txHashToFind)=>!txHashesFound.some((txHashFound)=>txHashToFind.equals(txHashFound))).join(', ');
226
- throw new Error(`Txs not found for epoch ${epochNumber}: ${missingTxHashes}`);
274
+ throw new Error(`Txs not found for epoch ${epochNumber}: ${missingTxs.map((hash)=>hash.toString()).join(', ')}`);
227
275
  }
228
- /** Extracted for testing purposes. */ doCreateEpochProvingJob(epochNumber, deadline, blocks, txs, publicProcessorFactory, cleanUp) {
229
- return new EpochProvingJob(this.worldState, epochNumber, blocks, txs, this.prover.createEpochProver(), publicProcessorFactory, this.publisher, this.l2BlockSource, this.l1ToL2MessageSource, this.metrics, deadline, {
230
- parallelBlockLimit: this.options.maxParallelBlocksPerEpoch
231
- }, cleanUp);
276
+ async gatherMessages(epochNumber, checkpoints) {
277
+ const messages = await Promise.all(checkpoints.map((c)=>this.l1ToL2MessageSource.getL1ToL2Messages(c.number)));
278
+ const messageCount = sum(messages.map((m)=>m.length));
279
+ this.log.verbose(`Gathered all ${messageCount} messages for epoch ${epochNumber}`, {
280
+ epochNumber
281
+ });
282
+ const messagesByCheckpoint = {};
283
+ for(let i = 0; i < checkpoints.length; i++){
284
+ messagesByCheckpoint[checkpoints[i].number] = messages[i];
285
+ }
286
+ return messagesByCheckpoint;
287
+ }
288
+ async gatherPreviousBlockHeader(epochNumber, previousBlockNumber) {
289
+ const header = await (previousBlockNumber === 0 ? this.worldState.getCommitted().getInitialHeader() : this.l2BlockSource.getBlockHeader(BlockNumber(previousBlockNumber)));
290
+ if (!header) {
291
+ throw new Error(`Previous block header ${previousBlockNumber} not found for proving epoch ${epochNumber}`);
292
+ }
293
+ this.log.verbose(`Gathered previous block header ${header.getBlockNumber()} for epoch ${epochNumber}`);
294
+ return header;
295
+ }
296
+ /** Extracted for testing purposes. */ doCreateEpochProvingJob(data, deadline, publicProcessorFactory, publisher, opts = {}) {
297
+ const { proverNodeMaxParallelBlocksPerEpoch: parallelBlockLimit, proverNodeDisableProofPublish } = this.config;
298
+ return new EpochProvingJob(data, this.worldState, this.prover.createEpochProver(), publicProcessorFactory, publisher, this.l2BlockSource, this.jobMetrics, deadline, {
299
+ parallelBlockLimit,
300
+ skipSubmitProof: proverNodeDisableProofPublish,
301
+ ...opts
302
+ });
232
303
  }
233
304
  /** Extracted for testing purposes. */ async triggerMonitors() {
234
305
  await this.epochsMonitor.work();
235
306
  }
307
+ validateConfig() {
308
+ if (this.config.proverNodeFailedEpochStore && (!this.config.dataDirectory || !this.config.l1ChainId || this.config.rollupVersion === undefined)) {
309
+ this.log.warn(`Invalid prover-node config (missing dataDirectory, l1ChainId, or rollupVersion)`, pick(this.config, 'proverNodeFailedEpochStore', 'dataDirectory', 'l1ChainId', 'rollupVersion'));
310
+ throw new Error('All of dataDirectory, l1ChainId, and rollupVersion are required if proverNodeFailedEpochStore is set.');
311
+ }
312
+ }
236
313
  }
237
314
  _ts_decorate([
238
315
  trackSpan('ProverNode.createProvingJob', (epochNumber)=>({
239
- [Attributes.EPOCH_NUMBER]: Number(epochNumber)
316
+ [Attributes.EPOCH_NUMBER]: epochNumber
240
317
  }))
241
318
  ], ProverNode.prototype, "createProvingJob", null);
242
319
  _ts_decorate([
243
320
  memoize
244
321
  ], ProverNode.prototype, "getL1Constants", null);
245
- _ts_decorate([
246
- trackSpan('ProverNode.checkForTxs')
247
- ], ProverNode.prototype, "checkForTxs", null);
248
322
  _ts_decorate([
249
323
  trackSpan('ProverNode.gatherEpochData', (epochNumber)=>({
250
- [Attributes.EPOCH_NUMBER]: Number(epochNumber)
324
+ [Attributes.EPOCH_NUMBER]: epochNumber
251
325
  }))
252
326
  ], ProverNode.prototype, "gatherEpochData", null);
253
327
  class EmptyEpochError extends Error {
@@ -0,0 +1,23 @@
1
+ import type { RollupContract } from '@aztec/ethereum/contracts';
2
+ import type { L1TxUtils } from '@aztec/ethereum/l1-tx-utils';
3
+ import type { PublisherManager } from '@aztec/ethereum/publisher-manager';
4
+ import type { PublisherConfig, TxSenderConfig } from '@aztec/sequencer-client';
5
+ import type { TelemetryClient } from '@aztec/telemetry-client';
6
+ import { ProverNodePublisher } from './prover-node-publisher.js';
7
+ export declare class ProverPublisherFactory {
8
+ private config;
9
+ private deps;
10
+ constructor(config: TxSenderConfig & PublisherConfig, deps: {
11
+ rollupContract: RollupContract;
12
+ publisherManager: PublisherManager<L1TxUtils>;
13
+ telemetry?: TelemetryClient;
14
+ });
15
+ start(): Promise<void>;
16
+ stop(): void;
17
+ /**
18
+ * Creates a new Prover Publisher instance.
19
+ * @returns A new ProverNodePublisher instance.
20
+ */
21
+ create(): Promise<ProverNodePublisher>;
22
+ }
23
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmVyLXB1Ymxpc2hlci1mYWN0b3J5LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcHJvdmVyLXB1Ymxpc2hlci1mYWN0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQzdELE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDMUUsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLGNBQWMsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQy9FLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRS9ELE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBRWpFLHFCQUFhLHNCQUFzQjtJQUUvQixPQUFPLENBQUMsTUFBTTtJQUNkLE9BQU8sQ0FBQyxJQUFJO0lBRmQsWUFDVSxNQUFNLEVBQUUsY0FBYyxHQUFHLGVBQWUsRUFDeEMsSUFBSSxFQUFFO1FBQ1osY0FBYyxFQUFFLGNBQWMsQ0FBQztRQUMvQixnQkFBZ0IsRUFBRSxnQkFBZ0IsQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUM5QyxTQUFTLENBQUMsRUFBRSxlQUFlLENBQUM7S0FDN0IsRUFDQztJQUVTLEtBQUssa0JBRWpCO0lBRU0sSUFBSSxTQUVWO0lBRUQ7OztPQUdHO0lBQ1UsTUFBTSxJQUFJLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBQyxDQU9sRDtDQUNGIn0=
@@ -0,0 +1 @@
1
+ {"version":3,"file":"prover-publisher-factory.d.ts","sourceRoot":"","sources":["../src/prover-publisher-factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE,qBAAa,sBAAsB;IAE/B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,IAAI;IAFd,YACU,MAAM,EAAE,cAAc,GAAG,eAAe,EACxC,IAAI,EAAE;QACZ,cAAc,EAAE,cAAc,CAAC;QAC/B,gBAAgB,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAC9C,SAAS,CAAC,EAAE,eAAe,CAAC;KAC7B,EACC;IAES,KAAK,kBAEjB;IAEM,IAAI,SAEV;IAED;;;OAGG;IACU,MAAM,IAAI,OAAO,CAAC,mBAAmB,CAAC,CAOlD;CACF"}
@@ -0,0 +1,26 @@
1
+ import { ProverNodePublisher } from './prover-node-publisher.js';
2
+ export class ProverPublisherFactory {
3
+ config;
4
+ deps;
5
+ constructor(config, deps){
6
+ this.config = config;
7
+ this.deps = deps;
8
+ }
9
+ async start() {
10
+ await this.deps.publisherManager.loadState();
11
+ }
12
+ stop() {
13
+ this.deps.publisherManager.interrupt();
14
+ }
15
+ /**
16
+ * Creates a new Prover Publisher instance.
17
+ * @returns A new ProverNodePublisher instance.
18
+ */ async create() {
19
+ const l1Publisher = await this.deps.publisherManager.getAvailablePublisher();
20
+ return new ProverNodePublisher(this.config, {
21
+ rollupContract: this.deps.rollupContract,
22
+ l1TxUtils: l1Publisher,
23
+ telemetry: this.deps.telemetry
24
+ });
25
+ }
26
+ }
@@ -1,10 +1,12 @@
1
1
  import type { EpochProverManager } from '@aztec/stdlib/interfaces/server';
2
+ import type { EpochProvingJob } from '../job/epoch-proving-job.js';
2
3
  import type { ProverNodePublisher } from '../prover-node-publisher.js';
3
4
  import { ProverNode } from '../prover-node.js';
4
- declare class TestProverNode_ extends ProverNode {
5
+ declare abstract class TestProverNodeClass extends ProverNode {
5
6
  prover: EpochProverManager;
6
7
  publisher: ProverNodePublisher;
8
+ abstract tryUploadEpochFailure(job: EpochProvingJob): Promise<string | undefined>;
7
9
  }
8
- export type TestProverNode = TestProverNode_;
10
+ export type TestProverNode = TestProverNodeClass;
9
11
  export {};
10
- //# sourceMappingURL=index.d.ts.map
12
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0L2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFMUUsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDbkUsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUN2RSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFL0MsdUJBQWUsbUJBQW9CLFNBQVEsVUFBVTtJQUNwQyxNQUFNLEVBQUUsa0JBQWtCLENBQUM7SUFDM0IsU0FBUyxFQUFFLG1CQUFtQixDQUFDO0lBRTlDLFNBQXlCLHFCQUFxQixDQUFDLEdBQUcsRUFBRSxlQUFlLEdBQUcsT0FBTyxDQUFDLE1BQU0sR0FBRyxTQUFTLENBQUMsQ0FBQztDQUNuRztBQUVELE1BQU0sTUFBTSxjQUFjLEdBQUcsbUJBQW1CLENBQUMifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAE1E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,cAAM,eAAgB,SAAQ,UAAU;IACtB,MAAM,EAAG,kBAAkB,CAAC;IAC5B,SAAS,EAAG,mBAAmB,CAAC;CACjD;AAED,MAAM,MAAM,cAAc,GAAG,eAAe,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAE1E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,uBAAe,mBAAoB,SAAQ,UAAU;IACpC,MAAM,EAAE,kBAAkB,CAAC;IAC3B,SAAS,EAAE,mBAAmB,CAAC;IAE9C,SAAyB,qBAAqB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CACnG;AAED,MAAM,MAAM,cAAc,GAAG,mBAAmB,CAAC"}
@@ -1,5 +1,3 @@
1
1
  import { ProverNode } from '../prover-node.js';
2
- class TestProverNode_ extends ProverNode {
3
- prover;
4
- publisher;
2
+ class TestProverNodeClass extends ProverNode {
5
3
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/prover-node",
3
- "version": "0.0.0-test.0",
3
+ "version": "0.0.1-commit.03f7ef2",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  ".": "./dest/index.js",
@@ -11,13 +11,12 @@
11
11
  "../package.common.json"
12
12
  ],
13
13
  "scripts": {
14
- "build": "yarn clean && tsc -b",
15
- "build:dev": "tsc -b --watch",
14
+ "build": "yarn clean && ../scripts/tsc.sh",
15
+ "build:dev": "../scripts/tsc.sh --watch",
16
16
  "clean": "rm -rf ./dest .tsbuildinfo",
17
- "formatting": "run -T prettier --check ./src && run -T eslint ./src",
18
- "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
19
17
  "bb": "node --no-warnings ./dest/bb/index.js",
20
- "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
18
+ "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}",
19
+ "run-failed-epoch": "node --no-warnings ./dest/bin/run-failed-epoch.js"
21
20
  },
22
21
  "jest": {
23
22
  "moduleNameMapper": {
@@ -50,41 +49,48 @@
50
49
  "testTimeout": 120000,
51
50
  "setupFiles": [
52
51
  "../../foundation/src/jest/setup.mjs"
52
+ ],
53
+ "testEnvironment": "../../foundation/src/jest/env.mjs",
54
+ "setupFilesAfterEnv": [
55
+ "../../foundation/src/jest/setupAfterEnv.mjs"
53
56
  ]
54
57
  },
55
58
  "dependencies": {
56
- "@aztec/archiver": "0.0.0-test.0",
57
- "@aztec/bb-prover": "0.0.0-test.0",
58
- "@aztec/blob-sink": "0.0.0-test.0",
59
- "@aztec/constants": "0.0.0-test.0",
60
- "@aztec/epoch-cache": "0.0.0-test.0",
61
- "@aztec/ethereum": "0.0.0-test.0",
62
- "@aztec/foundation": "0.0.0-test.0",
63
- "@aztec/kv-store": "0.0.0-test.0",
64
- "@aztec/l1-artifacts": "0.0.0-test.0",
65
- "@aztec/noir-protocol-circuits-types": "0.0.0-test.0",
66
- "@aztec/p2p": "0.0.0-test.0",
67
- "@aztec/protocol-contracts": "0.0.0-test.0",
68
- "@aztec/prover-client": "0.0.0-test.0",
69
- "@aztec/sequencer-client": "0.0.0-test.0",
70
- "@aztec/simulator": "0.0.0-test.0",
71
- "@aztec/stdlib": "0.0.0-test.0",
72
- "@aztec/telemetry-client": "0.0.0-test.0",
73
- "@aztec/world-state": "0.0.0-test.0",
59
+ "@aztec/archiver": "0.0.1-commit.03f7ef2",
60
+ "@aztec/bb-prover": "0.0.1-commit.03f7ef2",
61
+ "@aztec/blob-client": "0.0.1-commit.03f7ef2",
62
+ "@aztec/blob-lib": "0.0.1-commit.03f7ef2",
63
+ "@aztec/constants": "0.0.1-commit.03f7ef2",
64
+ "@aztec/epoch-cache": "0.0.1-commit.03f7ef2",
65
+ "@aztec/ethereum": "0.0.1-commit.03f7ef2",
66
+ "@aztec/foundation": "0.0.1-commit.03f7ef2",
67
+ "@aztec/kv-store": "0.0.1-commit.03f7ef2",
68
+ "@aztec/l1-artifacts": "0.0.1-commit.03f7ef2",
69
+ "@aztec/node-keystore": "0.0.1-commit.03f7ef2",
70
+ "@aztec/node-lib": "0.0.1-commit.03f7ef2",
71
+ "@aztec/noir-protocol-circuits-types": "0.0.1-commit.03f7ef2",
72
+ "@aztec/p2p": "0.0.1-commit.03f7ef2",
73
+ "@aztec/protocol-contracts": "0.0.1-commit.03f7ef2",
74
+ "@aztec/prover-client": "0.0.1-commit.03f7ef2",
75
+ "@aztec/sequencer-client": "0.0.1-commit.03f7ef2",
76
+ "@aztec/simulator": "0.0.1-commit.03f7ef2",
77
+ "@aztec/stdlib": "0.0.1-commit.03f7ef2",
78
+ "@aztec/telemetry-client": "0.0.1-commit.03f7ef2",
79
+ "@aztec/world-state": "0.0.1-commit.03f7ef2",
74
80
  "source-map-support": "^0.5.21",
75
81
  "tslib": "^2.4.0",
76
- "viem": "2.22.8"
82
+ "viem": "npm:@aztec/viem@2.38.2"
77
83
  },
78
84
  "devDependencies": {
79
- "@jest/globals": "^29.5.0",
80
- "@types/jest": "^29.5.0",
81
- "@types/memdown": "^3.0.0",
82
- "@types/node": "^18.7.23",
85
+ "@jest/globals": "^30.0.0",
86
+ "@types/jest": "^30.0.0",
87
+ "@types/node": "^22.15.17",
83
88
  "@types/source-map-support": "^0.5.10",
84
- "jest": "^29.5.0",
85
- "jest-mock-extended": "^3.0.3",
89
+ "@typescript/native-preview": "7.0.0-dev.20251126.1",
90
+ "jest": "^30.0.0",
91
+ "jest-mock-extended": "^4.0.0",
86
92
  "ts-node": "^10.9.1",
87
- "typescript": "^5.0.4"
93
+ "typescript": "^5.3.3"
88
94
  },
89
95
  "files": [
90
96
  "dest",
@@ -93,6 +99,6 @@
93
99
  ],
94
100
  "types": "./dest/index.d.ts",
95
101
  "engines": {
96
- "node": ">=18"
102
+ "node": ">=20.10"
97
103
  }
98
104
  }