@aztec/prover-node 0.0.1-commit.b655e406 → 0.0.1-commit.b9865e97
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/actions/download-epoch-proving-job.d.ts +4 -4
- package/dest/actions/download-epoch-proving-job.js +1 -1
- package/dest/actions/index.d.ts +1 -1
- package/dest/actions/rerun-epoch-proving-job.d.ts +5 -3
- package/dest/actions/rerun-epoch-proving-job.d.ts.map +1 -1
- package/dest/actions/rerun-epoch-proving-job.js +105 -25
- package/dest/actions/upload-epoch-proof-failure.d.ts +2 -2
- package/dest/actions/upload-epoch-proof-failure.d.ts.map +1 -1
- package/dest/bin/run-failed-epoch.d.ts +1 -1
- package/dest/bin/run-failed-epoch.js +6 -5
- package/dest/config.d.ts +8 -10
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +19 -21
- package/dest/factory.d.ts +20 -16
- package/dest/factory.d.ts.map +1 -1
- package/dest/factory.js +48 -63
- package/dest/index.d.ts +2 -1
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +1 -0
- package/dest/job/epoch-proving-job-data.d.ts +8 -6
- package/dest/job/epoch-proving-job-data.d.ts.map +1 -1
- package/dest/job/epoch-proving-job-data.js +25 -18
- package/dest/job/epoch-proving-job.d.ts +11 -13
- package/dest/job/epoch-proving-job.d.ts.map +1 -1
- package/dest/job/epoch-proving-job.js +669 -111
- package/dest/metrics.d.ts +24 -3
- package/dest/metrics.d.ts.map +1 -1
- package/dest/metrics.js +77 -98
- package/dest/monitors/epoch-monitor.d.ts +3 -2
- package/dest/monitors/epoch-monitor.d.ts.map +1 -1
- package/dest/monitors/epoch-monitor.js +14 -20
- package/dest/monitors/index.d.ts +1 -1
- package/dest/prover-node-publisher.d.ts +33 -11
- package/dest/prover-node-publisher.d.ts.map +1 -1
- package/dest/prover-node-publisher.js +248 -46
- package/dest/prover-node.d.ts +30 -19
- package/dest/prover-node.d.ts.map +1 -1
- package/dest/prover-node.js +512 -81
- package/dest/prover-publisher-factory.d.ts +10 -6
- package/dest/prover-publisher-factory.d.ts.map +1 -1
- package/dest/prover-publisher-factory.js +7 -5
- package/dest/test/index.d.ts +1 -1
- package/dest/test/index.d.ts.map +1 -1
- package/package.json +27 -25
- package/src/actions/download-epoch-proving-job.ts +1 -1
- package/src/actions/rerun-epoch-proving-job.ts +20 -7
- package/src/actions/upload-epoch-proof-failure.ts +1 -1
- package/src/bin/run-failed-epoch.ts +5 -3
- package/src/config.ts +27 -33
- package/src/factory.ts +81 -103
- package/src/index.ts +1 -0
- package/src/job/epoch-proving-job-data.ts +31 -25
- package/src/job/epoch-proving-job.ts +228 -117
- package/src/metrics.ts +102 -82
- package/src/monitors/epoch-monitor.ts +10 -17
- package/src/prover-node-publisher.ts +302 -66
- package/src/prover-node.ts +135 -86
- package/src/prover-publisher-factory.ts +19 -11
|
@@ -1,25 +1,30 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { getEthBlobEvaluationInputs } from '@aztec/blob-lib';
|
|
2
|
+
import { MAX_CHECKPOINTS_PER_EPOCH } from '@aztec/constants';
|
|
2
3
|
import { makeTuple } from '@aztec/foundation/array';
|
|
4
|
+
import { CheckpointNumber } from '@aztec/foundation/branded-types';
|
|
3
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';
|
|
9
|
+
import { retryUntil } from '@aztec/foundation/retry';
|
|
7
10
|
import { Timer } from '@aztec/foundation/timer';
|
|
8
11
|
import { RollupAbi } from '@aztec/l1-artifacts';
|
|
9
12
|
import { CommitteeAttestation, CommitteeAttestationsAndSigners } from '@aztec/stdlib/block';
|
|
13
|
+
import { getProofSubmissionDeadlineTimestamp } from '@aztec/stdlib/epoch-helpers';
|
|
10
14
|
import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
11
15
|
import { inspect } from 'util';
|
|
12
|
-
import { encodeFunctionData } from 'viem';
|
|
16
|
+
import { encodeFunctionData, formatEther, formatGwei } from 'viem';
|
|
13
17
|
import { ProverNodePublisherMetrics } from './metrics.js';
|
|
14
18
|
export class ProverNodePublisher {
|
|
15
19
|
interrupted = false;
|
|
16
20
|
metrics;
|
|
17
|
-
log
|
|
21
|
+
log;
|
|
18
22
|
rollupContract;
|
|
19
23
|
l1TxUtils;
|
|
20
|
-
constructor(config, deps){
|
|
24
|
+
constructor(config, deps, bindings){
|
|
21
25
|
const telemetry = deps.telemetry ?? getTelemetryClient();
|
|
22
26
|
this.metrics = new ProverNodePublisherMetrics(telemetry, 'ProverNode');
|
|
27
|
+
this.log = createLogger('prover-node:l1-tx-publisher', bindings);
|
|
23
28
|
this.rollupContract = deps.rollupContract;
|
|
24
29
|
this.l1TxUtils = deps.l1TxUtils;
|
|
25
30
|
}
|
|
@@ -43,18 +48,23 @@ export class ProverNodePublisher {
|
|
|
43
48
|
return this.l1TxUtils.getSenderAddress();
|
|
44
49
|
}
|
|
45
50
|
async submitEpochProof(args) {
|
|
46
|
-
const { epochNumber,
|
|
51
|
+
const { epochNumber, fromCheckpoint, toCheckpoint } = args;
|
|
47
52
|
const ctx = {
|
|
48
53
|
epochNumber,
|
|
49
|
-
|
|
50
|
-
|
|
54
|
+
fromCheckpoint,
|
|
55
|
+
toCheckpoint
|
|
51
56
|
};
|
|
52
57
|
if (!this.interrupted) {
|
|
58
|
+
if (!await this.waitUntilStartBuildsOnProven(args)) {
|
|
59
|
+
this.log.verbose('Checkpoint data syncing interrupted', ctx);
|
|
60
|
+
return false;
|
|
61
|
+
}
|
|
53
62
|
const timer = new Timer();
|
|
54
63
|
// Validate epoch proof range and hashes are correct before submitting
|
|
55
64
|
await this.validateEpochProofSubmission(args);
|
|
56
65
|
const txReceipt = await this.sendSubmitEpochProofTx(args);
|
|
57
66
|
if (!txReceipt) {
|
|
67
|
+
this.log.error(`Failed to mine submitEpochProof tx`, undefined, ctx);
|
|
58
68
|
return false;
|
|
59
69
|
}
|
|
60
70
|
try {
|
|
@@ -84,32 +94,68 @@ export class ProverNodePublisher {
|
|
|
84
94
|
return true;
|
|
85
95
|
}
|
|
86
96
|
this.metrics.recordFailedTx();
|
|
87
|
-
this.log.error(`Rollup
|
|
97
|
+
this.log.error(`Rollup submitEpochProof tx reverted ${txReceipt.transactionHash}`, undefined, ctx);
|
|
88
98
|
}
|
|
89
|
-
this.log.verbose('
|
|
99
|
+
this.log.verbose('Checkpoint data syncing interrupted', ctx);
|
|
90
100
|
return false;
|
|
91
101
|
}
|
|
102
|
+
async waitUntilStartBuildsOnProven(args) {
|
|
103
|
+
const { epochNumber, fromCheckpoint } = args;
|
|
104
|
+
const provenCheckpoint = await this.getProvenCheckpoint();
|
|
105
|
+
if (this.isStartBuildingOnProven(fromCheckpoint, provenCheckpoint)) {
|
|
106
|
+
return true;
|
|
107
|
+
}
|
|
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
|
+
}
|
|
92
138
|
async validateEpochProofSubmission(args) {
|
|
93
|
-
const {
|
|
94
|
-
// Check that the
|
|
95
|
-
const {
|
|
96
|
-
// Don't publish if proven is beyond our
|
|
97
|
-
if (proven >
|
|
98
|
-
throw new Error(`Cannot submit epoch proof for ${
|
|
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}`);
|
|
99
145
|
}
|
|
100
|
-
//
|
|
101
|
-
if (
|
|
102
|
-
throw new Error(`Cannot submit epoch proof for ${
|
|
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}`);
|
|
103
149
|
}
|
|
104
|
-
// Check the archive for the immediate
|
|
105
|
-
const
|
|
106
|
-
if (publicInputs.previousArchiveRoot.
|
|
107
|
-
throw new Error(`Previous archive root mismatch: ${publicInputs.previousArchiveRoot.toString()} !== ${
|
|
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()}`);
|
|
108
154
|
}
|
|
109
|
-
// Check the archive for the last
|
|
110
|
-
const
|
|
111
|
-
if (publicInputs.endArchiveRoot.
|
|
112
|
-
throw new Error(`End archive root mismatch: ${publicInputs.endArchiveRoot.toString()} !== ${
|
|
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()}`);
|
|
113
159
|
}
|
|
114
160
|
// Check the batched blob inputs from the root rollup against the batched blob computed in ts
|
|
115
161
|
const finalBlobAccumulator = batchedBlobInputs.toFinalBlobAccumulator();
|
|
@@ -121,19 +167,74 @@ export class ProverNodePublisher {
|
|
|
121
167
|
const argsPublicInputs = [
|
|
122
168
|
...publicInputs.toFields()
|
|
123
169
|
];
|
|
124
|
-
if (!areArraysEqual(rollupPublicInputs
|
|
125
|
-
|
|
126
|
-
|
|
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
|
+
});
|
|
127
179
|
}
|
|
128
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
|
+
}
|
|
129
230
|
async sendSubmitEpochProofTx(args) {
|
|
130
231
|
const txArgs = [
|
|
131
232
|
this.getSubmitEpochProofArgs(args)
|
|
132
233
|
];
|
|
133
234
|
this.log.info(`Submitting epoch proof to L1 rollup contract`, {
|
|
134
235
|
proofSize: args.proof.withoutPublicInputs().length,
|
|
135
|
-
|
|
136
|
-
|
|
236
|
+
fromCheckpoint: args.fromCheckpoint,
|
|
237
|
+
toCheckpoint: args.toCheckpoint
|
|
137
238
|
});
|
|
138
239
|
const data = encodeFunctionData({
|
|
139
240
|
abi: RollupAbi,
|
|
@@ -145,33 +246,37 @@ export class ProverNodePublisher {
|
|
|
145
246
|
to: this.rollupContract.address,
|
|
146
247
|
data
|
|
147
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
|
+
}
|
|
148
261
|
return receipt;
|
|
149
262
|
} catch (err) {
|
|
150
263
|
this.log.error(`Rollup submit epoch proof failed`, err);
|
|
151
|
-
const errorMsg = await this.l1TxUtils.tryGetErrorFromRevertedTx(data, {
|
|
152
|
-
args: [
|
|
153
|
-
...txArgs
|
|
154
|
-
],
|
|
155
|
-
functionName: 'submitEpochRootProof',
|
|
156
|
-
abi: RollupAbi,
|
|
157
|
-
address: this.rollupContract.address
|
|
158
|
-
}, /*blobInputs*/ undefined, /*stateOverride*/ []);
|
|
159
|
-
this.log.error(`Rollup submit epoch proof tx reverted. ${errorMsg}`);
|
|
160
264
|
return undefined;
|
|
161
265
|
}
|
|
162
266
|
}
|
|
163
267
|
getEpochProofPublicInputsArgs(args) {
|
|
164
268
|
// Returns arguments for EpochProofLib.sol -> getEpochProofPublicInputs()
|
|
165
269
|
return [
|
|
166
|
-
BigInt(args.
|
|
167
|
-
BigInt(args.
|
|
270
|
+
BigInt(args.fromCheckpoint),
|
|
271
|
+
BigInt(args.toCheckpoint),
|
|
168
272
|
{
|
|
169
273
|
previousArchive: args.publicInputs.previousArchiveRoot.toString(),
|
|
170
274
|
endArchive: args.publicInputs.endArchiveRoot.toString(),
|
|
275
|
+
outHash: args.publicInputs.outHash.toString(),
|
|
171
276
|
proverId: EthAddress.fromField(args.publicInputs.constants.proverId).toString()
|
|
172
277
|
} /*_args*/ ,
|
|
173
|
-
makeTuple(
|
|
174
|
-
args.batchedBlobInputs
|
|
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)
|
|
175
280
|
];
|
|
176
281
|
}
|
|
177
282
|
getSubmitEpochProofArgs(args) {
|
|
@@ -183,9 +288,106 @@ export class ProverNodePublisher {
|
|
|
183
288
|
end: argsArray[1],
|
|
184
289
|
args: argsArray[2],
|
|
185
290
|
fees: argsArray[3],
|
|
186
|
-
attestations:
|
|
291
|
+
attestations: CommitteeAttestationsAndSigners.packAttestations(args.attestations.map((a)=>CommitteeAttestation.fromViem(a))),
|
|
187
292
|
blobInputs: argsArray[4],
|
|
188
293
|
proof: proofHex
|
|
189
294
|
};
|
|
190
295
|
}
|
|
191
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
|
+
});
|
|
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)}`);
|
|
393
|
+
}
|
package/dest/prover-node.d.ts
CHANGED
|
@@ -1,13 +1,14 @@
|
|
|
1
|
-
import type { RollupContract } from '@aztec/ethereum';
|
|
2
|
-
import type {
|
|
3
|
-
import
|
|
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';
|
|
4
5
|
import { PublicProcessorFactory } from '@aztec/simulator/server';
|
|
5
6
|
import type { L2BlockSource } from '@aztec/stdlib/block';
|
|
6
7
|
import type { ChainConfig } from '@aztec/stdlib/config';
|
|
7
8
|
import type { ContractDataSource } from '@aztec/stdlib/contract';
|
|
8
|
-
import { type EpochProverManager, type ProverNodeApi, type Service, type WorldStateSyncStatus, 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';
|
|
9
11
|
import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
|
|
10
|
-
import type { P2PClientType } from '@aztec/stdlib/p2p';
|
|
11
12
|
import { L1Metrics, type TelemetryClient, type Traceable, type Tracer } from '@aztec/telemetry-client';
|
|
12
13
|
import type { SpecificProverNodeConfig } from './config.js';
|
|
13
14
|
import type { EpochProvingJobData } from './job/epoch-proving-job-data.js';
|
|
@@ -29,28 +30,38 @@ export declare class ProverNode implements EpochMonitorHandler, ProverNodeApi, T
|
|
|
29
30
|
protected readonly l1ToL2MessageSource: L1ToL2MessageSource;
|
|
30
31
|
protected readonly contractDataSource: ContractDataSource;
|
|
31
32
|
protected readonly worldState: WorldStateSynchronizer;
|
|
32
|
-
protected readonly p2pClient:
|
|
33
|
+
protected readonly p2pClient: {
|
|
34
|
+
getTxProvider(): ITxProvider;
|
|
35
|
+
} & Partial<Service>;
|
|
33
36
|
protected readonly epochsMonitor: EpochMonitor;
|
|
34
37
|
protected readonly rollupContract: RollupContract;
|
|
35
38
|
protected readonly l1Metrics: L1Metrics;
|
|
36
39
|
protected readonly telemetryClient: TelemetryClient;
|
|
40
|
+
private delayer?;
|
|
41
|
+
private readonly dateProvider;
|
|
37
42
|
private log;
|
|
38
|
-
private dateProvider;
|
|
39
43
|
private jobs;
|
|
40
44
|
private config;
|
|
41
45
|
private jobMetrics;
|
|
42
46
|
private rewardsMetrics;
|
|
47
|
+
private startingProofEpochs;
|
|
43
48
|
readonly tracer: Tracer;
|
|
44
49
|
protected publisher: ProverNodePublisher | undefined;
|
|
45
|
-
constructor(prover: EpochProverManager, publisherFactory: ProverPublisherFactory, l2BlockSource: L2BlockSource & Partial<Service>, l1ToL2MessageSource: L1ToL2MessageSource, contractDataSource: ContractDataSource, worldState: WorldStateSynchronizer, p2pClient:
|
|
46
|
-
|
|
47
|
-
|
|
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;
|
|
48
59
|
/**
|
|
49
60
|
* Handles an epoch being completed by starting a proof for it if there are no active jobs for it.
|
|
50
61
|
* @param epochNumber - The epoch number that was just completed.
|
|
51
62
|
* @returns false if there is an error, true otherwise
|
|
52
63
|
*/
|
|
53
|
-
handleEpochReadyToProve(epochNumber:
|
|
64
|
+
handleEpochReadyToProve(epochNumber: EpochNumber): Promise<boolean>;
|
|
54
65
|
/**
|
|
55
66
|
* Starts the prover node so it periodically checks for unproven epochs in the unfinalized chain from L1 and
|
|
56
67
|
* starts proving jobs for them.
|
|
@@ -58,6 +69,7 @@ export declare class ProverNode implements EpochMonitorHandler, ProverNodeApi, T
|
|
|
58
69
|
start(): Promise<void>;
|
|
59
70
|
/**
|
|
60
71
|
* Stops the prover node and all its dependencies.
|
|
72
|
+
* Resources not owned by this node (shared with the parent aztec-node) are skipped.
|
|
61
73
|
*/
|
|
62
74
|
stop(): Promise<void>;
|
|
63
75
|
/** Returns world state status. */
|
|
@@ -67,7 +79,9 @@ export declare class ProverNode implements EpochMonitorHandler, ProverNodeApi, T
|
|
|
67
79
|
/**
|
|
68
80
|
* Starts a proving process and returns immediately.
|
|
69
81
|
*/
|
|
70
|
-
startProof(epochNumber:
|
|
82
|
+
startProof(epochNumber: EpochNumber): Promise<void>;
|
|
83
|
+
private startProofIfNeeded;
|
|
84
|
+
private startProofInternal;
|
|
71
85
|
private runJob;
|
|
72
86
|
protected tryUploadEpochFailure(job: EpochProvingJob): Promise<string | undefined>;
|
|
73
87
|
/**
|
|
@@ -80,17 +94,14 @@ export declare class ProverNode implements EpochMonitorHandler, ProverNodeApi, T
|
|
|
80
94
|
getJobs(): Promise<{
|
|
81
95
|
uuid: string;
|
|
82
96
|
status: EpochProvingJobState;
|
|
83
|
-
epochNumber:
|
|
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
104
|
private gatherEpochData;
|
|
93
|
-
private gatherBlocks;
|
|
94
105
|
private gatherTxs;
|
|
95
106
|
private gatherMessages;
|
|
96
107
|
private gatherPreviousBlockHeader;
|
|
@@ -103,4 +114,4 @@ export declare class ProverNode implements EpochMonitorHandler, ProverNodeApi, T
|
|
|
103
114
|
private validateConfig;
|
|
104
115
|
}
|
|
105
116
|
export {};
|
|
106
|
-
//# sourceMappingURL=
|
|
117
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmVyLW5vZGUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9wcm92ZXItbm9kZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUMzRCxPQUFPLEVBQWlDLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBSzdGLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN2RCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNqRSxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUV6RCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN4RCxPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRWpFLE9BQU8sRUFDTCxLQUFLLGtCQUFrQixFQUN2QixLQUFLLFdBQVcsRUFDaEIsS0FBSyxhQUFhLEVBQ2xCLEtBQUssT0FBTyxFQUNaLEtBQUssb0JBQW9CLEVBQ3pCLEtBQUssc0JBQXNCLEVBRTVCLE1BQU0saUNBQWlDLENBQUM7QUFDekMsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDOUQsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUVuRSxPQUFPLEVBRUwsU0FBUyxFQUNULEtBQUssZUFBZSxFQUNwQixLQUFLLFNBQVMsRUFDZCxLQUFLLE1BQU0sRUFHWixNQUFNLHlCQUF5QixDQUFDO0FBR2pDLE9BQU8sS0FBSyxFQUFFLHdCQUF3QixFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQzVELE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0saUNBQWlD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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prover-node.d.ts","sourceRoot":"","sources":["../src/prover-node.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"prover-node.d.ts","sourceRoot":"","sources":["../src/prover-node.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAiC,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAK7F,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAEjE,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,WAAW,EAChB,KAAK,aAAa,EAClB,KAAK,OAAO,EACZ,KAAK,oBAAoB,EACzB,KAAK,sBAAsB,EAE5B,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAEnE,OAAO,EAEL,SAAS,EACT,KAAK,eAAe,EACpB,KAAK,SAAS,EACd,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAGjC,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,OAAO,EAAE,eAAe,EAA+B,KAAK,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAErH,OAAO,KAAK,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AACrF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAE5E,KAAK,iBAAiB,GAAG,wBAAwB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAC9E,KAAK,gBAAgB,GAAG,IAAI,CAAC,eAAe,EAAE,eAAe,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,eAAe,CAAC,CAAC;AAElH;;;;GAIG;AACH,qBAAa,UAAW,YAAW,mBAAmB,EAAE,aAAa,EAAE,SAAS;IAc5E,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,kBAAkB;IAC7C,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,sBAAsB;IAC3D,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC;IAClE,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB;IAC3D,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB;IACzD,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,sBAAsB;IACrD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE;QAAE,aAAa,IAAI,WAAW,CAAA;KAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IACjF,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,YAAY;IAC9C,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc;IACjD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS;IAEvC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe;IACnD,OAAO,CAAC,OAAO,CAAC;IAChB,OAAO,CAAC,QAAQ,CAAC,YAAY;IA1B/B,OAAO,CAAC,GAAG,CAA+B;IAE1C,OAAO,CAAC,IAAI,CAA2C;IACvD,OAAO,CAAC,MAAM,CAAoB;IAClC,OAAO,CAAC,UAAU,CAAuB;IACzC,OAAO,CAAC,cAAc,CAA2B;IACjD,OAAO,CAAC,mBAAmB,CAA+B;IAE1D,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,SAAS,CAAC,SAAS,EAAE,mBAAmB,GAAG,SAAS,CAAC;IAErD,YACqB,MAAM,EAAE,kBAAkB,EAC1B,gBAAgB,EAAE,sBAAsB,EACxC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,EAC/C,mBAAmB,EAAE,mBAAmB,EACxC,kBAAkB,EAAE,kBAAkB,EACtC,UAAU,EAAE,sBAAsB,EAClC,SAAS,EAAE;QAAE,aAAa,IAAI,WAAW,CAAA;KAAE,GAAG,OAAO,CAAC,OAAO,CAAC,EAC9D,aAAa,EAAE,YAAY,EAC3B,cAAc,EAAE,cAAc,EAC9B,SAAS,EAAE,SAAS,EACvC,MAAM,GAAE,OAAO,CAAC,iBAAiB,CAAM,EACpB,eAAe,GAAE,eAAsC,EAClE,OAAO,CAAC,qBAAS,EACR,YAAY,GAAE,YAAiC,EAuBjE;IAEM,WAAW,uDAEjB;IAEM,MAAM;;yBAEZ;IAED,8EAA8E;IACvE,UAAU,IAAI,OAAO,GAAG,SAAS,CAEvC;IAED;;;;OAIG;IACG,uBAAuB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAcxE;IAED;;;OAGG;IACG,KAAK,kBAOV;IAED;;;OAGG;IACG,IAAI,kBAWT;IAED,kCAAkC;IACrB,uBAAuB,IAAI,OAAO,CAAC,oBAAoB,CAAC,CAGpE;IAED,+BAA+B;IACxB,SAAS,kDAEf;IAED;;OAEG;IACU,UAAU,CAAC,WAAW,EAAE,WAAW,iBAE/C;YAEa,kBAAkB;YA2BlB,kBAAkB;YAKlB,MAAM;IAyBpB,UAAgB,qBAAqB,CAAC,GAAG,EAAE,eAAe,+BAYzD;IAED;;OAEG;IACI,SAAS,uBAEf;IAED;;OAEG;IACI,OAAO,IAAI,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,oBAAoB,CAAC;QAAC,WAAW,EAAE,WAAW,CAAA;KAAE,EAAE,CAAC,CAEpG;IAED,OAAO,CAAC,eAAe;YAQT,oBAAoB;IA2BlC,OAAO,CAAC,uBAAuB;YAQjB,gBAAgB;IAqC9B,OAAO,CAAC,cAAc;YAKR,eAAe;YAgBf,SAAS;YAgBT,cAAc;YAWd,yBAAyB;IAUvC,sCAAsC;IACtC,SAAS,CAAC,uBAAuB,CAC/B,IAAI,EAAE,mBAAmB,EACzB,QAAQ,EAAE,IAAI,GAAG,SAAS,EAC1B,sBAAsB,EAAE,sBAAsB,EAC9C,SAAS,EAAE,mBAAmB,EAC9B,IAAI,GAAE;QAAE,cAAc,CAAC,EAAE,OAAO,CAAA;KAAO,mBAexC;IAED,sCAAsC;IACtC,UAAgB,eAAe,kBAE9B;IAED,OAAO,CAAC,cAAc;CAcvB"}
|