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

package/dest/prover-node.js

@@ -4,134 +4,180 @@ function _ts_decorate(decorators, target, key, desc) {
     else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-import { compact } from '@aztec/foundation/collection';
+import { assertRequired, compact, pick, sum } from '@aztec/foundation/collection';
 import { memoize } from '@aztec/foundation/decorators';
 import { createLogger } from '@aztec/foundation/log';
-import { RunningPromise } from '@aztec/foundation/running-promise';
 import { DateProvider } from '@aztec/foundation/timer';
 import { PublicProcessorFactory } from '@aztec/simulator/server';
-import { getTimestampRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
+import { getProofSubmissionDeadlineTimestamp } from '@aztec/stdlib/epoch-helpers';
 import { EpochProvingJobTerminalState, tryStop } from '@aztec/stdlib/interfaces/server';
 import { Attributes, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
+import { uploadEpochProofFailure } from './actions/upload-epoch-proof-failure.js';
 import { EpochProvingJob } from './job/epoch-proving-job.js';
-import { ProverNodeMetrics } from './metrics.js';
+import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
 /**
- * An Aztec Prover Node is a standalone process that monitors the unfinalised chain on L1 for unproven blocks,
- * submits bids for proving them, and monitors if they are accepted. If so, the prover node fetches the txs
- * from a tx source in the p2p network or an external node, re-executes their public functions, creates a rollup
+ * An Aztec Prover Node is a standalone process that monitors the unfinalized chain on L1 for unproven epochs,
+ * fetches their txs from the p2p network or external nodes, re-executes their public functions, creates a rollup
  * proof for the epoch, and submits it to L1.
  */ export class ProverNode {
     prover;
-    publisher;
+    publisherFactory;
     l2BlockSource;
     l1ToL2MessageSource;
     contractDataSource;
     worldState;
-    coordination;
+    p2pClient;
     epochsMonitor;
+    rollupContract;
+    l1Metrics;
     telemetryClient;
     log;
     dateProvider;
-    latestEpochWeAreProving;
     jobs;
-    cachedEpochData;
-    options;
-    metrics;
-    txFetcher;
-    lastBlockNumber;
+    config;
+    jobMetrics;
+    rewardsMetrics;
     tracer;
-    constructor(prover, publisher, l2BlockSource, l1ToL2MessageSource, contractDataSource, worldState, coordination, epochsMonitor, options = {}, telemetryClient = getTelemetryClient()){
+    publisher;
+    constructor(prover, publisherFactory, l2BlockSource, l1ToL2MessageSource, contractDataSource, worldState, p2pClient, epochsMonitor, rollupContract, l1Metrics, config = {}, telemetryClient = getTelemetryClient()){
         this.prover = prover;
-        this.publisher = publisher;
+        this.publisherFactory = publisherFactory;
         this.l2BlockSource = l2BlockSource;
         this.l1ToL2MessageSource = l1ToL2MessageSource;
         this.contractDataSource = contractDataSource;
         this.worldState = worldState;
-        this.coordination = coordination;
+        this.p2pClient = p2pClient;
         this.epochsMonitor = epochsMonitor;
+        this.rollupContract = rollupContract;
+        this.l1Metrics = l1Metrics;
         this.telemetryClient = telemetryClient;
         this.log = createLogger('prover-node');
         this.dateProvider = new DateProvider();
         this.jobs = new Map();
-        this.cachedEpochData = undefined;
-        this.options = {
-            pollingIntervalMs: 1_000,
-            maxPendingJobs: 100,
-            maxParallelBlocksPerEpoch: 32,
-            txGatheringTimeoutMs: 60_000,
+        this.config = {
+            proverNodePollingIntervalMs: 1_000,
+            proverNodeMaxPendingJobs: 100,
+            proverNodeMaxParallelBlocksPerEpoch: 32,
             txGatheringIntervalMs: 1_000,
-            txGatheringMaxParallelRequests: 100,
-            ...compact(options)
+            txGatheringBatchSize: 10,
+            txGatheringMaxParallelRequestsPerNode: 100,
+            txGatheringTimeoutMs: 120_000,
+            proverNodeFailedEpochStore: undefined,
+            proverNodeEpochProvingDelayMs: undefined,
+            ...compact(config)
         };
-        this.metrics = new ProverNodeMetrics(telemetryClient, 'ProverNode');
+        this.validateConfig();
+        const meter = telemetryClient.getMeter('ProverNode');
         this.tracer = telemetryClient.getTracer('ProverNode');
-        this.txFetcher = new RunningPromise(()=>this.checkForTxs(), this.log, this.options.txGatheringIntervalMs);
+        this.jobMetrics = new ProverNodeJobMetrics(meter, telemetryClient.getTracer('EpochProvingJob'));
+        this.rewardsMetrics = new ProverNodeRewardsMetrics(meter, this.prover.getProverId(), rollupContract);
     }
     getProverId() {
         return this.prover.getProverId();
     }
     getP2P() {
-        const asP2PClient = this.coordination;
-        if (typeof asP2PClient.isP2PClient === 'function' && asP2PClient.isP2PClient()) {
-            return asP2PClient;
-        }
-        return undefined;
+        return this.p2pClient;
     }
     /**
    * Handles an epoch being completed by starting a proof for it if there are no active jobs for it.
    * @param epochNumber - The epoch number that was just completed.
+   * @returns false if there is an error, true otherwise
    */ async handleEpochReadyToProve(epochNumber) {
         try {
-            this.log.debug('jobs', JSON.stringify(this.jobs, null, 2));
+            this.log.debug(`Running jobs as ${epochNumber} is ready to prove`, {
+                jobs: Array.from(this.jobs.values()).map((job)=>`${job.getEpochNumber()}:${job.getId()}`)
+            });
             const activeJobs = await this.getActiveJobsForEpoch(epochNumber);
             if (activeJobs.length > 0) {
-                this.log.info(`Not starting proof for ${epochNumber} since there are active jobs`);
-                return;
+                this.log.warn(`Not starting proof for ${epochNumber} since there are active jobs for the epoch`, {
+                    activeJobs: activeJobs.map((job)=>job.uuid)
+                });
+                return true;
             }
-            // TODO: we probably want to skip starting a proof if we are too far into the current epoch
             await this.startProof(epochNumber);
+            return true;
         } catch (err) {
             if (err instanceof EmptyEpochError) {
                 this.log.info(`Not starting proof for ${epochNumber} since no blocks were found`);
             } else {
                 this.log.error(`Error handling epoch completed`, err);
             }
+            return false;
         }
     }
     /**
-   * Starts the prover node so it periodically checks for unproven epochs in the unfinalised chain from L1 and
+   * Starts the prover node so it periodically checks for unproven epochs in the unfinalized chain from L1 and
    * starts proving jobs for them.
-   */ start() {
-        this.txFetcher.start();
+   */ async start() {
         this.epochsMonitor.start(this);
-        this.log.info('Started ProverNode', this.options);
+        await this.publisherFactory.start();
+        this.publisher = await this.publisherFactory.create();
+        await this.rewardsMetrics.start();
+        this.l1Metrics.start();
+        this.log.info(`Started Prover Node with prover id ${this.prover.getProverId().toString()}`, this.config);
     }
     /**
    * Stops the prover node and all its dependencies.
    */ async stop() {
         this.log.info('Stopping ProverNode');
-        await this.txFetcher.stop();
         await this.epochsMonitor.stop();
         await this.prover.stop();
+        await tryStop(this.p2pClient);
         await tryStop(this.l2BlockSource);
-        this.publisher.interrupt();
+        await tryStop(this.publisherFactory);
+        this.publisher?.interrupt();
         await Promise.all(Array.from(this.jobs.values()).map((job)=>job.stop()));
         await this.worldState.stop();
-        await tryStop(this.coordination);
+        this.rewardsMetrics.stop();
+        this.l1Metrics.stop();
         await this.telemetryClient.stop();
         this.log.info('Stopped ProverNode');
     }
-    /**
-   * Creates a proof for a block range. Returns once the proof has been submitted to L1.
-   */ async prove(epochNumber) {
-        const job = await this.createProvingJob(BigInt(epochNumber));
-        return job.run();
+    /** Returns world state status. */ async getWorldStateSyncStatus() {
+        const { syncSummary } = await this.worldState.status();
+        return syncSummary;
+    }
+    /** Returns archiver status. */ getL2Tips() {
+        return this.l2BlockSource.getL2Tips();
     }
     /**
    * Starts a proving process and returns immediately.
    */ async startProof(epochNumber) {
-        const job = await this.createProvingJob(BigInt(epochNumber));
-        void job.run().catch((err)=>this.log.error(`Error proving epoch ${epochNumber}`, err));
+        const job = await this.createProvingJob(BigInt(epochNumber), {
+            skipEpochCheck: true
+        });
+        void this.runJob(job);
+    }
+    async runJob(job) {
+        const epochNumber = job.getEpochNumber();
+        const ctx = {
+            id: job.getId(),
+            epochNumber,
+            state: undefined
+        };
+        try {
+            await job.run();
+            const state = job.getState();
+            ctx.state = state;
+            if (state === 'reorg') {
+                this.log.warn(`Running new job for epoch ${epochNumber} due to reorg`, ctx);
+                await this.createProvingJob(epochNumber);
+            } else if (state === 'failed') {
+                this.log.error(`Job for ${epochNumber} exited with state ${state}`, ctx);
+                await this.tryUploadEpochFailure(job);
+            } else {
+                this.log.verbose(`Job for ${epochNumber} exited with state ${state}`, ctx);
+            }
+        } catch (err) {
+            this.log.error(`Error proving epoch ${epochNumber}`, err, ctx);
+        } finally{
+            this.jobs.delete(job.getId());
+        }
+    }
+    async tryUploadEpochFailure(job) {
+        if (this.config.proverNodeFailedEpochStore) {
+            return await uploadEpochProofFailure(this.config.proverNodeFailedEpochStore, job.getId(), job.getProvingData(), this.l2BlockSource, this.worldState, assertRequired(pick(this.config, 'l1ChainId', 'rollupVersion', 'dataDirectory')), this.log);
+        }
     }
     /**
    * Returns the prover instance.
@@ -153,56 +199,51 @@ import { ProverNodeMetrics } from './metrics.js';
         return jobs.filter((job)=>job.epochNumber === epochNumber && !EpochProvingJobTerminalState.includes(job.status));
     }
     checkMaximumPendingJobs() {
-        const { maxPendingJobs } = this.options;
-        return maxPendingJobs === 0 || this.jobs.size < maxPendingJobs;
-    }
-    async createProvingJob(epochNumber) {
-        if (!this.checkMaximumPendingJobs()) {
-            throw new Error(`Maximum pending proving jobs ${this.options.maxPendingJobs} reached. Cannot create new job.`);
+        const { proverNodeMaxPendingJobs: maxPendingJobs } = this.config;
+        if (maxPendingJobs > 0 && this.jobs.size >= maxPendingJobs) {
+            throw new Error(`Maximum pending proving jobs ${maxPendingJobs} reached. Cannot create new job.`);
         }
-        // Gather blocks for this epoch
-        const cachedEpochData = this.cachedEpochData?.epochNumber === epochNumber ? this.cachedEpochData : undefined;
-        const { blocks, txs } = cachedEpochData ?? await this.gatherEpochData(epochNumber);
-        const fromBlock = blocks[0].number;
-        const toBlock = blocks.at(-1).number;
-        // Fast forward world state to right before the target block and get a fork
+    }
+    async createProvingJob(epochNumber, opts = {}) {
+        this.checkMaximumPendingJobs();
+        this.publisher = await this.publisherFactory.create();
+        // Gather all data for this epoch
+        const epochData = await this.gatherEpochData(epochNumber);
+        const fromBlock = epochData.blocks[0].number;
+        const toBlock = epochData.blocks.at(-1).number;
         this.log.verbose(`Creating proving job for epoch ${epochNumber} for block range ${fromBlock} to ${toBlock}`);
+        // Fast forward world state to right before the target block and get a fork
         await this.worldState.syncImmediate(toBlock);
-        // Create a processor using the forked world state
+        // Create a processor factory
         const publicProcessorFactory = new PublicProcessorFactory(this.contractDataSource, this.dateProvider, this.telemetryClient);
-        const cleanUp = ()=>{
-            this.jobs.delete(job.getId());
-            return Promise.resolve();
-        };
-        const [_, endTimestamp] = getTimestampRangeForEpoch(epochNumber + 1n, await this.getL1Constants());
-        const deadline = new Date(Number(endTimestamp) * 1000);
-        const job = this.doCreateEpochProvingJob(epochNumber, deadline, blocks, txs, publicProcessorFactory, cleanUp);
+        // Set deadline for this job to run. It will abort if it takes too long.
+        const deadlineTs = getProofSubmissionDeadlineTimestamp(epochNumber, await this.getL1Constants());
+        const deadline = new Date(Number(deadlineTs) * 1000);
+        const job = this.doCreateEpochProvingJob(epochData, deadline, publicProcessorFactory, this.publisher, opts);
         this.jobs.set(job.getId(), job);
         return job;
     }
     getL1Constants() {
         return this.l2BlockSource.getL1Constants();
     }
-    /** Monitors for new blocks and requests their txs from the p2p layer to ensure they are available for proving. */ async checkForTxs() {
-        const blockNumber = await this.l2BlockSource.getBlockNumber();
-        if (this.lastBlockNumber === undefined || blockNumber > this.lastBlockNumber) {
-            const block = await this.l2BlockSource.getBlock(blockNumber);
-            if (!block) {
-                return;
-            }
-            const txHashes = block.body.txEffects.map((tx)=>tx.txHash);
-            this.log.verbose(`Fetching ${txHashes.length} tx hashes for block number ${blockNumber} from coordination`);
-            await this.coordination.getTxsByHash(txHashes); // This stores the txs in the tx pool, no need to persist them here
-            this.lastBlockNumber = blockNumber;
-        }
-    }
     async gatherEpochData(epochNumber) {
-        // Gather blocks for this epoch and their txs
         const blocks = await this.gatherBlocks(epochNumber);
-        const txs = await this.gatherTxs(epochNumber, blocks);
+        const txArray = await this.gatherTxs(epochNumber, blocks);
+        const txs = new Map(txArray.map((tx)=>[
+                tx.getTxHash().toString(),
+                tx
+            ]));
+        const l1ToL2Messages = await this.gatherMessages(epochNumber, blocks);
+        const previousBlockHeader = await this.gatherPreviousBlockHeader(epochNumber, blocks[0]);
+        const [lastBlock] = await this.l2BlockSource.getPublishedBlocks(blocks.at(-1).number, 1);
+        const attestations = lastBlock?.attestations ?? [];
         return {
             blocks,
-            txs
+            txs,
+            l1ToL2Messages,
+            epochNumber,
+            previousBlockHeader,
+            attestations
         };
     }
     async gatherBlocks(epochNumber) {
@@ -213,26 +254,59 @@ import { ProverNodeMetrics } from './metrics.js';
         return blocks;
     }
     async gatherTxs(epochNumber, blocks) {
-        const txsToFind = blocks.flatMap((block)=>block.body.txEffects.map((tx)=>tx.txHash));
-        const txs = await this.coordination.getTxsByHash(txsToFind);
-        if (txs.length === txsToFind.length) {
+        const deadline = new Date(this.dateProvider.now() + this.config.txGatheringTimeoutMs);
+        const txProvider = this.p2pClient.getTxProvider();
+        const txsByBlock = await Promise.all(blocks.map((block)=>txProvider.getTxsForBlock(block, {
+                deadline
+            })));
+        const txs = txsByBlock.map(({ txs })=>txs).flat();
+        const missingTxs = txsByBlock.map(({ missingTxs })=>missingTxs).flat();
+        if (missingTxs.length === 0) {
             this.log.verbose(`Gathered all ${txs.length} txs for epoch ${epochNumber}`, {
                 epochNumber
             });
             return txs;
         }
-        const txHashesFound = await Promise.all(txs.map((tx)=>tx.getTxHash()));
-        const missingTxHashes = txsToFind.filter((txHashToFind)=>!txHashesFound.some((txHashFound)=>txHashToFind.equals(txHashFound))).join(', ');
-        throw new Error(`Txs not found for epoch ${epochNumber}: ${missingTxHashes}`);
+        throw new Error(`Txs not found for epoch ${epochNumber}: ${missingTxs.map((hash)=>hash.toString()).join(', ')}`);
+    }
+    async gatherMessages(epochNumber, blocks) {
+        const messages = await Promise.all(blocks.map((b)=>this.l1ToL2MessageSource.getL1ToL2Messages(b.number)));
+        const messageCount = sum(messages.map((m)=>m.length));
+        this.log.verbose(`Gathered all ${messageCount} messages for epoch ${epochNumber}`, {
+            epochNumber
+        });
+        const messagesByBlock = {};
+        for(let i = 0; i < blocks.length; i++){
+            messagesByBlock[blocks[i].number] = messages[i];
+        }
+        return messagesByBlock;
+    }
+    async gatherPreviousBlockHeader(epochNumber, initialBlock) {
+        const previousBlockNumber = initialBlock.number - 1;
+        const header = await (previousBlockNumber === 0 ? this.worldState.getCommitted().getInitialHeader() : this.l2BlockSource.getBlockHeader(previousBlockNumber));
+        if (!header) {
+            throw new Error(`Previous block header ${initialBlock.number} not found for proving epoch ${epochNumber}`);
+        }
+        this.log.verbose(`Gathered previous block header ${header.getBlockNumber()} for epoch ${epochNumber}`);
+        return header;
     }
-    /** Extracted for testing purposes. */ doCreateEpochProvingJob(epochNumber, deadline, blocks, txs, publicProcessorFactory, cleanUp) {
-        return new EpochProvingJob(this.worldState, epochNumber, blocks, txs, this.prover.createEpochProver(), publicProcessorFactory, this.publisher, this.l2BlockSource, this.l1ToL2MessageSource, this.metrics, deadline, {
-            parallelBlockLimit: this.options.maxParallelBlocksPerEpoch
-        }, cleanUp);
+    /** Extracted for testing purposes. */ doCreateEpochProvingJob(data, deadline, publicProcessorFactory, publisher, opts = {}) {
+        const { proverNodeMaxParallelBlocksPerEpoch: parallelBlockLimit, proverNodeDisableProofPublish } = this.config;
+        return new EpochProvingJob(data, this.worldState, this.prover.createEpochProver(), publicProcessorFactory, publisher, this.l2BlockSource, this.jobMetrics, deadline, {
+            parallelBlockLimit,
+            skipSubmitProof: proverNodeDisableProofPublish,
+            ...opts
+        });
     }
     /** Extracted for testing purposes. */ async triggerMonitors() {
         await this.epochsMonitor.work();
     }
+    validateConfig() {
+        if (this.config.proverNodeFailedEpochStore && (!this.config.dataDirectory || !this.config.l1ChainId || !this.config.rollupVersion)) {
+            this.log.warn(`Invalid prover-node config (missing dataDirectory, l1ChainId, or rollupVersion)`, pick(this.config, 'proverNodeFailedEpochStore', 'dataDirectory', 'l1ChainId', 'rollupVersion'));
+            throw new Error('All of dataDirectory, l1ChainId, and rollupVersion are required if proverNodeFailedEpochStore is set.');
+        }
+    }
 }
 _ts_decorate([
     trackSpan('ProverNode.createProvingJob', (epochNumber)=>({
@@ -242,9 +316,6 @@ _ts_decorate([
 _ts_decorate([
     memoize
 ], ProverNode.prototype, "getL1Constants", null);
-_ts_decorate([
-    trackSpan('ProverNode.checkForTxs')
-], ProverNode.prototype, "checkForTxs", null);
 _ts_decorate([
     trackSpan('ProverNode.gatherEpochData', (epochNumber)=>({
             [Attributes.EPOCH_NUMBER]: Number(epochNumber)

package/dest/prover-publisher-factory.d.ts

@@ -0,0 +1,21 @@
+import type { L1TxUtils, PublisherManager, RollupContract } from '@aztec/ethereum';
+import type { PublisherConfig, TxSenderConfig } from '@aztec/sequencer-client';
+import type { TelemetryClient } from '@aztec/telemetry-client';
+import { ProverNodePublisher } from './prover-node-publisher.js';
+export declare class ProverPublisherFactory {
+    private config;
+    private deps;
+    constructor(config: TxSenderConfig & PublisherConfig, deps: {
+        rollupContract: RollupContract;
+        publisherManager: PublisherManager<L1TxUtils>;
+        telemetry?: TelemetryClient;
+    });
+    start(): Promise<void>;
+    stop(): void;
+    /**
+     * Creates a new Prover Publisher instance.
+     * @returns A new ProverNodePublisher instance.
+     */
+    create(): Promise<ProverNodePublisher>;
+}
+//# sourceMappingURL=prover-publisher-factory.d.ts.map

package/dest/prover-publisher-factory.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"prover-publisher-factory.d.ts","sourceRoot":"","sources":["../src/prover-publisher-factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACnF,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE,qBAAa,sBAAsB;IAE/B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,IAAI;gBADJ,MAAM,EAAE,cAAc,GAAG,eAAe,EACxC,IAAI,EAAE;QACZ,cAAc,EAAE,cAAc,CAAC;QAC/B,gBAAgB,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAC9C,SAAS,CAAC,EAAE,eAAe,CAAC;KAC7B;IAGU,KAAK;IAIX,IAAI;IAIX;;;OAGG;IACU,MAAM,IAAI,OAAO,CAAC,mBAAmB,CAAC;CAQpD"}

package/dest/prover-publisher-factory.js

@@ -0,0 +1,26 @@
+import { ProverNodePublisher } from './prover-node-publisher.js';
+export class ProverPublisherFactory {
+    config;
+    deps;
+    constructor(config, deps){
+        this.config = config;
+        this.deps = deps;
+    }
+    async start() {
+        await this.deps.publisherManager.loadState();
+    }
+    stop() {
+        this.deps.publisherManager.interrupt();
+    }
+    /**
+   * Creates a new Prover Publisher instance.
+   * @returns A new ProverNodePublisher instance.
+   */ async create() {
+        const l1Publisher = await this.deps.publisherManager.getAvailablePublisher();
+        return new ProverNodePublisher(this.config, {
+            rollupContract: this.deps.rollupContract,
+            l1TxUtils: l1Publisher,
+            telemetry: this.deps.telemetry
+        });
+    }
+}

package/dest/test/index.d.ts

@@ -1,10 +1,12 @@
 import type { EpochProverManager } from '@aztec/stdlib/interfaces/server';
+import type { EpochProvingJob } from '../job/epoch-proving-job.js';
 import type { ProverNodePublisher } from '../prover-node-publisher.js';
 import { ProverNode } from '../prover-node.js';
-declare class TestProverNode_ extends ProverNode {
+declare abstract class TestProverNodeClass extends ProverNode {
     prover: EpochProverManager;
     publisher: ProverNodePublisher;
+    abstract tryUploadEpochFailure(job: EpochProvingJob): Promise<string | undefined>;
 }
-export type TestProverNode = TestProverNode_;
+export type TestProverNode = TestProverNodeClass;
 export {};
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAE1E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,cAAM,eAAgB,SAAQ,UAAU;IACtB,MAAM,EAAG,kBAAkB,CAAC;IAC5B,SAAS,EAAG,mBAAmB,CAAC;CACjD;AAED,MAAM,MAAM,cAAc,GAAG,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAE1E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,uBAAe,mBAAoB,SAAQ,UAAU;IACpC,MAAM,EAAE,kBAAkB,CAAC;IAC3B,SAAS,EAAE,mBAAmB,CAAC;aAErB,qBAAqB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAClG;AAED,MAAM,MAAM,cAAc,GAAG,mBAAmB,CAAC"}

package/dest/test/index.js

@@ -1,5 +1,3 @@
 import { ProverNode } from '../prover-node.js';
-class TestProverNode_ extends ProverNode {
-    prover;
-    publisher;
+class TestProverNodeClass extends ProverNode {
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/prover-node",
-  "version": "0.0.0-test.1",
+  "version": "0.0.1-commit.b655e406",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -14,10 +14,9 @@
     "build": "yarn clean && tsc -b",
     "build:dev": "tsc -b --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
-    "formatting": "run -T prettier --check ./src && run -T eslint ./src",
-    "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
     "bb": "node --no-warnings ./dest/bb/index.js",
-    "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
+    "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}",
+    "run-failed-epoch": "node --no-warnings ./dest/bin/run-failed-epoch.js"
   },
   "jest": {
     "moduleNameMapper": {
@@ -50,41 +49,47 @@
     "testTimeout": 120000,
     "setupFiles": [
       "../../foundation/src/jest/setup.mjs"
+    ],
+    "testEnvironment": "../../foundation/src/jest/env.mjs",
+    "setupFilesAfterEnv": [
+      "../../foundation/src/jest/setupAfterEnv.mjs"
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "0.0.0-test.1",
-    "@aztec/bb-prover": "0.0.0-test.1",
-    "@aztec/blob-sink": "0.0.0-test.1",
-    "@aztec/constants": "0.0.0-test.1",
-    "@aztec/epoch-cache": "0.0.0-test.1",
-    "@aztec/ethereum": "0.0.0-test.1",
-    "@aztec/foundation": "0.0.0-test.1",
-    "@aztec/kv-store": "0.0.0-test.1",
-    "@aztec/l1-artifacts": "0.0.0-test.1",
-    "@aztec/noir-protocol-circuits-types": "0.0.0-test.1",
-    "@aztec/p2p": "0.0.0-test.1",
-    "@aztec/protocol-contracts": "0.0.0-test.1",
-    "@aztec/prover-client": "0.0.0-test.1",
-    "@aztec/sequencer-client": "0.0.0-test.1",
-    "@aztec/simulator": "0.0.0-test.1",
-    "@aztec/stdlib": "0.0.0-test.1",
-    "@aztec/telemetry-client": "0.0.0-test.1",
-    "@aztec/world-state": "0.0.0-test.1",
+    "@aztec/archiver": "0.0.1-commit.b655e406",
+    "@aztec/bb-prover": "0.0.1-commit.b655e406",
+    "@aztec/blob-lib": "0.0.1-commit.b655e406",
+    "@aztec/blob-sink": "0.0.1-commit.b655e406",
+    "@aztec/constants": "0.0.1-commit.b655e406",
+    "@aztec/epoch-cache": "0.0.1-commit.b655e406",
+    "@aztec/ethereum": "0.0.1-commit.b655e406",
+    "@aztec/foundation": "0.0.1-commit.b655e406",
+    "@aztec/kv-store": "0.0.1-commit.b655e406",
+    "@aztec/l1-artifacts": "0.0.1-commit.b655e406",
+    "@aztec/node-keystore": "0.0.1-commit.b655e406",
+    "@aztec/node-lib": "0.0.1-commit.b655e406",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.b655e406",
+    "@aztec/p2p": "0.0.1-commit.b655e406",
+    "@aztec/protocol-contracts": "0.0.1-commit.b655e406",
+    "@aztec/prover-client": "0.0.1-commit.b655e406",
+    "@aztec/sequencer-client": "0.0.1-commit.b655e406",
+    "@aztec/simulator": "0.0.1-commit.b655e406",
+    "@aztec/stdlib": "0.0.1-commit.b655e406",
+    "@aztec/telemetry-client": "0.0.1-commit.b655e406",
+    "@aztec/world-state": "0.0.1-commit.b655e406",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0",
-    "viem": "2.22.8"
+    "viem": "npm:@spalladino/viem@2.38.2-eip7594.0"
   },
   "devDependencies": {
-    "@jest/globals": "^29.5.0",
-    "@types/jest": "^29.5.0",
-    "@types/memdown": "^3.0.0",
-    "@types/node": "^18.7.23",
+    "@jest/globals": "^30.0.0",
+    "@types/jest": "^30.0.0",
+    "@types/node": "^22.15.17",
     "@types/source-map-support": "^0.5.10",
-    "jest": "^29.5.0",
-    "jest-mock-extended": "^3.0.3",
+    "jest": "^30.0.0",
+    "jest-mock-extended": "^4.0.0",
     "ts-node": "^10.9.1",
-    "typescript": "^5.0.4"
+    "typescript": "^5.3.3"
   },
   "files": [
     "dest",
@@ -93,6 +98,6 @@
   ],
   "types": "./dest/index.d.ts",
   "engines": {
-    "node": ">=18"
+    "node": ">=20.10"
   }
 }

package/src/actions/download-epoch-proving-job.ts

@@ -0,0 +1,44 @@
+import { jsonParseWithSchema } from '@aztec/foundation/json-rpc';
+import type { Logger } from '@aztec/foundation/log';
+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: string,
+  log: Logger,
+  config: {
+    dataDirectory: string;
+    jobDataDownloadPath: string;
+  },
+) {
+  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/src/actions/index.ts

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