@aztec/p2p 0.0.1-commit.9ef841308 → 0.0.1-commit.a4600f49

package/dest/services/libp2p/libp2p_service.js

@@ -370,15 +370,17 @@ 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, _initProto;
+var _dec, _dec1, _dec2, _dec3, _dec4, _dec5, _initProto;
 import { BlockNumber } from '@aztec/foundation/branded-types';
-import { maxBy } from '@aztec/foundation/collection';
+import { compactArray, 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 { DEFAULT_MAX_BLOCKS_PER_CHECKPOINT } from '@aztec/stdlib/config';
+import { getNetworkTxGasLimits } from '@aztec/stdlib/gas';
 import { BlockProposal, CheckpointAttestation, CheckpointProposal, P2PMessage, PeerErrorSeverity, PeerErrorSeverityByHarshness, TopicType, createTopicString, getTopicsForConfig, metricsTopicStrToLabels } from '@aztec/stdlib/p2p';
+import { ConsensusTimetable, getDefaultCheckpointProposalSyncGrace } from '@aztec/stdlib/timetable';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
 import { Tx } from '@aztec/stdlib/tx';
 import { compressComponentVersions } from '@aztec/stdlib/versioning';
@@ -396,22 +398,36 @@ 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 { createFirstStageTxValidationsForGossipedTransactions, createSecondStageTxValidationsForGossipedTransactions, createTxValidatorForBlockProposalReceivedTxs, createTxValidatorForReqResponseReceivedTxs } 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 { SnappyTransform, getMsgIdFn, msgIdToStrFn } from '../encoding.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, pingHandler, reqGoodbyeHandler, reqRespBlockHandler, reqRespBlockTxsHandler, reqRespStatusHandler, reqRespTxHandler } from '../reqresp/index.js';
+import { YAMUX_MAX_MESSAGE_SIZE_BYTES } from '../reqresp/config.js';
+import { ReqRespSubProtocol, ValidationError, pingHandler, reqGoodbyeHandler, reqRespBlockTxsHandler, reqRespStatusHandler, reqRespTxHandler } from '../reqresp/index.js';
 import { ReqResp } from '../reqresp/reqresp.js';
 import { P2PInstrumentation } from './instrumentation.js';
+/**
+ * Builds the {@link ConsensusTimetable} shared by the gossip validators for proposal/attestation receive-window
+ * bounds. Derived purely from protocol slot-timing constants plus the block sub-slot duration and the consensus
+ * materialization grace, so every node agrees on these bounds without depending on proposer operational budgets.
+ */ function buildConsensusTimetable(config, l1Constants) {
+    const blockDuration = config.blockDurationMs / 1000;
+    return new ConsensusTimetable({
+        l1Constants,
+        blockDuration,
+        checkpointProposalSyncGrace: config.checkpointProposalSyncGraceSeconds ?? getDefaultCheckpointProposalSyncGrace(blockDuration)
+    });
+}
 _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId, attestation)=>({
         [Attributes.SLOT_NUMBER]: attestation.payload.header.slotNumber.toString()
     })), _dec1 = trackSpan('Libp2pService.validateAndStoreBlockProposal', (_peerId, block)=>({
@@ -427,12 +443,8 @@ _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()
     }));
 /**
  * Lib P2P implementation of the P2PService interface.
@@ -447,6 +459,8 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
     epochCache;
     proofVerifier;
     worldStateSynchronizer;
+    blockMinFeesProvider;
+    txValidationCache;
     static{
         ({ e: [_initProto] } = _apply_decs_2203_r(this, [
             [
@@ -477,17 +491,7 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
             [
                 _dec5,
                 2,
-                "validateRequestedBlockTxs"
-            ],
-            [
-                _dec6,
-                2,
-                "validateRequestedTxs"
-            ],
-            [
-                _dec7,
-                2,
-                "validateRequestedBlock"
+                "validateRequestedBlockTxsConsistency"
             ]
         ], []));
     }
@@ -499,9 +503,10 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
     checkpointAttestationValidator;
     protocolVersion;
     topicStrings;
-    feesCache;
     /** Callback invoked when a duplicate proposal is detected (triggers slashing). */ duplicateProposalCallback;
+    /** Callback invoked when an oversized block proposal is stored as slashing evidence (triggers slashing). */ oversizedProposalCallback;
     /** 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.
@@ -511,15 +516,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;
-    /** Discovered public IP address (set when queryForIp is enabled and no static IP was configured). */ discoveredP2pIp;
+    discoveredP2pIp;
     instrumentation;
     telemetry;
     logger;
-    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 = {};
+    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;
@@ -535,13 +545,27 @@ _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);
+        // Build the consensus timetable once from protocol slot-timing constants and inject it into every
+        // validator so they share one set of receive-window bounds, independent of proposer operational budgets.
+        const consensusTimetable = buildConsensusTimetable(config, epochCache.getL1Constants());
         const proposalValidatorOpts = {
             txsPermitted: !config.disableTransactions,
-            maxTxsPerBlock: config.validateMaxTxsPerBlock ?? config.validateMaxTxsPerCheckpoint
+            maxTxsPerBlock: config.validateMaxTxsPerBlock ?? config.validateMaxTxsPerCheckpoint,
+            maxBlocksPerCheckpoint: config.maxBlocksPerCheckpoint,
+            skipSlotValidation: config.skipProposalSlotValidation,
+            signatureContext: {
+                chainId: config.l1ChainId,
+                rollupAddress: config.rollupAddress
+            },
+            clockDisparityMs: config.maxGossipClockDisparityMs
+        };
+        this.blockProposalValidator = new BlockProposalValidator(epochCache, consensusTimetable, proposalValidatorOpts);
+        this.checkpointProposalValidator = new CheckpointProposalValidator(epochCache, consensusTimetable, proposalValidatorOpts);
+        const attestationValidatorOpts = {
+            signatureContext: proposalValidatorOpts.signatureContext,
+            clockDisparityMs: config.maxGossipClockDisparityMs
         };
-        this.blockProposalValidator = new BlockProposalValidator(epochCache, proposalValidatorOpts);
-        this.checkpointProposalValidator = new CheckpointProposalValidator(epochCache, proposalValidatorOpts);
-        this.checkpointAttestationValidator = config.fishermanMode ? new FishermanAttestationValidator(epochCache, mempools.attestationPool, telemetry) : new CheckpointAttestationValidator(epochCache);
+        this.checkpointAttestationValidator = config.fishermanMode ? new FishermanAttestationValidator(epochCache, consensusTimetable, mempools.attestationPool, telemetry, attestationValidatorOpts) : new CheckpointAttestationValidator(epochCache, consensusTimetable, attestationValidatorOpts);
         this.gossipSubEventHandler = this.handleGossipSubEvent.bind(this);
         this.blockReceivedCallback = async (block)=>{
             this.logger.warn(`Handler for block received not yet registered on P2P service. Received block ${block.blockNumber} for slot ${block.slotNumber} from peer.`, {
@@ -549,13 +573,16 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
             });
             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.
@@ -563,12 +590,12 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
    * @param txPool - The transaction pool to be accessed by the service.
    * @returns The new service.
    */ static async new(config, peerId, deps) {
-        const { worldStateSynchronizer, epochCache, l2BlockSource, mempools, proofVerifier, peerStore, telemetry, logger, packageVersion } = 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);
         const otelMetricsAdapter = new OtelMetricsAdapter(telemetry, logger.getBindings());
-        const peerDiscoveryService = new DiscV5Service(peerId, config, packageVersion, telemetry, createLogger(`${logger.module}:discv5_service`, logger.getBindings()));
+        const peerDiscoveryService = new DiscV5Service(peerId, config, packageVersion, telemetry, createLogger(`${logger.module}:discv5_service`, logger.getBindings()), peerStore);
         // Seed libp2p's bootstrap discovery with private and trusted peers
         const bootstrapNodes = [
             ...config.privatePeers,
@@ -583,31 +610,45 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         const versions = getVersions(config);
         const protocolVersion = compressComponentVersions(versions);
         const preferredPeersEnrs = config.preferredPeers.map((enr)=>ENR.decodeTxt(enr));
-        const directPeers = (await Promise.all(preferredPeersEnrs.map(async (enr)=>{
-            const peerId = await enr.peerId();
-            const address = enr.getLocationMultiaddr('tcp');
-            if (address === undefined) {
-                throw new Error(`Direct peer ${peerId.toString()} has no TCP address, ENR: ${enr.encodeTxt()}`);
+        const directPeers = compactArray(await Promise.all(preferredPeersEnrs.map(async (enr)=>{
+            try {
+                const peerId = await enr.peerId();
+                const address = enr.getLocationMultiaddr('tcp');
+                if (address === undefined) {
+                    throw new Error(`Direct peer ${peerId.toString()} has no TCP address, ENR: ${enr.encodeTxt()}`);
+                }
+                return {
+                    id: peerId,
+                    addrs: [
+                        address
+                    ]
+                };
+            } catch (err) {
+                // A malformed configured ENR shouldn't abort node setup — skip it and log.
+                logger.warn(`Skipping preferred peer with invalid ENR`, {
+                    err
+                });
+                return undefined;
             }
-            return {
-                id: peerId,
-                addrs: [
-                    address
-                ]
-            };
-        }))).filter((peer)=>peer !== undefined);
+        })));
         const announceTcpMultiaddr = config.p2pIp ? [
             convertToMultiaddr(config.p2pIp, p2pPort, 'tcp')
         ] : [];
-        // Create dynamic topic score params based on network configuration
+        // Create dynamic topic score params based on network configuration. Scoring uses the network-wide
+        // max-blocks-per-checkpoint config value directly to size expected per-slot message rates; these are
+        // peer-rate thresholds, not consensus deadlines, so they need no proposer operational budgets.
         const l1Constants = epochCache.getL1Constants();
         const topicScoreParams = createAllTopicScoreParams(protocolVersion, {
             slotDurationMs: l1Constants.slotDuration * 1000,
             heartbeatIntervalMs: config.gossipsubInterval,
             targetCommitteeSize: l1Constants.targetCommitteeSize,
-            blockDurationMs: config.blockDurationMs,
+            maxBlocksPerCheckpoint: config.maxBlocksPerCheckpoint ?? DEFAULT_MAX_BLOCKS_PER_CHECKPOINT,
             expectedBlockProposalsPerSlot: config.expectedBlockProposalsPerSlot
         });
+        // Restrict gossipsub to exactly the topics we subscribe to. Without this, an arbitrary-topic
+        // message is transformed, msg-id'd and inserted into the seenCache before the subscription check,
+        // so a crafted topic colliding on msg id can suppress a real message as a duplicate.
+        const allowedTopics = getTopicsForConfig(config.disableTransactions).map((topic)=>createTopicString(topic, protocolVersion));
         const node = await createLibp2p({
             start: false,
             peerId,
@@ -641,8 +682,11 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
             ],
             datastore,
             peerDiscovery,
+            // Pin the yamux frame size: MAX_REQRESP_REQUEST_SIZE_BYTES relies on a reqresp request fitting in one frame.
             streamMuxers: [
-                yamux(),
+                yamux({
+                    maxMessageSize: YAMUX_MAX_MESSAGE_SIZE_BYTES
+                }),
                 mplex()
             ],
             connectionEncryption: [
@@ -660,7 +704,7 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
             },
             connectionGater: {
                 denyInboundConnection: (maConn)=>{
-                    const allowed = peerManager.isNodeAllowedToConnect(maConn.remoteAddr.nodeAddress().address);
+                    const allowed = peerManager.isAddressAllowedToConnect(maConn.remoteAddr.nodeAddress().address);
                     if (allowed) {
                         return false;
                     }
@@ -670,7 +714,7 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
                 denyInboundEncryptedConnection: (peerId, _maConn)=>{
                     //NOTE: it is not necessary to check address here because this was already done by
                     // denyInboundConnection
-                    const allowed = peerManager.isNodeAllowedToConnect(peerId);
+                    const allowed = peerManager.isPeerAllowedToConnect(peerId);
                     if (allowed) {
                         return false;
                     }
@@ -697,9 +741,13 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
                     mcacheLength: config.gossipsubMcacheLength,
                     mcacheGossip: config.gossipsubMcacheGossip,
                     seenTTL: config.gossipsubSeenTTL,
+                    allowedTopics,
+                    // No fastMsgIdFn: the fast-path dedup cache keys on a non-cryptographic 64-bit hash of the
+                    // raw data only (no topic), so a collision — accidental or engineered via a weak seed — drops
+                    // a different message with no fallback to the full id. Dedup instead rests solely on the
+                    // cryptographic, topic-framed msgIdFn below.
                     msgIdFn: getMsgIdFn,
                     msgIdToStrFn: msgIdToStrFn,
-                    fastMsgIdFn: fastMsgIdFn,
                     dataTransform: new SnappyTransform(),
                     metricsRegister: otelMetricsAdapter,
                     metricsTopicStrToLabel: metricsTopicStrToLabels(protocolVersion),
@@ -721,6 +769,8 @@ _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);
+        // 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)
@@ -728,7 +778,7 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         // 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(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.
@@ -738,22 +788,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 && !this.config.queryForIp) {
-            throw new Error('Announce address not provided.');
+            throw new Error('Announce address not provided and queryForIp is not enabled.');
         }
         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);
@@ -762,15 +809,8 @@ _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 getTopicsForConfig(this.config.disableTransactions)){
@@ -782,26 +822,31 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         if (!this.config.p2pDiscoveryDisabled) {
             await this.peerDiscoveryService.start();
         }
-        // When queryForIp is enabled and no static IP was configured, bridge discv5 IP discovery to libp2p.
-        // Discv5 discovers our public IP via peer WHOAREYOU exchanges (enrUpdate=true) and emits 'ip:changed'.
-        // We confirm the discovered address in the libp2p AddressManager so it appears in getMultiaddrs()
-        // and is pushed to all connected peers via the identify protocol.
-        if (this.config.queryForIp && !p2pIp) {
+        // 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'));
-                // Remove old discovered IP if one exists
-                if (this.discoveredP2pIp) {
-                    const oldAddr = multiaddr(convertToMultiaddr(this.discoveredP2pIp, 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);
-                // Store discovered IP
                 this.discoveredP2pIp = ip;
-                this.logger.info('Public IP discovered via discv5', {
-                    ip
-                });
             };
             this.peerDiscoveryService.on('ip:changed', this.ipChangedHandler);
         }
@@ -812,7 +857,7 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         this.logger.info(`Started P2P service`, {
             listen: this.config.listenAddress,
             port: this.config.p2pPort,
-            announce: announceTcpMultiaddr ?? 'pending (queryForIp=true)',
+            announce: announceTcpMultiaddr,
             peerId: this.node.peerId.toString()
         });
     }
@@ -822,9 +867,8 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
    */ async stop() {
         // Remove gossip sub listener
         this.node.services.pubsub.removeEventListener(GossipSubEvent.MESSAGE, this.gossipSubEventHandler);
-        // Remove ip:changed listener if registered
         if (this.ipChangedHandler) {
-            this.peerDiscoveryService.off('ip:changed', this.ipChangedHandler);
+            this.peerDiscoveryService.removeListener('ip:changed', this.ipChangedHandler);
             this.ipChangedHandler = undefined;
         }
         // Stop peer manager
@@ -840,8 +884,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);
@@ -863,14 +907,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);
     }
@@ -883,8 +919,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.
@@ -893,12 +932,20 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         this.duplicateProposalCallback = callback;
     }
     /**
+   * Registers a callback to be invoked when an oversized block proposal is stored as slashing evidence.
+   */ registerOversizedProposalCallback(callback) {
+        this.oversizedProposalCallback = 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.
@@ -1013,6 +1060,13 @@ _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]) {
@@ -1076,6 +1130,18 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
                 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,
@@ -1310,15 +1376,17 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
             }
         }
         // Attestation was added successfully - accept it so other nodes can also detect the equivocation
+        this.checkpointAttestationCallback?.(attestation);
         return {
             result: TopicValidatorResult.Accept,
             obj: attestation
         };
     }
     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) {
+        const { result, obj: block, metadata: { isEquivocated, isOversized } = {} } = await this.validateReceivedMessage(()=>this.validateAndStoreBlockProposal(source, BlockProposal.fromBuffer(payloadData)), msgId, source, TopicType.block_proposal);
+        // If not accepted, equivocated, or oversized, return. Oversized proposals are re-broadcast as
+        // slashing evidence but never attested or processed.
+        if (result !== TopicValidatorResult.Accept || !block || isEquivocated || isOversized) {
             return;
         }
         await this.processValidBlockProposal(block, source);
@@ -1341,6 +1409,10 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         // 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;
+        // An oversized proposal (index at or beyond the consensus per-checkpoint limit) is structurally valid
+        // proposer misbehavior: it is stored and re-broadcast as slashing evidence but never processed or
+        // attested to. No-ops when maxBlocksPerCheckpoint is unset (local/test).
+        const isOversized = this.config.maxBlocksPerCheckpoint !== undefined && block.indexWithinCheckpoint >= this.config.maxBlocksPerCheckpoint;
         // Duplicate proposal received, no need to re-broadcast
         if (alreadyExists) {
             this.logger.debug(`Ignoring duplicate block proposal received`, {
@@ -1353,7 +1425,8 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
                 result: TopicValidatorResult.Ignore,
                 obj: block,
                 metadata: {
-                    isEquivocated
+                    isEquivocated,
+                    isOversized
                 }
             };
         }
@@ -1369,11 +1442,30 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
             return {
                 result: TopicValidatorResult.Reject,
                 metadata: {
-                    isEquivocated
+                    isEquivocated,
+                    isOversized
                 },
                 severity: PeerErrorSeverity.HighToleranceError
             };
         }
+        // The proposal was stored: if oversized, invoke the oversized callback so the proposer can be
+        // slashed. Fired alongside (not instead of) equivocation detection below.
+        if (isOversized) {
+            const proposer = block.getSender();
+            if (proposer) {
+                this.logger.warn(`Detected oversized block proposal at slot ${block.slotNumber}`, {
+                    ...block.toBlockInfo(),
+                    indexWithinCheckpoint: block.indexWithinCheckpoint,
+                    maxBlocksPerCheckpoint: this.config.maxBlocksPerCheckpoint,
+                    source: peerId.toString(),
+                    proposer: proposer.toString()
+                });
+                this.oversizedProposalCallback?.({
+                    slot: block.slotNumber,
+                    proposer
+                });
+            }
+        }
         // 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) {
@@ -1395,14 +1487,19 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
                 result: TopicValidatorResult.Accept,
                 obj: block,
                 metadata: {
-                    isEquivocated
+                    isEquivocated,
+                    isOversized
                 }
             };
         }
         // Otherwise, we're good to go!
         return {
             result: TopicValidatorResult.Accept,
-            obj: block
+            obj: block,
+            metadata: {
+                isEquivocated: false,
+                isOversized
+            }
         };
     }
     // REFACTOR(palla): This method should be moved to the p2p_client or to a separate component,
@@ -1421,22 +1518,35 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         const isValid = await this.blockReceivedCallback(block, sender);
         if (!isValid) {
             this.logger.info(`Block proposal validation failed for block ${block.blockNumber}`, block.toBlockInfo());
+            // Release the protections this proposal created so its txs return to pending. Only entries still
+            // keyed to this slot are cleared, so a tx referenced by a live proposal at another slot stays protected.
+            await this.mempools.txPool.unprotectTxs(block.txHashes, slot);
         }
     }
     /**
    * Handle a gossiped checkpoint proposal.
    * 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);
+        const { result, obj: checkpoint, metadata: { isEquivocated, processBlock, isOversized } = {} } = await this.validateReceivedMessage(()=>this.validateAndStoreCheckpointProposal(source, CheckpointProposal.fromBuffer(payloadData)), msgId, source, TopicType.checkpoint_proposal);
+        // An oversized checkpoint is re-broadcast as slashing evidence but never attested or processed.
+        // Process checkpoint proposal if valid and neither equivocated nor oversized.
+        const processCheckpointFn = ()=>result === TopicValidatorResult.Accept && checkpoint && !isEquivocated && !isOversized ? 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
@@ -1459,13 +1569,15 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         // Extract and try to add the block proposal first if present
         const blockProposal = checkpoint.getBlockProposal();
         let processBlock = false;
+        let isOversized = false;
         if (blockProposal) {
             this.logger.debug(`Validating block proposal from propagated checkpoint`, {
                 [Attributes.SLOT_NUMBER]: checkpoint.slotNumber.toString(),
                 [Attributes.P2P_ID]: peerId.toString()
             });
             const blockProposalResult = await this.validateAndStoreBlockProposal(peerId, blockProposal);
-            const { obj, metadata: { isEquivocated } = {} } = blockProposalResult;
+            const { obj, metadata: { isEquivocated, isOversized: blockIsOversized } = {} } = blockProposalResult;
+            isOversized = blockIsOversized ?? false;
             if (blockProposalResult.result === TopicValidatorResult.Reject || !obj || isEquivocated) {
                 this.logger.debug(`Rejecting checkpoint due to invalid last block proposal`, {
                     [Attributes.SLOT_NUMBER]: checkpoint.slotNumber.toString(),
@@ -1477,7 +1589,8 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
                     result: TopicValidatorResult.Reject,
                     severity: 'severity' in blockProposalResult ? blockProposalResult.severity : PeerErrorSeverity.MidToleranceError
                 };
-            } else if (blockProposalResult.result === TopicValidatorResult.Accept && obj && !isEquivocated) {
+            } else if (blockProposalResult.result === TopicValidatorResult.Accept && obj && !isEquivocated && !isOversized) {
+                // An oversized terminal block is re-broadcast as slashing evidence but never processed.
                 processBlock = true;
             }
         }
@@ -1497,11 +1610,12 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
                 obj: checkpoint,
                 metadata: {
                     isEquivocated,
-                    processBlock
+                    processBlock,
+                    isOversized
                 }
             };
         }
-        // Too many checkpoint proposals received for this slot, penalize peer and do not re-broadcast
+        // 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.logger.warn(`Penalizing peer for checkpoint proposal exceeding per-slot cap`, {
@@ -1514,7 +1628,8 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
                 obj: checkpoint,
                 metadata: {
                     isEquivocated,
-                    processBlock
+                    processBlock,
+                    isOversized
                 },
                 severity: PeerErrorSeverity.HighToleranceError
             };
@@ -1541,7 +1656,8 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
                 obj: checkpoint,
                 metadata: {
                     isEquivocated,
-                    processBlock
+                    processBlock,
+                    isOversized
                 }
             };
         }
@@ -1551,7 +1667,8 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
             obj: checkpoint,
             metadata: {
                 processBlock,
-                isEquivocated
+                isEquivocated,
+                isOversized
             }
         };
     }
@@ -1566,9 +1683,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);
@@ -1592,62 +1710,66 @@ _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) {
+            // 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;
+            }
+            // 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);
+                throw new ValidationError('Returned txs should be a subset of (tx hashes by index) U (explicitly requested tx hashes)');
+            }
+            // 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;
+            }
+            // 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);
-                throw new ValidationError(`Received more txs (${response.txs.length}) than requested-and-available (${maxReturnable})`);
+                throw new ValidationError(`Received block txs with mismatched bitvector length: expected ${blockTxHashes.length}, got ${response.txIndices.getLength()}`);
             }
-            // 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`);
-                return false;
+            // 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');
             }
-            await Promise.all(response.txs.map((tx)=>this.validateRequestedTx(tx, peerId, requestedTxValidator)));
             return true;
         } catch (e) {
             if (e instanceof ValidationError) {
@@ -1658,104 +1780,8 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
             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) {
-                this.peerManager.penalizePeer(peerId, PeerErrorSeverity.LowToleranceError);
-                return false;
-            }
-            const local = await this.archiver.getBlock(BlockNumber(reqNum));
-            if (!local) {
-                // We are missing the local block; we cannot verify the hash yet. Reject without penalizing.
-                // TODO: Consider extending this validator to accept an expected hash or
-                // performing quorum-based checks when using P2P syncing prior to L1 sync.
-                this.logger.warn(`Local block ${reqNum} not found; rejecting BLOCK response without hash verification`);
-                return false;
-            }
-            const [localHash, respHash] = await Promise.all([
-                local.hash(),
-                responseBlock.hash()
-            ]);
-            if (!localHash.equals(respHash)) {
-                this.peerManager.penalizePeer(peerId, PeerErrorSeverity.MidToleranceError);
-                return false;
-            }
-            return true;
-        } catch (e) {
-            this.logger.warn(`Error validating requested block`, e);
-            return false;
-        }
-    }
-    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 createTxValidatorForReqResponseReceivedTxs(this.proofVerifier, {
-            l1ChainId: this.config.l1ChainId,
-            rollupVersion: this.config.rollupVersion
-        });
-    }
-    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
@@ -1766,16 +1792,18 @@ _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 validateTxsReceivedInBlockProposal(txs) {
         const validator = createTxValidatorForBlockProposalReceivedTxs(this.proofVerifier, {
             l1ChainId: this.config.l1ChainId,
             rollupVersion: this.config.rollupVersion
-        }, this.logger.getBindings());
+        }, this.logger.getBindings(), this.txValidationCache);
         const results = await Promise.all(txs.map(async (tx)=>{
             const result = await validator.validateTx(tx);
             return result.result !== 'invalid';
@@ -1785,17 +1813,17 @@ _dec = trackSpan('Libp2pService.validateAndStoreCheckpointAttestation', (_peerId
         }
     }
     /** Creates the first stage (fast) validators for gossiped transactions. */ async createFirstStageMessageValidators(currentBlockNumber, nextSlotTimestamp) {
-        const gasFees = await this.getGasFees(currentBlockNumber);
+        const gasFees = await this.getGasFees();
         const allowedInSetup = [
             ...await getDefaultAllowedSetupFunctions(),
             ...this.config.txPublicSetupAllowListExtend ?? []
         ];
         const blockNumber = BlockNumber(currentBlockNumber + 1);
         const l1Constants = await this.archiver.getL1Constants();
+        const networkTxGasLimits = getNetworkTxGasLimits(this.config, l1Constants);
         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
+            maxTxL2Gas: networkTxGasLimits.l2Gas,
+            maxTxDAGas: networkTxGasLimits.daGas
         });
     }
     /** Creates the second stage (expensive proof verification) validators for gossiped transactions. */ createSecondStageMessageValidators() {