@aztec/prover-node 3.0.0-canary.a9708bd → 3.0.0-devnet.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/prover-node",
-  "version": "3.0.0-canary.a9708bd",
+  "version": "3.0.0-devnet.3",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -56,30 +56,30 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "3.0.0-canary.a9708bd",
-    "@aztec/bb-prover": "3.0.0-canary.a9708bd",
-    "@aztec/blob-lib": "3.0.0-canary.a9708bd",
-    "@aztec/blob-sink": "3.0.0-canary.a9708bd",
-    "@aztec/constants": "3.0.0-canary.a9708bd",
-    "@aztec/epoch-cache": "3.0.0-canary.a9708bd",
-    "@aztec/ethereum": "3.0.0-canary.a9708bd",
-    "@aztec/foundation": "3.0.0-canary.a9708bd",
-    "@aztec/kv-store": "3.0.0-canary.a9708bd",
-    "@aztec/l1-artifacts": "3.0.0-canary.a9708bd",
-    "@aztec/node-keystore": "3.0.0-canary.a9708bd",
-    "@aztec/node-lib": "3.0.0-canary.a9708bd",
-    "@aztec/noir-protocol-circuits-types": "3.0.0-canary.a9708bd",
-    "@aztec/p2p": "3.0.0-canary.a9708bd",
-    "@aztec/protocol-contracts": "3.0.0-canary.a9708bd",
-    "@aztec/prover-client": "3.0.0-canary.a9708bd",
-    "@aztec/sequencer-client": "3.0.0-canary.a9708bd",
-    "@aztec/simulator": "3.0.0-canary.a9708bd",
-    "@aztec/stdlib": "3.0.0-canary.a9708bd",
-    "@aztec/telemetry-client": "3.0.0-canary.a9708bd",
-    "@aztec/world-state": "3.0.0-canary.a9708bd",
+    "@aztec/archiver": "3.0.0-devnet.3",
+    "@aztec/bb-prover": "3.0.0-devnet.3",
+    "@aztec/blob-lib": "3.0.0-devnet.3",
+    "@aztec/blob-sink": "3.0.0-devnet.3",
+    "@aztec/constants": "3.0.0-devnet.3",
+    "@aztec/epoch-cache": "3.0.0-devnet.3",
+    "@aztec/ethereum": "3.0.0-devnet.3",
+    "@aztec/foundation": "3.0.0-devnet.3",
+    "@aztec/kv-store": "3.0.0-devnet.3",
+    "@aztec/l1-artifacts": "3.0.0-devnet.3",
+    "@aztec/node-keystore": "3.0.0-devnet.3",
+    "@aztec/node-lib": "3.0.0-devnet.3",
+    "@aztec/noir-protocol-circuits-types": "3.0.0-devnet.3",
+    "@aztec/p2p": "3.0.0-devnet.3",
+    "@aztec/protocol-contracts": "3.0.0-devnet.3",
+    "@aztec/prover-client": "3.0.0-devnet.3",
+    "@aztec/sequencer-client": "3.0.0-devnet.3",
+    "@aztec/simulator": "3.0.0-devnet.3",
+    "@aztec/stdlib": "3.0.0-devnet.3",
+    "@aztec/telemetry-client": "3.0.0-devnet.3",
+    "@aztec/world-state": "3.0.0-devnet.3",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0",
-    "viem": "2.23.7"
+    "viem": "npm:@spalladino/viem@2.38.2-eip7594.0"
   },
   "devDependencies": {
     "@jest/globals": "^30.0.0",

package/src/bin/run-failed-epoch.ts

@@ -25,7 +25,7 @@ async function rerunFailedEpoch(provingJobUrl: string, baseLocalDir: string) {
   const config = {
     ...getProverNodeConfigFromEnv(),
     dataDirectory: dataDir,
-    dataStoreMapSizeKB: env.dataStoreMapSizeKB ?? 1024 * 1024,
+    dataStoreMapSizeKb: env.dataStoreMapSizeKb ?? 1024 * 1024,
     proverId: env.proverId ?? EthAddress.random(),
   };
 

package/src/config.ts

@@ -1,16 +1,14 @@
 import { type ArchiverConfig, archiverConfigMappings } from '@aztec/archiver/config';
 import type { ACVMConfig, BBConfig } from '@aztec/bb-prover/config';
 import { type GenesisStateConfig, genesisStateConfigMappings } from '@aztec/ethereum';
-import { type ConfigMappingsType, getConfigFromMappings, numberConfigHelper } from '@aztec/foundation/config';
-import { type DataStoreConfig, dataConfigMappings } from '@aztec/kv-store/config';
 import {
-  type EthAccount,
-  type EthAddressHex,
-  type EthRemoteSignerAccount,
-  type KeyStore,
-  type KeyStoreConfig,
-  keyStoreConfigMappings,
-} from '@aztec/node-keystore';
+  type ConfigMappingsType,
+  booleanConfigHelper,
+  getConfigFromMappings,
+  numberConfigHelper,
+} from '@aztec/foundation/config';
+import { type DataStoreConfig, dataConfigMappings } from '@aztec/kv-store/config';
+import { type KeyStore, type KeyStoreConfig, ethPrivateKeySchema, keyStoreConfigMappings } from '@aztec/node-keystore';
 import { type SharedNodeConfig, sharedNodeConfigMappings } from '@aztec/node-lib/config';
 import { type P2PConfig, p2pConfigMappings } from '@aztec/p2p/config';
 import {
@@ -45,6 +43,8 @@ export type SpecificProverNodeConfig = {
   proverNodePollingIntervalMs: number;
   proverNodeMaxParallelBlocksPerEpoch: number;
   proverNodeFailedEpochStore: string | undefined;
+  proverNodeEpochProvingDelayMs: number | undefined;
+  proverNodeDisableProofPublish?: boolean;
   txGatheringTimeoutMs: number;
   txGatheringIntervalMs: number;
   txGatheringBatchSize: number;
@@ -72,6 +72,10 @@ const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeCon
     description: 'File store where to upload node state when an epoch fails to be proven',
     defaultValue: undefined,
   },
+  proverNodeEpochProvingDelayMs: {
+    description: 'Optional delay in milliseconds to wait before proving a new epoch',
+    defaultValue: undefined,
+  },
   txGatheringIntervalMs: {
     env: 'PROVER_NODE_TX_GATHERING_INTERVAL_MS',
     description: 'How often to check that tx data is available',
@@ -92,6 +96,11 @@ const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeCon
     description: 'How long to wait for tx data to be available before giving up',
     ...numberConfigHelper(120_000),
   },
+  proverNodeDisableProofPublish: {
+    env: 'PROVER_NODE_DISABLE_PROOF_PUBLISH',
+    description: 'Whether the prover node skips publishing proofs to L1',
+    ...booleanConfigHelper(false),
+  },
 };
 
 export const proverNodeConfigMappings: ConfigMappingsType<ProverNodeConfig> = {
@@ -125,19 +134,14 @@ export function getProverNodeAgentConfigFromEnv(): ProverAgentConfig & BBConfig
   };
 }
 
-function createKeyStoreFromWeb3Signer(config: ProverNodeConfig) {
-  // See what we have been given for proverId.
-  const proverId = config.proverId ? (config.proverId.toString() as EthAddressHex) : undefined;
-
+function createKeyStoreFromWeb3Signer(config: ProverNodeConfig): KeyStore | undefined {
   // If we don't have a valid prover Id then we can't build a valid key store with remote signers
-  if (proverId === undefined) {
+  if (config.proverId === undefined) {
     return undefined;
   }
 
   // Also, we need at least one publisher address.
-  const publishers = config.publisherAddresses
-    ? config.publisherAddresses.map(k => k.toChecksumString() as EthRemoteSignerAccount)
-    : [];
+  const publishers = config.publisherAddresses ?? [];
 
   if (publishers.length === 0) {
     return undefined;
@@ -147,7 +151,7 @@ function createKeyStoreFromWeb3Signer(config: ProverNodeConfig) {
     schemaVersion: 1,
     slasher: undefined,
     prover: {
-      id: proverId,
+      id: config.proverId,
       publisher: publishers,
     },
     remoteSigner: config.web3SignerUrl,
@@ -156,10 +160,10 @@ function createKeyStoreFromWeb3Signer(config: ProverNodeConfig) {
   return keyStore;
 }
 
-function createKeyStoreFromPublisherKeys(config: ProverNodeConfig) {
+function createKeyStoreFromPublisherKeys(config: ProverNodeConfig): KeyStore | undefined {
   // Extract the publisher keys from the provided config.
   const publisherKeys = config.publisherPrivateKeys
-    ? config.publisherPrivateKeys.map(k => k.getValue() as EthAddressHex)
+    ? config.publisherPrivateKeys.map(k => ethPrivateKeySchema.parse(k.getValue()))
     : [];
 
   // There must be at least 1.
@@ -167,9 +171,6 @@ function createKeyStoreFromPublisherKeys(config: ProverNodeConfig) {
     return undefined;
   }
 
-  // Now see what we have been given for proverId.
-  const proverId = config.proverId ? (config.proverId.toString() as EthAddressHex) : undefined;
-
   // If we have a valid proverId then create a prover key store of the form { id, publisher: [publisherKeys] }
   // Otherwise create one of the form ("0x12345678....." as EthAccount).
 
@@ -177,11 +178,11 @@ function createKeyStoreFromPublisherKeys(config: ProverNodeConfig) {
     schemaVersion: 1,
     slasher: undefined,
     prover:
-      proverId === undefined
-        ? (publisherKeys[0] as EthAccount)
+      config.proverId === undefined
+        ? publisherKeys[0]
         : {
-            id: proverId,
-            publisher: publisherKeys.map(key => key as EthAccount),
+            id: config.proverId,
+            publisher: publisherKeys,
           },
     remoteSigner: undefined,
     validators: undefined,
@@ -189,7 +190,7 @@ function createKeyStoreFromPublisherKeys(config: ProverNodeConfig) {
   return keyStore;
 }
 
-export function createKeyStoreForProver(config: ProverNodeConfig) {
+export function createKeyStoreForProver(config: ProverNodeConfig): KeyStore | undefined {
   if (config.web3SignerUrl !== undefined && config.web3SignerUrl.length > 0) {
     return createKeyStoreFromWeb3Signer(config);
   }

package/src/factory.ts

@@ -2,20 +2,14 @@ import { type Archiver, createArchiver } from '@aztec/archiver';
 import { BBCircuitVerifier, QueuedIVCVerifier, TestCircuitVerifier } from '@aztec/bb-prover';
 import { type BlobSinkClientInterface, createBlobSinkClient } from '@aztec/blob-sink/client';
 import { EpochCache } from '@aztec/epoch-cache';
-import {
-  type EthSigner,
-  L1TxUtils,
-  PublisherManager,
-  RollupContract,
-  createEthereumChain,
-  createL1TxUtilsFromEthSigner,
-} from '@aztec/ethereum';
+import { L1TxUtils, PublisherManager, RollupContract, createEthereumChain } from '@aztec/ethereum';
 import { pick } from '@aztec/foundation/collection';
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import { DateProvider } from '@aztec/foundation/timer';
 import type { DataStoreConfig } from '@aztec/kv-store/config';
 import { type KeyStoreConfig, KeystoreManager, loadKeystores, mergeKeystores } from '@aztec/node-keystore';
 import { trySnapshotSync } from '@aztec/node-lib/actions';
+import { createL1TxUtilsFromEthSignerWithStore } from '@aztec/node-lib/factories';
 import { NodeRpcTxSource, createP2PClient } from '@aztec/p2p';
 import { type ProverClientConfig, createProverClient } from '@aztec/prover-client';
 import { createAndStartProvingBroker } from '@aztec/prover-client/broker';
@@ -73,6 +67,8 @@ export async function createProverNode(
     }
   }
 
+  await keyStoreManager?.validateSigners();
+
   // Extract the prover signers from the key store and verify that we have one.
   const proverSigners = keyStoreManager?.createProverSigners();
 
@@ -86,6 +82,8 @@ export async function createProverNode(
     );
   }
 
+  log.info(`Creating prover with publishers ${proverSigners.signers.map(signer => signer.address.toString()).join()}`);
+
   // Only consider user provided config if it is valid
   const proverIdInUserConfig = config.proverId === undefined || config.proverId.isZero() ? undefined : config.proverId;
 
@@ -133,15 +131,18 @@ export async function createProverNode(
 
   const l1TxUtils = deps.l1TxUtils
     ? [deps.l1TxUtils]
-    : proverSigners.signers.map((signer: EthSigner) => {
-        return createL1TxUtilsFromEthSigner(publicClient, signer, log, dateProvider, config);
-      });
+    : await createL1TxUtilsFromEthSignerWithStore(
+        publicClient,
+        proverSigners.signers,
+        { ...config, scope: 'prover' },
+        { telemetry, logger: log.createChild('l1-tx-utils'), dateProvider },
+      );
 
   const publisherFactory =
     deps.publisherFactory ??
     new ProverPublisherFactory(config, {
       rollupContract,
-      publisherManager: new PublisherManager(l1TxUtils),
+      publisherManager: new PublisherManager(l1TxUtils, config),
       telemetry,
     });
 
@@ -175,6 +176,7 @@ export async function createProverNode(
       'proverNodeMaxPendingJobs',
       'proverNodeMaxParallelBlocksPerEpoch',
       'proverNodePollingIntervalMs',
+      'proverNodeEpochProvingDelayMs',
       'txGatheringMaxParallelRequests',
       'txGatheringIntervalMs',
       'txGatheringTimeoutMs',
@@ -187,7 +189,7 @@ export async function createProverNode(
 
   const epochMonitor = await EpochMonitor.create(
     archiver,
-    { pollingIntervalMs: config.proverNodePollingIntervalMs },
+    { pollingIntervalMs: config.proverNodePollingIntervalMs, provingDelayMs: config.proverNodeEpochProvingDelayMs },
     telemetry,
   );
 

package/src/job/epoch-proving-job.ts

@@ -1,4 +1,3 @@
-import { BatchedBlob, Blob } from '@aztec/blob-lib';
 import { NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/constants';
 import { asyncPool } from '@aztec/foundation/async-pool';
 import { padArrayEnd } from '@aztec/foundation/collection';
@@ -6,6 +5,9 @@ import { Fr } from '@aztec/foundation/fields';
 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 type { PublicProcessor, PublicProcessorFactory } from '@aztec/simulator/server';
 import type { L2Block, L2BlockSource } from '@aztec/stdlib/block';
 import {
@@ -14,6 +16,7 @@ import {
   EpochProvingJobTerminalState,
   type ForkMerkleTreeOperations,
 } from '@aztec/stdlib/interfaces/server';
+import { CheckpointConstantData } from '@aztec/stdlib/rollup';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
 import type { ProcessedTx, Tx } from '@aztec/stdlib/tx';
 import { Attributes, type Traceable, type Tracer, trackSpan } from '@aztec/telemetry-client';
@@ -24,6 +27,12 @@ import type { ProverNodeJobMetrics } from '../metrics.js';
 import type { ProverNodePublisher } from '../prover-node-publisher.js';
 import { type EpochProvingJobData, validateEpochProvingJobData } from './epoch-proving-job-data.js';
 
+export type EpochProvingJobOptions = {
+  parallelBlockLimit?: number;
+  skipEpochCheck?: boolean;
+  skipSubmitProof?: boolean;
+};
+
 /**
  * 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
@@ -49,7 +58,7 @@ export class EpochProvingJob implements Traceable {
     private l2BlockSource: L2BlockSource | undefined,
     private metrics: ProverNodeJobMetrics,
     private deadline: Date | undefined,
-    private config: { parallelBlockLimit?: number; skipEpochCheck?: boolean },
+    private config: EpochProvingJobOptions,
   ) {
     validateEpochProvingJobData(data);
     this.uuid = crypto.randomUUID();
@@ -123,12 +132,14 @@ export class EpochProvingJob implements Traceable {
     this.runPromise = promise;
 
     try {
-      const allBlobs = (
-        await Promise.all(this.blocks.map(async block => await Blob.getBlobsPerBlock(block.body.toBlobFields())))
-      ).flat();
+      const blobFieldsPerCheckpoint = this.blocks.map(block => block.getCheckpointBlobFields());
+      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;
 
-      const finalBlobBatchingChallenges = await BatchedBlob.precomputeBatchedBlobChallenges(allBlobs);
-      this.prover.startNewEpoch(epochNumber, fromBlock, epochSizeBlocks, finalBlobBatchingChallenges);
+      this.prover.startNewEpoch(epochNumber, totalNumCheckpoints, finalBlobBatchingChallenges);
       await this.prover.startTubeCircuits(Array.from(this.txs.values()));
 
       await asyncPool(this.config.parallelBlockLimit ?? 32, this.blocks, async block => {
@@ -151,12 +162,41 @@ export class EpochProvingJob implements Traceable {
           ...globalVariables,
         });
 
+        const checkpointConstants = CheckpointConstantData.from({
+          chainId: globalVariables.chainId,
+          version: globalVariables.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(globalVariables, l1ToL2Messages, previousHeader);
+        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, true);
+        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();
@@ -167,7 +207,8 @@ export class EpochProvingJob implements Traceable {
         });
 
         // Mark block as completed to pad it
-        await this.prover.setBlockCompleted(block.number, block.header);
+        const expectedBlockHeader = block.getBlockHeader();
+        await this.prover.setBlockCompleted(block.number, expectedBlockHeader);
       });
 
       const executionTime = timer.ms();
@@ -178,6 +219,15 @@ export class EpochProvingJob implements Traceable {
 
       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.state = 'completed';
+        this.metrics.recordProvingJob(executionTime, timer.ms(), epochSizeBlocks, epochSizeTxs);
+        return;
+      }
+
       const success = await this.publisher.submitEpochProof({
         fromBlock,
         toBlock,
@@ -224,7 +274,7 @@ export class EpochProvingJob implements Traceable {
    */
   private async createFork(blockNumber: number, l1ToL2Messages: Fr[]) {
     const db = await this.dbProvider.fork(blockNumber);
-    const l1ToL2MessagesPadded = padArrayEnd(
+    const l1ToL2MessagesPadded = padArrayEnd<Fr, number>(
       l1ToL2Messages,
       Fr.ZERO,
       NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
@@ -252,7 +302,6 @@ export class EpochProvingJob implements Traceable {
   public async stop(state: EpochProvingJobTerminalState = 'stopped') {
     this.state = state;
     this.prover.cancel();
-    // TODO(palla/prover): Stop the publisher as well
     if (this.runPromise) {
       await this.runPromise;
     }
@@ -318,7 +367,7 @@ export class EpochProvingJob implements Traceable {
   private getBlockHeader(blockNumber: number) {
     const block = this.blocks.find(b => b.number === blockNumber);
     if (block) {
-      return block.header;
+      return block.getBlockHeader();
     }
 
     if (blockNumber === Number(this.data.previousBlockHeader.getBlockNumber())) {

package/src/metrics.ts

@@ -91,7 +91,7 @@ export class ProverNodeRewardsMetrics {
   }
 
   private observe = async (observer: BatchObservableResult): Promise<void> => {
-    const epoch = await this.rollup.getEpochNumber();
+    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

package/src/monitors/epoch-monitor.ts

@@ -1,5 +1,6 @@
 import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
+import { sleep } from '@aztec/foundation/sleep';
 import type { L2BlockSource } from '@aztec/stdlib/block';
 import { type L1RollupConstants, getEpochAtSlot } from '@aztec/stdlib/epoch-helpers';
 import {
@@ -36,16 +37,19 @@ export class EpochMonitor implements Traceable {
   constructor(
     private readonly l2BlockSource: L2BlockSource,
     private readonly l1Constants: Pick<L1RollupConstants, 'epochDuration'>,
-    private options: { pollingIntervalMs: number },
+    private options: { pollingIntervalMs: number; provingDelayMs?: number },
     telemetry: TelemetryClient = getTelemetryClient(),
   ) {
     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`);
+    }
   }
 
   public static async create(
     l2BlockSource: L2BlockSource,
-    options: { pollingIntervalMs: number },
+    options: { pollingIntervalMs: number; provingDelayMs?: number },
     telemetry: TelemetryClient = getTelemetryClient(),
   ): Promise<EpochMonitor> {
     const l1Constants = await l2BlockSource.getL1Constants();
@@ -87,6 +91,11 @@ export class EpochMonitor implements Traceable {
       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`);
     if (await this.handler?.handleEpochReadyToProve(epochToProve)) {
       this.latestEpochNumber = epochToProve;

package/src/prover-node-publisher.ts

@@ -1,21 +1,16 @@
-import { type BatchedBlob, FinalBlobAccumulatorPublicInputs } from '@aztec/blob-lib';
+import type { BatchedBlob } from '@aztec/blob-lib';
 import { AZTEC_MAX_EPOCH_DURATION } from '@aztec/constants';
-import {
-  type L1TxUtils,
-  type RollupContract,
-  RollupContract as RollupContractClass,
-  type ViemCommitteeAttestation,
-} from '@aztec/ethereum';
+import type { L1TxUtils, RollupContract, ViemCommitteeAttestation } from '@aztec/ethereum';
 import { makeTuple } from '@aztec/foundation/array';
 import { areArraysEqual } from '@aztec/foundation/collection';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
 import type { Tuple } from '@aztec/foundation/serialize';
-import { InterruptibleSleep } from '@aztec/foundation/sleep';
 import { Timer } from '@aztec/foundation/timer';
 import { RollupAbi } from '@aztec/l1-artifacts';
 import type { PublisherConfig, TxSenderConfig } from '@aztec/sequencer-client';
+import { CommitteeAttestation, CommitteeAttestationsAndSigners } from '@aztec/stdlib/block';
 import type { Proof } from '@aztec/stdlib/proofs';
 import type { FeeRecipient, RootRollupPublicInputs } from '@aztec/stdlib/rollup';
 import type { L1PublishProofStats } from '@aztec/stdlib/stats';
@@ -39,8 +34,6 @@ export type L1SubmitEpochProofArgs = {
 };
 
 export class ProverNodePublisher {
-  private interruptibleSleep = new InterruptibleSleep();
-  private sleepTimeMs: number;
   private interrupted = false;
   private metrics: ProverNodePublisherMetrics;
 
@@ -58,8 +51,6 @@ export class ProverNodePublisher {
       telemetry?: TelemetryClient;
     },
   ) {
-    this.sleepTimeMs = config?.l1PublishRetryIntervalMS ?? 60_000;
-
     const telemetry = deps.telemetry ?? getTelemetryClient();
 
     this.metrics = new ProverNodePublisherMetrics(telemetry, 'ProverNode');
@@ -80,12 +71,13 @@ export class ProverNodePublisher {
    */
   public interrupt() {
     this.interrupted = true;
-    this.interruptibleSleep.interrupt();
+    this.l1TxUtils.interrupt();
   }
 
   /** Restarts the publisher after calling `interrupt`. */
   public restart() {
     this.interrupted = false;
+    this.l1TxUtils.restart();
   }
 
   public getSenderAddress() {
@@ -103,6 +95,7 @@ export class ProverNodePublisher {
   }): Promise<boolean> {
     const { epochNumber, fromBlock, toBlock } = args;
     const ctx = { epochNumber, fromBlock, toBlock };
+
     if (!this.interrupted) {
       const timer = new Timer();
       // Validate epoch proof range and hashes are correct before submitting
@@ -143,7 +136,6 @@ export class ProverNodePublisher {
 
       this.metrics.recordFailedTx();
       this.log.error(`Rollup.submitEpochProof tx status failed ${txReceipt.transactionHash}`, undefined, ctx);
-      await this.sleepOrInterrupted();
     }
 
     this.log.verbose('L2 block data syncing interrupted', ctx);
@@ -188,9 +180,10 @@ export class ProverNodePublisher {
     }
 
     // Check the batched blob inputs from the root rollup against the batched blob computed in ts
-    if (!publicInputs.blobPublicInputs.equals(FinalBlobAccumulatorPublicInputs.fromBatchedBlob(batchedBlobInputs))) {
+    const finalBlobAccumulator = batchedBlobInputs.toFinalBlobAccumulator();
+    if (!publicInputs.blobPublicInputs.equals(finalBlobAccumulator)) {
       throw new Error(
-        `Batched blob mismatch: ${inspect(publicInputs.blobPublicInputs)} !== ${inspect(FinalBlobAccumulatorPublicInputs.fromBatchedBlob(batchedBlobInputs))}`,
+        `Batched blob mismatch: ${inspect(publicInputs.blobPublicInputs)} !== ${inspect(finalBlobAccumulator)}`,
       );
     }
 
@@ -263,7 +256,7 @@ export class ProverNodePublisher {
       {
         previousArchive: args.publicInputs.previousArchiveRoot.toString(),
         endArchive: args.publicInputs.endArchiveRoot.toString(),
-        proverId: EthAddress.fromField(args.publicInputs.proverId).toString(),
+        proverId: EthAddress.fromField(args.publicInputs.constants.proverId).toString(),
       } /*_args*/,
       makeTuple(AZTEC_MAX_EPOCH_DURATION * 2, i =>
         i % 2 === 0
@@ -290,13 +283,11 @@ export class ProverNodePublisher {
       end: argsArray[1],
       args: argsArray[2],
       fees: argsArray[3],
-      attestations: RollupContractClass.packAttestations(args.attestations),
+      attestations: new CommitteeAttestationsAndSigners(
+        args.attestations.map(a => CommitteeAttestation.fromViem(a)),
+      ).getPackedAttestations(),
       blobInputs: argsArray[4],
       proof: proofHex,
     };
   }
-
-  protected async sleepOrInterrupted() {
-    await this.interruptibleSleep.sleep(this.sleepTimeMs);
-  }
 }

package/src/prover-node.ts

@@ -87,6 +87,7 @@ export class ProverNode implements EpochMonitorHandler, ProverNodeApi, Traceable
       txGatheringMaxParallelRequestsPerNode: 100,
       txGatheringTimeoutMs: 120_000,
       proverNodeFailedEpochStore: undefined,
+      proverNodeEpochProvingDelayMs: undefined,
       ...compact(config),
     };
 
@@ -143,6 +144,7 @@ export class ProverNode implements EpochMonitorHandler, ProverNodeApi, Traceable
    */
   async start() {
     this.epochsMonitor.start(this);
+    await this.publisherFactory.start();
     this.publisher = await this.publisherFactory.create();
     await this.rewardsMetrics.start();
     this.l1Metrics.start();
@@ -158,6 +160,7 @@ export class ProverNode implements EpochMonitorHandler, ProverNodeApi, Traceable
     await this.prover.stop();
     await tryStop(this.p2pClient);
     await tryStop(this.l2BlockSource);
+    await tryStop(this.publisherFactory);
     this.publisher?.interrupt();
     await Promise.all(Array.from(this.jobs.values()).map(job => job.stop()));
     await this.worldState.stop();
@@ -366,7 +369,7 @@ export class ProverNode implements EpochMonitorHandler, ProverNodeApi, Traceable
     publisher: ProverNodePublisher,
     opts: { skipEpochCheck?: boolean } = {},
   ) {
-    const { proverNodeMaxParallelBlocksPerEpoch: parallelBlockLimit } = this.config;
+    const { proverNodeMaxParallelBlocksPerEpoch: parallelBlockLimit, proverNodeDisableProofPublish } = this.config;
     return new EpochProvingJob(
       data,
       this.worldState,
@@ -376,7 +379,7 @@ export class ProverNode implements EpochMonitorHandler, ProverNodeApi, Traceable
       this.l2BlockSource,
       this.jobMetrics,
       deadline,
-      { parallelBlockLimit, ...opts },
+      { parallelBlockLimit, skipSubmitProof: proverNodeDisableProofPublish, ...opts },
     );
   }
 

package/src/prover-publisher-factory.ts

@@ -13,6 +13,15 @@ export class ProverPublisherFactory {
       telemetry?: TelemetryClient;
     },
   ) {}
+
+  public async start() {
+    await this.deps.publisherManager.loadState();
+  }
+
+  public stop() {
+    this.deps.publisherManager.interrupt();
+  }
+
   /**
    * Creates a new Prover Publisher instance.
    * @returns A new ProverNodePublisher instance.