@aztec/prover-node 0.0.0-test.0 → 0.0.1-commit.03f7ef2

package/dest/metrics.js

@@ -1,83 +1,193 @@
 import { createLogger } from '@aztec/foundation/log';
 import { Attributes, Metrics, ValueType } from '@aztec/telemetry-client';
-import { formatEther } from 'viem';
-export class ProverNodeMetrics {
-    client;
+import { formatEther, formatUnits } from 'viem';
+export class ProverNodeJobMetrics {
+    meter;
+    tracer;
     logger;
     proverEpochExecutionDuration;
     provingJobDuration;
+    provingJobCheckpoints;
     provingJobBlocks;
     provingJobTransactions;
-    gasPrice;
-    txCount;
-    txDuration;
-    txGas;
-    txCalldataSize;
-    txCalldataGas;
-    txBlobDataGasUsed;
-    txBlobDataGasCost;
-    senderBalance;
-    constructor(client, name = 'ProverNode', logger = createLogger('prover-node:publisher:metrics')){
-        this.client = client;
+    constructor(meter, tracer, logger = createLogger('prover-node:publisher:metrics')){
+        this.meter = meter;
+        this.tracer = tracer;
         this.logger = logger;
-        const meter = client.getMeter(name);
-        this.proverEpochExecutionDuration = meter.createHistogram(Metrics.PROVER_NODE_EXECUTION_DURATION, {
+        this.proverEpochExecutionDuration = this.meter.createHistogram(Metrics.PROVER_NODE_EXECUTION_DURATION, {
             description: 'Duration of execution of an epoch by the prover',
             unit: 'ms',
             valueType: ValueType.INT
         });
-        this.provingJobDuration = meter.createHistogram(Metrics.PROVER_NODE_JOB_DURATION, {
+        this.provingJobDuration = this.meter.createHistogram(Metrics.PROVER_NODE_JOB_DURATION, {
             description: 'Duration of proving job',
             unit: 's',
             valueType: ValueType.DOUBLE
         });
-        this.provingJobBlocks = meter.createGauge(Metrics.PROVER_NODE_JOB_BLOCKS, {
+        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
         });
-        this.provingJobTransactions = meter.createGauge(Metrics.PROVER_NODE_JOB_TRANSACTIONS, {
+        this.provingJobTransactions = this.meter.createGauge(Metrics.PROVER_NODE_JOB_TRANSACTIONS, {
             description: 'Number of transactions in a proven epoch',
             valueType: ValueType.INT
         });
-        this.gasPrice = meter.createHistogram(Metrics.L1_PUBLISHER_GAS_PRICE, {
+    }
+    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));
+    }
+}
+export class ProverNodeRewardsMetrics {
+    meter;
+    coinbase;
+    rollup;
+    logger;
+    rewards;
+    accumulatedRewards;
+    prevEpoch;
+    proofSubmissionEpochs;
+    constructor(meter, coinbase, rollup, logger = createLogger('prover-node:publisher:metrics')){
+        this.meter = meter;
+        this.coinbase = coinbase;
+        this.rollup = rollup;
+        this.logger = logger;
+        this.prevEpoch = -1n;
+        this.proofSubmissionEpochs = 0;
+        this.observe = async (observer)=>{
+            const epoch = await this.rollup.getCurrentEpochNumber();
+            if (epoch > this.proofSubmissionEpochs) {
+                // 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 = 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, {
+                    [Attributes.COINBASE]: this.coinbase.toString()
+                });
+                // only accumulate once per epoch
+                if (closedEpoch > this.prevEpoch) {
+                    this.prevEpoch = closedEpoch;
+                    this.accumulatedRewards.add(fmt, {
+                        [Attributes.COINBASE]: this.coinbase.toString()
+                    });
+                }
+            }
+        };
+        this.rewards = this.meter.createObservableGauge(Metrics.PROVER_NODE_REWARDS_PER_EPOCH, {
+            valueType: ValueType.DOUBLE,
+            description: 'The rewards earned'
+        });
+        this.accumulatedRewards = this.meter.createUpDownCounter(Metrics.PROVER_NODE_REWARDS_TOTAL, {
+            valueType: ValueType.DOUBLE,
+            description: 'The rewards earned (total)'
+        });
+    }
+    async start() {
+        const proofSubmissionEpochs = await this.rollup.getProofSubmissionEpochs();
+        this.proofSubmissionEpochs = Number(proofSubmissionEpochs);
+        this.meter.addBatchObservableCallback(this.observe, [
+            this.rewards
+        ]);
+    }
+    stop() {
+        this.meter.removeBatchObservableCallback(this.observe, [
+            this.rewards
+        ]);
+    }
+    observe;
+}
+export class ProverNodePublisherMetrics {
+    client;
+    logger;
+    gasPrice;
+    txCount;
+    txDuration;
+    txGas;
+    txCalldataSize;
+    txCalldataGas;
+    txBlobDataGasUsed;
+    txBlobDataGasCost;
+    txTotalFee;
+    senderBalance;
+    meter;
+    constructor(client, name = 'ProverNode', logger = createLogger('prover-node:publisher:metrics')){
+        this.client = client;
+        this.logger = logger;
+        this.meter = client.getMeter(name);
+        this.gasPrice = this.meter.createHistogram(Metrics.L1_PUBLISHER_GAS_PRICE, {
             description: 'The gas price used for transactions',
             unit: 'gwei',
             valueType: ValueType.DOUBLE
         });
-        this.txCount = meter.createUpDownCounter(Metrics.L1_PUBLISHER_TX_COUNT, {
+        this.txCount = this.meter.createUpDownCounter(Metrics.L1_PUBLISHER_TX_COUNT, {
             description: 'The number of transactions processed'
         });
-        this.txDuration = meter.createHistogram(Metrics.L1_PUBLISHER_TX_DURATION, {
+        this.txDuration = this.meter.createHistogram(Metrics.L1_PUBLISHER_TX_DURATION, {
             description: 'The duration of transaction processing',
             unit: 'ms',
             valueType: ValueType.INT
         });
-        this.txGas = meter.createHistogram(Metrics.L1_PUBLISHER_TX_GAS, {
+        this.txGas = this.meter.createHistogram(Metrics.L1_PUBLISHER_TX_GAS, {
             description: 'The gas consumed by transactions',
             unit: 'gas',
             valueType: ValueType.INT
         });
-        this.txCalldataSize = meter.createHistogram(Metrics.L1_PUBLISHER_TX_CALLDATA_SIZE, {
+        this.txCalldataSize = this.meter.createHistogram(Metrics.L1_PUBLISHER_TX_CALLDATA_SIZE, {
             description: 'The size of the calldata in transactions',
             unit: 'By',
             valueType: ValueType.INT
         });
-        this.txCalldataGas = meter.createHistogram(Metrics.L1_PUBLISHER_TX_CALLDATA_GAS, {
+        this.txCalldataGas = this.meter.createHistogram(Metrics.L1_PUBLISHER_TX_CALLDATA_GAS, {
             description: 'The gas consumed by the calldata in transactions',
             unit: 'gas',
             valueType: ValueType.INT
         });
-        this.txBlobDataGasUsed = meter.createHistogram(Metrics.L1_PUBLISHER_TX_BLOBDATA_GAS_USED, {
+        this.txBlobDataGasUsed = this.meter.createHistogram(Metrics.L1_PUBLISHER_TX_BLOBDATA_GAS_USED, {
             description: 'The amount of blob gas used in transactions',
             unit: 'gas',
             valueType: ValueType.INT
         });
-        this.txBlobDataGasCost = meter.createHistogram(Metrics.L1_PUBLISHER_TX_BLOBDATA_GAS_COST, {
+        this.txBlobDataGasCost = this.meter.createHistogram(Metrics.L1_PUBLISHER_TX_BLOBDATA_GAS_COST, {
             description: 'The gas cost of blobs in transactions',
             unit: 'gwei',
             valueType: ValueType.INT
         });
-        this.senderBalance = meter.createGauge(Metrics.L1_PUBLISHER_BALANCE, {
+        this.txTotalFee = this.meter.createHistogram(Metrics.L1_PUBLISHER_TX_TOTAL_FEE, {
+            description: 'How much L1 tx costs',
+            unit: 'gwei',
+            valueType: ValueType.DOUBLE,
+            advice: {
+                explicitBucketBoundaries: [
+                    0.001,
+                    0.002,
+                    0.004,
+                    0.008,
+                    0.01,
+                    0.02,
+                    0.04,
+                    0.08,
+                    0.1,
+                    0.2,
+                    0.4,
+                    0.8,
+                    1,
+                    1.2,
+                    1.4,
+                    1.8,
+                    2
+                ]
+            }
+        });
+        this.senderBalance = this.meter.createGauge(Metrics.L1_PUBLISHER_BALANCE, {
             unit: 'eth',
             description: 'The balance of the sender address',
             valueType: ValueType.DOUBLE
@@ -92,12 +202,6 @@ export class ProverNodeMetrics {
     recordSubmitProof(durationMs, stats) {
         this.recordTx(durationMs, stats);
     }
-    recordProvingJob(executionTimeMs, totalTimeMs, numBlocks, numTxs) {
-        this.proverEpochExecutionDuration.record(Math.ceil(executionTimeMs));
-        this.provingJobDuration.record(totalTimeMs / 1000);
-        this.provingJobBlocks.record(Math.floor(numBlocks));
-        this.provingJobTransactions.record(Math.floor(numTxs));
-    }
     recordSenderBalance(wei, senderAddress) {
         const eth = parseFloat(formatEther(wei, 'wei'));
         this.senderBalance.record(eth, {
@@ -122,7 +226,15 @@ export class ProverNodeMetrics {
         this.txBlobDataGasUsed.record(Number(stats.blobGasUsed), attributes);
         try {
             this.gasPrice.record(parseInt(formatEther(stats.gasPrice, 'gwei'), 10));
-        } catch (e) {
+        } catch  {
+        // ignore
+        }
+        const executionFee = stats.gasUsed * stats.gasPrice;
+        const blobFee = stats.blobGasUsed * stats.blobDataGas;
+        const totalFee = executionFee + blobFee;
+        try {
+            this.txTotalFee.record(parseFloat(formatEther(totalFee)));
+        } catch  {
         // ignore
         }
     }

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<void>;
+    handleEpochReadyToProve(epochNumber: EpochNumber): Promise<boolean>;
 }
 /**
  * Fires an event when a new epoch ready to prove is detected.
@@ -26,9 +27,11 @@ export declare class EpochMonitor implements Traceable {
     private latestEpochNumber;
     constructor(l2BlockSource: L2BlockSource, l1Constants: Pick<L1RollupConstants, 'epochDuration'>, options: {
         pollingIntervalMs: number;
+        provingDelayMs?: number;
     }, telemetry?: TelemetryClient);
     static create(l2BlockSource: L2BlockSource, options: {
         pollingIntervalMs: number;
+        provingDelayMs?: number;
     }, telemetry?: TelemetryClient): Promise<EpochMonitor>;
     start(handler: EpochMonitorHandler): void;
     /** Exposed for testing */
@@ -37,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":"AAEA,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,IAAI,CAAC,CAAC;CAC7D;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,CAAA;KAAE,EAC9C,SAAS,GAAE,eAAsC;WAM/B,MAAM,CACxB,aAAa,EAAE,aAAa,EAC5B,OAAO,EAAE;QAAE,iBAAiB,EAAE,MAAM,CAAA;KAAE,EACtC,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;YAsBH,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,8 +4,10 @@ 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';
 import { getEpochAtSlot } from '@aztec/stdlib/epoch-helpers';
 import { getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
 /**
@@ -34,6 +36,9 @@ import { getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
         this.log = createLogger('prover-node:epoch-monitor');
         this.tracer = telemetry.getTracer('EpochMonitor');
         this.runningPromise = new RunningPromise(this.work.bind(this), this.log, this.options.pollingIntervalMs);
+        if (this.options.provingDelayMs) {
+            this.log.warn(`Prover node epoch monitor running with delay of ${this.options.provingDelayMs}ms`);
+        }
     }
     static async create(l2BlockSource, options, telemetry = getTelemetryClient()) {
         const l1Constants = await l2BlockSource.getL1Constants();
@@ -53,6 +58,10 @@ import { getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
     }
     async work() {
         const { epochToProve, blockNumber, slotNumber } = await this.getEpochNumberToProve();
+        this.log.debug(`Epoch to prove: ${epochToProve}`, {
+            blockNumber,
+            slotNumber
+        });
         if (epochToProve === undefined) {
             this.log.trace(`Next block to prove ${blockNumber} not yet mined`, {
                 blockNumber
@@ -76,13 +85,18 @@ import { getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
             });
             return;
         }
+        if (this.options.provingDelayMs) {
+            this.log.debug(`Waiting ${this.options.provingDelayMs}ms before proving epoch ${epochToProve}`);
+            await sleep(this.options.provingDelayMs);
+        }
         this.log.debug(`Epoch ${epochToProve} is ready to be proven`);
-        await this.handler?.handleEpochReadyToProve(epochToProve);
-        this.latestEpochNumber = epochToProve;
+        if (await this.handler?.handleEpochReadyToProve(epochToProve)) {
+            this.latestEpochNumber = epochToProve;
+        }
     }
     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,22 +1,20 @@
+import { BatchedBlob } from '@aztec/blob-lib';
 import { AZTEC_MAX_EPOCH_DURATION } from '@aztec/constants';
-import type { L1TxUtils, RollupContract } 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 { Tuple } from '@aztec/foundation/serialize';
 import type { PublisherConfig, TxSenderConfig } from '@aztec/sequencer-client';
 import type { Proof } from '@aztec/stdlib/proofs';
 import type { FeeRecipient, RootRollupPublicInputs } from '@aztec/stdlib/rollup';
 import { type TelemetryClient } from '@aztec/telemetry-client';
-/**
- * Stats for a sent transaction.
- */
 /** Arguments to the submitEpochProof method of the rollup contract */
 export type L1SubmitEpochProofArgs = {
     epochSize: number;
     previousArchive: Fr;
     endArchive: Fr;
-    previousBlockHash: Fr;
-    endBlockHash: Fr;
     endTimestamp: Fr;
     outHash: Fr;
     proverId: Fr;
@@ -24,8 +22,6 @@ export type L1SubmitEpochProofArgs = {
     proof: Proof;
 };
 export declare class ProverNodePublisher {
-    private interruptibleSleep;
-    private sleepTimeMs;
     private interrupted;
     private metrics;
     protected log: import("@aztec/foundation/log").Logger;
@@ -36,6 +32,7 @@ export declare class ProverNodePublisher {
         l1TxUtils: L1TxUtils;
         telemetry?: TelemetryClient;
     });
+    getRollupContract(): RollupContract;
     /**
      * Calling `interrupt` will cause any in progress call to `publishRollup` to return `false` asap.
      * Be warned, the call may return false even if the tx subsequently gets successfully mined.
@@ -47,15 +44,17 @@ 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;
+        attestations: ViemCommitteeAttestation[];
     }): Promise<boolean>;
     private validateEpochProofSubmission;
     private sendSubmitEpochProofTx;
+    private getEpochProofPublicInputsArgs;
     private getSubmitEpochProofArgs;
-    protected sleepOrInterrupted(): Promise<void>;
 }
-//# 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,EAA6B,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AACvF,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGjE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,KAAK,KAAK,EAAqB,MAAM,6BAA6B,CAAC;AAI5E,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC/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;AAMnF;;GAEG;AACH,sEAAsE;AACtE,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,EAAE,CAAC;IACpB,UAAU,EAAE,EAAE,CAAC;IACf,iBAAiB,EAAE,EAAE,CAAC;IACtB,YAAY,EAAE,EAAE,CAAC;IACjB,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,kBAAkB,CAA4B;IACtD,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,OAAO,CAAoB;IAEnC,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;IAYH;;;;;OAKG;IACI,SAAS;IAKhB,wDAAwD;IACjD,OAAO;IAIP,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;KACd,GAAG,OAAO,CAAC,OAAO,CAAC;YAgDN,4BAA4B;YAyD5B,sBAAsB;IAoDpC,OAAO,CAAC,uBAAuB;cA+Bf,kBAAkB;CAGnC"}
+{"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"}