@aztec/prover-node 0.0.0-test.1 → 0.0.1-commit.1142ef1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (82) hide show
  1. package/dest/actions/download-epoch-proving-job.d.ts +18 -0
  2. package/dest/actions/download-epoch-proving-job.d.ts.map +1 -0
  3. package/dest/actions/download-epoch-proving-job.js +37 -0
  4. package/dest/actions/index.d.ts +3 -0
  5. package/dest/actions/index.d.ts.map +1 -0
  6. package/dest/actions/index.js +2 -0
  7. package/dest/actions/rerun-epoch-proving-job.d.ts +11 -0
  8. package/dest/actions/rerun-epoch-proving-job.d.ts.map +1 -0
  9. package/dest/actions/rerun-epoch-proving-job.js +40 -0
  10. package/dest/actions/upload-epoch-proof-failure.d.ts +15 -0
  11. package/dest/actions/upload-epoch-proof-failure.d.ts.map +1 -0
  12. package/dest/actions/upload-epoch-proof-failure.js +78 -0
  13. package/dest/bin/run-failed-epoch.d.ts +2 -0
  14. package/dest/bin/run-failed-epoch.d.ts.map +1 -0
  15. package/dest/bin/run-failed-epoch.js +67 -0
  16. package/dest/config.d.ts +15 -11
  17. package/dest/config.d.ts.map +1 -1
  18. package/dest/config.js +83 -15
  19. package/dest/factory.d.ts +14 -12
  20. package/dest/factory.d.ts.map +1 -1
  21. package/dest/factory.js +105 -32
  22. package/dest/index.d.ts +3 -2
  23. package/dest/index.d.ts.map +1 -1
  24. package/dest/index.js +2 -1
  25. package/dest/job/epoch-proving-job-data.d.ts +18 -0
  26. package/dest/job/epoch-proving-job-data.d.ts.map +1 -0
  27. package/dest/job/epoch-proving-job-data.js +59 -0
  28. package/dest/job/epoch-proving-job.d.ts +26 -18
  29. package/dest/job/epoch-proving-job.d.ts.map +1 -1
  30. package/dest/job/epoch-proving-job.js +579 -96
  31. package/dest/metrics.d.ts +30 -5
  32. package/dest/metrics.d.ts.map +1 -1
  33. package/dest/metrics.js +103 -73
  34. package/dest/monitors/epoch-monitor.d.ts +5 -2
  35. package/dest/monitors/epoch-monitor.d.ts.map +1 -1
  36. package/dest/monitors/epoch-monitor.js +18 -13
  37. package/dest/monitors/index.d.ts +1 -1
  38. package/dest/prover-node-publisher.d.ts +14 -15
  39. package/dest/prover-node-publisher.d.ts.map +1 -1
  40. package/dest/prover-node-publisher.js +86 -81
  41. package/dest/prover-node.d.ts +49 -44
  42. package/dest/prover-node.d.ts.map +1 -1
  43. package/dest/prover-node.js +581 -129
  44. package/dest/prover-publisher-factory.d.ts +23 -0
  45. package/dest/prover-publisher-factory.d.ts.map +1 -0
  46. package/dest/prover-publisher-factory.js +26 -0
  47. package/dest/test/index.d.ts +5 -3
  48. package/dest/test/index.d.ts.map +1 -1
  49. package/dest/test/index.js +1 -3
  50. package/package.json +39 -33
  51. package/src/actions/download-epoch-proving-job.ts +44 -0
  52. package/src/actions/index.ts +2 -0
  53. package/src/actions/rerun-epoch-proving-job.ts +61 -0
  54. package/src/actions/upload-epoch-proof-failure.ts +88 -0
  55. package/src/bin/run-failed-epoch.ts +77 -0
  56. package/src/config.ts +111 -25
  57. package/src/factory.ts +176 -44
  58. package/src/index.ts +2 -1
  59. package/src/job/epoch-proving-job-data.ts +82 -0
  60. package/src/job/epoch-proving-job.ts +255 -83
  61. package/src/metrics.ts +116 -73
  62. package/src/monitors/epoch-monitor.ts +20 -15
  63. package/src/prover-node-publisher.ts +133 -115
  64. package/src/prover-node.ts +223 -142
  65. package/src/prover-publisher-factory.ts +39 -0
  66. package/src/test/index.ts +7 -4
  67. package/dest/http.d.ts +0 -8
  68. package/dest/http.d.ts.map +0 -1
  69. package/dest/http.js +0 -9
  70. package/dest/prover-coordination/config.d.ts +0 -7
  71. package/dest/prover-coordination/config.d.ts.map +0 -1
  72. package/dest/prover-coordination/config.js +0 -11
  73. package/dest/prover-coordination/factory.d.ts +0 -22
  74. package/dest/prover-coordination/factory.d.ts.map +0 -1
  75. package/dest/prover-coordination/factory.js +0 -42
  76. package/dest/prover-coordination/index.d.ts +0 -3
  77. package/dest/prover-coordination/index.d.ts.map +0 -1
  78. package/dest/prover-coordination/index.js +0 -2
  79. package/src/http.ts +0 -13
  80. package/src/prover-coordination/config.ts +0 -17
  81. package/src/prover-coordination/factory.ts +0 -72
  82. package/src/prover-coordination/index.ts +0 -2
package/src/config.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  import { type ArchiverConfig, archiverConfigMappings } from '@aztec/archiver/config';
2
2
  import type { ACVMConfig, BBConfig } from '@aztec/bb-prover/config';
3
+ import { type GenesisStateConfig, genesisStateConfigMappings } from '@aztec/ethereum/config';
3
4
  import {
4
5
  type ConfigMappingsType,
5
6
  booleanConfigHelper,
@@ -7,14 +8,18 @@ import {
7
8
  numberConfigHelper,
8
9
  } from '@aztec/foundation/config';
9
10
  import { type DataStoreConfig, dataConfigMappings } from '@aztec/kv-store/config';
11
+ import { type KeyStoreConfig, keyStoreConfigMappings } from '@aztec/node-keystore/config';
12
+ import { ethPrivateKeySchema } from '@aztec/node-keystore/schemas';
13
+ import type { KeyStore } from '@aztec/node-keystore/types';
14
+ import { type SharedNodeConfig, sharedNodeConfigMappings } from '@aztec/node-lib/config';
10
15
  import { type P2PConfig, p2pConfigMappings } from '@aztec/p2p/config';
11
16
  import {
12
17
  type ProverAgentConfig,
13
18
  type ProverBrokerConfig,
14
19
  proverAgentConfigMappings,
15
20
  proverBrokerConfigMappings,
16
- } from '@aztec/prover-client/broker';
17
- import { type ProverClientConfig, bbConfigMappings, proverClientConfigMappings } from '@aztec/prover-client/config';
21
+ } from '@aztec/prover-client/broker/config';
22
+ import { type ProverClientUserConfig, bbConfigMappings, proverClientConfigMappings } from '@aztec/prover-client/config';
18
23
  import {
19
24
  type PublisherConfig,
20
25
  type TxSenderConfig,
@@ -23,28 +28,29 @@ import {
23
28
  } from '@aztec/sequencer-client/config';
24
29
  import { type WorldStateConfig, worldStateConfigMappings } from '@aztec/world-state/config';
25
30
 
26
- import { type ProverCoordinationConfig, proverCoordinationConfigMappings } from './prover-coordination/config.js';
27
-
28
31
  export type ProverNodeConfig = ArchiverConfig &
29
- ProverClientConfig &
32
+ ProverClientUserConfig &
30
33
  P2PConfig &
31
34
  WorldStateConfig &
32
35
  PublisherConfig &
33
36
  TxSenderConfig &
34
37
  DataStoreConfig &
35
- ProverCoordinationConfig &
36
- SpecificProverNodeConfig & {
37
- /** Whether to populate the genesis state with initial fee juice for the test accounts */
38
- testAccounts: boolean;
39
- };
38
+ KeyStoreConfig &
39
+ SharedNodeConfig &
40
+ SpecificProverNodeConfig &
41
+ GenesisStateConfig;
40
42
 
41
- type SpecificProverNodeConfig = {
43
+ export type SpecificProverNodeConfig = {
42
44
  proverNodeMaxPendingJobs: number;
43
45
  proverNodePollingIntervalMs: number;
44
46
  proverNodeMaxParallelBlocksPerEpoch: number;
47
+ proverNodeFailedEpochStore: string | undefined;
48
+ proverNodeEpochProvingDelayMs: number | undefined;
49
+ proverNodeDisableProofPublish?: boolean;
45
50
  txGatheringTimeoutMs: number;
46
51
  txGatheringIntervalMs: number;
47
- txGatheringMaxParallelRequests: number;
52
+ txGatheringBatchSize: number;
53
+ txGatheringMaxParallelRequestsPerNode: number;
48
54
  };
49
55
 
50
56
  const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeConfig> = {
@@ -63,38 +69,54 @@ const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeCon
63
69
  description: 'The Maximum number of blocks to process in parallel while proving an epoch',
64
70
  ...numberConfigHelper(32),
65
71
  },
66
- txGatheringTimeoutMs: {
67
- env: 'PROVER_NODE_TX_GATHERING_TIMEOUT_MS',
68
- description: 'The maximum amount of time to wait for tx data to be available',
69
- ...numberConfigHelper(60_000),
72
+ proverNodeFailedEpochStore: {
73
+ env: 'PROVER_NODE_FAILED_EPOCH_STORE',
74
+ description: 'File store where to upload node state when an epoch fails to be proven',
75
+ defaultValue: undefined,
76
+ },
77
+ proverNodeEpochProvingDelayMs: {
78
+ description: 'Optional delay in milliseconds to wait before proving a new epoch',
79
+ defaultValue: undefined,
70
80
  },
71
81
  txGatheringIntervalMs: {
72
82
  env: 'PROVER_NODE_TX_GATHERING_INTERVAL_MS',
73
83
  description: 'How often to check that tx data is available',
74
84
  ...numberConfigHelper(1_000),
75
85
  },
76
- txGatheringMaxParallelRequests: {
77
- env: 'PROVER_NODE_TX_GATHERING_MAX_PARALLEL_REQUESTS',
78
- description: 'How many txs to load up a time',
86
+ txGatheringBatchSize: {
87
+ env: 'PROVER_NODE_TX_GATHERING_BATCH_SIZE',
88
+ description: 'How many transactions to gather from a node in a single request',
89
+ ...numberConfigHelper(10),
90
+ },
91
+ txGatheringMaxParallelRequestsPerNode: {
92
+ env: 'PROVER_NODE_TX_GATHERING_MAX_PARALLEL_REQUESTS_PER_NODE',
93
+ description: 'How many tx requests to make in parallel to each node',
79
94
  ...numberConfigHelper(100),
80
95
  },
96
+ txGatheringTimeoutMs: {
97
+ env: 'PROVER_NODE_TX_GATHERING_TIMEOUT_MS',
98
+ description: 'How long to wait for tx data to be available before giving up',
99
+ ...numberConfigHelper(120_000),
100
+ },
101
+ proverNodeDisableProofPublish: {
102
+ env: 'PROVER_NODE_DISABLE_PROOF_PUBLISH',
103
+ description: 'Whether the prover node skips publishing proofs to L1',
104
+ ...booleanConfigHelper(false),
105
+ },
81
106
  };
82
107
 
83
108
  export const proverNodeConfigMappings: ConfigMappingsType<ProverNodeConfig> = {
84
109
  ...dataConfigMappings,
110
+ ...keyStoreConfigMappings,
85
111
  ...archiverConfigMappings,
86
112
  ...proverClientConfigMappings,
87
113
  ...p2pConfigMappings,
88
114
  ...worldStateConfigMappings,
89
115
  ...getPublisherConfigMappings('PROVER'),
90
116
  ...getTxSenderConfigMappings('PROVER'),
91
- ...proverCoordinationConfigMappings,
92
117
  ...specificProverNodeConfigMappings,
93
- testAccounts: {
94
- env: 'TEST_ACCOUNTS',
95
- description: 'Whether to populate the genesis state with initial fee juice for the test accounts.',
96
- ...booleanConfigHelper(false),
97
- },
118
+ ...genesisStateConfigMappings,
119
+ ...sharedNodeConfigMappings,
98
120
  };
99
121
 
100
122
  export function getProverNodeConfigFromEnv(): ProverNodeConfig {
@@ -113,3 +135,67 @@ export function getProverNodeAgentConfigFromEnv(): ProverAgentConfig & BBConfig
113
135
  ...getConfigFromMappings(bbConfigMappings),
114
136
  };
115
137
  }
138
+
139
+ function createKeyStoreFromWeb3Signer(config: ProverNodeConfig): KeyStore | undefined {
140
+ // If we don't have a valid prover Id then we can't build a valid key store with remote signers
141
+ if (config.proverId === undefined) {
142
+ return undefined;
143
+ }
144
+
145
+ // Also, we need at least one publisher address.
146
+ const publishers = config.publisherAddresses ?? [];
147
+
148
+ if (publishers.length === 0) {
149
+ return undefined;
150
+ }
151
+
152
+ const keyStore: KeyStore = {
153
+ schemaVersion: 1,
154
+ slasher: undefined,
155
+ prover: {
156
+ id: config.proverId,
157
+ publisher: publishers,
158
+ },
159
+ remoteSigner: config.web3SignerUrl,
160
+ validators: undefined,
161
+ };
162
+ return keyStore;
163
+ }
164
+
165
+ function createKeyStoreFromPublisherKeys(config: ProverNodeConfig): KeyStore | undefined {
166
+ // Extract the publisher keys from the provided config.
167
+ const publisherKeys = config.publisherPrivateKeys
168
+ ? config.publisherPrivateKeys.map((k: { getValue: () => string }) => ethPrivateKeySchema.parse(k.getValue()))
169
+ : [];
170
+
171
+ // There must be at least 1.
172
+ if (publisherKeys.length === 0) {
173
+ return undefined;
174
+ }
175
+
176
+ // If we have a valid proverId then create a prover key store of the form { id, publisher: [publisherKeys] }
177
+ // Otherwise create one of the form ("0x12345678....." as EthAccount).
178
+
179
+ const keyStore: KeyStore = {
180
+ schemaVersion: 1,
181
+ slasher: undefined,
182
+ prover:
183
+ config.proverId === undefined
184
+ ? publisherKeys[0]
185
+ : {
186
+ id: config.proverId,
187
+ publisher: publisherKeys,
188
+ },
189
+ remoteSigner: undefined,
190
+ validators: undefined,
191
+ };
192
+ return keyStore;
193
+ }
194
+
195
+ export function createKeyStoreForProver(config: ProverNodeConfig): KeyStore | undefined {
196
+ if (config.web3SignerUrl !== undefined && config.web3SignerUrl.length > 0) {
197
+ return createKeyStoreFromWeb3Signer(config);
198
+ }
199
+
200
+ return createKeyStoreFromPublisherKeys(config);
201
+ }
package/src/factory.ts CHANGED
@@ -1,43 +1,112 @@
1
1
  import { type Archiver, createArchiver } from '@aztec/archiver';
2
- import { type BlobSinkClientInterface, createBlobSinkClient } from '@aztec/blob-sink/client';
2
+ import { BBCircuitVerifier, QueuedIVCVerifier, TestCircuitVerifier } from '@aztec/bb-prover';
3
+ import { createBlobClientWithFileStores } from '@aztec/blob-client/client';
3
4
  import { EpochCache } from '@aztec/epoch-cache';
4
- import { L1TxUtils, RollupContract, createEthereumChain, createL1Clients } from '@aztec/ethereum';
5
+ import { createEthereumChain } from '@aztec/ethereum/chain';
6
+ import { RollupContract } from '@aztec/ethereum/contracts';
7
+ import { L1TxUtils } from '@aztec/ethereum/l1-tx-utils';
8
+ import { PublisherManager } from '@aztec/ethereum/publisher-manager';
9
+ import { pick } from '@aztec/foundation/collection';
5
10
  import { type Logger, createLogger } from '@aztec/foundation/log';
11
+ import { DateProvider } from '@aztec/foundation/timer';
6
12
  import type { DataStoreConfig } from '@aztec/kv-store/config';
7
- import { createProverClient } from '@aztec/prover-client';
13
+ import { type KeyStoreConfig, KeystoreManager, loadKeystores, mergeKeystores } from '@aztec/node-keystore';
14
+ import { trySnapshotSync } from '@aztec/node-lib/actions';
15
+ import {
16
+ createForwarderL1TxUtilsFromEthSigner,
17
+ createL1TxUtilsFromEthSignerWithStore,
18
+ } from '@aztec/node-lib/factories';
19
+ import { NodeRpcTxSource, createP2PClient } from '@aztec/p2p';
20
+ import { type ProverClientConfig, createProverClient } from '@aztec/prover-client';
8
21
  import { createAndStartProvingBroker } from '@aztec/prover-client/broker';
9
- import type { ProverCoordination, ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
22
+ import type { AztecNode, ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
23
+ import { P2PClientType } from '@aztec/stdlib/p2p';
10
24
  import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
11
- import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
25
+ import { getPackageVersion } from '@aztec/stdlib/update-checker';
26
+ import { L1Metrics, type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
12
27
  import { createWorldStateSynchronizer } from '@aztec/world-state';
13
28
 
14
- import type { ProverNodeConfig } from './config.js';
29
+ import { createPublicClient, fallback, http } from 'viem';
30
+
31
+ import { type ProverNodeConfig, createKeyStoreForProver } from './config.js';
15
32
  import { EpochMonitor } from './monitors/epoch-monitor.js';
16
- import { createProverCoordination } from './prover-coordination/factory.js';
17
- import { ProverNodePublisher } from './prover-node-publisher.js';
18
- import { ProverNode, type ProverNodeOptions } from './prover-node.js';
33
+ import { ProverNode } from './prover-node.js';
34
+ import { ProverPublisherFactory } from './prover-publisher-factory.js';
35
+
36
+ export type ProverNodeDeps = {
37
+ telemetry?: TelemetryClient;
38
+ log?: Logger;
39
+ aztecNodeTxProvider?: Pick<AztecNode, 'getTxsByHash'>;
40
+ archiver?: Archiver;
41
+ publisherFactory?: ProverPublisherFactory;
42
+ broker?: ProvingJobBroker;
43
+ l1TxUtils?: L1TxUtils;
44
+ dateProvider?: DateProvider;
45
+ };
19
46
 
20
47
  /** Creates a new prover node given a config. */
21
48
  export async function createProverNode(
22
- config: ProverNodeConfig & DataStoreConfig,
23
- deps: {
24
- telemetry?: TelemetryClient;
25
- log?: Logger;
26
- aztecNodeTxProvider?: ProverCoordination;
27
- archiver?: Archiver;
28
- publisher?: ProverNodePublisher;
29
- blobSinkClient?: BlobSinkClientInterface;
30
- broker?: ProvingJobBroker;
31
- l1TxUtils?: L1TxUtils;
32
- } = {},
49
+ userConfig: ProverNodeConfig & DataStoreConfig & KeyStoreConfig,
50
+ deps: ProverNodeDeps = {},
33
51
  options: {
34
52
  prefilledPublicData?: PublicDataTreeLeaf[];
35
53
  } = {},
36
54
  ) {
55
+ const config = { ...userConfig };
37
56
  const telemetry = deps.telemetry ?? getTelemetryClient();
38
- const blobSinkClient = deps.blobSinkClient ?? createBlobSinkClient(config);
57
+ const dateProvider = deps.dateProvider ?? new DateProvider();
58
+ const blobClient = await createBlobClientWithFileStores(config, createLogger('prover-node:blob-client:client'));
39
59
  const log = deps.log ?? createLogger('prover-node');
40
- const archiver = deps.archiver ?? (await createArchiver(config, blobSinkClient, { blockUntilSync: true }, telemetry));
60
+
61
+ // Build a key store from file if given or from environment otherwise
62
+ let keyStoreManager: KeystoreManager | undefined;
63
+ const keyStoreProvided = config.keyStoreDirectory !== undefined && config.keyStoreDirectory.length > 0;
64
+ if (keyStoreProvided) {
65
+ const keyStores = loadKeystores(config.keyStoreDirectory!);
66
+ keyStoreManager = new KeystoreManager(mergeKeystores(keyStores));
67
+ } else {
68
+ const keyStore = createKeyStoreForProver(config);
69
+ if (keyStore) {
70
+ keyStoreManager = new KeystoreManager(keyStore);
71
+ }
72
+ }
73
+
74
+ await keyStoreManager?.validateSigners();
75
+
76
+ // Extract the prover signers from the key store and verify that we have one.
77
+ const proverSigners = keyStoreManager?.createProverSigners();
78
+
79
+ if (proverSigners === undefined) {
80
+ throw new Error('Failed to create prover key store configuration');
81
+ } else if (proverSigners.signers.length === 0) {
82
+ throw new Error('No prover signers found in the key store');
83
+ } else if (!keyStoreProvided) {
84
+ log.warn(
85
+ 'KEY STORE CREATED FROM ENVIRONMENT, IT IS RECOMMENDED TO USE A FILE-BASED KEY STORE IN PRODUCTION ENVIRONMENTS',
86
+ );
87
+ }
88
+
89
+ log.info(`Creating prover with publishers ${proverSigners.signers.map(signer => signer.address.toString()).join()}`);
90
+
91
+ // Only consider user provided config if it is valid
92
+ const proverIdInUserConfig = config.proverId === undefined || config.proverId.isZero() ? undefined : config.proverId;
93
+
94
+ // ProverId: Take from key store if provided, otherwise from user config if valid, otherwise address of first signer
95
+ const proverId = proverSigners.id ?? proverIdInUserConfig ?? proverSigners.signers[0].address;
96
+
97
+ // Now create the prover client configuration from this.
98
+ const proverClientConfig: ProverClientConfig = {
99
+ ...config,
100
+ proverId,
101
+ };
102
+
103
+ await trySnapshotSync(config, log);
104
+
105
+ const epochCache = await EpochCache.create(config.l1Contracts.rollupAddress, config);
106
+
107
+ const archiver =
108
+ deps.archiver ??
109
+ (await createArchiver(config, { blobClient, epochCache, telemetry, dateProvider }, { blockUntilSync: true }));
41
110
  log.verbose(`Created archiver and synced to block ${await archiver.getBlockNumber()}`);
42
111
 
43
112
  const worldStateConfig = { ...config, worldStateProvenBlocksOnly: false };
@@ -50,49 +119,112 @@ export async function createProverNode(
50
119
  await worldStateSynchronizer.start();
51
120
 
52
121
  const broker = deps.broker ?? (await createAndStartProvingBroker(config, telemetry));
53
- const prover = await createProverClient(config, worldStateSynchronizer, broker, telemetry);
54
122
 
55
- const { l1RpcUrls: rpcUrls, l1ChainId: chainId, publisherPrivateKey } = config;
123
+ const prover = await createProverClient(proverClientConfig, worldStateSynchronizer, broker, telemetry);
124
+
125
+ const { l1RpcUrls: rpcUrls, l1ChainId: chainId } = config;
56
126
  const chain = createEthereumChain(rpcUrls, chainId);
57
- const { publicClient, walletClient } = createL1Clients(rpcUrls, publisherPrivateKey, chain.chainInfo);
127
+
128
+ const publicClient = createPublicClient({
129
+ chain: chain.chainInfo,
130
+ transport: fallback(config.l1RpcUrls.map((url: string) => http(url, { batch: false }))),
131
+ pollingInterval: config.viemPollingIntervalMS,
132
+ });
58
133
 
59
134
  const rollupContract = new RollupContract(publicClient, config.l1Contracts.rollupAddress.toString());
60
135
 
61
- const l1TxUtils = deps.l1TxUtils ?? new L1TxUtils(publicClient, walletClient, log, config);
62
- const publisher = deps.publisher ?? new ProverNodePublisher(config, { telemetry, rollupContract, l1TxUtils });
136
+ const l1TxUtils = deps.l1TxUtils
137
+ ? [deps.l1TxUtils]
138
+ : config.publisherForwarderAddress
139
+ ? await createForwarderL1TxUtilsFromEthSigner(
140
+ publicClient,
141
+ proverSigners.signers,
142
+ config.publisherForwarderAddress,
143
+ { ...config, scope: 'prover' },
144
+ { telemetry, logger: log.createChild('l1-tx-utils'), dateProvider },
145
+ )
146
+ : await createL1TxUtilsFromEthSignerWithStore(
147
+ publicClient,
148
+ proverSigners.signers,
149
+ { ...config, scope: 'prover' },
150
+ { telemetry, logger: log.createChild('l1-tx-utils'), dateProvider },
151
+ );
63
152
 
64
- const epochCache = await EpochCache.create(config.l1Contracts.rollupAddress, config);
153
+ const publisherFactory =
154
+ deps.publisherFactory ??
155
+ new ProverPublisherFactory(config, {
156
+ rollupContract,
157
+ publisherManager: new PublisherManager(l1TxUtils, config),
158
+ telemetry,
159
+ });
65
160
 
66
- // If config.p2pEnabled is true, createProverCoordination will create a p2p client where txs are requested
67
- // If config.p2pEnabled is false, createProverCoordination request information from the AztecNode
68
- const proverCoordination = await createProverCoordination(config, {
69
- aztecNodeTxProvider: deps.aztecNodeTxProvider,
70
- worldStateSynchronizer,
161
+ const proofVerifier = new QueuedIVCVerifier(
162
+ config,
163
+ config.realProofs || config.debugForceTxProofVerification
164
+ ? await BBCircuitVerifier.new(config)
165
+ : new TestCircuitVerifier(config.proverTestVerificationDelayMs),
166
+ );
167
+
168
+ const p2pClient = await createP2PClient(
169
+ P2PClientType.Prover,
170
+ config,
71
171
  archiver,
172
+ proofVerifier,
173
+ worldStateSynchronizer,
72
174
  epochCache,
175
+ getPackageVersion() ?? '',
176
+ dateProvider,
73
177
  telemetry,
74
- });
178
+ {
179
+ txCollectionNodeSources: deps.aztecNodeTxProvider
180
+ ? [new NodeRpcTxSource(deps.aztecNodeTxProvider, 'TestNode')]
181
+ : [],
182
+ },
183
+ );
75
184
 
76
- const proverNodeConfig: ProverNodeOptions = {
77
- maxPendingJobs: config.proverNodeMaxPendingJobs,
78
- pollingIntervalMs: config.proverNodePollingIntervalMs,
79
- maxParallelBlocksPerEpoch: config.proverNodeMaxParallelBlocksPerEpoch,
80
- txGatheringMaxParallelRequests: config.txGatheringMaxParallelRequests,
81
- txGatheringIntervalMs: config.txGatheringIntervalMs,
82
- txGatheringTimeoutMs: config.txGatheringTimeoutMs,
185
+ await p2pClient.start();
186
+
187
+ const proverNodeConfig = {
188
+ ...pick(
189
+ config,
190
+ 'proverNodeMaxPendingJobs',
191
+ 'proverNodeMaxParallelBlocksPerEpoch',
192
+ 'proverNodePollingIntervalMs',
193
+ 'proverNodeEpochProvingDelayMs',
194
+ 'txGatheringMaxParallelRequests',
195
+ 'txGatheringIntervalMs',
196
+ 'txGatheringTimeoutMs',
197
+ 'proverNodeFailedEpochStore',
198
+ 'proverNodeDisableProofPublish',
199
+ 'dataDirectory',
200
+ 'l1ChainId',
201
+ 'rollupVersion',
202
+ ),
83
203
  };
84
204
 
85
- const epochMonitor = await EpochMonitor.create(archiver, proverNodeConfig, telemetry);
205
+ const epochMonitor = await EpochMonitor.create(
206
+ archiver,
207
+ { pollingIntervalMs: config.proverNodePollingIntervalMs, provingDelayMs: config.proverNodeEpochProvingDelayMs },
208
+ telemetry,
209
+ );
210
+
211
+ const l1Metrics = new L1Metrics(
212
+ telemetry.getMeter('ProverNodeL1Metrics'),
213
+ publicClient,
214
+ l1TxUtils.map(utils => utils.getSenderAddress()),
215
+ );
86
216
 
87
217
  return new ProverNode(
88
218
  prover,
89
- publisher,
219
+ publisherFactory,
90
220
  archiver,
91
221
  archiver,
92
222
  archiver,
93
223
  worldStateSynchronizer,
94
- proverCoordination,
224
+ p2pClient,
95
225
  epochMonitor,
226
+ rollupContract,
227
+ l1Metrics,
96
228
  proverNodeConfig,
97
229
  telemetry,
98
230
  );
package/src/index.ts CHANGED
@@ -1,5 +1,6 @@
1
+ export * from './actions/index.js';
1
2
  export * from './config.js';
2
3
  export * from './factory.js';
3
- export * from './http.js';
4
+ export * from './monitors/index.js';
4
5
  export * from './prover-node-publisher.js';
5
6
  export * from './prover-node.js';
@@ -0,0 +1,82 @@
1
+ import { CheckpointNumber, EpochNumber } from '@aztec/foundation/branded-types';
2
+ import { Fr } from '@aztec/foundation/curves/bn254';
3
+ import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
4
+ import { CommitteeAttestation } from '@aztec/stdlib/block';
5
+ import { Checkpoint } from '@aztec/stdlib/checkpoint';
6
+ import { BlockHeader, Tx } from '@aztec/stdlib/tx';
7
+
8
+ /** All data from an epoch used in proving. */
9
+ export type EpochProvingJobData = {
10
+ epochNumber: EpochNumber;
11
+ checkpoints: Checkpoint[];
12
+ txs: Map<string, Tx>;
13
+ l1ToL2Messages: Record<CheckpointNumber, Fr[]>;
14
+ previousBlockHeader: BlockHeader;
15
+ attestations: CommitteeAttestation[];
16
+ };
17
+
18
+ export function validateEpochProvingJobData(data: EpochProvingJobData) {
19
+ if (data.checkpoints.length === 0) {
20
+ throw new Error('No checkpoints to prove');
21
+ }
22
+
23
+ const firstBlockNumber = data.checkpoints[0].blocks[0].number;
24
+ const previousBlockNumber = data.previousBlockHeader.getBlockNumber();
25
+ if (previousBlockNumber + 1 !== firstBlockNumber) {
26
+ throw new Error(
27
+ `Initial block number ${firstBlockNumber} does not match previous block header ${previousBlockNumber}`,
28
+ );
29
+ }
30
+
31
+ for (const checkpoint of data.checkpoints) {
32
+ if (!(checkpoint.number in data.l1ToL2Messages)) {
33
+ throw new Error(`Missing L1 to L2 messages for checkpoint number ${checkpoint.number}`);
34
+ }
35
+ }
36
+ }
37
+
38
+ export function serializeEpochProvingJobData(data: EpochProvingJobData): Buffer {
39
+ const checkpoints = data.checkpoints.map(checkpoint => checkpoint.toBuffer());
40
+ const txs = Array.from(data.txs.values()).map(tx => tx.toBuffer());
41
+ const l1ToL2Messages = Object.entries(data.l1ToL2Messages).map(([checkpointNumber, messages]) => [
42
+ Number(checkpointNumber),
43
+ messages.length,
44
+ ...messages,
45
+ ]);
46
+ const attestations = data.attestations.map(attestation => attestation.toBuffer());
47
+
48
+ return serializeToBuffer(
49
+ data.epochNumber,
50
+ data.previousBlockHeader,
51
+ checkpoints.length,
52
+ ...checkpoints,
53
+ txs.length,
54
+ ...txs,
55
+ l1ToL2Messages.length,
56
+ ...l1ToL2Messages,
57
+ attestations.length,
58
+ ...attestations,
59
+ );
60
+ }
61
+
62
+ export function deserializeEpochProvingJobData(buf: Buffer): EpochProvingJobData {
63
+ const reader = BufferReader.asReader(buf);
64
+ const epochNumber = EpochNumber(reader.readNumber());
65
+ const previousBlockHeader = reader.readObject(BlockHeader);
66
+ const checkpoints = reader.readVector(Checkpoint);
67
+ const txArray = reader.readVector(Tx);
68
+
69
+ const l1ToL2MessageCheckpointCount = reader.readNumber();
70
+ const l1ToL2Messages: Record<number, Fr[]> = {};
71
+ for (let i = 0; i < l1ToL2MessageCheckpointCount; i++) {
72
+ const checkpointNumber = CheckpointNumber(reader.readNumber());
73
+ const messages = reader.readVector(Fr);
74
+ l1ToL2Messages[checkpointNumber] = messages;
75
+ }
76
+
77
+ const attestations = reader.readVector(CommitteeAttestation);
78
+
79
+ const txs = new Map<string, Tx>(txArray.map(tx => [tx.getTxHash().toString(), tx]));
80
+
81
+ return { epochNumber, previousBlockHeader, checkpoints, txs, l1ToL2Messages, attestations };
82
+ }