@aztec/p2p 0.0.1-commit.b655e406 → 0.0.1-commit.b8a057fa

package/dest/services/reqresp/reqresp.js

@@ -1,31 +1,403 @@
 // @attribution: lodestar impl for inspiration
-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 { compactArray } from '@aztec/foundation/collection';
+function _apply_decs_2203_r(targetClass, memberDecs, classDecs, parentClass) {
+    return (_apply_decs_2203_r = applyDecs2203RFactory())(targetClass, memberDecs, classDecs, parentClass);
+}
+var _dec, _dec1, _initProto;
 import { AbortError, TimeoutError } from '@aztec/foundation/error';
 import { createLogger } from '@aztec/foundation/log';
 import { executeTimeout } from '@aztec/foundation/timer';
 import { PeerErrorSeverity } from '@aztec/stdlib/p2p';
 import { Attributes, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
 import { pipeline } from 'node:stream/promises';
-import { CollectiveReqRespTimeoutError, IndividualReqRespTimeoutError, InvalidResponseError } from '../../errors/reqresp.error.js';
-import { SnappyTransform } from '../encoding.js';
-import { DEFAULT_INDIVIDUAL_REQUEST_TIMEOUT_MS, DEFAULT_REQRESP_DIAL_TIMEOUT_MS } from './config.js';
-import { BatchConnectionSampler } from './connection-sampler/batch_connection_sampler.js';
+import { IndividualReqRespTimeoutError, OversizedReqRespRequestError } from '../../errors/reqresp.error.js';
+import { DEFAULT_MAX_RESPONSE_SIZE_KB, OversizedSnappyResponseError, ResponseSizeLimitExceededError, SnappyTransform } from '../encoding.js';
+import { DEFAULT_INDIVIDUAL_REQUEST_TIMEOUT_MS, DEFAULT_REQRESP_DIAL_TIMEOUT_MS, MAX_REQRESP_REQUEST_SIZE_BYTES } from './config.js';
 import { ConnectionSampler, RandomSampler } from './connection-sampler/connection_sampler.js';
-import { DEFAULT_SUB_PROTOCOL_VALIDATORS, ReqRespSubProtocol, responseFromBuffer } from './interface.js';
+import { ReqRespSubProtocol, UNAUTHENTICATED_ALLOWED_PROTOCOLS, subProtocolSizeCalculators } from './interface.js';
 import { ReqRespMetrics } from './metrics.js';
 import { RateLimitStatus, RequestResponseRateLimiter, prettyPrintRateLimitStatus } from './rate-limiter/rate_limiter.js';
-import { ReqRespStatus, ReqRespStatusError, parseStatusChunk, prettyPrintReqRespStatus } from './status.js';
+import { ReqRespStatus, ReqRespStatusError, parseStatusChunk } from './status.js';
+_dec = trackSpan('ReqResp.sendRequestToPeer', (peerId, subProtocol, _)=>({
+        [Attributes.P2P_ID]: peerId.toString(),
+        [Attributes.P2P_REQ_RESP_PROTOCOL]: subProtocol
+    })), _dec1 = trackSpan('ReqResp.streamHandler', (protocol, { connection })=>({
+        [Attributes.P2P_REQ_RESP_PROTOCOL]: protocol,
+        [Attributes.P2P_ID]: connection.remotePeer.toString()
+    }));
 /**
  * The Request Response Service
  *
  * It allows nodes to request specific information from their peers, its use case covers recovering
- * information that was missed during a syncronisation or a gossip event.
+ * information that was missed during a synchronisation or a gossip event.
  *
  * This service implements the request response sub protocol, it is heavily inspired from
  * ethereum implementations of the same name.
@@ -38,22 +410,35 @@ import { ReqRespStatus, ReqRespStatusError, parseStatusChunk, prettyPrintReqResp
     libp2p;
     peerScoring;
     logger;
+    static{
+        ({ e: [_initProto] } = _apply_decs_2203_r(this, [
+            [
+                _dec,
+                2,
+                "sendRequestToPeer"
+            ],
+            [
+                _dec1,
+                2,
+                "streamHandler"
+            ]
+        ], []));
+    }
     individualRequestTimeoutMs;
     dialTimeoutMs;
     subProtocolHandlers;
-    subProtocolValidators;
     connectionSampler;
     rateLimiter;
     snappyTransform;
+    shouldRejectPeer;
     metrics;
     constructor(config, libp2p, peerScoring, logger = createLogger('p2p:reqresp'), rateLimits = {}, telemetryClient = getTelemetryClient()){
         this.libp2p = libp2p;
         this.peerScoring = peerScoring;
         this.logger = logger;
-        this.individualRequestTimeoutMs = DEFAULT_INDIVIDUAL_REQUEST_TIMEOUT_MS;
+        this.individualRequestTimeoutMs = (_initProto(this), DEFAULT_INDIVIDUAL_REQUEST_TIMEOUT_MS);
         this.dialTimeoutMs = DEFAULT_REQRESP_DIAL_TIMEOUT_MS;
         this.subProtocolHandlers = {};
-        this.subProtocolValidators = {};
         this.updateConfig(config);
         this.rateLimiter = new RequestResponseRateLimiter(peerScoring, rateLimits);
         // Connection sampler is used to sample our connected peers
@@ -69,24 +454,31 @@ import { ReqRespStatus, ReqRespStatusError, parseStatusChunk, prettyPrintReqResp
             this.dialTimeoutMs = config.dialTimeoutMs;
         }
     }
+    setShouldRejectPeer(checker) {
+        this.shouldRejectPeer = checker;
+    }
     get tracer() {
         return this.metrics.tracer;
     }
     /**
+   * Get the connection sampler instance
+   */ getConnectionSampler() {
+        return this.connectionSampler;
+    }
+    /**
    * Start the reqresp service
-   */ async start(subProtocolHandlers, subProtocolValidators) {
+   */ async start(subProtocolHandlers) {
         Object.assign(this.subProtocolHandlers, subProtocolHandlers);
-        Object.assign(this.subProtocolValidators, subProtocolValidators);
-        // Register all protocol handlers
+        // Register streamHandler with libp2p.
+        // The streamHandler is responsible for reading the incoming stream, determining the protocol, then triggering the appropriate handler.
         for (const subProtocol of Object.keys(subProtocolHandlers)){
             this.logger.debug(`Registering handler for sub protocol ${subProtocol}`);
             await this.libp2p.handle(subProtocol, (data)=>void this.streamHandler(subProtocol, data).catch((err)=>this.logger.error(`Error on libp2p subprotocol ${subProtocol} handler`, err)));
         }
         this.rateLimiter.start();
     }
-    async addSubProtocol(subProtocol, handler, validator = DEFAULT_SUB_PROTOCOL_VALIDATORS[subProtocol]) {
+    async addSubProtocol(subProtocol, handler) {
         this.subProtocolHandlers[subProtocol] = handler;
-        this.subProtocolValidators[subProtocol] = validator;
         this.logger.debug(`Registering handler for sub protocol ${subProtocol}`);
         await this.libp2p.handle(subProtocol, (data)=>void this.streamHandler(subProtocol, data).catch((err)=>this.logger.error(`Error on libp2p subprotocol ${subProtocol} handler`, err)));
     }
@@ -108,149 +500,6 @@ import { ReqRespStatus, ReqRespStatusError, parseStatusChunk, prettyPrintReqResp
     // NOTE: We assume libp2p instance is managed by the caller
     }
     /**
-   * Request multiple messages over the same sub protocol, balancing the requests across peers.
-   *
-   * @devnote
-   * - The function prioritizes sending requests to free peers using a batch sampling strategy.
-   * - If a peer fails to respond or returns an invalid response, it is removed from the sampling pool and replaced.
-   * - The function stops retrying once all requests are processed, no active peers remain, or the maximum retry attempts are reached.
-   * - Responses are validated using a custom validator for the sub-protocol.*
-   *
-   * Requests are sent in parallel to each peer, but multiple requests are sent to the same peer in series
-   * - If a peer fails to respond or returns an invalid response, it is removed from the sampling pool and replaced.
-   * - The function stops retrying once all requests are processed, no active peers remain, or the maximum retry attempts are reached.
-   * - Responses are validated using a custom validator for the sub-protocol.*
-   *
-   * @param subProtocol
-   * @param requests
-   * @param timeoutMs
-   * @param maxPeers
-   * @returns
-   *
-   * @throws {CollectiveReqRespTimeoutError} - If the request batch exceeds the specified timeout (`timeoutMs`).
-   */ async sendBatchRequest(subProtocol, requests, pinnedPeer, timeoutMs = 10000, maxPeers = Math.max(10, Math.ceil(requests.length / 3)), maxRetryAttempts = 3) {
-        const responseValidator = this.subProtocolValidators[subProtocol] ?? DEFAULT_SUB_PROTOCOL_VALIDATORS[subProtocol];
-        const responses = new Array(requests.length);
-        const requestBuffers = requests.map((req)=>req.toBuffer());
-        const requestFunction = async (signal)=>{
-            // Track which requests still need to be processed
-            const pendingRequestIndices = new Set(requestBuffers.map((_, i)=>i));
-            // Create batch sampler with the total number of requests and max peers
-            const batchSampler = new BatchConnectionSampler(this.connectionSampler, requests.length, maxPeers, compactArray([
-                pinnedPeer
-            ]), createLogger(`${this.logger.module}:batch-connection-sampler`));
-            if (batchSampler.activePeerCount === 0 && !pinnedPeer) {
-                this.logger.warn('No active peers to send requests to');
-                return [];
-            }
-            // This is where it gets fun
-            // The outer loop is the retry loop, we will continue to retry until we process all indices we have
-            // not received a response for, or we have reached the max retry attempts
-            // The inner loop is the batch loop, we will process all requests for each peer in parallel
-            // We will then process the results of the requests, and resample any peers that failed to respond
-            // We will continue to retry until we have processed all indices, or we have reached the max retry attempts
-            let retryAttempts = 0;
-            while(pendingRequestIndices.size > 0 && batchSampler.activePeerCount > 0 && retryAttempts < maxRetryAttempts){
-                if (signal.aborted) {
-                    throw new AbortError('Batch request aborted');
-                }
-                const requestBatches = new Map();
-                // Group requests by peer
-                for (const requestIndex of pendingRequestIndices){
-                    const peer = batchSampler.getPeerForRequest(requestIndex);
-                    if (!peer) {
-                        break;
-                    }
-                    const peerAsString = peer.toString();
-                    if (!requestBatches.has(peerAsString)) {
-                        requestBatches.set(peerAsString, {
-                            peerId: peer,
-                            indices: []
-                        });
-                    }
-                    requestBatches.get(peerAsString).indices.push(requestIndex);
-                }
-                // If there is a pinned peer, we will always send every request to that peer
-                // We use the default limits for the subprotocol to avoid hitting the rate limiter
-                if (pinnedPeer) {
-                    const limit = this.rateLimiter.getRateLimits(subProtocol).peerLimit.quotaCount;
-                    requestBatches.set(pinnedPeer.toString(), {
-                        peerId: pinnedPeer,
-                        indices: Array.from(pendingRequestIndices.values()).slice(0, limit)
-                    });
-                }
-                // Make parallel requests for each peer's batch
-                // A batch entry will look something like this:
-                // PeerId0: [0, 1, 2, 3]
-                // PeerId1: [4, 5, 6, 7]
-                // Peer Id 0 will send requests 0, 1, 2, 3 in serial
-                // while simultaneously Peer Id 1 will send requests 4, 5, 6, 7 in serial
-                const batchResults = await Promise.all(Array.from(requestBatches.entries()).map(async ([peerAsString, { peerId: peer, indices }])=>{
-                    try {
-                        // Requests all going to the same peer are sent synchronously
-                        const peerResults = [];
-                        for (const index of indices){
-                            this.logger.trace(`Sending request ${index} to peer ${peerAsString}`);
-                            const response = await this.sendRequestToPeer(peer, subProtocol, requestBuffers[index]);
-                            // Check the status of the response buffer
-                            if (response.status !== ReqRespStatus.SUCCESS) {
-                                this.logger.debug(`Request to peer ${peerAsString} failed with status ${prettyPrintReqRespStatus(response.status)}`);
-                                // If we hit a rate limit or some failure, we remove the peer and return the results,
-                                // they will be split among remaining peers and the new sampled peer
-                                batchSampler.removePeerAndReplace(peer);
-                                return {
-                                    peer,
-                                    results: peerResults
-                                };
-                            }
-                            if (response && response.data.length > 0) {
-                                const object = responseFromBuffer(subProtocol, response.data);
-                                const isValid = await responseValidator(requests[index], object, peer);
-                                if (isValid) {
-                                    peerResults.push({
-                                        index,
-                                        response: object
-                                    });
-                                }
-                            }
-                        }
-                        return {
-                            peer,
-                            results: peerResults
-                        };
-                    } catch (error) {
-                        this.logger.debug(`Failed batch request to peer ${peerAsString}:`, error);
-                        batchSampler.removePeerAndReplace(peer);
-                        return {
-                            peer,
-                            results: []
-                        };
-                    }
-                }));
-                // Process results
-                for (const { results } of batchResults){
-                    for (const { index, response } of results){
-                        if (response) {
-                            responses[index] = response;
-                            pendingRequestIndices.delete(index);
-                        }
-                    }
-                }
-                retryAttempts++;
-            }
-            if (retryAttempts >= maxRetryAttempts) {
-                this.logger.debug(`Max retry attempts ${maxRetryAttempts} reached for batch request`);
-            }
-            return responses;
-        };
-        try {
-            return await executeTimeout(requestFunction, timeoutMs, ()=>new CollectiveReqRespTimeoutError());
-        } catch (e) {
-            this.logger.debug(`${e.message} | subProtocol: ${subProtocol}`);
-            return [];
-        }
-    }
-    /**
    * Sends a request to a specific peer
    *
    * We first dial a particular protocol for the peer, this ensures that the peer knows
@@ -275,25 +524,34 @@ import { ReqRespStatus, ReqRespStatusError, parseStatusChunk, prettyPrintReqResp
    * If the stream is not closed by the dialled peer, and a timeout occurs, then
    * the stream is closed on the requester's end and sender (us) updates its peer score
    */ async sendRequestToPeer(peerId, subProtocol, payload, dialTimeout = this.dialTimeoutMs) {
+        // Thrown before the try block so the generic error handling below does not penalize the peer for our own bug.
+        if (payload.length > MAX_REQRESP_REQUEST_SIZE_BYTES) {
+            throw new OversizedReqRespRequestError(subProtocol, payload.length, MAX_REQRESP_REQUEST_SIZE_BYTES);
+        }
         let stream;
         try {
             this.metrics.recordRequestSent(subProtocol);
+            // Calculate expected response size based on the request payload
+            const expectedSizeKb = subProtocolSizeCalculators[subProtocol](payload);
             this.logger.trace(`Sending request to peer ${peerId.toString()} on sub protocol ${subProtocol}`);
             stream = await this.connectionSampler.dialProtocol(peerId, subProtocol, dialTimeout);
             this.logger.trace(`Opened stream ${stream.id} for sending request to peer ${peerId.toString()} on sub protocol ${subProtocol}`);
             const timeoutErr = new IndividualReqRespTimeoutError();
+            // Create a wrapper to pass the expected size to readMessage
+            const readMessageWithSizeLimit = (source)=>this.readMessage(source, expectedSizeKb);
             const [_, resp] = await executeTimeout((signal)=>Promise.all([
                     pipeline([
                         payload
                     ], stream.sink, {
                         signal
                     }),
-                    pipeline(stream.source, this.readMessage.bind(this), {
+                    pipeline(stream.source, readMessageWithSizeLimit, {
                         signal
                     })
                 ]), this.individualRequestTimeoutMs, ()=>timeoutErr);
             return resp;
         } catch (e) {
+            this.logger.debug(`SUBPROTOCOL: ${subProtocol}\n`, e);
             // On error we immediately abort the stream, this is preferred way,
             // because it signals to the sender that error happened, whereas
             // closing the stream only closes our side and is much slower
@@ -341,13 +599,33 @@ import { ReqRespStatus, ReqRespStatusError, parseStatusChunk, prettyPrintReqResp
    * The message is split into two components
    * - The first chunk should contain a control byte, indicating the status of the response see `ReqRespStatus`
    * - The second chunk should contain the response data
-   */ async readMessage(source) {
+   *
+   * To bound memory usage we abort reception as soon as the accumulated compressed bytes exceed a
+   * bound derived from `maxSizeKb`, before the full stream has been buffered. Without this a peer we
+   * dialed could stream data up to the request timeout, forcing us to buffer arbitrarily much (the
+   * `maxSizeKb` guard in `inboundTransformData` only runs after the whole compressed payload is
+   * concatenated, so it does nothing to cap reception memory). Snappy can expand incompressible input
+   * to ~1.17x its size, so we allow 2x `maxSizeKb`: comfortably above the worst-case expansion of a
+   * legitimate max-size response, while still capping buffered memory at twice the permitted size.
+   *
+   * @param source - The async iterable source of data chunks
+   * @param maxSizeKb - Optional maximum expected size in KB for the decompressed response
+   */ async readMessage(source, maxSizeKb) {
         let status;
         const chunks = [];
+        const maxAccumulatedBytes = (maxSizeKb ?? DEFAULT_MAX_RESPONSE_SIZE_KB) * 1024 * 2;
+        let accumulatedBytes = 0;
         try {
             for await (const chunk of source){
                 const statusParsed = status !== undefined;
                 if (statusParsed) {
+                    // Use `byteLength` (the logical length) rather than `chunk.subarray().length`: calling
+                    // `subarray()` on a `Uint8ArrayList` consolidates its backing buffers into a single copy,
+                    // which would materialize the very chunk we are trying to reject.
+                    accumulatedBytes += chunk.byteLength;
+                    if (accumulatedBytes > maxAccumulatedBytes) {
+                        throw new ResponseSizeLimitExceededError(accumulatedBytes, maxAccumulatedBytes);
+                    }
                     chunks.push(chunk.subarray());
                     continue;
                 }
@@ -362,20 +640,16 @@ import { ReqRespStatus, ReqRespStatusError, parseStatusChunk, prettyPrintReqResp
                 }
             }
             const messageData = Buffer.concat(chunks);
-            const message = this.snappyTransform.inboundTransformData(messageData);
+            const message = this.snappyTransform.inboundTransformData(messageData, undefined, maxSizeKb);
             return {
                 status: status ?? ReqRespStatus.UNKNOWN,
                 data: message
             };
         } catch (e) {
+            // All errors (invalid status bytes, oversized snappy responses, corrupt data, etc.)
+            // are re-thrown so the caller can penalize the peer via handleResponseError.
             this.logger.debug(`Reading message failed: ${e.message}`);
-            let status = ReqRespStatus.UNKNOWN;
-            if (e instanceof ReqRespStatusError) {
-                status = e.status;
-            }
-            return {
-                status
-            };
+            throw e;
         }
     }
     /**
@@ -403,6 +677,11 @@ import { ReqRespStatus, ReqRespStatusError, parseStatusChunk, prettyPrintReqResp
                 this.logger.verbose(`Rate limit exceeded ${prettyPrintRateLimitStatus(rateLimitStatus)} for ${protocol} from ${connection.remotePeer}`);
                 throw new ReqRespStatusError(ReqRespStatus.RATE_LIMIT_EXCEEDED);
             }
+            // When p2pAllowOnlyValidators is enabled, reject unauthenticated peers on data protocols
+            if (!UNAUTHENTICATED_ALLOWED_PROTOCOLS.has(protocol) && (this.shouldRejectPeer?.(connection.remotePeer.toString()) ?? false)) {
+                this.logger.debug(`Rejecting unauthenticated peer ${connection.remotePeer} on gated protocol ${protocol}`);
+                throw new ReqRespStatusError(ReqRespStatus.FAILURE);
+            }
             await this.processStream(protocol, incomingStream);
         } catch (err) {
             this.metrics.recordResponseError(protocol);
@@ -423,7 +702,8 @@ import { ReqRespStatus, ReqRespStatusError, parseStatusChunk, prettyPrintReqResp
                 // and that this stream should be dropped
                 const isMessageToNotWarn = err instanceof Error && [
                     'stream reset',
-                    'Cannot push value onto an ended pushable'
+                    'Cannot push value onto an ended pushable',
+                    'read ECONNRESET'
                 ].some((msg)=>err.message.includes(msg));
                 const level = isMessageToNotWarn ? 'debug' : 'warn';
                 this.logger[level]('Unknown stream error while handling the stream, aborting', {
@@ -452,6 +732,9 @@ import { ReqRespStatus, ReqRespStatusError, parseStatusChunk, prettyPrintReqResp
         const snappy = this.snappyTransform;
         const SUCCESS = Uint8Array.of(ReqRespStatus.SUCCESS);
         await pipeline(stream.source, async function*(source) {
+            // Req/resp is one-request-one-response: an honest sender writes a single payload and half-closes.
+            // Process only the first chunk and return, so extra frames a peer queues on the same stream cannot
+            // drive further handler invocations that bypass the per-stream rate-limit check in streamHandler.
             for await (const chunk of source){
                 const response = await handler(connection.remotePeer, chunk.subarray());
                 if (protocol === ReqRespSubProtocol.GOODBYE) {
@@ -463,6 +746,7 @@ import { ReqRespStatus, ReqRespStatusError, parseStatusChunk, prettyPrintReqResp
                 stream.metadata.written = true; // Mark the stream as written to;
                 yield SUCCESS;
                 yield snappy.outboundTransformData(response);
+                return;
             }
         }, stream.sink);
     }
@@ -511,12 +795,12 @@ import { ReqRespStatus, ReqRespStatusError, parseStatusChunk, prettyPrintReqResp
             peerId: peerId.toString(),
             subProtocol
         };
-        //Punishable error - peer should never send badly formed request
+        // Punishable error - peer should never send badly formed request
         if (e instanceof ReqRespStatusError && e.status === ReqRespStatus.BADLY_FORMED_REQUEST) {
             this.logger.debug(`Punishable error in ${subProtocol}: ${e.cause}`, logTags);
             return PeerErrorSeverity.LowToleranceError;
         }
-        //TODO: (mralj): think if we should penalize peer here based on connection errors
+        // TODO: (mralj): think if we should penalize peer here based on connection errors
         return undefined;
     }
     /**
@@ -533,16 +817,30 @@ import { ReqRespStatus, ReqRespStatusError, parseStatusChunk, prettyPrintReqResp
             this.logger.debug('Error encountered on goodbye sub protocol, no penalty', logTags);
             return undefined;
         }
-        // We do not punish a collective timeout, as the node triggers this interupt, independent of the peer's behaviour
-        if (e instanceof CollectiveReqRespTimeoutError || e instanceof InvalidResponseError) {
-            this.logger.debug(`Non-punishable error in ${subProtocol}: ${e.message}`, logTags);
-            return undefined;
+        // Invalid status byte: the peer sent a status byte that doesn't match any known status code.
+        // This is a protocol violation, penalize harshly.
+        if (e instanceof ReqRespStatusError) {
+            this.logger.warn(`Invalid status byte from peer ${peerId.toString()} in ${subProtocol}: ${e.message}`, logTags);
+            return PeerErrorSeverity.LowToleranceError;
+        }
+        // Oversized snappy response: the peer is sending data that exceeds the allowed size.
+        // This is a protocol violation that wastes bandwidth, so penalize harshly.
+        if (e instanceof OversizedSnappyResponseError) {
+            this.logger.warn(`Oversized response from peer ${peerId.toString()} in ${subProtocol}: ${e.message}`, logTags);
+            return PeerErrorSeverity.LowToleranceError;
+        }
+        // Response exceeded the reception buffer bound: the peer streamed more compressed data than the
+        // per-request size limit allows. Same protocol violation as above, penalize harshly.
+        if (e instanceof ResponseSizeLimitExceededError) {
+            this.logger.warn(`Oversized response from peer ${peerId.toString()} in ${subProtocol}: ${e.message}`, logTags);
+            return PeerErrorSeverity.LowToleranceError;
         }
         return this.categorizeConnectionErrors(e, peerId, subProtocol);
     }
     /*
    * Errors specific to connection  handling
-   * These can happen  both when sending request and response*/ categorizeConnectionErrors(e, peerId, subProtocol) {
+   * These can happen  both when sending request and response.
+   */ categorizeConnectionErrors(e, peerId, subProtocol) {
         const logTags = {
             peerId: peerId.toString(),
             subProtocol
@@ -587,21 +885,3 @@ import { ReqRespStatus, ReqRespStatusError, parseStatusChunk, prettyPrintReqResp
         return PeerErrorSeverity.HighToleranceError;
     }
 }
-_ts_decorate([
-    trackSpan('ReqResp.sendBatchRequest', (subProtocol, requests)=>({
-            [Attributes.P2P_REQ_RESP_PROTOCOL]: subProtocol,
-            [Attributes.P2P_REQ_RESP_BATCH_REQUESTS_COUNT]: requests.length
-        }))
-], ReqResp.prototype, "sendBatchRequest", null);
-_ts_decorate([
-    trackSpan('ReqResp.sendRequestToPeer', (peerId, subProtocol, _)=>({
-            [Attributes.P2P_ID]: peerId.toString(),
-            [Attributes.P2P_REQ_RESP_PROTOCOL]: subProtocol
-        }))
-], ReqResp.prototype, "sendRequestToPeer", null);
-_ts_decorate([
-    trackSpan('ReqResp.streamHandler', (protocol, { connection })=>({
-            [Attributes.P2P_REQ_RESP_PROTOCOL]: protocol,
-            [Attributes.P2P_ID]: connection.remotePeer.toString()
-        }))
-], ReqResp.prototype, "streamHandler", null);