@aztec/p2p 0.0.1-commit.24de95ac → 0.0.1-commit.3469e52

package/src/services/libp2p/libp2p_service.ts

@@ -1,20 +1,22 @@
 import type { EpochCacheInterface } from '@aztec/epoch-cache';
-import { randomInt } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { randomInt } from '@aztec/foundation/crypto/random';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { type Logger, createLibp2pComponentLogger, createLogger } from '@aztec/foundation/log';
-import { SerialQueue } from '@aztec/foundation/queue';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 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, 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';
 import {
-  BlockAttestation,
   BlockProposal,
+  CheckpointAttestation,
+  CheckpointProposal,
+  type CheckpointProposalCore,
   type Gossipable,
   P2PClientType,
   P2PMessage,
@@ -28,7 +30,14 @@ import { MerkleTreeId } from '@aztec/stdlib/trees';
 import { Tx, type TxHash, type TxValidationResult, type TxValidator } from '@aztec/stdlib/tx';
 import type { UInt64 } from '@aztec/stdlib/types';
 import { compressComponentVersions } from '@aztec/stdlib/versioning';
-import { Attributes, OtelMetricsAdapter, type TelemetryClient, WithTracer, trackSpan } from '@aztec/telemetry-client';
+import {
+  Attributes,
+  OtelMetricsAdapter,
+  SpanStatusCode,
+  type TelemetryClient,
+  WithTracer,
+  trackSpan,
+} from '@aztec/telemetry-client';
 
 import {
   type GossipSub,
@@ -50,8 +59,15 @@ import { ENR } from '@nethermindeth/enr';
 import { createLibp2p } from 'libp2p';
 
 import type { P2PConfig } from '../../config.js';
+import { ProposalSlotCapExceededError } from '../../errors/attestation-pool.error.js';
 import type { MemPools } from '../../mem_pools/interface.js';
-import { AttestationValidator, BlockProposalValidator } from '../../msg_validators/index.js';
+import {
+  BlockProposalValidator,
+  CheckpointAttestationValidator,
+  CheckpointProposalValidator,
+  FishermanAttestationValidator,
+  SizeTxValidator,
+} from '../../msg_validators/index.js';
 import { MessageSeenValidator } from '../../msg_validators/msg_seen_validator/msg_seen_validator.js';
 import { getDefaultAllowedSetupFunctions } from '../../msg_validators/tx_validator/allowed_public_setup.js';
 import { type MessageValidator, createTxMessageValidators } from '../../msg_validators/tx_validator/factory.js';
@@ -96,7 +112,12 @@ import {
   reqRespTxHandler,
 } from '../reqresp/protocols/index.js';
 import { ReqResp } from '../reqresp/reqresp.js';
-import type { P2PBlockReceivedCallback, P2PService, PeerDiscoveryService } from '../service.js';
+import type {
+  P2PBlockReceivedCallback,
+  P2PCheckpointReceivedCallback,
+  P2PService,
+  PeerDiscoveryService,
+} from '../service.js';
 import { P2PInstrumentation } from './instrumentation.js';
 
 interface ValidationResult {
@@ -116,18 +137,18 @@ type ReceivedMessageValidationResult<T> =
  * Lib P2P implementation of the P2PService interface.
  */
 export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends WithTracer implements P2PService {
-  private jobQueue: SerialQueue = new SerialQueue();
   private discoveryRunningPromise?: RunningPromise;
   private msgIdSeenValidators: Record<TopicType, MessageSeenValidator> = {} as Record<TopicType, MessageSeenValidator>;
 
   // Message validators
-  private attestationValidator: AttestationValidator;
   private blockProposalValidator: BlockProposalValidator;
+  private checkpointProposalValidator: CheckpointProposalValidator;
+  private checkpointAttestationValidator: CheckpointAttestationValidator;
 
   private protocolVersion = '';
   private topicStrings: Record<TopicType, string> = {} as Record<TopicType, string>;
 
-  private feesCache: { blockNumber: number; gasFees: GasFees } | undefined;
+  private feesCache: { blockNumber: BlockNumber; gasFees: GasFees } | undefined;
 
   /**
    * Callback for when a block is received from a peer.
@@ -136,10 +157,21 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
    */
   private blockReceivedCallback: P2PBlockReceivedCallback;
 
+  /**
+   * Callback for when a checkpoint proposal is received from a peer.
+   * @param checkpoint - The checkpoint proposal received from the peer.
+   * @returns The attestations for the checkpoint, if any.
+   */
+  private checkpointReceivedCallback: P2PCheckpointReceivedCallback;
+
   private gossipSubEventHandler: (e: CustomEvent<GossipsubMessage>) => void;
 
   private instrumentation: P2PInstrumentation;
 
+  private telemetry: TelemetryClient;
+
+  protected logger: Logger;
+
   constructor(
     private clientType: T,
     private config: P2PConfig,
@@ -147,21 +179,26 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
     private peerDiscoveryService: PeerDiscoveryService,
     private reqresp: ReqRespInterface,
     private peerManager: PeerManagerInterface,
-    protected mempools: MemPools<T>,
+    protected mempools: MemPools,
     private archiver: L2BlockSource & ContractDataSource,
     private epochCache: EpochCacheInterface,
     private proofVerifier: ClientProtocolCircuitVerifier,
     private worldStateSynchronizer: WorldStateSynchronizer,
     telemetry: TelemetryClient,
-    protected logger = createLogger('p2p:libp2p_service'),
+    logger: Logger = createLogger('p2p:libp2p_service'),
   ) {
     super(telemetry, 'LibP2PService');
+    this.telemetry = telemetry;
+
+    // Create child logger with fisherman prefix if in fisherman mode
+    this.logger = config.fishermanMode ? logger.createChild('[FISHERMAN]') : logger;
 
     this.instrumentation = new P2PInstrumentation(telemetry, 'LibP2PService');
 
     this.msgIdSeenValidators[TopicType.tx] = new MessageSeenValidator(config.seenMessageCacheSize);
     this.msgIdSeenValidators[TopicType.block_proposal] = new MessageSeenValidator(config.seenMessageCacheSize);
-    this.msgIdSeenValidators[TopicType.block_attestation] = new MessageSeenValidator(config.seenMessageCacheSize);
+    this.msgIdSeenValidators[TopicType.checkpoint_proposal] = new MessageSeenValidator(config.seenMessageCacheSize);
+    this.msgIdSeenValidators[TopicType.checkpoint_attestation] = new MessageSeenValidator(config.seenMessageCacheSize);
 
     const versions = getVersions(config);
     this.protocolVersion = compressComponentVersions(versions);
@@ -169,22 +206,40 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
 
     this.topicStrings[TopicType.tx] = createTopicString(TopicType.tx, this.protocolVersion);
     this.topicStrings[TopicType.block_proposal] = createTopicString(TopicType.block_proposal, this.protocolVersion);
-    this.topicStrings[TopicType.block_attestation] = createTopicString(
-      TopicType.block_attestation,
+    this.topicStrings[TopicType.checkpoint_proposal] = createTopicString(
+      TopicType.checkpoint_proposal,
+      this.protocolVersion,
+    );
+    this.topicStrings[TopicType.checkpoint_attestation] = createTopicString(
+      TopicType.checkpoint_attestation,
       this.protocolVersion,
     );
 
-    this.attestationValidator = new AttestationValidator(epochCache);
     this.blockProposalValidator = new BlockProposalValidator(epochCache, { txsPermitted: !config.disableTransactions });
+    this.checkpointProposalValidator = new CheckpointProposalValidator(epochCache, {
+      txsPermitted: !config.disableTransactions,
+    });
+    this.checkpointAttestationValidator = config.fishermanMode
+      ? new FishermanAttestationValidator(epochCache, mempools.attestationPool, telemetry)
+      : new CheckpointAttestationValidator(epochCache);
 
     this.gossipSubEventHandler = this.handleGossipSubEvent.bind(this);
 
-    this.blockReceivedCallback = async (block: BlockProposal): Promise<BlockAttestation[] | undefined> => {
+    this.blockReceivedCallback = async (block: BlockProposal): Promise<boolean> => {
       this.logger.debug(
-        `Handler not yet registered: Block received callback not set. Received block for slot ${block.slotNumber.toNumber()} from peer.`,
-        { p2pMessageIdentifier: await block.p2pMessageIdentifier() },
+        `Handler not yet registered: Block received callback not set. Received block for slot ${block.slotNumber} from peer.`,
+        { p2pMessageIdentifier: await block.p2pMessageLoggingIdentifier() },
       );
-      return undefined;
+      return false;
+    };
+
+    this.checkpointReceivedCallback = (
+      checkpoint: CheckpointProposalCore,
+    ): Promise<CheckpointAttestation[] | undefined> => {
+      this.logger.debug(
+        `Handler not yet registered: Checkpoint received callback not set. Received checkpoint for slot ${checkpoint.slotNumber} from peer.`,
+      );
+      return Promise.resolve(undefined);
     };
   }
 
@@ -203,7 +258,7 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
     config: P2PConfig,
     peerId: PeerId,
     deps: {
-      mempools: MemPools<T>;
+      mempools: MemPools;
       l2BlockSource: L2BlockSource & ContractDataSource;
       epochCache: EpochCacheInterface;
       proofVerifier: ClientProtocolCircuitVerifier;
@@ -253,7 +308,8 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
 
     const txTopic = createTopicString(TopicType.tx, protocolVersion);
     const blockProposalTopic = createTopicString(TopicType.block_proposal, protocolVersion);
-    const blockAttestationTopic = createTopicString(TopicType.block_attestation, protocolVersion);
+    const checkpointProposalTopic = createTopicString(TopicType.checkpoint_proposal, protocolVersion);
+    const checkpointAttestationTopic = createTopicString(TopicType.checkpoint_attestation, protocolVersion);
 
     const preferredPeersEnrs: ENR[] = config.preferredPeers.map(enr => ENR.decodeTxt(enr));
     const directPeers = (
@@ -375,12 +431,17 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
                 invalidMessageDeliveriesWeight: -20,
                 invalidMessageDeliveriesDecay: 0.5,
               }),
-              [blockAttestationTopic]: createTopicScoreParams({
+              [blockProposalTopic]: createTopicScoreParams({
                 topicWeight: 1,
                 invalidMessageDeliveriesWeight: -20,
                 invalidMessageDeliveriesDecay: 0.5,
               }),
-              [blockProposalTopic]: createTopicScoreParams({
+              [checkpointProposalTopic]: createTopicScoreParams({
+                topicWeight: 1,
+                invalidMessageDeliveriesWeight: -20,
+                invalidMessageDeliveriesDecay: 0.5,
+              }),
+              [checkpointAttestationTopic]: createTopicScoreParams({
                 topicWeight: 1,
                 invalidMessageDeliveriesWeight: -20,
                 invalidMessageDeliveriesDecay: 0.5,
@@ -395,7 +456,7 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
       logger: createLibp2pComponentLogger(logger.module),
     });
 
-    const peerScoring = new PeerScoring(config);
+    const peerScoring = new PeerScoring(config, telemetry);
     const reqresp = new ReqResp(config, node, peerScoring, createLogger(`${logger.module}:reqresp`));
 
     const peerManager = new PeerManager(
@@ -450,20 +511,6 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
     }
     const announceTcpMultiaddr = convertToMultiaddr(p2pIp, p2pPort, 'tcp');
 
-    // Start job queue, peer discovery service and libp2p node
-    this.jobQueue.start();
-
-    await this.peerManager.initializePeers();
-    if (!this.config.p2pDiscoveryDisabled) {
-      await this.peerDiscoveryService.start();
-    }
-    await this.node.start();
-
-    // Subscribe to standard GossipSub topics by default
-    for (const topic of getTopicsForClientAndConfig(this.clientType, this.config.disableTransactions)) {
-      this.subscribeToTopic(this.topicStrings[topic]);
-    }
-
     // Create request response protocol handlers
     const txHandler = reqRespTxHandler(this.mempools);
     const goodbyeHandler = reqGoodbyeHandler(this.peerManager);
@@ -477,8 +524,7 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
       [ReqRespSubProtocol.BLOCK]: blockHandler.bind(this),
     };
 
-    // Only handle block transactions request if attestation pool is available to the client
-    if (this.mempools.attestationPool && !this.config.disableTransactions) {
+    if (!this.config.disableTransactions) {
       const blockTxsHandler = reqRespBlockTxsHandler(this.mempools.attestationPool, this.mempools.txPool);
       requestResponseHandlers[ReqRespSubProtocol.BLOCK_TXS] = blockTxsHandler.bind(this);
     }
@@ -487,25 +533,41 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
       requestResponseHandlers[ReqRespSubProtocol.TX] = txHandler.bind(this);
     }
 
+    // Define the sub protocol validators - This is done within this start() method to gain a callback to the existing validateTx function
+    const reqrespSubProtocolValidators = {
+      ...DEFAULT_SUB_PROTOCOL_VALIDATORS,
+      [ReqRespSubProtocol.TX]: this.validateRequestedTxs.bind(this),
+      [ReqRespSubProtocol.BLOCK_TXS]: this.validateRequestedBlockTxs.bind(this),
+      [ReqRespSubProtocol.BLOCK]: this.validateRequestedBlock.bind(this),
+    };
+
+    await this.peerManager.initializePeers();
+
+    await this.reqresp.start(requestResponseHandlers, reqrespSubProtocolValidators);
+
+    await this.node.start();
+
+    // Subscribe to standard GossipSub topics by default
+    for (const topic of getTopicsForClientAndConfig(this.clientType, this.config.disableTransactions)) {
+      this.subscribeToTopic(this.topicStrings[topic]);
+    }
+
     // add GossipSub listener
     this.node.services.pubsub.addEventListener(GossipSubEvent.MESSAGE, this.gossipSubEventHandler);
 
-    // Start running promise for peer discovery
+    // Start running promise for peer discovery and metrics collection
+    if (!this.config.p2pDiscoveryDisabled) {
+      await this.peerDiscoveryService.start();
+    }
     this.discoveryRunningPromise = new RunningPromise(
-      () => this.peerManager.heartbeat(),
+      async () => {
+        await this.peerManager.heartbeat();
+      },
       this.logger,
       this.config.peerCheckIntervalMS,
     );
     this.discoveryRunningPromise.start();
 
-    // Define the sub protocol validators - This is done within this start() method to gain a callback to the existing validateTx function
-    const reqrespSubProtocolValidators = {
-      ...DEFAULT_SUB_PROTOCOL_VALIDATORS,
-      // TODO(#11336): A request validator for blocks
-      [ReqRespSubProtocol.TX]: this.validateRequestedTxs.bind(this),
-      [ReqRespSubProtocol.BLOCK_TXS]: this.validateRequestedBlockTxs.bind(this),
-    };
-    await this.reqresp.start(requestResponseHandlers, reqrespSubProtocolValidators);
     this.logger.info(`Started P2P service`, {
       listen: this.config.listenAddress,
       port: this.config.p2pPort,
@@ -525,9 +587,6 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
     // Stop peer manager
     this.logger.debug('Stopping peer manager...');
     await this.peerManager.stop();
-
-    this.logger.debug('Stopping job queue...');
-    await this.jobQueue.end();
     this.logger.debug('Stopping running promise...');
     await this.discoveryRunningPromise?.stop();
     this.logger.debug('Stopping peer discovery service...');
@@ -594,6 +653,10 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
     this.blockReceivedCallback = callback;
   }
 
+  public registerCheckpointReceivedCallback(callback: P2PCheckpointReceivedCallback) {
+    this.checkpointReceivedCallback = callback;
+  }
+
   /**
    * Subscribes to a topic.
    * @param topic - The topic to subscribe to.
@@ -615,7 +678,10 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
     if (!this.node.services.pubsub) {
       throw new Error('Pubsub service not available.');
     }
-    const p2pMessage = P2PMessage.fromGossipable(message);
+    const isBlockProposal = topic === this.topicStrings[TopicType.block_proposal];
+    const traceContext =
+      this.config.debugP2PInstrumentMessages && isBlockProposal ? this.telemetry.getTraceContext() : undefined;
+    const p2pMessage = P2PMessage.fromGossipable(message, this.config.debugP2PInstrumentMessages, traceContext);
     const result = await this.node.services.pubsub.publish(topic, p2pMessage.toMessageData());
     return result.recipients.length;
   }
@@ -636,12 +702,15 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
       case this.topicStrings[TopicType.tx]:
         topicType = TopicType.tx;
         break;
-      case this.topicStrings[TopicType.block_attestation]:
-        topicType = TopicType.block_attestation;
-        break;
       case this.topicStrings[TopicType.block_proposal]:
         topicType = TopicType.block_proposal;
         break;
+      case this.topicStrings[TopicType.checkpoint_proposal]:
+        topicType = TopicType.checkpoint_proposal;
+        break;
+      case this.topicStrings[TopicType.checkpoint_attestation]:
+        topicType = TopicType.checkpoint_attestation;
+        break;
       default:
         this.logger.error(`Received message on unknown topic: ${msg.topic}`);
         break;
@@ -660,13 +729,39 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
     return { result: true, topicType };
   }
 
+  /**
+   * Safely deserializes a P2PMessage from raw message data.
+   * @param msgId - The message ID.
+   * @param source - The peer ID of the message source.
+   * @param data - The raw message data.
+   * @returns The deserialized P2PMessage or undefined if deserialization fails.
+   */
+  private safelyDeserializeP2PMessage(msgId: string, source: PeerId, data: Uint8Array): P2PMessage | undefined {
+    try {
+      return P2PMessage.fromMessageData(Buffer.from(data), this.config.debugP2PInstrumentMessages);
+    } catch (err) {
+      this.logger.error(`Error deserializing P2PMessage`, err, {
+        msgId,
+        source: source.toString(),
+      });
+      this.node.services.pubsub.reportMessageValidationResult(msgId, source.toString(), TopicValidatorResult.Reject);
+      this.peerManager.penalizePeer(source, PeerErrorSeverity.LowToleranceError);
+      return undefined;
+    }
+  }
+
   /**
    * Handles a new gossip message that was received by the client.
    * @param topic - The message's topic.
    * @param data - The message data
    */
   protected async handleNewGossipMessage(msg: Message, msgId: string, source: PeerId) {
-    const p2pMessage = P2PMessage.fromMessageData(Buffer.from(msg.data));
+    const msgReceivedTime = Date.now();
+    let topicType: TopicType | undefined;
+    const p2pMessage = this.safelyDeserializeP2PMessage(msgId, source, msg.data);
+    if (!p2pMessage) {
+      return;
+    }
 
     const preValidationResult = this.preValidateReceivedMessage(msg, msgId, source);
 
@@ -674,14 +769,75 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
       return;
     }
 
+    // Determine topic type for attributes
     if (msg.topic === this.topicStrings[TopicType.tx]) {
-      await this.handleGossipedTx(p2pMessage.payload, msgId, source);
+      topicType = TopicType.tx;
+    } else if (msg.topic === this.topicStrings[TopicType.checkpoint_attestation]) {
+      topicType = TopicType.checkpoint_attestation;
+    } else if (msg.topic === this.topicStrings[TopicType.block_proposal]) {
+      topicType = TopicType.block_proposal;
+    } else if (msg.topic === this.topicStrings[TopicType.checkpoint_proposal]) {
+      topicType = TopicType.checkpoint_proposal;
     }
-    if (msg.topic === this.topicStrings[TopicType.block_attestation] && this.clientType === P2PClientType.Full) {
-      await this.processAttestationFromPeer(p2pMessage.payload, msgId, source);
+
+    // Process the message, optionally within a linked span for trace propagation
+    const processMessage = async () => {
+      if (msg.topic === this.topicStrings[TopicType.tx]) {
+        await this.handleGossipedTx(p2pMessage.payload, msgId, source);
+      } else if (msg.topic === this.topicStrings[TopicType.checkpoint_attestation]) {
+        if (this.clientType === P2PClientType.Full) {
+          await this.processCheckpointAttestationFromPeer(p2pMessage.payload, msgId, source);
+        }
+      } else if (msg.topic === this.topicStrings[TopicType.block_proposal]) {
+        await this.processBlockFromPeer(p2pMessage.payload, msgId, source);
+      } else if (msg.topic === this.topicStrings[TopicType.checkpoint_proposal]) {
+        await this.handleGossipedCheckpointProposal(p2pMessage.payload, msgId, source);
+      } else {
+        this.logger.error(`Received message on unknown topic: ${msg.topic}`);
+      }
+    };
+
+    const latency = p2pMessage.timestamp !== undefined ? msgReceivedTime - p2pMessage.timestamp.getTime() : undefined;
+    const propagatedContext = p2pMessage.traceContext
+      ? this.telemetry.extractPropagatedContext(p2pMessage.traceContext)
+      : undefined;
+
+    if (propagatedContext) {
+      await this.tracer.startActiveSpan(
+        'LibP2PService.processMessage',
+        {
+          attributes: {
+            [Attributes.TOPIC_NAME]: topicType!,
+            [Attributes.PEER_ID]: source.toString(),
+          },
+        },
+        propagatedContext,
+        async span => {
+          try {
+            await processMessage();
+            span.setStatus({
+              code: SpanStatusCode.OK,
+            });
+          } catch (err) {
+            span.setStatus({
+              code: SpanStatusCode.ERROR,
+              message: String(err),
+            });
+            if (typeof err === 'string' || (err && err instanceof Error)) {
+              span.recordException(err);
+            }
+            throw err;
+          } finally {
+            span.end();
+          }
+        },
+      );
+    } else {
+      await processMessage();
     }
-    if (msg.topic === this.topicStrings[TopicType.block_proposal]) {
-      await this.processBlockFromPeer(p2pMessage.payload, msgId, source);
+
+    if (latency !== undefined && topicType !== undefined) {
+      this.instrumentation.recordMessageLatency(topicType, latency);
     }
 
     return;
@@ -698,6 +854,7 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
     try {
       resultAndObj = await validationFunc();
     } catch (err) {
+      this.peerManager.penalizePeer(source, PeerErrorSeverity.LowToleranceError);
       this.logger.error(`Error deserializing and validating gossipsub message`, err, {
         msgId,
         source: source.toString(),
@@ -751,24 +908,37 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
       return;
     }
 
+    this.instrumentation.incrementTxReceived(1);
     await this.mempools.txPool.addTxs([tx]);
   }
 
   /**
-   * Process Attestation From Peer
-   * When a proposal is received from a peer, we add it to the attestation pool, so it can be accessed by other services.
-   *
-   * @param attestation - The attestation to process.
+   * Process a checkpoint attestation from a peer.
+   * Validates the attestation and adds it to the pool.
    */
-  private async processAttestationFromPeer(payloadData: Buffer, msgId: string, source: PeerId): Promise<void> {
-    const validationFunc: () => Promise<ReceivedMessageValidationResult<BlockAttestation>> = async () => {
-      const attestation = BlockAttestation.fromBuffer(payloadData);
-      const isValid = await this.validateAttestation(source, attestation);
-      const exists = isValid && (await this.mempools.attestationPool!.hasAttestation(attestation));
+  private async processCheckpointAttestationFromPeer(
+    payloadData: Buffer,
+    msgId: string,
+    source: PeerId,
+  ): Promise<void> {
+    const validationFunc: () => Promise<ReceivedMessageValidationResult<CheckpointAttestation>> = async () => {
+      const attestation = CheckpointAttestation.fromBuffer(payloadData);
+      const pool = this.mempools.attestationPool;
+      const isValid = await this.validateCheckpointAttestation(source, attestation);
+      const exists = isValid && (await pool.hasCheckpointAttestation(attestation));
+
+      let canAdd = true;
+      if (isValid && !exists) {
+        const slot = attestation.payload.header.slotNumber;
+        const { committee } = await this.epochCache.getCommittee(slot);
+        const committeeSize = committee?.length ?? 0;
+        canAdd = await pool.canAddCheckpointAttestation(attestation, committeeSize);
+      }
 
-      this.logger.trace(`Validate propagated block attestation`, {
+      this.logger.trace(`Validate propagated checkpoint attestation`, {
         isValid,
         exists,
+        canAdd,
         [Attributes.SLOT_NUMBER]: attestation.payload.header.slotNumber.toString(),
         [Attributes.P2P_ID]: source.toString(),
       });
@@ -777,16 +947,23 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
         return { result: TopicValidatorResult.Reject };
       } 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`, {
+          slot: attestation.payload.header.slotNumber.toString(),
+          archive: attestation.archive.toString(),
+          source: source.toString(),
+        });
+        return { result: TopicValidatorResult.Ignore, obj: attestation };
       } else {
         return { result: TopicValidatorResult.Accept, obj: attestation };
       }
     };
 
-    const { result, obj: attestation } = await this.validateReceivedMessage<BlockAttestation>(
+    const { result, obj: attestation } = await this.validateReceivedMessage<CheckpointAttestation>(
       validationFunc,
       msgId,
       source,
-      TopicType.block_attestation,
+      TopicType.checkpoint_attestation,
     );
 
     if (result !== TopicValidatorResult.Accept || !attestation) {
@@ -794,31 +971,32 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
     }
 
     this.logger.debug(
-      `Received attestation for slot ${attestation.slotNumber.toNumber()} from external peer ${source.toString()}`,
+      `Received checkpoint attestation for slot ${attestation.slotNumber} from external peer ${source.toString()}`,
       {
-        p2pMessageIdentifier: await attestation.p2pMessageIdentifier(),
-        slot: attestation.slotNumber.toNumber(),
+        p2pMessageIdentifier: await attestation.p2pMessageLoggingIdentifier(),
+        slot: attestation.slotNumber,
         archive: attestation.archive.toString(),
         source: source.toString(),
       },
     );
 
-    await this.mempools.attestationPool!.addAttestations([attestation]);
+    await this.mempools.attestationPool.addCheckpointAttestations([attestation]);
   }
 
   private async processBlockFromPeer(payloadData: Buffer, msgId: string, source: PeerId): Promise<void> {
     const validationFunc: () => Promise<ReceivedMessageValidationResult<BlockProposal>> = async () => {
       const block = BlockProposal.fromBuffer(payloadData);
       const isValid = await this.validateBlockProposal(source, block);
+      const pool = this.mempools.attestationPool;
 
-      // Note that we dont have an attestation pool if we're a prover node, but we still
-      // subscribe to block proposal topics in order to prevent their txs from being cleared.
-      const exists = isValid && (await this.mempools.attestationPool?.hasBlockProposal(block));
+      const exists = isValid && (await pool.hasBlockProposal(block));
+      const canAdd = isValid && (await pool.canAddProposal(block));
 
       this.logger.trace(`Validate propagated block proposal`, {
         isValid,
         exists,
-        [Attributes.SLOT_NUMBER]: block.payload.header.slotNumber.toString(),
+        canAdd,
+        [Attributes.SLOT_NUMBER]: block.slotNumber.toString(),
         [Attributes.P2P_ID]: source.toString(),
       });
 
@@ -826,6 +1004,14 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
         return { result: TopicValidatorResult.Reject };
       } else if (exists) {
         return { result: TopicValidatorResult.Ignore, obj: block };
+      } else if (!canAdd) {
+        this.peerManager.penalizePeer(source, PeerErrorSeverity.MidToleranceError);
+        this.logger.warn(`Penalizing peer for block proposal exceeding per-slot cap`, {
+          slot: block.slotNumber.toString(),
+          archive: block.archive.toString(),
+          source: source.toString(),
+        });
+        return { result: TopicValidatorResult.Reject };
       } else {
         return { result: TopicValidatorResult.Accept, obj: block };
       }
@@ -846,55 +1032,155 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
   }
 
   // REVIEW: callback pattern https://github.com/AztecProtocol/aztec-packages/issues/7963
+  // REFACTOR(palla): This method should be moved to the p2p_client or to a separate component,
+  // should not be here as it does not deal with p2p networking.
   @trackSpan('Libp2pService.processValidBlockProposal', async block => ({
-    [Attributes.SLOT_NUMBER]: block.slotNumber.toNumber(),
+    [Attributes.SLOT_NUMBER]: block.slotNumber,
     [Attributes.BLOCK_ARCHIVE]: block.archive.toString(),
-    [Attributes.P2P_ID]: await block.p2pMessageIdentifier().then(i => i.toString()),
+    [Attributes.P2P_ID]: await block.p2pMessageLoggingIdentifier().then(i => i.toString()),
   }))
   private async processValidBlockProposal(block: BlockProposal, sender: PeerId) {
-    const slot = block.slotNumber.toBigInt();
-    const previousSlot = slot - 1n;
+    const slot = block.slotNumber;
     this.logger.verbose(`Received block proposal for slot ${slot} from external peer ${sender.toString()}.`, {
-      p2pMessageIdentifier: await block.p2pMessageIdentifier(),
-      slot: block.slotNumber.toNumber(),
-      archive: block.archive.toString(),
+      p2pMessageIdentifier: await block.p2pMessageLoggingIdentifier(),
       source: sender.toString(),
+      ...block.toBlockInfo(),
     });
-    const attestationsForPreviousSlot = await this.mempools.attestationPool?.getAttestationsForSlot(previousSlot);
-    if (attestationsForPreviousSlot !== undefined) {
-      this.logger.verbose(`Received ${attestationsForPreviousSlot.length} attestations for slot ${previousSlot}`);
+
+    // Attempt to add proposal
+    try {
+      await this.mempools.attestationPool.addBlockProposal(block);
+    } catch (err: unknown) {
+      // Drop proposals if we hit per-slot cap in the attestation pool; rethrow unknown errors
+      if (err instanceof ProposalSlotCapExceededError) {
+        this.logger.warn(`Dropping block proposal due to per-slot proposal cap`, {
+          slot: String(slot),
+          archive: block.archive.toString(),
+          error: (err as Error).message,
+        });
+        return;
+      }
+      throw err;
     }
 
     // Mark the txs in this proposal as non-evictable
     await this.mempools.txPool.markTxsAsNonEvictable(block.txHashes);
-    await this.mempools.attestationPool?.addBlockProposal(block);
-    const attestations = await this.blockReceivedCallback(block, sender);
 
-    // TODO: fix up this pattern - the abstraction is not nice
-    // The attestation can be undefined if no handler is registered / the validator deems the block invalid
-    if (attestations?.length) {
-      for (const attestation of attestations) {
-        this.logger.verbose(`Broadcasting attestation for slot ${attestation.slotNumber.toNumber()}`, {
-          p2pMessageIdentifier: await attestation.p2pMessageIdentifier(),
-          slot: attestation.slotNumber.toNumber(),
-          archive: attestation.archive.toString(),
+    // Call the block received callback to validate the proposal.
+    // Note: Validators do NOT attest to individual blocks, only to checkpoint proposals.
+    const isValid = await this.blockReceivedCallback(block, sender);
+    if (!isValid) {
+      this.logger.warn(`Block proposal validation failed for block ${block.blockNumber}`, block.toBlockInfo());
+    }
+  }
+
+  /**
+   * Handle a gossiped checkpoint proposal.
+   * Validates and processes the checkpoint proposal, then triggers the callback for attestation.
+   */
+  private async handleGossipedCheckpointProposal(payloadData: Buffer, msgId: string, source: PeerId): Promise<void> {
+    // 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 isValid = await this.validateCheckpointProposal(source, checkpoint);
+      const pool = this.mempools.attestationPool;
+
+      const exists = isValid && (await pool.hasCheckpointProposal(checkpoint));
+      const canAdd = isValid && (await pool.canAddCheckpointProposal(checkpoint));
+
+      this.logger.trace(`Validate propagated checkpoint proposal`, {
+        isValid,
+        exists,
+        canAdd,
+        [Attributes.SLOT_NUMBER]: checkpoint.slotNumber.toString(),
+        [Attributes.P2P_ID]: source.toString(),
+      });
+
+      if (!isValid) {
+        return { result: TopicValidatorResult.Reject };
+      } else if (exists) {
+        return { result: TopicValidatorResult.Ignore, obj: checkpoint };
+      } else if (!canAdd) {
+        this.peerManager.penalizePeer(source, PeerErrorSeverity.MidToleranceError);
+        this.logger.warn(`Penalizing peer for checkpoint proposal exceeding per-slot cap`, {
+          slot: checkpoint.slotNumber.toString(),
+          archive: checkpoint.archive.toString(),
+          source: source.toString(),
         });
-        await this.broadcastAttestation(attestation);
+        return { result: TopicValidatorResult.Reject };
+      } else {
+        return { result: TopicValidatorResult.Accept, obj: checkpoint };
       }
+    };
+
+    const { result, obj: checkpoint } = await this.validateReceivedMessage<CheckpointProposal>(
+      validationFunc,
+      msgId,
+      source,
+      TopicType.checkpoint_proposal,
+    );
+
+    if (result !== TopicValidatorResult.Accept || !checkpoint) {
+      return;
     }
+
+    await this.processValidCheckpointProposal(checkpoint, source);
   }
 
   /**
-   * Broadcast an attestation to all peers.
-   * @param attestation - The attestation to broadcast.
+   * Process a validated checkpoint proposal.
+   * Extracts and processes the last block proposal (if present) first, then processes the checkpoint.
+   * The block callback is invoked before the checkpoint callback.
    */
-  @trackSpan('Libp2pService.broadcastAttestation', async attestation => ({
-    [Attributes.SLOT_NUMBER]: attestation.payload.header.slotNumber.toNumber(),
-    [Attributes.BLOCK_ARCHIVE]: attestation.archive.toString(),
-    [Attributes.P2P_ID]: await attestation.p2pMessageIdentifier().then(i => i.toString()),
+  @trackSpan('Libp2pService.processValidCheckpointProposal', async checkpoint => ({
+    [Attributes.SLOT_NUMBER]: checkpoint.slotNumber,
+    [Attributes.BLOCK_ARCHIVE]: checkpoint.archive.toString(),
+    [Attributes.P2P_ID]: await checkpoint.p2pMessageLoggingIdentifier().then(i => i.toString()),
   }))
-  private async broadcastAttestation(attestation: BlockAttestation) {
-    await this.propagate(attestation);
+  private async processValidCheckpointProposal(checkpoint: CheckpointProposal, sender: PeerId) {
+    const slot = checkpoint.slotNumber;
+    this.logger.verbose(`Received checkpoint proposal for slot ${slot} from external peer ${sender.toString()}.`, {
+      p2pMessageIdentifier: await checkpoint.p2pMessageLoggingIdentifier(),
+      slot: checkpoint.slotNumber,
+      archive: checkpoint.archive.toString(),
+      source: sender.toString(),
+    });
+
+    // Extract block proposal before adding to pool (pool stores them separately)
+    const blockProposal = checkpoint.getBlockProposal();
+
+    // Add proposal to the pool (this extracts and stores block proposal separately)
+    await this.mempools.attestationPool.addCheckpointProposal(checkpoint);
+
+    // Mark txs as non-evictable if present (from the last block)
+    if (checkpoint.txHashes.length > 0) {
+      await this.mempools.txPool.markTxsAsNonEvictable(checkpoint.txHashes);
+    }
+
+    // If there was a last block proposal, invoke the block callback first for validation.
+    // Note: The block proposal is already stored in the pool by addCheckpointProposal.
+    if (blockProposal) {
+      const isValid = await this.blockReceivedCallback(blockProposal, sender);
+      if (!isValid) {
+        this.logger.warn(`Block proposal from checkpoint failed validation`, {
+          slot: slot.toString(),
+          archive: checkpoint.archive.toString(),
+          blockNumber: blockProposal.blockNumber.toString(),
+        });
+        return;
+      }
+    }
+
+    // Call the checkpoint received callback with the core version (without lastBlock)
+    // to validate and potentially generate attestations
+    const attestations = await this.checkpointReceivedCallback(checkpoint.toCore(), sender);
+    if (attestations && attestations.length > 0) {
+      // If the callback returned attestations, add them to the pool and propagate them
+      await this.mempools.attestationPool.addCheckpointAttestations(attestations);
+      for (const attestation of attestations) {
+        await this.propagate(attestation);
+      }
+    }
   }
 
   /**
@@ -902,19 +1188,15 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
    * @param message - The message to propagate.
    */
   public async propagate<T extends Gossipable>(message: T) {
-    const p2pMessageIdentifier = await message.p2pMessageIdentifier();
+    const p2pMessageIdentifier = await message.p2pMessageLoggingIdentifier();
     this.logger.trace(`Message ${p2pMessageIdentifier} queued`, { p2pMessageIdentifier });
-    void this.jobQueue
-      .put(async () => {
-        await this.sendToPeers(message);
-      })
-      .catch(error => {
-        this.logger.error(`Error propagating message ${p2pMessageIdentifier}`, { error });
-      });
+    void this.sendToPeers(message).catch(error => {
+      this.logger.error(`Error propagating message ${p2pMessageIdentifier}`, { error });
+    });
   }
 
   /**
-   * Validate the requested block transactions.
+   * Validate the requested block transactions. Allow partial returns.
    * @param request - The block transactions request.
    * @param response - The block transactions response.
    * @param peerId - The ID of the peer that made the request.
@@ -924,14 +1206,71 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
     [Attributes.BLOCK_HASH]: request.blockHash.toString(),
   }))
   private async validateRequestedBlockTxs(
-    _request: BlockTxsRequest,
+    request: BlockTxsRequest,
     response: BlockTxsResponse,
     peerId: PeerId,
   ): Promise<boolean> {
     const requestedTxValidator = this.createRequestedTxValidator();
 
     try {
-      // TODO(palla/txs): Validate that this tx belongs to the block hash being requested
+      if (!response.blockHash.equals(request.blockHash)) {
+        this.peerManager.penalizePeer(peerId, PeerErrorSeverity.MidToleranceError);
+        throw new ValidationError(
+          `Received block txs for unexpected block: expected ${request.blockHash.toString()}, got ${response.blockHash.toString()}`,
+        );
+      }
+
+      if (response.txIndices.getLength() !== request.txIndices.getLength()) {
+        this.peerManager.penalizePeer(peerId, PeerErrorSeverity.MidToleranceError);
+        throw new ValidationError(
+          `Received block txs with mismatched bitvector length: expected ${request.txIndices.getLength()}, got ${response.txIndices.getLength()}`,
+        );
+      }
+
+      // Check no duplicates and not exceeding returnable count
+      const requestedIndices = new Set(request.txIndices.getTrueIndices());
+      const availableIndices = new Set(response.txIndices.getTrueIndices());
+      const maxReturnable = [...requestedIndices].filter(i => availableIndices.has(i)).length;
+
+      const returnedHashes = await Promise.all(response.txs.map(tx => tx.getTxHash().toString()));
+      const uniqueReturned = new Set(returnedHashes.map(h => h.toString()));
+      if (uniqueReturned.size !== returnedHashes.length) {
+        this.peerManager.penalizePeer(peerId, PeerErrorSeverity.MidToleranceError);
+        throw new ValidationError(`Received duplicate txs in block txs response`);
+      }
+      if (response.txs.length > maxReturnable) {
+        this.peerManager.penalizePeer(peerId, PeerErrorSeverity.MidToleranceError);
+        throw new ValidationError(
+          `Received more txs (${response.txs.length}) than requested-and-available (${maxReturnable})`,
+        );
+      }
+
+      // Given proposal (should have locally), ensure returned txs are valid subset and match request indices
+      const proposal = await this.mempools.attestationPool.getBlockProposal(request.blockHash.toString());
+      if (proposal) {
+        // Build intersected indices
+        const intersectIdx = request.txIndices.getTrueIndices().filter(i => response.txIndices.isSet(i));
+
+        // Enforce subset membership and preserve increasing order by index.
+        const hashToIndexInProposal = new Map<string, number>(
+          proposal.txHashes.map((h, i) => [h.toString(), i] as [string, number]),
+        );
+        const allowedIndexSet = new Set(intersectIdx);
+        const indices = returnedHashes.map(h => hashToIndexInProposal.get(h));
+        const allAllowed = indices.every(idx => idx !== undefined && allowedIndexSet.has(idx));
+        const strictlyIncreasing = indices.every((idx, i) => (i === 0 ? idx !== undefined : idx! > indices[i - 1]!));
+        if (!allAllowed || !strictlyIncreasing) {
+          this.peerManager.penalizePeer(peerId, PeerErrorSeverity.LowToleranceError);
+          throw new ValidationError('Returned txs do not match expected subset/order for requested indices');
+        }
+      } else {
+        // No local proposal, cannot check the membership/order of the returned txs
+        this.logger.warn(
+          `Block proposal not found for block hash ${request.blockHash.toString()}; cannot validate membership/order of returned txs`,
+        );
+        return false;
+      }
+
       await Promise.all(response.txs.map(tx => this.validateRequestedTx(tx, peerId, requestedTxValidator)));
       return true;
     } catch (e: any) {
@@ -955,7 +1294,7 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
    * ReqRespSubProtocol.TX subprotocol validation.
    *
    * @param requestedTxHash - The collection of the txs that was requested.
-   * @param responseTx - The collectin of txs that was received as a response to the request.
+   * @param responseTx - The collection of txs that was received as a response to the request.
    * @param peerId - The peer ID of the peer that sent the tx.
    * @returns True if the whole collection of txs is valid, false otherwise.
    */
@@ -982,9 +1321,57 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
     }
   }
 
+  /**
+   * Validates a BLOCK response.
+   *
+   * If a local copy exists, enforces hash equality. If missing, rejects (no penalty) since the hash cannot be verified.
+   * Penalizes on block number mismatch or hash mismatch.
+   *
+   * @param requestedBlockNumber - The requested block number.
+   * @param responseBlock - The block returned by the peer.
+   * @param peerId - The peer that returned the block.
+   * @returns True if the response is valid, false otherwise.
+   */
+  @trackSpan('Libp2pService.validateRequestedBlock', (requestedBlockNumber, _responseBlock) => ({
+    [Attributes.BLOCK_NUMBER]: requestedBlockNumber.toString(),
+  }))
+  private async validateRequestedBlock(
+    requestedBlockNumber: Fr,
+    responseBlock: L2BlockNew,
+    peerId: PeerId,
+  ): Promise<boolean> {
+    try {
+      const reqNum = Number(requestedBlockNumber.toString());
+      if (responseBlock.number !== reqNum) {
+        this.peerManager.penalizePeer(peerId, PeerErrorSeverity.LowToleranceError);
+        return false;
+      }
+
+      const local = await this.archiver.getBlock(BlockNumber(reqNum));
+      if (!local) {
+        // We are missing the local block; we cannot verify the hash yet. Reject without penalizing.
+        // TODO: Consider extending this validator to accept an expected hash or
+        // performing quorum-based checks when using P2P syncing prior to L1 sync.
+        this.logger.warn(`Local block ${reqNum} not found; rejecting BLOCK response without hash verification`);
+        return false;
+      }
+      const [localHash, respHash] = await Promise.all([local.hash(), responseBlock.hash()]);
+      if (!localHash.equals(respHash)) {
+        this.peerManager.penalizePeer(peerId, PeerErrorSeverity.MidToleranceError);
+        return false;
+      }
+
+      return true;
+    } catch (e) {
+      this.logger.warn(`Error validating requested block`, e);
+      return false;
+    }
+  }
+
   private createRequestedTxValidator(): TxValidator {
     return new AggregateTxValidator(
       new DataTxValidator(),
+      new SizeTxValidator(),
       new MetadataTxValidator({
         l1ChainId: new Fr(this.config.l1ChainId),
         rollupVersion: new Fr(this.config.rollupVersion),
@@ -996,19 +1383,21 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
   }
 
   private async validateRequestedTx(tx: Tx, peerId: PeerId, txValidator: TxValidator, requested?: Set<`0x${string}`>) {
+    const penalize = (severity: PeerErrorSeverity) => this.peerManager.penalizePeer(peerId, severity);
+
     if (!(await tx.validateTxHash())) {
-      this.peerManager.penalizePeer(peerId, PeerErrorSeverity.MidToleranceError);
+      penalize(PeerErrorSeverity.MidToleranceError);
       throw new ValidationError(`Received tx with invalid hash ${tx.getTxHash().toString()}.`);
     }
 
     if (requested && !requested.has(tx.getTxHash().toString())) {
-      this.peerManager.penalizePeer(peerId, PeerErrorSeverity.MidToleranceError);
+      penalize(PeerErrorSeverity.MidToleranceError);
       throw new ValidationError(`Received tx with hash ${tx.getTxHash().toString()} that was not requested.`);
     }
 
     const { result } = await txValidator.validateTx(tx);
     if (result === 'invalid') {
-      this.peerManager.penalizePeer(peerId, PeerErrorSeverity.LowToleranceError);
+      penalize(PeerErrorSeverity.LowToleranceError);
       throw new ValidationError(`Received tx with hash ${tx.getTxHash().toString()} that is invalid.`);
     }
   }
@@ -1034,7 +1423,7 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
 
       // Double spend validator has a special case handler
       if (name === 'doubleSpendValidator') {
-        const txBlockNumber = currentBlockNumber + 1; // tx is expected to be in the next block
+        const txBlockNumber = BlockNumber(currentBlockNumber + 1); // tx is expected to be in the next block
         severity = await this.handleDoubleSpendFailure(tx, txBlockNumber);
       }
 
@@ -1044,7 +1433,7 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
     return true;
   }
 
-  private async getGasFees(blockNumber: number): Promise<GasFees> {
+  private async getGasFees(blockNumber: BlockNumber): Promise<GasFees> {
     if (blockNumber === this.feesCache?.blockNumber) {
       return this.feesCache.gasFees;
     }
@@ -1085,13 +1474,13 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
    * @returns The message validators.
    */
   private async createMessageValidators(
-    currentBlockNumber: number,
+    currentBlockNumber: BlockNumber,
     nextSlotTimestamp: UInt64,
   ): Promise<Record<string, MessageValidator>[]> {
     const gasFees = await this.getGasFees(currentBlockNumber);
     const allowedInSetup = this.config.txPublicSetupAllowList ?? (await getDefaultAllowedSetupFunctions());
 
-    const blockNumberInWhichTheTxIsConsideredToBeIncluded = currentBlockNumber + 1;
+    const blockNumberInWhichTheTxIsConsideredToBeIncluded = BlockNumber(currentBlockNumber + 1);
 
     return createTxMessageValidators(
       nextSlotTimestamp,
@@ -1153,7 +1542,7 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
    * @param peerId - The peer ID of the peer that sent the tx.
    * @returns Severity
    */
-  private async handleDoubleSpendFailure(tx: Tx, blockNumber: number): Promise<PeerErrorSeverity> {
+  private async handleDoubleSpendFailure(tx: Tx, blockNumber: BlockNumber): Promise<PeerErrorSeverity> {
     if (blockNumber <= this.config.doubleSpendSeverePeerPenaltyWindow) {
       return PeerErrorSeverity.HighToleranceError;
     }
@@ -1161,7 +1550,7 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
     const snapshotValidator = new DoubleSpendTxValidator({
       nullifiersExist: async (nullifiers: Buffer[]) => {
         const merkleTree = this.worldStateSynchronizer.getSnapshot(
-          blockNumber - this.config.doubleSpendSeverePeerPenaltyWindow,
+          BlockNumber(blockNumber - this.config.doubleSpendSeverePeerPenaltyWindow),
         );
         const indices = await merkleTree.findLeafIndices(MerkleTreeId.NULLIFIER_TREE, nullifiers);
         return indices.map(index => index !== undefined);
@@ -1177,19 +1566,20 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
   }
 
   /**
-   * Validate an attestation.
+   * Validate a checkpoint attestation.
    *
-   * @param attestation - The attestation to validate.
-   * @returns True if the attestation is valid, false otherwise.
+   * @param attestation - The checkpoint attestation to validate.
+   * @returns True if the checkpoint attestation is valid, false otherwise.
    */
-  @trackSpan('Libp2pService.validateAttestation', async (_, attestation) => ({
-    [Attributes.SLOT_NUMBER]: attestation.payload.header.slotNumber.toNumber(),
+  @trackSpan('Libp2pService.validateCheckpointAttestation', async (_, attestation) => ({
+    [Attributes.SLOT_NUMBER]: attestation.payload.header.slotNumber,
     [Attributes.BLOCK_ARCHIVE]: attestation.archive.toString(),
-    [Attributes.P2P_ID]: await attestation.p2pMessageIdentifier().then(i => i.toString()),
+    [Attributes.P2P_ID]: await attestation.p2pMessageLoggingIdentifier().then(i => i.toString()),
   }))
-  public async validateAttestation(peerId: PeerId, attestation: BlockAttestation): Promise<boolean> {
-    const severity = await this.attestationValidator.validate(attestation);
+  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, severity);
       return false;
     }
@@ -1204,7 +1594,7 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
    * @returns True if the block proposal is valid, false otherwise.
    */
   @trackSpan('Libp2pService.validateBlockProposal', (_peerId, block) => ({
-    [Attributes.SLOT_NUMBER]: block.payload.header.slotNumber.toString(),
+    [Attributes.SLOT_NUMBER]: block.slotNumber.toString(),
   }))
   public async validateBlockProposal(peerId: PeerId, block: BlockProposal): Promise<boolean> {
     const severity = await this.blockProposalValidator.validate(block);
@@ -1217,6 +1607,26 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
     return true;
   }
 
+  /**
+   * Validate a checkpoint proposal.
+   *
+   * @param checkpoint - The checkpoint proposal to validate.
+   * @returns True if the checkpoint proposal is valid, false otherwise.
+   */
+  @trackSpan('Libp2pService.validateCheckpointProposal', (_peerId, checkpoint) => ({
+    [Attributes.SLOT_NUMBER]: checkpoint.slotNumber.toString(),
+  }))
+  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, severity);
+      return false;
+    }
+
+    return true;
+  }
+
   public getPeerScore(peerId: PeerId): number {
     return this.node.services.pubsub.score.score(peerId.toString());
   }
@@ -1228,7 +1638,7 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
   private async sendToPeers<T extends Gossipable>(message: T) {
     const parent = message.constructor as typeof Gossipable;
 
-    const identifier = await message.p2pMessageIdentifier().then(i => i.toString());
+    const identifier = await message.p2pMessageLoggingIdentifier().then(i => i.toString());
     this.logger.trace(`Sending message ${identifier}`, { p2pMessageIdentifier: identifier });
 
     const recipientsNum = await this.publishToTopic(this.topicStrings[parent.p2pTopic], message);