@aztec/prover-node 0.0.1-commit.04852196a → 0.0.1-commit.04d373f

package/dest/prover-node.js

@@ -451,7 +451,7 @@ _dec = trackSpan('ProverNode.createProvingJob', (epochNumber)=>({
         this.config = {
             proverNodePollingIntervalMs: 1_000,
             proverNodeMaxPendingJobs: 100,
-            proverNodeMaxParallelBlocksPerEpoch: 32,
+            proverNodeMaxParallelBlocksPerEpoch: 0,
             txGatheringIntervalMs: 1_000,
             txGatheringBatchSize: 10,
             txGatheringMaxParallelRequestsPerNode: 100,
@@ -519,10 +519,10 @@ _dec = trackSpan('ProverNode.createProvingJob', (epochNumber)=>({
    */ async stop() {
         this.log.info('Stopping ProverNode');
         await this.epochsMonitor.stop();
-        await this.prover.stop();
-        await tryStop(this.publisherFactory);
         this.publisher?.interrupt();
         await Promise.all(Array.from(this.jobs.values()).map((job)=>job.stop()));
+        await this.prover.stop();
+        await tryStop(this.publisherFactory);
         this.rewardsMetrics.stop();
         this.l1Metrics.stop();
         await this.telemetryClient.stop();
@@ -606,10 +606,12 @@ _dec = trackSpan('ProverNode.createProvingJob', (epochNumber)=>({
         const fromCheckpoint = epochData.checkpoints[0].number;
         const toCheckpoint = epochData.checkpoints.at(-1).number;
         const fromBlock = epochData.checkpoints[0].blocks[0].number;
-        const toBlock = epochData.checkpoints.at(-1).blocks.at(-1).number;
+        const lastBlock = epochData.checkpoints.at(-1).blocks.at(-1);
+        const toBlock = lastBlock.number;
         this.log.verbose(`Creating proving job for epoch ${epochNumber} for checkpoint range ${fromCheckpoint} to ${toCheckpoint} and block range ${fromBlock} to ${toBlock}`);
         // Fast forward world state to right before the target block and get a fork
-        await this.worldState.syncImmediate(toBlock);
+        const lastBlockHash = await lastBlock.header.hash();
+        await this.worldState.syncImmediate(toBlock, lastBlockHash);
         // Create a processor factory
         const publicProcessorFactory = new PublicProcessorFactory(this.contractDataSource, this.dateProvider, this.telemetryClient, this.log.getBindings());
         // Set deadline for this job to run. It will abort if it takes too long.
@@ -623,7 +625,14 @@ _dec = trackSpan('ProverNode.createProvingJob', (epochNumber)=>({
         return this.l2BlockSource.getL1Constants();
     }
     async gatherEpochData(epochNumber) {
-        const checkpoints = await this.gatherCheckpoints(epochNumber);
+        const publishedCheckpoints = await this.l2BlockSource.getCheckpoints({
+            epoch: epochNumber
+        });
+        if (publishedCheckpoints.length === 0) {
+            throw new EmptyEpochError(epochNumber);
+        }
+        const checkpoints = publishedCheckpoints.map((p)=>p.checkpoint);
+        const attestations = publishedCheckpoints.at(-1)?.attestations ?? [];
         const txArray = await this.gatherTxs(epochNumber, checkpoints);
         const txs = new Map(txArray.map((tx)=>[
                 tx.getTxHash().toString(),
@@ -632,8 +641,6 @@ _dec = trackSpan('ProverNode.createProvingJob', (epochNumber)=>({
         const l1ToL2Messages = await this.gatherMessages(epochNumber, checkpoints);
         const [firstBlock] = checkpoints[0].blocks;
         const previousBlockHeader = await this.gatherPreviousBlockHeader(epochNumber, firstBlock.number - 1);
-        const [lastPublishedCheckpoint] = await this.l2BlockSource.getCheckpoints(checkpoints.at(-1).number, 1);
-        const attestations = lastPublishedCheckpoint?.attestations ?? [];
         return {
             checkpoints,
             txs,
@@ -643,13 +650,6 @@ _dec = trackSpan('ProverNode.createProvingJob', (epochNumber)=>({
             attestations
         };
     }
-    async gatherCheckpoints(epochNumber) {
-        const checkpoints = await this.l2BlockSource.getCheckpointsForEpoch(epochNumber);
-        if (checkpoints.length === 0) {
-            throw new EmptyEpochError(epochNumber);
-        }
-        return checkpoints;
-    }
     async gatherTxs(epochNumber, checkpoints) {
         const deadline = new Date(this.dateProvider.now() + this.config.txGatheringTimeoutMs);
         const txProvider = this.p2pClient.getTxProvider();
@@ -680,12 +680,14 @@ _dec = trackSpan('ProverNode.createProvingJob', (epochNumber)=>({
         return messagesByCheckpoint;
     }
     async gatherPreviousBlockHeader(epochNumber, previousBlockNumber) {
-        const header = await (previousBlockNumber === 0 ? this.worldState.getCommitted().getInitialHeader() : this.l2BlockSource.getBlockHeader(BlockNumber(previousBlockNumber)));
-        if (!header) {
+        const data = await this.l2BlockSource.getBlockData({
+            number: BlockNumber(previousBlockNumber)
+        });
+        if (!data?.header) {
             throw new Error(`Previous block header ${previousBlockNumber} not found for proving epoch ${epochNumber}`);
         }
-        this.log.verbose(`Gathered previous block header ${header.getBlockNumber()} for epoch ${epochNumber}`);
-        return header;
+        this.log.verbose(`Gathered previous block header ${data.header.getBlockNumber()} for epoch ${epochNumber}`);
+        return data.header;
     }
     /** Extracted for testing purposes. */ doCreateEpochProvingJob(data, deadline, publicProcessorFactory, publisher, opts = {}) {
         const { proverNodeMaxParallelBlocksPerEpoch: parallelBlockLimit, proverNodeDisableProofPublish } = this.config;

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

@@ -15,11 +15,11 @@ export declare class ProverPublisherFactory {
         telemetry?: TelemetryClient;
     }, bindings?: LoggerBindings | undefined);
     start(): Promise<void>;
-    stop(): void;
+    stop(): Promise<void>;
     /**
      * Creates a new Prover Publisher instance.
      * @returns A new ProverNodePublisher instance.
      */
     create(): Promise<ProverNodePublisher>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmVyLXB1Ymxpc2hlci1mYWN0b3J5LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcHJvdmVyLXB1Ymxpc2hlci1mYWN0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQzdELE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDMUUsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDNUQsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUMzRixPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUUvRCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUVqRSxxQkFBYSxzQkFBc0I7SUFFL0IsT0FBTyxDQUFDLE1BQU07SUFDZCxPQUFPLENBQUMsSUFBSTtJQUtaLE9BQU8sQ0FBQyxRQUFRLENBQUM7SUFQbkIsWUFDVSxNQUFNLEVBQUUsb0JBQW9CLEdBQUcscUJBQXFCLEVBQ3BELElBQUksRUFBRTtRQUNaLGNBQWMsRUFBRSxjQUFjLENBQUM7UUFDL0IsZ0JBQWdCLEVBQUUsZ0JBQWdCLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDOUMsU0FBUyxDQUFDLEVBQUUsZUFBZSxDQUFDO0tBQzdCLEVBQ08sUUFBUSxDQUFDLDRCQUFnQixFQUMvQjtJQUVTLEtBQUssa0JBRWpCO0lBRU0sSUFBSSxTQUVWO0lBRUQ7OztPQUdHO0lBQ1UsTUFBTSxJQUFJLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBQyxDQVdsRDtDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmVyLXB1Ymxpc2hlci1mYWN0b3J5LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcHJvdmVyLXB1Ymxpc2hlci1mYWN0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQzdELE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDMUUsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDNUQsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUMzRixPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUUvRCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUVqRSxxQkFBYSxzQkFBc0I7SUFFL0IsT0FBTyxDQUFDLE1BQU07SUFDZCxPQUFPLENBQUMsSUFBSTtJQUtaLE9BQU8sQ0FBQyxRQUFRLENBQUM7SUFQbkIsWUFDVSxNQUFNLEVBQUUsb0JBQW9CLEdBQUcscUJBQXFCLEVBQ3BELElBQUksRUFBRTtRQUNaLGNBQWMsRUFBRSxjQUFjLENBQUM7UUFDL0IsZ0JBQWdCLEVBQUUsZ0JBQWdCLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDOUMsU0FBUyxDQUFDLEVBQUUsZUFBZSxDQUFDO0tBQzdCLEVBQ08sUUFBUSxDQUFDLDRCQUFnQixFQUMvQjtJQUVTLEtBQUssa0JBRWpCO0lBRVksSUFBSSxrQkFFaEI7SUFFRDs7O09BR0c7SUFDVSxNQUFNLElBQUksT0FBTyxDQUFDLG1CQUFtQixDQUFDLENBV2xEO0NBQ0YifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"prover-publisher-factory.d.ts","sourceRoot":"","sources":["../src/prover-publisher-factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAC3F,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;IAKZ,OAAO,CAAC,QAAQ,CAAC;IAPnB,YACU,MAAM,EAAE,oBAAoB,GAAG,qBAAqB,EACpD,IAAI,EAAE;QACZ,cAAc,EAAE,cAAc,CAAC;QAC/B,gBAAgB,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAC9C,SAAS,CAAC,EAAE,eAAe,CAAC;KAC7B,EACO,QAAQ,CAAC,4BAAgB,EAC/B;IAES,KAAK,kBAEjB;IAEM,IAAI,SAEV;IAED;;;OAGG;IACU,MAAM,IAAI,OAAO,CAAC,mBAAmB,CAAC,CAWlD;CACF"}
+{"version":3,"file":"prover-publisher-factory.d.ts","sourceRoot":"","sources":["../src/prover-publisher-factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAC3F,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;IAKZ,OAAO,CAAC,QAAQ,CAAC;IAPnB,YACU,MAAM,EAAE,oBAAoB,GAAG,qBAAqB,EACpD,IAAI,EAAE;QACZ,cAAc,EAAE,cAAc,CAAC;QAC/B,gBAAgB,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAC9C,SAAS,CAAC,EAAE,eAAe,CAAC;KAC7B,EACO,QAAQ,CAAC,4BAAgB,EAC/B;IAES,KAAK,kBAEjB;IAEY,IAAI,kBAEhB;IAED;;;OAGG;IACU,MAAM,IAAI,OAAO,CAAC,mBAAmB,CAAC,CAWlD;CACF"}

package/dest/prover-publisher-factory.js

@@ -9,10 +9,10 @@ export class ProverPublisherFactory {
         this.bindings = bindings;
     }
     async start() {
-        await this.deps.publisherManager.loadState();
+        await this.deps.publisherManager.start();
     }
-    stop() {
-        this.deps.publisherManager.interrupt();
+    async stop() {
+        await this.deps.publisherManager.stop();
     }
     /**
    * Creates a new Prover Publisher instance.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/prover-node",
-  "version": "0.0.1-commit.04852196a",
+  "version": "0.0.1-commit.04d373f",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -56,27 +56,28 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "0.0.1-commit.04852196a",
-    "@aztec/bb-prover": "0.0.1-commit.04852196a",
-    "@aztec/blob-client": "0.0.1-commit.04852196a",
-    "@aztec/blob-lib": "0.0.1-commit.04852196a",
-    "@aztec/constants": "0.0.1-commit.04852196a",
-    "@aztec/epoch-cache": "0.0.1-commit.04852196a",
-    "@aztec/ethereum": "0.0.1-commit.04852196a",
-    "@aztec/foundation": "0.0.1-commit.04852196a",
-    "@aztec/kv-store": "0.0.1-commit.04852196a",
-    "@aztec/l1-artifacts": "0.0.1-commit.04852196a",
-    "@aztec/node-keystore": "0.0.1-commit.04852196a",
-    "@aztec/node-lib": "0.0.1-commit.04852196a",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.04852196a",
-    "@aztec/p2p": "0.0.1-commit.04852196a",
-    "@aztec/protocol-contracts": "0.0.1-commit.04852196a",
-    "@aztec/prover-client": "0.0.1-commit.04852196a",
-    "@aztec/sequencer-client": "0.0.1-commit.04852196a",
-    "@aztec/simulator": "0.0.1-commit.04852196a",
-    "@aztec/stdlib": "0.0.1-commit.04852196a",
-    "@aztec/telemetry-client": "0.0.1-commit.04852196a",
-    "@aztec/world-state": "0.0.1-commit.04852196a",
+    "@aztec/archiver": "0.0.1-commit.04d373f",
+    "@aztec/bb-prover": "0.0.1-commit.04d373f",
+    "@aztec/blob-client": "0.0.1-commit.04d373f",
+    "@aztec/blob-lib": "0.0.1-commit.04d373f",
+    "@aztec/constants": "0.0.1-commit.04d373f",
+    "@aztec/epoch-cache": "0.0.1-commit.04d373f",
+    "@aztec/ethereum": "0.0.1-commit.04d373f",
+    "@aztec/foundation": "0.0.1-commit.04d373f",
+    "@aztec/kv-store": "0.0.1-commit.04d373f",
+    "@aztec/l1-artifacts": "0.0.1-commit.04d373f",
+    "@aztec/native": "0.0.1-commit.04d373f",
+    "@aztec/node-keystore": "0.0.1-commit.04d373f",
+    "@aztec/node-lib": "0.0.1-commit.04d373f",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.04d373f",
+    "@aztec/p2p": "0.0.1-commit.04d373f",
+    "@aztec/protocol-contracts": "0.0.1-commit.04d373f",
+    "@aztec/prover-client": "0.0.1-commit.04d373f",
+    "@aztec/sequencer-client": "0.0.1-commit.04d373f",
+    "@aztec/simulator": "0.0.1-commit.04d373f",
+    "@aztec/stdlib": "0.0.1-commit.04d373f",
+    "@aztec/telemetry-client": "0.0.1-commit.04d373f",
+    "@aztec/world-state": "0.0.1-commit.04d373f",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0",
     "viem": "npm:@aztec/viem@2.38.2"

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

@@ -30,7 +30,7 @@ export async function downloadEpochProvingJob(
 
   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 });
+  await snapshotSync({ dataUrls }, log, { ...config, ...metadata, fileStore });
 
   const dataPath = urlJoin(location, 'data.bin');
   const localPath = config.jobDataDownloadPath;

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

@@ -1,10 +1,11 @@
-import { createArchiverStore } from '@aztec/archiver';
+import { createArchiverStore, createContractDataSource } from '@aztec/archiver';
 import type { L1ContractsConfig } from '@aztec/ethereum/config';
 import type { Logger } from '@aztec/foundation/log';
 import { type ProverClientConfig, createProverClient } from '@aztec/prover-client';
 import { ProverBrokerConfig, createAndStartProvingBroker } from '@aztec/prover-client/broker';
 import { PublicProcessorFactory } from '@aztec/simulator/server';
 import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
+import type { GenesisData } from '@aztec/stdlib/world-state';
 import { getTelemetryClient } from '@aztec/telemetry-client';
 import { createWorldState } from '@aztec/world-state';
 
@@ -23,17 +24,27 @@ export async function rerunEpochProvingJob(
   localPath: string,
   log: Logger,
   config: DataStoreConfig & ProverBrokerConfig & ProverClientConfig & Pick<L1ContractsConfig, 'aztecEpochDuration'>,
+  genesis?: GenesisData,
 ) {
   const jobData = deserializeEpochProvingJobData(readFileSync(localPath));
   log.info(`Loaded proving job data for epoch ${jobData.epochNumber}`);
 
   const telemetry = getTelemetryClient();
   const metrics = new ProverNodeJobMetrics(telemetry.getMeter('prover-job'), telemetry.getTracer('prover-job'));
-  const worldState = await createWorldState(config);
-  const archiver = await createArchiverStore(config, { epochDuration: config.aztecEpochDuration });
-  const publicProcessorFactory = new PublicProcessorFactory(archiver, undefined, undefined, log.getBindings());
+  const worldState = await createWorldState(config, genesis);
+  const initialBlockHash = await worldState.getInitialHeader().hash();
+  const archiver = await createArchiverStore(config, initialBlockHash);
+  const publicProcessorFactory = new PublicProcessorFactory(
+    createContractDataSource(archiver),
+    undefined,
+    undefined,
+    log.getBindings(),
+  );
 
-  const publisher = { submitEpochProof: () => Promise.resolve(true) };
+  const publisher = {
+    submitEpochProof: () => Promise.resolve(true),
+    analyzeEpochProofSubmission: () => Promise.resolve(),
+  };
   const l2BlockSourceForReorgDetection = undefined;
   const deadline = undefined;
 

package/src/bin/run-failed-epoch.ts

@@ -1,6 +1,5 @@
 /* eslint-disable no-console */
 import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
-import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { jsonParseWithSchema, jsonStringify } from '@aztec/foundation/json-rpc';
 import { createLogger } from '@aztec/foundation/log';
@@ -50,7 +49,7 @@ async function rerunFailedEpoch(provingJobUrl: string, baseLocalDir: string) {
   logger.info(`Rerunning proving job from ${jobPath} with state from ${dataDir}`, metadata);
   const result = await rerunEpochProvingJob(jobPath, logger, {
     ...config,
-    l1Contracts: { rollupAddress: metadata.rollupAddress } as L1ContractAddresses,
+    rollupAddress: metadata.rollupAddress,
     rollupVersion: metadata.rollupVersion,
   });
 

package/src/config.ts

@@ -60,7 +60,7 @@ export const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProver
   proverNodeMaxParallelBlocksPerEpoch: {
     env: 'PROVER_NODE_MAX_PARALLEL_BLOCKS_PER_EPOCH',
     description: 'The Maximum number of blocks to process in parallel while proving an epoch',
-    ...numberConfigHelper(32),
+    ...numberConfigHelper(0),
   },
   proverNodeFailedEpochStore: {
     env: 'PROVER_NODE_FAILED_EPOCH_STORE',

package/src/factory.ts

@@ -3,6 +3,7 @@ import type { BlobClientInterface } from '@aztec/blob-client/client';
 import { Blob } from '@aztec/blob-lib';
 import type { EpochCacheInterface } from '@aztec/epoch-cache';
 import { createEthereumChain } from '@aztec/ethereum/chain';
+import { makeL1HttpTransport } from '@aztec/ethereum/client';
 import { RollupContract } from '@aztec/ethereum/contracts';
 import { L1TxUtils } from '@aztec/ethereum/l1-tx-utils';
 import { PublisherManager } from '@aztec/ethereum/publisher-manager';
@@ -27,7 +28,7 @@ import type {
 } from '@aztec/stdlib/interfaces/server';
 import { L1Metrics, type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
 
-import { createPublicClient, fallback, http } from 'viem';
+import { createPublicClient } from 'viem';
 
 import type { SpecificProverNodeConfig } from './config.js';
 import { EpochMonitor } from './monitors/epoch-monitor.js';
@@ -95,11 +96,11 @@ export async function createProverNode(
 
   const publicClient = createPublicClient({
     chain: chain.chainInfo,
-    transport: fallback(config.l1RpcUrls.map((url: string) => http(url, { batch: false }))),
+    transport: makeL1HttpTransport(config.l1RpcUrls, { timeout: config.l1HttpTimeoutMS }),
     pollingInterval: config.viemPollingIntervalMS,
   });
 
-  const rollupContract = new RollupContract(publicClient, config.l1Contracts.rollupAddress.toString());
+  const rollupContract = new RollupContract(publicClient, config.rollupAddress.toString());
 
   const l1TxUtils = deps.l1TxUtils
     ? [deps.l1TxUtils]
@@ -118,11 +119,27 @@ export async function createProverNode(
           { telemetry, logger: log.createChild('l1-tx-utils'), dateProvider },
         );
 
+  // Create a funder L1TxUtils from the keystore funding account (if configured)
+  const fundingSigner = keyStoreManager?.createFundingSigner();
+  let funderL1TxUtils: L1TxUtils | undefined;
+  if (fundingSigner) {
+    const [funder] = await createL1TxUtilsFromSigners(
+      publicClient,
+      [fundingSigner],
+      { ...config, scope: 'prover' },
+      { telemetry, logger: log.createChild('l1-tx-utils:funder'), dateProvider },
+    );
+    funderL1TxUtils = funder;
+  }
+
   const publisherFactory =
     deps.publisherFactory ??
     new ProverPublisherFactory(config, {
       rollupContract,
-      publisherManager: new PublisherManager(l1TxUtils, getPublisherConfigFromProverConfig(config), log.getBindings()),
+      publisherManager: new PublisherManager(l1TxUtils, getPublisherConfigFromProverConfig(config), {
+        bindings: log.getBindings(),
+        funder: funderL1TxUtils,
+      }),
       telemetry,
     });
 

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

@@ -1,11 +1,10 @@
-import { NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/constants';
 import { asyncPool } from '@aztec/foundation/async-pool';
 import { BlockNumber, EpochNumber } from '@aztec/foundation/branded-types';
-import { padArrayEnd } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { type Logger, type LoggerBindings, createLogger } from '@aztec/foundation/log';
 import { RunningPromise, promiseWithResolvers } from '@aztec/foundation/promise';
 import { Timer } from '@aztec/foundation/timer';
+import { AVM_MAX_CONCURRENT_SIMULATIONS } from '@aztec/native';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
 import { protocolContractsHash } from '@aztec/protocol-contracts';
 import { buildFinalBlobChallenges } from '@aztec/prover-client/helpers';
@@ -19,8 +18,8 @@ import {
   EpochProvingJobTerminalState,
   type ForkMerkleTreeOperations,
 } from '@aztec/stdlib/interfaces/server';
+import { appendL1ToL2MessagesToTree } from '@aztec/stdlib/messaging';
 import { CheckpointConstantData } from '@aztec/stdlib/rollup';
-import { MerkleTreeId } from '@aztec/stdlib/trees';
 import type { ProcessedTx, Tx } from '@aztec/stdlib/tx';
 import { Attributes, type Traceable, type Tracer, trackSpan } from '@aztec/telemetry-client';
 
@@ -47,6 +46,7 @@ export class EpochProvingJob implements Traceable {
   private uuid: string;
 
   private runPromise: Promise<void> | undefined;
+  private abortController = new AbortController();
   private epochCheckPromise: RunningPromise | undefined;
   private deadlineTimeoutHandler: NodeJS.Timeout | undefined;
 
@@ -57,7 +57,7 @@ export class EpochProvingJob implements Traceable {
     private dbProvider: Pick<ForkMerkleTreeOperations, 'fork'>,
     private prover: EpochProver,
     private publicProcessorFactory: PublicProcessorFactory,
-    private publisher: Pick<ProverNodePublisher, 'submitEpochProof'>,
+    private publisher: Pick<ProverNodePublisher, 'submitEpochProof' | 'analyzeEpochProofSubmission'>,
     private l2BlockSource: L2BlockSource | undefined,
     private metrics: ProverNodeJobMetrics,
     private deadline: Date | undefined,
@@ -148,21 +148,32 @@ export class EpochProvingJob implements Traceable {
     this.runPromise = promise;
 
     try {
+      const blobTimer = new Timer();
       const blobFieldsPerCheckpoint = this.checkpoints.map(checkpoint => checkpoint.toBlobFields());
-      this.log.info(`Blob fields per checkpoint: ${timer.ms()}ms`);
       const finalBlobBatchingChallenges = await buildFinalBlobChallenges(blobFieldsPerCheckpoint);
-      this.log.info(`Final blob batching challeneger: ${timer.ms()}ms`);
+      this.metrics.recordBlobProcessing(blobTimer.ms());
 
       this.prover.startNewEpoch(epochNumber, epochSizeCheckpoints, finalBlobBatchingChallenges);
+      const chonkTimer = new Timer();
       await this.prover.startChonkVerifierCircuits(Array.from(this.txs.values()));
+      this.metrics.recordChonkVerifier(chonkTimer.ms());
 
       // Everything in the epoch should have the same chainId and version.
       const { chainId, version } = this.checkpoints[0].blocks[0].header.globalVariables;
 
       const previousBlockHeaders = this.gatherPreviousBlockHeaders();
 
-      await asyncPool(this.config.parallelBlockLimit ?? 32, this.checkpoints, async checkpoint => {
+      const allCheckpointsTimer = new Timer();
+
+      const parallelism = this.config.parallelBlockLimit
+        ? this.config.parallelBlockLimit
+        : AVM_MAX_CONCURRENT_SIMULATIONS > 0
+          ? AVM_MAX_CONCURRENT_SIMULATIONS
+          : this.checkpoints.length;
+
+      await this.processCheckpoints(parallelism, async checkpoint => {
         this.checkState();
+        const checkpointTimer = new Timer();
 
         const checkpointIndex = checkpoint.number - fromCheckpoint;
         const checkpointConstants = CheckpointConstantData.from({
@@ -179,11 +190,12 @@ export class EpochProvingJob implements Traceable {
         const previousHeader = previousBlockHeaders[checkpointIndex];
         const l1ToL2Messages = this.getL1ToL2Messages(checkpoint);
 
-        this.log.verbose(`Starting processing checkpoint ${checkpoint.number}`, {
+        this.log.debug(`Starting processing checkpoint ${checkpoint.number}`, {
           number: checkpoint.number,
           checkpointHash: checkpoint.hash().toString(),
-          lastArchive: checkpoint.header.lastArchiveRoot,
-          previousHeader: previousHeader.hash(),
+          headerHash: checkpoint.header.hash().toString(),
+          numL1ToL2Messages: l1ToL2Messages.length,
+          previousBlockNumber: previousHeader.globalVariables.blockNumber,
           uuid: this.uuid,
         });
 
@@ -196,6 +208,7 @@ export class EpochProvingJob implements Traceable {
         );
 
         for (let blockIndex = 0; blockIndex < checkpoint.blocks.length; blockIndex++) {
+          const blockTimer = new Timer();
           const block = checkpoint.blocks[blockIndex];
           const globalVariables = block.header.globalVariables;
           const txs = this.getTxs(block);
@@ -216,22 +229,26 @@ export class EpochProvingJob implements Traceable {
 
           // Process public fns. L1 to L2 messages are only inserted for the first block of a checkpoint,
           // as the fork for subsequent blocks already includes them from the previous block's synced state.
-          const db = await this.createFork(
-            BlockNumber(block.number - 1),
-            blockIndex === 0 ? l1ToL2Messages : undefined,
-          );
-          const config = PublicSimulatorConfig.from({
-            proverId: this.prover.getProverId().toField(),
-            skipFeeEnforcement: false,
-            collectDebugLogs: false,
-            collectHints: true,
-            collectPublicInputs: true,
-            collectStatistics: false,
-          });
-          const publicProcessor = this.publicProcessorFactory.create(db, globalVariables, config);
-          const processed = await this.processTxs(publicProcessor, txs);
-          await this.prover.addTxs(processed);
-          await db.close();
+          {
+            await using db = await this.createFork(
+              BlockNumber(block.number - 1),
+              blockIndex === 0 ? l1ToL2Messages : undefined,
+            );
+            this.checkState();
+            const config = PublicSimulatorConfig.from({
+              proverId: this.prover.getProverId().toField(),
+              skipFeeEnforcement: false,
+              collectDebugLogs: false,
+              collectHints: true,
+              collectPublicInputs: true,
+              collectStatistics: false,
+            });
+            const publicProcessor = this.publicProcessorFactory.create(db, globalVariables, config);
+            const processed = await this.processTxs(publicProcessor, txs);
+            this.checkState();
+            await this.prover.addTxs(processed);
+          }
+          this.checkState();
           this.log.verbose(`Processed all ${txs.length} txs for block ${block.number}`, {
             blockNumber: block.number,
             blockHash: (await block.hash()).toString(),
@@ -241,8 +258,11 @@ export class EpochProvingJob implements Traceable {
           // Mark block as completed to pad it
           const expectedBlockHeader = block.header;
           await this.prover.setBlockCompleted(block.number, expectedBlockHeader);
+          this.metrics.recordBlockProcessing(blockTimer.ms());
         }
+        this.metrics.recordCheckpointProcessing(checkpointTimer.ms());
       });
+      this.metrics.recordAllCheckpointsProcessing(allCheckpointsTimer.ms());
 
       const executionTime = timer.ms();
 
@@ -254,8 +274,21 @@ export class EpochProvingJob implements Traceable {
 
       if (this.config.skipSubmitProof) {
         this.log.info(
-          `Proof publishing is disabled. Dropping valid proof for epoch ${epochNumber} (checkpoints ${fromCheckpoint} to ${toCheckpoint})`,
+          `Proof publishing is disabled. Analyzing estimated L1 fees for epoch ${epochNumber} (checkpoints ${fromCheckpoint} to ${toCheckpoint})`,
         );
+        try {
+          await this.publisher.analyzeEpochProofSubmission({
+            fromCheckpoint,
+            toCheckpoint,
+            epochNumber,
+            publicInputs,
+            proof,
+            batchedBlobInputs,
+            attestations,
+          });
+        } catch (err) {
+          this.log.warn(`Failed to analyze estimated L1 fees for epoch ${epochNumber}`, err);
+        }
         this.state = 'completed';
         this.metrics.recordProvingJob(executionTime, timer.ms(), epochSizeCheckpoints, epochSizeBlocks, epochSizeTxs);
         return;
@@ -309,25 +342,56 @@ export class EpochProvingJob implements Traceable {
    */
   private async createFork(blockNumber: BlockNumber, l1ToL2Messages: Fr[] | undefined) {
     this.log.verbose(`Creating fork at ${blockNumber}`, { blockNumber });
-    const db = await this.dbProvider.fork(blockNumber);
+    // temporary stack to control fork lifetime
+    await using cleanup = new AsyncDisposableStack();
+    const db = cleanup.use(await this.dbProvider.fork(blockNumber));
 
     if (l1ToL2Messages !== undefined) {
       this.log.verbose(`Inserting ${l1ToL2Messages.length} L1 to L2 messages in fork`, {
         blockNumber,
         l1ToL2Messages: l1ToL2Messages.map(m => m.toString()),
       });
-      const l1ToL2MessagesPadded = padArrayEnd<Fr, number>(
-        l1ToL2Messages,
-        Fr.ZERO,
-        NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
-        'Too many L1 to L2 messages',
-      );
-      await db.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, l1ToL2MessagesPadded);
+      await appendL1ToL2MessagesToTree(db, l1ToL2Messages);
     }
 
+    // everything run succesfully so we can release this stack and give control of the fork's lifetime to the caller
+    cleanup.move();
     return db;
   }
 
+  private async processCheckpoints(
+    parallelism: number,
+    processCheckpoint: (checkpoint: Checkpoint) => Promise<void>,
+  ): Promise<void> {
+    let hasError = false;
+    let firstError: unknown;
+
+    await asyncPool(Math.max(parallelism, 1), this.checkpoints, async checkpoint => {
+      if (hasError || this.abortController.signal.aborted) {
+        return;
+      }
+
+      try {
+        this.checkState();
+        await processCheckpoint(checkpoint);
+      } catch (err) {
+        if (!hasError) {
+          hasError = true;
+          firstError = err;
+          this.failProcessing();
+        }
+      }
+    });
+
+    if (hasError) {
+      throw firstError;
+    }
+
+    if (this.abortController.signal.aborted) {
+      this.checkState();
+    }
+  }
+
   private progressState(state: EpochProvingJobState) {
     this.checkState();
     this.state = state;
@@ -341,12 +405,24 @@ export class EpochProvingJob implements Traceable {
 
   public async stop(state: EpochProvingJobTerminalState = 'stopped') {
     this.state = state;
-    this.prover.cancel();
+    this.interruptProcessing();
     if (this.runPromise) {
       await this.runPromise;
     }
   }
 
+  private failProcessing() {
+    if (!EpochProvingJobTerminalState.includes(this.state)) {
+      this.state = 'failed';
+    }
+    this.interruptProcessing();
+  }
+
+  private interruptProcessing() {
+    this.abortController.abort();
+    this.prover.cancel();
+  }
+
   private scheduleDeadlineStop() {
     const deadline = this.deadline;
     if (deadline) {
@@ -381,7 +457,9 @@ export class EpochProvingJob implements Traceable {
     const intervalMs = Math.ceil((await l2BlockSource.getL1Constants()).ethereumSlotDuration / 2) * 1000;
     this.epochCheckPromise = new RunningPromise(
       async () => {
-        const blockHeaders = await l2BlockSource.getCheckpointedBlockHeadersForEpoch(this.epochNumber);
+        const blockHeaders = (
+          await l2BlockSource.getBlocksData({ epoch: this.epochNumber, onlyCheckpointed: true })
+        ).map(d => d.header);
         const blockHashes = await Promise.all(blockHeaders.map(header => header.hash()));
         const thisBlocks = this.checkpoints.flatMap(checkpoint => checkpoint.blocks);
         const thisBlockHashes = await Promise.all(thisBlocks.map(block => block.hash()));
@@ -420,7 +498,11 @@ export class EpochProvingJob implements Traceable {
 
   private async processTxs(publicProcessor: PublicProcessor, txs: Tx[]): Promise<ProcessedTx[]> {
     const { deadline } = this;
-    const [processedTxs, failedTxs] = await publicProcessor.process(txs, { deadline });
+    const [processedTxs, failedTxs] = await publicProcessor.process(txs, {
+      deadline,
+      signal: this.abortController.signal,
+    });
+    this.checkState();
 
     if (failedTxs.length) {
       const failedTxHashes = await Promise.all(failedTxs.map(({ tx }) => tx.getTxHash()));