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

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

@@ -6,14 +6,16 @@ function _ts_decorate(decorators, target, key, desc) {
 }
 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';
@@ -75,8 +77,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 +94,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 +114,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
+                    slotNumber: checkpoint.header.slotNumber,
+                    coinbase: checkpoint.header.coinbase,
+                    feeRecipient: checkpoint.header.feeRecipient,
+                    gasFees: checkpoint.header.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()
-                });
-                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 +194,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 +211,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 +248,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;
@@ -294,8 +306,9 @@ import { validateEpochProvingJobData } from './epoch-proving-job-data.js';
         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 thisBlocks = this.checkpoints.flatMap((checkpoint)=>checkpoint.blocks);
+            const thisBlockHashes = await Promise.all(thisBlocks.map((block)=>block.hash()));
+            if (blocks.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 +320,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;
@@ -341,7 +351,7 @@ import { validateEpochProvingJobData } from './epoch-proving-job-data.js';
 _ts_decorate([
     trackSpan('EpochProvingJob.run', function() {
         return {
-            [Attributes.EPOCH_NUMBER]: Number(this.data.epochNumber)
+            [Attributes.EPOCH_NUMBER]: this.data.epochNumber
         };
     })
 ], EpochProvingJob.prototype, "run", null);

package/dest/metrics.d.ts

@@ -1,4 +1,4 @@
-import type { RollupContract } from '@aztec/ethereum';
+import type { RollupContract } from '@aztec/ethereum/contracts';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { L1PublishProofStats } from '@aztec/stdlib/stats';
 import { type Gauge, type Histogram, type Meter, type TelemetryClient, type Tracer, type UpDownCounter } from '@aztec/telemetry-client';
@@ -8,10 +8,11 @@ export declare class ProverNodeJobMetrics {
     private logger;
     proverEpochExecutionDuration: Histogram;
     provingJobDuration: Histogram;
+    provingJobCheckpoints: Gauge;
     provingJobBlocks: Gauge;
     provingJobTransactions: Gauge;
     constructor(meter: Meter, tracer: Tracer, logger?: import("@aztec/foundation/log").Logger);
-    recordProvingJob(executionTimeMs: number, totalTimeMs: number, numBlocks: number, numTxs: number): void;
+    recordProvingJob(executionTimeMs: number, totalTimeMs: number, numCheckpoints: number, numBlocks: number, numTxs: number): void;
 }
 export declare class ProverNodeRewardsMetrics {
     private meter;
@@ -47,4 +48,4 @@ export declare class ProverNodePublisherMetrics {
     recordSenderBalance(wei: bigint, senderAddress: string): void;
     private recordTx;
 }
-//# sourceMappingURL=metrics.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWV0cmljcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL21ldHJpY3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFaEUsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQWtCLE1BQU0scUJBQXFCLENBQUM7QUFDL0UsT0FBTyxFQUdMLEtBQUssS0FBSyxFQUNWLEtBQUssU0FBUyxFQUNkLEtBQUssS0FBSyxFQUdWLEtBQUssZUFBZSxFQUNwQixLQUFLLE1BQU0sRUFDWCxLQUFLLGFBQWEsRUFFbkIsTUFBTSx5QkFBeUIsQ0FBQztBQUlqQyxxQkFBYSxvQkFBb0I7SUFRN0IsT0FBTyxDQUFDLEtBQUs7YUFDRyxNQUFNLEVBQUUsTUFBTTtJQUM5QixPQUFPLENBQUMsTUFBTTtJQVRoQiw0QkFBNEIsRUFBRSxTQUFTLENBQUM7SUFDeEMsa0JBQWtCLEVBQUUsU0FBUyxDQUFDO0lBQzlCLHFCQUFxQixFQUFFLEtBQUssQ0FBQztJQUM3QixnQkFBZ0IsRUFBRSxLQUFLLENBQUM7SUFDeEIsc0JBQXNCLEVBQUUsS0FBSyxDQUFDO0lBRTlCLFlBQ1UsS0FBSyxFQUFFLEtBQUssRUFDSixNQUFNLEVBQUUsTUFBTSxFQUN0QixNQUFNLHlDQUFnRCxFQXdCL0Q7SUFFTSxnQkFBZ0IsQ0FDckIsZUFBZSxFQUFFLE1BQU0sRUFDdkIsV0FBVyxFQUFFLE1BQU0sRUFDbkIsY0FBYyxFQUFFLE1BQU0sRUFDdEIsU0FBUyxFQUFFLE1BQU0sRUFDakIsTUFBTSxFQUFFLE1BQU0sUUFPZjtDQUNGO0FBRUQscUJBQWEsd0JBQXdCO0lBT2pDLE9BQU8sQ0FBQyxLQUFLO0lBQ2IsT0FBTyxDQUFDLFFBQVE7SUFDaEIsT0FBTyxDQUFDLE1BQU07SUFDZCxPQUFPLENBQUMsTUFBTTtJQVRoQixPQUFPLENBQUMsT0FBTyxDQUFrQjtJQUNqQyxPQUFPLENBQUMsa0JBQWtCLENBQWdCO0lBQzFDLE9BQU8sQ0FBQyxTQUFTLENBQU87SUFDeEIsT0FBTyxDQUFDLHFCQUFxQixDQUFLO0lBRWxDLFlBQ1UsS0FBSyxFQUFFLEtBQUssRUFDWixRQUFRLEVBQUUsVUFBVSxFQUNwQixNQUFNLEVBQUUsY0FBYyxFQUN0QixNQUFNLHlDQUFnRCxFQVcvRDtJQUVZLEtBQUssa0JBSWpCO0lBRU0sSUFBSSxTQUVWO0lBRUQsT0FBTyxDQUFDLE9BQU8sQ0F3QmI7Q0FDSDtBQUVELHFCQUFhLDBCQUEwQjthQWVuQixNQUFNLEVBQUUsZUFBZTtJQUV2QyxPQUFPLENBQUMsTUFBTTtJQWhCaEIsUUFBUSxFQUFFLFNBQVMsQ0FBQztJQUNwQixPQUFPLEVBQUUsYUFBYSxDQUFDO0lBQ3ZCLFVBQVUsRUFBRSxTQUFTLENBQUM7SUFDdEIsS0FBSyxFQUFFLFNBQVMsQ0FBQztJQUNqQixjQUFjLEVBQUUsU0FBUyxDQUFDO0lBQzFCLGFBQWEsRUFBRSxTQUFTLENBQUM7SUFDekIsaUJBQWlCLEVBQUUsU0FBUyxDQUFDO0lBQzdCLGlCQUFpQixFQUFFLFNBQVMsQ0FBQztJQUM3QixVQUFVLEVBQUUsU0FBUyxDQUFDO0lBRXRCLE9BQU8sQ0FBQyxhQUFhLENBQVE7SUFDN0IsT0FBTyxDQUFDLEtBQUssQ0FBUTtJQUVyQixZQUNrQixNQUFNLEVBQUUsZUFBZSxFQUN2QyxJQUFJLFNBQWUsRUFDWCxNQUFNLHlDQUFnRCxFQWtFL0Q7SUFFRCxjQUFjLFNBS2I7SUFFRCxpQkFBaUIsQ0FBQyxVQUFVLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxtQkFBbUIsUUFFL0Q7SUFFTSxtQkFBbUIsQ0FBQyxHQUFHLEVBQUUsTUFBTSxFQUFFLGFBQWEsRUFBRSxNQUFNLFFBSzVEO0lBRUQsT0FBTyxDQUFDLFFBQVE7Q0F1Q2pCIn0=

package/dest/metrics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../src/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,KAAK,EAAE,mBAAmB,EAAkB,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EAGL,KAAK,KAAK,EACV,KAAK,SAAS,EACd,KAAK,KAAK,EAGV,KAAK,eAAe,EACpB,KAAK,MAAM,EACX,KAAK,aAAa,EAEnB,MAAM,yBAAyB,CAAC;AAIjC,qBAAa,oBAAoB;IAO7B,OAAO,CAAC,KAAK;aACG,MAAM,EAAE,MAAM;IAC9B,OAAO,CAAC,MAAM;IARhB,4BAA4B,EAAE,SAAS,CAAC;IACxC,kBAAkB,EAAE,SAAS,CAAC;IAC9B,gBAAgB,EAAE,KAAK,CAAC;IACxB,sBAAsB,EAAE,KAAK,CAAC;gBAGpB,KAAK,EAAE,KAAK,EACJ,MAAM,EAAE,MAAM,EACtB,MAAM,yCAAgD;IAsBzD,gBAAgB,CAAC,eAAe,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;CAMxG;AAED,qBAAa,wBAAwB;IAOjC,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IAThB,OAAO,CAAC,OAAO,CAAkB;IACjC,OAAO,CAAC,kBAAkB,CAAgB;IAC1C,OAAO,CAAC,SAAS,CAAO;IACxB,OAAO,CAAC,qBAAqB,CAAK;gBAGxB,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,UAAU,EACpB,MAAM,EAAE,cAAc,EACtB,MAAM,yCAAgD;IAanD,KAAK;IAMX,IAAI;IAIX,OAAO,CAAC,OAAO,CAwBb;CACH;AAED,qBAAa,0BAA0B;aAenB,MAAM,EAAE,eAAe;IAEvC,OAAO,CAAC,MAAM;IAhBhB,QAAQ,EAAE,SAAS,CAAC;IACpB,OAAO,EAAE,aAAa,CAAC;IACvB,UAAU,EAAE,SAAS,CAAC;IACtB,KAAK,EAAE,SAAS,CAAC;IACjB,cAAc,EAAE,SAAS,CAAC;IAC1B,aAAa,EAAE,SAAS,CAAC;IACzB,iBAAiB,EAAE,SAAS,CAAC;IAC7B,iBAAiB,EAAE,SAAS,CAAC;IAC7B,UAAU,EAAE,SAAS,CAAC;IAEtB,OAAO,CAAC,aAAa,CAAQ;IAC7B,OAAO,CAAC,KAAK,CAAQ;gBAGH,MAAM,EAAE,eAAe,EACvC,IAAI,SAAe,EACX,MAAM,yCAAgD;IAoEhE,cAAc;IAOd,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB;IAIzD,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;IAO7D,OAAO,CAAC,QAAQ;CAuCjB"}
+{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../src/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,KAAK,EAAE,mBAAmB,EAAkB,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EAGL,KAAK,KAAK,EACV,KAAK,SAAS,EACd,KAAK,KAAK,EAGV,KAAK,eAAe,EACpB,KAAK,MAAM,EACX,KAAK,aAAa,EAEnB,MAAM,yBAAyB,CAAC;AAIjC,qBAAa,oBAAoB;IAQ7B,OAAO,CAAC,KAAK;aACG,MAAM,EAAE,MAAM;IAC9B,OAAO,CAAC,MAAM;IAThB,4BAA4B,EAAE,SAAS,CAAC;IACxC,kBAAkB,EAAE,SAAS,CAAC;IAC9B,qBAAqB,EAAE,KAAK,CAAC;IAC7B,gBAAgB,EAAE,KAAK,CAAC;IACxB,sBAAsB,EAAE,KAAK,CAAC;IAE9B,YACU,KAAK,EAAE,KAAK,EACJ,MAAM,EAAE,MAAM,EACtB,MAAM,yCAAgD,EAwB/D;IAEM,gBAAgB,CACrB,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,QAOf;CACF;AAED,qBAAa,wBAAwB;IAOjC,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IAThB,OAAO,CAAC,OAAO,CAAkB;IACjC,OAAO,CAAC,kBAAkB,CAAgB;IAC1C,OAAO,CAAC,SAAS,CAAO;IACxB,OAAO,CAAC,qBAAqB,CAAK;IAElC,YACU,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,UAAU,EACpB,MAAM,EAAE,cAAc,EACtB,MAAM,yCAAgD,EAW/D;IAEY,KAAK,kBAIjB;IAEM,IAAI,SAEV;IAED,OAAO,CAAC,OAAO,CAwBb;CACH;AAED,qBAAa,0BAA0B;aAenB,MAAM,EAAE,eAAe;IAEvC,OAAO,CAAC,MAAM;IAhBhB,QAAQ,EAAE,SAAS,CAAC;IACpB,OAAO,EAAE,aAAa,CAAC;IACvB,UAAU,EAAE,SAAS,CAAC;IACtB,KAAK,EAAE,SAAS,CAAC;IACjB,cAAc,EAAE,SAAS,CAAC;IAC1B,aAAa,EAAE,SAAS,CAAC;IACzB,iBAAiB,EAAE,SAAS,CAAC;IAC7B,iBAAiB,EAAE,SAAS,CAAC;IAC7B,UAAU,EAAE,SAAS,CAAC;IAEtB,OAAO,CAAC,aAAa,CAAQ;IAC7B,OAAO,CAAC,KAAK,CAAQ;IAErB,YACkB,MAAM,EAAE,eAAe,EACvC,IAAI,SAAe,EACX,MAAM,yCAAgD,EAkE/D;IAED,cAAc,SAKb;IAED,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB,QAE/D;IAEM,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,QAK5D;IAED,OAAO,CAAC,QAAQ;CAuCjB"}

package/dest/metrics.js

@@ -7,6 +7,7 @@ export class ProverNodeJobMetrics {
     logger;
     proverEpochExecutionDuration;
     provingJobDuration;
+    provingJobCheckpoints;
     provingJobBlocks;
     provingJobTransactions;
     constructor(meter, tracer, logger = createLogger('prover-node:publisher:metrics')){
@@ -23,6 +24,10 @@ export class ProverNodeJobMetrics {
             unit: 's',
             valueType: ValueType.DOUBLE
         });
+        this.provingJobCheckpoints = this.meter.createGauge(Metrics.PROVER_NODE_JOB_CHECKPOINTS, {
+            description: 'Number of checkpoints in a proven epoch',
+            valueType: ValueType.INT
+        });
         this.provingJobBlocks = this.meter.createGauge(Metrics.PROVER_NODE_JOB_BLOCKS, {
             description: 'Number of blocks in a proven epoch',
             valueType: ValueType.INT
@@ -32,9 +37,10 @@ export class ProverNodeJobMetrics {
             valueType: ValueType.INT
         });
     }
-    recordProvingJob(executionTimeMs, totalTimeMs, numBlocks, numTxs) {
+    recordProvingJob(executionTimeMs, totalTimeMs, numCheckpoints, numBlocks, numTxs) {
         this.proverEpochExecutionDuration.record(Math.ceil(executionTimeMs));
         this.provingJobDuration.record(totalTimeMs / 1000);
+        this.provingJobCheckpoints.record(Math.floor(numCheckpoints));
         this.provingJobBlocks.record(Math.floor(numBlocks));
         this.provingJobTransactions.record(Math.floor(numTxs));
     }
@@ -61,7 +67,7 @@ export class ProverNodeRewardsMetrics {
                 // look at the prev epoch so that we get an accurate value, after proof submission window has closed
                 // For example, if proof submission window is 1 epoch, and we are in epoch 2, we should be looking at epoch 0.
                 // Similarly, if the proof submission window is 0, and we are in epoch 1, we should be looking at epoch 0.
-                const closedEpoch = epoch - BigInt(this.proofSubmissionEpochs) - 1n;
+                const closedEpoch = BigInt(epoch) - BigInt(this.proofSubmissionEpochs) - 1n;
                 const rewards = await this.rollup.getSpecificProverRewardsForEpoch(closedEpoch, this.coinbase);
                 const fmt = parseFloat(formatUnits(rewards, 18));
                 observer.observe(this.rewards, fmt, {

package/dest/monitors/epoch-monitor.d.ts

@@ -1,8 +1,9 @@
+import { EpochNumber } from '@aztec/foundation/branded-types';
 import type { L2BlockSource } from '@aztec/stdlib/block';
 import { type L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
 import { type TelemetryClient, type Traceable, type Tracer } from '@aztec/telemetry-client';
 export interface EpochMonitorHandler {
-    handleEpochReadyToProve(epochNumber: bigint): Promise<boolean>;
+    handleEpochReadyToProve(epochNumber: EpochNumber): Promise<boolean>;
 }
 /**
  * Fires an event when a new epoch ready to prove is detected.
@@ -39,4 +40,4 @@ export declare class EpochMonitor implements Traceable {
     work(): Promise<void>;
     private getEpochNumberToProve;
 }
-//# sourceMappingURL=epoch-monitor.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXBvY2gtbW9uaXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21vbml0b3JzL2Vwb2NoLW1vbml0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFlLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBSTNFLE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxLQUFLLGlCQUFpQixFQUFrQixNQUFNLDZCQUE2QixDQUFDO0FBQ3JGLE9BQU8sRUFDTCxLQUFLLGVBQWUsRUFDcEIsS0FBSyxTQUFTLEVBQ2QsS0FBSyxNQUFNLEVBR1osTUFBTSx5QkFBeUIsQ0FBQztBQUVqQyxNQUFNLFdBQVcsbUJBQW1CO0lBQ2xDLHVCQUF1QixDQUFDLFdBQVcsRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0NBQ3JFO0FBRUQ7Ozs7Ozs7Ozs7R0FVRztBQUNILHFCQUFhLFlBQWEsWUFBVyxTQUFTO0lBUzFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsYUFBYTtJQUM5QixPQUFPLENBQUMsUUFBUSxDQUFDLFdBQVc7SUFDNUIsT0FBTyxDQUFDLE9BQU87SUFWakIsT0FBTyxDQUFDLGNBQWMsQ0FBaUI7SUFDdkMsT0FBTyxDQUFDLEdBQUcsQ0FBNkM7SUFDeEQsU0FBZ0IsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUUvQixPQUFPLENBQUMsT0FBTyxDQUFrQztJQUNqRCxPQUFPLENBQUMsaUJBQWlCLENBQTBCO0lBRW5ELFlBQ21CLGFBQWEsRUFBRSxhQUFhLEVBQzVCLFdBQVcsRUFBRSxJQUFJLENBQUMsaUJBQWlCLEVBQUUsZUFBZSxDQUFDLEVBQzlELE9BQU8sRUFBRTtRQUFFLGlCQUFpQixFQUFFLE1BQU0sQ0FBQztRQUFDLGNBQWMsQ0FBQyxFQUFFLE1BQU0sQ0FBQTtLQUFFLEVBQ3ZFLFNBQVMsR0FBRSxlQUFzQyxFQU9sRDtJQUVELE9BQW9CLE1BQU0sQ0FDeEIsYUFBYSxFQUFFLGFBQWEsRUFDNUIsT0FBTyxFQUFFO1FBQUUsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO1FBQUMsY0FBYyxDQUFDLEVBQUUsTUFBTSxDQUFBO0tBQUUsRUFDL0QsU0FBUyxHQUFFLGVBQXNDLEdBQ2hELE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FHdkI7SUFFTSxLQUFLLENBQUMsT0FBTyxFQUFFLG1CQUFtQixRQUl4QztJQUVELDBCQUEwQjtJQUNuQixVQUFVLENBQUMsT0FBTyxFQUFFLG1CQUFtQixRQUU3QztJQUVZLElBQUksa0JBR2hCO0lBR1ksSUFBSSxrQkEyQmhCO1lBRWEscUJBQXFCO0NBWXBDIn0=

package/dest/monitors/epoch-monitor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"epoch-monitor.d.ts","sourceRoot":"","sources":["../../src/monitors/epoch-monitor.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,KAAK,iBAAiB,EAAkB,MAAM,6BAA6B,CAAC;AACrF,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,SAAS,EACd,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAEjC,MAAM,WAAW,mBAAmB;IAClC,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAChE;AAED;;;;;;;;;;GAUG;AACH,qBAAa,YAAa,YAAW,SAAS;IAS1C,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,OAAO;IAVjB,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,GAAG,CAA6C;IACxD,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,OAAO,CAAkC;IACjD,OAAO,CAAC,iBAAiB,CAAqB;gBAG3B,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,IAAI,CAAC,iBAAiB,EAAE,eAAe,CAAC,EAC9D,OAAO,EAAE;QAAE,iBAAiB,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,EACvE,SAAS,GAAE,eAAsC;WAS/B,MAAM,CACxB,aAAa,EAAE,aAAa,EAC5B,OAAO,EAAE;QAAE,iBAAiB,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,EAC/D,SAAS,GAAE,eAAsC,GAChD,OAAO,CAAC,YAAY,CAAC;IAKjB,KAAK,CAAC,OAAO,EAAE,mBAAmB;IAMzC,0BAA0B;IACnB,UAAU,CAAC,OAAO,EAAE,mBAAmB;IAIjC,IAAI;IAMJ,IAAI;YA6BH,qBAAqB;CAYpC"}
+{"version":3,"file":"epoch-monitor.d.ts","sourceRoot":"","sources":["../../src/monitors/epoch-monitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAI3E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,KAAK,iBAAiB,EAAkB,MAAM,6BAA6B,CAAC;AACrF,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,SAAS,EACd,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAEjC,MAAM,WAAW,mBAAmB;IAClC,uBAAuB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACrE;AAED;;;;;;;;;;GAUG;AACH,qBAAa,YAAa,YAAW,SAAS;IAS1C,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,OAAO;IAVjB,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,GAAG,CAA6C;IACxD,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,OAAO,CAAkC;IACjD,OAAO,CAAC,iBAAiB,CAA0B;IAEnD,YACmB,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,IAAI,CAAC,iBAAiB,EAAE,eAAe,CAAC,EAC9D,OAAO,EAAE;QAAE,iBAAiB,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,EACvE,SAAS,GAAE,eAAsC,EAOlD;IAED,OAAoB,MAAM,CACxB,aAAa,EAAE,aAAa,EAC5B,OAAO,EAAE;QAAE,iBAAiB,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,EAC/D,SAAS,GAAE,eAAsC,GAChD,OAAO,CAAC,YAAY,CAAC,CAGvB;IAEM,KAAK,CAAC,OAAO,EAAE,mBAAmB,QAIxC;IAED,0BAA0B;IACnB,UAAU,CAAC,OAAO,EAAE,mBAAmB,QAE7C;IAEY,IAAI,kBAGhB;IAGY,IAAI,kBA2BhB;YAEa,qBAAqB;CAYpC"}

package/dest/monitors/epoch-monitor.js

@@ -4,6 +4,7 @@ function _ts_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;
 }
+import { BlockNumber } from '@aztec/foundation/branded-types';
 import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { sleep } from '@aztec/foundation/sleep';
@@ -95,7 +96,7 @@ import { getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
     }
     async getEpochNumberToProve() {
         const lastBlockProven = await this.l2BlockSource.getProvenBlockNumber();
-        const firstBlockToProve = lastBlockProven + 1;
+        const firstBlockToProve = BlockNumber(lastBlockProven + 1);
         const firstBlockHeaderToProve = await this.l2BlockSource.getBlockHeader(firstBlockToProve);
         if (!firstBlockHeaderToProve) {
             return {

package/dest/monitors/index.d.ts

@@ -1,2 +1,2 @@
 export * from './epoch-monitor.js';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9tb25pdG9ycy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLG9CQUFvQixDQUFDIn0=

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

@@ -1,8 +1,10 @@
-import type { BatchedBlob } from '@aztec/blob-lib';
+import { BatchedBlob } from '@aztec/blob-lib';
 import { AZTEC_MAX_EPOCH_DURATION } from '@aztec/constants';
-import type { L1TxUtils, RollupContract, ViemCommitteeAttestation } from '@aztec/ethereum';
+import type { RollupContract, ViemCommitteeAttestation } from '@aztec/ethereum/contracts';
+import type { L1TxUtils } from '@aztec/ethereum/l1-tx-utils';
+import { CheckpointNumber, EpochNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { Fr } from '@aztec/foundation/fields';
 import type { Tuple } from '@aztec/foundation/serialize';
 import type { PublisherConfig, TxSenderConfig } from '@aztec/sequencer-client';
 import type { Proof } from '@aztec/stdlib/proofs';
@@ -42,9 +44,9 @@ export declare class ProverNodePublisher {
     restart(): void;
     getSenderAddress(): EthAddress;
     submitEpochProof(args: {
-        epochNumber: number;
-        fromBlock: number;
-        toBlock: number;
+        epochNumber: EpochNumber;
+        fromCheckpoint: CheckpointNumber;
+        toCheckpoint: CheckpointNumber;
         publicInputs: RootRollupPublicInputs;
         proof: Proof;
         batchedBlobInputs: BatchedBlob;
@@ -55,4 +57,4 @@ export declare class ProverNodePublisher {
     private getEpochProofPublicInputsArgs;
     private getSubmitEpochProofArgs;
 }
-//# sourceMappingURL=prover-node-publisher.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmVyLW5vZGUtcHVibGlzaGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcHJvdmVyLW5vZGUtcHVibGlzaGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQThCLE1BQU0saUJBQWlCLENBQUM7QUFDMUUsT0FBTyxFQUFFLHdCQUF3QixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDNUQsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLHdCQUF3QixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDMUYsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFN0QsT0FBTyxFQUFFLGdCQUFnQixFQUFFLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRWhGLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFM0QsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFHekQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLGNBQWMsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRS9FLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2xELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRWpGLE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBc0IsTUFBTSx5QkFBeUIsQ0FBQztBQU9uRixzRUFBc0U7QUFDdEUsTUFBTSxNQUFNLHNCQUFzQixHQUFHO0lBQ25DLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsZUFBZSxFQUFFLEVBQUUsQ0FBQztJQUNwQixVQUFVLEVBQUUsRUFBRSxDQUFDO0lBQ2YsWUFBWSxFQUFFLEVBQUUsQ0FBQztJQUNqQixPQUFPLEVBQUUsRUFBRSxDQUFDO0lBQ1osUUFBUSxFQUFFLEVBQUUsQ0FBQztJQUNiLElBQUksRUFBRSxLQUFLLENBQUMsWUFBWSxFQUFFLE9BQU8sd0JBQXdCLENBQUMsQ0FBQztJQUMzRCxLQUFLLEVBQUUsS0FBSyxDQUFDO0NBQ2QsQ0FBQztBQUVGLHFCQUFhLG1CQUFtQjtJQUM5QixPQUFPLENBQUMsV0FBVyxDQUFTO0lBQzVCLE9BQU8sQ0FBQyxPQUFPLENBQTZCO0lBRTVDLFNBQVMsQ0FBQyxHQUFHLHlDQUErQztJQUU1RCxTQUFTLENBQUMsY0FBYyxFQUFFLGNBQWMsQ0FBQztJQUV6QyxTQUFnQixTQUFTLEVBQUUsU0FBUyxDQUFDO0lBRXJDLFlBQ0UsTUFBTSxFQUFFLGNBQWMsR0FBRyxlQUFlLEVBQ3hDLElBQUksRUFBRTtRQUNKLGNBQWMsRUFBRSxjQUFjLENBQUM7UUFDL0IsU0FBUyxFQUFFLFNBQVMsQ0FBQztRQUNyQixTQUFTLENBQUMsRUFBRSxlQUFlLENBQUM7S0FDN0IsRUFRRjtJQUVNLGlCQUFpQixtQkFFdkI7SUFFRDs7Ozs7T0FLRztJQUNJLFNBQVMsU0FHZjtJQUVELHdEQUF3RDtJQUNqRCxPQUFPLFNBR2I7SUFFTSxnQkFBZ0IsZUFFdEI7SUFFWSxnQkFBZ0IsQ0FBQyxJQUFJLEVBQUU7UUFDbEMsV0FBVyxFQUFFLFdBQVcsQ0FBQztRQUN6QixjQUFjLEVBQUUsZ0JBQWdCLENBQUM7UUFDakMsWUFBWSxFQUFFLGdCQUFnQixDQUFDO1FBQy9CLFlBQVksRUFBRSxzQkFBc0IsQ0FBQztRQUNyQyxLQUFLLEVBQUUsS0FBSyxDQUFDO1FBQ2IsaUJBQWlCLEVBQUUsV0FBVyxDQUFDO1FBQy9CLFlBQVksRUFBRSx3QkFBd0IsRUFBRSxDQUFDO0tBQzFDLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQWlEbkI7WUFFYSw0QkFBNEI7WUErRDVCLHNCQUFzQjtJQTRDcEMsT0FBTyxDQUFDLDZCQUE2QjtJQXlCckMsT0FBTyxDQUFDLHVCQUF1QjtDQXVCaEMifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"prover-node-publisher.d.ts","sourceRoot":"","sources":["../src/prover-node-publisher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAG3F,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAGzD,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAE/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAEjF,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAOnF,sEAAsE;AACtE,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,EAAE,CAAC;IACpB,UAAU,EAAE,EAAE,CAAC;IACf,YAAY,EAAE,EAAE,CAAC;IACjB,OAAO,EAAE,EAAE,CAAC;IACZ,QAAQ,EAAE,EAAE,CAAC;IACb,IAAI,EAAE,KAAK,CAAC,YAAY,EAAE,OAAO,wBAAwB,CAAC,CAAC;IAC3D,KAAK,EAAE,KAAK,CAAC;CACd,CAAC;AAEF,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,OAAO,CAA6B;IAE5C,SAAS,CAAC,GAAG,yCAA+C;IAE5D,SAAS,CAAC,cAAc,EAAE,cAAc,CAAC;IAEzC,SAAgB,SAAS,EAAE,SAAS,CAAC;gBAGnC,MAAM,EAAE,cAAc,GAAG,eAAe,EACxC,IAAI,EAAE;QACJ,cAAc,EAAE,cAAc,CAAC;QAC/B,SAAS,EAAE,SAAS,CAAC;QACrB,SAAS,CAAC,EAAE,eAAe,CAAC;KAC7B;IAUI,iBAAiB;IAIxB;;;;;OAKG;IACI,SAAS;IAKhB,wDAAwD;IACjD,OAAO;IAKP,gBAAgB;IAIV,gBAAgB,CAAC,IAAI,EAAE;QAClC,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,YAAY,EAAE,sBAAsB,CAAC;QACrC,KAAK,EAAE,KAAK,CAAC;QACb,iBAAiB,EAAE,WAAW,CAAC;QAC/B,YAAY,EAAE,wBAAwB,EAAE,CAAC;KAC1C,GAAG,OAAO,CAAC,OAAO,CAAC;YAkDN,4BAA4B;YA2D5B,sBAAsB;IAyCpC,OAAO,CAAC,6BAA6B;IAyBrC,OAAO,CAAC,uBAAuB;CAuBhC"}
+{"version":3,"file":"prover-node-publisher.d.ts","sourceRoot":"","sources":["../src/prover-node-publisher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAA8B,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAC1F,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAE7D,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAEhF,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAGzD,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAE/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAEjF,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAOnF,sEAAsE;AACtE,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,EAAE,CAAC;IACpB,UAAU,EAAE,EAAE,CAAC;IACf,YAAY,EAAE,EAAE,CAAC;IACjB,OAAO,EAAE,EAAE,CAAC;IACZ,QAAQ,EAAE,EAAE,CAAC;IACb,IAAI,EAAE,KAAK,CAAC,YAAY,EAAE,OAAO,wBAAwB,CAAC,CAAC;IAC3D,KAAK,EAAE,KAAK,CAAC;CACd,CAAC;AAEF,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,OAAO,CAA6B;IAE5C,SAAS,CAAC,GAAG,yCAA+C;IAE5D,SAAS,CAAC,cAAc,EAAE,cAAc,CAAC;IAEzC,SAAgB,SAAS,EAAE,SAAS,CAAC;IAErC,YACE,MAAM,EAAE,cAAc,GAAG,eAAe,EACxC,IAAI,EAAE;QACJ,cAAc,EAAE,cAAc,CAAC;QAC/B,SAAS,EAAE,SAAS,CAAC;QACrB,SAAS,CAAC,EAAE,eAAe,CAAC;KAC7B,EAQF;IAEM,iBAAiB,mBAEvB;IAED;;;;;OAKG;IACI,SAAS,SAGf;IAED,wDAAwD;IACjD,OAAO,SAGb;IAEM,gBAAgB,eAEtB;IAEY,gBAAgB,CAAC,IAAI,EAAE;QAClC,WAAW,EAAE,WAAW,CAAC;QACzB,cAAc,EAAE,gBAAgB,CAAC;QACjC,YAAY,EAAE,gBAAgB,CAAC;QAC/B,YAAY,EAAE,sBAAsB,CAAC;QACrC,KAAK,EAAE,KAAK,CAAC;QACb,iBAAiB,EAAE,WAAW,CAAC;QAC/B,YAAY,EAAE,wBAAwB,EAAE,CAAC;KAC1C,GAAG,OAAO,CAAC,OAAO,CAAC,CAiDnB;YAEa,4BAA4B;YA+D5B,sBAAsB;IA4CpC,OAAO,CAAC,6BAA6B;IAyBrC,OAAO,CAAC,uBAAuB;CAuBhC"}

package/dest/prover-node-publisher.js

@@ -1,8 +1,10 @@
+import { getEthBlobEvaluationInputs } from '@aztec/blob-lib';
 import { AZTEC_MAX_EPOCH_DURATION } from '@aztec/constants';
 import { makeTuple } from '@aztec/foundation/array';
+import { CheckpointNumber } from '@aztec/foundation/branded-types';
 import { areArraysEqual } from '@aztec/foundation/collection';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
 import { RollupAbi } from '@aztec/l1-artifacts';
@@ -43,11 +45,11 @@ export class ProverNodePublisher {
         return this.l1TxUtils.getSenderAddress();
     }
     async submitEpochProof(args) {
-        const { epochNumber, fromBlock, toBlock } = args;
+        const { epochNumber, fromCheckpoint, toCheckpoint } = args;
         const ctx = {
             epochNumber,
-            fromBlock,
-            toBlock
+            fromCheckpoint,
+            toCheckpoint
         };
         if (!this.interrupted) {
             const timer = new Timer();
@@ -55,6 +57,7 @@ export class ProverNodePublisher {
             await this.validateEpochProofSubmission(args);
             const txReceipt = await this.sendSubmitEpochProofTx(args);
             if (!txReceipt) {
+                this.log.error(`Failed to mine submitEpochProof tx`, undefined, ctx);
                 return false;
             }
             try {
@@ -84,32 +87,32 @@ export class ProverNodePublisher {
                 return true;
             }
             this.metrics.recordFailedTx();
-            this.log.error(`Rollup.submitEpochProof tx status failed ${txReceipt.transactionHash}`, undefined, ctx);
+            this.log.error(`Rollup submitEpochProof tx reverted ${txReceipt.transactionHash}`, undefined, ctx);
         }
-        this.log.verbose('L2 block data syncing interrupted', ctx);
+        this.log.verbose('Checkpoint data syncing interrupted', ctx);
         return false;
     }
     async validateEpochProofSubmission(args) {
-        const { fromBlock, toBlock, publicInputs, batchedBlobInputs } = args;
-        // Check that the block numbers match the expected epoch to be proven
-        const { pendingBlockNumber: pending, provenBlockNumber: proven } = await this.rollupContract.getTips();
-        // Don't publish if proven is beyond our toBlock, pointless to do so
-        if (proven > BigInt(toBlock)) {
-            throw new Error(`Cannot submit epoch proof for ${fromBlock}-${toBlock} as proven block is ${proven}`);
+        const { fromCheckpoint, toCheckpoint, publicInputs, batchedBlobInputs } = args;
+        // Check that the checkpoint numbers match the expected epoch to be proven
+        const { pending, proven } = await this.rollupContract.getTips();
+        // Don't publish if proven is beyond our toCheckpoint, pointless to do so
+        if (proven > toCheckpoint) {
+            throw new Error(`Cannot submit epoch proof for ${fromCheckpoint}-${toCheckpoint} as proven checkpoint is ${proven}`);
         }
-        // toBlock can't be greater than pending
-        if (toBlock > pending) {
-            throw new Error(`Cannot submit epoch proof for ${fromBlock}-${toBlock} as pending block is ${pending}`);
+        // toCheckpoint can't be greater than pending
+        if (toCheckpoint > pending) {
+            throw new Error(`Cannot submit epoch proof for ${fromCheckpoint}-${toCheckpoint} as pending checkpoint is ${pending}`);
         }
-        // Check the archive for the immediate block before the epoch
-        const blockLog = await this.rollupContract.getBlock(BigInt(fromBlock - 1));
-        if (publicInputs.previousArchiveRoot.toString() !== blockLog.archive) {
-            throw new Error(`Previous archive root mismatch: ${publicInputs.previousArchiveRoot.toString()} !== ${blockLog.archive}`);
+        // Check the archive for the immediate checkpoint before the epoch
+        const checkpointLog = await this.rollupContract.getCheckpoint(CheckpointNumber(fromCheckpoint - 1));
+        if (publicInputs.previousArchiveRoot.toString() !== checkpointLog.archive) {
+            throw new Error(`Previous archive root mismatch: ${publicInputs.previousArchiveRoot.toString()} !== ${checkpointLog.archive}`);
         }
-        // Check the archive for the last block in the epoch
-        const endBlockLog = await this.rollupContract.getBlock(BigInt(toBlock));
-        if (publicInputs.endArchiveRoot.toString() !== endBlockLog.archive) {
-            throw new Error(`End archive root mismatch: ${publicInputs.endArchiveRoot.toString()} !== ${endBlockLog.archive}`);
+        // Check the archive for the last checkpoint in the epoch
+        const endCheckpointLog = await this.rollupContract.getCheckpoint(toCheckpoint);
+        if (publicInputs.endArchiveRoot.toString() !== endCheckpointLog.archive) {
+            throw new Error(`End archive root mismatch: ${publicInputs.endArchiveRoot.toString()} !== ${endCheckpointLog.archive}`);
         }
         // Check the batched blob inputs from the root rollup against the batched blob computed in ts
         const finalBlobAccumulator = batchedBlobInputs.toFinalBlobAccumulator();
@@ -132,8 +135,8 @@ export class ProverNodePublisher {
         ];
         this.log.info(`Submitting epoch proof to L1 rollup contract`, {
             proofSize: args.proof.withoutPublicInputs().length,
-            fromBlock: args.fromBlock,
-            toBlock: args.toBlock
+            fromCheckpoint: args.fromCheckpoint,
+            toCheckpoint: args.toCheckpoint
         });
         const data = encodeFunctionData({
             abi: RollupAbi,
@@ -145,33 +148,36 @@ export class ProverNodePublisher {
                 to: this.rollupContract.address,
                 data
             });
+            if (receipt.status !== 'success') {
+                const errorMsg = await this.l1TxUtils.tryGetErrorFromRevertedTx(data, {
+                    args: [
+                        ...txArgs
+                    ],
+                    functionName: 'submitEpochRootProof',
+                    abi: RollupAbi,
+                    address: this.rollupContract.address
+                }, /*blobInputs*/ undefined, /*stateOverride*/ []);
+                this.log.error(`Rollup submit epoch proof tx reverted with ${errorMsg ?? 'unknown error'}`);
+                return undefined;
+            }
             return receipt;
         } catch (err) {
             this.log.error(`Rollup submit epoch proof failed`, err);
-            const errorMsg = await this.l1TxUtils.tryGetErrorFromRevertedTx(data, {
-                args: [
-                    ...txArgs
-                ],
-                functionName: 'submitEpochRootProof',
-                abi: RollupAbi,
-                address: this.rollupContract.address
-            }, /*blobInputs*/ undefined, /*stateOverride*/ []);
-            this.log.error(`Rollup submit epoch proof tx reverted. ${errorMsg}`);
             return undefined;
         }
     }
     getEpochProofPublicInputsArgs(args) {
         // Returns arguments for EpochProofLib.sol -> getEpochProofPublicInputs()
         return [
-            BigInt(args.fromBlock),
-            BigInt(args.toBlock),
+            BigInt(args.fromCheckpoint),
+            BigInt(args.toCheckpoint),
             {
                 previousArchive: args.publicInputs.previousArchiveRoot.toString(),
                 endArchive: args.publicInputs.endArchiveRoot.toString(),
                 proverId: EthAddress.fromField(args.publicInputs.constants.proverId).toString()
             } /*_args*/ ,
             makeTuple(AZTEC_MAX_EPOCH_DURATION * 2, (i)=>i % 2 === 0 ? args.publicInputs.fees[i / 2].recipient.toField().toString() : args.publicInputs.fees[(i - 1) / 2].value.toString()),
-            args.batchedBlobInputs.getEthBlobEvaluationInputs()
+            getEthBlobEvaluationInputs(args.batchedBlobInputs)
         ];
     }
     getSubmitEpochProofArgs(args) {