@aztec/p2p 3.0.0-devnet.2 → 3.0.0-devnet.2-patch.1

package/dest/services/libp2p/libp2p_service.js

@@ -4,10 +4,10 @@ function _ts_decorate(decorators, target, key, desc) {
     else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-import { randomInt } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
+import { BlockNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import { randomInt } from '@aztec/foundation/crypto/random';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { createLibp2pComponentLogger, createLogger } from '@aztec/foundation/log';
-import { SerialQueue } from '@aztec/foundation/queue';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { Timer } from '@aztec/foundation/timer';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
@@ -30,7 +30,8 @@ import { mplex } from '@libp2p/mplex';
 import { tcp } from '@libp2p/tcp';
 import { ENR } from '@nethermindeth/enr';
 import { createLibp2p } from 'libp2p';
-import { AttestationValidator, BlockProposalValidator } from '../../msg_validators/index.js';
+import { ProposalSlotCapExceededError } from '../../errors/attestation-pool.error.js';
+import { AttestationValidator, BlockProposalValidator, FishermanAttestationValidator } from '../../msg_validators/index.js';
 import { MessageSeenValidator } from '../../msg_validators/msg_seen_validator/msg_seen_validator.js';
 import { getDefaultAllowedSetupFunctions } from '../../msg_validators/tx_validator/allowed_public_setup.js';
 import { createTxMessageValidators } from '../../msg_validators/tx_validator/factory.js';
@@ -64,8 +65,6 @@ import { P2PInstrumentation } from './instrumentation.js';
     epochCache;
     proofVerifier;
     worldStateSynchronizer;
-    logger;
-    jobQueue;
     discoveryRunningPromise;
     msgIdSeenValidators;
     // Message validators
@@ -81,8 +80,11 @@ import { P2PInstrumentation } from './instrumentation.js';
    */ blockReceivedCallback;
     gossipSubEventHandler;
     instrumentation;
+    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.logger = logger, this.jobQueue = new SerialQueue(), this.msgIdSeenValidators = {}, this.protocolVersion = '', this.topicStrings = {};
+        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 = {}, this.protocolVersion = '', this.topicStrings = {};
+        // Create child logger with fisherman prefix if in fisherman mode
+        this.logger = config.fishermanMode ? logger.createChild('[FISHERMAN]') : logger;
         this.instrumentation = new P2PInstrumentation(telemetry, 'LibP2PService');
         this.msgIdSeenValidators[TopicType.tx] = new MessageSeenValidator(config.seenMessageCacheSize);
         this.msgIdSeenValidators[TopicType.block_proposal] = new MessageSeenValidator(config.seenMessageCacheSize);
@@ -93,14 +95,15 @@ import { P2PInstrumentation } from './instrumentation.js';
         this.topicStrings[TopicType.tx] = createTopicString(TopicType.tx, this.protocolVersion);
         this.topicStrings[TopicType.block_proposal] = createTopicString(TopicType.block_proposal, this.protocolVersion);
         this.topicStrings[TopicType.block_attestation] = createTopicString(TopicType.block_attestation, this.protocolVersion);
-        this.attestationValidator = new AttestationValidator(epochCache);
+        // Use FishermanAttestationValidator in fisherman mode to validate attestation payloads against proposals
+        this.attestationValidator = config.fishermanMode ? new FishermanAttestationValidator(epochCache, mempools.attestationPool, telemetry) : new AttestationValidator(epochCache);
         this.blockProposalValidator = new BlockProposalValidator(epochCache, {
             txsPermitted: !config.disableTransactions
         });
         this.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.toNumber()} from peer.`, {
-                p2pMessageIdentifier: await block.p2pMessageIdentifier()
+            this.logger.debug(`Handler not yet registered: Block received callback not set. Received block for slot ${block.slotNumber} from peer.`, {
+                p2pMessageIdentifier: await block.p2pMessageLoggingIdentifier()
             });
             return undefined;
         };
@@ -278,7 +281,7 @@ import { P2PInstrumentation } from './instrumentation.js';
             },
             logger: createLibp2pComponentLogger(logger.module)
         });
-        const peerScoring = new PeerScoring(config);
+        const peerScoring = new PeerScoring(config, telemetry);
         const reqresp = new ReqResp(config, node, peerScoring, createLogger(`${logger.module}:reqresp`));
         const peerManager = new PeerManager(node, peerDiscoveryService, config, telemetry, createLogger(`${logger.module}:peer_manager`), peerScoring, reqresp, worldStateSynchronizer, protocolVersion, epochCache);
         // Update gossipsub score params
@@ -300,8 +303,6 @@ import { P2PInstrumentation } from './instrumentation.js';
             throw new Error('Announce address not provided.');
         }
         const announceTcpMultiaddr = convertToMultiaddr(p2pIp, p2pPort, 'tcp');
-        // Start job queue, peer discovery service and libp2p node
-        this.jobQueue.start();
         await this.peerManager.initializePeers();
         if (!this.config.p2pDiscoveryDisabled) {
             await this.peerDiscoveryService.start();
@@ -323,7 +324,7 @@ import { P2PInstrumentation } from './instrumentation.js';
             [ReqRespSubProtocol.BLOCK]: blockHandler.bind(this)
         };
         // Only handle block transactions request if attestation pool is available to the client
-        if (this.mempools.attestationPool) {
+        if (this.mempools.attestationPool && !this.config.disableTransactions) {
             const blockTxsHandler = reqRespBlockTxsHandler(this.mempools.attestationPool, this.mempools.txPool);
             requestResponseHandlers[ReqRespSubProtocol.BLOCK_TXS] = blockTxsHandler.bind(this);
         }
@@ -332,15 +333,17 @@ import { P2PInstrumentation } from './instrumentation.js';
         }
         // add GossipSub listener
         this.node.services.pubsub.addEventListener(GossipSubEvent.MESSAGE, this.gossipSubEventHandler);
-        // Start running promise for peer discovery
-        this.discoveryRunningPromise = new RunningPromise(()=>this.peerManager.heartbeat(), this.logger, this.config.peerCheckIntervalMS);
+        // Start running promise for peer discovery and metrics collection
+        this.discoveryRunningPromise = new RunningPromise(async ()=>{
+            await this.peerManager.heartbeat();
+        }, this.logger, this.config.peerCheckIntervalMS);
         this.discoveryRunningPromise.start();
         // Define the sub protocol validators - This is done within this start() method to gain a callback to the existing validateTx function
         const reqrespSubProtocolValidators = {
             ...DEFAULT_SUB_PROTOCOL_VALIDATORS,
-            // TODO(#11336): A request validator for blocks
             [ReqRespSubProtocol.TX]: this.validateRequestedTxs.bind(this),
-            [ReqRespSubProtocol.BLOCK_TXS]: this.validateRequestedBlockTxs.bind(this)
+            [ReqRespSubProtocol.BLOCK_TXS]: this.validateRequestedBlockTxs.bind(this),
+            [ReqRespSubProtocol.BLOCK]: this.validateRequestedBlock.bind(this)
         };
         await this.reqresp.start(requestResponseHandlers, reqrespSubProtocolValidators);
         this.logger.info(`Started P2P service`, {
@@ -359,8 +362,6 @@ import { P2PInstrumentation } from './instrumentation.js';
         // Stop peer manager
         this.logger.debug('Stopping peer manager...');
         await this.peerManager.stop();
-        this.logger.debug('Stopping job queue...');
-        await this.jobQueue.end();
         this.logger.debug('Stopping running promise...');
         await this.discoveryRunningPromise?.stop();
         this.logger.debug('Stopping peer discovery service...');
@@ -426,11 +427,15 @@ import { P2PInstrumentation } from './instrumentation.js';
         if (!this.node.services.pubsub) {
             throw new Error('Pubsub service not available.');
         }
-        const p2pMessage = P2PMessage.fromGossipable(message);
+        const p2pMessage = P2PMessage.fromGossipable(message, this.config.debugP2PInstrumentMessages);
         const result = await this.node.services.pubsub.publish(topic, p2pMessage.toMessageData());
         return result.recipients.length;
     }
-    preValidateReceivedMessage(msg, msgId, source) {
+    /**
+   * Checks if this message has already been seen, based on its msgId computed from hashing the message data.
+   * Note that we do not rely on the seenCache from gossipsub since we want to keep a longer history of seen
+   * messages to avoid tx echoes across the network.
+   */ preValidateReceivedMessage(msg, msgId, source) {
         let topicType;
         switch(msg.topic){
             case this.topicStrings[TopicType.tx]:
@@ -462,54 +467,108 @@ import { P2PInstrumentation } from './instrumentation.js';
         };
     }
     /**
+   * Safely deserializes a P2PMessage from raw message data.
+   * @param msgId - The message ID.
+   * @param source - The peer ID of the message source.
+   * @param data - The raw message data.
+   * @returns The deserialized P2PMessage or undefined if deserialization fails.
+   */ safelyDeserializeP2PMessage(msgId, source, data) {
+        try {
+            return P2PMessage.fromMessageData(Buffer.from(data), this.config.debugP2PInstrumentMessages);
+        } catch (err) {
+            this.logger.error(`Error deserializing P2PMessage`, err, {
+                msgId,
+                source: source.toString()
+            });
+            this.node.services.pubsub.reportMessageValidationResult(msgId, source.toString(), TopicValidatorResult.Reject);
+            this.peerManager.penalizePeer(source, PeerErrorSeverity.LowToleranceError);
+            return undefined;
+        }
+    }
+    /**
    * Handles a new gossip message that was received by the client.
    * @param topic - The message's topic.
    * @param data - The message data
    */ async handleNewGossipMessage(msg, msgId, source) {
-        const p2pMessage = P2PMessage.fromMessageData(Buffer.from(msg.data));
+        const msgReceivedTime = Date.now();
+        let topicType;
+        const p2pMessage = this.safelyDeserializeP2PMessage(msgId, source, msg.data);
+        if (!p2pMessage) {
+            return;
+        }
         const preValidationResult = this.preValidateReceivedMessage(msg, msgId, source);
         if (!preValidationResult.result) {
             return;
         }
         if (msg.topic === this.topicStrings[TopicType.tx]) {
+            topicType = TopicType.tx;
             await this.handleGossipedTx(p2pMessage.payload, msgId, source);
         }
-        if (msg.topic === this.topicStrings[TopicType.block_attestation] && this.clientType === P2PClientType.Full) {
-            await this.processAttestationFromPeer(p2pMessage.payload, msgId, source);
+        if (msg.topic === this.topicStrings[TopicType.block_attestation]) {
+            topicType = TopicType.block_attestation;
+            if (this.clientType === P2PClientType.Full) {
+                await this.processAttestationFromPeer(p2pMessage.payload, msgId, source);
+            }
         }
         if (msg.topic === this.topicStrings[TopicType.block_proposal]) {
+            topicType = TopicType.block_proposal;
             await this.processBlockFromPeer(p2pMessage.payload, msgId, source);
         }
+        if (p2pMessage.timestamp !== undefined && topicType !== undefined) {
+            const latency = msgReceivedTime - p2pMessage.timestamp.getTime();
+            this.instrumentation.recordMessageLatency(topicType, latency);
+        }
         return;
     }
     async validateReceivedMessage(validationFunc, msgId, source, topicType) {
         let resultAndObj = {
-            result: false,
-            obj: undefined
+            result: TopicValidatorResult.Reject
         };
         const timer = new Timer();
         try {
             resultAndObj = await validationFunc();
         } catch (err) {
-            this.logger.error(`Error deserializing and validating message `, err);
+            this.peerManager.penalizePeer(source, PeerErrorSeverity.LowToleranceError);
+            this.logger.error(`Error deserializing and validating gossipsub message`, err, {
+                msgId,
+                source: source.toString(),
+                topicType
+            });
         }
-        if (resultAndObj.result) {
+        if (resultAndObj.result === TopicValidatorResult.Accept) {
             this.instrumentation.recordMessageValidation(topicType, timer);
         }
-        this.node.services.pubsub.reportMessageValidationResult(msgId, source.toString(), resultAndObj.result && resultAndObj.obj ? TopicValidatorResult.Accept : TopicValidatorResult.Reject);
+        this.node.services.pubsub.reportMessageValidationResult(msgId, source.toString(), resultAndObj.result);
         return resultAndObj;
     }
     async handleGossipedTx(payloadData, msgId, source) {
         const validationFunc = async ()=>{
             const tx = Tx.fromBuffer(payloadData);
-            const result = await this.validatePropagatedTx(tx, source);
-            return {
-                result,
-                obj: tx
-            };
+            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,
+                [Attributes.P2P_ID]: source.toString()
+            });
+            if (!isValid) {
+                return {
+                    result: TopicValidatorResult.Reject
+                };
+            } else if (exists) {
+                return {
+                    result: TopicValidatorResult.Ignore,
+                    obj: tx
+                };
+            } else {
+                return {
+                    result: TopicValidatorResult.Accept,
+                    obj: tx
+                };
+            }
         };
         const { result, obj: tx } = await this.validateReceivedMessage(validationFunc, msgId, source, TopicType.tx);
-        if (!result || !tx) {
+        if (result !== TopicValidatorResult.Accept || !tx) {
             return;
         }
         const txHash = tx.getTxHash();
@@ -519,9 +578,10 @@ import { P2PInstrumentation } from './instrumentation.js';
             txHash: txHashString
         });
         if (this.config.dropTransactions && randomInt(1000) < this.config.dropTransactionsProbability * 1000) {
-            this.logger.debug(`Intentionally dropping tx ${txHashString} (probability rule)`);
+            this.logger.warn(`Intentionally dropping tx ${txHashString} (probability rule)`);
             return;
         }
+        this.instrumentation.incrementTxReceived(1);
         await this.mempools.txPool.addTxs([
             tx
         ]);
@@ -534,23 +594,56 @@ import { P2PInstrumentation } from './instrumentation.js';
    */ async processAttestationFromPeer(payloadData, msgId, source) {
         const validationFunc = async ()=>{
             const attestation = BlockAttestation.fromBuffer(payloadData);
-            const result = await this.validateAttestation(source, attestation);
-            this.logger.trace(`validatePropagatedAttestation: ${result}`, {
+            const pool = this.mempools.attestationPool;
+            const isValid = await this.validateAttestation(source, attestation);
+            const exists = isValid && await pool.hasAttestation(attestation);
+            let canAdd = true;
+            if (isValid && !exists) {
+                const slot = attestation.payload.header.slotNumber;
+                const { committee } = await this.epochCache.getCommittee(slot);
+                const committeeSize = committee?.length ?? 0;
+                canAdd = await pool.canAddAttestation(attestation, committeeSize);
+            }
+            this.logger.trace(`Validate propagated block attestation`, {
+                isValid,
+                exists,
+                canAdd,
                 [Attributes.SLOT_NUMBER]: attestation.payload.header.slotNumber.toString(),
                 [Attributes.P2P_ID]: source.toString()
             });
-            return {
-                result,
-                obj: attestation
-            };
+            if (!isValid) {
+                return {
+                    result: TopicValidatorResult.Reject
+                };
+            } else if (exists) {
+                return {
+                    result: TopicValidatorResult.Ignore,
+                    obj: attestation
+                };
+            } else if (!canAdd) {
+                this.logger.warn(`Dropping block attestation due to per-(slot, proposalId) attestation cap`, {
+                    slot: attestation.payload.header.slotNumber.toString(),
+                    archive: attestation.archive.toString(),
+                    source: source.toString()
+                });
+                return {
+                    result: TopicValidatorResult.Ignore,
+                    obj: attestation
+                };
+            } else {
+                return {
+                    result: TopicValidatorResult.Accept,
+                    obj: attestation
+                };
+            }
         };
         const { result, obj: attestation } = await this.validateReceivedMessage(validationFunc, msgId, source, TopicType.block_attestation);
-        if (!result || !attestation) {
+        if (result !== TopicValidatorResult.Accept || !attestation) {
             return;
         }
-        this.logger.debug(`Received attestation for slot ${attestation.slotNumber.toNumber()} from external peer ${source.toString()}`, {
-            p2pMessageIdentifier: await attestation.p2pMessageIdentifier(),
-            slot: attestation.slotNumber.toNumber(),
+        this.logger.debug(`Received attestation for slot ${attestation.slotNumber} from external peer ${source.toString()}`, {
+            p2pMessageIdentifier: await attestation.p2pMessageLoggingIdentifier(),
+            slot: attestation.slotNumber,
             archive: attestation.archive.toString(),
             source: source.toString()
         });
@@ -561,15 +654,44 @@ import { P2PInstrumentation } from './instrumentation.js';
     async processBlockFromPeer(payloadData, msgId, source) {
         const validationFunc = async ()=>{
             const block = BlockProposal.fromBuffer(payloadData);
-            const result = await this.validateBlockProposal(source, block);
-            this.logger.trace(`validatePropagatedBlock: ${result}`, {
+            const isValid = await this.validateBlockProposal(source, block);
+            const pool = this.mempools.attestationPool;
+            // Note that we dont have an attestation pool if we're a prover node, but we still
+            // subscribe to block proposal topics in order to prevent their txs from being cleared.
+            const exists = isValid && await pool?.hasBlockProposal(block);
+            const canAdd = isValid && await pool?.canAddProposal(block);
+            this.logger.trace(`Validate propagated block proposal`, {
+                isValid,
+                exists,
+                canAdd,
                 [Attributes.SLOT_NUMBER]: block.payload.header.slotNumber.toString(),
                 [Attributes.P2P_ID]: source.toString()
             });
-            return {
-                result,
-                obj: block
-            };
+            if (!isValid) {
+                return {
+                    result: TopicValidatorResult.Reject
+                };
+            } else if (exists) {
+                return {
+                    result: TopicValidatorResult.Ignore,
+                    obj: block
+                };
+            } else if (!canAdd) {
+                this.peerManager.penalizePeer(source, PeerErrorSeverity.MidToleranceError);
+                this.logger.warn(`Penalizing peer for block proposal exceeding per-slot cap`, {
+                    slot: block.slotNumber.toString(),
+                    archive: block.archive.toString(),
+                    source: source.toString()
+                });
+                return {
+                    result: TopicValidatorResult.Reject
+                };
+            } else {
+                return {
+                    result: TopicValidatorResult.Accept,
+                    obj: block
+                };
+            }
         };
         const { result, obj: block } = await this.validateReceivedMessage(validationFunc, msgId, source, TopicType.block_proposal);
         if (!result || !block) {
@@ -579,11 +701,11 @@ import { P2PInstrumentation } from './instrumentation.js';
     }
     // REVIEW: callback pattern https://github.com/AztecProtocol/aztec-packages/issues/7963
     async processValidBlockProposal(block, sender) {
-        const slot = block.slotNumber.toBigInt();
-        const previousSlot = slot - 1n;
+        const slot = block.slotNumber;
+        const previousSlot = SlotNumber(slot - 1);
         this.logger.verbose(`Received block proposal for slot ${slot} from external peer ${sender.toString()}.`, {
-            p2pMessageIdentifier: await block.p2pMessageIdentifier(),
-            slot: block.slotNumber.toNumber(),
+            p2pMessageIdentifier: await block.p2pMessageLoggingIdentifier(),
+            slot: block.slotNumber,
             archive: block.archive.toString(),
             source: sender.toString()
         });
@@ -591,17 +713,30 @@ import { P2PInstrumentation } from './instrumentation.js';
         if (attestationsForPreviousSlot !== undefined) {
             this.logger.verbose(`Received ${attestationsForPreviousSlot.length} attestations for slot ${previousSlot}`);
         }
-        // Mark the txs in this proposal as non-evictable
+        // Attempt to add proposal, then mark the txs in this proposal as non-evictable
+        try {
+            await this.mempools.attestationPool?.addBlockProposal(block);
+        } catch (err) {
+            // Drop proposals if we hit per-slot cap in the attestation pool; rethrow unknown errors
+            if (err instanceof ProposalSlotCapExceededError) {
+                this.logger.warn(`Dropping block proposal due to per-slot proposal cap`, {
+                    slot: String(slot),
+                    archive: block.archive.toString(),
+                    error: err.message
+                });
+                return;
+            }
+            throw err;
+        }
         await this.mempools.txPool.markTxsAsNonEvictable(block.txHashes);
-        await this.mempools.attestationPool?.addBlockProposal(block);
         const attestations = await this.blockReceivedCallback(block, sender);
         // TODO: fix up this pattern - the abstraction is not nice
-        // The attestation can be undefined if no handler is registered / the validator deems the block invalid
+        // The attestation can be undefined if no handler is registered / the validator deems the block invalid / in fisherman mode
         if (attestations?.length) {
             for (const attestation of attestations){
-                this.logger.verbose(`Broadcasting attestation for slot ${attestation.slotNumber.toNumber()}`, {
-                    p2pMessageIdentifier: await attestation.p2pMessageIdentifier(),
-                    slot: attestation.slotNumber.toNumber(),
+                this.logger.verbose(`Broadcasting attestation for slot ${attestation.slotNumber}`, {
+                    p2pMessageIdentifier: await attestation.p2pMessageLoggingIdentifier(),
+                    slot: attestation.slotNumber,
                     archive: attestation.archive.toString()
                 });
                 await this.broadcastAttestation(attestation);
@@ -618,28 +753,72 @@ import { P2PInstrumentation } from './instrumentation.js';
    * Propagates provided message to peers.
    * @param message - The message to propagate.
    */ async propagate(message) {
-        const p2pMessageIdentifier = await message.p2pMessageIdentifier();
+        const p2pMessageIdentifier = await message.p2pMessageLoggingIdentifier();
         this.logger.trace(`Message ${p2pMessageIdentifier} queued`, {
             p2pMessageIdentifier
         });
-        void this.jobQueue.put(async ()=>{
-            await this.sendToPeers(message);
-        }).catch((error)=>{
+        void this.sendToPeers(message).catch((error)=>{
             this.logger.error(`Error propagating message ${p2pMessageIdentifier}`, {
                 error
             });
         });
     }
     /**
-   * Validate the requested block transactions.
+   * Validate the requested block transactions. Allow partial returns.
    * @param request - The block transactions request.
    * @param response - The block transactions response.
    * @param peerId - The ID of the peer that made the request.
    * @returns True if the requested block transactions are valid, false otherwise.
-   */ async validateRequestedBlockTxs(_request, response, peerId) {
+   */ async validateRequestedBlockTxs(request, response, peerId) {
         const requestedTxValidator = this.createRequestedTxValidator();
         try {
-            // TODO(palla/txs): Validate that this tx belongs to the block hash being requested
+            if (!response.blockHash.equals(request.blockHash)) {
+                this.peerManager.penalizePeer(peerId, PeerErrorSeverity.MidToleranceError);
+                throw new ValidationError(`Received block txs for unexpected block: expected ${request.blockHash.toString()}, got ${response.blockHash.toString()}`);
+            }
+            if (response.txIndices.getLength() !== request.txIndices.getLength()) {
+                this.peerManager.penalizePeer(peerId, PeerErrorSeverity.MidToleranceError);
+                throw new ValidationError(`Received block txs with mismatched bitvector length: expected ${request.txIndices.getLength()}, got ${response.txIndices.getLength()}`);
+            }
+            // Check no duplicates and not exceeding returnable count
+            const requestedIndices = new Set(request.txIndices.getTrueIndices());
+            const availableIndices = new Set(response.txIndices.getTrueIndices());
+            const maxReturnable = [
+                ...requestedIndices
+            ].filter((i)=>availableIndices.has(i)).length;
+            const returnedHashes = await Promise.all(response.txs.map((tx)=>tx.getTxHash().toString()));
+            const uniqueReturned = new Set(returnedHashes.map((h)=>h.toString()));
+            if (uniqueReturned.size !== returnedHashes.length) {
+                this.peerManager.penalizePeer(peerId, PeerErrorSeverity.MidToleranceError);
+                throw new ValidationError(`Received duplicate txs in block txs response`);
+            }
+            if (response.txs.length > maxReturnable) {
+                this.peerManager.penalizePeer(peerId, PeerErrorSeverity.MidToleranceError);
+                throw new ValidationError(`Received more txs (${response.txs.length}) than requested-and-available (${maxReturnable})`);
+            }
+            // Given proposal (should have locally), ensure returned txs are valid subset and match request indices
+            const proposal = await this.mempools.attestationPool?.getBlockProposal(request.blockHash.toString());
+            if (proposal) {
+                // Build intersected indices
+                const intersectIdx = request.txIndices.getTrueIndices().filter((i)=>response.txIndices.isSet(i));
+                // Enforce subset membership and preserve increasing order by index.
+                const hashToIndexInProposal = new Map(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 block hash ${request.blockHash.toString()}; cannot validate membership/order of returned txs`);
+                return false;
+            }
             await Promise.all(response.txs.map((tx)=>this.validateRequestedTx(tx, peerId, requestedTxValidator)));
             return true;
         } catch (e) {
@@ -661,7 +840,7 @@ import { P2PInstrumentation } from './instrumentation.js';
    * ReqRespSubProtocol.TX subprotocol validation.
    *
    * @param requestedTxHash - The collection of the txs that was requested.
-   * @param responseTx - The collectin of txs that was received as a response to the request.
+   * @param responseTx - The collection of txs that was received as a response to the request.
    * @param peerId - The peer ID of the peer that sent the tx.
    * @returns True if the whole collection of txs is valid, false otherwise.
    */ async validateRequestedTxs(requestedTxHash, responseTx, peerId) {
@@ -681,6 +860,45 @@ import { P2PInstrumentation } from './instrumentation.js';
             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;
+        }
+    }
     createRequestedTxValidator() {
         return new AggregateTxValidator(new DataTxValidator(), new MetadataTxValidator({
             l1ChainId: new Fr(this.config.l1ChainId),
@@ -690,17 +908,18 @@ import { P2PInstrumentation } from './instrumentation.js';
         }), new TxProofValidator(this.proofVerifier));
     }
     async validateRequestedTx(tx, peerId, txValidator, requested) {
+        const penalize = (severity)=>this.peerManager.penalizePeer(peerId, severity);
         if (!await tx.validateTxHash()) {
-            this.peerManager.penalizePeer(peerId, PeerErrorSeverity.MidToleranceError);
+            penalize(PeerErrorSeverity.MidToleranceError);
             throw new ValidationError(`Received tx with invalid hash ${tx.getTxHash().toString()}.`);
         }
         if (requested && !requested.has(tx.getTxHash().toString())) {
-            this.peerManager.penalizePeer(peerId, PeerErrorSeverity.MidToleranceError);
+            penalize(PeerErrorSeverity.MidToleranceError);
             throw new ValidationError(`Received tx with hash ${tx.getTxHash().toString()} that was not requested.`);
         }
         const { result } = await txValidator.validateTx(tx);
         if (result === 'invalid') {
-            this.peerManager.penalizePeer(peerId, PeerErrorSeverity.LowToleranceError);
+            penalize(PeerErrorSeverity.LowToleranceError);
             throw new ValidationError(`Received tx with hash ${tx.getTxHash().toString()} that is invalid.`);
         }
     }
@@ -718,7 +937,7 @@ import { P2PInstrumentation } from './instrumentation.js';
             let { severity } = outcome.failure;
             // Double spend validator has a special case handler
             if (name === 'doubleSpendValidator') {
-                const txBlockNumber = currentBlockNumber + 1; // tx is expected to be in the next block
+                const txBlockNumber = BlockNumber(currentBlockNumber + 1); // tx is expected to be in the next block
                 severity = await this.handleDoubleSpendFailure(tx, txBlockNumber);
             }
             this.peerManager.penalizePeer(peerId, severity);
@@ -768,7 +987,7 @@ import { P2PInstrumentation } from './instrumentation.js';
    */ async createMessageValidators(currentBlockNumber, nextSlotTimestamp) {
         const gasFees = await this.getGasFees(currentBlockNumber);
         const allowedInSetup = this.config.txPublicSetupAllowList ?? await getDefaultAllowedSetupFunctions();
-        const blockNumberInWhichTheTxIsConsideredToBeIncluded = currentBlockNumber + 1;
+        const blockNumberInWhichTheTxIsConsideredToBeIncluded = BlockNumber(currentBlockNumber + 1);
         return createTxMessageValidators(nextSlotTimestamp, blockNumberInWhichTheTxIsConsideredToBeIncluded, this.worldStateSynchronizer, gasFees, this.config.l1ChainId, this.config.rollupVersion, protocolContractsHash, this.archiver, this.proofVerifier, !this.config.disableTransactions, allowedInSetup);
     }
     /**
@@ -824,7 +1043,7 @@ import { P2PInstrumentation } from './instrumentation.js';
         }
         const snapshotValidator = new DoubleSpendTxValidator({
             nullifiersExist: async (nullifiers)=>{
-                const merkleTree = this.worldStateSynchronizer.getSnapshot(blockNumber - this.config.doubleSpendSeverePeerPenaltyWindow);
+                const merkleTree = this.worldStateSynchronizer.getSnapshot(BlockNumber(blockNumber - this.config.doubleSpendSeverePeerPenaltyWindow));
                 const indices = await merkleTree.findLeafIndices(MerkleTreeId.NULLIFIER_TREE, nullifiers);
                 return indices.map((index)=>index !== undefined);
             }
@@ -870,7 +1089,7 @@ import { P2PInstrumentation } from './instrumentation.js';
     }
     async sendToPeers(message) {
         const parent = message.constructor;
-        const identifier = await message.p2pMessageIdentifier().then((i)=>i.toString());
+        const identifier = await message.p2pMessageLoggingIdentifier().then((i)=>i.toString());
         this.logger.trace(`Sending message ${identifier}`, {
             p2pMessageIdentifier: identifier
         });
@@ -899,16 +1118,16 @@ import { P2PInstrumentation } from './instrumentation.js';
 }
 _ts_decorate([
     trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
-            [Attributes.SLOT_NUMBER]: block.slotNumber.toNumber(),
+            [Attributes.SLOT_NUMBER]: block.slotNumber,
             [Attributes.BLOCK_ARCHIVE]: block.archive.toString(),
-            [Attributes.P2P_ID]: await block.p2pMessageIdentifier().then((i)=>i.toString())
+            [Attributes.P2P_ID]: await block.p2pMessageLoggingIdentifier().then((i)=>i.toString())
         }))
 ], LibP2PService.prototype, "processValidBlockProposal", null);
 _ts_decorate([
     trackSpan('Libp2pService.broadcastAttestation', async (attestation)=>({
-            [Attributes.SLOT_NUMBER]: attestation.payload.header.slotNumber.toNumber(),
+            [Attributes.SLOT_NUMBER]: attestation.payload.header.slotNumber,
             [Attributes.BLOCK_ARCHIVE]: attestation.archive.toString(),
-            [Attributes.P2P_ID]: await attestation.p2pMessageIdentifier().then((i)=>i.toString())
+            [Attributes.P2P_ID]: await attestation.p2pMessageLoggingIdentifier().then((i)=>i.toString())
         }))
 ], LibP2PService.prototype, "broadcastAttestation", null);
 _ts_decorate([
@@ -921,6 +1140,11 @@ _ts_decorate([
             [Attributes.TX_HASH]: requestedTxHash.toString()
         }))
 ], LibP2PService.prototype, "validateRequestedTxs", null);
+_ts_decorate([
+    trackSpan('Libp2pService.validateRequestedBlock', (requestedBlockNumber, _responseBlock)=>({
+            [Attributes.BLOCK_NUMBER]: requestedBlockNumber.toString()
+        }))
+], LibP2PService.prototype, "validateRequestedBlock", null);
 _ts_decorate([
     trackSpan('Libp2pService.validatePropagatedTx', (tx)=>({
             [Attributes.TX_HASH]: tx.getTxHash().toString()
@@ -928,9 +1152,9 @@ _ts_decorate([
 ], LibP2PService.prototype, "validatePropagatedTx", null);
 _ts_decorate([
     trackSpan('Libp2pService.validateAttestation', async (_, attestation)=>({
-            [Attributes.SLOT_NUMBER]: attestation.payload.header.slotNumber.toNumber(),
+            [Attributes.SLOT_NUMBER]: attestation.payload.header.slotNumber,
             [Attributes.BLOCK_ARCHIVE]: attestation.archive.toString(),
-            [Attributes.P2P_ID]: await attestation.p2pMessageIdentifier().then((i)=>i.toString())
+            [Attributes.P2P_ID]: await attestation.p2pMessageLoggingIdentifier().then((i)=>i.toString())
         }))
 ], LibP2PService.prototype, "validateAttestation", null);
 _ts_decorate([