@aztec/p2p 0.0.1-commit.c7c42ec → 0.0.1-commit.cf93bcc56

package/src/services/libp2p/libp2p_service.ts

@@ -1,23 +1,24 @@
 import type { EpochCacheInterface } from '@aztec/epoch-cache';
-import { BlockNumber, SlotNumber } from '@aztec/foundation/branded-types';
-import { randomInt } from '@aztec/foundation/crypto/random';
+import { BlockNumber, type SlotNumber } from '@aztec/foundation/branded-types';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { type Logger, createLibp2pComponentLogger, createLogger } from '@aztec/foundation/log';
 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, L2Block, 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,
+  type ValidationResult as P2PValidationResult,
   PeerErrorSeverity,
   TopicType,
   createTopicString,
@@ -28,7 +29,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,
@@ -36,7 +44,7 @@ import {
   type GossipsubMessage,
   gossipsub,
 } from '@chainsafe/libp2p-gossipsub';
-import { createPeerScoreParams, createTopicScoreParams } from '@chainsafe/libp2p-gossipsub/score';
+import { createPeerScoreParams } from '@chainsafe/libp2p-gossipsub/score';
 import { SignaturePolicy } from '@chainsafe/libp2p-gossipsub/types';
 import { noise } from '@chainsafe/libp2p-noise';
 import { yamux } from '@chainsafe/libp2p-yamux';
@@ -50,58 +58,65 @@ 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,
+  CheckpointAttestationValidator,
+  CheckpointProposalValidator,
+  DoubleSpendTxValidator,
   FishermanAttestationValidator,
+  getDefaultAllowedSetupFunctions,
 } 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';
 import {
-  AggregateTxValidator,
-  DataTxValidator,
-  DoubleSpendTxValidator,
-  MetadataTxValidator,
-  TxProofValidator,
-} from '../../msg_validators/tx_validator/index.js';
+  type MessageValidator,
+  createTxMessageValidators,
+  createTxReqRespValidator,
+} from '../../msg_validators/tx_validator/factory.js';
 import { GossipSubEvent } from '../../types/index.js';
 import { type PubSubLibp2p, convertToMultiaddr } from '../../util.js';
 import { getVersions } from '../../versioning.js';
 import { AztecDatastore } from '../data_store.js';
 import { DiscV5Service } from '../discv5/discV5_service.js';
 import { SnappyTransform, fastMsgIdFn, getMsgIdFn, msgIdToStrFn } from '../encoding.js';
-import { gossipScoreThresholds } from '../gossipsub/scoring.js';
+import { APP_SPECIFIC_WEIGHT, gossipScoreThresholds } from '../gossipsub/scoring.js';
+import { createAllTopicScoreParams } from '../gossipsub/topic_score_params.js';
 import type { PeerManagerInterface } from '../peer-manager/interface.js';
 import { PeerManager } from '../peer-manager/peer_manager.js';
 import { PeerScoring } from '../peer-manager/peer_scoring.js';
+import type { BatchTxRequesterLibP2PService } from '../reqresp/batch-tx-requester/interface.js';
 import type { P2PReqRespConfig } from '../reqresp/config.js';
 import {
   DEFAULT_SUB_PROTOCOL_VALIDATORS,
   type ReqRespInterface,
+  type ReqRespResponse,
   ReqRespSubProtocol,
   type ReqRespSubProtocolHandler,
   type ReqRespSubProtocolHandlers,
   type ReqRespSubProtocolValidators,
   type SubProtocolMap,
   ValidationError,
-} from '../reqresp/interface.js';
-import { reqRespBlockTxsHandler } from '../reqresp/protocols/block_txs/block_txs_handler.js';
-import { reqGoodbyeHandler } from '../reqresp/protocols/goodbye.js';
+} from '../reqresp/index.js';
 import {
   AuthRequest,
   BlockTxsRequest,
   BlockTxsResponse,
   StatusMessage,
   pingHandler,
+  reqGoodbyeHandler,
   reqRespBlockHandler,
+  reqRespBlockTxsHandler,
   reqRespStatusHandler,
   reqRespTxHandler,
-} from '../reqresp/protocols/index.js';
+} from '../reqresp/index.js';
 import { ReqResp } from '../reqresp/reqresp.js';
-import type { P2PBlockReceivedCallback, P2PService, PeerDiscoveryService } from '../service.js';
+import type {
+  P2PBlockReceivedCallback,
+  P2PCheckpointReceivedCallback,
+  P2PDuplicateAttestationCallback,
+  P2PService,
+  PeerDiscoveryService,
+} from '../service.js';
 import { P2PInstrumentation } from './instrumentation.js';
 
 interface ValidationResult {
@@ -113,9 +128,9 @@ interface ValidationResult {
 type ValidationOutcome = { allPassed: true } | { allPassed: false; failure: ValidationResult };
 
 // REFACTOR: Unify with the type above
-type ReceivedMessageValidationResult<T> =
-  | { obj: T; result: Exclude<TopicValidatorResult, TopicValidatorResult.Reject> }
-  | { obj?: undefined; result: TopicValidatorResult.Reject };
+type ReceivedMessageValidationResult<T, M = undefined> =
+  | { obj: T; result: Exclude<TopicValidatorResult, TopicValidatorResult.Reject>; metadata?: M }
+  | { obj?: T; result: TopicValidatorResult.Reject; metadata?: M };
 
 /**
  * Lib P2P implementation of the P2PService interface.
@@ -125,14 +140,25 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
   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: BlockNumber; gasFees: GasFees } | undefined;
 
+  /** Callback invoked when a duplicate proposal is detected (triggers slashing). */
+  private duplicateProposalCallback?: (info: {
+    slot: SlotNumber;
+    proposer: EthAddress;
+    type: 'checkpoint' | 'block';
+  }) => void;
+
+  /** Callback invoked when a duplicate attestation is detected (triggers slashing). */
+  private duplicateAttestationCallback?: P2PDuplicateAttestationCallback;
+
   /**
    * Callback for when a block is received from a peer.
    * @param block - The block received from the peer.
@@ -140,10 +166,19 @@ 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(
@@ -152,9 +187,9 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
     protected node: PubSubLibp2p,
     private peerDiscoveryService: PeerDiscoveryService,
     private reqresp: ReqRespInterface,
-    private peerManager: PeerManagerInterface,
+    protected peerManager: PeerManagerInterface,
     protected mempools: MemPools,
-    private archiver: L2BlockSource & ContractDataSource,
+    protected archiver: L2BlockSource & ContractDataSource,
     private epochCache: EpochCacheInterface,
     private proofVerifier: ClientProtocolCircuitVerifier,
     private worldStateSynchronizer: WorldStateSynchronizer,
@@ -162,6 +197,7 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
     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;
@@ -170,7 +206,8 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
 
     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);
@@ -178,25 +215,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,
     );
 
-    // Use FishermanAttestationValidator in fisherman mode to validate attestation payloads against proposals
-    this.attestationValidator = config.fishermanMode
-      ? new FishermanAttestationValidator(epochCache, mempools.attestationPool, telemetry)
-      : 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} 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);
     };
   }
 
@@ -242,14 +294,14 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
 
     const datastore = new AztecDatastore(peerStore);
 
-    const otelMetricsAdapter = new OtelMetricsAdapter(telemetry);
+    const otelMetricsAdapter = new OtelMetricsAdapter(telemetry, logger.getBindings());
 
     const peerDiscoveryService = new DiscV5Service(
       peerId,
       config,
       packageVersion,
       telemetry,
-      createLogger(`${logger.module}:discv5_service`),
+      createLogger(`${logger.module}:discv5_service`, logger.getBindings()),
     );
 
     // Seed libp2p's bootstrap discovery with private and trusted peers
@@ -263,10 +315,6 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
     const versions = getVersions(config);
     const protocolVersion = compressComponentVersions(versions);
 
-    const txTopic = createTopicString(TopicType.tx, protocolVersion);
-    const blockProposalTopic = createTopicString(TopicType.block_proposal, protocolVersion);
-    const blockAttestationTopic = createTopicString(TopicType.block_attestation, protocolVersion);
-
     const preferredPeersEnrs: ENR[] = config.preferredPeers.map(enr => ENR.decodeTxt(enr));
     const directPeers = (
       await Promise.all(
@@ -286,6 +334,15 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
 
     const announceTcpMultiaddr = config.p2pIp ? [convertToMultiaddr(config.p2pIp, p2pPort, 'tcp')] : [];
 
+    // Create dynamic topic score params based on network configuration
+    const l1Constants = epochCache.getL1Constants();
+    const topicScoreParams = createAllTopicScoreParams(protocolVersion, {
+      slotDurationMs: l1Constants.slotDuration * 1000,
+      heartbeatIntervalMs: config.gossipsubInterval,
+      targetCommitteeSize: l1Constants.targetCommitteeSize,
+      blockDurationMs: config.blockDurationMs,
+    });
+
     const node = await createLibp2p({
       start: false,
       peerId,
@@ -381,30 +438,14 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
           scoreParams: createPeerScoreParams({
             // IPColocation factor can be disabled for local testing - default to -5
             IPColocationFactorWeight: config.debugDisableColocationPenalty ? 0 : -5.0,
-            topics: {
-              [txTopic]: createTopicScoreParams({
-                topicWeight: 1,
-                invalidMessageDeliveriesWeight: -20,
-                invalidMessageDeliveriesDecay: 0.5,
-              }),
-              [blockAttestationTopic]: createTopicScoreParams({
-                topicWeight: 1,
-                invalidMessageDeliveriesWeight: -20,
-                invalidMessageDeliveriesDecay: 0.5,
-              }),
-              [blockProposalTopic]: createTopicScoreParams({
-                topicWeight: 1,
-                invalidMessageDeliveriesWeight: -20,
-                invalidMessageDeliveriesDecay: 0.5,
-              }),
-            },
+            topics: topicScoreParams,
           }),
         }) as (components: GossipSubComponents) => GossipSub,
         components: (components: { connectionManager: ConnectionManager }) => ({
           connectionManager: components.connectionManager,
         }),
       },
-      logger: createLibp2pComponentLogger(logger.module),
+      logger: createLibp2pComponentLogger(logger.module, logger.getBindings()),
     });
 
     const peerScoring = new PeerScoring(config, telemetry);
@@ -423,8 +464,12 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
       epochCache,
     );
 
-    // Update gossipsub score params
-    node.services.pubsub.score.params.appSpecificWeight = 10;
+    // Configure application-specific scoring for gossipsub.
+    // The weight scales app score to align with gossipsub thresholds:
+    // - Disconnect (-50) × 10 = -500 = gossipThreshold (stops receiving gossip)
+    // - Ban (-100) × 10 = -1000 = publishThreshold (cannot publish)
+    // Note: positive topic scores can offset penalties, so alignment is best-effort.
+    node.services.pubsub.score.params.appSpecificWeight = APP_SPECIFIC_WEIGHT;
     node.services.pubsub.score.params.appSpecificScore = (peerId: string) =>
       peerManager.shouldDisableP2PGossip(peerId) ? -Infinity : peerManager.getPeerScore(peerId);
 
@@ -462,17 +507,6 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
     }
     const announceTcpMultiaddr = convertToMultiaddr(p2pIp, p2pPort, 'tcp');
 
-    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);
@@ -487,7 +521,11 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
     };
 
     if (!this.config.disableTransactions) {
-      const blockTxsHandler = reqRespBlockTxsHandler(this.mempools.attestationPool, this.mempools.txPool);
+      const blockTxsHandler = reqRespBlockTxsHandler(
+        this.mempools.attestationPool,
+        this.archiver,
+        this.mempools.txPool,
+      );
       requestResponseHandlers[ReqRespSubProtocol.BLOCK_TXS] = blockTxsHandler.bind(this);
     }
 
@@ -495,10 +533,32 @@ 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 and metrics collection
+    if (!this.config.p2pDiscoveryDisabled) {
+      await this.peerDiscoveryService.start();
+    }
     this.discoveryRunningPromise = new RunningPromise(
       async () => {
         await this.peerManager.heartbeat();
@@ -508,14 +568,6 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
     );
     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,
-      [ReqRespSubProtocol.TX]: this.validateRequestedTxs.bind(this),
-      [ReqRespSubProtocol.BLOCK_TXS]: this.validateRequestedBlockTxs.bind(this),
-      [ReqRespSubProtocol.BLOCK]: this.validateRequestedBlock.bind(this),
-    };
-    await this.reqresp.start(requestResponseHandlers, reqrespSubProtocolValidators);
     this.logger.info(`Started P2P service`, {
       listen: this.config.listenAddress,
       port: this.config.p2pPort,
@@ -589,6 +641,15 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
     return this.reqresp.sendBatchRequest(protocol, requests, pinnedPeerId);
   }
 
+  public sendRequestToPeer(
+    peerId: PeerId,
+    subProtocol: ReqRespSubProtocol,
+    payload: Buffer,
+    dialTimeout?: number,
+  ): Promise<ReqRespResponse> {
+    return this.reqresp.sendRequestToPeer(peerId, subProtocol, payload, dialTimeout);
+  }
+
   /**
    * Get the ENR of the node
    * @returns The ENR of the node
@@ -601,6 +662,29 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
     this.blockReceivedCallback = callback;
   }
 
+  public registerCheckpointReceivedCallback(callback: P2PCheckpointReceivedCallback) {
+    this.checkpointReceivedCallback = callback;
+  }
+
+  /**
+   * Registers a callback to be invoked when a duplicate proposal is detected.
+   * This callback is triggered on the first duplicate (when count goes from 1 to 2).
+   */
+  public registerDuplicateProposalCallback(
+    callback: (info: { slot: SlotNumber; proposer: EthAddress; type: 'checkpoint' | 'block' }) => void,
+  ): void {
+    this.duplicateProposalCallback = callback;
+  }
+
+  /**
+   * Registers a callback to be invoked when a duplicate attestation is detected.
+   * A validator signing attestations for different proposals at the same slot.
+   * This callback is triggered on the first duplicate (when count goes from 1 to 2).
+   */
+  public registerDuplicateAttestationCallback(callback: P2PDuplicateAttestationCallback): void {
+    this.duplicateAttestationCallback = callback;
+  }
+
   /**
    * Subscribes to a topic.
    * @param topic - The topic to subscribe to.
@@ -622,7 +706,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, this.config.debugP2PInstrumentMessages);
+    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;
   }
@@ -643,12 +730,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;
@@ -707,36 +797,87 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
       return;
     }
 
+    // Determine topic type for attributes
     if (msg.topic === this.topicStrings[TopicType.tx]) {
       topicType = TopicType.tx;
-      await this.handleGossipedTx(p2pMessage.payload, msgId, source);
+    } 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]) {
-      topicType = TopicType.block_attestation;
-      if (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}`);
       }
-    }
-    if (msg.topic === this.topicStrings[TopicType.block_proposal]) {
-      topicType = TopicType.block_proposal;
-      await this.processBlockFromPeer(p2pMessage.payload, msgId, source);
+    };
+
+    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 (p2pMessage.timestamp !== undefined && topicType !== undefined) {
-      const latency = msgReceivedTime - p2pMessage.timestamp.getTime();
+    if (latency !== undefined && topicType !== undefined) {
       this.instrumentation.recordMessageLatency(topicType, latency);
     }
 
     return;
   }
 
-  protected async validateReceivedMessage<T>(
-    validationFunc: () => Promise<ReceivedMessageValidationResult<T>>,
+  protected async validateReceivedMessage<T, M = undefined>(
+    validationFunc: () => Promise<ReceivedMessageValidationResult<T, M>>,
     msgId: string,
     source: PeerId,
     topicType: TopicType,
-  ): Promise<ReceivedMessageValidationResult<T>> {
-    let resultAndObj: ReceivedMessageValidationResult<T> = { result: TopicValidatorResult.Reject };
+  ): Promise<ReceivedMessageValidationResult<T, M>> {
+    let resultAndObj: ReceivedMessageValidationResult<T, M> = { result: TopicValidatorResult.Reject };
     const timer = new Timer();
     try {
       resultAndObj = await validationFunc();
@@ -761,20 +902,33 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
     const validationFunc: () => Promise<ReceivedMessageValidationResult<Tx>> = async () => {
       const tx = Tx.fromBuffer(payloadData);
       const isValid = await this.validatePropagatedTx(tx, source);
-      const exists = isValid && (await this.mempools.txPool.hasTx(tx.getTxHash()));
+      if (!isValid) {
+        this.logger.trace(`Rejecting invalid propagated tx`, {
+          [Attributes.P2P_ID]: source.toString(),
+        });
+        return { result: TopicValidatorResult.Reject };
+      }
+
+      // Propagate only on pool acceptance
+      const txHash = tx.getTxHash();
+      const addResult = await this.mempools.txPool.addPendingTxs([tx], { source: 'gossip' });
+
+      const wasAccepted = addResult.accepted.some(h => h.equals(txHash));
+      const wasIgnored = addResult.ignored.some(h => h.equals(txHash));
 
       this.logger.trace(`Validate propagated tx`, {
         isValid,
-        exists,
+        wasAccepted,
+        wasIgnored,
         [Attributes.P2P_ID]: source.toString(),
       });
 
-      if (!isValid) {
-        return { result: TopicValidatorResult.Reject };
-      } else if (exists) {
+      if (wasAccepted) {
+        return { result: TopicValidatorResult.Accept, obj: tx };
+      } else if (wasIgnored) {
         return { result: TopicValidatorResult.Ignore, obj: tx };
       } else {
-        return { result: TopicValidatorResult.Accept, obj: tx };
+        return { result: TopicValidatorResult.Reject };
       }
     };
 
@@ -783,6 +937,7 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
       return;
     }
 
+    // Tx was accepted into pool and will be propagated - just log and record metrics
     const txHash = tx.getTxHash();
     const txHashString = txHash.toString();
     this.logger.verbose(`Received tx ${txHashString} from external peer ${source.toString()} via gossip`, {
@@ -790,73 +945,31 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
       txHash: txHashString,
     });
 
-    if (this.config.dropTransactions && randomInt(1000) < this.config.dropTransactionsProbability * 1000) {
-      this.logger.warn(`Intentionally dropping tx ${txHashString} (probability rule)`);
-      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 pool = this.mempools.attestationPool;
-      const isValid = await this.validateAttestation(source, attestation);
-      const exists = isValid && (await pool.hasAttestation(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.canAddAttestation(attestation, committeeSize);
-      }
-
-      this.logger.trace(`Validate propagated block attestation`, {
-        isValid,
-        exists,
-        canAdd,
-        [Attributes.SLOT_NUMBER]: attestation.payload.header.slotNumber.toString(),
-        [Attributes.P2P_ID]: source.toString(),
-      });
-
-      if (!isValid) {
-        return { result: TopicValidatorResult.Reject };
-      } else if (exists) {
-        return { result: TopicValidatorResult.Ignore, obj: attestation };
-      } else if (!canAdd) {
-        this.logger.warn(`Dropping block 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>(
-      validationFunc,
+  private async processCheckpointAttestationFromPeer(
+    payloadData: Buffer,
+    msgId: string,
+    source: PeerId,
+  ): Promise<void> {
+    const { result, obj: attestation } = await this.validateReceivedMessage<CheckpointAttestation>(
+      () => this.validateAndStoreCheckpointAttestation(source, CheckpointAttestation.fromBuffer(payloadData)),
       msgId,
       source,
-      TopicType.block_attestation,
+      TopicType.checkpoint_attestation,
     );
 
     if (result !== TopicValidatorResult.Accept || !attestation) {
       return;
     }
 
-    this.logger.debug(
-      `Received attestation for slot ${attestation.slotNumber} from external peer ${source.toString()}`,
+    this.logger.verbose(
+      `Received valid checkpoint attestation for slot ${attestation.slotNumber} from external peer ${source.toString()}`,
       {
         p2pMessageIdentifier: await attestation.p2pMessageLoggingIdentifier(),
         slot: attestation.slotNumber,
@@ -864,119 +977,354 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
         source: source.toString(),
       },
     );
-
-    await this.mempools.attestationPool.addAttestations([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;
+  /** Validates a checkpoint attestation and adds it to the pool. Penalizes the peer if validation fails. */
+  @trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId, attestation) => ({
+    [Attributes.SLOT_NUMBER]: attestation.payload.header.slotNumber.toString(),
+  }))
+  protected async validateAndStoreCheckpointAttestation(
+    peerId: PeerId,
+    attestation: CheckpointAttestation,
+  ): Promise<ReceivedMessageValidationResult<CheckpointAttestation>> {
+    const validationResult = await this.checkpointAttestationValidator.validate(attestation);
+
+    if (validationResult.result === 'reject') {
+      this.logger.warn(`Penalizing peer ${peerId} for checkpoint attestation validation failure`);
+      this.peerManager.penalizePeer(peerId, validationResult.severity);
+      return { result: TopicValidatorResult.Reject };
+    }
+
+    if (validationResult.result === 'ignore') {
+      return { result: TopicValidatorResult.Ignore, obj: attestation };
+    }
 
-      const exists = isValid && (await pool.hasBlockProposal(block));
-      const canAdd = isValid && (await pool.canAddProposal(block));
+    // Try to add the attestation: this handles existence check, cap check, and adding in one call
+    // count is the number of attestations by this signer for this slot (for duplicate detection)
+    const slot = attestation.payload.header.slotNumber;
+    const { added, alreadyExists, count } =
+      await this.mempools.attestationPool.tryAddCheckpointAttestation(attestation);
+
+    this.logger.trace(`Validate propagated checkpoint attestation`, {
+      added,
+      alreadyExists,
+      count,
+      [Attributes.SLOT_NUMBER]: slot.toString(),
+      [Attributes.P2P_ID]: peerId.toString(),
+    });
 
-      this.logger.trace(`Validate propagated block proposal`, {
-        isValid,
-        exists,
-        canAdd,
-        [Attributes.SLOT_NUMBER]: block.payload.header.slotNumber.toString(),
-        [Attributes.P2P_ID]: source.toString(),
+    // Exact same attestation received, no need to re-broadcast
+    if (alreadyExists) {
+      return { result: TopicValidatorResult.Ignore, obj: attestation };
+    }
+
+    // Could not add (cap reached for signer), no need to re-broadcast
+    if (!added) {
+      this.logger.warn(`Dropping checkpoint attestation due to cap`, {
+        slot: slot.toString(),
+        archive: attestation.archive.toString(),
+        source: peerId.toString(),
+        attester: attestation.getSender()?.toString(),
+        count,
       });
+      return { result: TopicValidatorResult.Ignore, obj: attestation };
+    }
 
-      if (!isValid) {
-        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(),
+    // Check if this is a duplicate attestation (signer attested to a different proposal at the same slot)
+    // count is the number of attestations by this signer for this slot
+    if (count === 2) {
+      const attester = attestation.getSender();
+      if (attester) {
+        this.logger.warn(`Detected duplicate attestation (equivocation) at slot ${slot}`, {
+          slot: slot.toString(),
+          archive: attestation.archive.toString(),
+          source: peerId.toString(),
+          attester: attester.toString(),
         });
-        return { result: TopicValidatorResult.Reject };
-      } else {
-        return { result: TopicValidatorResult.Accept, obj: block };
+        this.duplicateAttestationCallback?.({ slot, attester });
       }
-    };
+    }
+
+    // Attestation was added successfully - accept it so other nodes can also detect the equivocation
+    return { result: TopicValidatorResult.Accept, obj: attestation };
+  }
 
-    const { result, obj: block } = await this.validateReceivedMessage<BlockProposal>(
-      validationFunc,
+  protected async processBlockFromPeer(payloadData: Buffer, msgId: string, source: PeerId): Promise<void> {
+    const {
+      result,
+      obj: block,
+      metadata: { isEquivocated } = {},
+    } = await this.validateReceivedMessage<BlockProposal, { isEquivocated: boolean }>(
+      () => this.validateAndStoreBlockProposal(source, BlockProposal.fromBuffer(payloadData)),
       msgId,
       source,
       TopicType.block_proposal,
     );
 
-    if (!result || !block) {
+    // If not accepted or equivocated, return
+    if (result !== TopicValidatorResult.Accept || !block || isEquivocated) {
       return;
     }
 
     await this.processValidBlockProposal(block, source);
   }
 
-  // REVIEW: callback pattern https://github.com/AztecProtocol/aztec-packages/issues/7963
+  /** Validates a block proposal. Triggers a penalization to the peer that sent it if invalid. Adds to the mempool if valid. */
+  @trackSpan('Libp2pService.validateAndStoreBlockProposal', (_peerId, block) => ({
+    [Attributes.BLOCK_NUMBER]: block.blockNumber.toString(),
+    [Attributes.SLOT_NUMBER]: block.slotNumber.toString(),
+  }))
+  protected async validateAndStoreBlockProposal(
+    peerId: PeerId,
+    block: BlockProposal,
+  ): Promise<ReceivedMessageValidationResult<BlockProposal, { isEquivocated: boolean }>> {
+    const validationResult = await this.blockProposalValidator.validate(block);
+
+    if (validationResult.result === 'reject') {
+      this.logger.warn(`Penalizing peer ${peerId} for block proposal validation failure`);
+      this.peerManager.penalizePeer(peerId, validationResult.severity);
+      return { result: TopicValidatorResult.Reject };
+    }
+
+    if (validationResult.result === 'ignore') {
+      return { result: TopicValidatorResult.Ignore, obj: block };
+    }
+
+    // Try to add the proposal: this handles existence check, cap check, and adding in one call
+    const { added, alreadyExists, count } = await this.mempools.attestationPool.tryAddBlockProposal(block);
+    const isEquivocated = count !== undefined && count > 1;
+
+    // Duplicate proposal received, no need to re-broadcast
+    if (alreadyExists) {
+      this.logger.debug(`Ignoring duplicate block proposal received`, {
+        ...block.toBlockInfo(),
+        indexWithinCheckpoint: block.indexWithinCheckpoint,
+        proposer: block.getSender()?.toString(),
+        source: peerId.toString(),
+      });
+      return { result: TopicValidatorResult.Ignore, obj: block, metadata: { isEquivocated } };
+    }
+
+    // Too many blocks received for this slot and index, penalize peer and do not re-broadcast
+    if (!added) {
+      this.peerManager.penalizePeer(peerId, PeerErrorSeverity.HighToleranceError);
+      this.logger.warn(`Penalizing peer for block proposal exceeding per-position cap`, {
+        ...block.toBlockInfo(),
+        indexWithinCheckpoint: block.indexWithinCheckpoint,
+        count,
+        proposer: block.getSender()?.toString(),
+        source: peerId.toString(),
+      });
+      return { result: TopicValidatorResult.Reject, metadata: { isEquivocated } };
+    }
+
+    // If this was a duplicate proposal, do not process it, but do invoke the duplicate callback,
+    // and do re-broadcast it so other nodes in the network know to slash the proposer
+    if (isEquivocated) {
+      const proposer = block.getSender();
+      this.logger.warn(`Detected duplicate block proposal (equivocation) at slot ${block.slotNumber}`, {
+        ...block.toBlockInfo(),
+        source: peerId.toString(),
+        proposer: proposer?.toString(),
+      });
+      // Invoke the duplicate callback on the first duplicate spotted only
+      if (proposer && count === 2) {
+        this.duplicateProposalCallback?.({ slot: block.slotNumber, proposer, type: 'block' });
+      }
+      return { result: TopicValidatorResult.Accept, obj: block, metadata: { isEquivocated } };
+    }
+
+    // Otherwise, we're good to go!
+    return { result: TopicValidatorResult.Accept, obj: block };
+  }
+
+  // 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,
     [Attributes.BLOCK_ARCHIVE]: block.archive.toString(),
     [Attributes.P2P_ID]: await block.p2pMessageLoggingIdentifier().then(i => i.toString()),
   }))
-  private async processValidBlockProposal(block: BlockProposal, sender: PeerId) {
+  protected async processValidBlockProposal(block: BlockProposal, sender: PeerId) {
     const slot = block.slotNumber;
-    const previousSlot = SlotNumber(slot - 1);
     this.logger.verbose(`Received block proposal for slot ${slot} from external peer ${sender.toString()}.`, {
       p2pMessageIdentifier: await block.p2pMessageLoggingIdentifier(),
-      slot: block.slotNumber,
-      archive: block.archive.toString(),
       source: sender.toString(),
+      ...block.toBlockInfo(),
     });
-    const attestationsForPreviousSlot = await this.mempools.attestationPool.getAttestationsForSlot(previousSlot);
-    this.logger.verbose(`Received ${attestationsForPreviousSlot.length} attestations for slot ${previousSlot}`);
 
-    // Attempt to add proposal, then mark the txs in this proposal as non-evictable
-    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,
+    // Mark the txs in this proposal as protected
+    await this.mempools.txPool.protectTxs(block.txHashes, block.blockHeader);
+
+    // 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.
+   */
+  protected async handleGossipedCheckpointProposal(payloadData: Buffer, msgId: string, source: PeerId): Promise<void> {
+    const {
+      result,
+      obj: checkpoint,
+      metadata: { isEquivocated, processBlock } = {},
+    } = await this.validateReceivedMessage<CheckpointProposal, { isEquivocated: boolean; processBlock: boolean }>(
+      () => this.validateAndStoreCheckpointProposal(source, CheckpointProposal.fromBuffer(payloadData)),
+      msgId,
+      source,
+      TopicType.checkpoint_proposal,
+    );
+
+    // If the checkpoint contained a valid last block, we process it even if the checkpoint itself is to be rejected
+    // TODO(palla/mbps): Is this ok? Should we be considering a block from a checkpoint that was equivocated?
+    if (processBlock && checkpoint?.getBlockProposal()) {
+      await this.processValidBlockProposal(checkpoint.getBlockProposal()!, source);
+    }
+
+    if (result !== TopicValidatorResult.Accept || !checkpoint || isEquivocated) {
+      return;
+    }
+
+    await this.processValidCheckpointProposal(checkpoint.toCore(), source);
+  }
+
+  /**
+   * Validates a checkpoint proposal. Penalizes peer if validation fails. Adds the checkpoint and
+   * its last block (if present) to the mempool if valid. Triggers equivocation detection on both.
+   */
+  @trackSpan('Libp2pService.validateAndStoreCheckpointProposal', (_peerId, checkpoint) => ({
+    [Attributes.SLOT_NUMBER]: checkpoint.slotNumber.toString(),
+  }))
+  protected async validateAndStoreCheckpointProposal(
+    peerId: PeerId,
+    checkpoint: CheckpointProposal,
+  ): Promise<ReceivedMessageValidationResult<CheckpointProposal, { isEquivocated: boolean; processBlock: boolean }>> {
+    const validationResult = await this.checkpointProposalValidator.validate(checkpoint);
+
+    if (validationResult.result === 'reject') {
+      this.logger.warn(`Penalizing peer ${peerId} for checkpoint proposal validation failure`);
+      this.peerManager.penalizePeer(peerId, validationResult.severity);
+      return { result: TopicValidatorResult.Reject };
+    }
+
+    if (validationResult.result === 'ignore') {
+      return { result: TopicValidatorResult.Ignore, obj: checkpoint };
+    }
+
+    // Extract and try to add the block proposal first if present
+    const blockProposal = checkpoint.getBlockProposal();
+    let processBlock = false;
+    if (blockProposal) {
+      this.logger.debug(`Validating block proposal from propagated checkpoint`, {
+        [Attributes.SLOT_NUMBER]: checkpoint.slotNumber.toString(),
+        [Attributes.P2P_ID]: peerId.toString(),
+      });
+      const {
+        result,
+        obj,
+        metadata: { isEquivocated } = {},
+      } = await this.validateAndStoreBlockProposal(peerId, blockProposal);
+      if (result === TopicValidatorResult.Reject || !obj || isEquivocated) {
+        this.logger.debug(`Rejecting checkpoint due to invalid last block proposal`, {
+          [Attributes.SLOT_NUMBER]: checkpoint.slotNumber.toString(),
+          [Attributes.P2P_ID]: peerId.toString(),
+          isEquivocated,
+          result,
         });
-        return;
+        return { result: TopicValidatorResult.Reject };
+      } else if (result === TopicValidatorResult.Accept && obj && !isEquivocated) {
+        processBlock = true;
       }
-      throw err;
     }
-    await this.mempools.txPool.markTxsAsNonEvictable(block.txHashes);
-    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 / in fisherman mode
-    if (attestations?.length) {
-      for (const attestation of attestations) {
-        this.logger.verbose(`Broadcasting attestation for slot ${attestation.slotNumber}`, {
-          p2pMessageIdentifier: await attestation.p2pMessageLoggingIdentifier(),
-          slot: attestation.slotNumber,
-          archive: attestation.archive.toString(),
-        });
-        await this.broadcastAttestation(attestation);
+    // Try to add the checkpoint proposal core: this handles existence check, cap check, and adding in one call
+    const checkpointCore = checkpoint.toCore();
+    const tryAddResult = await this.mempools.attestationPool.tryAddCheckpointProposal(checkpointCore);
+    const { added, alreadyExists, count } = tryAddResult;
+    const isEquivocated = count !== undefined && count > 1;
+
+    // Duplicate proposal received, do not re-broadcast
+    if (alreadyExists) {
+      this.logger.debug(`Ignoring duplicate checkpoint proposal received`, {
+        ...checkpoint.toCheckpointInfo(),
+        source: peerId.toString(),
+      });
+      return {
+        result: TopicValidatorResult.Ignore,
+        obj: checkpoint,
+        metadata: { isEquivocated, processBlock },
+      };
+    }
+
+    // Too many checkpoint proposals received for this slot, penalize peer and do not re-broadcast
+    // Note: We still return the checkpoint obj so the lastBlock can be processed if valid
+    if (!added) {
+      this.peerManager.penalizePeer(peerId, PeerErrorSeverity.HighToleranceError);
+      this.logger.warn(`Penalizing peer for checkpoint proposal exceeding per-slot cap`, {
+        ...checkpoint.toCheckpointInfo(),
+        count,
+        source: peerId.toString(),
+      });
+      return { result: TopicValidatorResult.Reject, obj: checkpoint, metadata: { isEquivocated, processBlock } };
+    }
+
+    // If this was a duplicate proposal, do not process it, but do invoke the duplicate callback,
+    // and do re-broadcast it so other nodes in the network know to slash the proposer
+    if (isEquivocated) {
+      const proposer = checkpoint.getSender();
+      this.logger.warn(`Detected duplicate checkpoint proposal (equivocation) at slot ${checkpoint.slotNumber}`, {
+        ...checkpoint.toCheckpointInfo(),
+        source: peerId.toString(),
+        proposer: proposer?.toString(),
+      });
+      // Invoke the duplicate callback on the first duplicate spotted only
+      if (proposer && count === 2) {
+        this.duplicateProposalCallback?.({ slot: checkpoint.slotNumber, proposer, type: 'checkpoint' });
       }
+      return {
+        result: TopicValidatorResult.Accept,
+        obj: checkpoint,
+        metadata: { isEquivocated, processBlock },
+      };
     }
+
+    // Otherwise, we're good to go!
+    return { result: TopicValidatorResult.Accept, obj: checkpoint, metadata: { processBlock, isEquivocated } };
   }
 
   /**
-   * Broadcast an attestation to all peers.
-   * @param attestation - The attestation to broadcast.
+   * Process a validated checkpoint proposal.
+   * Note: The proposal was already added to the pool by tryAddCheckpointProposal in handleGossipedCheckpointProposal.
    */
-  @trackSpan('Libp2pService.broadcastAttestation', async attestation => ({
-    [Attributes.SLOT_NUMBER]: attestation.payload.header.slotNumber,
-    [Attributes.BLOCK_ARCHIVE]: attestation.archive.toString(),
-    [Attributes.P2P_ID]: await attestation.p2pMessageLoggingIdentifier().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);
+  protected async processValidCheckpointProposal(checkpoint: CheckpointProposalCore, 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(),
+    });
+
+    // Call the checkpoint received callback with the core version (without lastBlock)
+    // to validate and potentially generate attestations
+    const attestations = await this.checkpointReceivedCallback(checkpoint, sender);
+    if (attestations && attestations.length > 0) {
+      // If the callback returned attestations, add them to the pool and propagate them
+      await this.mempools.attestationPool.addOwnCheckpointAttestations(attestations);
+      for (const attestation of attestations) {
+        await this.propagate(attestation);
+      }
+    }
   }
 
   /**
@@ -999,9 +1347,9 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
    * @returns True if the requested block transactions are valid, false otherwise.
    */
   @trackSpan('Libp2pService.validateRequestedBlockTxs', request => ({
-    [Attributes.BLOCK_HASH]: request.blockHash.toString(),
+    [Attributes.BLOCK_ARCHIVE]: request.archiveRoot.toString(),
   }))
-  private async validateRequestedBlockTxs(
+  protected async validateRequestedBlockTxs(
     request: BlockTxsRequest,
     response: BlockTxsResponse,
     peerId: PeerId,
@@ -1009,10 +1357,10 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
     const requestedTxValidator = this.createRequestedTxValidator();
 
     try {
-      if (!response.blockHash.equals(request.blockHash)) {
+      if (!response.archiveRoot.equals(request.archiveRoot)) {
         this.peerManager.penalizePeer(peerId, PeerErrorSeverity.MidToleranceError);
         throw new ValidationError(
-          `Received block txs for unexpected block: expected ${request.blockHash.toString()}, got ${response.blockHash.toString()}`,
+          `Received block txs for unexpected archive root: expected ${request.archiveRoot.toString()}, got ${response.archiveRoot.toString()}`,
         );
       }
 
@@ -1042,7 +1390,7 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
       }
 
       // 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());
+      const proposal = await this.mempools.attestationPool.getBlockProposal(request.archiveRoot.toString());
       if (proposal) {
         // Build intersected indices
         const intersectIdx = request.txIndices.getTrueIndices().filter(i => response.txIndices.isSet(i));
@@ -1062,7 +1410,7 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
       } 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`,
+          `Block proposal not found for archive root ${request.archiveRoot.toString()}; cannot validate membership/order of returned txs`,
         );
         return false;
       }
@@ -1101,7 +1449,7 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
     const requested = new Set(requestedTxHash.map(h => h.toString()));
     const requestedTxValidator = this.createRequestedTxValidator();
 
-    //TODO: (mralj) - this is somewhat naive implementation, if single tx is invlid we consider the whole response invalid.
+    //TODO: (mralj) - this is somewhat naive implementation, if single tx is invalid we consider the whole response invalid.
     // I think we should still extract the valid txs and return them, so that we can still use the response.
     try {
       await Promise.all(responseTx.map(tx => this.validateRequestedTx(tx, peerId, requestedTxValidator, requested)));
@@ -1131,7 +1479,7 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
   @trackSpan('Libp2pService.validateRequestedBlock', (requestedBlockNumber, _responseBlock) => ({
     [Attributes.BLOCK_NUMBER]: requestedBlockNumber.toString(),
   }))
-  private async validateRequestedBlock(
+  protected async validateRequestedBlock(
     requestedBlockNumber: Fr,
     responseBlock: L2Block,
     peerId: PeerId,
@@ -1164,27 +1512,13 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
     }
   }
 
-  private createRequestedTxValidator(): TxValidator {
-    return new AggregateTxValidator(
-      new DataTxValidator(),
-      new MetadataTxValidator({
-        l1ChainId: new Fr(this.config.l1ChainId),
-        rollupVersion: new Fr(this.config.rollupVersion),
-        protocolContractsHash,
-        vkTreeRoot: getVKTreeRoot(),
-      }),
-      new TxProofValidator(this.proofVerifier),
-    );
-  }
-
-  private async validateRequestedTx(tx: Tx, peerId: PeerId, txValidator: TxValidator, requested?: Set<`0x${string}`>) {
+  protected 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())) {
-      penalize(PeerErrorSeverity.MidToleranceError);
-      throw new ValidationError(`Received tx with invalid hash ${tx.getTxHash().toString()}.`);
-    }
-
     if (requested && !requested.has(tx.getTxHash().toString())) {
       penalize(PeerErrorSeverity.MidToleranceError);
       throw new ValidationError(`Received tx with hash ${tx.getTxHash().toString()} that was not requested.`);
@@ -1197,13 +1531,20 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
     }
   }
 
+  protected createRequestedTxValidator(): TxValidator {
+    return createTxReqRespValidator(this.proofVerifier, {
+      l1ChainId: this.config.l1ChainId,
+      rollupVersion: this.config.rollupVersion,
+    });
+  }
+
   @trackSpan('Libp2pService.validatePropagatedTx', tx => ({
     [Attributes.TX_HASH]: tx.getTxHash().toString(),
   }))
-  private async validatePropagatedTx(tx: Tx, peerId: PeerId): Promise<boolean> {
+  protected async validatePropagatedTx(tx: Tx, peerId: PeerId): Promise<boolean> {
     const currentBlockNumber = await this.archiver.getBlockNumber();
 
-    // We accept transactions if they are not expired by the next slot (checked based on the IncludeByTimestamp field)
+    // We accept transactions if they are not expired by the next slot (checked based on the ExpirationTimestamp field)
     const { ts: nextSlotTimestamp } = this.epochCache.getEpochAndSlotInNextL1Slot();
     const messageValidators = await this.createMessageValidators(currentBlockNumber, nextSlotTimestamp);
 
@@ -1239,10 +1580,26 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
     return gasFees;
   }
 
+  /**
+   * Get the BatchTxRequesterLibP2PService dependencies for creating BatchTxRequester instances
+   */
+  public getBatchTxRequesterService(): BatchTxRequesterLibP2PService {
+    return {
+      reqResp: this.reqresp,
+      connectionSampler: this.reqresp.getConnectionSampler(),
+      txValidatorConfig: {
+        l1ChainId: this.config.l1ChainId,
+        rollupVersion: this.config.rollupVersion,
+        proofVerifier: this.proofVerifier,
+      },
+      peerScoring: this.peerManager,
+    };
+  }
+
   public async validate(txs: Tx[]): Promise<void> {
     const currentBlockNumber = await this.archiver.getBlockNumber();
 
-    // We accept transactions if they are not expired by the next slot (checked based on the IncludeByTimestamp field)
+    // We accept transactions if they are not expired by the next slot (checked based on the ExpirationTimestamp field)
     const { ts: nextSlotTimestamp } = this.epochCache.getEpochAndSlotInNextL1Slot();
     const messageValidators = await this.createMessageValidators(currentBlockNumber, nextSlotTimestamp);
 
@@ -1289,6 +1646,7 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
       this.proofVerifier,
       !this.config.disableTransactions,
       allowedInSetup,
+      this.logger.getBindings(),
     );
   }
 
@@ -1342,15 +1700,18 @@ export class LibP2PService<T extends P2PClientType = P2PClientType.Full> extends
       return PeerErrorSeverity.HighToleranceError;
     }
 
-    const snapshotValidator = new DoubleSpendTxValidator({
-      nullifiersExist: async (nullifiers: Buffer[]) => {
-        const merkleTree = this.worldStateSynchronizer.getSnapshot(
-          BlockNumber(blockNumber - this.config.doubleSpendSeverePeerPenaltyWindow),
-        );
-        const indices = await merkleTree.findLeafIndices(MerkleTreeId.NULLIFIER_TREE, nullifiers);
-        return indices.map(index => index !== undefined);
+    const snapshotValidator = new DoubleSpendTxValidator(
+      {
+        nullifiersExist: async (nullifiers: Buffer[]) => {
+          const merkleTree = this.worldStateSynchronizer.getSnapshot(
+            BlockNumber(blockNumber - this.config.doubleSpendSeverePeerPenaltyWindow),
+          );
+          const indices = await merkleTree.findLeafIndices(MerkleTreeId.NULLIFIER_TREE, nullifiers);
+          return indices.map(index => index !== undefined);
+        },
       },
-    });
+      this.logger.getBindings(),
+    );
 
     const validSnapshot = await snapshotValidator.validateTx(tx);
     if (validSnapshot.result !== 'valid') {
@@ -1361,44 +1722,28 @@ 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) => ({
+  @trackSpan('Libp2pService.validateCheckpointAttestation', async (_, attestation) => ({
     [Attributes.SLOT_NUMBER]: attestation.payload.header.slotNumber,
     [Attributes.BLOCK_ARCHIVE]: attestation.archive.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);
-    if (severity) {
-      this.peerManager.penalizePeer(peerId, severity);
-      return false;
-    }
-
-    return true;
-  }
+  public async validateCheckpointAttestation(
+    peerId: PeerId,
+    attestation: CheckpointAttestation,
+  ): Promise<P2PValidationResult> {
+    const result = await this.checkpointAttestationValidator.validate(attestation);
 
-  /**
-   * Validate a block proposal.
-   *
-   * @param block - The block proposal to validate.
-   * @returns True if the block proposal is valid, false otherwise.
-   */
-  @trackSpan('Libp2pService.validateBlockProposal', (_peerId, block) => ({
-    [Attributes.SLOT_NUMBER]: block.payload.header.slotNumber.toString(),
-  }))
-  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, severity);
-      return false;
+    if (result.result === 'reject') {
+      this.logger.warn(`Penalizing peer ${peerId} for checkpoint attestation validation failure`);
+      this.peerManager.penalizePeer(peerId, result.severity);
     }
 
-    return true;
+    return result;
   }
 
   public getPeerScore(peerId: PeerId): number {