@aztec/p2p 4.0.0-nightly.20250907 → 4.0.0-nightly.20260107

package/dest/services/libp2p/libp2p_service.js

@@ -1,22 +1,390 @@
-function _ts_decorate(decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.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;
+function applyDecs2203RFactory() {
+    function createAddInitializerMethod(initializers, decoratorFinishedRef) {
+        return function addInitializer(initializer) {
+            assertNotFinished(decoratorFinishedRef, "addInitializer");
+            assertCallable(initializer, "An initializer");
+            initializers.push(initializer);
+        };
+    }
+    function memberDec(dec, name, desc, initializers, kind, isStatic, isPrivate, metadata, value) {
+        var kindStr;
+        switch(kind){
+            case 1:
+                kindStr = "accessor";
+                break;
+            case 2:
+                kindStr = "method";
+                break;
+            case 3:
+                kindStr = "getter";
+                break;
+            case 4:
+                kindStr = "setter";
+                break;
+            default:
+                kindStr = "field";
+        }
+        var ctx = {
+            kind: kindStr,
+            name: isPrivate ? "#" + name : name,
+            static: isStatic,
+            private: isPrivate,
+            metadata: metadata
+        };
+        var decoratorFinishedRef = {
+            v: false
+        };
+        ctx.addInitializer = createAddInitializerMethod(initializers, decoratorFinishedRef);
+        var get, set;
+        if (kind === 0) {
+            if (isPrivate) {
+                get = desc.get;
+                set = desc.set;
+            } else {
+                get = function() {
+                    return this[name];
+                };
+                set = function(v) {
+                    this[name] = v;
+                };
+            }
+        } else if (kind === 2) {
+            get = function() {
+                return desc.value;
+            };
+        } else {
+            if (kind === 1 || kind === 3) {
+                get = function() {
+                    return desc.get.call(this);
+                };
+            }
+            if (kind === 1 || kind === 4) {
+                set = function(v) {
+                    desc.set.call(this, v);
+                };
+            }
+        }
+        ctx.access = get && set ? {
+            get: get,
+            set: set
+        } : get ? {
+            get: get
+        } : {
+            set: set
+        };
+        try {
+            return dec(value, ctx);
+        } finally{
+            decoratorFinishedRef.v = true;
+        }
+    }
+    function assertNotFinished(decoratorFinishedRef, fnName) {
+        if (decoratorFinishedRef.v) {
+            throw new Error("attempted to call " + fnName + " after decoration was finished");
+        }
+    }
+    function assertCallable(fn, hint) {
+        if (typeof fn !== "function") {
+            throw new TypeError(hint + " must be a function");
+        }
+    }
+    function assertValidReturnValue(kind, value) {
+        var type = typeof value;
+        if (kind === 1) {
+            if (type !== "object" || value === null) {
+                throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0");
+            }
+            if (value.get !== undefined) {
+                assertCallable(value.get, "accessor.get");
+            }
+            if (value.set !== undefined) {
+                assertCallable(value.set, "accessor.set");
+            }
+            if (value.init !== undefined) {
+                assertCallable(value.init, "accessor.init");
+            }
+        } else if (type !== "function") {
+            var hint;
+            if (kind === 0) {
+                hint = "field";
+            } else if (kind === 10) {
+                hint = "class";
+            } else {
+                hint = "method";
+            }
+            throw new TypeError(hint + " decorators must return a function or void 0");
+        }
+    }
+    function applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, initializers, metadata) {
+        var decs = decInfo[0];
+        var desc, init, value;
+        if (isPrivate) {
+            if (kind === 0 || kind === 1) {
+                desc = {
+                    get: decInfo[3],
+                    set: decInfo[4]
+                };
+            } else if (kind === 3) {
+                desc = {
+                    get: decInfo[3]
+                };
+            } else if (kind === 4) {
+                desc = {
+                    set: decInfo[3]
+                };
+            } else {
+                desc = {
+                    value: decInfo[3]
+                };
+            }
+        } else if (kind !== 0) {
+            desc = Object.getOwnPropertyDescriptor(base, name);
+        }
+        if (kind === 1) {
+            value = {
+                get: desc.get,
+                set: desc.set
+            };
+        } else if (kind === 2) {
+            value = desc.value;
+        } else if (kind === 3) {
+            value = desc.get;
+        } else if (kind === 4) {
+            value = desc.set;
+        }
+        var newValue, get, set;
+        if (typeof decs === "function") {
+            newValue = memberDec(decs, name, desc, initializers, kind, isStatic, isPrivate, metadata, value);
+            if (newValue !== void 0) {
+                assertValidReturnValue(kind, newValue);
+                if (kind === 0) {
+                    init = newValue;
+                } else if (kind === 1) {
+                    init = newValue.init;
+                    get = newValue.get || value.get;
+                    set = newValue.set || value.set;
+                    value = {
+                        get: get,
+                        set: set
+                    };
+                } else {
+                    value = newValue;
+                }
+            }
+        } else {
+            for(var i = decs.length - 1; i >= 0; i--){
+                var dec = decs[i];
+                newValue = memberDec(dec, name, desc, initializers, kind, isStatic, isPrivate, metadata, value);
+                if (newValue !== void 0) {
+                    assertValidReturnValue(kind, newValue);
+                    var newInit;
+                    if (kind === 0) {
+                        newInit = newValue;
+                    } else if (kind === 1) {
+                        newInit = newValue.init;
+                        get = newValue.get || value.get;
+                        set = newValue.set || value.set;
+                        value = {
+                            get: get,
+                            set: set
+                        };
+                    } else {
+                        value = newValue;
+                    }
+                    if (newInit !== void 0) {
+                        if (init === void 0) {
+                            init = newInit;
+                        } else if (typeof init === "function") {
+                            init = [
+                                init,
+                                newInit
+                            ];
+                        } else {
+                            init.push(newInit);
+                        }
+                    }
+                }
+            }
+        }
+        if (kind === 0 || kind === 1) {
+            if (init === void 0) {
+                init = function(instance, init) {
+                    return init;
+                };
+            } else if (typeof init !== "function") {
+                var ownInitializers = init;
+                init = function(instance, init) {
+                    var value = init;
+                    for(var i = 0; i < ownInitializers.length; i++){
+                        value = ownInitializers[i].call(instance, value);
+                    }
+                    return value;
+                };
+            } else {
+                var originalInitializer = init;
+                init = function(instance, init) {
+                    return originalInitializer.call(instance, init);
+                };
+            }
+            ret.push(init);
+        }
+        if (kind !== 0) {
+            if (kind === 1) {
+                desc.get = value.get;
+                desc.set = value.set;
+            } else if (kind === 2) {
+                desc.value = value;
+            } else if (kind === 3) {
+                desc.get = value;
+            } else if (kind === 4) {
+                desc.set = value;
+            }
+            if (isPrivate) {
+                if (kind === 1) {
+                    ret.push(function(instance, args) {
+                        return value.get.call(instance, args);
+                    });
+                    ret.push(function(instance, args) {
+                        return value.set.call(instance, args);
+                    });
+                } else if (kind === 2) {
+                    ret.push(value);
+                } else {
+                    ret.push(function(instance, args) {
+                        return value.call(instance, args);
+                    });
+                }
+            } else {
+                Object.defineProperty(base, name, desc);
+            }
+        }
+    }
+    function applyMemberDecs(Class, decInfos, metadata) {
+        var ret = [];
+        var protoInitializers;
+        var staticInitializers;
+        var existingProtoNonFields = new Map();
+        var existingStaticNonFields = new Map();
+        for(var i = 0; i < decInfos.length; i++){
+            var decInfo = decInfos[i];
+            if (!Array.isArray(decInfo)) continue;
+            var kind = decInfo[1];
+            var name = decInfo[2];
+            var isPrivate = decInfo.length > 3;
+            var isStatic = kind >= 5;
+            var base;
+            var initializers;
+            if (isStatic) {
+                base = Class;
+                kind = kind - 5;
+                staticInitializers = staticInitializers || [];
+                initializers = staticInitializers;
+            } else {
+                base = Class.prototype;
+                protoInitializers = protoInitializers || [];
+                initializers = protoInitializers;
+            }
+            if (kind !== 0 && !isPrivate) {
+                var existingNonFields = isStatic ? existingStaticNonFields : existingProtoNonFields;
+                var existingKind = existingNonFields.get(name) || 0;
+                if (existingKind === true || existingKind === 3 && kind !== 4 || existingKind === 4 && kind !== 3) {
+                    throw new Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + name);
+                } else if (!existingKind && kind > 2) {
+                    existingNonFields.set(name, kind);
+                } else {
+                    existingNonFields.set(name, true);
+                }
+            }
+            applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, initializers, metadata);
+        }
+        pushInitializers(ret, protoInitializers);
+        pushInitializers(ret, staticInitializers);
+        return ret;
+    }
+    function pushInitializers(ret, initializers) {
+        if (initializers) {
+            ret.push(function(instance) {
+                for(var i = 0; i < initializers.length; i++){
+                    initializers[i].call(instance);
+                }
+                return instance;
+            });
+        }
+    }
+    function applyClassDecs(targetClass, classDecs, metadata) {
+        if (classDecs.length > 0) {
+            var initializers = [];
+            var newClass = targetClass;
+            var name = targetClass.name;
+            for(var i = classDecs.length - 1; i >= 0; i--){
+                var decoratorFinishedRef = {
+                    v: false
+                };
+                try {
+                    var nextNewClass = classDecs[i](newClass, {
+                        kind: "class",
+                        name: name,
+                        addInitializer: createAddInitializerMethod(initializers, decoratorFinishedRef),
+                        metadata
+                    });
+                } finally{
+                    decoratorFinishedRef.v = true;
+                }
+                if (nextNewClass !== undefined) {
+                    assertValidReturnValue(10, nextNewClass);
+                    newClass = nextNewClass;
+                }
+            }
+            return [
+                defineMetadata(newClass, metadata),
+                function() {
+                    for(var i = 0; i < initializers.length; i++){
+                        initializers[i].call(newClass);
+                    }
+                }
+            ];
+        }
+    }
+    function defineMetadata(Class, metadata) {
+        return Object.defineProperty(Class, Symbol.metadata || Symbol.for("Symbol.metadata"), {
+            configurable: true,
+            enumerable: true,
+            value: metadata
+        });
+    }
+    return function applyDecs2203R(targetClass, memberDecs, classDecs, parentClass) {
+        if (parentClass !== void 0) {
+            var parentMetadata = parentClass[Symbol.metadata || Symbol.for("Symbol.metadata")];
+        }
+        var metadata = Object.create(parentMetadata === void 0 ? null : parentMetadata);
+        var e = applyMemberDecs(targetClass, memberDecs, metadata);
+        if (!classDecs.length) defineMetadata(targetClass, metadata);
+        return {
+            e: e,
+            get c () {
+                return applyClassDecs(targetClass, classDecs, metadata);
+            }
+        };
+    };
 }
-import { randomInt } from '@aztec/foundation/crypto';
+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;
+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 { protocolContractTreeRoot } from '@aztec/protocol-contracts';
+import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
+import { protocolContractsHash } from '@aztec/protocol-contracts';
 import { GasFees } from '@aztec/stdlib/gas';
 import { BlockAttestation, BlockProposal, P2PClientType, P2PMessage, PeerErrorSeverity, TopicType, createTopicString, getTopicsForClientAndConfig, metricsTopicStrToLabels } from '@aztec/stdlib/p2p';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
 import { Tx } from '@aztec/stdlib/tx';
 import { compressComponentVersions } from '@aztec/stdlib/versioning';
 import { Attributes, OtelMetricsAdapter, WithTracer, trackSpan } from '@aztec/telemetry-client';
-import { ENR } from '@chainsafe/enr';
 import { gossipsub } from '@chainsafe/libp2p-gossipsub';
 import { createPeerScoreParams, createTopicScoreParams } from '@chainsafe/libp2p-gossipsub/score';
 import { SignaturePolicy } from '@chainsafe/libp2p-gossipsub/types';
@@ -25,15 +393,16 @@ import { yamux } from '@chainsafe/libp2p-yamux';
 import { bootstrap } from '@libp2p/bootstrap';
 import { identify } from '@libp2p/identify';
 import { TopicValidatorResult } from '@libp2p/interface';
-import '@libp2p/kad-dht';
 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';
-import { DoubleSpendTxValidator, TxProofValidator } from '../../msg_validators/tx_validator/index.js';
+import { AggregateTxValidator, DataTxValidator, DoubleSpendTxValidator, MetadataTxValidator, TxProofValidator } from '../../msg_validators/tx_validator/index.js';
 import { GossipSubEvent } from '../../types/index.js';
 import { convertToMultiaddr } from '../../util.js';
 import { getVersions } from '../../versioning.js';
@@ -49,6 +418,29 @@ import { reqGoodbyeHandler } from '../reqresp/protocols/goodbye.js';
 import { pingHandler, reqRespBlockHandler, reqRespStatusHandler, reqRespTxHandler } from '../reqresp/protocols/index.js';
 import { ReqResp } from '../reqresp/reqresp.js';
 import { P2PInstrumentation } from './instrumentation.js';
+_dec = trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
+        [Attributes.SLOT_NUMBER]: block.slotNumber,
+        [Attributes.BLOCK_ARCHIVE]: block.archive.toString(),
+        [Attributes.P2P_ID]: await block.p2pMessageLoggingIdentifier().then((i)=>i.toString())
+    })), _dec1 = trackSpan('Libp2pService.broadcastAttestation', async (attestation)=>({
+        [Attributes.SLOT_NUMBER]: attestation.payload.header.slotNumber,
+        [Attributes.BLOCK_ARCHIVE]: attestation.archive.toString(),
+        [Attributes.P2P_ID]: await attestation.p2pMessageLoggingIdentifier().then((i)=>i.toString())
+    })), _dec2 = trackSpan('Libp2pService.validateRequestedBlockTxs', (request)=>({
+        [Attributes.BLOCK_HASH]: request.blockHash.toString()
+    })), _dec3 = trackSpan('Libp2pService.validateRequestedTx', (requestedTxHash, _responseTx)=>({
+        [Attributes.TX_HASH]: requestedTxHash.toString()
+    })), _dec4 = trackSpan('Libp2pService.validateRequestedBlock', (requestedBlockNumber, _responseBlock)=>({
+        [Attributes.BLOCK_NUMBER]: requestedBlockNumber.toString()
+    })), _dec5 = trackSpan('Libp2pService.validatePropagatedTx', (tx)=>({
+        [Attributes.TX_HASH]: tx.getTxHash().toString()
+    })), _dec6 = trackSpan('Libp2pService.validateAttestation', async (_, attestation)=>({
+        [Attributes.SLOT_NUMBER]: attestation.payload.header.slotNumber,
+        [Attributes.BLOCK_ARCHIVE]: attestation.archive.toString(),
+        [Attributes.P2P_ID]: await attestation.p2pMessageLoggingIdentifier().then((i)=>i.toString())
+    })), _dec7 = trackSpan('Libp2pService.validateBlockProposal', (_peerId, block)=>({
+        [Attributes.SLOT_NUMBER]: block.payload.header.slotNumber.toString()
+    }));
 /**
  * Lib P2P implementation of the P2PService interface.
  */ export class LibP2PService extends WithTracer {
@@ -63,8 +455,50 @@ import { P2PInstrumentation } from './instrumentation.js';
     epochCache;
     proofVerifier;
     worldStateSynchronizer;
-    logger;
-    jobQueue;
+    static{
+        ({ e: [_initProto] } = _apply_decs_2203_r(this, [
+            [
+                _dec,
+                2,
+                "processValidBlockProposal"
+            ],
+            [
+                _dec1,
+                2,
+                "broadcastAttestation"
+            ],
+            [
+                _dec2,
+                2,
+                "validateRequestedBlockTxs"
+            ],
+            [
+                _dec3,
+                2,
+                "validateRequestedTxs"
+            ],
+            [
+                _dec4,
+                2,
+                "validateRequestedBlock"
+            ],
+            [
+                _dec5,
+                2,
+                "validatePropagatedTx"
+            ],
+            [
+                _dec6,
+                2,
+                "validateAttestation"
+            ],
+            [
+                _dec7,
+                2,
+                "validateBlockProposal"
+            ]
+        ], []));
+    }
     discoveryRunningPromise;
     msgIdSeenValidators;
     // Message validators
@@ -80,8 +514,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 = (_initProto(this), {}), 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);
@@ -92,12 +529,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);
-        this.blockProposalValidator = new BlockProposalValidator(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;
         };
@@ -165,7 +605,7 @@ import { P2PInstrumentation } from './instrumentation.js';
                     // The connection attempts to the node on TCP layer are not necessarily valid Aztec peers so we want to have a bit of leeway here
                     // If we hit the limit, the connection will be temporarily accepted and immediately dropped.
                     // Docs: https://nodejs.org/api/net.html#servermaxconnections
-                    maxConnections: Math.ceil(maxPeerCount * 1.5),
+                    maxConnections: maxPeerCount * 2,
                     // socket option: the maximum length of the queue of pending connections
                     // https://nodejs.org/dist/latest-v22.x/docs/api/net.html#serverlisten
                     // it's not safe if we increase this number
@@ -176,7 +616,7 @@ import { P2PInstrumentation } from './instrumentation.js';
                         // In case closeAbove is reached, the server stops listening altogether
                         // It's important that there is enough difference between closeAbove and listenAbove,
                         // otherwise the server.listener will flap between being closed and open potentially degrading perf even more
-                        closeAbove: maxPeerCount * 2,
+                        closeAbove: maxPeerCount * 3,
                         listenBelow: Math.floor(maxPeerCount * 0.9)
                     }
                 })
@@ -192,7 +632,9 @@ import { P2PInstrumentation } from './instrumentation.js';
             ],
             connectionManager: {
                 minConnections: 0,
-                maxConnections: maxPeerCount,
+                // We set maxConnections above maxPeerCount because if we hit limit of maxPeerCount
+                // libp2p will start aggressively rejecting all new connections, preventing network discovery and crawling.
+                maxConnections: maxPeerCount * 2,
                 maxParallelDials: 100,
                 dialTimeout: 30_000,
                 maxPeerAddrsToDial: 5,
@@ -273,7 +715,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
@@ -295,8 +737,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();
@@ -311,18 +751,13 @@ import { P2PInstrumentation } from './instrumentation.js';
         const goodbyeHandler = reqGoodbyeHandler(this.peerManager);
         const blockHandler = reqRespBlockHandler(this.archiver);
         const statusHandler = reqRespStatusHandler(this.protocolVersion, this.worldStateSynchronizer, this.logger);
-        // In case P2P client doesnt'have attestation pool,
-        // const blockTxsHandler = this.mempools.attestationPool
-        //   ? reqRespBlockTxsHandler(this.mempools.attestationPool, this.mempools.txPool)
-        //   : def;
         const requestResponseHandlers = {
             [ReqRespSubProtocol.PING]: pingHandler,
             [ReqRespSubProtocol.STATUS]: statusHandler.bind(this),
             [ReqRespSubProtocol.GOODBYE]: goodbyeHandler.bind(this),
             [ReqRespSubProtocol.BLOCK]: blockHandler.bind(this)
         };
-        // Only handle block transactions request if attestation pool is available to the client
-        if (this.mempools.attestationPool) {
+        if (!this.config.disableTransactions) {
             const blockTxsHandler = reqRespBlockTxsHandler(this.mempools.attestationPool, this.mempools.txPool);
             requestResponseHandlers[ReqRespSubProtocol.BLOCK_TXS] = blockTxsHandler.bind(this);
         }
@@ -331,14 +766,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.validateRequestedTx.bind(this)
+            [ReqRespSubProtocol.TX]: this.validateRequestedTxs.bind(this),
+            [ReqRespSubProtocol.BLOCK_TXS]: this.validateRequestedBlockTxs.bind(this),
+            [ReqRespSubProtocol.BLOCK]: this.validateRequestedBlock.bind(this)
         };
         await this.reqresp.start(requestResponseHandlers, reqrespSubProtocolValidators);
         this.logger.info(`Started P2P service`, {
@@ -357,8 +795,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...');
@@ -424,15 +860,15 @@ import { P2PInstrumentation } from './instrumentation.js';
         if (!this.node.services.pubsub) {
             throw new Error('Pubsub service not available.');
         }
-        const p2pMessage = await P2PMessage.fromGossipable(message);
-        this.logger.debug(`Publishing message`, {
-            topic,
-            messageId: p2pMessage.id
-        });
+        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]:
@@ -464,66 +900,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 currentTime = new Date();
-        const messageLatency = currentTime.getTime() - p2pMessage.publishTime.getTime();
-        this.logger.debug(`Received message`, {
-            topic: msg.topic,
-            messageId: p2pMessage.id,
-            messageLatency
-        });
+        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;
-        } else if (preValidationResult.topicType !== undefined) {
-            // guard against clock skew & DST
-            if (messageLatency > 0) {
-                this.instrumentation.recordMessageLatency(preValidationResult.topicType, messageLatency);
-            }
         }
         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();
@@ -533,9 +1011,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
         ]);
@@ -548,25 +1027,57 @@ 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 block ${attestation.blockNumber} 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(),
-            block: attestation.blockNumber,
             source: source.toString()
         });
         await this.mempools.attestationPool.addAttestations([
@@ -576,15 +1087,42 @@ 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;
+            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) {
@@ -594,33 +1132,41 @@ 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 epoch = slot / 32n;
-        this.logger.verbose(`Received block ${block.blockNumber} for slot ${slot} epoch ${epoch} from external peer ${sender.toString()}.`, {
-            p2pMessageIdentifier: await block.p2pMessageIdentifier(),
-            slot: block.slotNumber.toNumber(),
+        const slot = block.slotNumber;
+        const previousSlot = SlotNumber(slot - 1);
+        this.logger.verbose(`Received block proposal for slot ${slot} from external peer ${sender.toString()}.`, {
+            p2pMessageIdentifier: await block.p2pMessageLoggingIdentifier(),
+            slot: block.slotNumber,
             archive: block.archive.toString(),
-            block: block.blockNumber,
             source: sender.toString()
         });
-        const attestationsForPreviousSlot = await this.mempools.attestationPool?.getAttestationsForSlot(previousSlot);
-        if (attestationsForPreviousSlot !== undefined) {
-            this.logger.verbose(`Received ${attestationsForPreviousSlot.length} attestations for slot ${previousSlot}`);
+        const attestationsForPreviousSlot = await this.mempools.attestationPool.getAttestationsForSlot(previousSlot);
+        this.logger.verbose(`Received ${attestationsForPreviousSlot.length} attestations for slot ${previousSlot}`);
+        // Attempt to add proposal, then mark the txs in this proposal as non-evictable
+        try {
+            await this.mempools.attestationPool.addBlockProposal(block);
+        } catch (err) {
+            // Drop proposals if we hit per-slot cap in the attestation pool; rethrow unknown errors
+            if (err instanceof ProposalSlotCapExceededError) {
+                this.logger.warn(`Dropping block proposal due to per-slot proposal cap`, {
+                    slot: String(slot),
+                    archive: block.archive.toString(),
+                    error: err.message
+                });
+                return;
+            }
+            throw err;
         }
-        // Mark the txs in this proposal as non-evictable
         await this.mempools.txPool.markTxsAsNonEvictable(block.txHashes);
-        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 block ${attestation.blockNumber} slot ${attestation.slotNumber.toNumber()}`, {
-                    p2pMessageIdentifier: await attestation.p2pMessageIdentifier(),
-                    slot: attestation.slotNumber.toNumber(),
-                    archive: attestation.archive.toString(),
-                    block: attestation.blockNumber
+                this.logger.verbose(`Broadcasting attestation for slot ${attestation.slotNumber}`, {
+                    p2pMessageIdentifier: await attestation.p2pMessageLoggingIdentifier(),
+                    slot: attestation.slotNumber,
+                    archive: attestation.archive.toString()
                 });
                 await this.broadcastAttestation(attestation);
             }
@@ -636,19 +1182,84 @@ 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. 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) {
+        const requestedTxValidator = this.createRequestedTxValidator();
+        try {
+            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) {
+            if (e instanceof ValidationError) {
+                this.logger.warn(`Failed validation for requested block txs from peer ${peerId.toString()}`);
+            } else {
+                this.logger.error(`Error during validation of requested block txs`, e);
+            }
+            return false;
+        }
+    }
+    /**
    * Validate a collection of txs that has been requested from a peer.
    *
    * The core component of this validator is that each tx hash MUST match the requested tx hash,
@@ -658,36 +1269,89 @@ 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.
-   */ //TODO: (mralj) - this is somewhat naive implementation, if single tx is invlid 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.
-    async validateRequestedTx(requestedTxHash, responseTx, peerId) {
+   */ async validateRequestedTxs(requestedTxHash, responseTx, peerId) {
         const requested = new Set(requestedTxHash.map((h)=>h.toString()));
-        const proofValidator = new TxProofValidator(this.proofVerifier);
+        const requestedTxValidator = this.createRequestedTxValidator();
+        //TODO: (mralj) - this is somewhat naive implementation, if single tx is invlid 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(async (tx)=>{
-                if (!requested.has(tx.getTxHash().toString())) {
-                    this.peerManager.penalizePeer(peerId, PeerErrorSeverity.MidToleranceError);
-                    throw new ValidationError(`Received tx with hash ${tx.getTxHash().toString()} that was not requested.`);
-                }
-                const { result } = await proofValidator.validateTx(tx);
-                if (result === 'invalid') {
-                    this.peerManager.penalizePeer(peerId, PeerErrorSeverity.LowToleranceError);
-                    throw new ValidationError(`Received tx with hash ${tx.getTxHash().toString()} that is invalid.`);
-                }
-            }));
+            await Promise.all(responseTx.map((tx)=>this.validateRequestedTx(tx, peerId, requestedTxValidator, requested)));
             return true;
         } catch (e) {
             if (e instanceof ValidationError) {
-                this.logger.debug(`Failed to validate requested txs from peer ${peerId.toString()}, reason ${e.message}`);
+                this.logger.warn(`Failed to validate requested txs from peer ${peerId.toString()}, reason ${e.message}`);
             } else {
-                this.logger.warn(`Error during validation of requested txs`, e);
+                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;
         }
     }
+    createRequestedTxValidator() {
+        return new AggregateTxValidator(new DataTxValidator(), new MetadataTxValidator({
+            l1ChainId: new Fr(this.config.l1ChainId),
+            rollupVersion: new Fr(this.config.rollupVersion),
+            protocolContractsHash,
+            vkTreeRoot: getVKTreeRoot()
+        }), new TxProofValidator(this.proofVerifier));
+    }
+    async validateRequestedTx(tx, peerId, txValidator, requested) {
+        const penalize = (severity)=>this.peerManager.penalizePeer(peerId, severity);
+        if (!await tx.validateTxHash()) {
+            penalize(PeerErrorSeverity.MidToleranceError);
+            throw new ValidationError(`Received tx with invalid hash ${tx.getTxHash().toString()}.`);
+        }
+        if (requested && !requested.has(tx.getTxHash().toString())) {
+            penalize(PeerErrorSeverity.MidToleranceError);
+            throw new ValidationError(`Received tx with hash ${tx.getTxHash().toString()} that was not requested.`);
+        }
+        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.`);
+        }
+    }
     async validatePropagatedTx(tx, peerId) {
         const currentBlockNumber = await this.archiver.getBlockNumber();
         // We accept transactions if they are not expired by the next slot (checked based on the IncludeByTimestamp field)
@@ -702,7 +1366,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);
@@ -752,8 +1416,8 @@ 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;
-        return createTxMessageValidators(nextSlotTimestamp, blockNumberInWhichTheTxIsConsideredToBeIncluded, this.worldStateSynchronizer, gasFees, this.config.l1ChainId, this.config.rollupVersion, protocolContractTreeRoot, this.archiver, this.proofVerifier, !this.config.disableTransactions, allowedInSetup);
+        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);
     }
     /**
    * Run validations on a tx.
@@ -808,7 +1472,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);
             }
@@ -854,7 +1518,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
         });
@@ -881,42 +1545,3 @@ import { P2PInstrumentation } from './instrumentation.js';
         }
     }
 }
-_ts_decorate([
-    trackSpan('Libp2pService.processValidBlockProposal', async (block)=>({
-            [Attributes.BLOCK_NUMBER]: block.blockNumber,
-            [Attributes.SLOT_NUMBER]: block.slotNumber.toNumber(),
-            [Attributes.BLOCK_ARCHIVE]: block.archive.toString(),
-            [Attributes.P2P_ID]: await block.p2pMessageIdentifier().then((i)=>i.toString())
-        }))
-], LibP2PService.prototype, "processValidBlockProposal", null);
-_ts_decorate([
-    trackSpan('Libp2pService.broadcastAttestation', async (attestation)=>({
-            [Attributes.BLOCK_NUMBER]: attestation.blockNumber,
-            [Attributes.SLOT_NUMBER]: attestation.payload.header.slotNumber.toNumber(),
-            [Attributes.BLOCK_ARCHIVE]: attestation.archive.toString(),
-            [Attributes.P2P_ID]: await attestation.p2pMessageIdentifier().then((i)=>i.toString())
-        }))
-], LibP2PService.prototype, "broadcastAttestation", null);
-_ts_decorate([
-    trackSpan('Libp2pService.validateRequestedTx', (requestedTxHash, _responseTx)=>({
-            [Attributes.TX_HASH]: requestedTxHash.toString()
-        }))
-], LibP2PService.prototype, "validateRequestedTx", null);
-_ts_decorate([
-    trackSpan('Libp2pService.validatePropagatedTx', (tx)=>({
-            [Attributes.TX_HASH]: tx.getTxHash().toString()
-        }))
-], LibP2PService.prototype, "validatePropagatedTx", null);
-_ts_decorate([
-    trackSpan('Libp2pService.validateAttestation', async (_, attestation)=>({
-            [Attributes.BLOCK_NUMBER]: attestation.blockNumber,
-            [Attributes.SLOT_NUMBER]: attestation.payload.header.slotNumber.toNumber(),
-            [Attributes.BLOCK_ARCHIVE]: attestation.archive.toString(),
-            [Attributes.P2P_ID]: await attestation.p2pMessageIdentifier().then((i)=>i.toString())
-        }))
-], LibP2PService.prototype, "validateAttestation", null);
-_ts_decorate([
-    trackSpan('Libp2pService.validateBlockProposal', (_peerId, block)=>({
-            [Attributes.SLOT_NUMBER]: block.payload.header.slotNumber.toString()
-        }))
-], LibP2PService.prototype, "validateBlockProposal", null);