@aztec/p2p 0.0.1-commit.96bb3f7 → 0.0.1-commit.993d52e

package/dest/services/libp2p/libp2p_service.js

@@ -372,21 +372,18 @@ function _apply_decs_2203_r(targetClass, memberDecs, classDecs, parentClass) {
 }
 var _dec, _dec1, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _initProto;
 import { BlockNumber } from '@aztec/foundation/branded-types';
-import { randomInt } from '@aztec/foundation/crypto/random';
-import { Fr } from '@aztec/foundation/curves/bn254';
 import { createLibp2pComponentLogger, createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { Timer } from '@aztec/foundation/timer';
-import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
 import { protocolContractsHash } from '@aztec/protocol-contracts';
 import { GasFees } from '@aztec/stdlib/gas';
-import { BlockProposal, CheckpointAttestation, CheckpointProposal, P2PClientType, P2PMessage, PeerErrorSeverity, TopicType, createTopicString, getTopicsForClientAndConfig, metricsTopicStrToLabels } from '@aztec/stdlib/p2p';
+import { BlockProposal, CheckpointAttestation, CheckpointProposal, P2PMessage, PeerErrorSeverity, TopicType, createTopicString, getTopicsForConfig, metricsTopicStrToLabels } from '@aztec/stdlib/p2p';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
 import { Tx } from '@aztec/stdlib/tx';
 import { compressComponentVersions } from '@aztec/stdlib/versioning';
 import { Attributes, OtelMetricsAdapter, SpanStatusCode, WithTracer, trackSpan } from '@aztec/telemetry-client';
 import { 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';
@@ -397,56 +394,51 @@ import { mplex } from '@libp2p/mplex';
 import { tcp } from '@libp2p/tcp';
 import { ENR } from '@nethermindeth/enr';
 import { createLibp2p } from 'libp2p';
-import { ProposalSlotCapExceededError } from '../../errors/attestation-pool.error.js';
-import { BlockProposalValidator, CheckpointAttestationValidator, CheckpointProposalValidator, FishermanAttestationValidator } from '../../msg_validators/index.js';
+import { 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 { createTxMessageValidators } from '../../msg_validators/tx_validator/factory.js';
-import { AggregateTxValidator, DataTxValidator, DoubleSpendTxValidator, MetadataTxValidator, TxProofValidator } from '../../msg_validators/tx_validator/index.js';
+import { createFirstStageTxValidationsForGossipedTransactions, createSecondStageTxValidationsForGossipedTransactions, createTxValidatorForBlockProposalReceivedTxs, createTxValidatorForReqResponseReceivedTxs } from '../../msg_validators/tx_validator/factory.js';
 import { GossipSubEvent } from '../../types/index.js';
 import { 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 { PeerManager } from '../peer-manager/peer_manager.js';
 import { PeerScoring } from '../peer-manager/peer_scoring.js';
-import { DEFAULT_SUB_PROTOCOL_VALIDATORS, ReqRespSubProtocol, ValidationError } from '../reqresp/interface.js';
-import { reqRespBlockTxsHandler } from '../reqresp/protocols/block_txs/block_txs_handler.js';
-import { reqGoodbyeHandler } from '../reqresp/protocols/goodbye.js';
-import { pingHandler, reqRespBlockHandler, reqRespStatusHandler, reqRespTxHandler } from '../reqresp/protocols/index.js';
+import { DEFAULT_SUB_PROTOCOL_VALIDATORS, ReqRespSubProtocol, ValidationError, pingHandler, reqGoodbyeHandler, reqRespBlockHandler, reqRespBlockTxsHandler, reqRespStatusHandler, reqRespTxHandler } from '../reqresp/index.js';
 import { ReqResp } from '../reqresp/reqresp.js';
 import { P2PInstrumentation } from './instrumentation.js';
-_dec = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
+_dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId, attestation)=>({
+        [Attributes.SLOT_NUMBER]: attestation.payload.header.slotNumber.toString()
+    })), _dec1 = trackSpan('Libp2pService.validateAndStoreBlockProposal', (_peerId, block)=>({
+        [Attributes.BLOCK_NUMBER]: block.blockNumber.toString(),
+        [Attributes.SLOT_NUMBER]: block.slotNumber.toString()
+    })), _dec2 = 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())
-    })), _dec1 = trackSpan('Libp2pService.processValidCheckpointProposal', async (checkpoint)=>({
+    })), _dec3 = trackSpan('Libp2pService.validateAndStoreCheckpointProposal', (_peerId, checkpoint)=>({
+        [Attributes.SLOT_NUMBER]: checkpoint.slotNumber.toString()
+    })), _dec4 = 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())
-    })), _dec2 = trackSpan('Libp2pService.validateRequestedBlockTxs', (request)=>({
-        [Attributes.BLOCK_HASH]: request.blockHash.toString()
-    })), _dec3 = trackSpan('Libp2pService.validateRequestedTx', (requestedTxHash, _responseTx)=>({
+    })), _dec5 = trackSpan('Libp2pService.validateRequestedBlockTxs', (request)=>({
+        [Attributes.BLOCK_ARCHIVE]: request.archiveRoot.toString()
+    })), _dec6 = trackSpan('Libp2pService.validateRequestedTx', (requestedTxHash, _responseTx)=>({
         [Attributes.TX_HASH]: requestedTxHash.toString()
-    })), _dec4 = trackSpan('Libp2pService.validateRequestedBlock', (requestedBlockNumber, _responseBlock)=>({
+    })), _dec7 = trackSpan('Libp2pService.validateRequestedBlock', (requestedBlockNumber, _responseBlock)=>({
         [Attributes.BLOCK_NUMBER]: requestedBlockNumber.toString()
-    })), _dec5 = trackSpan('Libp2pService.validatePropagatedTx', (tx)=>({
-        [Attributes.TX_HASH]: tx.getTxHash().toString()
-    })), _dec6 = trackSpan('Libp2pService.validateCheckpointAttestation', async (_, attestation)=>({
+    })), _dec8 = 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())
-    })), _dec7 = trackSpan('Libp2pService.validateBlockProposal', (_peerId, block)=>({
-        [Attributes.SLOT_NUMBER]: block.slotNumber.toString()
-    })), _dec8 = trackSpan('Libp2pService.validateCheckpointProposal', (_peerId, checkpoint)=>({
-        [Attributes.SLOT_NUMBER]: checkpoint.slotNumber.toString()
     }));
 /**
  * Lib P2P implementation of the P2PService interface.
  */ export class LibP2PService extends WithTracer {
-    clientType;
     config;
     node;
     peerDiscoveryService;
@@ -462,47 +454,47 @@ _dec = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
             [
                 _dec,
                 2,
-                "processValidBlockProposal"
+                "validateAndStoreCheckpointAttestation"
             ],
             [
                 _dec1,
                 2,
-                "processValidCheckpointProposal"
+                "validateAndStoreBlockProposal"
             ],
             [
                 _dec2,
                 2,
-                "validateRequestedBlockTxs"
+                "processValidBlockProposal"
             ],
             [
                 _dec3,
                 2,
-                "validateRequestedTxs"
+                "validateAndStoreCheckpointProposal"
             ],
             [
                 _dec4,
                 2,
-                "validateRequestedBlock"
+                "processValidCheckpointProposal"
             ],
             [
                 _dec5,
                 2,
-                "validatePropagatedTx"
+                "validateRequestedBlockTxs"
             ],
             [
                 _dec6,
                 2,
-                "validateCheckpointAttestation"
+                "validateRequestedTxs"
             ],
             [
                 _dec7,
                 2,
-                "validateBlockProposal"
+                "validateRequestedBlock"
             ],
             [
                 _dec8,
                 2,
-                "validateCheckpointProposal"
+                "validateCheckpointAttestation"
             ]
         ], []));
     }
@@ -515,6 +507,8 @@ _dec = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
     protocolVersion;
     topicStrings;
     feesCache;
+    /** Callback invoked when a duplicate proposal is detected (triggers slashing). */ duplicateProposalCallback;
+    /** Callback invoked when a duplicate attestation is detected (triggers slashing). */ duplicateAttestationCallback;
     /**
    * Callback for when a block is received from a peer.
    * @param block - The block received from the peer.
@@ -529,8 +523,8 @@ _dec = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
     instrumentation;
     telemetry;
     logger;
-    constructor(clientType, config, node, peerDiscoveryService, reqresp, peerManager, mempools, archiver, epochCache, proofVerifier, worldStateSynchronizer, telemetry, logger = createLogger('p2p:libp2p_service')){
-        super(telemetry, 'LibP2PService'), this.clientType = clientType, this.config = config, this.node = node, this.peerDiscoveryService = peerDiscoveryService, this.reqresp = reqresp, this.peerManager = peerManager, this.mempools = mempools, this.archiver = archiver, this.epochCache = epochCache, this.proofVerifier = proofVerifier, this.worldStateSynchronizer = worldStateSynchronizer, this.msgIdSeenValidators = (_initProto(this), {}), this.protocolVersion = '', this.topicStrings = {};
+    constructor(config, node, peerDiscoveryService, reqresp, peerManager, mempools, archiver, epochCache, proofVerifier, worldStateSynchronizer, telemetry, logger = createLogger('p2p:libp2p_service')){
+        super(telemetry, 'LibP2PService'), this.config = config, this.node = node, this.peerDiscoveryService = peerDiscoveryService, this.reqresp = reqresp, this.peerManager = peerManager, this.mempools = mempools, this.archiver = archiver, this.epochCache = epochCache, this.proofVerifier = proofVerifier, this.worldStateSynchronizer = worldStateSynchronizer, this.msgIdSeenValidators = (_initProto(this), {}), this.protocolVersion = '', this.topicStrings = {};
         this.telemetry = telemetry;
         // Create child logger with fisherman prefix if in fisherman mode
         this.logger = config.fishermanMode ? logger.createChild('[FISHERMAN]') : logger;
@@ -547,10 +541,12 @@ _dec = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
         this.topicStrings[TopicType.checkpoint_proposal] = createTopicString(TopicType.checkpoint_proposal, this.protocolVersion);
         this.topicStrings[TopicType.checkpoint_attestation] = createTopicString(TopicType.checkpoint_attestation, this.protocolVersion);
         this.blockProposalValidator = new BlockProposalValidator(epochCache, {
-            txsPermitted: !config.disableTransactions
+            txsPermitted: !config.disableTransactions,
+            maxTxsPerBlock: config.maxTxsPerBlock
         });
         this.checkpointProposalValidator = new CheckpointProposalValidator(epochCache, {
-            txsPermitted: !config.disableTransactions
+            txsPermitted: !config.disableTransactions,
+            maxTxsPerBlock: config.maxTxsPerBlock
         });
         this.checkpointAttestationValidator = config.fishermanMode ? new FishermanAttestationValidator(epochCache, mempools.attestationPool, telemetry) : new CheckpointAttestationValidator(epochCache);
         this.gossipSubEventHandler = this.handleGossipSubEvent.bind(this);
@@ -573,13 +569,13 @@ _dec = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
    * @param config - The configuration to use when creating the service.
    * @param txPool - The transaction pool to be accessed by the service.
    * @returns The new service.
-   */ static async new(clientType, config, peerId, deps) {
+   */ static async new(config, peerId, deps) {
         const { worldStateSynchronizer, epochCache, l2BlockSource, mempools, proofVerifier, peerStore, telemetry, logger, packageVersion } = deps;
         const { p2pPort, maxPeerCount, listenAddress } = config;
         const bindAddrTcp = convertToMultiaddr(listenAddress, p2pPort, 'tcp');
         const datastore = new AztecDatastore(peerStore);
-        const otelMetricsAdapter = new OtelMetricsAdapter(telemetry);
-        const peerDiscoveryService = new DiscV5Service(peerId, config, packageVersion, telemetry, createLogger(`${logger.module}:discv5_service`));
+        const otelMetricsAdapter = new OtelMetricsAdapter(telemetry, logger.getBindings());
+        const peerDiscoveryService = new DiscV5Service(peerId, config, packageVersion, telemetry, createLogger(`${logger.module}:discv5_service`, logger.getBindings()));
         // Seed libp2p's bootstrap discovery with private and trusted peers
         const bootstrapNodes = [
             ...config.privatePeers,
@@ -593,10 +589,6 @@ _dec = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
         }
         const versions = getVersions(config);
         const protocolVersion = compressComponentVersions(versions);
-        const txTopic = createTopicString(TopicType.tx, protocolVersion);
-        const blockProposalTopic = createTopicString(TopicType.block_proposal, protocolVersion);
-        const checkpointProposalTopic = createTopicString(TopicType.checkpoint_proposal, protocolVersion);
-        const checkpointAttestationTopic = createTopicString(TopicType.checkpoint_attestation, protocolVersion);
         const preferredPeersEnrs = config.preferredPeers.map((enr)=>ENR.decodeTxt(enr));
         const directPeers = (await Promise.all(preferredPeersEnrs.map(async (enr)=>{
             const peerId = await enr.peerId();
@@ -614,6 +606,15 @@ _dec = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
         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,
+            expectedBlockProposalsPerSlot: config.expectedBlockProposalsPerSlot
+        });
         const node = await createLibp2p({
             start: false,
             peerId,
@@ -714,43 +715,26 @@ _dec = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
                     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
-                            }),
-                            [blockProposalTopic]: createTopicScoreParams({
-                                topicWeight: 1,
-                                invalidMessageDeliveriesWeight: -20,
-                                invalidMessageDeliveriesDecay: 0.5
-                            }),
-                            [checkpointProposalTopic]: createTopicScoreParams({
-                                topicWeight: 1,
-                                invalidMessageDeliveriesWeight: -20,
-                                invalidMessageDeliveriesDecay: 0.5
-                            }),
-                            [checkpointAttestationTopic]: createTopicScoreParams({
-                                topicWeight: 1,
-                                invalidMessageDeliveriesWeight: -20,
-                                invalidMessageDeliveriesDecay: 0.5
-                            })
-                        }
+                        topics: topicScoreParams
                     })
                 }),
                 components: (components)=>({
                         connectionManager: components.connectionManager
                     })
             },
-            logger: createLibp2pComponentLogger(logger.module)
+            logger: createLibp2pComponentLogger(logger.module, logger.getBindings())
         });
         const peerScoring = new PeerScoring(config, telemetry);
         const reqresp = new ReqResp(config, node, peerScoring, createLogger(`${logger.module}:reqresp`));
         const peerManager = new PeerManager(node, peerDiscoveryService, config, telemetry, createLogger(`${logger.module}:peer_manager`), peerScoring, reqresp, worldStateSynchronizer, protocolVersion, 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)=>peerManager.shouldDisableP2PGossip(peerId) ? -Infinity : peerManager.getPeerScore(peerId);
-        return new LibP2PService(clientType, config, node, peerDiscoveryService, reqresp, peerManager, mempools, l2BlockSource, epochCache, proofVerifier, worldStateSynchronizer, telemetry, logger);
+        return new LibP2PService(config, node, peerDiscoveryService, reqresp, peerManager, mempools, l2BlockSource, epochCache, proofVerifier, worldStateSynchronizer, telemetry, logger);
     }
     /**
    * Starts the LibP2P service.
@@ -778,7 +762,7 @@ _dec = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
             [ReqRespSubProtocol.BLOCK]: blockHandler.bind(this)
         };
         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);
         }
         if (!this.config.disableTransactions) {
@@ -795,7 +779,7 @@ _dec = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
         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)){
+        for (const topic of getTopicsForConfig(this.config.disableTransactions)){
             this.subscribeToTopic(this.topicStrings[topic]);
         }
         // add GossipSub listener
@@ -843,6 +827,9 @@ _dec = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
     getPeers(includePending) {
         return this.peerManager.getPeers(includePending);
     }
+    getGossipMeshPeerCount(topicType) {
+        return this.node.services.pubsub.getMeshPeers(this.topicStrings[topicType]).length;
+    }
     handleGossipSubEvent(e) {
         this.logger.trace(`Received PUBSUB message.`);
         const safeJob = async ()=>{
@@ -862,6 +849,9 @@ _dec = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
    */ sendBatchRequest(protocol, requests, pinnedPeerId) {
         return this.reqresp.sendBatchRequest(protocol, requests, pinnedPeerId);
     }
+    sendRequestToPeer(peerId, subProtocol, payload, dialTimeout) {
+        return this.reqresp.sendRequestToPeer(peerId, subProtocol, payload, dialTimeout);
+    }
     /**
    * Get the ENR of the node
    * @returns The ENR of the node
@@ -875,6 +865,19 @@ _dec = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
         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).
+   */ registerDuplicateProposalCallback(callback) {
+        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).
+   */ registerDuplicateAttestationCallback(callback) {
+        this.duplicateAttestationCallback = callback;
+    }
+    /**
    * Subscribes to a topic.
    * @param topic - The topic to subscribe to.
    */ subscribeToTopic(topic) {
@@ -985,9 +988,7 @@ _dec = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
             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);
-                }
+                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]) {
@@ -1055,26 +1056,71 @@ _dec = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
     async handleGossipedTx(payloadData, msgId, source) {
         const validationFunc = async ()=>{
             const tx = Tx.fromBuffer(payloadData);
-            const isValid = await this.validatePropagatedTx(tx, source);
-            const exists = isValid && await this.mempools.txPool.hasTx(tx.getTxHash());
+            const currentBlockNumber = await this.archiver.getBlockNumber();
+            const { ts: nextSlotTimestamp } = this.epochCache.getEpochAndSlotInNextL1Slot();
+            // Stage 1: fast validators (metadata, data, timestamps, double-spend, gas, phases, block header)
+            const firstStageValidators = await this.createFirstStageMessageValidators(currentBlockNumber, nextSlotTimestamp);
+            const firstStageOutcome = await this.runValidations(tx, firstStageValidators);
+            if (!firstStageOutcome.allPassed) {
+                const { name } = firstStageOutcome.failure;
+                let { severity } = firstStageOutcome.failure;
+                // Double spend validator has a special case handler. We perform more detailed examination
+                // as to how recently the nullifier was entered into the tree and if the transaction should
+                // have 'known' the nullifier existed. This determines the severity of the penalty applied to the peer.
+                if (name === 'doubleSpendValidator') {
+                    const txBlockNumber = BlockNumber(currentBlockNumber + 1);
+                    severity = await this.handleDoubleSpendFailure(tx, txBlockNumber);
+                }
+                this.peerManager.penalizePeer(source, severity);
+                return {
+                    result: TopicValidatorResult.Reject
+                };
+            }
+            // Pool pre-check: see if the pool would accept this tx before doing expensive proof verification
+            const canAdd = await this.mempools.txPool.canAddPendingTx(tx);
+            if (canAdd === 'ignored') {
+                return {
+                    result: TopicValidatorResult.Ignore,
+                    obj: tx
+                };
+            }
+            // Stage 2: expensive proof verification
+            const secondStageValidators = this.createSecondStageMessageValidators();
+            const secondStageOutcome = await this.runValidations(tx, secondStageValidators);
+            if (!secondStageOutcome.allPassed) {
+                const { severity } = secondStageOutcome.failure;
+                this.peerManager.penalizePeer(source, severity);
+                return {
+                    result: TopicValidatorResult.Reject
+                };
+            }
+            // Pool add: persist the tx
+            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) {
+            if (wasAccepted) {
                 return {
-                    result: TopicValidatorResult.Reject
+                    result: TopicValidatorResult.Accept,
+                    obj: tx
                 };
-            } else if (exists) {
+            } else if (wasIgnored) {
                 return {
                     result: TopicValidatorResult.Ignore,
                     obj: tx
                 };
             } else {
                 return {
-                    result: TopicValidatorResult.Accept,
-                    obj: tx
+                    result: TopicValidatorResult.Reject
                 };
             }
         };
@@ -1082,131 +1128,190 @@ _dec = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
         if (result !== TopicValidatorResult.Accept || !tx) {
             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`, {
             source: source.toString(),
             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 a checkpoint attestation from a peer.
    * Validates the attestation and adds it to the pool.
    */ async processCheckpointAttestationFromPeer(payloadData, msgId, source) {
-        const validationFunc = 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 checkpoint 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 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(validationFunc, msgId, source, TopicType.checkpoint_attestation);
+        const { result, obj: attestation } = await this.validateReceivedMessage(()=>this.validateAndStoreCheckpointAttestation(source, CheckpointAttestation.fromBuffer(payloadData)), msgId, source, TopicType.checkpoint_attestation);
         if (result !== TopicValidatorResult.Accept || !attestation) {
             return;
         }
-        this.logger.debug(`Received checkpoint 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,
             archive: attestation.archive.toString(),
             source: source.toString()
         });
-        await this.mempools.attestationPool.addCheckpointAttestations([
-            attestation
-        ]);
     }
-    async processBlockFromPeer(payloadData, msgId, source) {
-        const validationFunc = async ()=>{
-            const block = BlockProposal.fromBuffer(payloadData);
-            const isValid = await this.validateBlockProposal(source, block);
-            const pool = this.mempools.attestationPool;
-            const exists = isValid && await pool.hasBlockProposal(block);
-            const canAdd = isValid && await pool.canAddProposal(block);
-            this.logger.trace(`Validate propagated block proposal`, {
-                isValid,
-                exists,
-                canAdd,
-                [Attributes.SLOT_NUMBER]: block.slotNumber.toString(),
-                [Attributes.P2P_ID]: source.toString()
+    /** Validates a checkpoint attestation and adds it to the pool. Penalizes the peer if validation fails. */ async validateAndStoreCheckpointAttestation(peerId, attestation) {
+        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
+            };
+        }
+        // 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()
+        });
+        // 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
             });
-            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()
+            return {
+                result: TopicValidatorResult.Ignore,
+                obj: attestation
+            };
+        }
+        // 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()
+                });
+                this.duplicateAttestationCallback?.({
+                    slot,
+                    attester
                 });
-                return {
-                    result: TopicValidatorResult.Reject
-                };
-            } else {
-                return {
-                    result: TopicValidatorResult.Accept,
-                    obj: block
-                };
             }
+        }
+        // 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(validationFunc, msgId, source, TopicType.block_proposal);
-        if (!result || !block) {
+    }
+    async processBlockFromPeer(payloadData, msgId, source) {
+        const { result, obj: block, metadata: { isEquivocated } = {} } = await this.validateReceivedMessage(()=>this.validateAndStoreBlockProposal(source, BlockProposal.fromBuffer(payloadData)), msgId, source, TopicType.block_proposal);
+        // 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. */ async validateAndStoreBlockProposal(peerId, block) {
+        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.
     async processValidBlockProposal(block, sender) {
@@ -1216,23 +1321,8 @@ _dec = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
             source: sender.toString(),
             ...block.toBlockInfo()
         });
-        // Attempt to add proposal
-        try {
-            await this.mempools.attestationPool.addBlockProposal(block);
-        } catch (err) {
-            // 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.message
-                });
-                return;
-            }
-            throw err;
-        }
-        // Mark the txs in this proposal as non-evictable
-        await this.mempools.txPool.markTxsAsNonEvictable(block.txHashes);
+        // 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);
@@ -1244,56 +1334,135 @@ _dec = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
    * Handle a gossiped checkpoint proposal.
    * Validates and processes the checkpoint proposal, then triggers the callback for attestation.
    */ async handleGossipedCheckpointProposal(payloadData, msgId, source) {
-        // TODO(palla/mbps): This pattern is repeated across multiple message handlers, consider abstracting it.
-        const validationFunc = 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,
+        const { result, obj: checkpoint, metadata: { isEquivocated, processBlock } = {} } = await this.validateReceivedMessage(()=>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.
+   */ async validateAndStoreCheckpointProposal(peerId, checkpoint) {
+        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]: source.toString()
+                [Attributes.P2P_ID]: peerId.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()
+            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 {
                     result: TopicValidatorResult.Reject
                 };
-            } else {
-                return {
-                    result: TopicValidatorResult.Accept,
-                    obj: checkpoint
-                };
+            } else if (result === TopicValidatorResult.Accept && obj && !isEquivocated) {
+                processBlock = true;
             }
-        };
-        const { result, obj: checkpoint } = await this.validateReceivedMessage(validationFunc, msgId, source, TopicType.checkpoint_proposal);
-        if (result !== TopicValidatorResult.Accept || !checkpoint) {
-            return;
         }
-        await this.processValidCheckpointProposal(checkpoint, source);
+        // 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
+            }
+        };
     }
     /**
    * 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.
+   * Note: The proposal was already added to the pool by tryAddCheckpointProposal in handleGossipedCheckpointProposal.
    */ async processValidCheckpointProposal(checkpoint, sender) {
         const slot = checkpoint.slotNumber;
         this.logger.verbose(`Received checkpoint proposal for slot ${slot} from external peer ${sender.toString()}.`, {
@@ -1302,33 +1471,12 @@ _dec = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
             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);
+        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.addCheckpointAttestations(attestations);
+            await this.mempools.attestationPool.addOwnCheckpointAttestations(attestations);
             for (const attestation of attestations){
                 await this.propagate(attestation);
             }
@@ -1357,9 +1505,9 @@ _dec = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
    */ async validateRequestedBlockTxs(request, response, peerId) {
         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()}`);
+                throw new ValidationError(`Received block txs for unexpected archive root: expected ${request.archiveRoot.toString()}, got ${response.archiveRoot.toString()}`);
             }
             if (response.txIndices.getLength() !== request.txIndices.getLength()) {
                 this.peerManager.penalizePeer(peerId, PeerErrorSeverity.MidToleranceError);
@@ -1382,7 +1530,7 @@ _dec = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
                 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());
+            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));
@@ -1401,7 +1549,7 @@ _dec = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
                 }
             } 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`);
+                this.logger.warn(`Block proposal not found for archive root ${request.archiveRoot.toString()}; cannot validate membership/order of returned txs`);
                 return false;
             }
             await Promise.all(response.txs.map((tx)=>this.validateRequestedTx(tx, peerId, requestedTxValidator)));
@@ -1431,7 +1579,7 @@ _dec = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
    */ async validateRequestedTxs(requestedTxHash, responseTx, peerId) {
         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)));
@@ -1484,20 +1632,8 @@ _dec = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
             return false;
         }
     }
-    createRequestedTxValidator() {
-        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));
-    }
     async validateRequestedTx(tx, peerId, txValidator, requested) {
         const penalize = (severity)=>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.`);
@@ -1508,27 +1644,11 @@ _dec = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
             throw new ValidationError(`Received tx with hash ${tx.getTxHash().toString()} that is invalid.`);
         }
     }
-    async validatePropagatedTx(tx, peerId) {
-        const currentBlockNumber = await this.archiver.getBlockNumber();
-        // We accept transactions if they are not expired by the next slot (checked based on the IncludeByTimestamp field)
-        const { ts: nextSlotTimestamp } = this.epochCache.getEpochAndSlotInNextL1Slot();
-        const messageValidators = await this.createMessageValidators(currentBlockNumber, nextSlotTimestamp);
-        for (const validator of messageValidators){
-            const outcome = await this.runValidations(tx, validator);
-            if (outcome.allPassed) {
-                continue;
-            }
-            const { name } = outcome.failure;
-            let { severity } = outcome.failure;
-            // Double spend validator has a special case handler
-            if (name === 'doubleSpendValidator') {
-                const txBlockNumber = BlockNumber(currentBlockNumber + 1); // tx is expected to be in the next block
-                severity = await this.handleDoubleSpendFailure(tx, txBlockNumber);
-            }
-            this.peerManager.penalizePeer(peerId, severity);
-            return false;
-        }
-        return true;
+    createRequestedTxValidator() {
+        return createTxValidatorForReqResponseReceivedTxs(this.proofVerifier, {
+            l1ChainId: this.config.l1ChainId,
+            rollupVersion: this.config.rollupVersion
+        });
     }
     async getGasFees(blockNumber) {
         if (blockNumber === this.feesCache?.blockNumber) {
@@ -1542,38 +1662,41 @@ _dec = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
         };
         return gasFees;
     }
-    async validate(txs) {
-        const currentBlockNumber = await this.archiver.getBlockNumber();
-        // We accept transactions if they are not expired by the next slot (checked based on the IncludeByTimestamp field)
-        const { ts: nextSlotTimestamp } = this.epochCache.getEpochAndSlotInNextL1Slot();
-        const messageValidators = await this.createMessageValidators(currentBlockNumber, nextSlotTimestamp);
-        await Promise.all(txs.map(async (tx)=>{
-            for (const validator of messageValidators){
-                const outcome = await this.runValidations(tx, validator);
-                if (!outcome.allPassed) {
-                    throw new Error('Invalid tx detected', {
-                        cause: {
-                            outcome
-                        }
-                    });
-                }
-            }
+    /**
+   * Get the BatchTxRequesterLibP2PService dependencies for creating BatchTxRequester instances
+   */ getBatchTxRequesterService() {
+        return {
+            reqResp: this.reqresp,
+            connectionSampler: this.reqresp.getConnectionSampler(),
+            txValidatorConfig: {
+                l1ChainId: this.config.l1ChainId,
+                rollupVersion: this.config.rollupVersion,
+                proofVerifier: this.proofVerifier
+            },
+            peerScoring: this.peerManager
+        };
+    }
+    async validateTxsReceivedInBlockProposal(txs) {
+        const validator = createTxValidatorForBlockProposalReceivedTxs(this.proofVerifier, {
+            l1ChainId: this.config.l1ChainId,
+            rollupVersion: this.config.rollupVersion
+        }, this.logger.getBindings());
+        const results = await Promise.all(txs.map(async (tx)=>{
+            const result = await validator.validateTx(tx);
+            return result.result !== 'invalid';
         }));
+        if (results.some((value)=>value === false)) {
+            throw new Error('Invalid tx detected');
+        }
     }
-    /**
-   * Create message validators for the given block number and timestamp.
-   *
-   * Each validator is a pair of a validator and a severity.
-   * If a validator fails, the peer is penalized with the severity of the validator.
-   *
-   * @param currentBlockNumber - The current synced block number.
-   * @param nextSlotTimestamp - The timestamp of the next slot (used to validate txs are not expired).
-   * @returns The message validators.
-   */ async createMessageValidators(currentBlockNumber, nextSlotTimestamp) {
+    /** Creates the first stage (fast) validators for gossiped transactions. */ async createFirstStageMessageValidators(currentBlockNumber, nextSlotTimestamp) {
         const gasFees = await this.getGasFees(currentBlockNumber);
         const allowedInSetup = this.config.txPublicSetupAllowList ?? await getDefaultAllowedSetupFunctions();
-        const blockNumberInWhichTheTxIsConsideredToBeIncluded = BlockNumber(currentBlockNumber + 1);
-        return createTxMessageValidators(nextSlotTimestamp, blockNumberInWhichTheTxIsConsideredToBeIncluded, this.worldStateSynchronizer, gasFees, this.config.l1ChainId, this.config.rollupVersion, protocolContractsHash, this.archiver, this.proofVerifier, !this.config.disableTransactions, allowedInSetup);
+        const blockNumber = BlockNumber(currentBlockNumber + 1);
+        return createFirstStageTxValidationsForGossipedTransactions(nextSlotTimestamp, blockNumber, this.worldStateSynchronizer, gasFees, this.config.l1ChainId, this.config.rollupVersion, protocolContractsHash, this.archiver, !this.config.disableTransactions, allowedInSetup, this.logger.getBindings());
+    }
+    /** Creates the second stage (expensive proof verification) validators for gossiped transactions. */ createSecondStageMessageValidators() {
+        return createSecondStageTxValidationsForGossipedTransactions(this.proofVerifier, this.logger.getBindings());
     }
     /**
    * Run validations on a tx.
@@ -1632,7 +1755,7 @@ _dec = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
                 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') {
             return PeerErrorSeverity.LowToleranceError;
@@ -1645,41 +1768,12 @@ _dec = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
    * @param attestation - The checkpoint attestation to validate.
    * @returns True if the checkpoint attestation is valid, false otherwise.
    */ async validateCheckpointAttestation(peerId, attestation) {
-        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;
-        }
-        return true;
-    }
-    /**
-   * Validate a block proposal.
-   *
-   * @param block - The block proposal to validate.
-   * @returns True if the block proposal is valid, false otherwise.
-   */ async validateBlockProposal(peerId, block) {
-        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;
-        }
-        return true;
-    }
-    /**
-   * Validate a checkpoint proposal.
-   *
-   * @param checkpoint - The checkpoint proposal to validate.
-   * @returns True if the checkpoint proposal is valid, false otherwise.
-   */ async validateCheckpointProposal(peerId, checkpoint) {
-        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;
+        const result = await this.checkpointAttestationValidator.validate(attestation);
+        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;
     }
     getPeerScore(peerId) {
         return this.node.services.pubsub.score.score(peerId.toString());