@aztec/p2p 0.0.1-commit.e558bd1c → 0.0.1-commit.e57c76e

package/dest/services/libp2p/libp2p_service.js

@@ -370,21 +370,20 @@ function applyDecs2203RFactory() {
 function _apply_decs_2203_r(targetClass, memberDecs, classDecs, parentClass) {
     return (_apply_decs_2203_r = applyDecs2203RFactory())(targetClass, memberDecs, classDecs, parentClass);
 }
-var _dec, _dec1, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _initProto;
+var _dec, _dec1, _dec2, _dec3, _dec4, _dec5, _initProto;
 import { BlockNumber } from '@aztec/foundation/branded-types';
-import { randomInt } from '@aztec/foundation/crypto/random';
+import { maxBy, merge } from '@aztec/foundation/collection';
 import { createLibp2pComponentLogger, createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { Timer } from '@aztec/foundation/timer';
 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, PeerErrorSeverityByHarshness, 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';
@@ -393,22 +392,24 @@ import { identify } from '@libp2p/identify';
 import { TopicValidatorResult } from '@libp2p/interface';
 import { mplex } from '@libp2p/mplex';
 import { tcp } from '@libp2p/tcp';
+import { multiaddr } from '@multiformats/multiaddr';
 import { ENR } from '@nethermindeth/enr';
 import { createLibp2p } from 'libp2p';
+import { CheckpointProposalReceivedCallbackNotRegisteredError } from '../../errors/p2p-service.error.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 { createTxMessageValidators, createTxReqRespValidator } from '../../msg_validators/tx_validator/factory.js';
+import { createFirstStageTxValidationsForGossipedTransactions, createSecondStageTxValidationsForGossipedTransactions, createTxValidatorForBlockProposalReceivedTxs } 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/index.js';
-import { pingHandler, reqGoodbyeHandler, reqRespBlockHandler, reqRespBlockTxsHandler, reqRespStatusHandler, reqRespTxHandler } from '../reqresp/index.js';
+import { ReqRespSubProtocol, ValidationError, pingHandler, reqGoodbyeHandler, reqRespBlockTxsHandler, reqRespStatusHandler, reqRespTxHandler } from '../reqresp/index.js';
 import { ReqResp } from '../reqresp/reqresp.js';
 import { P2PInstrumentation } from './instrumentation.js';
 _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId, attestation)=>({
@@ -426,23 +427,12 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         [Attributes.SLOT_NUMBER]: checkpoint.slotNumber,
         [Attributes.BLOCK_ARCHIVE]: checkpoint.archive.toString(),
         [Attributes.P2P_ID]: await checkpoint.p2pMessageLoggingIdentifier().then((i)=>i.toString())
-    })), _dec5 = trackSpan('Libp2pService.validateRequestedBlockTxs', (request)=>({
+    })), _dec5 = trackSpan('Libp2pService.validateRequestedBlockTxsConsistency', (request)=>({
         [Attributes.BLOCK_ARCHIVE]: request.archiveRoot.toString()
-    })), _dec6 = trackSpan('Libp2pService.validateRequestedTx', (requestedTxHash, _responseTx)=>({
-        [Attributes.TX_HASH]: requestedTxHash.toString()
-    })), _dec7 = trackSpan('Libp2pService.validateRequestedBlock', (requestedBlockNumber, _responseBlock)=>({
-        [Attributes.BLOCK_NUMBER]: requestedBlockNumber.toString()
-    })), _dec8 = trackSpan('Libp2pService.validatePropagatedTx', (tx)=>({
-        [Attributes.TX_HASH]: tx.getTxHash().toString()
-    })), _dec9 = 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())
     }));
 /**
  * Lib P2P implementation of the P2PService interface.
  */ export class LibP2PService extends WithTracer {
-    clientType;
     config;
     node;
     peerDiscoveryService;
@@ -453,6 +443,8 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
     epochCache;
     proofVerifier;
     worldStateSynchronizer;
+    blockMinFeesProvider;
+    txValidationCache;
     static{
         ({ e: [_initProto] } = _apply_decs_2203_r(this, [
             [
@@ -483,27 +475,7 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
             [
                 _dec5,
                 2,
-                "validateRequestedBlockTxs"
-            ],
-            [
-                _dec6,
-                2,
-                "validateRequestedTxs"
-            ],
-            [
-                _dec7,
-                2,
-                "validateRequestedBlock"
-            ],
-            [
-                _dec8,
-                2,
-                "validatePropagatedTx"
-            ],
-            [
-                _dec9,
-                2,
-                "validateCheckpointAttestation"
+                "validateRequestedBlockTxsConsistency"
             ]
         ], []));
     }
@@ -515,8 +487,9 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
     checkpointAttestationValidator;
     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 invoked when a valid checkpoint attestation is accepted into the pool. */ checkpointAttestationCallback;
     /**
    * Callback for when a block is received from a peer.
    * @param block - The block received from the peer.
@@ -526,13 +499,20 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
    * 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.
-   */ checkpointReceivedCallback;
+   */ allNodesCheckpointReceivedCallback;
+    /**
+   * Callback for when a checkpoint proposal is received - specifically for validators - from a peer.
+   * @param checkpoint - The checkpoint proposal received from the peer.
+   * @returns The attestations for the checkpoint, if any.
+   */ validatorCheckpointReceivedCallback;
     gossipSubEventHandler;
+    ipChangedHandler;
+    discoveredP2pIp;
     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, blockMinFeesProvider, telemetry, logger = createLogger('p2p:libp2p_service'), txValidationCache){
+        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.blockMinFeesProvider = blockMinFeesProvider, this.txValidationCache = txValidationCache, 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;
@@ -548,35 +528,51 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         this.topicStrings[TopicType.block_proposal] = createTopicString(TopicType.block_proposal, this.protocolVersion);
         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
-        });
-        this.checkpointProposalValidator = new CheckpointProposalValidator(epochCache, {
-            txsPermitted: !config.disableTransactions
-        });
-        this.checkpointAttestationValidator = config.fishermanMode ? new FishermanAttestationValidator(epochCache, mempools.attestationPool, telemetry) : new CheckpointAttestationValidator(epochCache);
+        const p2pPropagationTime = config.attestationPropagationTime;
+        const proposalValidatorOpts = {
+            txsPermitted: !config.disableTransactions,
+            maxTxsPerBlock: config.validateMaxTxsPerBlock ?? config.validateMaxTxsPerCheckpoint,
+            maxBlocksPerCheckpoint: config.maxBlocksPerCheckpoint,
+            p2pPropagationTime,
+            skipSlotValidation: config.skipProposalSlotValidation,
+            signatureContext: {
+                chainId: config.l1ChainId,
+                rollupAddress: config.rollupAddress
+            }
+        };
+        this.blockProposalValidator = new BlockProposalValidator(epochCache, proposalValidatorOpts);
+        this.checkpointProposalValidator = new CheckpointProposalValidator(epochCache, proposalValidatorOpts);
+        const attestationValidatorOpts = {
+            l1PublishingTime: config.l1PublishingTime,
+            p2pPropagationTime,
+            signatureContext: proposalValidatorOpts.signatureContext
+        };
+        this.checkpointAttestationValidator = config.fishermanMode ? new FishermanAttestationValidator(epochCache, mempools.attestationPool, telemetry, attestationValidatorOpts) : new CheckpointAttestationValidator(epochCache, attestationValidatorOpts);
         this.gossipSubEventHandler = this.handleGossipSubEvent.bind(this);
         this.blockReceivedCallback = async (block)=>{
-            this.logger.debug(`Handler not yet registered: Block received callback not set. Received block for slot ${block.slotNumber} from peer.`, {
+            this.logger.warn(`Handler for block received not yet registered on P2P service. Received block ${block.blockNumber} for slot ${block.slotNumber} from peer.`, {
                 p2pMessageIdentifier: await block.p2pMessageLoggingIdentifier()
             });
-            return false;
+            return true;
         };
-        this.checkpointReceivedCallback = (checkpoint)=>{
-            this.logger.debug(`Handler not yet registered: Checkpoint received callback not set. Received checkpoint for slot ${checkpoint.slotNumber} from peer.`);
+        this.allNodesCheckpointReceivedCallback = (_checkpoint)=>{
+            throw new CheckpointProposalReceivedCallbackNotRegisteredError();
+        };
+        this.validatorCheckpointReceivedCallback = (_checkpoint)=>{
             return Promise.resolve(undefined);
         };
     }
     updateConfig(config) {
         this.reqresp.updateConfig(config);
+        this.config = merge(this.config, config);
     }
     /**
    * Creates an instance of the LibP2P service.
    * @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) {
-        const { worldStateSynchronizer, epochCache, l2BlockSource, mempools, proofVerifier, peerStore, telemetry, logger, packageVersion } = deps;
+   */ static async new(config, peerId, deps) {
+        const { worldStateSynchronizer, epochCache, l2BlockSource, mempools, proofVerifier, peerStore, blockMinFeesProvider, telemetry, logger, packageVersion, txValidationCache } = deps;
         const { p2pPort, maxPeerCount, listenAddress } = config;
         const bindAddrTcp = convertToMultiaddr(listenAddress, p2pPort, 'tcp');
         const datastore = new AztecDatastore(peerStore);
@@ -595,10 +591,6 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         }
         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();
@@ -616,6 +608,18 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         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,
+            ethereumSlotDuration: l1Constants.ethereumSlotDuration,
+            heartbeatIntervalMs: config.gossipsubInterval,
+            targetCommitteeSize: l1Constants.targetCommitteeSize,
+            blockDurationMs: config.blockDurationMs,
+            l1PublishingTime: config.l1PublishingTime,
+            p2pPropagationTime: config.attestationPropagationTime,
+            expectedBlockProposalsPerSlot: config.expectedBlockProposalsPerSlot
+        });
         const node = await createLibp2p({
             start: false,
             peerId,
@@ -716,32 +720,12 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
                     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
+                        connectionManager: components.connectionManager,
+                        addressManager: components.addressManager
                     })
             },
             logger: createLibp2pComponentLogger(logger.module, logger.getBindings())
@@ -749,10 +733,16 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         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;
+        // Gate req/resp data protocols for unauthenticated peers when p2pAllowOnlyValidators is enabled
+        reqresp.setShouldRejectPeer((peerId)=>peerManager.shouldDisableP2PGossip(peerId));
+        // 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, blockMinFeesProvider, telemetry, logger, txValidationCache);
     }
     /**
    * Starts the LibP2P service.
@@ -762,22 +752,19 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         if (this.node.status === 'started') {
             throw new Error('P2P service already started');
         }
-        // Get listen & announce addresses for logging
         const { p2pIp, p2pPort } = this.config;
-        if (!p2pIp) {
-            throw new Error('Announce address not provided.');
+        if (!p2pIp && !this.config.queryForIp) {
+            throw new Error('Announce address not provided and queryForIp is not enabled.');
         }
-        const announceTcpMultiaddr = convertToMultiaddr(p2pIp, p2pPort, 'tcp');
+        const announceTcpMultiaddr = p2pIp ? convertToMultiaddr(p2pIp, p2pPort, 'tcp') : undefined;
         // Create request response protocol handlers
         const txHandler = reqRespTxHandler(this.mempools);
         const goodbyeHandler = reqGoodbyeHandler(this.peerManager);
-        const blockHandler = reqRespBlockHandler(this.archiver);
         const statusHandler = reqRespStatusHandler(this.protocolVersion, this.worldStateSynchronizer, this.logger);
         const requestResponseHandlers = {
             [ReqRespSubProtocol.PING]: pingHandler,
             [ReqRespSubProtocol.STATUS]: statusHandler.bind(this),
-            [ReqRespSubProtocol.GOODBYE]: goodbyeHandler.bind(this),
-            [ReqRespSubProtocol.BLOCK]: blockHandler.bind(this)
+            [ReqRespSubProtocol.GOODBYE]: goodbyeHandler.bind(this)
         };
         if (!this.config.disableTransactions) {
             const blockTxsHandler = reqRespBlockTxsHandler(this.mempools.attestationPool, this.archiver, this.mempools.txPool);
@@ -786,18 +773,11 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         if (!this.config.disableTransactions) {
             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.reqresp.start(requestResponseHandlers);
         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
@@ -806,6 +786,34 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         if (!this.config.p2pDiscoveryDisabled) {
             await this.peerDiscoveryService.start();
         }
+        // Bridge discv5 IP changes to libp2p's AddressManager so peers see the updated address
+        if (this.config.queryForIp) {
+            this.discoveredP2pIp = this.config.p2pIp;
+            this.logger.info('IP change tracking enabled, bridging discv5 IP updates to libp2p AddressManager');
+            this.ipChangedHandler = (ip)=>{
+                const addressManager = this.node.services.components.addressManager;
+                const newAddr = multiaddr(convertToMultiaddr(ip, this.config.p2pPort, 'tcp'));
+                const previousIp = this.discoveredP2pIp;
+                if (previousIp) {
+                    const oldAddr = multiaddr(convertToMultiaddr(previousIp, this.config.p2pPort, 'tcp'));
+                    addressManager.removeObservedAddr(oldAddr);
+                    this.logger.info('Libp2p announce address updated due to IP change', {
+                        previousIp,
+                        newIp: ip,
+                        newMultiaddr: newAddr.toString()
+                    });
+                } else {
+                    this.logger.info('Libp2p announce address set from initial discv5 IP discovery', {
+                        ip,
+                        multiaddr: newAddr.toString()
+                    });
+                }
+                addressManager.addObservedAddr(newAddr);
+                addressManager.confirmObservedAddr(newAddr);
+                this.discoveredP2pIp = ip;
+            };
+            this.peerDiscoveryService.on('ip:changed', this.ipChangedHandler);
+        }
         this.discoveryRunningPromise = new RunningPromise(async ()=>{
             await this.peerManager.heartbeat();
         }, this.logger, this.config.peerCheckIntervalMS);
@@ -823,6 +831,10 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
    */ async stop() {
         // Remove gossip sub listener
         this.node.services.pubsub.removeEventListener(GossipSubEvent.MESSAGE, this.gossipSubEventHandler);
+        if (this.ipChangedHandler) {
+            this.peerDiscoveryService.removeListener('ip:changed', this.ipChangedHandler);
+            this.ipChangedHandler = undefined;
+        }
         // Stop peer manager
         this.logger.debug('Stopping peer manager...');
         await this.peerManager.stop();
@@ -836,8 +848,8 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         await this.stopLibP2P();
         this.logger.info('LibP2P service stopped');
     }
-    addReqRespSubProtocol(subProtocol, handler, validator) {
-        return this.reqresp.addSubProtocol(subProtocol, handler, validator);
+    addReqRespSubProtocol(subProtocol, handler) {
+        return this.reqresp.addSubProtocol(subProtocol, handler);
     }
     registerThisValidatorAddresses(address) {
         this.peerManager.registerThisValidatorAddresses(address);
@@ -845,6 +857,9 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
     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 ()=>{
@@ -856,14 +871,6 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         };
         setImmediate(()=>void safeJob());
     }
-    /**
-   * Send a batch of requests to peers, and return the responses
-   * @param protocol - The request response protocol to use
-   * @param requests - The requests to send to the peers
-   * @returns The responses to the requests
-   */ sendBatchRequest(protocol, requests, pinnedPeerId) {
-        return this.reqresp.sendBatchRequest(protocol, requests, pinnedPeerId);
-    }
     sendRequestToPeer(peerId, subProtocol, payload, dialTimeout) {
         return this.reqresp.sendRequestToPeer(peerId, subProtocol, payload, dialTimeout);
     }
@@ -876,8 +883,11 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
     registerBlockReceivedCallback(callback) {
         this.blockReceivedCallback = callback;
     }
-    registerCheckpointReceivedCallback(callback) {
-        this.checkpointReceivedCallback = callback;
+    registerValidatorCheckpointReceivedCallback(callback) {
+        this.validatorCheckpointReceivedCallback = callback;
+    }
+    registerAllNodesCheckpointReceivedCallback(callback) {
+        this.allNodesCheckpointReceivedCallback = callback;
     }
     /**
    * Registers a callback to be invoked when a duplicate proposal is detected.
@@ -886,6 +896,16 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         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;
+    }
+    registerCheckpointAttestationCallback(callback) {
+        this.checkpointAttestationCallback = callback;
+    }
+    /**
    * Subscribes to a topic.
    * @param topic - The topic to subscribe to.
    */ subscribeToTopic(topic) {
@@ -936,6 +956,12 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         if (!validator || !validator.addMessage(msgId)) {
             this.instrumentation.incMessagePrevalidationStatus(false, topicType);
             this.node.services.pubsub.reportMessageValidationResult(msgId, source.toString(), TopicValidatorResult.Ignore);
+            if (topicType === TopicType.tx) {
+                this.logger.verbose(`Ignoring already-seen tx gossip message`, {
+                    msgId,
+                    source: source.toString()
+                });
+            }
             return {
                 result: false,
                 topicType
@@ -993,12 +1019,17 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         }
         // Process the message, optionally within a linked span for trace propagation
         const processMessage = async ()=>{
+            if (this.config.skipIncomingProposals && (msg.topic === this.topicStrings[TopicType.block_proposal] || msg.topic === this.topicStrings[TopicType.checkpoint_proposal])) {
+                this.logger.warn(`Ignoring incoming proposal (skipIncomingProposals is set)`, {
+                    topic: msg.topic
+                });
+                this.node.services.pubsub.reportMessageValidationResult(msgId, source.toString(), TopicValidatorResult.Ignore);
+                return;
+            }
             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]) {
@@ -1043,49 +1074,162 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         return;
     }
     async validateReceivedMessage(validationFunc, msgId, source, topicType) {
+        // Default to reject result with a penalty if validation function throws an error
         let resultAndObj = {
-            result: TopicValidatorResult.Reject
+            result: TopicValidatorResult.Reject,
+            severity: PeerErrorSeverity.MidToleranceError
         };
         const timer = new Timer();
         try {
             resultAndObj = await validationFunc();
         } catch (err) {
-            this.peerManager.penalizePeer(source, PeerErrorSeverity.LowToleranceError);
-            this.logger.error(`Error deserializing and validating gossipsub message`, err, {
+            this.logger.error(`Error validating gossipsub message`, err, {
                 msgId,
                 source: source.toString(),
                 topicType
             });
         }
+        const validationTimeMs = timer.ms();
+        const mcacheWindowMs = this.config.gossipsubMcacheLength * this.config.gossipsubInterval;
+        if (validationTimeMs > mcacheWindowMs * 0.75) {
+            this.instrumentation.incSlowValidation(topicType);
+            this.logger.warn(`Gossip validation for ${topicType} took ${validationTimeMs}ms, approaching mcache eviction window of ${mcacheWindowMs}ms. ` + `Message forwarding may be skipped if validation exceeds the window.`, {
+                msgId,
+                source: source.toString(),
+                topicType,
+                validationTimeMs,
+                mcacheWindowMs
+            });
+        }
         if (resultAndObj.result === TopicValidatorResult.Accept) {
+            this.logger.debug(`Message ${topicType} accepted by validator`, {
+                msgId,
+                source: source.toString(),
+                topicType
+            });
             this.instrumentation.recordMessageValidation(topicType, timer);
+        } else if (resultAndObj.result === TopicValidatorResult.Reject) {
+            this.logger.warn(`Message ${topicType} rejected by validator with severity ${resultAndObj.severity}`, {
+                msgId,
+                source: source.toString(),
+                topicType,
+                severity: resultAndObj.severity
+            });
+            this.peerManager.penalizePeer(source, resultAndObj.severity);
+        } else {
+            this.logger.trace(`Message ${topicType} ignored by validator`, {
+                msgId,
+                source: source.toString(),
+                topicType
+            });
         }
         this.node.services.pubsub.reportMessageValidationResult(msgId, source.toString(), resultAndObj.result);
         return resultAndObj;
     }
+    tryDeserialize(deserializeFunc, msgId, source) {
+        try {
+            return deserializeFunc();
+        } catch (err) {
+            this.logger.warn(`Failed to deserialize gossipsub message from buffer`, {
+                err,
+                msgId,
+                source: source.toString()
+            });
+            return undefined;
+        }
+    }
     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());
-            this.logger.trace(`Validate propagated tx`, {
-                isValid,
-                exists,
+            const tx = this.tryDeserialize(()=>Tx.fromBuffer(payloadData), msgId, source);
+            if (!tx) {
+                return {
+                    result: TopicValidatorResult.Reject,
+                    severity: PeerErrorSeverity.LowToleranceError
+                };
+            }
+            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.logger.verbose(`Rejecting gossiped tx ${tx.getTxHash().toString()}: stage 1 validation failed`, {
+                    validator: name,
+                    severity,
+                    source: source.toString()
+                });
+                return {
+                    result: TopicValidatorResult.Reject,
+                    severity
+                };
+            }
+            // 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') {
+                this.logger.verbose(`Ignoring gossiped tx ${tx.getTxHash().toString()}: pool pre-check returned ignored`, {
+                    source: source.toString()
+                });
+                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, name } = secondStageOutcome.failure;
+                this.logger.verbose(`Rejecting gossiped tx ${tx.getTxHash().toString()}: stage 2 validation failed`, {
+                    validator: name,
+                    severity,
+                    source: source.toString()
+                });
+                return {
+                    result: TopicValidatorResult.Reject,
+                    severity
+                };
+            }
+            // 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.verbose(`Validate propagated tx ${txHash.toString()}`, {
+                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 {
+                this.logger.warn(`Gossiped tx ${txHash.toString()} unexpectedly rejected by pool`, {
+                    source: source.toString(),
+                    txHash: txHash.toString()
+                });
                 return {
-                    result: TopicValidatorResult.Accept,
-                    obj: tx
+                    result: TopicValidatorResult.Reject,
+                    severity: PeerErrorSeverity.HighToleranceError
                 };
             }
         };
@@ -1093,26 +1237,29 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         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 { result, obj: attestation } = await this.validateReceivedMessage(()=>this.validateAndStoreCheckpointAttestation(source, CheckpointAttestation.fromBuffer(payloadData)), msgId, source, TopicType.checkpoint_attestation);
+        const { result, obj: attestation } = await this.validateReceivedMessage(()=>{
+            const attestation = this.tryDeserialize(()=>CheckpointAttestation.fromBuffer(payloadData), msgId, source);
+            if (!attestation) {
+                return Promise.resolve({
+                    result: TopicValidatorResult.Reject,
+                    severity: PeerErrorSeverity.LowToleranceError
+                });
+            }
+            return this.validateAndStoreCheckpointAttestation(source, attestation);
+        }, msgId, source, TopicType.checkpoint_attestation);
         if (result !== TopicValidatorResult.Accept || !attestation) {
             return;
         }
@@ -1127,9 +1274,9 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         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
+                result: TopicValidatorResult.Reject,
+                severity: validationResult.severity
             };
         }
         if (validationResult.result === 'ignore') {
@@ -1138,38 +1285,57 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
                 obj: attestation
             };
         }
-        // Get committee size for the attestation's slot
-        const slot = attestation.payload.header.slotNumber;
-        const { committee } = await this.epochCache.getCommittee(slot);
-        const committeeSize = committee?.length ?? 0;
         // Try to add the attestation: this handles existence check, cap check, and adding in one call
-        const { added, alreadyExists } = await this.mempools.attestationPool.tryAddCheckpointAttestation(attestation, committeeSize);
+        // 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()
         });
-        // Duplicate attestation received, no need to re-broadcast
+        // Exact same attestation received, no need to re-broadcast
         if (alreadyExists) {
             return {
                 result: TopicValidatorResult.Ignore,
                 obj: attestation
             };
         }
-        // Could not add (cap reached), no need to re-broadcast
+        // Could not add (cap reached for signer), penalize and do not re-broadcast
         if (!added) {
-            this.logger.warn(`Dropping checkpoint attestation due to per-(slot, proposalId) attestation cap`, {
+            this.logger.warn(`Rejecting checkpoint attestation due to cap`, {
                 slot: slot.toString(),
                 archive: attestation.archive.toString(),
-                source: peerId.toString()
+                source: peerId.toString(),
+                attester: attestation.getSender()?.toString(),
+                count
             });
             return {
-                result: TopicValidatorResult.Ignore,
-                obj: attestation
+                result: TopicValidatorResult.Reject,
+                severity: PeerErrorSeverity.HighToleranceError
             };
         }
-        // Attestation was added successfully
+        // 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
+                });
+            }
+        }
+        // Attestation was added successfully - accept it so other nodes can also detect the equivocation
+        this.checkpointAttestationCallback?.(attestation);
         return {
             result: TopicValidatorResult.Accept,
             obj: attestation
@@ -1187,9 +1353,9 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         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
+                result: TopicValidatorResult.Reject,
+                severity: validationResult.severity
             };
         }
         if (validationResult.result === 'ignore') {
@@ -1199,8 +1365,8 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
             };
         }
         // Try to add the proposal: this handles existence check, cap check, and adding in one call
-        const { added, alreadyExists, totalForPosition } = await this.mempools.attestationPool.tryAddBlockProposal(block);
-        const isEquivocated = totalForPosition !== undefined && totalForPosition > 1;
+        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`, {
@@ -1219,11 +1385,10 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         }
         // 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,
-                totalForPosition,
+                count,
                 proposer: block.getSender()?.toString(),
                 source: peerId.toString()
             });
@@ -1231,7 +1396,8 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
                 result: TopicValidatorResult.Reject,
                 metadata: {
                     isEquivocated
-                }
+                },
+                severity: PeerErrorSeverity.HighToleranceError
             };
         }
         // If this was a duplicate proposal, do not process it, but do invoke the duplicate callback,
@@ -1244,7 +1410,7 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
                 proposer: proposer?.toString()
             });
             // Invoke the duplicate callback on the first duplicate spotted only
-            if (proposer && totalForPosition === 2) {
+            if (proposer && count === 2) {
                 this.duplicateProposalCallback?.({
                     slot: block.slotNumber,
                     proposer,
@@ -1274,13 +1440,13 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
             source: sender.toString(),
             ...block.toBlockInfo()
         });
-        // 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);
         if (!isValid) {
-            this.logger.warn(`Block proposal validation failed for block ${block.blockNumber}`, block.toBlockInfo());
+            this.logger.info(`Block proposal validation failed for block ${block.blockNumber}`, block.toBlockInfo());
         }
     }
     /**
@@ -1288,15 +1454,24 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
    * Validates and processes the checkpoint proposal, then triggers the callback for attestation.
    */ async handleGossipedCheckpointProposal(payloadData, msgId, source) {
         const { result, obj: checkpoint, metadata: { isEquivocated, processBlock } = {} } = await this.validateReceivedMessage(()=>this.validateAndStoreCheckpointProposal(source, CheckpointProposal.fromBuffer(payloadData)), msgId, source, TopicType.checkpoint_proposal);
+        // Process checkpoint proposal if valid and not equivocated.
+        const processCheckpointFn = ()=>result === TopicValidatorResult.Accept && checkpoint && !isEquivocated ? this.processValidCheckpointProposal(checkpoint.toCore(), source) : Promise.resolve();
         // 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) {
+        const processBlockFn = ()=>processBlock && checkpoint && checkpoint.getBlockProposal() ? this.processValidBlockProposal(checkpoint.getBlockProposal(), source) : Promise.resolve();
+        // A node that skips checkpoint validation attests without re-executing the embedded last block, so run
+        // the checkpoint callback first: this creates and broadcasts the attestation before the block is
+        // processed. Otherwise the block's re-execution — which can stall until the re-execution deadline
+        // waiting for a parent that may never arrive — would delay the attestation past the slot's attestation
+        // window, after which peers reject it as stale.
+        if (this.config.skipCheckpointProposalValidation) {
+            await processCheckpointFn();
+            await processBlockFn();
             return;
         }
-        await this.processValidCheckpointProposal(checkpoint.toCore(), source);
+        // Process the block first, since it's required for the checkpoint proposal validation.
+        await processBlockFn();
+        await processCheckpointFn();
     }
     /**
    * Validates a checkpoint proposal. Penalizes peer if validation fails. Adds the checkpoint and
@@ -1305,9 +1480,9 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         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
+                result: TopicValidatorResult.Reject,
+                severity: validationResult.severity
             };
         }
         if (validationResult.result === 'ignore') {
@@ -1324,26 +1499,28 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
                 [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) {
+            const blockProposalResult = await this.validateAndStoreBlockProposal(peerId, blockProposal);
+            const { obj, metadata: { isEquivocated } = {} } = blockProposalResult;
+            if (blockProposalResult.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
+                    result: blockProposalResult.result
                 });
                 return {
-                    result: TopicValidatorResult.Reject
+                    result: TopicValidatorResult.Reject,
+                    severity: 'severity' in blockProposalResult ? blockProposalResult.severity : PeerErrorSeverity.MidToleranceError
                 };
-            } else if (result === TopicValidatorResult.Accept && obj && !isEquivocated) {
+            } else if (blockProposalResult.result === TopicValidatorResult.Accept && obj && !isEquivocated) {
                 processBlock = true;
             }
         }
         // 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, totalForPosition } = tryAddResult;
-        const isEquivocated = totalForPosition !== undefined && totalForPosition > 1;
+        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`, {
@@ -1362,10 +1539,9 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         // 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(),
-                totalForPosition,
+                count,
                 source: peerId.toString()
             });
             return {
@@ -1374,7 +1550,8 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
                 metadata: {
                     isEquivocated,
                     processBlock
-                }
+                },
+                severity: PeerErrorSeverity.HighToleranceError
             };
         }
         // If this was a duplicate proposal, do not process it, but do invoke the duplicate callback,
@@ -1387,7 +1564,7 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
                 proposer: proposer?.toString()
             });
             // Invoke the duplicate callback on the first duplicate spotted only
-            if (proposer && totalForPosition === 2) {
+            if (proposer && count === 2) {
                 this.duplicateProposalCallback?.({
                     slot: checkpoint.slotNumber,
                     proposer,
@@ -1424,9 +1601,10 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
             archive: checkpoint.archive.toString(),
             source: sender.toString()
         });
+        await this.allNodesCheckpointReceivedCallback(checkpoint, sender);
         // Call the checkpoint received callback with the core version (without lastBlock)
         // to validate and potentially generate attestations
-        const attestations = await this.checkpointReceivedCallback(checkpoint, sender);
+        const attestations = await this.validatorCheckpointReceivedCallback(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);
@@ -1450,192 +1628,78 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         });
     }
     /**
-   * Validate the requested block transactions. Allow partial returns.
+   * Validate the requested block transactions request-response consistency.
+   * It does NOT validate the transactions themselves.
    * @param request - The block transactions request.
    * @param response - The block transactions response.
    * @param peerId - The ID of the peer that made the request.
-   * @returns True if the requested block transactions are valid, false otherwise.
-   */ async validateRequestedBlockTxs(request, response, peerId) {
-        const requestedTxValidator = this.createRequestedTxValidator();
+   * @returns True if the request-response is consistent, false otherwise.
+   */ async validateRequestedBlockTxsConsistency(request, response, peerId) {
         try {
-            if (!response.archiveRoot.equals(request.archiveRoot)) {
-                this.peerManager.penalizePeer(peerId, PeerErrorSeverity.MidToleranceError);
-                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);
-                throw new ValidationError(`Received block txs with mismatched bitvector length: expected ${request.txIndices.getLength()}, got ${response.txIndices.getLength()}`);
-            }
-            // Check no duplicates and not exceeding returnable count
-            const requestedIndices = new Set(request.txIndices.getTrueIndices());
-            const availableIndices = new Set(response.txIndices.getTrueIndices());
-            const maxReturnable = [
-                ...requestedIndices
-            ].filter((i)=>availableIndices.has(i)).length;
-            const returnedHashes = await Promise.all(response.txs.map((tx)=>tx.getTxHash().toString()));
+            // Check for duplicates txs (or hashes) in the response.
+            const returnedHashes = response.txs.map((tx)=>tx.getTxHash().toString());
             const uniqueReturned = new Set(returnedHashes.map((h)=>h.toString()));
             if (uniqueReturned.size !== returnedHashes.length) {
                 this.peerManager.penalizePeer(peerId, PeerErrorSeverity.MidToleranceError);
                 throw new ValidationError(`Received duplicate txs in block txs response`);
             }
-            if (response.txs.length > maxReturnable) {
-                this.peerManager.penalizePeer(peerId, PeerErrorSeverity.MidToleranceError);
-                throw new ValidationError(`Received more txs (${response.txs.length}) than requested-and-available (${maxReturnable})`);
-            }
-            // Given proposal (should have locally), ensure returned txs are valid subset and match request indices
-            const proposal = await this.mempools.attestationPool.getBlockProposal(request.archiveRoot.toString());
-            if (proposal) {
-                // Build intersected indices
-                const intersectIdx = request.txIndices.getTrueIndices().filter((i)=>response.txIndices.isSet(i));
-                // Enforce subset membership and preserve increasing order by index.
-                const hashToIndexInProposal = new Map(proposal.txHashes.map((h, i)=>[
-                        h.toString(),
-                        i
-                    ]));
-                const allowedIndexSet = new Set(intersectIdx);
-                const indices = returnedHashes.map((h)=>hashToIndexInProposal.get(h));
-                const allAllowed = indices.every((idx)=>idx !== undefined && allowedIndexSet.has(idx));
-                const strictlyIncreasing = indices.every((idx, i)=>i === 0 ? idx !== undefined : idx > indices[i - 1]);
-                if (!allAllowed || !strictlyIncreasing) {
-                    this.peerManager.penalizePeer(peerId, PeerErrorSeverity.LowToleranceError);
-                    throw new ValidationError('Returned txs do not match expected subset/order for requested indices');
-                }
-            } else {
-                // No local proposal, cannot check the membership/order of the returned txs
-                this.logger.warn(`Block proposal not found for archive root ${request.archiveRoot.toString()}; cannot validate membership/order of returned txs`);
+            // We get the block tx hashes from the proposal or the archiver.
+            const proposal = await this.mempools.attestationPool.getBlockProposalByArchive(request.archiveRoot.toString());
+            const blockTxHashes = proposal?.txHashes ?? (await this.archiver.getBlock({
+                archive: request.archiveRoot
+            }))?.body.txEffects.map((e)=>e.txHash);
+            // If we don't have the block, we can't verify membership/order of the returned txs.
+            if (!blockTxHashes) {
+                // This shouldn't happen, since we asked for the block (proposal).
+                // Neither a local proposal nor an archived block: we cannot verify membership/order of the
+                // returned txs. This is a local-state gap, not a peer fault, so we do not penalize.
+                this.logger.warn(`Block ${request.archiveRoot.toString()} not found in attestation pool or archiver; cannot validate membership/order of returned txs`);
+                // NOTE: We mark the response as invalid, given the limitations of a true/false return value.
                 return false;
             }
-            await Promise.all(response.txs.map((tx)=>this.validateRequestedTx(tx, peerId, requestedTxValidator)));
-            return true;
-        } catch (e) {
-            if (e instanceof ValidationError) {
-                this.logger.warn(`Failed validation for requested block txs from peer ${peerId.toString()}`);
-            } else {
-                this.logger.error(`Error during validation of requested block txs`, e);
-            }
-            return false;
-        }
-    }
-    /**
-   * Validate a collection of txs that has been requested from a peer.
-   *
-   * The core component of this validator is that each tx hash MUST match the requested tx hash,
-   * In order to perform this check, the tx proof must be verified.
-   *
-   * Note: This function is called from within `ReqResp.sendRequest` as part of the
-   * ReqRespSubProtocol.TX subprotocol validation.
-   *
-   * @param requestedTxHash - The collection of the txs that was requested.
-   * @param responseTx - The collection of txs that was received as a response to the request.
-   * @param peerId - The peer ID of the peer that sent the tx.
-   * @returns True if the whole collection of txs is valid, false otherwise.
-   */ 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 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)));
-            return true;
-        } catch (e) {
-            if (e instanceof ValidationError) {
-                this.logger.warn(`Failed to validate requested txs from peer ${peerId.toString()}, reason ${e.message}`);
-            } else {
-                this.logger.error(`Error during validation of requested txs`, e);
-            }
-            return false;
-        }
-    }
-    /**
-   * Validates a BLOCK response.
-   *
-   * If a local copy exists, enforces hash equality. If missing, rejects (no penalty) since the hash cannot be verified.
-   * Penalizes on block number mismatch or hash mismatch.
-   *
-   * @param requestedBlockNumber - The requested block number.
-   * @param responseBlock - The block returned by the peer.
-   * @param peerId - The peer that returned the block.
-   * @returns True if the response is valid, false otherwise.
-   */ async validateRequestedBlock(requestedBlockNumber, responseBlock, peerId) {
-        try {
-            const reqNum = Number(requestedBlockNumber.toString());
-            if (responseBlock.number !== reqNum) {
+            // Verify that the returned tx hashes are a subset of (tx hashes by index) U (explicitly requested tx hashes).
+            const uniqueRequestedHashes = new Set([
+                // tx hashes requested by index.
+                ...request.txIndices.getTrueIndices().map((i)=>blockTxHashes[i].toString()),
+                // explicitly requested tx hashes.
+                ...request.txHashes.map((h)=>h.toString())
+            ]);
+            if (!returnedHashes.every((h)=>uniqueRequestedHashes.has(h))) {
                 this.peerManager.penalizePeer(peerId, PeerErrorSeverity.LowToleranceError);
-                return false;
+                throw new ValidationError('Returned txs should be a subset of (tx hashes by index) U (explicitly requested tx hashes)');
             }
-            const local = await this.archiver.getBlock(BlockNumber(reqNum));
-            if (!local) {
-                // We are missing the local block; we cannot verify the hash yet. Reject without penalizing.
-                // TODO: Consider extending this validator to accept an expected hash or
-                // performing quorum-based checks when using P2P syncing prior to L1 sync.
-                this.logger.warn(`Local block ${reqNum} not found; rejecting BLOCK response without hash verification`);
-                return false;
+            // Tx indices information is optional, but if present, we need to verify a few things.
+            if (!response.peerHasBlock()) {
+                this.logger.debug(`Peer ${peerId.toString()} signalled missing block`);
+                return true;
             }
-            const [localHash, respHash] = await Promise.all([
-                local.hash(),
-                responseBlock.hash()
-            ]);
-            if (!localHash.equals(respHash)) {
+            // If the response has a non-empty bitvector, it needs to be consistent with the number of txs in the block.
+            if (response.txIndices.getLength() !== blockTxHashes.length) {
                 this.peerManager.penalizePeer(peerId, PeerErrorSeverity.MidToleranceError);
-                return false;
+                throw new ValidationError(`Received block txs with mismatched bitvector length: expected ${blockTxHashes.length}, got ${response.txIndices.getLength()}`);
+            }
+            // For every index we requested that the peer claims to have (per its bitvector), the
+            // corresponding tx must be present in the response. A peer advertising availability but
+            // withholding the tx is inconsistent.
+            const returnedHashSet = new Set(returnedHashes);
+            const expectedIndices = request.txIndices.getTrueIndices().filter((i)=>response.txIndices.isSet(i));
+            const missingExpected = expectedIndices.some((i)=>!returnedHashSet.has(blockTxHashes[i].toString()));
+            if (missingExpected) {
+                this.peerManager.penalizePeer(peerId, PeerErrorSeverity.LowToleranceError);
+                throw new ValidationError('Peer advertised requested txs via indices but did not return them');
             }
             return true;
         } catch (e) {
-            this.logger.warn(`Error validating requested block`, e);
-            return false;
-        }
-    }
-    async validateRequestedTx(tx, peerId, txValidator, requested) {
-        const penalize = (severity)=>this.peerManager.penalizePeer(peerId, severity);
-        if (requested && !requested.has(tx.getTxHash().toString())) {
-            penalize(PeerErrorSeverity.MidToleranceError);
-            throw new ValidationError(`Received tx with hash ${tx.getTxHash().toString()} that was not requested.`);
-        }
-        const { result } = await txValidator.validateTx(tx);
-        if (result === 'invalid') {
-            penalize(PeerErrorSeverity.LowToleranceError);
-            throw new ValidationError(`Received tx with hash ${tx.getTxHash().toString()} that is invalid.`);
-        }
-    }
-    createRequestedTxValidator() {
-        return createTxReqRespValidator(this.proofVerifier, {
-            l1ChainId: this.config.l1ChainId,
-            rollupVersion: this.config.rollupVersion
-        });
-    }
-    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);
+            if (e instanceof ValidationError) {
+                this.logger.warn(`Failed validation for requested block txs from peer ${peerId.toString()}`);
+            } else {
+                this.logger.error(`Error during validation of requested block txs`, e);
             }
-            this.peerManager.penalizePeer(peerId, severity);
             return false;
         }
-        return true;
     }
-    async getGasFees(blockNumber) {
-        if (blockNumber === this.feesCache?.blockNumber) {
-            return this.feesCache.gasFees;
-        }
-        const header = await this.archiver.getBlockHeader(blockNumber);
-        const gasFees = header?.globalVariables.gasFees ?? GasFees.empty();
-        this.feesCache = {
-            blockNumber,
-            gasFees
-        };
-        return gasFees;
+    getGasFees() {
+        return this.blockMinFeesProvider.getCurrentMinFees();
     }
     /**
    * Get the BatchTxRequesterLibP2PService dependencies for creating BatchTxRequester instances
@@ -1646,43 +1710,42 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
             txValidatorConfig: {
                 l1ChainId: this.config.l1ChainId,
                 rollupVersion: this.config.rollupVersion,
-                proofVerifier: this.proofVerifier
+                proofVerifier: this.proofVerifier,
+                txValidationCache: this.txValidationCache
             },
-            peerScoring: this.peerManager
+            peerScoring: this.peerManager,
+            validateRequestedBlockTxsConsistency: this.validateRequestedBlockTxsConsistency.bind(this)
         };
     }
-    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
-                        }
-                    });
-                }
-            }
+    async validateTxsReceivedInBlockProposal(txs) {
+        const validator = createTxValidatorForBlockProposalReceivedTxs(this.proofVerifier, {
+            l1ChainId: this.config.l1ChainId,
+            rollupVersion: this.config.rollupVersion
+        }, this.logger.getBindings(), this.txValidationCache);
+        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) {
-        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, this.logger.getBindings());
+    /** Creates the first stage (fast) validators for gossiped transactions. */ async createFirstStageMessageValidators(currentBlockNumber, nextSlotTimestamp) {
+        const gasFees = await this.getGasFees();
+        const allowedInSetup = [
+            ...await getDefaultAllowedSetupFunctions(),
+            ...this.config.txPublicSetupAllowListExtend ?? []
+        ];
+        const blockNumber = BlockNumber(currentBlockNumber + 1);
+        const l1Constants = await this.archiver.getL1Constants();
+        return createFirstStageTxValidationsForGossipedTransactions(nextSlotTimestamp, blockNumber, this.worldStateSynchronizer, gasFees, this.config.l1ChainId, this.config.rollupVersion, protocolContractsHash, this.archiver, !this.config.disableTransactions, allowedInSetup, this.logger.getBindings(), {
+            rollupManaLimit: l1Constants.rollupManaLimit,
+            maxBlockL2Gas: this.config.validateMaxL2BlockGas,
+            maxBlockDAGas: this.config.validateMaxDABlockGas
+        });
+    }
+    /** Creates the second stage (expensive proof verification) validators for gossiped transactions. */ createSecondStageMessageValidators() {
+        return createSecondStageTxValidationsForGossipedTransactions(this.proofVerifier, this.logger.getBindings());
     }
     /**
    * Run validations on a tx.
@@ -1700,8 +1763,10 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         });
         // A promise that resolves when all validations have been run
         const allValidations = await Promise.all(validationPromises);
-        const failed = allValidations.find((x)=>!x.isValid);
-        if (failed) {
+        const failures = allValidations.filter((x)=>!x.isValid);
+        if (failures.length > 0) {
+            // Pick the most severe failure (lowest tolerance = harshest penalty)
+            const failed = maxBy(failures, (f)=>PeerErrorSeverityByHarshness.indexOf(f.severity));
             return {
                 allPassed: false,
                 failure: {
@@ -1748,19 +1813,6 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         }
         return PeerErrorSeverity.HighToleranceError;
     }
-    /**
-   * Validate a checkpoint attestation.
-   *
-   * @param attestation - The checkpoint attestation to validate.
-   * @returns True if the checkpoint attestation is valid, false otherwise.
-   */ async validateCheckpointAttestation(peerId, attestation) {
-        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 result;
-    }
     getPeerScore(peerId) {
         return this.node.services.pubsub.score.score(peerId.toString());
     }