@aztec/prover-node 0.0.1-commit.b655e406 → 0.0.1-commit.c31f2472

package/dest/job/epoch-proving-job.js

@@ -1,25 +1,399 @@
-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, _initProto;
 import { NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/constants';
 import { asyncPool } from '@aztec/foundation/async-pool';
+import { BlockNumber } from '@aztec/foundation/branded-types';
 import { padArrayEnd } from '@aztec/foundation/collection';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise, promiseWithResolvers } from '@aztec/foundation/promise';
 import { Timer } from '@aztec/foundation/timer';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
 import { protocolContractsHash } from '@aztec/protocol-contracts';
 import { buildFinalBlobChallenges } from '@aztec/prover-client/helpers';
+import { PublicSimulatorConfig } from '@aztec/stdlib/avm';
 import { EpochProvingJobTerminalState } from '@aztec/stdlib/interfaces/server';
 import { CheckpointConstantData } from '@aztec/stdlib/rollup';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
 import { Attributes, trackSpan } from '@aztec/telemetry-client';
 import * as crypto from 'node:crypto';
 import { validateEpochProvingJobData } from './epoch-proving-job-data.js';
+_dec = trackSpan('EpochProvingJob.run', function() {
+    return {
+        [Attributes.EPOCH_NUMBER]: this.data.epochNumber
+    };
+});
 /**
  * Job that grabs a range of blocks from the unfinalized chain from L1, gets their txs given their hashes,
  * re-executes their public calls, generates a rollup proof, and submits it to L1. This job will update the
@@ -34,6 +408,15 @@ import { validateEpochProvingJobData } from './epoch-proving-job-data.js';
     metrics;
     deadline;
     config;
+    static{
+        ({ e: [_initProto] } = _apply_decs_2203_r(this, [
+            [
+                _dec,
+                2,
+                "run"
+            ]
+        ], []));
+    }
     state;
     log;
     uuid;
@@ -41,7 +424,7 @@ import { validateEpochProvingJobData } from './epoch-proving-job-data.js';
     epochCheckPromise;
     deadlineTimeoutHandler;
     tracer;
-    constructor(data, dbProvider, prover, publicProcessorFactory, publisher, l2BlockSource, metrics, deadline, config){
+    constructor(data, dbProvider, prover, publicProcessorFactory, publisher, l2BlockSource, metrics, deadline, config, bindings){
         this.data = data;
         this.dbProvider = dbProvider;
         this.prover = prover;
@@ -51,10 +434,13 @@ import { validateEpochProvingJobData } from './epoch-proving-job-data.js';
         this.metrics = metrics;
         this.deadline = deadline;
         this.config = config;
-        this.state = 'initialized';
-        this.log = createLogger('prover-node:epoch-proving-job');
+        this.state = (_initProto(this), 'initialized');
         validateEpochProvingJobData(data);
         this.uuid = crypto.randomUUID();
+        this.log = createLogger('prover-node:epoch-proving-job', {
+            ...bindings,
+            instanceId: `epoch-${data.epochNumber}`
+        });
         this.tracer = metrics.tracer;
     }
     getId() {
@@ -75,8 +461,8 @@ import { validateEpochProvingJobData } from './epoch-proving-job-data.js';
     get epochNumber() {
         return this.data.epochNumber;
     }
-    get blocks() {
-        return this.data.blocks;
+    get checkpoints() {
+        return this.data.checkpoints;
     }
     get txs() {
         return this.data.txs;
@@ -92,17 +478,18 @@ import { validateEpochProvingJobData } from './epoch-proving-job-data.js';
             await this.scheduleEpochCheck();
         }
         const attestations = this.attestations.map((attestation)=>attestation.toViem());
-        const epochNumber = Number(this.epochNumber);
-        const epochSizeBlocks = this.blocks.length;
-        const epochSizeTxs = this.blocks.reduce((total, current)=>total + current.body.txEffects.length, 0);
-        const [fromBlock, toBlock] = [
-            this.blocks[0].number,
-            this.blocks.at(-1).number
-        ];
-        this.log.info(`Starting epoch ${epochNumber} proving job with blocks ${fromBlock} to ${toBlock}`, {
+        const epochNumber = this.epochNumber;
+        const epochSizeCheckpoints = this.checkpoints.length;
+        const epochSizeBlocks = this.checkpoints.reduce((accum, checkpoint)=>accum + checkpoint.blocks.length, 0);
+        const epochSizeTxs = this.checkpoints.reduce((accum, checkpoint)=>accum + checkpoint.blocks.reduce((accumC, block)=>accumC + block.body.txEffects.length, 0), 0);
+        const fromCheckpoint = this.checkpoints[0].number;
+        const toCheckpoint = this.checkpoints.at(-1).number;
+        const fromBlock = this.checkpoints[0].blocks[0].number;
+        const toBlock = this.checkpoints.at(-1).blocks.at(-1).number;
+        this.log.info(`Starting epoch ${epochNumber} proving job with checkpoints ${fromCheckpoint} to ${toCheckpoint}`, {
             fromBlock,
             toBlock,
-            epochSizeBlocks,
+            epochSizeTxs,
             epochNumber,
             uuid: this.uuid
         });
@@ -111,66 +498,75 @@ import { validateEpochProvingJobData } from './epoch-proving-job-data.js';
         const { promise, resolve } = promiseWithResolvers();
         this.runPromise = promise;
         try {
-            const blobFieldsPerCheckpoint = this.blocks.map((block)=>block.getCheckpointBlobFields());
+            const blobFieldsPerCheckpoint = this.checkpoints.map((checkpoint)=>checkpoint.toBlobFields());
             const finalBlobBatchingChallenges = await buildFinalBlobChallenges(blobFieldsPerCheckpoint);
-            // TODO(#17027): Enable multiple blocks per checkpoint.
-            // Total number of checkpoints equals number of blocks because we currently build a checkpoint with only one block.
-            const totalNumCheckpoints = epochSizeBlocks;
-            this.prover.startNewEpoch(epochNumber, totalNumCheckpoints, finalBlobBatchingChallenges);
+            this.prover.startNewEpoch(epochNumber, epochSizeCheckpoints, finalBlobBatchingChallenges);
             await this.prover.startChonkVerifierCircuits(Array.from(this.txs.values()));
-            await asyncPool(this.config.parallelBlockLimit ?? 32, this.blocks, async (block)=>{
+            // Everything in the epoch should have the same chainId and version.
+            const { chainId, version } = this.checkpoints[0].blocks[0].header.globalVariables;
+            const previousBlockHeaders = this.gatherPreviousBlockHeaders();
+            await asyncPool(this.config.parallelBlockLimit ?? 32, this.checkpoints, async (checkpoint)=>{
                 this.checkState();
-                const globalVariables = block.header.globalVariables;
-                const txs = this.getTxs(block);
-                const l1ToL2Messages = this.getL1ToL2Messages(block);
-                const previousHeader = this.getBlockHeader(block.number - 1);
-                this.log.verbose(`Starting processing block ${block.number}`, {
-                    number: block.number,
-                    blockHash: (await block.hash()).toString(),
-                    lastArchive: block.header.lastArchive.root,
-                    noteHashTreeRoot: block.header.state.partial.noteHashTree.root,
-                    nullifierTreeRoot: block.header.state.partial.nullifierTree.root,
-                    publicDataTreeRoot: block.header.state.partial.publicDataTree.root,
-                    previousHeader: previousHeader.hash(),
-                    uuid: this.uuid,
-                    ...globalVariables
-                });
+                const checkpointIndex = checkpoint.number - fromCheckpoint;
                 const checkpointConstants = CheckpointConstantData.from({
-                    chainId: globalVariables.chainId,
-                    version: globalVariables.version,
+                    chainId,
+                    version,
                     vkTreeRoot: getVKTreeRoot(),
                     protocolContractsHash: protocolContractsHash,
                     proverId: this.prover.getProverId().toField(),
-                    slotNumber: globalVariables.slotNumber,
-                    coinbase: globalVariables.coinbase,
-                    feeRecipient: globalVariables.feeRecipient,
-                    gasFees: globalVariables.gasFees
-                });
-                // TODO(#17027): Enable multiple blocks per checkpoint.
-                // Each checkpoint has only one block.
-                const totalNumBlocks = 1;
-                const checkpointIndex = block.number - fromBlock;
-                await this.prover.startNewCheckpoint(checkpointIndex, checkpointConstants, l1ToL2Messages, totalNumBlocks, blobFieldsPerCheckpoint[checkpointIndex].length, previousHeader);
-                // Start block proving
-                await this.prover.startNewBlock(block.number, globalVariables.timestamp, txs.length);
-                // Process public fns
-                const db = await this.createFork(block.number - 1, l1ToL2Messages);
-                const publicProcessor = this.publicProcessorFactory.create(db, globalVariables, {
-                    skipFeeEnforcement: true,
-                    clientInitiatedSimulation: false,
-                    proverId: this.prover.getProverId().toField()
+                    slotNumber: checkpoint.header.slotNumber,
+                    coinbase: checkpoint.header.coinbase,
+                    feeRecipient: checkpoint.header.feeRecipient,
+                    gasFees: checkpoint.header.gasFees
                 });
-                const processed = await this.processTxs(publicProcessor, txs);
-                await this.prover.addTxs(processed);
-                await db.close();
-                this.log.verbose(`Processed all ${txs.length} txs for block ${block.number}`, {
-                    blockNumber: block.number,
-                    blockHash: (await block.hash()).toString(),
+                const previousHeader = previousBlockHeaders[checkpointIndex];
+                const l1ToL2Messages = this.getL1ToL2Messages(checkpoint);
+                this.log.verbose(`Starting processing checkpoint ${checkpoint.number}`, {
+                    number: checkpoint.number,
+                    checkpointHash: checkpoint.hash().toString(),
+                    lastArchive: checkpoint.header.lastArchiveRoot,
+                    previousHeader: previousHeader.hash(),
                     uuid: this.uuid
                 });
-                // Mark block as completed to pad it
-                const expectedBlockHeader = block.getBlockHeader();
-                await this.prover.setBlockCompleted(block.number, expectedBlockHeader);
+                await this.prover.startNewCheckpoint(checkpointIndex, checkpointConstants, l1ToL2Messages, checkpoint.blocks.length, previousHeader);
+                for (const block of checkpoint.blocks){
+                    const globalVariables = block.header.globalVariables;
+                    const txs = this.getTxs(block);
+                    this.log.verbose(`Starting processing block ${block.number}`, {
+                        number: block.number,
+                        blockHash: (await block.hash()).toString(),
+                        lastArchive: block.header.lastArchive.root,
+                        noteHashTreeRoot: block.header.state.partial.noteHashTree.root,
+                        nullifierTreeRoot: block.header.state.partial.nullifierTree.root,
+                        publicDataTreeRoot: block.header.state.partial.publicDataTree.root,
+                        ...globalVariables,
+                        numTxs: txs.length
+                    });
+                    // Start block proving
+                    await this.prover.startNewBlock(block.number, globalVariables.timestamp, txs.length);
+                    // Process public fns
+                    const db = await this.createFork(BlockNumber(block.number - 1), l1ToL2Messages);
+                    const config = PublicSimulatorConfig.from({
+                        proverId: this.prover.getProverId().toField(),
+                        skipFeeEnforcement: false,
+                        collectDebugLogs: false,
+                        collectHints: true,
+                        collectPublicInputs: true,
+                        collectStatistics: false
+                    });
+                    const publicProcessor = this.publicProcessorFactory.create(db, globalVariables, config);
+                    const processed = await this.processTxs(publicProcessor, txs);
+                    await this.prover.addTxs(processed);
+                    await db.close();
+                    this.log.verbose(`Processed all ${txs.length} txs for block ${block.number}`, {
+                        blockNumber: block.number,
+                        blockHash: (await block.hash()).toString(),
+                        uuid: this.uuid
+                    });
+                    // Mark block as completed to pad it
+                    const expectedBlockHeader = block.header;
+                    await this.prover.setBlockCompleted(block.number, expectedBlockHeader);
+                }
             });
             const executionTime = timer.ms();
             this.progressState('awaiting-prover');
@@ -182,14 +578,14 @@ import { validateEpochProvingJobData } from './epoch-proving-job-data.js';
             });
             this.progressState('publishing-proof');
             if (this.config.skipSubmitProof) {
-                this.log.info(`Proof publishing is disabled. Dropping valid proof for epoch ${epochNumber} (blocks ${fromBlock} to ${toBlock})`);
+                this.log.info(`Proof publishing is disabled. Dropping valid proof for epoch ${epochNumber} (checkpoints ${fromCheckpoint} to ${toCheckpoint})`);
                 this.state = 'completed';
-                this.metrics.recordProvingJob(executionTime, timer.ms(), epochSizeBlocks, epochSizeTxs);
+                this.metrics.recordProvingJob(executionTime, timer.ms(), epochSizeCheckpoints, epochSizeBlocks, epochSizeTxs);
                 return;
             }
             const success = await this.publisher.submitEpochProof({
-                fromBlock,
-                toBlock,
+                fromCheckpoint,
+                toCheckpoint,
                 epochNumber,
                 publicInputs,
                 proof,
@@ -199,12 +595,12 @@ import { validateEpochProvingJobData } from './epoch-proving-job-data.js';
             if (!success) {
                 throw new Error('Failed to submit epoch proof to L1');
             }
-            this.log.info(`Submitted proof for epoch ${epochNumber} (blocks ${fromBlock} to ${toBlock})`, {
+            this.log.info(`Submitted proof for epoch ${epochNumber} (checkpoints ${fromCheckpoint} to ${toCheckpoint})`, {
                 epochNumber,
                 uuid: this.uuid
             });
             this.state = 'completed';
-            this.metrics.recordProvingJob(executionTime, timer.ms(), epochSizeBlocks, epochSizeTxs);
+            this.metrics.recordProvingJob(executionTime, timer.ms(), epochSizeCheckpoints, epochSizeBlocks, epochSizeTxs);
         } catch (err) {
             if (err && err.name === 'HaltExecutionError') {
                 this.log.warn(`Halted execution of epoch ${epochNumber} prover job`, {
@@ -236,7 +632,7 @@ import { validateEpochProvingJobData } from './epoch-proving-job-data.js';
         const l1ToL2MessagesPadded = padArrayEnd(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, 'Too many L1 to L2 messages');
         this.log.verbose(`Creating fork at ${blockNumber} with ${l1ToL2Messages.length} L1 to L2 messages`, {
             blockNumber,
-            l1ToL2Messages: l1ToL2MessagesPadded.map((m)=>m.toString())
+            l1ToL2Messages: l1ToL2Messages.map((m)=>m.toString())
         });
         await db.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, l1ToL2MessagesPadded);
         return db;
@@ -292,10 +688,11 @@ import { validateEpochProvingJobData } from './epoch-proving-job-data.js';
         }
         const intervalMs = Math.ceil((await l2BlockSource.getL1Constants()).ethereumSlotDuration / 2) * 1000;
         this.epochCheckPromise = new RunningPromise(async ()=>{
-            const blocks = await l2BlockSource.getBlockHeadersForEpoch(this.epochNumber);
-            const blockHashes = await Promise.all(blocks.map((block)=>block.hash()));
-            const thisBlockHashes = await Promise.all(this.blocks.map((block)=>block.hash()));
-            if (blocks.length !== this.blocks.length || !blockHashes.every((block, i)=>block.equals(thisBlockHashes[i]))) {
+            const blockHeaders = await l2BlockSource.getCheckpointedBlockHeadersForEpoch(this.epochNumber);
+            const blockHashes = await Promise.all(blockHeaders.map(async (header)=>(await header.hash()).toField()));
+            const thisBlocks = this.checkpoints.flatMap((checkpoint)=>checkpoint.blocks);
+            const thisBlockHashes = await Promise.all(thisBlocks.map((block)=>block.hash()));
+            if (blockHeaders.length !== thisBlocks.length || !blockHashes.every((block, i)=>block.equals(thisBlockHashes[i]))) {
                 this.log.warn('Epoch blocks changed underfoot', {
                     uuid: this.uuid,
                     epochNumber: this.epochNumber,
@@ -307,21 +704,18 @@ import { validateEpochProvingJobData } from './epoch-proving-job-data.js';
         }, this.log, intervalMs).start();
         this.log.verbose(`Scheduled epoch check for epoch ${this.epochNumber} every ${intervalMs}ms`);
     }
-    /* Returns the header for the given block number based on the epoch proving job data. */ getBlockHeader(blockNumber) {
-        const block = this.blocks.find((b)=>b.number === blockNumber);
-        if (block) {
-            return block.getBlockHeader();
-        }
-        if (blockNumber === Number(this.data.previousBlockHeader.getBlockNumber())) {
-            return this.data.previousBlockHeader;
-        }
-        throw new Error(`Block header not found for block number ${blockNumber} (got ${this.blocks.map((b)=>b.number).join(', ')} and previous header ${this.data.previousBlockHeader.getBlockNumber()})`);
+    /* Returns the last block header in the previous checkpoint for all checkpoints in the epoch */ gatherPreviousBlockHeaders() {
+        const lastBlocks = this.checkpoints.map((checkpoint)=>checkpoint.blocks.at(-1));
+        return [
+            this.data.previousBlockHeader,
+            ...lastBlocks.map((block)=>block.header).slice(0, -1)
+        ];
     }
     getTxs(block) {
         return block.body.txEffects.map((txEffect)=>this.txs.get(txEffect.txHash.toString()));
     }
-    getL1ToL2Messages(block) {
-        return this.data.l1ToL2Messages[block.number];
+    getL1ToL2Messages(checkpoint) {
+        return this.data.l1ToL2Messages[checkpoint.number];
     }
     async processTxs(publicProcessor, txs) {
         const { deadline } = this;
@@ -338,13 +732,6 @@ import { validateEpochProvingJobData } from './epoch-proving-job-data.js';
         return processedTxs;
     }
 }
-_ts_decorate([
-    trackSpan('EpochProvingJob.run', function() {
-        return {
-            [Attributes.EPOCH_NUMBER]: Number(this.data.epochNumber)
-        };
-    })
-], EpochProvingJob.prototype, "run", null);
 class HaltExecutionError extends Error {
     state;
     constructor(state){