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

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

@@ -1,63 +1,222 @@
-import { createArchiverStore } from '@aztec/archiver';
+import { createArchiverStore, createContractDataSource } from '@aztec/archiver';
 import type { L1ContractsConfig } from '@aztec/ethereum/config';
+import { BlockNumber } from '@aztec/foundation/branded-types';
 import type { Logger } from '@aztec/foundation/log';
-import type { DataStoreConfig } from '@aztec/kv-store/config';
+import { DateProvider } from '@aztec/foundation/timer';
 import { type ProverClientConfig, createProverClient } from '@aztec/prover-client';
 import { ProverBrokerConfig, createAndStartProvingBroker } from '@aztec/prover-client/broker';
-import { PublicProcessorFactory } from '@aztec/simulator/server';
+import { getLastSiblingPath } from '@aztec/prover-client/helpers';
+import { ChonkCache } from '@aztec/prover-client/orchestrator';
+import { AvmSimulatorPool, PublicProcessorFactory } from '@aztec/simulator/server';
+import type { L2Block } from '@aztec/stdlib/block';
+import { getEpochAtSlot, getSlotRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
+import type { ITxProvider } from '@aztec/stdlib/interfaces/server';
+import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
+import { MerkleTreeId } from '@aztec/stdlib/trees';
+import type { Tx, TxHash } from '@aztec/stdlib/tx';
+import type { GenesisData } from '@aztec/stdlib/world-state';
 import { getTelemetryClient } from '@aztec/telemetry-client';
 import { createWorldState } from '@aztec/world-state';
 
 import { readFileSync } from 'fs';
 
-import { deserializeEpochProvingJobData } from '../job/epoch-proving-job-data.js';
-import { EpochProvingJob } from '../job/epoch-proving-job.js';
+import { CheckpointProver } from '../job/checkpoint-prover.js';
+import { type EpochProvingJobData, deserializeEpochProvingJobData } from '../job/epoch-proving-job-data.js';
+import { EpochSession, type SessionSpec } from '../job/epoch-session.js';
 import { ProverNodeJobMetrics } from '../metrics.js';
 
+type RerunConfig = DataStoreConfig &
+  ProverBrokerConfig &
+  ProverClientConfig &
+  Pick<L1ContractsConfig, 'aztecEpochDuration'>;
+
 /**
  * Given a local folder where `downloadEpochProvingJob` was called, creates a new archiver and world state
- * using the state snapshots, and creates a new epoch proving job to prove the downloaded proving job.
+ * using the state snapshots, and creates a new epoch proving session to prove the downloaded proving job.
  * Proving is done with a local proving broker and agents as specified by the config.
  */
-export async function rerunEpochProvingJob(
+export async function rerunEpochProvingJob(localPath: string, log: Logger, config: RerunConfig, genesis?: GenesisData) {
+  await using ctx = await createRerunContext(localPath, log, config, genesis);
+  const { jobData, prover, metrics } = ctx;
+
+  log.info(`Rerunning epoch proving for epoch ${jobData.epochNumber}`);
+
+  const provers: CheckpointProver[] = [];
+  for (let i = 0; i < jobData.checkpoints.length; i++) {
+    provers.push(await buildCheckpointProver(ctx, i, log));
+  }
+
+  // Local rerun never publishes — stub the service so submit() always resolves 'published'
+  // and withdraw is a no-op.
+  const publishingService = {
+    submit: () => Promise.resolve('published' as const),
+    withdraw: () => {},
+  };
+
+  const l1Constants = { epochDuration: config.aztecEpochDuration };
+  const [fromSlot, toSlot] = getSlotRangeForEpoch(jobData.epochNumber, l1Constants);
+  const spec: SessionSpec = { kind: 'full', epochNumber: jobData.epochNumber, fromSlot, toSlot };
+
+  const session = new EpochSession(spec, provers, {
+    proverFactory: prover,
+    proverId: prover.getProverId(),
+    publishingService,
+    metrics,
+    dateProvider: new DateProvider(),
+    deadline: undefined,
+    config: {},
+    bindings: log.getBindings(),
+  });
+
+  const finalState = await session.start();
+  log.info(`Completed proving for epoch ${jobData.epochNumber} with status ${finalState}`, {
+    derivedEpoch: getEpochAtSlot(provers[0].slotNumber, l1Constants),
+  });
+  return finalState;
+}
+
+/**
+ * Re-proves a single downloaded checkpoint proving job (as uploaded by a `CheckpointProver` failure).
+ * Reconstructs just that checkpoint's sub-tree prover from the snapshot and awaits its block proofs — no
+ * epoch top-tree, no L1 submission — so a checkpoint-level failure can be reproduced offline in isolation.
+ * Returns the block-rollup proof outputs on success; throws if the checkpoint fails to prove again.
+ */
+export async function rerunCheckpointProvingJob(
   localPath: string,
   log: Logger,
-  config: DataStoreConfig & ProverBrokerConfig & ProverClientConfig & Pick<L1ContractsConfig, 'aztecEpochDuration'>,
+  config: RerunConfig,
+  genesis?: GenesisData,
 ) {
+  await using ctx = await createRerunContext(localPath, log, config, genesis);
+  const { jobData } = ctx;
+  const checkpointNumber = jobData.checkpoints[0].number;
+
+  log.info(`Rerunning checkpoint proving for checkpoint ${checkpointNumber} (epoch ${jobData.epochNumber})`);
+
+  const prover = await buildCheckpointProver(ctx, 0, log);
+  try {
+    const blockProofs = await prover.whenBlockProofsReady();
+    log.info(`Completed proving for checkpoint ${checkpointNumber} with ${blockProofs.length} block proof(s)`);
+    return blockProofs;
+  } finally {
+    prover.cancel({ routine: true });
+    await prover.whenDone();
+  }
+}
+
+/** Everything a rerun needs, reconstructed from the downloaded snapshot + job data. */
+type RerunContext = {
+  jobData: EpochProvingJobData;
+  metrics: ProverNodeJobMetrics;
+  worldState: Awaited<ReturnType<typeof createWorldState>>;
+  publicProcessorFactory: PublicProcessorFactory;
+  prover: Awaited<ReturnType<typeof createProverClient>>;
+  chonkCache: ChonkCache;
+  txProvider: ITxProvider;
+} & AsyncDisposable;
+
+/**
+ * Rebuilds the offline proving environment from a downloaded job: world state + archiver from the
+ * snapshots, a local proving broker + client, a chonk cache, and a tx provider that replays the job's txs.
+ */
+async function createRerunContext(
+  localPath: string,
+  log: Logger,
+  config: RerunConfig,
+  genesis?: GenesisData,
+): Promise<RerunContext> {
   const jobData = deserializeEpochProvingJobData(readFileSync(localPath));
   log.info(`Loaded proving job data for epoch ${jobData.epochNumber}`);
 
   const telemetry = getTelemetryClient();
   const metrics = new ProverNodeJobMetrics(telemetry.getMeter('prover-job'), telemetry.getTracer('prover-job'));
-  const worldState = await createWorldState(config);
-  const archiver = await createArchiverStore(config, { epochDuration: config.aztecEpochDuration });
-  const publicProcessorFactory = new PublicProcessorFactory(archiver, undefined, undefined, log.getBindings());
-
-  const publisher = { submitEpochProof: () => Promise.resolve(true) };
-  const l2BlockSourceForReorgDetection = undefined;
-  const deadline = undefined;
-
-  // This starts a local proving broker that does not get exposed as a service. This should be good enough for
-  // smallish epochs to be proven if we run on a large machine, but as epochs grow larger, we may want to switch
-  // this out for a live proving broker with multiple agents that we can connect to.
+  const worldState = await createWorldState(config, genesis);
+  const initialBlockHash = await worldState.getInitialHeader().hash();
+  const archiver = await createArchiverStore(config, initialBlockHash);
+  const avmSimulator = await AvmSimulatorPool.spawn({ wsdbIpcPath: worldState.getIpcPath() });
+  const publicProcessorFactory = new PublicProcessorFactory(
+    createContractDataSource(archiver),
+    avmSimulator,
+    undefined,
+    undefined,
+    log.getBindings(),
+  );
   const broker = await createAndStartProvingBroker(config, telemetry);
   const prover = await createProverClient(config, worldState, broker, telemetry);
+  const chonkCache = new ChonkCache(log.getBindings());
+  const txProvider = makeReplayingTxProvider(jobData.txs);
 
-  const provingJob = new EpochProvingJob(
+  return {
     jobData,
+    metrics,
     worldState,
-    prover.createEpochProver(),
     publicProcessorFactory,
-    publisher,
-    l2BlockSourceForReorgDetection,
-    metrics,
-    deadline,
-    { skipEpochCheck: true },
-    log.getBindings(),
+    prover,
+    chonkCache,
+    txProvider,
+    async [Symbol.asyncDispose]() {
+      await avmSimulator[Symbol.asyncDispose]();
+      await worldState[Symbol.asyncDispose]();
+    },
+  };
+}
+
+/** Reconstructs the `CheckpointProver` for the checkpoint at `index` in the job, ready to prove. */
+async function buildCheckpointProver(ctx: RerunContext, index: number, log: Logger): Promise<CheckpointProver> {
+  const { jobData, worldState, prover, chonkCache, publicProcessorFactory, txProvider, metrics } = ctx;
+  const checkpoint = jobData.checkpoints[index];
+  const previousBlockHeader =
+    index === 0 ? jobData.previousBlockHeader : jobData.checkpoints[index - 1].blocks.at(-1)!.header;
+  const l1ToL2Messages = jobData.l1ToL2Messages[checkpoint.number] ?? [];
+  const previousArchiveSiblingPath = await getLastSiblingPath(
+    MerkleTreeId.ARCHIVE,
+    worldState.getSnapshot(BlockNumber(checkpoint.blocks[0].number - 1)),
   );
+  const attestations = checkpoint.number === jobData.checkpoints.at(-1)!.number ? jobData.attestations : [];
+  return new CheckpointProver(
+    {
+      checkpoint,
+      epochNumber: jobData.epochNumber,
+      attestations,
+      previousBlockHeader,
+      l1ToL2Messages,
+      previousArchiveSiblingPath,
+    },
+    {
+      proverFactory: prover,
+      chonkCache,
+      publicProcessorFactory,
+      dbProvider: worldState,
+      txProvider,
+      dateProvider: new DateProvider(),
+      proverId: prover.getProverId(),
+      metrics,
+      txGatheringTimeoutMs: 120_000,
+      deadline: undefined,
+      log,
+    },
+  );
+}
 
-  log.info(`Rerunning epoch proving job for epoch ${jobData.epochNumber}`);
-  await provingJob.run();
-  log.info(`Completed job for epoch ${jobData.epochNumber} with status ${provingJob.getState()}`);
-  return provingJob.getState();
+/** Build a synthetic ITxProvider that returns the supplied txs map by lookup. */
+function makeReplayingTxProvider(txs: Map<string, Tx>): ITxProvider {
+  const lookup = (hashes: TxHash[]) => {
+    const found: Tx[] = [];
+    const missing: TxHash[] = [];
+    for (const hash of hashes) {
+      const tx = txs.get(hash.toString());
+      if (tx) {
+        found.push(tx);
+      } else {
+        missing.push(hash);
+      }
+    }
+    return { txs: found, missingTxs: missing };
+  };
+  return {
+    getAvailableTxs: hashes => Promise.resolve(lookup(hashes)),
+    hasTxs: hashes => Promise.resolve(hashes.map(h => txs.has(h.toString()))),
+    getTxsForBlockProposal: () => Promise.resolve({ txs: [], missingTxs: [] }),
+    getTxsForBlock: (block: L2Block) => Promise.resolve(lookup(block.body.txEffects.map(e => e.txHash))),
+  };
 }

package/src/actions/upload-epoch-proof-failure.ts

@@ -3,11 +3,11 @@ import { tryRmDir } from '@aztec/foundation/fs';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
 import type { Logger } from '@aztec/foundation/log';
 import { isoDate } from '@aztec/foundation/string';
-import type { DataStoreConfig } from '@aztec/kv-store/config';
 import { buildSnapshotMetadata, createBackups } from '@aztec/node-lib/actions';
 import type { ChainConfig } from '@aztec/stdlib/config';
 import { type FileStore, createFileStore } from '@aztec/stdlib/file-store';
 import type { WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
+import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
 import { type UploadSnapshotMetadata, getBasePath, uploadSnapshotData } from '@aztec/stdlib/snapshots';
 import { WORLD_STATE_DB_VERSION } from '@aztec/world-state';
 

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

@@ -1,5 +1,5 @@
 /* eslint-disable no-console */
-import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
+import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { jsonParseWithSchema, jsonStringify } from '@aztec/foundation/json-rpc';
 import { createLogger } from '@aztec/foundation/log';
@@ -22,8 +22,10 @@ async function rerunFailedEpoch(provingJobUrl: string, baseLocalDir: string) {
   const dataDir = join(localDir, 'state');
 
   const env = getProverNodeConfigFromEnv();
+  const l1Config = getL1ContractsConfigEnvVars();
   const config = {
-    ...getProverNodeConfigFromEnv(),
+    ...env,
+    ...l1Config,
     dataDirectory: dataDir,
     dataStoreMapSizeKb: env.dataStoreMapSizeKb ?? 1024 * 1024,
     proverId: env.proverId ?? EthAddress.random(),
@@ -47,7 +49,7 @@ async function rerunFailedEpoch(provingJobUrl: string, baseLocalDir: string) {
   logger.info(`Rerunning proving job from ${jobPath} with state from ${dataDir}`, metadata);
   const result = await rerunEpochProvingJob(jobPath, logger, {
     ...config,
-    l1Contracts: { rollupAddress: metadata.rollupAddress } as L1ContractAddresses,
+    rollupAddress: metadata.rollupAddress,
     rollupVersion: metadata.rollupVersion,
   });
 

package/src/checkpoint-store.ts

@@ -0,0 +1,212 @@
+import type { BlockNumber, CheckpointNumber, EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import { type Logger, type LoggerBindings, createLogger } from '@aztec/foundation/log';
+import type { L2BlockSource } from '@aztec/stdlib/block';
+import type { Checkpoint } from '@aztec/stdlib/checkpoint';
+import { type L1RollupConstants, getEpochAtSlot, getSlotRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
+
+import {
+  CheckpointProver,
+  type CheckpointProverArgs,
+  type CheckpointProverDeps,
+  type CheckpointProverTestHooks,
+} from './job/checkpoint-prover.js';
+
+/** Register-time data needed to construct a `CheckpointProver` (everything except the checkpoint + epoch). */
+export type RegisterCheckpointData = Omit<CheckpointProverArgs, 'checkpoint' | 'epochNumber'>;
+
+/** Factory used by the store to construct new provers. Tests can inject a stub. */
+export type CheckpointProverFactory = (args: CheckpointProverArgs, deps: CheckpointProverDeps) => CheckpointProver;
+
+/**
+ * Prover-node-wide registry of `CheckpointProver` instances, content-addressed by
+ * `(checkpoint number, slot, checkpoint archive root)`.
+ *
+ * The store survives every epoch / session boundary. A prover lives from its first
+ * `addOrUpdate` call until either:
+ *  - its checkpoint is pruned by an L1 reorg (`cancelAndRemoveAboveBlock`), or
+ *  - its epoch's proof-submission window has closed (`reapExpired`), so the proof could no
+ *    longer be accepted on L1 even if produced.
+ *
+ * A prover's sub-tree work forks world-state per block and does not survive a prune of a base
+ * block, so there is nothing to preserve across a reorg: a pruned prover is cancelled and
+ * dropped, and a re-add (even of identical content) constructs a fresh prover.
+ */
+export class CheckpointStore {
+  private readonly provers = new Map<string, CheckpointProver>();
+  /**
+   * Teardowns of provers already removed from `provers` (by prune or reap), awaited on `stop()`.
+   * Keyed by a monotonic id rather than the prover's content id: a prune-then-re-add can leave two
+   * teardowns for the same content id in flight at once, which a content-id key would clobber.
+   */
+  private readonly pendingTeardowns = new Map<number, Promise<void>>();
+  private nextTeardownId = 0;
+  /** Test-only hooks injected into every prover this store constructs. */
+  private testHooks: CheckpointProverTestHooks = {};
+  private readonly log: Logger;
+
+  constructor(
+    private readonly l2BlockSource: Pick<L2BlockSource, 'getL1Constants'>,
+    private readonly proverDeps: Omit<CheckpointProverDeps, 'log'>,
+    bindings?: LoggerBindings,
+    private readonly proverFactoryFn: CheckpointProverFactory = (args, deps) => new CheckpointProver(args, deps),
+  ) {
+    this.log = createLogger('prover-node:checkpoint-store', bindings);
+  }
+
+  public start(): Promise<void> {
+    return Promise.resolve();
+  }
+
+  public async stop(): Promise<void> {
+    // Cancel every live prover, then await both their teardown and any still in flight for provers
+    // already removed by a prune or reap.
+    const provers = Array.from(this.provers.values());
+    this.provers.clear();
+    for (const prover of provers) {
+      prover.cancel();
+    }
+    await Promise.allSettled([...provers.map(p => p.whenDone()), ...this.pendingTeardowns.values()]);
+  }
+
+  /**
+   * Tracks the teardown of a prover just removed from the store so `stop()` can await it. The entry
+   * removes itself once teardown settles, so the map stays bounded by the number in flight.
+   */
+  private trackTeardown(prover: CheckpointProver): void {
+    const id = this.nextTeardownId++;
+    const done = prover.whenDone();
+    this.pendingTeardowns.set(id, done);
+    void done.finally(() => this.pendingTeardowns.delete(id));
+  }
+
+  /**
+   * Registers a checkpoint with the store. If a prover already exists for the
+   * `(number, slot, archive root)` content key it is reused (an at-least-once re-registration of
+   * still-canonical content); otherwise a new prover is constructed.
+   */
+  public async addOrUpdate(checkpoint: Checkpoint, data: RegisterCheckpointData): Promise<CheckpointProver> {
+    const l1Constants = await this.l2BlockSource.getL1Constants();
+    const epochNumber = getEpochAtSlot(checkpoint.header.slotNumber, l1Constants);
+    const id = CheckpointProver.idFor(checkpoint);
+
+    const existing = this.provers.get(id);
+    if (existing) {
+      return existing;
+    }
+
+    // At most one canonical checkpoint per slot. A different checkpoint at the same slot means the
+    // caller forgot to prune the old chain before adding the replacement — surface it rather than
+    // silently creating a parallel canonical chain. A pruned checkpoint has already been removed,
+    // so every prover still in the store is canonical.
+    for (const prover of this.provers.values()) {
+      if (prover.slotNumber === checkpoint.header.slotNumber) {
+        throw new Error(
+          `Cannot add checkpoint ${checkpoint.number} (archive ${checkpoint.archive.root}) at slot ${checkpoint.header.slotNumber}: ` +
+            `a different checkpoint already occupies this slot. Prune it first.`,
+        );
+      }
+    }
+
+    const prover = this.proverFactoryFn(
+      { ...data, checkpoint, epochNumber },
+      { ...this.proverDeps, checkpointProveOverride: this.testHooks.checkpointProveOverride, log: this.log },
+    );
+    this.provers.set(id, prover);
+    return prover;
+  }
+
+  /**
+   * Installs test-only hooks applied to every prover constructed from now on. Used by the e2e harness to
+   * force a checkpoint sub-tree failure without monkey-patching the prover factory.
+   */
+  public setTestHooks(hooks: CheckpointProverTestHooks): void {
+    this.testHooks = hooks;
+  }
+
+  /**
+   * Cancels and removes every prover that holds a block above the prune target. A checkpoint is orphaned by a prune to
+   * block `targetBlockNumber` iff its last block sits above the target — including a checkpoint whose range straddles
+   * the target (partially orphaned), which block-range marking catches without boundary ambiguity. Keying off the
+   * surviving block number (rather than a checkpoint number) is correct even when the source has already
+   * re-checkpointed past the divergence: the prune event reports the highest surviving block, which by construction
+   * survives on the source, whereas the source's current checkpointed tip can sit above the prune target.
+   *
+   * The prover's in-flight sub-tree work forks world-state per block and faults once its base block is pruned, so it
+   * cannot be reused; it is cancelled (aborting the fork reads) and dropped. A subsequent re-add constructs a fresh
+   * prover. Returns the removed provers.
+   */
+  public cancelAndRemoveAboveBlock(targetBlockNumber: BlockNumber): CheckpointProver[] {
+    const affected: CheckpointProver[] = [];
+    for (const [id, prover] of Array.from(this.provers.entries())) {
+      const lastBlockNumber = prover.checkpoint.blocks.at(-1)!.number;
+      if (lastBlockNumber > targetBlockNumber) {
+        prover.cancel();
+        this.trackTeardown(prover);
+        this.provers.delete(id);
+        affected.push(prover);
+      }
+    }
+    return affected;
+  }
+
+  /**
+   * Drops provers whose epoch is at or below the supplied expired epoch. Once an epoch's
+   * proof-submission window has closed, its proof can no longer be accepted on L1, so the
+   * prover is no longer needed.
+   */
+  public reapExpired(expiredEpoch: EpochNumber): void {
+    const reaped: { id: string; checkpointNumber: CheckpointNumber; epochNumber: EpochNumber }[] = [];
+    for (const [id, prover] of Array.from(this.provers.entries())) {
+      if (prover.epochNumber <= expiredEpoch) {
+        reaped.push({ id, checkpointNumber: prover.checkpoint.number, epochNumber: prover.epochNumber });
+        prover.cancel({ routine: true });
+        this.trackTeardown(prover);
+        this.provers.delete(id);
+      }
+    }
+    if (reaped.length > 0) {
+      this.log.info(`Reaped ${reaped.length} expired CheckpointProver(s) for expiredEpoch ${expiredEpoch}`, {
+        expiredEpoch,
+        reapedCount: reaped.length,
+        reaped,
+      });
+    }
+  }
+
+  /** Returns the prover with the supplied id, or undefined. */
+  public get(id: string): CheckpointProver | undefined {
+    return this.provers.get(id);
+  }
+
+  /** Returns the prover for the supplied checkpoint (by its content-addressed id), or undefined. */
+  public getByCheckpoint(checkpoint: Checkpoint): CheckpointProver | undefined {
+    return this.provers.get(CheckpointProver.idFor(checkpoint));
+  }
+
+  /** Every prover currently in the store, in insertion order. */
+  public listAll(): CheckpointProver[] {
+    return Array.from(this.provers.values());
+  }
+
+  /** Provers in the store, sorted by checkpoint number. */
+  public list(): CheckpointProver[] {
+    return Array.from(this.provers.values()).sort((a, b) => a.checkpoint.number - b.checkpoint.number);
+  }
+
+  /**
+   * Provers whose slot is in the supplied epoch's slot range, sorted by checkpoint number.
+   */
+  public async listForEpoch(epoch: EpochNumber): Promise<CheckpointProver[]> {
+    const l1Constants = await this.l2BlockSource.getL1Constants();
+    const [fromSlot, toSlot] = getSlotRangeForEpoch(epoch, l1Constants);
+    return this.listInSlotRange(fromSlot, toSlot);
+  }
+
+  /** Provers whose slot falls within `[fromSlot, toSlot]`, sorted by checkpoint number. */
+  public listInSlotRange(fromSlot: SlotNumber, toSlot: SlotNumber): CheckpointProver[] {
+    return this.list().filter(p => p.slotNumber >= fromSlot && p.slotNumber <= toSlot);
+  }
+}
+
+/** Sub-set of `L1RollupConstants` actually consumed by the store's slot helpers. */
+export type CheckpointStoreL1Constants = Pick<L1RollupConstants, 'epochDuration'>;

package/src/config.ts

@@ -1,18 +1,16 @@
-import { type ArchiverConfig, archiverConfigMappings } from '@aztec/archiver/config';
 import type { ACVMConfig, BBConfig } from '@aztec/bb-prover/config';
-import { type GenesisStateConfig, genesisStateConfigMappings } from '@aztec/ethereum/config';
 import {
   type ConfigMappingsType,
   booleanConfigHelper,
   getConfigFromMappings,
   numberConfigHelper,
+  pickConfigMappings,
 } from '@aztec/foundation/config';
-import { type DataStoreConfig, dataConfigMappings } from '@aztec/kv-store/config';
+import { EthAddress } from '@aztec/foundation/eth-address';
 import { type KeyStoreConfig, keyStoreConfigMappings } from '@aztec/node-keystore/config';
 import { ethPrivateKeySchema } from '@aztec/node-keystore/schemas';
 import type { KeyStore } from '@aztec/node-keystore/types';
 import { type SharedNodeConfig, sharedNodeConfigMappings } from '@aztec/node-lib/config';
-import { type P2PConfig, p2pConfigMappings } from '@aztec/p2p/config';
 import {
   type ProverAgentConfig,
   type ProverBrokerConfig,
@@ -21,24 +19,20 @@ import {
 } from '@aztec/prover-client/broker/config';
 import { type ProverClientUserConfig, bbConfigMappings, proverClientConfigMappings } from '@aztec/prover-client/config';
 import {
-  type PublisherConfig,
-  type TxSenderConfig,
-  getPublisherConfigMappings,
-  getTxSenderConfigMappings,
+  type ProverPublisherConfig,
+  type ProverTxSenderConfig,
+  proverPublisherConfigMappings,
+  proverTxSenderConfigMappings,
 } from '@aztec/sequencer-client/config';
-import { type WorldStateConfig, worldStateConfigMappings } from '@aztec/world-state/config';
-
-export type ProverNodeConfig = ArchiverConfig &
-  ProverClientUserConfig &
-  P2PConfig &
-  WorldStateConfig &
-  PublisherConfig &
-  TxSenderConfig &
+import { type DataStoreConfig, dataConfigMappings } from '@aztec/stdlib/kv-store';
+
+export type ProverNodeConfig = ProverClientUserConfig &
+  ProverPublisherConfig &
+  ProverTxSenderConfig &
   DataStoreConfig &
   KeyStoreConfig &
-  SharedNodeConfig &
   SpecificProverNodeConfig &
-  GenesisStateConfig;
+  Pick<SharedNodeConfig, 'web3SignerUrl'>;
 
 export type SpecificProverNodeConfig = {
   proverNodeMaxPendingJobs: number;
@@ -51,9 +45,10 @@ export type SpecificProverNodeConfig = {
   txGatheringIntervalMs: number;
   txGatheringBatchSize: number;
   txGatheringMaxParallelRequestsPerNode: number;
+  proofSubmissionTargetAddress?: EthAddress;
 };
 
-const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeConfig> = {
+export const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeConfig> = {
   proverNodeMaxPendingJobs: {
     env: 'PROVER_NODE_MAX_PENDING_JOBS',
     description: 'The maximum number of pending jobs for the prover node',
@@ -67,7 +62,7 @@ const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeCon
   proverNodeMaxParallelBlocksPerEpoch: {
     env: 'PROVER_NODE_MAX_PARALLEL_BLOCKS_PER_EPOCH',
     description: 'The Maximum number of blocks to process in parallel while proving an epoch',
-    ...numberConfigHelper(32),
+    ...numberConfigHelper(0),
   },
   proverNodeFailedEpochStore: {
     env: 'PROVER_NODE_FAILED_EPOCH_STORE',
@@ -75,7 +70,8 @@ const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeCon
     defaultValue: undefined,
   },
   proverNodeEpochProvingDelayMs: {
-    description: 'Optional delay in milliseconds to wait before proving a new epoch',
+    description:
+      'Optional delay in milliseconds to wait for late-arriving events (e.g. reorgs) to settle before starting top-tree proving for an epoch',
     defaultValue: undefined,
   },
   txGatheringIntervalMs: {
@@ -103,20 +99,24 @@ const specificProverNodeConfigMappings: ConfigMappingsType<SpecificProverNodeCon
     description: 'Whether the prover node skips publishing proofs to L1',
     ...booleanConfigHelper(false),
   },
+  proofSubmissionTargetAddress: {
+    env: 'PROVER_NODE_PROOF_SUBMISSION_TARGET_ADDRESS',
+    description:
+      'Optional L1 address the submitEpochRootProof tx is sent to. Must expose the identical submitEpochRootProof ABI ' +
+      'and forward to the rollup. Defaults to the rollup address.',
+    parseEnv: (val: string) => EthAddress.fromString(val),
+    defaultValue: undefined,
+  },
 };
 
 export const proverNodeConfigMappings: ConfigMappingsType<ProverNodeConfig> = {
   ...dataConfigMappings,
   ...keyStoreConfigMappings,
-  ...archiverConfigMappings,
   ...proverClientConfigMappings,
-  ...p2pConfigMappings,
-  ...worldStateConfigMappings,
-  ...getPublisherConfigMappings('PROVER'),
-  ...getTxSenderConfigMappings('PROVER'),
+  ...proverPublisherConfigMappings,
+  ...proverTxSenderConfigMappings,
   ...specificProverNodeConfigMappings,
-  ...genesisStateConfigMappings,
-  ...sharedNodeConfigMappings,
+  ...pickConfigMappings(sharedNodeConfigMappings, ['web3SignerUrl']),
 };
 
 export function getProverNodeConfigFromEnv(): ProverNodeConfig {
@@ -143,7 +143,7 @@ function createKeyStoreFromWeb3Signer(config: ProverNodeConfig): KeyStore | unde
   }
 
   // Also, we need at least one publisher address.
-  const publishers = config.publisherAddresses ?? [];
+  const publishers = config.proverPublisherAddresses ?? [];
 
   if (publishers.length === 0) {
     return undefined;
@@ -164,8 +164,8 @@ function createKeyStoreFromWeb3Signer(config: ProverNodeConfig): KeyStore | unde
 
 function createKeyStoreFromPublisherKeys(config: ProverNodeConfig): KeyStore | undefined {
   // Extract the publisher keys from the provided config.
-  const publisherKeys = config.publisherPrivateKeys
-    ? config.publisherPrivateKeys.map((k: { getValue: () => string }) => ethPrivateKeySchema.parse(k.getValue()))
+  const publisherKeys = config.proverPublisherPrivateKeys
+    ? config.proverPublisherPrivateKeys.map((k: { getValue: () => string }) => ethPrivateKeySchema.parse(k.getValue()))
     : [];
 
   // There must be at least 1.
@@ -194,7 +194,10 @@ function createKeyStoreFromPublisherKeys(config: ProverNodeConfig): KeyStore | u
 
 export function createKeyStoreForProver(config: ProverNodeConfig): KeyStore | undefined {
   if (config.web3SignerUrl !== undefined && config.web3SignerUrl.length > 0) {
-    return createKeyStoreFromWeb3Signer(config);
+    const keyStore = createKeyStoreFromWeb3Signer(config);
+    if (keyStore) {
+      return keyStore;
+    }
   }
 
   return createKeyStoreFromPublisherKeys(config);