From 9db6b39dc3b267092959a1bb3c2677c895b6fbd6 Mon Sep 17 00:00:00 2001 From: realbigsean Date: Tue, 2 May 2023 19:14:02 -0400 Subject: [PATCH] fix check on max request size (#4250) --- .../beacon_processor/worker/rpc_methods.rs | 33 ++++++------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/beacon_node/network/src/beacon_processor/worker/rpc_methods.rs b/beacon_node/network/src/beacon_processor/worker/rpc_methods.rs index c8667b3528..5f282ecfbe 100644 --- a/beacon_node/network/src/beacon_processor/worker/rpc_methods.rs +++ b/beacon_node/network/src/beacon_processor/worker/rpc_methods.rs @@ -625,7 +625,7 @@ impl Worker { ); // Should not send more than max request blocks - if req.count > MAX_REQUEST_BLOB_SIDECARS { + if req.count * T::EthSpec::max_blobs_per_block() as u64 > MAX_REQUEST_BLOB_SIDECARS { return self.send_error_response( peer_id, RPCResponseErrorCode::InvalidRequest, @@ -808,28 +808,15 @@ impl Worker { .slot() .unwrap_or_else(|_| self.chain.slot_clock.genesis_slot()); - if blobs_sent < (req.count as usize) { - debug!( - self.log, - "BlobsByRange Response processed"; - "peer" => %peer_id, - "msg" => "Failed to return all requested blobs", - "start_slot" => req.start_slot, - "current_slot" => current_slot, - "requested" => req.count, - "returned" => blobs_sent - ); - } else { - debug!( - self.log, - "BlobsByRange Response processed"; - "peer" => %peer_id, - "start_slot" => req.start_slot, - "current_slot" => current_slot, - "requested" => req.count, - "returned" => blobs_sent - ); - } + debug!( + self.log, + "BlobsByRange Response processed"; + "peer" => %peer_id, + "start_slot" => req.start_slot, + "current_slot" => current_slot, + "requested" => req.count, + "returned" => blobs_sent + ); if send_response { // send the stream terminator