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

package/dest/prover-node.js

@@ -1,137 +1,575 @@
-function _ts_decorate(decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.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;
+function applyDecs2203RFactory() {
+    function createAddInitializerMethod(initializers, decoratorFinishedRef) {
+        return function addInitializer(initializer) {
+            assertNotFinished(decoratorFinishedRef, "addInitializer");
+            assertCallable(initializer, "An initializer");
+            initializers.push(initializer);
+        };
+    }
+    function memberDec(dec, name, desc, initializers, kind, isStatic, isPrivate, metadata, value) {
+        var kindStr;
+        switch(kind){
+            case 1:
+                kindStr = "accessor";
+                break;
+            case 2:
+                kindStr = "method";
+                break;
+            case 3:
+                kindStr = "getter";
+                break;
+            case 4:
+                kindStr = "setter";
+                break;
+            default:
+                kindStr = "field";
+        }
+        var ctx = {
+            kind: kindStr,
+            name: isPrivate ? "#" + name : name,
+            static: isStatic,
+            private: isPrivate,
+            metadata: metadata
+        };
+        var decoratorFinishedRef = {
+            v: false
+        };
+        ctx.addInitializer = createAddInitializerMethod(initializers, decoratorFinishedRef);
+        var get, set;
+        if (kind === 0) {
+            if (isPrivate) {
+                get = desc.get;
+                set = desc.set;
+            } else {
+                get = function() {
+                    return this[name];
+                };
+                set = function(v) {
+                    this[name] = v;
+                };
+            }
+        } else if (kind === 2) {
+            get = function() {
+                return desc.value;
+            };
+        } else {
+            if (kind === 1 || kind === 3) {
+                get = function() {
+                    return desc.get.call(this);
+                };
+            }
+            if (kind === 1 || kind === 4) {
+                set = function(v) {
+                    desc.set.call(this, v);
+                };
+            }
+        }
+        ctx.access = get && set ? {
+            get: get,
+            set: set
+        } : get ? {
+            get: get
+        } : {
+            set: set
+        };
+        try {
+            return dec(value, ctx);
+        } finally{
+            decoratorFinishedRef.v = true;
+        }
+    }
+    function assertNotFinished(decoratorFinishedRef, fnName) {
+        if (decoratorFinishedRef.v) {
+            throw new Error("attempted to call " + fnName + " after decoration was finished");
+        }
+    }
+    function assertCallable(fn, hint) {
+        if (typeof fn !== "function") {
+            throw new TypeError(hint + " must be a function");
+        }
+    }
+    function assertValidReturnValue(kind, value) {
+        var type = typeof value;
+        if (kind === 1) {
+            if (type !== "object" || value === null) {
+                throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0");
+            }
+            if (value.get !== undefined) {
+                assertCallable(value.get, "accessor.get");
+            }
+            if (value.set !== undefined) {
+                assertCallable(value.set, "accessor.set");
+            }
+            if (value.init !== undefined) {
+                assertCallable(value.init, "accessor.init");
+            }
+        } else if (type !== "function") {
+            var hint;
+            if (kind === 0) {
+                hint = "field";
+            } else if (kind === 10) {
+                hint = "class";
+            } else {
+                hint = "method";
+            }
+            throw new TypeError(hint + " decorators must return a function or void 0");
+        }
+    }
+    function applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, initializers, metadata) {
+        var decs = decInfo[0];
+        var desc, init, value;
+        if (isPrivate) {
+            if (kind === 0 || kind === 1) {
+                desc = {
+                    get: decInfo[3],
+                    set: decInfo[4]
+                };
+            } else if (kind === 3) {
+                desc = {
+                    get: decInfo[3]
+                };
+            } else if (kind === 4) {
+                desc = {
+                    set: decInfo[3]
+                };
+            } else {
+                desc = {
+                    value: decInfo[3]
+                };
+            }
+        } else if (kind !== 0) {
+            desc = Object.getOwnPropertyDescriptor(base, name);
+        }
+        if (kind === 1) {
+            value = {
+                get: desc.get,
+                set: desc.set
+            };
+        } else if (kind === 2) {
+            value = desc.value;
+        } else if (kind === 3) {
+            value = desc.get;
+        } else if (kind === 4) {
+            value = desc.set;
+        }
+        var newValue, get, set;
+        if (typeof decs === "function") {
+            newValue = memberDec(decs, name, desc, initializers, kind, isStatic, isPrivate, metadata, value);
+            if (newValue !== void 0) {
+                assertValidReturnValue(kind, newValue);
+                if (kind === 0) {
+                    init = newValue;
+                } else if (kind === 1) {
+                    init = newValue.init;
+                    get = newValue.get || value.get;
+                    set = newValue.set || value.set;
+                    value = {
+                        get: get,
+                        set: set
+                    };
+                } else {
+                    value = newValue;
+                }
+            }
+        } else {
+            for(var i = decs.length - 1; i >= 0; i--){
+                var dec = decs[i];
+                newValue = memberDec(dec, name, desc, initializers, kind, isStatic, isPrivate, metadata, value);
+                if (newValue !== void 0) {
+                    assertValidReturnValue(kind, newValue);
+                    var newInit;
+                    if (kind === 0) {
+                        newInit = newValue;
+                    } else if (kind === 1) {
+                        newInit = newValue.init;
+                        get = newValue.get || value.get;
+                        set = newValue.set || value.set;
+                        value = {
+                            get: get,
+                            set: set
+                        };
+                    } else {
+                        value = newValue;
+                    }
+                    if (newInit !== void 0) {
+                        if (init === void 0) {
+                            init = newInit;
+                        } else if (typeof init === "function") {
+                            init = [
+                                init,
+                                newInit
+                            ];
+                        } else {
+                            init.push(newInit);
+                        }
+                    }
+                }
+            }
+        }
+        if (kind === 0 || kind === 1) {
+            if (init === void 0) {
+                init = function(instance, init) {
+                    return init;
+                };
+            } else if (typeof init !== "function") {
+                var ownInitializers = init;
+                init = function(instance, init) {
+                    var value = init;
+                    for(var i = 0; i < ownInitializers.length; i++){
+                        value = ownInitializers[i].call(instance, value);
+                    }
+                    return value;
+                };
+            } else {
+                var originalInitializer = init;
+                init = function(instance, init) {
+                    return originalInitializer.call(instance, init);
+                };
+            }
+            ret.push(init);
+        }
+        if (kind !== 0) {
+            if (kind === 1) {
+                desc.get = value.get;
+                desc.set = value.set;
+            } else if (kind === 2) {
+                desc.value = value;
+            } else if (kind === 3) {
+                desc.get = value;
+            } else if (kind === 4) {
+                desc.set = value;
+            }
+            if (isPrivate) {
+                if (kind === 1) {
+                    ret.push(function(instance, args) {
+                        return value.get.call(instance, args);
+                    });
+                    ret.push(function(instance, args) {
+                        return value.set.call(instance, args);
+                    });
+                } else if (kind === 2) {
+                    ret.push(value);
+                } else {
+                    ret.push(function(instance, args) {
+                        return value.call(instance, args);
+                    });
+                }
+            } else {
+                Object.defineProperty(base, name, desc);
+            }
+        }
+    }
+    function applyMemberDecs(Class, decInfos, metadata) {
+        var ret = [];
+        var protoInitializers;
+        var staticInitializers;
+        var existingProtoNonFields = new Map();
+        var existingStaticNonFields = new Map();
+        for(var i = 0; i < decInfos.length; i++){
+            var decInfo = decInfos[i];
+            if (!Array.isArray(decInfo)) continue;
+            var kind = decInfo[1];
+            var name = decInfo[2];
+            var isPrivate = decInfo.length > 3;
+            var isStatic = kind >= 5;
+            var base;
+            var initializers;
+            if (isStatic) {
+                base = Class;
+                kind = kind - 5;
+                staticInitializers = staticInitializers || [];
+                initializers = staticInitializers;
+            } else {
+                base = Class.prototype;
+                protoInitializers = protoInitializers || [];
+                initializers = protoInitializers;
+            }
+            if (kind !== 0 && !isPrivate) {
+                var existingNonFields = isStatic ? existingStaticNonFields : existingProtoNonFields;
+                var existingKind = existingNonFields.get(name) || 0;
+                if (existingKind === true || existingKind === 3 && kind !== 4 || existingKind === 4 && kind !== 3) {
+                    throw new Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + name);
+                } else if (!existingKind && kind > 2) {
+                    existingNonFields.set(name, kind);
+                } else {
+                    existingNonFields.set(name, true);
+                }
+            }
+            applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, initializers, metadata);
+        }
+        pushInitializers(ret, protoInitializers);
+        pushInitializers(ret, staticInitializers);
+        return ret;
+    }
+    function pushInitializers(ret, initializers) {
+        if (initializers) {
+            ret.push(function(instance) {
+                for(var i = 0; i < initializers.length; i++){
+                    initializers[i].call(instance);
+                }
+                return instance;
+            });
+        }
+    }
+    function applyClassDecs(targetClass, classDecs, metadata) {
+        if (classDecs.length > 0) {
+            var initializers = [];
+            var newClass = targetClass;
+            var name = targetClass.name;
+            for(var i = classDecs.length - 1; i >= 0; i--){
+                var decoratorFinishedRef = {
+                    v: false
+                };
+                try {
+                    var nextNewClass = classDecs[i](newClass, {
+                        kind: "class",
+                        name: name,
+                        addInitializer: createAddInitializerMethod(initializers, decoratorFinishedRef),
+                        metadata
+                    });
+                } finally{
+                    decoratorFinishedRef.v = true;
+                }
+                if (nextNewClass !== undefined) {
+                    assertValidReturnValue(10, nextNewClass);
+                    newClass = nextNewClass;
+                }
+            }
+            return [
+                defineMetadata(newClass, metadata),
+                function() {
+                    for(var i = 0; i < initializers.length; i++){
+                        initializers[i].call(newClass);
+                    }
+                }
+            ];
+        }
+    }
+    function defineMetadata(Class, metadata) {
+        return Object.defineProperty(Class, Symbol.metadata || Symbol.for("Symbol.metadata"), {
+            configurable: true,
+            enumerable: true,
+            value: metadata
+        });
+    }
+    return function applyDecs2203R(targetClass, memberDecs, classDecs, parentClass) {
+        if (parentClass !== void 0) {
+            var parentMetadata = parentClass[Symbol.metadata || Symbol.for("Symbol.metadata")];
+        }
+        var metadata = Object.create(parentMetadata === void 0 ? null : parentMetadata);
+        var e = applyMemberDecs(targetClass, memberDecs, metadata);
+        if (!classDecs.length) defineMetadata(targetClass, metadata);
+        return {
+            e: e,
+            get c () {
+                return applyClassDecs(targetClass, classDecs, metadata);
+            }
+        };
+    };
+}
+function _apply_decs_2203_r(targetClass, memberDecs, classDecs, parentClass) {
+    return (_apply_decs_2203_r = applyDecs2203RFactory())(targetClass, memberDecs, classDecs, parentClass);
 }
-import { compact } from '@aztec/foundation/collection';
+var _dec, _dec1, _initProto;
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { assertRequired, compact, pick, sum } from '@aztec/foundation/collection';
 import { memoize } from '@aztec/foundation/decorators';
 import { createLogger } from '@aztec/foundation/log';
-import { RunningPromise } from '@aztec/foundation/running-promise';
 import { DateProvider } from '@aztec/foundation/timer';
 import { PublicProcessorFactory } from '@aztec/simulator/server';
-import { getTimestampRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
+import { getProofSubmissionDeadlineTimestamp } from '@aztec/stdlib/epoch-helpers';
 import { EpochProvingJobTerminalState, tryStop } from '@aztec/stdlib/interfaces/server';
 import { Attributes, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
+import { uploadEpochProofFailure } from './actions/upload-epoch-proof-failure.js';
 import { EpochProvingJob } from './job/epoch-proving-job.js';
-import { ProverNodeMetrics } from './metrics.js';
+import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
+_dec = trackSpan('ProverNode.createProvingJob', (epochNumber)=>({
+        [Attributes.EPOCH_NUMBER]: epochNumber
+    })), _dec1 = trackSpan('ProverNode.gatherEpochData', (epochNumber)=>({
+        [Attributes.EPOCH_NUMBER]: epochNumber
+    }));
 /**
- * An Aztec Prover Node is a standalone process that monitors the unfinalised chain on L1 for unproven blocks,
- * submits bids for proving them, and monitors if they are accepted. If so, the prover node fetches the txs
- * from a tx source in the p2p network or an external node, re-executes their public functions, creates a rollup
+ * An Aztec Prover Node is a standalone process that monitors the unfinalized chain on L1 for unproven epochs,
+ * fetches their txs from the p2p network or external nodes, re-executes their public functions, creates a rollup
  * proof for the epoch, and submits it to L1.
  */ export class ProverNode {
     prover;
-    publisher;
+    publisherFactory;
     l2BlockSource;
     l1ToL2MessageSource;
     contractDataSource;
     worldState;
-    coordination;
+    p2pClient;
     epochsMonitor;
+    rollupContract;
+    l1Metrics;
     telemetryClient;
+    static{
+        ({ e: [_initProto] } = _apply_decs_2203_r(this, [
+            [
+                _dec,
+                2,
+                "createProvingJob"
+            ],
+            [
+                memoize,
+                2,
+                "getL1Constants"
+            ],
+            [
+                _dec1,
+                2,
+                "gatherEpochData"
+            ]
+        ], []));
+    }
     log;
     dateProvider;
-    latestEpochWeAreProving;
     jobs;
-    cachedEpochData;
-    options;
-    metrics;
-    txFetcher;
-    lastBlockNumber;
+    config;
+    jobMetrics;
+    rewardsMetrics;
     tracer;
-    constructor(prover, publisher, l2BlockSource, l1ToL2MessageSource, contractDataSource, worldState, coordination, epochsMonitor, options = {}, telemetryClient = getTelemetryClient()){
+    publisher;
+    constructor(prover, publisherFactory, l2BlockSource, l1ToL2MessageSource, contractDataSource, worldState, p2pClient, epochsMonitor, rollupContract, l1Metrics, config = {}, telemetryClient = getTelemetryClient()){
         this.prover = prover;
-        this.publisher = publisher;
+        this.publisherFactory = publisherFactory;
         this.l2BlockSource = l2BlockSource;
         this.l1ToL2MessageSource = l1ToL2MessageSource;
         this.contractDataSource = contractDataSource;
         this.worldState = worldState;
-        this.coordination = coordination;
+        this.p2pClient = p2pClient;
         this.epochsMonitor = epochsMonitor;
+        this.rollupContract = rollupContract;
+        this.l1Metrics = l1Metrics;
         this.telemetryClient = telemetryClient;
-        this.log = createLogger('prover-node');
+        this.log = (_initProto(this), createLogger('prover-node'));
         this.dateProvider = new DateProvider();
         this.jobs = new Map();
-        this.cachedEpochData = undefined;
-        this.options = {
-            pollingIntervalMs: 1_000,
-            maxPendingJobs: 100,
-            maxParallelBlocksPerEpoch: 32,
-            txGatheringTimeoutMs: 60_000,
+        this.config = {
+            proverNodePollingIntervalMs: 1_000,
+            proverNodeMaxPendingJobs: 100,
+            proverNodeMaxParallelBlocksPerEpoch: 32,
             txGatheringIntervalMs: 1_000,
-            txGatheringMaxParallelRequests: 100,
-            ...compact(options)
+            txGatheringBatchSize: 10,
+            txGatheringMaxParallelRequestsPerNode: 100,
+            txGatheringTimeoutMs: 120_000,
+            proverNodeFailedEpochStore: undefined,
+            proverNodeEpochProvingDelayMs: undefined,
+            ...compact(config)
         };
-        this.metrics = new ProverNodeMetrics(telemetryClient, 'ProverNode');
+        this.validateConfig();
+        const meter = telemetryClient.getMeter('ProverNode');
         this.tracer = telemetryClient.getTracer('ProverNode');
-        this.txFetcher = new RunningPromise(()=>this.checkForTxs(), this.log, this.options.txGatheringIntervalMs);
+        this.jobMetrics = new ProverNodeJobMetrics(meter, telemetryClient.getTracer('EpochProvingJob'));
+        this.rewardsMetrics = new ProverNodeRewardsMetrics(meter, this.prover.getProverId(), rollupContract);
     }
     getProverId() {
         return this.prover.getProverId();
     }
     getP2P() {
-        const asP2PClient = this.coordination;
-        if (typeof asP2PClient.isP2PClient === 'function' && asP2PClient.isP2PClient()) {
-            return asP2PClient;
-        }
-        return undefined;
+        return this.p2pClient;
     }
     /**
    * Handles an epoch being completed by starting a proof for it if there are no active jobs for it.
    * @param epochNumber - The epoch number that was just completed.
+   * @returns false if there is an error, true otherwise
    */ async handleEpochReadyToProve(epochNumber) {
         try {
-            this.log.debug('jobs', JSON.stringify(this.jobs, null, 2));
+            this.log.debug(`Running jobs as ${epochNumber} is ready to prove`, {
+                jobs: Array.from(this.jobs.values()).map((job)=>`${job.getEpochNumber()}:${job.getId()}`)
+            });
             const activeJobs = await this.getActiveJobsForEpoch(epochNumber);
             if (activeJobs.length > 0) {
-                this.log.info(`Not starting proof for ${epochNumber} since there are active jobs`);
-                return;
+                this.log.warn(`Not starting proof for ${epochNumber} since there are active jobs for the epoch`, {
+                    activeJobs: activeJobs.map((job)=>job.uuid)
+                });
+                return true;
             }
-            // TODO: we probably want to skip starting a proof if we are too far into the current epoch
             await this.startProof(epochNumber);
+            return true;
         } catch (err) {
             if (err instanceof EmptyEpochError) {
                 this.log.info(`Not starting proof for ${epochNumber} since no blocks were found`);
             } else {
                 this.log.error(`Error handling epoch completed`, err);
             }
+            return false;
         }
     }
     /**
-   * Starts the prover node so it periodically checks for unproven epochs in the unfinalised chain from L1 and
+   * Starts the prover node so it periodically checks for unproven epochs in the unfinalized chain from L1 and
    * starts proving jobs for them.
-   */ start() {
-        this.txFetcher.start();
+   */ async start() {
         this.epochsMonitor.start(this);
-        this.log.info('Started ProverNode', this.options);
+        await this.publisherFactory.start();
+        this.publisher = await this.publisherFactory.create();
+        await this.rewardsMetrics.start();
+        this.l1Metrics.start();
+        this.log.info(`Started Prover Node with prover id ${this.prover.getProverId().toString()}`, this.config);
     }
     /**
    * Stops the prover node and all its dependencies.
    */ async stop() {
         this.log.info('Stopping ProverNode');
-        await this.txFetcher.stop();
         await this.epochsMonitor.stop();
         await this.prover.stop();
+        await tryStop(this.p2pClient);
         await tryStop(this.l2BlockSource);
-        this.publisher.interrupt();
+        await tryStop(this.publisherFactory);
+        this.publisher?.interrupt();
         await Promise.all(Array.from(this.jobs.values()).map((job)=>job.stop()));
         await this.worldState.stop();
-        await tryStop(this.coordination);
+        this.rewardsMetrics.stop();
+        this.l1Metrics.stop();
         await this.telemetryClient.stop();
         this.log.info('Stopped ProverNode');
     }
-    /**
-   * Creates a proof for a block range. Returns once the proof has been submitted to L1.
-   */ async prove(epochNumber) {
-        const job = await this.createProvingJob(BigInt(epochNumber));
-        return job.run();
+    /** Returns world state status. */ async getWorldStateSyncStatus() {
+        const { syncSummary } = await this.worldState.status();
+        return syncSummary;
+    }
+    /** Returns archiver status. */ getL2Tips() {
+        return this.l2BlockSource.getL2Tips();
     }
     /**
    * Starts a proving process and returns immediately.
    */ async startProof(epochNumber) {
-        const job = await this.createProvingJob(BigInt(epochNumber));
-        void job.run().catch((err)=>this.log.error(`Error proving epoch ${epochNumber}`, err));
+        const job = await this.createProvingJob(epochNumber, {
+            skipEpochCheck: true
+        });
+        void this.runJob(job);
+    }
+    async runJob(job) {
+        const epochNumber = job.getEpochNumber();
+        const ctx = {
+            id: job.getId(),
+            epochNumber,
+            state: undefined
+        };
+        try {
+            await job.run();
+            const state = job.getState();
+            ctx.state = state;
+            if (state === 'reorg') {
+                this.log.warn(`Running new job for epoch ${epochNumber} due to reorg`, ctx);
+                await this.createProvingJob(epochNumber);
+            } else if (state === 'failed') {
+                this.log.error(`Job for ${epochNumber} exited with state ${state}`, ctx);
+                await this.tryUploadEpochFailure(job);
+            } else {
+                this.log.verbose(`Job for ${epochNumber} exited with state ${state}`, ctx);
+            }
+        } catch (err) {
+            this.log.error(`Error proving epoch ${epochNumber}`, err, ctx);
+        } finally{
+            this.jobs.delete(job.getId());
+        }
+    }
+    async tryUploadEpochFailure(job) {
+        if (this.config.proverNodeFailedEpochStore) {
+            return await uploadEpochProofFailure(this.config.proverNodeFailedEpochStore, job.getId(), job.getProvingData(), this.l2BlockSource, this.worldState, assertRequired(pick(this.config, 'l1ChainId', 'rollupVersion', 'dataDirectory')), this.log);
+        }
     }
     /**
    * Returns the prover instance.
@@ -144,112 +582,126 @@ import { ProverNodeMetrics } from './metrics.js';
         return Promise.resolve(Array.from(this.jobs.entries()).map(([uuid, job])=>({
                 uuid,
                 status: job.getState(),
-                epochNumber: Number(job.getEpochNumber())
+                epochNumber: job.getEpochNumber()
             })));
     }
-    async getActiveJobsForEpoch(epochBigInt) {
+    async getActiveJobsForEpoch(epochNumber) {
         const jobs = await this.getJobs();
-        const epochNumber = Number(epochBigInt);
         return jobs.filter((job)=>job.epochNumber === epochNumber && !EpochProvingJobTerminalState.includes(job.status));
     }
     checkMaximumPendingJobs() {
-        const { maxPendingJobs } = this.options;
-        return maxPendingJobs === 0 || this.jobs.size < maxPendingJobs;
-    }
-    async createProvingJob(epochNumber) {
-        if (!this.checkMaximumPendingJobs()) {
-            throw new Error(`Maximum pending proving jobs ${this.options.maxPendingJobs} reached. Cannot create new job.`);
+        const { proverNodeMaxPendingJobs: maxPendingJobs } = this.config;
+        if (maxPendingJobs > 0 && this.jobs.size >= maxPendingJobs) {
+            throw new Error(`Maximum pending proving jobs ${maxPendingJobs} reached. Cannot create new job.`);
         }
-        // Gather blocks for this epoch
-        const cachedEpochData = this.cachedEpochData?.epochNumber === epochNumber ? this.cachedEpochData : undefined;
-        const { blocks, txs } = cachedEpochData ?? await this.gatherEpochData(epochNumber);
-        const fromBlock = blocks[0].number;
-        const toBlock = blocks.at(-1).number;
+    }
+    async createProvingJob(epochNumber, opts = {}) {
+        this.checkMaximumPendingJobs();
+        this.publisher = await this.publisherFactory.create();
+        // Gather all data for this epoch
+        const epochData = await this.gatherEpochData(epochNumber);
+        const 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;
+        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
-        this.log.verbose(`Creating proving job for epoch ${epochNumber} for block range ${fromBlock} to ${toBlock}`);
         await this.worldState.syncImmediate(toBlock);
-        // Create a processor using the forked world state
+        // Create a processor factory
         const publicProcessorFactory = new PublicProcessorFactory(this.contractDataSource, this.dateProvider, this.telemetryClient);
-        const cleanUp = ()=>{
-            this.jobs.delete(job.getId());
-            return Promise.resolve();
-        };
-        const [_, endTimestamp] = getTimestampRangeForEpoch(epochNumber + 1n, await this.getL1Constants());
-        const deadline = new Date(Number(endTimestamp) * 1000);
-        const job = this.doCreateEpochProvingJob(epochNumber, deadline, blocks, txs, publicProcessorFactory, cleanUp);
+        // Set deadline for this job to run. It will abort if it takes too long.
+        const deadlineTs = getProofSubmissionDeadlineTimestamp(epochNumber, await this.getL1Constants());
+        const deadline = new Date(Number(deadlineTs) * 1000);
+        const job = this.doCreateEpochProvingJob(epochData, deadline, publicProcessorFactory, this.publisher, opts);
         this.jobs.set(job.getId(), job);
         return job;
     }
     getL1Constants() {
         return this.l2BlockSource.getL1Constants();
     }
-    /** Monitors for new blocks and requests their txs from the p2p layer to ensure they are available for proving. */ async checkForTxs() {
-        const blockNumber = await this.l2BlockSource.getBlockNumber();
-        if (this.lastBlockNumber === undefined || blockNumber > this.lastBlockNumber) {
-            const block = await this.l2BlockSource.getBlock(blockNumber);
-            if (!block) {
-                return;
-            }
-            const txHashes = block.body.txEffects.map((tx)=>tx.txHash);
-            this.log.verbose(`Fetching ${txHashes.length} tx hashes for block number ${blockNumber} from coordination`);
-            await this.coordination.getTxsByHash(txHashes); // This stores the txs in the tx pool, no need to persist them here
-            this.lastBlockNumber = blockNumber;
-        }
-    }
     async gatherEpochData(epochNumber) {
-        // Gather blocks for this epoch and their txs
-        const blocks = await this.gatherBlocks(epochNumber);
-        const txs = await this.gatherTxs(epochNumber, blocks);
+        const checkpoints = await this.gatherCheckpoints(epochNumber);
+        const txArray = await this.gatherTxs(epochNumber, checkpoints);
+        const txs = new Map(txArray.map((tx)=>[
+                tx.getTxHash().toString(),
+                tx
+            ]));
+        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.getPublishedCheckpoints(checkpoints.at(-1).number, 1);
+        const attestations = lastPublishedCheckpoint?.attestations ?? [];
         return {
-            blocks,
-            txs
+            checkpoints,
+            txs,
+            l1ToL2Messages,
+            epochNumber,
+            previousBlockHeader,
+            attestations
         };
     }
-    async gatherBlocks(epochNumber) {
-        const blocks = await this.l2BlockSource.getBlocksForEpoch(epochNumber);
-        if (blocks.length === 0) {
+    async gatherCheckpoints(epochNumber) {
+        const checkpoints = await this.l2BlockSource.getCheckpointsForEpoch(epochNumber);
+        if (checkpoints.length === 0) {
             throw new EmptyEpochError(epochNumber);
         }
-        return blocks;
+        return checkpoints;
     }
-    async gatherTxs(epochNumber, blocks) {
-        const txsToFind = blocks.flatMap((block)=>block.body.txEffects.map((tx)=>tx.txHash));
-        const txs = await this.coordination.getTxsByHash(txsToFind);
-        if (txs.length === txsToFind.length) {
+    async gatherTxs(epochNumber, checkpoints) {
+        const deadline = new Date(this.dateProvider.now() + this.config.txGatheringTimeoutMs);
+        const txProvider = this.p2pClient.getTxProvider();
+        const blocks = checkpoints.flatMap((checkpoint)=>checkpoint.blocks);
+        const txsByBlock = await Promise.all(blocks.map((block)=>txProvider.getTxsForBlock(block, {
+                deadline
+            })));
+        const txs = txsByBlock.map(({ txs })=>txs).flat();
+        const missingTxs = txsByBlock.map(({ missingTxs })=>missingTxs).flat();
+        if (missingTxs.length === 0) {
             this.log.verbose(`Gathered all ${txs.length} txs for epoch ${epochNumber}`, {
                 epochNumber
             });
             return txs;
         }
-        const txHashesFound = await Promise.all(txs.map((tx)=>tx.getTxHash()));
-        const missingTxHashes = txsToFind.filter((txHashToFind)=>!txHashesFound.some((txHashFound)=>txHashToFind.equals(txHashFound))).join(', ');
-        throw new Error(`Txs not found for epoch ${epochNumber}: ${missingTxHashes}`);
+        throw new Error(`Txs not found for epoch ${epochNumber}: ${missingTxs.map((hash)=>hash.toString()).join(', ')}`);
     }
-    /** Extracted for testing purposes. */ doCreateEpochProvingJob(epochNumber, deadline, blocks, txs, publicProcessorFactory, cleanUp) {
-        return new EpochProvingJob(this.worldState, epochNumber, blocks, txs, this.prover.createEpochProver(), publicProcessorFactory, this.publisher, this.l2BlockSource, this.l1ToL2MessageSource, this.metrics, deadline, {
-            parallelBlockLimit: this.options.maxParallelBlocksPerEpoch
-        }, cleanUp);
+    async gatherMessages(epochNumber, checkpoints) {
+        const messages = await Promise.all(checkpoints.map((c)=>this.l1ToL2MessageSource.getL1ToL2Messages(c.number)));
+        const messageCount = sum(messages.map((m)=>m.length));
+        this.log.verbose(`Gathered all ${messageCount} messages for epoch ${epochNumber}`, {
+            epochNumber
+        });
+        const messagesByCheckpoint = {};
+        for(let i = 0; i < checkpoints.length; i++){
+            messagesByCheckpoint[checkpoints[i].number] = messages[i];
+        }
+        return messagesByCheckpoint;
+    }
+    async gatherPreviousBlockHeader(epochNumber, previousBlockNumber) {
+        const header = await (previousBlockNumber === 0 ? this.worldState.getCommitted().getInitialHeader() : this.l2BlockSource.getBlockHeader(BlockNumber(previousBlockNumber)));
+        if (!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;
+    }
+    /** Extracted for testing purposes. */ doCreateEpochProvingJob(data, deadline, publicProcessorFactory, publisher, opts = {}) {
+        const { proverNodeMaxParallelBlocksPerEpoch: parallelBlockLimit, proverNodeDisableProofPublish } = this.config;
+        return new EpochProvingJob(data, this.worldState, this.prover.createEpochProver(), publicProcessorFactory, publisher, this.l2BlockSource, this.jobMetrics, deadline, {
+            parallelBlockLimit,
+            skipSubmitProof: proverNodeDisableProofPublish,
+            ...opts
+        });
     }
     /** Extracted for testing purposes. */ async triggerMonitors() {
         await this.epochsMonitor.work();
     }
+    validateConfig() {
+        if (this.config.proverNodeFailedEpochStore && (!this.config.dataDirectory || !this.config.l1ChainId || this.config.rollupVersion === undefined)) {
+            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)=>({
-            [Attributes.EPOCH_NUMBER]: Number(epochNumber)
-        }))
-], ProverNode.prototype, "createProvingJob", null);
-_ts_decorate([
-    memoize
-], ProverNode.prototype, "getL1Constants", null);
-_ts_decorate([
-    trackSpan('ProverNode.checkForTxs')
-], ProverNode.prototype, "checkForTxs", null);
-_ts_decorate([
-    trackSpan('ProverNode.gatherEpochData', (epochNumber)=>({
-            [Attributes.EPOCH_NUMBER]: Number(epochNumber)
-        }))
-], ProverNode.prototype, "gatherEpochData", null);
 class EmptyEpochError extends Error {
     constructor(epochNumber){
         super(`No blocks found for epoch ${epochNumber}`);