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

package/dest/actions/download-epoch-proving-job.d.ts

@@ -0,0 +1,18 @@
+import type { Logger } from '@aztec/foundation/log';
+/**
+ * Given a location returned by `uploadEpochProofFailure`, downloads the world state and archiver snapshots
+ * and the proving job data, so we can re-run the job later using `rerunEpochProvingJob`. This is decoupled
+ * from actually proving so we can download once and run multiple times.
+ */
+export declare function downloadEpochProvingJob(location: string, log: Logger, config: {
+    dataDirectory: string;
+    jobDataDownloadPath: string;
+}): Promise<{
+    rollupVersion: number;
+    l2BlockNumber: number;
+    l2BlockHash: string;
+    rollupAddress: import("@aztec/foundation/schemas").EthAddress;
+    l1ChainId: number;
+    l1BlockNumber: number;
+}>;
+//# sourceMappingURL=download-epoch-proving-job.d.ts.map

package/dest/actions/download-epoch-proving-job.d.ts.map

@@ -0,0 +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"}

package/dest/actions/download-epoch-proving-job.js

@@ -0,0 +1,37 @@
+import { jsonParseWithSchema } from '@aztec/foundation/json-rpc';
+import { urlJoin } from '@aztec/foundation/string';
+import { snapshotSync } from '@aztec/node-lib/actions';
+import { createReadOnlyFileStore } from '@aztec/stdlib/file-store';
+import { UploadSnapshotMetadataSchema, makeSnapshotPaths } from '@aztec/stdlib/snapshots';
+import { readFileSync } from 'fs';
+import { deserializeEpochProvingJobData } from '../job/epoch-proving-job-data.js';
+/**
+ * Given a location returned by `uploadEpochProofFailure`, downloads the world state and archiver snapshots
+ * and the proving job data, so we can re-run the job later using `rerunEpochProvingJob`. This is decoupled
+ * from actually proving so we can download once and run multiple times.
+ */ export async function downloadEpochProvingJob(location, log, config) {
+    log.info(`Downloading epoch proving job data from ${location}`);
+    const fileStore = await createReadOnlyFileStore(location);
+    const metadataUrl = urlJoin(location, 'metadata.json');
+    const metadataRaw = await fileStore.read(metadataUrl);
+    const metadata = jsonParseWithSchema(metadataRaw.toString(), UploadSnapshotMetadataSchema);
+    const dataUrls = makeSnapshotPaths(location);
+    log.info(`Downloading state snapshot from ${location} to local data directory`, {
+        metadata,
+        dataUrls
+    });
+    await snapshotSync({
+        dataUrls
+    }, log, {
+        ...config,
+        ...metadata,
+        snapshotsUrl: location
+    });
+    const dataPath = urlJoin(location, 'data.bin');
+    const localPath = config.jobDataDownloadPath;
+    log.info(`Downloading epoch proving job data from ${dataPath} to ${localPath}`);
+    await fileStore.download(dataPath, localPath);
+    const jobData = deserializeEpochProvingJobData(readFileSync(localPath));
+    log.info(`Epoch proving job data for epoch ${jobData.epochNumber} downloaded successfully`);
+    return metadata;
+}

package/dest/actions/index.d.ts

@@ -0,0 +1,3 @@
+export * from './download-epoch-proving-job.js';
+export * from './rerun-epoch-proving-job.js';
+//# sourceMappingURL=index.d.ts.map

package/dest/actions/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/actions/index.ts"],"names":[],"mappings":"AAAA,cAAc,iCAAiC,CAAC;AAChD,cAAc,8BAA8B,CAAC"}

package/dest/actions/index.js

@@ -0,0 +1,2 @@
+export * from './download-epoch-proving-job.js';
+export * from './rerun-epoch-proving-job.js';

package/dest/actions/rerun-epoch-proving-job.d.ts

@@ -0,0 +1,11 @@
+import type { Logger } from '@aztec/foundation/log';
+import type { DataStoreConfig } from '@aztec/kv-store/config';
+import { type ProverClientConfig } from '@aztec/prover-client';
+import { ProverBrokerConfig } from '@aztec/prover-client/broker';
+/**
+ * Given a local folder where `downloadEpochProvingJob` was called, creates a new archiver and world state
+ * using the state snapshots, and creates a new epoch proving job to prove the downloaded proving job.
+ * Proving is done with a local proving broker and agents as specified by the config.
+ */
+export declare function rerunEpochProvingJob(localPath: string, log: Logger, config: DataStoreConfig & ProverBrokerConfig & ProverClientConfig): Promise<"initialized" | "processing" | "awaiting-prover" | "publishing-proof" | "completed" | "failed" | "stopped" | "timed-out" | "reorg">;
+//# sourceMappingURL=rerun-epoch-proving-job.d.ts.map

package/dest/actions/rerun-epoch-proving-job.d.ts.map

@@ -0,0 +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,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,KAAK,kBAAkB,EAAsB,MAAM,sBAAsB,CAAC;AACnF,OAAO,EAAE,kBAAkB,EAA+B,MAAM,6BAA6B,CAAC;AAW9F;;;;GAIG;AACH,wBAAsB,oBAAoB,CACxC,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,eAAe,GAAG,kBAAkB,GAAG,kBAAkB,+IAqClE"}

package/dest/actions/rerun-epoch-proving-job.js

@@ -0,0 +1,40 @@
+import { createArchiverStore } from '@aztec/archiver';
+import { createProverClient } from '@aztec/prover-client';
+import { createAndStartProvingBroker } from '@aztec/prover-client/broker';
+import { PublicProcessorFactory } from '@aztec/simulator/server';
+import { getTelemetryClient } from '@aztec/telemetry-client';
+import { createWorldState } from '@aztec/world-state';
+import { readFileSync } from 'fs';
+import { deserializeEpochProvingJobData } from '../job/epoch-proving-job-data.js';
+import { EpochProvingJob } from '../job/epoch-proving-job.js';
+import { ProverNodeJobMetrics } from '../metrics.js';
+/**
+ * Given a local folder where `downloadEpochProvingJob` was called, creates a new archiver and world state
+ * using the state snapshots, and creates a new epoch proving job to prove the downloaded proving job.
+ * Proving is done with a local proving broker and agents as specified by the config.
+ */ export async function rerunEpochProvingJob(localPath, log, config) {
+    const jobData = deserializeEpochProvingJobData(readFileSync(localPath));
+    log.info(`Loaded proving job data for epoch ${jobData.epochNumber}`);
+    const telemetry = getTelemetryClient();
+    const metrics = new ProverNodeJobMetrics(telemetry.getMeter('prover-job'), telemetry.getTracer('prover-job'));
+    const worldState = await createWorldState(config);
+    const archiver = await createArchiverStore(config);
+    const publicProcessorFactory = new PublicProcessorFactory(archiver);
+    const publisher = {
+        submitEpochProof: ()=>Promise.resolve(true)
+    };
+    const l2BlockSourceForReorgDetection = undefined;
+    const deadline = undefined;
+    // This starts a local proving broker that does not get exposed as a service. This should be good enough for
+    // smallish epochs to be proven if we run on a large machine, but as epochs grow larger, we may want to switch
+    // this out for a live proving broker with multiple agents that we can connect to.
+    const broker = await createAndStartProvingBroker(config, telemetry);
+    const prover = await createProverClient(config, worldState, broker, telemetry);
+    const provingJob = new EpochProvingJob(jobData, worldState, prover.createEpochProver(), publicProcessorFactory, publisher, l2BlockSourceForReorgDetection, metrics, deadline, {
+        skipEpochCheck: true
+    });
+    log.info(`Rerunning epoch proving job for epoch ${jobData.epochNumber}`);
+    await provingJob.run();
+    log.info(`Completed job for epoch ${jobData.epochNumber} with status ${provingJob.getState()}`);
+    return provingJob.getState();
+}

package/dest/actions/upload-epoch-proof-failure.d.ts

@@ -0,0 +1,15 @@
+import { type Archiver } from '@aztec/archiver';
+import type { Logger } from '@aztec/foundation/log';
+import type { DataStoreConfig } from '@aztec/kv-store/config';
+import type { ChainConfig } from '@aztec/stdlib/config';
+import type { WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
+import { type EpochProvingJobData } from '../job/epoch-proving-job-data.js';
+type UploadEpochProofConfig = Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'> & Pick<DataStoreConfig, 'dataDirectory'>;
+/**
+ * Uploads a snapshot of world state and archiver (requires pausing them) along with the proving job data,
+ * so we can download and re-run the job later under the same conditions.
+ * @param location The location to upload the data to (used to create the `FileStore`).
+ */
+export declare function uploadEpochProofFailure(location: string, jobId: string, jobData: EpochProvingJobData, archiver: Archiver, worldState: WorldStateSynchronizer, config: UploadEpochProofConfig, log: Logger): Promise<string>;
+export {};
+//# sourceMappingURL=upload-epoch-proof-failure.d.ts.map

package/dest/actions/upload-epoch-proof-failure.d.ts.map

@@ -0,0 +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;AAEpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAQ9E,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"}

package/dest/actions/upload-epoch-proof-failure.js

@@ -0,0 +1,78 @@
+import { ARCHIVER_DB_VERSION } from '@aztec/archiver';
+import { tryRmDir } from '@aztec/foundation/fs';
+import { jsonStringify } from '@aztec/foundation/json-rpc';
+import { isoDate } from '@aztec/foundation/string';
+import { buildSnapshotMetadata, createBackups } from '@aztec/node-lib/actions';
+import { createFileStore } from '@aztec/stdlib/file-store';
+import { getBasePath, uploadSnapshotData } from '@aztec/stdlib/snapshots';
+import { WORLD_STATE_DB_VERSION } from '@aztec/world-state';
+import { mkdtemp } from 'fs/promises';
+import { tmpdir } from 'os';
+import { dirname, join } from 'path';
+import { serializeEpochProvingJobData } from '../job/epoch-proving-job-data.js';
+/** Whether uploaded data to the file store should be of public access. */ const PUBLIC_UPLOADS = true;
+/**
+ * Uploads a snapshot of world state and archiver (requires pausing them) along with the proving job data,
+ * so we can download and re-run the job later under the same conditions.
+ * @param location The location to upload the data to (used to create the `FileStore`).
+ */ export async function uploadEpochProofFailure(location, jobId, jobData, archiver, worldState, config, log) {
+    const epochNumber = jobData.epochNumber;
+    log.warn(`Uploading epoch proof failure for ${epochNumber} to ${location}`, {
+        epochNumber,
+        jobId,
+        location
+    });
+    const backupDir = await mkdtemp(join(config.dataDirectory ?? tmpdir(), 'epoch-proof-data-'));
+    const store = await createFileStore(location);
+    if (!store) {
+        throw new Error(`Failed to create file store for epoch proof failure upload for location ${location}.`);
+    }
+    try {
+        const versions = {
+            archiver: ARCHIVER_DB_VERSION,
+            worldState: WORLD_STATE_DB_VERSION
+        };
+        const uploadMetadata = await buildSnapshotMetadata(archiver, config);
+        const paths = await createBackups(backupDir, archiver, worldState, log);
+        const basePath = `${getBasePath(uploadMetadata)}/${epochNumber}-${isoDate()}-${jobId}`;
+        const pathFor = (key)=>`${basePath}/${key}.db`;
+        const [metadata, dataUrl, metadataUrl] = await Promise.all([
+            uploadSnapshotData(paths, versions, uploadMetadata, store, {
+                pathFor,
+                private: !PUBLIC_UPLOADS
+            }),
+            uploadJobData(jobData, store, basePath),
+            uploadSnapshotMetadata(uploadMetadata, store, basePath)
+        ]);
+        const baseUrl = dirname(metadataUrl);
+        log.warn(`Uploaded epoch ${epochNumber} proof failure data to ${baseUrl}`, {
+            epochNumber,
+            location,
+            basePath,
+            metadataUrl,
+            dataUrl,
+            metadata,
+            jobId
+        });
+        return baseUrl;
+    } finally{
+        log.info(`Cleaning up backup dir ${backupDir}`);
+        await tryRmDir(backupDir, log);
+    }
+}
+async function uploadJobData(jobData, store, basePath) {
+    const data = serializeEpochProvingJobData(jobData);
+    const path = `${basePath}/data.bin`;
+    return await store.save(path, data, {
+        compress: true,
+        public: PUBLIC_UPLOADS
+    });
+}
+async function uploadSnapshotMetadata(metadata, store, basePath) {
+    const data = Buffer.from(jsonStringify(metadata), 'utf-8');
+    const path = `${basePath}/metadata.json`;
+    return await store.save(path, data, {
+        compress: false,
+        public: PUBLIC_UPLOADS
+    });
+}

package/dest/bin/run-failed-epoch.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=run-failed-epoch.d.ts.map

package/dest/bin/run-failed-epoch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"run-failed-epoch.d.ts","sourceRoot":"","sources":["../../src/bin/run-failed-epoch.ts"],"names":[],"mappings":""}

package/dest/bin/run-failed-epoch.js

@@ -0,0 +1,67 @@
+/* eslint-disable no-console */ import { EthAddress } from '@aztec/foundation/eth-address';
+import { jsonParseWithSchema, jsonStringify } from '@aztec/foundation/json-rpc';
+import { createLogger } from '@aztec/foundation/log';
+import { downloadEpochProvingJob, getProverNodeConfigFromEnv, rerunEpochProvingJob } from '@aztec/prover-node';
+import { UploadSnapshotMetadataSchema } from '@aztec/stdlib/snapshots';
+import { existsSync, mkdirSync } from 'fs';
+import { readFile, writeFile } from 'fs/promises';
+import { basename, join } from 'path';
+const logger = createLogger('prover-node:run-failed-epoch');
+function printUsage() {
+    console.error('Usage: run-failed-epoch <proof-uri> [out-dir=./data]');
+}
+async function rerunFailedEpoch(provingJobUrl, baseLocalDir) {
+    const localDir = join(baseLocalDir, basename(provingJobUrl));
+    const jobPath = join(localDir, 'data.bin');
+    const dataDir = join(localDir, 'state');
+    const env = getProverNodeConfigFromEnv();
+    const config = {
+        ...getProverNodeConfigFromEnv(),
+        dataDirectory: dataDir,
+        dataStoreMapSizeKb: env.dataStoreMapSizeKb ?? 1024 * 1024,
+        proverId: env.proverId ?? EthAddress.random()
+    };
+    let metadata;
+    const metadataPath = join(localDir, 'metadata.json');
+    if (existsSync(metadataPath)) {
+        logger.info(`Using downloaded data`);
+        metadata = jsonParseWithSchema(await readFile(metadataPath, 'utf-8'), UploadSnapshotMetadataSchema);
+    } else {
+        logger.info(`Downloading epoch proving job data and state from ${provingJobUrl} to ${localDir}`);
+        metadata = await downloadEpochProvingJob(provingJobUrl, logger, {
+            jobDataDownloadPath: jobPath,
+            dataDirectory: dataDir
+        });
+        await writeFile(metadataPath, jsonStringify(metadata, true));
+        logger.info(`Download to ${localDir} complete`);
+    }
+    logger.info(`Rerunning proving job from ${jobPath} with state from ${dataDir}`, metadata);
+    const result = await rerunEpochProvingJob(jobPath, logger, {
+        ...config,
+        l1Contracts: {
+            rollupAddress: metadata.rollupAddress
+        },
+        rollupVersion: metadata.rollupVersion
+    });
+    console.error(`Epoch proving job complete with result ${result}`);
+}
+async function main() {
+    if (process.argv[2] === '--help') {
+        printUsage();
+        return;
+    }
+    const uri = process.argv[2];
+    const outDir = process.argv[3] || './data';
+    if (!uri) {
+        printUsage();
+        throw new Error('Missing URL to epoch proving job');
+    }
+    mkdirSync(outDir, {
+        recursive: true
+    });
+    await rerunFailedEpoch(uri, outDir);
+}
+main().catch((err)=>{
+    console.error(err);
+    process.exit(1);
+});

package/dest/config.d.ts

@@ -1,28 +1,31 @@
 import { type ArchiverConfig } from '@aztec/archiver/config';
 import type { ACVMConfig, BBConfig } from '@aztec/bb-prover/config';
+import { type GenesisStateConfig } from '@aztec/ethereum';
 import { type ConfigMappingsType } from '@aztec/foundation/config';
 import { type DataStoreConfig } from '@aztec/kv-store/config';
+import { type KeyStore, type KeyStoreConfig } from '@aztec/node-keystore';
+import { type SharedNodeConfig } from '@aztec/node-lib/config';
 import { type P2PConfig } from '@aztec/p2p/config';
 import { type ProverAgentConfig, type ProverBrokerConfig } from '@aztec/prover-client/broker';
-import { type ProverClientConfig } from '@aztec/prover-client/config';
+import { type ProverClientUserConfig } from '@aztec/prover-client/config';
 import { type PublisherConfig, type TxSenderConfig } from '@aztec/sequencer-client/config';
 import { type WorldStateConfig } from '@aztec/world-state/config';
-import { type ProverCoordinationConfig } from './prover-coordination/config.js';
-export type ProverNodeConfig = ArchiverConfig & ProverClientConfig & P2PConfig & WorldStateConfig & PublisherConfig & TxSenderConfig & DataStoreConfig & ProverCoordinationConfig & SpecificProverNodeConfig & {
-    /** Whether to populate the genesis state with initial fee juice for the test accounts */
-    testAccounts: boolean;
-};
-type SpecificProverNodeConfig = {
+export type ProverNodeConfig = ArchiverConfig & ProverClientUserConfig & P2PConfig & WorldStateConfig & PublisherConfig & TxSenderConfig & DataStoreConfig & KeyStoreConfig & SharedNodeConfig & SpecificProverNodeConfig & GenesisStateConfig;
+export type SpecificProverNodeConfig = {
     proverNodeMaxPendingJobs: number;
     proverNodePollingIntervalMs: number;
     proverNodeMaxParallelBlocksPerEpoch: number;
+    proverNodeFailedEpochStore: string | undefined;
+    proverNodeEpochProvingDelayMs: number | undefined;
+    proverNodeDisableProofPublish?: boolean;
     txGatheringTimeoutMs: number;
     txGatheringIntervalMs: number;
-    txGatheringMaxParallelRequests: number;
+    txGatheringBatchSize: number;
+    txGatheringMaxParallelRequestsPerNode: number;
 };
 export declare const proverNodeConfigMappings: ConfigMappingsType<ProverNodeConfig>;
 export declare function getProverNodeConfigFromEnv(): ProverNodeConfig;
 export declare function getProverNodeBrokerConfigFromEnv(): ProverBrokerConfig;
 export declare function getProverNodeAgentConfigFromEnv(): ProverAgentConfig & BBConfig & ACVMConfig;
-export {};
+export declare function createKeyStoreForProver(config: ProverNodeConfig): KeyStore | undefined;
 //# sourceMappingURL=config.d.ts.map

package/dest/config.d.ts.map

@@ -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"}
+{"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,EAAE,KAAK,kBAAkB,EAA8B,MAAM,iBAAiB,CAAC;AACtF,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AAClF,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,cAAc,EAA+C,MAAM,sBAAsB,CAAC;AACvH,OAAO,EAAE,KAAK,gBAAgB,EAA4B,MAAM,wBAAwB,CAAC;AACzF,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,mBAAmB,CAAC;AACtE,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EAGxB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,KAAK,sBAAsB,EAAgD,MAAM,6BAA6B,CAAC;AACxH,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,cAAc,EAGpB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,KAAK,gBAAgB,EAA4B,MAAM,2BAA2B,CAAC;AAE5F,MAAM,MAAM,gBAAgB,GAAG,cAAc,GAC3C,sBAAsB,GACtB,SAAS,GACT,gBAAgB,GAChB,eAAe,GACf,cAAc,GACd,eAAe,GACf,cAAc,GACd,gBAAgB,GAChB,wBAAwB,GACxB,kBAAkB,CAAC;AAErB,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;AAsDF,eAAO,MAAM,wBAAwB,EAAE,kBAAkB,CAAC,gBAAgB,CAYzE,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,CAMtF"}

package/dest/config.js

@@ -1,12 +1,14 @@
 import { archiverConfigMappings } from '@aztec/archiver/config';
+import { genesisStateConfigMappings } from '@aztec/ethereum';
 import { booleanConfigHelper, getConfigFromMappings, numberConfigHelper } from '@aztec/foundation/config';
 import { dataConfigMappings } from '@aztec/kv-store/config';
+import { ethPrivateKeySchema, keyStoreConfigMappings } from '@aztec/node-keystore';
+import { sharedNodeConfigMappings } from '@aztec/node-lib/config';
 import { p2pConfigMappings } from '@aztec/p2p/config';
 import { proverAgentConfigMappings, proverBrokerConfigMappings } from '@aztec/prover-client/broker';
 import { bbConfigMappings, proverClientConfigMappings } from '@aztec/prover-client/config';
 import { getPublisherConfigMappings, getTxSenderConfigMappings } from '@aztec/sequencer-client/config';
 import { worldStateConfigMappings } from '@aztec/world-state/config';
-import { proverCoordinationConfigMappings } from './prover-coordination/config.js';
 const specificProverNodeConfigMappings = {
     proverNodeMaxPendingJobs: {
         env: 'PROVER_NODE_MAX_PENDING_JOBS',
@@ -23,37 +25,53 @@ const specificProverNodeConfigMappings = {
         description: 'The Maximum number of blocks to process in parallel while proving an epoch',
         ...numberConfigHelper(32)
     },
-    txGatheringTimeoutMs: {
-        env: 'PROVER_NODE_TX_GATHERING_TIMEOUT_MS',
-        description: 'The maximum amount of time to wait for tx data to be available',
-        ...numberConfigHelper(60_000)
+    proverNodeFailedEpochStore: {
+        env: 'PROVER_NODE_FAILED_EPOCH_STORE',
+        description: 'File store where to upload node state when an epoch fails to be proven',
+        defaultValue: undefined
+    },
+    proverNodeEpochProvingDelayMs: {
+        description: 'Optional delay in milliseconds to wait before proving a new epoch',
+        defaultValue: undefined
     },
     txGatheringIntervalMs: {
         env: 'PROVER_NODE_TX_GATHERING_INTERVAL_MS',
         description: 'How often to check that tx data is available',
         ...numberConfigHelper(1_000)
     },
-    txGatheringMaxParallelRequests: {
-        env: 'PROVER_NODE_TX_GATHERING_MAX_PARALLEL_REQUESTS',
-        description: 'How many txs to load up a time',
+    txGatheringBatchSize: {
+        env: 'PROVER_NODE_TX_GATHERING_BATCH_SIZE',
+        description: 'How many transactions to gather from a node in a single request',
+        ...numberConfigHelper(10)
+    },
+    txGatheringMaxParallelRequestsPerNode: {
+        env: 'PROVER_NODE_TX_GATHERING_MAX_PARALLEL_REQUESTS_PER_NODE',
+        description: 'How many tx requests to make in parallel to each node',
         ...numberConfigHelper(100)
+    },
+    txGatheringTimeoutMs: {
+        env: 'PROVER_NODE_TX_GATHERING_TIMEOUT_MS',
+        description: 'How long to wait for tx data to be available before giving up',
+        ...numberConfigHelper(120_000)
+    },
+    proverNodeDisableProofPublish: {
+        env: 'PROVER_NODE_DISABLE_PROOF_PUBLISH',
+        description: 'Whether the prover node skips publishing proofs to L1',
+        ...booleanConfigHelper(false)
     }
 };
 export const proverNodeConfigMappings = {
     ...dataConfigMappings,
+    ...keyStoreConfigMappings,
     ...archiverConfigMappings,
     ...proverClientConfigMappings,
     ...p2pConfigMappings,
     ...worldStateConfigMappings,
     ...getPublisherConfigMappings('PROVER'),
     ...getTxSenderConfigMappings('PROVER'),
-    ...proverCoordinationConfigMappings,
     ...specificProverNodeConfigMappings,
-    testAccounts: {
-        env: 'TEST_ACCOUNTS',
-        description: 'Whether to populate the genesis state with initial fee juice for the test accounts.',
-        ...booleanConfigHelper(false)
-    }
+    ...genesisStateConfigMappings,
+    ...sharedNodeConfigMappings
 };
 export function getProverNodeConfigFromEnv() {
     return getConfigFromMappings(proverNodeConfigMappings);
@@ -69,3 +87,52 @@ export function getProverNodeAgentConfigFromEnv() {
         ...getConfigFromMappings(bbConfigMappings)
     };
 }
+function createKeyStoreFromWeb3Signer(config) {
+    // If we don't have a valid prover Id then we can't build a valid key store with remote signers
+    if (config.proverId === undefined) {
+        return undefined;
+    }
+    // Also, we need at least one publisher address.
+    const publishers = config.publisherAddresses ?? [];
+    if (publishers.length === 0) {
+        return undefined;
+    }
+    const keyStore = {
+        schemaVersion: 1,
+        slasher: undefined,
+        prover: {
+            id: config.proverId,
+            publisher: publishers
+        },
+        remoteSigner: config.web3SignerUrl,
+        validators: undefined
+    };
+    return keyStore;
+}
+function createKeyStoreFromPublisherKeys(config) {
+    // Extract the publisher keys from the provided config.
+    const publisherKeys = config.publisherPrivateKeys ? config.publisherPrivateKeys.map((k)=>ethPrivateKeySchema.parse(k.getValue())) : [];
+    // There must be at least 1.
+    if (publisherKeys.length === 0) {
+        return undefined;
+    }
+    // If we have a valid proverId then create a prover key store of the form { id, publisher: [publisherKeys] }
+    // Otherwise create one of the form ("0x12345678....." as EthAccount).
+    const keyStore = {
+        schemaVersion: 1,
+        slasher: undefined,
+        prover: config.proverId === undefined ? publisherKeys[0] : {
+            id: config.proverId,
+            publisher: publisherKeys
+        },
+        remoteSigner: undefined,
+        validators: undefined
+    };
+    return keyStore;
+}
+export function createKeyStoreForProver(config) {
+    if (config.web3SignerUrl !== undefined && config.web3SignerUrl.length > 0) {
+        return createKeyStoreFromWeb3Signer(config);
+    }
+    return createKeyStoreFromPublisherKeys(config);
+}

package/dest/factory.d.ts

@@ -2,24 +2,28 @@ import { type Archiver } from '@aztec/archiver';
 import { type BlobSinkClientInterface } from '@aztec/blob-sink/client';
 import { L1TxUtils } from '@aztec/ethereum';
 import { type Logger } from '@aztec/foundation/log';
+import { DateProvider } from '@aztec/foundation/timer';
 import type { DataStoreConfig } from '@aztec/kv-store/config';
-import type { ProverCoordination, ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
+import { type KeyStoreConfig } from '@aztec/node-keystore';
+import type { AztecNode, ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
 import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
 import { type TelemetryClient } from '@aztec/telemetry-client';
-import type { ProverNodeConfig } from './config.js';
-import { ProverNodePublisher } from './prover-node-publisher.js';
+import { type ProverNodeConfig } from './config.js';
 import { ProverNode } from './prover-node.js';
-/** Creates a new prover node given a config. */
-export declare function createProverNode(config: ProverNodeConfig & DataStoreConfig, deps?: {
+import { ProverPublisherFactory } from './prover-publisher-factory.js';
+export type ProverNodeDeps = {
     telemetry?: TelemetryClient;
     log?: Logger;
-    aztecNodeTxProvider?: ProverCoordination;
+    aztecNodeTxProvider?: Pick<AztecNode, 'getTxsByHash'>;
     archiver?: Archiver;
-    publisher?: ProverNodePublisher;
+    publisherFactory?: ProverPublisherFactory;
     blobSinkClient?: BlobSinkClientInterface;
     broker?: ProvingJobBroker;
     l1TxUtils?: L1TxUtils;
-}, options?: {
+    dateProvider?: DateProvider;
+};
+/** Creates a new prover node given a config. */
+export declare function createProverNode(userConfig: ProverNodeConfig & DataStoreConfig & KeyStoreConfig, deps?: ProverNodeDeps, options?: {
     prefilledPublicData?: PublicDataTreeLeaf[];
 }): Promise<ProverNode>;
 //# sourceMappingURL=factory.d.ts.map

package/dest/factory.d.ts.map

@@ -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"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAkB,MAAM,iBAAiB,CAAC;AAEhE,OAAO,EAAE,KAAK,uBAAuB,EAAwB,MAAM,yBAAyB,CAAC;AAE7F,OAAO,EAAE,SAAS,EAAyD,MAAM,iBAAiB,CAAC;AAEnG,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,KAAK,cAAc,EAAkD,MAAM,sBAAsB,CAAC;AAM3G,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAE9D,OAAO,EAAa,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAK9F,OAAO,EAAE,KAAK,gBAAgB,EAA2B,MAAM,aAAa,CAAC;AAE7E,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,mBAAmB,CAAC,EAAE,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;IACtD,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,gBAAgB,CAAC,EAAE,sBAAsB,CAAC;IAC1C,cAAc,CAAC,EAAE,uBAAuB,CAAC;IACzC,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,CAAC;AAEF,gDAAgD;AAChD,wBAAsB,gBAAgB,CACpC,UAAU,EAAE,gBAAgB,GAAG,eAAe,GAAG,cAAc,EAC/D,IAAI,GAAE,cAAmB,EACzB,OAAO,GAAE;IACP,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAC;CACvC,uBAyKP"}