@aztec/aztec-node 5.0.0-nightly.20260421 → 5.0.0-nightly.20260423

package/src/aztec-node/server.ts

@@ -313,326 +313,344 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDeb
 
     const epochCache = await EpochCache.create(config.l1Contracts.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.genesis, telemetry);
-    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);
-    }
-
-    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',
+    // Track started resources so we can clean up on partial failure during node creation.
+    const started: { stop?(): Promise<void> | void }[] = [];
+    try {
+      const archiver = await createArchiver(
+        config,
+        { blobClient, epochCache, telemetry, dateProvider },
+        { blockUntilSync: !config.skipArchiverInitialSync },
       );
-    } else {
-      debugLogStore = new NullDebugLogStore();
-    }
-
-    const proverOnly = config.enableProverNode && config.disableValidator;
-    if (proverOnly) {
-      log.info('Starting in prover-only mode: skipping validator, sequencer, sentinel, and slasher subsystems');
-    }
+      started.push(archiver);
+
+      // now create the merkle trees and the world state synchronizer
+      const worldStateSynchronizer = await createWorldStateSynchronizer(config, archiver, options.genesis, 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,
-      peerProofVerifier,
-      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 = {
+        l1Contracts: config.l1Contracts,
+        ethereumSlotDuration: config.ethereumSlotDuration,
+        rollupVersion: BigInt(config.rollupVersion),
         l1GenesisTime,
         slotDuration: Number(slotDuration),
-        rollupManaLimit,
-        maxTxsPerCheckpoint: config.validateMaxTxsPerCheckpoint,
-      },
-      worldStateSynchronizer,
-      archiver,
-      dateProvider,
-      telemetry,
-    );
-
-    let validatorClient: ValidatorClient | undefined;
-
-    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,
-        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);
+      const globalVariableBuilder = new GlobalVariableBuilder(dateProvider, publicClient, globalVariableBuilderConfig);
+      const feeProvider = new FeeProviderImpl(dateProvider, publicClient, globalVariableBuilderConfig);
 
-        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 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,
+      // 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,
-        blobClient,
+        feeProvider,
+        packageVersion,
         dateProvider,
         telemetry,
-      }).register(p2pClient, reexecute, archiver);
-    }
-
-    // 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();
+        deps.p2pClientDeps,
+      );
+      started.push(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,
+      );
 
-    let validatorsSentinel: Awaited<ReturnType<typeof createSentinel>> | undefined;
-    let epochPruneWatcher: EpochPruneWatcher | undefined;
-    let attestationsBlockWatcher: AttestationsBlockWatcher | undefined;
+      let validatorClient: ValidatorClient | undefined;
 
-    if (!proverOnly) {
-      validatorsSentinel = await createSentinel(epochCache, archiver, p2pClient, config);
-      if (validatorsSentinel && config.slashInactivityPenalty > 0n) {
-        watchers.push(validatorsSentinel);
+      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,
+          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 (config.slashPrunePenalty > 0n || config.slashDataWithholdingPenalty > 0n) {
-        epochPruneWatcher = new EpochPruneWatcher(
-          archiver,
-          archiver,
+      // 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,
-          p2pClient.getTxProvider(),
-          validatorCheckpointsBuilder,
-          config,
-        );
-        watchers.push(epochPruneWatcher);
+          blockSource: archiver,
+          l1ToL2MessageSource: archiver,
+          p2pClient,
+          blobClient,
+          dateProvider,
+          telemetry,
+        }).register(p2pClient, reexecute, archiver);
       }
 
-      // 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);
-        watchers.push(attestationsBlockWatcher);
-      }
-    }
+      // Start world state and wait for it to sync to the archiver.
+      await worldStateSynchronizer.start();
 
-    // Start p2p-related services once the archiver has completed sync
-    void archiver
-      .waitForInitialSync()
-      .then(async () => {
-        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));
-
-    const globalVariableBuilderConfig = {
-      l1Contracts: config.l1Contracts,
-      ethereumSlotDuration: config.ethereumSlotDuration,
-      rollupVersion: BigInt(config.rollupVersion),
-      l1GenesisTime,
-      slotDuration: Number(slotDuration),
-    };
+      // Start p2p. Note that it depends on world state to be running.
+      await p2pClient.start();
 
-    const globalVariableBuilder = new GlobalVariableBuilder(dateProvider, publicClient, globalVariableBuilderConfig);
-    const feeProvider = new FeeProviderImpl(dateProvider, publicClient, globalVariableBuilderConfig);
+      let validatorsSentinel: Awaited<ReturnType<typeof createSentinel>> | undefined;
+      let epochPruneWatcher: EpochPruneWatcher | undefined;
+      let attestationsBlockWatcher: AttestationsBlockWatcher | undefined;
 
-    // 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()
-        : [];
+      if (!proverOnly) {
+        validatorsSentinel = await createSentinel(epochCache, archiver, p2pClient, config);
+        if (validatorsSentinel && config.slashInactivityPenalty > 0n) {
+          watchers.push(validatorsSentinel);
+        }
 
-      slasherClient = await createSlasher(
-        config,
-        config.l1Contracts,
-        getPublicClient(config),
-        watchers,
-        dateProvider,
-        epochCache,
-        validatorAddresses,
-        undefined, // logger
-      );
-      await slasherClient.start();
+        if (config.slashPrunePenalty > 0n || config.slashDataWithholdingPenalty > 0n) {
+          epochPruneWatcher = new EpochPruneWatcher(
+            archiver,
+            archiver,
+            epochCache,
+            p2pClient.getTxProvider(),
+            validatorCheckpointsBuilder,
+            config,
+          );
+          watchers.push(epochPruneWatcher);
+        }
 
-      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(
+        // 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);
+          watchers.push(attestationsBlockWatcher);
+        }
+      }
+
+      // Start p2p-related services once the archiver has completed sync
+      void archiver
+        .waitForInitialSync()
+        .then(async () => {
+          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();
+        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 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,
-          [fundingSigner],
-          { ...config, scope: 'sequencer' },
-          { telemetry, logger: log.createChild('l1-tx-utils:funder'), dateProvider },
+        // Create and start the sequencer client
+        const checkpointsBuilder = new CheckpointsBuilder(
+          { ...config, l1GenesisTime, slotDuration: Number(slotDuration), rollupManaLimit },
+          worldStateSynchronizer,
+          archiver,
+          dateProvider,
+          telemetry,
+          debugLogStore,
         );
-        funderL1TxUtils = funder;
+
+        sequencer = await SequencerClient.new(config, {
+          ...deps,
+          epochCache,
+          l1TxUtils,
+          funderL1TxUtils,
+          validatorClient,
+          p2pClient,
+          worldStateSynchronizer,
+          slasherClient,
+          checkpointsBuilder,
+          l2BlockSource: archiver,
+          l1ToL2MessageSource: archiver,
+          telemetry,
+          dateProvider,
+          blobClient,
+          nodeKeyStore: keyStoreManager!,
+          globalVariableBuilder,
+        });
       }
 
-      // Create and start the sequencer client
-      const checkpointsBuilder = new CheckpointsBuilder(
-        { ...config, l1GenesisTime, slotDuration: Number(slotDuration), rollupManaLimit },
-        worldStateSynchronizer,
-        archiver,
-        dateProvider,
-        telemetry,
-        debugLogStore,
-      );
+      if (!options.dontStartSequencer && sequencer) {
+        await sequencer.start();
+        started.push(sequencer);
+        log.verbose(`Sequencer started`);
+      } else if (sequencer) {
+        log.warn(`Sequencer created but not started`);
+      }
 
-      sequencer = await SequencerClient.new(config, {
-        ...deps,
-        epochCache,
-        l1TxUtils,
-        funderL1TxUtils,
-        validatorClient,
+      // 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,
+        sequencer,
+        proverNode,
         slasherClient,
-        checkpointsBuilder,
-        l2BlockSource: archiver,
-        l1ToL2MessageSource: archiver,
-        telemetry,
-        dateProvider,
-        blobClient,
-        nodeKeyStore: keyStoreManager!,
+        validatorsSentinel,
+        epochPruneWatcher,
+        ethereumChain.chainInfo.id,
+        config.rollupVersion,
         globalVariableBuilder,
-      });
-    }
-
-    if (!options.dontStartSequencer && sequencer) {
-      await sequencer.start();
-      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,
-        archiver,
-        worldStateSynchronizer,
-        p2pClient,
+        feeProvider,
         epochCache,
+        packageVersion,
+        peerProofVerifier,
+        rpcProofVerifier,
+        telemetry,
+        log,
         blobClient,
+        validatorClient,
         keyStoreManager,
-      });
+        debugLogStore,
+      );
 
-      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 node = new AztecNodeService(
-      config,
-      p2pClient,
-      archiver,
-      archiver,
-      archiver,
-      archiver,
-      worldStateSynchronizer,
-      sequencer,
-      proverNode,
-      slasherClient,
-      validatorsSentinel,
-      epochPruneWatcher,
-      ethereumChain.chainInfo.id,
-      config.rollupVersion,
-      globalVariableBuilder,
-      feeProvider,
-      epochCache,
-      packageVersion,
-      peerProofVerifier,
-      rpcProofVerifier,
-      telemetry,
-      log,
-      blobClient,
-      validatorClient,
-      keyStoreManager,
-      debugLogStore,
-    );
-
-    return node;
   }
 
   /**
@@ -1714,18 +1732,19 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDeb
     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.`,
-        );
+        // Block 0 is a first-class historical block: its state lives in the trees' persisted
+        // block-0 payload. Resolving the genesis hash to block number 0 lets the snapshot path
+        // pin reads to genesis state even after the node has advanced past it.
+        blockNumber = BlockNumber.ZERO;
+      } else {
+        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();
       }
-
-      blockNumber = header.getBlockNumber();
     } else {
       blockNumber = block as BlockNumber;
     }
@@ -1742,8 +1761,9 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDeb
     if (BlockHash.isBlockHash(block)) {
       const blockHash = await snapshot.getLeafValue(MerkleTreeId.ARCHIVE, BigInt(blockNumber));
       if (!blockHash || !block.equals(blockHash)) {
+        const initialBlockHash = await this.#getInitialHeaderHash();
         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 ${block.toString()} not found in world state at block number ${blockNumber} (world state has ${blockHash?.toString() ?? 'no hash'} at that index, genesis header hash is ${initialBlockHash.toString()}). If the node API has been queried with anchor block hash possibly a reorg has occurred.`,
         );
       }
     }