@aztec/prover-node 0.86.0 → 0.87.0

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

@@ -11,20 +11,18 @@ import { Timer } from '@aztec/foundation/timer';
 import { EpochProvingJobTerminalState } from '@aztec/stdlib/interfaces/server';
 import { Attributes, trackSpan } from '@aztec/telemetry-client';
 import * as crypto from 'node:crypto';
+import { validateEpochProvingJobData } from './epoch-proving-job-data.js';
 /**
  * Job that grabs a range of blocks from the unfinalised chain from L1, gets their txs given their hashes,
  * re-executes their public calls, generates a rollup proof, and submits it to L1. This job will update the
  * world state as part of public call execution via the public processor.
  */ export class EpochProvingJob {
+    data;
     dbProvider;
-    epochNumber;
-    blocks;
-    txs;
     prover;
     publicProcessorFactory;
     publisher;
     l2BlockSource;
-    l1ToL2MessageSource;
     metrics;
     deadline;
     config;
@@ -35,23 +33,19 @@ import * as crypto from 'node:crypto';
     epochCheckPromise;
     deadlineTimeoutHandler;
     tracer;
-    constructor(dbProvider, epochNumber, blocks, txs, prover, publicProcessorFactory, publisher, l2BlockSource, l1ToL2MessageSource, metrics, deadline, config = {
-        parallelBlockLimit: 32
-    }){
+    constructor(data, dbProvider, prover, publicProcessorFactory, publisher, l2BlockSource, metrics, deadline, config){
+        this.data = data;
         this.dbProvider = dbProvider;
-        this.epochNumber = epochNumber;
-        this.blocks = blocks;
-        this.txs = txs;
         this.prover = prover;
         this.publicProcessorFactory = publicProcessorFactory;
         this.publisher = publisher;
         this.l2BlockSource = l2BlockSource;
-        this.l1ToL2MessageSource = l1ToL2MessageSource;
         this.metrics = metrics;
         this.deadline = deadline;
         this.config = config;
         this.state = 'initialized';
         this.log = createLogger('prover-node:epoch-proving-job');
+        validateEpochProvingJobData(data);
         this.uuid = crypto.randomUUID();
         this.tracer = metrics.tracer;
     }
@@ -62,16 +56,30 @@ import * as crypto from 'node:crypto';
         return this.state;
     }
     getEpochNumber() {
-        return this.epochNumber;
+        return this.data.epochNumber;
     }
     getDeadline() {
         return this.deadline;
     }
+    getProvingData() {
+        return this.data;
+    }
+    get epochNumber() {
+        return this.data.epochNumber;
+    }
+    get blocks() {
+        return this.data.blocks;
+    }
+    get txs() {
+        return this.data.txs;
+    }
     /**
    * Proves the given epoch and submits the proof to L1.
    */ async run() {
         this.scheduleDeadlineStop();
-        await this.scheduleEpochCheck();
+        if (!this.config.skipEpochCheck) {
+            await this.scheduleEpochCheck();
+        }
         const epochNumber = Number(this.epochNumber);
         const epochSizeBlocks = this.blocks.length;
         const epochSizeTxs = this.blocks.reduce((total, current)=>total + current.body.txEffects.length, 0);
@@ -93,12 +101,12 @@ import * as crypto from 'node:crypto';
         try {
             this.prover.startNewEpoch(epochNumber, fromBlock, epochSizeBlocks);
             await this.prover.startTubeCircuits(this.txs);
-            await asyncPool(this.config.parallelBlockLimit, this.blocks, async (block)=>{
+            await asyncPool(this.config.parallelBlockLimit ?? 32, this.blocks, async (block)=>{
                 this.checkState();
                 const globalVariables = block.header.globalVariables;
                 const txs = await this.getTxs(block);
-                const l1ToL2Messages = await this.getL1ToL2Messages(block);
-                const previousHeader = await this.getBlockHeader(block.number - 1);
+                const l1ToL2Messages = this.getL1ToL2Messages(block);
+                const previousHeader = this.getBlockHeader(block.number - 1);
                 this.log.verbose(`Starting processing block ${block.number}`, {
                     number: block.number,
                     blockHash: (await block.hash()).toString(),
@@ -217,9 +225,14 @@ import * as crypto from 'node:crypto';
    * Kicks off a running promise that queries the archiver for the set of L2 blocks of the current epoch.
    * If those change, stops the proving job with a `rerun` state, so the node re-enqueues it.
    */ async scheduleEpochCheck() {
-        const intervalMs = Math.ceil((await this.l2BlockSource.getL1Constants()).ethereumSlotDuration / 2) * 1000;
+        const l2BlockSource = this.l2BlockSource;
+        if (!l2BlockSource) {
+            this.log.warn(`No L2 block source available, skipping epoch check`);
+            return;
+        }
+        const intervalMs = Math.ceil((await l2BlockSource.getL1Constants()).ethereumSlotDuration / 2) * 1000;
         this.epochCheckPromise = new RunningPromise(async ()=>{
-            const blocks = await this.l2BlockSource.getBlockHeadersForEpoch(this.epochNumber);
+            const blocks = await l2BlockSource.getBlockHeadersForEpoch(this.epochNumber);
             const blockHashes = await Promise.all(blocks.map((block)=>block.hash()));
             const thisBlockHashes = await Promise.all(this.blocks.map((block)=>block.hash()));
             if (blocks.length !== this.blocks.length || !blockHashes.every((block, i)=>block.equals(thisBlockHashes[i]))) {
@@ -234,11 +247,15 @@ import * as crypto from 'node:crypto';
         }, this.log, intervalMs).start();
         this.log.verbose(`Scheduled epoch check for epoch ${this.epochNumber} every ${intervalMs}ms`);
     }
-    /* Returns the header for the given block number, or the genesis block for block zero. */ async getBlockHeader(blockNumber) {
-        if (blockNumber === 0) {
-            return (await this.dbProvider.fork()).getInitialHeader();
+    /* Returns the header for the given block number based on the epoch proving job data. */ getBlockHeader(blockNumber) {
+        const block = this.blocks.find((b)=>b.number === blockNumber);
+        if (block) {
+            return block.header;
+        }
+        if (blockNumber === Number(this.data.previousBlockHeader.getBlockNumber())) {
+            return this.data.previousBlockHeader;
         }
-        return this.l2BlockSource.getBlockHeader(blockNumber);
+        throw new Error(`Block header not found for block number ${blockNumber} (got ${this.blocks.map((b)=>b.number).join(', ')} and previous header ${this.data.previousBlockHeader.getBlockNumber()})`);
     }
     async getTxs(block) {
         const txHashes = block.body.txEffects.map((tx)=>tx.txHash.toBigInt());
@@ -249,7 +266,7 @@ import * as crypto from 'node:crypto';
         return txsAndHashes.filter((txAndHash)=>txHashes.includes(txAndHash.hash.toBigInt())).map((txAndHash)=>txAndHash.tx);
     }
     getL1ToL2Messages(block) {
-        return this.l1ToL2MessageSource.getL1ToL2Messages(BigInt(block.number));
+        return this.data.l1ToL2Messages[block.number];
     }
     async processTxs(publicProcessor, txs) {
         const { deadline } = this;
@@ -269,7 +286,7 @@ import * as crypto from 'node:crypto';
 _ts_decorate([
     trackSpan('EpochProvingJob.run', function() {
         return {
-            [Attributes.EPOCH_NUMBER]: Number(this.epochNumber)
+            [Attributes.EPOCH_NUMBER]: Number(this.data.epochNumber)
         };
     })
 ], EpochProvingJob.prototype, "run", null);

package/dest/metrics.js

@@ -217,7 +217,7 @@ export class ProverNodePublisherMetrics {
         this.txBlobDataGasUsed.record(Number(stats.blobGasUsed), attributes);
         try {
             this.gasPrice.record(parseInt(formatEther(stats.gasPrice, 'gwei'), 10));
-        } catch (e) {
+        } catch  {
         // ignore
         }
         const executionFee = stats.gasUsed * stats.gasPrice;
@@ -225,7 +225,7 @@ export class ProverNodePublisherMetrics {
         const totalFee = executionFee + blobFee;
         try {
             this.txTotalFee.record(parseFloat(formatEther(totalFee)));
-        } catch (e) {
+        } catch  {
         // ignore
         }
     }

package/dest/prover-coordination/combined-prover-coordination.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"combined-prover-coordination.d.ts","sourceRoot":"","sources":["../../src/prover-coordination/combined-prover-coordination.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrF,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEnD,MAAM,MAAM,2BAA2B,GAAG;IAExC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,qCAAqC,EAAE,MAAM,CAAC;CAC/C,CAAC;AASF,MAAM,WAAW,QAAQ;IACvB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC;CAC/D;AAsCD,qBAAa,0BAA2B,YAAW,kBAAkB;;aAEjD,GAAG,EAAE,GAAG,GAAG,SAAS;aACpB,UAAU,EAAE,QAAQ,EAAE;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO;IAIxB,OAAO,CAAC,QAAQ,CAAC,GAAG;gBANJ,GAAG,EAAE,GAAG,GAAG,SAAS,EACpB,UAAU,EAAE,QAAQ,EAAE,EACrB,OAAO,GAAE,2BAGzB,EACgB,GAAG,yCAA2D;IAG1E,YAAY,IAAI,SAAS,GAAG,SAAS;IAI/B,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC;IAY/C,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAyE1D"}
+{"version":3,"file":"combined-prover-coordination.d.ts","sourceRoot":"","sources":["../../src/prover-coordination/combined-prover-coordination.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrF,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEnD,MAAM,MAAM,2BAA2B,GAAG;IAExC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,qCAAqC,EAAE,MAAM,CAAC;CAC/C,CAAC;AASF,MAAM,WAAW,QAAQ;IACvB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC;CAC/D;AAsCD,qBAAa,0BAA2B,YAAW,kBAAkB;;aAEjD,GAAG,EAAE,GAAG,GAAG,SAAS;aACpB,UAAU,EAAE,QAAQ,EAAE;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO;IAIxB,OAAO,CAAC,QAAQ,CAAC,GAAG;gBANJ,GAAG,EAAE,GAAG,GAAG,SAAS,EACpB,UAAU,EAAE,QAAQ,EAAE,EACrB,OAAO,GAAE,2BAGzB,EACgB,GAAG,yCAA2D;IAG1E,YAAY,IAAI,SAAS,GAAG,SAAS;IAI/B,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC;IAY/C,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CA4E1D"}

package/dest/prover-coordination/combined-prover-coordination.js

@@ -75,7 +75,7 @@ export class CombinedProverCoordination {
         const notFound = txHashes.filter((_, index)=>!availability[index]);
         const txsToFind = new Set(notFound.map((tx)=>tx.toString()));
         if (txsToFind.size === 0) {
-            this.log.info(`Check for ${txHashes.length} txs found all in the pool}`);
+            this.log.info(`Check for ${txHashes.length} txs found all in the pool`);
             return;
         }
         this.log.info(`Check for ${txHashes.length} txs found ${txsToFind.size} missing. Will gather from nodes and p2p`);
@@ -90,13 +90,16 @@ export class CombinedProverCoordination {
         const foundFromP2P = await pool.getTxsByHash([
             ...txsToFind
         ].map((tx)=>TxHash.fromString(tx)));
+        // TODO(!!): test for this
+        // getTxsByHash returns undefined for transactions that are not found, so it must be filtered to find the true length
+        const foundFromP2PLength = foundFromP2P.filter((tx)=>!!tx).length;
         const numFoundFromNodes = originalToFind - toFindFromP2P;
-        const numNotFound = toFindFromP2P - foundFromP2P.length;
+        const numNotFound = toFindFromP2P - foundFromP2PLength;
         if (numNotFound === 0) {
-            this.log.info(`Found all ${originalToFind} txs. ${numFoundFromNodes} from nodes, ${foundFromP2P.length} from p2p`);
+            this.log.info(`Found all ${originalToFind} txs. ${numFoundFromNodes} from nodes, ${foundFromP2PLength} from p2p`);
             return;
         }
-        this.log.warn(`Failed to find ${numNotFound} txs from any source. Found ${foundFromP2P.length} from p2p and ${numFoundFromNodes} from nodes`);
+        this.log.warn(`Failed to find ${numNotFound} txs from any source. Found ${foundFromP2PLength} from p2p and ${numFoundFromNodes} from nodes`);
     }
     async #gatherTxsFromAllNodes(txsToFind, pool) {
         if (txsToFind.size === 0 || this.aztecNodes.length === 0) {

package/dest/prover-coordination/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/prover-coordination/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAAyB,MAAM,0BAA0B,CAAC;AAE1F,MAAM,MAAM,wBAAwB,GAAG;IACrC,0BAA0B,EAAE,MAAM,EAAE,CAAC;CACtC,CAAC;AAEF,eAAO,MAAM,gCAAgC,EAAE,kBAAkB,CAAC,wBAAwB,CAMzF,CAAC;AAEF,wBAAgB,0BAA0B,IAAI,wBAAwB,CAErE"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/prover-coordination/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAAyB,MAAM,0BAA0B,CAAC;AAE1F,MAAM,MAAM,wBAAwB,GAAG;IACrC,0BAA0B,EAAE,MAAM,EAAE,CAAC;CACtC,CAAC;AAEF,eAAO,MAAM,gCAAgC,EAAE,kBAAkB,CAAC,wBAAwB,CAOzF,CAAC;AAEF,wBAAgB,0BAA0B,IAAI,wBAAwB,CAErE"}

package/dest/prover-coordination/config.js

@@ -3,7 +3,8 @@ export const proverCoordinationConfigMappings = {
     proverCoordinationNodeUrls: {
         env: 'PROVER_COORDINATION_NODE_URLS',
         description: 'The URLs of the tx provider nodes',
-        parseEnv: (val)=>val.split(',').map((url)=>url.trim().replace(/\/$/, ''))
+        parseEnv: (val)=>val.split(',').map((url)=>url.trim().replace(/\/$/, '')),
+        defaultValue: []
     }
 };
 export function getTxProviderConfigFromEnv() {

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

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/prover-coordination/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAK9D,OAAO,KAAK,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAGlG,OAAO,EAAE,KAAK,eAAe,EAAmB,MAAM,yBAAyB,CAAC;AAEhF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAGL,KAAK,QAAQ,EACd,MAAM,mCAAmC,CAAC;AAG3C,KAAK,sBAAsB,GAAG;IAC5B,mBAAmB,CAAC,EAAE,QAAQ,CAAC;IAC/B,sBAAsB,EAAE,sBAAsB,CAAC;IAC/C,QAAQ,EAAE,QAAQ,GAAG,aAAa,CAAC;IACnC,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAEF;;;;;GAKG;AACH,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,gBAAgB,GAAG,eAAe,EAC1C,IAAI,EAAE,sBAAsB,GAC3B,OAAO,CAAC,kBAAkB,CAAC,CA2C7B"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/prover-coordination/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAK9D,OAAO,KAAK,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAIlG,OAAO,EAAE,KAAK,eAAe,EAAmB,MAAM,yBAAyB,CAAC;AAEhF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAGL,KAAK,QAAQ,EACd,MAAM,mCAAmC,CAAC;AAG3C,KAAK,sBAAsB,GAAG;IAC5B,mBAAmB,CAAC,EAAE,QAAQ,CAAC;IAC/B,sBAAsB,EAAE,sBAAsB,CAAC;IAC/C,QAAQ,EAAE,QAAQ,GAAG,aAAa,CAAC;IACnC,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAEF;;;;;GAKG;AACH,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,gBAAgB,GAAG,eAAe,EAC1C,IAAI,EAAE,sBAAsB,GAC3B,OAAO,CAAC,kBAAkB,CAAC,CA6C7B"}

package/dest/prover-coordination/factory.js

@@ -5,6 +5,7 @@ import { createP2PClient } from '@aztec/p2p';
 import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
 import { createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
 import { P2PClientType } from '@aztec/stdlib/p2p';
+import { getPackageVersion } from '@aztec/stdlib/update-checker';
 import { getComponentsVersionsFromConfig } from '@aztec/stdlib/versioning';
 import { makeTracedFetch } from '@aztec/telemetry-client';
 import { CombinedProverCoordination } from './combined-prover-coordination.js';
@@ -32,17 +33,20 @@ import { CombinedProverCoordination } from './combined-prover-coordination.js';
         }
     }
     let nodes = [];
-    if (config.proverCoordinationNodeUrls.length > 0) {
+    if (config.proverCoordinationNodeUrls && config.proverCoordinationNodeUrls.length > 0) {
         log.info('Using prover coordination via node urls');
         const versions = getComponentsVersionsFromConfig(config, protocolContractTreeRoot, getVKTreeRoot());
-        nodes = config.proverCoordinationNodeUrls.map((url)=>createAztecNodeClient(url, versions, makeTracedFetch([
+        nodes = config.proverCoordinationNodeUrls.map((url)=>{
+            log.info(`Creating aztec node client for prover coordination with url: ${url}`);
+            return createAztecNodeClient(url, versions, makeTracedFetch([
                 1,
                 2,
                 3
-            ], false)));
+            ], false));
+        });
     }
     const proofVerifier = config.realProofs ? await BBCircuitVerifier.new(config) : new TestCircuitVerifier();
-    const p2pClient = await createP2PClient(P2PClientType.Prover, config, deps.archiver, proofVerifier, deps.worldStateSynchronizer, deps.epochCache, deps.telemetry);
+    const p2pClient = await createP2PClient(P2PClientType.Prover, config, deps.archiver, proofVerifier, deps.worldStateSynchronizer, deps.epochCache, getPackageVersion() ?? '', deps.telemetry);
     await p2pClient.start();
     return new CombinedProverCoordination(p2pClient, nodes, coordinationConfig);
 }

package/dest/prover-node.d.ts

@@ -1,48 +1,46 @@
-import type { Maybe } from '@aztec/foundation/types';
+import type { Fr } from '@aztec/foundation/fields';
+import type { DataStoreConfig } from '@aztec/kv-store/config';
 import { PublicProcessorFactory } from '@aztec/simulator/server';
-import type { L2Block, L2BlockSource } from '@aztec/stdlib/block';
+import type { L2BlockSource } from '@aztec/stdlib/block';
+import type { ChainConfig } from '@aztec/stdlib/config';
 import type { ContractDataSource } from '@aztec/stdlib/contract';
 import { type EpochProverManager, type ProverCoordination, type ProverNodeApi, type Service, type WorldStateSyncStatus, type WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
 import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
-import type { Tx } from '@aztec/stdlib/tx';
 import { type TelemetryClient, type Traceable, type Tracer } from '@aztec/telemetry-client';
+import type { SpecificProverNodeConfig } from './config.js';
+import type { EpochProvingJobData } from './job/epoch-proving-job-data.js';
 import { EpochProvingJob, type EpochProvingJobState } from './job/epoch-proving-job.js';
 import type { EpochMonitor, EpochMonitorHandler } from './monitors/epoch-monitor.js';
 import type { ProverNodePublisher } from './prover-node-publisher.js';
-export type ProverNodeOptions = {
-    pollingIntervalMs: number;
-    maxPendingJobs: number;
-    maxParallelBlocksPerEpoch: number;
-    txGatheringIntervalMs: number;
-};
+type ProverNodeOptions = SpecificProverNodeConfig & Partial<DataStoreOptions>;
+type DataStoreOptions = Pick<DataStoreConfig, 'dataDirectory'> & Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'>;
 /**
- * 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 unfinalised 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 declare class ProverNode implements EpochMonitorHandler, ProverNodeApi, Traceable {
     protected readonly prover: EpochProverManager;
     protected readonly publisher: ProverNodePublisher;
-    protected readonly l2BlockSource: L2BlockSource & Maybe<Service>;
+    protected readonly l2BlockSource: L2BlockSource & Partial<Service>;
     protected readonly l1ToL2MessageSource: L1ToL2MessageSource;
     protected readonly contractDataSource: ContractDataSource;
     protected readonly worldState: WorldStateSynchronizer;
-    protected readonly coordination: ProverCoordination;
+    protected readonly coordination: ProverCoordination & Partial<Service>;
     protected readonly epochsMonitor: EpochMonitor;
     protected readonly telemetryClient: TelemetryClient;
     private log;
     private dateProvider;
     private jobs;
-    private options;
+    private config;
     private jobMetrics;
     private rewardsMetrics;
     private l1Metrics;
     private txFetcher;
     private lastBlockNumber;
     readonly tracer: Tracer;
-    constructor(prover: EpochProverManager, publisher: ProverNodePublisher, l2BlockSource: L2BlockSource & Maybe<Service>, l1ToL2MessageSource: L1ToL2MessageSource, contractDataSource: ContractDataSource, worldState: WorldStateSynchronizer, coordination: ProverCoordination, epochsMonitor: EpochMonitor, options?: Partial<ProverNodeOptions>, telemetryClient?: TelemetryClient);
-    getProverId(): import("@aztec/foundation/schemas").Fr;
+    constructor(prover: EpochProverManager, publisher: ProverNodePublisher, l2BlockSource: L2BlockSource & Partial<Service>, l1ToL2MessageSource: L1ToL2MessageSource, contractDataSource: ContractDataSource, worldState: WorldStateSynchronizer, coordination: ProverCoordination & Partial<Service>, epochsMonitor: EpochMonitor, config?: Partial<ProverNodeOptions>, telemetryClient?: TelemetryClient);
+    getProverId(): Fr;
     getP2P(): import("@aztec/stdlib/interfaces/server").P2PClient | undefined;
     /**
      * Handles an epoch being completed by starting a proof for it if there are no active jobs for it.
@@ -68,6 +66,7 @@ export declare class ProverNode implements EpochMonitorHandler, ProverNodeApi, T
      */
     startProof(epochNumber: number | bigint): Promise<void>;
     private runJob;
+    protected tryUploadEpochFailure(job: EpochProvingJob): Promise<string | undefined>;
     /**
      * Returns the prover instance.
      */
@@ -92,9 +91,15 @@ export declare class ProverNode implements EpochMonitorHandler, ProverNodeApi, T
     private gatherEpochData;
     private gatherBlocks;
     private gatherTxs;
+    private gatherMessages;
+    private gatherPreviousBlockHeader;
     /** Extracted for testing purposes. */
-    protected doCreateEpochProvingJob(epochNumber: bigint, deadline: Date | undefined, blocks: L2Block[], txs: Tx[], publicProcessorFactory: PublicProcessorFactory): EpochProvingJob;
+    protected doCreateEpochProvingJob(data: EpochProvingJobData, deadline: Date | undefined, publicProcessorFactory: PublicProcessorFactory, opts?: {
+        skipEpochCheck?: boolean;
+    }): EpochProvingJob;
     /** Extracted for testing purposes. */
     protected triggerMonitors(): Promise<void>;
+    private validateConfig;
 }
+export {};
 //# sourceMappingURL=prover-node.d.ts.map

package/dest/prover-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prover-node.d.ts","sourceRoot":"","sources":["../src/prover-node.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"prover-node.d.ts","sourceRoot":"","sources":["../src/prover-node.ts"],"names":[],"mappings":"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"}

package/dest/prover-node.js

@@ -4,7 +4,7 @@ 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 { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
@@ -14,12 +14,12 @@ import { PublicProcessorFactory } from '@aztec/simulator/server';
 import { getProofSubmissionDeadlineTimestamp } from '@aztec/stdlib/epoch-helpers';
 import { EpochProvingJobTerminalState, tryStop } from '@aztec/stdlib/interfaces/server';
 import { Attributes, L1Metrics, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
+import { uploadEpochProofFailure } from './actions/upload-epoch-proof-failure.js';
 import { EpochProvingJob } from './job/epoch-proving-job.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 unfinalised 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;
@@ -34,14 +34,14 @@ import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
     log;
     dateProvider;
     jobs;
-    options;
+    config;
     jobMetrics;
     rewardsMetrics;
     l1Metrics;
     txFetcher;
     lastBlockNumber;
     tracer;
-    constructor(prover, publisher, l2BlockSource, l1ToL2MessageSource, contractDataSource, worldState, coordination, epochsMonitor, options = {}, telemetryClient = getTelemetryClient()){
+    constructor(prover, publisher, l2BlockSource, l1ToL2MessageSource, contractDataSource, worldState, coordination, epochsMonitor, config = {}, telemetryClient = getTelemetryClient()){
         this.prover = prover;
         this.publisher = publisher;
         this.l2BlockSource = l2BlockSource;
@@ -57,18 +57,22 @@ import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
         this.l1Metrics = new L1Metrics(telemetryClient.getMeter('ProverNodeL1Metrics'), publisher.l1TxUtils.client, [
             publisher.getSenderAddress()
         ]);
-        this.options = {
-            pollingIntervalMs: 1_000,
-            maxPendingJobs: 100,
-            maxParallelBlocksPerEpoch: 32,
+        this.config = {
+            proverNodePollingIntervalMs: 1_000,
+            proverNodeMaxPendingJobs: 100,
+            proverNodeMaxParallelBlocksPerEpoch: 32,
             txGatheringIntervalMs: 1_000,
-            ...compact(options)
+            txGatheringBatchSize: 10,
+            txGatheringMaxParallelRequestsPerNode: 100,
+            proverNodeFailedEpochStore: undefined,
+            ...compact(config)
         };
+        this.validateConfig();
         const meter = telemetryClient.getMeter('ProverNode');
         this.tracer = telemetryClient.getTracer('ProverNode');
         this.jobMetrics = new ProverNodeJobMetrics(meter, telemetryClient.getTracer('EpochProvingJob'));
         this.rewardsMetrics = new ProverNodeRewardsMetrics(meter, EthAddress.fromField(this.prover.getProverId()), this.publisher.getRollupContract());
-        this.txFetcher = new RunningPromise(()=>this.checkForTxs(), this.log, this.options.txGatheringIntervalMs);
+        this.txFetcher = new RunningPromise(()=>this.checkForTxs(), this.log, this.config.txGatheringIntervalMs);
     }
     getProverId() {
         return this.prover.getProverId();
@@ -111,7 +115,7 @@ import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
         this.epochsMonitor.start(this);
         this.l1Metrics.start();
         await this.rewardsMetrics.start();
-        this.log.info(`Started Prover Node with prover id ${this.prover.getProverId().toString()}`, this.options);
+        this.log.info(`Started Prover Node with prover id ${this.prover.getProverId().toString()}`, this.config);
     }
     /**
    * Stops the prover node and all its dependencies.
@@ -140,29 +144,42 @@ import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
     /**
    * Starts a proving process and returns immediately.
    */ async startProof(epochNumber) {
-        const job = await this.createProvingJob(BigInt(epochNumber));
+        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: job.getEpochNumber()
+            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 ${job.getEpochNumber()} due to reorg`, ctx);
-                await this.createProvingJob(job.getEpochNumber());
+                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 ${job.getEpochNumber()} exited with state ${state}`, ctx);
+                this.log.verbose(`Job for ${epochNumber} exited with state ${state}`, ctx);
             }
         } catch (err) {
-            this.log.error(`Error proving epoch ${job.getEpochNumber()}`, err, ctx);
+            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.
    */ getProver() {
@@ -183,25 +200,26 @@ import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } 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 { blocks, txs } = 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();
+        // 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);
+        // 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(epochNumber, deadline, blocks, txs, publicProcessorFactory);
+        const job = this.doCreateEpochProvingJob(epochData, deadline, publicProcessorFactory, opts);
         this.jobs.set(job.getId(), job);
         return job;
     }
@@ -222,12 +240,16 @@ import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
         }
     }
     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 l1ToL2Messages = await this.gatherMessages(epochNumber, blocks);
+        const previousBlockHeader = await this.gatherPreviousBlockHeader(epochNumber, blocks[0]);
         return {
             blocks,
-            txs
+            txs,
+            l1ToL2Messages,
+            epochNumber,
+            previousBlockHeader
         };
     }
     async gatherBlocks(epochNumber) {
@@ -250,14 +272,43 @@ import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
         const missingTxHashes = txsToFind.filter((txHashToFind)=>!txHashesFound.some((txHashFound)=>txHashToFind.equals(txHashFound))).join(', ');
         throw new Error(`Txs not found for epoch ${epochNumber}: ${missingTxHashes}`);
     }
-    /** Extracted for testing purposes. */ doCreateEpochProvingJob(epochNumber, deadline, blocks, txs, publicProcessorFactory) {
-        return new EpochProvingJob(this.worldState, epochNumber, blocks, txs, this.prover.createEpochProver(), publicProcessorFactory, this.publisher, this.l2BlockSource, this.l1ToL2MessageSource, this.jobMetrics, deadline, {
-            parallelBlockLimit: this.options.maxParallelBlocksPerEpoch
+    async gatherMessages(epochNumber, blocks) {
+        const messages = await Promise.all(blocks.map((b)=>this.l1ToL2MessageSource.getL1ToL2Messages(BigInt(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(data, deadline, publicProcessorFactory, opts = {}) {
+        const { proverNodeMaxParallelBlocksPerEpoch: parallelBlockLimit } = this.config;
+        return new EpochProvingJob(data, this.worldState, this.prover.createEpochProver(), publicProcessorFactory, this.publisher, this.l2BlockSource, this.jobMetrics, deadline, {
+            parallelBlockLimit,
+            ...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)=>({

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;IACvB,MAAM,EAAE,kBAAkB,CAAC;IAC3B,SAAS,EAAE,mBAAmB,CAAC;CAC/C;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"}