@aztec/p2p 0.0.1-commit.d1f2d6c → 0.0.1-commit.d431d1c

package/src/services/libp2p/libp2p_service.ts

@@ -8,7 +8,7 @@ import { Timer } from '@aztec/foundation/timer';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
 import { protocolContractsHash } from '@aztec/protocol-contracts';
-import type { EthAddress, L2Block, L2BlockSource } from '@aztec/stdlib/block';
+import type { EthAddress, L2BlockNew, L2BlockSource } from '@aztec/stdlib/block';
 import type { ContractDataSource } from '@aztec/stdlib/contract';
 import { GasFees } from '@aztec/stdlib/gas';
 import type { ClientProtocolCircuitVerifier, PeerInfo, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
@@ -20,7 +20,6 @@ import {
   type Gossipable,
   P2PClientType,
   P2PMessage,
-  type ValidationResult as P2PValidationResult,
   PeerErrorSeverity,
   TopicType,
   createTopicString,
@@ -925,8 +924,7 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
     const validationFunc: () => Promise<ReceivedMessageValidationResult<CheckpointAttestation>> = async () => {
       const attestation = CheckpointAttestation.fromBuffer(payloadData);
       const pool = this.mempools.attestationPool;
-      const validationResult = await this.validateCheckpointAttestation(source, attestation);
-      const isValid = validationResult.result === 'accept';
+      const isValid = await this.validateCheckpointAttestation(source, attestation);
       const exists = isValid && (await pool.hasCheckpointAttestation(attestation));
 
       let canAdd = true;
@@ -945,9 +943,9 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
         [Attributes.P2P_ID]: source.toString(),
       });
 
-      if (validationResult.result === 'reject') {
+      if (!isValid) {
         return { result: TopicValidatorResult.Reject };
-      } else if (validationResult.result === 'ignore' || exists) {
+      } else if (exists) {
         return { result: TopicValidatorResult.Ignore, obj: attestation };
       } else if (!canAdd) {
         this.logger.warn(`Dropping checkpoint attestation due to per-(slot, proposalId) attestation cap`, {
@@ -988,8 +986,7 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
   private async processBlockFromPeer(payloadData: Buffer, msgId: string, source: PeerId): Promise<void> {
     const validationFunc: () => Promise<ReceivedMessageValidationResult<BlockProposal>> = async () => {
       const block = BlockProposal.fromBuffer(payloadData);
-      const validationResult = await this.validateBlockProposal(source, block);
-      const isValid = validationResult.result === 'accept';
+      const isValid = await this.validateBlockProposal(source, block);
       const pool = this.mempools.attestationPool;
 
       const exists = isValid && (await pool.hasBlockProposal(block));
@@ -1003,9 +1000,9 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
         [Attributes.P2P_ID]: source.toString(),
       });
 
-      if (validationResult.result === 'reject') {
+      if (!isValid) {
         return { result: TopicValidatorResult.Reject };
-      } else if (validationResult.result === 'ignore' || exists) {
+      } else if (exists) {
         return { result: TopicValidatorResult.Ignore, obj: block };
       } else if (!canAdd) {
         this.peerManager.penalizePeer(source, PeerErrorSeverity.MidToleranceError);
@@ -1085,8 +1082,7 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
     // TODO(palla/mbps): This pattern is repeated across multiple message handlers, consider abstracting it.
     const validationFunc: () => Promise<ReceivedMessageValidationResult<CheckpointProposal>> = async () => {
       const checkpoint = CheckpointProposal.fromBuffer(payloadData);
-      const validationResult = await this.validateCheckpointProposal(source, checkpoint);
-      const isValid = validationResult.result === 'accept';
+      const isValid = await this.validateCheckpointProposal(source, checkpoint);
       const pool = this.mempools.attestationPool;
 
       const exists = isValid && (await pool.hasCheckpointProposal(checkpoint));
@@ -1100,9 +1096,9 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
         [Attributes.P2P_ID]: source.toString(),
       });
 
-      if (validationResult.result === 'reject') {
+      if (!isValid) {
         return { result: TopicValidatorResult.Reject };
-      } else if (validationResult.result === 'ignore' || exists) {
+      } else if (exists) {
         return { result: TopicValidatorResult.Ignore, obj: checkpoint };
       } else if (!canAdd) {
         this.peerManager.penalizePeer(source, PeerErrorSeverity.MidToleranceError);
@@ -1341,7 +1337,7 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
   }))
   private async validateRequestedBlock(
     requestedBlockNumber: Fr,
-    responseBlock: L2Block,
+    responseBlock: L2BlockNew,
     peerId: PeerId,
   ): Promise<boolean> {
     try {
@@ -1580,18 +1576,15 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
     [Attributes.BLOCK_ARCHIVE]: attestation.archive.toString(),
     [Attributes.P2P_ID]: await attestation.p2pMessageLoggingIdentifier().then(i => i.toString()),
   }))
-  public async validateCheckpointAttestation(
-    peerId: PeerId,
-    attestation: CheckpointAttestation,
-  ): Promise<P2PValidationResult> {
-    const result = await this.checkpointAttestationValidator.validate(attestation);
-
-    if (result.result === 'reject') {
+  public async validateCheckpointAttestation(peerId: PeerId, attestation: CheckpointAttestation): Promise<boolean> {
+    const severity = await this.checkpointAttestationValidator.validate(attestation);
+    if (severity) {
       this.logger.debug(`Penalizing peer ${peerId} for checkpoint attestation validation failure`);
-      this.peerManager.penalizePeer(peerId, result.severity);
+      this.peerManager.penalizePeer(peerId, severity);
+      return false;
     }
 
-    return result;
+    return true;
   }
 
   /**
@@ -1603,15 +1596,15 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
   @trackSpan('Libp2pService.validateBlockProposal', (_peerId, block) => ({
     [Attributes.SLOT_NUMBER]: block.slotNumber.toString(),
   }))
-  public async validateBlockProposal(peerId: PeerId, block: BlockProposal): Promise<P2PValidationResult> {
-    const result = await this.blockProposalValidator.validate(block);
-
-    if (result.result === 'reject') {
+  public async validateBlockProposal(peerId: PeerId, block: BlockProposal): Promise<boolean> {
+    const severity = await this.blockProposalValidator.validate(block);
+    if (severity) {
       this.logger.debug(`Penalizing peer ${peerId} for block proposal validation failure`);
-      this.peerManager.penalizePeer(peerId, result.severity);
+      this.peerManager.penalizePeer(peerId, severity);
+      return false;
     }
 
-    return result;
+    return true;
   }
 
   /**
@@ -1623,18 +1616,15 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
   @trackSpan('Libp2pService.validateCheckpointProposal', (_peerId, checkpoint) => ({
     [Attributes.SLOT_NUMBER]: checkpoint.slotNumber.toString(),
   }))
-  public async validateCheckpointProposal(
-    peerId: PeerId,
-    checkpoint: CheckpointProposal,
-  ): Promise<P2PValidationResult> {
-    const result = await this.checkpointProposalValidator.validate(checkpoint);
-
-    if (result.result === 'reject') {
+  public async validateCheckpointProposal(peerId: PeerId, checkpoint: CheckpointProposal): Promise<boolean> {
+    const severity = await this.checkpointProposalValidator.validate(checkpoint);
+    if (severity) {
       this.logger.debug(`Penalizing peer ${peerId} for checkpoint proposal validation failure`);
-      this.peerManager.penalizePeer(peerId, result.severity);
+      this.peerManager.penalizePeer(peerId, severity);
+      return false;
     }
 
-    return result;
+    return true;
   }
 
   public getPeerScore(peerId: PeerId): number {

package/src/services/reqresp/interface.ts

@@ -1,5 +1,5 @@
 import { Fr } from '@aztec/foundation/curves/bn254';
-import { L2Block } from '@aztec/stdlib/block';
+import { L2BlockNew } from '@aztec/stdlib/block';
 import { TxArray, TxHashArray } from '@aztec/stdlib/tx';
 
 import type { PeerId } from '@libp2p/interface';
@@ -198,7 +198,7 @@ export const subProtocolMap = {
   },
   [ReqRespSubProtocol.BLOCK]: {
     request: Fr, // block number
-    response: L2Block,
+    response: L2BlockNew,
   },
   [ReqRespSubProtocol.AUTH]: {
     request: AuthRequest,

package/src/services/tx_collection/slow_tx_collection.ts

@@ -4,7 +4,7 @@ import { type Logger, createLogger } from '@aztec/foundation/log';
 import { boundInclusive } from '@aztec/foundation/number';
 import { RunningPromise } from '@aztec/foundation/promise';
 import { DateProvider } from '@aztec/foundation/timer';
-import type { L2Block } from '@aztec/stdlib/block';
+import type { L2BlockNew } from '@aztec/stdlib/block';
 import { type L1RollupConstants, getEpochAtSlot, getTimestampRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
 import { type Tx, TxHash } from '@aztec/stdlib/tx';
 
@@ -76,7 +76,7 @@ export class SlowTxCollection {
   }
 
   /** Starts collecting the given tx hashes for the given L2Block in the slow loop */
-  public startCollecting(block: L2Block, txHashes: TxHash[]) {
+  public startCollecting(block: L2BlockNew, txHashes: TxHash[]) {
     const slot = block.header.getSlot();
     const deadline = this.getDeadlineForSlot(slot);
     if (+deadline < this.dateProvider.now()) {

package/src/services/tx_collection/tx_collection.ts

@@ -3,7 +3,7 @@ import { compactArray } from '@aztec/foundation/collection';
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import { type PromiseWithResolvers, RunningPromise } from '@aztec/foundation/promise';
 import { DateProvider } from '@aztec/foundation/timer';
-import type { L2Block, L2BlockInfo } from '@aztec/stdlib/block';
+import type { L2BlockInfo, L2BlockNew } from '@aztec/stdlib/block';
 import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
 import type { BlockProposal } from '@aztec/stdlib/p2p';
 import { Tx, TxHash } from '@aztec/stdlib/tx';
@@ -25,7 +25,7 @@ export type CollectionMethod = 'fast-req-resp' | 'fast-node-rpc' | 'slow-req-res
 export type MissingTxInfo = { blockNumber: BlockNumber; deadline: Date; readyForReqResp: boolean };
 
 export type FastCollectionRequestInput =
-  | { type: 'block'; block: L2Block }
+  | { type: 'block'; block: L2BlockNew }
   | { type: 'proposal'; blockProposal: BlockProposal; blockNumber: BlockNumber };
 
 export type FastCollectionRequest = FastCollectionRequestInput & {
@@ -146,7 +146,7 @@ export class TxCollection {
   }
 
   /** Starts collecting the given tx hashes for the given L2Block in the slow loop */
-  public startCollecting(block: L2Block, txHashes: TxHash[]) {
+  public startCollecting(block: L2BlockNew, txHashes: TxHash[]) {
     return this.slowCollection.startCollecting(block, txHashes);
   }
 
@@ -162,7 +162,7 @@ export class TxCollection {
 
   /** Collects the set of txs for the given mined block as fast as possible */
   public collectFastForBlock(
-    block: L2Block,
+    block: L2BlockNew,
     txHashes: TxHash[] | string[],
     opts: { deadline: Date; pinnedPeer?: PeerId },
   ) {

package/src/services/tx_provider.ts

@@ -2,7 +2,7 @@ import { BlockNumber } from '@aztec/foundation/branded-types';
 import { compactArray } from '@aztec/foundation/collection';
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import { elapsed } from '@aztec/foundation/timer';
-import type { L2Block, L2BlockInfo } from '@aztec/stdlib/block';
+import type { L2BlockInfo, L2BlockNew } from '@aztec/stdlib/block';
 import type { ITxProvider } from '@aztec/stdlib/interfaces/server';
 import type { BlockProposal } from '@aztec/stdlib/p2p';
 import { Tx, TxHash } from '@aztec/stdlib/tx';
@@ -68,7 +68,7 @@ export class TxProvider implements ITxProvider {
   }
 
   /** Gathers txs from the tx pool, remote rpc nodes, and reqresp. */
-  public getTxsForBlock(block: L2Block, opts: { deadline: Date }): Promise<{ txs: Tx[]; missingTxs: TxHash[] }> {
+  public getTxsForBlock(block: L2BlockNew, opts: { deadline: Date }): Promise<{ txs: Tx[]; missingTxs: TxHash[] }> {
     return this.getOrderedTxsFromAllSources(
       { type: 'block', block },
       block.toBlockInfo(),

package/src/testbench/p2p_client_testbench_worker.ts

@@ -89,7 +89,7 @@ function mockEpochCache(): EpochCacheInterface {
   return {
     getCommittee: () => Promise.resolve({ committee: [], seed: 1n, epoch: EpochNumber.ZERO, isEscapeHatchOpen: false }),
     getProposerIndexEncoding: () => '0x' as `0x${string}`,
-    getEpochAndSlotNow: () => ({ epoch: EpochNumber.ZERO, slot: SlotNumber.ZERO, ts: 0n, nowMs: 0n }),
+    getEpochAndSlotNow: () => ({ epoch: EpochNumber.ZERO, slot: SlotNumber.ZERO, ts: 0n }),
     computeProposerIndex: () => 0n,
     getCurrentAndNextSlot: () => ({
       currentSlot: SlotNumber.ZERO,

package/dest/msg_validators/clock_tolerance.d.ts

@@ -1,21 +0,0 @@
-import type { EpochCacheInterface } from '@aztec/epoch-cache';
-import { SlotNumber } from '@aztec/foundation/branded-types';
-/**
- * Maximum clock disparity tolerance for P2P message validation (in milliseconds).
- * Messages for the previous slot are accepted if we're within this many milliseconds
- * of the current slot start. This prevents penalizing peers for messages that
- * were valid when sent but arrived slightly late due to network latency.
- *
- * This follows Ethereum's MAXIMUM_GOSSIP_CLOCK_DISPARITY approach.
- */
-export declare const MAXIMUM_GOSSIP_CLOCK_DISPARITY_MS = 500;
-/**
- * Checks if a message for the previous slot should be accepted due to clock tolerance.
- *
- * @param messageSlot - The slot number from the received message
- * @param currentSlot - The current slot number
- * @param epochCache - EpochCache to get timing information
- * @returns true if the message is for the previous slot AND we're within the clock tolerance window
- */
-export declare function isWithinClockTolerance(messageSlot: SlotNumber, currentSlot: SlotNumber, epochCache: EpochCacheInterface): boolean;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xvY2tfdG9sZXJhbmNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvY2xvY2tfdG9sZXJhbmNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDOUQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRTdEOzs7Ozs7O0dBT0c7QUFDSCxlQUFPLE1BQU0saUNBQWlDLE1BQU0sQ0FBQztBQUVyRDs7Ozs7OztHQU9HO0FBQ0gsd0JBQWdCLHNCQUFzQixDQUNwQyxXQUFXLEVBQUUsVUFBVSxFQUN2QixXQUFXLEVBQUUsVUFBVSxFQUN2QixVQUFVLEVBQUUsbUJBQW1CLEdBQzlCLE9BQU8sQ0F5QlQifQ==

package/dest/msg_validators/clock_tolerance.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"clock_tolerance.d.ts","sourceRoot":"","sources":["../../src/msg_validators/clock_tolerance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE7D;;;;;;;GAOG;AACH,eAAO,MAAM,iCAAiC,MAAM,CAAC;AAErD;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,UAAU,EACvB,WAAW,EAAE,UAAU,EACvB,UAAU,EAAE,mBAAmB,GAC9B,OAAO,CAyBT"}

package/dest/msg_validators/clock_tolerance.js

@@ -1,37 +0,0 @@
-import { SlotNumber } from '@aztec/foundation/branded-types';
-/**
- * Maximum clock disparity tolerance for P2P message validation (in milliseconds).
- * Messages for the previous slot are accepted if we're within this many milliseconds
- * of the current slot start. This prevents penalizing peers for messages that
- * were valid when sent but arrived slightly late due to network latency.
- *
- * This follows Ethereum's MAXIMUM_GOSSIP_CLOCK_DISPARITY approach.
- */ export const MAXIMUM_GOSSIP_CLOCK_DISPARITY_MS = 500;
-/**
- * Checks if a message for the previous slot should be accepted due to clock tolerance.
- *
- * @param messageSlot - The slot number from the received message
- * @param currentSlot - The current slot number
- * @param epochCache - EpochCache to get timing information
- * @returns true if the message is for the previous slot AND we're within the clock tolerance window
- */ export function isWithinClockTolerance(messageSlot, currentSlot, epochCache) {
-    // Guard against slot 0 edge case (genesis)
-    if (currentSlot === SlotNumber.ZERO) {
-        return false;
-    }
-    // Only apply tolerance to messages for the previous slot
-    const previousSlot = SlotNumber(currentSlot - 1);
-    if (messageSlot !== previousSlot) {
-        return false;
-    }
-    // Check how far we are into the current slot (in milliseconds)
-    const { ts: slotStartTs, nowMs, slot } = epochCache.getEpochAndSlotNow();
-    // Sanity check: ensure the epoch cache's current slot matches the expected current slot
-    if (slot !== currentSlot) {
-        return false;
-    }
-    // ts is in seconds, convert to ms; nowMs is already in milliseconds
-    const slotStartMs = slotStartTs * 1000n;
-    const elapsedMs = Number(nowMs - slotStartMs);
-    return elapsedMs < MAXIMUM_GOSSIP_CLOCK_DISPARITY_MS;
-}

package/src/msg_validators/clock_tolerance.ts

@@ -1,51 +0,0 @@
-import type { EpochCacheInterface } from '@aztec/epoch-cache';
-import { SlotNumber } from '@aztec/foundation/branded-types';
-
-/**
- * Maximum clock disparity tolerance for P2P message validation (in milliseconds).
- * Messages for the previous slot are accepted if we're within this many milliseconds
- * of the current slot start. This prevents penalizing peers for messages that
- * were valid when sent but arrived slightly late due to network latency.
- *
- * This follows Ethereum's MAXIMUM_GOSSIP_CLOCK_DISPARITY approach.
- */
-export const MAXIMUM_GOSSIP_CLOCK_DISPARITY_MS = 500;
-
-/**
- * Checks if a message for the previous slot should be accepted due to clock tolerance.
- *
- * @param messageSlot - The slot number from the received message
- * @param currentSlot - The current slot number
- * @param epochCache - EpochCache to get timing information
- * @returns true if the message is for the previous slot AND we're within the clock tolerance window
- */
-export function isWithinClockTolerance(
-  messageSlot: SlotNumber,
-  currentSlot: SlotNumber,
-  epochCache: EpochCacheInterface,
-): boolean {
-  // Guard against slot 0 edge case (genesis)
-  if (currentSlot === SlotNumber.ZERO) {
-    return false;
-  }
-
-  // Only apply tolerance to messages for the previous slot
-  const previousSlot = SlotNumber(currentSlot - 1);
-  if (messageSlot !== previousSlot) {
-    return false;
-  }
-
-  // Check how far we are into the current slot (in milliseconds)
-  const { ts: slotStartTs, nowMs, slot } = epochCache.getEpochAndSlotNow();
-
-  // Sanity check: ensure the epoch cache's current slot matches the expected current slot
-  if (slot !== currentSlot) {
-    return false;
-  }
-
-  // ts is in seconds, convert to ms; nowMs is already in milliseconds
-  const slotStartMs = slotStartTs * 1000n;
-  const elapsedMs = Number(nowMs - slotStartMs);
-
-  return elapsedMs < MAXIMUM_GOSSIP_CLOCK_DISPARITY_MS;
-}