@aztec/prover-node 0.0.0-test.1 → 0.0.1-commit.001888fc

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 +12 -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 +70 -0
  16. package/dest/config.d.ts +17 -16
  17. package/dest/config.d.ts.map +1 -1
  18. package/dest/config.js +93 -28
  19. package/dest/factory.d.ts +26 -18
  20. package/dest/factory.d.ts.map +1 -1
  21. package/dest/factory.js +72 -42
  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 +27 -18
  29. package/dest/job/epoch-proving-job.d.ts.map +1 -1
  30. package/dest/job/epoch-proving-job.js +604 -97
  31. package/dest/metrics.d.ts +40 -5
  32. package/dest/metrics.d.ts.map +1 -1
  33. package/dest/metrics.js +136 -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 -15
  37. package/dest/monitors/index.d.ts +1 -1
  38. package/dest/prover-node-publisher.d.ts +19 -19
  39. package/dest/prover-node-publisher.d.ts.map +1 -1
  40. package/dest/prover-node-publisher.js +90 -84
  41. package/dest/prover-node.d.ts +61 -46
  42. package/dest/prover-node.d.ts.map +1 -1
  43. package/dest/prover-node.js +592 -135
  44. package/dest/prover-publisher-factory.d.ts +25 -0
  45. package/dest/prover-publisher-factory.d.ts.map +1 -0
  46. package/dest/prover-publisher-factory.js +28 -0
  47. package/dest/test/index.d.ts +5 -3
  48. package/dest/test/index.d.ts.map +1 -1
  49. package/dest/test/index.js +1 -3
  50. package/package.json +40 -33
  51. package/src/actions/download-epoch-proving-job.ts +44 -0
  52. package/src/actions/index.ts +2 -0
  53. package/src/actions/rerun-epoch-proving-job.ts +63 -0
  54. package/src/actions/upload-epoch-proof-failure.ts +88 -0
  55. package/src/bin/run-failed-epoch.ts +80 -0
  56. package/src/config.ts +123 -45
  57. package/src/factory.ts +146 -66
  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 +295 -85
  61. package/src/metrics.ts +153 -72
  62. package/src/monitors/epoch-monitor.ts +21 -17
  63. package/src/prover-node-publisher.ts +139 -119
  64. package/src/prover-node.ts +238 -149
  65. package/src/prover-publisher-factory.ts +45 -0
  66. package/src/test/index.ts +7 -4
  67. package/dest/http.d.ts +0 -8
  68. package/dest/http.d.ts.map +0 -1
  69. package/dest/http.js +0 -9
  70. package/dest/prover-coordination/config.d.ts +0 -7
  71. package/dest/prover-coordination/config.d.ts.map +0 -1
  72. package/dest/prover-coordination/config.js +0 -11
  73. package/dest/prover-coordination/factory.d.ts +0 -22
  74. package/dest/prover-coordination/factory.d.ts.map +0 -1
  75. package/dest/prover-coordination/factory.js +0 -42
  76. package/dest/prover-coordination/index.d.ts +0 -3
  77. package/dest/prover-coordination/index.d.ts.map +0 -1
  78. package/dest/prover-coordination/index.js +0 -2
  79. package/src/http.ts +0 -13
  80. package/src/prover-coordination/config.ts +0 -17
  81. package/src/prover-coordination/factory.ts +0 -72
  82. package/src/prover-coordination/index.ts +0 -2
@@ -0,0 +1,18 @@
1
+ import type { Logger } from '@aztec/foundation/log';
2
+ /**
3
+ * Given a location returned by `uploadEpochProofFailure`, downloads the world state and archiver snapshots
4
+ * and the proving job data, so we can re-run the job later using `rerunEpochProvingJob`. This is decoupled
5
+ * from actually proving so we can download once and run multiple times.
6
+ */
7
+ export declare function downloadEpochProvingJob(location: string, log: Logger, config: {
8
+ dataDirectory: string;
9
+ jobDataDownloadPath: string;
10
+ }): Promise<{
11
+ l2BlockNumber: number;
12
+ l2BlockHash: string;
13
+ l1BlockNumber: number;
14
+ l1ChainId: number;
15
+ rollupVersion: number;
16
+ rollupAddress: import("@aztec/foundation/eth-address").EthAddress;
17
+ }>;
18
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG93bmxvYWQtZXBvY2gtcHJvdmluZy1qb2IuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY3Rpb25zL2Rvd25sb2FkLWVwb2NoLXByb3Zpbmctam9iLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBVXBEOzs7O0dBSUc7QUFDSCx3QkFBc0IsdUJBQXVCLENBQzNDLFFBQVEsRUFBRSxNQUFNLEVBQ2hCLEdBQUcsRUFBRSxNQUFNLEVBQ1gsTUFBTSxFQUFFO0lBQ04sYUFBYSxFQUFFLE1BQU0sQ0FBQztJQUN0QixtQkFBbUIsRUFBRSxNQUFNLENBQUM7Q0FDN0I7Ozs7Ozs7R0FxQkYifQ==
@@ -0,0 +1 @@
1
+ {"version":3,"file":"download-epoch-proving-job.d.ts","sourceRoot":"","sources":["../../src/actions/download-epoch-proving-job.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAUpD;;;;GAIG;AACH,wBAAsB,uBAAuB,CAC3C,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE;IACN,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,MAAM,CAAC;CAC7B;;;;;;;GAqBF"}
@@ -0,0 +1,37 @@
1
+ import { jsonParseWithSchema } from '@aztec/foundation/json-rpc';
2
+ import { urlJoin } from '@aztec/foundation/string';
3
+ import { snapshotSync } from '@aztec/node-lib/actions';
4
+ import { createReadOnlyFileStore } from '@aztec/stdlib/file-store';
5
+ import { UploadSnapshotMetadataSchema, makeSnapshotPaths } from '@aztec/stdlib/snapshots';
6
+ import { readFileSync } from 'fs';
7
+ import { deserializeEpochProvingJobData } from '../job/epoch-proving-job-data.js';
8
+ /**
9
+ * Given a location returned by `uploadEpochProofFailure`, downloads the world state and archiver snapshots
10
+ * and the proving job data, so we can re-run the job later using `rerunEpochProvingJob`. This is decoupled
11
+ * from actually proving so we can download once and run multiple times.
12
+ */ export async function downloadEpochProvingJob(location, log, config) {
13
+ log.info(`Downloading epoch proving job data from ${location}`);
14
+ const fileStore = await createReadOnlyFileStore(location);
15
+ const metadataUrl = urlJoin(location, 'metadata.json');
16
+ const metadataRaw = await fileStore.read(metadataUrl);
17
+ const metadata = jsonParseWithSchema(metadataRaw.toString(), UploadSnapshotMetadataSchema);
18
+ const dataUrls = makeSnapshotPaths(location);
19
+ log.info(`Downloading state snapshot from ${location} to local data directory`, {
20
+ metadata,
21
+ dataUrls
22
+ });
23
+ await snapshotSync({
24
+ dataUrls
25
+ }, log, {
26
+ ...config,
27
+ ...metadata,
28
+ snapshotsUrl: location
29
+ });
30
+ const dataPath = urlJoin(location, 'data.bin');
31
+ const localPath = config.jobDataDownloadPath;
32
+ log.info(`Downloading epoch proving job data from ${dataPath} to ${localPath}`);
33
+ await fileStore.download(dataPath, localPath);
34
+ const jobData = deserializeEpochProvingJobData(readFileSync(localPath));
35
+ log.info(`Epoch proving job data for epoch ${jobData.epochNumber} downloaded successfully`);
36
+ return metadata;
37
+ }
@@ -0,0 +1,3 @@
1
+ export * from './download-epoch-proving-job.js';
2
+ export * from './rerun-epoch-proving-job.js';
3
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY3Rpb25zL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsaUNBQWlDLENBQUM7QUFDaEQsY0FBYyw4QkFBOEIsQ0FBQyJ9
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/actions/index.ts"],"names":[],"mappings":"AAAA,cAAc,iCAAiC,CAAC;AAChD,cAAc,8BAA8B,CAAC"}
@@ -0,0 +1,2 @@
1
+ export * from './download-epoch-proving-job.js';
2
+ export * from './rerun-epoch-proving-job.js';
@@ -0,0 +1,12 @@
1
+ import type { L1ContractsConfig } from '@aztec/ethereum/config';
2
+ import type { Logger } from '@aztec/foundation/log';
3
+ import { type ProverClientConfig } from '@aztec/prover-client';
4
+ import { ProverBrokerConfig } from '@aztec/prover-client/broker';
5
+ import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
6
+ /**
7
+ * Given a local folder where `downloadEpochProvingJob` was called, creates a new archiver and world state
8
+ * using the state snapshots, and creates a new epoch proving job to prove the downloaded proving job.
9
+ * Proving is done with a local proving broker and agents as specified by the config.
10
+ */
11
+ export declare function rerunEpochProvingJob(localPath: string, log: Logger, config: DataStoreConfig & ProverBrokerConfig & ProverClientConfig & Pick<L1ContractsConfig, 'aztecEpochDuration'>): Promise<"awaiting-prover" | "completed" | "failed" | "initialized" | "processing" | "publishing-proof" | "reorg" | "stopped" | "timed-out">;
12
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVydW4tZXBvY2gtcHJvdmluZy1qb2IuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY3Rpb25zL3JlcnVuLWVwb2NoLXByb3Zpbmctam9iLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxFQUFFLEtBQUssa0JBQWtCLEVBQXNCLE1BQU0sc0JBQXNCLENBQUM7QUFDbkYsT0FBTyxFQUFFLGtCQUFrQixFQUErQixNQUFNLDZCQUE2QixDQUFDO0FBRTlGLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBVTlEOzs7O0dBSUc7QUFDSCx3QkFBc0Isb0JBQW9CLENBQ3hDLFNBQVMsRUFBRSxNQUFNLEVBQ2pCLEdBQUcsRUFBRSxNQUFNLEVBQ1gsTUFBTSxFQUFFLGVBQWUsR0FBRyxrQkFBa0IsR0FBRyxrQkFBa0IsR0FBRyxJQUFJLENBQUMsaUJBQWlCLEVBQUUsb0JBQW9CLENBQUMsK0lBc0NsSCJ9
@@ -0,0 +1 @@
1
+ {"version":3,"file":"rerun-epoch-proving-job.d.ts","sourceRoot":"","sources":["../../src/actions/rerun-epoch-proving-job.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,KAAK,kBAAkB,EAAsB,MAAM,sBAAsB,CAAC;AACnF,OAAO,EAAE,kBAAkB,EAA+B,MAAM,6BAA6B,CAAC;AAE9F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAU9D;;;;GAIG;AACH,wBAAsB,oBAAoB,CACxC,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,eAAe,GAAG,kBAAkB,GAAG,kBAAkB,GAAG,IAAI,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,+IAsClH"}
@@ -0,0 +1,40 @@
1
+ import { createArchiverStore } from '@aztec/archiver';
2
+ import { createProverClient } from '@aztec/prover-client';
3
+ import { createAndStartProvingBroker } from '@aztec/prover-client/broker';
4
+ import { PublicProcessorFactory } from '@aztec/simulator/server';
5
+ import { getTelemetryClient } from '@aztec/telemetry-client';
6
+ import { createWorldState } from '@aztec/world-state';
7
+ import { readFileSync } from 'fs';
8
+ import { deserializeEpochProvingJobData } from '../job/epoch-proving-job-data.js';
9
+ import { EpochProvingJob } from '../job/epoch-proving-job.js';
10
+ import { ProverNodeJobMetrics } from '../metrics.js';
11
+ /**
12
+ * Given a local folder where `downloadEpochProvingJob` was called, creates a new archiver and world state
13
+ * using the state snapshots, and creates a new epoch proving job to prove the downloaded proving job.
14
+ * Proving is done with a local proving broker and agents as specified by the config.
15
+ */ export async function rerunEpochProvingJob(localPath, log, config) {
16
+ const jobData = deserializeEpochProvingJobData(readFileSync(localPath));
17
+ log.info(`Loaded proving job data for epoch ${jobData.epochNumber}`);
18
+ const telemetry = getTelemetryClient();
19
+ const metrics = new ProverNodeJobMetrics(telemetry.getMeter('prover-job'), telemetry.getTracer('prover-job'));
20
+ const worldState = await createWorldState(config);
21
+ const archiver = await createArchiverStore(config);
22
+ const publicProcessorFactory = new PublicProcessorFactory(archiver, undefined, undefined, log.getBindings());
23
+ const publisher = {
24
+ submitEpochProof: ()=>Promise.resolve(true)
25
+ };
26
+ const l2BlockSourceForReorgDetection = undefined;
27
+ const deadline = undefined;
28
+ // This starts a local proving broker that does not get exposed as a service. This should be good enough for
29
+ // smallish epochs to be proven if we run on a large machine, but as epochs grow larger, we may want to switch
30
+ // this out for a live proving broker with multiple agents that we can connect to.
31
+ const broker = await createAndStartProvingBroker(config, telemetry);
32
+ const prover = await createProverClient(config, worldState, broker, telemetry);
33
+ const provingJob = new EpochProvingJob(jobData, worldState, prover.createEpochProver(), publicProcessorFactory, publisher, l2BlockSourceForReorgDetection, metrics, deadline, {
34
+ skipEpochCheck: true
35
+ }, log.getBindings());
36
+ log.info(`Rerunning epoch proving job for epoch ${jobData.epochNumber}`);
37
+ await provingJob.run();
38
+ log.info(`Completed job for epoch ${jobData.epochNumber} with status ${provingJob.getState()}`);
39
+ return provingJob.getState();
40
+ }
@@ -0,0 +1,15 @@
1
+ import { type Archiver } from '@aztec/archiver';
2
+ import type { Logger } from '@aztec/foundation/log';
3
+ import type { ChainConfig } from '@aztec/stdlib/config';
4
+ import type { WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
5
+ import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
6
+ import { type EpochProvingJobData } from '../job/epoch-proving-job-data.js';
7
+ type UploadEpochProofConfig = Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'> & Pick<DataStoreConfig, 'dataDirectory'>;
8
+ /**
9
+ * Uploads a snapshot of world state and archiver (requires pausing them) along with the proving job data,
10
+ * so we can download and re-run the job later under the same conditions.
11
+ * @param location The location to upload the data to (used to create the `FileStore`).
12
+ */
13
+ export declare function uploadEpochProofFailure(location: string, jobId: string, jobData: EpochProvingJobData, archiver: Archiver, worldState: WorldStateSynchronizer, config: UploadEpochProofConfig, log: Logger): Promise<string>;
14
+ export {};
15
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBsb2FkLWVwb2NoLXByb29mLWZhaWx1cmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY3Rpb25zL3VwbG9hZC1lcG9jaC1wcm9vZi1mYWlsdXJlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBdUIsS0FBSyxRQUFRLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUdyRSxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUdwRCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUV4RCxPQUFPLEtBQUssRUFBRSxzQkFBc0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzlFLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBUTlELE9BQU8sRUFBRSxLQUFLLG1CQUFtQixFQUFnQyxNQUFNLGtDQUFrQyxDQUFDO0FBRTFHLEtBQUssc0JBQXNCLEdBQUcsSUFBSSxDQUFDLFdBQVcsRUFBRSxXQUFXLEdBQUcsZUFBZSxDQUFDLEdBQUcsSUFBSSxDQUFDLGVBQWUsRUFBRSxlQUFlLENBQUMsQ0FBQztBQUt4SDs7OztHQUlHO0FBQ0gsd0JBQXNCLHVCQUF1QixDQUMzQyxRQUFRLEVBQUUsTUFBTSxFQUNoQixLQUFLLEVBQUUsTUFBTSxFQUNiLE9BQU8sRUFBRSxtQkFBbUIsRUFDNUIsUUFBUSxFQUFFLFFBQVEsRUFDbEIsVUFBVSxFQUFFLHNCQUFzQixFQUNsQyxNQUFNLEVBQUUsc0JBQXNCLEVBQzlCLEdBQUcsRUFBRSxNQUFNLG1CQXVDWiJ9
@@ -0,0 +1 @@
1
+ {"version":3,"file":"upload-epoch-proof-failure.d.ts","sourceRoot":"","sources":["../../src/actions/upload-epoch-proof-failure.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAGrE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAC9E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAQ9D,OAAO,EAAE,KAAK,mBAAmB,EAAgC,MAAM,kCAAkC,CAAC;AAE1G,KAAK,sBAAsB,GAAG,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,eAAe,CAAC,GAAG,IAAI,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;AAKxH;;;;GAIG;AACH,wBAAsB,uBAAuB,CAC3C,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,mBAAmB,EAC5B,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,sBAAsB,EAClC,MAAM,EAAE,sBAAsB,EAC9B,GAAG,EAAE,MAAM,mBAuCZ"}
@@ -0,0 +1,78 @@
1
+ import { ARCHIVER_DB_VERSION } from '@aztec/archiver';
2
+ import { tryRmDir } from '@aztec/foundation/fs';
3
+ import { jsonStringify } from '@aztec/foundation/json-rpc';
4
+ import { isoDate } from '@aztec/foundation/string';
5
+ import { buildSnapshotMetadata, createBackups } from '@aztec/node-lib/actions';
6
+ import { createFileStore } from '@aztec/stdlib/file-store';
7
+ import { getBasePath, uploadSnapshotData } from '@aztec/stdlib/snapshots';
8
+ import { WORLD_STATE_DB_VERSION } from '@aztec/world-state';
9
+ import { mkdtemp } from 'fs/promises';
10
+ import { tmpdir } from 'os';
11
+ import { dirname, join } from 'path';
12
+ import { serializeEpochProvingJobData } from '../job/epoch-proving-job-data.js';
13
+ /** Whether uploaded data to the file store should be of public access. */ const PUBLIC_UPLOADS = true;
14
+ /**
15
+ * Uploads a snapshot of world state and archiver (requires pausing them) along with the proving job data,
16
+ * so we can download and re-run the job later under the same conditions.
17
+ * @param location The location to upload the data to (used to create the `FileStore`).
18
+ */ export async function uploadEpochProofFailure(location, jobId, jobData, archiver, worldState, config, log) {
19
+ const epochNumber = jobData.epochNumber;
20
+ log.warn(`Uploading epoch proof failure for ${epochNumber} to ${location}`, {
21
+ epochNumber,
22
+ jobId,
23
+ location
24
+ });
25
+ const backupDir = await mkdtemp(join(config.dataDirectory ?? tmpdir(), 'epoch-proof-data-'));
26
+ const store = await createFileStore(location);
27
+ if (!store) {
28
+ throw new Error(`Failed to create file store for epoch proof failure upload for location ${location}.`);
29
+ }
30
+ try {
31
+ const versions = {
32
+ archiver: ARCHIVER_DB_VERSION,
33
+ worldState: WORLD_STATE_DB_VERSION
34
+ };
35
+ const uploadMetadata = await buildSnapshotMetadata(archiver, config);
36
+ const paths = await createBackups(backupDir, archiver, worldState, log);
37
+ const basePath = `${getBasePath(uploadMetadata)}/${epochNumber}-${isoDate()}-${jobId}`;
38
+ const pathFor = (key)=>`${basePath}/${key}.db`;
39
+ const [metadata, dataUrl, metadataUrl] = await Promise.all([
40
+ uploadSnapshotData(paths, versions, uploadMetadata, store, {
41
+ pathFor,
42
+ private: !PUBLIC_UPLOADS
43
+ }),
44
+ uploadJobData(jobData, store, basePath),
45
+ uploadSnapshotMetadata(uploadMetadata, store, basePath)
46
+ ]);
47
+ const baseUrl = dirname(metadataUrl);
48
+ log.warn(`Uploaded epoch ${epochNumber} proof failure data to ${baseUrl}`, {
49
+ epochNumber,
50
+ location,
51
+ basePath,
52
+ metadataUrl,
53
+ dataUrl,
54
+ metadata,
55
+ jobId
56
+ });
57
+ return baseUrl;
58
+ } finally{
59
+ log.info(`Cleaning up backup dir ${backupDir}`);
60
+ await tryRmDir(backupDir, log);
61
+ }
62
+ }
63
+ async function uploadJobData(jobData, store, basePath) {
64
+ const data = serializeEpochProvingJobData(jobData);
65
+ const path = `${basePath}/data.bin`;
66
+ return await store.save(path, data, {
67
+ compress: true,
68
+ public: PUBLIC_UPLOADS
69
+ });
70
+ }
71
+ async function uploadSnapshotMetadata(metadata, store, basePath) {
72
+ const data = Buffer.from(jsonStringify(metadata), 'utf-8');
73
+ const path = `${basePath}/metadata.json`;
74
+ return await store.save(path, data, {
75
+ compress: false,
76
+ public: PUBLIC_UPLOADS
77
+ });
78
+ }
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnVuLWZhaWxlZC1lcG9jaC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jpbi9ydW4tZmFpbGVkLWVwb2NoLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIifQ==
@@ -0,0 +1 @@
1
+ {"version":3,"file":"run-failed-epoch.d.ts","sourceRoot":"","sources":["../../src/bin/run-failed-epoch.ts"],"names":[],"mappings":""}
@@ -0,0 +1,70 @@
1
+ /* eslint-disable no-console */ import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
2
+ import { EthAddress } from '@aztec/foundation/eth-address';
3
+ import { jsonParseWithSchema, jsonStringify } from '@aztec/foundation/json-rpc';
4
+ import { createLogger } from '@aztec/foundation/log';
5
+ import { downloadEpochProvingJob, getProverNodeConfigFromEnv, rerunEpochProvingJob } from '@aztec/prover-node';
6
+ import { UploadSnapshotMetadataSchema } from '@aztec/stdlib/snapshots';
7
+ import { existsSync, mkdirSync } from 'fs';
8
+ import { readFile, writeFile } from 'fs/promises';
9
+ import { basename, join } from 'path';
10
+ const logger = createLogger('prover-node:run-failed-epoch');
11
+ function printUsage() {
12
+ console.error('Usage: run-failed-epoch <proof-uri> [out-dir=./data]');
13
+ }
14
+ async function rerunFailedEpoch(provingJobUrl, baseLocalDir) {
15
+ const localDir = join(baseLocalDir, basename(provingJobUrl));
16
+ const jobPath = join(localDir, 'data.bin');
17
+ const dataDir = join(localDir, 'state');
18
+ const env = getProverNodeConfigFromEnv();
19
+ const l1Config = getL1ContractsConfigEnvVars();
20
+ const config = {
21
+ ...env,
22
+ ...l1Config,
23
+ dataDirectory: dataDir,
24
+ dataStoreMapSizeKb: env.dataStoreMapSizeKb ?? 1024 * 1024,
25
+ proverId: env.proverId ?? EthAddress.random()
26
+ };
27
+ let metadata;
28
+ const metadataPath = join(localDir, 'metadata.json');
29
+ if (existsSync(metadataPath)) {
30
+ logger.info(`Using downloaded data`);
31
+ metadata = jsonParseWithSchema(await readFile(metadataPath, 'utf-8'), UploadSnapshotMetadataSchema);
32
+ } else {
33
+ logger.info(`Downloading epoch proving job data and state from ${provingJobUrl} to ${localDir}`);
34
+ metadata = await downloadEpochProvingJob(provingJobUrl, logger, {
35
+ jobDataDownloadPath: jobPath,
36
+ dataDirectory: dataDir
37
+ });
38
+ await writeFile(metadataPath, jsonStringify(metadata, true));
39
+ logger.info(`Download to ${localDir} complete`);
40
+ }
41
+ logger.info(`Rerunning proving job from ${jobPath} with state from ${dataDir}`, metadata);
42
+ const result = await rerunEpochProvingJob(jobPath, logger, {
43
+ ...config,
44
+ l1Contracts: {
45
+ rollupAddress: metadata.rollupAddress
46
+ },
47
+ rollupVersion: metadata.rollupVersion
48
+ });
49
+ console.error(`Epoch proving job complete with result ${result}`);
50
+ }
51
+ async function main() {
52
+ if (process.argv[2] === '--help') {
53
+ printUsage();
54
+ return;
55
+ }
56
+ const uri = process.argv[2];
57
+ const outDir = process.argv[3] || './data';
58
+ if (!uri) {
59
+ printUsage();
60
+ throw new Error('Missing URL to epoch proving job');
61
+ }
62
+ mkdirSync(outDir, {
63
+ recursive: true
64
+ });
65
+ await rerunFailedEpoch(uri, outDir);
66
+ }
67
+ main().catch((err)=>{
68
+ console.error(err);
69
+ process.exit(1);
70
+ });
package/dest/config.d.ts CHANGED
@@ -1,28 +1,29 @@
1
- import { type ArchiverConfig } from '@aztec/archiver/config';
2
1
  import type { ACVMConfig, BBConfig } from '@aztec/bb-prover/config';
3
2
  import { type ConfigMappingsType } from '@aztec/foundation/config';
4
- import { type DataStoreConfig } from '@aztec/kv-store/config';
5
- import { type P2PConfig } from '@aztec/p2p/config';
6
- import { type ProverAgentConfig, type ProverBrokerConfig } from '@aztec/prover-client/broker';
7
- import { type ProverClientConfig } from '@aztec/prover-client/config';
8
- import { type PublisherConfig, type TxSenderConfig } from '@aztec/sequencer-client/config';
9
- import { type WorldStateConfig } from '@aztec/world-state/config';
10
- import { type ProverCoordinationConfig } from './prover-coordination/config.js';
11
- export type ProverNodeConfig = ArchiverConfig & ProverClientConfig & P2PConfig & WorldStateConfig & PublisherConfig & TxSenderConfig & DataStoreConfig & ProverCoordinationConfig & SpecificProverNodeConfig & {
12
- /** Whether to populate the genesis state with initial fee juice for the test accounts */
13
- testAccounts: boolean;
14
- };
15
- type SpecificProverNodeConfig = {
3
+ import { type KeyStoreConfig } from '@aztec/node-keystore/config';
4
+ import type { KeyStore } from '@aztec/node-keystore/types';
5
+ import { type SharedNodeConfig } from '@aztec/node-lib/config';
6
+ import { type ProverAgentConfig, type ProverBrokerConfig } from '@aztec/prover-client/broker/config';
7
+ import { type ProverClientUserConfig } from '@aztec/prover-client/config';
8
+ import { type ProverPublisherConfig, type ProverTxSenderConfig } from '@aztec/sequencer-client/config';
9
+ import { type DataStoreConfig } from '@aztec/stdlib/kv-store';
10
+ export type ProverNodeConfig = ProverClientUserConfig & ProverPublisherConfig & ProverTxSenderConfig & DataStoreConfig & KeyStoreConfig & SpecificProverNodeConfig & Pick<SharedNodeConfig, 'web3SignerUrl'>;
11
+ export type SpecificProverNodeConfig = {
16
12
  proverNodeMaxPendingJobs: number;
17
13
  proverNodePollingIntervalMs: number;
18
14
  proverNodeMaxParallelBlocksPerEpoch: number;
15
+ proverNodeFailedEpochStore: string | undefined;
16
+ proverNodeEpochProvingDelayMs: number | undefined;
17
+ proverNodeDisableProofPublish?: boolean;
19
18
  txGatheringTimeoutMs: number;
20
19
  txGatheringIntervalMs: number;
21
- txGatheringMaxParallelRequests: number;
20
+ txGatheringBatchSize: number;
21
+ txGatheringMaxParallelRequestsPerNode: number;
22
22
  };
23
+ export declare const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeConfig>;
23
24
  export declare const proverNodeConfigMappings: ConfigMappingsType<ProverNodeConfig>;
24
25
  export declare function getProverNodeConfigFromEnv(): ProverNodeConfig;
25
26
  export declare function getProverNodeBrokerConfigFromEnv(): ProverBrokerConfig;
26
27
  export declare function getProverNodeAgentConfigFromEnv(): ProverAgentConfig & BBConfig & ACVMConfig;
27
- export {};
28
- //# sourceMappingURL=config.d.ts.map
28
+ export declare function createKeyStoreForProver(config: ProverNodeConfig): KeyStore | undefined;
29
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNwRSxPQUFPLEVBQ0wsS0FBSyxrQkFBa0IsRUFLeEIsTUFBTSwwQkFBMEIsQ0FBQztBQUNsQyxPQUFPLEVBQUUsS0FBSyxjQUFjLEVBQTBCLE1BQU0sNkJBQTZCLENBQUM7QUFFMUYsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDM0QsT0FBTyxFQUFFLEtBQUssZ0JBQWdCLEVBQTRCLE1BQU0sd0JBQXdCLENBQUM7QUFDekYsT0FBTyxFQUNMLEtBQUssaUJBQWlCLEVBQ3RCLEtBQUssa0JBQWtCLEVBR3hCLE1BQU0sb0NBQW9DLENBQUM7QUFDNUMsT0FBTyxFQUFFLEtBQUssc0JBQXNCLEVBQWdELE1BQU0sNkJBQTZCLENBQUM7QUFDeEgsT0FBTyxFQUNMLEtBQUsscUJBQXFCLEVBQzFCLEtBQUssb0JBQW9CLEVBRzFCLE1BQU0sZ0NBQWdDLENBQUM7QUFDeEMsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFzQixNQUFNLHdCQUF3QixDQUFDO0FBRWxGLE1BQU0sTUFBTSxnQkFBZ0IsR0FBRyxzQkFBc0IsR0FDbkQscUJBQXFCLEdBQ3JCLG9CQUFvQixHQUNwQixlQUFlLEdBQ2YsY0FBYyxHQUNkLHdCQUF3QixHQUN4QixJQUFJLENBQUMsZ0JBQWdCLEVBQUUsZUFBZSxDQUFDLENBQUM7QUFFMUMsTUFBTSxNQUFNLHdCQUF3QixHQUFHO0lBQ3JDLHdCQUF3QixFQUFFLE1BQU0sQ0FBQztJQUNqQywyQkFBMkIsRUFBRSxNQUFNLENBQUM7SUFDcEMsbUNBQW1DLEVBQUUsTUFBTSxDQUFDO0lBQzVDLDBCQUEwQixFQUFFLE1BQU0sR0FBRyxTQUFTLENBQUM7SUFDL0MsNkJBQTZCLEVBQUUsTUFBTSxHQUFHLFNBQVMsQ0FBQztJQUNsRCw2QkFBNkIsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUN4QyxvQkFBb0IsRUFBRSxNQUFNLENBQUM7SUFDN0IscUJBQXFCLEVBQUUsTUFBTSxDQUFDO0lBQzlCLG9CQUFvQixFQUFFLE1BQU0sQ0FBQztJQUM3QixxQ0FBcUMsRUFBRSxNQUFNLENBQUM7Q0FDL0MsQ0FBQztBQUVGLGVBQU8sTUFBTSxnQ0FBZ0MsRUFBRSxrQkFBa0IsQ0FBQyx3QkFBd0IsQ0FrRHpGLENBQUM7QUFFRixlQUFPLE1BQU0sd0JBQXdCLEVBQUUsa0JBQWtCLENBQUMsZ0JBQWdCLENBUXpFLENBQUM7QUFFRix3QkFBZ0IsMEJBQTBCLElBQUksZ0JBQWdCLENBRTdEO0FBRUQsd0JBQWdCLGdDQUFnQyxJQUFJLGtCQUFrQixDQUlyRTtBQUVELHdCQUFnQiwrQkFBK0IsSUFBSSxpQkFBaUIsR0FBRyxRQUFRLEdBQUcsVUFBVSxDQUszRjtBQTBERCx3QkFBZ0IsdUJBQXVCLENBQUMsTUFBTSxFQUFFLGdCQUFnQixHQUFHLFFBQVEsR0FBRyxTQUFTLENBU3RGIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,wBAAwB,CAAC;AACrF,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AAClF,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,mBAAmB,CAAC;AACtE,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EAGxB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,KAAK,kBAAkB,EAAgD,MAAM,6BAA6B,CAAC;AACpH,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,cAAc,EAGpB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,KAAK,gBAAgB,EAA4B,MAAM,2BAA2B,CAAC;AAE5F,OAAO,EAAE,KAAK,wBAAwB,EAAoC,MAAM,iCAAiC,CAAC;AAElH,MAAM,MAAM,gBAAgB,GAAG,cAAc,GAC3C,kBAAkB,GAClB,SAAS,GACT,gBAAgB,GAChB,eAAe,GACf,cAAc,GACd,eAAe,GACf,wBAAwB,GACxB,wBAAwB,GAAG;IACzB,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEJ,KAAK,wBAAwB,GAAG;IAC9B,wBAAwB,EAAE,MAAM,CAAC;IACjC,2BAA2B,EAAE,MAAM,CAAC;IACpC,mCAAmC,EAAE,MAAM,CAAC;IAC5C,oBAAoB,EAAE,MAAM,CAAC;IAC7B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,8BAA8B,EAAE,MAAM,CAAC;CACxC,CAAC;AAmCF,eAAO,MAAM,wBAAwB,EAAE,kBAAkB,CAAC,gBAAgB,CAezE,CAAC;AAEF,wBAAgB,0BAA0B,IAAI,gBAAgB,CAE7D;AAED,wBAAgB,gCAAgC,IAAI,kBAAkB,CAIrE;AAED,wBAAgB,+BAA+B,IAAI,iBAAiB,GAAG,QAAQ,GAAG,UAAU,CAK3F"}
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EACL,KAAK,kBAAkB,EAKxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,6BAA6B,CAAC;AAE1F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,KAAK,gBAAgB,EAA4B,MAAM,wBAAwB,CAAC;AACzF,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EAGxB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,KAAK,sBAAsB,EAAgD,MAAM,6BAA6B,CAAC;AACxH,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,EAG1B,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AAElF,MAAM,MAAM,gBAAgB,GAAG,sBAAsB,GACnD,qBAAqB,GACrB,oBAAoB,GACpB,eAAe,GACf,cAAc,GACd,wBAAwB,GACxB,IAAI,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAC;AAE1C,MAAM,MAAM,wBAAwB,GAAG;IACrC,wBAAwB,EAAE,MAAM,CAAC;IACjC,2BAA2B,EAAE,MAAM,CAAC;IACpC,mCAAmC,EAAE,MAAM,CAAC;IAC5C,0BAA0B,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/C,6BAA6B,EAAE,MAAM,GAAG,SAAS,CAAC;IAClD,6BAA6B,CAAC,EAAE,OAAO,CAAC;IACxC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,qCAAqC,EAAE,MAAM,CAAC;CAC/C,CAAC;AAEF,eAAO,MAAM,gCAAgC,EAAE,kBAAkB,CAAC,wBAAwB,CAkDzF,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,kBAAkB,CAAC,gBAAgB,CAQzE,CAAC;AAEF,wBAAgB,0BAA0B,IAAI,gBAAgB,CAE7D;AAED,wBAAgB,gCAAgC,IAAI,kBAAkB,CAIrE;AAED,wBAAgB,+BAA+B,IAAI,iBAAiB,GAAG,QAAQ,GAAG,UAAU,CAK3F;AA0DD,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,gBAAgB,GAAG,QAAQ,GAAG,SAAS,CAStF"}
package/dest/config.js CHANGED
@@ -1,13 +1,12 @@
1
- import { archiverConfigMappings } from '@aztec/archiver/config';
2
- import { booleanConfigHelper, getConfigFromMappings, numberConfigHelper } from '@aztec/foundation/config';
3
- import { dataConfigMappings } from '@aztec/kv-store/config';
4
- import { p2pConfigMappings } from '@aztec/p2p/config';
5
- import { proverAgentConfigMappings, proverBrokerConfigMappings } from '@aztec/prover-client/broker';
1
+ import { booleanConfigHelper, getConfigFromMappings, numberConfigHelper, pickConfigMappings } from '@aztec/foundation/config';
2
+ import { keyStoreConfigMappings } from '@aztec/node-keystore/config';
3
+ import { ethPrivateKeySchema } from '@aztec/node-keystore/schemas';
4
+ import { sharedNodeConfigMappings } from '@aztec/node-lib/config';
5
+ import { proverAgentConfigMappings, proverBrokerConfigMappings } from '@aztec/prover-client/broker/config';
6
6
  import { bbConfigMappings, proverClientConfigMappings } from '@aztec/prover-client/config';
7
- import { getPublisherConfigMappings, getTxSenderConfigMappings } from '@aztec/sequencer-client/config';
8
- import { worldStateConfigMappings } from '@aztec/world-state/config';
9
- import { proverCoordinationConfigMappings } from './prover-coordination/config.js';
10
- const specificProverNodeConfigMappings = {
7
+ import { proverPublisherConfigMappings, proverTxSenderConfigMappings } from '@aztec/sequencer-client/config';
8
+ import { dataConfigMappings } from '@aztec/stdlib/kv-store';
9
+ export const specificProverNodeConfigMappings = {
11
10
  proverNodeMaxPendingJobs: {
12
11
  env: 'PROVER_NODE_MAX_PENDING_JOBS',
13
12
  description: 'The maximum number of pending jobs for the prover node',
@@ -21,39 +20,53 @@ const specificProverNodeConfigMappings = {
21
20
  proverNodeMaxParallelBlocksPerEpoch: {
22
21
  env: 'PROVER_NODE_MAX_PARALLEL_BLOCKS_PER_EPOCH',
23
22
  description: 'The Maximum number of blocks to process in parallel while proving an epoch',
24
- ...numberConfigHelper(32)
23
+ ...numberConfigHelper(0)
25
24
  },
26
- txGatheringTimeoutMs: {
27
- env: 'PROVER_NODE_TX_GATHERING_TIMEOUT_MS',
28
- description: 'The maximum amount of time to wait for tx data to be available',
29
- ...numberConfigHelper(60_000)
25
+ proverNodeFailedEpochStore: {
26
+ env: 'PROVER_NODE_FAILED_EPOCH_STORE',
27
+ description: 'File store where to upload node state when an epoch fails to be proven',
28
+ defaultValue: undefined
29
+ },
30
+ proverNodeEpochProvingDelayMs: {
31
+ description: 'Optional delay in milliseconds to wait before proving a new epoch',
32
+ defaultValue: undefined
30
33
  },
31
34
  txGatheringIntervalMs: {
32
35
  env: 'PROVER_NODE_TX_GATHERING_INTERVAL_MS',
33
36
  description: 'How often to check that tx data is available',
34
37
  ...numberConfigHelper(1_000)
35
38
  },
36
- txGatheringMaxParallelRequests: {
37
- env: 'PROVER_NODE_TX_GATHERING_MAX_PARALLEL_REQUESTS',
38
- description: 'How many txs to load up a time',
39
+ txGatheringBatchSize: {
40
+ env: 'PROVER_NODE_TX_GATHERING_BATCH_SIZE',
41
+ description: 'How many transactions to gather from a node in a single request',
42
+ ...numberConfigHelper(10)
43
+ },
44
+ txGatheringMaxParallelRequestsPerNode: {
45
+ env: 'PROVER_NODE_TX_GATHERING_MAX_PARALLEL_REQUESTS_PER_NODE',
46
+ description: 'How many tx requests to make in parallel to each node',
39
47
  ...numberConfigHelper(100)
48
+ },
49
+ txGatheringTimeoutMs: {
50
+ env: 'PROVER_NODE_TX_GATHERING_TIMEOUT_MS',
51
+ description: 'How long to wait for tx data to be available before giving up',
52
+ ...numberConfigHelper(120_000)
53
+ },
54
+ proverNodeDisableProofPublish: {
55
+ env: 'PROVER_NODE_DISABLE_PROOF_PUBLISH',
56
+ description: 'Whether the prover node skips publishing proofs to L1',
57
+ ...booleanConfigHelper(false)
40
58
  }
41
59
  };
42
60
  export const proverNodeConfigMappings = {
43
61
  ...dataConfigMappings,
44
- ...archiverConfigMappings,
62
+ ...keyStoreConfigMappings,
45
63
  ...proverClientConfigMappings,
46
- ...p2pConfigMappings,
47
- ...worldStateConfigMappings,
48
- ...getPublisherConfigMappings('PROVER'),
49
- ...getTxSenderConfigMappings('PROVER'),
50
- ...proverCoordinationConfigMappings,
64
+ ...proverPublisherConfigMappings,
65
+ ...proverTxSenderConfigMappings,
51
66
  ...specificProverNodeConfigMappings,
52
- testAccounts: {
53
- env: 'TEST_ACCOUNTS',
54
- description: 'Whether to populate the genesis state with initial fee juice for the test accounts.',
55
- ...booleanConfigHelper(false)
56
- }
67
+ ...pickConfigMappings(sharedNodeConfigMappings, [
68
+ 'web3SignerUrl'
69
+ ])
57
70
  };
58
71
  export function getProverNodeConfigFromEnv() {
59
72
  return getConfigFromMappings(proverNodeConfigMappings);
@@ -69,3 +82,55 @@ export function getProverNodeAgentConfigFromEnv() {
69
82
  ...getConfigFromMappings(bbConfigMappings)
70
83
  };
71
84
  }
85
+ function createKeyStoreFromWeb3Signer(config) {
86
+ // If we don't have a valid prover Id then we can't build a valid key store with remote signers
87
+ if (config.proverId === undefined) {
88
+ return undefined;
89
+ }
90
+ // Also, we need at least one publisher address.
91
+ const publishers = config.proverPublisherAddresses ?? [];
92
+ if (publishers.length === 0) {
93
+ return undefined;
94
+ }
95
+ const keyStore = {
96
+ schemaVersion: 1,
97
+ slasher: undefined,
98
+ prover: {
99
+ id: config.proverId,
100
+ publisher: publishers
101
+ },
102
+ remoteSigner: config.web3SignerUrl,
103
+ validators: undefined
104
+ };
105
+ return keyStore;
106
+ }
107
+ function createKeyStoreFromPublisherKeys(config) {
108
+ // Extract the publisher keys from the provided config.
109
+ const publisherKeys = config.proverPublisherPrivateKeys ? config.proverPublisherPrivateKeys.map((k)=>ethPrivateKeySchema.parse(k.getValue())) : [];
110
+ // There must be at least 1.
111
+ if (publisherKeys.length === 0) {
112
+ return undefined;
113
+ }
114
+ // If we have a valid proverId then create a prover key store of the form { id, publisher: [publisherKeys] }
115
+ // Otherwise create one of the form ("0x12345678....." as EthAccount).
116
+ const keyStore = {
117
+ schemaVersion: 1,
118
+ slasher: undefined,
119
+ prover: config.proverId === undefined ? publisherKeys[0] : {
120
+ id: config.proverId,
121
+ publisher: publisherKeys
122
+ },
123
+ remoteSigner: undefined,
124
+ validators: undefined
125
+ };
126
+ return keyStore;
127
+ }
128
+ export function createKeyStoreForProver(config) {
129
+ if (config.web3SignerUrl !== undefined && config.web3SignerUrl.length > 0) {
130
+ const keyStore = createKeyStoreFromWeb3Signer(config);
131
+ if (keyStore) {
132
+ return keyStore;
133
+ }
134
+ }
135
+ return createKeyStoreFromPublisherKeys(config);
136
+ }
package/dest/factory.d.ts CHANGED
@@ -1,25 +1,33 @@
1
- import { type Archiver } from '@aztec/archiver';
2
- import { type BlobSinkClientInterface } from '@aztec/blob-sink/client';
3
- import { L1TxUtils } from '@aztec/ethereum';
1
+ import type { Archiver } from '@aztec/archiver';
2
+ import type { BlobClientInterface } from '@aztec/blob-client/client';
3
+ import type { EpochCacheInterface } from '@aztec/epoch-cache';
4
+ import { L1TxUtils } from '@aztec/ethereum/l1-tx-utils';
4
5
  import { type Logger } from '@aztec/foundation/log';
5
- import type { DataStoreConfig } from '@aztec/kv-store/config';
6
- import type { ProverCoordination, ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
7
- import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
6
+ import { DateProvider } from '@aztec/foundation/timer';
7
+ import { KeystoreManager } from '@aztec/node-keystore';
8
+ import { type ProverClientUserConfig } from '@aztec/prover-client';
9
+ import { type ProverPublisherConfig, type ProverTxSenderConfig } from '@aztec/sequencer-client';
10
+ import type { ITxProvider, ProverConfig, ProvingJobBroker, Service, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
8
11
  import { type TelemetryClient } from '@aztec/telemetry-client';
9
- import type { ProverNodeConfig } from './config.js';
10
- import { ProverNodePublisher } from './prover-node-publisher.js';
12
+ import type { SpecificProverNodeConfig } from './config.js';
11
13
  import { ProverNode } from './prover-node.js';
12
- /** Creates a new prover node given a config. */
13
- export declare function createProverNode(config: ProverNodeConfig & DataStoreConfig, deps?: {
14
+ import { ProverPublisherFactory } from './prover-publisher-factory.js';
15
+ export type ProverNodeDeps = {
14
16
  telemetry?: TelemetryClient;
15
17
  log?: Logger;
16
- aztecNodeTxProvider?: ProverCoordination;
17
- archiver?: Archiver;
18
- publisher?: ProverNodePublisher;
19
- blobSinkClient?: BlobSinkClientInterface;
18
+ archiver: Archiver;
19
+ publisherFactory?: ProverPublisherFactory;
20
20
  broker?: ProvingJobBroker;
21
21
  l1TxUtils?: L1TxUtils;
22
- }, options?: {
23
- prefilledPublicData?: PublicDataTreeLeaf[];
24
- }): Promise<ProverNode>;
25
- //# sourceMappingURL=factory.d.ts.map
22
+ dateProvider?: DateProvider;
23
+ worldStateSynchronizer: WorldStateSynchronizer;
24
+ p2pClient: {
25
+ getTxProvider(): ITxProvider;
26
+ } & Partial<Service>;
27
+ epochCache: EpochCacheInterface;
28
+ blobClient: BlobClientInterface;
29
+ keyStoreManager?: KeystoreManager;
30
+ };
31
+ /** Creates a new prover node subsystem given a config and dependencies */
32
+ export declare function createProverNode(userConfig: SpecificProverNodeConfig & ProverConfig & ProverClientUserConfig & ProverPublisherConfig & ProverTxSenderConfig, deps: ProverNodeDeps): Promise<ProverNode>;
33
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDaEQsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUVyRSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBSTlELE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUd4RCxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFDbEUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3ZELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUV2RCxPQUFPLEVBQTJCLEtBQUssc0JBQXNCLEVBQXNCLE1BQU0sc0JBQXNCLENBQUM7QUFFaEgsT0FBTyxFQUNMLEtBQUsscUJBQXFCLEVBQzFCLEtBQUssb0JBQW9CLEVBRTFCLE1BQU0seUJBQXlCLENBQUM7QUFDakMsT0FBTyxLQUFLLEVBQ1YsV0FBVyxFQUNYLFlBQVksRUFDWixnQkFBZ0IsRUFDaEIsT0FBTyxFQUNQLHNCQUFzQixFQUN2QixNQUFNLGlDQUFpQyxDQUFDO0FBQ3pDLE9BQU8sRUFBYSxLQUFLLGVBQWUsRUFBc0IsTUFBTSx5QkFBeUIsQ0FBQztBQUk5RixPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUU1RCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDOUMsT0FBTyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFdkUsTUFBTSxNQUFNLGNBQWMsR0FBRztJQUMzQixTQUFTLENBQUMsRUFBRSxlQUFlLENBQUM7SUFDNUIsR0FBRyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2IsUUFBUSxFQUFFLFFBQVEsQ0FBQztJQUNuQixnQkFBZ0IsQ0FBQyxFQUFFLHNCQUFzQixDQUFDO0lBQzFDLE1BQU0sQ0FBQyxFQUFFLGdCQUFnQixDQUFDO0lBQzFCLFNBQVMsQ0FBQyxFQUFFLFNBQVMsQ0FBQztJQUN0QixZQUFZLENBQUMsRUFBRSxZQUFZLENBQUM7SUFDNUIsc0JBQXNCLEVBQUUsc0JBQXNCLENBQUM7SUFDL0MsU0FBUyxFQUFFO1FBQUUsYUFBYSxJQUFJLFdBQVcsQ0FBQTtLQUFFLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQy9ELFVBQVUsRUFBRSxtQkFBbUIsQ0FBQztJQUNoQyxVQUFVLEVBQUUsbUJBQW1CLENBQUM7SUFDaEMsZUFBZSxDQUFDLEVBQUUsZUFBZSxDQUFDO0NBQ25DLENBQUM7QUFFRiwwRUFBMEU7QUFDMUUsd0JBQXNCLGdCQUFnQixDQUNwQyxVQUFVLEVBQUUsd0JBQXdCLEdBQ2xDLFlBQVksR0FDWixzQkFBc0IsR0FDdEIscUJBQXFCLEdBQ3JCLG9CQUFvQixFQUN0QixJQUFJLEVBQUUsY0FBYyx1QkF1SHJCIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAkB,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,KAAK,uBAAuB,EAAwB,MAAM,yBAAyB,CAAC;AAE7F,OAAO,EAAE,SAAS,EAAwD,MAAM,iBAAiB,CAAC;AAClG,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG9D,OAAO,KAAK,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAC5F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAGnF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAGpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,UAAU,EAA0B,MAAM,kBAAkB,CAAC;AAEtE,gDAAgD;AAChD,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,gBAAgB,GAAG,eAAe,EAC1C,IAAI,GAAE;IACJ,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,mBAAmB,CAAC,EAAE,kBAAkB,CAAC;IACzC,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,SAAS,CAAC,EAAE,mBAAmB,CAAC;IAChC,cAAc,CAAC,EAAE,uBAAuB,CAAC;IACzC,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,SAAS,CAAC,EAAE,SAAS,CAAC;CAClB,EACN,OAAO,GAAE;IACP,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAC;CACvC,uBAgEP"}
1
+ {"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAErE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAI9D,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAGxD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAA2B,KAAK,sBAAsB,EAAsB,MAAM,sBAAsB,CAAC;AAEhH,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,EAE1B,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EACV,WAAW,EACX,YAAY,EACZ,gBAAgB,EAChB,OAAO,EACP,sBAAsB,EACvB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAa,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAI9F,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAE5D,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAEvE,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,QAAQ,CAAC;IACnB,gBAAgB,CAAC,EAAE,sBAAsB,CAAC;IAC1C,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,sBAAsB,EAAE,sBAAsB,CAAC;IAC/C,SAAS,EAAE;QAAE,aAAa,IAAI,WAAW,CAAA;KAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/D,UAAU,EAAE,mBAAmB,CAAC;IAChC,UAAU,EAAE,mBAAmB,CAAC;IAChC,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC,CAAC;AAEF,0EAA0E;AAC1E,wBAAsB,gBAAgB,CACpC,UAAU,EAAE,wBAAwB,GAClC,YAAY,GACZ,sBAAsB,GACtB,qBAAqB,GACrB,oBAAoB,EACtB,IAAI,EAAE,cAAc,uBAuHrB"}