@aztec/prover-node 0.85.0-alpha-testnet.2 → 0.85.0-alpha-testnet.3

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

@@ -4,12 +4,13 @@ import type { DataStoreConfig } from '@aztec/kv-store/config';
 import type { ProverCoordination, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 import type { ProverNodeConfig } from '../config.js';
+import { type TxSource } from './combined-prover-coordination.js';
 type ProverCoordinationDeps = {
-    aztecNodeTxProvider?: ProverCoordination;
-    worldStateSynchronizer?: WorldStateSynchronizer;
-    archiver?: Archiver | ArchiveSource;
+    aztecNodeTxProvider?: TxSource;
+    worldStateSynchronizer: WorldStateSynchronizer;
+    archiver: Archiver | ArchiveSource;
     telemetry?: TelemetryClient;
-    epochCache?: EpochCache;
+    epochCache: EpochCache;
 };
 /**
  * Creates a prover coordination service.

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;AAGrD,KAAK,sBAAsB,GAAG;IAC5B,mBAAmB,CAAC,EAAE,kBAAkB,CAAC;IACzC,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;IAChD,QAAQ,CAAC,EAAE,QAAQ,GAAG,aAAa,CAAC;IACpC,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB,CAAC;AAEF;;;;;GAKG;AACH,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,gBAAgB,GAAG,eAAe,EAC1C,IAAI,EAAE,sBAAsB,GAC3B,OAAO,CAAC,kBAAkB,CAAC,CAqC7B"}
+{"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,CA4C7B"}

package/dest/prover-coordination/factory.js

@@ -7,6 +7,7 @@ import { createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
 import { P2PClientType } from '@aztec/stdlib/p2p';
 import { getComponentsVersionsFromConfig } from '@aztec/stdlib/versioning';
 import { makeTracedFetch } from '@aztec/telemetry-client';
+import { CombinedProverCoordination } from './combined-prover-coordination.js';
 /**
  * Creates a prover coordination service.
  * If p2p is enabled, prover coordination is done via p2p.
@@ -14,29 +15,37 @@ import { makeTracedFetch } from '@aztec/telemetry-client';
  * If an aztec node is provided, it is returned directly.
  */ export async function createProverCoordination(config, deps) {
     const log = createLogger('prover-node:prover-coordination');
+    const coordinationConfig = {
+        txGatheringBatchSize: config.txGatheringBatchSize ?? 10,
+        txGatheringMaxParallelRequestsPerNode: config.txGatheringMaxParallelRequestsPerNode ?? 10
+    };
     if (deps.aztecNodeTxProvider) {
         log.info('Using prover coordination via aztec node');
-        return deps.aztecNodeTxProvider;
+        return new CombinedProverCoordination(undefined, [
+            deps.aztecNodeTxProvider
+        ], coordinationConfig);
     }
     if (config.p2pEnabled) {
         log.info('Using prover coordination via p2p');
         if (!deps.archiver || !deps.worldStateSynchronizer || !deps.telemetry || !deps.epochCache) {
             throw new Error('Missing dependencies for p2p prover coordination');
         }
-        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);
-        await p2pClient.start();
-        return p2pClient;
     }
-    if (config.proverCoordinationNodeUrl) {
-        log.info('Using prover coordination via node url');
+    let nodes = [];
+    if (config.proverCoordinationNodeUrls && config.proverCoordinationNodeUrls.length > 0) {
+        log.info('Using prover coordination via node urls');
         const versions = getComponentsVersionsFromConfig(config, protocolContractTreeRoot, getVKTreeRoot());
-        return createAztecNodeClient(config.proverCoordinationNodeUrl, versions, makeTracedFetch([
-            1,
-            2,
-            3
-        ], false));
-    } else {
-        throw new Error(`Aztec Node URL for Tx Provider is not set.`);
+        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));
+        });
     }
+    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);
+    await p2pClient.start();
+    return new CombinedProverCoordination(p2pClient, nodes, coordinationConfig);
 }

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

@@ -36,6 +36,7 @@ export declare class ProverNodePublisher {
         l1TxUtils: L1TxUtils;
         telemetry?: TelemetryClient;
     });
+    getRollupContract(): RollupContract;
     /**
      * Calling `interrupt` will cause any in progress call to `publishRollup` to return `false` asap.
      * Be warned, the call may return false even if the tx subsequently gets successfully mined.

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

@@ -1 +1 @@
-{"version":3,"file":"prover-node-publisher.d.ts","sourceRoot":"","sources":["../src/prover-node-publisher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGjE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAIzD,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAEjF,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAMnF;;GAEG;AACH,sEAAsE;AACtE,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,EAAE,CAAC;IACpB,UAAU,EAAE,EAAE,CAAC;IACf,iBAAiB,EAAE,EAAE,CAAC;IACtB,YAAY,EAAE,EAAE,CAAC;IACjB,YAAY,EAAE,EAAE,CAAC;IACjB,OAAO,EAAE,EAAE,CAAC;IACZ,QAAQ,EAAE,EAAE,CAAC;IACb,IAAI,EAAE,KAAK,CAAC,YAAY,EAAE,OAAO,wBAAwB,CAAC,CAAC;IAC3D,KAAK,EAAE,KAAK,CAAC;CACd,CAAC;AAEF,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,kBAAkB,CAA4B;IACtD,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,OAAO,CAAoB;IAEnC,SAAS,CAAC,GAAG,yCAA+C;IAE5D,SAAS,CAAC,cAAc,EAAE,cAAc,CAAC;IAEzC,SAAgB,SAAS,EAAE,SAAS,CAAC;gBAGnC,MAAM,EAAE,cAAc,GAAG,eAAe,EACxC,IAAI,EAAE;QACJ,cAAc,EAAE,cAAc,CAAC;QAC/B,SAAS,EAAE,SAAS,CAAC;QACrB,SAAS,CAAC,EAAE,eAAe,CAAC;KAC7B;IAYH;;;;;OAKG;IACI,SAAS;IAKhB,wDAAwD;IACjD,OAAO;IAIP,gBAAgB;IAIV,gBAAgB,CAAC,IAAI,EAAE;QAClC,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,YAAY,EAAE,sBAAsB,CAAC;QACrC,KAAK,EAAE,KAAK,CAAC;KACd,GAAG,OAAO,CAAC,OAAO,CAAC;YA+CN,4BAA4B;YAwD5B,sBAAsB;IAmDpC,OAAO,CAAC,uBAAuB;cA8Bf,kBAAkB;CAGnC"}
+{"version":3,"file":"prover-node-publisher.d.ts","sourceRoot":"","sources":["../src/prover-node-publisher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGjE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAIzD,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAEjF,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAMnF;;GAEG;AACH,sEAAsE;AACtE,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,EAAE,CAAC;IACpB,UAAU,EAAE,EAAE,CAAC;IACf,iBAAiB,EAAE,EAAE,CAAC;IACtB,YAAY,EAAE,EAAE,CAAC;IACjB,YAAY,EAAE,EAAE,CAAC;IACjB,OAAO,EAAE,EAAE,CAAC;IACZ,QAAQ,EAAE,EAAE,CAAC;IACb,IAAI,EAAE,KAAK,CAAC,YAAY,EAAE,OAAO,wBAAwB,CAAC,CAAC;IAC3D,KAAK,EAAE,KAAK,CAAC;CACd,CAAC;AAEF,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,kBAAkB,CAA4B;IACtD,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,OAAO,CAA6B;IAE5C,SAAS,CAAC,GAAG,yCAA+C;IAE5D,SAAS,CAAC,cAAc,EAAE,cAAc,CAAC;IAEzC,SAAgB,SAAS,EAAE,SAAS,CAAC;gBAGnC,MAAM,EAAE,cAAc,GAAG,eAAe,EACxC,IAAI,EAAE;QACJ,cAAc,EAAE,cAAc,CAAC;QAC/B,SAAS,EAAE,SAAS,CAAC;QACrB,SAAS,CAAC,EAAE,eAAe,CAAC;KAC7B;IAYI,iBAAiB;IAIxB;;;;;OAKG;IACI,SAAS;IAKhB,wDAAwD;IACjD,OAAO;IAIP,gBAAgB;IAIV,gBAAgB,CAAC,IAAI,EAAE;QAClC,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,YAAY,EAAE,sBAAsB,CAAC;QACrC,KAAK,EAAE,KAAK,CAAC;KACd,GAAG,OAAO,CAAC,OAAO,CAAC;YA+CN,4BAA4B;YAwD5B,sBAAsB;IAmDpC,OAAO,CAAC,uBAAuB;cA8Bf,kBAAkB;CAGnC"}

package/dest/prover-node-publisher.js

@@ -9,7 +9,7 @@ import { Timer } from '@aztec/foundation/timer';
 import { RollupAbi } from '@aztec/l1-artifacts';
 import { getTelemetryClient } from '@aztec/telemetry-client';
 import { encodeFunctionData } from 'viem';
-import { ProverNodeMetrics } from './metrics.js';
+import { ProverNodePublisherMetrics } from './metrics.js';
 export class ProverNodePublisher {
     interruptibleSleep = new InterruptibleSleep();
     sleepTimeMs;
@@ -21,10 +21,13 @@ export class ProverNodePublisher {
     constructor(config, deps){
         this.sleepTimeMs = config?.l1PublishRetryIntervalMS ?? 60_000;
         const telemetry = deps.telemetry ?? getTelemetryClient();
-        this.metrics = new ProverNodeMetrics(telemetry, 'ProverNode');
+        this.metrics = new ProverNodePublisherMetrics(telemetry, 'ProverNode');
         this.rollupContract = deps.rollupContract;
         this.l1TxUtils = deps.l1TxUtils;
     }
+    getRollupContract() {
+        return this.rollupContract;
+    }
     /**
    * Calling `interrupt` will cause any in progress call to `publishRollup` to return `false` asap.
    * Be warned, the call may return false even if the tx subsequently gets successfully mined.

package/dest/prover-node.d.ts

@@ -1,28 +1,23 @@
+import type { Fr } from '@aztec/foundation/fields';
 import type { Maybe } from '@aztec/foundation/types';
-import type { P2P } from '@aztec/p2p';
+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 { P2PClientType } from '@aztec/stdlib/p2p';
-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;
-    txGatheringTimeoutMs: number;
-    txGatheringIntervalMs: number;
-    txGatheringMaxParallelRequests: 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 {
@@ -32,31 +27,33 @@ export declare class ProverNode implements EpochMonitorHandler, ProverNodeApi, T
     protected readonly l1ToL2MessageSource: L1ToL2MessageSource;
     protected readonly contractDataSource: ContractDataSource;
     protected readonly worldState: WorldStateSynchronizer;
-    protected readonly coordination: ProverCoordination & Maybe<Service>;
+    protected readonly coordination: ProverCoordination;
     protected readonly epochsMonitor: EpochMonitor;
     protected readonly telemetryClient: TelemetryClient;
     private log;
     private dateProvider;
     private jobs;
-    private options;
-    private metrics;
+    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 & Maybe<Service>, epochsMonitor: EpochMonitor, options?: Partial<ProverNodeOptions>, telemetryClient?: TelemetryClient);
-    getProverId(): import("@aztec/foundation/schemas").Fr;
-    getP2P(): P2P<P2PClientType.Prover> | undefined;
+    constructor(prover: EpochProverManager, publisher: ProverNodePublisher, l2BlockSource: L2BlockSource & Maybe<Service>, l1ToL2MessageSource: L1ToL2MessageSource, contractDataSource: ContractDataSource, worldState: WorldStateSynchronizer, coordination: ProverCoordination, 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.
      * @param epochNumber - The epoch number that was just completed.
+     * @returns false if there is an error, true otherwise
      */
-    handleEpochReadyToProve(epochNumber: bigint): Promise<void>;
+    handleEpochReadyToProve(epochNumber: bigint): Promise<boolean>;
     /**
      * Starts the prover node so it periodically checks for unproven epochs in the unfinalised chain from L1 and
      * starts proving jobs for them.
      */
-    start(): void;
+    start(): Promise<void>;
     /**
      * Stops the prover node and all its dependencies.
      */
@@ -70,6 +67,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.
      */
@@ -94,9 +92,13 @@ 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): 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,8 +4,9 @@ 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';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { DateProvider } from '@aztec/foundation/timer';
@@ -13,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 { 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 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;
@@ -33,13 +34,14 @@ import { ProverNodeMetrics } from './metrics.js';
     log;
     dateProvider;
     jobs;
-    options;
-    metrics;
+    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;
@@ -55,32 +57,33 @@ import { ProverNodeMetrics } from './metrics.js';
         this.l1Metrics = new L1Metrics(telemetryClient.getMeter('ProverNodeL1Metrics'), publisher.l1TxUtils.publicClient, [
             publisher.getSenderAddress()
         ]);
-        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,
+            proverNodeFailedEpochStore: 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, EthAddress.fromField(this.prover.getProverId()), this.publisher.getRollupContract());
+        this.txFetcher = new RunningPromise(()=>this.checkForTxs(), this.log, this.config.txGatheringIntervalMs);
     }
     getProverId() {
         return this.prover.getProverId();
     }
     getP2P() {
-        const asP2PClient = this.coordination;
-        if (typeof asP2PClient.isP2PClient === 'function' && asP2PClient.isP2PClient()) {
-            return asP2PClient;
-        }
-        return undefined;
+        return this.coordination.getP2PClient();
     }
     /**
    * 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(`Running jobs as ${epochNumber} is ready to prove`, {
@@ -91,25 +94,28 @@ import { ProverNodeMetrics } from './metrics.js';
                 this.log.warn(`Not starting proof for ${epochNumber} since there are active jobs for the epoch`, {
                     activeJobs: activeJobs.map((job)=>job.uuid)
                 });
-                return;
+                return true;
             }
             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 proving jobs for them.
-   */ start() {
+   */ async start() {
         this.txFetcher.start();
         this.epochsMonitor.start(this);
         this.l1Metrics.start();
-        this.log.info(`Started Prover Node with prover id ${this.prover.getProverId().toString()}`, this.options);
+        await this.rewardsMetrics.start();
+        this.log.info(`Started Prover Node with prover id ${this.prover.getProverId().toString()}`, this.config);
     }
     /**
    * Stops the prover node and all its dependencies.
@@ -124,11 +130,13 @@ import { ProverNodeMetrics } from './metrics.js';
         await this.worldState.stop();
         await tryStop(this.coordination);
         this.l1Metrics.stop();
+        this.rewardsMetrics.stop();
         await this.telemetryClient.stop();
         this.log.info('Stopped ProverNode');
     }
-    /** Returns world state status. */ getWorldStateSyncStatus() {
-        return this.worldState.status().then((s)=>s.syncSummary);
+    /** Returns world state status. */ async getWorldStateSyncStatus() {
+        const { syncSummary } = await this.worldState.status();
+        return syncSummary;
     }
     /** Returns archiver status. */ getL2Tips() {
         return this.l2BlockSource.getL2Tips();
@@ -140,25 +148,36 @@ import { ProverNodeMetrics } from './metrics.js';
         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() {
@@ -179,25 +198,26 @@ 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;
+        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.`);
+        }
     }
     async createProvingJob(epochNumber) {
-        if (!this.checkMaximumPendingJobs()) {
-            throw new Error(`Maximum pending proving jobs ${this.options.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
+        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);
         this.jobs.set(job.getId(), job);
         return job;
     }
@@ -213,17 +233,21 @@ import { ProverNodeMetrics } from './metrics.js';
             }
             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
+            await this.coordination.gatherTxs(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 l1ToL2Messages = await this.gatherMessages(epochNumber, blocks);
+        const previousBlockHeader = await this.gatherPreviousBlockHeader(epochNumber, blocks[0]);
         return {
             blocks,
-            txs
+            txs,
+            l1ToL2Messages,
+            epochNumber,
+            previousBlockHeader
         };
     }
     async gatherBlocks(epochNumber) {
@@ -246,14 +270,42 @@ import { ProverNodeMetrics } 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.metrics, 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) {
+        const { proverNodeMaxParallelBlocksPerEpoch: parallelBlockLimit } = this.config;
+        return new EpochProvingJob(data, this.worldState, this.prover.createEpochProver(), publicProcessorFactory, this.publisher, this.l2BlockSource, this.jobMetrics, deadline, {
+            parallelBlockLimit
         });
     }
     /** 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"}

package/dest/test/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/prover-node",
-  "version": "0.85.0-alpha-testnet.2",
+  "version": "0.85.0-alpha-testnet.3",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -53,25 +53,25 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "0.85.0-alpha-testnet.2",
-    "@aztec/bb-prover": "0.85.0-alpha-testnet.2",
-    "@aztec/blob-sink": "0.85.0-alpha-testnet.2",
-    "@aztec/constants": "0.85.0-alpha-testnet.2",
-    "@aztec/epoch-cache": "0.85.0-alpha-testnet.2",
-    "@aztec/ethereum": "0.85.0-alpha-testnet.2",
-    "@aztec/foundation": "0.85.0-alpha-testnet.2",
-    "@aztec/kv-store": "0.85.0-alpha-testnet.2",
-    "@aztec/l1-artifacts": "0.85.0-alpha-testnet.2",
-    "@aztec/node-lib": "0.85.0-alpha-testnet.2",
-    "@aztec/noir-protocol-circuits-types": "0.85.0-alpha-testnet.2",
-    "@aztec/p2p": "0.85.0-alpha-testnet.2",
-    "@aztec/protocol-contracts": "0.85.0-alpha-testnet.2",
-    "@aztec/prover-client": "0.85.0-alpha-testnet.2",
-    "@aztec/sequencer-client": "0.85.0-alpha-testnet.2",
-    "@aztec/simulator": "0.85.0-alpha-testnet.2",
-    "@aztec/stdlib": "0.85.0-alpha-testnet.2",
-    "@aztec/telemetry-client": "0.85.0-alpha-testnet.2",
-    "@aztec/world-state": "0.85.0-alpha-testnet.2",
+    "@aztec/archiver": "0.85.0-alpha-testnet.3",
+    "@aztec/bb-prover": "0.85.0-alpha-testnet.3",
+    "@aztec/blob-sink": "0.85.0-alpha-testnet.3",
+    "@aztec/constants": "0.85.0-alpha-testnet.3",
+    "@aztec/epoch-cache": "0.85.0-alpha-testnet.3",
+    "@aztec/ethereum": "0.85.0-alpha-testnet.3",
+    "@aztec/foundation": "0.85.0-alpha-testnet.3",
+    "@aztec/kv-store": "0.85.0-alpha-testnet.3",
+    "@aztec/l1-artifacts": "0.85.0-alpha-testnet.3",
+    "@aztec/node-lib": "0.85.0-alpha-testnet.3",
+    "@aztec/noir-protocol-circuits-types": "0.85.0-alpha-testnet.3",
+    "@aztec/p2p": "0.85.0-alpha-testnet.3",
+    "@aztec/protocol-contracts": "0.85.0-alpha-testnet.3",
+    "@aztec/prover-client": "0.85.0-alpha-testnet.3",
+    "@aztec/sequencer-client": "0.85.0-alpha-testnet.3",
+    "@aztec/simulator": "0.85.0-alpha-testnet.3",
+    "@aztec/stdlib": "0.85.0-alpha-testnet.3",
+    "@aztec/telemetry-client": "0.85.0-alpha-testnet.3",
+    "@aztec/world-state": "0.85.0-alpha-testnet.3",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0",
     "viem": "2.23.7"