@aztec/prover-node 0.0.0-test.1 → 0.0.1-commit.017a351

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 +13 -0
  8. package/dest/actions/rerun-epoch-proving-job.d.ts.map +1 -0
  9. package/dest/actions/rerun-epoch-proving-job.js +120 -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 +68 -0
  16. package/dest/config.d.ts +17 -16
  17. package/dest/config.d.ts.map +1 -1
  18. package/dest/config.js +93 -28
  19. package/dest/factory.d.ts +26 -18
  20. package/dest/factory.d.ts.map +1 -1
  21. package/dest/factory.js +92 -43
  22. package/dest/index.d.ts +3 -2
  23. package/dest/index.d.ts.map +1 -1
  24. package/dest/index.js +2 -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 +31 -18
  29. package/dest/job/epoch-proving-job.d.ts.map +1 -1
  30. package/dest/job/epoch-proving-job.js +756 -99
  31. package/dest/metrics.d.ts +50 -5
  32. package/dest/metrics.d.ts.map +1 -1
  33. package/dest/metrics.js +157 -72
  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 +24 -17
  37. package/dest/monitors/index.d.ts +1 -1
  38. package/dest/prover-node-publisher.d.ts +38 -19
  39. package/dest/prover-node-publisher.d.ts.map +1 -1
  40. package/dest/prover-node-publisher.js +288 -87
  41. package/dest/prover-node.d.ts +64 -49
  42. package/dest/prover-node.d.ts.map +1 -1
  43. package/dest/prover-node.js +650 -148
  44. package/dest/prover-publisher-factory.d.ts +25 -0
  45. package/dest/prover-publisher-factory.d.ts.map +1 -0
  46. package/dest/prover-publisher-factory.js +28 -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 +40 -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 +74 -0
  54. package/src/actions/upload-epoch-proof-failure.ts +88 -0
  55. package/src/bin/run-failed-epoch.ts +79 -0
  56. package/src/config.ts +123 -45
  57. package/src/factory.ts +163 -67
  58. package/src/index.ts +2 -1
  59. package/src/job/epoch-proving-job-data.ts +82 -0
  60. package/src/job/epoch-proving-job.ts +364 -88
  61. package/src/metrics.ts +188 -70
  62. package/src/monitors/epoch-monitor.ts +23 -19
  63. package/src/prover-node-publisher.ts +368 -125
  64. package/src/prover-node.ts +292 -166
  65. package/src/prover-publisher-factory.ts +45 -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
@@ -1,31 +1,36 @@
1
- import { AGGREGATION_OBJECT_LENGTH, AZTEC_MAX_EPOCH_DURATION } from '@aztec/constants';
1
+ import { getEthBlobEvaluationInputs } from '@aztec/blob-lib';
2
+ import { MAX_CHECKPOINTS_PER_EPOCH } from '@aztec/constants';
2
3
  import { makeTuple } from '@aztec/foundation/array';
3
- import { areArraysEqual, times } from '@aztec/foundation/collection';
4
+ import { CheckpointNumber } from '@aztec/foundation/branded-types';
5
+ import { areArraysEqual } from '@aztec/foundation/collection';
6
+ import { Fr } from '@aztec/foundation/curves/bn254';
4
7
  import { EthAddress } from '@aztec/foundation/eth-address';
5
- import { Fr } from '@aztec/foundation/fields';
6
8
  import { createLogger } from '@aztec/foundation/log';
7
- import { serializeToBuffer } from '@aztec/foundation/serialize';
8
- import { InterruptibleSleep } from '@aztec/foundation/sleep';
9
+ import { retryUntil } from '@aztec/foundation/retry';
9
10
  import { Timer } from '@aztec/foundation/timer';
10
11
  import { RollupAbi } from '@aztec/l1-artifacts';
12
+ import { CommitteeAttestation, CommitteeAttestationsAndSigners } from '@aztec/stdlib/block';
13
+ import { getProofSubmissionDeadlineTimestamp } from '@aztec/stdlib/epoch-helpers';
11
14
  import { getTelemetryClient } from '@aztec/telemetry-client';
12
- import { encodeFunctionData } from 'viem';
13
- import { ProverNodeMetrics } from './metrics.js';
15
+ import { inspect } from 'util';
16
+ import { encodeFunctionData, formatEther, formatGwei } from 'viem';
17
+ import { ProverNodePublisherMetrics } from './metrics.js';
14
18
  export class ProverNodePublisher {
15
- interruptibleSleep = new InterruptibleSleep();
16
- sleepTimeMs;
17
19
  interrupted = false;
18
20
  metrics;
19
- log = createLogger('prover-node:l1-tx-publisher');
21
+ log;
20
22
  rollupContract;
21
23
  l1TxUtils;
22
- constructor(config, deps){
23
- this.sleepTimeMs = config?.l1PublishRetryIntervalMS ?? 60_000;
24
+ constructor(config, deps, bindings){
24
25
  const telemetry = deps.telemetry ?? getTelemetryClient();
25
- this.metrics = new ProverNodeMetrics(telemetry, 'ProverNode');
26
+ this.metrics = new ProverNodePublisherMetrics(telemetry, 'ProverNode');
27
+ this.log = createLogger('prover-node:l1-tx-publisher', bindings);
26
28
  this.rollupContract = deps.rollupContract;
27
29
  this.l1TxUtils = deps.l1TxUtils;
28
30
  }
31
+ getRollupContract() {
32
+ return this.rollupContract;
33
+ }
29
34
  /**
30
35
  * Calling `interrupt` will cause any in progress call to `publishRollup` to return `false` asap.
31
36
  * Be warned, the call may return false even if the tx subsequently gets successfully mined.
@@ -33,36 +38,42 @@ export class ProverNodePublisher {
33
38
  * A call to `restart` is required before you can continue publishing.
34
39
  */ interrupt() {
35
40
  this.interrupted = true;
36
- this.interruptibleSleep.interrupt();
41
+ this.l1TxUtils.interrupt();
37
42
  }
38
43
  /** Restarts the publisher after calling `interrupt`. */ restart() {
39
44
  this.interrupted = false;
45
+ this.l1TxUtils.restart();
40
46
  }
41
47
  getSenderAddress() {
42
- return EthAddress.fromString(this.l1TxUtils.getSenderAddress());
48
+ return this.l1TxUtils.getSenderAddress();
43
49
  }
44
50
  async submitEpochProof(args) {
45
- const { epochNumber, fromBlock, toBlock } = args;
51
+ const { epochNumber, fromCheckpoint, toCheckpoint } = args;
46
52
  const ctx = {
47
53
  epochNumber,
48
- fromBlock,
49
- toBlock
54
+ fromCheckpoint,
55
+ toCheckpoint
50
56
  };
51
57
  if (!this.interrupted) {
58
+ if (!await this.waitUntilStartBuildsOnProven(args)) {
59
+ this.log.verbose('Checkpoint data syncing interrupted', ctx);
60
+ return false;
61
+ }
52
62
  const timer = new Timer();
53
63
  // Validate epoch proof range and hashes are correct before submitting
54
64
  await this.validateEpochProofSubmission(args);
55
65
  const txReceipt = await this.sendSubmitEpochProofTx(args);
56
66
  if (!txReceipt) {
67
+ this.log.error(`Failed to mine submitEpochProof tx`, undefined, ctx);
57
68
  return false;
58
69
  }
59
70
  try {
60
- this.metrics.recordSenderBalance(await this.l1TxUtils.getSenderBalance(), this.l1TxUtils.getSenderAddress());
71
+ this.metrics.recordSenderBalance(await this.l1TxUtils.getSenderBalance(), this.l1TxUtils.getSenderAddress().toString());
61
72
  } catch (err) {
62
73
  this.log.warn(`Failed to record the ETH balance of the prover node: ${err}`);
63
74
  }
64
75
  // Tx was mined successfully
65
- if (txReceipt.status) {
76
+ if (txReceipt.status === 'success') {
66
77
  const tx = await this.l1TxUtils.getTransactionStats(txReceipt.transactionHash);
67
78
  const stats = {
68
79
  gasPrice: txReceipt.effectiveGasPrice,
@@ -83,66 +94,148 @@ export class ProverNodePublisher {
83
94
  return true;
84
95
  }
85
96
  this.metrics.recordFailedTx();
86
- this.log.error(`Rollup.submitEpochProof tx status failed: ${txReceipt.transactionHash}`, ctx);
87
- await this.sleepOrInterrupted();
97
+ this.log.error(`Rollup submitEpochProof tx reverted ${txReceipt.transactionHash}`, undefined, ctx);
88
98
  }
89
- this.log.verbose('L2 block data syncing interrupted while processing blocks.', ctx);
99
+ this.log.verbose('Checkpoint data syncing interrupted', ctx);
90
100
  return false;
91
101
  }
92
- async validateEpochProofSubmission(args) {
93
- const { fromBlock, toBlock, publicInputs, proof } = args;
94
- // Check that the block numbers match the expected epoch to be proven
95
- const { pendingBlockNumber: pending, provenBlockNumber: proven } = await this.rollupContract.getTips();
96
- if (proven !== BigInt(fromBlock) - 1n) {
97
- throw new Error(`Cannot submit epoch proof for ${fromBlock}-${toBlock} as proven block is ${proven}`);
102
+ async waitUntilStartBuildsOnProven(args) {
103
+ const { epochNumber, fromCheckpoint } = args;
104
+ const provenCheckpoint = await this.getProvenCheckpoint();
105
+ if (this.isStartBuildingOnProven(fromCheckpoint, provenCheckpoint)) {
106
+ return true;
98
107
  }
99
- if (toBlock > pending) {
100
- throw new Error(`Cannot submit epoch proof for ${fromBlock}-${toBlock} as pending block is ${pending}`);
108
+ const timeout = await this.getSecondsUntilProofSubmissionWindowEnd(epochNumber);
109
+ this.log.info(`Waiting for proven checkpoint to reach proof start`, {
110
+ epochNumber,
111
+ fromCheckpoint,
112
+ provenCheckpoint,
113
+ timeout
114
+ });
115
+ await retryUntil(async ()=>{
116
+ if (this.interrupted) {
117
+ return true;
118
+ }
119
+ const proven = await this.getProvenCheckpoint();
120
+ this.log.verbose(`Proven checkpoint is at ${proven} (waiting for ${fromCheckpoint - 1})`, {
121
+ epochNumber
122
+ });
123
+ return this.isStartBuildingOnProven(fromCheckpoint, proven) ? true : undefined;
124
+ }, `proven checkpoint to reach ${fromCheckpoint - 1}`, timeout, 4);
125
+ return !this.interrupted;
126
+ }
127
+ async getProvenCheckpoint() {
128
+ return (await this.rollupContract.getTips()).proven;
129
+ }
130
+ isStartBuildingOnProven(fromCheckpoint, provenCheckpoint) {
131
+ return fromCheckpoint - 1 <= provenCheckpoint;
132
+ }
133
+ async getSecondsUntilProofSubmissionWindowEnd(epochNumber) {
134
+ const deadline = getProofSubmissionDeadlineTimestamp(epochNumber, await this.rollupContract.getRollupConstants());
135
+ const now = BigInt(Math.floor(Date.now() / 1000));
136
+ return Math.max(Number(deadline - now), 0.001);
137
+ }
138
+ async validateEpochProofSubmission(args) {
139
+ const { fromCheckpoint, toCheckpoint, publicInputs, batchedBlobInputs } = args;
140
+ // Check that the checkpoint numbers match the expected epoch to be proven
141
+ const { pending, proven } = await this.rollupContract.getTips();
142
+ // Don't publish if proven is beyond our toCheckpoint, pointless to do so
143
+ if (proven > toCheckpoint) {
144
+ throw new Error(`Cannot submit epoch proof for ${fromCheckpoint}-${toCheckpoint} as proven checkpoint is ${proven}`);
101
145
  }
102
- // Check the block hash and archive for the immediate block before the epoch
103
- const blockLog = await this.rollupContract.getBlock(proven);
104
- if (publicInputs.previousArchive.root.toString() !== blockLog.archive) {
105
- throw new Error(`Previous archive root mismatch: ${publicInputs.previousArchive.root.toString()} !== ${blockLog.archive}`);
146
+ // toCheckpoint can't be greater than pending
147
+ if (toCheckpoint > pending) {
148
+ throw new Error(`Cannot submit epoch proof for ${fromCheckpoint}-${toCheckpoint} as proposed checkpoint is ${pending}`);
106
149
  }
107
- // TODO: Remove zero check once we inject the proper zero blockhash
108
- if (blockLog.blockHash !== Fr.ZERO.toString() && publicInputs.previousBlockHash.toString() !== blockLog.blockHash) {
109
- throw new Error(`Previous block hash mismatch: ${publicInputs.previousBlockHash.toString()} !== ${blockLog.blockHash}`);
150
+ // Check the archive for the immediate checkpoint before the epoch
151
+ const checkpointLog = await this.rollupContract.getCheckpoint(CheckpointNumber(fromCheckpoint - 1));
152
+ if (!publicInputs.previousArchiveRoot.equals(checkpointLog.archive)) {
153
+ throw new Error(`Previous archive root mismatch: ${publicInputs.previousArchiveRoot.toString()} !== ${checkpointLog.archive.toString()}`);
110
154
  }
111
- // Check the block hash and archive for the last block in the epoch
112
- const endBlockLog = await this.rollupContract.getBlock(BigInt(toBlock));
113
- if (publicInputs.endArchive.root.toString() !== endBlockLog.archive) {
114
- throw new Error(`End archive root mismatch: ${publicInputs.endArchive.root.toString()} !== ${endBlockLog.archive}`);
155
+ // Check the archive for the last checkpoint in the epoch
156
+ const endCheckpointLog = await this.rollupContract.getCheckpoint(toCheckpoint);
157
+ if (!publicInputs.endArchiveRoot.equals(endCheckpointLog.archive)) {
158
+ throw new Error(`End archive root mismatch: ${publicInputs.endArchiveRoot.toString()} !== ${endCheckpointLog.archive.toString()}`);
115
159
  }
116
- if (publicInputs.endBlockHash.toString() !== endBlockLog.blockHash) {
117
- throw new Error(`End block hash mismatch: ${publicInputs.endBlockHash.toString()} !== ${endBlockLog.blockHash}`);
160
+ // Check the batched blob inputs from the root rollup against the batched blob computed in ts
161
+ const finalBlobAccumulator = batchedBlobInputs.toFinalBlobAccumulator();
162
+ if (!publicInputs.blobPublicInputs.equals(finalBlobAccumulator)) {
163
+ throw new Error(`Batched blob mismatch: ${inspect(publicInputs.blobPublicInputs)} !== ${inspect(finalBlobAccumulator)}`);
118
164
  }
119
165
  // Compare the public inputs computed by the contract with the ones injected
120
- const rollupPublicInputs = await this.rollupContract.getEpochProofPublicInputs(this.getSubmitEpochProofArgs(args));
121
- const aggregationObject = proof.isEmpty() ? times(AGGREGATION_OBJECT_LENGTH, Fr.zero) : proof.extractAggregationObject();
166
+ const rollupPublicInputs = await this.rollupContract.getEpochProofPublicInputs(this.getEpochProofPublicInputsArgs(args));
122
167
  const argsPublicInputs = [
123
- ...publicInputs.toFields(),
124
- ...aggregationObject
168
+ ...publicInputs.toFields()
125
169
  ];
126
- if (!areArraysEqual(rollupPublicInputs.map(Fr.fromHexString), argsPublicInputs, (a, b)=>a.equals(b))) {
127
- const fmt = (inputs)=>inputs.map((x)=>x.toString()).join(', ');
128
- throw new Error(`Root rollup public inputs mismatch:\nRollup: ${fmt(rollupPublicInputs)}\nComputed:${fmt(argsPublicInputs)}`);
170
+ if (!areArraysEqual(rollupPublicInputs, argsPublicInputs, (a, b)=>a.equals(b))) {
171
+ throw await reportPublicInputsMismatch({
172
+ rollupPublicInputs,
173
+ argsPublicInputs,
174
+ fromCheckpoint,
175
+ toCheckpoint,
176
+ rollupContract: this.rollupContract,
177
+ log: this.log
178
+ });
129
179
  }
130
180
  }
181
+ /**
182
+ * Estimates what submitting the epoch proof would have cost on L1 without actually sending it.
183
+ * Runs the same validation as `submitEpochProof`, encodes the calldata, estimates gas, and records metrics.
184
+ * Used when proof publishing is disabled (e.g. PROVER_NODE_DISABLE_PROOF_PUBLISH=true on mainnet).
185
+ */ async analyzeEpochProofSubmission(args) {
186
+ const { epochNumber, fromCheckpoint, toCheckpoint } = args;
187
+ await this.validateEpochProofSubmission(args);
188
+ const data = this.encodeSubmitEpochProofCalldata(args);
189
+ const senderAddress = this.l1TxUtils.getSenderAddress();
190
+ const [gasLimit, gasPrice, latestBlock] = await Promise.all([
191
+ this.l1TxUtils.estimateGas(senderAddress.toString(), {
192
+ to: this.rollupContract.address,
193
+ data
194
+ }),
195
+ this.l1TxUtils.getGasPrice(),
196
+ this.l1TxUtils.client.getBlock({
197
+ blockTag: 'latest'
198
+ })
199
+ ]);
200
+ const baseFeePerGas = latestBlock.baseFeePerGas ?? 0n;
201
+ const { maxPriorityFeePerGas } = gasPrice;
202
+ const effectiveFeePerGas = baseFeePerGas + maxPriorityFeePerGas;
203
+ const estimatedTotalFee = gasLimit * effectiveFeePerGas;
204
+ const stats = {
205
+ gasLimit,
206
+ baseFeePerGas,
207
+ maxPriorityFeePerGas,
208
+ estimatedTotalFee
209
+ };
210
+ this.log.info(`Estimated epoch proof submission cost (not submitted)`, {
211
+ epochNumber,
212
+ fromCheckpoint,
213
+ toCheckpoint,
214
+ gasLimit: gasLimit.toString(),
215
+ baseFeePerGas: formatGwei(baseFeePerGas),
216
+ maxPriorityFeePerGas: formatGwei(maxPriorityFeePerGas),
217
+ estimatedTotalFeeEth: formatEther(estimatedTotalFee)
218
+ });
219
+ this.metrics.recordEstimatedSubmitProof(stats);
220
+ }
221
+ encodeSubmitEpochProofCalldata(args) {
222
+ return encodeFunctionData({
223
+ abi: RollupAbi,
224
+ functionName: 'submitEpochRootProof',
225
+ args: [
226
+ this.getSubmitEpochProofArgs(args)
227
+ ]
228
+ });
229
+ }
131
230
  async sendSubmitEpochProofTx(args) {
132
- const proofHex = `0x${args.proof.withoutPublicInputs().toString('hex')}`;
133
- const argsArray = this.getSubmitEpochProofArgs(args);
134
231
  const txArgs = [
135
- {
136
- start: argsArray[0],
137
- end: argsArray[1],
138
- args: argsArray[2],
139
- fees: argsArray[3],
140
- blobPublicInputs: argsArray[4],
141
- aggregationObject: argsArray[5],
142
- proof: proofHex
143
- }
232
+ this.getSubmitEpochProofArgs(args)
144
233
  ];
145
- this.log.info(`SubmitEpochProof proofSize=${args.proof.withoutPublicInputs().length} bytes`);
234
+ this.log.info(`Submitting epoch proof to L1 rollup contract`, {
235
+ proofSize: args.proof.withoutPublicInputs().length,
236
+ fromCheckpoint: args.fromCheckpoint,
237
+ toCheckpoint: args.toCheckpoint
238
+ });
146
239
  const data = encodeFunctionData({
147
240
  abi: RollupAbi,
148
241
  functionName: 'submitEpochRootProof',
@@ -153,40 +246,148 @@ export class ProverNodePublisher {
153
246
  to: this.rollupContract.address,
154
247
  data
155
248
  });
249
+ if (receipt.status !== 'success') {
250
+ const errorMsg = await this.l1TxUtils.tryGetErrorFromRevertedTx(data, {
251
+ args: [
252
+ ...txArgs
253
+ ],
254
+ functionName: 'submitEpochRootProof',
255
+ abi: RollupAbi,
256
+ address: this.rollupContract.address
257
+ }, /*blobInputs*/ undefined, /*stateOverride*/ []);
258
+ this.log.error(`Rollup submit epoch proof tx reverted with ${errorMsg ?? 'unknown error'}`);
259
+ return undefined;
260
+ }
156
261
  return receipt;
157
262
  } catch (err) {
158
263
  this.log.error(`Rollup submit epoch proof failed`, err);
159
- const errorMsg = await this.l1TxUtils.tryGetErrorFromRevertedTx(data, {
160
- args: [
161
- ...txArgs
162
- ],
163
- functionName: 'submitEpochRootProof',
164
- abi: RollupAbi,
165
- address: this.rollupContract.address
166
- }, /*blobInputs*/ undefined, /*stateOverride*/ []);
167
- this.log.error(`Rollup submit epoch proof tx reverted. ${errorMsg}`);
168
264
  return undefined;
169
265
  }
170
266
  }
171
- getSubmitEpochProofArgs(args) {
267
+ getEpochProofPublicInputsArgs(args) {
268
+ // Returns arguments for EpochProofLib.sol -> getEpochProofPublicInputs()
172
269
  return [
173
- BigInt(args.fromBlock),
174
- BigInt(args.toBlock),
270
+ BigInt(args.fromCheckpoint),
271
+ BigInt(args.toCheckpoint),
175
272
  {
176
- previousArchive: args.publicInputs.previousArchive.root.toString(),
177
- endArchive: args.publicInputs.endArchive.root.toString(),
178
- previousBlockHash: args.publicInputs.previousBlockHash.toString(),
179
- endBlockHash: args.publicInputs.endBlockHash.toString(),
180
- endTimestamp: args.publicInputs.endTimestamp.toBigInt(),
273
+ previousArchive: args.publicInputs.previousArchiveRoot.toString(),
274
+ endArchive: args.publicInputs.endArchiveRoot.toString(),
181
275
  outHash: args.publicInputs.outHash.toString(),
182
- proverId: EthAddress.fromField(args.publicInputs.proverId).toString()
183
- },
184
- makeTuple(AZTEC_MAX_EPOCH_DURATION * 2, (i)=>i % 2 === 0 ? args.publicInputs.fees[i / 2].recipient.toField().toString() : args.publicInputs.fees[(i - 1) / 2].value.toString()),
185
- `0x${args.publicInputs.blobPublicInputs.filter((_, i)=>i < args.toBlock - args.fromBlock + 1).map((b)=>b.toString()).join(``)}`,
186
- `0x${serializeToBuffer(args.proof.extractAggregationObject()).toString('hex')}`
276
+ proverId: EthAddress.fromField(args.publicInputs.constants.proverId).toString()
277
+ } /*_args*/ ,
278
+ makeTuple(MAX_CHECKPOINTS_PER_EPOCH * 2, (i)=>i % 2 === 0 ? args.publicInputs.fees[i / 2].recipient.toField().toString() : args.publicInputs.fees[(i - 1) / 2].value.toString()),
279
+ getEthBlobEvaluationInputs(args.batchedBlobInputs)
187
280
  ];
188
281
  }
189
- async sleepOrInterrupted() {
190
- await this.interruptibleSleep.sleep(this.sleepTimeMs);
282
+ getSubmitEpochProofArgs(args) {
283
+ // Returns arguments for EpochProofLib.sol -> submitEpochRootProof()
284
+ const proofHex = `0x${args.proof.withoutPublicInputs().toString('hex')}`;
285
+ const argsArray = this.getEpochProofPublicInputsArgs(args);
286
+ return {
287
+ start: argsArray[0],
288
+ end: argsArray[1],
289
+ args: argsArray[2],
290
+ fees: argsArray[3],
291
+ attestations: CommitteeAttestationsAndSigners.packAttestations(args.attestations.map((a)=>CommitteeAttestation.fromViem(a))),
292
+ blobInputs: argsArray[4],
293
+ proof: proofHex
294
+ };
295
+ }
296
+ }
297
+ /**
298
+ * Decodes a `Root rollup public inputs mismatch`, fetches the on-chain CheckpointLog for any
299
+ * mismatching `checkpointHeaderHashes[i]`, emits a structured error log, and returns a thrown-ready
300
+ * Error with a human-readable summary.
301
+ *
302
+ * Layout of `RootRollupPublicInputs.toFields()`:
303
+ * [0] previousArchiveRoot
304
+ * [1] endArchiveRoot
305
+ * [2] outHash
306
+ * [3 .. 3+N-1] checkpointHeaderHashes[i] for i in 0..N-1 (N = MAX_CHECKPOINTS_PER_EPOCH)
307
+ * [3+N .. 3+3N-1] fees[i] = (recipient, value) for i in 0..N-1
308
+ * [3+3N .. 3+3N+4] EpochConstantData (chainId, version, vkTreeRoot, protocolContractsHash, proverId)
309
+ * [3+3N+5 ..] blobPublicInputs (FinalBlobAccumulator)
310
+ */ async function reportPublicInputsMismatch(input) {
311
+ const { rollupPublicInputs, argsPublicInputs, fromCheckpoint, toCheckpoint, rollupContract, log } = input;
312
+ const N = MAX_CHECKPOINTS_PER_EPOCH;
313
+ const constantsStart = 3 + 3 * N;
314
+ const blobStart = constantsStart + 5;
315
+ const constantLabels = [
316
+ 'chainId',
317
+ 'version',
318
+ 'vkTreeRoot',
319
+ 'protocolContractsHash',
320
+ 'proverId'
321
+ ];
322
+ const diffs = [];
323
+ const len = Math.max(rollupPublicInputs.length, argsPublicInputs.length);
324
+ for(let i = 0; i < len; i++){
325
+ const a = rollupPublicInputs[i] ?? Fr.ZERO;
326
+ const b = argsPublicInputs[i] ?? Fr.ZERO;
327
+ if (a.equals(b)) {
328
+ continue;
329
+ }
330
+ let label;
331
+ let checkpointIndex;
332
+ if (i === 0) {
333
+ label = 'previousArchiveRoot';
334
+ } else if (i === 1) {
335
+ label = 'endArchiveRoot';
336
+ } else if (i === 2) {
337
+ label = 'outHash';
338
+ } else if (i < 3 + N) {
339
+ checkpointIndex = i - 3;
340
+ label = `checkpointHeaderHashes[${checkpointIndex}]`;
341
+ } else if (i < 3 + 3 * N) {
342
+ const feePairIndex = i - (3 + N);
343
+ const feeIndex = Math.floor(feePairIndex / 2);
344
+ const sub = feePairIndex % 2 === 0 ? 'recipient' : 'value';
345
+ label = `fees[${feeIndex}].${sub}`;
346
+ } else if (i < blobStart) {
347
+ label = `constants.${constantLabels[i - constantsStart]}`;
348
+ } else {
349
+ label = `blobPublicInputs[${i - blobStart}]`;
350
+ }
351
+ diffs.push({
352
+ index: i,
353
+ label,
354
+ rollup: a,
355
+ computed: b,
356
+ checkpointIndex
357
+ });
191
358
  }
359
+ // For each mismatching checkpointHeaderHash, fetch the L1 CheckpointLog so the operator can
360
+ // see what was published on-chain alongside the prover's recomputed hash.
361
+ const onChainCheckpoints = await Promise.all(diffs.filter((d)=>d.checkpointIndex !== undefined).map(async (d)=>{
362
+ const checkpointNumber = CheckpointNumber(fromCheckpoint + d.checkpointIndex);
363
+ try {
364
+ const cp = await rollupContract.getCheckpoint(checkpointNumber);
365
+ return {
366
+ checkpointIndex: d.checkpointIndex,
367
+ checkpointNumber,
368
+ headerHash: cp.headerHash.toString()
369
+ };
370
+ } catch (err) {
371
+ return {
372
+ checkpointIndex: d.checkpointIndex,
373
+ checkpointNumber,
374
+ error: err.message
375
+ };
376
+ }
377
+ }));
378
+ log.error(`Root rollup public inputs mismatch`, undefined, {
379
+ fromCheckpoint,
380
+ toCheckpoint,
381
+ numDiffs: diffs.length,
382
+ diffs: diffs.map((d)=>({
383
+ index: d.index,
384
+ label: d.label,
385
+ rollup: d.rollup.toString(),
386
+ computed: d.computed.toString()
387
+ })),
388
+ onChainCheckpoints
389
+ });
390
+ const fmt = (inputs)=>inputs.map((x)=>x.toString()).join(', ');
391
+ const summary = diffs.map((d)=>`[${d.index} ${d.label}] L1=${d.rollup} prover=${d.computed}`).join('\n');
392
+ return new Error(`Root rollup public inputs mismatch (${diffs.length} fields differ):\n${summary}\n` + `Rollup: ${fmt(rollupPublicInputs)}\nComputed:${fmt(argsPublicInputs)}`);
192
393
  }
@@ -1,75 +1,89 @@
1
- import type { Maybe } from '@aztec/foundation/types';
2
- import type { P2P } from '@aztec/p2p';
1
+ import type { RollupContract } from '@aztec/ethereum/contracts';
2
+ import type { Delayer } from '@aztec/ethereum/l1-tx-utils';
3
+ import { EpochNumber } from '@aztec/foundation/branded-types';
4
+ import { DateProvider } from '@aztec/foundation/timer';
3
5
  import { PublicProcessorFactory } from '@aztec/simulator/server';
4
- import type { L2Block, L2BlockSource } from '@aztec/stdlib/block';
6
+ import type { L2BlockSource } from '@aztec/stdlib/block';
7
+ import type { ChainConfig } from '@aztec/stdlib/config';
5
8
  import type { ContractDataSource } from '@aztec/stdlib/contract';
6
- import { type EpochProverManager, type ProverCoordination, type ProverNodeApi, type Service, type WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
9
+ import { type EpochProverManager, type ITxProvider, type ProverNodeApi, type Service, type WorldStateSyncStatus, type WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
10
+ import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
7
11
  import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
8
- import type { P2PClientType } from '@aztec/stdlib/p2p';
9
- import type { Tx } from '@aztec/stdlib/tx';
10
- import { type TelemetryClient, type Traceable, type Tracer } from '@aztec/telemetry-client';
12
+ import { L1Metrics, type TelemetryClient, type Traceable, type Tracer } from '@aztec/telemetry-client';
13
+ import type { SpecificProverNodeConfig } from './config.js';
14
+ import type { EpochProvingJobData } from './job/epoch-proving-job-data.js';
11
15
  import { EpochProvingJob, type EpochProvingJobState } from './job/epoch-proving-job.js';
12
16
  import type { EpochMonitor, EpochMonitorHandler } from './monitors/epoch-monitor.js';
13
17
  import type { ProverNodePublisher } from './prover-node-publisher.js';
14
- export type ProverNodeOptions = {
15
- pollingIntervalMs: number;
16
- maxPendingJobs: number;
17
- maxParallelBlocksPerEpoch: number;
18
- txGatheringTimeoutMs: number;
19
- txGatheringIntervalMs: number;
20
- txGatheringMaxParallelRequests: number;
21
- };
18
+ import type { ProverPublisherFactory } from './prover-publisher-factory.js';
19
+ type ProverNodeOptions = SpecificProverNodeConfig & Partial<DataStoreOptions>;
20
+ type DataStoreOptions = Pick<DataStoreConfig, 'dataDirectory'> & Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'>;
22
21
  /**
23
- * An Aztec Prover Node is a standalone process that monitors the unfinalised chain on L1 for unproven blocks,
24
- * submits bids for proving them, and monitors if they are accepted. If so, the prover node fetches the txs
25
- * from a tx source in the p2p network or an external node, re-executes their public functions, creates a rollup
22
+ * An Aztec Prover Node is a standalone process that monitors the unfinalized chain on L1 for unproven epochs,
23
+ * fetches their txs from the p2p network or external nodes, re-executes their public functions, creates a rollup
26
24
  * proof for the epoch, and submits it to L1.
27
25
  */
28
26
  export declare class ProverNode implements EpochMonitorHandler, ProverNodeApi, Traceable {
29
27
  protected readonly prover: EpochProverManager;
30
- protected readonly publisher: ProverNodePublisher;
31
- protected readonly l2BlockSource: L2BlockSource & Maybe<Service>;
28
+ protected readonly publisherFactory: ProverPublisherFactory;
29
+ protected readonly l2BlockSource: L2BlockSource & Partial<Service>;
32
30
  protected readonly l1ToL2MessageSource: L1ToL2MessageSource;
33
31
  protected readonly contractDataSource: ContractDataSource;
34
32
  protected readonly worldState: WorldStateSynchronizer;
35
- protected readonly coordination: ProverCoordination & Maybe<Service>;
33
+ protected readonly p2pClient: {
34
+ getTxProvider(): ITxProvider;
35
+ } & Partial<Service>;
36
36
  protected readonly epochsMonitor: EpochMonitor;
37
+ protected readonly rollupContract: RollupContract;
38
+ protected readonly l1Metrics: L1Metrics;
37
39
  protected readonly telemetryClient: TelemetryClient;
40
+ private delayer?;
41
+ private readonly dateProvider;
38
42
  private log;
39
- private dateProvider;
40
- private latestEpochWeAreProving;
41
43
  private jobs;
42
- private cachedEpochData;
43
- private options;
44
- private metrics;
45
- private txFetcher;
46
- private lastBlockNumber;
44
+ private config;
45
+ private jobMetrics;
46
+ private rewardsMetrics;
47
+ private startingProofEpochs;
47
48
  readonly tracer: Tracer;
48
- constructor(prover: EpochProverManager, publisher: ProverNodePublisher, l2BlockSource: L2BlockSource & Maybe<Service>, l1ToL2MessageSource: L1ToL2MessageSource, contractDataSource: ContractDataSource, worldState: WorldStateSynchronizer, coordination: ProverCoordination & Maybe<Service>, epochsMonitor: EpochMonitor, options?: Partial<ProverNodeOptions>, telemetryClient?: TelemetryClient);
49
- getProverId(): import("@aztec/aztec.js").Fr;
50
- getP2P(): P2P<P2PClientType.Prover> | undefined;
49
+ protected publisher: ProverNodePublisher | undefined;
50
+ constructor(prover: EpochProverManager, publisherFactory: ProverPublisherFactory, l2BlockSource: L2BlockSource & Partial<Service>, l1ToL2MessageSource: L1ToL2MessageSource, contractDataSource: ContractDataSource, worldState: WorldStateSynchronizer, p2pClient: {
51
+ getTxProvider(): ITxProvider;
52
+ } & Partial<Service>, epochsMonitor: EpochMonitor, rollupContract: RollupContract, l1Metrics: L1Metrics, config?: Partial<ProverNodeOptions>, telemetryClient?: TelemetryClient, delayer?: Delayer | undefined, dateProvider?: DateProvider);
53
+ getProverId(): import("@aztec/foundation/eth-address").EthAddress;
54
+ getP2P(): {
55
+ getTxProvider(): ITxProvider;
56
+ } & Partial<Service>;
57
+ /** Returns the shared tx delayer for prover L1 txs, if enabled. Test-only. */
58
+ getDelayer(): Delayer | undefined;
51
59
  /**
52
60
  * Handles an epoch being completed by starting a proof for it if there are no active jobs for it.
53
61
  * @param epochNumber - The epoch number that was just completed.
62
+ * @returns false if there is an error, true otherwise
54
63
  */
55
- handleEpochReadyToProve(epochNumber: bigint): Promise<void>;
64
+ handleEpochReadyToProve(epochNumber: EpochNumber): Promise<boolean>;
56
65
  /**
57
- * Starts the prover node so it periodically checks for unproven epochs in the unfinalised chain from L1 and
66
+ * Starts the prover node so it periodically checks for unproven epochs in the unfinalized chain from L1 and
58
67
  * starts proving jobs for them.
59
68
  */
60
- start(): void;
69
+ start(): Promise<void>;
61
70
  /**
62
71
  * Stops the prover node and all its dependencies.
72
+ * Resources not owned by this node (shared with the parent aztec-node) are skipped.
63
73
  */
64
74
  stop(): Promise<void>;
65
- /**
66
- * Creates a proof for a block range. Returns once the proof has been submitted to L1.
67
- */
68
- prove(epochNumber: number | bigint): Promise<void>;
75
+ /** Returns world state status. */
76
+ getWorldStateSyncStatus(): Promise<WorldStateSyncStatus>;
77
+ /** Returns archiver status. */
78
+ getL2Tips(): Promise<import("@aztec/stdlib/block").L2Tips>;
69
79
  /**
70
80
  * Starts a proving process and returns immediately.
71
81
  */
72
- startProof(epochNumber: number | bigint): Promise<void>;
82
+ startProof(epochNumber: EpochNumber): Promise<void>;
83
+ private startProofIfNeeded;
84
+ private startProofInternal;
85
+ private runJob;
86
+ protected tryUploadEpochFailure(job: EpochProvingJob): Promise<string | undefined>;
73
87
  /**
74
88
  * Returns the prover instance.
75
89
  */
@@ -80,23 +94,24 @@ export declare class ProverNode implements EpochMonitorHandler, ProverNodeApi, T
80
94
  getJobs(): Promise<{
81
95
  uuid: string;
82
96
  status: EpochProvingJobState;
83
- epochNumber: number;
84
- }[]>;
85
- protected getActiveJobsForEpoch(epochBigInt: bigint): Promise<{
86
- uuid: string;
87
- status: EpochProvingJobState;
97
+ epochNumber: EpochNumber;
88
98
  }[]>;
99
+ private getJobsInternal;
100
+ private activeJobsCoverEpoch;
89
101
  private checkMaximumPendingJobs;
90
102
  private createProvingJob;
91
103
  private getL1Constants;
92
- /** Monitors for new blocks and requests their txs from the p2p layer to ensure they are available for proving. */
93
- private checkForTxs;
94
104
  private gatherEpochData;
95
- private gatherBlocks;
96
105
  private gatherTxs;
106
+ private gatherMessages;
107
+ private gatherPreviousBlockHeader;
97
108
  /** Extracted for testing purposes. */
98
- protected doCreateEpochProvingJob(epochNumber: bigint, deadline: Date | undefined, blocks: L2Block[], txs: Tx[], publicProcessorFactory: PublicProcessorFactory, cleanUp: () => Promise<void>): EpochProvingJob;
109
+ protected doCreateEpochProvingJob(data: EpochProvingJobData, deadline: Date | undefined, publicProcessorFactory: PublicProcessorFactory, publisher: ProverNodePublisher, opts?: {
110
+ skipEpochCheck?: boolean;
111
+ }): EpochProvingJob;
99
112
  /** Extracted for testing purposes. */
100
113
  protected triggerMonitors(): Promise<void>;
114
+ private validateConfig;
101
115
  }
102
- //# sourceMappingURL=prover-node.d.ts.map
116
+ export {};
117
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmVyLW5vZGUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9wcm92ZXItbm9kZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUMzRCxPQUFPLEVBQWlDLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBSzdGLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN2RCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNqRSxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUV6RCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN4RCxPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRWpFLE9BQU8sRUFDTCxLQUFLLGtCQUFrQixFQUN2QixLQUFLLFdBQVcsRUFDaEIsS0FBSyxhQUFhLEVBQ2xCLEtBQUssT0FBTyxFQUNaLEtBQUssb0JBQW9CLEVBQ3pCLEtBQUssc0JBQXNCLEVBRTVCLE1BQU0saUNBQWlDLENBQUM7QUFDekMsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDOUQsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUVuRSxPQUFPLEVBRUwsU0FBUyxFQUNULEtBQUssZUFBZSxFQUNwQixLQUFLLFNBQVMsRUFDZCxLQUFLLE1BQU0sRUFHWixNQUFNLHlCQUF5QixDQUFDO0FBR2pDLE9BQU8sS0FBSyxFQUFFLHdCQUF3QixFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQzVELE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDM0UsT0FBTyxFQUFFLGVBQWUsRUFBK0IsS0FBSyxvQkFBb0IsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBRXJILE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ3JGLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDdEUsT0FBTyxLQUFLLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUU1RSxLQUFLLGlCQUFpQixHQUFHLHdCQUF3QixHQUFHLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO0FBQzlFLEtBQUssZ0JBQWdCLEdBQUcsSUFBSSxDQUFDLGVBQWUsRUFBRSxlQUFlLENBQUMsR0FBRyxJQUFJLENBQUMsV0FBVyxFQUFFLFdBQVcsR0FBRyxlQUFlLENBQUMsQ0FBQztBQUVsSDs7OztHQUlHO0FBQ0gscUJBQWEsVUFBVyxZQUFXLG1CQUFtQixFQUFFLGFBQWEsRUFBRSxTQUFTO0lBYzVFLFNBQVMsQ0FBQyxRQUFRLENBQUMsTUFBTSxFQUFFLGtCQUFrQjtJQUM3QyxTQUFTLENBQUMsUUFBUSxDQUFDLGdCQUFnQixFQUFFLHNCQUFzQjtJQUMzRCxTQUFTLENBQUMsUUFBUSxDQUFDLGFBQWEsRUFBRSxhQUFhLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQztJQUNsRSxTQUFTLENBQUMsUUFBUSxDQUFDLG1CQUFtQixFQUFFLG1CQUFtQjtJQUMzRCxTQUFTLENBQUMsUUFBUSxDQUFDLGtCQUFrQixFQUFFLGtCQUFrQjtJQUN6RCxTQUFTLENBQUMsUUFBUSxDQUFDLFVBQVUsRUFBRSxzQkFBc0I7SUFDckQsU0FBUyxDQUFDLFFBQVEsQ0FBQyxTQUFTLEVBQUU7UUFBRSxhQUFhLElBQUksV0FBVyxDQUFBO0tBQUUsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDO0lBQ2pGLFNBQVMsQ0FBQyxRQUFRLENBQUMsYUFBYSxFQUFFLFlBQVk7SUFDOUMsU0FBUyxDQUFDLFFBQVEsQ0FBQyxjQUFjLEVBQUUsY0FBYztJQUNqRCxTQUFTLENBQUMsUUFBUSxDQUFDLFNBQVMsRUFBRSxTQUFTO0lBRXZDLFNBQVMsQ0FBQyxRQUFRLENBQUMsZUFBZSxFQUFFLGVBQWU7SUFDbkQsT0FBTyxDQUFDLE9BQU8sQ0FBQztJQUNoQixPQUFPLENBQUMsUUFBUSxDQUFDLFlBQVk7SUExQi9CLE9BQU8sQ0FBQyxHQUFHLENBQStCO0lBRTFDLE9BQU8sQ0FBQyxJQUFJLENBQTJDO0lBQ3ZELE9BQU8sQ0FBQyxNQUFNLENBQW9CO0lBQ2xDLE9BQU8sQ0FBQyxVQUFVLENBQXVCO0lBQ3pDLE9BQU8sQ0FBQyxjQUFjLENBQTJCO0lBQ2pELE9BQU8sQ0FBQyxtQkFBbUIsQ0FBK0I7SUFFMUQsU0FBZ0IsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUUvQixTQUFTLENBQUMsU0FBUyxFQUFFLG1CQUFtQixHQUFHLFNBQVMsQ0FBQztJQUVyRCxZQUNxQixNQUFNLEVBQUUsa0JBQWtCLEVBQzFCLGdCQUFnQixFQUFFLHNCQUFzQixFQUN4QyxhQUFhLEVBQUUsYUFBYSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsRUFDL0MsbUJBQW1CLEVBQUUsbUJBQW1CLEVBQ3hDLGtCQUFrQixFQUFFLGtCQUFrQixFQUN0QyxVQUFVLEVBQUUsc0JBQXNCLEVBQ2xDLFNBQVMsRUFBRTtRQUFFLGFBQWEsSUFBSSxXQUFXLENBQUE7S0FBRSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsRUFDOUQsYUFBYSxFQUFFLFlBQVksRUFDM0IsY0FBYyxFQUFFLGNBQWMsRUFDOUIsU0FBUyxFQUFFLFNBQVMsRUFDdkMsTUFBTSxHQUFFLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBTSxFQUNwQixlQUFlLEdBQUUsZUFBc0MsRUFDbEUsT0FBTyxDQUFDLHFCQUFTLEVBQ1IsWUFBWSxHQUFFLFlBQWlDLEVBdUJqRTtJQUVNLFdBQVcsdURBRWpCO0lBRU0sTUFBTTs7eUJBRVo7SUFFRCw4RUFBOEU7SUFDdkUsVUFBVSxJQUFJLE9BQU8sR0FBRyxTQUFTLENBRXZDO0lBRUQ7Ozs7T0FJRztJQUNHLHVCQUF1QixDQUFDLFdBQVcsRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQWN4RTtJQUVEOzs7T0FHRztJQUNHLEtBQUssa0JBT1Y7SUFFRDs7O09BR0c7SUFDRyxJQUFJLGtCQVdUO0lBRUQsa0NBQWtDO0lBQ3JCLHVCQUF1QixJQUFJLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxDQUdwRTtJQUVELCtCQUErQjtJQUN4QixTQUFTLGtEQUVmO0lBRUQ7O09BRUc7SUFDVSxVQUFVLENBQUMsV0FBVyxFQUFFLFdBQVcsaUJBRS9DO1lBRWEsa0JBQWtCO1lBMkJsQixrQkFBa0I7WUFLbEIsTUFBTTtJQXlCcEIsVUFBZ0IscUJBQXFCLENBQUMsR0FBRyxFQUFFLGVBQWUsK0JBWXpEO0lBRUQ7O09BRUc7SUFDSSxTQUFTLHVCQUVmO0lBRUQ7O09BRUc7SUFDSSxPQUFPLElBQUksT0FBTyxDQUFDO1FBQUUsSUFBSSxFQUFFLE1BQU0sQ0FBQztRQUFDLE1BQU0sRUFBRSxvQkFBb0IsQ0FBQztRQUFDLFdBQVcsRUFBRSxXQUFXLENBQUE7S0FBRSxFQUFFLENBQUMsQ0FFcEc7SUFFRCxPQUFPLENBQUMsZUFBZTtZQVFULG9CQUFvQjtJQTJCbEMsT0FBTyxDQUFDLHVCQUF1QjtZQVFqQixnQkFBZ0I7SUFxQzlCLE9BQU8sQ0FBQyxjQUFjO1lBS1IsZUFBZTtZQWdCZixTQUFTO1lBZ0JULGNBQWM7WUFXZCx5QkFBeUI7SUFVdkMsc0NBQXNDO0lBQ3RDLFNBQVMsQ0FBQyx1QkFBdUIsQ0FDL0IsSUFBSSxFQUFFLG1CQUFtQixFQUN6QixRQUFRLEVBQUUsSUFBSSxHQUFHLFNBQVMsRUFDMUIsc0JBQXNCLEVBQUUsc0JBQXNCLEVBQzlDLFNBQVMsRUFBRSxtQkFBbUIsRUFDOUIsSUFBSSxHQUFFO1FBQUUsY0FBYyxDQUFDLEVBQUUsT0FBTyxDQUFBO0tBQU8sbUJBZXhDO0lBRUQsc0NBQXNDO0lBQ3RDLFVBQWdCLGVBQWUsa0JBRTlCO0lBRUQsT0FBTyxDQUFDLGNBQWM7Q0FjdkIifQ==