@aztec/prover-node 0.0.1-commit.24de95ac → 0.0.1-commit.2606882

package/dest/prover-node.js

@@ -1,20 +1,393 @@
-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);
 }
+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 { 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';
 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 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
@@ -31,15 +404,36 @@ import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
     rollupContract;
     l1Metrics;
     telemetryClient;
-    log;
+    delayer;
     dateProvider;
+    static{
+        ({ e: [_initProto] } = _apply_decs_2203_r(this, [
+            [
+                _dec,
+                2,
+                "createProvingJob"
+            ],
+            [
+                memoize,
+                2,
+                "getL1Constants"
+            ],
+            [
+                _dec1,
+                2,
+                "gatherEpochData"
+            ]
+        ], []));
+    }
+    log;
     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;
@@ -51,13 +445,15 @@ import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
         this.rollupContract = rollupContract;
         this.l1Metrics = l1Metrics;
         this.telemetryClient = telemetryClient;
-        this.log = createLogger('prover-node');
-        this.dateProvider = new DateProvider();
+        this.delayer = delayer;
+        this.dateProvider = dateProvider;
+        this.log = (_initProto(this), createLogger('prover-node'));
         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,
@@ -78,6 +474,9 @@ import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
     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.
@@ -87,15 +486,7 @@ import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
             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`);
@@ -118,16 +509,14 @@ import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
     }
     /**
    * 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();
@@ -143,9 +532,35 @@ import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
     /**
    * Starts a proving process and returns immediately.
    */ async startProof(epochNumber) {
-        const job = await this.createProvingJob(BigInt(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) {
@@ -187,16 +602,40 @@ import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
     /**
    * 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: Number(job.getEpochNumber())
-            })));
+                epochNumber: job.getEpochNumber()
+            }));
     }
-    async getActiveJobsForEpoch(epochBigInt) {
-        const jobs = await this.getJobs();
-        const epochNumber = Number(epochBigInt);
-        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;
@@ -209,13 +648,17 @@ import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
         this.publisher = await this.publisherFactory.create();
         // Gather all data for this epoch
         const epochData = await this.gatherEpochData(epochNumber);
-        const fromBlock = epochData.blocks[0].number;
-        const toBlock = epochData.blocks.at(-1).number;
-        this.log.verbose(`Creating proving job for epoch ${epochNumber} for block range ${fromBlock} to ${toBlock}`);
+        const fromCheckpoint = epochData.checkpoints[0].number;
+        const toCheckpoint = epochData.checkpoints.at(-1).number;
+        const fromBlock = epochData.checkpoints[0].blocks[0].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);
+        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.
         const deadlineTs = getProofSubmissionDeadlineTimestamp(epochNumber, await this.getL1Constants());
         const deadline = new Date(Number(deadlineTs) * 1000);
@@ -227,18 +670,24 @@ import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
         return this.l2BlockSource.getL1Constants();
     }
     async gatherEpochData(epochNumber) {
-        const blocks = await this.gatherBlocks(epochNumber);
-        const txArray = await this.gatherTxs(epochNumber, blocks);
+        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(),
                 tx
             ]));
-        const l1ToL2Messages = await this.gatherMessages(epochNumber, blocks);
-        const previousBlockHeader = await this.gatherPreviousBlockHeader(epochNumber, blocks[0]);
-        const [lastBlock] = await this.l2BlockSource.getPublishedBlocks(blocks.at(-1).number, 1);
-        const attestations = lastBlock?.attestations ?? [];
+        const l1ToL2Messages = await this.gatherMessages(epochNumber, checkpoints);
+        const [firstBlock] = checkpoints[0].blocks;
+        const previousBlockHeader = await this.gatherPreviousBlockHeader(epochNumber, firstBlock.number - 1);
         return {
-            blocks,
+            checkpoints,
             txs,
             l1ToL2Messages,
             epochNumber,
@@ -246,16 +695,10 @@ import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
             attestations
         };
     }
-    async gatherBlocks(epochNumber) {
-        const blocks = await this.l2BlockSource.getBlocksForEpoch(epochNumber);
-        if (blocks.length === 0) {
-            throw new EmptyEpochError(epochNumber);
-        }
-        return blocks;
-    }
-    async gatherTxs(epochNumber, blocks) {
+    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
             })));
@@ -269,26 +712,27 @@ import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
         }
         throw new Error(`Txs not found for epoch ${epochNumber}: ${missingTxs.map((hash)=>hash.toString()).join(', ')}`);
     }
-    async gatherMessages(epochNumber, blocks) {
-        const messages = await Promise.all(blocks.map((b)=>this.l1ToL2MessageSource.getL1ToL2Messages(b.number)));
+    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 messagesByBlock = {};
-        for(let i = 0; i < blocks.length; i++){
-            messagesByBlock[blocks[i].number] = messages[i];
+        const messagesByCheckpoint = {};
+        for(let i = 0; i < checkpoints.length; i++){
+            messagesByCheckpoint[checkpoints[i].number] = messages[i];
         }
-        return messagesByBlock;
+        return messagesByCheckpoint;
     }
-    async gatherPreviousBlockHeader(epochNumber, initialBlock) {
-        const previousBlockNumber = initialBlock.number - 1;
-        const header = await (previousBlockNumber === 0 ? this.worldState.getCommitted().getInitialHeader() : this.l2BlockSource.getBlockHeader(previousBlockNumber));
-        if (!header) {
-            throw new Error(`Previous block header ${initialBlock.number} not found for proving epoch ${epochNumber}`);
+    async gatherPreviousBlockHeader(epochNumber, previousBlockNumber) {
+        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;
@@ -296,31 +740,18 @@ import { ProverNodeJobMetrics, ProverNodeRewardsMetrics } from './metrics.js';
             parallelBlockLimit,
             skipSubmitProof: proverNodeDisableProofPublish,
             ...opts
-        });
+        }, this.log.getBindings());
     }
     /** Extracted for testing purposes. */ async triggerMonitors() {
         await this.epochsMonitor.work();
     }
     validateConfig() {
-        if (this.config.proverNodeFailedEpochStore && (!this.config.dataDirectory || !this.config.l1ChainId || !this.config.rollupVersion)) {
+        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.gatherEpochData', (epochNumber)=>({
-            [Attributes.EPOCH_NUMBER]: Number(epochNumber)
-        }))
-], ProverNode.prototype, "gatherEpochData", null);
 class EmptyEpochError extends Error {
     constructor(epochNumber){
         super(`No blocks found for epoch ${epochNumber}`);