@aztec/prover-node 0.0.1-commit.2eb6648a → 0.0.1-commit.2f68f620

package/dest/prover-node.js

@@ -378,7 +378,7 @@ import { createLogger } from '@aztec/foundation/log';
 import { DateProvider } from '@aztec/foundation/timer';
 import { PublicProcessorFactory } from '@aztec/simulator/server';
 import { getProofSubmissionDeadlineTimestamp } from '@aztec/stdlib/epoch-helpers';
-import { EpochProvingJobTerminalState, tryStop } from '@aztec/stdlib/interfaces/server';
+import { tryStop } from '@aztec/stdlib/interfaces/server';
 import { Attributes, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
 import { uploadEpochProofFailure } from './actions/upload-epoch-proof-failure.js';
 import { EpochProvingJob } from './job/epoch-proving-job.js';
@@ -404,6 +404,8 @@ _dec = trackSpan('ProverNode.createProvingJob', (epochNumber)=>({
     rollupContract;
     l1Metrics;
     telemetryClient;
+    delayer;
+    dateProvider;
     static{
         ({ e: [_initProto] } = _apply_decs_2203_r(this, [
             [
@@ -424,14 +426,14 @@ _dec = trackSpan('ProverNode.createProvingJob', (epochNumber)=>({
         ], []));
     }
     log;
-    dateProvider;
     jobs;
     config;
     jobMetrics;
     rewardsMetrics;
+    startingProofEpochs;
     tracer;
     publisher;
-    constructor(prover, publisherFactory, l2BlockSource, l1ToL2MessageSource, contractDataSource, worldState, p2pClient, epochsMonitor, rollupContract, l1Metrics, config = {}, telemetryClient = getTelemetryClient()){
+    constructor(prover, publisherFactory, l2BlockSource, l1ToL2MessageSource, contractDataSource, worldState, p2pClient, epochsMonitor, rollupContract, l1Metrics, config = {}, telemetryClient = getTelemetryClient(), delayer, dateProvider = new DateProvider()){
         this.prover = prover;
         this.publisherFactory = publisherFactory;
         this.l2BlockSource = l2BlockSource;
@@ -443,13 +445,15 @@ _dec = trackSpan('ProverNode.createProvingJob', (epochNumber)=>({
         this.rollupContract = rollupContract;
         this.l1Metrics = l1Metrics;
         this.telemetryClient = telemetryClient;
+        this.delayer = delayer;
+        this.dateProvider = dateProvider;
         this.log = (_initProto(this), createLogger('prover-node'));
-        this.dateProvider = new DateProvider();
         this.jobs = new Map();
+        this.startingProofEpochs = new Set();
         this.config = {
             proverNodePollingIntervalMs: 1_000,
             proverNodeMaxPendingJobs: 100,
-            proverNodeMaxParallelBlocksPerEpoch: 32,
+            proverNodeMaxParallelBlocksPerEpoch: 0,
             txGatheringIntervalMs: 1_000,
             txGatheringBatchSize: 10,
             txGatheringMaxParallelRequestsPerNode: 100,
@@ -470,6 +474,9 @@ _dec = trackSpan('ProverNode.createProvingJob', (epochNumber)=>({
     getP2P() {
         return this.p2pClient;
     }
+    /** Returns the shared tx delayer for prover L1 txs, if enabled. Test-only. */ getDelayer() {
+        return this.delayer;
+    }
     /**
    * 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.
@@ -479,15 +486,7 @@ _dec = trackSpan('ProverNode.createProvingJob', (epochNumber)=>({
             this.log.debug(`Running jobs as ${epochNumber} is ready to prove`, {
                 jobs: Array.from(this.jobs.values()).map((job)=>`${job.getEpochNumber()}:${job.getId()}`)
             });
-            const activeJobs = await this.getActiveJobsForEpoch(epochNumber);
-            if (activeJobs.length > 0) {
-                this.log.warn(`Not starting proof for ${epochNumber} since there are active jobs for the epoch`, {
-                    activeJobs: activeJobs.map((job)=>job.uuid)
-                });
-                return true;
-            }
-            await this.startProof(epochNumber);
-            return true;
+            return await this.startProofIfNeeded(epochNumber);
         } catch (err) {
             if (err instanceof EmptyEpochError) {
                 this.log.info(`Not starting proof for ${epochNumber} since no blocks were found`);
@@ -510,16 +509,14 @@ _dec = trackSpan('ProverNode.createProvingJob', (epochNumber)=>({
     }
     /**
    * Stops the prover node and all its dependencies.
+   * Resources not owned by this node (shared with the parent aztec-node) are skipped.
    */ async stop() {
         this.log.info('Stopping ProverNode');
         await this.epochsMonitor.stop();
-        await this.prover.stop();
-        await tryStop(this.p2pClient);
-        await tryStop(this.l2BlockSource);
-        await tryStop(this.publisherFactory);
         this.publisher?.interrupt();
         await Promise.all(Array.from(this.jobs.values()).map((job)=>job.stop()));
-        await this.worldState.stop();
+        await this.prover.stop();
+        await tryStop(this.publisherFactory);
         this.rewardsMetrics.stop();
         this.l1Metrics.stop();
         await this.telemetryClient.stop();
@@ -535,9 +532,35 @@ _dec = trackSpan('ProverNode.createProvingJob', (epochNumber)=>({
     /**
    * Starts a proving process and returns immediately.
    */ async startProof(epochNumber) {
-        const job = await this.createProvingJob(epochNumber, {
+        await this.startProofIfNeeded(epochNumber, {
             skipEpochCheck: true
         });
+    }
+    async startProofIfNeeded(epochNumber, opts = {}) {
+        if (this.startingProofEpochs.has(epochNumber)) {
+            this.log.warn(`Not starting proof for ${epochNumber} since a proof is already being started for the epoch`, {
+                epochNumber
+            });
+            return false;
+        }
+        this.startingProofEpochs.add(epochNumber);
+        try {
+            const activeJobs = await this.activeJobsCoverEpoch(epochNumber);
+            if (activeJobs.length > 0) {
+                this.log.warn(`Not starting proof for ${epochNumber} since an active job already covers the epoch`, {
+                    epochNumber,
+                    activeJobs
+                });
+                return true;
+            }
+            await this.startProofInternal(epochNumber, opts);
+            return true;
+        } finally{
+            this.startingProofEpochs.delete(epochNumber);
+        }
+    }
+    async startProofInternal(epochNumber, opts = {}) {
+        const job = await this.createProvingJob(epochNumber, opts);
         void this.runJob(job);
     }
     async runJob(job) {
@@ -579,15 +602,40 @@ _dec = trackSpan('ProverNode.createProvingJob', (epochNumber)=>({
     /**
    * Returns an array of jobs being processed.
    */ getJobs() {
-        return Promise.resolve(Array.from(this.jobs.entries()).map(([uuid, job])=>({
+        return Promise.resolve(this.getJobsInternal());
+    }
+    getJobsInternal() {
+        return Array.from(this.jobs.entries()).map(([uuid, job])=>({
                 uuid,
                 status: job.getState(),
                 epochNumber: job.getEpochNumber()
-            })));
+            }));
     }
-    async getActiveJobsForEpoch(epochNumber) {
-        const jobs = await this.getJobs();
-        return jobs.filter((job)=>job.epochNumber === epochNumber && !EpochProvingJobTerminalState.includes(job.status));
+    async activeJobsCoverEpoch(epochNumber) {
+        const checkpoints = await this.l2BlockSource.getCheckpointsData({
+            epoch: epochNumber
+        });
+        if (checkpoints.length === 0) {
+            return [];
+        }
+        const firstCheckpoint = checkpoints.at(0).checkpointNumber;
+        const latestCheckpoint = checkpoints.at(-1).checkpointNumber;
+        const jobs = [];
+        for (const job of this.jobs.values()){
+            if (job.getEpochNumber() !== epochNumber) {
+                continue;
+            }
+            const jobCheckpoints = job.getProvingData().checkpoints;
+            const checkpointOverlap = jobCheckpoints.at(0).number <= firstCheckpoint && jobCheckpoints.at(-1).number >= latestCheckpoint;
+            if (checkpointOverlap && ![
+                'failed',
+                'stopped',
+                'timed-out'
+            ].includes(job.getState())) {
+                jobs.push(job.getId());
+            }
+        }
+        return jobs;
     }
     checkMaximumPendingJobs() {
         const { proverNodeMaxPendingJobs: maxPendingJobs } = this.config;
@@ -603,10 +651,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.
@@ -620,7 +670,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(),
@@ -629,8 +686,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,
@@ -640,13 +695,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();
@@ -677,12 +725,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

@@ -1,25 +1,27 @@
 import type { RollupContract } from '@aztec/ethereum/contracts';
 import type { L1TxUtils } from '@aztec/ethereum/l1-tx-utils';
 import type { PublisherManager } from '@aztec/ethereum/publisher-manager';
+import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { LoggerBindings } from '@aztec/foundation/log';
-import type { PublisherConfig, TxSenderConfig } from '@aztec/sequencer-client';
+import type { ProverPublisherConfig, ProverTxSenderConfig } from '@aztec/sequencer-client';
 import type { TelemetryClient } from '@aztec/telemetry-client';
 import { ProverNodePublisher } from './prover-node-publisher.js';
 export declare class ProverPublisherFactory {
     private config;
     private deps;
     private bindings?;
-    constructor(config: TxSenderConfig & PublisherConfig, deps: {
+    constructor(config: ProverTxSenderConfig & ProverPublisherConfig, deps: {
         rollupContract: RollupContract;
         publisherManager: PublisherManager<L1TxUtils>;
+        proofSubmissionTarget?: EthAddress;
         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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmVyLXB1Ymxpc2hlci1mYWN0b3J5LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcHJvdmVyLXB1Ymxpc2hlci1mYWN0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQzdELE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDMUUsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDNUQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLGNBQWMsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQy9FLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRS9ELE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBRWpFLHFCQUFhLHNCQUFzQjtJQUUvQixPQUFPLENBQUMsTUFBTTtJQUNkLE9BQU8sQ0FBQyxJQUFJO0lBS1osT0FBTyxDQUFDLFFBQVEsQ0FBQztJQVBuQixZQUNVLE1BQU0sRUFBRSxjQUFjLEdBQUcsZUFBZSxFQUN4QyxJQUFJLEVBQUU7UUFDWixjQUFjLEVBQUUsY0FBYyxDQUFDO1FBQy9CLGdCQUFnQixFQUFFLGdCQUFnQixDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQzlDLFNBQVMsQ0FBQyxFQUFFLGVBQWUsQ0FBQztLQUM3QixFQUNPLFFBQVEsQ0FBQyw0QkFBZ0IsRUFDL0I7SUFFUyxLQUFLLGtCQUVqQjtJQUVNLElBQUksU0FFVjtJQUVEOzs7T0FHRztJQUNVLE1BQU0sSUFBSSxPQUFPLENBQUMsbUJBQW1CLENBQUMsQ0FXbEQ7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmVyLXB1Ymxpc2hlci1mYWN0b3J5LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcHJvdmVyLXB1Ymxpc2hlci1mYWN0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQzdELE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDMUUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDNUQsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUMzRixPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUUvRCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUVqRSxxQkFBYSxzQkFBc0I7SUFFL0IsT0FBTyxDQUFDLE1BQU07SUFDZCxPQUFPLENBQUMsSUFBSTtJQU1aLE9BQU8sQ0FBQyxRQUFRLENBQUM7SUFSbkIsWUFDVSxNQUFNLEVBQUUsb0JBQW9CLEdBQUcscUJBQXFCLEVBQ3BELElBQUksRUFBRTtRQUNaLGNBQWMsRUFBRSxjQUFjLENBQUM7UUFDL0IsZ0JBQWdCLEVBQUUsZ0JBQWdCLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDOUMscUJBQXFCLENBQUMsRUFBRSxVQUFVLENBQUM7UUFDbkMsU0FBUyxDQUFDLEVBQUUsZUFBZSxDQUFDO0tBQzdCLEVBQ08sUUFBUSxDQUFDLDRCQUFnQixFQUMvQjtJQUVTLEtBQUssa0JBRWpCO0lBRVksSUFBSSxrQkFFaEI7SUFFRDs7O09BR0c7SUFDVSxNQUFNLElBQUksT0FBTyxDQUFDLG1CQUFtQixDQUFDLENBWWxEO0NBQ0YifQ==

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,eAAe,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE,qBAAa,sBAAsB;IAE/B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,IAAI;IAKZ,OAAO,CAAC,QAAQ,CAAC;IAPnB,YACU,MAAM,EAAE,cAAc,GAAG,eAAe,EACxC,IAAI,EAAE;QACZ,cAAc,EAAE,cAAc,CAAC;QAC/B,gBAAgB,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAC9C,SAAS,CAAC,EAAE,eAAe,CAAC;KAC7B,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,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,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;IAMZ,OAAO,CAAC,QAAQ,CAAC;IARnB,YACU,MAAM,EAAE,oBAAoB,GAAG,qBAAqB,EACpD,IAAI,EAAE;QACZ,cAAc,EAAE,cAAc,CAAC;QAC/B,gBAAgB,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAC9C,qBAAqB,CAAC,EAAE,UAAU,CAAC;QACnC,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,CAYlD;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.
@@ -22,6 +22,7 @@ export class ProverPublisherFactory {
         return new ProverNodePublisher(this.config, {
             rollupContract: this.deps.rollupContract,
             l1TxUtils: l1Publisher,
+            proofSubmissionTarget: this.deps.proofSubmissionTarget,
             telemetry: this.deps.telemetry
         }, this.bindings);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/prover-node",
-  "version": "0.0.1-commit.2eb6648a",
+  "version": "0.0.1-commit.2f68f620",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -56,27 +56,28 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "0.0.1-commit.2eb6648a",
-    "@aztec/bb-prover": "0.0.1-commit.2eb6648a",
-    "@aztec/blob-client": "0.0.1-commit.2eb6648a",
-    "@aztec/blob-lib": "0.0.1-commit.2eb6648a",
-    "@aztec/constants": "0.0.1-commit.2eb6648a",
-    "@aztec/epoch-cache": "0.0.1-commit.2eb6648a",
-    "@aztec/ethereum": "0.0.1-commit.2eb6648a",
-    "@aztec/foundation": "0.0.1-commit.2eb6648a",
-    "@aztec/kv-store": "0.0.1-commit.2eb6648a",
-    "@aztec/l1-artifacts": "0.0.1-commit.2eb6648a",
-    "@aztec/node-keystore": "0.0.1-commit.2eb6648a",
-    "@aztec/node-lib": "0.0.1-commit.2eb6648a",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.2eb6648a",
-    "@aztec/p2p": "0.0.1-commit.2eb6648a",
-    "@aztec/protocol-contracts": "0.0.1-commit.2eb6648a",
-    "@aztec/prover-client": "0.0.1-commit.2eb6648a",
-    "@aztec/sequencer-client": "0.0.1-commit.2eb6648a",
-    "@aztec/simulator": "0.0.1-commit.2eb6648a",
-    "@aztec/stdlib": "0.0.1-commit.2eb6648a",
-    "@aztec/telemetry-client": "0.0.1-commit.2eb6648a",
-    "@aztec/world-state": "0.0.1-commit.2eb6648a",
+    "@aztec/archiver": "0.0.1-commit.2f68f620",
+    "@aztec/bb-prover": "0.0.1-commit.2f68f620",
+    "@aztec/blob-client": "0.0.1-commit.2f68f620",
+    "@aztec/blob-lib": "0.0.1-commit.2f68f620",
+    "@aztec/constants": "0.0.1-commit.2f68f620",
+    "@aztec/epoch-cache": "0.0.1-commit.2f68f620",
+    "@aztec/ethereum": "0.0.1-commit.2f68f620",
+    "@aztec/foundation": "0.0.1-commit.2f68f620",
+    "@aztec/kv-store": "0.0.1-commit.2f68f620",
+    "@aztec/l1-artifacts": "0.0.1-commit.2f68f620",
+    "@aztec/native": "0.0.1-commit.2f68f620",
+    "@aztec/node-keystore": "0.0.1-commit.2f68f620",
+    "@aztec/node-lib": "0.0.1-commit.2f68f620",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.2f68f620",
+    "@aztec/p2p": "0.0.1-commit.2f68f620",
+    "@aztec/protocol-contracts": "0.0.1-commit.2f68f620",
+    "@aztec/prover-client": "0.0.1-commit.2f68f620",
+    "@aztec/sequencer-client": "0.0.1-commit.2f68f620",
+    "@aztec/simulator": "0.0.1-commit.2f68f620",
+    "@aztec/stdlib": "0.0.1-commit.2f68f620",
+    "@aztec/telemetry-client": "0.0.1-commit.2f68f620",
+    "@aztec/world-state": "0.0.1-commit.2f68f620",
     "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 { DataStoreConfig } from '@aztec/kv-store/config';
 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());
+  await using 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/actions/upload-epoch-proof-failure.ts

@@ -3,11 +3,11 @@ import { tryRmDir } from '@aztec/foundation/fs';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
 import type { Logger } from '@aztec/foundation/log';
 import { isoDate } from '@aztec/foundation/string';
-import type { DataStoreConfig } from '@aztec/kv-store/config';
 import { buildSnapshotMetadata, createBackups } from '@aztec/node-lib/actions';
 import type { ChainConfig } from '@aztec/stdlib/config';
 import { type FileStore, createFileStore } from '@aztec/stdlib/file-store';
 import type { WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
+import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
 import { type UploadSnapshotMetadata, getBasePath, uploadSnapshotData } from '@aztec/stdlib/snapshots';
 import { WORLD_STATE_DB_VERSION } from '@aztec/world-state';
 

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

@@ -1,5 +1,5 @@
 /* eslint-disable no-console */
-import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
+import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { jsonParseWithSchema, jsonStringify } from '@aztec/foundation/json-rpc';
 import { createLogger } from '@aztec/foundation/log';
@@ -22,8 +22,10 @@ async function rerunFailedEpoch(provingJobUrl: string, baseLocalDir: string) {
   const dataDir = join(localDir, 'state');
 
   const env = getProverNodeConfigFromEnv();
+  const l1Config = getL1ContractsConfigEnvVars();
   const config = {
-    ...getProverNodeConfigFromEnv(),
+    ...env,
+    ...l1Config,
     dataDirectory: dataDir,
     dataStoreMapSizeKb: env.dataStoreMapSizeKb ?? 1024 * 1024,
     proverId: env.proverId ?? EthAddress.random(),
@@ -47,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

@@ -1,18 +1,16 @@
-import { type ArchiverConfig, archiverConfigMappings } from '@aztec/archiver/config';
 import type { ACVMConfig, BBConfig } from '@aztec/bb-prover/config';
-import { type GenesisStateConfig, genesisStateConfigMappings } from '@aztec/ethereum/config';
 import {
   type ConfigMappingsType,
   booleanConfigHelper,
   getConfigFromMappings,
   numberConfigHelper,
+  pickConfigMappings,
 } from '@aztec/foundation/config';
-import { type DataStoreConfig, dataConfigMappings } from '@aztec/kv-store/config';
+import { EthAddress } from '@aztec/foundation/eth-address';
 import { type KeyStoreConfig, keyStoreConfigMappings } from '@aztec/node-keystore/config';
 import { ethPrivateKeySchema } from '@aztec/node-keystore/schemas';
 import type { KeyStore } from '@aztec/node-keystore/types';
 import { type SharedNodeConfig, sharedNodeConfigMappings } from '@aztec/node-lib/config';
-import { type P2PConfig, p2pConfigMappings } from '@aztec/p2p/config';
 import {
   type ProverAgentConfig,
   type ProverBrokerConfig,
@@ -21,24 +19,20 @@ import {
 } from '@aztec/prover-client/broker/config';
 import { type ProverClientUserConfig, bbConfigMappings, proverClientConfigMappings } from '@aztec/prover-client/config';
 import {
-  type PublisherConfig,
-  type TxSenderConfig,
-  getPublisherConfigMappings,
-  getTxSenderConfigMappings,
+  type ProverPublisherConfig,
+  type ProverTxSenderConfig,
+  proverPublisherConfigMappings,
+  proverTxSenderConfigMappings,
 } from '@aztec/sequencer-client/config';
-import { type WorldStateConfig, worldStateConfigMappings } from '@aztec/world-state/config';
-
-export type ProverNodeConfig = ArchiverConfig &
-  ProverClientUserConfig &
-  P2PConfig &
-  WorldStateConfig &
-  PublisherConfig &
-  TxSenderConfig &
+import { type DataStoreConfig, dataConfigMappings } from '@aztec/stdlib/kv-store';
+
+export type ProverNodeConfig = ProverClientUserConfig &
+  ProverPublisherConfig &
+  ProverTxSenderConfig &
   DataStoreConfig &
   KeyStoreConfig &
-  SharedNodeConfig &
   SpecificProverNodeConfig &
-  GenesisStateConfig;
+  Pick<SharedNodeConfig, 'web3SignerUrl'>;
 
 export type SpecificProverNodeConfig = {
   proverNodeMaxPendingJobs: number;
@@ -51,9 +45,10 @@ export type SpecificProverNodeConfig = {
   txGatheringIntervalMs: number;
   txGatheringBatchSize: number;
   txGatheringMaxParallelRequestsPerNode: number;
+  proofSubmissionTargetAddress?: EthAddress;
 };
 
-const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeConfig> = {
+export const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeConfig> = {
   proverNodeMaxPendingJobs: {
     env: 'PROVER_NODE_MAX_PENDING_JOBS',
     description: 'The maximum number of pending jobs for the prover node',
@@ -67,7 +62,7 @@ const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeCon
   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',
@@ -103,20 +98,24 @@ const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeCon
     description: 'Whether the prover node skips publishing proofs to L1',
     ...booleanConfigHelper(false),
   },
+  proofSubmissionTargetAddress: {
+    env: 'PROVER_NODE_PROOF_SUBMISSION_TARGET_ADDRESS',
+    description:
+      'Optional L1 address the submitEpochRootProof tx is sent to. Must expose the identical submitEpochRootProof ABI ' +
+      'and forward to the rollup. Defaults to the rollup address.',
+    parseEnv: (val: string) => EthAddress.fromString(val),
+    defaultValue: undefined,
+  },
 };
 
 export const proverNodeConfigMappings: ConfigMappingsType<ProverNodeConfig> = {
   ...dataConfigMappings,
   ...keyStoreConfigMappings,
-  ...archiverConfigMappings,
   ...proverClientConfigMappings,
-  ...p2pConfigMappings,
-  ...worldStateConfigMappings,
-  ...getPublisherConfigMappings('PROVER'),
-  ...getTxSenderConfigMappings('PROVER'),
+  ...proverPublisherConfigMappings,
+  ...proverTxSenderConfigMappings,
   ...specificProverNodeConfigMappings,
-  ...genesisStateConfigMappings,
-  ...sharedNodeConfigMappings,
+  ...pickConfigMappings(sharedNodeConfigMappings, ['web3SignerUrl']),
 };
 
 export function getProverNodeConfigFromEnv(): ProverNodeConfig {
@@ -143,7 +142,7 @@ function createKeyStoreFromWeb3Signer(config: ProverNodeConfig): KeyStore | unde
   }
 
   // Also, we need at least one publisher address.
-  const publishers = config.publisherAddresses ?? [];
+  const publishers = config.proverPublisherAddresses ?? [];
 
   if (publishers.length === 0) {
     return undefined;
@@ -164,8 +163,8 @@ function createKeyStoreFromWeb3Signer(config: ProverNodeConfig): KeyStore | unde
 
 function createKeyStoreFromPublisherKeys(config: ProverNodeConfig): KeyStore | undefined {
   // Extract the publisher keys from the provided config.
-  const publisherKeys = config.publisherPrivateKeys
-    ? config.publisherPrivateKeys.map((k: { getValue: () => string }) => ethPrivateKeySchema.parse(k.getValue()))
+  const publisherKeys = config.proverPublisherPrivateKeys
+    ? config.proverPublisherPrivateKeys.map((k: { getValue: () => string }) => ethPrivateKeySchema.parse(k.getValue()))
     : [];
 
   // There must be at least 1.
@@ -194,7 +193,10 @@ function createKeyStoreFromPublisherKeys(config: ProverNodeConfig): KeyStore | u
 
 export function createKeyStoreForProver(config: ProverNodeConfig): KeyStore | undefined {
   if (config.web3SignerUrl !== undefined && config.web3SignerUrl.length > 0) {
-    return createKeyStoreFromWeb3Signer(config);
+    const keyStore = createKeyStoreFromWeb3Signer(config);
+    if (keyStore) {
+      return keyStore;
+    }
   }
 
   return createKeyStoreFromPublisherKeys(config);