@aztec/prover-node 0.0.1-commit.86469d5 → 0.0.1-commit.8655d4a
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.js +1 -1
- package/dest/actions/rerun-epoch-proving-job.d.ts +4 -3
- package/dest/actions/rerun-epoch-proving-job.d.ts.map +1 -1
- package/dest/actions/rerun-epoch-proving-job.js +8 -8
- 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.js +6 -5
- package/dest/config.d.ts +5 -8
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +16 -19
- package/dest/factory.d.ts +19 -13
- package/dest/factory.d.ts.map +1 -1
- package/dest/factory.js +40 -60
- package/dest/job/epoch-proving-job.d.ts +6 -2
- package/dest/job/epoch-proving-job.d.ts.map +1 -1
- package/dest/job/epoch-proving-job.js +206 -35
- package/dest/metrics.d.ts +21 -1
- package/dest/metrics.d.ts.map +1 -1
- package/dest/metrics.js +47 -0
- package/dest/monitors/epoch-monitor.d.ts +1 -1
- package/dest/monitors/epoch-monitor.d.ts.map +1 -1
- package/dest/monitors/epoch-monitor.js +11 -9
- package/dest/prover-node-publisher.d.ts +22 -3
- package/dest/prover-node-publisher.d.ts.map +1 -1
- package/dest/prover-node-publisher.js +202 -7
- package/dest/prover-node.d.ts +19 -10
- package/dest/prover-node.d.ts.map +1 -1
- package/dest/prover-node.js +30 -25
- package/dest/prover-publisher-factory.d.ts +4 -4
- package/dest/prover-publisher-factory.d.ts.map +1 -1
- package/dest/prover-publisher-factory.js +3 -3
- package/package.json +23 -22
- package/src/actions/download-epoch-proving-job.ts +1 -1
- package/src/actions/rerun-epoch-proving-job.ts +17 -6
- package/src/actions/upload-epoch-proof-failure.ts +1 -1
- package/src/bin/run-failed-epoch.ts +5 -3
- package/src/config.ts +23 -31
- package/src/factory.ts +68 -103
- package/src/job/epoch-proving-job.ts +137 -41
- package/src/metrics.ts +71 -0
- package/src/monitors/epoch-monitor.ts +5 -6
- package/src/prover-node-publisher.ts +235 -12
- package/src/prover-node.ts +29 -31
- package/src/prover-publisher-factory.ts +5 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prover-node-publisher.d.ts","sourceRoot":"","sources":["../src/prover-node-publisher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAA8B,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"prover-node-publisher.d.ts","sourceRoot":"","sources":["../src/prover-node-publisher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,19 @@
|
|
|
1
1
|
import { getEthBlobEvaluationInputs } from '@aztec/blob-lib';
|
|
2
|
-
import {
|
|
2
|
+
import { MAX_CHECKPOINTS_PER_EPOCH } from '@aztec/constants';
|
|
3
3
|
import { makeTuple } from '@aztec/foundation/array';
|
|
4
4
|
import { CheckpointNumber } from '@aztec/foundation/branded-types';
|
|
5
5
|
import { areArraysEqual } from '@aztec/foundation/collection';
|
|
6
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
6
7
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
7
8
|
import { createLogger } from '@aztec/foundation/log';
|
|
9
|
+
import { retryUntil } from '@aztec/foundation/retry';
|
|
8
10
|
import { Timer } from '@aztec/foundation/timer';
|
|
9
11
|
import { RollupAbi } from '@aztec/l1-artifacts';
|
|
10
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
15
|
import { inspect } from 'util';
|
|
13
|
-
import { encodeFunctionData } from 'viem';
|
|
16
|
+
import { encodeFunctionData, formatEther, formatGwei } from 'viem';
|
|
14
17
|
import { ProverNodePublisherMetrics } from './metrics.js';
|
|
15
18
|
export class ProverNodePublisher {
|
|
16
19
|
interrupted = false;
|
|
@@ -52,6 +55,10 @@ export class ProverNodePublisher {
|
|
|
52
55
|
toCheckpoint
|
|
53
56
|
};
|
|
54
57
|
if (!this.interrupted) {
|
|
58
|
+
if (!await this.waitUntilStartBuildsOnProven(args)) {
|
|
59
|
+
this.log.verbose('Checkpoint data syncing interrupted', ctx);
|
|
60
|
+
return false;
|
|
61
|
+
}
|
|
55
62
|
const timer = new Timer();
|
|
56
63
|
// Validate epoch proof range and hashes are correct before submitting
|
|
57
64
|
await this.validateEpochProofSubmission(args);
|
|
@@ -92,6 +99,42 @@ export class ProverNodePublisher {
|
|
|
92
99
|
this.log.verbose('Checkpoint data syncing interrupted', ctx);
|
|
93
100
|
return false;
|
|
94
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
|
+
}
|
|
95
138
|
async validateEpochProofSubmission(args) {
|
|
96
139
|
const { fromCheckpoint, toCheckpoint, publicInputs, batchedBlobInputs } = args;
|
|
97
140
|
// Check that the checkpoint numbers match the expected epoch to be proven
|
|
@@ -102,7 +145,7 @@ export class ProverNodePublisher {
|
|
|
102
145
|
}
|
|
103
146
|
// toCheckpoint can't be greater than pending
|
|
104
147
|
if (toCheckpoint > pending) {
|
|
105
|
-
throw new Error(`Cannot submit epoch proof for ${fromCheckpoint}-${toCheckpoint} as
|
|
148
|
+
throw new Error(`Cannot submit epoch proof for ${fromCheckpoint}-${toCheckpoint} as proposed checkpoint is ${pending}`);
|
|
106
149
|
}
|
|
107
150
|
// Check the archive for the immediate checkpoint before the epoch
|
|
108
151
|
const checkpointLog = await this.rollupContract.getCheckpoint(CheckpointNumber(fromCheckpoint - 1));
|
|
@@ -125,10 +168,65 @@ export class ProverNodePublisher {
|
|
|
125
168
|
...publicInputs.toFields()
|
|
126
169
|
];
|
|
127
170
|
if (!areArraysEqual(rollupPublicInputs, argsPublicInputs, (a, b)=>a.equals(b))) {
|
|
128
|
-
|
|
129
|
-
|
|
171
|
+
throw await reportPublicInputsMismatch({
|
|
172
|
+
rollupPublicInputs,
|
|
173
|
+
argsPublicInputs,
|
|
174
|
+
fromCheckpoint,
|
|
175
|
+
toCheckpoint,
|
|
176
|
+
rollupContract: this.rollupContract,
|
|
177
|
+
log: this.log
|
|
178
|
+
});
|
|
130
179
|
}
|
|
131
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
|
+
}
|
|
132
230
|
async sendSubmitEpochProofTx(args) {
|
|
133
231
|
const txArgs = [
|
|
134
232
|
this.getSubmitEpochProofArgs(args)
|
|
@@ -177,7 +275,7 @@ export class ProverNodePublisher {
|
|
|
177
275
|
outHash: args.publicInputs.outHash.toString(),
|
|
178
276
|
proverId: EthAddress.fromField(args.publicInputs.constants.proverId).toString()
|
|
179
277
|
} /*_args*/ ,
|
|
180
|
-
makeTuple(
|
|
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()),
|
|
181
279
|
getEthBlobEvaluationInputs(args.batchedBlobInputs)
|
|
182
280
|
];
|
|
183
281
|
}
|
|
@@ -190,9 +288,106 @@ export class ProverNodePublisher {
|
|
|
190
288
|
end: argsArray[1],
|
|
191
289
|
args: argsArray[2],
|
|
192
290
|
fees: argsArray[3],
|
|
193
|
-
attestations:
|
|
291
|
+
attestations: CommitteeAttestationsAndSigners.packAttestations(args.attestations.map((a)=>CommitteeAttestation.fromViem(a))),
|
|
194
292
|
blobInputs: argsArray[4],
|
|
195
293
|
proof: proofHex
|
|
196
294
|
};
|
|
197
295
|
}
|
|
198
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,14 +1,14 @@
|
|
|
1
1
|
import type { RollupContract } from '@aztec/ethereum/contracts';
|
|
2
|
+
import type { Delayer } from '@aztec/ethereum/l1-tx-utils';
|
|
2
3
|
import { EpochNumber } from '@aztec/foundation/branded-types';
|
|
3
|
-
import
|
|
4
|
-
import type { P2PClient } from '@aztec/p2p';
|
|
4
|
+
import { DateProvider } from '@aztec/foundation/timer';
|
|
5
5
|
import { PublicProcessorFactory } from '@aztec/simulator/server';
|
|
6
6
|
import type { L2BlockSource } from '@aztec/stdlib/block';
|
|
7
7
|
import type { ChainConfig } from '@aztec/stdlib/config';
|
|
8
8
|
import type { ContractDataSource } from '@aztec/stdlib/contract';
|
|
9
|
-
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';
|
|
10
11
|
import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
|
|
11
|
-
import type { P2PClientType } from '@aztec/stdlib/p2p';
|
|
12
12
|
import { L1Metrics, type TelemetryClient, type Traceable, type Tracer } from '@aztec/telemetry-client';
|
|
13
13
|
import type { SpecificProverNodeConfig } from './config.js';
|
|
14
14
|
import type { EpochProvingJobData } from './job/epoch-proving-job-data.js';
|
|
@@ -30,22 +30,31 @@ export declare class ProverNode implements EpochMonitorHandler, ProverNodeApi, T
|
|
|
30
30
|
protected readonly l1ToL2MessageSource: L1ToL2MessageSource;
|
|
31
31
|
protected readonly contractDataSource: ContractDataSource;
|
|
32
32
|
protected readonly worldState: WorldStateSynchronizer;
|
|
33
|
-
protected readonly p2pClient:
|
|
33
|
+
protected readonly p2pClient: {
|
|
34
|
+
getTxProvider(): ITxProvider;
|
|
35
|
+
} & Partial<Service>;
|
|
34
36
|
protected readonly epochsMonitor: EpochMonitor;
|
|
35
37
|
protected readonly rollupContract: RollupContract;
|
|
36
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
43
|
private jobs;
|
|
41
44
|
private config;
|
|
42
45
|
private jobMetrics;
|
|
43
46
|
private rewardsMetrics;
|
|
44
47
|
readonly tracer: Tracer;
|
|
45
48
|
protected publisher: ProverNodePublisher | undefined;
|
|
46
|
-
constructor(prover: EpochProverManager, publisherFactory: ProverPublisherFactory, l2BlockSource: L2BlockSource & Partial<Service>, l1ToL2MessageSource: L1ToL2MessageSource, contractDataSource: ContractDataSource, worldState: WorldStateSynchronizer, p2pClient:
|
|
49
|
+
constructor(prover: EpochProverManager, publisherFactory: ProverPublisherFactory, l2BlockSource: L2BlockSource & Partial<Service>, l1ToL2MessageSource: L1ToL2MessageSource, contractDataSource: ContractDataSource, worldState: WorldStateSynchronizer, p2pClient: {
|
|
50
|
+
getTxProvider(): ITxProvider;
|
|
51
|
+
} & Partial<Service>, epochsMonitor: EpochMonitor, rollupContract: RollupContract, l1Metrics: L1Metrics, config?: Partial<ProverNodeOptions>, telemetryClient?: TelemetryClient, delayer?: Delayer | undefined, dateProvider?: DateProvider);
|
|
47
52
|
getProverId(): import("@aztec/foundation/eth-address").EthAddress;
|
|
48
|
-
getP2P():
|
|
53
|
+
getP2P(): {
|
|
54
|
+
getTxProvider(): ITxProvider;
|
|
55
|
+
} & Partial<Service>;
|
|
56
|
+
/** Returns the shared tx delayer for prover L1 txs, if enabled. Test-only. */
|
|
57
|
+
getDelayer(): Delayer | undefined;
|
|
49
58
|
/**
|
|
50
59
|
* Handles an epoch being completed by starting a proof for it if there are no active jobs for it.
|
|
51
60
|
* @param epochNumber - The epoch number that was just completed.
|
|
@@ -59,6 +68,7 @@ export declare class ProverNode implements EpochMonitorHandler, ProverNodeApi, T
|
|
|
59
68
|
start(): Promise<void>;
|
|
60
69
|
/**
|
|
61
70
|
* Stops the prover node and all its dependencies.
|
|
71
|
+
* Resources not owned by this node (shared with the parent aztec-node) are skipped.
|
|
62
72
|
*/
|
|
63
73
|
stop(): Promise<void>;
|
|
64
74
|
/** Returns world state status. */
|
|
@@ -91,7 +101,6 @@ export declare class ProverNode implements EpochMonitorHandler, ProverNodeApi, T
|
|
|
91
101
|
private createProvingJob;
|
|
92
102
|
private getL1Constants;
|
|
93
103
|
private gatherEpochData;
|
|
94
|
-
private gatherCheckpoints;
|
|
95
104
|
private gatherTxs;
|
|
96
105
|
private gatherMessages;
|
|
97
106
|
private gatherPreviousBlockHeader;
|
|
@@ -104,4 +113,4 @@ export declare class ProverNode implements EpochMonitorHandler, ProverNodeApi, T
|
|
|
104
113
|
private validateConfig;
|
|
105
114
|
}
|
|
106
115
|
export {};
|
|
107
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
116
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmVyLW5vZGUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9wcm92ZXItbm9kZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUMzRCxPQUFPLEVBQWlDLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBSzdGLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN2RCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNqRSxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUV6RCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN4RCxPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRWpFLE9BQU8sRUFDTCxLQUFLLGtCQUFrQixFQUV2QixLQUFLLFdBQVcsRUFDaEIsS0FBSyxhQUFhLEVBQ2xCLEtBQUssT0FBTyxFQUNaLEtBQUssb0JBQW9CLEVBQ3pCLEtBQUssc0JBQXNCLEVBRTVCLE1BQU0saUNBQWlDLENBQUM7QUFDekMsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDOUQsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUVuRSxPQUFPLEVBRUwsU0FBUyxFQUNULEtBQUssZUFBZSxFQUNwQixLQUFLLFNBQVMsRUFDZCxLQUFLLE1BQU0sRUFHWixNQUFNLHlCQUF5QixDQUFDO0FBR2pDLE9BQU8sS0FBSyxFQUFFLHdCQUF3QixFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQzVELE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0saUNBQWlD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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,2BAA2B,CAAC;AAChE,OAAO,
|
|
1
|
+
{"version":3,"file":"prover-node.d.ts","sourceRoot":"","sources":["../src/prover-node.ts"],"names":[],"mappings":"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"}
|
package/dest/prover-node.js
CHANGED
|
@@ -404,6 +404,8 @@ _dec = trackSpan('ProverNode.createProvingJob', (epochNumber)=>({
|
|
|
404
404
|
rollupContract;
|
|
405
405
|
l1Metrics;
|
|
406
406
|
telemetryClient;
|
|
407
|
+
delayer;
|
|
408
|
+
dateProvider;
|
|
407
409
|
static{
|
|
408
410
|
({ e: [_initProto] } = _apply_decs_2203_r(this, [
|
|
409
411
|
[
|
|
@@ -424,14 +426,13 @@ _dec = trackSpan('ProverNode.createProvingJob', (epochNumber)=>({
|
|
|
424
426
|
], []));
|
|
425
427
|
}
|
|
426
428
|
log;
|
|
427
|
-
dateProvider;
|
|
428
429
|
jobs;
|
|
429
430
|
config;
|
|
430
431
|
jobMetrics;
|
|
431
432
|
rewardsMetrics;
|
|
432
433
|
tracer;
|
|
433
434
|
publisher;
|
|
434
|
-
constructor(prover, publisherFactory, l2BlockSource, l1ToL2MessageSource, contractDataSource, worldState, p2pClient, epochsMonitor, rollupContract, l1Metrics, config = {}, telemetryClient = getTelemetryClient()){
|
|
435
|
+
constructor(prover, publisherFactory, l2BlockSource, l1ToL2MessageSource, contractDataSource, worldState, p2pClient, epochsMonitor, rollupContract, l1Metrics, config = {}, telemetryClient = getTelemetryClient(), delayer, dateProvider = new DateProvider()){
|
|
435
436
|
this.prover = prover;
|
|
436
437
|
this.publisherFactory = publisherFactory;
|
|
437
438
|
this.l2BlockSource = l2BlockSource;
|
|
@@ -443,13 +444,14 @@ _dec = trackSpan('ProverNode.createProvingJob', (epochNumber)=>({
|
|
|
443
444
|
this.rollupContract = rollupContract;
|
|
444
445
|
this.l1Metrics = l1Metrics;
|
|
445
446
|
this.telemetryClient = telemetryClient;
|
|
447
|
+
this.delayer = delayer;
|
|
448
|
+
this.dateProvider = dateProvider;
|
|
446
449
|
this.log = (_initProto(this), createLogger('prover-node'));
|
|
447
|
-
this.dateProvider = new DateProvider();
|
|
448
450
|
this.jobs = new Map();
|
|
449
451
|
this.config = {
|
|
450
452
|
proverNodePollingIntervalMs: 1_000,
|
|
451
453
|
proverNodeMaxPendingJobs: 100,
|
|
452
|
-
proverNodeMaxParallelBlocksPerEpoch:
|
|
454
|
+
proverNodeMaxParallelBlocksPerEpoch: 0,
|
|
453
455
|
txGatheringIntervalMs: 1_000,
|
|
454
456
|
txGatheringBatchSize: 10,
|
|
455
457
|
txGatheringMaxParallelRequestsPerNode: 100,
|
|
@@ -470,6 +472,9 @@ _dec = trackSpan('ProverNode.createProvingJob', (epochNumber)=>({
|
|
|
470
472
|
getP2P() {
|
|
471
473
|
return this.p2pClient;
|
|
472
474
|
}
|
|
475
|
+
/** Returns the shared tx delayer for prover L1 txs, if enabled. Test-only. */ getDelayer() {
|
|
476
|
+
return this.delayer;
|
|
477
|
+
}
|
|
473
478
|
/**
|
|
474
479
|
* Handles an epoch being completed by starting a proof for it if there are no active jobs for it.
|
|
475
480
|
* @param epochNumber - The epoch number that was just completed.
|
|
@@ -510,16 +515,14 @@ _dec = trackSpan('ProverNode.createProvingJob', (epochNumber)=>({
|
|
|
510
515
|
}
|
|
511
516
|
/**
|
|
512
517
|
* Stops the prover node and all its dependencies.
|
|
518
|
+
* Resources not owned by this node (shared with the parent aztec-node) are skipped.
|
|
513
519
|
*/ async stop() {
|
|
514
520
|
this.log.info('Stopping ProverNode');
|
|
515
521
|
await this.epochsMonitor.stop();
|
|
516
|
-
await this.prover.stop();
|
|
517
|
-
await tryStop(this.p2pClient);
|
|
518
|
-
await tryStop(this.l2BlockSource);
|
|
519
|
-
await tryStop(this.publisherFactory);
|
|
520
522
|
this.publisher?.interrupt();
|
|
521
523
|
await Promise.all(Array.from(this.jobs.values()).map((job)=>job.stop()));
|
|
522
|
-
await this.
|
|
524
|
+
await this.prover.stop();
|
|
525
|
+
await tryStop(this.publisherFactory);
|
|
523
526
|
this.rewardsMetrics.stop();
|
|
524
527
|
this.l1Metrics.stop();
|
|
525
528
|
await this.telemetryClient.stop();
|
|
@@ -603,10 +606,12 @@ _dec = trackSpan('ProverNode.createProvingJob', (epochNumber)=>({
|
|
|
603
606
|
const fromCheckpoint = epochData.checkpoints[0].number;
|
|
604
607
|
const toCheckpoint = epochData.checkpoints.at(-1).number;
|
|
605
608
|
const fromBlock = epochData.checkpoints[0].blocks[0].number;
|
|
606
|
-
const
|
|
609
|
+
const lastBlock = epochData.checkpoints.at(-1).blocks.at(-1);
|
|
610
|
+
const toBlock = lastBlock.number;
|
|
607
611
|
this.log.verbose(`Creating proving job for epoch ${epochNumber} for checkpoint range ${fromCheckpoint} to ${toCheckpoint} and block range ${fromBlock} to ${toBlock}`);
|
|
608
612
|
// Fast forward world state to right before the target block and get a fork
|
|
609
|
-
await
|
|
613
|
+
const lastBlockHash = await lastBlock.header.hash();
|
|
614
|
+
await this.worldState.syncImmediate(toBlock, lastBlockHash);
|
|
610
615
|
// Create a processor factory
|
|
611
616
|
const publicProcessorFactory = new PublicProcessorFactory(this.contractDataSource, this.dateProvider, this.telemetryClient, this.log.getBindings());
|
|
612
617
|
// Set deadline for this job to run. It will abort if it takes too long.
|
|
@@ -620,7 +625,14 @@ _dec = trackSpan('ProverNode.createProvingJob', (epochNumber)=>({
|
|
|
620
625
|
return this.l2BlockSource.getL1Constants();
|
|
621
626
|
}
|
|
622
627
|
async gatherEpochData(epochNumber) {
|
|
623
|
-
const
|
|
628
|
+
const publishedCheckpoints = await this.l2BlockSource.getCheckpoints({
|
|
629
|
+
epoch: epochNumber
|
|
630
|
+
});
|
|
631
|
+
if (publishedCheckpoints.length === 0) {
|
|
632
|
+
throw new EmptyEpochError(epochNumber);
|
|
633
|
+
}
|
|
634
|
+
const checkpoints = publishedCheckpoints.map((p)=>p.checkpoint);
|
|
635
|
+
const attestations = publishedCheckpoints.at(-1)?.attestations ?? [];
|
|
624
636
|
const txArray = await this.gatherTxs(epochNumber, checkpoints);
|
|
625
637
|
const txs = new Map(txArray.map((tx)=>[
|
|
626
638
|
tx.getTxHash().toString(),
|
|
@@ -629,8 +641,6 @@ _dec = trackSpan('ProverNode.createProvingJob', (epochNumber)=>({
|
|
|
629
641
|
const l1ToL2Messages = await this.gatherMessages(epochNumber, checkpoints);
|
|
630
642
|
const [firstBlock] = checkpoints[0].blocks;
|
|
631
643
|
const previousBlockHeader = await this.gatherPreviousBlockHeader(epochNumber, firstBlock.number - 1);
|
|
632
|
-
const [lastPublishedCheckpoint] = await this.l2BlockSource.getCheckpoints(checkpoints.at(-1).number, 1);
|
|
633
|
-
const attestations = lastPublishedCheckpoint?.attestations ?? [];
|
|
634
644
|
return {
|
|
635
645
|
checkpoints,
|
|
636
646
|
txs,
|
|
@@ -640,13 +650,6 @@ _dec = trackSpan('ProverNode.createProvingJob', (epochNumber)=>({
|
|
|
640
650
|
attestations
|
|
641
651
|
};
|
|
642
652
|
}
|
|
643
|
-
async gatherCheckpoints(epochNumber) {
|
|
644
|
-
const checkpoints = await this.l2BlockSource.getCheckpointsForEpoch(epochNumber);
|
|
645
|
-
if (checkpoints.length === 0) {
|
|
646
|
-
throw new EmptyEpochError(epochNumber);
|
|
647
|
-
}
|
|
648
|
-
return checkpoints;
|
|
649
|
-
}
|
|
650
653
|
async gatherTxs(epochNumber, checkpoints) {
|
|
651
654
|
const deadline = new Date(this.dateProvider.now() + this.config.txGatheringTimeoutMs);
|
|
652
655
|
const txProvider = this.p2pClient.getTxProvider();
|
|
@@ -677,12 +680,14 @@ _dec = trackSpan('ProverNode.createProvingJob', (epochNumber)=>({
|
|
|
677
680
|
return messagesByCheckpoint;
|
|
678
681
|
}
|
|
679
682
|
async gatherPreviousBlockHeader(epochNumber, previousBlockNumber) {
|
|
680
|
-
const
|
|
681
|
-
|
|
683
|
+
const data = await this.l2BlockSource.getBlockData({
|
|
684
|
+
number: BlockNumber(previousBlockNumber)
|
|
685
|
+
});
|
|
686
|
+
if (!data?.header) {
|
|
682
687
|
throw new Error(`Previous block header ${previousBlockNumber} not found for proving epoch ${epochNumber}`);
|
|
683
688
|
}
|
|
684
|
-
this.log.verbose(`Gathered previous block header ${header.getBlockNumber()} for epoch ${epochNumber}`);
|
|
685
|
-
return header;
|
|
689
|
+
this.log.verbose(`Gathered previous block header ${data.header.getBlockNumber()} for epoch ${epochNumber}`);
|
|
690
|
+
return data.header;
|
|
686
691
|
}
|
|
687
692
|
/** Extracted for testing purposes. */ doCreateEpochProvingJob(data, deadline, publicProcessorFactory, publisher, opts = {}) {
|
|
688
693
|
const { proverNodeMaxParallelBlocksPerEpoch: parallelBlockLimit, proverNodeDisableProofPublish } = this.config;
|
|
@@ -2,24 +2,24 @@ import type { RollupContract } from '@aztec/ethereum/contracts';
|
|
|
2
2
|
import type { L1TxUtils } from '@aztec/ethereum/l1-tx-utils';
|
|
3
3
|
import type { PublisherManager } from '@aztec/ethereum/publisher-manager';
|
|
4
4
|
import type { LoggerBindings } from '@aztec/foundation/log';
|
|
5
|
-
import type {
|
|
5
|
+
import type { ProverPublisherConfig, ProverTxSenderConfig } from '@aztec/sequencer-client';
|
|
6
6
|
import type { TelemetryClient } from '@aztec/telemetry-client';
|
|
7
7
|
import { ProverNodePublisher } from './prover-node-publisher.js';
|
|
8
8
|
export declare class ProverPublisherFactory {
|
|
9
9
|
private config;
|
|
10
10
|
private deps;
|
|
11
11
|
private bindings?;
|
|
12
|
-
constructor(config:
|
|
12
|
+
constructor(config: ProverTxSenderConfig & ProverPublisherConfig, deps: {
|
|
13
13
|
rollupContract: RollupContract;
|
|
14
14
|
publisherManager: PublisherManager<L1TxUtils>;
|
|
15
15
|
telemetry?: TelemetryClient;
|
|
16
16
|
}, bindings?: LoggerBindings | undefined);
|
|
17
17
|
start(): Promise<void>;
|
|
18
|
-
stop(): void
|
|
18
|
+
stop(): Promise<void>;
|
|
19
19
|
/**
|
|
20
20
|
* Creates a new Prover Publisher instance.
|
|
21
21
|
* @returns A new ProverNodePublisher instance.
|
|
22
22
|
*/
|
|
23
23
|
create(): Promise<ProverNodePublisher>;
|
|
24
24
|
}
|
|
25
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
25
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmVyLXB1Ymxpc2hlci1mYWN0b3J5LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcHJvdmVyLXB1Ymxpc2hlci1mYWN0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQzdELE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDMUUsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDNUQsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUMzRixPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUUvRCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUVqRSxxQkFBYSxzQkFBc0I7SUFFL0IsT0FBTyxDQUFDLE1BQU07SUFDZCxPQUFPLENBQUMsSUFBSTtJQUtaLE9BQU8sQ0FBQyxRQUFRLENBQUM7SUFQbkIsWUFDVSxNQUFNLEVBQUUsb0JBQW9CLEdBQUcscUJBQXFCLEVBQ3BELElBQUksRUFBRTtRQUNaLGNBQWMsRUFBRSxjQUFjLENBQUM7UUFDL0IsZ0JBQWdCLEVBQUUsZ0JBQWdCLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDOUMsU0FBUyxDQUFDLEVBQUUsZUFBZSxDQUFDO0tBQzdCLEVBQ08sUUFBUSxDQUFDLDRCQUFnQixFQUMvQjtJQUVTLEtBQUssa0JBRWpCO0lBRVksSUFBSSxrQkFFaEI7SUFFRDs7O09BR0c7SUFDVSxNQUFNLElBQUksT0FBTyxDQUFDLG1CQUFtQixDQUFDLENBV2xEO0NBQ0YifQ==
|
|
@@ -1 +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,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,
|
|
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,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAC3F,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;IAKZ,OAAO,CAAC,QAAQ,CAAC;IAPnB,YACU,MAAM,EAAE,oBAAoB,GAAG,qBAAqB,EACpD,IAAI,EAAE;QACZ,cAAc,EAAE,cAAc,CAAC;QAC/B,gBAAgB,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAC9C,SAAS,CAAC,EAAE,eAAe,CAAC;KAC7B,EACO,QAAQ,CAAC,4BAAgB,EAC/B;IAES,KAAK,kBAEjB;IAEY,IAAI,kBAEhB;IAED;;;OAGG;IACU,MAAM,IAAI,OAAO,CAAC,mBAAmB,CAAC,CAWlD;CACF"}
|
|
@@ -9,10 +9,10 @@ export class ProverPublisherFactory {
|
|
|
9
9
|
this.bindings = bindings;
|
|
10
10
|
}
|
|
11
11
|
async start() {
|
|
12
|
-
await this.deps.publisherManager.
|
|
12
|
+
await this.deps.publisherManager.start();
|
|
13
13
|
}
|
|
14
|
-
stop() {
|
|
15
|
-
this.deps.publisherManager.
|
|
14
|
+
async stop() {
|
|
15
|
+
await this.deps.publisherManager.stop();
|
|
16
16
|
}
|
|
17
17
|
/**
|
|
18
18
|
* Creates a new Prover Publisher instance.
|