Updateeth2_libp2p & move blob count validations of received request…

…s to `eth2_libp2p`
grandinetech · Jan 13, 2025 · eb84363 · eb84363
1 parent aadb443
commit eb84363
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 44 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/eth2_libp2p b/eth2_libp2p
diff --git a/p2p/src/network.rs b/p2p/src/network.rs
@@ -413,7 +413,9 @@ impl<P: Preset> Network<P> {
                             self.request_blobs_by_range(request_id, peer_id, start_slot, count);
                         }
                         SyncToP2p::RequestBlobsByRoot(request_id, peer_id, identifiers) => {
-                            self.request_blobs_by_root(request_id, peer_id, identifiers);
+                            if let Err(error) = self.request_blobs_by_root(request_id, peer_id, identifiers) {
+                                warn!("cannot request blobs by root: {error:?}");
+                            }
                         }
                         SyncToP2p::RequestBlocksByRange(request_id, peer_id, start_slot, count) => {
                             self.request_blocks_by_range(request_id, peer_id, start_slot, count);
@@ -926,7 +928,8 @@ impl<P: Preset> Network<P> {
                 self.handle_blobs_by_range_request(peer_id, peer_request_id, request_id, request)
             }
             RequestType::BlobsByRoot(request) => {
-                self.handle_blobs_by_root_request(peer_id, peer_request_id, request_id, request)
+                self.handle_blobs_by_root_request(peer_id, peer_request_id, request_id, request);
+                Ok(())
             }
             RequestType::Goodbye(goodbye_reason) => {
                 debug!("received GoodBye request (peer_id: {peer_id}, reason: {goodbye_reason:?})");
@@ -1046,19 +1049,8 @@ impl<P: Preset> Network<P> {
         debug!("received BlobSidecarsByRange request (peer_id: {peer_id}, request: {request:?})");
 
         let BlobsByRangeRequest { start_slot, count } = request;
-        let chain_config = self.controller.chain_config();
-        let phase = chain_config.phase_at_slot::<P>(start_slot);
-        let Some(max_request_blob_sidecars) = chain_config.max_request_blob_sidecars(phase) else {
-            return Err(Error::InvalidPhaseRequest {
-                phase,
-                protocol: "blob_sidecars_by_range".to_owned(),
-            }
-            .into());
-        };
 
-        let difference = count
-            .min(max_request_blob_sidecars)
-            .min(MAX_FOR_DOS_PREVENTION);
+        let difference = count.min(MAX_FOR_DOS_PREVENTION);
 
         let end_slot = start_slot
             .checked_add(difference)
@@ -1116,35 +1108,21 @@ impl<P: Preset> Network<P> {
         peer_request_id: PeerRequestId,
         request_id: IncomingRequestId,
         request: BlobsByRootRequest,
-    ) -> Result<()> {
+    ) {
         debug!("received BlobsByRootRequest request (peer_id: {peer_id}, request: {request:?})");
 
         // TODO(feature/deneb): MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS
         let BlobsByRootRequest { blob_ids } = request;
-        let phase = self.controller.phase();
-        let Some(max_request_blob_sidecars) = self
-            .controller
-            .chain_config()
-            .max_request_blob_sidecars(phase)
-        else {
-            return Err(Error::InvalidPhaseRequest {
-                phase,
-                protocol: "blob_sidecars_by_root".to_owned(),
-            }
-            .into());
-        };
 
         let controller = self.controller.clone_arc();
         let network_to_service_tx = self.network_to_service_tx.clone();
 
         self.dedicated_executor
             .spawn(async move {
                 // > Clients MAY limit the number of blocks and sidecars in the response.
-                let blob_ids = blob_ids.into_iter().take(
-                    MAX_FOR_DOS_PREVENTION
-                        .min(max_request_blob_sidecars)
-                        .try_into()?,
-                );
+                let blob_ids = blob_ids
+                    .into_iter()
+                    .take(MAX_FOR_DOS_PREVENTION.try_into()?);
 
                 let blob_sidecars = controller.blob_sidecars_by_ids(blob_ids)?;
 
@@ -1179,9 +1157,7 @@ impl<P: Preset> Network<P> {
 
                 Ok::<_, anyhow::Error>(())
             })
-            .detach();
-
-        Ok(())
+            .detach()
     }
 
     fn handle_blocks_by_root_request(
@@ -1778,7 +1754,7 @@ impl<P: Preset> Network<P> {
         request_id: RequestId,
         peer_id: PeerId,
         blob_identifiers: Vec<BlobIdentifier>,
-    ) {
+    ) -> Result<()> {
         let blob_identifiers = blob_identifiers
             .into_iter()
             .filter(|blob_identifier| !self.received_blob_sidecars.contains_key(blob_identifier))
@@ -1789,18 +1765,23 @@ impl<P: Preset> Network<P> {
                 "cannot request BlobSidecarsByRoot: all requested blob sidecars have been received",
             );
 
-            return;
+            return Ok(());
         }
 
-        let request =
-            BlobsByRootRequest::new(self.controller.chain_config(), blob_identifiers.into_iter());
+        let request = BlobsByRootRequest::new(
+            self.controller.chain_config(),
+            self.controller.phase(),
+            blob_identifiers.into_iter(),
+        )?;
 
         debug!(
             "sending BlobSidecarsByRoot request (request_id: {request_id}, peer_id: {peer_id}, \
             request: {request:?})",
         );
 
         self.request(peer_id, request_id, RequestType::BlobsByRoot(request));
+
+        Ok(())
     }
 
     fn request_blocks_by_range(
@@ -1982,8 +1963,6 @@ impl<P: Preset> Network<P> {
 enum Error {
     #[error("end slot overflowed ({start_slot} + {difference})")]
     EndSlotOverflow { start_slot: u64, difference: u64 },
-    #[error("cannot request {protocol} at {phase}")]
-    InvalidPhaseRequest { protocol: String, phase: Phase },
 }
 
 fn fork_digest(fork_context: &ForkContext) -> ForkDigest {
+1 −0		Cargo.toml
+2 −3		gossipsub/Cargo.toml
+1 −1		gossipsub/src/backoff.rs
+21 −17		gossipsub/src/behaviour.rs
+1 −0		gossipsub/src/behaviour/tests.rs
+1 −1		gossipsub/src/peer_score.rs
+3 −3		src/config.rs
+2 −3		src/discovery/subnet_predicate.rs
+0 −4		src/peer_manager/network_behaviour.rs
+1 −1		src/peer_manager/peerdb.rs
+2 −2		src/peer_manager/peerdb/peer_info.rs
+57 −11		src/rpc/codec.rs
+2 −2		src/rpc/config.rs
+5 −5		src/rpc/handler.rs
+13 −6		src/rpc/methods.rs
+3 −2		src/rpc/mod.rs
+18 −8		src/rpc/protocol.rs
+17 −7		src/rpc/rate_limiter.rs
+16 −4		src/rpc/self_limiter.rs
+11 −12		src/service/gossip_cache.rs
+11 −1		src/types/mod.rs