@aztec/aztec-node 6.0.0-nightly.20260810 → 6.0.0-nightly.20260821

package/src/factory.ts

@@ -402,16 +402,22 @@ export async function createAztecNodeService(
     }
 
     if (collectOffenses) {
-      dataWithholdingWatcher = new DataWithholdingWatcher(
-        epochCache,
-        archiver,
-        p2pClient.getTxProvider(),
-        p2pClient,
-        reexecutionTracker,
-        { chainId: config.l1ChainId, rollupAddress: config.rollupAddress },
-        config,
-      );
-      watchers.push(dataWithholdingWatcher);
+      // The watcher's only evidence is the absence of gossiped txs in the local pool, so it cannot make a
+      // valid claim on a node that runs no p2p stack at all. Skipped entirely rather than gated at runtime.
+      if (config.p2pEnabled) {
+        dataWithholdingWatcher = new DataWithholdingWatcher(
+          epochCache,
+          archiver,
+          p2pClient.getTxProvider(),
+          p2pClient,
+          reexecutionTracker,
+          { chainId: config.l1ChainId, rollupAddress: config.rollupAddress },
+          config,
+        );
+        watchers.push(dataWithholdingWatcher);
+      } else {
+        log.verbose('Skipping data-withholding watcher since p2p is disabled');
+      }
 
       broadcastedInvalidCheckpointProposalWatcher = new BroadcastedInvalidCheckpointProposalWatcher(
         p2pClient,

package/src/modules/node_world_state_queries.ts

@@ -1,5 +1,5 @@
 import { ARCHIVE_HEIGHT, type L1_TO_L2_MSG_TREE_HEIGHT, type NOTE_HASH_TREE_HEIGHT } from '@aztec/constants';
-import { BlockNumber, type CheckpointNumber, type EpochNumber } from '@aztec/foundation/branded-types';
+import { BlockNumber, type EpochNumber } from '@aztec/foundation/branded-types';
 import { chunkBy } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { type Logger, createLogger } from '@aztec/foundation/log';
@@ -16,7 +16,7 @@ import {
 } from '@aztec/stdlib/block';
 import { computePublicDataTreeLeafSlot } from '@aztec/stdlib/hash';
 import type { WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
-import { InboxLeaf, type L1ToL2MessageSource, type L2ToL1MembershipWitness } from '@aztec/stdlib/messaging';
+import type { L1ToL2MessageSource, L2ToL1MembershipWitness } from '@aztec/stdlib/messaging';
 import {
   MerkleTreeId,
   type NullifierLeafPreimage,
@@ -177,9 +177,8 @@ export class NodeWorldStateQueries {
     return [witness.index, witness.path];
   }
 
-  public async getL1ToL2MessageCheckpoint(l1ToL2Message: Fr): Promise<CheckpointNumber | undefined> {
-    const messageIndex = await this.l1ToL2MessageSource.getL1ToL2MessageIndex(l1ToL2Message);
-    return messageIndex !== undefined ? InboxLeaf.checkpointNumberFromIndex(messageIndex) : undefined;
+  public getL1ToL2MessageIndex(l1ToL2Message: Fr): Promise<bigint | undefined> {
+    return this.l1ToL2MessageSource.getL1ToL2MessageIndex(l1ToL2Message);
   }
 
   /**