@aztec/aztec-node 5.0.0-private.20260318 → 5.0.0-rc.1

package/src/aztec-node/server.ts

@@ -1,5 +1,6 @@
-import { Archiver, createArchiver } from '@aztec/archiver';
-import { BBCircuitVerifier, QueuedIVCVerifier, TestCircuitVerifier } from '@aztec/bb-prover';
+import { Archiver, L1ToL2MessagesNotReadyError, createArchiver } from '@aztec/archiver';
+import { BBCircuitVerifier, BatchChonkVerifier, QueuedIVCVerifier } from '@aztec/bb-prover';
+import { TestCircuitVerifier } from '@aztec/bb-prover/test';
 import { type BlobClientInterface, createBlobClientWithFileStores } from '@aztec/blob-client/client';
 import { Blob } from '@aztec/blob-lib';
 import { ARCHIVE_HEIGHT, type L1_TO_L2_MSG_TREE_HEIGHT, type NOTE_HASH_TREE_HEIGHT } from '@aztec/constants';
@@ -7,16 +8,25 @@ import { EpochCache, type EpochCacheInterface } from '@aztec/epoch-cache';
 import { createEthereumChain } from '@aztec/ethereum/chain';
 import { getPublicClient, makeL1HttpTransport } from '@aztec/ethereum/client';
 import { RegistryContract, RollupContract } from '@aztec/ethereum/contracts';
-import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
-import { BlockNumber, CheckpointNumber, EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import { type L1ContractAddresses, pickL1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
+import type { L1TxUtils } from '@aztec/ethereum/l1-tx-utils';
+import {
+  BlockNumber,
+  CheckpointNumber,
+  type CheckpointProposalHash,
+  EpochNumber,
+  SlotNumber,
+} from '@aztec/foundation/branded-types';
 import { chunkBy, compactArray, pick, unique } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { BadRequestError } from '@aztec/foundation/json-rpc';
 import { type Logger, createLogger } from '@aztec/foundation/log';
+import { retryUntil } from '@aztec/foundation/retry';
 import { count } from '@aztec/foundation/string';
 import { DateProvider, Timer } from '@aztec/foundation/timer';
 import { MembershipWitness, SiblingPath } from '@aztec/foundation/trees';
+import { isErrorClass } from '@aztec/foundation/types';
 import { type KeyStore, KeystoreManager, loadKeystores, mergeKeystores } from '@aztec/node-keystore';
 import { trySnapshotSync, uploadSnapshot } from '@aztec/node-lib/actions';
 import { createForwarderL1TxUtilsFromSigners, createL1TxUtilsFromSigners } from '@aztec/node-lib/factories';
@@ -30,26 +40,46 @@ import {
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { type ProverNode, type ProverNodeDeps, createProverNode } from '@aztec/prover-node';
 import { createKeyStoreForProver } from '@aztec/prover-node/config';
-import { GlobalVariableBuilder, SequencerClient, type SequencerPublisher } from '@aztec/sequencer-client';
-import { PublicProcessorFactory } from '@aztec/simulator/server';
+import {
+  FeeProviderImpl,
+  GlobalVariableBuilder,
+  SequencerClient,
+  type SequencerPublisher,
+} from '@aztec/sequencer-client';
+import { AutomineSequencer, createAutomineSequencer } from '@aztec/sequencer-client/automine';
+import { PublicContractsDB, PublicProcessorFactory } from '@aztec/simulator/server';
 import {
   AttestationsBlockWatcher,
-  EpochPruneWatcher,
+  AttestedInvalidProposalWatcher,
+  BroadcastedInvalidCheckpointProposalWatcher,
+  CheckpointEquivocationWatcher,
+  DataWithholdingWatcher,
   type SlasherClientInterface,
   type Watcher,
   createSlasher,
 } from '@aztec/slasher';
+import { STANDARD_MULTI_CALL_ENTRYPOINT_ADDRESS } from '@aztec/standard-contracts/multi-call-entrypoint';
 import { CollectionLimitsConfig, PublicSimulatorConfig } from '@aztec/stdlib/avm';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import {
   type BlockData,
   BlockHash,
   type BlockParameter,
+  BlockTag,
+  type CheckpointsQuery,
+  type CommitteeAttestation,
   type DataInBlock,
-  L2Block,
   type L2BlockSource,
+  type L2Tips,
+  type NormalizedBlockParameter,
+  inspectBlockParameter,
 } from '@aztec/stdlib/block';
-import type { PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
+import {
+  type CheckpointData,
+  CheckpointReexecutionTracker,
+  L1PublishedData,
+  type PublishedCheckpoint,
+} from '@aztec/stdlib/checkpoint';
 import type {
   ContractClassPublic,
   ContractDataSource,
@@ -57,16 +87,27 @@ import type {
   NodeInfo,
   ProtocolContractAddresses,
 } from '@aztec/stdlib/contract';
-import { GasFees } from '@aztec/stdlib/gas';
+import { getEpochAtSlot } from '@aztec/stdlib/epoch-helpers';
+import { GasFees, type ManaUsageEstimate, getNetworkTxGasLimits } from '@aztec/stdlib/gas';
 import { computePublicDataTreeLeafSlot } from '@aztec/stdlib/hash';
-import {
-  type AztecNode,
-  type AztecNodeAdmin,
-  type AztecNodeAdminConfig,
-  AztecNodeAdminConfigSchema,
-  type GetContractClassLogsResponse,
-  type GetPublicLogsResponse,
+import type {
+  AztecNode,
+  AztecNodeAdmin,
+  AztecNodeAdminConfig,
+  AztecNodeDebug,
+  BlockIncludeOptions,
+  BlockResponse,
+  BlocksIncludeOptions,
+  ChainTip,
+  ChainTips,
+  CheckpointIncludeOptions,
+  CheckpointParameter,
+  CheckpointResponse,
+  GetTxByHashOptions,
+  PeerInfo,
+  ProposalsForSlot,
 } from '@aztec/stdlib/interfaces/client';
+import { AztecNodeAdminConfigSchema } from '@aztec/stdlib/interfaces/client';
 import {
   type AllowedElement,
   type ClientProtocolCircuitVerifier,
@@ -76,25 +117,39 @@ import {
   type WorldStateSynchronizer,
   tryStop,
 } from '@aztec/stdlib/interfaces/server';
-import type { DebugLogStore, LogFilter, SiloedTag, Tag, TxScopedL2Log } from '@aztec/stdlib/logs';
+import type { DebugLogStore, LogResult, PrivateLogsQuery, PublicLogsQuery } from '@aztec/stdlib/logs';
 import { InMemoryDebugLogStore, NullDebugLogStore } from '@aztec/stdlib/logs';
-import { InboxLeaf, type L1ToL2MessageSource } from '@aztec/stdlib/messaging';
-import type { Offense, SlashPayloadRound } from '@aztec/stdlib/slashing';
-import type { NullifierLeafPreimage, PublicDataTreeLeaf, PublicDataTreeLeafPreimage } from '@aztec/stdlib/trees';
+import {
+  InboxLeaf,
+  type L1ToL2MessageSource,
+  type L2ToL1MembershipWitness,
+  appendL1ToL2MessagesToTree,
+} from '@aztec/stdlib/messaging';
+import type { CheckpointAttestation } from '@aztec/stdlib/p2p';
+import type { Offense } from '@aztec/stdlib/slashing';
+import type { NullifierLeafPreimage, PublicDataTreeLeafPreimage } from '@aztec/stdlib/trees';
 import { MerkleTreeId, NullifierMembershipWitness, PublicDataWitness } from '@aztec/stdlib/trees';
 import {
-  type BlockHeader,
+  DroppedTxReceipt,
+  type FeeProvider,
+  type GetTxReceiptOptions,
   type GlobalVariableBuilder as GlobalVariableBuilderInterface,
+  GlobalVariables,
   type IndexedTxEffect,
+  MinedTxReceipt,
+  type MinedTxStatus,
+  PendingTxReceipt,
   PublicSimulationOutput,
+  type SimulationOverrides,
   Tx,
   type TxHash,
-  TxReceipt,
+  type TxReceipt,
   TxStatus,
   type TxValidationResult,
 } from '@aztec/stdlib/tx';
 import { getPackageVersion } from '@aztec/stdlib/update-checker';
 import type { SingleValidatorStats, ValidatorsStats } from '@aztec/stdlib/validators';
+import type { GenesisData } from '@aztec/stdlib/world-state';
 import {
   Attributes,
   type TelemetryClient,
@@ -108,27 +163,36 @@ import {
   FullNodeCheckpointsBuilder,
   NodeKeystoreAdapter,
   ValidatorClient,
-  createBlockProposalHandler,
+  createProposalHandler,
   createValidatorClient,
 } from '@aztec/validator-client';
-import { createWorldStateSynchronizer } from '@aztec/world-state';
+import type { SlashingProtectionDatabase } from '@aztec/validator-ha-signer/types';
+import { createWorldState, createWorldStateSynchronizer } from '@aztec/world-state';
 
 import { createPublicClient } from 'viem';
 
 import { createSentinel } from '../sentinel/factory.js';
 import { Sentinel } from '../sentinel/sentinel.js';
+import {
+  blockResponseFromBlockData,
+  blockResponseFromL2Block,
+  checkpointResponseFromCheckpointData,
+  checkpointResponseFromPublishedCheckpoint,
+  projectProposedToCheckpointResponse,
+} from './block_response_helpers.js';
 import { type AztecNodeConfig, createKeyStoreForValidator } from './config.js';
 import { NodeMetrics } from './node_metrics.js';
+import { applyPublicDataOverrides } from './public_data_overrides.js';
 
 /**
  * The aztec node.
  */
-export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
+export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDebug, Traceable {
   private metrics: NodeMetrics;
-  private initialHeaderHashPromise: Promise<BlockHash> | undefined = undefined;
-
   // Prevent two snapshot operations to happen simultaneously
   private isUploadingSnapshot = false;
+  // Saved minTxsPerBlock used by `pauseSequencer` to restore production-sequencer config on resume.
+  private sequencerPausedMinTxsPerBlock: number | undefined;
 
   public readonly tracer: Tracer;
 
@@ -144,25 +208,28 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
     protected readonly proverNode: ProverNode | undefined,
     protected readonly slasherClient: SlasherClientInterface | undefined,
     protected readonly validatorsSentinel: Sentinel | undefined,
-    protected readonly epochPruneWatcher: EpochPruneWatcher | undefined,
+    private readonly stopStartedWatchers: () => Promise<void>,
     protected readonly l1ChainId: number,
     protected readonly version: number,
     protected readonly globalVariableBuilder: GlobalVariableBuilderInterface,
+    protected readonly feeProvider: FeeProvider,
     protected readonly epochCache: EpochCacheInterface,
     protected readonly packageVersion: string,
-    private proofVerifier: ClientProtocolCircuitVerifier,
+    private peerProofVerifier: ClientProtocolCircuitVerifier,
+    private rpcProofVerifier: ClientProtocolCircuitVerifier,
     private telemetry: TelemetryClient = getTelemetryClient(),
     private log = createLogger('node'),
     private blobClient?: BlobClientInterface,
     private validatorClient?: ValidatorClient,
     private keyStoreManager?: KeystoreManager,
     private debugLogStore: DebugLogStore = new NullDebugLogStore(),
+    private readonly automineSequencer?: AutomineSequencer,
   ) {
     this.metrics = new NodeMetrics(telemetry, 'AztecNodeService');
     this.tracer = telemetry.getTracer('AztecNodeService');
 
     this.log.info(`Aztec Node version: ${this.packageVersion}`);
-    this.log.info(`Aztec Node started on chain 0x${l1ChainId.toString(16)}`, config.l1Contracts);
+    this.log.info(`Aztec Node started on chain 0x${l1ChainId.toString(16)}`, pickL1ContractAddresses(config));
 
     // A defensive check that protects us against introducing a bug in the complex `createAndSync` function. We must
     // never have debugLogStore enabled when not in test mode because then we would be accumulating debug logs in
@@ -172,13 +239,264 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
     }
   }
 
+  /** @internal Exposed for testing — returns the RPC proof verifier. */
+  public getProofVerifier(): ClientProtocolCircuitVerifier {
+    return this.rpcProofVerifier;
+  }
+
   public async getWorldStateSyncStatus(): Promise<WorldStateSyncStatus> {
     const status = await this.worldStateSynchronizer.status();
     return status.syncSummary;
   }
 
-  public getL2Tips() {
-    return this.blockSource.getL2Tips();
+  public async getChainTips(): Promise<ChainTips> {
+    const { proposed, checkpointed, proven, finalized } = await this.blockSource.getL2Tips();
+    return { proposed, checkpointed, proven, finalized };
+  }
+
+  public getL1Constants() {
+    return this.blockSource.getL1Constants();
+  }
+
+  public getSyncedL2SlotNumber() {
+    return this.blockSource.getSyncedL2SlotNumber();
+  }
+
+  public getSyncedL2EpochNumber() {
+    return this.blockSource.getSyncedL2EpochNumber();
+  }
+
+  public getSyncedL1Timestamp() {
+    return this.blockSource.getL1Timestamp();
+  }
+
+  public getCheckpointsData(query: CheckpointsQuery) {
+    return this.blockSource.getCheckpointsData(query);
+  }
+
+  public async getBlockNumber(tip?: ChainTip): Promise<BlockNumber> {
+    if (tip === undefined || tip === 'proposed') {
+      return this.blockSource.getBlockNumber();
+    }
+    return (await this.blockSource.getBlockNumber({ tag: tip })) ?? BlockNumber.ZERO;
+  }
+
+  public async getCheckpointNumber(tip?: ChainTip): Promise<CheckpointNumber> {
+    const tips = await this.blockSource.getL2Tips();
+    switch (tip) {
+      case undefined:
+      case 'checkpointed':
+        return tips.checkpointed.checkpoint.number;
+      case 'proposed':
+        return tips.proposedCheckpoint.checkpoint.number;
+      case 'proven':
+        return tips.proven.checkpoint.number;
+      case 'finalized':
+        return tips.finalized.checkpoint.number;
+    }
+  }
+
+  private isChainTip(value: unknown): value is ChainTip {
+    return value === 'proposed' || value === 'checkpointed' || value === 'proven' || value === 'finalized';
+  }
+
+  /**
+   * Normalizes a {@link BlockParameter} (which may be a bare value) into a
+   * {@link NormalizedBlockParameter} object form. Performs no chain-tip resolution — tag
+   * lookups are deferred to the underlying block source.
+   */
+  private normalizeBlockParameter(param: BlockParameter): NormalizedBlockParameter {
+    if (BlockHash.isBlockHash(param)) {
+      return { hash: param };
+    }
+    if (typeof param === 'number') {
+      return { number: param as BlockNumber };
+    }
+    if (typeof param === 'string') {
+      if (this.isBlockTag(param)) {
+        return { tag: param === 'latest' ? 'proposed' : param };
+      }
+      throw new BadRequestError(`Invalid BlockParameter tag: ${param}`);
+    }
+    if (typeof param === 'object' && param !== null) {
+      if ('number' in param) {
+        return { number: param.number };
+      }
+      if ('hash' in param) {
+        return { hash: param.hash };
+      }
+      if ('archive' in param) {
+        return { archive: param.archive };
+      }
+      if ('tag' in param) {
+        if (this.isBlockTag(param.tag)) {
+          return { tag: param.tag };
+        }
+        throw new BadRequestError(`Invalid BlockParameter tag: ${param.tag}`);
+      }
+    }
+    throw new BadRequestError(`Invalid BlockParameter: ${JSON.stringify(param)}`);
+  }
+
+  private isBlockTag(value: string): value is BlockTag {
+    return BlockTag.includes(value as BlockTag);
+  }
+
+  /**
+   * Resolves a {@link CheckpointParameter} into a concrete `{ number }` or `{ slot }` query.
+   *
+   * Tag-based parameters (`'proposed'`, `'checkpointed'`, `'proven'`, `'finalized'`) are
+   * translated up-front to the corresponding tip's checkpoint number via {@link L2BlockSource.getL2Tips}.
+   * After resolution the unified {@link getCheckpoint} flow can perform a single
+   * confirmed→proposed lookup against either store.
+   */
+  private async resolveCheckpointParameter(
+    param: CheckpointParameter,
+  ): Promise<{ number: CheckpointNumber } | { slot: SlotNumber }> {
+    if (typeof param === 'number') {
+      return { number: param as CheckpointNumber };
+    }
+    if (this.isChainTip(param)) {
+      const tips = await this.blockSource.getL2Tips();
+      switch (param) {
+        case 'proposed':
+          return { number: tips.proposedCheckpoint.checkpoint.number };
+        case 'checkpointed':
+          return { number: tips.checkpointed.checkpoint.number };
+        case 'proven':
+          return { number: tips.proven.checkpoint.number };
+        case 'finalized':
+          return { number: tips.finalized.checkpoint.number };
+      }
+    }
+    if (typeof param === 'object' && param !== null) {
+      if ('number' in param) {
+        return { number: param.number };
+      }
+      if ('slot' in param) {
+        return { slot: param.slot };
+      }
+    }
+    throw new BadRequestError(`Invalid CheckpointParameter: ${JSON.stringify(param)}`);
+  }
+
+  /** Fetches checkpoint-level L1 and attestation data for use as block response context. */
+  async #getCheckpointContext(
+    checkpointNumber: CheckpointNumber,
+  ): Promise<{ l1?: L1PublishedData; attestations?: CommitteeAttestation[] } | undefined> {
+    const checkpoint = await this.blockSource.getCheckpointData({ number: checkpointNumber });
+    if (!checkpoint) {
+      return undefined;
+    }
+    return { l1: checkpoint.l1, attestations: checkpoint.attestations };
+  }
+
+  public async getBlock<Opts extends BlockIncludeOptions = {}>(
+    param: BlockParameter,
+    options: Opts = {} as Opts,
+  ): Promise<BlockResponse<Opts> | undefined> {
+    const query = this.normalizeBlockParameter(param);
+    const wantTxs = !!options.includeTransactions;
+    const wantContext = !!options.includeL1PublishInfo || !!options.includeAttestations;
+
+    if (wantTxs) {
+      const block = await this.blockSource.getBlock(query);
+      if (!block) {
+        return undefined;
+      }
+      const ctx = wantContext ? await this.#getCheckpointContext(block.checkpointNumber) : undefined;
+      return (await blockResponseFromL2Block(block, options, ctx)) as BlockResponse<Opts>;
+    }
+    const data = await this.blockSource.getBlockData(query);
+    if (!data) {
+      return undefined;
+    }
+    const ctx = wantContext ? await this.#getCheckpointContext(data.checkpointNumber) : undefined;
+    return blockResponseFromBlockData(data, options, ctx) as BlockResponse<Opts>;
+  }
+
+  public getBlockData(param: BlockParameter): Promise<BlockData | undefined> {
+    const query = this.normalizeBlockParameter(param);
+    return this.blockSource.getBlockData(query);
+  }
+
+  public async getBlocks<Opts extends BlocksIncludeOptions = {}>(
+    from: BlockNumber,
+    limit: number,
+    options: Opts = {} as Opts,
+  ): Promise<BlockResponse<Opts>[]> {
+    const wantTxs = !!options.includeTransactions;
+    const wantContext = !!options.includeL1PublishInfo || !!options.includeAttestations;
+    const onlyCheckpointed = !!options.onlyCheckpointed;
+    if (wantTxs) {
+      const blocks = await this.blockSource.getBlocks({ from, limit, onlyCheckpointed });
+      const ctxByCheckpoint = await this.#getCheckpointContextsForBlocks(wantContext ? blocks : []);
+      return (await Promise.all(
+        blocks.map(block => blockResponseFromL2Block(block, options, ctxByCheckpoint.get(block.checkpointNumber))),
+      )) as BlockResponse<Opts>[];
+    }
+    const dataItems = await this.blockSource.getBlocksData({ from, limit, onlyCheckpointed });
+    const ctxByCheckpoint = await this.#getCheckpointContextsForBlocks(wantContext ? dataItems : []);
+    return (await Promise.all(
+      dataItems.map(data => blockResponseFromBlockData(data, options, ctxByCheckpoint.get(data.checkpointNumber))),
+    )) as BlockResponse<Opts>[];
+  }
+
+  /** Fetches checkpoint context for a set of blocks, deduplicating shared checkpoints. */
+  async #getCheckpointContextsForBlocks(
+    blocks: { checkpointNumber: CheckpointNumber }[],
+  ): Promise<Map<CheckpointNumber, { l1?: L1PublishedData; attestations?: CommitteeAttestation[] } | undefined>> {
+    const unique = Array.from(new Set(blocks.map(b => b.checkpointNumber)));
+    const entries = await Promise.all(unique.map(async n => [n, await this.#getCheckpointContext(n)] as const));
+    return new Map(entries);
+  }
+
+  public async getCheckpoint<Opts extends CheckpointIncludeOptions = {}>(
+    param: CheckpointParameter,
+    options: Opts = {} as Opts,
+  ): Promise<CheckpointResponse<Opts> | undefined> {
+    const query = await this.resolveCheckpointParameter(param);
+
+    // Try the confirmed store first.
+    const confirmed = options.includeBlocks
+      ? await this.blockSource.getCheckpoint(query)
+      : await this.blockSource.getCheckpointData(query);
+    if (confirmed) {
+      return (await (options.includeBlocks
+        ? checkpointResponseFromPublishedCheckpoint(confirmed as PublishedCheckpoint, options)
+        : checkpointResponseFromCheckpointData(confirmed as CheckpointData, options))) as CheckpointResponse<Opts>;
+    }
+
+    // Fall back to the proposed store.
+    const proposed = await this.blockSource.getProposedCheckpointData(query);
+    if (proposed) {
+      if (options.includeAttestations || options.includeL1PublishInfo) {
+        throw new BadRequestError(
+          `Options includeL1PublishInfo or includeAttestations cannot be satisfied for a proposed checkpoint`,
+        );
+      }
+      const blocks = options.includeBlocks
+        ? await this.blockSource.getBlocks({ from: proposed.startBlock, limit: proposed.blockCount })
+        : undefined;
+      return (await projectProposedToCheckpointResponse(proposed, options, blocks)) as CheckpointResponse<Opts>;
+    }
+
+    return undefined;
+  }
+
+  public async getCheckpoints<Opts extends CheckpointIncludeOptions = {}>(
+    from: CheckpointNumber,
+    limit: number,
+    options: Opts = {} as Opts,
+  ): Promise<CheckpointResponse<Opts>[]> {
+    if (options.includeBlocks) {
+      const checkpoints = await this.blockSource.getCheckpoints({ from, limit });
+      return (await Promise.all(
+        checkpoints.map(cp => checkpointResponseFromPublishedCheckpoint(cp, options)),
+      )) as CheckpointResponse<Opts>[];
+    }
+    const datas = await this.blockSource.getCheckpointsData({ from, limit });
+    return datas.map(d => checkpointResponseFromCheckpointData(d, options)) as CheckpointResponse<Opts>[];
   }
 
   /**
@@ -195,16 +513,17 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
       dateProvider?: DateProvider;
       p2pClientDeps?: P2PClientDeps;
       proverNodeDeps?: Partial<ProverNodeDeps>;
+      slashingProtectionDb?: SlashingProtectionDatabase;
     } = {},
     options: {
-      prefilledPublicData?: PublicDataTreeLeaf[];
+      genesis?: GenesisData;
       dontStartSequencer?: boolean;
       dontStartProverNode?: boolean;
     } = {},
   ): Promise<AztecNodeService> {
     const config = { ...inputConfig }; // Copy the config so we dont mutate the input object
     const log = deps.logger ?? createLogger('node');
-    const packageVersion = getPackageVersion() ?? '';
+    const packageVersion = getPackageVersion();
     const telemetry = deps.telemetry ?? getTelemetryClient();
     const dateProvider = deps.dateProvider ?? new DateProvider();
     const ethereumChain = createEthereumChain(config.l1RpcUrls, config.l1ChainId);
@@ -263,17 +582,17 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
 
     const l1ContractsAddresses = await RegistryContract.collectAddresses(
       publicClient,
-      config.l1Contracts.registryAddress,
+      config.registryAddress,
       config.rollupVersion ?? 'canonical',
     );
 
-    // Overwrite the passed in vars.
-    config.l1Contracts = { ...config.l1Contracts, ...l1ContractsAddresses };
+    Object.assign(config, l1ContractsAddresses);
 
-    const rollupContract = new RollupContract(publicClient, config.l1Contracts.rollupAddress.toString());
-    const [l1GenesisTime, slotDuration, rollupVersionFromRollup, rollupManaLimit] = await Promise.all([
+    const rollupContract = new RollupContract(publicClient, config.rollupAddress.toString());
+    const [l1GenesisTime, slotDuration, epochDuration, rollupVersionFromRollup, rollupManaLimit] = await Promise.all([
       rollupContract.getL1GenesisTime(),
       rollupContract.getSlotDuration(),
+      rollupContract.getEpochDuration(),
       rollupContract.getVersion(),
       rollupContract.getManaLimit().then(Number),
     ] as const);
@@ -291,300 +610,472 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
     // attempt snapshot sync if possible
     await trySnapshotSync(config, log);
 
-    const epochCache = await EpochCache.create(config.l1Contracts.rollupAddress, config, { dateProvider });
+    const epochCache = await EpochCache.create(config.rollupAddress, config, { dateProvider });
 
-    const archiver = await createArchiver(
-      config,
-      { blobClient, epochCache, telemetry, dateProvider },
-      { blockUntilSync: !config.skipArchiverInitialSync },
-    );
-
-    // now create the merkle trees and the world state synchronizer
-    const worldStateSynchronizer = await createWorldStateSynchronizer(
-      config,
-      archiver,
-      options.prefilledPublicData,
-      telemetry,
-    );
-    const circuitVerifier =
-      config.realProofs || config.debugForceTxProofVerification
-        ? await BBCircuitVerifier.new(config)
-        : new TestCircuitVerifier(config.proverTestVerificationDelayMs);
-
-    let debugLogStore: DebugLogStore;
-    if (!config.realProofs) {
-      log.warn(`Aztec node is accepting fake proofs`);
-
-      debugLogStore = new InMemoryDebugLogStore();
-      log.info(
-        'Aztec node started in test mode (realProofs set to false) hence debug logs from public functions will be collected and served',
-      );
-    } else {
-      debugLogStore = new NullDebugLogStore();
-    }
+    // Track started resources so we can clean up on partial failure during node creation.
+    const started: { stop?(): Promise<void> | void }[] = [];
+    try {
+      config.skipOrphanProposedBlockPruning ||= !!config.useAutomineSequencer;
 
-    const proofVerifier = new QueuedIVCVerifier(config, circuitVerifier);
+      AztecNodeService.checkConfigMatchesRollup(config, {
+        slotDuration: Number(slotDuration),
+        epochDuration: Number(epochDuration),
+      });
 
-    const proverOnly = config.enableProverNode && config.disableValidator;
-    if (proverOnly) {
-      log.info('Starting in prover-only mode: skipping validator, sequencer, sentinel, and slasher subsystems');
-    }
+      // Create world-state first so we can retrieve the initial header before constructing the archiver.
+      const nativeWs = await createWorldState(config, options.genesis);
+      const initialHeader = nativeWs.getInitialHeader();
+      const initialBlockHash = await initialHeader.hash();
+      const archiver = await createArchiver(
+        config,
+        { blobClient, epochCache, telemetry, dateProvider },
+        { blockUntilSync: !config.skipArchiverInitialSync },
+        initialHeader,
+        initialBlockHash,
+      );
+      started.push(archiver);
+
+      // The synchronizer takes ownership of the native world-state from here
+      const worldStateSynchronizer = await createWorldStateSynchronizer(config, archiver, nativeWs, telemetry);
+      started.push(worldStateSynchronizer);
+      const useRealVerifiers = config.realProofs || config.debugForceTxProofVerification;
+      let peerProofVerifier: ClientProtocolCircuitVerifier;
+      let rpcProofVerifier: ClientProtocolCircuitVerifier;
+      if (useRealVerifiers) {
+        peerProofVerifier = await BatchChonkVerifier.new(config, config.bbChonkVerifyMaxBatch, 'peer');
+        const rpcVerifier = await BBCircuitVerifier.new(config);
+        rpcProofVerifier = new QueuedIVCVerifier(rpcVerifier, config.numConcurrentIVCVerifiers);
+      } else {
+        peerProofVerifier = new TestCircuitVerifier(config.proverTestVerificationDelayMs);
+        rpcProofVerifier = new TestCircuitVerifier(config.proverTestVerificationDelayMs);
+      }
+      started.push(peerProofVerifier, rpcProofVerifier);
 
-    // create the tx pool and the p2p client, which will need the l2 block source
-    const p2pClient = await createP2PClient(
-      config,
-      archiver,
-      proofVerifier,
-      worldStateSynchronizer,
-      epochCache,
-      packageVersion,
-      dateProvider,
-      telemetry,
-      deps.p2pClientDeps,
-    );
+      let debugLogStore: DebugLogStore;
+      if (!config.realProofs) {
+        log.warn(`Aztec node is accepting fake proofs`);
 
-    // We'll accumulate sentinel watchers here
-    const watchers: Watcher[] = [];
+        debugLogStore = new InMemoryDebugLogStore();
+        log.info(
+          'Aztec node started in test mode (realProofs set to false) hence debug logs from public functions will be collected and served',
+        );
+      } else {
+        debugLogStore = new NullDebugLogStore();
+      }
 
-    // Create FullNodeCheckpointsBuilder for block proposal handling and tx validation.
-    // Override maxTxsPerCheckpoint with the validator-specific limit if set.
-    const validatorCheckpointsBuilder = new FullNodeCheckpointsBuilder(
-      {
-        ...config,
+      const globalVariableBuilderConfig = {
+        rollupAddress: config.rollupAddress,
+        ethereumSlotDuration: config.ethereumSlotDuration,
+        rollupVersion: BigInt(config.rollupVersion),
         l1GenesisTime,
         slotDuration: Number(slotDuration),
-        rollupManaLimit,
-        maxTxsPerCheckpoint: config.validateMaxTxsPerCheckpoint,
-      },
-      worldStateSynchronizer,
-      archiver,
-      dateProvider,
-      telemetry,
-    );
+      };
 
-    let validatorClient: ValidatorClient | undefined;
+      const globalVariableBuilder = new GlobalVariableBuilder(dateProvider, publicClient, globalVariableBuilderConfig);
+      const feeProvider = new FeeProviderImpl(dateProvider, publicClient, globalVariableBuilderConfig);
 
-    if (!proverOnly) {
-      // Create validator client if required
-      validatorClient = await createValidatorClient(config, {
-        checkpointsBuilder: validatorCheckpointsBuilder,
-        worldState: worldStateSynchronizer,
-        p2pClient,
-        telemetry,
-        dateProvider,
-        epochCache,
-        blockSource: archiver,
-        l1ToL2MessageSource: archiver,
-        keyStoreManager,
-        blobClient,
-      });
-
-      // If we have a validator client, register it as a source of offenses for the slasher,
-      // and have it register callbacks on the p2p client *before* we start it, otherwise messages
-      // like attestations or auths will fail.
-      if (validatorClient) {
-        watchers.push(validatorClient);
-        if (!options.dontStartSequencer) {
-          await validatorClient.registerHandlers();
-        }
+      const proverOnly = config.enableProverNode && config.disableValidator;
+      if (proverOnly) {
+        log.info('Starting in prover-only mode: skipping validator, sequencer, sentinel, and slasher subsystems');
       }
-    }
 
-    // If there's no validator client, create a BlockProposalHandler to handle block proposals
-    // for monitoring or reexecution. Reexecution (default) allows us to follow the pending chain,
-    // while non-reexecution is used for validating the proposals and collecting their txs.
-    if (!validatorClient) {
-      const reexecute = !!config.alwaysReexecuteBlockProposals;
-      log.info(`Setting up block proposal handler` + (reexecute ? ' with reexecution of proposals' : ''));
-      createBlockProposalHandler(config, {
-        checkpointsBuilder: validatorCheckpointsBuilder,
-        worldState: worldStateSynchronizer,
+      // create the tx pool and the p2p client, which will need the l2 block source
+      const p2pClient = await createP2PClient(
+        config,
+        archiver,
+        peerProofVerifier,
+        worldStateSynchronizer,
         epochCache,
-        blockSource: archiver,
-        l1ToL2MessageSource: archiver,
-        p2pClient,
+        feeProvider,
+        packageVersion,
         dateProvider,
         telemetry,
-      }).register(p2pClient, reexecute);
-    }
+        deps.p2pClientDeps,
+        initialBlockHash,
+      );
+      started.push(p2pClient);
+      archiver.setCheckpointProposalPresence(p2pClient);
+
+      // We'll accumulate sentinel watchers here
+      const watchers: Watcher[] = [];
+
+      // Create FullNodeCheckpointsBuilder for block proposal handling and tx validation.
+      // Override maxTxsPerCheckpoint with the validator-specific limit if set.
+      const validatorCheckpointsBuilder = new FullNodeCheckpointsBuilder(
+        {
+          ...config,
+          l1GenesisTime,
+          slotDuration: Number(slotDuration),
+          rollupManaLimit,
+          maxTxsPerCheckpoint: config.validateMaxTxsPerCheckpoint,
+        },
+        worldStateSynchronizer,
+        archiver,
+        dateProvider,
+        telemetry,
+      );
 
-    // Start world state and wait for it to sync to the archiver.
-    await worldStateSynchronizer.start();
+      let validatorClient: ValidatorClient | undefined;
 
-    // Start p2p. Note that it depends on world state to be running.
-    await p2pClient.start();
+      // Tracks successful checkpoint re-execution by a checkpoint proposal handler.
+      const reexecutionTracker = new CheckpointReexecutionTracker();
 
-    let validatorsSentinel: Awaited<ReturnType<typeof createSentinel>> | undefined;
-    let epochPruneWatcher: EpochPruneWatcher | undefined;
-    let attestationsBlockWatcher: AttestationsBlockWatcher | undefined;
+      if (!config.disableValidator) {
+        // Create validator client if required
+        validatorClient = await createValidatorClient(config, {
+          checkpointsBuilder: validatorCheckpointsBuilder,
+          worldState: worldStateSynchronizer,
+          p2pClient,
+          telemetry,
+          dateProvider,
+          epochCache,
+          blockSource: archiver,
+          l1ToL2MessageSource: archiver,
+          keyStoreManager,
+          blobClient,
+          reexecutionTracker,
+          slashingProtectionDb: deps.slashingProtectionDb,
+        });
+
+        // If we have a validator client, register it as a source of offenses for the slasher,
+        // and have it register callbacks on the p2p client *before* we start it, otherwise messages
+        // like attestations or auths will fail.
+        if (validatorClient) {
+          watchers.push(validatorClient);
+
+          const vc = validatorClient;
+          const getValidatorAddresses = () => vc.getValidatorAddresses().map(a => a.toString());
+          validatorClient.getProposalHandler().register(p2pClient, true, archiver, getValidatorAddresses);
+
+          if (!options.dontStartSequencer) {
+            await validatorClient.registerHandlers();
+          }
+        }
+      }
 
-    if (!proverOnly) {
-      validatorsSentinel = await createSentinel(epochCache, archiver, p2pClient, config);
-      if (validatorsSentinel && config.slashInactivityPenalty > 0n) {
-        watchers.push(validatorsSentinel);
+      // If there's no validator client, create a ProposalHandler to handle block and checkpoint proposals
+      // for monitoring or reexecution. Reexecution (default) allows us to follow the pending chain,
+      // while non-reexecution is used for validating the proposals and collecting their txs.
+      // Checkpoint proposals rebuild blobs if the blob client can upload blobs.
+      if (!validatorClient) {
+        const reexecute = !!config.alwaysReexecuteBlockProposals;
+        log.info(`Setting up proposal handler` + (reexecute ? ' with reexecution of proposals' : ''));
+        createProposalHandler(config, {
+          checkpointsBuilder: validatorCheckpointsBuilder,
+          worldState: worldStateSynchronizer,
+          epochCache,
+          blockSource: archiver,
+          l1ToL2MessageSource: archiver,
+          p2pClient,
+          blobClient,
+          dateProvider,
+          telemetry,
+          reexecutionTracker,
+        }).register(p2pClient, reexecute, archiver);
       }
 
-      if (config.slashPrunePenalty > 0n || config.slashDataWithholdingPenalty > 0n) {
-        epochPruneWatcher = new EpochPruneWatcher(
+      // Start world state and wait for it to sync to the archiver.
+      await worldStateSynchronizer.start();
+
+      // Start p2p. Note that it depends on world state to be running.
+      await p2pClient.start();
+
+      let validatorsSentinel: Awaited<ReturnType<typeof createSentinel>> | undefined;
+      let dataWithholdingWatcher: DataWithholdingWatcher | undefined;
+      let attestationsBlockWatcher: AttestationsBlockWatcher | undefined;
+      let attestedInvalidProposalWatcher: AttestedInvalidProposalWatcher | undefined;
+      let broadcastedInvalidCheckpointProposalWatcher: BroadcastedInvalidCheckpointProposalWatcher | undefined;
+      let checkpointEquivocationWatcher: CheckpointEquivocationWatcher | undefined;
+
+      if (!proverOnly) {
+        validatorsSentinel = await createSentinel(epochCache, archiver, p2pClient, reexecutionTracker, config);
+        if (validatorsSentinel) {
+          watchers.push(validatorsSentinel);
+        }
+
+        dataWithholdingWatcher = new DataWithholdingWatcher(
+          epochCache,
           archiver,
+          p2pClient.getTxProvider(),
+          p2pClient,
+          reexecutionTracker,
+          { chainId: config.l1ChainId, rollupAddress: config.rollupAddress },
+          config,
+        );
+        watchers.push(dataWithholdingWatcher);
+
+        broadcastedInvalidCheckpointProposalWatcher = new BroadcastedInvalidCheckpointProposalWatcher(
+          p2pClient,
           archiver,
           epochCache,
-          p2pClient.getTxProvider(),
-          validatorCheckpointsBuilder,
           config,
         );
-        watchers.push(epochPruneWatcher);
-      }
+        watchers.push(broadcastedInvalidCheckpointProposalWatcher);
+
+        if (validatorClient) {
+          attestedInvalidProposalWatcher = new AttestedInvalidProposalWatcher(
+            p2pClient,
+            validatorClient,
+            archiver,
+            epochCache,
+            config,
+            { log: log.createChild('attested-invalid-proposal-watcher') },
+          );
+          watchers.push(attestedInvalidProposalWatcher);
+        }
 
-      // We assume we want to slash for invalid attestations unless all max penalties are set to 0
-      if (config.slashProposeInvalidAttestationsPenalty > 0n || config.slashAttestDescendantOfInvalidPenalty > 0n) {
-        attestationsBlockWatcher = new AttestationsBlockWatcher(archiver, epochCache, config);
+        checkpointEquivocationWatcher = new CheckpointEquivocationWatcher(archiver, epochCache, config);
+        watchers.push(checkpointEquivocationWatcher);
+
+        attestationsBlockWatcher = new AttestationsBlockWatcher(archiver, epochCache, config, log.getBindings());
         watchers.push(attestationsBlockWatcher);
       }
-    }
 
-    // Start p2p-related services once the archiver has completed sync
-    void archiver
-      .waitForInitialSync()
-      .then(async () => {
-        await p2pClient.start();
-        await validatorsSentinel?.start();
-        await epochPruneWatcher?.start();
-        await attestationsBlockWatcher?.start();
-        log.info(`All p2p services started`);
-      })
-      .catch(err => log.error('Failed to start p2p services after archiver sync', err));
-
-    // Validator enabled, create/start relevant service
-    let sequencer: SequencerClient | undefined;
-    let slasherClient: SlasherClientInterface | undefined;
-    if (!config.disableValidator && validatorClient) {
-      // We create a slasher only if we have a sequencer, since all slashing actions go through the sequencer publisher
-      // as they are executed when the node is selected as proposer.
-      const validatorAddresses = keyStoreManager
-        ? NodeKeystoreAdapter.fromKeyStoreManager(keyStoreManager).getAddresses()
-        : [];
-
-      slasherClient = await createSlasher(
-        config,
-        config.l1Contracts,
-        getPublicClient(config),
-        watchers,
-        dateProvider,
-        epochCache,
-        validatorAddresses,
-        undefined, // logger
-      );
-      await slasherClient.start();
+      const watchersToStart = compactArray([
+        validatorsSentinel,
+        dataWithholdingWatcher,
+        attestationsBlockWatcher,
+        broadcastedInvalidCheckpointProposalWatcher,
+        attestedInvalidProposalWatcher,
+        checkpointEquivocationWatcher,
+      ]);
+      const startedWatchers: Watcher[] = [];
+      const stopStartedWatchers = async () => {
+        for (const watcher of startedWatchers) {
+          await tryStop(watcher);
+        }
+      };
 
-      const l1TxUtils = config.sequencerPublisherForwarderAddress
-        ? await createForwarderL1TxUtilsFromSigners(
-            publicClient,
-            keyStoreManager!.createAllValidatorPublisherSigners(),
-            config.sequencerPublisherForwarderAddress,
-            { ...config, scope: 'sequencer' },
-            { telemetry, logger: log.createChild('l1-tx-utils'), dateProvider, kzg: Blob.getViemKzgInstance() },
-          )
-        : await createL1TxUtilsFromSigners(
+      // Start p2p-related services once the archiver has completed sync
+      void archiver
+        .waitForInitialSync()
+        .then(async () => {
+          for (const watcher of watchersToStart) {
+            await watcher.start();
+            startedWatchers.push(watcher);
+          }
+          log.info(`All p2p services started`);
+        })
+        .catch(err => log.error('Failed to start p2p services after archiver sync', err));
+      started.push({ stop: stopStartedWatchers });
+
+      // Validator enabled, create/start relevant service
+      let sequencer: SequencerClient | undefined;
+      let automineSequencer: AutomineSequencer | undefined;
+      let slasherClient: SlasherClientInterface | undefined;
+      if (!config.disableValidator && validatorClient) {
+        // We create a slasher only if we have a sequencer, since all slashing actions go through the sequencer publisher
+        // as they are executed when the node is selected as proposer.
+        const validatorAddresses = keyStoreManager
+          ? NodeKeystoreAdapter.fromKeyStoreManager(keyStoreManager).getAddresses()
+          : [];
+
+        slasherClient = await createSlasher(
+          config,
+          pickL1ContractAddresses(config),
+          getPublicClient(config),
+          watchers,
+          dateProvider,
+          epochCache,
+          validatorAddresses,
+          undefined, // logger
+        );
+        await slasherClient.start();
+        started.push(slasherClient);
+
+        const l1TxUtils = config.sequencerPublisherForwarderAddress
+          ? await createForwarderL1TxUtilsFromSigners(
+              publicClient,
+              keyStoreManager!.createAllValidatorPublisherSigners(),
+              config.sequencerPublisherForwarderAddress,
+              { ...config, scope: 'sequencer' },
+              { telemetry, logger: log.createChild('l1-tx-utils'), dateProvider, kzg: Blob.getViemKzgInstance() },
+            )
+          : await createL1TxUtilsFromSigners(
+              publicClient,
+              keyStoreManager!.createAllValidatorPublisherSigners(),
+              { ...config, scope: 'sequencer' },
+              { telemetry, logger: log.createChild('l1-tx-utils'), dateProvider, kzg: Blob.getViemKzgInstance() },
+            );
+
+        // Create a funder L1TxUtils from the keystore funding account (if configured)
+        const fundingSigner = keyStoreManager?.createFundingSigner();
+        let funderL1TxUtils: L1TxUtils | undefined;
+        if (fundingSigner) {
+          const [funder] = await createL1TxUtilsFromSigners(
             publicClient,
-            keyStoreManager!.createAllValidatorPublisherSigners(),
+            [fundingSigner],
             { ...config, scope: 'sequencer' },
-            { telemetry, logger: log.createChild('l1-tx-utils'), dateProvider, kzg: Blob.getViemKzgInstance() },
+            { telemetry, logger: log.createChild('l1-tx-utils:funder'), dateProvider },
           );
+          funderL1TxUtils = funder;
+        }
 
-      // Create and start the sequencer client
-      const checkpointsBuilder = new CheckpointsBuilder(
-        { ...config, l1GenesisTime, slotDuration: Number(slotDuration), rollupManaLimit },
-        worldStateSynchronizer,
-        archiver,
-        dateProvider,
-        telemetry,
-        debugLogStore,
-      );
+        // Create and start the sequencer client
+        const checkpointsBuilder = new CheckpointsBuilder(
+          { ...config, l1GenesisTime, slotDuration: Number(slotDuration), rollupManaLimit },
+          worldStateSynchronizer,
+          archiver,
+          dateProvider,
+          telemetry,
+          debugLogStore,
+        );
 
-      sequencer = await SequencerClient.new(config, {
-        ...deps,
-        epochCache,
-        l1TxUtils,
-        validatorClient,
-        p2pClient,
-        worldStateSynchronizer,
-        slasherClient,
-        checkpointsBuilder,
-        l2BlockSource: archiver,
-        l1ToL2MessageSource: archiver,
-        telemetry,
-        dateProvider,
-        blobClient,
-        nodeKeyStore: keyStoreManager!,
-      });
-    }
+        if (config.useAutomineSequencer) {
+          // Test-only path: deterministic, queue-driven sequencer for non-block-building e2e tests.
+          // See `AUTOMINE_E2E_OPTS` in `end-to-end/src/fixtures/fixtures.ts`.
+          automineSequencer = await createAutomineSequencer({
+            config,
+            l1TxUtils,
+            funderL1TxUtils,
+            publicClient,
+            rollupContract,
+            epochCache,
+            blobClient,
+            telemetry,
+            dateProvider,
+            keyStoreManager: keyStoreManager!,
+            validatorClient,
+            checkpointsBuilder,
+            globalVariableBuilder,
+            worldStateSynchronizer,
+            archiver,
+            p2pClient,
+            l1Constants: {
+              l1GenesisTime,
+              slotDuration: Number(slotDuration),
+              ethereumSlotDuration: config.ethereumSlotDuration,
+              rollupManaLimit,
+            },
+            autoSettle: config.automineEnableProveEpoch,
+            log,
+          });
+        } else {
+          sequencer = await SequencerClient.new(config, {
+            ...deps,
+            epochCache,
+            l1TxUtils,
+            funderL1TxUtils,
+            validatorClient,
+            p2pClient,
+            worldStateSynchronizer,
+            slasherClient,
+            checkpointsBuilder,
+            l2BlockSource: archiver,
+            l1ToL2MessageSource: archiver,
+            telemetry,
+            dateProvider,
+            blobClient,
+            nodeKeyStore: keyStoreManager!,
+            globalVariableBuilder,
+          });
+        }
+      }
 
-    if (!options.dontStartSequencer && sequencer) {
-      await sequencer.start();
-      log.verbose(`Sequencer started`);
-    } else if (sequencer) {
-      log.warn(`Sequencer created but not started`);
-    }
+      if (!options.dontStartSequencer && sequencer) {
+        await sequencer.start();
+        started.push(sequencer);
+        log.verbose(`Sequencer started`);
+      } else if (sequencer) {
+        log.warn(`Sequencer created but not started`);
+      }
 
-    // Create prover node subsystem if enabled
-    let proverNode: ProverNode | undefined;
-    if (config.enableProverNode) {
-      proverNode = await createProverNode(config, {
-        ...deps.proverNodeDeps,
-        telemetry,
-        dateProvider,
+      if (!options.dontStartSequencer && automineSequencer) {
+        await automineSequencer.start();
+        started.push({ stop: () => automineSequencer!.stop() });
+        log.verbose(`AutomineSequencer started`);
+      } else if (automineSequencer) {
+        log.warn(`AutomineSequencer created but not started`);
+      }
+
+      // Create prover node subsystem if enabled
+      let proverNode: ProverNode | undefined;
+      if (config.enableProverNode) {
+        proverNode = await createProverNode(config, {
+          ...deps.proverNodeDeps,
+          telemetry,
+          dateProvider,
+          archiver,
+          worldStateSynchronizer,
+          p2pClient,
+          epochCache,
+          blobClient,
+          keyStoreManager,
+        });
+
+        if (!options.dontStartProverNode) {
+          await proverNode.start();
+          started.push(proverNode);
+          log.info(`Prover node subsystem started`);
+        } else {
+          log.info(`Prover node subsystem created but not started`);
+        }
+      }
+
+      const node = new AztecNodeService(
+        config,
+        p2pClient,
+        archiver,
+        archiver,
+        archiver,
         archiver,
         worldStateSynchronizer,
-        p2pClient,
+        sequencer,
+        proverNode,
+        slasherClient,
+        validatorsSentinel,
+        stopStartedWatchers,
+        ethereumChain.chainInfo.id,
+        config.rollupVersion,
+        globalVariableBuilder,
+        feeProvider,
         epochCache,
+        packageVersion,
+        peerProofVerifier,
+        rpcProofVerifier,
+        telemetry,
+        log,
         blobClient,
+        validatorClient,
         keyStoreManager,
-      });
+        debugLogStore,
+        automineSequencer,
+      );
 
-      if (!options.dontStartProverNode) {
-        await proverNode.start();
-        log.info(`Prover node subsystem started`);
-      } else {
-        log.info(`Prover node subsystem created but not started`);
+      return node;
+    } catch (err) {
+      log.error('Failed during node creation, stopping started resources', err);
+      for (const resource of started.reverse()) {
+        await tryStop(resource);
       }
+      throw err;
     }
+  }
 
-    const globalVariableBuilder = new GlobalVariableBuilder({
-      ...config,
-      rollupVersion: BigInt(config.rollupVersion),
-      l1GenesisTime,
-      slotDuration: Number(slotDuration),
-    });
-
-    const node = new AztecNodeService(
-      config,
-      p2pClient,
-      archiver,
-      archiver,
-      archiver,
-      archiver,
-      worldStateSynchronizer,
-      sequencer,
-      proverNode,
-      slasherClient,
-      validatorsSentinel,
-      epochPruneWatcher,
-      ethereumChain.chainInfo.id,
-      config.rollupVersion,
-      globalVariableBuilder,
-      epochCache,
-      packageVersion,
-      proofVerifier,
-      telemetry,
-      log,
-      blobClient,
-      validatorClient,
-      keyStoreManager,
-      debugLogStore,
-    );
-
-    return node;
+  /**
+   * Verifies the node's configured L1 timing matches the rollup contract it is pointed at, for the fields the
+   * node's own config carries. Each comparison is guarded against an undefined config value, so a config that
+   * does not carry a field is not checked. Throws a single error listing every mismatch. Runs in the shared
+   * startup path for every node role.
+   */
+  private static checkConfigMatchesRollup(
+    config: AztecNodeConfig,
+    rollup: { slotDuration: number; epochDuration: number },
+  ): void {
+    const mismatches: string[] = [];
+    if (config.aztecSlotDuration !== undefined && config.aztecSlotDuration !== rollup.slotDuration) {
+      mismatches.push(`aztecSlotDuration is ${config.aztecSlotDuration} but the rollup reports ${rollup.slotDuration}`);
+    }
+    if (config.aztecEpochDuration !== undefined && config.aztecEpochDuration !== rollup.epochDuration) {
+      mismatches.push(
+        `aztecEpochDuration is ${config.aztecEpochDuration} but the rollup reports ${rollup.epochDuration}`,
+      );
+    }
+    if (mismatches.length > 0) {
+      throw new Error(
+        `The node's configured L1 timing does not match the rollup contract it is pointed at: ${mismatches.join('; ')}`,
+      );
+    }
   }
 
   /**
@@ -595,6 +1086,11 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
     return this.sequencer;
   }
 
+  /** Test-only: returns the AutomineSequencer when wired via `useAutomineSequencer`. */
+  public getAutomineSequencer(): AutomineSequencer | undefined {
+    return this.automineSequencer;
+  }
+
   /** Returns the prover node subsystem, if enabled. */
   public getProverNode(): ProverNode | undefined {
     return this.proverNode;
@@ -617,7 +1113,7 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
    * @returns - The currently deployed L1 contract addresses.
    */
   public getL1ContractAddresses(): Promise<L1ContractAddresses> {
-    return Promise.resolve(this.config.l1Contracts);
+    return Promise.resolve(pickL1ContractAddresses(this.config));
   }
 
   public getEncodedEnr(): Promise<string | undefined> {
@@ -637,14 +1133,22 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
   }
 
   public async getNodeInfo(): Promise<NodeInfo> {
-    const [nodeVersion, rollupVersion, chainId, enr, contractAddresses, protocolContractAddresses] = await Promise.all([
-      this.getNodeVersion(),
-      this.getVersion(),
-      this.getChainId(),
-      this.getEncodedEnr(),
-      this.getL1ContractAddresses(),
-      this.getProtocolContractAddresses(),
-    ]);
+    const [nodeVersion, rollupVersion, chainId, enr, contractAddresses, protocolContractAddresses, l1Constants] =
+      await Promise.all([
+        this.getNodeVersion(),
+        this.getVersion(),
+        this.getChainId(),
+        this.getEncodedEnr(),
+        this.getL1ContractAddresses(),
+        this.getProtocolContractAddresses(),
+        this.blockSource.getL1Constants(),
+      ]);
+
+    // Gas limits a single tx may declare on this network, derived from network-wide constants only (the
+    // timetable's blocks-per-checkpoint and the network-minimum per-block multipliers) — never this node's
+    // local caps or configured multipliers, which can make the node stricter at block-building time but
+    // cannot define what the network accepts for relay. Clients read txsLimits to set fallback gas limits.
+    const maxTxGas = getNetworkTxGasLimits(this.config, l1Constants);
 
     const nodeInfo: NodeInfo = {
       nodeVersion,
@@ -654,112 +1158,29 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
       l1ContractAddresses: contractAddresses,
       protocolContractAddresses: protocolContractAddresses,
       realProofs: !!this.config.realProofs,
+      txsLimits: { gas: { daGas: maxTxGas.daGas, l2Gas: maxTxGas.l2Gas } },
     };
 
     return nodeInfo;
   }
 
-  /**
-   * Get a block specified by its block number, block hash, or 'latest'.
-   * @param block - The block parameter (block number, block hash, or 'latest').
-   * @returns The requested block.
-   */
-  public async getBlock(block: BlockParameter): Promise<L2Block | undefined> {
-    if (BlockHash.isBlockHash(block)) {
-      return this.getBlockByHash(block);
-    }
-    const blockNumber = block === 'latest' ? await this.getBlockNumber() : (block as BlockNumber);
-    if (blockNumber === BlockNumber.ZERO) {
-      return this.buildInitialBlock();
-    }
-    return await this.blockSource.getL2Block(blockNumber);
-  }
-
-  /**
-   * Get a block specified by its hash.
-   * @param blockHash - The block hash being requested.
-   * @returns The requested block.
-   */
-  public async getBlockByHash(blockHash: BlockHash): Promise<L2Block | undefined> {
-    const initialBlockHash = await this.#getInitialHeaderHash();
-    if (blockHash.equals(initialBlockHash)) {
-      return this.buildInitialBlock();
-    }
-    return await this.blockSource.getL2BlockByHash(blockHash);
-  }
-
-  private buildInitialBlock(): L2Block {
-    const initialHeader = this.worldStateSynchronizer.getCommitted().getInitialHeader();
-    return L2Block.empty(initialHeader);
-  }
-
-  /**
-   * Get a block specified by its archive root.
-   * @param archive - The archive root being requested.
-   * @returns The requested block.
-   */
-  public async getBlockByArchive(archive: Fr): Promise<L2Block | undefined> {
-    return await this.blockSource.getL2BlockByArchive(archive);
-  }
-
-  /**
-   * Method to request blocks. Will attempt to return all requested blocks but will return only those available.
-   * @param from - The start of the range of blocks to return.
-   * @param limit - The maximum number of blocks to obtain.
-   * @returns The blocks requested.
-   */
-  public async getBlocks(from: BlockNumber, limit: number): Promise<L2Block[]> {
-    return (await this.blockSource.getBlocks(from, BlockNumber(limit))) ?? [];
-  }
-
-  public async getCheckpoints(from: CheckpointNumber, limit: number): Promise<PublishedCheckpoint[]> {
-    return (await this.blockSource.getCheckpoints(from, limit)) ?? [];
-  }
-
-  public async getCheckpointedBlocks(from: BlockNumber, limit: number) {
-    return (await this.blockSource.getCheckpointedBlocks(from, limit)) ?? [];
-  }
-
-  public getCheckpointsDataForEpoch(epochNumber: EpochNumber) {
-    return this.blockSource.getCheckpointsDataForEpoch(epochNumber);
+  public async getCurrentMinFees(): Promise<GasFees> {
+    return await this.feeProvider.getCurrentMinFees();
   }
 
-  /**
-   * Method to fetch the current min L2 fees.
-   * @returns The current min L2 fees.
-   */
-  public async getCurrentMinFees(): Promise<GasFees> {
-    return await this.globalVariableBuilder.getCurrentMinFees();
+  /** Returns predicted min fees for the current slot and next N slots. */
+  public async getPredictedMinFees(manaUsage?: ManaUsageEstimate): Promise<GasFees[]> {
+    return await this.feeProvider.getPredictedMinFees(manaUsage);
   }
 
   public async getMaxPriorityFees(): Promise<GasFees> {
-    for await (const tx of this.p2pClient.iteratePendingTxs()) {
+    for await (const tx of this.p2pClient.iteratePendingTxs({ includeProof: false })) {
       return tx.getGasSettings().maxPriorityFeesPerGas;
     }
 
     return GasFees.from({ feePerDaGas: 0n, feePerL2Gas: 0n });
   }
 
-  /**
-   * Method to fetch the latest block number synchronized by the node.
-   * @returns The block number.
-   */
-  public async getBlockNumber(): Promise<BlockNumber> {
-    return await this.blockSource.getBlockNumber();
-  }
-
-  public async getProvenBlockNumber(): Promise<BlockNumber> {
-    return await this.blockSource.getProvenBlockNumber();
-  }
-
-  public async getCheckpointedBlockNumber(): Promise<BlockNumber> {
-    return await this.blockSource.getCheckpointedL2BlockNumber();
-  }
-
-  public getCheckpointNumber(): Promise<CheckpointNumber> {
-    return this.blockSource.getCheckpointNumber();
-  }
-
   /**
    * Method to fetch the version of the package.
    * @returns The node package version
@@ -792,69 +1213,12 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
     return this.contractDataSource.getContract(address);
   }
 
-  public async getPrivateLogsByTags(
-    tags: SiloedTag[],
-    page?: number,
-    referenceBlock?: BlockHash,
-  ): Promise<TxScopedL2Log[][]> {
-    let upToBlockNumber: BlockNumber | undefined;
-    if (referenceBlock) {
-      const initialBlockHash = await this.#getInitialHeaderHash();
-      if (referenceBlock.equals(initialBlockHash)) {
-        upToBlockNumber = BlockNumber(0);
-      } else {
-        const header = await this.blockSource.getBlockHeaderByHash(referenceBlock);
-        if (!header) {
-          throw new Error(
-            `Block ${referenceBlock.toString()} not found in the node. This might indicate a reorg has occurred.`,
-          );
-        }
-        upToBlockNumber = header.globalVariables.blockNumber;
-      }
-    }
-    return this.logsSource.getPrivateLogsByTags(tags, page, upToBlockNumber);
-  }
-
-  public async getPublicLogsByTagsFromContract(
-    contractAddress: AztecAddress,
-    tags: Tag[],
-    page?: number,
-    referenceBlock?: BlockHash,
-  ): Promise<TxScopedL2Log[][]> {
-    let upToBlockNumber: BlockNumber | undefined;
-    if (referenceBlock) {
-      const initialBlockHash = await this.#getInitialHeaderHash();
-      if (referenceBlock.equals(initialBlockHash)) {
-        upToBlockNumber = BlockNumber(0);
-      } else {
-        const header = await this.blockSource.getBlockHeaderByHash(referenceBlock);
-        if (!header) {
-          throw new Error(
-            `Block ${referenceBlock.toString()} not found in the node. This might indicate a reorg has occurred.`,
-          );
-        }
-        upToBlockNumber = header.globalVariables.blockNumber;
-      }
-    }
-    return this.logsSource.getPublicLogsByTagsFromContract(contractAddress, tags, page, upToBlockNumber);
-  }
-
-  /**
-   * Gets public logs based on the provided filter.
-   * @param filter - The filter to apply to the logs.
-   * @returns The requested logs.
-   */
-  getPublicLogs(filter: LogFilter): Promise<GetPublicLogsResponse> {
-    return this.logsSource.getPublicLogs(filter);
+  public getPrivateLogsByTags(query: PrivateLogsQuery): Promise<LogResult[][]> {
+    return this.logsSource.getPrivateLogsByTags(query);
   }
 
-  /**
-   * Gets contract class logs based on the provided filter.
-   * @param filter - The filter to apply to the logs.
-   * @returns The requested logs.
-   */
-  getContractClassLogs(filter: LogFilter): Promise<GetContractClassLogsResponse> {
-    return this.logsSource.getContractClassLogs(filter);
+  public getPublicLogsByTags(query: PublicLogsQuery): Promise<LogResult[][]> {
+    return this.logsSource.getPublicLogsByTags(query);
   }
 
   /**
@@ -877,32 +1241,47 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
       throw new Error(`Invalid tx: ${reason}`);
     }
 
-    await this.p2pClient!.sendTx(tx);
+    try {
+      await this.p2pClient!.sendTx(tx);
+    } catch (err) {
+      this.metrics.receivedTx(timer.ms(), false);
+      this.log.warn(`Mempool rejected tx ${txHash}: ${(err as Error).message}`, { txHash });
+      throw err;
+    }
     const duration = timer.ms();
     this.metrics.receivedTx(duration, true);
     this.log.info(`Received tx ${txHash} in ${duration}ms`, { txHash });
   }
 
-  public async getTxReceipt(txHash: TxHash): Promise<TxReceipt> {
+  public async getTxReceipt<TGetTxReceiptOptions extends GetTxReceiptOptions = {}>(
+    txHash: TxHash,
+    options?: TGetTxReceiptOptions,
+  ): Promise<TxReceipt<TGetTxReceiptOptions>> {
     // Check the tx pool status first. If the tx is known to the pool (pending or mined), we'll use that
-    // as a fallback if we don't find a settled receipt in the archiver.
+    // as a fallback if we don't find a mined tx effect in the archiver.
     const txPoolStatus = await this.p2pClient.getTxStatus(txHash);
     const isKnownToPool = txPoolStatus === 'pending' || txPoolStatus === 'mined';
 
-    // Then get the actual tx from the archiver, which tracks every tx in a mined block.
-    const settledTxReceipt = await this.blockSource.getSettledTxReceipt(txHash);
+    // Then get the raw tx effect from the archiver, which tracks every tx in a mined block.
+    const indexed = await this.blockSource.getTxEffect(txHash);
 
     let receipt: TxReceipt;
-    if (settledTxReceipt) {
-      receipt = settledTxReceipt;
+    if (indexed) {
+      receipt = await this.#assembleMinedReceipt(indexed, options);
     } else if (isKnownToPool) {
       // If the tx is in the pool but not in the archiver, it's pending.
       // This handles race conditions between archiver and p2p, where the archiver
       // has pruned the block in which a tx was mined, but p2p has not caught up yet.
-      receipt = new TxReceipt(txHash, TxStatus.PENDING, undefined, undefined);
+      let tx: Tx | undefined;
+      if (options?.includePendingTx) {
+        // The tx may have left the pool since we checked its status (mined or dropped); in that case we
+        // leave `tx` unset and still return a pending receipt.
+        tx = await this.p2pClient.getTxByHashFromPool(txHash, { includeProof: !!options.includeProof });
+      }
+      receipt = new PendingTxReceipt(txHash, tx);
     } else {
       // Otherwise, if we don't know the tx, we consider it dropped.
-      receipt = new TxReceipt(txHash, TxStatus.DROPPED, undefined, 'Tx dropped by P2P node');
+      receipt = new DroppedTxReceipt(txHash, 'Tx dropped by P2P node');
     }
 
     this.debugLogStore.decorateReceiptWithLogs(txHash.toString(), receipt);
@@ -910,6 +1289,44 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
     return receipt;
   }
 
+  /**
+   * Assembles a {@link MinedTxReceipt} from a raw {@link IndexedTxEffect}, deriving the finalization status from the
+   * cached L2 tips and the epoch from the block's slot number.
+   */
+  async #assembleMinedReceipt(indexed: IndexedTxEffect, options?: GetTxReceiptOptions): Promise<MinedTxReceipt> {
+    const blockNumber = indexed.l2BlockNumber;
+    const [tips, l1Constants] = await Promise.all([this.blockSource.getL2Tips(), this.blockSource.getL1Constants()]);
+
+    const status = this.#deriveMinedStatus(blockNumber, tips);
+    const epochNumber = getEpochAtSlot(indexed.slotNumber, l1Constants);
+
+    return new MinedTxReceipt(
+      indexed.data.txHash,
+      status,
+      MinedTxReceipt.executionResultFromRevertCode(indexed.data.revertCode),
+      indexed.data.transactionFee.toBigInt(),
+      indexed.l2BlockHash,
+      blockNumber,
+      indexed.slotNumber,
+      indexed.txIndexInBlock,
+      epochNumber,
+      options?.includeTxEffect ? indexed.data : undefined,
+      /*debugLogs=*/ undefined,
+    );
+  }
+
+  #deriveMinedStatus(blockNumber: BlockNumber, tips: L2Tips): MinedTxStatus {
+    if (blockNumber <= tips.finalized.block.number) {
+      return TxStatus.FINALIZED;
+    } else if (blockNumber <= tips.proven.block.number) {
+      return TxStatus.PROVEN;
+    } else if (blockNumber <= tips.checkpointed.block.number) {
+      return TxStatus.CHECKPOINTED;
+    } else {
+      return TxStatus.PROPOSED;
+    }
+  }
+
   public getTxEffect(txHash: TxHash): Promise<IndexedTxEffect | undefined> {
     return this.blockSource.getTxEffect(txHash);
   }
@@ -919,11 +1336,11 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
    */
   public async stop() {
     this.log.info(`Stopping Aztec Node`);
-    await tryStop(this.validatorsSentinel);
-    await tryStop(this.epochPruneWatcher);
+    await this.stopStartedWatchers();
     await tryStop(this.slasherClient);
-    await tryStop(this.proofVerifier);
+    await Promise.all([tryStop(this.peerProofVerifier), tryStop(this.rpcProofVerifier)]);
     await tryStop(this.sequencer);
+    await tryStop(this.automineSequencer);
     await tryStop(this.proverNode);
     await tryStop(this.p2pClient);
     await tryStop(this.worldStateSynchronizer);
@@ -947,30 +1364,50 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
    * @param after - The last known pending tx. Used for pagination
    * @returns - The pending txs.
    */
-  public getPendingTxs(limit?: number, after?: TxHash): Promise<Tx[]> {
-    return this.p2pClient!.getPendingTxs(limit, after);
+  public getPendingTxs(limit?: number, after?: TxHash, options?: GetTxByHashOptions): Promise<Tx[]> {
+    return this.p2pClient!.getPendingTxs(limit, after, options);
   }
 
   public getPendingTxCount(): Promise<number> {
     return this.p2pClient!.getPendingTxCount();
   }
 
+  public getPeers(includePending?: boolean): Promise<PeerInfo[]> {
+    return this.p2pClient!.getPeers(includePending);
+  }
+
+  public getCheckpointAttestationsForSlot(
+    slot: SlotNumber,
+    proposalPayloadHash?: CheckpointProposalHash,
+  ): Promise<CheckpointAttestation[]> {
+    return this.p2pClient!.getCheckpointAttestationsForSlot(slot, proposalPayloadHash);
+  }
+
+  public getProposalsForSlot(slot: SlotNumber): Promise<ProposalsForSlot> {
+    return this.p2pClient!.getProposalsForSlot(slot);
+  }
+
   /**
-   * Method to retrieve a single tx from the mempool or unfinalized chain.
+   * Method to retrieve a single tx from the mempool or unfinalized chain. The tx's proof is only loaded and returned
+   * when `includeProof` is set.
    * @param txHash - The transaction hash to return.
+   * @param options - Options for the returned tx (eg whether to include its proof).
    * @returns - The tx if it exists.
    */
-  public getTxByHash(txHash: TxHash): Promise<Tx | undefined> {
-    return Promise.resolve(this.p2pClient!.getTxByHashFromPool(txHash));
+  public getTxByHash(txHash: TxHash, options?: GetTxByHashOptions): Promise<Tx | undefined> {
+    return this.p2pClient!.getTxByHashFromPool(txHash, { includeProof: !!options?.includeProof });
   }
 
   /**
-   * Method to retrieve txs from the mempool or unfinalized chain.
+   * Method to retrieve txs from the mempool or unfinalized chain. The txs' proofs are only loaded and returned when
+   * `includeProof` is set.
    * @param txHash - The transaction hash to return.
+   * @param options - Options for the returned txs (eg whether to include their proofs).
    * @returns - The txs if it exists.
    */
-  public async getTxsByHash(txHashes: TxHash[]): Promise<Tx[]> {
-    return compactArray(await Promise.all(txHashes.map(txHash => this.getTxByHash(txHash))));
+  public async getTxsByHash(txHashes: TxHash[], options?: GetTxByHashOptions): Promise<Tx[]> {
+    const txs = await this.p2pClient!.getTxsByHashFromPool(txHashes, { includeProof: !!options?.includeProof });
+    return compactArray(txs);
   }
 
   public async findLeavesIndexes(
@@ -1012,7 +1449,7 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
     );
 
     // Build a map from block number to block hash
-    const blockNumberToHash = new Map<BlockNumber, Fr>();
+    const blockNumberToHash = new Map<BlockNumber, BlockHash>();
     for (let i = 0; i < uniqueBlockNumbers.length; i++) {
       const blockHash = blockHashes[i];
       if (blockHash === undefined) {
@@ -1030,13 +1467,13 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
       if (blockNumber === undefined) {
         throw new Error(`Block number not found for leaf index ${index} in tree ${MerkleTreeId[treeId]}`);
       }
-      const blockHash = blockNumberToHash.get(blockNumber);
-      if (blockHash === undefined) {
+      const l2BlockHash = blockNumberToHash.get(blockNumber);
+      if (l2BlockHash === undefined) {
         throw new Error(`Block hash not found for block number ${blockNumber}`);
       }
       return {
         l2BlockNumber: blockNumber,
-        l2BlockHash: new BlockHash(blockHash),
+        l2BlockHash,
         data: index,
       };
     });
@@ -1046,7 +1483,15 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
     referenceBlock: BlockParameter,
     blockHash: BlockHash,
   ): Promise<MembershipWitness<typeof ARCHIVE_HEIGHT> | undefined> {
-    const committedDb = await this.getWorldState(referenceBlock);
+    // The Noir circuit checks the archive membership proof against `anchor_block_header.last_archive.root`,
+    // which is the archive tree root BEFORE the anchor block was added (i.e. the state after block N-1).
+    // So we need the world state at block N-1, not block N, to produce a sibling path matching that root.
+    const referenceBlockNumber = await this.resolveBlockNumber(referenceBlock);
+    if (referenceBlockNumber === BlockNumber.ZERO) {
+      // Block 0 (the initial block) has an empty archive, so no membership witness can exist.
+      return undefined;
+    }
+    const committedDb = await this.getWorldState(BlockNumber(referenceBlockNumber - 1));
     const [pathAndIndex] = await committedDb.findSiblingPaths<MerkleTreeId.ARCHIVE>(MerkleTreeId.ARCHIVE, [blockHash]);
     return pathAndIndex === undefined
       ? undefined
@@ -1083,35 +1528,37 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
 
   public async getL1ToL2MessageCheckpoint(l1ToL2Message: Fr): Promise<CheckpointNumber | undefined> {
     const messageIndex = await this.l1ToL2MessageSource.getL1ToL2MessageIndex(l1ToL2Message);
-    return messageIndex ? InboxLeaf.checkpointNumberFromIndex(messageIndex) : undefined;
-  }
-
-  /**
-   * Returns whether an L1 to L2 message is synced by archiver and if it's ready to be included in a block.
-   * @param l1ToL2Message - The L1 to L2 message to check.
-   * @returns Whether the message is synced and ready to be included in a block.
-   */
-  public async isL1ToL2MessageSynced(l1ToL2Message: Fr): Promise<boolean> {
-    const messageIndex = await this.l1ToL2MessageSource.getL1ToL2MessageIndex(l1ToL2Message);
-    return messageIndex !== undefined;
+    return messageIndex !== undefined ? InboxLeaf.checkpointNumberFromIndex(messageIndex) : undefined;
   }
 
   /**
    * Returns all the L2 to L1 messages in an epoch.
+   *
+   * @deprecated Use {@link getL2ToL1MembershipWitness} to get an L2-to-L1 message witness directly.
+   *
    * @param epoch - The epoch at which to get the data.
    * @returns The L2 to L1 messages (empty array if the epoch is not found).
    */
   public async getL2ToL1Messages(epoch: EpochNumber): Promise<Fr[][][][]> {
-    // Assumes `getCheckpointedBlocksForEpoch` returns blocks in ascending order of block number.
-    const checkpointedBlocks = await this.blockSource.getCheckpointedBlocksForEpoch(epoch);
-    const blocksInCheckpoints = chunkBy(checkpointedBlocks, cb => cb.block.header.globalVariables.slotNumber).map(
-      group => group.map(cb => cb.block),
-    );
-    return blocksInCheckpoints.map(blocks =>
-      blocks.map(block => block.body.txEffects.map(txEffect => txEffect.l2ToL1Msgs)),
+    const blocks = await this.blockSource.getBlocks({ epoch, onlyCheckpointed: true });
+    const blocksInCheckpoints = chunkBy(blocks, block => block.header.globalVariables.slotNumber);
+    return blocksInCheckpoints.map(slotBlocks =>
+      slotBlocks.map(block => block.body.txEffects.map(txEffect => txEffect.l2ToL1Msgs)),
     );
   }
 
+  /**
+   * Returns the L2-to-L1 membership witness for a message in `txHash`. Passthrough to the
+   * archiver's locally-cached resolver — see {@link Archiver.getL2ToL1MembershipWitness}.
+   */
+  public getL2ToL1MembershipWitness(
+    txHash: TxHash,
+    message: Fr,
+    messageIndexInTx?: number,
+  ): Promise<L2ToL1MembershipWitness | undefined> {
+    return this.blockSource.getL2ToL1MembershipWitness(txHash, message, messageIndexInTx);
+  }
+
   public async getNullifierMembershipWitness(
     referenceBlock: BlockParameter,
     nullifier: Fr,
@@ -1182,49 +1629,20 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
     return preimage.leaf.value;
   }
 
-  public async getBlockHeader(block: BlockParameter = 'latest'): Promise<BlockHeader | undefined> {
-    if (BlockHash.isBlockHash(block)) {
-      const initialBlockHash = await this.#getInitialHeaderHash();
-      if (block.equals(initialBlockHash)) {
-        // Block source doesn't handle initial header so we need to handle the case separately.
-        return this.worldStateSynchronizer.getCommitted().getInitialHeader();
-      }
-      return this.blockSource.getBlockHeaderByHash(block);
-    } else {
-      // Block source doesn't handle initial header so we need to handle the case separately.
-      const blockNumber = block === 'latest' ? await this.getBlockNumber() : (block as BlockNumber);
-      if (blockNumber === BlockNumber.ZERO) {
-        return this.worldStateSynchronizer.getCommitted().getInitialHeader();
-      }
-      return this.blockSource.getBlockHeader(block);
-    }
-  }
-
-  /**
-   * Get a block header specified by its archive root.
-   * @param archive - The archive root being requested.
-   * @returns The requested block header.
-   */
-  public async getBlockHeaderByArchive(archive: Fr): Promise<BlockHeader | undefined> {
-    return await this.blockSource.getBlockHeaderByArchive(archive);
-  }
-
-  public getBlockData(number: BlockNumber): Promise<BlockData | undefined> {
-    return this.blockSource.getBlockData(number);
-  }
-
-  public getBlockDataByArchive(archive: Fr): Promise<BlockData | undefined> {
-    return this.blockSource.getBlockDataByArchive(archive);
-  }
-
   /**
    * Simulates the public part of a transaction with the current state.
    * @param tx - The transaction to simulate.
+   * @param skipFeeEnforcement - If true, fee enforcement is skipped.
+   * @param overrides - Optional pre-simulation overrides applied to the ephemeral fork and contract DB.
    **/
   @trackSpan('AztecNodeService.simulatePublicCalls', (tx: Tx) => ({
     [Attributes.TX_HASH]: tx.getTxHash().toString(),
   }))
-  public async simulatePublicCalls(tx: Tx, skipFeeEnforcement = false): Promise<PublicSimulationOutput> {
+  public async simulatePublicCalls(
+    tx: Tx,
+    skipFeeEnforcement = false,
+    overrides?: SimulationOverrides,
+  ): Promise<PublicSimulationOutput> {
     // Check total gas limit for simulation
     const gasSettings = tx.data.constants.txContext.gasSettings;
     const txGasLimit = gasSettings.gasLimits.l2Gas;
@@ -1240,18 +1658,43 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
     }
 
     const txHash = tx.getTxHash();
-    const latestBlockNumber = await this.blockSource.getBlockNumber();
+    const l2Tips = await this.blockSource.getL2Tips();
+    const latestBlockNumber = l2Tips.proposed.number;
     const blockNumber = BlockNumber.add(latestBlockNumber, 1);
 
     // If sequencer is not initialized, we just set these values to zero for simulation.
     const coinbase = EthAddress.ZERO;
     const feeRecipient = AztecAddress.ZERO;
 
-    const newGlobalVariables = await this.globalVariableBuilder.buildGlobalVariables(
-      blockNumber,
+    // Define the slot for simulation as the max of the next L1 timestamp slot, the slot after the proposed
+    // checkpoint, and the latest proposed block's slot.
+    const proposedCheckpointBlockData = await this.blockSource.getBlockData({
+      number: l2Tips.proposedCheckpoint.block.number,
+    });
+    const proposedCheckpointSlot = proposedCheckpointBlockData?.header.getSlot();
+    let slotAfterProposedCheckpoint: SlotNumber | undefined;
+    if (proposedCheckpointSlot !== undefined) {
+      slotAfterProposedCheckpoint = SlotNumber.fromBigInt(BigInt(proposedCheckpointSlot) + 1n);
+    }
+
+    let latestProposedBlockSlot: SlotNumber | undefined;
+    if (l2Tips.proposed.number > l2Tips.proposedCheckpoint.block.number) {
+      latestProposedBlockSlot = (
+        await this.blockSource.getBlockData({ number: l2Tips.proposed.number })
+      )?.header.getSlot();
+    }
+    const slotFromNextL1Timestamp = this.epochCache.getEpochAndSlotInNextL1Slot().slot;
+    const targetSlot = SlotNumber(
+      Math.max(...compactArray([slotFromNextL1Timestamp, slotAfterProposedCheckpoint, latestProposedBlockSlot])),
+    );
+
+    const checkpointGlobalVariables = await this.globalVariableBuilder.buildCheckpointGlobalVariables(
       coinbase,
       feeRecipient,
+      targetSlot,
     );
+    const newGlobalVariables = GlobalVariables.from({ blockNumber, ...checkpointGlobalVariables });
+
     const publicProcessorFactory = new PublicProcessorFactory(
       this.contractDataSource,
       new DateProvider(),
@@ -1267,40 +1710,77 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
 
     // Ensure world-state has caught up with the latest block we loaded from the archiver
     await this.worldStateSynchronizer.syncImmediate(latestBlockNumber);
-    const merkleTreeFork = await this.worldStateSynchronizer.fork();
-    try {
-      const config = PublicSimulatorConfig.from({
-        skipFeeEnforcement,
-        collectDebugLogs: true,
-        collectHints: false,
-        collectCallMetadata: true,
-        collectStatistics: false,
-        collectionLimits: CollectionLimitsConfig.from({
-          maxDebugLogMemoryReads: this.config.rpcSimulatePublicMaxDebugLogMemoryReads,
-        }),
-      });
-      const processor = publicProcessorFactory.create(merkleTreeFork, newGlobalVariables, config);
-
-      // REFACTOR: Consider merging ProcessReturnValues into ProcessedTx
-      const [processedTxs, failedTxs, _usedTxs, returns, debugLogs] = await processor.process([tx]);
-      // REFACTOR: Consider returning the error rather than throwing
-      if (failedTxs.length) {
-        this.log.warn(`Simulated tx ${txHash} fails: ${failedTxs[0].error}`, { txHash });
-        throw failedTxs[0].error;
-      }
 
-      const [processedTx] = processedTxs;
-      return new PublicSimulationOutput(
-        processedTx.revertReason,
-        processedTx.globalVariables,
-        processedTx.txEffect,
-        returns,
-        processedTx.gasUsed,
-        debugLogs,
+    // If we detect the next block would start a new checkpoint, then insert L1-to-L2 messages into
+    // the world state tree so simulation can take them into account. We detect if the next block would
+    // start a new checkpoint by checking if the proposed checkpoint's block number matches the latest block number,
+    // which means the next block would be the first block of the next checkpoint.
+    const targetCheckpoint = CheckpointNumber(
+      (l2Tips.proposedCheckpoint.checkpoint.number ?? CheckpointNumber.ZERO) + 1,
+    );
+    const nextCheckpointMessages: Fr[] | undefined =
+      l2Tips.proposedCheckpoint.block.number === l2Tips.proposed.number
+        ? await this.l1ToL2MessageSource.getL1ToL2Messages(targetCheckpoint).catch(err => {
+            if (isErrorClass(err, L1ToL2MessagesNotReadyError)) {
+              this.log.warn(
+                `L1-to-L2 messages for checkpoint ${targetCheckpoint} are not ready yet (simulating without them)`,
+              );
+            } else {
+              this.log.error(
+                `Failed to get L1-to-L2 messages for checkpoint ${targetCheckpoint} (simulating without them)`,
+                err,
+              );
+            }
+            return undefined;
+          })
+        : undefined;
+
+    // Request a new fork of the world state at the latest block number, and apply any overrides and next checkpoint messages to it before simulation
+    await using merkleTreeFork = await this.worldStateSynchronizer.fork(latestBlockNumber);
+
+    if (nextCheckpointMessages !== undefined) {
+      this.log.debug(
+        `Appending ${nextCheckpointMessages.length} L1-to-L2 messages to the world state tree for the next checkpoint`,
+        { checkpointNumber: l2Tips.proposedCheckpoint.checkpoint.number + 1 },
       );
-    } finally {
-      await merkleTreeFork.close();
+      await appendL1ToL2MessagesToTree(merkleTreeFork, nextCheckpointMessages);
     }
+    await applyPublicDataOverrides(merkleTreeFork, overrides?.publicStorage);
+
+    const config = PublicSimulatorConfig.from({
+      skipFeeEnforcement,
+      collectDebugLogs: true,
+      collectHints: false,
+      collectCallMetadata: true,
+      collectStatistics: false,
+      collectionLimits: CollectionLimitsConfig.from({
+        maxDebugLogMemoryReads: this.config.rpcSimulatePublicMaxDebugLogMemoryReads,
+      }),
+    });
+
+    const contractsDB = new PublicContractsDB(this.contractDataSource, this.log.getBindings());
+    if (overrides?.contracts) {
+      contractsDB.addContracts(Object.values(overrides.contracts).map(({ instance }) => instance));
+    }
+    const processor = publicProcessorFactory.create(merkleTreeFork, newGlobalVariables, config, contractsDB);
+
+    // REFACTOR: Consider merging ProcessReturnValues into ProcessedTx
+    const [processedTxs, failedTxs, _usedTxs, returns, debugLogs] = await processor.process([tx]);
+    // REFACTOR: Consider returning the error rather than throwing
+    if (failedTxs.length) {
+      this.log.warn(`Simulated tx ${txHash} fails: ${failedTxs[0].error}`, { txHash });
+      throw failedTxs[0].error;
+    }
+
+    const [processedTx] = processedTxs;
+    return new PublicSimulationOutput(
+      processedTx.revertReason,
+      processedTx.globalVariables,
+      processedTx.txEffect,
+      returns,
+      processedTx.gasUsed,
+      debugLogs,
+    );
   }
 
   public async isValidTx(
@@ -1308,12 +1788,15 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
     { isSimulation, skipFeeEnforcement }: { isSimulation?: boolean; skipFeeEnforcement?: boolean } = {},
   ): Promise<TxValidationResult> {
     const db = this.worldStateSynchronizer.getCommitted();
-    const verifier = isSimulation ? undefined : this.proofVerifier;
+    const verifier = isSimulation ? undefined : this.rpcProofVerifier;
 
     // We accept transactions if they are not expired by the next slot (checked based on the ExpirationTimestamp field)
     const { ts: nextSlotTimestamp } = this.epochCache.getEpochAndSlotInNextL1Slot();
     const blockNumber = BlockNumber((await this.blockSource.getBlockNumber()) + 1);
     const l1Constants = await this.blockSource.getL1Constants();
+    // Enforce the same network admission limit the node advertises in getNodeInfo (network-wide, not this
+    // node's local caps), so a tx the wallet sized against txsLimits is not rejected here.
+    const networkTxGasLimits = getNetworkTxGasLimits(this.config, l1Constants);
     const validator = createTxValidatorForAcceptingTxsOverRPC(
       db,
       this.contractDataSource,
@@ -1329,10 +1812,10 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
         ],
         gasFees: await this.getCurrentMinFees(),
         skipFeeEnforcement,
+        isSimulation,
         txsPermitted: !this.config.disableTransactions,
-        rollupManaLimit: l1Constants.rollupManaLimit,
-        maxBlockL2Gas: this.config.validateMaxL2BlockGas,
-        maxBlockDAGas: this.config.validateMaxDABlockGas,
+        maxTxL2Gas: networkTxGasLimits.l2Gas,
+        maxTxDAGas: networkTxGasLimits.daGas,
       },
       this.log.getBindings(),
     );
@@ -1348,7 +1831,18 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
 
   public async setConfig(config: Partial<AztecNodeAdminConfig>): Promise<void> {
     const newConfig = { ...this.config, ...config };
-    this.sequencer?.updateConfig(config);
+    // If the sequencer is currently paused via pauseSequencer(), record the caller's desired
+    // minTxsPerBlock as the restore value (so resumeSequencer applies it) and keep the freeze
+    // (MAX_SAFE_INTEGER) applied to the underlying sequencer. Without this guard, forwarding
+    // the new minTxsPerBlock to the sequencer would silently unpause block production while
+    // pauseSequencer() still considers it paused.
+    const sequencerUpdate = { ...config };
+    if (this.sequencerPausedMinTxsPerBlock !== undefined && sequencerUpdate.minTxsPerBlock !== undefined) {
+      this.sequencerPausedMinTxsPerBlock = sequencerUpdate.minTxsPerBlock;
+      delete sequencerUpdate.minTxsPerBlock;
+    }
+    this.sequencer?.updateConfig(sequencerUpdate);
+    this.automineSequencer?.updateConfig(sequencerUpdate);
     this.slasherClient?.updateConfig(config);
     this.validatorsSentinel?.updateConfig(config);
     await this.p2pClient.updateP2PConfig(config);
@@ -1357,7 +1851,15 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
       archiver.updateConfig(config);
     }
     if (newConfig.realProofs !== this.config.realProofs) {
-      this.proofVerifier = config.realProofs ? await BBCircuitVerifier.new(newConfig) : new TestCircuitVerifier();
+      await Promise.all([tryStop(this.peerProofVerifier), tryStop(this.rpcProofVerifier)]);
+      if (newConfig.realProofs) {
+        this.peerProofVerifier = await BatchChonkVerifier.new(newConfig, newConfig.bbChonkVerifyMaxBatch, 'peer');
+        const rpcVerifier = await BBCircuitVerifier.new(newConfig);
+        this.rpcProofVerifier = new QueuedIVCVerifier(rpcVerifier, newConfig.numConcurrentIVCVerifiers);
+      } else {
+        this.peerProofVerifier = new TestCircuitVerifier();
+        this.rpcProofVerifier = new TestCircuitVerifier();
+      }
     }
 
     this.config = newConfig;
@@ -1368,7 +1870,7 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
       classRegistry: ProtocolContractAddress.ContractClassRegistry,
       feeJuice: ProtocolContractAddress.FeeJuice,
       instanceRegistry: ProtocolContractAddress.ContractInstanceRegistry,
-      multiCallEntrypoint: ProtocolContractAddress.MultiCallEntrypoint,
+      multiCallEntrypoint: STANDARD_MULTI_CALL_ENTRYPOINT_ADDRESS,
     });
   }
 
@@ -1432,7 +1934,7 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
     return Promise.resolve();
   }
 
-  public async rollbackTo(targetBlock: BlockNumber, force?: boolean): Promise<void> {
+  public async rollbackTo(targetBlock: BlockNumber, force?: boolean, resumeSync = true): Promise<void> {
     const archiver = this.blockSource as Archiver;
     if (!('rollbackTo' in archiver)) {
       throw new Error('Archiver implementation does not support rollbacks.');
@@ -1462,9 +1964,13 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
       this.log.error(`Error during rollback`, err);
       throw err;
     } finally {
-      this.log.info(`Resuming world state and archiver sync.`);
-      this.worldStateSynchronizer.resumeSync();
-      archiver.resume();
+      if (resumeSync) {
+        this.log.info(`Resuming world state and archiver sync.`);
+        this.worldStateSynchronizer.resumeSync();
+        archiver.resume();
+      } else {
+        this.log.info(`Sync left paused after rollback (resumeSync=false).`);
+      }
     }
   }
 
@@ -1481,11 +1987,39 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
     return Promise.resolve();
   }
 
-  public getSlashPayloads(): Promise<SlashPayloadRound[]> {
-    if (!this.slasherClient) {
-      throw new Error(`Slasher client not enabled`);
+  public pauseSequencer(): Promise<void> {
+    if (this.automineSequencer) {
+      this.automineSequencer.pause();
+      return Promise.resolve();
+    }
+    if (this.sequencer) {
+      if (this.sequencerPausedMinTxsPerBlock === undefined) {
+        this.sequencerPausedMinTxsPerBlock = this.sequencer.getSequencer().getConfig().minTxsPerBlock ?? 0;
+        this.sequencer.updateConfig({ minTxsPerBlock: Number.MAX_SAFE_INTEGER });
+        this.log.info(`Sequencer paused (minTxsPerBlock set to MAX_SAFE_INTEGER)`, {
+          previousMinTxsPerBlock: this.sequencerPausedMinTxsPerBlock,
+        });
+      }
+      return Promise.resolve();
+    }
+    throw new BadRequestError('Cannot pause sequencer: no sequencer is running');
+  }
+
+  public resumeSequencer(): Promise<void> {
+    if (this.automineSequencer) {
+      this.automineSequencer.resume();
+      return Promise.resolve();
+    }
+    if (this.sequencer) {
+      if (this.sequencerPausedMinTxsPerBlock !== undefined) {
+        const restored = this.sequencerPausedMinTxsPerBlock;
+        this.sequencerPausedMinTxsPerBlock = undefined;
+        this.sequencer.updateConfig({ minTxsPerBlock: restored });
+        this.log.info(`Sequencer resumed (minTxsPerBlock restored)`, { minTxsPerBlock: restored });
+      }
+      return Promise.resolve();
     }
-    return this.slasherClient.getSlashPayloads();
+    throw new BadRequestError('Cannot resume sequencer: no sequencer is running');
   }
 
   public getSlashOffenses(round: bigint | 'all' | 'current'): Promise<Offense[]> {
@@ -1493,7 +2027,7 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
       throw new Error(`Slasher client not enabled`);
     }
     if (round === 'all') {
-      return this.slasherClient.getPendingOffenses();
+      return this.slasherClient.getOffenses();
     } else {
       return this.slasherClient.gatherOffensesForRound(round === 'current' ? undefined : BigInt(round));
     }
@@ -1587,11 +2121,49 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
     this.log.info('Keystore reloaded: coinbase, feeRecipient, and attester keys updated');
   }
 
-  #getInitialHeaderHash(): Promise<BlockHash> {
-    if (!this.initialHeaderHashPromise) {
-      this.initialHeaderHashPromise = this.worldStateSynchronizer.getCommitted().getInitialHeader().hash();
+  public async mineBlock(): Promise<void> {
+    if (this.automineSequencer) {
+      await this.automineSequencer.buildEmptyBlock();
+      return;
+    }
+    if (!this.sequencer) {
+      throw new BadRequestError('Cannot mine block: no sequencer is running');
+    }
+
+    const currentBlockNumber = await this.getBlockNumber();
+
+    // Use slot duration + 50% buffer as the timeout so this works on running networks too
+    const { slotDuration } = await this.blockSource.getL1Constants();
+    const timeoutSeconds = Math.ceil(slotDuration * 1.5);
+
+    // Temporarily set minTxsPerBlock to 0 so the sequencer produces a block even with no txs
+    const originalMinTxsPerBlock = this.sequencer.getSequencer().getConfig().minTxsPerBlock;
+    this.sequencer.updateConfig({ minTxsPerBlock: 0 });
+
+    try {
+      // Trigger the sequencer to produce a block immediately
+      void this.sequencer.trigger();
+
+      // Wait for the new L2 block to appear
+      await retryUntil(
+        async () => {
+          const newBlockNumber = await this.getBlockNumber();
+          return newBlockNumber > currentBlockNumber ? true : undefined;
+        },
+        'mineBlock',
+        timeoutSeconds,
+        0.1,
+      );
+    } finally {
+      this.sequencer.updateConfig({ minTxsPerBlock: originalMinTxsPerBlock });
+    }
+  }
+
+  public async prove(upToCheckpoint?: CheckpointNumber): Promise<CheckpointNumber> {
+    if (!this.automineSequencer) {
+      throw new BadRequestError('Cannot prove checkpoint: no automine sequencer is running');
     }
-    return this.initialHeaderHashPromise;
+    return await this.automineSequencer.prove(upToCheckpoint);
   }
 
   /**
@@ -1600,54 +2172,52 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
    * @returns An instance of a committed MerkleTreeOperations
    */
   protected async getWorldState(block: BlockParameter) {
+    const query = this.normalizeBlockParameter(block);
+
+    // When the request anchors on a specific block hash, resolve it against the archiver up front and
+    // drive the world-state sync to that exact block number and hash. Resolving against the archiver
+    // first fails fast with a clear reorg error if the hash is unknown, and passing the hash to the
+    // synchronizer makes the sync reorg-aware: it barriers until the archive-tree commit for that block
+    // has landed and verifies it matches the requested fork, instead of syncing to bare latest height
+    // and then racing the snapshot read below against an in-flight archive-tree write.
+    const requestedHash = 'hash' in query ? query.hash : undefined;
+    const anchorBlockNumber = requestedHash !== undefined ? await this.resolveBlockNumber(query) : undefined;
+
     let blockSyncedTo: BlockNumber = BlockNumber.ZERO;
     try {
       // Attempt to sync the world state if necessary
-      blockSyncedTo = await this.#syncWorldState();
+      blockSyncedTo = await this.#syncWorldState(anchorBlockNumber, requestedHash);
     } catch (err) {
       this.log.error(`Error getting world state: ${err}`);
     }
 
-    if (block === 'latest') {
-      this.log.debug(`Using committed db for block 'latest', world state synced upto ${blockSyncedTo}`);
+    if ('tag' in query && query.tag === 'proposed') {
+      this.log.debug(`Using committed db for latest block, world state synced upto ${blockSyncedTo}`);
       return this.worldStateSynchronizer.getCommitted();
     }
 
-    // Get the block number, either directly from the parameter or by quering the archiver with the block hash
-    let blockNumber: BlockNumber;
-    if (BlockHash.isBlockHash(block)) {
-      const initialBlockHash = await this.#getInitialHeaderHash();
-      if (block.equals(initialBlockHash)) {
-        // Block source doesn't handle initial header so we need to handle the case separately.
-        return this.worldStateSynchronizer.getSnapshot(BlockNumber.ZERO);
-      }
-
-      const header = await this.blockSource.getBlockHeaderByHash(block);
-      if (!header) {
-        throw new Error(
-          `Block hash ${block.toString()} not found when querying world state. If the node API has been queried with anchor block hash possibly a reorg has occurred.`,
-        );
-      }
-
-      blockNumber = header.getBlockNumber();
-    } else {
-      blockNumber = block as BlockNumber;
-    }
+    const blockNumber = anchorBlockNumber ?? (await this.resolveBlockNumber(query));
 
     // Check it's within world state sync range
     if (blockNumber > blockSyncedTo) {
-      throw new Error(`Queried block ${block} not yet synced by the node (node is synced upto ${blockSyncedTo}).`);
+      throw new Error(
+        `Queried block ${inspectBlockParameter(block)} not yet synced by the node (node is synced upto ${blockSyncedTo}).`,
+      );
     }
     this.log.debug(`Using snapshot for block ${blockNumber}, world state synced upto ${blockSyncedTo}`);
 
     const snapshot = this.worldStateSynchronizer.getSnapshot(blockNumber);
 
-    // Double-check world-state synced to the same block hash as was requested
-    if (BlockHash.isBlockHash(block)) {
+    // Double-check world-state synced to the same block hash as was requested.
+    // Block 0 is skipped: the snapshot returned by `getSnapshot(0)` is the *pre*-genesis archive
+    // (size 0), so leaf 0 is not yet inserted from that snapshot's view even though block 0's hash
+    // does live at archive index 0 in the committed tree. The genesis hash is already validated by
+    // the archiver when it resolves the hash query to block number 0.
+    if (requestedHash !== undefined && blockNumber !== BlockNumber.ZERO) {
       const blockHash = await snapshot.getLeafValue(MerkleTreeId.ARCHIVE, BigInt(blockNumber));
-      if (!blockHash || !new BlockHash(blockHash).equals(block)) {
+      if (!blockHash || !requestedHash.equals(blockHash)) {
         throw new Error(
-          `Block hash ${block.toString()} not found in world state at block number ${blockNumber}. If the node API has been queried with anchor block hash possibly a reorg has occurred.`,
+          `Block hash ${requestedHash.toString()} not found in world state at block number ${blockNumber} (world state has ${blockHash?.toString() ?? 'no hash'} at that index, genesis header hash is ${this.blockSource.getGenesisBlockHash().toString()}). If the node API has been queried with anchor block hash possibly a reorg has occurred.`,
         );
       }
     }
@@ -1655,12 +2225,33 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
     return snapshot;
   }
 
+  /** Resolves any {@link BlockParameter} variant to a concrete block number. */
+  protected async resolveBlockNumber(block: BlockParameter): Promise<BlockNumber> {
+    const query = this.normalizeBlockParameter(block);
+    const blockNumber = await this.blockSource.getBlockNumber(query);
+    if (blockNumber === undefined) {
+      if ('hash' in query) {
+        throw new Error(
+          `Block hash ${query.hash.toString()} not found when querying world state. If the node API has been queried with anchor block hash possibly a reorg has occurred.`,
+        );
+      }
+      if ('archive' in query) {
+        throw new Error(`Block with archive ${query.archive.toString()} not found.`);
+      }
+      throw new Error(`Block not found for ${inspectBlockParameter(block)}.`);
+    }
+    return blockNumber;
+  }
+
   /**
-   * Ensure we fully sync the world state
+   * Ensure the world state is synced.
+   * @param targetBlockNumber - Block to sync up to. Defaults to the latest block known to the archiver.
+   * @param blockHash - If provided, the synchronizer verifies the block at `targetBlockNumber` matches this
+   * hash, resyncing (and so detecting reorgs) if it does not yet match or has been reorged away.
    * @returns A promise that fulfils once the world state is synced
    */
-  async #syncWorldState(): Promise<BlockNumber> {
-    const blockSourceHeight = await this.blockSource.getBlockNumber();
-    return await this.worldStateSynchronizer.syncImmediate(blockSourceHeight);
+  async #syncWorldState(targetBlockNumber?: BlockNumber, blockHash?: BlockHash): Promise<BlockNumber> {
+    const target = targetBlockNumber ?? (await this.blockSource.getBlockNumber());
+    return await this.worldStateSynchronizer.syncImmediate(target, blockHash);
   }
 }