@aztec/prover-node 0.0.1-commit.9b94fc1 → 0.0.1-commit.9ee6fcc6
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 +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 +2 -2
- 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 +5 -2
- 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 +47 -62
- 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 +7 -6
- package/dest/job/epoch-proving-job-data.d.ts.map +1 -1
- package/dest/job/epoch-proving-job-data.js +24 -18
- package/dest/job/epoch-proving-job.d.ts +5 -4
- package/dest/job/epoch-proving-job.d.ts.map +1 -1
- package/dest/job/epoch-proving-job.js +511 -108
- package/dest/metrics.d.ts +14 -3
- package/dest/metrics.d.ts.map +1 -1
- package/dest/metrics.js +54 -97
- 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 +8 -18
- package/dest/prover-node-publisher.d.ts +12 -10
- package/dest/prover-node-publisher.d.ts.map +1 -1
- package/dest/prover-node-publisher.js +46 -40
- package/dest/prover-node.d.ts +22 -12
- package/dest/prover-node.d.ts.map +1 -1
- package/dest/prover-node.js +442 -55
- 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/package.json +26 -25
- package/src/actions/rerun-epoch-proving-job.ts +5 -3
- package/src/actions/upload-epoch-proof-failure.ts +1 -1
- package/src/bin/run-failed-epoch.ts +5 -2
- package/src/config.ts +27 -33
- package/src/factory.ts +80 -104
- package/src/index.ts +1 -0
- package/src/job/epoch-proving-job-data.ts +28 -23
- package/src/job/epoch-proving-job.ts +151 -111
- package/src/metrics.ts +64 -81
- package/src/monitors/epoch-monitor.ts +6 -14
- package/src/prover-node-publisher.ts +67 -55
- package/src/prover-node.ts +54 -42
- package/src/prover-publisher-factory.ts +19 -11
|
@@ -2,15 +2,17 @@ import { ProverNodePublisher } from './prover-node-publisher.js';
|
|
|
2
2
|
export class ProverPublisherFactory {
|
|
3
3
|
config;
|
|
4
4
|
deps;
|
|
5
|
-
|
|
5
|
+
bindings;
|
|
6
|
+
constructor(config, deps, bindings){
|
|
6
7
|
this.config = config;
|
|
7
8
|
this.deps = deps;
|
|
9
|
+
this.bindings = bindings;
|
|
8
10
|
}
|
|
9
11
|
async start() {
|
|
10
|
-
await this.deps.publisherManager.
|
|
12
|
+
await this.deps.publisherManager.start();
|
|
11
13
|
}
|
|
12
|
-
stop() {
|
|
13
|
-
this.deps.publisherManager.
|
|
14
|
+
async stop() {
|
|
15
|
+
await this.deps.publisherManager.stop();
|
|
14
16
|
}
|
|
15
17
|
/**
|
|
16
18
|
* Creates a new Prover Publisher instance.
|
|
@@ -21,6 +23,6 @@ export class ProverPublisherFactory {
|
|
|
21
23
|
rollupContract: this.deps.rollupContract,
|
|
22
24
|
l1TxUtils: l1Publisher,
|
|
23
25
|
telemetry: this.deps.telemetry
|
|
24
|
-
});
|
|
26
|
+
}, this.bindings);
|
|
25
27
|
}
|
|
26
28
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/prover-node",
|
|
3
|
-
"version": "0.0.1-commit.
|
|
3
|
+
"version": "0.0.1-commit.9ee6fcc6",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
@@ -11,8 +11,8 @@
|
|
|
11
11
|
"../package.common.json"
|
|
12
12
|
],
|
|
13
13
|
"scripts": {
|
|
14
|
-
"build": "yarn clean &&
|
|
15
|
-
"build:dev": "
|
|
14
|
+
"build": "yarn clean && ../scripts/tsc.sh",
|
|
15
|
+
"build:dev": "../scripts/tsc.sh --watch",
|
|
16
16
|
"clean": "rm -rf ./dest .tsbuildinfo",
|
|
17
17
|
"bb": "node --no-warnings ./dest/bb/index.js",
|
|
18
18
|
"test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}",
|
|
@@ -56,27 +56,28 @@
|
|
|
56
56
|
]
|
|
57
57
|
},
|
|
58
58
|
"dependencies": {
|
|
59
|
-
"@aztec/archiver": "0.0.1-commit.
|
|
60
|
-
"@aztec/bb-prover": "0.0.1-commit.
|
|
61
|
-
"@aztec/blob-
|
|
62
|
-
"@aztec/blob-
|
|
63
|
-
"@aztec/constants": "0.0.1-commit.
|
|
64
|
-
"@aztec/epoch-cache": "0.0.1-commit.
|
|
65
|
-
"@aztec/ethereum": "0.0.1-commit.
|
|
66
|
-
"@aztec/foundation": "0.0.1-commit.
|
|
67
|
-
"@aztec/kv-store": "0.0.1-commit.
|
|
68
|
-
"@aztec/l1-artifacts": "0.0.1-commit.
|
|
69
|
-
"@aztec/
|
|
70
|
-
"@aztec/node-
|
|
71
|
-
"@aztec/
|
|
72
|
-
"@aztec/
|
|
73
|
-
"@aztec/
|
|
74
|
-
"@aztec/
|
|
75
|
-
"@aztec/
|
|
76
|
-
"@aztec/
|
|
77
|
-
"@aztec/
|
|
78
|
-
"@aztec/
|
|
79
|
-
"@aztec/
|
|
59
|
+
"@aztec/archiver": "0.0.1-commit.9ee6fcc6",
|
|
60
|
+
"@aztec/bb-prover": "0.0.1-commit.9ee6fcc6",
|
|
61
|
+
"@aztec/blob-client": "0.0.1-commit.9ee6fcc6",
|
|
62
|
+
"@aztec/blob-lib": "0.0.1-commit.9ee6fcc6",
|
|
63
|
+
"@aztec/constants": "0.0.1-commit.9ee6fcc6",
|
|
64
|
+
"@aztec/epoch-cache": "0.0.1-commit.9ee6fcc6",
|
|
65
|
+
"@aztec/ethereum": "0.0.1-commit.9ee6fcc6",
|
|
66
|
+
"@aztec/foundation": "0.0.1-commit.9ee6fcc6",
|
|
67
|
+
"@aztec/kv-store": "0.0.1-commit.9ee6fcc6",
|
|
68
|
+
"@aztec/l1-artifacts": "0.0.1-commit.9ee6fcc6",
|
|
69
|
+
"@aztec/native": "0.0.1-commit.9ee6fcc6",
|
|
70
|
+
"@aztec/node-keystore": "0.0.1-commit.9ee6fcc6",
|
|
71
|
+
"@aztec/node-lib": "0.0.1-commit.9ee6fcc6",
|
|
72
|
+
"@aztec/noir-protocol-circuits-types": "0.0.1-commit.9ee6fcc6",
|
|
73
|
+
"@aztec/p2p": "0.0.1-commit.9ee6fcc6",
|
|
74
|
+
"@aztec/protocol-contracts": "0.0.1-commit.9ee6fcc6",
|
|
75
|
+
"@aztec/prover-client": "0.0.1-commit.9ee6fcc6",
|
|
76
|
+
"@aztec/sequencer-client": "0.0.1-commit.9ee6fcc6",
|
|
77
|
+
"@aztec/simulator": "0.0.1-commit.9ee6fcc6",
|
|
78
|
+
"@aztec/stdlib": "0.0.1-commit.9ee6fcc6",
|
|
79
|
+
"@aztec/telemetry-client": "0.0.1-commit.9ee6fcc6",
|
|
80
|
+
"@aztec/world-state": "0.0.1-commit.9ee6fcc6",
|
|
80
81
|
"source-map-support": "^0.5.21",
|
|
81
82
|
"tslib": "^2.4.0",
|
|
82
83
|
"viem": "npm:@aztec/viem@2.38.2"
|
|
@@ -86,7 +87,7 @@
|
|
|
86
87
|
"@types/jest": "^30.0.0",
|
|
87
88
|
"@types/node": "^22.15.17",
|
|
88
89
|
"@types/source-map-support": "^0.5.10",
|
|
89
|
-
"@typescript/native-preview": "7.0.0-dev.
|
|
90
|
+
"@typescript/native-preview": "7.0.0-dev.20260113.1",
|
|
90
91
|
"jest": "^30.0.0",
|
|
91
92
|
"jest-mock-extended": "^4.0.0",
|
|
92
93
|
"ts-node": "^10.9.1",
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { createArchiverStore } from '@aztec/archiver';
|
|
2
|
+
import type { L1ContractsConfig } from '@aztec/ethereum/config';
|
|
2
3
|
import type { Logger } from '@aztec/foundation/log';
|
|
3
|
-
import type { DataStoreConfig } from '@aztec/kv-store/config';
|
|
4
4
|
import { type ProverClientConfig, createProverClient } from '@aztec/prover-client';
|
|
5
5
|
import { ProverBrokerConfig, createAndStartProvingBroker } from '@aztec/prover-client/broker';
|
|
6
6
|
import { PublicProcessorFactory } from '@aztec/simulator/server';
|
|
7
|
+
import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
|
|
7
8
|
import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
8
9
|
import { createWorldState } from '@aztec/world-state';
|
|
9
10
|
|
|
@@ -21,7 +22,7 @@ import { ProverNodeJobMetrics } from '../metrics.js';
|
|
|
21
22
|
export async function rerunEpochProvingJob(
|
|
22
23
|
localPath: string,
|
|
23
24
|
log: Logger,
|
|
24
|
-
config: DataStoreConfig & ProverBrokerConfig & ProverClientConfig,
|
|
25
|
+
config: DataStoreConfig & ProverBrokerConfig & ProverClientConfig & Pick<L1ContractsConfig, 'aztecEpochDuration'>,
|
|
25
26
|
) {
|
|
26
27
|
const jobData = deserializeEpochProvingJobData(readFileSync(localPath));
|
|
27
28
|
log.info(`Loaded proving job data for epoch ${jobData.epochNumber}`);
|
|
@@ -30,7 +31,7 @@ export async function rerunEpochProvingJob(
|
|
|
30
31
|
const metrics = new ProverNodeJobMetrics(telemetry.getMeter('prover-job'), telemetry.getTracer('prover-job'));
|
|
31
32
|
const worldState = await createWorldState(config);
|
|
32
33
|
const archiver = await createArchiverStore(config);
|
|
33
|
-
const publicProcessorFactory = new PublicProcessorFactory(archiver);
|
|
34
|
+
const publicProcessorFactory = new PublicProcessorFactory(archiver, undefined, undefined, log.getBindings());
|
|
34
35
|
|
|
35
36
|
const publisher = { submitEpochProof: () => Promise.resolve(true) };
|
|
36
37
|
const l2BlockSourceForReorgDetection = undefined;
|
|
@@ -52,6 +53,7 @@ export async function rerunEpochProvingJob(
|
|
|
52
53
|
metrics,
|
|
53
54
|
deadline,
|
|
54
55
|
{ skipEpochCheck: true },
|
|
56
|
+
log.getBindings(),
|
|
55
57
|
);
|
|
56
58
|
|
|
57
59
|
log.info(`Rerunning epoch proving job for epoch ${jobData.epochNumber}`);
|
|
@@ -3,11 +3,11 @@ import { tryRmDir } from '@aztec/foundation/fs';
|
|
|
3
3
|
import { jsonStringify } from '@aztec/foundation/json-rpc';
|
|
4
4
|
import type { Logger } from '@aztec/foundation/log';
|
|
5
5
|
import { isoDate } from '@aztec/foundation/string';
|
|
6
|
-
import type { DataStoreConfig } from '@aztec/kv-store/config';
|
|
7
6
|
import { buildSnapshotMetadata, createBackups } from '@aztec/node-lib/actions';
|
|
8
7
|
import type { ChainConfig } from '@aztec/stdlib/config';
|
|
9
8
|
import { type FileStore, createFileStore } from '@aztec/stdlib/file-store';
|
|
10
9
|
import type { WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
|
|
10
|
+
import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
|
|
11
11
|
import { type UploadSnapshotMetadata, getBasePath, uploadSnapshotData } from '@aztec/stdlib/snapshots';
|
|
12
12
|
import { WORLD_STATE_DB_VERSION } from '@aztec/world-state';
|
|
13
13
|
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
/* eslint-disable no-console */
|
|
2
|
-
import
|
|
2
|
+
import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
|
|
3
|
+
import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
|
|
3
4
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
4
5
|
import { jsonParseWithSchema, jsonStringify } from '@aztec/foundation/json-rpc';
|
|
5
6
|
import { createLogger } from '@aztec/foundation/log';
|
|
@@ -22,8 +23,10 @@ async function rerunFailedEpoch(provingJobUrl: string, baseLocalDir: string) {
|
|
|
22
23
|
const dataDir = join(localDir, 'state');
|
|
23
24
|
|
|
24
25
|
const env = getProverNodeConfigFromEnv();
|
|
26
|
+
const l1Config = getL1ContractsConfigEnvVars();
|
|
25
27
|
const config = {
|
|
26
|
-
...
|
|
28
|
+
...env,
|
|
29
|
+
...l1Config,
|
|
27
30
|
dataDirectory: dataDir,
|
|
28
31
|
dataStoreMapSizeKb: env.dataStoreMapSizeKb ?? 1024 * 1024,
|
|
29
32
|
proverId: env.proverId ?? EthAddress.random(),
|
package/src/config.ts
CHANGED
|
@@ -1,42 +1,37 @@
|
|
|
1
|
-
import { type ArchiverConfig, archiverConfigMappings } from '@aztec/archiver/config';
|
|
2
1
|
import type { ACVMConfig, BBConfig } from '@aztec/bb-prover/config';
|
|
3
|
-
import { type GenesisStateConfig, genesisStateConfigMappings } from '@aztec/ethereum';
|
|
4
2
|
import {
|
|
5
3
|
type ConfigMappingsType,
|
|
6
4
|
booleanConfigHelper,
|
|
7
5
|
getConfigFromMappings,
|
|
8
6
|
numberConfigHelper,
|
|
7
|
+
pickConfigMappings,
|
|
9
8
|
} from '@aztec/foundation/config';
|
|
10
|
-
import { type
|
|
11
|
-
import {
|
|
9
|
+
import { type KeyStoreConfig, keyStoreConfigMappings } from '@aztec/node-keystore/config';
|
|
10
|
+
import { ethPrivateKeySchema } from '@aztec/node-keystore/schemas';
|
|
11
|
+
import type { KeyStore } from '@aztec/node-keystore/types';
|
|
12
12
|
import { type SharedNodeConfig, sharedNodeConfigMappings } from '@aztec/node-lib/config';
|
|
13
|
-
import { type P2PConfig, p2pConfigMappings } from '@aztec/p2p/config';
|
|
14
13
|
import {
|
|
15
14
|
type ProverAgentConfig,
|
|
16
15
|
type ProverBrokerConfig,
|
|
17
16
|
proverAgentConfigMappings,
|
|
18
17
|
proverBrokerConfigMappings,
|
|
19
|
-
} from '@aztec/prover-client/broker';
|
|
18
|
+
} from '@aztec/prover-client/broker/config';
|
|
20
19
|
import { type ProverClientUserConfig, bbConfigMappings, proverClientConfigMappings } from '@aztec/prover-client/config';
|
|
21
20
|
import {
|
|
22
|
-
type
|
|
23
|
-
type
|
|
24
|
-
|
|
25
|
-
|
|
21
|
+
type ProverPublisherConfig,
|
|
22
|
+
type ProverTxSenderConfig,
|
|
23
|
+
proverPublisherConfigMappings,
|
|
24
|
+
proverTxSenderConfigMappings,
|
|
26
25
|
} from '@aztec/sequencer-client/config';
|
|
27
|
-
import { type
|
|
28
|
-
|
|
29
|
-
export type ProverNodeConfig =
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
WorldStateConfig &
|
|
33
|
-
PublisherConfig &
|
|
34
|
-
TxSenderConfig &
|
|
26
|
+
import { type DataStoreConfig, dataConfigMappings } from '@aztec/stdlib/kv-store';
|
|
27
|
+
|
|
28
|
+
export type ProverNodeConfig = ProverClientUserConfig &
|
|
29
|
+
ProverPublisherConfig &
|
|
30
|
+
ProverTxSenderConfig &
|
|
35
31
|
DataStoreConfig &
|
|
36
32
|
KeyStoreConfig &
|
|
37
|
-
SharedNodeConfig &
|
|
38
33
|
SpecificProverNodeConfig &
|
|
39
|
-
|
|
34
|
+
Pick<SharedNodeConfig, 'web3SignerUrl'>;
|
|
40
35
|
|
|
41
36
|
export type SpecificProverNodeConfig = {
|
|
42
37
|
proverNodeMaxPendingJobs: number;
|
|
@@ -51,7 +46,7 @@ export type SpecificProverNodeConfig = {
|
|
|
51
46
|
txGatheringMaxParallelRequestsPerNode: number;
|
|
52
47
|
};
|
|
53
48
|
|
|
54
|
-
const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeConfig> = {
|
|
49
|
+
export const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeConfig> = {
|
|
55
50
|
proverNodeMaxPendingJobs: {
|
|
56
51
|
env: 'PROVER_NODE_MAX_PENDING_JOBS',
|
|
57
52
|
description: 'The maximum number of pending jobs for the prover node',
|
|
@@ -65,7 +60,7 @@ const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeCon
|
|
|
65
60
|
proverNodeMaxParallelBlocksPerEpoch: {
|
|
66
61
|
env: 'PROVER_NODE_MAX_PARALLEL_BLOCKS_PER_EPOCH',
|
|
67
62
|
description: 'The Maximum number of blocks to process in parallel while proving an epoch',
|
|
68
|
-
...numberConfigHelper(
|
|
63
|
+
...numberConfigHelper(0),
|
|
69
64
|
},
|
|
70
65
|
proverNodeFailedEpochStore: {
|
|
71
66
|
env: 'PROVER_NODE_FAILED_EPOCH_STORE',
|
|
@@ -106,15 +101,11 @@ const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeCon
|
|
|
106
101
|
export const proverNodeConfigMappings: ConfigMappingsType<ProverNodeConfig> = {
|
|
107
102
|
...dataConfigMappings,
|
|
108
103
|
...keyStoreConfigMappings,
|
|
109
|
-
...archiverConfigMappings,
|
|
110
104
|
...proverClientConfigMappings,
|
|
111
|
-
...
|
|
112
|
-
...
|
|
113
|
-
...getPublisherConfigMappings('PROVER'),
|
|
114
|
-
...getTxSenderConfigMappings('PROVER'),
|
|
105
|
+
...proverPublisherConfigMappings,
|
|
106
|
+
...proverTxSenderConfigMappings,
|
|
115
107
|
...specificProverNodeConfigMappings,
|
|
116
|
-
...
|
|
117
|
-
...sharedNodeConfigMappings,
|
|
108
|
+
...pickConfigMappings(sharedNodeConfigMappings, ['web3SignerUrl']),
|
|
118
109
|
};
|
|
119
110
|
|
|
120
111
|
export function getProverNodeConfigFromEnv(): ProverNodeConfig {
|
|
@@ -141,7 +132,7 @@ function createKeyStoreFromWeb3Signer(config: ProverNodeConfig): KeyStore | unde
|
|
|
141
132
|
}
|
|
142
133
|
|
|
143
134
|
// Also, we need at least one publisher address.
|
|
144
|
-
const publishers = config.
|
|
135
|
+
const publishers = config.proverPublisherAddresses ?? [];
|
|
145
136
|
|
|
146
137
|
if (publishers.length === 0) {
|
|
147
138
|
return undefined;
|
|
@@ -162,8 +153,8 @@ function createKeyStoreFromWeb3Signer(config: ProverNodeConfig): KeyStore | unde
|
|
|
162
153
|
|
|
163
154
|
function createKeyStoreFromPublisherKeys(config: ProverNodeConfig): KeyStore | undefined {
|
|
164
155
|
// Extract the publisher keys from the provided config.
|
|
165
|
-
const publisherKeys = config.
|
|
166
|
-
? config.
|
|
156
|
+
const publisherKeys = config.proverPublisherPrivateKeys
|
|
157
|
+
? config.proverPublisherPrivateKeys.map((k: { getValue: () => string }) => ethPrivateKeySchema.parse(k.getValue()))
|
|
167
158
|
: [];
|
|
168
159
|
|
|
169
160
|
// There must be at least 1.
|
|
@@ -192,7 +183,10 @@ function createKeyStoreFromPublisherKeys(config: ProverNodeConfig): KeyStore | u
|
|
|
192
183
|
|
|
193
184
|
export function createKeyStoreForProver(config: ProverNodeConfig): KeyStore | undefined {
|
|
194
185
|
if (config.web3SignerUrl !== undefined && config.web3SignerUrl.length > 0) {
|
|
195
|
-
|
|
186
|
+
const keyStore = createKeyStoreFromWeb3Signer(config);
|
|
187
|
+
if (keyStore) {
|
|
188
|
+
return keyStore;
|
|
189
|
+
}
|
|
196
190
|
}
|
|
197
191
|
|
|
198
192
|
return createKeyStoreFromPublisherKeys(config);
|
package/src/factory.ts
CHANGED
|
@@ -1,28 +1,36 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
1
|
+
import type { Archiver } from '@aztec/archiver';
|
|
2
|
+
import type { BlobClientInterface } from '@aztec/blob-client/client';
|
|
3
|
+
import { Blob } from '@aztec/blob-lib';
|
|
4
|
+
import type { EpochCacheInterface } from '@aztec/epoch-cache';
|
|
5
|
+
import { createEthereumChain } from '@aztec/ethereum/chain';
|
|
6
|
+
import { makeL1HttpTransport } from '@aztec/ethereum/client';
|
|
7
|
+
import { RollupContract } from '@aztec/ethereum/contracts';
|
|
8
|
+
import { L1TxUtils } from '@aztec/ethereum/l1-tx-utils';
|
|
9
|
+
import { PublisherManager } from '@aztec/ethereum/publisher-manager';
|
|
6
10
|
import { pick } from '@aztec/foundation/collection';
|
|
7
11
|
import { type Logger, createLogger } from '@aztec/foundation/log';
|
|
8
12
|
import { DateProvider } from '@aztec/foundation/timer';
|
|
9
|
-
import
|
|
10
|
-
import {
|
|
11
|
-
import {
|
|
12
|
-
import { createL1TxUtilsFromEthSignerWithStore } from '@aztec/node-lib/factories';
|
|
13
|
-
import { NodeRpcTxSource, createP2PClient } from '@aztec/p2p';
|
|
14
|
-
import { type ProverClientConfig, createProverClient } from '@aztec/prover-client';
|
|
13
|
+
import { KeystoreManager } from '@aztec/node-keystore';
|
|
14
|
+
import { createForwarderL1TxUtilsFromSigners, createL1TxUtilsFromSigners } from '@aztec/node-lib/factories';
|
|
15
|
+
import { type ProverClientConfig, type ProverClientUserConfig, createProverClient } from '@aztec/prover-client';
|
|
15
16
|
import { createAndStartProvingBroker } from '@aztec/prover-client/broker';
|
|
16
|
-
import
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
17
|
+
import {
|
|
18
|
+
type ProverPublisherConfig,
|
|
19
|
+
type ProverTxSenderConfig,
|
|
20
|
+
getPublisherConfigFromProverConfig,
|
|
21
|
+
} from '@aztec/sequencer-client';
|
|
22
|
+
import type {
|
|
23
|
+
ITxProvider,
|
|
24
|
+
ProverConfig,
|
|
25
|
+
ProvingJobBroker,
|
|
26
|
+
Service,
|
|
27
|
+
WorldStateSynchronizer,
|
|
28
|
+
} from '@aztec/stdlib/interfaces/server';
|
|
20
29
|
import { L1Metrics, type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
|
|
21
|
-
import { createWorldStateSynchronizer } from '@aztec/world-state';
|
|
22
30
|
|
|
23
|
-
import { createPublicClient
|
|
31
|
+
import { createPublicClient } from 'viem';
|
|
24
32
|
|
|
25
|
-
import
|
|
33
|
+
import type { SpecificProverNodeConfig } from './config.js';
|
|
26
34
|
import { EpochMonitor } from './monitors/epoch-monitor.js';
|
|
27
35
|
import { ProverNode } from './prover-node.js';
|
|
28
36
|
import { ProverPublisherFactory } from './prover-publisher-factory.js';
|
|
@@ -30,56 +38,42 @@ import { ProverPublisherFactory } from './prover-publisher-factory.js';
|
|
|
30
38
|
export type ProverNodeDeps = {
|
|
31
39
|
telemetry?: TelemetryClient;
|
|
32
40
|
log?: Logger;
|
|
33
|
-
|
|
34
|
-
archiver?: Archiver;
|
|
41
|
+
archiver: Archiver;
|
|
35
42
|
publisherFactory?: ProverPublisherFactory;
|
|
36
|
-
blobSinkClient?: BlobSinkClientInterface;
|
|
37
43
|
broker?: ProvingJobBroker;
|
|
38
44
|
l1TxUtils?: L1TxUtils;
|
|
39
45
|
dateProvider?: DateProvider;
|
|
46
|
+
worldStateSynchronizer: WorldStateSynchronizer;
|
|
47
|
+
p2pClient: { getTxProvider(): ITxProvider } & Partial<Service>;
|
|
48
|
+
epochCache: EpochCacheInterface;
|
|
49
|
+
blobClient: BlobClientInterface;
|
|
50
|
+
keyStoreManager?: KeystoreManager;
|
|
40
51
|
};
|
|
41
52
|
|
|
42
|
-
/** Creates a new prover node given a config
|
|
53
|
+
/** Creates a new prover node subsystem given a config and dependencies */
|
|
43
54
|
export async function createProverNode(
|
|
44
|
-
userConfig:
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
55
|
+
userConfig: SpecificProverNodeConfig &
|
|
56
|
+
ProverConfig &
|
|
57
|
+
ProverClientUserConfig &
|
|
58
|
+
ProverPublisherConfig &
|
|
59
|
+
ProverTxSenderConfig,
|
|
60
|
+
deps: ProverNodeDeps,
|
|
49
61
|
) {
|
|
50
62
|
const config = { ...userConfig };
|
|
51
63
|
const telemetry = deps.telemetry ?? getTelemetryClient();
|
|
52
64
|
const dateProvider = deps.dateProvider ?? new DateProvider();
|
|
53
|
-
const
|
|
54
|
-
deps.blobSinkClient ?? createBlobSinkClient(config, { logger: createLogger('prover-node:blob-sink:client') });
|
|
55
|
-
const log = deps.log ?? createLogger('prover-node');
|
|
56
|
-
|
|
57
|
-
// Build a key store from file if given or from environment otherwise
|
|
58
|
-
let keyStoreManager: KeystoreManager | undefined;
|
|
59
|
-
const keyStoreProvided = config.keyStoreDirectory !== undefined && config.keyStoreDirectory.length > 0;
|
|
60
|
-
if (keyStoreProvided) {
|
|
61
|
-
const keyStores = loadKeystores(config.keyStoreDirectory!);
|
|
62
|
-
keyStoreManager = new KeystoreManager(mergeKeystores(keyStores));
|
|
63
|
-
} else {
|
|
64
|
-
const keyStore = createKeyStoreForProver(config);
|
|
65
|
-
if (keyStore) {
|
|
66
|
-
keyStoreManager = new KeystoreManager(keyStore);
|
|
67
|
-
}
|
|
68
|
-
}
|
|
65
|
+
const log = deps.log ?? createLogger('prover');
|
|
69
66
|
|
|
70
|
-
|
|
67
|
+
const { p2pClient, archiver, keyStoreManager, worldStateSynchronizer } = deps;
|
|
71
68
|
|
|
72
69
|
// Extract the prover signers from the key store and verify that we have one.
|
|
70
|
+
await keyStoreManager?.validateSigners();
|
|
73
71
|
const proverSigners = keyStoreManager?.createProverSigners();
|
|
74
72
|
|
|
75
73
|
if (proverSigners === undefined) {
|
|
76
74
|
throw new Error('Failed to create prover key store configuration');
|
|
77
75
|
} else if (proverSigners.signers.length === 0) {
|
|
78
76
|
throw new Error('No prover signers found in the key store');
|
|
79
|
-
} else if (!keyStoreProvided) {
|
|
80
|
-
log.warn(
|
|
81
|
-
'KEY STORE CREATED FROM ENVIRONMENT, IT IS RECOMMENDED TO USE A FILE-BASED KEY STORE IN PRODUCTION ENVIRONMENTS',
|
|
82
|
-
);
|
|
83
77
|
}
|
|
84
78
|
|
|
85
79
|
log.info(`Creating prover with publishers ${proverSigners.signers.map(signer => signer.address.toString()).join()}`);
|
|
@@ -91,28 +85,7 @@ export async function createProverNode(
|
|
|
91
85
|
const proverId = proverSigners.id ?? proverIdInUserConfig ?? proverSigners.signers[0].address;
|
|
92
86
|
|
|
93
87
|
// Now create the prover client configuration from this.
|
|
94
|
-
const proverClientConfig: ProverClientConfig = {
|
|
95
|
-
...config,
|
|
96
|
-
proverId,
|
|
97
|
-
};
|
|
98
|
-
|
|
99
|
-
await trySnapshotSync(config, log);
|
|
100
|
-
|
|
101
|
-
const epochCache = await EpochCache.create(config.l1Contracts.rollupAddress, config);
|
|
102
|
-
|
|
103
|
-
const archiver =
|
|
104
|
-
deps.archiver ??
|
|
105
|
-
(await createArchiver(config, { blobSinkClient, epochCache, telemetry, dateProvider }, { blockUntilSync: true }));
|
|
106
|
-
log.verbose(`Created archiver and synced to block ${await archiver.getBlockNumber()}`);
|
|
107
|
-
|
|
108
|
-
const worldStateConfig = { ...config, worldStateProvenBlocksOnly: false };
|
|
109
|
-
const worldStateSynchronizer = await createWorldStateSynchronizer(
|
|
110
|
-
worldStateConfig,
|
|
111
|
-
archiver,
|
|
112
|
-
options.prefilledPublicData,
|
|
113
|
-
telemetry,
|
|
114
|
-
);
|
|
115
|
-
await worldStateSynchronizer.start();
|
|
88
|
+
const proverClientConfig: ProverClientConfig = { ...config, proverId };
|
|
116
89
|
|
|
117
90
|
const broker = deps.broker ?? (await createAndStartProvingBroker(config, telemetry));
|
|
118
91
|
|
|
@@ -123,7 +96,7 @@ export async function createProverNode(
|
|
|
123
96
|
|
|
124
97
|
const publicClient = createPublicClient({
|
|
125
98
|
chain: chain.chainInfo,
|
|
126
|
-
transport:
|
|
99
|
+
transport: makeL1HttpTransport(config.l1RpcUrls, { timeout: config.l1HttpTimeoutMS }),
|
|
127
100
|
pollingInterval: config.viemPollingIntervalMS,
|
|
128
101
|
});
|
|
129
102
|
|
|
@@ -131,47 +104,45 @@ export async function createProverNode(
|
|
|
131
104
|
|
|
132
105
|
const l1TxUtils = deps.l1TxUtils
|
|
133
106
|
? [deps.l1TxUtils]
|
|
134
|
-
:
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
107
|
+
: config.proverPublisherForwarderAddress
|
|
108
|
+
? await createForwarderL1TxUtilsFromSigners(
|
|
109
|
+
publicClient,
|
|
110
|
+
proverSigners.signers,
|
|
111
|
+
config.proverPublisherForwarderAddress,
|
|
112
|
+
{ ...config, scope: 'prover' },
|
|
113
|
+
{ telemetry, logger: log.createChild('l1-tx-utils'), dateProvider, kzg: Blob.getViemKzgInstance() },
|
|
114
|
+
)
|
|
115
|
+
: await createL1TxUtilsFromSigners(
|
|
116
|
+
publicClient,
|
|
117
|
+
proverSigners.signers,
|
|
118
|
+
{ ...config, scope: 'prover' },
|
|
119
|
+
{ telemetry, logger: log.createChild('l1-tx-utils'), dateProvider },
|
|
120
|
+
);
|
|
121
|
+
|
|
122
|
+
// Create a funder L1TxUtils from the keystore funding account (if configured)
|
|
123
|
+
const fundingSigner = keyStoreManager?.createFundingSigner();
|
|
124
|
+
let funderL1TxUtils: L1TxUtils | undefined;
|
|
125
|
+
if (fundingSigner) {
|
|
126
|
+
const [funder] = await createL1TxUtilsFromSigners(
|
|
127
|
+
publicClient,
|
|
128
|
+
[fundingSigner],
|
|
129
|
+
{ ...config, scope: 'prover' },
|
|
130
|
+
{ telemetry, logger: log.createChild('l1-tx-utils:funder'), dateProvider },
|
|
131
|
+
);
|
|
132
|
+
funderL1TxUtils = funder;
|
|
133
|
+
}
|
|
140
134
|
|
|
141
135
|
const publisherFactory =
|
|
142
136
|
deps.publisherFactory ??
|
|
143
137
|
new ProverPublisherFactory(config, {
|
|
144
138
|
rollupContract,
|
|
145
|
-
publisherManager: new PublisherManager(l1TxUtils, config),
|
|
139
|
+
publisherManager: new PublisherManager(l1TxUtils, getPublisherConfigFromProverConfig(config), {
|
|
140
|
+
bindings: log.getBindings(),
|
|
141
|
+
funder: funderL1TxUtils,
|
|
142
|
+
}),
|
|
146
143
|
telemetry,
|
|
147
144
|
});
|
|
148
145
|
|
|
149
|
-
const proofVerifier = new QueuedIVCVerifier(
|
|
150
|
-
config,
|
|
151
|
-
config.realProofs
|
|
152
|
-
? await BBCircuitVerifier.new(config)
|
|
153
|
-
: new TestCircuitVerifier(config.proverTestVerificationDelayMs),
|
|
154
|
-
);
|
|
155
|
-
|
|
156
|
-
const p2pClient = await createP2PClient(
|
|
157
|
-
P2PClientType.Prover,
|
|
158
|
-
config,
|
|
159
|
-
archiver,
|
|
160
|
-
proofVerifier,
|
|
161
|
-
worldStateSynchronizer,
|
|
162
|
-
epochCache,
|
|
163
|
-
getPackageVersion() ?? '',
|
|
164
|
-
dateProvider,
|
|
165
|
-
telemetry,
|
|
166
|
-
{
|
|
167
|
-
txCollectionNodeSources: deps.aztecNodeTxProvider
|
|
168
|
-
? [new NodeRpcTxSource(deps.aztecNodeTxProvider, 'TestNode')]
|
|
169
|
-
: [],
|
|
170
|
-
},
|
|
171
|
-
);
|
|
172
|
-
|
|
173
|
-
await p2pClient.start();
|
|
174
|
-
|
|
175
146
|
const proverNodeConfig = {
|
|
176
147
|
...pick(
|
|
177
148
|
config,
|
|
@@ -202,6 +173,9 @@ export async function createProverNode(
|
|
|
202
173
|
l1TxUtils.map(utils => utils.getSenderAddress()),
|
|
203
174
|
);
|
|
204
175
|
|
|
176
|
+
// Extract the shared delayer from the first L1TxUtils instance (all instances share the same delayer)
|
|
177
|
+
const delayer = l1TxUtils[0]?.delayer;
|
|
178
|
+
|
|
205
179
|
return new ProverNode(
|
|
206
180
|
prover,
|
|
207
181
|
publisherFactory,
|
|
@@ -215,5 +189,7 @@ export async function createProverNode(
|
|
|
215
189
|
l1Metrics,
|
|
216
190
|
proverNodeConfig,
|
|
217
191
|
telemetry,
|
|
192
|
+
delayer,
|
|
193
|
+
dateProvider,
|
|
218
194
|
);
|
|
219
195
|
}
|